From 7d1df0e8aa0e630c6959061e1f49f296424982dd Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 27 Feb 2012 13:34:15 +0900
Subject: [PATCH 001/816] Fix build with vala 0.14.2.

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5697071
---
 ui/gtk3/switcher.vala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 5db459c3c..ff521e1c7 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -65,7 +65,8 @@ class Switcher : Gtk.Window {
         if (device == null) {
             var display = get_display();
             var device_manager = display.get_device_manager();
-            device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+            unowned GLib.List<Gdk.Device> devices = device_manager.list_devices(Gdk.DeviceType.MASTER);
+            device = devices.data;
         }
 
         Gdk.Device keyboard;

From 947ea295e8e9a75a4add59434677912e603bd6d0 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Mon, 27 Feb 2012 09:57:47 -0500
Subject: [PATCH 002/816] Refine inline doc and test for
 ibus_bus_get_engines_by_names().

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/5697067
---
 src/ibusbus.h        | 3 ++-
 src/tests/ibus-bus.c | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ibusbus.h b/src/ibusbus.h
index 477ff8ce2..337091bb5 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -716,7 +716,8 @@ GList       *ibus_bus_list_active_engines_async_finish
  * @names: (array zero-terminated=1): A %NULL-terminated array of names.
  * @returns: (array zero-terminated=1) (transfer full): A %NULL-terminated array of engines.
  *
- * Get engines by given names synchronously.
+ * 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
  */
 IBusEngineDesc **
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 644f35dd7..620f14d47 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -539,6 +539,7 @@ test_get_engines_by_names (void)
         "xkb:ca:eng:eng",
         "xkb:fr::fra",
         "xkb:jp::jpn",
+        "invalid_engine_name",
         NULL,
     };
 
@@ -556,7 +557,12 @@ test_get_engines_by_names (void)
         // The ref should be zero, *p is released.
         g_assert (!IBUS_IS_ENGINE_DESC (*p));
     }
+
+    // The last engine does not exist.
+    g_assert_cmpint (i, ==, G_N_ELEMENTS(names) - 2);
+
     g_free (engines);
+
     engines = NULL;
 }
 

From 4fe94aee0d3099060433189f3457df3df6b89bea Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Mon, 27 Feb 2012 10:28:18 -0500
Subject: [PATCH 003/816] Remove redefinition of typedef
 IBusEngineSimplePrivate.

BUG=None
TEST=Make on Linux desktop

Review URL: https://codereview.appspot.com/5699087
---
 src/ibusenginesimple.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index d38612418..8bd1ff40a 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -32,8 +32,6 @@ struct _IBusComposeTableCompact
     gint n_index_stride;
 };
 
-
-typedef struct _IBusEngineSimplePrivate IBusEngineSimplePrivate;
 struct _IBusEngineSimplePrivate {
     GSList     *tables;
     guint       compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];

From d050c5ba6c8a6546cb7855a3eff9a9c1f048b977 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 29 Feb 2012 12:58:46 +0900
Subject: [PATCH 004/816] dconf: remove workaround for self-write notification.

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5709051
---
 conf/dconf/config.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index 02506fbad..faca9328d 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -315,15 +315,6 @@ ibus_config_dconf_set_value (IBusConfigService *config,
                                  error);
     g_free (gkey);
 
-    /* notify the caller that the value has changed, as dconf does not
-       call watch_func when the caller is the process itself */
-    if (retval) {
-        if (value == NULL) {
-            /* Use a empty tuple for a unset value */
-            value = g_variant_new_tuple (NULL, 0);
-        }
-        ibus_config_service_value_changed (config, section, name, value);
-    }
     return retval;
 }
 

From 87863d575856768517f8f6bd8119eaea2b8e7c49 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 29 Feb 2012 15:44:00 +0900
Subject: [PATCH 005/816] Fix to return false in
 ibus_simple_engine_process_key_event

IM clients expect filter_keypress returns FALSE when IME is disabled.
Now we use the simple engine instead of the disabled state so
it would be better that process_key_event returns FALSE for ASCII.

BUG=RH#769133
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5707057
---
 src/ibusenginesimple.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 8bd1ff40a..5dd78f398 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -661,7 +661,11 @@ no_sequence_matches (IBusEngineSimple *simple,
         }
 
         ch = ibus_keyval_to_unicode (keyval);
-        if (ch != 0 && !g_unichar_iscntrl (ch)) {
+        /* IBUS_CHANGE: RH#769133
+         * Since we use ibus xkb engines as the disable state,
+         * do not commit the characters locally without in_hex_sequence. */
+        if (ch != 0 && !g_unichar_iscntrl (ch) &&
+            priv->in_hex_sequence) {
             ibus_engine_simple_commit_char (simple, ch);
             return TRUE;
         }

From 57846a1016a395f06e9b8fe8db1c537f791a6018 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 29 Feb 2012 17:00:32 +0900
Subject: [PATCH 006/816] Add ibus_config_watch/unwatch.

Currently IBusConfig proxy is notified every config value change.
e.g. ibus-m17n will get notified even when ibus-anthy's config values
are changed.

With this patch, IBusConfig proxy will be able to restrict
notification by calling ibus_config_watch().  For example, after:

ibus_config_watch (config, "engine/M17N/hi/inscript", NULL);

it will be notified value changes only under
"engine/M17N/hi/inscript" section.

BUG=none
TEST=manually with modified ibus-m17n

Review URL: https://codereview.appspot.com/5091045
---
 src/ibusbus.c           |   4 -
 src/ibusconfig.c        | 248 +++++++++++++++++++++++++++++++++++++-
 src/ibusconfig.h        |  49 +++++++-
 src/ibusinternal.h      |  21 ++++
 src/tests/Makefile.am   |   1 +
 src/tests/ibus-config.c | 260 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 572 insertions(+), 11 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index ceed16aa1..ea18841c3 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -33,10 +33,6 @@
 #include "ibusserializable.h"
 #include "ibusconfig.h"
 
-#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
-#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
-#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
-
 #define IBUS_BUS_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_BUS, IBusBusPrivate))
 
diff --git a/src/ibusconfig.c b/src/ibusconfig.c
index b691277b7..40c27699a 100644
--- a/src/ibusconfig.c
+++ b/src/ibusconfig.c
@@ -23,6 +23,7 @@
 #include "ibusmarshalers.h"
 #include "ibusshare.h"
 #include "ibusconfig.h"
+#include "ibusbus.h"
 
 #define IBUS_CONFIG_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_CONFIG, IBusConfigPrivate))
@@ -35,9 +36,9 @@ enum {
 
 /* IBusConfigPriv */
 struct _IBusConfigPrivate {
-    gpointer pad;
+    GArray *watch_rules;
+    guint watch_config_signal_id;
 };
-typedef struct _IBusConfigPrivate IBusConfigPrivate;
 
 static guint    config_signals[LAST_SIGNAL] = { 0 };
 
@@ -50,7 +51,22 @@ static void      ibus_config_g_signal       (GDBusProxy         *proxy,
                                              const gchar        *signal_name,
                                              GVariant           *parameters);
 
-G_DEFINE_TYPE (IBusConfig, ibus_config, IBUS_TYPE_PROXY)
+static void      initable_iface_init        (GInitableIface     *initable_iface);
+static void      async_initable_iface_init  (GAsyncInitableIface
+                                                                *async_initable_iface);
+
+static gchar    *_make_match_rule           (const gchar        *section,
+                                             const gchar        *name);
+static guint     _signal_subscribe          (GDBusProxy         *proxy);
+static void      _signal_unsubscribe        (GDBusProxy         *proxy,
+                                             guint               signal_id);
+
+static void      _remove_all_match_rules    (IBusConfig         *config);
+
+G_DEFINE_TYPE_WITH_CODE (IBusConfig, ibus_config, IBUS_TYPE_PROXY,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
+                         );
 
 static void
 ibus_config_class_init (IBusConfigClass *class)
@@ -92,11 +108,19 @@ ibus_config_class_init (IBusConfigClass *class)
 static void
 ibus_config_init (IBusConfig *config)
 {
+    config->priv = IBUS_CONFIG_GET_PRIVATE (config);
+    config->priv->watch_rules = g_array_new (FALSE, FALSE, sizeof (gchar *));
 }
 
 static void
 ibus_config_real_destroy (IBusProxy *proxy)
 {
+    IBusConfigPrivate *priv = IBUS_CONFIG_GET_PRIVATE (proxy);
+
+    _signal_unsubscribe (G_DBUS_PROXY (proxy), priv->watch_config_signal_id);
+    _remove_all_match_rules (IBUS_CONFIG (proxy));
+    g_array_free (priv->watch_rules, FALSE);
+
     IBUS_PROXY_CLASS(ibus_config_parent_class)->destroy (proxy);
 }
 
@@ -127,6 +151,133 @@ ibus_config_g_signal (GDBusProxy  *proxy,
     g_return_if_reached ();
 }
 
+static void
+_connection_signal_cb (GDBusConnection *connection,
+                       const gchar     *sender_name,
+                       const gchar     *object_path,
+                       const gchar     *interface_name,
+                       const gchar     *signal_name,
+                       GVariant        *parameters,
+                       IBusConfig      *config)
+{
+    g_return_if_fail (IBUS_IS_CONFIG (config));
+
+    ibus_config_g_signal (G_DBUS_PROXY (config),
+                          sender_name,
+                          signal_name,
+                          parameters);
+}
+
+static gchar *
+_make_match_rule (const gchar *section,
+                  const gchar *name)
+{
+    GString *str = g_string_new ("type='signal',"
+                                 "interface='" IBUS_INTERFACE_CONFIG "',"
+                                 "path='" IBUS_PATH_CONFIG "',"
+                                 "member='ValueChanged'");
+    if (section != NULL) {
+        g_string_append_printf (str, ",arg0='%s'", section);
+        if (name != NULL)
+            g_string_append_printf (str, ",arg1='%s'", name);
+    }
+    return g_string_free (str, FALSE);
+}
+
+static void
+_remove_all_match_rules (IBusConfig *config)
+{
+    gint i;
+
+    for (i = 0; i < config->priv->watch_rules->len; i++) {
+        IBusBus *bus = ibus_bus_new ();
+        gchar *rule = g_array_index (config->priv->watch_rules, gchar *, i);
+        ibus_bus_remove_match (bus, rule);
+        g_object_unref (bus);
+        g_free (rule);
+    }
+    g_array_set_size (config->priv->watch_rules, 0);
+}
+
+gboolean
+ibus_config_watch (IBusConfig  *config,
+                   const gchar *section,
+                   const gchar *name)
+{
+    g_return_val_if_fail (IBUS_IS_CONFIG (config), FALSE);
+    g_assert ((section != NULL) || (section == NULL && name == NULL));
+
+    IBusBus *bus = ibus_bus_new ();
+    gchar *rule;
+    gboolean retval;
+
+    if (section == NULL && name == NULL) {
+        _remove_all_match_rules (config);
+
+        rule = _make_match_rule (NULL, NULL);
+        retval = ibus_bus_add_match (bus, rule);
+        g_object_unref (bus);
+        g_free (rule);
+
+        return retval;
+    }
+
+    if (config->priv->watch_rules->len == 0) {
+        rule = _make_match_rule (NULL, NULL);
+        retval = ibus_bus_remove_match (bus, rule);
+        g_free (rule);
+        if (!retval) {
+            g_object_unref (bus);
+            return FALSE;
+        }
+    }
+
+    rule = _make_match_rule (section, name);
+    retval = ibus_bus_add_match (bus, rule);
+    g_object_unref (bus);
+    if (!retval) {
+        g_free (rule);
+        return FALSE;
+    }
+
+    g_array_append_val (config->priv->watch_rules, rule);
+    return TRUE;
+}
+
+gboolean
+ibus_config_unwatch (IBusConfig  *config,
+                     const gchar *section,
+                     const gchar *name)
+{
+    g_return_val_if_fail (IBUS_IS_CONFIG (config), FALSE);
+    g_assert ((section != NULL) || (section == NULL && name == NULL));
+
+    IBusBus *bus = ibus_bus_new ();
+    gchar *rule = _make_match_rule (section, name);
+    gboolean retval;
+
+    retval = ibus_bus_remove_match (bus, rule);
+    g_object_unref (bus);
+    if (retval && (section != NULL || name != NULL)) {
+        /* Remove the previously registered match rule from
+           config->priv->watch_rules. */
+        gint i;
+        for (i = 0; i < config->priv->watch_rules->len; i++) {
+            gchar *_rule = g_array_index (config->priv->watch_rules, gchar *,
+                                          i);
+            if (g_strcmp0 (_rule, rule) == 0) {
+                config->priv->watch_rules =
+                    g_array_remove_index_fast (config->priv->watch_rules, i);
+                g_free (_rule);
+                break;
+            }
+        }
+    }
+    g_free (rule);
+
+    return TRUE;
+}
+
 IBusConfig *
 ibus_config_new (GDBusConnection  *connection,
                  GCancellable     *cancellable,
@@ -137,7 +288,8 @@ ibus_config_new (GDBusConnection  *connection,
     GInitable *initable;
 
     GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
+                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+                            G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS;
 
     initable = g_initable_new (IBUS_TYPE_CONFIG,
                                cancellable,
@@ -174,7 +326,8 @@ ibus_config_new_async (GDBusConnection     *connection,
     g_assert (callback != NULL);
 
     GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
+                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+                            G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS;
 
     g_async_initable_new_async (IBUS_TYPE_CONFIG,
                                 G_PRIORITY_DEFAULT,
@@ -482,3 +635,88 @@ ibus_config_unset (IBusConfig   *config,
     g_variant_unref (result);
     return TRUE;
 }
+
+static guint
+_signal_subscribe (GDBusProxy *proxy)
+{
+    GDBusConnection *connection = g_dbus_proxy_get_connection (proxy);
+    return g_dbus_connection_signal_subscribe (connection,
+                                               NULL,
+                                               IBUS_INTERFACE_CONFIG,
+                                               NULL,
+                                               NULL,
+                                               NULL,
+                                               G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
+                                               (GDBusSignalCallback) _connection_signal_cb,
+                                               g_object_ref (proxy),
+                                               (GDestroyNotify) g_object_unref);
+}
+
+static void
+_signal_unsubscribe (GDBusProxy *proxy, guint signal_id)
+{
+    GDBusConnection *connection = g_dbus_proxy_get_connection (proxy);
+    g_dbus_connection_signal_unsubscribe (connection, signal_id);
+}
+
+static GInitableIface *initable_iface_parent = NULL;
+
+static gboolean
+initable_init (GInitable     *initable,
+               GCancellable  *cancellable,
+               GError       **error)
+{
+    if (!initable_iface_parent->init (initable, cancellable, error))
+        return FALSE;
+
+    IBusConfig *config = IBUS_CONFIG (initable);
+    config->priv->watch_config_signal_id =
+        _signal_subscribe (G_DBUS_PROXY (initable));
+    return ibus_config_watch (config, NULL, NULL);
+}
+
+static void
+initable_iface_init (GInitableIface *initable_iface)
+{
+    initable_iface_parent = g_type_interface_peek_parent (initable_iface);
+    initable_iface->init = initable_init;
+}
+
+static GAsyncInitableIface *async_initable_iface_parent = NULL;
+
+static void
+async_initable_init_async (GAsyncInitable      *initable,
+                           gint                 io_priority,
+                           GCancellable        *cancellable,
+                           GAsyncReadyCallback  callback,
+                           gpointer             user_data)
+{
+    async_initable_iface_parent->init_async (initable,
+                                             io_priority,
+                                             cancellable,
+                                             callback,
+                                             user_data);
+}
+
+static gboolean
+async_initable_init_finish (GAsyncInitable  *initable,
+                            GAsyncResult    *res,
+                            GError         **error)
+{
+    if (!async_initable_iface_parent->init_finish (initable, res, error))
+        return FALSE;
+
+    IBusConfig *config = IBUS_CONFIG (initable);
+    config->priv->watch_config_signal_id =
+        _signal_subscribe (G_DBUS_PROXY (initable));
+    return ibus_config_watch (config, NULL, NULL);
+}
+
+static void
+async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
+{
+    async_initable_iface_parent =
+        g_type_interface_peek_parent (async_initable_iface);
+    async_initable_iface->init_async = async_initable_init_async;
+    async_initable_iface->init_finish = async_initable_init_finish;
+}
diff --git a/src/ibusconfig.h b/src/ibusconfig.h
index c3e01056b..2bdd23184 100644
--- a/src/ibusconfig.h
+++ b/src/ibusconfig.h
@@ -61,6 +61,7 @@ G_BEGIN_DECLS
 
 typedef struct _IBusConfig IBusConfig;
 typedef struct _IBusConfigClass IBusConfigClass;
+typedef struct _IBusConfigPrivate IBusConfigPrivate;
 
 /**
  * IBusConfig:
@@ -68,12 +69,17 @@ typedef struct _IBusConfigClass IBusConfigClass;
  * An opaque data type representing an IBusConfig.
  */
 struct _IBusConfig {
-  IBusProxy parent;
-  /* instance members */
+    /*< private >*/
+    IBusProxy parent;
+    IBusConfigPrivate *priv;
+
+    /* instance members */
 };
 
 struct _IBusConfigClass {
+    /*< private >*/
     IBusProxyClass parent;
+
     /* class members */
 };
 
@@ -302,6 +308,45 @@ gboolean         ibus_config_unset      (IBusConfig         *config,
 
 /* FIXME add an asynchronous version of unset */
 
+/**
+ * ibus_config_watch:
+ * @config: An #IBusConfig
+ * @section: (allow-none): Section name of the configuration option.
+ * @name: (allow-none): Name of the configure option its self.
+ * @returns: %TRUE if succeed; %FALSE otherwise.
+ *
+ * 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
+ * call ibus_config_watch() with the sections they are interested in,
+ * to reduce the number of D-Bus messages.
+ *
+ * See also: ibus_config_unwatch().
+ */
+gboolean         ibus_config_watch      (IBusConfig         *config,
+                                         const gchar        *section,
+                                         const gchar        *name);
+
+/* FIXME add an asynchronous version of watch */
+
+/**
+ * ibus_config_unwatch:
+ * @config: An #IBusConfig
+ * @section: (allow-none): Section name of the configuration option.
+ * @name: (allow-none): Name of the configure option its self.
+ * @returns: %TRUE if succeed; %FALSE otherwise.
+ *
+ * Unsubscribe from the configuration option change notification.
+ *
+ * See also: ibus_config_watch.
+ */
+gboolean         ibus_config_unwatch    (IBusConfig         *config,
+                                         const gchar        *section,
+                                         const gchar        *name);
+
+/* FIXME add an asynchronous version of unwatch */
+
 G_END_DECLS
 #endif
 
diff --git a/src/ibusinternal.h b/src/ibusinternal.h
index 6feb5f391..c1ebf6c52 100644
--- a/src/ibusinternal.h
+++ b/src/ibusinternal.h
@@ -47,5 +47,26 @@
  */
 #define I_(string) g_intern_static_string (string)
 
+/**
+ * DBUS_SERVICE_DBUS:
+ *
+ * Address of D-Bus service.
+ */
+#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
+
+/**
+ * DBUS_PATH_DBUS:
+ *
+ * D-Bus path for D-Bus.
+ */
+#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
+
+/**
+ * DBUS_INTERFACE_DBUS:
+ *
+ * D-Bus interface for D-Bus.
+ */
+#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
+
 #endif
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1c34da706..266ba630a 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -55,6 +55,7 @@ ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
 
 ibus_config_SOURCES = ibus-config.c
+ibus_config_CFLAGS = -DSET_VALUE_PROGRAM=\"$(builddir)/ibus-config-set-value\"
 ibus_config_LDADD = $(prog_ldadd)
 
 ibus_configservice_SOURCES = ibus-configservice.c
diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index 8967adba2..58b856c2c 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -126,6 +126,265 @@ test_config_set_get (void)
     g_object_unref (config);
 }
 
+typedef struct {
+    GMainLoop *loop;
+    gchar *section;
+    gchar *name;
+} WatchData;
+
+static void
+value_changed_cb (IBusConfig  *config,
+                  const gchar *section,
+                  const gchar *name,
+                  GVariant    *value,
+                  gpointer     user_data)
+{
+    WatchData *data = (WatchData *) user_data;
+
+    data->section = g_strdup (section);
+    data->name = g_strdup (name);
+
+    g_main_loop_quit (data->loop);
+}
+
+static gboolean
+timeout_cb (gpointer user_data)
+{
+    WatchData *data = (WatchData *) user_data;
+    g_main_loop_quit (data->loop);
+    return FALSE;
+}
+
+static void
+change_value (IBusConfig  *config,
+              const gchar *section,
+              const gchar *name,
+              WatchData   *data)
+{
+    gboolean retval;
+    guint timeout_id;
+
+    /* Unset won't notify value-changed signal. */
+    retval = ibus_config_unset (config, section, name);
+    g_assert (retval);
+
+    timeout_id = g_timeout_add (1, timeout_cb, data);
+    g_main_loop_run (data->loop);
+    g_source_remove (timeout_id);
+
+    retval = ibus_config_set_value (config, section, name,
+                                    g_variant_new_int32 (1));
+    g_assert (retval);
+
+    timeout_id = g_timeout_add (1, timeout_cb, data);
+    g_main_loop_run (data->loop);
+    g_source_remove (timeout_id);
+}
+
+static void
+test_config_watch (void)
+{
+    IBusConfig *config;
+    WatchData data;
+
+    config = ibus_config_new (ibus_bus_get_connection (bus),
+                              NULL,
+                              NULL);
+    g_assert (config);
+
+    data.loop = g_main_loop_new (NULL, FALSE);
+    g_signal_connect (config, "value-changed",
+                      G_CALLBACK (value_changed_cb), &data);
+
+    /* By default, no watch is set and every change will be notified. */
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s1");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    /* Watch only section. */
+    ibus_config_watch (config, "test/s1", NULL);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s1");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s2", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_unwatch (config, "test/s1", NULL);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_watch (config, NULL, NULL);
+
+    /* Watch only section; multiple watches. */
+    ibus_config_watch (config, "test/s1", NULL);
+    ibus_config_watch (config, "test/s2", NULL);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s1");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s2", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s2");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_unwatch (config, "test/s1", NULL);
+    ibus_config_unwatch (config, "test/s2", NULL);
+    ibus_config_watch (config, NULL, NULL);
+
+    /* Watch both section and name. */
+    ibus_config_watch (config, "test/s1", "n1");
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s1");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n2", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s2", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_unwatch (config, "test/s1", "n1");
+    ibus_config_watch (config, NULL, NULL);
+
+    /* Watch both section and name; multiple watches. */
+    ibus_config_watch (config, "test/s1", "n1");
+    ibus_config_watch (config, "test/s2", "n2");
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s1");
+    g_assert_cmpstr (data.name, ==, "n1");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n2", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s2", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s2", "n2", &data);
+
+    g_assert_cmpstr (data.section, ==, "test/s2");
+    g_assert_cmpstr (data.name, ==, "n2");
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_unwatch (config, "test/s1", "n1");
+
+    data.section = NULL;
+    data.name = NULL;
+
+    change_value (config, "test/s1", "n1", &data);
+
+    g_assert_cmpstr (data.section, ==, NULL);
+    g_assert_cmpstr (data.name, ==, NULL);
+
+    g_free (data.section);
+    g_free (data.name);
+
+    ibus_config_unwatch (config, "test/s2", "n2");
+    ibus_config_watch (config, NULL, NULL);
+
+    g_main_loop_unref (data.loop);
+    g_object_unref (config);
+}
+
 gint
 main (gint    argc,
       gchar **argv)
@@ -136,6 +395,7 @@ main (gint    argc,
     ibus_init ();
     bus = ibus_bus_new ();
 
+    g_test_add_func ("/ibus/config-watch", test_config_watch);
     g_test_add_func ("/ibus/create-config-async", test_create_config_async);
     g_test_add_func ("/ibus/config-set-get", test_config_set_get);
 

From d91bdc01d58629f65d6be01665f54767b1bd7f0e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 1 Mar 2012 10:50:37 +0900
Subject: [PATCH 007/816] Simplify ibus_config_watch tests using fixtures.

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5702058
---
 src/tests/Makefile.am   |   1 -
 src/tests/ibus-config.c | 414 +++++++++++++++++++++-------------------
 2 files changed, 213 insertions(+), 202 deletions(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 266ba630a..1c34da706 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -55,7 +55,6 @@ ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
 
 ibus_config_SOURCES = ibus-config.c
-ibus_config_CFLAGS = -DSET_VALUE_PROGRAM=\"$(builddir)/ibus-config-set-value\"
 ibus_config_LDADD = $(prog_ldadd)
 
 ibus_configservice_SOURCES = ibus-configservice.c
diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index 58b856c2c..a91d38270 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -132,6 +132,111 @@ typedef struct {
     gchar *name;
 } WatchData;
 
+typedef struct {
+    gchar *section;
+    gchar *name;
+} WatchKey;
+
+typedef struct {
+    WatchKey *watched;          /* watched keys (null-terminated) */
+    WatchKey *changed;          /* changed keys (null-terminated) */
+    WatchKey *notified;         /* notified keys (same length as
+                                   changed, not null-terminated) */
+} WatchTestData;
+
+static WatchKey default_watched[] = {
+    { NULL }
+};
+static WatchKey default_changed[] = {
+    { "test/s1", "n1" },
+    { "test/s1", "n2" },
+    { "test/s2", "n1" },
+    { "test/s2", "n2" },
+    { NULL }
+};
+static WatchKey default_notified[] = {
+    { "test/s1", "n1" },
+    { "test/s1", "n2" },
+    { "test/s2", "n1" },
+    { "test/s2", "n2" }
+};
+static WatchTestData default_data = {
+    default_watched,
+    default_changed,
+    default_notified
+};
+
+static WatchKey section_watched[] = {
+    { "test/s1", NULL },
+    { NULL }
+};
+static WatchKey section_notified[] = {
+    { "test/s1", "n1" },
+    { "test/s1", "n2" },
+    { NULL, NULL },
+    { NULL, NULL },
+};
+static WatchTestData section_data = {
+    section_watched,
+    default_changed,
+    section_notified
+};
+
+static WatchKey section_multiple_watched[] = {
+    { "test/s1", NULL },
+    { "test/s2", NULL },
+    { NULL }
+};
+static WatchKey section_multiple_notified[] = {
+    { "test/s1", "n1" },
+    { "test/s1", "n2" },
+    { "test/s2", "n1" },
+    { "test/s2", "n2" },
+};
+static WatchTestData section_multiple_data = {
+    section_multiple_watched,
+    default_changed,
+    section_multiple_notified
+};
+
+static WatchKey section_name_watched[] = {
+    { "test/s1", "n1" },
+    { NULL }
+};
+static WatchKey section_name_notified[] = {
+    { "test/s1", "n1" },
+    { NULL, NULL },
+    { NULL, NULL },
+    { NULL, NULL },
+};
+static WatchTestData section_name_data = {
+    section_name_watched,
+    default_changed,
+    section_name_notified
+};
+
+static WatchKey section_name_multiple_watched[] = {
+    { "test/s1", "n1" },
+    { "test/s2", "n2" },
+    { NULL }
+};
+static WatchKey section_name_multiple_notified[] = {
+    { "test/s1", "n1" },
+    { NULL, NULL },
+    { NULL, NULL },
+    { "test/s2", "n2" },
+};
+static WatchTestData section_name_multiple_data = {
+    section_name_multiple_watched,
+    default_changed,
+    section_name_multiple_notified
+};
+
+typedef struct {
+    IBusConfig *config;
+    WatchData data;
+} WatchFixture;
+
 static void
 value_changed_cb (IBusConfig  *config,
                   const gchar *section,
@@ -156,14 +261,19 @@ timeout_cb (gpointer user_data)
 }
 
 static void
-change_value (IBusConfig  *config,
-              const gchar *section,
-              const gchar *name,
-              WatchData   *data)
+change_and_test (IBusConfig  *config,
+                 const gchar *section,
+                 const gchar *name,
+                 const gchar *expected_section,
+                 const gchar *expected_name,
+                 WatchData   *data)
 {
     gboolean retval;
     guint timeout_id;
 
+    data->section = NULL;
+    data->name = NULL;
+
     /* Unset won't notify value-changed signal. */
     retval = ibus_config_unset (config, section, name);
     g_assert (retval);
@@ -179,210 +289,78 @@ change_value (IBusConfig  *config,
     timeout_id = g_timeout_add (1, timeout_cb, data);
     g_main_loop_run (data->loop);
     g_source_remove (timeout_id);
+
+    g_assert_cmpstr (data->section, ==, expected_section);
+    g_assert_cmpstr (data->name, ==, expected_name);
+
+    g_free (data->section);
+    g_free (data->name);
 }
 
 static void
-test_config_watch (void)
+watch_fixture_setup (WatchFixture *fixture, gconstpointer user_data)
 {
-    IBusConfig *config;
-    WatchData data;
-
-    config = ibus_config_new (ibus_bus_get_connection (bus),
-                              NULL,
-                              NULL);
-    g_assert (config);
-
-    data.loop = g_main_loop_new (NULL, FALSE);
-    g_signal_connect (config, "value-changed",
-                      G_CALLBACK (value_changed_cb), &data);
-
-    /* By default, no watch is set and every change will be notified. */
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s1");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    /* Watch only section. */
-    ibus_config_watch (config, "test/s1", NULL);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s1");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s2", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    ibus_config_unwatch (config, "test/s1", NULL);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    ibus_config_watch (config, NULL, NULL);
-
-    /* Watch only section; multiple watches. */
-    ibus_config_watch (config, "test/s1", NULL);
-    ibus_config_watch (config, "test/s2", NULL);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s1");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s2", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s2");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    ibus_config_unwatch (config, "test/s1", NULL);
-    ibus_config_unwatch (config, "test/s2", NULL);
-    ibus_config_watch (config, NULL, NULL);
-
-    /* Watch both section and name. */
-    ibus_config_watch (config, "test/s1", "n1");
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s1");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n2", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s2", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    ibus_config_unwatch (config, "test/s1", "n1");
-    ibus_config_watch (config, NULL, NULL);
-
-    /* Watch both section and name; multiple watches. */
-    ibus_config_watch (config, "test/s1", "n1");
-    ibus_config_watch (config, "test/s2", "n2");
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s1");
-    g_assert_cmpstr (data.name, ==, "n1");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n2", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s2", "n1", &data);
-
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
-
-    g_free (data.section);
-    g_free (data.name);
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s2", "n2", &data);
-
-    g_assert_cmpstr (data.section, ==, "test/s2");
-    g_assert_cmpstr (data.name, ==, "n2");
-
-    g_free (data.section);
-    g_free (data.name);
-
-    ibus_config_unwatch (config, "test/s1", "n1");
-
-    data.section = NULL;
-    data.name = NULL;
-
-    change_value (config, "test/s1", "n1", &data);
+    fixture->config = ibus_config_new (ibus_bus_get_connection (bus),
+                                       NULL,
+                                       NULL);
+    g_assert (fixture->config);
+
+    fixture->data.loop = g_main_loop_new (NULL, FALSE);
+    g_signal_connect (fixture->config, "value-changed",
+                      G_CALLBACK (value_changed_cb), &fixture->data);
+}
 
-    g_assert_cmpstr (data.section, ==, NULL);
-    g_assert_cmpstr (data.name, ==, NULL);
+static void
+watch_fixture_teardown (WatchFixture *fixture, gconstpointer user_data)
+{
+    g_main_loop_unref (fixture->data.loop);
 
-    g_free (data.section);
-    g_free (data.name);
+    ibus_proxy_destroy (IBUS_PROXY (fixture->config));
+    g_object_unref (fixture->config);
+}
 
-    ibus_config_unwatch (config, "test/s2", "n2");
-    ibus_config_watch (config, NULL, NULL);
+static void
+test_config_watch (WatchFixture *fixture, gconstpointer user_data)
+{
+    const WatchTestData *data = user_data;
+    gint i;
 
-    g_main_loop_unref (data.loop);
-    g_object_unref (config);
+    for (i = 0; data->watched[i].section != NULL; i++) {
+        ibus_config_watch (fixture->config,
+                           data->watched[i].section,
+                           data->watched[i].name);
+    }
+    for (i = 0; data->changed[i].section != NULL; i++) {
+        change_and_test (fixture->config,
+                         data->changed[i].section,
+                         data->changed[i].name,
+                         data->notified[i].section,
+                         data->notified[i].name,
+                         &fixture->data);
+    }
+    for (i = 0; data->watched[i].section != NULL; i++) {
+        ibus_config_unwatch (fixture->config,
+                             data->watched[i].section,
+                             data->watched[i].name);
+    }
+    if (i > 0) {
+        /* Check if the above unwatch takes effect. */
+        for (i = 0; data->changed[i].section != NULL; i++) {
+            change_and_test (fixture->config,
+                             data->changed[i].section,
+                             data->changed[i].name,
+                             NULL,
+                             NULL,
+                             &fixture->data);
+        }
+    } else {
+        /* If ibus_config_unwatch has not been called, need to manually
+           unwatch the default rule here, otherwise the recipient of
+           the default match rule will be ref'd twice on the next
+           ibus_config_new(), since we reuse single D-Bus
+           connection. */
+        ibus_config_unwatch (fixture->config, NULL, NULL);
+    }
 }
 
 gint
@@ -395,7 +373,41 @@ main (gint    argc,
     ibus_init ();
     bus = ibus_bus_new ();
 
-    g_test_add_func ("/ibus/config-watch", test_config_watch);
+    g_test_add ("/ibus/config-watch/default",
+                WatchFixture,
+                &default_data,
+                watch_fixture_setup,
+                test_config_watch,
+                watch_fixture_teardown);
+
+    g_test_add ("/ibus/config-watch/section",
+                WatchFixture,
+                &section_data,
+                watch_fixture_setup,
+                test_config_watch,
+                watch_fixture_teardown);
+
+    g_test_add ("/ibus/config-watch/section-multiple",
+                WatchFixture,
+                &section_multiple_data,
+                watch_fixture_setup,
+                test_config_watch,
+                watch_fixture_teardown);
+
+    g_test_add ("/ibus/config-watch/section-name",
+                WatchFixture,
+                &section_name_data,
+                watch_fixture_setup,
+                test_config_watch,
+                watch_fixture_teardown);
+
+    g_test_add ("/ibus/config-watch/section-name-multiple",
+                WatchFixture,
+                &section_name_multiple_data,
+                watch_fixture_setup,
+                test_config_watch,
+                watch_fixture_teardown);
+
     g_test_add_func ("/ibus/create-config-async", test_create_config_async);
     g_test_add_func ("/ibus/config-set-get", test_config_set_get);
 

From 5af76e815d4680b16d297eb66bd3b5486a501802 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2012 11:33:52 +0900
Subject: [PATCH 008/816] Fix page_up and page_down signals in ibus-ui-gtk3

BUG=RH#796555
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5705050
---
 ui/gtk3/panel.vala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index e851b2474..b83d7e399 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -60,6 +60,8 @@ class Panel : IBus.PanelService {
         m_status_icon.set_from_icon_name("ibus-keyboard");
 
         m_candidate_panel = new CandidatePanel();
+        m_candidate_panel.page_up.connect((w) => this.page_up());
+        m_candidate_panel.page_down.connect((w) => this.page_down());
 
         m_switcher = new Switcher();
 

From 25d05c609e0500dd2d51e946c672bc051a30972a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2012 11:38:15 +0900
Subject: [PATCH 009/816] Fix to launch ibus-setup without running ibus-daemon.

BUG=RH#796070
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5704054
---
 setup/main.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 7cd3e3745..d1c7a1e56 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -324,9 +324,13 @@ def __init_bus(self):
             # self.__bus.config_add_watch("/general/hotkey")
             # self.__bus.config_add_watch("/panel")
         except:
-            while self.__bus == None:
+            pass
+        finally:
+            if self.__bus != None and self.__bus.is_connected():
+                return
+            while self.__bus == None or not self.__bus.is_connected():
                 message = _("IBus daemon is not started. Do you want to start it now?")
-                dlg = Gtk.MessageDialog(type = Gtk.MESSAGE_QUESTION,
+                dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION,
                         buttons = Gtk.ButtonsType.YES_NO,
                         message_format = message)
                 id = dlg.run()
@@ -337,21 +341,23 @@ def __init_bus(self):
                 pid = os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
                 time.sleep(1)
                 try:
+                    if self.__bus != None:
+                        self.__bus.destroy()
                     self.__bus = IBus.Bus()
                 except:
                     continue
-                message = _("IBus has been started! "
-                    "If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-                    "  export GTK_IM_MODULE=ibus\n"
-                    "  export XMODIFIERS=@im=ibus\n"
-                    "  export QT_IM_MODULE=ibus"
-                    )
-                dlg = Gtk.MessageDialog(type = Gtk.MESSAGE_INFO,
-                                        buttons = Gtk.ButtonsType.OK,
-                                        message_format = message)
-                id = dlg.run()
-                dlg.destroy()
-                self.__flush_gtk_events()
+            message = _("IBus has been started! "
+                "If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
+                "  export GTK_IM_MODULE=ibus\n"
+                "  export XMODIFIERS=@im=ibus\n"
+                "  export QT_IM_MODULE=ibus"
+                )
+            dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
+                                    buttons = Gtk.ButtonsType.OK,
+                                    message_format = message)
+            id = dlg.run()
+            dlg.destroy()
+            self.__flush_gtk_events()
 
     def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,

From 991166db3bbcaf8c76569a368dcaaf4dd7c263d8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2012 11:55:48 +0900
Subject: [PATCH 010/816] Fix no gconf engines_order and the engine setup
 button on ibus-setup.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5702057
---
 data/ibus.schemas.in | 12 ++++++++++++
 setup/main.py        | 14 +++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 68def4068..53ba05c40 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -13,6 +13,18 @@
 	    <long>Preload engines during ibus starts up</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/engines_order</key>
+      <applyto>/desktop/ibus/general/engines_order</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <default>[]</default>
+      <list_type>string</list_type>
+      <locale name="C">
+        <short>Engines order</short>
+            <long>Saved engines order in input method list</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
diff --git a/setup/main.py b/setup/main.py
index d1c7a1e56..f9c7e5ebc 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -254,7 +254,7 @@ def __get_engine_setup_exec_args(self, engine):
             args = setup.split()
             args.insert(1, path.basename(args[0]))
             return args
-        name = str(engine.name)
+        name = str(engine.get_name())
         libexecdir = os.environ['IBUS_LIBEXECDIR']
         setup_path = (libexecdir + '/' + 'ibus-setup-' if libexecdir != None \
             else 'ibus-setup-') + name.split(':')[0]
@@ -275,11 +275,11 @@ def __treeview_notify_cb(self, treeview, prop):
         self.__builder.get_object("button_engine_up").set_sensitive(engine not in engines[:1])
         self.__builder.get_object("button_engine_down").set_sensitive(engine not in engines[-1:])
 
-        # obj = self.__builder.get_object("button_engine_preferences")
-        # if len(self.__get_engine_setup_exec_args(engine)) != 0:
-        #     obj.set_sensitive(True)
-        # else:
-        #     obj.set_sensitive(False)
+        obj = self.__builder.get_object("button_engine_preferences")
+        if len(self.__get_engine_setup_exec_args(engine)) != 0:
+            obj.set_sensitive(True)
+        else:
+            obj.set_sensitive(False)
 
         if prop.name == "engines":
             engine_names = map(lambda e: e.get_name(), engines)
@@ -302,7 +302,7 @@ def __button_engine_preferences_cb(self, button):
         args = self.__get_engine_setup_exec_args(engine)
         if len(args) == 0:
             return
-        name = engine.name
+        name = engine.get_name()
         if name in self.__engine_setup_exec_list.keys():
             try:
                 wpid, sts = os.waitpid(self.__engine_setup_exec_list[name],

From 0c044387fe874fe403c27a50792c2c3720665bbe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2012 12:09:07 +0900
Subject: [PATCH 011/816] Fix build errors in ui/gtk3 with vala-0.15.1 and
 gtk3-3.3.14

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5704053
---
 ui/gtk3/candidatepanel.vala | 3 ++-
 ui/gtk3/handle.vala         | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index d02c06d66..614cceafd 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -80,7 +80,8 @@ public class CandidatePanel : Gtk.HBox{
     }
 
     public void set_cursor_location(int x, int y, int width, int height) {
-        Gdk.Rectangle location = { x, y, width, height };
+        Gdk.Rectangle location = Gdk.Rectangle(){
+            x = x, y = y, width = width, height = height };
         if (m_cursor_location == location)
             return;
         m_cursor_location = location;
diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index 6738415f5..9492cb080 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -50,7 +50,8 @@ class Handle : Gtk.EventBox {
     public override bool button_press_event(Gdk.EventButton event) {
         if (event.button != 1)
             return false;
-        m_workarea = {0, 0, int.MAX, int.MAX};
+        m_workarea = Gdk.Rectangle(){
+            x = 0, y = 0, width = int.MAX, height = int.MAX};
         do {
             Gdk.Window root = Gdk.get_default_root_window();
             Gdk.Atom property = Gdk.Atom.intern("_NET_CURRENT_DESKTOP", false);
@@ -153,7 +154,7 @@ class Handle : Gtk.EventBox {
             Gtk.StyleContext context = get_style_context();
             Gtk.Allocation allocation;
             get_allocation(out allocation);
-            Gtk.render_handle(context, cr,
+            context.render_handle(cr,
                 allocation.x, allocation.y + (allocation.height - 40) / 2, allocation.width, 40.0);
         }
         return false;

From 07ec3b4c930445731708c2006a65dda11acfcc78 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 2 Mar 2012 10:27:47 +0900
Subject: [PATCH 012/816] ibus-setup: minor typo fixes of GI enum names

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5710049
---
 setup/enginetreeview.py | 4 ++--
 setup/main.py           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 8b3ef9ec9..8ade7dba8 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -148,9 +148,9 @@ def __layout_cell_data_cb(self, celllayout, renderer, model, it, data):
         renderer.set_property("text", layout)
         if self.__model.get_path(it).get_indices()[0] == 0:
             #default engine
-            renderer.set_property("weight", Pango.WEIGHT_BOLD)
+            renderer.set_property("weight", Pango.Weight.BOLD)
         else:
-            renderer.set_property("weight", Pango.WEIGHT_NORMAL)
+            renderer.set_property("weight", Pango.Weight.NORMAL)
 
     def __engine_layout_changed_cb(self, combo, path, it):
         return
diff --git a/setup/main.py b/setup/main.py
index f9c7e5ebc..274b25a89 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -392,7 +392,7 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
             try:
                 self.__bus.register_start_engine(data[DATA_LANG], data[DATA_NAME])
             except Exception, e:
-                dlg = Gtk.MessageDialog(type = Gtk.MESSAGE_ERROR,
+                dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
                         buttons = Gtk.ButtonsType.CLOSE,
                         message_format = str(e))
                 dlg.run()
@@ -403,7 +403,7 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
             try:
                 self.__bus.register_stop_engine(data[DATA_LANG], data[DATA_NAME])
             except Exception, e:
-                dlg = Gtk.MessageDialog(type = Gtk.MESSAGE_ERROR,
+                dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
                         buttons = Gtk.ButtonsType.CLOSE,
                         message_format = str(e))
                 dlg.run()

From e2191142be323934b1c2dafc16736ff9999541f7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 2 Mar 2012 11:18:38 +0900
Subject: [PATCH 013/816] Change LT_VERSION_INFO so that SONAME is changed for
 ibus 1.5.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5707059
---
 configure.ac | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8dbba3a58..aeb22b4c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,15 @@ m4_define([ibus_released], [0])
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [4])
 m4_define([ibus_micro_version], [99])
-m4_define([ibus_interface_age], [0])
-m4_define([ibus_binary_age],
+m4_define([ibus_abi_current], [5])
+m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])
+m4_define([ibus_abi_age], [0])
 m4_define([ibus_maybe_datestamp],
     m4_esyscmd([test x]ibus_released[ != x1 && date +.%Y%m%d | tr -d '\n\r']))
 m4_define([ibus_version],
     ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)
-m4_define([ibus_api_version], [1.0])
+m4_define([ibus_api_version], [ibus_major_version.0])
 
 AC_PREFEQ([2.62])
 AC_INIT([ibus], [ibus_version],
@@ -44,7 +45,10 @@ AC_INIT([ibus], [ibus_version],
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-m4_define([ibus_binary_version], [1.0.0])
+m4_define([ibus_abi_current_minus_age],
+          [m4_eval(ibus_abi_current - ibus_abi_age)])
+m4_define([ibus_binary_version],
+          [ibus_major_version.ibus_abi_current_minus_age.ibus_abi_age.ibus_abi_revision])
 
 # Required versions of other packages.
 m4_define([glib_required_version], [2.26.0])
@@ -64,25 +68,33 @@ AM_SILENT_RULES([yes])
 IBUS_MAJOR_VERSION=ibus_major_version
 IBUS_MINOR_VERSION=ibus_minor_version
 IBUS_MICRO_VERSION=ibus_micro_version
-IBUS_INTERFACE_AGE=ibus_interface_age
-IBUS_BINARY_AGE=ibus_binary_age
+IBUS_ABI_CURRENT=ibus_abi_current
+IBUS_ABI_REVISION=ibus_abi_revision
+IBUS_ABI_AGE=ibus_abi_age
 IBUS_VERSION=ibus_version
 IBUS_API_VERSION=ibus_api_version
 IBUS_BINARY_VERSION=ibus_binary_version
 AC_SUBST(IBUS_MAJOR_VERSION)
 AC_SUBST(IBUS_MINOR_VERSION)
 AC_SUBST(IBUS_MICRO_VERSION)
-AC_SUBST(IBUS_INTERFACE_AGE)
-AC_SUBST(IBUS_BINARY_AGE)
+AC_SUBST(IBUS_ABI_CURRENT)
+AC_SUBST(IBUS_ABI_REVISION)
+AC_SUBST(IBUS_ABI_AGE)
 AC_SUBST(IBUS_API_VERSION)
 AC_SUBST(IBUS_VERSION)
 AC_SUBST(IBUS_BINARY_VERSION)
 
 # libtool versioning
-m4_define([lt_current],
-          [m4_eval(100 * ibus_minor_version + ibus_micro_version - ibus_interface_age)])
-m4_define([lt_revision], [ibus_interface_age])
-m4_define([lt_age], [m4_eval(ibus_binary_age - ibus_interface_age)])
+#
+# If LT_VERSION_INFO="lt_current:lt_revision:lt_age", libibus is
+# libibus-ibus_api_version.so.(lt_current - lt_age).lt_age.lt_revision
+# If the abi is changed, but it is compatible with last version,
+# ibus_abi_current++, ibus_abi_age++;
+# If the abi is not compatible with last version,
+# ibus_abi_current++, ibus_abi_age = 0;
+m4_define([lt_current], [ibus_abi_current])
+m4_define([lt_revision], [ibus_abi_revision])
+m4_define([lt_age], [ibus_abi_age])
 LT_VERSION_INFO="lt_current:lt_revision:lt_age"
 LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
 AC_SUBST(LT_VERSION_INFO)

From f1c82fbc0681b471056b74f51b1fda71fc210e78 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 2 Mar 2012 15:58:36 +0900
Subject: [PATCH 014/816] ibus-setup: improve ibus-daemon auto start

Instead of repeatedly launch the daemon and wait, start it once and wait for
IBusBus::connected signal for 5 seconds.

BUG=none
TEST=manually on Fedora 17

Review URL: https://codereview.appspot.com/5716045
---
 setup/main.py | 66 +++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 274b25a89..fdfb33a92 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -316,36 +316,31 @@ def __button_engine_preferences_cb(self, button):
         self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args)
 
     def __init_bus(self):
-        try:
-            self.__bus = IBus.Bus()
-            # self.__bus.connect("config-value-changed", self.__config_value_changed_cb)
-            # self.__bus.connect("config-reloaded", self.__config_reloaded_cb)
-            # self.__bus.config_add_watch("/general")
-            # self.__bus.config_add_watch("/general/hotkey")
-            # self.__bus.config_add_watch("/panel")
-        except:
-            pass
-        finally:
-            if self.__bus != None and self.__bus.is_connected():
-                return
-            while self.__bus == None or not self.__bus.is_connected():
-                message = _("IBus daemon is not started. Do you want to start it now?")
-                dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION,
-                        buttons = Gtk.ButtonsType.YES_NO,
-                        message_format = message)
-                id = dlg.run()
-                dlg.destroy()
-                self.__flush_gtk_events()
-                if id != Gtk.ResponseType.YES:
-                    sys.exit(0)
-                pid = os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
-                time.sleep(1)
-                try:
-                    if self.__bus != None:
-                        self.__bus.destroy()
-                    self.__bus = IBus.Bus()
-                except:
-                    continue
+        self.__bus = IBus.Bus()
+        if self.__bus.is_connected():
+            return
+
+        message = _("IBus daemon is not started. Do you want to start it now?")
+        dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION,
+                                buttons = Gtk.ButtonsType.YES_NO,
+                                text = message)
+        id = dlg.run()
+        dlg.destroy()
+        self.__flush_gtk_events()
+        if id != Gtk.ResponseType.YES:
+            sys.exit(0)
+
+        main_loop = GLib.MainLoop()
+
+        timeout = 5
+        GLib.timeout_add_seconds(timeout, lambda *args: main_loop.quit())
+        self.__bus.connect("connected", lambda *args: main_loop.quit())
+
+        os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
+
+        main_loop.run()
+
+        if self.__bus.is_connected():
             message = _("IBus has been started! "
                 "If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
                 "  export GTK_IM_MODULE=ibus\n"
@@ -354,10 +349,19 @@ def __init_bus(self):
                 )
             dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
                                     buttons = Gtk.ButtonsType.OK,
-                                    message_format = message)
+                                    text = message)
+            id = dlg.run()
+            dlg.destroy()
+            self.__flush_gtk_events()
+        else:
+            message = _("IBus daemon coundn't be started in %d seconds")
+            dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
+                                    buttons = Gtk.ButtonsType.OK,
+                                    text = message % timeout)
             id = dlg.run()
             dlg.destroy()
             self.__flush_gtk_events()
+            sys.exit(0)
 
     def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,

From b7fb2107ca35662a92fe6b4964cade367a07c4c1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 5 Mar 2012 10:14:07 +0900
Subject: [PATCH 015/816] Revert Gdk.DeviceManager.list_devices to work with
 vala 0.15

Fixed a build error in ui/gtk3 with vala 0.15

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5720068
---
 ui/gtk3/switcher.vala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index ff521e1c7..dab70ab08 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -65,8 +65,15 @@ class Switcher : Gtk.Window {
         if (device == null) {
             var display = get_display();
             var device_manager = display.get_device_manager();
+/* The macro VALA_X_Y supports even numbers.
+ * http://git.gnome.org/browse/vala/commit/?id=294b374af6
+ */
+#if VALA_0_16
+            device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+#else
             unowned GLib.List<Gdk.Device> devices = device_manager.list_devices(Gdk.DeviceType.MASTER);
             device = devices.data;
+#endif
         }
 
         Gdk.Device keyboard;

From e786c06a6676c46dff74c2fcdd81948226625a42 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 5 Mar 2012 10:19:05 +0900
Subject: [PATCH 016/816] Enhance make dist

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5730046
---
 Makefile.am         |  2 +-
 autogen.sh          |  5 ++-
 bus/Makefile.am     |  2 ++
 configure.ac        | 13 +++++++
 po/POTFILES.in      | 87 ++++++++++++++++++++++++---------------------
 po/POTFILES.skip    | 14 ++++++++
 src/Makefile.am     |  8 +++--
 ui/gtk3/Makefile.am |  8 ++++-
 8 files changed, 93 insertions(+), 46 deletions(-)
 create mode 100644 po/POTFILES.skip

diff --git a/Makefile.am b/Makefile.am
index e648e44c8..2b5aae286 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ endif
 
 SUBDIRS = \
 	src \
+	bindings \
 	util \
 	conf \
 	client \
@@ -49,7 +50,6 @@ SUBDIRS = \
 	m4 \
 	po \
 	docs \
-	bindings \
 	$(UI_DIR) \
 	$(DAEMON_DIR) \
 	$(PYTHON_LIB_DIRS) \
diff --git a/autogen.sh b/autogen.sh
index c4cea1a42..4069cc999 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,4 +22,7 @@ which gnome-autogen.sh || {
     touch $srcdir/ChangeLog
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="-Wall $CFLAGS" . gnome-autogen.sh
+CFLAGS=${CFLAGS-"-Wall -Werror"}
+
+# need --enable-gtk-doc for gnome-autogen.sh to make dist
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="$CFLAGS" . gnome-autogen.sh $@
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 2b619edc8..7024b8fb8 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -109,11 +109,13 @@ marshalers.c: marshalers.h marshalers.list
 	mv $@.tmp $@
 
 
+if ENABLE_TESTS
 TESTS = \
 	test-matchrule \
 	test-registry \
 	test-stress	\
 	$(NULL)
+endif
 
 noinst_PROGRAMS = $(TESTS)
 
diff --git a/configure.ac b/configure.ac
index aeb22b4c5..1c4b28318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,18 @@ PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= glib_required_version
 ])
 
+# --disable-tests option.
+AC_ARG_ENABLE(tests,
+    AS_HELP_STRING([--disable-tests],
+                   [Do not run tests]),
+    [enable_tests=$enableval],
+    [enable_tests=yes]
+)
+AM_CONDITIONAL([ENABLE_TESTS], [test x"$enable_tests" = x"yes"])
+if test x"$enable_tests" != x"yes"; then
+    enable_tests="no (disabled, use --enable-tests to enable)"
+fi
+
 # --disable-gtk2 option.
 AC_ARG_ENABLE(gtk2,
     AS_HELP_STRING([--disable-gtk2],
@@ -532,5 +544,6 @@ Build options:
   No snooper regexes        "$NO_SNOOPER_APPS"
   Panel icon                "$IBUS_ICON_KEYBOARD"
   Enable surrounding-text   $enable_surrounding_text
+  Run test cases            $enable_tests
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6121f10bf..135f53742 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,60 +1,65 @@
-src/ibusbus.c
-src/ibusconfig.c
-src/ibusengine.c
-src/ibusfactory.c
-src/ibushotkey.c
-src/ibusinputcontext.c
-src/ibusobject.c
-src/ibuspanelservice.c
-src/ibusproxy.c
-src/ibusservice.c
-src/keyname-table.h
-bus/ibus.desktop.in
+# Files with translatable strings.
+# Please keep this file in alphabetical order.
+[type: gettext/glade]setup/setup.ui
 bus/dbusimpl.c
 bus/engineproxy.c
+bus/ibus.desktop.in
 bus/inputcontext.c
 bus/panelproxy.c
 bus/registry.c
-ibus/bus.py
+data/ibus.schemas.in
 ibus/__init__.py
 ibus/_config.py.in
-ibus/common.py
-ibus/utility.py
-ibus/keysyms.py
-ibus/modifier.py
+ibus/_gtk.py
+ibus/application.py
+ibus/ascii.py
 ibus/attribute.py
+ibus/bus.py
+ibus/common.py
 ibus/engine.py
-ibus/panel.py
+ibus/exception.py
+ibus/factory.py
 ibus/interface/__init__.py
-ibus/interface/ipanel.py
 ibus/interface/iconfig.py
-ibus/interface/iibus.py
 ibus/interface/iengine.py
 ibus/interface/ienginefactory.py
-ibus/exception.py
-ibus/application.py
-ibus/object.py
+ibus/interface/iibus.py
+ibus/interface/ipanel.py
+ibus/keysyms.py
 ibus/lang.py
 ibus/lookuptable.py
+ibus/modifier.py
+ibus/object.py
+ibus/panel.py
 ibus/property.py
-ibus/_gtk.py
-ibus/ascii.py
-ibus/factory.py
-ui/gtk/menu.py
-ui/gtk/handle.py
-ui/gtk/icon.py
-ui/gtk/candidatepanel.py
-ui/gtk/toolitem.py
-ui/gtk/main.py
-ui/gtk/panel.py
-ui/gtk/propitem.py
-ui/gtk/languagebar.py
-ui/gtk/engineabout.py
-setup/main.py
-setup/keyboardshortcut.py
-setup/enginecombobox.py
+ibus/utility.py
 setup/engineabout.py
+setup/enginecombobox.py
 setup/enginetreeview.py
 setup/ibus-setup.desktop.in
-data/ibus.schemas.in
-[type: gettext/glade]setup/setup.ui
+setup/keyboardshortcut.py
+setup/main.py
+src/ibusbus.c
+src/ibusconfig.c
+src/ibusengine.c
+src/ibusfactory.c
+src/ibushotkey.c
+src/ibusinputcontext.c
+src/ibusobject.c
+src/ibuspanelservice.c
+src/ibusproxy.c
+src/ibusservice.c
+src/ibusutil.c
+src/keyname-table.h
+tools/main.vala
+ui/gtk3/application.vala
+ui/gtk3/candidatearea.vala
+ui/gtk3/candidatepanel.vala
+ui/gtk3/handle.vala
+ui/gtk3/iconwidget.vala
+ui/gtk3/keybindingmanager.vala
+ui/gtk3/panel.vala
+ui/gtk3/pango.vala
+ui/gtk3/property.vala
+ui/gtk3/separator.vala
+ui/gtk3/switcher.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 000000000..4d9d6556e
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,14 @@
+# Files with translatable strings.
+# Please keep this file in alphabetical order.
+ibus/_config.py
+ui/gtk3/application.c
+ui/gtk3/candidatearea.c
+ui/gtk3/candidatepanel.c
+ui/gtk3/handle.c
+ui/gtk3/iconwidget.c
+ui/gtk3/keybindingmanager.c
+ui/gtk3/panel.c
+ui/gtk3/pango.c
+ui/gtk3/property.c
+ui/gtk3/separator.c
+ui/gtk3/switcher.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b4d0dcf40..b1d176676 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,11 @@
 
 NULL =
 
-SUBDIRS = . tests
+if ENABLE_TESTS
+TESTS = tests
+endif
+
+SUBDIRS = . $(TESTS)
 
 # libibus = libibus-@IBUS_API_VERSION@.la
 libibus = libibus-1.0.la
@@ -94,9 +98,9 @@ ibus_sources =              \
 	ibusenginesimple.c      \
 	$(NULL)
 libibus_1_0_la_SOURCES =    \
-    $(ibus_sources)         \
     ibusmarshalers.c        \
     ibusenumtypes.c         \
+    $(ibus_sources)         \
     $(NULL)
 ibus_marshalers_sources =   \
     ibusmarshalers.h        \
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 0fb9d3c6d..5b75e73a0 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -82,7 +82,7 @@ AM_VALAFLAGS = \
 
 libexec_PROGRAMS = ibus-ui-gtk3
 
-ibus_ui_gtk3_SOURCES = \
+ibus_ui_gtk3_valas = \
 	application.vala \
 	candidatearea.vala \
 	candidatepanel.vala \
@@ -94,6 +94,11 @@ ibus_ui_gtk3_SOURCES = \
 	property.vala \
 	separator.vala \
 	switcher.vala \
+	$(NULL)
+ibus_ui_gtk3_vala_cfiles = $(ibus_ui_gtk3_valas:.vala=.c)
+
+ibus_ui_gtk3_SOURCES = \
+	$(ibus_ui_gtk3_valas) \
 	grabkeycode.c \
 	$(NULL)
 
@@ -103,6 +108,7 @@ ibus_ui_gtk3_LDADD = \
 
 CLEANFILES = \
 	gtkpanel.xml \
+	$(ibus_ui_gtk3_vala_cfiles) \
 	$(NULL)
 
 EXTRA_DIST = \

From f1c010f6b5a56e21b78e5ea97aea263b95d7e540 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 5 Mar 2012 13:25:53 +0900
Subject: [PATCH 017/816] Fix python library to load libibus.so.Y

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5731060
---
 ibus/_config.py.in  | 2 ++
 ibus/common.py      | 3 ++-
 ui/gtk3/Makefile.am | 8 +-------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ibus/_config.py.in b/ibus/_config.py.in
index 098d805af..c9d11bba2 100644
--- a/ibus/_config.py.in
+++ b/ibus/_config.py.in
@@ -25,6 +25,7 @@ __all__ = (
     "get_copyright",
     "get_license",
     "get_ICON_KEYBOARD",
+    "LIBIBUS_SONAME",
     "ISOCODES_PREFIX",
     "_"
 )
@@ -55,4 +56,5 @@ def get_ICON_KEYBOARD():
         return fallback_icon
     return icon
 
+LIBIBUS_SONAME='libibus-@IBUS_API_VERSION@.so.@LT_CURRENT_MINUS_AGE@'
 ISOCODES_PREFIX='@ISOCODES_PREFIX@'
diff --git a/ibus/common.py b/ibus/common.py
index 6483aaed6..fb39d5641 100644
--- a/ibus/common.py
+++ b/ibus/common.py
@@ -59,6 +59,7 @@
 import sys
 from xdg import BaseDirectory
 import ctypes
+import _config
 
 # __display = os.environ["DISPLAY"]
 # __hostname, __display_screen = __display.split(":", 1)
@@ -104,7 +105,7 @@
 #         return None
 #     return address
 
-libibus = ctypes.CDLL("libibus-1.0.so.0")
+libibus = ctypes.CDLL(_config.LIBIBUS_SONAME)
 get_address = libibus.ibus_get_address
 get_address.restype=ctypes.c_char_p
 
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 5b75e73a0..0fb9d3c6d 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -82,7 +82,7 @@ AM_VALAFLAGS = \
 
 libexec_PROGRAMS = ibus-ui-gtk3
 
-ibus_ui_gtk3_valas = \
+ibus_ui_gtk3_SOURCES = \
 	application.vala \
 	candidatearea.vala \
 	candidatepanel.vala \
@@ -94,11 +94,6 @@ ibus_ui_gtk3_valas = \
 	property.vala \
 	separator.vala \
 	switcher.vala \
-	$(NULL)
-ibus_ui_gtk3_vala_cfiles = $(ibus_ui_gtk3_valas:.vala=.c)
-
-ibus_ui_gtk3_SOURCES = \
-	$(ibus_ui_gtk3_valas) \
 	grabkeycode.c \
 	$(NULL)
 
@@ -108,7 +103,6 @@ ibus_ui_gtk3_LDADD = \
 
 CLEANFILES = \
 	gtkpanel.xml \
-	$(ibus_ui_gtk3_vala_cfiles) \
 	$(NULL)
 
 EXTRA_DIST = \

From bef66b7ce2344dd0a4c72a6738e99a05ca2d9e56 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 6 Mar 2012 10:03:25 +0900
Subject: [PATCH 018/816] Restrict config notification to panel.

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5729064
---
 ui/gtk3/panel.vala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index b83d7e399..79404cfc6 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -89,12 +89,15 @@ class Panel : IBus.PanelService {
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
+            m_config.watch(null, null);
             m_config = null;
         }
 
         m_config = config;
         if (m_config != null) {
             m_config.value_changed.connect(config_value_changed_cb);
+            m_config.watch("general", "preload_engines");
+            m_config.watch("general", "engines_order");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
         } else {

From 24ea6f7077c4f44be5fca392160d44c73f03133a Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 7 Mar 2012 00:39:17 -0500
Subject: [PATCH 019/816] Shrink the IME switcher window size if necessary.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/5753056
---
 ui/gtk3/switcher.vala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index dab70ab08..76c67ec47 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -173,6 +173,9 @@ class Switcher : Gtk.Window {
             m_box.pack_start(button, true, true);
             m_buttons += button;
         }
+
+        // Cause window recalculate the perferred size.
+        resize(1, 1);
     }
 
     private void next_engine() {

From c1b7d86c3fc12274a569d0227877a53819927f25 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 7 Mar 2012 00:40:47 -0500
Subject: [PATCH 020/816] Refine coding style.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/5753058
---
 ui/gtk3/handle.vala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index 9492cb080..4fe9a7f49 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -111,7 +111,8 @@ class Handle : Gtk.EventBox {
         int x, y;
         Gtk.Window toplevel = (Gtk.Window)get_toplevel();
         toplevel.get_position(out x, out y);
-        m_press_pos = { (int)event.x_root - x, (int)event.y_root - y };
+        m_press_pos.x = (int)event.x_root - x;
+        m_press_pos.y = (int)event.y_root - y;
         move_begin();
         return true;
     }
@@ -120,7 +121,8 @@ class Handle : Gtk.EventBox {
         if (event.button != 1)
             return false;
         m_move_begined = false;
-        m_press_pos = { 0, 0 };
+        m_press_pos.x = 0;
+        m_press_pos.y = 0;
         get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
         move_end();
         return true;

From af87f5ee161f1cfeab85cd0e19e8c77f6b89ee76 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 7 Mar 2012 00:41:14 -0500
Subject: [PATCH 021/816] Remove some unused code.

BUG=None
TEST=Make

Review URL: https://codereview.appspot.com/5756061
---
 bus/ibusimpl.c           | 20 -------------
 client/x11/gdk-private.c | 64 ----------------------------------------
 src/ibuscomponent.c      | 15 ----------
 src/ibusconfigservice.c  | 41 -------------------------
 src/ibusshare.c          | 51 --------------------------------
 5 files changed, 191 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 7d804577c..10a6a1888 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -103,26 +103,6 @@ static void      bus_ibus_impl_service_method_call
                                                   GVariant           *parameters,
                                                   GDBusMethodInvocation
                                                                      *invocation);
-/* TODO use property to replace some getter and setter in future */
-#if 0
-static GVariant *ibus_ibus_impl_service_get_property
-                                              (IBusService        *service,
-                                               GDBusConnection    *connection,
-                                               const gchar        *sender,
-                                               const gchar        *object_path,
-                                               const gchar        *interface_name,
-                                               const gchar        *property_name,
-                                               GError            **error);
-static gboolean  ibus_ibus_impl_service_set_property
-                                              (IBusService        *service,
-                                               GDBusConnection    *connection,
-                                               const gchar        *sender,
-                                               const gchar        *object_path,
-                                               const gchar        *interface_name,
-                                               const gchar        *property_name,
-                                               GVariant           *value,
-                                               GError            **error);
-#endif
 static void     bus_ibus_impl_registry_changed  (BusIBusImpl        *ibus);
 static void     bus_ibus_impl_global_engine_changed
                                                 (BusIBusImpl        *ibus);
diff --git a/client/x11/gdk-private.c b/client/x11/gdk-private.c
index 9e42a3ae2..009a5b077 100644
--- a/client/x11/gdk-private.c
+++ b/client/x11/gdk-private.c
@@ -38,10 +38,6 @@ translate_key_event (GdkDisplay *display,
 		     XEvent     *xevent)
 {
   GdkKeymap *keymap = gdk_keymap_get_for_display (display);
-#if 0
-  gunichar c = 0;
-  gchar buf[7];
-#endif
 
   event->key.type = xevent->xany.type == KeyPress ? GDK_KEY_PRESS : GDK_KEY_RELEASE;
   event->key.time = xevent->xkey.time;
@@ -64,10 +60,6 @@ translate_key_event (GdkDisplay *display,
 				       event->key.group,
 				       &event->key.keyval,
 				       NULL, NULL, NULL);
-#if 0
-  _gdk_keymap_add_virtual_modifiers (keymap, &event->key.state);
-  event->key.is_modifier = _gdk_keymap_key_is_modifier (keymap, event->key.hardware_keycode);
-#endif
   event->key.is_modifier = 0;
 
   /* Fill in event->string crudely, since various programs
@@ -76,62 +68,6 @@ translate_key_event (GdkDisplay *display,
   event->key.string = NULL;
   event->key.length = 0;
 
-  /* Don't need event->string.
-   */
-#if 0
-  if (event->key.keyval != GDK_VoidSymbol)
-    c = gdk_keyval_to_unicode (event->key.keyval);
-
-  if (c)
-    {
-      gsize bytes_written;
-      gint len;
-
-      /* Apply the control key - Taken from Xlib
-       */
-      if (event->key.state & GDK_CONTROL_MASK)
-	{
-	  if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
-	  else if (c == '2')
-	    {
-	      event->key.string = g_memdup ("\0\0", 2);
-	      event->key.length = 1;
-	      buf[0] = '\0';
-	      goto out;
-	    }
-	  else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-	  else if (c == '8') c = '\177';
-	  else if (c == '/') c = '_' & 0x1F;
-	}
-
-      len = g_unichar_to_utf8 (c, buf);
-      buf[len] = '\0';
-
-      event->key.string = g_locale_from_utf8 (buf, len,
-					      NULL, &bytes_written,
-					      NULL);
-      if (event->key.string)
-	event->key.length = bytes_written;
-    }
-  else if (event->key.keyval == GDK_Escape)
-    {
-      event->key.length = 1;
-      event->key.string = g_strdup ("\033");
-    }
-  else if (event->key.keyval == GDK_Return ||
-	  event->key.keyval == GDK_KP_Enter)
-    {
-      event->key.length = 1;
-      event->key.string = g_strdup ("\r");
-    }
-
-  if (!event->key.string)
-    {
-      event->key.length = 0;
-      event->key.string = g_strdup ("");
-    }
- out:
-#endif
   return;
 }
 
diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index 6d21b66d6..e93a3b0b3 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -219,21 +219,6 @@ static void
 ibus_component_init (IBusComponent *component)
 {
     component->priv = IBUS_COMPONENT_GET_PRIVATE (component);
-
-    /* FIXME: Is it necessary? */
-#if 0
-    component->priv->engines = NULL;
-    component->priv->observed_paths = NULL;
-
-    component->priv->name = NULL;
-    component->priv->description = NULL;
-    component->priv->version = NULL;
-    component->priv->license = NULL;
-    component->priv->author = NULL;
-    component->priv->homepage = NULL;
-    component->priv->exec = NULL;
-    component->priv->textdomain = NULL;
-#endif
 }
 
 static void
diff --git a/src/ibusconfigservice.c b/src/ibusconfigservice.c
index 937dfdd41..4c21da54c 100644
--- a/src/ibusconfigservice.c
+++ b/src/ibusconfigservice.c
@@ -30,19 +30,9 @@ enum {
     PROP_0,
 };
 
-// static guint            config_service_signals[LAST_SIGNAL] = { 0 };
-
 /* functions prototype */
 static void      ibus_config_service_class_init      (IBusConfigServiceClass *class);
 static void      ibus_config_service_init            (IBusConfigService      *config);
-static void      ibus_config_service_set_property    (IBusConfigService      *config,
-                                                      guint                   prop_id,
-                                                      const GValue           *value,
-                                                      GParamSpec             *pspec);
-static void      ibus_config_service_get_property    (IBusConfigService      *config,
-                                                      guint                   prop_id,
-                                                      GValue                 *value,
-                                                      GParamSpec             *pspec);
 static void      ibus_config_service_destroy         (IBusConfigService      *config);
 static void      ibus_config_service_service_method_call
                                                      (IBusService            *service,
@@ -123,9 +113,6 @@ ibus_config_service_class_init (IBusConfigServiceClass *class)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_config_service_set_property;
-    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_config_service_get_property;
-
     IBUS_OBJECT_CLASS (gobject_class)->destroy = (IBusObjectDestroyFunc) ibus_config_service_destroy;
 
     IBUS_SERVICE_CLASS (class)->service_method_call  = ibus_config_service_service_method_call;
@@ -145,34 +132,6 @@ ibus_config_service_init (IBusConfigService *config)
 {
 }
 
-static void
-ibus_config_service_set_property (IBusConfigService *config,
-                                  guint              prop_id,
-                                  const GValue      *value,
-                                  GParamSpec        *pspec)
-{
-    switch (prop_id) {
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (config, prop_id, pspec);
-    }
-}
-
-static void
-ibus_config_service_get_property (IBusConfigService *config,
-                                  guint              prop_id,
-                                  GValue            *value,
-                                  GParamSpec        *pspec)
-{
-    switch (prop_id) {
-    #if 0
-    case PROP_CONNECTION:
-        break;
-    #endif
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (config, prop_id, pspec);
-    }
-}
-
 static void
 ibus_config_service_destroy (IBusConfigService *config)
 {
diff --git a/src/ibusshare.c b/src/ibusshare.c
index 9215369b9..95f98d347 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -69,63 +69,12 @@ const gchar *
 ibus_get_user_name (void)
 {
     return g_get_user_name ();
-#if 0
-    static gchar *username = NULL;
-    if (username == NULL) {
-        username = g_strdup (getlogin());
-        if (username == NULL)
-            username = g_strdup (g_getenv("SUDO_USER"));
-        if (username == NULL) {
-            const gchar *uid = g_getenv ("USERHELPER_UID");
-            if (uid != NULL) {
-                gchar *end;
-                uid_t id = (uid_t)strtol(uid, &end, 10);
-                if (uid != end) {
-                    struct passwd *pw = getpwuid (id);
-                    if (pw != NULL) {
-                        username = g_strdup (pw->pw_name);
-                    }
-                }
-            }
-        }
-        if (username == NULL)
-            username = g_strdup (g_getenv("USERNAME"));
-        if (username == NULL)
-            username = g_strdup (g_getenv("LOGNAME"));
-        if (username == NULL)
-            username = g_strdup (g_getenv("USER"));
-        if (username == NULL)
-            username = g_strdup (g_getenv("LNAME"));
-
-    }
-    return username;
-#endif
 }
 
 glong
 ibus_get_daemon_uid (void)
 {
     return getuid ();
-#if 0
-    struct passwd *pwd;
-    uid_t uid;
-    const gchar *username;
-
-    uid = getuid ();
-
-    if (uid != 0)
-        return uid;
-
-    username = ibus_get_user_name ();
-    if (username == NULL)
-        return 0;
-
-    pwd = getpwnam (username);
-    if (pwd == NULL)
-        return 0;
-
-    return pwd->pw_uid;
-#endif
 }
 
 const gchar *

From 3179c4fa298a89d2902842ccd30f475e012157b3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 12 Mar 2012 10:29:23 +0900
Subject: [PATCH 022/816] Fix to ungrab ui/gtk3/switcher for GTK 3.3.18 and
 GLib 2.31.20

BUG=RH#800897
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5795048
---
 ui/gtk3/switcher.vala | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 76c67ec47..131cad529 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -127,6 +127,9 @@ class Switcher : Gtk.Window {
         m_loop.run();
         m_loop = null;
 
+        keyboard.ungrab(Gdk.CURRENT_TIME);
+        pointer.ungrab(Gdk.CURRENT_TIME);
+
         hide();
         // Make sure the switcher is hidden before returning from this function.
         while (Gtk.events_pending())
@@ -239,6 +242,11 @@ class Switcher : Gtk.Window {
             return true;
         }
 
+        // if e.type == Gdk.EventType.KEY_RELEASE, m_loop is already null.
+        if (m_loop == null) {
+            return false;
+        }
+
         m_loop.quit();
         m_result = (int)m_selected_engine;
         return true;

From e38ff0fd94ae653eb0a39dde00712f809ef92654 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Tue, 13 Mar 2012 12:02:15 -0400
Subject: [PATCH 023/816] libibus: Fix a refcount issue in
 ibus_prop_list_deserialize()

BUG=None
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5796079
---
 src/ibusproplist.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ibusproplist.c b/src/ibusproplist.c
index 88245fbae..7eaeca1a5 100644
--- a/src/ibusproplist.c
+++ b/src/ibusproplist.c
@@ -108,7 +108,6 @@ ibus_prop_list_deserialize (IBusPropList    *prop_list,
     GVariant *var;
     while (g_variant_iter_loop (iter, "v", &var)) {
         IBusProperty *prop = IBUS_PROPERTY (ibus_serializable_deserialize (var));
-        g_object_ref_sink (prop);
         ibus_prop_list_append (prop_list, prop);
     }
     g_variant_iter_free (iter);

From ace5cdedf80608fb3524e643195c608543cf7a09 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 14 Mar 2012 11:07:47 +0900
Subject: [PATCH 024/816] gtk3: honor lookup table labels and orientation

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5798074
---
 ui/gtk3/candidatearea.vala  | 33 +++++++++++++--------------------
 ui/gtk3/candidatepanel.vala | 29 ++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 13ebf769e..85a830d16 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -34,6 +34,11 @@ class CandidateArea : Gtk.Box {
     private uint m_focus_candidate;
     private bool m_show_cursor;
 
+    private const string LABELS[] = {
+        "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
+        "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
+    };
+
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void page_up();
     public signal void page_down();
@@ -61,19 +66,12 @@ class CandidateArea : Gtk.Box {
             show_all();
     }
 
-    public void set_labels(string[] labels) {
-        if (labels == null) {
-            const string labels[] = {
-                "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
-                "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
-            };
-            for (int i = 0 ; i < 16; i++)
-                m_labels[i].set_text(labels[i]);
-        } else {
-            int i = 0;
-            foreach (string label in labels)
-                m_labels[i].set_text(label);
-        }
+    public void set_labels(IBus.Text[] labels) {
+        int i;
+        for (i = 0; i < int.min(16, labels.length); i++)
+            m_labels[i].set_text(labels[i].get_text());
+        for (; i < 16; i++)
+            m_labels[i].set_text(LABELS[i]);
     }
 
     public void set_candidates(IBus.Text[] candidates,
@@ -130,11 +128,6 @@ class CandidateArea : Gtk.Box {
             w.destroy();
         }
 
-        const string labels[] = {
-            "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
-            "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
-        };
-
         Gtk.Button prev_button = new Gtk.Button();
         prev_button.clicked.connect((b) => page_up());
         prev_button.set_image(new Gtk.Image.from_icon_name(Gtk.Stock.GO_UP, Gtk.IconSize.MENU));
@@ -171,7 +164,7 @@ class CandidateArea : Gtk.Box {
             m_candidates = {};
             m_widgets = {};
             for (int i = 0; i < 16; i++) {
-                Gtk.Label label = new Gtk.Label(labels[i]);
+                Gtk.Label label = new Gtk.Label(LABELS[i]);
                 label.set_alignment(0.0f, 0.5f);
                 label.show();
                 m_labels += label;
@@ -215,7 +208,7 @@ class CandidateArea : Gtk.Box {
             m_candidates = {};
             m_widgets = {};
             for (int i = 0; i < 16; i++) {
-                Gtk.Label label = new Gtk.Label(labels[i]);
+                Gtk.Label label = new Gtk.Label(LABELS[i]);
                 label.set_alignment(0.0f, 0.5f);
                 label.show();
                 m_labels += label;
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 614cceafd..a029e8fc8 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -79,6 +79,20 @@ public class CandidatePanel : Gtk.HBox{
         m_candidate_area.set_vertical(vertical);
     }
 
+    private void set_orientation(IBus.Orientation orientation) {
+        switch (orientation) {
+        case IBus.Orientation.VERTICAL:
+            m_candidate_area.set_vertical(true);
+            break;
+        case IBus.Orientation.HORIZONTAL:
+            m_candidate_area.set_vertical(false);
+            break;
+        case IBus.Orientation.SYSTEM:
+            m_candidate_area.set_vertical(m_vertical);
+            break;
+        }
+    }
+
     public void set_cursor_location(int x, int y, int width, int height) {
         Gdk.Rectangle location = Gdk.Rectangle(){
             x = x, y = y, width = width, height = height };
@@ -88,7 +102,7 @@ public class CandidatePanel : Gtk.HBox{
         adjust_window_position();
     }
 
-    public void set_labels(string[] labels) {
+    private void set_labels(IBus.Text[] labels) {
         m_candidate_area.set_labels(labels);
     }
 
@@ -118,6 +132,8 @@ public class CandidatePanel : Gtk.HBox{
         IBus.Text[] candidates = {};
         uint cursor_in_page = 0;
         bool show_cursor = true;
+        IBus.Text[] labels = {};
+        IBus.Orientation orientation = IBus.Orientation.SYSTEM;
 
         if (table != null) {
             uint page_size = table.get_page_size();
@@ -130,8 +146,19 @@ public class CandidatePanel : Gtk.HBox{
             uint page_end_pos = uint.min(page_start_pos + page_size, ncandidates);
             for (uint i = page_start_pos; i < page_end_pos; i++)
                 candidates += table.get_candidate(i);
+
+            for (uint i = 0; i < page_size; i++) {
+                IBus.Text? label = table.get_label(i);
+                if (label != null)
+                    labels += label;
+            }
+
+            orientation = (IBus.Orientation)table.get_orientation();
         }
         m_candidate_area.set_candidates(candidates, cursor_in_page, show_cursor);
+        set_labels(labels);
+        set_orientation(orientation);
+
         if (candidates.length != 0)
             m_candidate_area.show_all();
         else

From 865488566851107a69c315ad7d1cf01496c5e019 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 15 Mar 2012 13:21:08 +0900
Subject: [PATCH 025/816] gtk3: show language name on the IME menu.

BUG=https://bugzilla.redhat.com/show_bug.cgi?id=803177
TEST=manual

Review URL: https://codereview.appspot.com/5819049
---
 src/ibusutil.c     | 2 +-
 ui/gtk3/panel.vala | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ibusutil.c b/src/ibusutil.c
index d0bbd52aa..1b1a83312 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -147,7 +147,7 @@ ibus_get_language_name(const gchar *_locale) {
     }
     else {
 #ifdef ENABLE_NLS
-        return dgettext("iso_639", N_("Other"));
+        return dgettext(GETTEXT_PACKAGE, N_("Other"));
 #else
         return N_("Other");
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 79404cfc6..53789d247 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -330,8 +330,10 @@ class Panel : IBus.PanelService {
 
         // Append IMEs
         foreach (var engine in m_engines) {
+            var language = engine.get_language();
             var longname = engine.get_longname();
-            var item = new Gtk.ImageMenuItem.with_label(longname);
+            var item = new Gtk.ImageMenuItem.with_label(
+                "%s - %s".printf (IBus.get_language_name(language), longname));
             if (engine.get_icon() != "") {
                 var icon = new IconWidget(engine.get_icon(), width);
                  item.set_image(icon);

From 69902696928e6acb953ab30b1f70e462b5994272 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 15 Mar 2012 14:42:43 +0900
Subject: [PATCH 026/816] ibus-daemon: make sure to focus out engine when
 unset.

BUG=none
TEST=manual

Review URL: https://codereview.appspot.com/5824046
---
 bus/inputcontext.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 49c4a2694..91f2a9d9d 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2015,6 +2015,10 @@ bus_input_context_unset_engine (BusInputContext *context)
             g_signal_handlers_disconnect_by_func (context->engine,
                     engine_signals[i].callback, context);
         }
+        /* focus out engine so that the next call of
+           bus_engine_proxy_focus_in() will take effect and trigger
+           RegisterProperties. */
+        bus_engine_proxy_focus_out (context->engine);
         g_object_unref (context->engine);
         context->engine = NULL;
     }

From 942718e3a3177c33be2b04cf526c20be4ed227f6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 19 Mar 2012 16:20:55 +0900
Subject: [PATCH 027/816] Show language id on ibus-ui-gtk3.switcher window.

BUG=RH#803177
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5843059
---
 ui/gtk3/switcher.vala | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 131cad529..73b58d2fb 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -155,9 +155,22 @@ class Switcher : Gtk.Window {
         for (int i = 0; i < m_engines.length; i++) {
             var index = i;
             var engine = m_engines[i];
-            var button = new Gtk.Button.with_label(engine.get_longname());
+            var longname = engine.get_longname();
+            var language = engine.get_language();
+            var symbol = engine.get_symbol();
+            var id = language;
+
+            if (id.length > 2) {
+                id = id[0:2];
+            }
+            if (symbol.length != 0) {
+                id = symbol;
+            }
+            var label = "%-15s %s".printf(longname, id);
+            var button = new Gtk.Button.with_label(label);
             button.set_image(new IconWidget(engine.get_icon(), width));
             button.set_relief(Gtk.ReliefStyle.NONE);
+            button.set_alignment(1.0f, 0.0f);
             button.show();
 
             button.enter_notify_event.connect((e) => {

From 99f6b739f3dd9d7448c5e546da1195a901881752 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 20 Mar 2012 14:25:56 +0900
Subject: [PATCH 028/816] Set the custom font in ui.gtk3.CandidatePanel.

BUG=RH#803250
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5845047
---
 ui/gtk3/panel.vala | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 53789d247..251a65e93 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -40,6 +40,7 @@ class Panel : IBus.PanelService {
     private PropertyManager m_property_manager;
     private GLib.Pid m_setup_pid = 0;
     private Gtk.AboutDialog m_about_dialog;
+    private Gtk.CssProvider m_css_provider;
     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
     private const string ACCELERATOR_SWITCH_IME_BACKWARD = "<Control><Shift>space";
 
@@ -86,6 +87,63 @@ class Panel : IBus.PanelService {
         keybinding_manager.unbind(ACCELERATOR_SWITCH_IME_BACKWARD);
     }
 
+    private void set_custom_font() {
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Screen screen = (display != null) ?
+                display.get_default_screen() : null;
+
+        if (screen == null) {
+            warning("Could not open display.");
+            return;
+        }
+
+        bool use_custom_font = false;
+        GLib.Variant var_use_custom_font = m_config.get_value("panel",
+                                                              "use_custom_font");
+
+        if (var_use_custom_font != null) {
+            use_custom_font = var_use_custom_font.get_boolean();
+        }
+
+        if (m_css_provider != null) {
+            Gtk.StyleContext.remove_provider_for_screen(screen,
+                                                        m_css_provider);
+            m_css_provider = null;
+        }
+
+        if (use_custom_font == false) {
+            return;
+        }
+
+        string font_name = null;
+        GLib.Variant var_custom_font = m_config.get_value("panel",
+                                                          "custom_font");
+        if (var_custom_font != null) {
+            font_name = var_custom_font.dup_string();
+        }
+
+        if (font_name == null) {
+            warning("No config panel:custom_font.");
+            return;
+        }
+
+        string data_format = "GtkLabel { font: %s; }";
+        string data = data_format.printf(font_name);
+        m_css_provider = new Gtk.CssProvider();
+
+        try {
+            m_css_provider.load_from_data(data, -1);
+        } catch (GLib.Error e) {
+            warning("Failed css_provider_from_data: %s: %s", font_name,
+                                                             e.message);
+            return;
+        }
+
+        Gtk.StyleContext.add_provider_for_screen(screen,
+                                                 m_css_provider,
+                                                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
@@ -98,11 +156,15 @@ class Panel : IBus.PanelService {
             m_config.value_changed.connect(config_value_changed_cb);
             m_config.watch("general", "preload_engines");
             m_config.watch("general", "engines_order");
+            m_config.watch("panel", "custom_font");
+            m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
         } else {
             update_engines(null, null);
         }
+
+        set_custom_font();
     }
 
     private void switch_engine(int i, bool force = false) {
@@ -150,6 +212,13 @@ class Panel : IBus.PanelService {
                                          Variant variant) {
         if (section == "general" && name == "preload_engines") {
             update_engines(variant, null);
+            return;
+        }
+
+        if (section == "panel" && (name == "custom_font" ||
+                                   name == "use_custom_font")) {
+            set_custom_font();
+            return;
         }
     }
 

From b8c12964e9d14b8a15ef55b2f9ae23bf1592d6ee Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 23 Mar 2012 11:25:28 +0900
Subject: [PATCH 029/816] Add --help in ibus tool.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5868046
---
 tools/Makefile.am |  1 +
 tools/main.vala   | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index cd5325597..c0cacd698 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -38,6 +38,7 @@ AM_CFLAGS = \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DBINDIR=\"@bindir@\" \
+	-DIBUS_VERSION=\"@IBUS_VERSION@\" \
     -DIBUS_DISABLE_DEPRECATED \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
diff --git a/tools/main.vala b/tools/main.vala
index 9d4524243..0c51c4b85 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -23,6 +23,8 @@ using GLib;
 using IBus;
 
 
+public extern const string IBUS_VERSION;
+
 bool name_only = false;
 
 class EngineList {
@@ -129,6 +131,11 @@ int exit_daemon(string[] argv) {
     return 0;
 }
 
+int print_version (string[] argv) {
+    print("IBus %s\n", IBUS_VERSION);
+    return 0;
+}
+
 delegate int EntryFunc(string[] argv);
 
 struct CommandEntry {
@@ -142,10 +149,17 @@ public int main(string[] argv) {
         { "exit", exit_daemon },
         { "list-engine", list_engine },
         { "watch", message_watch },
-        { "restart", restart_daemon }
+        { "restart", restart_daemon },
+        { "version", print_version }
     };
 
     if (argv.length >= 2) {
+        if (argv[1] == "--help" || argv[1] == "help") {
+            foreach (var command in commands) {
+                print ("  %s\n", command.name);
+            }
+            return 0;
+        }
         string[] new_argv = argv[1:argv.length];
         foreach (var command in commands) {
             if (command.name == argv[1])

From ceaeb86d9b7c5d8674151c863551564a15c0924f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 23 Mar 2012 11:40:29 +0900
Subject: [PATCH 030/816] Enable bindtextdomain in ibus-ui-gtk3.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5876049
---
 configure.ac             | 3 +++
 ui/gtk3/Makefile.am      | 1 +
 ui/gtk3/application.vala | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/configure.ac b/configure.ac
index 1c4b28318..4c8b7f909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,9 @@ GETTEXT_PACKAGE=ibus10
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for out gettext translation domains.])
+GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR)
+GLIB_LOCALE_DIR=$localedir
+AC_SUBST(GLIB_LOCALE_DIR)
 
 # For dislpay date.
 m4_define(ibus_datedisplay,
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 0fb9d3c6d..87a7373d0 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -50,6 +50,7 @@ AM_CFLAGS = \
 	@X11_CFLAGS@ \
 	$(INCLUDES) \
 	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
+	-DGLIB_LOCALE_DIR=\"@GLIB_LOCALE_DIR@\" \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index 280da57a3..d49deb4d4 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -24,12 +24,17 @@ using IBus;
 using GLib;
 using Gtk;
 
+public extern const string GETTEXT_PACKAGE;
+public extern const string GLIB_LOCALE_DIR;
+
 class Application {
     private IBus.Bus m_bus;
     private Panel m_panel;
     private IBus.Config m_config;
 
     public Application(string[] argv) {
+        GLib.Intl.bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
+        GLib.Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
         IBus.init();
         Gtk.init(ref argv);
 

From 6ec73515cb040be531107b70705659a2668f0965 Mon Sep 17 00:00:00 2001
From: Yusuke Sato <yusukes@chromium.org>
Date: Tue, 3 Apr 2012 18:31:47 +0900
Subject: [PATCH 031/816] Fix typo in ibusfactory.c.

BUG=None
TEST=None

Review URL: https://codereview.appspot.com/5969068
---
 src/ibusfactory.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index d6d12311e..c25280fed 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -352,10 +352,10 @@ ibus_factory_new (GDBusConnection *connection)
 {
     g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
 
-    IBusEngine *object = g_object_new (IBUS_TYPE_FACTORY,
-                                       "object-path", IBUS_PATH_FACTORY,
-                                       "connection", connection,
-                                       NULL);
+    IBusFactory *object = g_object_new (IBUS_TYPE_FACTORY,
+                                        "object-path", IBUS_PATH_FACTORY,
+                                        "connection", connection,
+                                        NULL);
 
     return IBUS_FACTORY (object);
 }

From b620e0bcda97934d6927b7cdde300598ac5de45f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 5 Apr 2012 10:44:26 +0900
Subject: [PATCH 032/816] Fix ibus-setup SEGV on C locale.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5976076
---
 setup/enginecombobox.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index 8d1424b85..0ac73685c 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -75,7 +75,11 @@ def set_engines(self, engines):
 
         keys = langs.keys()
         keys.sort(locale.strcoll)
-        current_lang = IBus.get_language_name(locale.getlocale()[0])
+        loc = locale.getlocale()[0]
+        # None on C locale
+        if loc == None:
+            loc = 'en_US'
+        current_lang = IBus.get_language_name(loc)
         # move current language to the first place
         if current_lang in keys:
             keys.remove(current_lang)

From 991eebc31aa605fbce03edda6eaecfd06c2fcb1b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Apr 2012 12:11:35 +0900
Subject: [PATCH 033/816] Fix ibus-x11 SEGV in _process_key_event_done.

IMForwardEvent() calls _Xi18nFindClient() and it could return NULL.
Maybe the connect_id would be disconnected during the async
process_key_event.
This fix checks XIM_DISCONNECT in ims_protocol_handler() to cancel
IMForwardEvent() in _process_key_event_done().

BUG=RH#769135
TEST=Linux desktop

Review URL: https://codereview.appspot.com/5498090
---
 client/x11/main.c | 50 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 65451abaf..8550a5381 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -464,6 +464,13 @@ _process_key_event_done (GObject      *object,
         g_error_free (error);
     }
 
+    if (g_hash_table_lookup (_connections,
+                             GINT_TO_POINTER ((gint) pfe->connect_id))
+        == NULL) {
+        g_slice_free (IMForwardEventStruct, pfe);
+        return;
+    }
+
     if (retval == FALSE) {
         IMForwardEvent (_xims, (XPointer) pfe);
     }
@@ -600,29 +607,52 @@ _free_ic (gpointer data, gpointer user_data)
 }
 
 static int
-xim_close (XIMS ims, IMCloseStruct *call_data)
+_free_x11_iconn_from_id (CARD16 connect_id)
 {
     X11ICONN *conn;
 
-    LOG (1, "XIM_CLOSE connect_id=%d",
-                call_data->connect_id);
-
     conn = (X11ICONN *) g_hash_table_lookup (_connections,
-                                             GINT_TO_POINTER ((gint) call_data->connect_id));
-    g_return_val_if_fail (conn != NULL, 0);
+                                             GINT_TO_POINTER ((gint) connect_id));
 
-    g_list_foreach (conn->clients, _free_ic, NULL);
+    if (conn == NULL) {
+        return 0;
+    }
 
-    g_list_free (conn->clients);
+    g_list_free_full (conn->clients, (GDestroyNotify) _free_ic);
 
     g_hash_table_remove (_connections,
-                         GINT_TO_POINTER ((gint) call_data->connect_id));
+                         GINT_TO_POINTER ((gint) connect_id));
 
     g_slice_free (X11ICONN, conn);
 
     return 1;
 }
 
+static int
+xim_close (XIMS xims, IMCloseStruct *call_data)
+{
+    CARD16 connect_id = call_data->connect_id;
+
+    LOG (1, "XIM_CLOSE connect_id=%d", connect_id);
+
+    return _free_x11_iconn_from_id (connect_id);
+}
+
+static int
+xim_disconnect_ic (XIMS xims, IMDisConnectStruct *call_data)
+{
+    CARD16 connect_id = call_data->connect_id;
+
+    LOG (1, "XIM_DISCONNECT connect_id=%d", connect_id);
+
+    _free_x11_iconn_from_id (connect_id);
+
+    /* I am not sure if this can return 1 because I have not experienced
+     * that xim_disconnect_ic() is called. But I wish connect_id is
+     * released from _connections to avoid SEGV. */
+    return 0;
+}
+
 
 static void
 _xim_set_cursor_location (X11IC *x11ic)
@@ -745,6 +775,8 @@ ims_protocol_handler (XIMS xims, IMProtocol *call_data)
         return xim_open (xims, (IMOpenStruct *)call_data);
     case XIM_CLOSE:
         return xim_close (xims, (IMCloseStruct *)call_data);
+    case XIM_DISCONNECT:
+        return xim_disconnect_ic (xims, (IMDisConnectStruct *)call_data);
     case XIM_CREATE_IC:
         return xim_create_ic (xims, (IMChangeICStruct *)call_data);
     case XIM_DESTROY_IC:

From 6c5e5d09cb13989e21c7d533e9c0332feb3f0208 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 10 Apr 2012 11:31:49 +0900
Subject: [PATCH 034/816] Ignore mouse masks in ui/gtk3/keybindingmanager for
 accessibility.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5975069
---
 ui/gtk3/keybindingmanager.vala | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 0b588da8e..dd3c7bdb6 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -36,7 +36,12 @@ public class KeybindingManager : GLib.Object {
         Gdk.ModifierType.MOD2_MASK |
         Gdk.ModifierType.LOCK_MASK |
         Gdk.ModifierType.MOD4_MASK |
-        Gdk.ModifierType.MOD5_MASK);
+        Gdk.ModifierType.MOD5_MASK |
+        Gdk.ModifierType.BUTTON1_MASK |
+        Gdk.ModifierType.BUTTON2_MASK |
+        Gdk.ModifierType.BUTTON3_MASK |
+        Gdk.ModifierType.BUTTON4_MASK |
+        Gdk.ModifierType.BUTTON5_MASK);
 
     /**
      * Helper class to store keybinding
@@ -85,8 +90,6 @@ public class KeybindingManager : GLib.Object {
         Gdk.ModifierType modifiers;
         Gtk.accelerator_parse(accelerator, out keysym, out modifiers);
 
-        get_primary_modifier(modifiers);
-
         unowned X.Display display = Gdk.x11_get_default_xdisplay();
 
         int keycode = display.keysym_to_keycode(keysym);
@@ -147,7 +150,7 @@ public class KeybindingManager : GLib.Object {
             Gdk.ModifierType.SHIFT_MASK,
             Gdk.ModifierType.LOCK_MASK
         };
-        foreach (var mask in masks) {
+        foreach (uint mask in masks) {
             if ((binding_mask & mask) == mask)
                 return mask;
         }

From 75df361698c7be58e33993784f2d6b9b0957fd44 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 16 Apr 2012 10:19:57 +0900
Subject: [PATCH 035/816] Fix the order of arguments in NameOwnerChanged

BUG=RH#799571
TEST=Linux desktop

Review URL: https://codereview.appspot.com/6022044
---
 ui/gtk3/application.vala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index d49deb4d4..b54821ca8 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -92,7 +92,10 @@ class Application {
                                       Variant parameters) {
         debug("signal_name = %s", signal_name);
         m_panel = new Panel(m_bus);
-        m_panel.set_config(m_config);
+
+        if (m_config != null) {
+            m_panel.set_config(m_config);
+        }
     }
 
     private void bus_name_lost_cb(DBusConnection connection,
@@ -113,7 +116,8 @@ class Application {
                                               Variant parameters) {
         debug("signal_name = %s", signal_name);
         string name, new_owner, old_owner;
-        parameters.get("(sss)", out name, out new_owner, out old_owner);
+        parameters.get("(sss)", out name, out old_owner, out new_owner);
+
         if (new_owner == "") {
             m_config = null;
         } else {

From f2e266da9e60bc5318ea98ad40c8f83a8bb06026 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 17 Apr 2012 10:25:58 +0900
Subject: [PATCH 036/816] Add options to disable to build UI and engines.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/6031059
---
 Makefile.am  |  8 +++++++-
 configure.ac | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 2b5aae286..6d6e55174 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,13 @@
 
 NULL =
 
+if ENABLE_UI
 UI_DIR = ui
+endif
+
+if ENABLE_ENGINE
+ENGINE_DIR = engine
+endif
 
 if ENABLE_SETUP
 SETUP_DIR = setup
@@ -44,12 +50,12 @@ SUBDIRS = \
 	util \
 	conf \
 	client \
-	engine \
 	tools \
 	data \
 	m4 \
 	po \
 	docs \
+	$(ENGINE_DIR) \
 	$(UI_DIR) \
 	$(DAEMON_DIR) \
 	$(PYTHON_LIB_DIRS) \
diff --git a/configure.ac b/configure.ac
index 4c8b7f909..8498efe2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,6 +469,30 @@ else
     enable_surrounding_text="no (disabled, use --enable-surrounding-text to enable)"
 fi
 
+# --disable-ui
+AC_ARG_ENABLE(ui,
+    AS_HELP_STRING([--disable-ui],
+                   [Disable ibus default user interface]),
+    [enable_ui=$enableval],
+    [enable_ui=yes]
+)
+AM_CONDITIONAL([ENABLE_UI], [test x"$enable_ui" = x"yes"])
+if test x"$enable_ui" = x"yes"; then
+    enable_ui="yes (enabled, use --disable-ui to disable)"
+fi
+
+# --disable-engine
+AC_ARG_ENABLE(engine,
+    AS_HELP_STRING([--disable-engine],
+                   [Disable ibus simple engine]),
+    [enable_engine=$enableval],
+    [enable_engine=yes]
+)
+AM_CONDITIONAL([ENABLE_ENGINE], [test x"$enable_engine" = x"yes"])
+if test x"$enable_engine" = x"yes"; then
+    enable_engine="yes (enabled, use --disable-engine to disable)"
+fi
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -543,6 +567,8 @@ Build options:
   IBus-1.0.gir scannerflags "$IBUS_GIR_SCANNERFLAGS"
   Build vala binding        $enable_vala
   Build document            $enable_gtk_doc
+  Build UI                  $enable_ui
+  Build engine              $enable_engine
   Enable key snooper        $enable_key_snooper
   No snooper regexes        "$NO_SNOOPER_APPS"
   Panel icon                "$IBUS_ICON_KEYBOARD"

From b8fe4d782db37385246f651493f9d935dd58c301 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 18 Apr 2012 10:37:07 +0900
Subject: [PATCH 037/816] Fix make check.

The make variable TESTS is reserved by automake:
https://www.gnu.org/software/automake/manual/automake.html#index-TESTS-832
and thus it causes error when make check:
 make[4]: Entering directory `/home/ueno/devel/ibus/src'
 /bin/sh: line 9: ./tests: Is a directory
 FAIL: tests

BUG=none
TEST=manually

Review URL: https://codereview.appspot.com/6056043
---
 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b1d176676..df4ada343 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,10 +23,10 @@
 NULL =
 
 if ENABLE_TESTS
-TESTS = tests
+TESTS_DIR = tests
 endif
 
-SUBDIRS = . $(TESTS)
+SUBDIRS = . $(TESTS_DIR)
 
 # libibus = libibus-@IBUS_API_VERSION@.la
 libibus = libibus-1.0.la

From d0df8d3a62fd156029fb1422cd786d3f351b17fe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 27 Apr 2012 11:27:03 +0900
Subject: [PATCH 038/816] Enable to fall back /etc/machine-id

http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4

BUG=http://code.google.com/p/ibus/issues/detail?id=1389
TEST=Linux desktop

Review URL: https://codereview.appspot.com/6111060
---
 src/ibusshare.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index 95f98d347..ce332ba55 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void)
         if (!g_file_get_contents ("/var/lib/dbus/machine-id",
                                   &machine_id,
                                   NULL,
-                                  &error)) {
+                                  &error) &&
+            !g_file_get_contents ("/etc/machine-id",
+                                  &machine_id,
+                                  NULL,
+                                  NULL)) {
             g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
             g_error_free (error);
             machine_id = "machine-id";

From c333b7604437d10b30e8e33ef18c276c11119394 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 27 Apr 2012 11:42:00 +0900
Subject: [PATCH 039/816] Fix some test codes.

BUG=http://code.google.com/p/ibus/issues/detail?id=1438
TEST=Linux desktop

Review URL: https://codereview.appspot.com/6121053
---
 bus/test-client.c | 18 +++++++++++++++---
 bus/test-stress.c |  8 +++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bus/test-client.c b/bus/test-client.c
index be7c8256a..6192c8f3e 100644
--- a/bus/test-client.c
+++ b/bus/test-client.c
@@ -20,8 +20,8 @@
  */
 
 #include <ibus.h>
-#include <gtk/gtk.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include "test-client.h"
 
@@ -67,7 +67,7 @@ bus_test_client_class_init (BusTestClientClass *class)
 
     /* init display object */
     if (_xdisplay == NULL) {
-        _xdisplay = XOpenDisplay (gdk_display_get_name (gdk_display_get_default ()));
+        _xdisplay = XOpenDisplay (NULL);
     }
 
     /* init bus object */
@@ -175,7 +175,19 @@ bus_test_client_send_key (BusTestClient *client,
         _store_modifier_state (client, keysym);
     } else {
         IDEBUG ("key: %d is not modifier.", keysym);
-        gboolean is_upper = !gdk_keyval_is_lower (keysym);
+        /* This is an example code. If you use the keysym >= 0x01000000,
+         * gdk_keyval_is_upper may be useful since 
+         * XConvertCase supports implementation-independent conversions.
+         */
+        KeySym xlower = 0;
+        KeySym xupper = 0;
+        gboolean is_upper = FALSE;
+
+        if (keysym) {
+            XConvertCase (keysym, &xlower, &xupper);
+            is_upper = ((guint) xupper == keysym);
+        }
+
         gboolean is_shift_set = _is_shift_set (client);
 
         if (is_upper && !is_shift_set) {
diff --git a/bus/test-stress.c b/bus/test-stress.c
index b05129554..e428f5eea 100644
--- a/bus/test-stress.c
+++ b/bus/test-stress.c
@@ -23,7 +23,6 @@
 
 #include <ibus.h>
 #include <locale.h>
-#include <gtk/gtk.h>
 #include <glib.h>
 #include "test-client.h"
 
@@ -33,7 +32,7 @@
 static gboolean
 _sleep_cb (gpointer user_data)
 {
-    gtk_main_quit ();
+    ibus_quit ();
     return FALSE;
 }
 
@@ -41,7 +40,7 @@ static void
 _sleep (guint millisecond)
 {
     g_timeout_add (millisecond, (GSourceFunc) _sleep_cb, NULL);
-    gtk_main ();
+    ibus_main ();
 }
 
 /* ibus stress test
@@ -61,8 +60,7 @@ main (gint argc, gchar **argv)
     int send_key_num = 0;
 
     setlocale (LC_ALL, "");
-    gtk_set_locale ();
-    gtk_init (&argc, &argv);
+    ibus_init ();
 
     /* need to set active engine */
     client = bus_test_client_new ();

From e9f682d4c6bf90ba8c40e2920d24d7bbba449e8f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 May 2012 10:44:36 +0900
Subject: [PATCH 040/816] Fix GtkBuilder bindtextdomain in ibus-setup.

The patch was provided by Akio Obata <obata at lins dot jp>

BUG=http://code.google.com/p/ibus/issues/detail?id=1453
TEST=Linux desktop

Review URL: https://codereview.appspot.com/6203045
---
 ui/gtk2/i18n.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/gtk2/i18n.py b/ui/gtk2/i18n.py
index 98f60c4c2..41669b327 100644
--- a/ui/gtk2/i18n.py
+++ b/ui/gtk2/i18n.py
@@ -20,6 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+import locale
 import gettext
 import os
 
@@ -30,5 +31,13 @@
 
 def init():
     localedir = os.getenv("IBUS_LOCALEDIR")
+    # Python's locale module doesn't provide all methods on some
+    # operating systems like FreeBSD
+    try:
+        # for non-standard localedir
+        locale.bindtextdomain(DOMAINNAME, localedir)
+        locale.bind_textdomain_codeset(DOMAINNAME, "UTF-8")
+    except AttributeError:
+        pass
     gettext.bindtextdomain(DOMAINNAME, localedir)
     gettext.bind_textdomain_codeset(DOMAINNAME, "UTF-8")

From a78a254715fb410d4c2f7fd274894e51d74bc9bb Mon Sep 17 00:00:00 2001
From: Jason Conti <jason.conti@gmail.com>
Date: Tue, 8 May 2012 14:01:57 -0400
Subject: [PATCH 041/816] Add function ibus_bus_new_async to create a new
 IBusBus object and asynchronously connect to the IBus daemon.

BUG=http://code.google.com/p/ibus/issues/detail?id=1452
TEST=Manually

Review URL: https://codereview.appspot.com/6159047
Patch from Jason Conti <jason.conti@gmail.com>.
---
 src/ibusbus.c | 88 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/ibusbus.h | 10 ++++++
 2 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index ea18841c3..3aaf819db 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -258,7 +258,7 @@ _connection_closed_cb (GDBusConnection  *connection,
 }
 
 static void
-ibus_bus_connect (IBusBus *bus)
+ibus_bus_disconnect (IBusBus *bus)
 {
     /* unref the old connection at first */
     if (bus->priv->connection != NULL) {
@@ -268,15 +268,11 @@ ibus_bus_connect (IBusBus *bus)
         g_object_unref (bus->priv->connection);
         bus->priv->connection = NULL;
     }
+}
 
-    if (ibus_get_address () != NULL) {
-        bus->priv->connection =
-            g_dbus_connection_new_for_address_sync (ibus_get_address (),
-                                                    G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                                                    G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
-                                                    NULL, NULL, NULL);
-    }
-
+static void
+ibus_bus_connect_finish (IBusBus *bus)
+{
     if (bus->priv->connection) {
         /* FIXME */
         ibus_bus_hello (bus);
@@ -296,6 +292,63 @@ ibus_bus_connect (IBusBus *bus)
     }
 }
 
+static void
+_bus_connect_async_cb (GObject      *source_object,
+                        GAsyncResult *res,
+                        gpointer      user_data)
+{
+    g_return_if_fail (user_data != NULL);
+    g_return_if_fail (IBUS_IS_BUS (user_data));
+
+    IBusBus *bus   = IBUS_BUS (user_data);
+    GError  *error = NULL;
+
+    bus->priv->connection = g_dbus_connection_new_for_address_finish (res, &error);
+
+    if (error != NULL) {
+        g_warning ("Unable to connect to ibus: %s", error->message);
+        g_error_free (error);
+        error = NULL;
+    }
+
+    if (bus->priv->connection)
+        ibus_bus_connect_finish (bus);
+
+    /* unref the ref from ibus_bus_connect */
+    g_object_unref (bus);
+}
+
+static void
+ibus_bus_connect_async (IBusBus *bus)
+{
+    ibus_bus_disconnect (bus);
+
+    if (ibus_get_address () != NULL) {
+        g_object_ref (bus);
+        g_dbus_connection_new_for_address (ibus_get_address (),
+                                           G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+                                           G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
+                                           NULL, NULL,
+                                           _bus_connect_async_cb, bus);
+    }
+}
+
+static void
+ibus_bus_connect (IBusBus *bus)
+{
+    ibus_bus_disconnect (bus);
+
+    if (ibus_get_address () != NULL) {
+        bus->priv->connection =
+            g_dbus_connection_new_for_address_sync (ibus_get_address (),
+                                                    G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+                                                    G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
+                                                    NULL, NULL, NULL);
+    }
+
+    ibus_bus_connect_finish (bus);
+}
+
 static void
 _changed_cb (GFileMonitor       *monitor,
              GFile              *file,
@@ -343,8 +396,6 @@ ibus_bus_init (IBusBus *bus)
         }
     }
 
-    ibus_bus_connect (bus);
-
     file = g_file_new_for_path (ibus_get_socket_path ());
     bus->priv->monitor = g_file_monitor_file (file, 0, NULL, NULL);
 
@@ -482,9 +533,24 @@ ibus_bus_new (void)
 {
     IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS, NULL));
 
+    if (!ibus_bus_is_connected(bus))
+        ibus_bus_connect (bus);
+
     return bus;
 }
 
+IBusBus *
+ibus_bus_new_async (void)
+{
+    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS, NULL));
+
+    if (!ibus_bus_is_connected(bus))
+        ibus_bus_connect_async (bus);
+
+    return bus;
+}
+
+
 
 gboolean
 ibus_bus_is_connected (IBusBus *bus)
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 337091bb5..8fe0036a5 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -90,6 +90,16 @@ GType        ibus_bus_get_type          (void);
  */
 IBusBus     *ibus_bus_new               (void);
 
+/**
+ * ibus_bus_new_async:
+ * @returns: A newly allocated #IBusBus instance, and the instance is not floating.
+ *
+ * New an #IBusBus instance. The instance will asynchronously connect to the IBus
+ * daemon.
+ */
+IBusBus     *ibus_bus_new_async         (void);
+
+
 /**
  * ibus_bus_is_connected:
  * @bus: An #IBusBus.

From 7ca7db00f8d8feb5d68873089ac3418c795a0c15 Mon Sep 17 00:00:00 2001
From: Jason Conti <jason.conti@gmail.com>
Date: Tue, 8 May 2012 15:42:38 -0400
Subject: [PATCH 042/816] Use ibus_bus_new_async in gtk2 client.

BUG=http://code.google.com/p/ibus/issues/detail?id=1452
TEST=Manually

Review URL: https://codereview.appspot.com/6198052
Patch from Jason Conti <jason.conti@gmail.com>.
---
 client/gtk2/ibusimcontext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 1fcd2b2c2..584b92dd6 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -502,7 +502,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     /* init bus object */
     if (_bus == NULL) {
         ibus_set_display (gdk_display_get_name (gdk_display_get_default ()));
-        _bus = ibus_bus_new ();
+        _bus = ibus_bus_new_async ();
 
         /* init the global fake context */
         if (ibus_bus_is_connected (_bus)) {

From bbbdd2efb005b77282311d8dd1536ed6a2bf32ac Mon Sep 17 00:00:00 2001
From: Jason Conti <jason.conti@gmail.com>
Date: Wed, 9 May 2012 09:29:30 -0400
Subject: [PATCH 043/816] Add tests for ibus_bus_new_async

BUG=http://code.google.com/p/ibus/issues/detail?id=1452

Review URL: https://codereview.appspot.com/6200055
Patch from Jason Conti <jason.conti@gmail.com>.
---
 src/tests/ibus-bus.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 620f14d47..da1253432 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -604,6 +604,23 @@ call_next_async_function (void)
         (*async_functions[index++])();
 }
 
+static void
+_bus_connected_cb (IBusBus *bus,
+                   gpointer user_data)
+{
+    g_assert (ibus_bus_is_connected (bus));
+    ibus_quit ();
+}
+
+static void
+test_bus_new_async (void)
+{
+    g_object_unref (bus);
+    bus = ibus_bus_new_async ();
+    g_signal_connect (bus, "connected", G_CALLBACK (_bus_connected_cb), NULL);
+    ibus_main ();
+}
+
 gint
 main (gint    argc,
       gchar **argv)
@@ -622,6 +639,13 @@ main (gint    argc,
                      test_create_input_context_async);
     g_test_add_func ("/ibus/get-engines-by-names", test_get_engines_by_names);
     g_test_add_func ("/ibus/async-apis", test_async_apis);
+    g_test_add_func ("/ibus/bus-new-async", test_bus_new_async);
+    g_test_add_func ("/ibus/bus-new-async/list-engines", test_list_engines);
+    g_test_add_func ("/ibus/bus-new-async/list-active-engines", test_list_active_engines);
+    g_test_add_func ("/ibus/bus-new-async/create-input-context-async",
+                     test_create_input_context_async);
+    g_test_add_func ("/ibus/bus-new-async/get-engines-by-names", test_get_engines_by_names);
+    g_test_add_func ("/ibus/bus-new-async/async-apis", test_async_apis);
 
     result = g_test_run ();
     g_object_unref (bus);

From 99cbfbdd6f6e5ebd570d2a4b983ea3561980f7a3 Mon Sep 17 00:00:00 2001
From: "Kim, Seung Won" <seungzzang@gmail.com>
Date: Wed, 9 May 2012 10:05:59 -0400
Subject: [PATCH 044/816] Fix a typo.

BUG=None
TEST=None

Review URL: https://codereview.appspot.com/6188057
Patch from Kim, Seung Won <seungzzang@gmail.com>.
---
 src/ibusbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index 3aaf819db..f0865fe08 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -680,7 +680,7 @@ ibus_bus_create_input_context_async (IBusBus            *bus,
 
     if (cancellable != NULL) {
         g_object_set_data_full ((GObject *)simple,
-                                "concellable",
+                                "cancellable",
                                 g_object_ref (cancellable),
                                 (GDestroyNotify)g_object_unref);
     }

From 1fbf1695a873e8deb80c032d467aaaa806ee6c4d Mon Sep 17 00:00:00 2001
From: Jason Conti <jason.conti@gmail.com>
Date: Mon, 14 May 2012 13:55:30 -0400
Subject: [PATCH 045/816] Fix IBusBus gobject introspection by connecting in
 the constructor.

BUG=http://code.google.com/p/ibus/issues/detail?id=1452
TEST=Manually

Review URL: https://codereview.appspot.com/6210055
Patch from Jason Conti <jason.conti@gmail.com>.
---
 src/ibusbus.c | 83 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index f0865fe08..fc3c11b9b 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -44,6 +44,10 @@ enum {
     LAST_SIGNAL,
 };
 
+enum {
+    PROP_0 = 0,
+    PROP_CONNECT_ASYNC,
+};
 
 /* IBusBusPriv */
 struct _IBusBusPrivate {
@@ -55,6 +59,7 @@ struct _IBusBusPrivate {
     guint watch_ibus_signal_id;
     IBusConfig *config;
     gchar *unique_name;
+    gboolean connect_async;
 };
 
 static guint    bus_signals[LAST_SIGNAL] = { 0 };
@@ -89,6 +94,14 @@ static void      ibus_bus_call_async             (IBusBus                *bus,
                                                   GCancellable           *cancellable,
                                                   GAsyncReadyCallback     callback,
                                                   gpointer                user_data);
+static void      ibus_bus_set_property           (IBusBus                *bus,
+                                                  guint                   prop_id,
+                                                  const GValue           *value,
+                                                  GParamSpec             *pspec);
+static void      ibus_bus_get_property           (IBusBus                *bus,
+                                                  guint                   prop_id,
+                                                  GValue                 *value,
+                                                  GParamSpec             *pspec);
 
 G_DEFINE_TYPE (IBusBus, ibus_bus, IBUS_TYPE_OBJECT)
 
@@ -99,8 +112,25 @@ ibus_bus_class_init (IBusBusClass *class)
     IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
 
     gobject_class->constructor = ibus_bus_constructor;
+    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_bus_set_property;
+    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_bus_get_property;
     ibus_object_class->destroy = ibus_bus_destroy;
 
+    /* install properties */
+    /**
+     * IBusBus:connect-async:
+     *
+     * Whether the #IBusBus object should connect asynchronously to the bus.
+     *
+     */
+    g_object_class_install_property (gobject_class,
+                                     PROP_CONNECT_ASYNC,
+                                     g_param_spec_boolean ("connect-async",
+                                                           "Connect Async",
+                                                           "Connect asynchronously to the bus",
+                                                           FALSE,
+                                                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
     /* install signals */
     /**
      * IBusBus::connected:
@@ -383,6 +413,7 @@ ibus_bus_init (IBusBus *bus)
     bus->priv->watch_ibus_signal = FALSE;
     bus->priv->watch_ibus_signal_id = 0;
     bus->priv->unique_name = NULL;
+    bus->priv->connect_async = FALSE;
 
     path = g_path_get_dirname (ibus_get_socket_path ());
 
@@ -405,6 +436,36 @@ ibus_bus_init (IBusBus *bus)
     g_free (path);
 }
 
+static void
+ibus_bus_set_property (IBusBus      *bus,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
+{
+    switch (prop_id) {
+    case PROP_CONNECT_ASYNC:
+        bus->priv->connect_async = g_value_get_boolean (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (bus, prop_id, pspec);
+    }
+}
+
+static void
+ibus_bus_get_property (IBusBus    *bus,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
+{
+    switch (prop_id) {
+    case PROP_CONNECT_ASYNC:
+        g_value_set_boolean (value, bus->priv->connect_async);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (bus, prop_id, pspec);
+    }
+}
+
 static GObject*
 ibus_bus_constructor (GType                  type,
                       guint                  n_params,
@@ -418,6 +479,11 @@ ibus_bus_constructor (GType                  type,
         /* make bus object sink */
         g_object_ref_sink (object);
         _bus = IBUS_BUS (object);
+
+        if (_bus->priv->connect_async)
+            ibus_bus_connect_async (_bus);
+        else
+            ibus_bus_connect (_bus);
     }
     else {
         object = g_object_ref (_bus);
@@ -531,10 +597,9 @@ _async_finish_guint (GAsyncResult *res,
 IBusBus *
 ibus_bus_new (void)
 {
-    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS, NULL));
-
-    if (!ibus_bus_is_connected(bus))
-        ibus_bus_connect (bus);
+    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS,
+                                           "connect-async", FALSE,
+                                           NULL));
 
     return bus;
 }
@@ -542,16 +607,13 @@ ibus_bus_new (void)
 IBusBus *
 ibus_bus_new_async (void)
 {
-    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS, NULL));
-
-    if (!ibus_bus_is_connected(bus))
-        ibus_bus_connect_async (bus);
+    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS,
+                                           "connect-async", TRUE,
+                                           NULL));
 
     return bus;
 }
 
-
-
 gboolean
 ibus_bus_is_connected (IBusBus *bus)
 {
@@ -563,7 +625,6 @@ ibus_bus_is_connected (IBusBus *bus)
     return TRUE;
 }
 
-
 IBusInputContext *
 ibus_bus_create_input_context (IBusBus      *bus,
                                const gchar  *client_name)

From 6422f056a7e5946c59f105aabfc1bc724d13fc5a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 16 May 2012 16:23:55 +0900
Subject: [PATCH 046/816] Improved the language of a couple of dialogs.

Also update all po files.

BUG=https://github.com/ibus/ibus/pull/4
TEST=manually

Review URL: https://codereview.appspot.com/6212048
---
 po/ar.po       | 706 +++++++++++++++++++++---------------------
 po/as.po       | 777 +++++++++++++++++++++++-----------------------
 po/bn_IN.po    | 767 ++++++++++++++++++++++++----------------------
 po/ca.po       | 804 ++++++++++++++++++++++++------------------------
 po/da.po       | 782 +++++++++++++++++++++++-----------------------
 po/de.po       | 805 ++++++++++++++++++++++++------------------------
 po/en_GB.po    | 781 +++++++++++++++++++++++-----------------------
 po/es.po       | 817 +++++++++++++++++++++++++------------------------
 po/fa.po       | 599 ++++++++++++++++++------------------
 po/fr.po       | 813 ++++++++++++++++++++++++------------------------
 po/gu.po       | 776 +++++++++++++++++++++++-----------------------
 po/hi.po       | 774 +++++++++++++++++++++++-----------------------
 po/hu.po       | 808 ++++++++++++++++++++++++------------------------
 po/it.po       | 783 +++++++++++++++++++++++++----------------------
 po/ja.po       | 792 ++++++++++++++++++++++++-----------------------
 po/kn.po       | 781 +++++++++++++++++++++++-----------------------
 po/ko.po       | 763 +++++++++++++++++++++++----------------------
 po/lv.po       | 802 +++++++++++++++++++++++++-----------------------
 po/ml.po       | 763 +++++++++++++++++++++++----------------------
 po/mr.po       | 777 +++++++++++++++++++++++-----------------------
 po/nl.po       | 790 ++++++++++++++++++++++++-----------------------
 po/or.po       | 778 +++++++++++++++++++++++-----------------------
 po/pa.po       | 783 ++++++++++++++++++++++++-----------------------
 po/pl.po       | 795 ++++++++++++++++++++++++-----------------------
 po/pt_BR.po    | 798 ++++++++++++++++++++++++-----------------------
 po/ru.po       | 765 +++++++++++++++++++++++----------------------
 po/sr.po       | 745 ++++++++++++++++++++++----------------------
 po/sr@latin.po | 745 ++++++++++++++++++++++----------------------
 po/ta.po       | 780 +++++++++++++++++++++++-----------------------
 po/te.po       | 789 ++++++++++++++++++++++++-----------------------
 po/tg.po       | 593 +++++++++++++++++------------------
 po/uk.po       | 791 ++++++++++++++++++++++++-----------------------
 po/vi.po       | 769 ++++++++++++++++++++++++----------------------
 po/zh_CN.po    | 767 ++++++++++++++++++++++++----------------------
 po/zh_HK.po    | 769 ++++++++++++++++++++++++----------------------
 po/zh_TW.po    | 772 +++++++++++++++++++++++-----------------------
 setup/main.py  |   4 +-
 37 files changed, 14252 insertions(+), 13451 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index a4144f840..dee26d1dc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2009-04-06 11:45+0800\n"
 "Last-Translator: Muayyad Alsadi <alsadi@ojuba.org>\n"
 "Language-Team: Arabic <AR@li.org>\n"
@@ -16,528 +16,548 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "إطار إطرق الإدخال IBUS"
-
-#: ../bus/ibus.desktop.in.h:3
+#: ../setup/setup.ui.h:1
 #, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "إطار إطرق الإدخال IBUS"
+msgid "Horizontal"
+msgstr ""
+"أفقي\n"
+"عمودي"
 
-#: ../ibus/_config.py.in:39
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
 msgstr ""
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "أخرى"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:264
+#: ../setup/setup.ui.h:4
 #, fuzzy
-msgid "Previous page"
-msgstr "طريقة الإدخال السابقة"
+msgid "When active"
+msgstr ""
+"أبدا\n"
+"عند التفعيل\n"
+"دائما"
+
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
 msgstr ""
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
 msgstr ""
 
-#: ../ui/gtk/main.py:59
-#, fuzzy
-msgid "Restart Now"
-msgstr "إعادة تشغيل"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr ""
 
-#: ../ui/gtk/main.py:60
+#: ../setup/setup.ui.h:10
 #, fuzzy
-msgid "Later"
-msgstr "أخرى"
+msgid "Custom"
+msgstr "خط مخصص:"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "إطار إطرق الإدخال IBUS"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "تفضيلات IBus"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "إعادة تشغيل"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
 
-#: ../ui/gtk/panel.py:414
-#, fuzzy
-msgid "Turn off input method"
-msgstr "لا يوجد طريقة إدخال"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "طريقة الإدخال التالية"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "نظام IBus هو ناقل إدخال ذكي لنظام لينكس ويونكس."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "طريقة الإدخال السابقة"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-#, fuzzy
-msgid "About the input method"
-msgstr "طرق الإدخال"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "تبديل طريقة الإدخال"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "تفعيّل أو تثبيط:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "حول"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
-#, fuzzy
-msgid "About the Input Method"
-msgstr "طرق الإدخال"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>اختصارات لوحة المفاتيح</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, fuzzy, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "اختصارات لوحة المفاتيح"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "الاتجاهات المرشحة:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "إظهار لوحة اللغات:"
+
+#: ../setup/setup.ui.h:26
+#, fuzzy
+msgid "Language panel position:"
+msgstr "إظهار لوحة اللغات:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
 msgstr ""
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "زناد"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#, fuzzy
+msgid "Show input method name on language bar"
+msgstr "اسم الخط المخصص للوحة اللغة"
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../setup/setup.ui.h:29
+#, fuzzy
+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/main.py:124
-msgid "disable"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "طريقة الإدخال التالية"
+#: ../setup/setup.ui.h:32
+#, fuzzy
+msgid "Use custom font:"
+msgstr "استعمال خط مخصص"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "طريقة الإدخال السابقة"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>الخط والتنسيق</b>"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "خادم IBUS لم يبدأ من قبل. هل تريد تشغيله الآن؟"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "عام"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "اختر الاختصار ل %s"
-
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "اختصارات لوحة المفاتيح"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "كود المفتاح"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
 msgstr ""
-"فضلا اضغط مفتاح أو (عدة مفاتيح).\n"
-"صندوق الحوار سيغلق عند ترك المفتاح."
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "فضلا اضغط مفتاح أو عدة مفاتيح"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "طرق الإدخال"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "اختر طريقة الإدخال"
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 #, fuzzy
 msgid "Input Method"
 msgstr "طرق الإدخال"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "تفضيلات IBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: ../setup/setup.ui.h:46
 #, fuzzy
-msgid "Set IBus Preferences"
-msgstr "تفضيلات IBus"
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>اختصارات لوحة المفاتيح</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "اختر طريقة الإدخال"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>ناقل الإدخال الذكي</small>\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 "<b>Startup</b>"
+msgstr "<b>البدء</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "حول"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+#, fuzzy
+msgid "Input Method Framework"
+msgstr "إطار إطرق الإدخال IBUS"
+
+#: ../bus/ibus.desktop.in.h:3
+#, fuzzy
+msgid "Start IBus Input Method Framework"
+msgstr "إطار إطرق الإدخال IBUS"
 
 #: ../data/ibus.schemas.in.h:1
 #, fuzzy
-msgid "Auto hide"
-msgstr "اخفاء تلقائي"
+msgid "Preload engines"
+msgstr "المحركات المحملة مسبقا"
 
 #: ../data/ibus.schemas.in.h:2
 #, fuzzy
-msgid "Custom font"
-msgstr "خط مخصص:"
+msgid "Preload engines during ibus starts up"
+msgstr "المحركات المحملة مسبقا عند بدء ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "اسم الخط المخصص للوحة اللغة"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
+msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:6
 #, fuzzy
-msgid "Enable input method by default"
-msgstr "طريقة الإدخال التالية"
+msgid "Trigger shortcut keys"
+msgstr "مفتاح الزناد"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "مفتاح الزناد"
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Language panel position"
-msgstr "إظهار لوحة اللغات:"
+msgid "The shortcut keys for turning input method on"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:9
 #, fuzzy
-msgid "Next engine shortcut keys"
-msgstr "مفتاح المحرك التالي"
+msgid "Disable shortcut keys"
+msgstr "مفتاح الزناد"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
+msgid "The shortcut keys for turning input method off"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
+#, fuzzy
+msgid "Next engine shortcut keys"
+msgstr "مفتاح المحرك التالي"
 
 #: ../data/ibus.schemas.in.h:12
-#, fuzzy
-msgid "Preload engines"
-msgstr "المحركات المحملة مسبقا"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
 #, fuzzy
-msgid "Preload engines during ibus starts up"
-msgstr "المحركات المحملة مسبقا عند بدء ibus"
-
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
 msgid "Prev engine shortcut keys"
 msgstr "مفتاح المحرك السابق"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-#, fuzzy
-msgid "Show input method name"
-msgstr "اسم الخط المخصص للوحة اللغة"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
+#: ../data/ibus.schemas.in.h:15
 #, fuzzy
-msgid "Show input method name on language bar"
-msgstr "اسم الخط المخصص للوحة اللغة"
+msgid "Auto hide"
+msgstr "اخفاء تلقائي"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+#, fuzzy
+msgid "Language panel position"
+msgstr "إظهار لوحة اللغات:"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:22
-msgid "The shortcut keys for switching to the previous input method"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:22
 #, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "مفتاح الزناد"
+msgid "Show input method name"
+msgstr "اسم الخط المخصص للوحة اللغة"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "استعمال خط مخصص"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "استخدم خط مخصص في لوحة اللغة"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:28
 #, fuzzy
-msgid "Use global input method"
-msgstr "اختر طريقة الإدخال"
+msgid "Custom font"
+msgstr "خط مخصص:"
 
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr ""
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "اسم الخط المخصص للوحة اللغة"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>الخط والتنسيق</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+#, fuzzy
+msgid "Use global input method"
 msgstr "اختر طريقة الإدخال"
 
-#: ../setup/setup.ui.h:4
+#: ../data/ibus.schemas.in.h:34
 #, fuzzy
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>اختصارات لوحة المفاتيح</b>"
+msgid "Enable input method by default"
+msgstr "طريقة الإدخال التالية"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>اختصارات لوحة المفاتيح</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>البدء</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ناقل الإدخال الذكي</small>\n"
-"الموقع: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "أخرى"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr ""
+#: ../setup/engineabout.py:70
+#, fuzzy, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "اختصارات لوحة المفاتيح"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "الاتجاهات المرشحة:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "اختر طريقة الإدخال"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
 #, fuzzy
-msgid "Custom"
-msgstr "خط مخصص:"
+msgid "Set IBus Preferences"
+msgstr "تفضيلات IBus"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "اختصارات لوحة المفاتيح"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr ""
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "كود المفتاح"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
+"فضلا اضغط مفتاح أو (عدة مفاتيح).\n"
+"صندوق الحوار سيغلق عند ترك المفتاح."
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "تفعيّل أو تثبيط:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "فضلا اضغط مفتاح أو عدة مفاتيح"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr ""
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "زناد"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "عام"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-#, fuzzy
-msgid "Horizontal"
+#: ../setup/main.py:81
+msgid "disable"
 msgstr ""
-"أفقي\n"
-"عمودي"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/main.py:323
 #, fuzzy
-msgid "Language panel position:"
-msgstr "إظهار لوحة اللغات:"
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "خادم IBUS لم يبدأ من قبل. هل تريد تشغيله الآن؟"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:344
+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 ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "طريقة الإدخال التالية"
-
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "طريقة الإدخال السابقة"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "اختر الاختصار ل %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "نظام IBus هو ناقل إدخال ذكي لنظام لينكس ويونكس."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr ""
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr ""
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "إعادة تشغيل"
 
-#: ../setup/setup.ui.h:46
 #, fuzzy
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "اسم الخط المخصص للوحة اللغة"
-
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "إظهار لوحة اللغات:"
+#~ msgid "Previous page"
+#~ msgstr "طريقة الإدخال السابقة"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "بدء ibus عند الولوج"
+#, fuzzy
+#~ msgid "Restart Now"
+#~ msgstr "إعادة تشغيل"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
+#, fuzzy
+#~ msgid "Later"
+#~ msgstr "أخرى"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
+#~ msgid "IBus input method framework"
+#~ msgstr "إطار إطرق الإدخال IBUS"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr ""
+#, fuzzy
+#~ msgid "Turn off input method"
+#~ msgstr "لا يوجد طريقة إدخال"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr ""
+#~ msgid "Switch input method"
+#~ msgstr "تبديل طريقة الإدخال"
 
-#: ../setup/setup.ui.h:54
 #, fuzzy
-msgid "Use custom font:"
-msgstr "استعمال خط مخصص"
+#~ msgid "About the Input Method"
+#~ msgstr "طرق الإدخال"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr ""
+#~ msgid "next input method"
+#~ msgstr "طريقة الإدخال التالية"
 
-#: ../setup/setup.ui.h:58
-#, fuzzy
-msgid "When active"
-msgstr ""
-"أبدا\n"
-"عند التفعيل\n"
-"دائما"
+#~ msgid "previous input method"
+#~ msgstr "طريقة الإدخال السابقة"
 
 #, fuzzy
 #~ msgid "Use global engine"
diff --git a/po/as.po b/po/as.po
index 2b1ad482f..ef181fd7d 100644
--- a/po/as.po
+++ b/po/as.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ibus.as\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-23 10:15+0000\n"
 "Last-Translator: ngoswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
@@ -21,293 +21,313 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "অনুভূমিক"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "উল্লম্ব"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ইনপুট পদ্ধতি গাথনি"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "তালিকাত প্ৰোথিত"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ইনপুট পদ্ধতি গাথনি আৰম্ভ কৰা"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "সক্ৰিয় অৱস্থাত"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "সদায়ে"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "অন্য"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ওপৰৰ বাওঁফালৰ কোণত"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "পূৰ্ববৰ্তী পৃষ্ঠা"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ওপৰৰ সোঁফালৰ কোণত"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "পৰবৰ্তী পৃষ্ঠা"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "তলৰ বাওঁফালৰ কোণত"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"কিছুমান নিবেশ পদ্ধতিক সংস্থাপন, আঁতৰুৱা বা উন্নত কৰা হৈছে । অনুগ্ৰহ কৰি ibus"
-" নিবেশৰ মঞ্চ পুনৰাৰম্ভ কৰক ।"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "তলৰ সোঁফালৰ কোণত"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "এতিয়া পুনৰাৰম্ভ কৰক"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "স্বনিৰ্ধাৰিত"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "পিছত"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus পছন্দ"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus input method framework"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "তালিকাত উপস্থিত পৰবৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট চাবি"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "পুনৰাৰম্ভ"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "পিছৰ নিবেশ পদ্ধতি:"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "নিবেশ পদ্ধতি বন্ধ কৰক"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "তালিকাত উপস্থিত পূৰ্ববৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট চাবি"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "নিবেশৰ সংযোগক্ষেত্ৰ নাই"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "আগৰ নিবেশ পদ্ধতি"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান নিবেশ bus ।"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "নিবেশ পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় ছৰ্ট-কাট চাবি নিৰ্ধাৰণ কৰক"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "সক্ৰিয় বা নিষ্ক্ৰিয় কৰক:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "নিবেশ পদ্ধতি সলনি কৰক"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "সামৰ্থবান কৰা:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "বিষয়ে"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "অসামৰ্থবান কৰা:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>কীবৰ্ডৰ চমুপথবোৰ</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ভাষা: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "লুক-আপ টেবুলত প্ৰযোজ্য বিকল্পসমূহৰ দিশ নিৰ্ধাৰণ কৰক"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "চাবিৰ ফলকৰ বিন্যাস: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "প্ৰাৰ্থীৰ দিশ:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "লিখক: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ভাষাৰ বাৰ প্ৰদৰ্শন আৰু লুকুৱাৰ উদ্দেশ্যে ibus ৰ আচৰণ নিৰ্ধাৰণ কৰক"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "বিৱৰণ:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ভাষাৰ পেনেল দেখুৱাওক:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ট্ৰিগাৰ"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ভাষাৰ পেনেলৰ স্থান:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "সামৰ্থবান কৰা"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "প্ৰণালী ট্ৰত আইকন প্ৰদৰ্শন কৰা হ'ব"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "অসামৰ্থবান কৰা"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "পিছৰ নিবেশ পদ্ধতি"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "চেকবক্স নিৰ্বাচিত হ'লে ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম প্ৰদৰ্শন কৰা হ'ব"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "আগৰ নিবেশ পদ্ধতি"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr ""
-"IBus ডেমন আৰম্ভ কৰা হোৱা নাই । আপুনি ইয়াক এতিয়া আৰম্ভ কৰিব বিচাৰে নেকি ?"
+#: ../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/main.py:301
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>ফন্ট আৰু শৈলী</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "নিৰ্বাচিত নিবেশ পদ্ধতি সংক্ৰান্ত তথ্য প্ৰদৰ্শন কৰা হ'ব"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus আৰম্ভ কৰা হ'ল! IBus ব্যৱহাৰ কৰিব নোৱাৰিলে, এই শাৰী$HOME/.bashrc ত যোগ দিয়ক, আৰু আপোনাৰ ডেষ্কট'পত পুনঃ প্ৰৱেশ কৰক ।\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>অবিকল্পিত নিবেশ পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত ।\n"
+"তাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে ।</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ৰ কাৰণে চাবিফলকৰ চমুপথ নিৰ্ব্বাচন কৰক"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "নিবেশ পদ্ধতি"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "কীবৰ্ডৰ চমুপথবোৰ"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "প্ৰণালী চাবিৰ ফলক বিন্যাস প্ৰয়োগ কৰা হ'ব"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "চাবিৰ কোড:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "প্ৰণালী চাবিৰ ফলক (XKB) বিন্যাস প্ৰয়োগ কৰা হ'ব"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "পৰিবৰ্তক:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>চাবিৰ ফলকৰ বিন্যাস</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "সকলো অনুপ্ৰয়োগৰ মাজত একেই নিবেশ পদ্ধতি অংশীদাৰ কৰক"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "উন্নত"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ) ।\n"
-"চাবি এৰিলে সম্বাদ বন্ধ হ'ব ।"
+"<big><b>IBus</b></big>\n"
+"<small>বুদ্ধিমান নিবেশ bus</small>\n"
+"ঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "প্ৰৱেশত ibus আৰম্ভ কৰক"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>ষ্টাৰ্টআপ</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "নিবেশ পদ্ধতি"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "বিষয়ে"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus পছন্দ"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ইনপুট পদ্ধতি গাথনি"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus পছন্দসমূহ সংহতি কৰক"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ইনপুট পদ্ধতি গাথনি আৰম্ভ কৰা"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "স্বয়ংক্ৰিয়ভাবে লুকাওক"
+msgid "Preload engines"
+msgstr "কলঘৰ আগতে তুলি লোৱা হ'ব"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "স্বনিৰ্ধাৰিত ফন্ট"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus আৰম্ভৰ আগতে কলঘৰ তুলি লওক"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্ট"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "চৰ্টকাট কিসমূহ অসামৰ্থবান কৰক"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+msgid "Trigger shortcut keys"
+msgstr "ট্ৰিগাৰৰ ছৰ্টকাট চাবি"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱে সামৰ্থবান কৰক"
+msgid "Enable shortcut keys"
+msgstr "চৰ্টকাট কিসমূহ সামৰ্থবান কৰা"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"যেতিয়া অনুপ্ৰয়োগে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি "
-"সামৰ্থবান কৰা"
+msgid "The shortcut keys for turning input method on"
+msgstr "ইনপুট পদ্ধতি খুলিবলে চৰ্টকাট কিসমূহ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "চৰ্টকাট কিসমূহ সামৰ্থবান কৰা"
+msgid "Disable shortcut keys"
+msgstr "চৰ্টকাট কিসমূহ অসামৰ্থবান কৰক"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "ভাষাৰ পেনেলৰ স্থান"
+msgid "The shortcut keys for turning input method off"
+msgstr "ইনপুট পদ্ধতি বন্ধ কৰিবলে চৰ্টকাট কিসমূহ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "পৰবৰ্তী কলঘৰৰ বাবে ছৰ্টকাট চাবি"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "লুক-আপ টেবুলৰ দিশ"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "তালিকাত থকা পৰৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কিসমূহ"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "লুকআপ টেবুলৰ দিশ । ০ = অনুভূমিক, ১ = উলম্ব"
-
-#: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "কলঘৰ আগতে তুলি লোৱা হ'ব"
-
-#: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus আৰম্ভৰ আগতে কলঘৰ তুলি লওক"
-
-#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "পূৰ্ববৰ্তী কলঘৰৰ ছৰ্টকাট চাবি"
 
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "সকলো অনুপ্ৰয়োগৰ মাজত একেই নিবেশ পদ্ধতি অংশীদাৰ কৰক"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "প্ৰণালী ট্ৰত আইকন প্ৰদৰ্শন কৰা হ'ব"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "তালিকাত থকা পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কিসমূহ"
 
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "স্বয়ংক্ৰিয়ভাবে লুকাওক"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
-"ভাষাৰ পেনেলৰ আচৰণ । ০ = তালিকাত প্ৰোথিত, ১ = স্বয়ংক্ৰিয়ভাবে লুকাওক, ২ = সদায়"
-" দেখুৱাওক"
+"ভাষাৰ পেনেলৰ আচৰণ । ০ = তালিকাত প্ৰোথিত, ১ = স্বয়ংক্ৰিয়ভাবে লুকাওক, ২ = সদায় "
+"দেখুৱাওক"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ভাষাৰ পেনেলৰ স্থান"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -315,236 +335,231 @@ msgstr ""
 "ভাষাৰ পেনেলৰ স্থান । 0 = ওপৰৰ বাওঁফালৰ কোণত, 1 = ওপৰৰ সোঁফালৰ কোণত, 2 = তলৰ "
 "বাওঁফালৰ কোণত, 3 = তলৰ সোঁফালৰ কোণত, 4 = স্বনিৰ্ধাৰিত"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "তালিকাত থকা পৰৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কিসমূহ"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "লুক-আপ টেবুলৰ দিশ"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "তালিকাত থকা পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কিসমূহ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "লুকআপ টেবুলৰ দিশ । ০ = অনুভূমিক, ১ = উলম্ব"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ইনপুট পদ্ধতি বন্ধ কৰিবলে চৰ্টকাট কিসমূহ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ইনপুট পদ্ধতি খুলিবলে চৰ্টকাট কিসমূহ"
+msgid "Use custom font"
+msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr ""
-"নিবেশ পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় ছৰ্ট-কাট চাবি নিৰ্ধাৰণ কৰক"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ট্ৰিগাৰৰ ছৰ্টকাট চাবি"
+msgid "Custom font"
+msgstr "স্বনিৰ্ধাৰিত ফন্ট"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব"
+msgid "Custom font name for language panel"
+msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্ট"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
+msgid "Embed Preedit Text"
+msgstr "প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "সৰ্বব্যাপী নিবেশ পদ্ধতি ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "প্ৰণালী চাবিৰ ফলক (XKB) বিন্যাস প্ৰয়োগ কৰা হ'ব"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "প্ৰণালী চাবিৰ ফলক বিন্যাস প্ৰয়োগ কৰা হ'ব"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ফন্ট আৰু শৈলী</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>চাবিৰ ফলকৰ বিন্যাস</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱে সামৰ্থবান কৰক"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>কীবৰ্ডৰ চমুপথবোৰ</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"যেতিয়া অনুপ্ৰয়োগে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান "
+"কৰা"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ষ্টাৰ্টআপ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>বুদ্ধিমান নিবেশ bus</small>\n"
-"ঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>অবিকল্পিত নিবেশ পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত ।\n"
-"তাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে ।</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "নিৰ্বাচিত নিবেশ পদ্ধতিক সক্ৰিয় নিবেশ পদ্ধতিৰ তালিকাত যোগ কৰক"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "অন্য"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "উন্নত"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ভাষা: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "সদায়ে"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "চাবিৰ ফলকৰ বিন্যাস: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "তলৰ বাওঁফালৰ কোণত"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "লিখক: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "তলৰ সোঁফালৰ কোণত"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "বিৱৰণ:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "প্ৰাৰ্থীৰ দিশ:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "স্বনিৰ্ধাৰিত"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "অসামৰ্থবান কৰা:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus পছন্দসমূহ সংহতি কৰক"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "কীবৰ্ডৰ চমুপথবোৰ"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত নিবেশ পদ্ধতিৰ প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "চাবিৰ কোড:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "তালিকাত প্ৰোথিত"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "পৰিবৰ্তক:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "সক্ৰিয় বা নিষ্ক্ৰিয় কৰক:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ) ।\n"
+"চাবি এৰিলে সম্বাদ বন্ধ হ'ব ।"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "সামৰ্থবান কৰা:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "সাধাৰণ"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ট্ৰিগাৰ"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "অনুভূমিক"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "সামৰ্থবান কৰা"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ভাষাৰ পেনেলৰ স্থান:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "অসামৰ্থবান কৰা"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ডেমন আৰম্ভ কৰা হোৱা নাই । আপুনি ইয়াক এতিয়া আৰম্ভ কৰিব বিচাৰে নেকি ?"
+
+#: ../setup/main.py:344
+#, fuzzy
+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 আৰম্ভ কৰা হ'ল! IBus ব্যৱহাৰ কৰিব নোৱাৰিলে, এই শাৰী$HOME/.bashrc ত যোগ "
+"দিয়ক, আৰু আপোনাৰ ডেষ্কট'পত পুনঃ প্ৰৱেশ কৰক ।\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"নিৰ্বাচিত নিবেশ পদ্ধতিক সক্ৰিয় নিবেশ পদ্ধতিৰ তালিকাৰ ওপৰলৈ স্থানান্তৰ কৰক"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "পিছৰ নিবেশ পদ্ধতি:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ৰ কাৰণে চাবিফলকৰ চমুপথ নিৰ্ব্বাচন কৰক"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "আগৰ নিবেশ পদ্ধতি"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "সক্ৰিয় নিবেশ পদ্ধতিৰ তালিকাৰ পৰা নিৰ্বাচিত নিবেশ পদ্ধতি আঁতৰুৱা হ'ব"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান নিবেশ bus ।"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ভাষাৰ বাৰ প্ৰদৰ্শন আৰু লুকুৱাৰ উদ্দেশ্যে ibus ৰ আচৰণ নিৰ্ধাৰণ কৰক"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "লুক-আপ টেবুলত প্ৰযোজ্য বিকল্পসমূহৰ দিশ নিৰ্ধাৰণ কৰক"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "পুনৰাৰম্ভ"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "নিৰ্বাচিত নিবেশ পদ্ধতি সংক্ৰান্ত তথ্য প্ৰদৰ্শন কৰা হ'ব"
+#~ msgid "Previous page"
+#~ msgstr "পূৰ্ববৰ্তী পৃষ্ঠা"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "চেকবক্স নিৰ্বাচিত হ'লে ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম প্ৰদৰ্শন কৰা হ'ব"
+#~ msgid "Next page"
+#~ msgstr "পৰবৰ্তী পৃষ্ঠা"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ভাষাৰ পেনেল দেখুৱাওক:"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "কিছুমান নিবেশ পদ্ধতিক সংস্থাপন, আঁতৰুৱা বা উন্নত কৰা হৈছে । অনুগ্ৰহ কৰি ibus "
+#~ "নিবেশৰ মঞ্চ পুনৰাৰম্ভ কৰক ।"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "প্ৰৱেশত ibus আৰম্ভ কৰক"
+#~ msgid "Restart Now"
+#~ msgstr "এতিয়া পুনৰাৰম্ভ কৰক"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"তালিকাত উপস্থিত পৰবৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট চাবি"
+#~ msgid "Later"
+#~ msgstr "পিছত"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"তালিকাত উপস্থিত পূৰ্ববৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট "
-"চাবি"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus input method framework"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ওপৰৰ বাওঁফালৰ কোণত"
+#~ msgid "Turn off input method"
+#~ msgstr "নিবেশ পদ্ধতি বন্ধ কৰক"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ওপৰৰ সোঁফালৰ কোণত"
+#~ msgid "No input window"
+#~ msgstr "নিবেশৰ সংযোগক্ষেত্ৰ নাই"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক:"
+#~ msgid "About the input method"
+#~ msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "উল্লম্ব"
+#~ msgid "Switch input method"
+#~ msgstr "নিবেশ পদ্ধতি সলনি কৰক"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "সক্ৰিয় অৱস্থাত"
+#~ msgid "About the Input Method"
+#~ msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
+
+#~ msgid "next input method"
+#~ msgstr "পিছৰ নিবেশ পদ্ধতি"
+
+#~ msgid "previous input method"
+#~ msgstr "আগৰ নিবেশ পদ্ধতি"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 8d960d060..e65d7ba37 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-08-02 18:27+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -19,277 +19,306 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "অনুভূমিক"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ইনপুট পদ্ধতির পরিকাঠামো"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "উল্লম্ব"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো আরম্ভ করা হবে"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
 
-#: ../ibus/_config.py.in:39
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\n"
-"স্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "সক্রিয় অবস্থায়"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "অন্যান্য"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "সর্বদা"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "পূর্ববর্তী পৃষ্ঠা"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "উপরে বাঁদিকের কোণায়"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "পরবর্তী পৃষ্ঠা"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "উপরে ডানদিকের কোণায়"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"কয়েকটি ইনপুট পদ্ধতি ইনস্টল, অপসারণ অথবা আপডেট করা হয়েছে। অনুগ্রহ করে ibus ইনপুট "
-"প্ল্যাটফর্ম পুনরায় আরম্ভ করুন।"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "নীচে বাঁদিকের কোণায়"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "অবিলম্বে পুনরারম্ভ"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "নীচে ডানদিকের কোণায়"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "পরে"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "স্বনির্ধারিত"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus সংক্রান্ত পছন্দ"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "পুনরারম্ভ"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "ইনপুট পদ্ধতি বন্ধ করুন"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "পরবর্তী ইনপুট পদ্ধতি:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "ইনপুটের উদ্দেশ্যে উইন্ডো অনুপস্থিত"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ইনপুট পদ্ধতি পরিচিতি"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ইনপুট পদ্ধতি পরিবর্তন করুন"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "সক্রিয় অথা নিষ্ক্রিয় করুন:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "পরিচিতি"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ইনপুট পদ্ধতি পরিচিতি"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ভাষা: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>কি-বোর্ড শর্ট-কাট</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "কি-বোর্ড বিন্যাস: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "লুক-আপ টেবিলের মধ্যে প্রযোজ্য বিকল্পগুলির দিশা নির্ধারণ করুন"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "নির্মাতা: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "নির্বাচিত বস্তুর দিশা:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "বিবরণ:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ভাষার বার প্রদর্শন ও আড়াল করার উদ্দেশ্যে ibus-র আচরণ নির্ধারণ করুন"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ট্রিগার"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ভাষার প্যানেল প্রদর্শন করা হবে:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr ""
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr ""
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "পরবর্তী ইনপুট পদ্ধতি"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "পূর্ববর্তী ইনপুট পদ্ধতি"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus ডেমন আরম্ভ করা হয়নি। এটি এখন আরম্ভ করা হবে কি?"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>ফন্ট ও বিন্যাস</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "সাধারণ"
 
-#: ../setup/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব নয় হলে $HOME/.bashrc ফাইলের মধ্যে "
-"নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n"
+"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></"
+"small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "কি-বোর্ড শর্ট-কাট"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "কি-র কোড:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "পরিবর্তক:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "উন্নত"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\n"
-"কি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।"
+"<big><b>IBus</b></big>\n"
+"<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\n"
+"হোম-পেজ: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>প্রারম্ভ</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ইনপুট পদ্ধতি"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "পরিচিতি"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus সংক্রান্ত পছন্দ"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ইনপুট পদ্ধতির পরিকাঠামো"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো আরম্ভ করা হবে"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
+msgid "Preload engines"
+msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "স্বনির্ধারিত ফন্ট"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি পূর্বে লোড করা হবে"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Enable input method by default"
-msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
+msgid "Trigger shortcut keys"
+msgstr "ট্রিগারের শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি "
-"সক্রিয় করা হবে"
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "ট্রিগারের শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "ভাষার প্যানেলের অবস্থান"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "ট্রিগারের শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "লুক-আপ টেবিলের দিশা"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
+msgid "Next engine shortcut keys"
+msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি পূর্বে লোড করা হবে"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -297,7 +326,11 @@ msgstr ""
 "ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = মেনুর মধ্যে সন্নিবেশ করা হবে, 1 (১) = "
 "স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ভাষার প্যানেলের অবস্থান"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -305,223 +338,231 @@ msgstr ""
 "ভাষার প্যানেলের অবস্থান। 0 = উপরে বাঁদিকের কোণায়, 1 = উপরে ডানদিকের কোণায়, 2 = "
 "নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
-
-#: ../data/ibus.schemas.in.h:22
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "ট্রিগারের শর্টকাট-কি"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "সার্বজনীন ইনপুট পদ্ধতি "
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ফন্ট ও বিন্যাস</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>কি-বোর্ড শর্ট-কাট</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি "
+"সক্রিয় করা হবে"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>প্রারম্ভ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\n"
-"হোম-পেজ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n"
-"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></"
-"small>"
+"স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\n"
+"স্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকা যোগ করা হবে"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "অন্যান্য"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "উন্নত"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ভাষা: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "সর্বদা"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "কি-বোর্ড বিন্যাস: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "নীচে বাঁদিকের কোণায়"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "নির্মাতা: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "নীচে ডানদিকের কোণায়"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "বিবরণ:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "নির্বাচিত বস্তুর দিশা:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "স্বনির্ধারিত"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "কি-বোর্ড শর্ট-কাট"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ্যে ইনপুট পদ্ধতির প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "কি-র কোড:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "পরিবর্তক:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "সক্রিয় অথা নিষ্ক্রিয় করুন:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\n"
+"কি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ট্রিগার"
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "সাধারণ"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "অনুভূমিক"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ডেমন আরম্ভ করা হয়নি। এটি এখন আরম্ভ করা হবে কি?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ভাষার প্যানেলের অবস্থান:"
+#: ../setup/main.py:344
+#, fuzzy
+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 আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব নয় হলে $HOME/.bashrc ফাইলের মধ্যে "
+"নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "পরবর্তী ইনপুট পদ্ধতি:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\n"
+"স্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ভাষার বার প্রদর্শন ও আড়াল করার উদ্দেশ্যে ibus-র আচরণ নির্ধারণ করুন"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "পুনরারম্ভ"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "লুক-আপ টেবিলের মধ্যে প্রযোজ্য বিকল্পগুলির দিশা নির্ধারণ করুন"
+#~ msgid "Previous page"
+#~ msgstr "পূর্ববর্তী পৃষ্ঠা"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
+#~ msgid "Next page"
+#~ msgstr "পরবর্তী পৃষ্ঠা"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "কয়েকটি ইনপুট পদ্ধতি ইনস্টল, অপসারণ অথবা আপডেট করা হয়েছে। অনুগ্রহ করে ibus ইনপুট "
+#~ "প্ল্যাটফর্ম পুনরায় আরম্ভ করুন।"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ভাষার প্যানেল প্রদর্শন করা হবে:"
+#~ msgid "Restart Now"
+#~ msgstr "অবিলম্বে পুনরারম্ভ"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
+#~ msgid "Later"
+#~ msgstr "পরে"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+#~ msgid "Turn off input method"
+#~ msgstr "ইনপুট পদ্ধতি বন্ধ করুন"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "উপরে বাঁদিকের কোণায়"
+#~ msgid "No input window"
+#~ msgstr "ইনপুটের উদ্দেশ্যে উইন্ডো অনুপস্থিত"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "উপরে ডানদিকের কোণায়"
+#~ msgid "About the input method"
+#~ msgstr "ইনপুট পদ্ধতি পরিচিতি"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন:"
+#~ msgid "Switch input method"
+#~ msgstr "ইনপুট পদ্ধতি পরিবর্তন করুন"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "উল্লম্ব"
+#~ msgid "About the Input Method"
+#~ msgstr "ইনপুট পদ্ধতি পরিচিতি"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "সক্রিয় অবস্থায়"
+#~ msgid "next input method"
+#~ msgstr "পরবর্তী ইনপুট পদ্ধতি"
+
+#~ msgid "previous input method"
+#~ msgstr "পূর্ববর্তী ইনপুট পদ্ধতি"
diff --git a/po/ca.po b/po/ca.po
index 68a0d3047..a2b2ec5db 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,309 +2,333 @@
 # Catalan translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Oscar Osta <oostap.listas@gmail.com>, 2011.
 # Oscar Osta Pueyo <oostap@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-24 07:17+0000\n"
 "Last-Translator: oostap <oostap.listas@gmail.com>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horitzontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Entorn de mètodes d'entrada"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertical"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Inicia l'entorn de mètodes d'entrada IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Incrusta al menú"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Quan estigui actiu"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Altres"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Sempre"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Pàgina anterior"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Cantonada superior esquerra"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Pàgina següent"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Cantonada superior dreta"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Cantonada inferior esquerra"
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Cantonada inferior dreta"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Personalitzat"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferències de l'IBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"S'han instal·lat, suprimit o actualitzat alguns mètodes d'entrada. Reinicieu"
-" la plataforma d'entrada IBus."
+"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Reinicia ara"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Mètode d'entrada següent:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Després"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Quadre de l'IBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Mètode d'entrada anterior:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "Entorn de mètodes d'entrada IBus"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Reinicia"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Inhabilita el mètode d'entrada"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Habilita o inhabilita:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Cap finestra d'entrada"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Habilita:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Inhabilita:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Dreceres de teclat</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Estableix l'orientació dels candidats a la taula de cerca"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientació dels candidats:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
-"Oscar Osta Pueyo <oostap@gmail.com>, 2009\n"
-"Patricia Rivera Escuder <patysya@gmail.com>, 2009\n"
-"Xavier Conde Rueda <xavi.conde@gmail.com>\n"
-"Joan Duran <jodufi@gmail.com>"
+"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
+"d'idiomes"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Quant al mètode d'entrada"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Mostra el quadre d'idiomes:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Commuta el mètode d'entrada"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posició del quadre d'idiomes:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Quant a"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Mostra la icona a la safata del sistema"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Quant al mètode d'entrada"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Idioma: %s\n"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
+"casella de selecció"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Disposició del teclat: %s\n"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Incrusta el text editat prèviament en la finestra d'aplicació"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+"Incrusta el text editat prèviament del mètode d'entrada en la finestra "
+"d'aplicació"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Descripció: \n"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Utilitza un tipus de lletra personalitzat:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "activador"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Tipus de lletra i estil</b>"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "habilita"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "General"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "inhabilita"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "mètode d'entrada següent"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "mètode d'entrada anterior"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "No s'ha iniciat el dimoni de l'IBus. Voleu iniciar-lo ara?"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Mostra la informació del mètode d'entrada seleccionat"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Mostra la informació del mètode d'entrada seleccionat"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"S'ha iniciat l'IBus. Si no podeu utilitzar l'IBus, afegiu les línies següents a $HOME/.bashrc, i torneu a entrar a l'escriptori.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>El mètode d'entrada predeterminat és el primer de la llista.\n"
+"Podeu utilitzar els botons de pujar i baixar per canviar-lo.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Seleccioneu la drecera de teclat per a %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Mètode d'entrada"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Dreceres de teclat"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Codi de lletra:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificadors:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposició del teclat</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Comparteix el mateix mètode d'entrada en totes les aplicacions"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Paràmetres del mètode d'entrada global</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Premeu una tecla (o una combinació de tecles).\n"
-"El diàleg es tancarà quan es deixi anar la tecla."
+"<big><b>IBus</b></big>\n"
+"<small>El bus d'entrada intel·ligent</small>\n"
+"Lloc web: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Premeu una tecla (o una combinació de tecles)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Inicia l'IBus en entrar"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Seleccioneu un mètode d'entrada"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Inici</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Mètode d'entrada"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Quant a"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Preferències de l'IBus"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Entorn de mètodes d'entrada"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Estableix les preferències de l'IBus"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Inicia l'entorn de mètodes d'entrada IBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Oculta automàticament"
+msgid "Preload engines"
+msgstr "Precarrega els motors"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Tipus de lletra personalitzat"
+msgid "Preload engines during ibus starts up"
+msgstr "Precarrega els motors durant l'inici de l'IBus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Inhabilita les dreceres de teclat"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Integra el text editat prèviament"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Integra el text editat prèviament en la finestra de l'aplicació"
+msgid "Trigger shortcut keys"
+msgstr "Dreceres de teclat de l'activador"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Habilita els mètodes d'entrada per defecte"
+msgid "Enable shortcut keys"
+msgstr "Habilita les dreceres de teclat"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
-"d'entrada"
+msgid "The shortcut keys for turning input method on"
+msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Habilita les dreceres de teclat"
+msgid "Disable shortcut keys"
+msgstr "Inhabilita les dreceres de teclat"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Posició del quadre d'idiomes"
+msgid "The shortcut keys for turning input method off"
+msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Dreceres de teclat del motor següent"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientació de la taula de cerca"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
+msgid "Prev engine shortcut keys"
+msgstr "Dreceres de teclat del motor anterior"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Precarrega els motors"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+"Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Precarrega els motors durant l'inici de l'IBus"
+msgid "Auto hide"
+msgstr "Oculta automàticament"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Dreceres de teclat del motor anterior"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Comparteix el mateix mètode d'entrada en totes les aplicacions"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Mostra la icona a la safata del sistema"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Mostra el nom del mètode d'entrada"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -312,7 +336,11 @@ msgstr ""
 "El comportament del quadre d'idiomes. 0 = incrustat al menú, 1 = oculta "
 "automàticament, 2 = mostra sempre"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Posició del quadre d'idiomes"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -321,248 +349,238 @@ msgstr ""
 "cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
 "inferior dreta, 4 = personalitzat"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada anterior de la "
-"llista"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Mostra el nom del mètode d'entrada"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
+msgid "Use custom font"
+msgstr "Utilitza un tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr ""
-"Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Dreceres de teclat de l'activador"
+msgid "Custom font"
+msgstr "Tipus de lletra personalitzat"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Utilitza un tipus de lletra personalitzat"
+msgid "Custom font name for language panel"
+msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
+msgid "Embed Preedit Text"
+msgstr "Integra el text editat prèviament"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Integra el text editat prèviament en la finestra de l'aplicació"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Utilitza la disposició de teclat del sistema (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Utilitza la disposició de teclat del sistema"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Tipus de lletra i estil</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Paràmetres del mètode d'entrada global</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposició del teclat</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Dreceres de teclat</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
+"d'entrada"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Inici</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus d'entrada intel·ligent</small>\n"
-"Lloc web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>El mètode d'entrada predeterminat és el primer de la llista.\n"
-"Podeu utilitzar els botons de pujar i baixar per canviar-lo.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Altres"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avançat"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Idioma: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Sempre"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Disposició del teclat: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Cantonada inferior esquerra"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Cantonada inferior dreta"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Descripció: \n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientació dels candidats:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Seleccioneu un mètode d'entrada"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Personalitzat"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Inhabilita:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Estableix les preferències de l'IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Incrusta el text editat prèviament en la finestra d'aplicació"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Dreceres de teclat"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Incrusta el text editat prèviament del mètode d'entrada en la finestra "
-"d'aplicació"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Codi de lletra:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Incrusta al menú"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificadors:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Habilita o inhabilita:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Premeu una tecla (o una combinació de tecles).\n"
+"El diàleg es tancarà quan es deixi anar la tecla."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Habilita:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "General"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "activador"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horitzontal"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "habilita"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Posició del quadre d'idiomes:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "inhabilita"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "No s'ha iniciat el dimoni de l'IBus. Voleu iniciar-lo ara?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 ""
-"Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
+"S'ha iniciat l'IBus. Si no podeu utilitzar l'IBus, afegiu les línies "
+"següents a $HOME/.bashrc, i torneu a entrar a l'escriptori.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Mètode d'entrada següent:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Mètode d'entrada anterior:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Seleccioneu la drecera de teclat per a %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
-"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
-"d'idiomes"
+"Oscar Osta Pueyo <oostap@gmail.com>, 2009\n"
+"Patricia Rivera Escuder <patysya@gmail.com>, 2009\n"
+"Xavier Conde Rueda <xavi.conde@gmail.com>\n"
+"Joan Duran <jodufi@gmail.com>"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Estableix l'orientació dels candidats a la taula de cerca"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Reinicia"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostra la informació del mètode d'entrada seleccionat"
+#~ msgid "Previous page"
+#~ msgstr "Pàgina anterior"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
-"casella de selecció"
+#~ msgid "Next page"
+#~ msgstr "Pàgina següent"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Mostra el quadre d'idiomes:"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "S'han instal·lat, suprimit o actualitzat alguns mètodes d'entrada. "
+#~ "Reinicieu la plataforma d'entrada IBus."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Inicia l'IBus en entrar"
+#~ msgid "Restart Now"
+#~ msgstr "Reinicia ara"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+#~ msgid "Later"
+#~ msgstr "Després"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
+#~ msgid "IBus Panel"
+#~ msgstr "Quadre de l'IBus"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Cantonada superior esquerra"
+#~ msgid "IBus input method framework"
+#~ msgstr "Entorn de mètodes d'entrada IBus"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Cantonada superior dreta"
+#~ msgid "Turn off input method"
+#~ msgstr "Inhabilita el mètode d'entrada"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Utilitza un tipus de lletra personalitzat:"
+#~ msgid "No input window"
+#~ msgstr "Cap finestra d'entrada"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertical"
+#~ msgid "About the input method"
+#~ msgstr "Quant al mètode d'entrada"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Quan estigui actiu"
+#~ msgid "Switch input method"
+#~ msgstr "Commuta el mètode d'entrada"
+
+#~ msgid "About the Input Method"
+#~ msgstr "Quant al mètode d'entrada"
 
+#~ msgid "next input method"
+#~ msgstr "mètode d'entrada següent"
 
+#~ msgid "previous input method"
+#~ msgstr "mètode d'entrada anterior"
diff --git a/po/da.po b/po/da.po
index c1c387383..f894ba0fe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,307 +2,318 @@
 # Danish translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\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"
 "Last-Translator: kristho <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\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"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horisontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework for inputmetode"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikal"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus, framework for inputmetode"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Indlejret i menu"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Når aktiv"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Andre"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Altid"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Forrige side"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Øverste venstre hjørne"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Næste side"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Øverste højre hjørne"
 
-#: ../ui/gtk/main.py:62
-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."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Nederste venstre hjørne"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Genstart nu"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Nederste højre hjørne"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Senere"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Brugertilpasset"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus-panel"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Indstillinger for IBus"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus-ramme for inddatametode"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Genvejstaster for skift til den næste inputmetode i listen"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Genstart"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Næste inddatametode:"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Sluk for inputmetode"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Genvejstaster for skift til den forrige inputmetode i listen"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Intet inputvindue"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Forrige inddatametode:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus er en intelligent inddatabus til Linux/Unix."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"Kris Thomsen\n"
-"\n"
-"Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
-"Mere info: http://www.dansk-gruppen.dk"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Genvejstasterne for at tænde og slukke inputmetode"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Om inputmetoden"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aktivér eller deaktivér:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Skift inddatametode"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aktivér"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Om"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Deaktivér:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Om inputmetoden"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastaturgenveje</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Sprog: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Angiv orientering af kandidater i opslagstabel"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastaturlayout: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientering for kandidater:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Forfatter: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Beskrivelse:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Vis sprogpanel:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "udløser"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Placering af sprogpanel:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "aktivér"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Vis ikon i statusfelt"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "deaktivér"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Vis navn på inputmetode i sprogpanel"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Vis inputmetodens navn i sprogpanelet når tjek-boksen er vinget af"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "næste inddatametode"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "forrige inddatametode"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Indlejr forudredigeret tekst for inputmetode i programvinduet"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus-dæmonen er ikke startet. Vil du starte den nu?"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Brug brugertilpasset skrifttype:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Skrifttype og stil</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Generelt"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Tilføj de valgte inputmetoder i de aktiverede inputmetoder"
+
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Fjern den valgte inputmetode fra de aktiverede inputmetoder"
+
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Flyt den valgte inputmetode op i listen over aktiverede inputmetode"
+
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Flyt den valgte inputmetode i de aktiverede inputmetoder ned"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+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"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"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"
+"<small><i>Standard inputmetoden er den øverste i listen.\n"
+"Du kan bruge op/ned-knapperne for at ændre det.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Vælg tastaturgenveje til %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Inputmetode"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Tastaturgenveje"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Brug tastaturlayout for system"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Nøglekode:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Brug systemttastaturlayout (XKB)"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Kombinationstaster:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturlayout</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Del den samme inputmetode i alle programmer"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Indstillinger for global inputmetode</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avanceret"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Tryk venligst på en tast (eller en tastekombination).\n"
-"Dialogen bliver lukket, når tasten slippes."
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligente inddatabus</small>\n"
+"Netsted: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Tryk venligst på en tast (eller en tastekombination)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Start ibus ved logind"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Vælg en inddatametode"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Opstart</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Inputmetode"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Om"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Indstillinger for IBus"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Framework for inputmetode"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Angiv indstillinger for IBus"
+#: ../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 "Auto hide"
-msgstr "Skjul automatisk"
+msgid "Preload engines"
+msgstr "Forindlæs motorer"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Brugertilpasset skrifttype"
+msgid "Preload engines during ibus starts up"
+msgstr "Forindlæs motorer under opstarten af IBus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Tilpasset skrifttypenavn til sprogpanel"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Deaktivér genvejstaster"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Indbyg forudredigeret tekst"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Indlejr forudredigeret tekst i programvindue"
+msgid "Trigger shortcut keys"
+msgstr "Udløser tastaturgenveje"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Aktivér inputmetode som standard"
+msgid "Enable shortcut keys"
+msgstr "Aktivér genvejstaster"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
+msgid "The shortcut keys for turning input method on"
+msgstr "Genvejstasterne for at tænde inputmetode"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Aktivér genvejstaster"
+msgid "Disable shortcut keys"
+msgstr "Deaktivér genvejstaster"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Placering for sprogpanel"
+msgid "The shortcut keys for turning input method off"
+msgstr "Genvejstasterne for slukning af inputmetode"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Genvejstaster for næste motor"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientering af opslagstabel"
+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
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
+msgid "Prev engine shortcut keys"
+msgstr "Genvejstaster for forrige motor"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Forindlæs motorer"
+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
-msgid "Preload engines during ibus starts up"
-msgstr "Forindlæs motorer under opstarten af IBus"
+msgid "Auto hide"
+msgstr "Skjul automatisk"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Genvejstaster for forrige motor"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Del den samme inputmetode i alle programmer"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Vis ikon i statusfelt"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Vis navn på inputmetode"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Vis navn på inputmetode i sprogpanel"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -310,7 +321,11 @@ msgstr ""
 "Sprogpanelets opførsel. 0 = Indlejret i menu, 1 = Skjul automatisk, 2 = Vis "
 "altid"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Placering for sprogpanel"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -319,231 +334,236 @@ msgstr ""
 "hjørne, 2 = Nederste venstre hjørne, 3 = Nederste højre hjørne, 4 = "
 "Brugertilpasset"
 
-#: ../data/ibus.schemas.in.h:23
-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:19
+msgid "Orientation of lookup table"
+msgstr "Orientering af opslagstabel"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Genvejstasterne for at skifte til forrige inputmetode"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Genvejstasterne for slukning af inputmetode"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Vis navn på inputmetode"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Genvejstasterne for at tænde inputmetode"
+msgid "Use custom font"
+msgstr "Brug tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Genvejstasterne for at tænde og slukke inputmetode"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Udløser tastaturgenveje"
+msgid "Custom font"
+msgstr "Brugertilpasset skrifttype"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Brug tilpasset skrifttype"
+msgid "Custom font name for language panel"
+msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
+msgid "Embed Preedit Text"
+msgstr "Indbyg forudredigeret tekst"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Indlejr forudredigeret tekst i programvindue"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Brug systemttastaturlayout (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Brug tastaturlayout for system"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Skrifttype og stil</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Indstillinger for global inputmetode</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastaturlayout</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Aktivér inputmetode som standard"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastaturgenveje</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Opstart</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligente inddatabus</small>\n"
-"Netsted: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Standard inputmetoden er den øverste i listen.\n"
-"Du kan bruge op/ned-knapperne for at ændre det.</i></small>"
+"Ophavsret (c) 2007-2010 Peng Huang\n"
+"Ophavsret (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Tilføj de valgte inputmetoder i de aktiverede inputmetoder"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Andre"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avanceret"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Sprog: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Altid"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturlayout: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Nederste venstre hjørne"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Forfatter: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Nederste højre hjørne"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Beskrivelse:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientering for kandidater:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Vælg en inddatametode"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Brugertilpasset"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Deaktivér:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Angiv indstillinger for IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Indlejr forudredigeret tekst i programvindue"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Tastaturgenveje"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Indlejr forudredigeret tekst for inputmetode i programvinduet"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Nøglekode:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Indlejret i menu"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Kombinationstaster:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Aktivér eller deaktivér:"
+#: ../setup/keyboardshortcut.py:235
+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."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Aktivér"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Tryk venligst på en tast (eller en tastekombination)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Generelt"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "udløser"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horisontal"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "aktivér"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Placering af sprogpanel:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "deaktivér"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Flyt den valgte inputmetode i de aktiverede inputmetoder ned"
+#: ../setup/main.py:323
+#, fuzzy
+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?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Flyt den valgte inputmetode op i listen over aktiverede inputmetode"
+#: ../setup/main.py:344
+#, fuzzy
+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 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/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Næste inddatametode:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Forrige inddatametode:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Vælg tastaturgenveje til %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Fjern den valgte inputmetode fra de aktiverede inputmetoder"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Ophavsret (c) 2007-2010 Peng Huang\n"
+"Ophavsret (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus er en intelligent inddatabus til Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
-"Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
+"Kris Thomsen\n"
+"\n"
+"Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
+"Mere info: http://www.dansk-gruppen.dk"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Angiv orientering af kandidater i opslagstabel"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Genstart"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Vis information om den valgte inputmetode"
+#~ msgid "Previous page"
+#~ msgstr "Forrige side"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Vis inputmetodens navn i sprogpanelet når tjek-boksen er vinget af"
+#~ msgid "Next page"
+#~ msgstr "Næste side"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Vis sprogpanel:"
+#~ 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."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Start ibus ved logind"
+#~ msgid "Restart Now"
+#~ msgstr "Genstart nu"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Genvejstaster for skift til den næste inputmetode i listen"
+#~ msgid "Later"
+#~ msgstr "Senere"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Genvejstaster for skift til den forrige inputmetode i listen"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus-panel"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Øverste venstre hjørne"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus-ramme for inddatametode"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Øverste højre hjørne"
+#~ msgid "Turn off input method"
+#~ msgstr "Sluk for inputmetode"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Brug brugertilpasset skrifttype:"
+#~ msgid "No input window"
+#~ msgstr "Intet inputvindue"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertikal"
+#~ msgid "About the input method"
+#~ msgstr "Om inputmetoden"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Når aktiv"
+#~ msgid "Switch input method"
+#~ msgstr "Skift inddatametode"
+
+#~ msgid "About the Input Method"
+#~ msgstr "Om inputmetoden"
+
+#~ msgid "next input method"
+#~ msgstr "næste inddatametode"
+
+#~ msgid "previous input method"
+#~ msgstr "forrige inddatametode"
diff --git a/po/de.po b/po/de.po
index 1161a681d..6aebb882e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
 # German translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Fabian Affolter <fab@fedoraproject.org>, 2009.
 # Hedda Peters <hpeters@redhat.com>, 2009.
@@ -10,302 +10,328 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-06-23 14:37+0000\n"
 "Last-Translator: mariobl <mariobl@freenet.de>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: German\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Eingabemethode-Framework"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikal"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus-Eingabemethode-Framework starten"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "In Menü eingebettet"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Wenn aktiv"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Sonstige"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Immer"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Vorherige Seite"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Ecke oben links"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Nächste Seite"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Ecke oben rechts"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Ecke unten links"
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Ecke unten rechts"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus-Einstellungen"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"Einige Eingabemethoden wurden installiert, entfernt oder aktualisiert. Bitte"
-" starten Sie die IBus-Eingabe-Plattform erneut."
+"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Jetzt neu starten"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Nächste Eingabemethode:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Später"
+#: ../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"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus-Panel"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Vorherige Eingabemethode:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus-Eingabemethode-Framework"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Neustart"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Eingabemethode ausschalten"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aktivieren oder deaktivieren:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Kein Eingabefenster"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aktivieren:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ist ein intelligenter Eingabe-Bus für Linux/Unix."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Deaktivieren:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastenkombinationen</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Ausrichtung der Kandidaten:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
-"Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
-"Hedda Peters <hpeters@redhat.com>, 2009."
+"Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu verstecken"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Über die Eingabemethode"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Sprach-Panel anzeigen:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Eingabemethode wechseln"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Position des Sprach-Panels:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Info"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Info zu Eingabemethoden"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Sprache: %s\n"
+#: ../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"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastaturbelegung: %s\n"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Beschreibung:\n"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Benutzerdefinierte Schriftart verwenden:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "Auslöser"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Schriftart und Stil</b>"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "aktivieren"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Allgemein"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "deaktivieren"
+#: ../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"
+
+#: ../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"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "Nächste Eingabemethode"
+#: ../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"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "Vorherige Eingabemethode"
+#: ../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"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus-Daemon wurde nicht gestartet. Möchten Sie ihn jetzt starten?"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Informationen zur gewählten Eingabemethode anzeigen"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Informationen zur gewählten Eingabemethode anzeigen"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus wurde gestartet! Falls Sie IBus nicht nutzen können, fügen Sie bitte folgende Zeilen in $HOME/.bashrc hinzu und melden sich neu am Desktop an.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster "
+"Stelle.\n"
+"Sie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Wählen Sie eine Tastenkombination für %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Eingabemethode"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Tastenkombinationen"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Tasten-Code:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "System-Tastatur (XKB) Belegung verwenden"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Hilfstasten:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "Eingabemethode wählen"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Bitte eine Taste (oder eine Tastenkombination drücken).\n"
-"Der Dialog wird geschlossen, wenn die Taste losgelassen wird."
+"<big><b>IBus</b></big>\n"
+"<small>Der intelligente Eingabe-Bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "IBus bei der Anmeldung starten"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Eingabemethode wählen"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Starten</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Eingabemethode"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Info"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus-Einstellungen"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Eingabemethode-Framework"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus-Einstellungen konfigurieren"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus-Eingabemethode-Framework starten"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Automatisch verstecken"
+msgid "Preload engines"
+msgstr "Engines vorladen"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Benutzerdefinierte Schriftart"
+msgid "Preload engines during ibus starts up"
+msgstr "Engines vorladen, während IBus startet"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Tastenkürzel deaktivieren"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Preedit-Text einbetten"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Preedit-Text in Anwendungsfenster einbetten"
+msgid "Trigger shortcut keys"
+msgstr "Auslöser-Tastenkombination"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Eingabemethode standardmäßig aktivieren"
+msgid "Enable shortcut keys"
+msgstr "Tastenkürzel aktivieren"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus "
-"erlangt"
+msgid "The shortcut keys for turning input method on"
+msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Tastenkürzel aktivieren"
+msgid "Disable shortcut keys"
+msgstr "Tastenkürzel deaktivieren"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Position des Sprach-Panels"
+msgid "The shortcut keys for turning input method off"
+msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Nächste Engine-Tastenkombination"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Ausrichtung der Lookup-Tabelle"
+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:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
+msgid "Prev engine shortcut keys"
+msgstr "Vorherige Engine-Tastenkombination"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Engines vorladen"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Engines vorladen, während IBus startet"
+msgid "Auto hide"
+msgstr "Automatisch verstecken"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Vorherige Engine-Tastenkombination"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Symbol im Benachrichtigungsfeld anzeigen"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Name der Eingabemethode anzeigen"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -313,253 +339,248 @@ msgstr ""
 "Verhalten des Sprach-Panels: 0 = Im Menü einbetten, 1 = Automatisch "
 "verstecken, 2 = Immer anzeigen"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Position des Sprach-Panels"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"Die Position des Sprach-Panels: 0 = Ecke oben links, 1 = Ecke oben rechts, 2"
-" = Ecke unten links, 3 = Ecke unten rechts, 4 = Benutzerdefiniert"
+"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:23
-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:19
+msgid "Orientation of lookup table"
+msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Name der Eingabemethode anzeigen"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
+msgid "Use custom font"
+msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Auslöser-Tastenkombination"
+msgid "Custom font"
+msgstr "Benutzerdefinierte Schriftart"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Benutzerdefinierte Schriftart verwenden"
+msgid "Custom font name for language panel"
+msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
+msgid "Embed Preedit Text"
+msgstr "Preedit-Text einbetten"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Preedit-Text in Anwendungsfenster einbetten"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "System-Tastatur (XKB) Belegung verwenden"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "System-Tastaturbelegung verwenden"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Schriftart und Stil</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "Eingabemethode wählen"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastaturbelegung</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastenkombinationen</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus "
+"erlangt"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Starten</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Der intelligente Eingabe-Bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\n"
-"Sie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden "
-"hinzu"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Sonstige"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Erweitert"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Sprache: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Immer"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturbelegung: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Ecke unten links"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Ecke unten rechts"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Beschreibung:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Ausrichtung der Kandidaten:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Eingabemethode wählen"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Deaktivieren:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus-Einstellungen konfigurieren"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Preedit-Text in Anwendungsfenster einbetten"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Tastenkombinationen"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Tasten-Code:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "In Menü eingebettet"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Hilfstasten:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Aktivieren oder deaktivieren:"
+#: ../setup/keyboardshortcut.py:235
+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).\n"
+"Der Dialog wird geschlossen, wenn die Taste losgelassen wird."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Aktivieren:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Allgemein"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "Auslöser"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontal"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "aktivieren"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Position des Sprach-Panels:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "deaktivieren"
 
-#: ../setup/setup.ui.h:35
-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"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-Daemon wurde nicht gestartet. Möchten Sie ihn jetzt starten?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 ""
-"Bewegen Sie die gewählte Eingabemethode in den aktivierten Eingabemethoden "
-"nach oben"
+"IBus wurde gestartet! Falls Sie IBus nicht nutzen können, fügen Sie bitte "
+"folgende Zeilen in $HOME/.bashrc hinzu und melden sich neu am Desktop an.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Nächste Eingabemethode:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Vorherige Eingabemethode:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Wählen Sie eine Tastenkombination für %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Entfernen Sie die gewählte Eingabemethode aus den aktivierten "
-"Eingabemethoden"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:335
+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:339
+msgid "translator-credits"
 msgstr ""
-"Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu "
-"verstecken"
+"Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
+"Hedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Neustart"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Informationen zur gewählten Eingabemethode anzeigen"
+#~ msgid "Previous page"
+#~ msgstr "Vorherige Seite"
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Next page"
+#~ msgstr "Nächste Seite"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Sprach-Panel anzeigen:"
+#~ 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."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "IBus bei der Anmeldung starten"
+#~ msgid "Restart Now"
+#~ msgstr "Jetzt neu starten"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste"
+#~ msgid "Later"
+#~ msgstr "Später"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Tastenkombination zum Wechseln zur vorherigen Eingabemethode in der Liste"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus-Panel"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Ecke oben links"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus-Eingabemethode-Framework"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Ecke oben rechts"
+#~ msgid "Turn off input method"
+#~ msgstr "Eingabemethode ausschalten"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Benutzerdefinierte Schriftart verwenden:"
+#~ msgid "No input window"
+#~ msgstr "Kein Eingabefenster"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertikal"
+#~ msgid "About the input method"
+#~ msgstr "Über die Eingabemethode"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Wenn aktiv"
+#~ msgid "Switch input method"
+#~ msgstr "Eingabemethode wechseln"
+
+#~ msgid "About the Input Method"
+#~ msgstr "Info zu Eingabemethoden"
+
+#~ msgid "next input method"
+#~ msgstr "Nächste Eingabemethode"
+
+#~ msgid "previous input method"
+#~ msgstr "Vorherige Eingabemethode"
diff --git a/po/en_GB.po b/po/en_GB.po
index f332eada4..f5db17704 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.3.99.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 01:16-0400\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-04-30 01:19-0500\n"
 "Last-Translator: Steven Panek (Espreon) <Majora700@gmail.com>\n"
 "Language-Team: English (British)\n"
@@ -17,527 +17,546 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Input Method Framework"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertical"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus Input Method Framework"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Embedded in menu"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "When active"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Other"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Always"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Previous page"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Top left corner"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Next page"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Top right corner"
 
-#: ../ui/gtk/main.py:62
-msgid "Some input methods have been installed, removed or updated. Please restart ibus input platform."
-msgstr "Some input methods have been installed, removed or updated. Please restart ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Bottom left corner"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Restart Now"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Bottom right corner"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Later"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Custom"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus Panel"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus Preferences"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus input method framework"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "The shortcut keys for switching to next input method in the list"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Restart"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Next input method:"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Turn off input method"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "The shortcut keys for switching to previous input method in the list"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "No input window"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Previous input method:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus is an intelligent input bus for Linux/Unix."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Steven Panek, <Majora700@gmail.com>"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "The shortcut keys for turning input method on or off"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "About the input method"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Enable or disable:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Switch input method"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Enable:"
 
-#: ../ui/gtk/languagebar.py:357
-#: ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33
-#: ../setup/setup.ui.h:16
-msgid "About"
-msgstr "About"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Disable:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "About the Input Method"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Keyboard Shortcuts</b>"
 
-#: ../ui/gtk/engineabout.py:61
-#: ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Language: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Set the orientation of candidates in lookup table"
 
-#: ../ui/gtk/engineabout.py:63
-#: ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Keyboard layout: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Candidates orientation:"
 
-#: ../ui/gtk/engineabout.py:65
-#: ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Author: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Set the behaviour of ibus how to show or hide language bar"
 
-#: ../ui/gtk/engineabout.py:67
-#: ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Description:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Show language panel:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "trigger"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Language panel position:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "enable"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Show icon on system tray"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "disable"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Show input method name on language bar"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Show input method's name on language bar when check the checkbox"
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Embed pre-edit text in application window"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "next input method"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Embed the pre-edit text of input method in the application window"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "previous input method"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Use custom font:"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus daemon is not started. Do you want to start it now?"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Font and Style</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "General"
+
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Add the selected input method into the enabled input methods"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Remove the selected input method from the enabled input methods"
+
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Move up the selected input method in the enabled input methods list"
+
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Move down the selected input method in the enabled input methods"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Show information of the selected input method"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Show information of the selected input method"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Select keyboard shortcut for %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Input Method"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Keyboard shortcuts"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Use system keyboard layout"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Key code:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Use system keyboard (XKB) layout"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modifiers:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Keyboard Layout</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Share the same input method among all applications"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Global input method settings</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Please press a key (or a key combination)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Start ibus on login"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Select an input method"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Startup</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64
-#: ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Input Method"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "About"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1
-#: ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus Preferences"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Input Method Framework"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Set IBus Preferences"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Start IBus Input Method Framework"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Auto hide"
+msgid "Preload engines"
+msgstr "Preload engines"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Custom font"
+msgid "Preload engines during ibus starts up"
+msgstr "Preload engines during ibus starts up"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Custom font name for language panel"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Disable shortcut keys"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Embed Pre-edit Text"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Embed Pre-edit Text in Application Window"
+msgid "Trigger shortcut keys"
+msgstr "Trigger shortcut keys"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Enable input method by default"
+msgid "Enable shortcut keys"
+msgstr "Enable shortcut keys"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "Enable input method by default when the application gets input focus"
+msgid "The shortcut keys for turning input method on"
+msgstr "The shortcut keys for turning input method on"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Enable shortcut keys"
+msgid "Disable shortcut keys"
+msgstr "Disable shortcut keys"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Language panel position"
+msgid "The shortcut keys for turning input method off"
+msgstr "The shortcut keys for turning input method off"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Next engine shortcut keys"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientation of lookup table"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "The shortcut keys for switching to the next input method in the list"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgid "Prev engine shortcut keys"
+msgstr "Prev engine shortcut keys"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Preload engines"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "The shortcut keys for switching to the previous input method"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Preload engines during ibus starts up"
+msgid "Auto hide"
+msgstr "Auto hide"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Prev engine shortcut keys"
+msgid ""
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr ""
+"The behaviour of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
 
 #: ../data/ibus.schemas.in.h:17
-#: ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Share the same input method among all applications"
+msgid "Language panel position"
+msgstr "Language panel position"
 
 #: ../data/ibus.schemas.in.h:18
-#: ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Show icon on system tray"
+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 ""
+"The position of the language panel. 0 = Top left corner, 1 = Top right "
+"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 
 #: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Show input method name"
-
-#: ../data/ibus.schemas.in.h:20
-#: ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Show input method name on language bar"
+msgid "Orientation of lookup table"
+msgstr "Orientation of lookup table"
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show"
-msgstr "The behaviour of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 
 #: ../data/ibus.schemas.in.h:22
-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 "The position of the language panel. 0 = Top left corner, 1 = Top right corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
-
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "The shortcut keys for switching to the next input method in the list"
-
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "The shortcut keys for switching to the previous input method"
-
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "The shortcut keys for turning input method off"
+msgid "Show input method name"
+msgstr "Show input method name"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "The shortcut keys for turning input method on"
+msgid "Use custom font"
+msgstr "Use custom font"
 
 #: ../data/ibus.schemas.in.h:27
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "The shortcut keys for turning input method on or off"
+msgid "Use custom font name for language panel"
+msgstr "Use custom font name for language panel"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Trigger shortcut keys"
+msgid "Custom font"
+msgstr "Custom font"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Use custom font"
+msgid "Custom font name for language panel"
+msgstr "Custom font name for language panel"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Use custom font name for language panel"
+msgid "Embed Preedit Text"
+msgstr "Embed Pre-edit Text"
 
 #: ../data/ibus.schemas.in.h:31
-msgid "Use global input method"
-msgstr "Use global input method"
+msgid "Embed Preedit Text in Application Window"
+msgstr "Embed Pre-edit Text in Application Window"
 
 #: ../data/ibus.schemas.in.h:32
-#: ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Use system keyboard (XKB) layout"
-
-#: ../data/ibus.schemas.in.h:33
-#: ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Use system keyboard layout"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Font and Style</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Global input method settings</b>"
+msgid "Use global input method"
+msgstr "Use global input method"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Keyboard Layout</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Enable input method by default"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Keyboard Shortcuts</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Enable input method by default when the application gets input focus"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Startup</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Add the selected input method into the enabled input methods"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Other"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Advanced"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Language: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Always"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Keyboard layout: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Bottom left corner"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Author: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Bottom right corner"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Description:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Candidates orientation:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Select an input method"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Custom"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Disable:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Set IBus Preferences"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Embed pre-edit text in application window"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Keyboard shortcuts"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Embed the pre-edit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Key code:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Embedded in menu"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modifiers:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Enable or disable:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Please press a key (or a key combination)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "General"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "trigger"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontal"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "enable"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Language panel position:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "disable"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus daemon is not started. Do you want to start it now?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 has been started! If you can not use IBus, please add below lines in "
+"$HOME/.bashrc, and relogin your desktop.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Next input method:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Previous input method:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Select keyboard shortcut for %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Set the behaviour of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus is an intelligent input bus for Linux/Unix."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Set the orientation of candidates in lookup table"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Steven Panek, <Majora700@gmail.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Show information of the selected input method"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Restart"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Show input method's name on language bar when check the checkbox"
+#~ msgid "Previous page"
+#~ msgstr "Previous page"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Show language panel:"
+#~ msgid "Next page"
+#~ msgstr "Next page"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Start ibus on login"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "The shortcut keys for switching to next input method in the list"
+#~ msgid "Restart Now"
+#~ msgstr "Restart Now"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "The shortcut keys for switching to previous input method in the list"
+#~ msgid "Later"
+#~ msgstr "Later"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Top left corner"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus Panel"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Top right corner"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus input method framework"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Use custom font:"
+#~ msgid "Turn off input method"
+#~ msgstr "Turn off input method"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertical"
+#~ msgid "No input window"
+#~ msgstr "No input window"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "When active"
+#~ msgid "About the input method"
+#~ msgstr "About the input method"
+
+#~ msgid "Switch input method"
+#~ msgstr "Switch input method"
+
+#~ msgid "About the Input Method"
+#~ msgstr "About the Input Method"
+
+#~ msgid "next input method"
+#~ msgstr "next input method"
 
+#~ msgid "previous input method"
+#~ msgstr "previous input method"
diff --git a/po/es.po b/po/es.po
index c91ac2343..b65e2aff7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,307 +2,340 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011.
 # Héctor Daniel Cabrera <logan@fedoraproject.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-17 11:48+0000\n"
 "Last-Translator: elsupergomez <elsupergomez@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <trans-es@lists.fedoraproject.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: ARGENTINA\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Marco de trabajo para métodos de entrada"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertical"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Inicie el marco de trabajo para métodos de entrada IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Menú incrustado"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Cuando esté activo"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Otro"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Siempre"
+
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Esquina superior izquierda"
+
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Esquina superior derecha"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Página anterior"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Esquina inferior izquierda"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Siguiente página"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Esquina inferior derecha"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Personalizado"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferencias de IBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"Algunos métodos de entrada han sido instalados, eliminados o actualizados. "
-"Por favor, reinicie la plataforma de entrada ibus."
+"Tecla programada para cambiar al siguiente método de entrada en la lista"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Reiniciar ahora"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Siguiente método de entrada:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Más tarde"
+#: ../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"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Panel IBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Método de entrada anterior:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "Marco de trabajo para métodos de entrada IBus"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Atajo de teclado para encender o apagar el método de entrada"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Desactivar métodos de entrada"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Habilitar o deshabilitar:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Sin ventana de entrada"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Habilitar:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus es un bus de entrada inteligente para Linux/Unix."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Deshabilitar:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Atajos de teclado</b>"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Acerca del método de entrada"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Poner la orientación de la tabla de búsqueda de candidatos"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Cambiar método de entrada"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientaciones candidato:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Acerca de"
+#: ../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"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Acerca del Método de Entrada"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Mostrar el panel de idioma:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Idioma: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posición del panel de idioma:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Diseño del teclado: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Mostrar un ícono en el área de notificación"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Descripción:\n"
+#: ../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"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "activador"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "habilitar"
+#: ../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"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "deshabilitar"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Usar fuente personalizada:"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "siguiente método de entrada"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fuente y Estilo</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "método de entrada anterior"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "General"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
+#: ../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"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"¡IBus ha sido iniciado! Si no puede usar IBus, por favor, agregue las siguientes líneas a $HOME/.bashrc, y reingrese a su escritorio.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"Eliminar el método de entrada seleccionado de los métodos de entrada "
+"habilitados"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Seleccione la tecla de atajo para %s"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Atajos de teclado"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Código clave:"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Mostrar información sobre el método de entrada seleccionado"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificadores:"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Mostrar información sobre el método de entrada seleccionado"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:41
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"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:233
-msgid "Please press a key (or a key combination)"
-msgstr "Por favor, presione una tecla (o combinación de teclas)"
-
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Seleccione un método de entrada"
+"<small><i>El método de entrada determinado está al comienzo de la lista.\n"
+"Puede usar los botones arriba/abajo para cambiarlo.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Preferencias de IBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usar el diseño del teclado del sistema (XKB)"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Defina las preferencias de IBus"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Diseño del Teclado</b>"
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Auto Ocultar"
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Fuente personalizada"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configuraciones globales de método de entrada</b>"
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Nombre de fuente personalizado para el panel de idioma"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Deshabilitar atajos de teclado"
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>El bus de entrada inteligente</small>\n"
+"Sitio web: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Insertar texto preeditado"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Iniciar ibus al ingresar"
 
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Inicio</b>"
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Habilitar método de entrada en forma predeterminada"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Acerca de"
 
-#: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
+#: ../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"
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr "Precargar los motores durante el inicio de ibus"
+
+#: ../data/ibus.schemas.in.h:3
+msgid "Engines order"
 msgstr ""
-"Habilitar método de entrada en forma predeterminada cuando la aplicación en "
-"uso solicite alguno"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:4
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Trigger shortcut keys"
+msgstr "Activadora de los Atajos de teclado"
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Enable shortcut keys"
 msgstr "Habilitar atajos de teclado"
 
+#: ../data/ibus.schemas.in.h:8
+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:9
+msgid "Disable shortcut keys"
+msgstr "Deshabilitar atajos de teclado"
+
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Posición del panel de idioma"
+msgid "The shortcut keys for turning input method off"
+msgstr "Los atajos de teclado para deshabilitar el método de entrada"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Atajo de teclado para el siguiente motor"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientación de búsqueda en la tabla "
+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:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientación de la tabla de búsqueda. 0 = Horizontal, 1 = Vertical"
+msgid "Prev engine shortcut keys"
+msgstr "Atajo de teclado para la máquina previa"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Precargar máquinas"
+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:15
-msgid "Preload engines during ibus starts up"
-msgstr "Precargar los motores durante el inicio de ibus"
+msgid "Auto hide"
+msgstr "Auto Ocultar"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Atajo de teclado para la máquina previa"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Mostrar un ícono en el área de notificación"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Mostrar el nombre del método de entrada"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -310,7 +343,11 @@ 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
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Posición del panel de idioma"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -319,250 +356,234 @@ msgstr ""
 "superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior "
 "derecha, 4 = personalizado"
 
-#: ../data/ibus.schemas.in.h:23
-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:19
+msgid "Orientation of lookup table"
+msgstr "Orientación de búsqueda en la tabla "
 
-#: ../data/ibus.schemas.in.h:24
-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:20
+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
-msgid "The shortcut keys for turning input method off"
-msgstr "Los atajos de teclado para deshabilitar el método de entrada"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Mostrar el nombre del método de entrada"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Los atajos de teclado para habilitar el método de entrada"
+msgid "Use custom font"
+msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Atajo de teclado para encender o apagar el método de entrada"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Activadora de los Atajos de teclado"
+msgid "Custom font"
+msgstr "Fuente personalizada"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Usar fuente personalizada"
+msgid "Custom font name for language panel"
+msgstr "Nombre de fuente personalizado para el panel de idioma"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Usar nombre de fuente personalizada para el panel de idioma"
+msgid "Embed Preedit Text"
+msgstr "Insertar texto preeditado"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usar el diseño del teclado del sistema (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Usar el diseño del teclado del sistema"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fuente y Estilo</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configuraciones globales de método de entrada</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Diseño del Teclado</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Habilitar método de entrada en forma predeterminada"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Atajos de teclado</b>"
+#: ../data/ibus.schemas.in.h:35
+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"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus de entrada inteligente</small>\n"
-"Sitio web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>El método de entrada determinado está al comienzo de la lista.\n"
-"Puede usar los botones arriba/abajo para cambiarlo.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Agregar el método de entrada seleccionado a los métodos de entrada "
-"habilitados"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Otro"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avanzado"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Idioma: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Siempre"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Diseño del teclado: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Esquina inferior izquierda"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Esquina inferior derecha"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Descripción:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientaciones candidato:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Seleccione un método de entrada"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Personalizado"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Deshabilitar:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Defina las preferencias de IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Atajos de teclado"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Código clave:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificadores:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Insertar el texto previamente editado del método de entrada en la ventana de"
-" la aplicación"
+"Por favor, presione una tecla (o una combinación de tecla).\n"
+"El diálogo será cerrado cuando la tecla sea soltada."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Menú incrustado"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Habilitar o deshabilitar:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "activador"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Habilitar:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "habilitar"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "General"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "deshabilitar"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontal"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Posición del panel de idioma:"
+#: ../setup/main.py:344
+#, fuzzy
+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 ha sido iniciado! Si no puede usar IBus, por favor, agregue las "
+"siguientes líneas a $HOME/.bashrc, y reingrese a su escritorio.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Mover abajo el método de entrada seleccionado en los métodos de entrada "
-"habilitados"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Seleccione la tecla de atajo para %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Mover arriba el método de entrada seleccionado en la lista de métodos de "
-"entrada habilitados"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Siguiente método de entrada:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus es un bus de entrada inteligente para Linux/Unix."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Método de entrada anterior:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../setup/setup.ui.h:39
-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"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: ../setup/setup.ui.h:40
-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"
+#~ msgid "Previous page"
+#~ msgstr "Página anterior"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Poner la orientación de la tabla de búsqueda de candidatos"
+#~ msgid "Next page"
+#~ msgstr "Siguiente página"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostrar información sobre el método de entrada seleccionado"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Algunos métodos de entrada han sido instalados, eliminados o "
+#~ "actualizados. Por favor, reinicie la plataforma de entrada ibus."
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Restart Now"
+#~ msgstr "Reiniciar ahora"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Mostrar el panel de idioma:"
+#~ msgid "Later"
+#~ msgstr "Más tarde"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Iniciar ibus al ingresar"
+#~ msgid "IBus Panel"
+#~ msgstr "Panel IBus"
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "IBus input method framework"
+#~ msgstr "Marco de trabajo para métodos de entrada IBus"
 
-#: ../setup/setup.ui.h:50
-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"
+#~ msgid "Turn off input method"
+#~ msgstr "Desactivar métodos de entrada"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Esquina superior izquierda"
+#~ msgid "No input window"
+#~ msgstr "Sin ventana de entrada"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Esquina superior derecha"
+#~ msgid "About the input method"
+#~ msgstr "Acerca del método de entrada"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Usar fuente personalizada:"
+#~ msgid "Switch input method"
+#~ msgstr "Cambiar método de entrada"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertical"
+#~ msgid "About the Input Method"
+#~ msgstr "Acerca del Método de Entrada"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Cuando esté activo"
+#~ msgid "next input method"
+#~ msgstr "siguiente método de entrada"
+
+#~ msgid "previous input method"
+#~ msgstr "método de entrada anterior"
diff --git a/po/fa.po b/po/fa.po
index abd6184d7..bba8125a7 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2,252 +2,288 @@
 # Persian translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Daniyal Yousefi <da.yousefi@gmail.com>, 2011.
 # Mostafa Daneshvar <lashar@fedoraproject.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-07-30 19:07+0000\n"
 "Last-Translator: danialyousefi <da.yousefi@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/fedora/team/fa/)\n"
+"Language-Team: Persian (http://www.transifex.net/projects/p/fedora/team/"
+"fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "افقی"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr ""
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "عمودی"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
 msgstr ""
 
-#: ../ibus/_config.py.in:40
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:4
+msgid "When active"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "دیگر"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "همیشه"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "صفحهٔ قبل"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "گوشه بالا سمت چپ"
+
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "گوشه بالا سمت راست"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "صفحهٔ بعد"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "گوشه پایین سمت چپ"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "چوشه پایین سمت راست"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "انتخابی"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
 msgstr ""
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "راه‌اندازی مجدد، همین حالا"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "بعداً"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr ""
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
 msgstr ""
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "راه‌اندازی مجدد"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr ""
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
+#: ../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 "<b>Keyboard Shortcuts</b>"
 msgstr ""
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
 msgstr ""
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
+#: ../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:21
+msgid "Show icon on system tray"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "درباره"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "زبان: %s\n"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "نویسنده: %s\n"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "استفاده از فونت انتخابی"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "شرح:\n"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr ""
 
-#: ../setup/main.py:102
-msgid "trigger"
+#: ../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/main.py:113
-msgid "enable"
-msgstr "فعال"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "غیرفعال"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
 
-#: ../setup/main.py:135
-msgid "next input method"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:146
-msgid "previous input method"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
+#: ../setup/setup.ui.h:40
+msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "میانبرهای صفحه‌کلید"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "پیشرفته"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
 msgstr ""
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "درباره"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
 msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
+msgid "Preload engines"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
+msgid "Preload engines during ibus starts up"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
+msgid "Engines order"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
+msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
+msgid "Trigger shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr ""
+msgid "Enable shortcut keys"
+msgstr "فعال‌کردن کلیدهای میانبر"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
+msgid "The shortcut keys for turning input method on"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "فعال‌کردن کلیدهای میانبر"
+msgid "Disable shortcut keys"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
+msgid "The shortcut keys for turning input method off"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:11
@@ -255,271 +291,220 @@ msgid "Next engine shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
+msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgid "Prev engine shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
+msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
+msgid "Auto hide"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
+msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
+msgid "Custom font"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
+msgid "Custom font name for language panel"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
+msgid "Embed Preedit Text"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:31
-msgid "Use global input method"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr ""
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr ""
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
+msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
 msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
+"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."
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "پیشرفته"
-
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "همیشه"
-
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "گوشه پایین سمت چپ"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "دیگر"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "چوشه پایین سمت راست"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "زبان: %s\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "انتخابی"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "نویسنده: %s\n"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "غیرفعال:"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "شرح:\n"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
 msgstr ""
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
 msgstr ""
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "فعال یا غیرفعال:"
-
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "فعال:"
-
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "اصلی"
-
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "افقی"
-
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "موقعیت پنل زبان:"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "میانبرهای صفحه‌کلید"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../setup/main.py:79
+msgid "trigger"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "فعال"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr ""
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "غیرفعال"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
+#: ../setup/main.py:323
+msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
+#: ../setup/main.py:344
+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 ""
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "نمایش پنل زبان:"
-
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "گوشه بالا سمت چپ"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "گوشه بالا سمت راست"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "استفاده از فونت انتخابی"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "راه‌اندازی مجدد"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "عمودی"
+#~ msgid "Previous page"
+#~ msgstr "صفحهٔ قبل"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr ""
+#~ msgid "Next page"
+#~ msgstr "صفحهٔ بعد"
 
+#~ msgid "Restart Now"
+#~ msgstr "راه‌اندازی مجدد، همین حالا"
 
+#~ msgid "Later"
+#~ msgstr "بعداً"
diff --git a/po/fr.po b/po/fr.po
index db0eb820a..8e87e8c8c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@
 # French translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009.
 # Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011.
@@ -11,309 +11,341 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-07-16 04:21+0000\n"
 "Last-Translator: dominique <chepioq@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
+"Language: fr\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-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Generator: Lokalize 1.2\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontale"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework de méthode de saisie"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Verticale"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Démarrer le framework de méthode de saisie IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Insérée dans le menu"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Uniquement lorsque active"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Autre"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Toujours afficher"
+
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Coin supérieur gauche"
+
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Coin supérieur droit"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Page précédente"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Coin inférieur gauche"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Page suivante"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Coin inférieur droit"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Personnalisée"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Préférences de IBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"Certaines méthodes d'entrée ont été installées, supprimées ou mises à jour. "
-"Veuillez redémarrer iBus."
+"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Redémarrer IBus maintenant"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Méthode d'entrée suivante :"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Plus tard"
+#: ../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"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Tableau de bord IBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Méthode d'entrée précédente :"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "Framework de méthode de saisie iBus"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Redémarrer IBus"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+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"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Désactiver la méthode d'entrée"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Activer / désactiver :"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Aucune fenêtre de saisie"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Activer :"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus est un IME intelligent pour Linux/Unix"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Désactiver :"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Julien Humbert <julroy67@gmail.com>"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Raccourcis clavier</b>"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "À propos de la méthode d'entrée"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Permet de choisir l'orientation de la liste des candidats"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Changer de méthode d'entrée"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientation de la liste des candidats :"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "À propos"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "À propos de la méthode d'entrée"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Afficher la barre de langue :"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Langue : %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Afficher la barre de langue :"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Disposition du clavier : %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Afficher l'icône dans la boîte à miniatures"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Auteur : %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Description :\n"
+#: ../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"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "déclencheur"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "activer"
+#: ../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"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "désactiver"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Utiliser une police personnalisée :"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "méthode d'entrée suivante"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Police et Style</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "méthode d'entrée précédente"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Général"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 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"
+"Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Raccourci clavier pour %s"
+#: ../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 selectionnée dans la liste des "
+"méthodes d'entrée actives"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Raccourci clavier"
+#: ../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 selectionnée dans la liste des "
+"méthodes d'entrée actives"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Touche :"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Afficher les informations de la méthode d'entrée selectionnée"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificateurs :"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Afficher les informations de la méthode d'entrée selectionnée"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:41
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"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:233
-msgid "Please press a key (or a key combination)"
-msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
-
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Sélectionnez une méthode d'entrée"
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
-
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Préférences de IBus"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Définir les préférences de IBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Masquage automatique"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposition du clavier</b>"
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Police personnalisée"
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Partager la même méthode d'entrée pour toutes les applications"
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Police personnalisée pour le panneau de langue"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configuration de la méthode d'éntrée globale</b>"
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Désactiver les raccourcis clavier"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avancé"
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Insérer le texte en cours d'édition"
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Page d'accueil : http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Démarrer IBus lors de la connexion"
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Par défaut, activer la méthode d'entrée"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Démarrage</b>"
 
-#: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
+#: ../setup/setup.ui.h:59 ../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"
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr "Précharger les moteurs au démarrage d'ibus"
+
+#: ../data/ibus.schemas.in.h:3
+msgid "Engines order"
 msgstr ""
-"Par défaut, activer la méthode d'entrée lorsque l'application reçoit le "
-"focus"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:4
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Trigger shortcut keys"
+msgstr "Raccourci clavier déclencheur"
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Enable shortcut keys"
 msgstr "Activer les raccourcis clavier"
 
+#: ../data/ibus.schemas.in.h:8
+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:9
+msgid "Disable shortcut keys"
+msgstr "Désactiver les raccourcis clavier"
+
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Position de la barre"
+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:11
 msgid "Next engine shortcut keys"
 msgstr "Raccourci clavier pour passer au moteur suivant"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientation de la liste des candidats"
+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"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientation de la liste des candidats. 0 = Horizontale, 1 = Verticale"
+msgid "Prev engine shortcut keys"
+msgstr "Raccourci clavier pour revenir au moteur précédent"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Précharger les moteurs"
+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:15
-msgid "Preload engines during ibus starts up"
-msgstr "Précharger les moteurs au démarrage d'ibus"
+msgid "Auto hide"
+msgstr "Masquage automatique"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Raccourci clavier pour revenir au moteur précédent"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Partager la même méthode d'entrée pour toutes les applications"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Afficher l'icône dans la boîte à miniatures"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Afficher le nom de la méthode d'entrée"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
-
-#: ../data/ibus.schemas.in.h: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"
+"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
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Position de la barre"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -322,247 +354,234 @@ msgstr ""
 "supérieur droit, 2 = Coin inférieur gauche, 3 = Coin inférieur droit, 4 = "
 "Personnalisé"
 
-#: ../data/ibus.schemas.in.h:23
-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"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:24
-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:20
+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
-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:22
+msgid "Show input method name"
+msgstr "Afficher le nom de la méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Les raccourcis clavier pour la méthode d'entrée sont activés"
+msgid "Use custom font"
+msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-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"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Utiliser une police personnalisée pour la barre de langue"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Raccourci clavier déclencheur"
+msgid "Custom font"
+msgstr "Police personnalisée"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Utiliser une police personnalisée :"
+msgid "Custom font name for language panel"
+msgstr "Police personnalisée pour le panneau de langue"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Utiliser une police personnalisée pour la barre de langue"
+msgid "Embed Preedit Text"
+msgstr "Insérer le texte en cours d'édition"
 
 #: ../data/ibus.schemas.in.h:31
+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:32
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Utiliser la disposition clavier système (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Utiliser la disposition clavier système"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Police et Style</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configuration de la méthode d'éntrée globale</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposition du clavier</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Raccourcis clavier</b>"
+#: ../data/ibus.schemas.in.h:35
+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"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Démarrage</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d'accueil : http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>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.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Autre"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avancé"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Langue : %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Toujours afficher"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Disposition du clavier : %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Coin inférieur gauche"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Auteur : %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Coin inférieur droit"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Description :\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientation de la liste des candidats :"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Sélectionnez une méthode d'entrée"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Personnalisée"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Désactiver :"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Définir les préférences de IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Raccourci clavier"
 
-#: ../setup/setup.ui.h:26
-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"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Touche :"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Insérée dans le menu"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificateurs :"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Activer / désactiver :"
+#: ../setup/keyboardshortcut.py:235
+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."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Activer :"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Général"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "déclencheur"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontale"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "activer"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Afficher la barre de langue :"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "désactiver"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Déplacer vers le bas la méthode d'entrée selectionnée dans la liste des "
-"méthodes d'entrée actives"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 ""
-"Déplacer vers le haut la méthode d'entrée selectionnée dans la liste des "
-"méthodes d'entrée actives"
+"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"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Méthode d'entrée suivante :"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Méthode d'entrée précédente :"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Raccourci clavier pour %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus est un IME intelligent pour Linux/Unix"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Permet de choisir l'orientation de la liste des candidats"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Afficher les informations de la méthode d'entrée selectionnée"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Redémarrer IBus"
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Previous page"
+#~ msgstr "Page précédente"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Afficher la barre de langue :"
+#~ msgid "Next page"
+#~ msgstr "Page suivante"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Démarrer IBus lors de la connexion"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Certaines méthodes d'entrée ont été installées, supprimées ou mises à "
+#~ "jour. Veuillez redémarrer iBus."
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "Restart Now"
+#~ msgstr "Redémarrer IBus maintenant"
 
-#: ../setup/setup.ui.h:50
-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"
+#~ msgid "Later"
+#~ msgstr "Plus tard"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Coin supérieur gauche"
+#~ msgid "IBus Panel"
+#~ msgstr "Tableau de bord IBus"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Coin supérieur droit"
+#~ msgid "IBus input method framework"
+#~ msgstr "Framework de méthode de saisie iBus"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Utiliser une police personnalisée :"
+#~ msgid "Turn off input method"
+#~ msgstr "Désactiver la méthode d'entrée"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Verticale"
+#~ msgid "No input window"
+#~ msgstr "Aucune fenêtre de saisie"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Uniquement lorsque active"
+#~ msgid "About the input method"
+#~ msgstr "À propos de la méthode d'entrée"
+
+#~ msgid "Switch input method"
+#~ msgstr "Changer de méthode d'entrée"
+
+#~ msgid "About the Input Method"
+#~ msgstr "À propos de la méthode d'entrée"
 
+#~ msgid "next input method"
+#~ msgstr "méthode d'entrée suivante"
 
+#~ msgid "previous input method"
+#~ msgstr "méthode d'entrée précédente"
diff --git a/po/gu.po b/po/gu.po
index e8fd53b4b..0d36d0f45 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.gu\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -20,523 +20,541 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "આડુ"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "ઊભું"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્કને શરૂ કરો"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "મેનુમાં જડિત"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "જ્યારે સક્રિય હોય"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "બીજા"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "હંમેશા"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "પહેલાનુ પાનું"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ઉંચે ડાબી બાજુનો ખૂણો"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "પછીનુ પાનું"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ઉંચે જમણી બાજુનો ખૂણો"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"અમુક ઇનપુટ પદ્દતિઓને સ્થાપિત, દૂર અથવા સુધારી દેવામાં આવી છે. મહેરબાની કરીને"
-" ibus ઇનપુટ પ્લેટફોર્મને પુન:શરૂ કરો."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "નીચે ડાબી બાજુનો ખૂણો"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "હવે પુન:શરૂ કરો"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "નીચે જમણી બાજુનો ખૂણો"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "પછી"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "વૈવિધ્ય"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus પસંદગીઓ"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "પુન:શરૂ કરો"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "ઇનપુટ પદ્દતિને બંધ કરો"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "પછીની ઇનપુટ પદ્દતિ:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "ઇનપુટ વિન્ડો નથી"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ઇનપુટ પદ્દતિ વિશે"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ઇનપુટ પદ્દતિને ફેરબદલી કરવાનું ચાલુ અથવા ા બંધ કરવા માટે ટૂંકાણ કીઓ"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ઇનપુટ પદ્દતિને બદલો"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "સક્રિય અથવા નિષ્ક્રિય:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "વિશે"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "સક્રિય:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ઇનપુટ પદ્દતિ વિશે"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "નિષ્ક્રિય:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ભાષા: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>કિબોર્ડ ટૂંકાણો</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "કિબોર્ડ લેઆઉટ: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "કોષ્ટક જોવામાં સભ્યોની દિશાને સુયોજિત કરો"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "લેખક: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "ઉમેદવારોની દિશા:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "વર્ણન:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ભાષા પેનલને કેવી રીતે બતાવવી અથવા છુપાડવી તે માટે ibus નાં વર્ણતૂકને સુયોજિત કરો"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ટ્રીગર"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ભાષા પેનલને બતાવો:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "સક્રિય"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ભાષા પેનલનું સ્થાન:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "નિષ્ક્રિય"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતાવો"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "પછીની ઇનપુટ પદ્દતિ"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ નામને બતાવો"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "પહેલાની ઇનપુટ પદ્દતિ"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "જ્યારે ચેકબોક્સને ચકાસતા હોય ત્યારે ભાષા પેનલ પર ઇનપુટ પદ્દતિનાં નામને બતાવો"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus ડિમન એ શરૂ થયેલ નથી. શું તમે હવે તેને શરૂ કરવા ઇચ્છો છો?"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
+
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "કાર યક્મ વિન્ડોમાં ઇનપુટ પદ્દતિનાં preedit લખાણને બેસાડો"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "વૈવિધ્યપૂર્ણ ફોન્ટ વાપરો:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>ફોન્ટ અને શૈલીઓ</b>"
+
+#: ../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/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus ને શરૂ કરી દેવામાં આવી છે! જો તમે IBus ને વાપરી શકતા ન હોય તો, મહેરબાની કરીને નીચેનાં વાક્યમાં ઉમેરો$HOME/.bashrc, અને તમારા ડેસ્કટોપમાં ફરીથી પ્રવેશ કરો.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n"
+"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ઇનપુટ પદ્દતિ"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "કિબોર્ડ ટૂંકાણો"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "કિ કોડ:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "બદલનારો:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>વૈશ્ર્વિક ઇનપુટ પદ્દતિ સુયોજનો</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "ઉન્નત"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"મહેરબાની કરીને કીને દબાવો (અથવા કી સંયોજન).\n"
-"સંવાદ એ બંધ થયેલ હશે જ્યારે કી પ્રકાશિત થયેલ હોય તો."
+"<big><b>IBus</b></big>\n"
+"<small>હોશિયાર ઇનપુટ બસ</small>\n"
+"ઘરપાનું: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>શરૂઆત કરો</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ઇનપુટ પદ્દતિ"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "વિશે"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus પસંદગીઓ"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus પસંદગીઓને સુયોજિત કરો"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્કને શરૂ કરો"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "આપમેળે છુપાવો"
+msgid "Preload engines"
+msgstr "એંજિનોને ફરીથી લોડ કરો"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "વૈવિધ્ય ફોન્ટ"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus શરૂ કરવા દરમ્યાન એંજિનોને ફરીથી લોડ કરો"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "ટૂંકાણ કીઓને નિષ્ક્રિય કરો"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "બેસાડેલ Preedit લખાણ"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
+msgid "Trigger shortcut keys"
+msgstr "ટ્રીગર ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
+msgid "Enable shortcut keys"
+msgstr "ટૂંકાણ કીઓને સક્રિય કરો"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
+msgid "The shortcut keys for turning input method on"
+msgstr "ઇનપુટ પદ્દતિને ચાલુ કરવા માટે ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "ટૂંકાણ કીઓને સક્રિય કરો"
+msgid "Disable shortcut keys"
+msgstr "ટૂંકાણ કીઓને નિષ્ક્રિય કરો"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "ભાષા પેનલ સ્થાન"
+msgid "The shortcut keys for turning input method off"
+msgstr "ઇનપુટ પદ્દતિને બંધ કરવા માટે ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "પછીની એંજિન ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "કોષ્ટકને જોવાની દિશા"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને બદલવા માટે ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "કોષ્ટકને જોવાની દિશા. 0 = આડુ, 1 = ઊભુ "
+msgid "Prev engine shortcut keys"
+msgstr "પહેલાંની એંજિન ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "એંજિનોને ફરીથી લોડ કરો"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને લાવવા માટે ટૂંકાણ કીઓ"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus શરૂ કરવા દરમ્યાન એંજિનોને ફરીથી લોડ કરો"
+msgid "Auto hide"
+msgstr "આપમેળે છુપાવો"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "પહેલાંની એંજિન ટૂંકાણ કીઓ"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતાવો"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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 = હંમેશા બતાવો"
+msgstr "ભાષા પેનલની વર્ણતૂક. 0 = હંમેશા છુપાવો, 1 = આપમેળે છુપાવો, 2 = હંમેશા બતાવો"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ભાષા પેનલ સ્થાન"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ "
-"= નીચે ડાબી બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
+"ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી "
+"બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને બદલવા માટે ટૂંકાણ કીઓ"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "કોષ્ટકને જોવાની દિશા"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને લાવવા માટે ટૂંકાણ કીઓ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "કોષ્ટકને જોવાની દિશા. 0 = આડુ, 1 = ઊભુ "
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ઇનપુટ પદ્દતિને બંધ કરવા માટે ટૂંકાણ કીઓ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ઇનપુટ પદ્દતિને ચાલુ કરવા માટે ટૂંકાણ કીઓ"
+msgid "Use custom font"
+msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ઇનપુટ પદ્દતિને ફેરબદલી કરવાનું ચાલુ અથવા ા બંધ કરવા માટે ટૂંકાણ કીઓ"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ટ્રીગર ટૂંકાણ કીઓ"
+msgid "Custom font"
+msgstr "વૈવિધ્ય ફોન્ટ"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
+msgid "Custom font name for language panel"
+msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
+msgid "Embed Preedit Text"
+msgstr "બેસાડેલ Preedit લખાણ"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ફોન્ટ અને શૈલીઓ</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>વૈશ્ર્વિક ઇનપુટ પદ્દતિ સુયોજનો</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>કિબોર્ડ ટૂંકાણો</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>શરૂઆત કરો</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>હોશિયાર ઇનપુટ બસ</small>\n"
-"ઘરપાનું: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n"
-"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
-
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓમાં પસંદ થયેલ ઇનપુટ પદ્દતિને ઉમેરો"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "ઉન્નત"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "બીજા"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "હંમેશા"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ભાષા: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "નીચે ડાબી બાજુનો ખૂણો"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "કિબોર્ડ લેઆઉટ: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "નીચે જમણી બાજુનો ખૂણો"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "લેખક: %s\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "ઉમેદવારોની દિશા:"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "વર્ણન:\n"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "વૈવિધ્ય"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "નિષ્ક્રિય:"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus પસંદગીઓને સુયોજિત કરો"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "કાર યક્મ વિન્ડોમાં ઇનપુટ પદ્દતિનાં preedit લખાણને બેસાડો"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "કિબોર્ડ ટૂંકાણો"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "મેનુમાં જડિત"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "કિ કોડ:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "સક્રિય અથવા નિષ્ક્રિય:"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "બદલનારો:"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "સક્રિય:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"મહેરબાની કરીને કીને દબાવો (અથવા કી સંયોજન).\n"
+"સંવાદ એ બંધ થયેલ હશે જ્યારે કી પ્રકાશિત થયેલ હોય તો."
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "સામાન્ય"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "આડુ"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ટ્રીગર"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ભાષા પેનલનું સ્થાન:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "સક્રિય"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓમાં પસંદ થયેલ ઇનપુટ પદ્દતિને નીચે ખસેડો"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "નિષ્ક્રિય"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ યાદીમાં પસંદ થયેલ ઇનપુટ પદ્દતિને ઉપર ખસેડો"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ડિમન એ શરૂ થયેલ નથી. શું તમે હવે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "પછીની ઇનપુટ પદ્દતિ:"
+#: ../setup/main.py:344
+#, fuzzy
+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 ને શરૂ કરી દેવામાં આવી છે! જો તમે IBus ને વાપરી શકતા ન હોય તો, મહેરબાની કરીને "
+"નીચેનાં વાક્યમાં ઉમેરો$HOME/.bashrc, અને તમારા ડેસ્કટોપમાં ફરીથી પ્રવેશ કરો.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ માંથી પસંદ થયેલ ઇનપુટ પદ્દતિને દૂર કરો"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"ભાષા પેનલને કેવી રીતે બતાવવી અથવા છુપાડવી તે માટે ibus નાં વર્ણતૂકને સુયોજિત"
-" કરો"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "કોષ્ટક જોવામાં સભ્યોની દિશાને સુયોજિત કરો"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"જ્યારે ચેકબોક્સને ચકાસતા હોય ત્યારે ભાષા પેનલ પર ઇનપુટ પદ્દતિનાં નામને બતાવો"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "પુન:શરૂ કરો"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ભાષા પેનલને બતાવો:"
+#~ msgid "Previous page"
+#~ msgstr "પહેલાનુ પાનું"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
+#~ msgid "Next page"
+#~ msgstr "પછીનુ પાનું"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "અમુક ઇનપુટ પદ્દતિઓને સ્થાપિત, દૂર અથવા સુધારી દેવામાં આવી છે. મહેરબાની કરીને ibus "
+#~ "ઇનપુટ પ્લેટફોર્મને પુન:શરૂ કરો."
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
+#~ msgid "Restart Now"
+#~ msgstr "હવે પુન:શરૂ કરો"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ઉંચે ડાબી બાજુનો ખૂણો"
+#~ msgid "Later"
+#~ msgstr "પછી"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ઉંચે જમણી બાજુનો ખૂણો"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "વૈવિધ્યપૂર્ણ ફોન્ટ વાપરો:"
+#~ msgid "Turn off input method"
+#~ msgstr "ઇનપુટ પદ્દતિને બંધ કરો"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "ઊભું"
+#~ msgid "No input window"
+#~ msgstr "ઇનપુટ વિન્ડો નથી"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "જ્યારે સક્રિય હોય"
+#~ msgid "About the input method"
+#~ msgstr "ઇનપુટ પદ્દતિ વિશે"
+
+#~ msgid "Switch input method"
+#~ msgstr "ઇનપુટ પદ્દતિને બદલો"
+
+#~ msgid "About the Input Method"
+#~ msgstr "ઇનપુટ પદ્દતિ વિશે"
+
+#~ msgid "next input method"
+#~ msgstr "પછીની ઇનપુટ પદ્દતિ"
+
+#~ msgid "previous input method"
+#~ msgstr "પહેલાની ઇનપુટ પદ્દતિ"
diff --git a/po/hi.po b/po/hi.po
index 9c8057387..199d36cf4 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
 "Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
@@ -20,522 +20,542 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "क्षैतिज"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "IBus विधि फ्रेमवर्क"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "लंबवत"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus इनपुट विधि फ्रेमवर्क आरंभ करें"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "मेन्यू में अंतःस्थापित"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "जब सक्रिय हो"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "अन्य"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "हमेशा"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "पिछला पृष्ठ"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ऊपरी बायां कोना"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "अगला पृष्ठ"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ऊपरी दाहिना कोना"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"कुछ इनपुट विधियाँ संस्थापित, हटाई या अद्यतन की गई हैं. कृपया ibus इनपुट "
-"प्लैटफॉर्म को फिर आरंभ करें."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "निचला बायां कोना"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "अब फिर प्रारंभ करें"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "निचला दाहिना कोना"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "बाद में"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "मनपसंद"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus इनपुट विधि फ्रेमवर्क"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus वरीयता"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "पुनः प्रारंभ करें"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "सूची में अगली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "इनपुट विधि बंद करें"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "अगली इनपुट विधि :"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "कोई इनपुट विंडो नहीं"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "पिछली इनपुट विधि:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "राजेश रंजन (rranjan@redhat.com)"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "इनपुट विधि का परिचय"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "इनपुट विधि को चालू या बंद रखने के लिए शॉर्टकट कुंजी"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "इनपुट विधि बदलें"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "सक्रिय या निष्क्रिय करें:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "परिचय"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "सक्रिय करें:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "इनपुट विधि का परिचय"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "निष्क्रिय करें:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "भाषा: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>कुंजीपटल शॉर्टकट</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "कुंजीपट लेआउट: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "लुकअप सारणी में कंडीडेट की दिशा सेट करें"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "लेखक: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "कंडीडेट दिशा:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "विवरण:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus का आचरण सेट करें कि कैसे भाषा पट्टी को दिखाना या छिपाना है"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ट्रिगर"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "भाषा पैनल दिखाएँ:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "सक्रिय करें"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "भाषा पैनल स्थिति:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "निष्क्रिय करें"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "तंत्र तश्तरी पर प्रतीक दिखाएँ"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+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/main.py:135
-msgid "next input method"
-msgstr "अगली इनपुट विधि"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "पिछली इनपुट विधि"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "इनपुट विधि के पूर्वसंपादित पाठ को अनुप्रयोग विंडो में अंतःस्थापित करें"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus अबतक आरंभ नहीं हुआ है. क्या आप इसे आरंभ करना चाहते हैं?"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>फ़ॉन्ट व शैली</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus आरंभ किया गया है! यदि आप IBus का प्रयोग नहीं कर सकते हैं, कृपया नीचे की पंक्ति को $HOME/.bashrc में जोड़ें, और अपने डेस्कटॉप में फिर लॉगिन करें.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\n"
+"आप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "इनपुट विधि"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "कुंजीपटल शॉर्टकर्ट"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "तंत्र कुंजीपट लेआउट का प्रयोग करें"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "कुंजी कोड:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "तंत्र कुंजीपट (XKB) लेआउट का प्रयोग करें"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "परिवर्तनकर्ता:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>कुंजीपट लेआउट</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "सभी अनुप्रयोगों के बीच समान इनपुट विधि को साझा करें"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "कोई इनपुट विधि चुनें"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "उन्नत"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग).\n"
-"यह संवाद कुंजी छोड़े जाने पर बंद हो जाएगा."
+"<big><b>IBus</b></big>\n"
+"<small>तेज-तर्रार इनपुट बस</small>\n"
+"होमपेज: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "लॉगिन पर ibus आरंभ करें"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "कोई इनपुट विधि चुनें"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>स्टार्टअप</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "इनपुट विधि"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "परिचय"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus वरीयता"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "IBus विधि फ्रेमवर्क"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus वरीयताएँ सेट करें"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus इनपुट विधि फ्रेमवर्क आरंभ करें"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "स्वतः छुपाएँ"
+msgid "Preload engines"
+msgstr "पहले से लोड इंजन"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "मनपसंद फ़ॉन्ट"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus आरंभन के दौरान पहले से लोड इंजन"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "शॉर्टकट कुँजियाँ निष्क्रिय करें"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "पूर्वसंपादित पाठ अंतःस्थापित करें"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
+msgid "Trigger shortcut keys"
+msgstr "शॉर्टकट कुंजी ट्रिगर करें"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "इनपुट विधि को तयशुदा रूप से सक्रिय करें"
+msgid "Enable shortcut keys"
+msgstr "शॉर्टकट कुँजियाँ सक्रिय करें"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"जब अनुप्रयोग इनपुट फोकस पाता है तो इनपुट विधि को तयशुदा रूप से सक्रिय करें"
+msgid "The shortcut keys for turning input method on"
+msgstr "इनपुट विधि को चालू करने के लिए शॉर्टकट कुँजियाँ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "शॉर्टकट कुँजियाँ सक्रिय करें"
+msgid "Disable shortcut keys"
+msgstr "शॉर्टकट कुँजियाँ निष्क्रिय करें"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "भाषा पैनल स्थिति"
+msgid "The shortcut keys for turning input method off"
+msgstr "इनपुट विधि को बंद करने के लिए शॉर्टकट कुँजियाँ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "अगला इंजन शॉर्टकट कुंजी"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "लुकअप सारणी की दिशा"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "सूची में अगली इनपुट विधि में जाने के लिए शॉर्टकट कुंजियाँ"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "सारणी देखने के लिए दिशा. 0 = क्षैतिज, 1 = लंबवत"
-
-#: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "पहले से लोड इंजन"
-
-#: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus आरंभन के दौरान पहले से लोड इंजन"
-
-#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "पिछला इंजन शॉर्टकट कुंजी"
 
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "सभी अनुप्रयोगों के बीच समान इनपुट विधि को साझा करें"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "तंत्र तश्तरी पर प्रतीक दिखाएँ"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "इनपुट विधि नाम दिखाएँ"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजियाँ"
 
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "स्वतः छुपाएँ"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
-"भाषा फलक का व्यवहार. 0 = मेन्यू में अंतःस्थापित, 1 = स्वतः छिपाएँ, 2 = हमेशा"
-" दिखाएँ"
+"भाषा फलक का व्यवहार. 0 = मेन्यू में अंतःस्थापित, 1 = स्वतः छिपाएँ, 2 = हमेशा दिखाएँ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "भाषा पैनल स्थिति"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"भाषा पटल की स्थिति. 0 = ऊपरी बायाँ कोना, 1 = ऊपरी दाहिना कोना, 2 = निचला "
-"बायां कोना, 3 = निचला दाहिना कोना, 4 = पसंदीदा"
+"भाषा पटल की स्थिति. 0 = ऊपरी बायाँ कोना, 1 = ऊपरी दाहिना कोना, 2 = निचला बायां "
+"कोना, 3 = निचला दाहिना कोना, 4 = पसंदीदा"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "सूची में अगली इनपुट विधि में जाने के लिए शॉर्टकट कुंजियाँ"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "लुकअप सारणी की दिशा"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजियाँ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "सारणी देखने के लिए दिशा. 0 = क्षैतिज, 1 = लंबवत"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "इनपुट विधि को बंद करने के लिए शॉर्टकट कुँजियाँ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "इनपुट विधि नाम दिखाएँ"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "इनपुट विधि को चालू करने के लिए शॉर्टकट कुँजियाँ"
+msgid "Use custom font"
+msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "इनपुट विधि को चालू या बंद रखने के लिए शॉर्टकट कुंजी"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "शॉर्टकट कुंजी ट्रिगर करें"
+msgid "Custom font"
+msgstr "मनपसंद फ़ॉन्ट"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
+msgid "Custom font name for language panel"
+msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
+msgid "Embed Preedit Text"
+msgstr "पूर्वसंपादित पाठ अंतःस्थापित करें"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "लक्ष्य इनपुट विधि का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "तंत्र कुंजीपट (XKB) लेआउट का प्रयोग करें"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "तंत्र कुंजीपट लेआउट का प्रयोग करें"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>फ़ॉन्ट व शैली</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "कोई इनपुट विधि चुनें"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>कुंजीपट लेआउट</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>कुंजीपटल शॉर्टकट</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "जब अनुप्रयोग इनपुट फोकस पाता है तो इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>स्टार्टअप</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>तेज-तर्रार इनपुट बस</small>\n"
-"होमपेज: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\n"
-"आप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "सक्रिय किए गए इनपुट विधि में चुनी गई इनपुट विधियों को जोड़ें"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "अन्य"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "उन्नत"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "भाषा: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "हमेशा"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "कुंजीपट लेआउट: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "निचला बायां कोना"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "लेखक: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "निचला दाहिना कोना"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "विवरण:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "कंडीडेट दिशा:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "कोई इनपुट विधि चुनें"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "मनपसंद"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "निष्क्रिय करें:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus वरीयताएँ सेट करें"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "कुंजीपटल शॉर्टकर्ट"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "कुंजी कोड:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "परिवर्तनकर्ता:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"इनपुट विधि के पूर्वसंपादित पाठ को अनुप्रयोग विंडो में अंतःस्थापित करें"
+"कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग).\n"
+"यह संवाद कुंजी छोड़े जाने पर बंद हो जाएगा."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "मेन्यू में अंतःस्थापित"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "सक्रिय या निष्क्रिय करें:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ट्रिगर"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "सक्रिय करें:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "सक्रिय करें"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "सामान्य"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "निष्क्रिय करें"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "क्षैतिज"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus अबतक आरंभ नहीं हुआ है. क्या आप इसे आरंभ करना चाहते हैं?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "भाषा पैनल स्थिति:"
+#: ../setup/main.py:344
+#, fuzzy
+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 आरंभ किया गया है! यदि आप IBus का प्रयोग नहीं कर सकते हैं, कृपया नीचे की पंक्ति को "
+"$HOME/.bashrc में जोड़ें, और अपने डेस्कटॉप में फिर लॉगिन करें.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "सक्रिय की गई इनपुट विधियों में चुनी गई इनपुट विधियों को खिसकाएँ"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "सक्रिय की गई इनपुट विधि सूची में चुनी गई इनपुट विधियों को ले जाएँ"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "अगली इनपुट विधि :"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "पिछली इनपुट विधि:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "सक्रिय की गई इनपुट विधियों में चुनी गई इनपुट विधियों हटाएँ"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "राजेश रंजन (rranjan@redhat.com)"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus का आचरण सेट करें कि कैसे भाषा पट्टी को दिखाना या छिपाना है"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "पुनः प्रारंभ करें"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "लुकअप सारणी में कंडीडेट की दिशा सेट करें"
+#~ msgid "Previous page"
+#~ msgstr "पिछला पृष्ठ"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
+#~ msgid "Next page"
+#~ msgstr "अगला पृष्ठ"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ जब जाँचपेटी जाँचा गया है"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "कुछ इनपुट विधियाँ संस्थापित, हटाई या अद्यतन की गई हैं. कृपया ibus इनपुट प्लैटफॉर्म को "
+#~ "फिर आरंभ करें."
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "भाषा पैनल दिखाएँ:"
+#~ msgid "Restart Now"
+#~ msgstr "अब फिर प्रारंभ करें"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "लॉगिन पर ibus आरंभ करें"
+#~ msgid "Later"
+#~ msgstr "बाद में"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "सूची में अगली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus इनपुट विधि फ्रेमवर्क"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
+#~ msgid "Turn off input method"
+#~ msgstr "इनपुट विधि बंद करें"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ऊपरी बायां कोना"
+#~ msgid "No input window"
+#~ msgstr "कोई इनपुट विंडो नहीं"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ऊपरी दाहिना कोना"
+#~ msgid "About the input method"
+#~ msgstr "इनपुट विधि का परिचय"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें:"
+#~ msgid "Switch input method"
+#~ msgstr "इनपुट विधि बदलें"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "लंबवत"
+#~ msgid "About the Input Method"
+#~ msgstr "इनपुट विधि का परिचय"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "जब सक्रिय हो"
+#~ msgid "next input method"
+#~ msgstr "अगली इनपुट विधि"
+
+#~ msgid "previous input method"
+#~ msgstr "पिछली इनपुट विधि"
diff --git a/po/hu.po b/po/hu.po
index 1f04a9639..2e0c0dd59 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,314 +2,328 @@
 # Hungarian translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # kelemeng <kelemeng@gnome.hu>, 2011.
 # Sulyok Péter <peti@fedoraproject.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-09-01 00:45+0000\n"
 "Last-Translator: kelemeng <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Bevitelimód-keretrendszer"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Vízszintes"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus bevitelimód-keretrendszer elindítása"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Függőleges"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Beágyazva a menübe"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Más"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Amikor aktív"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Előző oldal"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Mindig"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Következő oldal"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Bal felső sarok"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"Néhány beviteli mód telepítésre, eltávolításra vagy frissítésre került. "
-"Indítsa újra az ibus beviteli rendszert."
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Jobb felső sarok"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Újraindítás most"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Bal alsó sarok"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Később"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Jobb alsó sarok"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus panel"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Egyéni"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus bevitelimód-keretrendszer"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus beállítások"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Újraindítás"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Gyorsbillentyűk a következő beviteli módra váltáshoz"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Beviteli mód kikapcsolása"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Következő beviteli mód:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Nincs beviteli ablak"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Gyorsbillentyűk az előző beviteli módra való váltáshoz"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Előző beviteli mód:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"Sulyok Péter <peti@fedoraproject.org>, 2009.\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"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "A beviteli mód névjegye"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Beviteli mód váltása"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Engedélyezés vagy tiltás:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Névjegy"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Engedélyezés:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "A beviteli mód névjegye"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Letiltás:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Nyelv: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Gyorsbillentyűk</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Billentyűzetkiosztás: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Jelöltek tájolásának beállítása a keresési táblában"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Szerző: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Jelöltek tájolása:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Leírás:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "aktiváló"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Nyelv panel megjelenítése:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "engedélyezés"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "A nyelvi panel elhelyezése:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "letiltás"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Ikon megjelenítése az értesítési területen"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "következő beviteli mód"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "előző beviteli mód"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Az IBus szolgáltatás áll. Beindítja?"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
-"IBus működik! Ha nem tudja IBus-t használni, kérem fűzze az \n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibussorokat a $HOME/.bashrc fájlhoz, majd lépjen be újra."
+"A beviteli mód előszerkesztett szövegének beágyazása az alkalmazásablakba"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s gyorsbillentyűjének kiválasztása"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Egyéni betűkészlet használata:"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Gyorsbillentyűk"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Betűkészlet és stílus</b>"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Billentyűkód:"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Általános"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Módosítók:"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\n"
-"Az ablak a billentyű felengedésekor bezáródik."
+"A kiválasztott beviteli mód eltávolítása az engedélyezett beviteli módok "
+"közül"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
+#: ../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"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Válasszon beviteli módot"
+#: ../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"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Információk megjelenítése a kiválasztott beviteli módról"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Információk megjelenítése a kiválasztott beviteli módról"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Beviteli mód"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Bill"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Rendszer-billentyűzetkiosztás használata"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus beállítások"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus beállításai"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Billentyűzetkiosztás</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globális bevitelimód-beállítások</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Speciális"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Az intelligens beviteli busz</small>\n"
+"Honlap: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Az IBus indítása bejelentkezéskor"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Indulás</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Névjegy"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Bevitelimód-keretrendszer"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus bevitelimód-keretrendszer elindítása"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Automatikus elrejtés"
+msgid "Preload engines"
+msgstr "Alrendszerek előtöltése"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Egyéni betűkészlet"
+msgid "Preload engines during ibus starts up"
+msgstr "Alrendszerek előtöltése  az ibus indításakor"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Egyéni betűkészlet neve a nyelv panelhez"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Gyorsbillentyűk letiltása"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Előszerkesztett szöveg beágyazása"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+msgid "Trigger shortcut keys"
+msgstr "Aktiváló gyorsbillentyűk"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Beviteli mód engedélyezése alapértelmezésben"
+msgid "Enable shortcut keys"
+msgstr "Gyorsbillentyűk engedélyezése"
 
 #: ../data/ibus.schemas.in.h:8
-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"
+msgid "The shortcut keys for turning input method on"
+msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Gyorsbillentyűk engedélyezése"
+msgid "Disable shortcut keys"
+msgstr "Gyorsbillentyűk letiltása"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Nyelvi panel pozíciója"
+msgid "The shortcut keys for turning input method off"
+msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Következő alrendszer gyorsbillentyűi"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Keresési tábla tájolása"
+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ű"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
+msgid "Prev engine shortcut keys"
+msgstr "Előző alrendszer gyorsbillentyűi"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Alrendszerek előtöltése"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Alrendszerek előtöltése  az ibus indításakor"
+msgid "Auto hide"
+msgstr "Automatikus elrejtés"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Előző alrendszer gyorsbillentyűi"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Ikon megjelenítése az értesítési területen"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Beviteli mód megjelenítése"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -317,7 +331,11 @@ 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:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Nyelvi panel pozíciója"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -325,239 +343,243 @@ 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:23
-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ű"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Keresési tábla tájolása"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Beviteli mód megjelenítése"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
+msgid "Use custom font"
+msgstr "Egyéni betűkészlet használata"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Egyéni betűkészlet használata a nyelv panelen"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Aktiváló gyorsbillentyűk"
+msgid "Custom font"
+msgstr "Egyéni betűkészlet"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Egyéni betűkészlet használata"
+msgid "Custom font name for language panel"
+msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Egyéni betűkészlet használata a nyelv panelen"
+msgid "Embed Preedit Text"
+msgstr "Előszerkesztett szöveg beágyazása"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Rendszer-billentyűzetkiosztás használata"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Betűkészlet és stílus</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globális bevitelimód-beállítások</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Billentyűzetkiosztás</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Gyorsbillentyűk</b>"
+#: ../data/ibus.schemas.in.h:35
+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"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Indulás</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Az intelligens beviteli busz</small>\n"
-"Honlap: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>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.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-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"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Más"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Speciális"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Nyelv: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Mindig"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Billentyűzetkiosztás: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Bal alsó sarok"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Szerző: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Jobb alsó sarok"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Leírás:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Jelöltek tájolása:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Válasszon beviteli módot"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Egyéni"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Bill"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Letiltás:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus beállításai"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Gyorsbillentyűk"
 
-#: ../setup/setup.ui.h:26
-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ásablakba"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Billentyűkód:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Beágyazva a menübe"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Módosítók:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Engedélyezés vagy tiltás:"
+#: ../setup/keyboardshortcut.py:235
+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).\n"
+"Az ablak a billentyű felengedésekor bezáródik."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Engedélyezés:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Általános"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "aktiváló"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Vízszintes"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "engedélyezés"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "A nyelvi panel elhelyezése:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "letiltás"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Az IBus szolgáltatás áll. Beindítja?"
+
+#: ../setup/main.py:344
+#, fuzzy
+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 ""
-"A kiválasztott beviteli mód mozgatása lefelé az engedélyezett beviteli módok"
-" között"
+"IBus működik! Ha nem tudja IBus-t használni, kérem fűzze az \n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibussorokat a $HOME/.bashrc fájlhoz, majd lépjen be "
+"újra."
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"A kiválasztott beviteli mód mozgatása felfelé az engedélyezett beviteli "
-"módok között"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Következő beviteli mód:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s gyorsbillentyűjének kiválasztása"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Előző beviteli mód:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
+
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
-"A kiválasztott beviteli mód eltávolítása az engedélyezett beviteli módok "
-"közül"
+"Sulyok Péter <peti@fedoraproject.org>, 2009.\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"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Újraindítás"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Jelöltek tájolásának beállítása a keresési táblában"
+#~ msgid "Previous page"
+#~ msgstr "Előző oldal"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Információk megjelenítése a kiválasztott beviteli módról"
+#~ msgid "Next page"
+#~ msgstr "Következő oldal"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Néhány beviteli mód telepítésre, eltávolításra vagy frissítésre került. "
+#~ "Indítsa újra az ibus beviteli rendszert."
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Nyelv panel megjelenítése:"
+#~ msgid "Restart Now"
+#~ msgstr "Újraindítás most"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Az IBus indítása bejelentkezéskor"
+#~ msgid "Later"
+#~ msgstr "Később"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Gyorsbillentyűk a következő beviteli módra váltáshoz"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus panel"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Gyorsbillentyűk az előző beviteli módra való váltáshoz"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus bevitelimód-keretrendszer"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Bal felső sarok"
+#~ msgid "Turn off input method"
+#~ msgstr "Beviteli mód kikapcsolása"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Jobb felső sarok"
+#~ msgid "No input window"
+#~ msgstr "Nincs beviteli ablak"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Egyéni betűkészlet használata:"
+#~ msgid "About the input method"
+#~ msgstr "A beviteli mód névjegye"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Függőleges"
+#~ msgid "Switch input method"
+#~ msgstr "Beviteli mód váltása"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Amikor aktív"
+#~ msgid "About the Input Method"
+#~ msgstr "A beviteli mód névjegye"
+
+#~ msgid "next input method"
+#~ msgstr "következő beviteli mód"
+
+#~ msgid "previous input method"
+#~ msgstr "előző beviteli mód"
diff --git a/po/it.po b/po/it.po
index 919a96a7a..5af4476d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-07-30 08:36+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <it@li.org>\n"
@@ -22,279 +22,314 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-01 17:40+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Orizzontale"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework del metodo di input"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Verticale"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Avvia il framework del metodo di input di IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Inserito nel menu"
 
-#: ../ibus/_config.py.in:39
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Copyright © 2007-2010 Peng Huang\n"
-"Copyright © 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Quando attivoB"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Altro"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Sempre"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Pagina precedente"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Angolo superiore sinistro"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Pagina successiva"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Angolo superiore destro"
 
-#: ../ui/gtk/main.py:55
-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."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Angolo inferiore sinistro"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "Riavvia ora"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Angolo inferiore destro"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "Più tardi"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Personalizzato"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "Ambiente del metodo di input IBus"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferenze di IBus"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Riavvia"
+#: ../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"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "Disabilita metodo di input"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Metodo di input successivo:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "Nessuna finestra di input"
+#: ../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"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus è un bus di input intelligente per Linux/Unix."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Metodo di input precedente:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Abilitare o disabilitare:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Sergio Zanchetta https://launchpad.net/~primes2h"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Informazioni sul metodo di input"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Cambia metodo di input"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Scorciatoie da tastiera</b>"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Informazioni"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Informazioni sul metodo di input"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientamento dei candidati:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Lingua: %s\n"
+#: ../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"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Disposizione tastiera: %s\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Mostrare pannello della lingua:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autore: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posizione pannello della lingua:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Descrizione:\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Mostrare l'icona nell'area di notifica"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "l'avvio"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Mostrare il nome del metodo di input nella barra della lingua"
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../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"
 
-#: ../setup/main.py:124
-msgid "disable"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
+
+#: ../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"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "il metodo di input successivo"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Usare carattere personalizzato:"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "il metodo di input precedente"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Tipo di carattere e stile</b>"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Il demone IBus non è in esecuzione. Avviarlo ora?"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Generali"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
+
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
+
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
+
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Mostra le informazioni sul metodo di input selezionato"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Mostra le informazioni sul metodo di input selezionato"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus è stato avviato. Se non è possibile usare IBus, aggiungere le righe "
-"sottostanti in $HOME/.bashrc e rieseguire l'accesso.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>Il metodo di input predefinito è il primo in alto nell'elenco.\n"
+"Per cambiarlo è possibile usare i pulsanti su/giù.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selezione delle scorciatoie da tastiera per %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Metodo di input"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Scorciatoie da tastiera"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Usa la disposizione di tastiera del sistema"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Codice del tasto:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificatori:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Condivide lo stesso metodo di input tra le applicazioni"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "Seleziona un metodo di input"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Premere un tasto (o una combinazione di tasti).\n"
-"La finestra verrà chiusa dopo il rilascio del tasto stesso."
+"<big><b>IBus</b></big>\n"
+"<small>Il bus di input intelligente</small>\n"
+"Sito web: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Premere un tasto (o una combinazione di tasti)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Avvia IBus all'accesso"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Seleziona un metodo di input"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Avvio</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Metodo di input"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Informazioni"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Preferenze di IBus"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Framework del metodo di input"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Imposta Preferenze di IBus"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Avvia il framework del metodo di input di IBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Nasconde automaticamente"
+msgid "Preload engines"
+msgstr "Pre-carica i motori"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Carattere personalizzato"
+msgid "Preload engines during ibus starts up"
+msgstr "Precarica i motori durante l'avvio di ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "Inserire il testo pre-modificato"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Enable input method by default"
-msgstr "Abilita per impostazione predefinita il metodo di input"
+msgid "Trigger shortcut keys"
+msgstr "Tasto di scelta rapida di avvio"
 
 #: ../data/ibus.schemas.in.h:7
-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"
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "Tasto di scelta rapida di avvio"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "Posizione pannello della lingua"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "Motore dei tasti di scelta rapida successivo"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "Tasto di scelta rapida di avvio"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "Orientamento della tabella di ricerca"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
+msgid "Next engine shortcut keys"
+msgstr "Motore dei tasti di scelta rapida successivo"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "Pre-carica i motori"
+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"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "Precarica i motori durante l'avvio di ibus"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida precedente"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Condivide lo stesso metodo di input tra le applicazioni"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Mostrare l'icona nell'area di notifica"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "Mostra il nome del metodo di input"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "I tasti scorciatoia per passare al metodo di input precedente"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Mostrare il nome del metodo di input nella barra della lingua"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Nasconde automaticamente"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -302,240 +337,246 @@ msgstr ""
 "Il comportamento del pannello della lingua. 0 = Inserito nel menu, 1 = "
 "Nasconde automaticamente, 2 = Mostra sempre"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Posizione pannello della lingua"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 "La 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:21
-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"
+"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 "The shortcut keys for switching to the previous input method"
-msgstr "I tasti scorciatoia per passare al metodo di input precedente"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Orientamento della tabella di ricerca"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "Tasto di scelta rapida di avvio"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Mostra il nome del metodo di input"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Usare carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "Usa il metodo di input globale"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usa la disposizione di tastiera del sistema (XKB)"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Usa la disposizione di tastiera del sistema"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "Inserire il testo pre-modificato"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Tipo di carattere e stile</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "Seleziona un metodo di input"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Usa il metodo di input globale"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposizione tastiera</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Abilita per impostazione predefinita il metodo di input"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Scorciatoie da tastiera</b>"
+#: ../data/ibus.schemas.in.h:35
+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"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Avvio</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Il bus di input intelligente</small>\n"
-"Sito web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Il metodo di input predefinito è il primo in alto nell'elenco.\n"
-"Per cambiarlo è possibile usare i pulsanti su/giù.</i></small>"
+"Copyright © 2007-2010 Peng Huang\n"
+"Copyright © 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Altro"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avanzate"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Lingua: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Sempre"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Disposizione tastiera: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Angolo inferiore sinistro"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autore: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Angolo inferiore destro"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Descrizione:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientamento dei candidati:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Seleziona un metodo di input"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Personalizzato"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Imposta Preferenze di IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Scorciatoie da tastiera"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Codice del tasto:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificatori:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Inserisce il testo premodificato del metodo di input nella finestra "
-"dell'applicazione"
+"Premere un tasto (o una combinazione di tasti).\n"
+"La finestra verrà chiusa dopo il rilascio del tasto stesso."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Inserito nel menu"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Premere un tasto (o una combinazione di tasti)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Abilitare o disabilitare:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "l'avvio"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Generali"
-
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Orizzontale"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Posizione pannello della lingua:"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Il demone IBus non è in esecuzione. Avviarlo ora?"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
+#: ../setup/main.py:344
+#, fuzzy
+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 è stato avviato. Se non è possibile usare IBus, aggiungere le righe "
+"sottostanti in $HOME/.bashrc e rieseguire l'accesso.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Metodo di input successivo:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selezione delle scorciatoie da tastiera per %s"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Metodo di input precedente:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright © 2007-2010 Peng Huang\n"
+"Copyright © 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
-"Imposta il comportamento di IBus su come mostrare o nascondere la barra "
-"della lingua"
+"Launchpad Contributions:\n"
+"  Sergio Zanchetta https://launchpad.net/~primes2h"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Riavvia"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostra le informazioni sul metodo di input selezionato"
+#~ msgid "Previous page"
+#~ msgstr "Pagina precedente"
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Next page"
+#~ msgstr "Pagina successiva"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Mostrare pannello della lingua:"
+#~ 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."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Avvia IBus all'accesso"
+#~ msgid "Restart Now"
+#~ msgstr "Riavvia ora"
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "Later"
+#~ msgstr "Più tardi"
 
-#: ../setup/setup.ui.h:50
-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"
+#~ msgid "IBus input method framework"
+#~ msgstr "Ambiente del metodo di input IBus"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Angolo superiore sinistro"
+#~ msgid "Turn off input method"
+#~ msgstr "Disabilita metodo di input"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Angolo superiore destro"
+#~ msgid "No input window"
+#~ msgstr "Nessuna finestra di input"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Usare carattere personalizzato:"
+#~ msgid "About the input method"
+#~ msgstr "Informazioni sul metodo di input"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Verticale"
+#~ msgid "Switch input method"
+#~ msgstr "Cambia metodo di input"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Quando attivoB"
+#~ 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"
diff --git a/po/ja.po b/po/ja.po
index d4c5b91ae..9808ece68 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-12-13 16:43+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-12-13 18:00+0000\n"
 "Last-Translator: Makoto Mizukami <makoto@fedoraporject.org>\n"
 "Language-Team: Japanese <jp@li.org>\n"
@@ -24,525 +24,557 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "インプットメソッドフレームワーク"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "横"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus インプットメソッドフレームワークを起動"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "縦"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "メニューに組み込む"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "その他"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "アクティブであるとき"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "前のページ"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "常に表示する"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "次のページ"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "左上隅"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr "いくつかのインプットメソッドがインストール、削除、または更新されています。IBus 入力プラットフォームを再起動してください。"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "右上隅"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "今すぐに再起動する"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "左下隅"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "後でする"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "右下隅"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus パネル"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "カスタム"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus インプットメソッドフレームワーク"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus の設定"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "再起動"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "リストの中で次のインプットメソッドに切り替えるためのショートカットキー"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "インプットメソッドをオフにする"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "次のインプットメソッド:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "入力ウィンドウがありません"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "ひとつ前のインプットメソッド:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
-"IWAI, Masaharu <iwai@alib.jp>\n"
-"日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "インプットメソッドについて"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "インプットメソッドをオン、オフするためのショートカットキーを設定します"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "インプットメソッドがありません"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "切り替え"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "情報"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "有効:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "インプットメソッドについて"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "無効:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "言語: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>キーボードショートカット</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "キーボードレイアウト: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ルックアップテーブルの中で候補ウィンドウの向きを設定します"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "候補ウィンドウの向き:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "説明:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "言語バーをどのように表示するもしくは隠すかの ibus の動作を設定します"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "トリガー"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "言語パネルの表示:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "有効"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "言語パネルの位置"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "無効"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "システムトレイにアイコンを表示する"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "次のインプットメソッド"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "言語バーにインプットメソッド名を表示する"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "ひとつ前のインプットメソッド"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表"
+"示します"
 
-#: ../setup/main.py:332
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus デーモンが動いていません。起動しますか？"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "アプリケーションウィンドウに前編集テキストを組み込む"
 
-#: ../setup/main.py:347
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
-"IBus を開始しました。IBus を使えない場合は次の行を$HOME/.bashrc に書き加えて再ログインしてください。\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み"
+"込みます"
 
-#: ../setup/main.py:362
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s のキーボードショートカットを選択"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "カスタムフォントを使う:"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "キーボードショートカット"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>フォントとスタイル</b>"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "キーコード:"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "一般"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "モディファイア:"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "選択したインプットメソッドを有効なインプットメソッドへ追加します"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../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 ""
-"キーもしくはキーの組み合わせを入力してください。\n"
-"キーを離すとダイアログを閉じます"
+"選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "キーもしくはキーの組み合わせを入力してください"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-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 ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
+"「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "インプットメソッド"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "システムキーボードレイアウトを使用する"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus の設定"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "システムキーボード (XKB) レイアウトを使用する"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus の設定"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>キーボードレイアウト</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "すべてのアプリケーション間で同じインプットメソッドを共有する"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>グローバルインプットメソッドの設定</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "詳細"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>インテリジェントなインプットバス</small>\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 "<b>Startup</b>"
+msgstr "<b>スタートアップ</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Auto hide"
-msgstr "自動的に隠す"
+msgid "Preload engines"
+msgstr "エンジンのプリロード"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "カスタムフォント"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus の開始中にエンジンをプリロード"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "言語パネル用のカスタムフォント名"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "ショートカットキーを無効にする"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "前編集テキストを組み込む"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "アプリケーションウィンドウにプリエディットテキストを組み込む"
+msgid "Trigger shortcut keys"
+msgstr "トリガーショートカットキー"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "標準でインプットメソッドを有効にする"
+msgid "Enable shortcut keys"
+msgstr "ショートカットキーを有効にする"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効にする"
+msgid "The shortcut keys for turning input method on"
+msgstr "インプットメソッドをオンに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "ショートカットキーを有効にする"
+msgid "Disable shortcut keys"
+msgstr "ショートカットキーを無効にする"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "言語パネルの位置"
+msgid "The shortcut keys for turning input method off"
+msgstr "インプットメソッドをオフに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "次のエンジンへのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "検索テーブルの方位"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "リスト中の次のインプットメソッドに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "検索テーブルの方位。0 = 横、1 = 縦"
+msgid "Prev engine shortcut keys"
+msgstr "前のエンジンへのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "エンジンのプリロード"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+"リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus の開始中にエンジンをプリロード"
+msgid "Auto hide"
+msgstr "自動的に隠す"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "前のエンジンへのショートカットキー"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "すべてのアプリケーション間で同じインプットメソッドを共有する"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "システムトレイにアイコンを表示する"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "インプットメソッド名を表示する"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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 = 常に表示"
+msgstr ""
+"言語パネルの動作。0 = メニューに組み込む、1 = 自動的に隠す、2 = 常に表示"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "言語パネルの位置"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
-msgstr "言語パネルの位置。0 = 左上隅、1 = 右上隅、2 = 左下隅、3 = 右下隅、4 = カスタム"
+msgstr ""
+"言語パネルの位置。0 = 左上隅、1 = 右上隅、2 = 左下隅、3 = 右下隅、4 = カスタ"
+"ム"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "リスト中の次のインプットメソッドに切り替えるためのショートカットキー"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "検索テーブルの方位"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "検索テーブルの方位。0 = 横、1 = 縦"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "インプットメソッドをオフに切り替えるためのショートカットキー"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "インプットメソッド名を表示する"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "インプットメソッドをオンに切り替えるためのショートカットキー"
+msgid "Use custom font"
+msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:52
-msgid "The shortcut keys for turning input method on or off"
-msgstr "インプットメソッドをオン、オフするためのショートカットキーを設定します"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "言語パネル用にカスタムフォント名を使用する"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "トリガーショートカットキー"
+msgid "Custom font"
+msgstr "カスタムフォント"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "カスタムフォントを使う"
+msgid "Custom font name for language panel"
+msgstr "言語パネル用のカスタムフォント名"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "言語パネル用にカスタムフォント名を使用する"
+msgid "Embed Preedit Text"
+msgstr "前編集テキストを組み込む"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "アプリケーションウィンドウにプリエディットテキストを組み込む"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "グローバルインプットメソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:56
-msgid "Use system keyboard (XKB) layout"
-msgstr "システムキーボード (XKB) レイアウトを使用する"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:57
-msgid "Use system keyboard layout"
-msgstr "システムキーボードレイアウトを使用する"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>フォントとスタイル</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>グローバルインプットメソッドの設定</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>キーボードレイアウト</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "標準でインプットメソッドを有効にする"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>キーボードショートカット</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効"
+"にする"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>スタートアップ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>インテリジェントなインプットバス</small>\n"
-"ホームページ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
-"「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドへ追加します"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "その他"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "詳細"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "言語: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "常に表示する"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "キーボードレイアウト: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "左下隅"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "右下隅"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "説明:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "候補ウィンドウの向き:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "インプットメソッドの選択"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "カスタム"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "無効:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus の設定"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "アプリケーションウィンドウに前編集テキストを組み込む"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "キーボードショートカット"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み込みます"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "キーコード:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "メニューに組み込む"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "モディファイア:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "切り替え"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"キーもしくはキーの組み合わせを入力してください。\n"
+"キーを離すとダイアログを閉じます"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "有効:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "一般"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "トリガー"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "横"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "有効"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "言語パネルの位置"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "無効"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus デーモンが動いていません。起動しますか？"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
+#: ../setup/main.py:344
+#, fuzzy
+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 を開始しました。IBus を使えない場合は次の行を$HOME/.bashrc に書き加えて"
+"再ログインしてください。\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "次のインプットメソッド:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "ひとつ前のインプットメソッド:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s のキーボードショートカットを選択"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドから削除します"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "言語バーをどのように表示するもしくは隠すかの ibus の動作を設定します"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ルックアップテーブルの中で候補ウィンドウの向きを設定します"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
+"IWAI, Masaharu <iwai@alib.jp>\n"
+"日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "選択したインプットメソッドの情報を表示します"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "再起動"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表示します"
+#~ msgid "Previous page"
+#~ msgstr "前のページ"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "言語パネルの表示:"
+#~ msgid "Next page"
+#~ msgstr "次のページ"
 
-#: ../setup/setup.ui.h:48
-msgid "Show setup of the selected input method"
-msgstr "選択したインプットメソッドの設定を表示します"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "いくつかのインプットメソッドがインストール、削除、または更新されています。"
+#~ "IBus 入力プラットフォームを再起動してください。"
 
-#: ../setup/setup.ui.h:49
-msgid "Start ibus on login"
-msgstr "ログイン時に IBus を起動"
+#~ msgid "Restart Now"
+#~ msgstr "今すぐに再起動する"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "リストの中で次のインプットメソッドに切り替えるためのショートカットキー"
+#~ msgid "Later"
+#~ msgstr "後でする"
 
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus パネル"
 
-#: ../setup/setup.ui.h:53
-msgid "Top left corner"
-msgstr "左上隅"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus インプットメソッドフレームワーク"
 
-#: ../setup/setup.ui.h:54
-msgid "Top right corner"
-msgstr "右上隅"
+#~ msgid "Turn off input method"
+#~ msgstr "インプットメソッドをオフにする"
 
-#: ../setup/setup.ui.h:55
-msgid "Use custom font:"
-msgstr "カスタムフォントを使う:"
+#~ msgid "No input window"
+#~ msgstr "入力ウィンドウがありません"
 
-#: ../setup/setup.ui.h:58
-msgid "Vertical"
-msgstr "縦"
+#~ msgid "About the input method"
+#~ msgstr "インプットメソッドについて"
 
-#: ../setup/setup.ui.h:59
-msgid "When active"
-msgstr "アクティブであるとき"
+#~ msgid "Switch input method"
+#~ msgstr "インプットメソッドがありません"
+
+#~ msgid "About the Input Method"
+#~ msgstr "インプットメソッドについて"
+
+#~ msgid "next input method"
+#~ msgstr "次のインプットメソッド"
+
+#~ msgid "previous input method"
+#~ msgstr "ひとつ前のインプットメソッド"
diff --git a/po/kn.po b/po/kn.po
index cd26c0b70..d48f6ea6a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.kn\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-23 12:03+0000\n"
 "Last-Translator: shanky <prasad.mvs@gmail.com>\n"
 "Language-Team: kn_IN <kde-i18n-doc@kde.org>\n"
@@ -20,284 +20,306 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "ಲಂಬ"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "ಲಂಬ"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "IBus ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "ಮೆನುವನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್ ಅನ್ನು ಆರಂಭಿಸು"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "ಯಾವಾಗಲೂ"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "ಇತರೆ"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ಮೇಲಿನ ಎಡ ಮೂಲೆ"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "ಹಿಂದಿನ ಪುಟ"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ಮೇಲಿನ ಬಲ ಮೂಲೆ"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "ಮುಂದಿನ ಪುಟ"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲ"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"ಕೆಲವು ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ, ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಅಥವ ಅಪ್‌ಡೇಟ್ "
-"ಮಾಡಲಾಗಿದೆ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ibus ಇನ್‌ಪುಟ್ ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಿ."
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "ಮರಳಿ ಆರಂಭಿಸು"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "ಇಚ್ಛೆಯ"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "ನಂತರ"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus ಆದ್ಯತೆಗಳು"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "ಪುನರಾರಂಭಿಸು"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್‌ ಮಾಡಿ"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ವಿಂಡೊ ಇಲ್ಲ"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "ಶಕ್ತಗೊಂಡ ಅಥವ ಅಶಕ್ತಗೊಂಡ:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಾಯಿಸು"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "ಶಕ್ತಗೊಳಿಸು:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "ಇದರ ಬಗ್ಗೆ"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "ಅಶಕ್ತಗೊಳಿಸು:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ಭಾಷೆ: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ವಾಲಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "ಅಭ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "ಕತೃ: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+"ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರಿಸಬೇಕು ಅಥವ ಅಡಗಿಸಬೇಕು ಎನ್ನುವ ibus ನ ವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "ವಿವರಣೆ:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ಟ್ರಿಗರ್"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "ಶಕ್ತಗೊಳಿಸು"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "ಅಶಕ್ತಗೊಳಿಸು"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ಗುರುತುಚೌಕದಲ್ಲಿ ಗುರುತು ಹಾಕಿದಾಗ ಭಾಷಾ ಪಟ್ಟಿಯಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus ಡೀಮನ್ ಇನ್ನೂ ಸಹ ಆರಂಭಗೊಂಡಿಲ್ಲ. ನೀವದನ್ನು ಈಗಲೆ ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನಿಮಗೆ IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದಲ್ಲಿ, ನಿಮ್ಮ $HOME/.bashrc ಯಲ್ಲಿ ಈ ಕೆಳಗಿನ ಸಾಲನ್ನು ಸೇರಿಸಿ, ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ದಾಖಲಾಗಿ.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>ಅಕ್ಷರಶೈಲಿ ಹಾಗು ವಿನ್ಯಾಸ</b>"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "ಕೀಲಿ ಸಂಕೇತ:"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "ಮಾರ್ಪಡಕಗಳು:"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
-"ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\n"
-"ಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\n"
+"ಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></"
+"small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನ"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus ಆದ್ಯತೆಗಳು"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸು"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ಜಾಗತಿಕ ಇನ್‌ಪುಟ್‌ ವಿಧಾನದ ಸಿದ್ಧತೆಗಳು</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "ಸುಧಾರಿತ"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\n"
+"Homepage: 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 "<b>Startup</b>"
+msgstr "<b>ಆರಂಭ</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Auto hide"
-msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
+msgid "Preload engines"
+msgstr "ಎಂಜಿನ್‌ಗಳನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡು"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್‌ಗಳು"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+msgid "Trigger shortcut keys"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
+msgid "Enable shortcut keys"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ "
-"ಶಕ್ತಗೊಳಿಸು"
+msgid "The shortcut keys for turning input method on"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
+msgid "Disable shortcut keys"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
+msgid "The shortcut keys for turning input method off"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
-
-#: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "ಎಂಜಿನ್‌ಗಳನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡು"
-
-#: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್‌ಗಳು"
-
-#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -305,7 +327,11 @@ msgstr ""
 "ಭಾಷೆಯ ಫಲಕದ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = "
 "ಯಾವಾಗಲೂ ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -313,241 +339,230 @@ msgstr ""
 "ಭಾಷೆಯ ಫಲಕವು ಇರುವ ಸ್ಥಳ. 0 = ಮೇಲಿನ ಎಡ ಮೂಲೆ, 1 = ಮೇಲಿನ ಬಲ ಮೂಲೆ, 2 = ಕೆಳಗಿನ ಎಡ "
 "ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
+msgid "Use custom font"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
+msgid "Custom font"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
+msgid "Custom font name for language panel"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
+msgid "Embed Preedit Text"
+msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ಅಕ್ಷರಶೈಲಿ ಹಾಗು ವಿನ್ಯಾಸ</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ಜಾಗತಿಕ ಇನ್‌ಪುಟ್‌ ವಿಧಾನದ ಸಿದ್ಧತೆಗಳು</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ಆರಂಭ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\n"
-"ಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "ಇತರೆ"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "ಸುಧಾರಿತ"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ಭಾಷೆ: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "ಯಾವಾಗಲೂ"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲ"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "ಕತೃ: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "ವಿವರಣೆ:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "ಅಭ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "ಇಚ್ಛೆಯ"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "ಅಶಕ್ತಗೊಳಿಸು:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸು"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "ಕೀಲಿ ಸಂಕೇತ:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "ಮೆನುವನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "ಮಾರ್ಪಡಕಗಳು:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "ಶಕ್ತಗೊಂಡ ಅಥವ ಅಶಕ್ತಗೊಂಡ:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\n"
+"ಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "ಶಕ್ತಗೊಳಿಸು:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "ಸಾಮಾನ್ಯ"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ಟ್ರಿಗರ್"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "ಲಂಬ"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "ಶಕ್ತಗೊಳಿಸು"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ "
-"ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ಡೀಮನ್ ಇನ್ನೂ ಸಹ ಆರಂಭಗೊಂಡಿಲ್ಲ. ನೀವದನ್ನು ಈಗಲೆ ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನಿಮಗೆ IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದಲ್ಲಿ, ನಿಮ್ಮ $HOME/."
+"bashrc ಯಲ್ಲಿ ಈ ಕೆಳಗಿನ ಸಾಲನ್ನು ಸೇರಿಸಿ, ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ದಾಖಲಾಗಿ.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ "
-"ತೆಗೆದು ಹಾಕಿ"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರಿಸಬೇಕು ಅಥವ ಅಡಗಿಸಬೇಕು ಎನ್ನುವ ibus ನ ವರ್ತನೆಯನ್ನು "
-"ಹೊಂದಿಸಿ"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ವಾಲಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"ಗುರುತುಚೌಕದಲ್ಲಿ ಗುರುತು ಹಾಕಿದಾಗ ಭಾಷಾ ಪಟ್ಟಿಯಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು "
-"ತೋರಿಸು"
+#~ msgid "Previous page"
+#~ msgstr "ಹಿಂದಿನ ಪುಟ"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
+#~ msgid "Next page"
+#~ msgstr "ಮುಂದಿನ ಪುಟ"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭಿಸು"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "ಕೆಲವು ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ, ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಅಥವ ಅಪ್‌ಡೇಟ್ "
+#~ "ಮಾಡಲಾಗಿದೆ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ibus ಇನ್‌ಪುಟ್ ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಿ."
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+#~ msgid "Restart Now"
+#~ msgstr "ಮರಳಿ ಆರಂಭಿಸು"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+#~ msgid "Later"
+#~ msgstr "ನಂತರ"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ಮೇಲಿನ ಎಡ ಮೂಲೆ"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ಮೇಲಿನ ಬಲ ಮೂಲೆ"
+#~ msgid "Turn off input method"
+#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್‌ ಮಾಡಿ"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
+#~ msgid "No input window"
+#~ msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ವಿಂಡೊ ಇಲ್ಲ"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "ಲಂಬ"
+#~ msgid "About the input method"
+#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
+#~ msgid "Switch input method"
+#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಾಯಿಸು"
+
+#~ msgid "About the Input Method"
+#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
+
+#~ msgid "next input method"
+#~ msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
+
+#~ msgid "previous input method"
+#~ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
diff --git a/po/ko.po b/po/ko.po
index c4bbe831f..f6a840dda 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-08-03 15:01+1000\n"
 "Last-Translator: \n"
 "Language-Team: Korean <en@li.org>\n"
@@ -19,281 +19,315 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "가로"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "입력 방식 프레임워크"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "세로"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus 입력 방식 프레임워크 시작"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "메뉴에 포함"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "활성화 되었을 때"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "기타"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "항상"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "이전 페이지"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "왼쪽 위"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "다음 페이지"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "오른쪽 위"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"입력 방식이 몇가지 설치되거나, 삭제되거나, 업데이트되었습니다. ibus 입력 플랫"
-"폼을 재시작 하십시오."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "왼쪽 아래"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "지금 재시작"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "오른쪽 아래"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "나중에"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "사용자 정의"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus 입력 방식 프레임워크"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus 환경 설정  "
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "재시작"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축키"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "입력 방식 해제"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "다음 입력 방식:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "입력 창이 없음  "
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축키   "
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "이전 입력 방식:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "김은주(eukim@redhat.com)"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "입력 방식 정보"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "입력 방식 전환  "
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "활성화 또는 비활성화:  "
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "정보  "
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "입력 방식 정보"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "언어: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>단축키들</b>  "
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "키보드 레이아웃: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "검색 테이블에서 후보 창의 방향 설정  "
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "저자: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "후보 창의 방향:  "
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "설명:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "트리거  "
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "언어 패널 표시:  "
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr ""
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "언어 패널 위치:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr ""
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "시스템 트레이에 아이콘 보여주기"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "다음 입력 방식   "
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "확인란을 선택하면 입력 방식의 이름을 입력 도구 모음에 표시"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "이전 입력 방식  "
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "어플리케이션 창에 편집전 텍스트 포함"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Bus 데몬이 시작되지 않았습니다. 지금 시작하시겠습니까?  "
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>글꼴 및 스타일</b> "
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "일반  "
 
-#: ../setup/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "선택한 입력 방식의 정보 보여주기"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus를 시작했습니다! IBus를 사용할 수 없는 경우, 다음을 $HOME/.bashrc에 추가"
-"하고 다시 로그인하십시오.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus "
+"<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n"
+"위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s의 단축키를 선택"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "입력 방식  "
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "단축키들 "
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "시스템 키보드 레이아웃 사용  "
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "키 코드:  "
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "수정자:  "
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>키보드 레이아웃</b>  "
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>전역 입력 방식 설정</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "고급  "
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"키 또는 키 조합을 입력하십시오.\n"
-"키를 입력하면 대화 상자가 닫히게 됩니다."
+"<big><b>IBus</b></big>\n"
+"<small>지능형 입력 버스</small>\n"
+"홈페이지: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "키 또는 키 조합을 입력하십시오. "
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "로그인 시 ibus 시작  "
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "입력 방식을 선택합니다"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>시작</b>  "
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "입력 방식  "
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "정보  "
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus 환경 설정  "
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "입력 방식 프레임워크"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus 환경 설정"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus 입력 방식 프레임워크 시작"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "자동 숨기기"
+msgid "Preload engines"
+msgstr "엔진 미리로드"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "사용자 정의 글꼴"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus 시작 시 엔진 미리 로드  "
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "언어 패널 용 사용자 정의 글꼴 이름"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "편집전 텍스트 포함"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "어플리케이션 창에 편집전 텍스트를 포함"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Enable input method by default"
-msgstr "입력기를 디폴트로 활성화"
+msgid "Trigger shortcut keys"
+msgstr "트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "언어 패널 위치"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "다음 엔진 단축키"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "검색 테이블의 방향  "
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
+msgid "Next engine shortcut keys"
+msgstr "다음 엔진 단축키"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "엔진 미리로드"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축 키"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "ibus 시작 시 엔진 미리 로드  "
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "이전 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "시스템 트레이에 아이콘 보여주기"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "입력 방식 이름 보여주기"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "자동 숨기기"
+
+#: ../data/ibus.schemas.in.h:16
 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:17
+msgid "Language panel position"
+msgstr "언어 패널 위치"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -301,222 +335,229 @@ msgstr ""
 "언어 패널의 위치. 0 = 왼쪽 위, 1 = 오른쪽 위, 2 = 왼쪽 아래, 3 = 오른쪽 아"
 "래, 4 = 사용자 지정"
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축 키"
-
-#: ../data/ibus.schemas.in.h:22
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "검색 테이블의 방향  "
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "트리거 단축키"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용  "
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "전역 입력 방식 사용"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "시스템 키보드 레이아웃 사용  "
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "편집전 텍스트 포함"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>글꼴 및 스타일</b> "
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>전역 입력 방식 설정</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "전역 입력 방식 사용"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>키보드 레이아웃</b>  "
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "입력기를 디폴트로 활성화"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>단축키들</b>  "
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>시작</b>  "
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>지능형 입력 버스</small>\n"
-"홈페이지: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n"
-"위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다  "
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "기타"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "고급  "
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "언어: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "항상"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "키보드 레이아웃: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "왼쪽 아래"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "저자: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "오른쪽 아래"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "설명:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "후보 창의 방향:  "
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "입력 방식을 선택합니다"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "사용자 정의"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus 환경 설정"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "어플리케이션 창에 편집전 텍스트 포함"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "단축키들 "
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "입력 방식의 편집전 텍스트를 어플레케이션 창에 포함시킵니다"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "키 코드:  "
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "메뉴에 포함"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "수정자:  "
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "활성화 또는 비활성화:  "
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"키 또는 키 조합을 입력하십시오.\n"
+"키를 입력하면 대화 상자가 닫히게 됩니다."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "키 또는 키 조합을 입력하십시오. "
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "트리거  "
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "일반  "
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "가로"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Bus 데몬이 시작되지 않았습니다. 지금 시작하시겠습니까?  "
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "언어 패널 위치:"
+#: ../setup/main.py:344
+#, fuzzy
+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를 시작했습니다! IBus를 사용할 수 없는 경우, 다음을 $HOME/.bashrc에 추가"
+"하고 다시 로그인하십시오.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus "
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s의 단축키를 선택"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "다음 입력 방식:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "이전 입력 방식:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "김은주(eukim@redhat.com)"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "재시작"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "검색 테이블에서 후보 창의 방향 설정  "
+#~ msgid "Previous page"
+#~ msgstr "이전 페이지"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "선택한 입력 방식의 정보 보여주기"
+#~ msgid "Next page"
+#~ msgstr "다음 페이지"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "확인란을 선택하면 입력 방식의 이름을 입력 도구 모음에 표시"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "입력 방식이 몇가지 설치되거나, 삭제되거나, 업데이트되었습니다. ibus 입력 "
+#~ "플랫폼을 재시작 하십시오."
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "언어 패널 표시:  "
+#~ msgid "Restart Now"
+#~ msgstr "지금 재시작"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "로그인 시 ibus 시작  "
+#~ msgid "Later"
+#~ msgstr "나중에"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축키"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus 입력 방식 프레임워크"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축키   "
+#~ msgid "Turn off input method"
+#~ msgstr "입력 방식 해제"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "왼쪽 위"
+#~ msgid "No input window"
+#~ msgstr "입력 창이 없음  "
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "오른쪽 위"
+#~ msgid "About the input method"
+#~ msgstr "입력 방식 정보"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "사용자 정의 글꼴 사용:"
+#~ msgid "Switch input method"
+#~ msgstr "입력 방식 전환  "
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "세로"
+#~ msgid "About the Input Method"
+#~ msgstr "입력 방식 정보"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "활성화 되었을 때"
+#~ msgid "next input method"
+#~ msgstr "다음 입력 방식   "
+
+#~ msgid "previous input method"
+#~ msgstr "이전 입력 방식  "
diff --git a/po/lv.po b/po/lv.po
index e039591a6..c6d2d4577 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,305 +2,324 @@
 # Source translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # rudolfs.mazurs <rudolfs.mazurs@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-09-28 14:03+0000\n"
 "Last-Translator: Tranzistors <rudolfs.mazurs@gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/fedora/team/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.net/projects/p/fedora/team/"
+"lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontāli"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Ievades metožu rāmja sistēma"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikāli"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Startēt IBus ievades metožu rāmja sistēmu"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Iegults izvēlnē"
 
-#: ../ibus/_config.py.in:40
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Autortiesības (c) 2007-2010 Peng Huang\n"
-"Autortiesības (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Kad aktīvs"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Cits"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Vienmēr"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Iepriekšējā lapa"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Augšējais kreisais stūris"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Nākamā lapa"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Augšējais labais stūris"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"Dažas ievades metodes ir uzinstalētas, izņemtas vai atjauninātas. Lūdzu, "
-"pārstartējiet ibus ievades platformu."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Apakšējais kreisais stūris"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Pārstartēt tagad"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Apakšējais labais stūris"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Vēlāk"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Izvēlēts"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus panelis"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus iestatījumi"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus ievades metodes rāmja sistēma"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Saīsņu taustiņi, lai pārslēgtos uz nākošo ievades metodi sarakstā"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Pārstartēt"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Nākamā ievades metode"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Izslēgt ievades metodi"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Nav ievades loga"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Iepriekšējā ievades metode:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ir inteliģenta ievades kopne Linux/Unix."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"Arvis Lācis\n"
-"Pēteris Krišjānis\n"
-"Rūdolfs Mazurs"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Saīsņu taustiņi, lai ieslēgtu vai izslēgtu ievades metodi"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Par ievades metodi"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aktivēt vai deaktivēt:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Pārslēgt ievades metodi"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aktivēt:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Par"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Deaktivēt:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Par ievades metodi"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastatūras īsceļi</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Valoda: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Iestatīt kandidātu orientāciju apsekošanas tabulā"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastatūras izkārtojums: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Kandidātu orientācija:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autors: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Iestatīt ibus uzvedību kā rādīt vai slēpt valodas joslu"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Apraksts:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Parādīt valodas paneli:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "trigeris"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Valodas paneļa pozīcija:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "aktivēt"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Rādīt ikonu sistēmas ikonu joslā"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "deaktivēt"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Parādīt ievades metodes nosaukumu valodas joslā"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "nākošā ievades metode"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Parādīt ievades metodes nosaukumu valodas joslā, kad tiek atzīmēta izvēles "
+"rūtiņa"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "iepriekšējā ievades metode"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Iegult pirmsrediģēšanas tekstu lietotnes logā"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus dēmons nav startēts. Vai vēlaties to startēt tagad?"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Iegult ievades metodes pirmsrediģēšanas tekstu lietotnes logā"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus tika startēts! Ja nevarat izmantot IBus, pievienojiet sekojošās rindiņas failā $HOME/.bashrc, un atkal piesakieties sesijā.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Lietot izvēlētu fontu:"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Izvēlieties tastatūras saīsni priekš %s"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fonts un stils</b>"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Tastatūras saīsnes"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Vispārīgi"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Taustiņa kods:"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Pievienot izvēlēto ievades metodi pie aktivētajām ievades metodēm"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modifikatoru taustiņi:"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Noņemt izvēlēto metodi no ieslēgto ievades metožu saraksta"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
-"Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju).\n"
-"Dialoga logs tiks aizvērts, kad taustiņš tiks atlaists."
+"Pārvietojiet augšup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju)"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Pārvietojiet lejup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Izvēlieties ievades metodi"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Parādīt informāciju par izvēlēto ievades metodi"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Parādīt informāciju par izvēlēto ievades metodi"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>Noklusētā ievades metode atrodas saraksta augšpusē.\n"
+"Jūs varat izmantot pogas uz augšu/uz leju, lai to izmainītu.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Ievades metode"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Izmantot sistēmas tastatūras izkārtojumu"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus iestatījumi"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Izmantot sistēmas tastatūras (XKB) izkārtojumu "
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Iestatīt IBus iestatījumus"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastatūras izkārtojums</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Starp lietotnēm izmantot vienu un to pašu ievades metodi"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globālās ievades metodes iestatījumi</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Paplašināti"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Inteliģentā ievades kopne</small>\n"
+"Mājas lapa: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Startēt ibus līdz ar pieslēgšanos"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Startēšana</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Par"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Ievades metožu rāmja sistēma"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Startēt IBus ievades metožu rāmja sistēmu"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Autom. slēpšana"
+msgid "Preload engines"
+msgstr "Pārlādēt dzinējus"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Izvēlēts fonts"
+msgid "Preload engines during ibus starts up"
+msgstr "Laicīgi ielādēt dzinējus ibus ielādes laikā"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Izvēlētā fonta nosaukums valodas panelim"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Deaktivēt īsinājumu taustiņus"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Iegult pirmsrediģēšanas tekstu"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Iegult pirmsrediģēšanas tekstu lietotnes logā"
+msgid "Trigger shortcut keys"
+msgstr "Trigera saīsņu taustiņi"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Aktivēt ievades metodi pēc noklusējuma"
+msgid "Enable shortcut keys"
+msgstr "Aktivēt īsinājuma taustiņus"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "Aktivēt ievades metodi pēc noklusējuma, kad lietotne saņem fokusu"
+msgid "The shortcut keys for turning input method on"
+msgstr "Saīsņu taustiņi, lai ieslēgtu ievades metodi "
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Aktivēt īsinājuma taustiņus"
+msgid "Disable shortcut keys"
+msgstr "Deaktivēt īsinājumu taustiņus"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Valodas paneļa pozīcija"
+msgid "The shortcut keys for turning input method off"
+msgstr "Saīsņu taustiņi, lai izslēgtu ievades metodi "
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Nākošā dzinēja saīsņu taustiņi"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Apsekošanas tabulas novietojums"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Saīsņu taustiņi, lai pārslēgtos uz nākamo ievades metodi sarakstā"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Apsekošanas tabulas novietojums. 0 = horizontāls, 1 = vertikāls"
+msgid "Prev engine shortcut keys"
+msgstr "Iepriekšējā dzinēja saīsņu taustiņi"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Pārlādēt dzinējus"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Laicīgi ielādēt dzinējus ibus ielādes laikā"
+msgid "Auto hide"
+msgstr "Autom. slēpšana"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Iepriekšējā dzinēja saīsņu taustiņi"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Starp lietotnēm izmantot vienu un to pašu ievades metodi"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Rādīt ikonu sistēmas ikonu joslā"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Rādīt ievades metodes nosaukumu"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Parādīt ievades metodes nosaukumu valodas joslā"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -308,245 +327,248 @@ msgstr ""
 "Valodas paneļa uzvedība. 0 = iegults izvēlnē, 1 = automātiski slēpt, 2 = "
 "vienmēr rādīt"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Valodas paneļa pozīcija"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"Valodas paneļa pozīcija. 0 = augšējais kreisais stūris, 1 = augšējais labais"
-" stūris, 2 = apakšējais kreisais stūris, 3 = apakšējais labais stūris, 4 = "
-"izvēlēts"
-
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Saīsņu taustiņi, lai pārslēgtos uz nākamo ievades metodi sarakstā"
-
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā"
-
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Saīsņu taustiņi, lai izslēgtu ievades metodi "
+"Valodas paneļa pozīcija. 0 = augšējais kreisais stūris, 1 = augšējais labais "
+"stūris, 2 = apakšējais kreisais stūris, 3 = apakšējais labais stūris, 4 = "
+"izvēlēts"
 
-#: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Saīsņu taustiņi, lai ieslēgtu ievades metodi "
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Apsekošanas tabulas novietojums"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Saīsņu taustiņi, lai ieslēgtu vai izslēgtu ievades metodi"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Apsekošanas tabulas novietojums. 0 = horizontāls, 1 = vertikāls"
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Trigera saīsņu taustiņi"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Rādīt ievades metodes nosaukumu"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Izmantot izvēles fontu"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Izmantojamais izvēles fonta nosaukums valodas panelim"
 
-#: ../data/ibus.schemas.in.h:31
-msgid "Use global input method"
-msgstr "Izmantot  globālo ievades metodi"
-
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Izmantot sistēmas tastatūras (XKB) izkārtojumu "
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Izvēlēts fonts"
 
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Izmantot sistēmas tastatūras izkārtojumu"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Izvēlētā fonta nosaukums valodas panelim"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "Iegult pirmsrediģēšanas tekstu"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fonts un stils</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Iegult pirmsrediģēšanas tekstu lietotnes logā"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globālās ievades metodes iestatījumi</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Izmantot  globālo ievades metodi"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastatūras izkārtojums</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Aktivēt ievades metodi pēc noklusējuma"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastatūras īsceļi</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Aktivēt ievades metodi pēc noklusējuma, kad lietotne saņem fokusu"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Startēšana</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteliģentā ievades kopne</small>\n"
-"Mājas lapa: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Noklusētā ievades metode atrodas saraksta augšpusē.\n"
-"Jūs varat izmantot pogas uz augšu/uz leju, lai to izmainītu.</i></small>"
+"Autortiesības (c) 2007-2010 Peng Huang\n"
+"Autortiesības (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Pievienot izvēlēto ievades metodi pie aktivētajām ievades metodēm"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Cits"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Paplašināti"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Valoda: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Vienmēr"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastatūras izkārtojums: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Apakšējais kreisais stūris"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autors: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Apakšējais labais stūris"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Apraksts:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Kandidātu orientācija:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Izvēlieties ievades metodi"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Izvēlēts"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Deaktivēt:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Iestatīt IBus iestatījumus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Iegult pirmsrediģēšanas tekstu lietotnes logā"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Tastatūras saīsnes"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Iegult ievades metodes pirmsrediģēšanas tekstu lietotnes logā"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Taustiņa kods:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Iegults izvēlnē"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modifikatoru taustiņi:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Aktivēt vai deaktivēt:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju).\n"
+"Dialoga logs tiks aizvērts, kad taustiņš tiks atlaists."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Aktivēt:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Vispārīgi"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "trigeris"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontāli"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "aktivēt"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Valodas paneļa pozīcija:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "deaktivēt"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus dēmons nav startēts. Vai vēlaties to startēt tagad?"
+
+#: ../setup/main.py:344
+#, fuzzy
+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 ""
-"Pārvietojiet lejup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
+"IBus tika startēts! Ja nevarat izmantot IBus, pievienojiet sekojošās "
+"rindiņas failā $HOME/.bashrc, un atkal piesakieties sesijā.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Pārvietojiet augšup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Nākamā ievades metode"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Izvēlieties tastatūras saīsni priekš %s"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Iepriekšējā ievades metode:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Autortiesības (c) 2007-2010 Peng Huang\n"
+"Autortiesības (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Noņemt izvēlēto metodi no ieslēgto ievades metožu saraksta"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ir inteliģenta ievades kopne Linux/Unix."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Iestatīt ibus uzvedību kā rādīt vai slēpt valodas joslu"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"Arvis Lācis\n"
+"Pēteris Krišjānis\n"
+"Rūdolfs Mazurs"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Iestatīt kandidātu orientāciju apsekošanas tabulā"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Pārstartēt"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Parādīt informāciju par izvēlēto ievades metodi"
+#~ msgid "Previous page"
+#~ msgstr "Iepriekšējā lapa"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Parādīt ievades metodes nosaukumu valodas joslā, kad tiek atzīmēta izvēles "
-"rūtiņa"
+#~ msgid "Next page"
+#~ msgstr "Nākamā lapa"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Parādīt valodas paneli:"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Dažas ievades metodes ir uzinstalētas, izņemtas vai atjauninātas. Lūdzu, "
+#~ "pārstartējiet ibus ievades platformu."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Startēt ibus līdz ar pieslēgšanos"
+#~ msgid "Restart Now"
+#~ msgstr "Pārstartēt tagad"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Saīsņu taustiņi, lai pārslēgtos uz nākošo ievades metodi sarakstā"
+#~ msgid "Later"
+#~ msgstr "Vēlāk"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus panelis"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Augšējais kreisais stūris"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ievades metodes rāmja sistēma"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Augšējais labais stūris"
+#~ msgid "Turn off input method"
+#~ msgstr "Izslēgt ievades metodi"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Lietot izvēlētu fontu:"
+#~ msgid "No input window"
+#~ msgstr "Nav ievades loga"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertikāli"
+#~ msgid "About the input method"
+#~ msgstr "Par ievades metodi"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Kad aktīvs"
+#~ msgid "Switch input method"
+#~ msgstr "Pārslēgt ievades metodi"
+
+#~ msgid "About the Input Method"
+#~ msgstr "Par ievades metodi"
+
+#~ msgid "next input method"
+#~ msgstr "nākošā ievades metode"
+
+#~ msgid "previous input method"
+#~ msgstr "iepriekšējā ievades metode"
diff --git a/po/ml.po b/po/ml.po
index 7d4006581..5e7c060ae 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-08-02 17:16+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -19,275 +19,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "കുറുകെയുള്ള"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "നേരെയുള്ള"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി ആരംഭിയ്ക്കുക"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "മെനുവില്‍ ഉള്‍പ്പെടുത്തുക"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "സജീവമാകുമ്പോള്‍"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "മറ്റുള്ളവ"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "എപ്പോഴും"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "മുമ്പുള്ള താള്‍:"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "മുകളില്‍ ഇടതു് കോണ്‍ "
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "അടുത്ത താള്‍"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "മുകളില്‍ വലതു് കോണ്‍ "
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "താഴെ ഇടതു് കോണ്‍"
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "താഴെ വലതു് കോണ്‍ "
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+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 ""
-"ചില ഇന്‍പുട്ട് മെഥേഡുകള്‍ക്കു് ചില മാറ്റങ്ങള്‍ വരുത്തിയിട്ടുണ്ടു്. ദയവായി ibus ഇന്‍പുട്ട് പ്ലാറ്റ്ഫോം "
-"വീണ്ടും ആരംഭിക്കുക."
+"അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "വീണ്ടും ഉടന്‍ ആരംഭിക്കുക"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്:"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "പിന്നീടു്"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള "
+"എളുപ്പവഴി"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്:"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "വീണ്ടും ആരംഭിക്കുക"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓഫ് ചെയ്യുക"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "ഇന്‍പുട്ട് ജാലകം ലഭ്യമല്ല"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "സജ്ജമാക്കുക അല്ലെങ്കില്‍ നിര്‍ജ്ജീവമാക്കുക:"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>കീബോര്‍ഡ് എളുപ്പവഴികള്‍</b>"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് മാറ്റുക"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ലുക്കപ്പ് പട്ടികയില്‍ ലഭ്യമായവയുടെ ക്രമീകരണം സജ്ജമാക്കുക"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "സംബന്ധിച്ചു്"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "ലഭ്യമായവയുടെ ക്രമീകരണങ്ങള്‍:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus ഭാഷയുടെ പാനല്‍ കാണിക്കണമോ വേണ്ടയോ എന്നതു് സജ്ജമാക്കുക"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ഭാഷ: %s\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ഭാഷയുടെ പാനല്‍ കാണിക്കുക:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "കീബോര്‍ഡ് മാതൃക: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "രചയിതാവു്: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "സിസ്റ്റം ട്രേയില്‍ ചിഹ്നം കാണിക്കുക"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "വിവരണം:\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ട്രിഗ്ഗര്‍ ചെയ്യുക"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ചെക്ക്ബോക്സ് ചെക്ക് ചെയ്യുമ്പോള്‍ ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr ""
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr ""
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റിനുള്ള ഇന്‍പുട്ട് രീകി ചേര്‍ക്കുക"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക:"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>അക്ഷരസഞ്ചയവും രീതിയും</b>"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus ഡെമണ്‍ ആരംഭിച്ചിട്ടില്ല. നിങ്ങള്‍ക്കിതു് ഉടന്‍ ആരംഭിക്കണമോ?"
+#: ../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/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള്‍ കാണിക്കുക"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus ആരംഭിച്ചു! നിങ്ങള്‍ക്കു് IBus ആരംഭിക്കുവാന്‍ സാധ്യമല്ല എങ്കില്‍, $HOME/.bashrc-ല്‍ താഴെ "
-"പറഞ്ഞിരിക്കുന്ന വരികള്‍ ചേര്‍ക്കുക. ശേഷം നിങ്ങളുടെ പണിയിടത്തിലേക്കു് വീണ്ടും പ്രവേശിക്കുക.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\n"
+"ഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ഇന്‍പുട്ട് മെഥേഡ്"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "കീബോര്‍ഡ് എളുപ്പവഴികള്‍"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "കീ കോഡ്:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "മോഡിഫയറുകള്‍:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "മെച്ചപ്പെട്ടവ"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്).\n"
-"കീ റിലീസ് ചെയ്യുമ്പോള്‍ ഡയലോഗ് അടയ്ക്കുന്നു."
+"<big><b>IBus</b></big>\n"
+"<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\n"
+"പ്രധാന താള്‍: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "പ്രവേശിക്കുമ്പോള്‍ തന്നെ ibus ആരംഭിക്കുക"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>ആരംഭത്തില്‍</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ്"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "സംബന്ധിച്ചു്"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus മുന്‍ഗണനകള്‍"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus മുന്‍ഗണനകള്‍ സജ്ജമാക്കുക"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി ആരംഭിയ്ക്കുക"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "സ്വയം അദൃശ്യമാക്കുക"
+msgid "Preload engines"
+msgstr "സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "അക്ഷരസഞ്ചയം യഥേഷ്ടമാക്കുക:"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ആരംഭിക്കുമ്പോള്‍ സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ഭാഷയുടെ പാനലിലേക്കുള്ള അക്ഷരസഞ്ചയത്തിനുള്ള പേരു് സജ്ജമാക്കുക"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Enable input method by default"
-msgstr "സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
+msgid "Trigger shortcut keys"
+msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പുട്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുമ്പോള്‍ സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം. 0 = നേരെയുള്ള, 1 = കുറുകയുള്ള"
+msgid "Next engine shortcut keys"
+msgstr "അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "പട്ടികയിലുള്ള അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനുള്ള എളുപ്പവഴി"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ആരംഭിക്കുമ്പോള്‍ സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "സിസ്റ്റം ട്രേയില്‍ ചിഹ്നം കാണിക്കുക"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറുന്നതിനുള്ള എളുപ്പവഴി"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "സ്വയം അദൃശ്യമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -295,7 +328,11 @@ msgstr ""
 "ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = മെനുവില്‍ ഉള്‍പ്പെടുത്തുക, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും "
 "കാണിക്കുക"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -303,225 +340,229 @@ msgstr ""
 "ഭാഷയുടെ പാനലിന്റെ സ്ഥാനം. 0 = മുകളില്‍ ഇടതു് കോണ്‍, 1 = മുകളില്‍ വലതു് കോണ്‍, 2 = താഴെ ഇടതു് "
 "കോണ്‍, 3 = താഴെ വലതു് കോണ്‍, 4 = യഥേഷ്ടം"
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "പട്ടികയിലുള്ള അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനുള്ള എളുപ്പവഴി"
-
-#: ../data/ibus.schemas.in.h:22
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറുന്നതിനുള്ള എളുപ്പവഴി"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം. 0 = നേരെയുള്ള, 1 = കുറുകയുള്ള"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്ങള്‍ സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "അക്ഷരസഞ്ചയം യഥേഷ്ടമാക്കുക:"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "ഭാഷയുടെ പാനലിലേക്കുള്ള അക്ഷരസഞ്ചയത്തിനുള്ള പേരു് സജ്ജമാക്കുക"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>അക്ഷരസഞ്ചയവും രീതിയും</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
 msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>കീബോര്‍ഡ് എളുപ്പവഴികള്‍</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പുട്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുമ്പോള്‍ സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ആരംഭത്തില്‍</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\n"
-"പ്രധാന താള്‍: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\n"
-"ഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളിലേക്കു് തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് ചേര്‍ക്കുക"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "മറ്റുള്ളവ"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "മെച്ചപ്പെട്ടവ"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ഭാഷ: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "എപ്പോഴും"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "കീബോര്‍ഡ് മാതൃക: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "താഴെ ഇടതു് കോണ്‍"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "രചയിതാവു്: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "താഴെ വലതു് കോണ്‍ "
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "വിവരണം:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "ലഭ്യമായവയുടെ ക്രമീകരണങ്ങള്‍:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "യഥേഷ്ടം:"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus മുന്‍ഗണനകള്‍ സജ്ജമാക്കുക"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "കീബോര്‍ഡ് എളുപ്പവഴികള്‍"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റിനുള്ള ഇന്‍പുട്ട് രീകി ചേര്‍ക്കുക"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "കീ കോഡ്:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "മെനുവില്‍ ഉള്‍പ്പെടുത്തുക"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "മോഡിഫയറുകള്‍:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "സജ്ജമാക്കുക അല്ലെങ്കില്‍ നിര്‍ജ്ജീവമാക്കുക:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്).\n"
+"കീ റിലീസ് ചെയ്യുമ്പോള്‍ ഡയലോഗ് അടയ്ക്കുന്നു."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)"
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ട്രിഗ്ഗര്‍ ചെയ്യുക"
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "സാധാരണ"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "കുറുകെയുള്ള"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ഡെമണ്‍ ആരംഭിച്ചിട്ടില്ല. നിങ്ങള്‍ക്കിതു് ഉടന്‍ ആരംഭിക്കണമോ?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം:"
+#: ../setup/main.py:344
+#, fuzzy
+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 ആരംഭിച്ചു! നിങ്ങള്‍ക്കു് IBus ആരംഭിക്കുവാന്‍ സാധ്യമല്ല എങ്കില്‍, $HOME/.bashrc-ല്‍ താഴെ "
+"പറഞ്ഞിരിക്കുന്ന വരികള്‍ ചേര്‍ക്കുക. ശേഷം നിങ്ങളുടെ പണിയിടത്തിലേക്കു് വീണ്ടും പ്രവേശിക്കുക.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് താഴേക്ക് നീക്കുക"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് മുകളിലേക്ക് നീക്കുക"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് നീക്കം ചെയ്യുക"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus ഭാഷയുടെ പാനല്‍ കാണിക്കണമോ വേണ്ടയോ എന്നതു് സജ്ജമാക്കുക"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "വീണ്ടും ആരംഭിക്കുക"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ലുക്കപ്പ് പട്ടികയില്‍ ലഭ്യമായവയുടെ ക്രമീകരണം സജ്ജമാക്കുക"
+#~ msgid "Previous page"
+#~ msgstr "മുമ്പുള്ള താള്‍:"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള്‍ കാണിക്കുക"
+#~ msgid "Next page"
+#~ msgstr "അടുത്ത താള്‍"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "ചെക്ക്ബോക്സ് ചെക്ക് ചെയ്യുമ്പോള്‍ ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "ചില ഇന്‍പുട്ട് മെഥേഡുകള്‍ക്കു് ചില മാറ്റങ്ങള്‍ വരുത്തിയിട്ടുണ്ടു്. ദയവായി ibus ഇന്‍പുട്ട് പ്ലാറ്റ്ഫോം "
+#~ "വീണ്ടും ആരംഭിക്കുക."
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ഭാഷയുടെ പാനല്‍ കാണിക്കുക:"
+#~ msgid "Restart Now"
+#~ msgstr "വീണ്ടും ഉടന്‍ ആരംഭിക്കുക"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "പ്രവേശിക്കുമ്പോള്‍ തന്നെ ibus ആരംഭിക്കുക"
+#~ msgid "Later"
+#~ msgstr "പിന്നീടു്"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള "
-"എളുപ്പവഴി"
+#~ msgid "Turn off input method"
+#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓഫ് ചെയ്യുക"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "മുകളില്‍ ഇടതു് കോണ്‍ "
+#~ msgid "No input window"
+#~ msgstr "ഇന്‍പുട്ട് ജാലകം ലഭ്യമല്ല"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "മുകളില്‍ വലതു് കോണ്‍ "
+#~ msgid "About the input method"
+#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക:"
+#~ msgid "Switch input method"
+#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് മാറ്റുക"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "നേരെയുള്ള"
+#~ msgid "About the Input Method"
+#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "സജീവമാകുമ്പോള്‍"
+#~ msgid "next input method"
+#~ msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്"
+
+#~ msgid "previous input method"
+#~ msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്"
diff --git a/po/mr.po b/po/mr.po
index 78ebc147f..936c50b65 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
@@ -19,524 +19,543 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "आडवे"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "उभे"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "इन्पुट पद्धत फ्रेमवर्क"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "मेन्यू मध्ये एम्बेड केले"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus इन्पुट पद्धती फ्रेमवर्क सुरू करा"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "सक्रीय असल्यावर"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "नेहमी"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "इतर"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "वरील डावा कोपरा"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "पूर्वीचे पान"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "वरील उजवा कोपरा"
+
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "तळापासून डावा कोपरा"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "पुढचे पान"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "तळापासून उजवा कोपरा"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"काहिक इंपुट पद्धत प्रतिष्ठापीत, काढून टाकले किंवा सुधारीत केले आहे. कृपया "
-"ibus इंपुट प्लॅटफॉर्म पुनः सुरू करा."
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "मनपसंत"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "आत्ता पुनः सुरू करा"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus आवड निवड"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "पुढे"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "सूचीतील पुढची इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus इन्पुट पद्धती फ्रेमवर्क"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "पुढची इंपुट पद्धत:"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "पुन्हा चालू करा"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "सूचीतील मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "इंपुट पद्धत बंद करा"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "मागील इंपुट पद्धत:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "इंपुट खिडकी आढळली नाही"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "इंपुट पद्धत सुरू किंवा बंद करण्यासाठी शार्टकट किज्"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr ""
-"संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके "
-"<sshedmak@redhat.com>, 2009, 2010."
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "कार्यान्वीत करा किंवा अकार्यान्वीत करा:"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "इंपुट पद्धत विषयी"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "सुरू करा:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "इंपुट पद्धत बदला"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "बंद करा:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "विषयी"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>कळफलक शार्टकट</b>"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "इंपुट पद्धत विषयी"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "लुकअप टेबल मधील घटकांचे निर्देशन ठरवा"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "भाषा: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "घटकांचे निर्देशन:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "कळफलक मांडणी: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "भाषा पट्टी कसे दाखवायचे किंवा लपवायचे यासाठी ibus चे वर्तन ठरवा"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "लेखक: %s\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "भाषा पटल दाखवा:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "वर्णन:\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "भाषा पटलाचे स्थान:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ट्रिगर"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "चिन्ह प्रणाली ट्रेवर दाखवा"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "सुरू करा"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "बंद करा"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "चेकबॉक्स नीवडल्यानंतर भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "पुढिल इंपुट पद्धत"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजूकर एम्बेड करा"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "मागील इंपुट पद्धत"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "ऍप्लिकेशन पटलात इंपुट पद्धतीचे प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus डिमन सुरू केले गेले नाही. तुम्हाला आता सुरू करायचे?"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "मनपसंत फॉन्टचा वापर करा:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>फॉन्ट व शैली</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus सुरू केले गेले आहे! तुम्ही IBus चा वापर करत नसल्यास, कृपया खालिल ओळ $HOME/.bashrc अंतर्गत समावेष करा, व पुन्हा डेस्कटॉपवर पुन्हा प्रवेश करा.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n"
+"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s करीता कळफलक शार्टकट नीवडा"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "इंपुट पद्धत"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "कळफलक शार्टकट"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "कि कोड:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "मॉडिफायर:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>कळफलक मांडणी</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ग्लोबल इंपुट पद्धत सेटिंग्स्</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "प्रगत"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"कृपया कि (किंवा कि जोडणी) दाबा.\n"
-"कि सोडल्यावर संवाद बंद होईल."
+"<big><b>IBus</b></big>\n"
+"<small>हुशार इनपुट बस</small>\n"
+"मुख्यपान: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "प्रवेशवेळी ibus सुरू करा"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "इंपुट पद्धत नीवडा"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>स्टार्टअप</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "इंपुट पद्धत"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "विषयी"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus आवड निवड"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "इन्पुट पद्धत फ्रेमवर्क"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus पसंती सुरू करा"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus इन्पुट पद्धती फ्रेमवर्क सुरू करा"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "स्वयं लपवा"
+msgid "Preload engines"
+msgstr "प्रीलोड इंजीन्स्"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "मनपसंत फॉन्ट"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus सुरू होतेवेळी इंजीन आधिपासूनच लोड करा"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "भाषा पटल करीता स्वपसंत फॉन्ट नाव"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "शार्टकट किज् बंद करा"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "प्रिएडीट मजकूर एम्बेड करा"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजकूर एम्बेड करा"
+msgid "Trigger shortcut keys"
+msgstr "शॉर्टकट किज् ट्रिगर करा"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "पूर्वनितर्धारीतपणे इंपुट पद्धत सुरू करा"
+msgid "Enable shortcut keys"
+msgstr "शार्टकट किज् सुरू करा"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू "
-"करा"
+msgid "The shortcut keys for turning input method on"
+msgstr "इंपुट पद्धती सुरू करण्यासाठी शार्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "शार्टकट किज् सुरू करा"
+msgid "Disable shortcut keys"
+msgstr "शार्टकट किज् बंद करा"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "भाषा पटलचे स्थान"
+msgid "The shortcut keys for turning input method off"
+msgstr "इंपुट पद्धती बंद करण्यासाठी शार्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "पुढील इंजीनचे शार्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "लुकअप टेबलचे निर्देशन"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "सूचीतील पुढील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "लुकअप टेबलचे निर्देशन. 0 = Horizontal, 1 = Vertical"
+msgid "Prev engine shortcut keys"
+msgstr "मागील इंजीनचे शॉर्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "प्रीलोड इंजीन्स्"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus सुरू होतेवेळी इंजीन आधिपासूनच लोड करा"
+msgid "Auto hide"
+msgstr "स्वयं लपवा"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "मागील इंजीनचे शॉर्टकट किज्"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "चिन्ह प्रणाली ट्रेवर दाखवा"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "इंपुट पद्धतीचे नाव दाखवा"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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 = Embedded in menu, 1 = Auto hide, 2 = Always show"
+msgstr "भाषा पटलचे वर्तन. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "भाषा पटलचे स्थान"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"भाषा पटलाचे स्थान. 0 = Top left corner, 1 = Top right corner, 2 = Bottom "
-"left corner, 3 = Bottom right corner, 4 = Custom"
+"भाषा पटलाचे स्थान. 0 = Top left corner, 1 = Top right corner, 2 = Bottom left "
+"corner, 3 = Bottom right corner, 4 = Custom"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "सूचीतील पुढील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "लुकअप टेबलचे निर्देशन"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "लुकअप टेबलचे निर्देशन. 0 = Horizontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "इंपुट पद्धती बंद करण्यासाठी शार्टकट किज्"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "इंपुट पद्धतीचे नाव दाखवा"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "इंपुट पद्धती सुरू करण्यासाठी शार्टकट किज्"
+msgid "Use custom font"
+msgstr "स्वपसंत फॉन्ट वापरा"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "इंपुट पद्धत सुरू किंवा बंद करण्यासाठी शार्टकट किज्"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "शॉर्टकट किज् ट्रिगर करा"
+msgid "Custom font"
+msgstr "मनपसंत फॉन्ट"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "स्वपसंत फॉन्ट वापरा"
+msgid "Custom font name for language panel"
+msgstr "भाषा पटल करीता स्वपसंत फॉन्ट नाव"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
+msgid "Embed Preedit Text"
+msgstr "प्रिएडीट मजकूर एम्बेड करा"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजकूर एम्बेड करा"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "ग्लोबल इंपुट पद्धत नीवडा"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>फॉन्ट व शैली</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ग्लोबल इंपुट पद्धत सेटिंग्स्</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>कळफलक मांडणी</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "पूर्वनितर्धारीतपणे इंपुट पद्धत सुरू करा"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>कळफलक शार्टकट</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू करा"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>स्टार्टअप</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>हुशार इनपुट बस</small>\n"
-"मुख्यपान: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n"
-"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
+"सर्वहक्काधिकार (c) 2007-2010 पेंग हुआंग\n"
+"सर्वहक्काधिकार (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "नीवडलेली इंपुट पद्धत कार्यक्षम इंपुट पद्धतींमध्ये समावेश करा"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "इतर"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "प्रगत"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "भाषा: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "नेहमी"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "कळफलक मांडणी: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "तळापासून डावा कोपरा"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "लेखक: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "तळापासून उजवा कोपरा"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "वर्णन:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "घटकांचे निर्देशन:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "इंपुट पद्धत नीवडा"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "मनपसंत"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "बंद करा:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus पसंती सुरू करा"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजूकर एम्बेड करा"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "कळफलक शार्टकट"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "ऍप्लिकेशन पटलात इंपुट पद्धतीचे प्रिएडीट मजकूर एम्बेड करा"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "कि कोड:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "मेन्यू मध्ये एम्बेड केले"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "मॉडिफायर:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "कार्यान्वीत करा किंवा अकार्यान्वीत करा:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"कृपया कि (किंवा कि जोडणी) दाबा.\n"
+"कि सोडल्यावर संवाद बंद होईल."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "सुरू करा:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "सर्वसाधारण"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ट्रिगर"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "आडवे"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "सुरू करा"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "भाषा पटलाचे स्थान:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "बंद करा"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "कार्यक्षम इंपुट पद्धतींमध्ये नीवडलेली इंपुट पद्धत खाली सरकवा"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus डिमन सुरू केले गेले नाही. तुम्हाला आता सुरू करायचे?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "कार्यक्षम इंपुट पद्धतींमध्ये नीवडलेली इंपुट पद्धत वर सरकवा"
+#: ../setup/main.py:344
+#, fuzzy
+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 सुरू केले गेले आहे! तुम्ही IBus चा वापर करत नसल्यास, कृपया खालिल ओळ $HOME/.bashrc "
+"अंतर्गत समावेष करा, व पुन्हा डेस्कटॉपवर पुन्हा प्रवेश करा.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "पुढची इंपुट पद्धत:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "मागील इंपुट पद्धत:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s करीता कळफलक शार्टकट नीवडा"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "कार्यक्षम इंपुट पद्धतीपासून नीवडलेली इंपुट पद्धत काढून टाका"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"सर्वहक्काधिकार (c) 2007-2010 पेंग हुआंग\n"
+"सर्वहक्काधिकार (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "भाषा पट्टी कसे दाखवायचे किंवा लपवायचे यासाठी ibus चे वर्तन ठरवा"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "लुकअप टेबल मधील घटकांचे निर्देशन ठरवा"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat."
+"com>, 2009, 2010."
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "पुन्हा चालू करा"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "चेकबॉक्स नीवडल्यानंतर भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
+#~ msgid "Previous page"
+#~ msgstr "पूर्वीचे पान"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "भाषा पटल दाखवा:"
+#~ msgid "Next page"
+#~ msgstr "पुढचे पान"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "प्रवेशवेळी ibus सुरू करा"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "काहिक इंपुट पद्धत प्रतिष्ठापीत, काढून टाकले किंवा सुधारीत केले आहे. कृपया ibus इंपुट "
+#~ "प्लॅटफॉर्म पुनः सुरू करा."
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "सूचीतील पुढची इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
+#~ msgid "Restart Now"
+#~ msgstr "आत्ता पुनः सुरू करा"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "सूचीतील मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
+#~ msgid "Later"
+#~ msgstr "पुढे"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "वरील डावा कोपरा"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus इन्पुट पद्धती फ्रेमवर्क"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "वरील उजवा कोपरा"
+#~ msgid "Turn off input method"
+#~ msgstr "इंपुट पद्धत बंद करा"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "मनपसंत फॉन्टचा वापर करा:"
+#~ msgid "No input window"
+#~ msgstr "इंपुट खिडकी आढळली नाही"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "उभे"
+#~ msgid "About the input method"
+#~ msgstr "इंपुट पद्धत विषयी"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "सक्रीय असल्यावर"
+#~ msgid "Switch input method"
+#~ msgstr "इंपुट पद्धत बदला"
+
+#~ msgid "About the Input Method"
+#~ msgstr "इंपुट पद्धत विषयी"
+
+#~ msgid "next input method"
+#~ msgstr "पुढिल इंपुट पद्धत"
+
+#~ msgid "previous input method"
+#~ msgstr "मागील इंपुट पद्धत"
diff --git a/po/nl.po b/po/nl.po
index 43b4388d4..b2974dcdc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,297 +6,325 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-13 15:18+0000\n"
 "Last-Translator: warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontaal"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Verticaal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Invoer methode kader"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Ingebed in menu"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus invoer methode kader"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Als deze actief is"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Altijd"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Andere"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Linksboven"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Vorige pagina"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Rechtsboven"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Volgende pagina"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Linksonder"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Rechtsonder"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Aangepast"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus voorkeuren"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"Sommige invoermethoden zijn geïnstalleerd, verwijderd of bijgewerkt. Start "
-"ibus invoer platform opnieuw op."
+"De sneltoetsen voor het schakelen naar de volgende invoermethode in de lijst"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Nu opnieuw opstarten"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Volgende invoermethode:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Later"
+#: ../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"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus paneel"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Vorige invoermethode:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus invoermethode kader"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Opnieuw starten"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Schakel invoer methode uit"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aan- of uitzetten:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Geen input venster"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aanzetten:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Uitzetten:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Geert Warrink"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Sneltoetsen</b>"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Over de invoer methode"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Stel de oriëntatie in van de kandidaten in de opzoektabel"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Schakel invoer methode om"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Kandidaten oriëntatie:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Over"
+#: ../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"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Over de invoer methode"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Toon taal paneel:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Taal: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Taal panel positie:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Toetsenbordindeling: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Toon icoon op systeemvak"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Auteur: %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Toon naam van invoermethode op taalbalk"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Beschrijving:\n"
+#: ../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"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "trigger"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Insluiten van pre-edit tekst in toepassingsvenster"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "aanzetten"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "uitzetten"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Gebruik aangepast lettertype:"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "volgende invoermethode"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Lettertype en stijl</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "vorige invoermethode"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Algemeen"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus daemon was niet gestart. Wil je het nu starten?"
+#: ../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"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"IBus is gestart! Als je IBus niet kunt gebruiken, voeg dan de onderstaande regels toe aan $HOME/.bashrc, en log opnieuw in op je bureaublad.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selecteer sneltoets voor %s"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Sneltoetsen"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Toetscode:"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Toon informatie over de geselecteerde invoermethode"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificatietoetsen:"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Toon informatie over de geselecteerde invoermethode"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:41
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"Druk op een toets (of een toetsencombinatie).\n"
-"De dialoog wordt afgesloten als de toets losgelaten wordt."
-
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Druk op een toets (of een toetsencombinatie)"
-
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Selecteer een invoermethode"
+"<small><i>De standaard invoermethode is de bovenste in de lijst.\n"
+"je kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Toetsenbord"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus voorkeuren"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Stel IBus voorkeuren in"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Toetsenbordindeling</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Deel dezelfde input-methode voor alle toepassingen"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globale invoermethode instellingen</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<bib><b>IBus</b></big>\n"
+"<small>De intelligente invoer bus</small>\n"
+"Homepagina: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Start ibus bij inloggen"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Opstarten</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Over"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Invoer methode kader"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Start IBus invoer methode kader"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Automatisch verbergen"
+msgid "Preload engines"
+msgstr "Engines voor-laden"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Aangepaste lettertype"
+msgid "Preload engines during ibus starts up"
+msgstr "Engines voor-laden tijdens opstarten van ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Aangepaste lettertype naam voor taal-paneel"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Zet sneltoetsen uit"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Voeg pre-edit tekst in"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Voeg pre-edit tekst in in toepassingsvenster"
+msgid "Trigger shortcut keys"
+msgstr "Trigger sneltoetsen"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Zet invoer-methode standaard aan"
+msgid "Enable shortcut keys"
+msgstr "Zet sneltoetsen aan"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
+msgid "The shortcut keys for turning input method on"
+msgstr "De sneltoetsen om invoermethode aan te zetten"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Zet sneltoetsen aan"
+msgid "Disable shortcut keys"
+msgstr "Zet sneltoetsen uit"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Taal-paneel positie"
+msgid "The shortcut keys for turning input method off"
+msgstr "De sneltoetsen om invoermethode uit te zetten"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Volgende engine sneltoetsen"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Oriëntatie van opzoektabel"
+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"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
+msgid "Prev engine shortcut keys"
+msgstr "Vorige engine sneltoetsen"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Engines voor-laden"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Engines voor-laden tijdens opstarten van ibus"
+msgid "Auto hide"
+msgstr "Automatisch verbergen"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Vorige engine sneltoetsen"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Deel dezelfde input-methode voor alle toepassingen"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Toon icoon op systeemvak"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Toon naam van invoermethode"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Toon naam van invoermethode op taalbalk"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -304,7 +332,11 @@ msgstr ""
 "Het gedrag van het taal paneel. 0 = Ingebed in het menu, 1 = Automatisch "
 "verbergen, 2 = Altijd tonen"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Taal-paneel positie"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -312,244 +344,232 @@ msgstr ""
 "De positie van de taal paneel. 0 = linksboven, 1 = rechtsboven, 2 = "
 "linksonder,  3 = rechtsonder, 4 = aangepast"
 
-#: ../data/ibus.schemas.in.h:23
-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"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "De sneltoetsen om invoermethode uit te zetten"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Toon naam van invoermethode"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "De sneltoetsen om invoermethode aan te zetten"
+msgid "Use custom font"
+msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Trigger sneltoetsen"
+msgid "Custom font"
+msgstr "Aangepaste lettertype"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Gebruik aangepast lettertype"
+msgid "Custom font name for language panel"
+msgstr "Aangepaste lettertype naam voor taal-paneel"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
+msgid "Embed Preedit Text"
+msgstr "Voeg pre-edit tekst in"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Voeg pre-edit tekst in in toepassingsvenster"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Gebruik systeem toetsenbord (XKB) indeling"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Gebruik systeem toetsenbordindeling"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Lettertype en stijl</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globale invoermethode instellingen</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Toetsenbordindeling</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Zet invoer-methode standaard aan"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Sneltoetsen</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Opstarten</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<bib><b>IBus</b></big>\n"
-"<small>De intelligente invoer bus</small>\n"
-"Homepagina: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>De standaard invoermethode is de bovenste in de lijst.\n"
-"je kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Andere"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Geavanceerd"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Taal: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Altijd"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Toetsenbordindeling: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Linksonder"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Auteur: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Rechtsonder"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Beschrijving:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Kandidaten oriëntatie:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Selecteer een invoermethode"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Aangepast"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Toetsenbord"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Uitzetten:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Stel IBus voorkeuren in"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Insluiten van pre-edit tekst in toepassingsvenster"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Sneltoetsen"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Toetscode:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificatietoetsen:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
+"Druk op een toets (of een toetsencombinatie).\n"
+"De dialoog wordt afgesloten als de toets losgelaten wordt."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Ingebed in menu"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Aan- of uitzetten:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "trigger"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Aanzetten:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "aanzetten"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Algemeen"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "uitzetten"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontaal"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus daemon was niet gestart. Wil je het nu starten?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Taal panel positie:"
+#: ../setup/main.py:344
+#, fuzzy
+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 is gestart! Als je IBus niet kunt gebruiken, voeg dan de onderstaande "
+"regels toe aan $HOME/.bashrc, en log opnieuw in op je bureaublad.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Verplaats de geselecteerde invoermethode omlaag in de aangezette "
-"invoermethoden lijst"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selecteer sneltoets voor %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Verplaats de geselecteerde invoermethode omhoog in de aangezette "
-"invoermethoden lijst"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Volgende invoermethode:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Vorige invoermethode:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Geert Warrink"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Opnieuw starten"
 
-#: ../setup/setup.ui.h:40
-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"
+#~ msgid "Previous page"
+#~ msgstr "Vorige pagina"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Stel de oriëntatie in van de kandidaten in de opzoektabel"
+#~ msgid "Next page"
+#~ msgstr "Volgende pagina"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Toon informatie over de geselecteerde invoermethode"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Sommige invoermethoden zijn geïnstalleerd, verwijderd of bijgewerkt. "
+#~ "Start ibus invoer platform opnieuw op."
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Restart Now"
+#~ msgstr "Nu opnieuw opstarten"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Toon taal paneel:"
+#~ msgid "Later"
+#~ msgstr "Later"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Start ibus bij inloggen"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus paneel"
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus invoermethode kader"
 
-#: ../setup/setup.ui.h:50
-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"
+#~ msgid "Turn off input method"
+#~ msgstr "Schakel invoer methode uit"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Linksboven"
+#~ msgid "No input window"
+#~ msgstr "Geen input venster"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Rechtsboven"
+#~ msgid "About the input method"
+#~ msgstr "Over de invoer methode"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Gebruik aangepast lettertype:"
+#~ msgid "Switch input method"
+#~ msgstr "Schakel invoer methode om"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Verticaal"
+#~ msgid "About the Input Method"
+#~ msgstr "Over de invoer methode"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Als deze actief is"
+#~ msgid "next input method"
+#~ msgstr "volgende invoermethode"
+
+#~ msgid "previous input method"
+#~ msgstr "vorige invoermethode"
diff --git a/po/or.po b/po/or.po
index d55e2ae15..9fd9c6c81 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.or\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
@@ -19,524 +19,544 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "ଭୂ-ସମାନ୍ତରାଳ"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "ଭୂଲମ୍ବ"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କକୁ ଆରମ୍ଭ କରନ୍ତୁ"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "ତାଲିକାରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "ସକ୍ରିୟ ଥିବା ସମୟରେ"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "ଅନ୍ୟାନ୍ୟ"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "ସର୍ବଦା"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "ପୂର୍ବବର୍ତ୍ତୀ ପୃଷ୍ଠା"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ଉପର ପାଖ ବାମ କୋଣ"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "ପରବର୍ତ୍ତୀ ପୃଷ୍ଠା"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"କିଛି ନିବେଶ ପଦ୍ଧତିକୁ ସ୍ଥାପନ କରାଯାଇଛି, କଢ଼ାଯାଇଛି ଅଥବା ଅଦ୍ୟତନ କରାଯାଇଛି। ଦୟାକରି "
-"ibus ନିବେଶ ପ୍ଲାଟଫର୍ମକୁ ପୁନର୍ଚାଳନ କରନ୍ତୁ।"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "ତଳପାଖ ବାମ କୋଣ"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "ବର୍ତ୍ତମାନ ପୁନଃଚାଳନ କରନ୍ତୁ"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "ପରେ"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "ଇଚ୍ଛାରୂପୀ"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus ପସନ୍ଦ"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "ପୁନଃଚାଳନ"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "ନିବେଶ ପ୍ରଣୀଳୀକୁ ବନ୍ଦ କରନ୍ତୁ"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "କୌଣସି ନିବେଶ ୱିଣ୍ଡୋ ନାହିଁ"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ନିବେଶ ପ୍ରଣୀଳିକୁ ବଦଳାନ୍ତୁ"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "ସକ୍ରିୟ ଅଥବା ନିଷ୍କ୍ରିୟ:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "ବିବରଣୀ"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "ସକ୍ରିୟ କରନ୍ତୁ:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ଭାଷା: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>କିବୋର୍ଡ ସଂକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "କିବୋର୍ଡ ବିନ୍ୟାସ: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ଅବଲୋକନ ସାରଣୀରେ ବ୍ୟକ୍ତିମାନଙ୍କର ଅନୁସ୍ଥାପନ ସେଟକରନ୍ତୁ"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "ଲେଖକ: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "ପ୍ରାର୍ଥୀ ଅନୁସ୍ଥାପନ:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "ବର୍ଣ୍ଣନା:\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ଭାଷା ସୂଚକକୁ ଦର୍ଶାଇବା ଅଥବା ଲୁଚାଇବା ପାଇଁ ibus ର ଆଚରଣକୁ ସେଟକରନ୍ତୁ"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ଟ୍ରିଗର"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "ସକ୍ରିୟ କରନ୍ତୁ"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ନିବେଶ ପଦ୍ଧତି ନାମକୁ ଭାଷା ସୂଚକରେ ଦର୍ଶାନ୍ତୁ ଯେତେବେଳେ ଯାଞ୍ଚବାକ୍ସକୁ ଯାଞ୍ଚକରୁଛନ୍ତି"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr ""
-"IBus ଡେମନଟି ଆରମ୍ଭ ହୋଇନାହିଁ। ଆପଣ ଏହାକୁ ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>ଅକ୍ଷରରୂପ ଏବଂ ଶୈଳୀ</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ $HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ଏବଂ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\n"
+"ଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀ"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "କି ସଂକେତ:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "ରୂପାନ୍ତରକ:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀ ବିନ୍ୟାସ</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "ଉନ୍ନତ"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\n"
-"କିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।"
+"<big><b>IBus</b></big>\n"
+"<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\n"
+"ମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>ଆରମ୍ଭ</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "ବିବରଣୀ"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus ପସନ୍ଦ"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟକରନ୍ତୁ"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କକୁ ଆରମ୍ଭ କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
+msgid "Preload engines"
+msgstr "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+msgid "Trigger shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ଟ୍ରିଗର କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+msgid "Enable shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ"
-" ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
+msgid "The shortcut keys for turning input method on"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+msgid "Disable shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
+msgid "The shortcut keys for turning input method off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "ପରବର୍ତ୍ତି ଯନ୍ତ୍ର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
+msgid "Prev engine shortcut keys"
+msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+msgid "Auto hide"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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 ="
-" ସର୍ବଦା ଦର୍ଶାନ୍ତୁ"
+"ଭାଷା ତାଲିକାର ଆଚରଣ। 0 = ତାଲିକାରେ ସନ୍ନିହିତ, 1 = ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ, 2 = ସର୍ବଦା "
+"ଦର୍ଶାନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"ଭାଷା ଫଳକର ଅବସ୍ଥାନ। 0 = ଉପର ପାଖ ବାମ କୋଣ, 1 = ଉପର ପାଖ ଡାହାଣ କୋଣ, 2 = ତଳ ପାଖ "
-"ବାମ କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ"
+"ଭାଷା ଫଳକର ଅବସ୍ଥାନ। 0 = ଉପର ପାଖ ବାମ କୋଣ, 1 = ଉପର ପାଖ ଡାହାଣ କୋଣ, 2 = ତଳ ପାଖ ବାମ "
+"କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+msgid "Use custom font"
+msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ଟ୍ରିଗର କରନ୍ତୁ"
+msgid "Custom font"
+msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
+msgid "Custom font name for language panel"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+msgid "Embed Preedit Text"
+msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ଅକ୍ଷରରୂପ ଏବଂ ଶୈଳୀ</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀ ବିନ୍ୟାସ</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>କିବୋର୍ଡ ସଂକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ଆରମ୍ଭ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\n"
-"ମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\n"
-"ଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀରେ ଯୋଗକରନ୍ତୁ"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "ଅନ୍ୟାନ୍ୟ"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "ଉନ୍ନତ"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ଭାଷା: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "ସର୍ବଦା"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "କିବୋର୍ଡ ବିନ୍ୟାସ: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "ତଳପାଖ ବାମ କୋଣ"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "ଲେଖକ: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "ବର୍ଣ୍ଣନା:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "ପ୍ରାର୍ଥୀ ଅନୁସ୍ଥାପନ:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "ଇଚ୍ଛାରୂପୀ"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟକରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "ନିବେଶ ପଦ୍ଧତିର ପ୍ରୀଡିତ ପାଠ୍ୟକୁ ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "କି ସଂକେତ:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "ତାଲିକାରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "ରୂପାନ୍ତରକ:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "ସକ୍ରିୟ ଅଥବା ନିଷ୍କ୍ରିୟ:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\n"
+"କିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "ସକ୍ରିୟ କରନ୍ତୁ:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "ସାଧାରଣ"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ଟ୍ରିଗର"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "ଭୂ-ସମାନ୍ତରାଳ"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିଗୁଡ଼ିକରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ତଳକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ଡେମନଟି ଆରମ୍ଭ ହୋଇନାହିଁ। ଆପଣ ଏହାକୁ ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତି ତାଲିକାରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+#: ../setup/main.py:344
+#, fuzzy
+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 ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ "
+"$HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ଏବଂ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିରୁ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ କାଢ଼ିଦିଅନ୍ତୁ"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ଭାଷା ସୂଚକକୁ ଦର୍ଶାଇବା ଅଥବା ଲୁଚାଇବା ପାଇଁ ibus ର ଆଚରଣକୁ ସେଟକରନ୍ତୁ"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ଅବଲୋକନ ସାରଣୀରେ ବ୍ୟକ୍ତିମାନଙ୍କର ଅନୁସ୍ଥାପନ ସେଟକରନ୍ତୁ"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "ପୁନଃଚାଳନ"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"ନିବେଶ ପଦ୍ଧତି ନାମକୁ ଭାଷା ସୂଚକରେ ଦର୍ଶାନ୍ତୁ ଯେତେବେଳେ ଯାଞ୍ଚବାକ୍ସକୁ ଯାଞ୍ଚକରୁଛନ୍ତି"
+#~ msgid "Previous page"
+#~ msgstr "ପୂର୍ବବର୍ତ୍ତୀ ପୃଷ୍ଠା"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
+#~ msgid "Next page"
+#~ msgstr "ପରବର୍ତ୍ତୀ ପୃଷ୍ଠା"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "କିଛି ନିବେଶ ପଦ୍ଧତିକୁ ସ୍ଥାପନ କରାଯାଇଛି, କଢ଼ାଯାଇଛି ଅଥବା ଅଦ୍ୟତନ କରାଯାଇଛି। ଦୟାକରି ibus ନିବେଶ "
+#~ "ପ୍ଲାଟଫର୍ମକୁ ପୁନର୍ଚାଳନ କରନ୍ତୁ।"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#~ msgid "Restart Now"
+#~ msgstr "ବର୍ତ୍ତମାନ ପୁନଃଚାଳନ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#~ msgid "Later"
+#~ msgstr "ପରେ"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ଉପର ପାଖ ବାମ କୋଣ"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
+#~ msgid "Turn off input method"
+#~ msgstr "ନିବେଶ ପ୍ରଣୀଳୀକୁ ବନ୍ଦ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ:"
+#~ msgid "No input window"
+#~ msgstr "କୌଣସି ନିବେଶ ୱିଣ୍ଡୋ ନାହିଁ"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "ଭୂଲମ୍ବ"
+#~ msgid "About the input method"
+#~ msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "ସକ୍ରିୟ ଥିବା ସମୟରେ"
+#~ msgid "Switch input method"
+#~ msgstr "ନିବେଶ ପ୍ରଣୀଳିକୁ ବଦଳାନ୍ତୁ"
+
+#~ msgid "About the Input Method"
+#~ msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
+
+#~ msgid "next input method"
+#~ msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ"
+
+#~ msgid "previous input method"
+#~ msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ"
diff --git a/po/pa.po b/po/pa.po
index c9d5f7d33..43acd259c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,7 +2,7 @@
 # Panjabi translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Amanpreet Singh <aalam@users.sf.net>, 2008.
 # A S Alam <aalam@users.sf.net>, 2009.
@@ -11,537 +11,558 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-08-18 01:36+0000\n"
 "Last-Translator: aalam <apreet.alam@gmail.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "ਆਈ-ਬੱਸ"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "ਲੇਟਵਾਂ"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "ਖੜ੍ਹਵਾਂ"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "ਆਈਬਸ ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ ਸ਼ੁਰੂ ਕਰੋ"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "ਮੇਨੂ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "ਜਦੋਂ ਐਕਟਿਵ"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "ਹੋਰ"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "ਪਿਛਲਾ ਪੇਜ਼"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "ਅਗਲਾ ਪੇਜ਼"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"ਕੁਝ ਇੰਪੁੰਟ ਢੰਗ ਇੰਸਟਾਲ ਕੀਤੇ, ਹਟਾਏ ਜਾਂ ਅੱਪਡੇਟ ਕੀਤੇ ਗਏ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ibus "
-"ਇੰਪੁੱਟ ਪਲੇਟਫਾਰਮ ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "ਹੁਣੇ ਮੁੜ-ਚਾਲੂ"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "ਬਾਅਦ 'ਚ"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "ਪਸੰਦੀਦਾ"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "ਆਈਬੱਸ ਪੈਨਲ"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus ਪਸੰਦ"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰੋ"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "ਕੋਈ ਇੰਪੁੱਟ ਵਿੰਡੋ ਨਹੀਂ"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੧\n"
-"http://www.satluj.com/"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "ਚਾਲੂ ਜਾਂ ਬੰਦ:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲੋ"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "ਚਾਲੂ:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "ਇਸ ਬਾਰੇ"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "ਬੰਦ:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "ਭਾਸ਼ਾ: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ਖੋਜ ਟੇਬਲ ਵਿੱਚ ਉਮੀਦਵਾਰ ਦੀ ਸਥਿਤੀ ਸੈੱਟ ਕਰੋ"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "ਉਮੀਦਵਾਰ ਸਥਿਤੀ:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "ਲੇਖਕ: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼ਾ ਪੱਟੀ ਕਿਵੇਂ ਵੇਖਾਈ ਜਾਵੇ"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "ਵੇਰਵਾ:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖੋ:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ਟਰਿੱਗਰ"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "ਚਾਲੂ ਕਰੋ"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਨਾਂ ਵੇਖੋ"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ਜਦੋਂ ਚੈੱਕ ਬਾਕਸ ਚੁਣਿਆ ਹੋਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਵੇਖੋ"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>ਫੋਂਟ ਅਤੇ ਸਟਾਈਲ</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ! ਜੇ ਤੁਹਾਨੂੰ IBus ਨਾ ਵਰਤ ਸਕੋ ਤਾਂ ਅੱਗੇ ਦਿੱਤੀਆਂ ਲਾਈਨਾਂ ਨੂੰ $HOME/.bashrc ਵਿੱਚ ਲਿਖੋ ਅਤੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਵਿੱਚ ਮੁੜ-ਲਾਗਇਨ ਕਰੋ।\n"
-" export GTK_IM_MODULE=ibus⏎ \n"
-"  export  XMODIFIERS=@im=ibus⏎ \n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\n"
+"ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋਂ"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "ਕੀ ਕੋਡ:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋਂ"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "ਮਾਡੀਫਾਇਰ:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨਾਂ ਵਿਚਕਾਰ ਕੁਝ ਇੰਪੁੱਟ ਸਾਂਝੀ ਕਰੋ"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n"
-"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਈਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।"
+"<big><b>IBus</b></big>\n"
+"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
+"ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "ਲਾਗਇਨ ਸਮੇਂ ibus ਚਲਾਉ"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>ਸ਼ੁਰੂ</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "ਇਸ ਬਾਰੇ"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "ਆਈ-ਬੱਸ"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus ਪਸੰਦ"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "ਆਈਬਸ ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "ਆਈਬਸ ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ ਸ਼ੁਰੂ ਕਰੋ"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
+msgid "Preload engines"
+msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ ਕੀਤੇ ਇੰਜਣ"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਬੰਦ ਕਰੋ"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+msgid "Trigger shortcut keys"
+msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
+msgid "Enable shortcut keys"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਚਾਲੂ ਕਰੋ"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
+msgid "The shortcut keys for turning input method on"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਚਾਲੂ ਕਰੋ"
+msgid "Disable shortcut keys"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਬੰਦ ਕਰੋ"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
+msgid "The shortcut keys for turning input method off"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
+msgid "Prev engine shortcut keys"
+msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ ਕੀਤੇ ਇੰਜਣ"
+msgid "Auto hide"
+msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨਾਂ ਵਿਚਕਾਰ ਕੁਝ ਇੰਪੁੱਟ ਸਾਂਝੀ ਕਰੋ"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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 = ਹਮੇਸ਼ਾ ਵੇਖੋ"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਦਾ ਰਵੱਈਆ. 0 = ਹਮੇਸ਼ਾ ਓਹਲੇ,  1 = ਆਟੋਮੈਟਿਕ ਓਹਲੇ, 2 = ਹਮੇਸ਼ਾ ਵੇਖੋ"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"ਭਾਸ਼ਾ ਪੈਨਲ ਦੀ ਸਥਿਤੀ. 0 = ਉੱਪਰ ਖੱਬਾ ਕੋਨਾ, 1 = ਉੱਪਰ ਸੱਜਾ ਕੋਨਾ, 2 = ਹੇਠਾਂ ਖੱਬਾ "
-"ਕੋਨਾ, 3 = ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ"
+"ਭਾਸ਼ਾ ਪੈਨਲ ਦੀ ਸਥਿਤੀ. 0 = ਉੱਪਰ ਖੱਬਾ ਕੋਨਾ, 1 = ਉੱਪਰ ਸੱਜਾ ਕੋਨਾ, 2 = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ, 3 = "
+"ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
+msgid "Use custom font"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+msgid "Custom font"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+msgid "Custom font name for language panel"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
+msgid "Embed Preedit Text"
+msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋਂ"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋਂ"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ਫੋਂਟ ਅਤੇ ਸਟਾਈਲ</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
+#: ../ibus/_config.py.in:41
+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."
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "ਹੋਰ"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ਸ਼ੁਰੂ</b>"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "ਭਾਸ਼ਾ: %s\n"
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
-"ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n"
 
-#: ../setup/setup.ui.h:14
-msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\n"
-"ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "ਲੇਖਕ: %s\n"
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕੀਤੇ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "ਵੇਰਵਾ:\n"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "ਹਮੇਸ਼ਾ"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "ਆਈਬਸ ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "ਉਮੀਦਵਾਰ ਸਥਿਤੀ:"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "ਕੀ ਕੋਡ:"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "ਪਸੰਦੀਦਾ"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "ਮਾਡੀਫਾਇਰ:"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "ਬੰਦ:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n"
+"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਈਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ਟਰਿੱਗਰ"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "ਮੇਨੂ ਵਿੱਚ ਸ਼ਾਮਿਲ"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "ਚਾਲੂ ਕਰੋ"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "ਚਾਲੂ ਜਾਂ ਬੰਦ:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "ਚਾਲੂ:"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "ਆਮ"
+#: ../setup/main.py:344
+#, fuzzy
+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 ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ! ਜੇ ਤੁਹਾਨੂੰ IBus ਨਾ ਵਰਤ ਸਕੋ ਤਾਂ ਅੱਗੇ ਦਿੱਤੀਆਂ ਲਾਈਨਾਂ ਨੂੰ $HOME/.bashrc ਵਿੱਚ "
+"ਲਿਖੋ ਅਤੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਵਿੱਚ ਮੁੜ-ਲਾਗਇਨ ਕਰੋ।\n"
+" export GTK_IM_MODULE=ibus⏎ \n"
+"  export  XMODIFIERS=@im=ibus⏎ \n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "ਲੇਟਵਾਂ"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੧\n"
+"http://www.satluj.com/"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚੋਂ ਹਟਾਓ"
+#~ msgid "Previous page"
+#~ msgstr "ਪਿਛਲਾ ਪੇਜ਼"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼ਾ ਪੱਟੀ ਕਿਵੇਂ ਵੇਖਾਈ ਜਾਵੇ"
+#~ msgid "Next page"
+#~ msgstr "ਅਗਲਾ ਪੇਜ਼"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ਖੋਜ ਟੇਬਲ ਵਿੱਚ ਉਮੀਦਵਾਰ ਦੀ ਸਥਿਤੀ ਸੈੱਟ ਕਰੋ"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "ਕੁਝ ਇੰਪੁੰਟ ਢੰਗ ਇੰਸਟਾਲ ਕੀਤੇ, ਹਟਾਏ ਜਾਂ ਅੱਪਡੇਟ ਕੀਤੇ ਗਏ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ibus ਇੰਪੁੱਟ ਪਲੇਟਫਾਰਮ "
+#~ "ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
+#~ msgid "Restart Now"
+#~ msgstr "ਹੁਣੇ ਮੁੜ-ਚਾਲੂ"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "ਜਦੋਂ ਚੈੱਕ ਬਾਕਸ ਚੁਣਿਆ ਹੋਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਵੇਖੋ"
+#~ msgid "Later"
+#~ msgstr "ਬਾਅਦ 'ਚ"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖੋ:"
+#~ msgid "IBus Panel"
+#~ msgstr "ਆਈਬੱਸ ਪੈਨਲ"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "ਲਾਗਇਨ ਸਮੇਂ ibus ਚਲਾਉ"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
+#~ msgid "Turn off input method"
+#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰੋ"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
+#~ msgid "No input window"
+#~ msgstr "ਕੋਈ ਇੰਪੁੱਟ ਵਿੰਡੋ ਨਹੀਂ"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ"
+#~ msgid "About the input method"
+#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ"
+#~ msgid "Switch input method"
+#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲੋ"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ:"
+#~ msgid "About the Input Method"
+#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "ਖੜ੍ਹਵਾਂ"
+#~ msgid "next input method"
+#~ msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "ਜਦੋਂ ਐਕਟਿਵ"
+#~ msgid "previous input method"
+#~ msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ"
diff --git a/po/pl.po b/po/pl.po
index ed90c06d5..1b318ecde 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-13 07:46+0000\n"
 "Last-Translator: raven <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -16,290 +16,316 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "iBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Poziomo"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Struktura metody wprowadzania"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Pionowo"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Uruchomienie struktury metody wprowadzania iBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Osadzanie w menu"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "W czasie aktywności"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Inne"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Zawsze"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Poprzednia strona"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Górny lewy róg"
+
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Górny prawy róg"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Następna strona"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Dolny lewy róg"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Dolny prawy róg"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Własna"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferencje usługi iBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
-"Metody wprowadzania zostały zainstalowane, usunięte lub zaktualizowane. "
-"Proszę ponownie uruchomić platformę wprowadzania iBus."
+"Klawisz skrótu do przełączenia na następną metodę wprowadzania na liście"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Uruchom ponownie teraz"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Następna metoda wprowadzania:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Później"
+#: ../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"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Panel iBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Poprzednia metoda wprowadzania:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "Struktura metody wprowadzania iBus"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Uruchom ponownie"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Wyłącz metodę wprowadzania"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Włączenie lub wyłączenie:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Brak okna wprowadzania"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Włączone:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr ""
-"iBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Wyłączone:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Skróty klawiszowe</b>"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "O metodzie wprowadzania"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Przełącz metodę wprowadzania"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientacja kandydatów:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "O programie"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi iBus"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "O metodzie wprowadzania"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Wyświetlanie panelu języków:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Język: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Pozycja panelu języków:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Układ klawiatury: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Wyświetlanie ikony w obszarze powiadamiania"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Opis:\n"
+#: ../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"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "przełącznik"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "włączenie"
+#: ../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"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "wyłączenie"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Użycie własnej czcionki:"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "następna metoda wprowadzania"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Czcionka i styl</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "poprzednia metoda wprowadzania"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Ogólne"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Demon iBus nie jest uruchomiony. Uruchomić go teraz?"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Dodanie wybranej metody wprowadzania do włączonych metod wprowadzania"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 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"
+"Usunięcie zaznaczonej metody wprowadzania we włączonych metodach wprowadzania"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Wybór skrótu klawiszowego dla %s"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Skróty klawiszowe"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Kod klawisza:"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modyfikatory:"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:41
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"Proszę nacisnąć klawisz (lub kombinację klawiszy).\n"
-"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
-
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
-
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Wybór metodę wprowadzania"
+"<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\n"
+"Można użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "KBD"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Preferencje usługi iBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Użycie systemowego układu klawiatury (XKB)"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Ustawianie preferencji usługi iBus"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Układ klawiatury</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>iBus</b></big>\n"
+"<small>Inteligentna magistrala wprowadzania</small>\n"
+"Strona domowa: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Uruchamianie iBus podczas logowania"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Uruchomienie</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "O programie"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "iBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Struktura metody wprowadzania"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Uruchomienie struktury metody wprowadzania iBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Automatyczne ukrywanie"
+msgid "Preload engines"
+msgstr "Wcześniejsze wczytanie mechanizmów"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Własna czcionka"
+msgid "Preload engines during ibus starts up"
+msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi iBus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Nazwa własnej czcionki dla panelu języków"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Wyłącza skróty klawiszowe"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
+msgid "Trigger shortcut keys"
+msgstr "Klawisze skrótów przełącznika"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Domyślne włączanie metody wprowadzania"
+msgid "Enable shortcut keys"
+msgstr "Włącza skróty klawiszowe"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
-"wprowadzania"
+msgid "The shortcut keys for turning input method on"
+msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Włącza skróty klawiszowe"
+msgid "Disable shortcut keys"
+msgstr "Wyłącza skróty klawiszowe"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Pozycja panela języków"
+msgid "The shortcut keys for turning input method off"
+msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Klawisze skrótów następnego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientacja tablicy wyszukiwania"
+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"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
+msgid "Prev engine shortcut keys"
+msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Wcześniejsze wczytanie mechanizmów"
+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"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi iBus"
+msgid "Auto hide"
+msgstr "Automatyczne ukrywanie"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Klawisze skrótów poprzedniego mechanizmu"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Wyświetlanie ikony w obszarze powiadamiania"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Wyświetlanie nazwy metody wprowadzania"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -307,7 +333,11 @@ msgstr ""
 "Zachowanie panela języków. 0 = osadzony w menu, 1 = automatycznie ukrywany, "
 "2 = zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Pozycja panela języków"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -315,243 +345,234 @@ 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:23
-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"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:24
-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"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Wyświetlanie nazwy metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Skróty klawiszowe do włączania metody wprowadzania"
+msgid "Use custom font"
+msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Klawisze skrótów przełącznika"
+msgid "Custom font"
+msgstr "Własna czcionka"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Użycie własnej czcionki"
+msgid "Custom font name for language panel"
+msgstr "Nazwa własnej czcionki dla panelu języków"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Nazwa własnej czcionki użytej w panelu języków"
+msgid "Embed Preedit Text"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Użycie systemowego układu klawiatury (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Użycie systemowych ustawień układu klawiatury"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Czcionka i styl</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Układ klawiatury</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Skróty klawiszowe</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
+"wprowadzania"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Uruchomienie</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>iBus</b></big>\n"
-"<small>Inteligentna magistrala wprowadzania</small>\n"
-"Strona domowa: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\n"
-"Można użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Dodanie wybranej metody wprowadzania do włączonych metod wprowadzania"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Inne"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Zaawansowane"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Język: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Zawsze"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Układ klawiatury: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Dolny lewy róg"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Dolny prawy róg"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Opis:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientacja kandydatów:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Wybór metodę wprowadzania"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Własna"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "KBD"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Wyłączone:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Ustawianie preferencji usługi iBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Skróty klawiszowe"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Kod klawisza:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modyfikatory:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Osadzanie wcześniej wprowadzonego tekstu metody wejścia w oknie aplikacji"
+"Proszę nacisnąć klawisz (lub kombinację klawiszy).\n"
+"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Osadzanie w menu"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Włączenie lub wyłączenie:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "przełącznik"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Włączone:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "włączenie"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Ogólne"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "wyłączenie"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Poziomo"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Demon iBus nie jest uruchomiony. Uruchomić go teraz?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Pozycja panelu języków:"
+#: ../setup/main.py:344
+#, fuzzy
+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 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"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach "
-"wprowadzania"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Wybór skrótu klawiszowego dla %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Przeniesienie w górę zaznaczonej metody wprowadzania we włączonych metodach "
-"wprowadzania"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Następna metoda wprowadzania:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "iBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Poprzednia metoda wprowadzania:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Usunięcie zaznaczonej metody wprowadzania we włączonych metodach "
-"wprowadzania"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Uruchom ponownie"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi iBus"
+#~ msgid "Previous page"
+#~ msgstr "Poprzednia strona"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
+#~ msgid "Next page"
+#~ msgstr "Następna strona"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Metody wprowadzania zostały zainstalowane, usunięte lub zaktualizowane. "
+#~ "Proszę ponownie uruchomić platformę wprowadzania iBus."
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Restart Now"
+#~ msgstr "Uruchom ponownie teraz"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Wyświetlanie panelu języków:"
+#~ msgid "Later"
+#~ msgstr "Później"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Uruchamianie iBus podczas logowania"
+#~ msgid "IBus Panel"
+#~ msgstr "Panel iBus"
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "IBus input method framework"
+#~ msgstr "Struktura metody wprowadzania iBus"
 
-#: ../setup/setup.ui.h:50
-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"
+#~ msgid "Turn off input method"
+#~ msgstr "Wyłącz metodę wprowadzania"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Górny lewy róg"
+#~ msgid "No input window"
+#~ msgstr "Brak okna wprowadzania"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Górny prawy róg"
+#~ msgid "About the input method"
+#~ msgstr "O metodzie wprowadzania"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Użycie własnej czcionki:"
+#~ msgid "Switch input method"
+#~ msgstr "Przełącz metodę wprowadzania"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Pionowo"
+#~ msgid "About the Input Method"
+#~ msgstr "O metodzie wprowadzania"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "W czasie aktywności"
+#~ msgid "next input method"
+#~ msgstr "następna metoda wprowadzania"
+
+#~ msgid "previous input method"
+#~ msgstr "poprzednia metoda wprowadzania"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dedafcd02..1d0dd1d68 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.pt_BR\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: Glaucia Cintra <gcintra@redhat.com>\n"
 "Language-Team: Portuguese (Brazilian) <trans-pt_br@lists.fedoraproject.org>\n"
@@ -20,283 +20,316 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework do método de entrada"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertical"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Iniciar Framework do método de entrada IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Embutido no menu"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Quando ativado"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Outros"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Sempre"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Página anterior"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Canto esquerdo superior"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Próxima página"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Canto direito superior"
 
-#: ../ui/gtk/main.py:55
-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. "
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Canto esquerdo inferior"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "Reinicie Agora"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Canto direito superior"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "Mais tarde"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Padrão"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "Framework do método de entrada IBus"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferências do IBus"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Reinicie"
+#: ../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"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "Desligue o método de entrada"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Próximo método de entrada:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "Nenhuma janela de entrada"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Teclas de atalho para alteração ao método de entrada anterior da lista"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Método de entrada anterior:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "créditos-tradutor"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Sobre o método de entrada"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Altere o método de entrada"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Ativa ou desativa:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Sobre"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Habilitar:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "A respeito do Método de Entrada"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Desabilitar:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Linguagem: %s\n"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Atalhos do Teclado</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Desenho do teclado: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Configure a orientação dos candidatos na tabela de observação"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientação dos candidatos:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Descrição:\n"
+#: ../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"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "trigger"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Apresente o painel de linguagem:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "habilitar"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posição do Painel de Linguagem:"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "desabiltar"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "próximo método de entrada"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Apresenta o nome do método de entrada na barra de linguagem"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "método de entrada anterior"
+#: ../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"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "O IBus daemon não foi inciado. Você deseja iniciá-lo agora?"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Embutir texto de pré-edição na janela do aplicativo "
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"Embutir o texto de pré-edição do método de entrada na janela do aplicativo"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selecione o atalho do teclado para %s"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Usa a fonte padrão:"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Atalhos do teclado"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fonte e Estilo</b>"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Código de tecla:"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Geral"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modificadores:"
+#: ../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"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"Por favor pressione uma tecla (ou uma combinação de tecla).\n"
-"O diálogo será encerrado quando a tecla for liberada."
+"Remova o método de entrada selecionado a partir dos métodos de entrada "
+"ativados"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
+#: ../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"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Selecione um método 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"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Apresente a informação do método de entrada selecionado"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Apresente a informação do método de entrada selecionado"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>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.</i></"
+"small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Preferências do IBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usa o desenho do teclado do sistema (XKB)"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Definir Preferências do IBus"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Desenho do Teclado</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configurações de Método de Entrada Global</b> "
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avançado"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Inicie o ibus na conexão "
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Inicialização</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Sobre"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Framework do método de entrada"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Iniciar Framework do método de entrada IBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Ocultar Automaticamente"
+msgid "Preload engines"
+msgstr "Mecanismos de carregamento"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Fonte padrão"
+msgid "Preload engines during ibus starts up"
+msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Nome da fonte padrão para o painel de linguagem"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Desabilitar teclas de atalho"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Embutir Texto de Pré-Edição "
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
+msgid "Trigger shortcut keys"
+msgstr "Realiza o trigger nas teclas de atalho"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Habilitar método de entrada por padrão"
+msgid "Enable shortcut keys"
+msgstr "Habilitar teclas de atalho"
 
 #: ../data/ibus.schemas.in.h:8
-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"
+msgid "The shortcut keys for turning input method on"
+msgstr "As teclas de atalho para ligar o método de entrada"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Habilitar teclas de atalho"
+msgid "Disable shortcut keys"
+msgstr "Desabilitar teclas de atalho"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Posição do Painel de Linguagem"
+msgid "The shortcut keys for turning input method off"
+msgstr "As teclas de atalho para desligar o método de entrada"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Próximo mecanismo de teclas de atalho"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Orientação da tabela de pesquisa"
+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 "
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
+msgid "Prev engine shortcut keys"
+msgstr "Visualização do mecanismo das teclas de atalho "
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Mecanismos de carregamento"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
+msgid "Auto hide"
+msgstr "Ocultar Automaticamente"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Visualização do mecanismo das teclas de atalho "
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Apresenta um ícone na bandeja do sistema"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Apresenta o nome do método de entrada"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Apresenta o nome do método de entrada na barra de linguagem"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -304,255 +337,244 @@ msgstr ""
 "O comportamento do painel de linguagem. 0 = Embutido no menu, 1 = Ocultar "
 "automaticamente, 2 = Apresentar sempre"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Posição do Painel de Linguagem"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 "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:23
-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 "
+"direito superior, 2 = canto esquerdo inferior, 3 = canto direito inferior, 4 "
+"= Padrão "
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Teclas de atalho para alteração ao método de entrada anterior"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Orientação da tabela de pesquisa"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "As teclas de atalho para desligar o método de entrada"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Apresenta o nome do método de entrada"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "As teclas de atalho para ligar o método de entrada"
+msgid "Use custom font"
+msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Usa o nome da fonte padrão para o painel de linguagem"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Realiza o trigger nas teclas de atalho"
+msgid "Custom font"
+msgstr "Fonte padrão"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Usa a fonte padrão"
+msgid "Custom font name for language panel"
+msgstr "Nome da fonte padrão para o painel de linguagem"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Usa o nome da fonte padrão para o painel de linguagem"
+msgid "Embed Preedit Text"
+msgstr "Embutir Texto de Pré-Edição "
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usa o desenho do teclado do sistema (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Usa o desenho do teclado do sistema"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fonte e Estilo</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configurações de Método de Entrada Global</b> "
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Desenho do Teclado</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Habilitar método de entrada por padrão"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Atalhos do Teclado</b>"
+#: ../data/ibus.schemas.in.h:35
+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"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Inicialização</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>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.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-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"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Outros"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Avançado"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Linguagem: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Sempre"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Desenho do teclado: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Canto esquerdo inferior"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Canto direito superior"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Descrição:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orientação dos candidatos:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Selecione um método de entrada"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Padrão"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Desabilitar:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Definir Preferências do IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Embutir texto de pré-edição na janela do aplicativo "
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Atalhos do teclado"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Código de tecla:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificadores:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Embutir o texto de pré-edição do método de entrada na janela do aplicativo"
+"Por favor pressione uma tecla (ou uma combinação de tecla).\n"
+"O diálogo será encerrado quando a tecla for liberada."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Embutido no menu"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Ativa ou desativa:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "trigger"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Habilitar:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "habilitar"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Geral"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "desabiltar"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Horizontal"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "O IBus daemon não foi inciado. Você deseja iniciá-lo agora?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Posição do Painel de Linguagem:"
+#: ../setup/main.py:344
+#, fuzzy
+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 has been started! If you can not use IBus, please add below lines in "
+"$HOME/.bashrc, and relogin your desktop.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Mova o método de entrada selecionado para baixo nos métodos de entrada "
-"ativados"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selecione o atalho do teclado para %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Mova para cima o método de entrada selecionado na lista dos métodos de "
-"entrada"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Próximo método de entrada:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Método de entrada anterior:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "créditos-tradutor"
 
-#: ../setup/setup.ui.h:39
-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"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Reinicie"
 
-#: ../setup/setup.ui.h:40
-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"
+#~ msgid "Previous page"
+#~ msgstr "Página anterior"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Configure a orientação dos candidatos na tabela de observação"
+#~ msgid "Next page"
+#~ msgstr "Próxima página"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Apresente a informação do método de entrada selecionado"
+#~ 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. "
 
-#: ../setup/setup.ui.h:46
-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"
+#~ msgid "Restart Now"
+#~ msgstr "Reinicie Agora"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Apresente o painel de linguagem:"
+#~ msgid "Later"
+#~ msgstr "Mais tarde"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Inicie o ibus na conexão "
+#~ msgid "IBus input method framework"
+#~ msgstr "Framework do método de entrada IBus"
 
-#: ../setup/setup.ui.h:49
-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"
+#~ msgid "Turn off input method"
+#~ msgstr "Desligue o método de entrada"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Teclas de atalho para alteração ao método de entrada anterior da lista"
+#~ msgid "No input window"
+#~ msgstr "Nenhuma janela de entrada"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Canto esquerdo superior"
+#~ msgid "About the input method"
+#~ msgstr "Sobre o método de entrada"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Canto direito superior"
+#~ msgid "Switch input method"
+#~ msgstr "Altere o método de entrada"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Usa a fonte padrão:"
+#~ msgid "About the Input Method"
+#~ msgstr "A respeito do Método de Entrada"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Vertical"
+#~ msgid "next input method"
+#~ msgstr "próximo método de entrada"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Quando ativado"
+#~ msgid "previous input method"
+#~ msgstr "método de entrada anterior"
diff --git a/po/ru.po b/po/ru.po
index a69150af3..def84f4c2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-07-30 10:25\n"
 "Last-Translator: Yulia <ypoyarko@redhat.com>\n"
 "Language-Team: Russian\n"
@@ -20,278 +20,306 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Горизонтально"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Система методов ввода"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Вертикально"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Запустить систему методов ввода IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Встроена в меню"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Когда активно"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Другие"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Всегда"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Предыдущая страница"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Левый верхний угол"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Следующая страница"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Правый верхний угол"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"Методы ввода были установлены, удалены или обновлены. Перезапустите "
-"платформу ввода iBus."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Левый нижний угол"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "Перезапустить сейчас"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Правый нижний угол"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "Позже"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Свой"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "Система методов ввода IBus"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Параметры IBus"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Перезапустить"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Горячие клавиши для переключения на следующий метод ввода в списке:"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "Отключить метод ввода"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Следующий метод ввода:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "Нет окна ввода"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Горячие клавиши для переключения на предыдущий метод ввода в списке:"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus &mdash; интеллектуальная система ввода для Linux и Unix."
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Предыдущий метод ввода:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+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 ""
-"Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\n"
-"Yulia <ypoyarko@redhat.com>, 2010."
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "О методе ввода"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Переключить метод ввода"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Горячие клавиши</b>"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "О программе"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Установить ориентацию кандидатов в таблице поиска"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "О методе ввода"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Ориентация кандидатов:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Язык: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Установить поведение iBus для показа или скрытия языковой панели"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Раскладка клавиатуры: %s\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Показывать языковую панель:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Автор: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Расположение языковой панели:"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Описание:\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Показать значок в области уведомлений"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "переключатель"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Показывать название метода ввода на языковой панели"
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
+"Показывать название метода ввода на языковой панели, когда пункт выбран"
 
-#: ../setup/main.py:124
-msgid "disable"
-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/main.py:135
-msgid "next input method"
-msgstr "следующий метод ввода"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Произвольный шрифт:"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "предыдущий метод ввода"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Шрифт и стиль</b>"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Служба IBus не запущена. Запустить?"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Основные"
 
-#: ../setup/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Показать информацию о выбранном методе ввода"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus запущен! Если вы не можете пользоваться IBus, добавьте приведённые "
-"строки в $HOME/.bashrc и заново войдите в систему.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>По умолчанию используется первый в списке метод ввода.\n"
+"Используйте кнопки вверх/вниз для изменения.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Выберите комбинацию клавиш для %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Метод ввода"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Комбинации клавиш"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Использовать системную раскладку клавиатуры"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Код клавиши:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Использовать системную раскладку (XKB)"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Модификаторы:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Раскладка клавиатуры</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Использовать один метод ввода для всех приложений"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Настройки глобального метода ввода</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Нажмите клавишу (или сочетание клавиш).\n"
-"Когда клавиша будет отпущена, окно закроется."
+"<big><b>IBus</b></big>\n"
+"<small>Интеллектуальная система ввода</small>\n"
+"Домашняя страница: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Нажмите клавишу (или сочетание клавиш)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Запускать iBus при входе в систему:"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Выберите метод ввода"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Запуск</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Метод ввода"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "О программе"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Параметры IBus"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Система методов ввода"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Настроить параметры IBus"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Запустить систему методов ввода IBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Автоматически скрывать"
+msgid "Preload engines"
+msgstr "Предварительная загрузка методов ввода"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Свой шрифт"
+msgid "Preload engines during ibus starts up"
+msgstr "Загружать методы ввода при запуске iBus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Свой шрифт для языковой панели"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "Вставить готовый текст"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "Вставить готовый текст в окно приложения"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Enable input method by default"
-msgstr "Включить метод ввода по умолчанию"
+msgid "Trigger shortcut keys"
+msgstr "Сочетание клавиш для включения/выключения"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Включить метод ввода по умолчанию при получении приложением фокуса ввода"
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "Сочетание клавиш для включения/выключения"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "Расположение языковой панели"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "Сочетание клавиш для включения/выключения метода ввода"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "Клавиши для следующего метода ввода"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "Сочетание клавиш для включения/выключения"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "Ориентация таблицы поиска"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "Сочетание клавиш для включения/выключения метода ввода"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
+msgid "Next engine shortcut keys"
+msgstr "Клавиши для следующего метода ввода"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "Предварительная загрузка методов ввода"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке:"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "Загружать методы ввода при запуске iBus"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "Клавиши для предыдущего метода ввода"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Использовать один метод ввода для всех приложений"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Показать значок в области уведомлений"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "Показывать название метода ввода"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Показывать название метода ввода на языковой панели"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Автоматически скрывать"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -299,7 +327,11 @@ msgstr ""
 "Поведение языковой панели: 0 = встроена в меню, 1 = автоматически скрывать, "
 "2 = всегда показывать"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Расположение языковой панели"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -307,223 +339,232 @@ msgstr ""
 "Расположение языковой панели: 0 = левый верхний угол, 1 = правый верхний "
 "угол, 2 = левый нижний угол, 3 = правый нижний угол, 4 = произвольное"
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке:"
-
-#: ../data/ibus.schemas.in.h:22
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Ориентация таблицы поиска"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Сочетание клавиш для включения/выключения метода ввода"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "Сочетание клавиш для включения/выключения"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Показывать название метода ввода"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Использовать свой шрифт"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Использовать свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "Использовать глобальный метод ввода"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Использовать системную раскладку (XKB)"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Свой шрифт"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Использовать системную раскладку клавиатуры"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Свой шрифт для языковой панели"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "Вставить готовый текст"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Шрифт и стиль</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Вставить готовый текст в окно приложения"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Настройки глобального метода ввода</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Использовать глобальный метод ввода"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Раскладка клавиатуры</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Включить метод ввода по умолчанию"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Горячие клавиши</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Включить метод ввода по умолчанию при получении приложением фокуса ввода"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Запуск</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Интеллектуальная система ввода</small>\n"
-"Домашняя страница: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>По умолчанию используется первый в списке метод ввода.\n"
-"Используйте кнопки вверх/вниз для изменения.</i></small>"
+"(c) 2007-2010 Peng Huang\n"
+"(c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Добавить выбранный метод ввода к используемым"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Другие"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Дополнительно"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Язык: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Всегда"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Раскладка клавиатуры: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Левый нижний угол"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Автор: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Правый нижний угол"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Описание:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Ориентация кандидатов:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Выберите метод ввода"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Свой"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Настроить параметры IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Вставить готовый текст в окно приложения"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Комбинации клавиш"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Вставить готовый текст метода ввода в окно приложения"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Код клавиши:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Встроена в меню"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Модификаторы:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Включить или выключить:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Нажмите клавишу (или сочетание клавиш).\n"
+"Когда клавиша будет отпущена, окно закроется."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Нажмите клавишу (или сочетание клавиш)"
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "переключатель"
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Основные"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Горизонтально"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Служба IBus не запущена. Запустить?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Расположение языковой панели:"
+#: ../setup/main.py:344
+#, fuzzy
+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 запущен! Если вы не можете пользоваться IBus, добавьте приведённые "
+"строки в $HOME/.bashrc и заново войдите в систему.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Переместить выбранный метод ввода вниз в списке используемых"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Переместить выбранный метод ввода вверх в списке используемых"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Выберите комбинацию клавиш для %s"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Следующий метод ввода:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"(c) 2007-2010 Peng Huang\n"
+"(c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Предыдущий метод ввода:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus &mdash; интеллектуальная система ввода для Linux и Unix."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Удалить выбранный метод ввода из списка"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\n"
+"Yulia <ypoyarko@redhat.com>, 2010."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Установить поведение iBus для показа или скрытия языковой панели"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Перезапустить"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Установить ориентацию кандидатов в таблице поиска"
+#~ msgid "Previous page"
+#~ msgstr "Предыдущая страница"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Показать информацию о выбранном методе ввода"
+#~ msgid "Next page"
+#~ msgstr "Следующая страница"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Показывать название метода ввода на языковой панели, когда пункт выбран"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Методы ввода были установлены, удалены или обновлены. Перезапустите "
+#~ "платформу ввода iBus."
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Показывать языковую панель:"
+#~ msgid "Restart Now"
+#~ msgstr "Перезапустить сейчас"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Запускать iBus при входе в систему:"
+#~ msgid "Later"
+#~ msgstr "Позже"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Горячие клавиши для переключения на следующий метод ввода в списке:"
+#~ msgid "IBus input method framework"
+#~ msgstr "Система методов ввода IBus"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Горячие клавиши для переключения на предыдущий метод ввода в списке:"
+#~ msgid "Turn off input method"
+#~ msgstr "Отключить метод ввода"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Левый верхний угол"
+#~ msgid "No input window"
+#~ msgstr "Нет окна ввода"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Правый верхний угол"
+#~ msgid "About the input method"
+#~ msgstr "О методе ввода"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Произвольный шрифт:"
+#~ msgid "Switch input method"
+#~ msgstr "Переключить метод ввода"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Вертикально"
+#~ msgid "About the Input Method"
+#~ msgstr "О методе ввода"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Когда активно"
+#~ msgid "next input method"
+#~ msgstr "следующий метод ввода"
+
+#~ msgid "previous input method"
+#~ msgstr "предыдущий метод ввода"
diff --git a/po/sr.po b/po/sr.po
index 02f74d2dc..ab2c17874 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2009-04-01 19:58+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
@@ -18,297 +18,338 @@ msgstr ""
 "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"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
+#: ../setup/setup.ui.h:1
 #, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus радни оквир методе уноса"
+msgid "Horizontal"
+msgstr ""
+"Водоравно\n"
+"Усправно"
 
-#: ../bus/ibus.desktop.in.h:3
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr ""
+
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr ""
+
+#: ../setup/setup.ui.h:4
 #, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus радни оквир методе уноса"
+msgid "When active"
+msgstr ""
+"Никад\n"
+"Када је активно\n"
+"Увек"
 
-#: ../ibus/_config.py.in:39
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:5
+msgid "Always"
 msgstr ""
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Друго"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:264
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
 #, fuzzy
-msgid "Previous page"
-msgstr "Претходна метода уноса:"
+msgid "Custom"
+msgstr "Прилагођени фонт:"
 
-#: ../ui/gtk/candidatepanel.py:269
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus поставке"
+
+#: ../setup/setup.ui.h:12
 #, fuzzy
-msgid "Next page"
-msgstr "следећи погон"
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Следећа метода уноса:"
+
+#: ../setup/setup.ui.h:14
+#, fuzzy
+msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
+"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
-#: ../ui/gtk/main.py:59
+#: ../setup/setup.ui.h:15
 #, fuzzy
-msgid "Restart Now"
-msgstr "Покрени поново"
+msgid "Previous input method:"
+msgstr "Претходна метода уноса:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/main.py:60
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
 #, fuzzy
-msgid "Later"
-msgstr "Друго"
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus радни оквир методе уноса"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Укључи или искључи:"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Покрени поново"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Пречице тастатуре</b>"
 
-#: ../ui/gtk/panel.py:414
+#: ../setup/setup.ui.h:22
 #, fuzzy
-msgid "Turn off input method"
-msgstr "Нема методе уноса"
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Оријентација референтне табеле"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Оријентације кандидата:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus је интелигентна магистрала уноса за Linux/Unix."
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Прикажи језички панел:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "Serbian <fedora-trans-sr@redhat.com>"
+#: ../setup/setup.ui.h:26
+#, fuzzy
+msgid "Language panel position:"
+msgstr "Прикажи језички панел:"
 
-#: ../ui/gtk/languagebar.py:106
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
 #, fuzzy
-msgid "About the input method"
-msgstr "Методе уноса"
+msgid "Show input method name on language bar"
+msgstr "Назив прилагођеног фонта за језички панел"
 
-#: ../ui/gtk/languagebar.py:214
+#: ../setup/setup.ui.h:29
 #, fuzzy
-msgid "Switch input method"
-msgstr "Нема методе уноса"
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Назив прилагођеног фонта за језички панел"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "О програму"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:32
 #, fuzzy
-msgid "About the Input Method"
-msgstr "Методе уноса"
+msgid "Use custom font:"
+msgstr "Употреби прилагођени фонт"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr ""
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Фонт и стил</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, fuzzy, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Пречице тастатуре"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Опште"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "окидач"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:124
-msgid "disable"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/main.py:135
+#: ../setup/setup.ui.h:40
 #, fuzzy
-msgid "next input method"
-msgstr "Следећа метода уноса"
+msgid "Show setup of the selected input method"
+msgstr "Методе уноса"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
 
-#: ../setup/main.py:146
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 #, fuzzy
-msgid "previous input method"
-msgstr "Претходна метода уноса"
+msgid "Input Method"
+msgstr "Методе уноса"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus демон није покренут. Да ли желите да га сада покренете?"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
-"IBus је покренут! Ако не можете да користите IBus, додајте редове испод у "
-"$HOME/.bashrc, и поново се пријавите у ваше радно окружење.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Изаберите пречицу тастатуре за %s"
+#: ../setup/setup.ui.h:46
+#, fuzzy
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Пречице тастатуре</b>"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Пречице тастатуре"
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Код тастера:"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "Изаберите методу уноса"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Модификатори:"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Притисните тастер (или комбинацију тастера).\n"
-"Прозорче ће бити затворено када се тастер отпусти."
+"<big><b>IBus</b></big>\n"
+"<small>Интелигентна магистрала уноса</small>\n"
+"Матична страница: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Притисните тастер (или комбинацију тастера)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Покрени ibus при пријави"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Изаберите методу уноса"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Покретање</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-#, fuzzy
-msgid "Input Method"
-msgstr "Методе уноса"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "О програму"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr ""
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus поставке"
+#: ../bus/ibus.desktop.in.h:2
+#, fuzzy
+msgid "Input Method Framework"
+msgstr "IBus радни оквир методе уноса"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: ../bus/ibus.desktop.in.h:3
 #, fuzzy
-msgid "Set IBus Preferences"
-msgstr "IBus поставке"
+msgid "Start IBus Input Method Framework"
+msgstr "IBus радни оквир методе уноса"
 
 #: ../data/ibus.schemas.in.h:1
 #, fuzzy
-msgid "Auto hide"
-msgstr "Самостално сакривање"
+msgid "Preload engines"
+msgstr "Унапред учитај погоне"
 
 #: ../data/ibus.schemas.in.h:2
 #, fuzzy
-msgid "Custom font"
-msgstr "Прилагођени фонт:"
+msgid "Preload engines during ibus starts up"
+msgstr "Унапред учитај погоне током ibus покретања"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Назив прилагођеног фонта за језички панел"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr ""
+#, fuzzy
+msgid "Saved engines order in input method list"
+msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:6
 #, fuzzy
-msgid "Enable input method by default"
-msgstr "Следећа метода уноса"
+msgid "Trigger shortcut keys"
+msgstr "Пречица окидача"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "Пречица окидача"
 
 #: ../data/ibus.schemas.in.h:8
 #, fuzzy
-msgid "Language panel position"
-msgstr "Прикажи језички панел:"
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
 #: ../data/ibus.schemas.in.h:9
 #, fuzzy
-msgid "Next engine shortcut keys"
-msgstr "Пречица следећег погона"
+msgid "Disable shortcut keys"
+msgstr "Пречица окидача"
 
 #: ../data/ibus.schemas.in.h:10
 #, fuzzy
-msgid "Orientation of lookup table"
-msgstr "Оријентација референтне табеле"
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
 #: ../data/ibus.schemas.in.h:11
 #, fuzzy
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Оријентација референтне табеле. 0 = водоравно, 1 = усправно"
+msgid "Next engine shortcut keys"
+msgstr "Пречица следећег погона"
 
 #: ../data/ibus.schemas.in.h:12
 #, fuzzy
-msgid "Preload engines"
-msgstr "Унапред учитај погоне"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
 
 #: ../data/ibus.schemas.in.h:13
 #, fuzzy
-msgid "Preload engines during ibus starts up"
-msgstr "Унапред учитај погоне током ibus покретања"
-
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
 msgid "Prev engine shortcut keys"
 msgstr "Пречица претходног погона"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:14
 #, fuzzy
-msgid "Show input method name"
-msgstr "Назив прилагођеног фонта за језички панел"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
+#: ../data/ibus.schemas.in.h:15
 #, fuzzy
-msgid "Show input method name on language bar"
-msgstr "Назив прилагођеног фонта за језички панел"
+msgid "Auto hide"
+msgstr "Самостално сакривање"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 #, fuzzy
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
@@ -317,253 +358,241 @@ msgstr ""
 "Понашање језичког панела. 0 = увек сакривен, 1 = самостално сакривање, 2 = "
 "увек приказан"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+#, fuzzy
+msgid "Language panel position"
+msgstr "Прикажи језички панел:"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-#, fuzzy
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
-
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:19
 #, fuzzy
-msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
+msgid "Orientation of lookup table"
+msgstr "Оријентација референтне табеле"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
+#: ../data/ibus.schemas.in.h:20
 #, fuzzy
-msgid "The shortcut keys for turning input method on or off"
-msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Оријентација референтне табеле. 0 = водоравно, 1 = усправно"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:22
 #, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "Пречица окидача"
+msgid "Show input method name"
+msgstr "Назив прилагођеног фонта за језички панел"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Употреби прилагођени фонт"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Користи прилагођени фонт за језички панел"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:28
 #, fuzzy
-msgid "Use global input method"
-msgstr "Изаберите методу уноса"
+msgid "Custom font"
+msgstr "Прилагођени фонт:"
 
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr ""
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Назив прилагођеног фонта за језички панел"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Фонт и стил</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+#, fuzzy
+msgid "Use global input method"
 msgstr "Изаберите методу уноса"
 
-#: ../setup/setup.ui.h:4
+#: ../data/ibus.schemas.in.h:34
 #, fuzzy
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Пречице тастатуре</b>"
+msgid "Enable input method by default"
+msgstr "Следећа метода уноса"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Пречице тастатуре</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Покретање</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Интелигентна магистрала уноса</small>\n"
-"Матична страница: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Друго"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr ""
+#: ../setup/engineabout.py:70
+#, fuzzy, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Пречице тастатуре"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Оријентације кандидата:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Изаберите методу уноса"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
 #, fuzzy
-msgid "Custom"
-msgstr "Прилагођени фонт:"
+msgid "Set IBus Preferences"
+msgstr "IBus поставке"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Пречице тастатуре"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr ""
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Код тастера:"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Модификатори:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
+"Притисните тастер (или комбинацију тастера).\n"
+"Прозорче ће бити затворено када се тастер отпусти."
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Укључи или искључи:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Притисните тастер (или комбинацију тастера)"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr ""
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "окидач"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Опште"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-#, fuzzy
-msgid "Horizontal"
+#: ../setup/main.py:81
+msgid "disable"
 msgstr ""
-"Водоравно\n"
-"Усправно"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/main.py:323
 #, fuzzy
-msgid "Language panel position:"
-msgstr "Прикажи језички панел:"
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus демон није покренут. Да ли желите да га сада покренете?"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:344
+#, fuzzy
+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 је покренут! Ако не можете да користите IBus, додајте редове испод у "
+"$HOME/.bashrc, и поново се пријавите у ваше радно окружење.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Следећа метода уноса:"
-
-#: ../setup/setup.ui.h:38
-#, fuzzy
-msgid "Previous input method:"
-msgstr "Претходна метода уноса:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Изаберите пречицу тастатуре за %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus је интелигентна магистрала уноса за Linux/Unix."
 
-#: ../setup/setup.ui.h:41
-#, fuzzy
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Оријентација референтне табеле"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr ""
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Покрени поново"
 
-#: ../setup/setup.ui.h:46
 #, fuzzy
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Назив прилагођеног фонта за језички панел"
-
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Прикажи језички панел:"
+#~ msgid "Previous page"
+#~ msgstr "Претходна метода уноса:"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Покрени ibus при пријави"
+#, fuzzy
+#~ msgid "Next page"
+#~ msgstr "следећи погон"
 
-#: ../setup/setup.ui.h:49
 #, fuzzy
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
+#~ msgid "Restart Now"
+#~ msgstr "Покрени поново"
 
-#: ../setup/setup.ui.h:50
 #, fuzzy
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
+#~ msgid "Later"
+#~ msgstr "Друго"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr ""
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus радни оквир методе уноса"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr ""
+#, fuzzy
+#~ msgid "Turn off input method"
+#~ msgstr "Нема методе уноса"
 
-#: ../setup/setup.ui.h:54
 #, fuzzy
-msgid "Use custom font:"
-msgstr "Употреби прилагођени фонт"
+#~ msgid "Switch input method"
+#~ msgstr "Нема методе уноса"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr ""
+#, fuzzy
+#~ msgid "About the Input Method"
+#~ msgstr "Методе уноса"
 
-#: ../setup/setup.ui.h:58
 #, fuzzy
-msgid "When active"
-msgstr ""
-"Никад\n"
-"Када је активно\n"
-"Увек"
+#~ msgid "next input method"
+#~ msgstr "Следећа метода уноса"
+
+#, fuzzy
+#~ msgid "previous input method"
+#~ msgstr "Претходна метода уноса"
 
 #, fuzzy
 #~ msgid "Use global engine"
@@ -594,10 +623,6 @@ msgstr ""
 #~ msgid "Use Custom Font"
 #~ msgstr "Користи прилагођени фонт"
 
-#~ msgid "Next engine hotkey for switch to next input method engine"
-#~ msgstr ""
-#~ "Пречица следећег погона за пребацивање на следећи погон методе уноса"
-
 #~ msgid "Prev engine hotkey for switch to previous input method engine"
 #~ msgstr ""
 #~ "Пречица претходног погона за пребацивање на претходни погон методе уноса"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index fecaeb48b..f4bfb741f 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2009-04-01 19:58+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
@@ -18,297 +18,338 @@ msgstr ""
 "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"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
+#: ../setup/setup.ui.h:1
 #, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus radni okvir metode unosa"
+msgid "Horizontal"
+msgstr ""
+"Vodoravno\n"
+"Uspravno"
 
-#: ../bus/ibus.desktop.in.h:3
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr ""
+
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr ""
+
+#: ../setup/setup.ui.h:4
 #, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus radni okvir metode unosa"
+msgid "When active"
+msgstr ""
+"Nikad\n"
+"Kada je aktivno\n"
+"Uvek"
 
-#: ../ibus/_config.py.in:39
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:5
+msgid "Always"
 msgstr ""
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Drugo"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:264
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
 #, fuzzy
-msgid "Previous page"
-msgstr "Prethodna metoda unosa:"
+msgid "Custom"
+msgstr "Prilagođeni font:"
 
-#: ../ui/gtk/candidatepanel.py:269
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus postavke"
+
+#: ../setup/setup.ui.h:12
 #, fuzzy
-msgid "Next page"
-msgstr "sledeći pogon"
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Sledeća metoda unosa:"
+
+#: ../setup/setup.ui.h:14
+#, fuzzy
+msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
+"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
-#: ../ui/gtk/main.py:59
+#: ../setup/setup.ui.h:15
 #, fuzzy
-msgid "Restart Now"
-msgstr "Pokreni ponovo"
+msgid "Previous input method:"
+msgstr "Prethodna metoda unosa:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/main.py:60
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
 #, fuzzy
-msgid "Later"
-msgstr "Drugo"
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus radni okvir metode unosa"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Uključi ili isključi:"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Pokreni ponovo"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Prečice tastature</b>"
 
-#: ../ui/gtk/panel.py:414
+#: ../setup/setup.ui.h:22
 #, fuzzy
-msgid "Turn off input method"
-msgstr "Nema metode unosa"
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Orijentacija referentne tabele"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orijentacije kandidata:"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus je inteligentna magistrala unosa za Linux/Unix."
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Prikaži jezički panel:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "Serbian <fedora-trans-sr@redhat.com>"
+#: ../setup/setup.ui.h:26
+#, fuzzy
+msgid "Language panel position:"
+msgstr "Prikaži jezički panel:"
 
-#: ../ui/gtk/languagebar.py:106
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
 #, fuzzy
-msgid "About the input method"
-msgstr "Metode unosa"
+msgid "Show input method name on language bar"
+msgstr "Naziv prilagođenog fonta za jezički panel"
 
-#: ../ui/gtk/languagebar.py:214
+#: ../setup/setup.ui.h:29
 #, fuzzy
-msgid "Switch input method"
-msgstr "Nema metode unosa"
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Naziv prilagođenog fonta za jezički panel"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "O programu"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:32
 #, fuzzy
-msgid "About the Input Method"
-msgstr "Metode unosa"
+msgid "Use custom font:"
+msgstr "Upotrebi prilagođeni font"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr ""
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Font i stil</b>"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, fuzzy, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Prečice tastature"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Opšte"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "okidač"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/main.py:124
-msgid "disable"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/main.py:135
+#: ../setup/setup.ui.h:40
 #, fuzzy
-msgid "next input method"
-msgstr "sledeća metoda unosa"
+msgid "Show setup of the selected input method"
+msgstr "Metode unosa"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
 
-#: ../setup/main.py:146
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 #, fuzzy
-msgid "previous input method"
-msgstr "prethodna metoda unosa"
+msgid "Input Method"
+msgstr "Metode unosa"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus demon nije pokrenut. Da li želite da ga sada pokrenete?"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
-"IBus je pokrenut! Ako ne možete da koristite IBus, dodajte redove ispod u "
-"$HOME/.bashrc, i ponovo se prijavite u vaše radno okruženje.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Izaberite prečicu tastature za %s"
+#: ../setup/setup.ui.h:46
+#, fuzzy
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Prečice tastature</b>"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Prečice tastature"
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Kod tastera:"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "Izaberite metodu unosa"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Modifikatori:"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Pritisnite taster (ili kombinaciju tastera).\n"
-"Prozorče će biti zatvoreno kada se taster otpusti."
+"<big><b>IBus</b></big>\n"
+"<small>Inteligentna magistrala unosa</small>\n"
+"Matična stranica: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Pritisnite taster (ili kombinaciju tastera)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Pokreni ibus pri prijavi"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Izaberite metodu unosa"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Pokretanje</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-#, fuzzy
-msgid "Input Method"
-msgstr "Metode unosa"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "O programu"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr ""
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus postavke"
+#: ../bus/ibus.desktop.in.h:2
+#, fuzzy
+msgid "Input Method Framework"
+msgstr "IBus radni okvir metode unosa"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: ../bus/ibus.desktop.in.h:3
 #, fuzzy
-msgid "Set IBus Preferences"
-msgstr "IBus postavke"
+msgid "Start IBus Input Method Framework"
+msgstr "IBus radni okvir metode unosa"
 
 #: ../data/ibus.schemas.in.h:1
 #, fuzzy
-msgid "Auto hide"
-msgstr "Samostalno sakrivanje"
+msgid "Preload engines"
+msgstr "Unapred učitaj pogone"
 
 #: ../data/ibus.schemas.in.h:2
 #, fuzzy
-msgid "Custom font"
-msgstr "Prilagođeni font:"
+msgid "Preload engines during ibus starts up"
+msgstr "Unapred učitaj pogone tokom ibus pokretanja"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr ""
+#, fuzzy
+msgid "Saved engines order in input method list"
+msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:6
 #, fuzzy
-msgid "Enable input method by default"
-msgstr "sledeća metoda unosa"
+msgid "Trigger shortcut keys"
+msgstr "Prečica okidača"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "Prečica okidača"
 
 #: ../data/ibus.schemas.in.h:8
 #, fuzzy
-msgid "Language panel position"
-msgstr "Prikaži jezički panel:"
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
 #: ../data/ibus.schemas.in.h:9
 #, fuzzy
-msgid "Next engine shortcut keys"
-msgstr "Prečica sledećeg pogona"
+msgid "Disable shortcut keys"
+msgstr "Prečica okidača"
 
 #: ../data/ibus.schemas.in.h:10
 #, fuzzy
-msgid "Orientation of lookup table"
-msgstr "Orijentacija referentne tabele"
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
 #: ../data/ibus.schemas.in.h:11
 #, fuzzy
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orijentacija referentne tabele. 0 = vodoravno, 1 = uspravno"
+msgid "Next engine shortcut keys"
+msgstr "Prečica sledećeg pogona"
 
 #: ../data/ibus.schemas.in.h:12
 #, fuzzy
-msgid "Preload engines"
-msgstr "Unapred učitaj pogone"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
 
 #: ../data/ibus.schemas.in.h:13
 #, fuzzy
-msgid "Preload engines during ibus starts up"
-msgstr "Unapred učitaj pogone tokom ibus pokretanja"
-
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
 msgid "Prev engine shortcut keys"
 msgstr "Prečica prethodnog pogona"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:14
 #, fuzzy
-msgid "Show input method name"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
+#: ../data/ibus.schemas.in.h:15
 #, fuzzy
-msgid "Show input method name on language bar"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgid "Auto hide"
+msgstr "Samostalno sakrivanje"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 #, fuzzy
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
@@ -317,253 +358,241 @@ msgstr ""
 "Ponašanje jezičkog panela. 0 = uvek sakriven, 1 = samostalno sakrivanje, 2 = "
 "uvek prikazan"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+#, fuzzy
+msgid "Language panel position"
+msgstr "Prikaži jezički panel:"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-#, fuzzy
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
-
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:19
 #, fuzzy
-msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
+msgid "Orientation of lookup table"
+msgstr "Orijentacija referentne tabele"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
+#: ../data/ibus.schemas.in.h:20
 #, fuzzy
-msgid "The shortcut keys for turning input method on or off"
-msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orijentacija referentne tabele. 0 = vodoravno, 1 = uspravno"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:22
 #, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "Prečica okidača"
+msgid "Show input method name"
+msgstr "Naziv prilagođenog fonta za jezički panel"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Upotrebi prilagođeni font"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Koristi prilagođeni font za jezički panel"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:28
 #, fuzzy
-msgid "Use global input method"
-msgstr "Izaberite metodu unosa"
+msgid "Custom font"
+msgstr "Prilagođeni font:"
 
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr ""
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Naziv prilagođenog fonta za jezički panel"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Font i stil</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+#, fuzzy
+msgid "Use global input method"
 msgstr "Izaberite metodu unosa"
 
-#: ../setup/setup.ui.h:4
+#: ../data/ibus.schemas.in.h:34
 #, fuzzy
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Prečice tastature</b>"
+msgid "Enable input method by default"
+msgstr "sledeća metoda unosa"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Prečice tastature</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Pokretanje</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteligentna magistrala unosa</small>\n"
-"Matična stranica: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Drugo"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr ""
+#: ../setup/engineabout.py:70
+#, fuzzy, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Prečice tastature"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Orijentacije kandidata:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Izaberite metodu unosa"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
 #, fuzzy
-msgid "Custom"
-msgstr "Prilagođeni font:"
+msgid "Set IBus Preferences"
+msgstr "IBus postavke"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Prečice tastature"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr ""
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Kod tastera:"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modifikatori:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
+"Pritisnite taster (ili kombinaciju tastera).\n"
+"Prozorče će biti zatvoreno kada se taster otpusti."
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Uključi ili isključi:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Pritisnite taster (ili kombinaciju tastera)"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr ""
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "okidač"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Opšte"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-#, fuzzy
-msgid "Horizontal"
+#: ../setup/main.py:81
+msgid "disable"
 msgstr ""
-"Vodoravno\n"
-"Uspravno"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/main.py:323
 #, fuzzy
-msgid "Language panel position:"
-msgstr "Prikaži jezički panel:"
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus demon nije pokrenut. Da li želite da ga sada pokrenete?"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:344
+#, fuzzy
+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 je pokrenut! Ako ne možete da koristite IBus, dodajte redove ispod u "
+"$HOME/.bashrc, i ponovo se prijavite u vaše radno okruženje.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Sledeća metoda unosa:"
-
-#: ../setup/setup.ui.h:38
-#, fuzzy
-msgid "Previous input method:"
-msgstr "Prethodna metoda unosa:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Izaberite prečicu tastature za %s"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus je inteligentna magistrala unosa za Linux/Unix."
 
-#: ../setup/setup.ui.h:41
-#, fuzzy
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Orijentacija referentne tabele"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr ""
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Pokreni ponovo"
 
-#: ../setup/setup.ui.h:46
 #, fuzzy
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Naziv prilagođenog fonta za jezički panel"
-
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Prikaži jezički panel:"
+#~ msgid "Previous page"
+#~ msgstr "Prethodna metoda unosa:"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Pokreni ibus pri prijavi"
+#, fuzzy
+#~ msgid "Next page"
+#~ msgstr "sledeći pogon"
 
-#: ../setup/setup.ui.h:49
 #, fuzzy
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
+#~ msgid "Restart Now"
+#~ msgstr "Pokreni ponovo"
 
-#: ../setup/setup.ui.h:50
 #, fuzzy
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
+#~ msgid "Later"
+#~ msgstr "Drugo"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr ""
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus radni okvir metode unosa"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr ""
+#, fuzzy
+#~ msgid "Turn off input method"
+#~ msgstr "Nema metode unosa"
 
-#: ../setup/setup.ui.h:54
 #, fuzzy
-msgid "Use custom font:"
-msgstr "Upotrebi prilagođeni font"
+#~ msgid "Switch input method"
+#~ msgstr "Nema metode unosa"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr ""
+#, fuzzy
+#~ msgid "About the Input Method"
+#~ msgstr "Metode unosa"
 
-#: ../setup/setup.ui.h:58
 #, fuzzy
-msgid "When active"
-msgstr ""
-"Nikad\n"
-"Kada je aktivno\n"
-"Uvek"
+#~ msgid "next input method"
+#~ msgstr "sledeća metoda unosa"
+
+#, fuzzy
+#~ msgid "previous input method"
+#~ msgstr "prethodna metoda unosa"
 
 #, fuzzy
 #~ msgid "Use global engine"
@@ -594,10 +623,6 @@ msgstr ""
 #~ msgid "Use Custom Font"
 #~ msgstr "Koristi prilagođeni font"
 
-#~ msgid "Next engine hotkey for switch to next input method engine"
-#~ msgstr ""
-#~ "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
-
 #~ msgid "Prev engine hotkey for switch to previous input method engine"
 #~ msgstr ""
 #~ "Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
diff --git a/po/ta.po b/po/ta.po
index 88d8eb9e4..a78ef0b11 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ta\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-03-08 12:32+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-03-22 15:23+0000\n"
 "Last-Translator: ifelix <ifelix25@gmail.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -21,530 +21,544 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "கிடைமட்டம்"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "செங்குத்து"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "உள்ளீடு முறை ஃபிரேம்வொர்க்"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "மெனுவில் உட்பொதியப்பட்டது"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்கை துவக்கு"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "செயலிலிருக்கும் போது"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "எப்போதும்"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "வேறு"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "மேல் இடது ஓரம்"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "முந்தைய பக்கம்"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "மேல் வலது ஓரம்"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "அடுத்த பக்கம்"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "கீழ் இடது ஓரம்"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"சில உள்ளீடு முறைகள் நிறுவப்பட்டுள்ளது, நீக்கப்பட்டுள்ளது அல்லது "
-"மேம்படுத்தப்பட்டுள்ளது. ibus உள்ளீட்டை மறுதுவக்கவும்."
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "கீழ் வலது ஓரம்"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "இப்போது மறுதுவக்கு"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "தனிபயன்"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "பின்னர்"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus முன்னுரிமைகள்"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "பட்டியலில் அடுத்த உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "அடுத்த உள்ளீடு முறை:"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "உள்ளீடு முறையை நிறுத்து"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "பட்டியலில் முந்தைய உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "உள்ளீடு சாளரம் இல்லை"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "முந்தைய உள்ளீடு முறை:"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "I. Felix <ifelix@redhat.com>"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "உள்ளீடு முறை பற்றி"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "செயல்படுத்து அல்லது செயல்நீக்கு:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "உள்ளீடு முறையை மாற்று"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "செயல்படுத்து:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "பற்றி"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "செயல்நீக்கு:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "உள்ளீடு முறை பற்றி"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>விசைப்பலகை குறுக்குவழிகள்</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "மொழி: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "காணும் அட்டவணையில் நபர்களின் திசையமைப்பை அமை"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "விசைப்பலகை அமைப்பு: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "கேண்டிடேட் சார்ந்து:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "ஆசிரியர்: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "மொழி பட்டையை எவ்வாறு காட்ட அல்லது மறைக்க வேண்டும் என ibus பண்பினை அமை"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "விளக்கம்:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "மொழி பலகத்தை காட்டு:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ட்ரிகர்"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "செயல்படுத்து"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "செயல்நீக்கு"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "அடுத்த உள்ளீடு முறை"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "முந்தைய உள்ளீடு முறை"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட preedit உரை"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus daemon துவக்கப்படவில்லை. இப்போது துவக்க வேண்டுமா?"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "பயன்பாட்டு சாளரத்தில் preedit உரையின் உள்ளீடு முறையை உட்பொதியவும்"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus துவக்கப்பட்டது! உங்களால் IBusஐ பயன்படுத்த முடியவில்லையெனில், பின்வரும் வரியை சேர்த்து $HOME/.bashrc, உங்கள் பணிமேடையை மறுதுவக்கவும்.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து:"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>எழுத்துரு மற்றும் தோற்றம்</b>"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "விசைப்பலகை குறுக்குவழிகள்"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "பொது"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "விசை குறியீடு:"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "மாற்றிகள்;"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை நீக்கு"
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
-"ஒரு விசையை அழுத்தவும் (அல்லது விசை கலவையை).\n"
-"விசையை விடுத்தால் உரையாடல் மூடப்படும்."
+"செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே நகர்த்து"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
+
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\n"
+"மேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus முன்னுரிமைகள்"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus முன்னுரிமைகளை அமை"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>விசைப்பலகை அமைப்பு</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "கூடுதல்"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\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 "<b>Startup</b>"
+msgstr "<b>துவக்கம்</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Auto hide"
-msgstr "தானாக மறை"
+msgid "Preload engines"
+msgstr "முன்ஏற்றப்பட்ட இயந்திரங்கள்"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "தனிபயன் எழுத்துரு"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus துவங்கும் போது முன்னேற்றப்பட்ட எந்திரங்கள் "
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "தனிபயன் எழுத்துரு பெயர் மொழி பலகத்துக்கு"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "குறுக்குவிசைகளை செயல்நீக்கு"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "உட்பொதியப்பட்ட Preedit உரை"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
+msgid "Trigger shortcut keys"
+msgstr "ட்ரிகர் குறுக்குவிசை"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
+msgid "Enable shortcut keys"
+msgstr "குறுக்குவிசைக்களை செயல்படுத்து"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
+msgid "The shortcut keys for turning input method on"
+msgstr "உள்ளீடு முறையை இயக்கும் குறுக்குவிசைகள்"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "குறுக்குவிசைக்களை செயல்படுத்து"
+msgid "Disable shortcut keys"
+msgstr "குறுக்குவிசைகளை செயல்நீக்கு"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "மொழி பேனல் இடம்"
+msgid "The shortcut keys for turning input method off"
+msgstr "உள்ளீடு முறையை நிறுத்தும் குறுக்குவிசைகள்"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "அடுத்த இயந்திர குறுக்குவிசை"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "காணும் அட்டவணையின் திசை"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "பட்டியலில் அடுத்த உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
-
-#: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "முன்ஏற்றப்பட்ட இயந்திரங்கள்"
-
-#: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus துவங்கும் போது முன்னேற்றப்பட்ட எந்திரங்கள் "
-
-#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "முந்தைய இயந்திர குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "முந்தைய உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "தானாக மறை"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
-"மொழி பலகத்தின் பண்புகள். 0 = மெனுவில் உட்பொதியப்பட்டது, 1 = தானாக மறை, 2 = "
-"எப்போதும் காட்டு"
+"மொழி பலகத்தின் பண்புகள். 0 = மெனுவில் உட்பொதியப்பட்டது, 1 = தானாக மறை, 2 = எப்போதும் "
+"காட்டு"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "மொழி பேனல் இடம்"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"மொழி பேனலின் இடம். 0 = மேல் இடது ஓரம், 1 = மேல் வலது ஓரம், 2 = கீழ் இடது "
-"ஓரம், 3 = கீழ் வலது ஓரம், 4 = தனிபயன்"
+"மொழி பேனலின் இடம். 0 = மேல் இடது ஓரம், 1 = மேல் வலது ஓரம், 2 = கீழ் இடது ஓரம், 3 = கீழ் "
+"வலது ஓரம், 4 = தனிபயன்"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "பட்டியலில் அடுத்த உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "காணும் அட்டவணையின் திசை"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "முந்தைய உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "உள்ளீடு முறையை நிறுத்தும் குறுக்குவிசைகள்"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "உள்ளீடு முறையை இயக்கும் குறுக்குவிசைகள்"
+msgid "Use custom font"
+msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "ட்ரிகர் குறுக்குவிசை"
+msgid "Custom font"
+msgstr "தனிபயன் எழுத்துரு"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
+msgid "Custom font name for language panel"
+msgstr "தனிபயன் எழுத்துரு பெயர் மொழி பலகத்துக்கு"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
+msgid "Embed Preedit Text"
+msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>எழுத்துரு மற்றும் தோற்றம்</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>விசைப்பலகை அமைப்பு</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>விசைப்பலகை குறுக்குவழிகள்</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>துவக்கம்</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"முதன்மை பக்கம்: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\n"
-"மேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "வேறு"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "கூடுதல்"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "மொழி: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "எப்போதும்"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "விசைப்பலகை அமைப்பு: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "கீழ் இடது ஓரம்"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "ஆசிரியர்: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "கீழ் வலது ஓரம்"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "விளக்கம்:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "கேண்டிடேட் சார்ந்து:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "தனிபயன்"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "செயல்நீக்கு:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus முன்னுரிமைகளை அமை"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட preedit உரை"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "விசைப்பலகை குறுக்குவழிகள்"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "பயன்பாட்டு சாளரத்தில் preedit உரையின் உள்ளீடு முறையை உட்பொதியவும்"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "விசை குறியீடு:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "மெனுவில் உட்பொதியப்பட்டது"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "மாற்றிகள்;"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "செயல்படுத்து அல்லது செயல்நீக்கு:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"ஒரு விசையை அழுத்தவும் (அல்லது விசை கலவையை).\n"
+"விசையை விடுத்தால் உரையாடல் மூடப்படும்."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "செயல்படுத்து:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "பொது"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ட்ரிகர்"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "கிடைமட்டம்"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "செயல்படுத்து"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "மொழி பேனல் படம்:"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "செயல்நீக்கு"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே "
-"நகர்த்து"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus daemon துவக்கப்படவில்லை. இப்போது துவக்க வேண்டுமா?"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:344
+#, fuzzy
+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 துவக்கப்பட்டது! உங்களால் IBusஐ பயன்படுத்த முடியவில்லையெனில், பின்வரும் வரியை "
+"சேர்த்து $HOME/.bashrc, உங்கள் பணிமேடையை மறுதுவக்கவும்.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "அடுத்த உள்ளீடு முறை:"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "முந்தைய உள்ளீடு முறை:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை"
-" நீக்கு"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "மொழி பட்டையை எவ்வாறு காட்ட அல்லது மறைக்க வேண்டும் என ibus பண்பினை அமை"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "காணும் அட்டவணையில் நபர்களின் திசையமைப்பை அமை"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "I. Felix <ifelix@redhat.com>"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "மறுதுவக்கம்"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
+#~ msgid "Previous page"
+#~ msgstr "முந்தைய பக்கம்"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "மொழி பலகத்தை காட்டு:"
+#~ msgid "Next page"
+#~ msgstr "அடுத்த பக்கம்"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "புகுபதிவில் ibusஐ துவக்கு"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "சில உள்ளீடு முறைகள் நிறுவப்பட்டுள்ளது, நீக்கப்பட்டுள்ளது அல்லது மேம்படுத்தப்பட்டுள்ளது. "
+#~ "ibus உள்ளீட்டை மறுதுவக்கவும்."
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "பட்டியலில் அடுத்த உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
+#~ msgid "Restart Now"
+#~ msgstr "இப்போது மறுதுவக்கு"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "பட்டியலில் முந்தைய உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
+#~ msgid "Later"
+#~ msgstr "பின்னர்"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "மேல் இடது ஓரம்"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "மேல் வலது ஓரம்"
+#~ msgid "Turn off input method"
+#~ msgstr "உள்ளீடு முறையை நிறுத்து"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து:"
+#~ msgid "No input window"
+#~ msgstr "உள்ளீடு சாளரம் இல்லை"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "செங்குத்து"
+#~ msgid "About the input method"
+#~ msgstr "உள்ளீடு முறை பற்றி"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "செயலிலிருக்கும் போது"
+#~ msgid "Switch input method"
+#~ msgstr "உள்ளீடு முறையை மாற்று"
+
+#~ msgid "About the Input Method"
+#~ msgstr "உள்ளீடு முறை பற்றி"
+
+#~ msgid "next input method"
+#~ msgstr "அடுத்த உள்ளீடு முறை"
+
+#~ msgid "previous input method"
+#~ msgstr "முந்தைய உள்ளீடு முறை"
diff --git a/po/te.po b/po/te.po
index 6dc78a7b0..097d981e5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,554 +2,567 @@
 # Telugu translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
 # ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-10-27 17:27+0000\n"
 "Last-Translator: Praveen_Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "అడ్డముగా"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్క్"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "నిలువుగా"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్కును ప్రారంభించు"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "మెనూనందు ఎంబెడెడ్ చేయబడెను"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "క్రియాశీలముగా ఉన్నప్పుడు"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "ఇతర"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "ఎల్లప్పుడు"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "మునుపటి పేజి"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "పై ఎడమ మూల"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "తరువాతి పేజి"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "పై కుడి మూల"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"కొన్ని ఇన్‌పుట్ విధానములు సంస్థాపించబడెను, తీసివేయబడెను, లేదా నవీకరించబడెను."
-" దయచేసి ibus ఇన్‌పుట్ ప్లాట్‌ఫాంను పునఃప్రారంభించుము."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "క్రింది ఎడమ మూల"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "ఇప్పుడు పునఃప్రారంభించుము"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "క్రింది కుడి మూల"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "తరువాత"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "మలచుకొనిన"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus ప్యానల్"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus ప్రాధాన్యతలు"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus ఇన్‌పుట్ పద్ధతి ఆకృతి"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "జాబితాలో ఉన్న తరువాతి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "పునఃప్రారంభించు"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి:"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "ఇన్‌పుట్ పద్ధతి ఆపు"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "ఇన్‌పుట్ విండో లేదు"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\n"
-"ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ఇన్‌పుట్ పద్ధతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "చేతనముచేయి లేదా అచేతనముచేయి:"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "ఇన్‌పుట్ పద్ధతిని మార్చు"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "చేతనపరుచు"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "గురించి"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "అచేతనపరుచు:"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>కీబోర్డు లఘువులు</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "భాష: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "లుకప్ పట్టికనందు కాండిడేట్ల సర్దుబాటును అమర్చుము"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "కీబోర్డు నమూనా: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "సభ్యుల దృక్పధము:"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "మూలకర్త: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ibus ప్రవర్తనను అమర్చుము"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "వివరణ:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "భాషా ప్యానల్ చూపించు:"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "ట్రిగ్గర్"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "భాషా ప్యానల్ స్థానము:"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "చేతనపరుచు"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "సిస్టమ్ ట్రే నందు ప్రతీకను చూపించు"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "అచేతనపరుచు"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "చెక్‌బాక్సు చెక్ చేసినప్పుడు భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "అనువర్తనము విండో నందు ముందుగాసరికూర్చిన పాఠమును ఎంబెడెడ్ చేయుము"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr ""
-"IBus డెమోన్ ప్రారంభమవలేదు. మీరు దానిని ప్రారంభించాలని అనుకొనుచున్నారా?"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>ఫాంటు మరియు శైలి</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతి యొక్క సమాచారాన్ని చూపించు"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus ప్రారంభమైంది! మీరు IBus ఉపయోగించలేక పోతే, క్రింది వాటిని $HOME/.bashrc నందు జతచేయుము, మరియు మీ డెస్కుటాపునకు తిరిగి లాగిన్ అవ్వుము.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\n"
+"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "ఇన్‌పుట్ పద్ధతి"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "కీబోర్డు లఘువులు"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "కీ కోడ్:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "సవరణిలు:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>కీబోర్డు నమూనా</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "అన్ని అనువర్తనములనందు యిన్పుట్ పద్దతిని భాగస్వామ్యపరచుము"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>గ్లోబల్ ఇన్‌పుట్ పద్ధతి అమరికలు</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "అధునాతన"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"దయచేసి వొక కీను వత్తండి (లేదా కీ మిశ్రమాన్ని).\n"
-"కీ వదిలినప్పుడు డైలాగు మూయబడుతుంది."
+"<big><b>IBus</b></big>\n"
+"<small>తెలివైన ఇన్‌పుట్ బస్</small>\n"
+"నివాసపుట: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "లాగిన్‌నందు ibus ప్రారంభించుము"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>ప్రారంభము</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "ఇన్‌పుట్ పద్ధతి"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "గురించి"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus ప్రాధాన్యతలు"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్క్"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus ప్రాధాన్యతలను అమర్చు"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "IBus ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్కును ప్రారంభించు"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "స్వయంచాలకంగా దాగిఉండు"
+msgid "Preload engines"
+msgstr "ముందుగా లోడైన ఇంజన్లు"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "అనురూపిత ఫాంటు"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ప్రారంభమునందు ఇంజన్లు ముందుగా లోడుచేయి"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "భాష ప్యానల్ కొరకు మలచుకొనిన ఫాంటు పేరు"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "అడ్డదారి కీలను అచేతనంచేయి"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "అనువర్తన విండోనందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
+msgid "Trigger shortcut keys"
+msgstr "లఘవులను నొక్కుము"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనముచేయుము"
+msgid "Enable shortcut keys"
+msgstr "లఘు కీ లను చేతనంచేయి"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనము "
-"చేయుము"
+msgid "The shortcut keys for turning input method on"
+msgstr "ఇన్‌పుట్ పద్ధతి ఆన్ చేయుటకు కీ లఘువులు"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "లఘు కీ లను చేతనంచేయి"
+msgid "Disable shortcut keys"
+msgstr "అడ్డదారి కీలను అచేతనంచేయి"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "భాషా ప్యానల్ స్థానము"
+msgid "The shortcut keys for turning input method off"
+msgstr "ఇన్‌పుట్ పద్ధతి ఆపుటకు కీ లఘువులు"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "తరువాతి ఇంజన్‌కు లఘువులు"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "లుకప్ పట్టిక సర్దుబాటు"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "జాబితానందలి తరువాతి ఇన్పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = చదరముగా, 1 = నిలువుగా"
-
-#: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "ముందుగా లోడైన ఇంజన్లు"
-
-#: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ప్రారంభమునందు ఇంజన్లు ముందుగా లోడుచేయి"
-
-#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "మునుపటి ఇంజన్ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "అన్ని అనువర్తనములనందు యిన్పుట్ పద్దతిని భాగస్వామ్యపరచుము"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "సిస్టమ్ ట్రే నందు ప్రతీకను చూపించు"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "స్వయంచాలకంగా దాగిఉండు"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
-"భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = మెనూనందు యెంబెడ్‌చేయి, 1 = స్వయంచాలకంగా "
-"మరుగునవుంచు, 2 = ఎల్లప్పుడూ చూపించు"
+"భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = మెనూనందు యెంబెడ్‌చేయి, 1 = స్వయంచాలకంగా మరుగునవుంచు, 2 = "
+"ఎల్లప్పుడూ చూపించు"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "భాషా ప్యానల్ స్థానము"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
-"భాషా ప్యానల్ యొక్క స్థానము. 0 = పై ఎడమ మూల, 1 = పై కుడి మూల, 2 = క్రింది ఎడమ"
-" మూల, 3 = క్రింది కుడి మూల, 4 = మలచుకొనిన"
+"భాషా ప్యానల్ యొక్క స్థానము. 0 = పై ఎడమ మూల, 1 = పై కుడి మూల, 2 = క్రింది ఎడమ మూల, 3 = క్రింది "
+"కుడి మూల, 4 = మలచుకొనిన"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "జాబితానందలి తరువాతి ఇన్పుట్ పద్ధతినకు మారుటకు లఘువులు"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "లుకప్ పట్టిక సర్దుబాటు"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = చదరముగా, 1 = నిలువుగా"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "ఇన్‌పుట్ పద్ధతి ఆపుటకు కీ లఘువులు"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "ఇన్‌పుట్ పద్ధతి ఆన్ చేయుటకు కీ లఘువులు"
+msgid "Use custom font"
+msgstr "మలచుకొనిన ఫాంటు ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ఇన్‌పుట్ పద్ధతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "లఘవులను నొక్కుము"
+msgid "Custom font"
+msgstr "అనురూపిత ఫాంటు"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "మలచుకొనిన ఫాంటు ఉపయోగించు"
+msgid "Custom font name for language panel"
+msgstr "భాష ప్యానల్ కొరకు మలచుకొనిన ఫాంటు పేరు"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
+msgid "Embed Preedit Text"
+msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "అనువర్తన విండోనందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "గ్లోబల్ ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>ఫాంటు మరియు శైలి</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>గ్లోబల్ ఇన్‌పుట్ పద్ధతి అమరికలు</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>కీబోర్డు నమూనా</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనముచేయుము"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>కీబోర్డు లఘువులు</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనము చేయుము"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>ప్రారంభము</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>తెలివైన ఇన్‌పుట్ బస్</small>\n"
-"నివాసపుట: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\n"
-"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
+"నకలుహక్కు (c) 2007-2010 Peng Huang\n"
+"నకలుహక్కు (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని చేతనమైన ఇన్పుట్ పద్ధతులలోనికి జతచేయుము"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "ఇతర"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "అధునాతన"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "భాష: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "ఎల్లప్పుడు"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "కీబోర్డు నమూనా: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "క్రింది ఎడమ మూల"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "మూలకర్త: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "క్రింది కుడి మూల"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "వివరణ:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "సభ్యుల దృక్పధము:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "మలచుకొనిన"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "అచేతనపరుచు:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus ప్రాధాన్యతలను అమర్చు"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "అనువర్తనము విండో నందు ముందుగాసరికూర్చిన పాఠమును ఎంబెడెడ్ చేయుము"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "కీబోర్డు లఘువులు"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "కీ కోడ్:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "సవరణిలు:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"అనువర్తనము విండోనందు ఇన్‌పుట్ పద్ధతి యొక్క ముందుగా సరికూర్చిన పాఠమును "
-"ఎంబెడెడ్ చేయుము"
+"దయచేసి వొక కీను వత్తండి (లేదా కీ మిశ్రమాన్ని).\n"
+"కీ వదిలినప్పుడు డైలాగు మూయబడుతుంది."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "మెనూనందు ఎంబెడెడ్ చేయబడెను"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "చేతనముచేయి లేదా అచేతనముచేయి:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "ట్రిగ్గర్"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/main.py:80
+msgid "enable"
 msgstr "చేతనపరుచు"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "సాధారణ"
-
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "అడ్డముగా"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "అచేతనపరుచు"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "భాషా ప్యానల్ స్థానము:"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus డెమోన్ ప్రారంభమవలేదు. మీరు దానిని ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:344
+#, fuzzy
+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 ప్రారంభమైంది! మీరు IBus ఉపయోగించలేక పోతే, క్రింది వాటిని $HOME/.bashrc నందు జతచేయుము, "
+"మరియు మీ డెస్కుటాపునకు తిరిగి లాగిన్ అవ్వుము.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"చేతనమైన ఇన్‌పుట్ పద్ధతుల జాబితాలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని పైకి కదుపుము"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి:"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి:"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"నకలుహక్కు (c) 2007-2010 Peng Huang\n"
+"నకలుహక్కు (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతుల నుంచి ఎంపికచేసిన ఇన్‌పుట్ పద్ధతిని తొలగించు"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
-"భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ibus ప్రవర్తనను అమర్చుము"
+"కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\n"
+"ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "లుకప్ పట్టికనందు కాండిడేట్ల సర్దుబాటును అమర్చుము"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "పునఃప్రారంభించు"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతి యొక్క సమాచారాన్ని చూపించు"
+#~ msgid "Previous page"
+#~ msgstr "మునుపటి పేజి"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"చెక్‌బాక్సు చెక్ చేసినప్పుడు భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
+#~ msgid "Next page"
+#~ msgstr "తరువాతి పేజి"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "భాషా ప్యానల్ చూపించు:"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "కొన్ని ఇన్‌పుట్ విధానములు సంస్థాపించబడెను, తీసివేయబడెను, లేదా నవీకరించబడెను. దయచేసి ibus ఇన్‌పుట్ "
+#~ "ప్లాట్‌ఫాంను పునఃప్రారంభించుము."
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "లాగిన్‌నందు ibus ప్రారంభించుము"
+#~ msgid "Restart Now"
+#~ msgstr "ఇప్పుడు పునఃప్రారంభించుము"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "జాబితాలో ఉన్న తరువాతి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
+#~ msgid "Later"
+#~ msgstr "తరువాత"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
+#~ msgid "IBus Panel"
+#~ msgstr "IBus ప్యానల్"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "పై ఎడమ మూల"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus ఇన్‌పుట్ పద్ధతి ఆకృతి"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "పై కుడి మూల"
+#~ msgid "Turn off input method"
+#~ msgstr "ఇన్‌పుట్ పద్ధతి ఆపు"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "మలచుకొనిన ఫాంటు ఉపయోగించుము:"
+#~ msgid "No input window"
+#~ msgstr "ఇన్‌పుట్ విండో లేదు"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "నిలువుగా"
+#~ msgid "About the input method"
+#~ msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "క్రియాశీలముగా ఉన్నప్పుడు"
+#~ msgid "Switch input method"
+#~ msgstr "ఇన్‌పుట్ పద్ధతిని మార్చు"
+
+#~ msgid "About the Input Method"
+#~ msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
+
+#~ msgid "next input method"
+#~ msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి"
+
+#~ msgid "previous input method"
+#~ msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి"
diff --git a/po/tg.po b/po/tg.po
index d2584846e..62ef35dbb 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -2,249 +2,286 @@
 # Tajik translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # tajikfedora <victor.ibragimov@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-12-09 09:55+0000\n"
 "Last-Translator: tajikfedora <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik (http://www.transifex.net/projects/p/fedora/team/tg/)\n"
+"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Уфуқӣ"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Амудӣ"
+
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
 msgstr ""
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
+#: ../setup/setup.ui.h:4
+msgid "When active"
 msgstr ""
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Ҳамеша"
+
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
 msgstr ""
 
-#: ../ibus/_config.py.in:40
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
 msgstr ""
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Дигар"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Саҳифаи пешина"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr ""
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Саҳифаи навбатӣ"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Танзимот"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
 msgstr ""
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Баъдтар"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr ""
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Лавҳаи IBus"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
 msgstr ""
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Бозоғозӣ"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
 msgstr ""
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Фаъолсозӣ:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Хомӯшкунӣ:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
 msgstr ""
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Дар бораи"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr ""
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Забон: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
 msgstr ""
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Муаллиф: %s\n"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Шарҳ:\n"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr ""
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "оғоздиҳӣ"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "фаъол"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr ""
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "ғайрифаъол"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+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/main.py:135
-msgid "next input method"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/main.py:146
-msgid "previous input method"
+#: ../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/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
+#: ../setup/setup.ui.h:40
+msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Миёнбурҳои клавиатура"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Рамзи тугма:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:231
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
 msgstr ""
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Дар бораи"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr ""
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr ""
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Пинҳонкунии худкор"
+msgid "Preload engines"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
+msgid "Preload engines during ibus starts up"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
+msgid "Engines order"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
+msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
+msgid "Trigger shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
+msgid "Enable shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
+msgid "The shortcut keys for turning input method on"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
+msgid "Disable shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
+msgid "The shortcut keys for turning input method off"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:11
@@ -252,271 +289,215 @@ msgid "Next engine shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
+msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgid "Prev engine shortcut keys"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
+msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr ""
+msgid "Auto hide"
+msgstr "Пинҳонкунии худкор"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
+msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
+msgid "Custom font"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
+msgid "Custom font name for language panel"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
+msgid "Embed Preedit Text"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:31
-msgid "Use global input method"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr ""
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
+msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
 msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr ""
-
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Ҳамеша"
-
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr ""
-
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr ""
-
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Танзимот"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Дигар"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Хомӯшкунӣ:"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Забон: %s\n"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Муаллиф: %s\n"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr ""
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Шарҳ:\n"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Фаъолсозӣ:"
-
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Умумӣ"
-
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Уфуқӣ"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
 msgstr ""
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Миёнбурҳои клавиатура"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Рамзи тугма:"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "оғоздиҳӣ"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr ""
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "фаъол"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr ""
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "ғайрифаъол"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
+#: ../setup/main.py:323
+msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
+#: ../setup/main.py:344
+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 ""
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
+#: ../ui/gtk3/panel.vala:330
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
 msgstr ""
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr ""
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Бозоғозӣ"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Амудӣ"
+#~ msgid "Previous page"
+#~ msgstr "Саҳифаи пешина"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr ""
+#~ msgid "Next page"
+#~ msgstr "Саҳифаи навбатӣ"
 
+#~ msgid "Later"
+#~ msgstr "Баъдтар"
 
+#~ msgid "IBus Panel"
+#~ msgstr "Лавҳаи IBus"
diff --git a/po/uk.po b/po/uk.po
index aa53b710b..887fe0dda 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,297 +6,323 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-13 05:04+0000\n"
 "Last-Translator: yurchor <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "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"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Горизонтально"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Оболонка способів введення"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Вертикально"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Запуск оболонки способів введення IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Вбудувати у меню"
 
-#: ../ibus/_config.py.in:40
-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"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Якщо активна"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Інше"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Завжди"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Попередня сторінка"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "У верхньому лівому куті"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Наступна сторінка"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "У верхньому правому куті"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "У нижньому лівому куті"
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "У нижньому правому куті"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+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 ""
-"Встановлено, вилучено або оновлено деякі зі способів введення. Будь ласка, "
-"перезапустіть платформу введення ibus."
+"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "Перезапустити зараз"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Наступний спосіб введення:"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "Пізніше"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Клавіатурне скорочення для перемикання на попередній спосіб введення у списку"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "Панель IBus"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Попередній спосіб введення:"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "Оболонка способів введення IBus"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "Перезапустити"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Клавіатурне скорочення для вмикання і вимикання способів введення"
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "Вимкнути спосіб введення"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Увімкнення або вимикання:"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "Немає вікна введення"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Увімкнути:"
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Вимкнути:"
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Юрій Чорноіван <yurchor@ukr.net>"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Клавіатурні скорочення</b>"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Про спосіб введення"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Встановити орієнтацію варіантів у таблиці пошуку"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Перемкнути спосіб введення"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Орієнтація варіантів:"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Інформація"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Визначає поведінку ibus: спосіб показу або приховування мовної панелі"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Про спосіб введення"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Показ мовної панелі:"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Мова: %s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Розташування мовної панелі:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Розкладка клавіатури: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Показувати піктограму у системному лотку"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Автор: %s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Показувати назву способу введення на мовній панелі"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Опис:\n"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Показати назву способу введення на мовній панелі, якщо позначено цей пункт"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "перемикач"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "увімкнути"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Вбудувати попередньо створений текст способу введення у вікно програми"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "вимкнути"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Нетиповий шрифт:"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "наступний спосіб введення"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Шрифт і стиль</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "попередній спосіб введення"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Загальне"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "Фонову службу не запущено IBus. Запустити її зараз?"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Додати позначений спосіб введення до списку увімкнених способів введення"
 
-#: ../setup/main.py:301
-msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"IBus запущено! Якщо ви не можете скористатися IBus, будь ласка, додайте наведені нижче рядки до вашого файла $HOME/.bashrc, вийдіть з облікового запису і знову до нього увійдіть.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"Вилучити позначений спосіб введення зі списку увімкнених способів введення"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Виберіть клавіатурне скорочення для дії %s"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Пересунути вгору позначений спосіб введення у списку увімкнених способів "
+"введення"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Клавіатурні скорочення"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Пересунути нижче позначений спосіб введення у списку увімкнених способів "
+"введення"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Код клавіші:"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Показати відомості щодо вибраного способу введення"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Модифікатори:"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Показати відомості щодо вибраного способу введення"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:41
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"Будь ласка, натисніть клавішу (або комбінацію клавіш).\n"
-"Діалогове вікно буде закрито після відпускання клавіші."
-
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
-
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Виберіть спосіб введення"
+"<small><i>Типовий спосіб введення — найвищий пункт у списку.\n"
+"Змінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Налаштування IBus"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Налаштувати IBus"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Розкладка клавіатури</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Використовувати один спосіб введення для всіх програм"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Загальні параметри способів введення</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Додатково"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Інтелектуальний канал введення</small>\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 "<b>Startup</b>"
+msgstr "<b>Запуск</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Auto hide"
-msgstr "Автоматично ховати"
+msgid "Preload engines"
+msgstr "Попередньо завантажувати рушії"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Нетиповий шрифт"
+msgid "Preload engines during ibus starts up"
+msgstr "Попередньо завантажувати рушії під час запуску ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Назва нетипового шрифту для мовної панелі"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "Вимкнути клавіатурні скорочення"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "Вбудувати попередньо створений текст"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "Вбудувати попередньо створений текст у вікно програми"
+msgid "Trigger shortcut keys"
+msgstr "Клавіатурні скорочення-перемикачі"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "Типово увімкнути спосіб введення"
+msgid "Enable shortcut keys"
+msgstr "Увімкнути клавіатурні скорочення"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Типово увімкнути спосіб введення, коли програма отримує фокус введення"
+msgid "The shortcut keys for turning input method on"
+msgstr "Клавіатурне скорочення для вмикання способів введення"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "Увімкнути клавіатурні скорочення"
+msgid "Disable shortcut keys"
+msgstr "Вимкнути клавіатурні скорочення"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "Розташування мовної панелі"
+msgid "The shortcut keys for turning input method off"
+msgstr "Клавіатурне скорочення для вимикання способів введення"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "Скорочення для наступного рушія"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "Орієнтація таблиці пошуку"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
+msgid "Prev engine shortcut keys"
+msgstr "Скорочення для попереднього рушія"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "Попередньо завантажувати рушії"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "Попередньо завантажувати рушії під час запуску ibus"
+msgid "Auto hide"
+msgstr "Автоматично ховати"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "Скорочення для попереднього рушія"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Використовувати один спосіб введення для всіх програм"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Показувати піктограму у системному лотку"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "Показувати назву способу введення"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Показувати назву способу введення на мовній панелі"
-
-#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -304,7 +330,11 @@ msgstr ""
 "Поведінка мовної панелі. 0 = вбудувати до меню, 1 = автоматично ховати, 2 = "
 "завжди показувати"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Розташування мовної панелі"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -313,242 +343,233 @@ msgstr ""
 "правому куті, 2 = у нижньому лівому куті, 3 = у нижньому правому куті, 4 = "
 "нетипове"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
-"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Орієнтація таблиці пошуку"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "Клавіатурне скорочення для вимикання способів введення"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Показувати назву способу введення"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "Клавіатурне скорочення для вмикання способів введення"
+msgid "Use custom font"
+msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Клавіатурне скорочення для вмикання і вимикання способів введення"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "Клавіатурні скорочення-перемикачі"
+msgid "Custom font"
+msgstr "Нетиповий шрифт"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "Використовувати нетиповий шрифт"
+msgid "Custom font name for language panel"
+msgstr "Назва нетипового шрифту для мовної панелі"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "Використовувати нетиповий шрифт для мовної панелі"
+msgid "Embed Preedit Text"
+msgstr "Вбудувати попередньо створений текст"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Вбудувати попередньо створений текст у вікно програми"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Використовувати розкладку клавіатури системи (XKB)"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Використовувати розкладку клавіатури системи"
-
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Шрифт і стиль</b>"
-
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Загальні параметри способів введення</b>"
-
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Розкладка клавіатури</b>"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Типово увімкнути спосіб введення"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Клавіатурні скорочення</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Запуск</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Інтелектуальний канал введення</small>\n"
-"Домашня сторінка: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>Типовий спосіб введення — найвищий пункт у списку.\n"
-"Змінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
+"© Peng Huang, 2007–2010\n"
+"© Red Hat, Inc., 2007–2010"
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Додати позначений спосіб введення до списку увімкнених способів введення"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Інше"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Додатково"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Мова: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Завжди"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Розкладка клавіатури: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "У нижньому лівому куті"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Автор: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "У нижньому правому куті"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Опис:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Орієнтація варіантів:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Виберіть спосіб введення"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Нетиповий"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "Вимкнути:"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Налаштувати IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Вбудувати попередньо створений текст у вікно програми"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Клавіатурні скорочення"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Код клавіші:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Модифікатори:"
+
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Вбудувати попередньо створений текст способу введення у вікно програми"
+"Будь ласка, натисніть клавішу (або комбінацію клавіш).\n"
+"Діалогове вікно буде закрито після відпускання клавіші."
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Вбудувати у меню"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Увімкнення або вимикання:"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "перемикач"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "Увімкнути:"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "увімкнути"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Загальне"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "вимкнути"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Горизонтально"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Фонову службу не запущено IBus. Запустити її зараз?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Розташування мовної панелі:"
+#: ../setup/main.py:344
+#, fuzzy
+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 запущено! Якщо ви не можете скористатися IBus, будь ласка, додайте "
+"наведені нижче рядки до вашого файла $HOME/.bashrc, вийдіть з облікового "
+"запису і знову до нього увійдіть.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Пересунути нижче позначений спосіб введення у списку увімкнених способів "
-"введення"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Виберіть клавіатурне скорочення для дії %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Пересунути вгору позначений спосіб введення у списку увімкнених способів "
-"введення"
+"© Peng Huang, 2007–2010\n"
+"© Red Hat, Inc., 2007–2010"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Наступний спосіб введення:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Попередній спосіб введення:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Вилучити позначений спосіб введення зі списку увімкнених способів введення"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Перезапустити"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Визначає поведінку ibus: спосіб показу або приховування мовної панелі"
+#~ msgid "Previous page"
+#~ msgstr "Попередня сторінка"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Встановити орієнтацію варіантів у таблиці пошуку"
+#~ msgid "Next page"
+#~ msgstr "Наступна сторінка"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Показати відомості щодо вибраного способу введення"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Встановлено, вилучено або оновлено деякі зі способів введення. Будь "
+#~ "ласка, перезапустіть платформу введення ibus."
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Показати назву способу введення на мовній панелі, якщо позначено цей пункт"
+#~ msgid "Restart Now"
+#~ msgstr "Перезапустити зараз"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Показ мовної панелі:"
+#~ msgid "Later"
+#~ msgstr "Пізніше"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Запускати ibus при вході"
+#~ msgid "IBus Panel"
+#~ msgstr "Панель IBus"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
+#~ msgid "IBus input method framework"
+#~ msgstr "Оболонка способів введення IBus"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Клавіатурне скорочення для перемикання на попередній спосіб введення у "
-"списку"
+#~ msgid "Turn off input method"
+#~ msgstr "Вимкнути спосіб введення"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "У верхньому лівому куті"
+#~ msgid "No input window"
+#~ msgstr "Немає вікна введення"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "У верхньому правому куті"
+#~ msgid "About the input method"
+#~ msgstr "Про спосіб введення"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Нетиповий шрифт:"
+#~ msgid "Switch input method"
+#~ msgstr "Перемкнути спосіб введення"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Вертикально"
+#~ msgid "About the Input Method"
+#~ msgstr "Про спосіб введення"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Якщо активна"
+#~ msgid "next input method"
+#~ msgstr "наступний спосіб введення"
+
+#~ msgid "previous input method"
+#~ msgstr "попередній спосіб введення"
diff --git a/po/vi.po b/po/vi.po
index 205be9c1d..0f6c3ccfb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: data 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-06-01 13:17+0700\n"
 "Last-Translator: Lê Quốc Tuấn <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Vietnamese\n"
@@ -17,280 +17,311 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Ngang"
 
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "Bộ gõ IBus"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Dọc"
 
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "Bộ gõ IBus"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "Nhúng vào menu"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "Khi hoạt động"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "Khác"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "Luôn luôn"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "Trang trước"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "Góc trên bên trái"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "Trang sau"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "Góc trên bên phải"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "Góc dưới bên trái"
+
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "Góc dưới bên phải"
+
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "Tùy biến"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Tùy chọn IBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Kiểu gõ kế tiếp:"
+
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Kiểu gõ trước:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Bật hoặc tắt:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
 msgstr ""
-"Một vài kiểu gõ vừa được cài đặt, xóa hoặc cập nhật. Vui lòng khởi động lại "
-"bộ gõ ibus."
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "Khởi động lại ngay"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "Sau"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Phím tắt</b>"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "Bộ gõ IBus"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Đặt hướng của từ gợi ý trong bảng tra cứu"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "Khởi động lại"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Hướng danh sách từ ứng cử:"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "Tắt kiểu gõ"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Thiết lập việc ẩn hay hiển thị thanh ngôn ngữ"
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "Không có cửa sổ nhập"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Hiển thị thanh ngôn ngữ:"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Vị trí thanh ngôn ngữ:"
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
-msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "Hiển thị biểu tượng trên khay hệ thống"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "Giới thiệu về kiểu gõ"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "Hiển thị tên kiểu gõ trên thanh ngôn ngữ"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "Chuyển kiểu gõ"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "Hiển thị tên của kiểu gõ trên thanh ngôn ngữ khi đánh dấu vào ô kiểm"
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "Giới thiệu"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "Giới thiệu về kiểu gõ"
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Nhúng văn bản tiền soạn thảo của bộ gõ trong cửa sổ ứng dụng"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "Ngôn ngữ: %s\n"
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Dùng phông chữ tùy biến:"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Bố trí bàn phím: %s\n"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Phông và kiểu</b>"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "Tác giả: %s\n"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Chung"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "Mô tả:\n"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Thêm kiểu gõ đã chọn vào những kiểu gõ cho phép sử dụng"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "kích hoạt"
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Xóa kiểu gõ đã chọn ra khỏi những kiểu gõ cho phép sử dụng"
 
-#: ../setup/main.py:113
-msgid "enable"
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
+"Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
 
-#: ../setup/main.py:124
-msgid "disable"
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
+"Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "chuyển đến kiểu gõ kế tiếp"
-
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "chuyển đến kiểu gõ trước"
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr ""
-"Trình nền IBus chưa được khởi động. Bạn có muốn khởi động nó ngay bây giờ?"
+#: ../setup/setup.ui.h:40
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus vừa được khởi động! Nếu bạn không thể dùng IBus, vui lòng thêm những "
-"dòng bên dưới vào $HOME/.bashrc, và đăng nhập lại.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>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ó</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Chọn phím tắt để %s"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Kiểu gõ"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "Những phím tắt"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Dùng kiểu bố trí bàn phím của hệ thống"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "Mã phím:"
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Dùng kiểu bố trí bàn phím hệ thống (XKB)"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "Phím bổ sung:"
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Bố trí bàn phím</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Chia sẻ cùng kiểu gõ cho tất cả các ứng dụng"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "Chọn một kiểu gõ"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Nâng cao"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Vui lòng nhấn một phím (hoặc tổ hợp phím).\n"
-"Hộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
+"<big><b>IBus</b></big>\n"
+"<small>Bộ gõ thông minh</small>\n"
+"Trang chủ: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Khởi động ibus khi đăng nhập"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "Chọn một kiểu gõ"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Khởi động</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "Kiểu gõ"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Giới thiệu"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "Tùy chọn IBus"
+#: ../bus/ibus.desktop.in.h:2
+#, fuzzy
+msgid "Input Method Framework"
+msgstr "Bộ gõ IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: ../bus/ibus.desktop.in.h:3
 #, fuzzy
-msgid "Set IBus Preferences"
-msgstr "Tùy chọn IBus"
+msgid "Start IBus Input Method Framework"
+msgstr "Bộ gõ IBus"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "Tự động ẩn"
+msgid "Preload engines"
+msgstr "Nạp trước các kiểu gõ"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "Tùy biến phông"
+msgid "Preload engines during ibus starts up"
+msgstr "Nạp trước các kiểu gõ khi khởi động ibus"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "Tùy biến phông cho thanh ngôn ngữ"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "Nhúng văn bản tiền soạn thảo"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
-
-#: ../data/ibus.schemas.in.h:6
-#, fuzzy
-msgid "Enable input method by default"
-msgstr "chuyển đến kiểu gõ kế tiếp"
+msgid "Trigger shortcut keys"
+msgstr "Phím tắt kích hoạt"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "Phím tắt kích hoạt"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "Vị trí thanh ngôn ngữ:"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "Phím tắt cho kiểu gõ kế tiếp"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "Phím tắt kích hoạt"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "Hướng của bảng tra cứu"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Hướng của bảng tra cứu. 0 = Ngang, 1 = Dọc"
+msgid "Next engine shortcut keys"
+msgstr "Phím tắt cho kiểu gõ kế tiếp"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "Nạp trước các kiểu gõ"
+#, fuzzy
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "Nạp trước các kiểu gõ khi khởi động ibus"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "Phím tắt cho kiểu gõ trước"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "Chia sẻ cùng kiểu gõ cho tất cả các ứng dụng"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "Hiển thị biểu tượng trên khay hệ thống"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "Hiển thị tên kiểu gõ"
+#: ../data/ibus.schemas.in.h:14
+#, fuzzy
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "Hiển thị tên kiểu gõ trên thanh ngôn ngữ"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Tự động ẩn"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
@@ -298,7 +329,11 @@ msgstr ""
 "Cách hiển thị thanh ngôn ngữ. 0 = Nhúng vào menu, 1 = Tự  động ẩn, 2 = Luôn "
 "hiện"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "Vị trí thanh ngôn ngữ:"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -306,226 +341,232 @@ msgstr ""
 "Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = "
 "góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
 
-#: ../data/ibus.schemas.in.h:21
-#, fuzzy
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
-
-#: ../data/ibus.schemas.in.h:22
-#, fuzzy
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Hướng của bảng tra cứu"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Hướng của bảng tra cứu. 0 = Ngang, 1 = Dọc"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "Phím tắt kích hoạt"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Hiển thị tên kiểu gõ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "Dùng phông chữ tùy biến"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "Dùng chung kiểu gõ cho toàn hệ thống"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "Dùng kiểu bố trí bàn phím hệ thống (XKB)"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Tùy biến phông"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "Dùng kiểu bố trí bàn phím của hệ thống"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Tùy biến phông cho thanh ngôn ngữ"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "Nhúng văn bản tiền soạn thảo"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>Phông và kiểu</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "Chọn một kiểu gõ"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Dùng chung kiểu gõ cho toàn hệ thống"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Bố trí bàn phím</b>"
+#: ../data/ibus.schemas.in.h:34
+#, fuzzy
+msgid "Enable input method by default"
+msgstr "chuyển đến kiểu gõ kế tiếp"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Phím tắt</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>Khởi động</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Bộ gõ thông minh</small>\n"
-"Trang chủ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>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ó</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Thêm kiểu gõ đã chọn vào những kiểu gõ cho phép sử dụng"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Khác"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "Nâng cao"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Ngôn ngữ: %s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "Luôn luôn"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Bố trí bàn phím: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "Góc dưới bên trái"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Tác giả: %s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "Góc dưới bên phải"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Mô tả:\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "Hướng danh sách từ ứng cử:"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "Chọn một kiểu gõ"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "Tùy biến"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+#, fuzzy
+msgid "Set IBus Preferences"
+msgstr "Tùy chọn IBus"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Những phím tắt"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Nhúng văn bản tiền soạn thảo của bộ gõ trong cửa sổ ứng dụng"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Mã phím:"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "Nhúng vào menu"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Phím bổ sung:"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "Bật hoặc tắt:"
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Vui lòng nhấn một phím (hoặc tổ hợp phím).\n"
+"Hộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)"
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "kích hoạt"
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "Chung"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "Ngang"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+"Trình nền IBus chưa được khởi động. Bạn có muốn khởi động nó ngay bây giờ?"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "Vị trí thanh ngôn ngữ:"
+#: ../setup/main.py:344
+#, fuzzy
+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 vừa được khởi động! Nếu bạn không thể dùng IBus, vui lòng thêm những "
+"dòng bên dưới vào $HOME/.bashrc, và đăng nhập lại.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
 msgstr ""
-"Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Chọn phím tắt để %s"
+
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr ""
-"Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "Kiểu gõ kế tiếp:"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "Kiểu gõ trước:"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Xóa kiểu gõ đã chọn ra khỏi những kiểu gõ cho phép sử dụng"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "Khởi động lại"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Thiết lập việc ẩn hay hiển thị thanh ngôn ngữ"
+#~ msgid "Previous page"
+#~ msgstr "Trang trước"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Đặt hướng của từ gợi ý trong bảng tra cứu"
+#~ msgid "Next page"
+#~ msgstr "Trang sau"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr ""
+#~ "Một vài kiểu gõ vừa được cài đặt, xóa hoặc cập nhật. Vui lòng khởi động "
+#~ "lại bộ gõ ibus."
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Hiển thị tên của kiểu gõ trên thanh ngôn ngữ khi đánh dấu vào ô kiểm"
+#~ msgid "Restart Now"
+#~ msgstr "Khởi động lại ngay"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "Hiển thị thanh ngôn ngữ:"
+#~ msgid "Later"
+#~ msgstr "Sau"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "Khởi động ibus khi đăng nhập"
+#~ msgid "IBus input method framework"
+#~ msgstr "Bộ gõ IBus"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
+#~ msgid "Turn off input method"
+#~ msgstr "Tắt kiểu gõ"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
+#~ msgid "No input window"
+#~ msgstr "Không có cửa sổ nhập"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "Góc trên bên trái"
+#~ msgid "About the input method"
+#~ msgstr "Giới thiệu về kiểu gõ"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "Góc trên bên phải"
+#~ msgid "Switch input method"
+#~ msgstr "Chuyển kiểu gõ"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "Dùng phông chữ tùy biến:"
+#~ msgid "About the Input Method"
+#~ msgstr "Giới thiệu về kiểu gõ"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "Dọc"
+#~ msgid "next input method"
+#~ msgstr "chuyển đến kiểu gõ kế tiếp"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "Khi hoạt động"
+#~ msgid "previous input method"
+#~ msgstr "chuyển đến kiểu gõ trước"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95667b8a9..f67f5837f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,11 +10,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-05-14 07:23+0000\n"
 "Last-Translator: simonyanix <simonyan@fedoraproject.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/fedora/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/fedora/"
+"team/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,518 +23,540 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "水平"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "输入法框架"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "竖直"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "启动IBus 输入法框架"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "嵌入菜单"
 
-#: ../ibus/_config.py.in:40
-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 公司"
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "活动时"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "其他"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "总是"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "上一页"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "左上角"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "下一页"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "右上角"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr "一些输入法已经被安装，删除或者更新了。请重新启动ibus输入平台。"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "左下角"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "现在重启"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "右下角"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "稍候"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "自定义"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus面板"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus 设置"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus 输入法框架"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "切换下一个输入法快捷键"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "重新启动"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "下一输入法："
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "关闭输入法"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "切换上一个输入法快捷键"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "没有输入窗口"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "上一输入法："
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus is an intelligent input bus for Linux/Unix."
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr "Huang Peng <shawn.p.huang@gmail.com>"
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "打开关闭输入法的快捷键"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "关于输入法"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "开关："
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "切换输入法"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "应用："
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "关于"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "禁用："
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "关于输入法"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>快捷键</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "语言: %s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "设置候选词表方向"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "键盘: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "候选词排列方向："
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者: %s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "设置显示隐藏语言栏的方式"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "描述:\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "显示语言栏："
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "开关"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "语言栏位置："
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "应用"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "在系统托盘上显示图标"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "禁用"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "在语言栏上显示输入法名字"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "下一输入法"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "在语言栏上显示输入法的名字"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "上一输入法"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus 守护进程没有启动，您是否想现在启动它？"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>字体和风格</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "显示选中输入法的信息"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus 已经被成功启动！如果你不能正常使用IBus，请将下面代码加入到$HOME/.bashrc中，并重新登录桌面。\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>列表中第一个输入法是默认的输入法。\n"
+"您可以使用上/下按钮来更改默认的输入法。</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "选择%s的快捷键"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "输入法"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "快捷键"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "使用系统键盘布局"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "按键："
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "修饰符："
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>键盘布局</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "在所有应用程序中共享同一个输入法"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>全局输入法设置</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "高级"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"请按一个键盘按键（或者一个组合按键）\n"
-"当您松开任意按键时，对话框会自动关闭。"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "请按一个键盘按键（或者一个组合按键）"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "启动桌面时自动启动IBus"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "选择输入法"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>启动</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "输入法"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "关于"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "Kbd"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus 设置"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "输入法框架"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "修改IBus偏好"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "启动IBus 输入法框架"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "自动隐藏"
+msgid "Preload engines"
+msgstr "预加载引擎"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "自定义字体"
+msgid "Preload engines during ibus starts up"
+msgstr "ibus启动时预加载的引擎"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "自定义语言栏字体"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "禁用快捷键"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "内嵌编辑模式"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "在应用程序窗口中启用内嵌编辑模式"
+msgid "Trigger shortcut keys"
+msgstr "触发快捷键"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "默认启动输入法"
+msgid "Enable shortcut keys"
+msgstr "应用快捷键"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "当应用程序需要使用输入时自动启用输入法"
+msgid "The shortcut keys for turning input method on"
+msgstr "开启输入法的快捷键"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "应用快捷键"
+msgid "Disable shortcut keys"
+msgstr "禁用快捷键"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "语言栏位置"
+msgid "The shortcut keys for turning input method off"
+msgstr "关闭输入法的快捷键"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "候选词表方向"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "切换下一个输入法快捷键"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "候选词表方向。0 = 水平，1 = 竖直。"
+msgid "Prev engine shortcut keys"
+msgstr "上一个引擎快捷键"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "预加载引擎"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "切换上一个输入法快捷键"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "ibus启动时预加载的引擎"
+msgid "Auto hide"
+msgstr "自动隐藏"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "上一个引擎快捷键"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "在所有应用程序中共享同一个输入法"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "在系统托盘上显示图标"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "在语言栏上显示输入法名字"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "语言栏位置"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "切换下一个输入法快捷键"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "切换上一个输入法快捷键"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "关闭输入法的快捷键"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "在语言栏上显示输入法名字"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "开启输入法的快捷键"
+msgid "Use custom font"
+msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "打开关闭输入法的快捷键"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "语言栏是否使用自定义字体"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "触发快捷键"
+msgid "Custom font"
+msgstr "自定义字体"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "使用自定义字体"
+msgid "Custom font name for language panel"
+msgstr "自定义语言栏字体"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "语言栏是否使用自定义字体"
+msgid "Embed Preedit Text"
+msgstr "内嵌编辑模式"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "在应用程序窗口中启用内嵌编辑模式"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "使用系统键盘（XKB）布局"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "使用系统键盘布局"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "默认启动输入法"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>字体和风格</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>全局输入法设置</b>"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>键盘布局</b>"
+#: ../ibus/_config.py.in:41
+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 公司"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>快捷键</b>"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "其他"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>启动</b>"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "语言: %s\n"
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "键盘: %s\n"
 
-#: ../setup/setup.ui.h:14
-msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>列表中第一个输入法是默认的输入法。\n"
-"您可以使用上/下按钮来更改默认的输入法。</i></small>"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者: %s\n"
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "添加输入法到启动"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "描述:\n"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "高级"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "选择输入法"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "总是"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "左下角"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "修改IBus偏好"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "右下角"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "快捷键"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "候选词排列方向："
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "按键："
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "自定义"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "修饰符："
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "禁用："
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"请按一个键盘按键（或者一个组合按键）\n"
+"当您松开任意按键时，对话框会自动关闭。"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "在应用程序窗口中启用内嵌编辑模式"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "在应用程序窗口中启用输入法的内嵌编辑模式"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "开关"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "嵌入菜单"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "应用"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "开关："
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "禁用"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "应用："
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 守护进程没有启动，您是否想现在启动它？"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "常规"
+#: ../setup/main.py:344
+#, fuzzy
+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 已经被成功启动！如果你不能正常使用IBus，请将下面代码加入到$HOME/.bashrc"
+"中，并重新登录桌面。\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "水平"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "语言栏位置："
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "选择%s的快捷键"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "下移选中的输入法"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"版权所有 (c) 2007-2010 黄鹏\n"
+"版权所有 (c) 2007-2010 Red Hat 公司"
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "上移选中的输入法"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus is an intelligent input bus for Linux/Unix."
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "下一输入法："
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "上一输入法："
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "重新启动"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "删除选中的输入法"
+#~ msgid "Previous page"
+#~ msgstr "上一页"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "设置显示隐藏语言栏的方式"
+#~ msgid "Next page"
+#~ msgstr "下一页"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "设置候选词表方向"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr "一些输入法已经被安装，删除或者更新了。请重新启动ibus输入平台。"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "显示选中输入法的信息"
+#~ msgid "Restart Now"
+#~ msgstr "现在重启"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "在语言栏上显示输入法的名字"
+#~ msgid "Later"
+#~ msgstr "稍候"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "显示语言栏："
+#~ msgid "IBus Panel"
+#~ msgstr "IBus面板"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "启动桌面时自动启动IBus"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus 输入法框架"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "切换下一个输入法快捷键"
+#~ msgid "Turn off input method"
+#~ msgstr "关闭输入法"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "切换上一个输入法快捷键"
+#~ msgid "No input window"
+#~ msgstr "没有输入窗口"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "左上角"
+#~ msgid "About the input method"
+#~ msgstr "关于输入法"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "右上角"
+#~ msgid "Switch input method"
+#~ msgstr "切换输入法"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "使用自定义字体："
+#~ msgid "About the Input Method"
+#~ msgstr "关于输入法"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "竖直"
+#~ msgid "next input method"
+#~ msgstr "下一输入法"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "活动时"
+#~ msgid "previous input method"
+#~ msgstr "上一输入法"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 7c4a89dce..6751990cf 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-12 00:41+0900\n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2010-05-06 13:25+1000\n"
 "Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -23,508 +23,549 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "水平"
 
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus 輸入法框架"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "垂直"
 
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus 輸入法框架"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "嵌入選單內"
 
-#: ../ibus/_config.py.in:39
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "當啟用時"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "其它"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "總是"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "上一頁"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "左上角"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "下一頁"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "右上角"
 
-#: ../ui/gtk/main.py:55
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "左下角"
 
-#: ../ui/gtk/main.py:59
-msgid "Restart Now"
-msgstr "現在重新啟動"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "右下角"
 
-#: ../ui/gtk/main.py:60
-msgid "Later"
-msgstr "稍候"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "自訂"
 
-#: ../ui/gtk/panel.py:109
-msgid "IBus input method framework"
-msgstr "IBus 輸入法框架"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus 偏好設定"
 
-#: ../ui/gtk/panel.py:327
-msgid "Restart"
-msgstr "重新啟動"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
-#: ../ui/gtk/panel.py:414
-msgid "Turn off input method"
-msgstr "關閉輸入法"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "下一個輸入法："
 
-#: ../ui/gtk/panel.py:453
-msgid "No input window"
-msgstr "無輸入視窗"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../ui/gtk/panel.py:484
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "上一個輸入法："
 
-#: ../ui/gtk/panel.py:488
-msgid "translator-credits"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+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 ""
-"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "關於輸入法"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>鍵盤快捷鍵</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "設置查詢表單內候選字詞的排列方向"
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "切換輸入法"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "候選詞排列方向："
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "關於"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "設置 ibus 如何顯示或隱藏語言列的行為"
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "關於輸入法"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "顯示語言面板："
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "語言：%s\n"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "語言面板位置："
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "鍵盤配置: %s\n"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "在系統匣內顯示圖示"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者：%s\n"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "在語言列上顯示輸入法名稱"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "描述：\n"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "當選取時在語言列上輸入法名稱"
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "觸發"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr ""
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "在應用程式視窗中內嵌輸入法的預先編輯文字"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr ""
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "使用自訂字型："
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "下一個輸入法"
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>字型與風格</b>"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "上一個輸入法"
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "通用"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus 幕後程式没有啟動，您是否想現在啟動它？"
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "加入選取的輸入法到已啟用的輸入法內"
 
-#: ../setup/main.py:301
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "顯示所選取的輸入法資訊"
+
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus 已經成功啟動！如果您無法使用 IBus，請將下列代碼加入到 $HOME/.bashrc 中，"
-"並重新登入桌面。\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
+"您可以使用 向上/向下 按鈕進行變更。</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "為 %s 選取鍵盤快捷鍵"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "輸入法"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "鍵盤快捷鍵"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "使用系統鍵盤配置"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "按鍵碼："
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "組合按鍵："
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>鍵盤配置</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "在所有的應用程式中共享同一個輸入法"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>全域輸入法設定值</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "進階"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"請按一個鍵盤按鍵 (或是按鍵組合)\n"
-"當您放開按鍵時，對話框會自動關閉。"
+"<big><b>IBus</b></big>\n"
+"<small>智慧型輸入框架</small>\n"
+"首頁: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "在登入時啟動 ibus"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "選取輸入法"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>啟動</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "輸入法"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "關於"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "鍵盤"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus 偏好設定"
+#: ../bus/ibus.desktop.in.h:2
+#, fuzzy
+msgid "Input Method Framework"
+msgstr "IBus 輸入法框架"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: ../bus/ibus.desktop.in.h:3
 #, fuzzy
-msgid "Set IBus Preferences"
-msgstr "IBus 偏好設定"
+msgid "Start IBus Input Method Framework"
+msgstr "IBus 輸入法框架"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "自動隱藏"
+msgid "Preload engines"
+msgstr "預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "自訂字型"
+msgid "Preload engines during ibus starts up"
+msgstr "當 ibus 啟動時預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "為語言面板自訂字型"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Embed Preedit Text"
-msgstr "內嵌編輯模式"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text in Application Window"
-msgstr "在應用程式視窗中內嵌編輯模式"
-
-#: ../data/ibus.schemas.in.h:6
-#, fuzzy
-msgid "Enable input method by default"
-msgstr "下一個輸入法"
+msgid "Trigger shortcut keys"
+msgstr "觸發用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+#, fuzzy
+msgid "Enable shortcut keys"
+msgstr "觸發用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Language panel position"
-msgstr "語言面板位置"
+#, fuzzy
+msgid "The shortcut keys for turning input method on"
+msgstr "用來開啟或關閉輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Next engine shortcut keys"
-msgstr "「下一個引擎」快捷鍵"
+#, fuzzy
+msgid "Disable shortcut keys"
+msgstr "觸發用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Orientation of lookup table"
-msgstr "查選表單表排列方向"
+#, fuzzy
+msgid "The shortcut keys for turning input method off"
+msgstr "用來開啟或關閉輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
+msgid "Next engine shortcut keys"
+msgstr "「下一個引擎」快捷鍵"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Preload engines"
-msgstr "預先載入引擎"
+#, fuzzy
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Preload engines during ibus starts up"
-msgstr "當 ibus 啟動時預先載入引擎"
-
-#: ../data/ibus.schemas.in.h:14
 msgid "Prev engine shortcut keys"
 msgstr "「上一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:15 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "在所有的應用程式中共享同一個輸入法"
-
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "在系統匣內顯示圖示"
-
-#: ../data/ibus.schemas.in.h:17
-msgid "Show input method name"
-msgstr "顯示輸入法名稱"
+#: ../data/ibus.schemas.in.h:14
+#, fuzzy
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-msgstr "在語言列上顯示輸入法名稱"
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "自動隱藏"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:16
 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:17
+msgid "Language panel position"
+msgstr "語言面板位置"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr "語言列的位置。0 = 左上角, 1 = 右上角, 2 = 左下角, 3 = 右下角, 4 = 自訂"
 
-#: ../data/ibus.schemas.in.h:21
-#, fuzzy
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "用來切換到清單內下一個輸入法的快捷鍵"
-
-#: ../data/ibus.schemas.in.h:22
-#, fuzzy
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "用來開啟或關閉輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Trigger shortcut keys"
-msgstr "觸發用快捷鍵"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:27
-msgid "Use global input method"
-msgstr "使用全域輸入法"
-
-#: ../data/ibus.schemas.in.h:28 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "使用系統鍵盤 (XKB) 配置"
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:29 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "使用系統鍵盤配置"
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "為語言面板自訂字型"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "內嵌編輯模式"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>字型與風格</b>"
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>全域輸入法設定值</b>"
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "使用全域輸入法"
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>鍵盤配置</b>"
+#: ../data/ibus.schemas.in.h:34
+#, fuzzy
+msgid "Enable input method by default"
+msgstr "下一個輸入法"
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>鍵盤快捷鍵</b>"
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>啟動</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智慧型輸入框架</small>\n"
-"首頁: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:14
+#: ../ibus/_config.py.in:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
-"您可以使用 向上/向下 按鈕進行變更。</i></small>"
+"版權所有 (c) 2007-2010 黃鵬\n"
+"版權所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "加入選取的輸入法到已啟用的輸入法內"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "其它"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "進階"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "語言：%s\n"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "總是"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "鍵盤配置: %s\n"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "左下角"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者：%s\n"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "右下角"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "描述：\n"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "候選詞排列方向："
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "選取輸入法"
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "自訂"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "鍵盤"
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr ""
+#: ../setup/ibus-setup.desktop.in.h:2
+#, fuzzy
+msgid "Set IBus Preferences"
+msgstr "IBus 偏好設定"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "在應用程式視窗中內嵌編輯模式"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "在應用程式視窗中內嵌輸入法的預先編輯文字"
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "按鍵碼："
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "嵌入選單內"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "組合按鍵："
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "啟用或停用："
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"請按一個鍵盤按鍵 (或是按鍵組合)\n"
+"當您放開按鍵時，對話框會自動關閉。"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
+
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "觸發"
+
+#: ../setup/main.py:80
+msgid "enable"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "通用"
+#: ../setup/main.py:81
+msgid "disable"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "水平"
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 幕後程式没有啟動，您是否想現在啟動它？"
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "語言面板位置："
+#: ../setup/main.py:344
+#, fuzzy
+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 已經成功啟動！如果您無法使用 IBus，請將下列代碼加入到 $HOME/.bashrc 中，"
+"並重新登入桌面。\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "下移所選取的輸入法"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "上移所選取的輸入法"
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "下一個輸入法："
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"版權所有 (c) 2007-2010 黃鵬\n"
+"版權所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "上一個輸入法："
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "從已啟用的輸入法中移除所選的輸入法"
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "設置 ibus 如何顯示或隱藏語言列的行為"
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "重新啟動"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "設置查詢表單內候選字詞的排列方向"
+#~ msgid "Previous page"
+#~ msgstr "上一頁"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "顯示所選取的輸入法資訊"
+#~ msgid "Next page"
+#~ msgstr "下一頁"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "當選取時在語言列上輸入法名稱"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "顯示語言面板："
+#~ msgid "Restart Now"
+#~ msgstr "現在重新啟動"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "在登入時啟動 ibus"
+#~ msgid "Later"
+#~ msgstr "稍候"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "用來切換到清單內下一個輸入法的快捷鍵"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus 輸入法框架"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+#~ msgid "Turn off input method"
+#~ msgstr "關閉輸入法"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "左上角"
+#~ msgid "No input window"
+#~ msgstr "無輸入視窗"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "右上角"
+#~ msgid "About the input method"
+#~ msgstr "關於輸入法"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "使用自訂字型："
+#~ msgid "Switch input method"
+#~ msgstr "切換輸入法"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "垂直"
+#~ msgid "About the Input Method"
+#~ msgstr "關於輸入法"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "當啟用時"
+#~ msgid "next input method"
+#~ msgstr "下一個輸入法"
+
+#~ msgid "previous input method"
+#~ msgstr "上一個輸入法"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1733a5cc2..569aa0958 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,538 +2,560 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2011-05-13 11:21+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-16 10:14+0900\n"
 "PO-Revision-Date: 2011-06-17 10:37+0000\n"
 "Last-Translator: zerng07 <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "水平"
 
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "輸入法框架"
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "垂直"
 
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "啟動 IBus 輸入法框架"
+#: ../setup/setup.ui.h:3
+msgid "Embedded in menu"
+msgstr "嵌入選單內"
 
-#: ../ibus/_config.py.in:40
-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."
+#: ../setup/setup.ui.h:4
+msgid "When active"
+msgstr "當啟用時"
 
-#: ../ibus/lang.py:41
-msgid "Other"
-msgstr "其它"
+#: ../setup/setup.ui.h:5
+msgid "Always"
+msgstr "總是"
 
-#: ../ui/gtk/candidatepanel.py:264
-msgid "Previous page"
-msgstr "上一頁"
+#: ../setup/setup.ui.h:6
+msgid "Top left corner"
+msgstr "左上角"
 
-#: ../ui/gtk/candidatepanel.py:269
-msgid "Next page"
-msgstr "下一頁"
+#: ../setup/setup.ui.h:7
+msgid "Top right corner"
+msgstr "右上角"
 
-#: ../ui/gtk/main.py:62
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
+#: ../setup/setup.ui.h:8
+msgid "Bottom left corner"
+msgstr "左下角"
 
-#: ../ui/gtk/main.py:66
-msgid "Restart Now"
-msgstr "現在重新啟動"
+#: ../setup/setup.ui.h:9
+msgid "Bottom right corner"
+msgstr "右下角"
 
-#: ../ui/gtk/main.py:67
-msgid "Later"
-msgstr "稍候"
+#: ../setup/setup.ui.h:10
+msgid "Custom"
+msgstr "自訂"
 
-#: ../ui/gtk/panel.py:116
-msgid "IBus Panel"
-msgstr "IBus 面板"
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus 偏好設定"
 
-#: ../ui/gtk/panel.py:122
-msgid "IBus input method framework"
-msgstr "IBus 輸入法框架"
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
-#: ../ui/gtk/panel.py:352
-msgid "Restart"
-msgstr "重新啟動"
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "下一個輸入法："
 
-#: ../ui/gtk/panel.py:439
-msgid "Turn off input method"
-msgstr "關閉輸入法"
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../ui/gtk/panel.py:478
-msgid "No input window"
-msgstr "無輸入視窗"
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "上一個輸入法："
 
-#: ../ui/gtk/panel.py:509
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
 
-#: ../ui/gtk/panel.py:513
-msgid "translator-credits"
-msgstr ""
-"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010."
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr "用來開啟或關閉輸入法的快捷鍵"
 
-#: ../ui/gtk/languagebar.py:106
-msgid "About the input method"
-msgstr "關於輸入法"
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "啟用或停用："
 
-#: ../ui/gtk/languagebar.py:214
-msgid "Switch input method"
-msgstr "切換輸入法"
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "啟用："
 
-#: ../ui/gtk/languagebar.py:357 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:16
-msgid "About"
-msgstr "關於"
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "停用："
 
-#: ../ui/gtk/languagebar.py:361
-msgid "About the Input Method"
-msgstr "關於輸入法"
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>鍵盤快捷鍵</b>"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
-#, python-format
-msgid "Language: %s\n"
-msgstr "語言：%s\n"
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "設置查詢表單內候選字詞的排列方向"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "鍵盤配置: %s\n"
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "候選詞排列方向："
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者：%s\n"
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "設置 ibus 如何顯示或隱藏語言列的行為"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
-msgid "Description:\n"
-msgstr "描述：\n"
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "顯示語言面板："
 
-#: ../setup/main.py:102
-msgid "trigger"
-msgstr "觸發"
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "語言面板位置："
 
-#: ../setup/main.py:113
-msgid "enable"
-msgstr "啟用"
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr "在系統匣內顯示圖示"
 
-#: ../setup/main.py:124
-msgid "disable"
-msgstr "停用"
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+msgid "Show input method name on language bar"
+msgstr "在語言列上顯示輸入法名稱"
 
-#: ../setup/main.py:135
-msgid "next input method"
-msgstr "下一個輸入法"
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "當選取時在語言列上輸入法名稱"
 
-#: ../setup/main.py:146
-msgid "previous input method"
-msgstr "上一個輸入法"
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../setup/main.py:286
-msgid "IBus daemon is not started. Do you want to start it now?"
-msgstr "IBus 幕後程式没有啟動，您是否想現在啟動它？"
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>字型與風格</b>"
+
+#: ../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
+#, fuzzy
+msgid "Show setup of the selected input method"
+msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/main.py:301
+#: ../setup/setup.ui.h:41
 msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
 msgstr ""
-"IBus 已經成功啟動！如果您無法使用 IBus，請將下列代碼加入到 $HOME/.bashrc 中，並重新登入桌面。\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
+"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
+"您可以使用 向上/向下 按鈕進行變更。</i></small>"
 
-#: ../setup/main.py:316
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "為 %s 選取鍵盤快捷鍵"
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "輸入法"
 
-#: ../setup/keyboardshortcut.py:52
-msgid "Keyboard shortcuts"
-msgstr "鍵盤快捷鍵"
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "使用系統鍵盤配置"
 
-#: ../setup/keyboardshortcut.py:63
-msgid "Key code:"
-msgstr "按鍵碼："
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/keyboardshortcut.py:78
-msgid "Modifiers:"
-msgstr "修飾鍵："
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "在所有的應用程式中共享同一個輸入法"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>全域輸入法設定值</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "進階"
+
+#: ../setup/setup.ui.h:50
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"請按一個鍵盤按鍵 (或是按鍵組合)\n"
-"當您放開按鍵時，對話框會自動關閉。"
+"<big><b>IBus</b></big>\n"
+"<small>智慧型輸入框架</small>\n"
+"首頁: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/keyboardshortcut.py:233
-msgid "Please press a key (or a key combination)"
-msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "在登入時啟動 ibus"
 
-#: ../setup/enginecombobox.py:120
-msgid "Select an input method"
-msgstr "選取輸入法"
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>啟動</b>"
 
-#. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:33
-msgid "Input Method"
-msgstr "輸入法"
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "關於"
 
-#: ../setup/enginetreeview.py:92
-msgid "Kbd"
-msgstr "鍵盤"
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
 
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:32
-msgid "IBus Preferences"
-msgstr "IBus 偏好設定"
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "輸入法框架"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "設置 IBus 偏好設定"
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "啟動 IBus 輸入法框架"
 
 #: ../data/ibus.schemas.in.h:1
-msgid "Auto hide"
-msgstr "自動隱藏"
+msgid "Preload engines"
+msgstr "預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:2
-msgid "Custom font"
-msgstr "自訂字型"
+msgid "Preload engines during ibus starts up"
+msgstr "當 ibus 啟動時預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr "為語言面板自訂字型"
+msgid "Engines order"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-msgid "Disable shortcut keys"
-msgstr "停用快捷鍵"
+msgid "Saved engines order in input method list"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Embed Preedit Text"
-msgstr "內嵌編輯模式"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Embed Preedit Text in Application Window"
-msgstr "在應用程式視窗中內嵌編輯模式"
+msgid "Trigger shortcut keys"
+msgstr "觸發用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable input method by default"
-msgstr "預設啟用輸入法"
+msgid "Enable shortcut keys"
+msgstr "啟用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:8
-msgid "Enable input method by default when the application gets input focus"
-msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
+msgid "The shortcut keys for turning input method on"
+msgstr "開啟輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:9
-msgid "Enable shortcut keys"
-msgstr "啟用快捷鍵"
+msgid "Disable shortcut keys"
+msgstr "停用快捷鍵"
 
 #: ../data/ibus.schemas.in.h:10
-msgid "Language panel position"
-msgstr "語言面板位置"
+msgid "The shortcut keys for turning input method off"
+msgstr "關閉輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
 msgstr "「下一個引擎」快捷鍵"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Orientation of lookup table"
-msgstr "查選表單表排列方向"
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:13
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
+msgid "Prev engine shortcut keys"
+msgstr "「上一個引擎」快捷鍵"
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Preload engines"
-msgstr "預先載入引擎"
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:15
-msgid "Preload engines during ibus starts up"
-msgstr "當 ibus 啟動時預先載入引擎"
+msgid "Auto hide"
+msgstr "自動隱藏"
 
 #: ../data/ibus.schemas.in.h:16
-msgid "Prev engine shortcut keys"
-msgstr "「上一個引擎」快捷鍵"
-
-#: ../data/ibus.schemas.in.h:17 ../setup/setup.ui.h:42
-msgid "Share the same input method among all applications"
-msgstr "在所有的應用程式中共享同一個輸入法"
-
-#: ../data/ibus.schemas.in.h:18 ../setup/setup.ui.h:43
-msgid "Show icon on system tray"
-msgstr "在系統匣內顯示圖示"
-
-#: ../data/ibus.schemas.in.h:19
-msgid "Show input method name"
-msgstr "顯示輸入法名稱"
-
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:45
-msgid "Show input method name on language bar"
-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
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr "語言面板位置"
+
+#: ../data/ibus.schemas.in.h:18
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr "語言列的位置。0 = 左上角, 1 = 右上角, 2 = 左下角, 3 = 右下角, 4 = 自訂"
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "用來切換到清單內下一個輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for turning input method off"
-msgstr "關閉輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "顯示輸入法名稱"
 
 #: ../data/ibus.schemas.in.h:26
-msgid "The shortcut keys for turning input method on"
-msgstr "開啟輸入法的快捷鍵"
+msgid "Use custom font"
+msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:27 ../setup/setup.ui.h:51
-msgid "The shortcut keys for turning input method on or off"
-msgstr "用來開啟或關閉輸入法的快捷鍵"
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "語言面板是否使用自訂字型"
 
 #: ../data/ibus.schemas.in.h:28
-msgid "Trigger shortcut keys"
-msgstr "觸發用快捷鍵"
+msgid "Custom font"
+msgstr "自訂字型"
 
 #: ../data/ibus.schemas.in.h:29
-msgid "Use custom font"
-msgstr "使用自訂字型"
+msgid "Custom font name for language panel"
+msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:30
-msgid "Use custom font name for language panel"
-msgstr "語言面板是否使用自訂字型"
+msgid "Embed Preedit Text"
+msgstr "內嵌編輯模式"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "在應用程式視窗中內嵌編輯模式"
+
+#: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:32 ../setup/setup.ui.h:55
-msgid "Use system keyboard (XKB) layout"
-msgstr "使用系統鍵盤 (XKB) 配置"
-
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:56
-msgid "Use system keyboard layout"
-msgstr "使用系統鍵盤配置"
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "預設啟用輸入法"
 
-#: ../setup/setup.ui.h:1
-msgid "..."
-msgstr "..."
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../setup/setup.ui.h:2
-msgid "<b>Font and Style</b>"
-msgstr "<b>字型與風格</b>"
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "<b>Global input method settings</b>"
-msgstr "<b>全域輸入法設定值</b>"
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>鍵盤配置</b>"
+#: ../ibus/_config.py.in:41
+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."
 
-#: ../setup/setup.ui.h:5
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>鍵盤快捷鍵</b>"
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "其它"
 
-#: ../setup/setup.ui.h:6
-msgid "<b>Startup</b>"
-msgstr "<b>啟動</b>"
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "語言：%s\n"
 
-#: ../setup/setup.ui.h:7
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智慧型輸入框架</small>\n"
-"首頁: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "鍵盤配置: %s\n"
 
-#: ../setup/setup.ui.h:14
-msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
-"您可以使用 向上/向下 按鈕進行變更。</i></small>"
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者：%s\n"
 
-#: ../setup/setup.ui.h:17
-msgid "Add the selected input method into the enabled input methods"
-msgstr "加入選取的輸入法到已啟用的輸入法內"
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "描述：\n"
 
-#: ../setup/setup.ui.h:18
-msgid "Advanced"
-msgstr "進階"
+#: ../setup/enginecombobox.py:136
+msgid "Select an input method"
+msgstr "選取輸入法"
 
-#: ../setup/setup.ui.h:19
-msgid "Always"
-msgstr "總是"
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "鍵盤"
 
-#: ../setup/setup.ui.h:20
-msgid "Bottom left corner"
-msgstr "左下角"
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "設置 IBus 偏好設定"
 
-#: ../setup/setup.ui.h:21
-msgid "Bottom right corner"
-msgstr "右下角"
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#: ../setup/setup.ui.h:22
-msgid "Candidates orientation:"
-msgstr "候選詞排列方向："
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "按鍵碼："
 
-#: ../setup/setup.ui.h:23
-msgid "Custom"
-msgstr "自訂"
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "修飾鍵："
 
-#: ../setup/setup.ui.h:24
-msgid "Disable:"
-msgstr "停用："
+#: ../setup/keyboardshortcut.py:235
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"請按一個鍵盤按鍵 (或是按鍵組合)\n"
+"當您放開按鍵時，對話框會自動關閉。"
 
-#: ../setup/setup.ui.h:25
-msgid "Embed preedit text in application window"
-msgstr "在應用程式視窗中內嵌編輯模式"
+#: ../setup/keyboardshortcut.py:237
+msgid "Please press a key (or a key combination)"
+msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/setup.ui.h:26
-msgid "Embed the preedit text of input method in the application window"
-msgstr "在應用程式視窗中內嵌輸入法的預先編輯文字"
+#: ../setup/main.py:79
+msgid "trigger"
+msgstr "觸發"
 
-#: ../setup/setup.ui.h:27
-msgid "Embedded in menu"
-msgstr "嵌入選單內"
+#: ../setup/main.py:80
+msgid "enable"
+msgstr "啟用"
 
-#: ../setup/setup.ui.h:28
-msgid "Enable or disable:"
-msgstr "啟用或停用："
+#: ../setup/main.py:81
+msgid "disable"
+msgstr "停用"
 
-#: ../setup/setup.ui.h:29
-msgid "Enable:"
-msgstr "啟用："
+#: ../setup/main.py:323
+#, fuzzy
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 幕後程式没有啟動，您是否想現在啟動它？"
 
-#: ../setup/setup.ui.h:30
-msgid "General"
-msgstr "通用"
+#: ../setup/main.py:344
+#, fuzzy
+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 已經成功啟動！如果您無法使用 IBus，請將下列代碼加入到 $HOME/.bashrc 中，"
+"並重新登入桌面。\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
-#: ../setup/setup.ui.h:31
-msgid "Horizontal"
-msgstr "水平"
+#: ../setup/main.py:357
+#, python-format
+msgid "IBus daemon coundn't be started in %d seconds"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "Language panel position:"
-msgstr "語言面板位置："
+#: ../setup/main.py:369
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../setup/setup.ui.h:35
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "下移所選取的輸入法"
+#: ../ui/gtk3/panel.vala:330
+#, fuzzy
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+"版權所有 (c) 2007-2010 黃鵬\n"
+"版權所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ../setup/setup.ui.h:36
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "上移所選取的輸入法"
+#: ../ui/gtk3/panel.vala:335
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../setup/setup.ui.h:37
-msgid "Next input method:"
-msgstr "下一個輸入法："
+#: ../ui/gtk3/panel.vala:339
+msgid "translator-credits"
+msgstr ""
+"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010."
 
-#: ../setup/setup.ui.h:38
-msgid "Previous input method:"
-msgstr "上一個輸入法："
+#: ../ui/gtk3/panel.vala:371
+msgid "Restart"
+msgstr "重新啟動"
 
-#: ../setup/setup.ui.h:39
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "從已啟用的輸入法中移除所選的輸入法"
+#~ msgid "Previous page"
+#~ msgstr "上一頁"
 
-#: ../setup/setup.ui.h:40
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "設置 ibus 如何顯示或隱藏語言列的行為"
+#~ msgid "Next page"
+#~ msgstr "下一頁"
 
-#: ../setup/setup.ui.h:41
-msgid "Set the orientation of candidates in lookup table"
-msgstr "設置查詢表單內候選字詞的排列方向"
+#~ msgid ""
+#~ "Some input methods have been installed, removed or updated. Please "
+#~ "restart ibus input platform."
+#~ msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "顯示所選取的輸入法資訊"
+#~ msgid "Restart Now"
+#~ msgstr "現在重新啟動"
 
-#: ../setup/setup.ui.h:46
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "當選取時在語言列上輸入法名稱"
+#~ msgid "Later"
+#~ msgstr "稍候"
 
-#: ../setup/setup.ui.h:47
-msgid "Show language panel:"
-msgstr "顯示語言面板："
+#~ msgid "IBus Panel"
+#~ msgstr "IBus 面板"
 
-#: ../setup/setup.ui.h:48
-msgid "Start ibus on login"
-msgstr "在登入時啟動 ibus"
+#~ msgid "IBus input method framework"
+#~ msgstr "IBus 輸入法框架"
 
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "用來切換到清單內下一個輸入法的快捷鍵"
+#~ msgid "Turn off input method"
+#~ msgstr "關閉輸入法"
 
-#: ../setup/setup.ui.h:50
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+#~ msgid "No input window"
+#~ msgstr "無輸入視窗"
 
-#: ../setup/setup.ui.h:52
-msgid "Top left corner"
-msgstr "左上角"
+#~ msgid "About the input method"
+#~ msgstr "關於輸入法"
 
-#: ../setup/setup.ui.h:53
-msgid "Top right corner"
-msgstr "右上角"
+#~ msgid "Switch input method"
+#~ msgstr "切換輸入法"
 
-#: ../setup/setup.ui.h:54
-msgid "Use custom font:"
-msgstr "使用自訂字型："
+#~ msgid "About the Input Method"
+#~ msgstr "關於輸入法"
 
-#: ../setup/setup.ui.h:57
-msgid "Vertical"
-msgstr "垂直"
+#~ msgid "next input method"
+#~ msgstr "下一個輸入法"
 
-#: ../setup/setup.ui.h:58
-msgid "When active"
-msgstr "當啟用時"
+#~ msgid "previous input method"
+#~ msgstr "上一個輸入法"
diff --git a/setup/main.py b/setup/main.py
index fdfb33a92..300f11bce 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -320,7 +320,7 @@ def __init_bus(self):
         if self.__bus.is_connected():
             return
 
-        message = _("IBus daemon is not started. Do you want to start it now?")
+        message = _("The IBus daemon is not running. Do you wish to start it?")
         dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION,
                                 buttons = Gtk.ButtonsType.YES_NO,
                                 text = message)
@@ -342,7 +342,7 @@ def __init_bus(self):
 
         if self.__bus.is_connected():
             message = _("IBus has been started! "
-                "If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
+                "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"

From 32533c72be144e0a26902e11ed0b967208a17317 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Thu, 17 May 2012 11:08:14 -0400
Subject: [PATCH 047/816] Don't not set orientation when hide lookup table to
 improve UI performance.

BUG=http://code.google.com/p/ibus/issues/detail?id=1461
TEST=manually

Review URL: https://codereview.appspot.com/6203085
---
 ui/gtk3/candidatepanel.vala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index a029e8fc8..0cf3c57fc 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -155,9 +155,15 @@ public class CandidatePanel : Gtk.HBox{
 
             orientation = (IBus.Orientation)table.get_orientation();
         }
+
         m_candidate_area.set_candidates(candidates, cursor_in_page, show_cursor);
         set_labels(labels);
-        set_orientation(orientation);
+
+        if (table != null) {
+            // Do not change orientation if table is null to avoid recreate
+            // candidates area.
+            set_orientation(orientation);
+        }
 
         if (candidates.length != 0)
             m_candidate_area.show_all();

From 4bee2863e8d2e51b185b6d149e6259848d8c0cb6 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Sun, 20 May 2012 15:01:01 +0900
Subject: [PATCH 048/816] dconf: use text-based key file and dconf update

BUG=none
TEST=manually

Review URL: https://codereview.appspot.com/6215062
---
 data/dconf/Makefile.am               | 18 +++++++++------
 data/dconf/make-dconf-override-db.sh | 33 ++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index daea8968a..54861a7e0 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = \
 	$(gsettings_schemas_in_files) \
 	make-dconf-override-db.sh \
 	profile/ibus \
+	00-upstream-settings \
 	$(NULL)
 
 DISTCLEANFILES = \
@@ -40,23 +41,26 @@ DISTCLEANFILES = \
 
 MAINTAINERCLEANFILES = \
 	$(gsettings_schemas_in_files) \
+	00-upstream-settings \
 	$(NULL)
 
-CLEANFILES = \
-	db/ibus \
-	$(NULL)
+dconfprofiledir = $(sysconfdir)/dconf/profile
+dconfprofile_DATA = profile/ibus
 
-dconfprofiledir = $(sysconfdir)/dconf
-nobase_dconfprofile_DATA = db/ibus profile/ibus
+dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
+dconfdb_DATA = 00-upstream-settings
 
 org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
 	$(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
 		--schema-id "org.freedesktop.ibus" \
 		--output $@ $<
 
-db/ibus: $(srcdir)/make-dconf-override-db.sh $(gsettings_SCHEMAS)
+00-upstream-settings: $(srcdir)/make-dconf-override-db.sh $(gsettings_SCHEMAS)
 	@$(MKDIR_P) db
-	$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh $@ || \
+	$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
 		{ rc=$$?; $(RM) -rf $@; exit $$rc; }
 
+install-data-hook:
+	dconf update
+
 -include $(top_srcdir)/git.mk
diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
index 0d8456b06..49a6df97c 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -15,17 +15,32 @@ trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
 # in case that schema is not installed on the system
 glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
 
-gsettings list-recursively org.freedesktop.ibus.general | \
-while read schema key val; do
-    gsettings set "$schema" "$key" "$val"
+cat <<EOF
+# This file is a part of the IBus packaging and should not be changed.
+#
+# Instead create your own file next to it with a higher numbered prefix,
+# and run
+#
+#       dconf update
+#
+EOF
+
+# Loop over top level schemas since "gsettings list-recursively" only
+# looks for direct children.
+schemas="org.freedesktop.ibus.general org.freedesktop.ibus.panel"
+current_schema=
+for schema in $schemas; do
+  gsettings list-recursively $schema | \
+  while read schema key val; do
+    if test "$schema" != "$current_schema"; then
+      echo
+      echo $schema | sed 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/'
+      current_schema="$schema"
+    fi
+    echo "$key=$val"
+  done
 done
 
-gsettings list-recursively org.freedesktop.ibus.panel | \
-while read schema key val; do
-    gsettings set "$schema" "$key" "$val"
-done
-
-mv $XDG_CONFIG_HOME/dconf/user "$1"
 rm -rf $TMPDIR
 
 kill $DBUS_SESSION_BUS_PID

From b745ea21b1ed6cbcec6614f957d1bd9c731f88c2 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 23 May 2012 09:55:38 +0900
Subject: [PATCH 049/816] gtk3: don't show "missing" icon for each submenu

BUG=none
TEST=manually

Review URL: https://codereview.appspot.com/6211072
---
 ui/gtk3/property.vala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index e24bc4043..eb3563642 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -126,7 +126,8 @@ public class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
 
     private void sync() {
         set_label(m_property.get_label().get_text());
-        set_icon(m_property.get_icon());
+        if (m_property.get_icon() != "")
+            set_icon(m_property.get_icon());
         set_visible(m_property.get_visible());
         set_sensitive(m_property.get_sensitive());
     }

From 83397c256ff39da5c03cc9bdf935883046083f8f Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Sun, 27 May 2012 21:45:58 -0400
Subject: [PATCH 050/816] Refine inline document of
 ibus_engine_update_preedit_text_with_mode()

BUG=http://code.google.com/p/ibus/issues/detail?id=1045
TEST=None

Review URL: https://codereview.appspot.com/6249058
---
 src/ibusengine.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ibusengine.h b/src/ibusengine.h
index d2d01a025..c12e254b9 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -225,10 +225,14 @@ void         ibus_engine_update_preedit_text
  * @visible: Whether the pre-edit buffer is visible.
  * @mode: Pre-edit commit mode when the focus is lost.
  *
- * Update the pre-edit buffer with commit mode.
- * if mode is IBUS_ENGINE_PREEDIT_CLEAR,
- * ibus_engine_update_preedit_text_with_mode is compatible with
- * ibus_engine_update_preedit_text.
+ * 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.
+ *
+ * If @mode is IBUS_ENGINE_PREEDIT_COMMIT, contents of the pre-edit buffer
+ * will be comitted and cleared.
+ * If @mode is IBUS_ENGINE_PREEDIT_CLEAR, contents of the pre-edit buffer
+ * will be cleared only.
  *
  * (Note: The text object will be released, if it is floating.
  *  If caller want to keep the object, caller should make the object

From 82e628c3cb911e078cfe95a226ddb88cf75b1257 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 28 May 2012 10:59:22 +0900
Subject: [PATCH 051/816] dconf: don't regenerate 00-upstream-settings after
 intltool-merge

BUG=https://codereview.appspot.com/6215062/#msg10
TEST=manually with make distcheck

Review URL: https://codereview.appspot.com/6245050
---
 data/dconf/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index 54861a7e0..b99380f44 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = \
 	00-upstream-settings \
 	$(NULL)
 
-DISTCLEANFILES = \
+CLEANFILES = \
 	$(gsettings_SCHEMAS) \
 	$(NULL)
 
@@ -55,7 +55,7 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
 		--schema-id "org.freedesktop.ibus" \
 		--output $@ $<
 
-00-upstream-settings: $(srcdir)/make-dconf-override-db.sh $(gsettings_SCHEMAS)
+00-upstream-settings: $(srcdir)/make-dconf-override-db.sh | $(gsettings_SCHEMAS)
 	@$(MKDIR_P) db
 	$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
 		{ rc=$$?; $(RM) -rf $@; exit $$rc; }

From 095e8232b871738ff2d22f33e70c4b1199ea6b4f Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 30 May 2012 07:42:51 -0400
Subject: [PATCH 052/816] Update setup ui file to gtk 3.0 and remove a debug
 print.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/6244057
---
 setup/enginecombobox.py |   1 -
 setup/setup.ui          | 191 +++++++++++++++++++++++++++++++++-------
 2 files changed, 161 insertions(+), 31 deletions(-)

diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index 0ac73685c..f80b164e4 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -65,7 +65,6 @@ def set_engines(self, engines):
         self.__model.set(iter1, 0, 0)
         langs = {}
         for e in engines:
-            print e.get_language()
             l = IBus.get_language_name(e.get_language())
             if l == None:
                 l = ""
diff --git a/setup/setup.ui b/setup/setup.ui
index e37cb323a..8121d629f 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="model_candidates_orientation">
     <columns>
       <!-- column-name gchararray -->
@@ -16,47 +15,48 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="model_panel_show_mode">
+  <object class="GtkListStore" id="model_panel_position">
     <columns>
-      <!-- column-name gchararray -->
+      <!-- column-name position -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Embedded in menu</col>
+        <col id="0" translatable="yes">Top left corner</col>
       </row>
       <row>
-        <col id="0" translatable="yes">When active</col>
+        <col id="0" translatable="yes">Top right corner</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Always</col>
+        <col id="0" translatable="yes">Bottom left corner</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom right corner</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Custom</col>
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="model_panel_position">
+  <object class="GtkListStore" id="model_panel_show_mode">
     <columns>
-      <!-- column-name position -->
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Top left corner</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Top right corner</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bottom left corner</col>
+        <col id="0" translatable="yes">Embedded in menu</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom right corner</col>
+        <col id="0" translatable="yes">When active</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Custom</col>
+        <col id="0" translatable="yes">Always</col>
       </row>
     </data>
   </object>
   <object class="GtkWindow" id="window_preferences">
+    <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">IBus Preferences</property>
     <property name="resizable">False</property>
@@ -65,7 +65,7 @@
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
@@ -74,6 +74,7 @@
             <child>
               <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="top_padding">12</property>
                 <property name="bottom_padding">12</property>
                 <property name="left_padding">12</property>
@@ -81,21 +82,24 @@
                 <child>
                   <object class="GtkVBox" id="vbox5">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkTable" id="table1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_rows">5</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">12</property>
@@ -103,6 +107,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">The shortcut keys for switching to next input method in the list</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Next input method:</property>
@@ -118,6 +123,7 @@
                                   <object class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
+                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">The shortcut keys for switching to previous input method in the list</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Previous input method:</property>
@@ -132,6 +138,7 @@
                                 <child>
                                   <object class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_trigger">
@@ -140,19 +147,24 @@
                                         <property name="editable">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_trigger">
                                         <property name="label" translatable="yes">...</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -165,6 +177,7 @@
                                 <child>
                                   <object class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_next_engine">
@@ -173,19 +186,24 @@
                                         <property name="editable">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_next_engine">
                                         <property name="label" translatable="yes">...</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -200,6 +218,7 @@
                                 <child>
                                   <object class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_prev_engine">
@@ -209,20 +228,25 @@
                                         <property name="editable">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_prev_engine">
                                         <property name="label" translatable="yes">...</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -237,6 +261,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">The shortcut keys for turning input method on or off</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Enable or disable:</property>
@@ -249,6 +274,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label18">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Enable:</property>
                                   </object>
@@ -262,6 +288,7 @@
                                 <child>
                                   <object class="GtkHBox" id="hbox2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_enable_unconditional">
@@ -270,19 +297,24 @@
                                         <property name="editable">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_enable_unconditional">
                                         <property name="label" translatable="yes">...</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -297,6 +329,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label19">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Disable:</property>
                                   </object>
@@ -310,6 +343,7 @@
                                 <child>
                                   <object class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_disable_unconditional">
@@ -318,19 +352,24 @@
                                         <property name="editable">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_disable_unconditional">
                                         <property name="label" translatable="yes">...</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -349,6 +388,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Keyboard Shortcuts&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -356,22 +396,26 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkTable" id="table2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_rows">7</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">12</property>
@@ -379,6 +423,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Set the orientation of candidates in lookup table</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Candidates orientation:</property>
@@ -391,6 +436,7 @@
                                 <child>
                                   <object class="GtkComboBox" id="combobox_lookup_table_orientation">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="model">model_candidates_orientation</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="renderer1"/>
@@ -407,6 +453,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Set the behavior of ibus how to show or hide language bar</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Show language panel:</property>
@@ -420,6 +467,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label16">
+                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Language panel position:</property>
@@ -434,6 +482,7 @@
                                 <child>
                                   <object class="GtkComboBox" id="combobox_panel_show">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="model">model_panel_show_mode</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="renderer2"/>
@@ -451,6 +500,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="combobox_panel_position">
+                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="model">model_panel_position</property>
                                     <child>
@@ -470,10 +520,13 @@
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_show_icon_on_systray">
                                     <property name="label" translatable="yes">Show icon on system tray</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Show icon on system tray</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -486,10 +539,13 @@
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_show_im_name">
                                     <property name="label" translatable="yes">Show input method name on language bar</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Show input method's name on language bar when check the checkbox</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -502,10 +558,13 @@
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_embed_preedit_text">
                                     <property name="label" translatable="yes">Embed preedit text in application window</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Embed the preedit text of input method in the application window</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -518,10 +577,13 @@
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_custom_font">
                                     <property name="label" translatable="yes">Use custom font:</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -532,9 +594,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkFontButton" id="fontbutton_custom_font">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -550,6 +614,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label13">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Font and Style&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -557,6 +622,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -567,6 +633,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">General</property>
               </object>
               <packing>
@@ -576,6 +643,7 @@
             <child>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="top_padding">12</property>
                 <property name="bottom_padding">12</property>
                 <property name="left_padding">12</property>
@@ -583,21 +651,24 @@
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkAlignment" id="alignment6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkVBox" id="vbox3">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment_engine_combobox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="EngineComboBox" id="combobox_engines">
                                         <property name="visible">True</property>
@@ -606,6 +677,7 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -615,8 +687,6 @@
                                     <property name="height_request">300</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
                                     <property name="shadow_type">in</property>
                                     <child>
                                       <object class="EngineTreeView" id="treeview_engines">
@@ -626,6 +696,8 @@
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -633,27 +705,32 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkVButtonBox" id="vbuttonbox1">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="button_engine_add">
                                     <property name="label">gtk-add</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Add the selected input method into the enabled input methods</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -665,11 +742,13 @@
                                 <child>
                                   <object class="GtkButton" id="button_engine_remove">
                                     <property name="label">gtk-remove</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Remove the selected input method from the enabled input methods</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -681,11 +760,13 @@
                                 <child>
                                   <object class="GtkButton" id="button_engine_up">
                                     <property name="label">gtk-go-up</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Move up the selected input method in the enabled input methods list</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -697,11 +778,13 @@
                                 <child>
                                   <object class="GtkButton" id="button_engine_down">
                                     <property name="label">gtk-go-down</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Move down the selected input method in the enabled input methods</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -713,11 +796,13 @@
                                 <child>
                                   <object class="GtkButton" id="button_engine_about">
                                     <property name="label">gtk-about</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Show information of the selected input method</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -729,11 +814,13 @@
                                 <child>
                                   <object class="GtkButton" id="button_engine_preferences">
                                     <property name="label">gtk-preferences</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Show setup of the selected input method</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
                                   </object>
                                   <packing>
@@ -747,42 +834,52 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="top_padding">6</property>
                         <child>
                           <object class="GtkHBox" id="hbox8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="stock">gtk-info</property>
                                 <property name="icon-size">2</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="label11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The default input method is the top one in the list.
 You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -791,6 +888,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -804,6 +902,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Input Method</property>
               </object>
               <packing>
@@ -814,6 +913,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
             <child>
               <object class="GtkAlignment" id="alignment9">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="top_padding">12</property>
                 <property name="bottom_padding">12</property>
                 <property name="left_padding">12</property>
@@ -821,33 +921,39 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                 <child>
                   <object class="GtkVBox" id="vbox7">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkFrame" id="frame2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment10">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkAlignment" id="alignment11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox8">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkCheckButton" id="checkbutton_use_sys_layout">
                                         <property name="label" translatable="yes">Use system keyboard layout</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text" translatable="yes">Use system keyboard (XKB) layout</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
                                       <packing>
@@ -865,6 +971,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                         <child type="label">
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -879,28 +986,34 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                     <child>
                       <object class="GtkFrame" id="frame5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkAlignment" id="alignment13">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox9">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkCheckButton" id="checkbutton_use_global_engine">
                                         <property name="label" translatable="yes">Share the same input method among all applications</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
                                       <packing>
@@ -918,6 +1031,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                         <child type="label">
                           <object class="GtkLabel" id="label17">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Global input method settings&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -939,6 +1053,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
             <child type="tab">
               <object class="GtkLabel" id="label14">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Advanced</property>
               </object>
               <packing>
@@ -948,14 +1063,15 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
             </child>
             <child>
               <object class="GtkVBox" id="vbox4">
+                <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;IBus&lt;/b&gt;&lt;/big&gt;
 &lt;small&gt;The intelligent input bus&lt;/small&gt;
 Homepage: http://code.google.com/p/ibus
@@ -967,26 +1083,33 @@ Homepage: http://code.google.com/p/ibus
                     <property name="justify">center</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame1">
+                    <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="checkbutton_auto_start">
                             <property name="label" translatable="yes">Start ibus on login</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                         </child>
@@ -995,6 +1118,7 @@ Homepage: http://code.google.com/p/ibus
                     <child type="label">
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Startup&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1014,6 +1138,7 @@ Homepage: http://code.google.com/p/ibus
             <child type="tab">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">About</property>
               </object>
               <packing>
@@ -1023,20 +1148,25 @@ Homepage: http://code.google.com/p/ibus
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_close">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -1048,6 +1178,7 @@ Homepage: http://code.google.com/p/ibus
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>

From 1fc1dc476ddc65e55fa2834c13b42bdb5880d52d Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 30 May 2012 11:38:40 -0400
Subject: [PATCH 053/816] Change engines order when global_engine is changed.

BUG=http://code.google.com/p/ibus/issues/detail?id=1464
TEST=Manually

Review URL: https://codereview.appspot.com/6249064
---
 ui/gtk3/panel.vala | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 251a65e93..b494b3629 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -174,12 +174,7 @@ class Panel : IBus.PanelService {
         if (i == 0 && !force)
             return;
 
-        // Move the target engine to the first place.
         IBus.EngineDesc engine = m_engines[i];
-        for (int j = i; j > 0; j--) {
-            m_engines[j] = m_engines[j - 1];
-        }
-        m_engines[0] = engine;
 
         if (!m_bus.set_global_engine(engine.get_name())) {
             warning("Switch engine to %s failed.", engine.get_name());
@@ -195,15 +190,6 @@ class Panel : IBus.PanelService {
         } catch (GLib.SpawnError e) {
             warning("execute setxkblayout failed");
         }
-
-        string[] names = {};
-        foreach(var desc in m_engines) {
-            names += desc.get_name();
-        }
-        if (m_config != null)
-            m_config.set_value("general",
-                               "engines_order",
-                               new GLib.Variant.strv(names));
     }
 
     private void config_value_changed_cb(IBus.Config config,
@@ -494,5 +480,36 @@ class Panel : IBus.PanelService {
             m_status_icon.set_from_file(icon_name);
         else
             m_status_icon.set_from_icon_name(icon_name);
+
+        if (engine == null)
+            return;
+
+        int i;
+        for (i = 0; i < m_engines.length; i++) {
+            if (m_engines[i].get_name() == engine.get_name())
+                break;
+        }
+
+        // engine is first engine in m_engines.
+        if (i == 0)
+            return;
+
+        // engine is not in m_engines.
+        if (i >= m_engines.length)
+            return;
+
+        for (int j = i; j > 0; j--) {
+            m_engines[j] = m_engines[j - 1];
+        }
+        m_engines[0] = engine;
+
+        string[] names = {};
+        foreach(var desc in m_engines) {
+            names += desc.get_name();
+        }
+        if (m_config != null)
+            m_config.set_value("general",
+                               "engines_order",
+                               new GLib.Variant.strv(names));
     }
 }

From c3688a9849e588e17db825dc24e6dde86d61a77a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 31 May 2012 11:38:40 +0900
Subject: [PATCH 054/816] Fix a SEGV when close the shortcutkey dialog and
 update mnemonic.

TEST=Manually

Review URL: https://codereview.appspot.com/6256068
---
 setup/keyboardshortcut.py | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 8972dafbb..7cc8649ec 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -84,14 +84,30 @@ def __init_ui(self):
 
         table = Gtk.Table(4, 2)
         self.__modifier_buttons = []
-        self.__modifier_buttons.append(("Control",  Gtk.CheckButton("_Control"),    Gdk.ModifierType.CONTROL_MASK))
-        self.__modifier_buttons.append(("Alt",      Gtk.CheckButton("A_lt"),        Gdk.ModifierType.MOD1_MASK))
-        self.__modifier_buttons.append(("Shift",    Gtk.CheckButton("_Shift"),      Gdk.ModifierType.SHIFT_MASK))
-        self.__modifier_buttons.append(("Meta",     Gtk.CheckButton("_Meta"),       Gdk.ModifierType.META_MASK))
-        self.__modifier_buttons.append(("Super",    Gtk.CheckButton("S_uper"),      Gdk.ModifierType.SUPER_MASK))
-        self.__modifier_buttons.append(("Hyper",    Gtk.CheckButton("_Hyper"),      Gdk.ModifierType.HYPER_MASK))
-        self.__modifier_buttons.append(("Capslock", Gtk.CheckButton("Capsloc_k"),   Gdk.ModifierType.LOCK_MASK))
-        self.__modifier_buttons.append(("Release",  Gtk.CheckButton("_Release"),    Gdk.ModifierType.RELEASE_MASK))
+        self.__modifier_buttons.append(("Control",
+                                        Gtk.CheckButton.new_with_mnemonic("_Control"),
+                                        Gdk.ModifierType.CONTROL_MASK))
+        self.__modifier_buttons.append(("Alt",
+                                        Gtk.CheckButton.new_with_mnemonic("A_lt"),
+                                        Gdk.ModifierType.MOD1_MASK))
+        self.__modifier_buttons.append(("Shift",
+                                        Gtk.CheckButton.new_with_mnemonic("_Shift"),
+                                        Gdk.ModifierType.SHIFT_MASK))
+        self.__modifier_buttons.append(("Meta",
+                                        Gtk.CheckButton.new_with_mnemonic("_Meta"),
+                                        Gdk.ModifierType.META_MASK))
+        self.__modifier_buttons.append(("Super",
+                                        Gtk.CheckButton.new_with_mnemonic("S_uper"),
+                                        Gdk.ModifierType.SUPER_MASK))
+        self.__modifier_buttons.append(("Hyper",
+                                        Gtk.CheckButton.new_with_mnemonic("_Hyper"),
+                                        Gdk.ModifierType.HYPER_MASK))
+        self.__modifier_buttons.append(("Capslock",
+                                        Gtk.CheckButton.new_with_mnemonic("Capsloc_k"),
+                                        Gdk.ModifierType.LOCK_MASK))
+        self.__modifier_buttons.append(("Release",
+                                        Gtk.CheckButton.new_with_mnemonic("_Release"),
+                                        Gdk.ModifierType.RELEASE_MASK))
         for name, button, mask in self.__modifier_buttons:
             button.connect("toggled", self.__modifier_button_toggled_cb, name)
 
@@ -203,8 +219,8 @@ def __del_selected_shortcut(self):
 
     def __shortcut_view_cursor_changed_cb(self, treeview):
         shortcut = self.__get_selected_shortcut()
-        self.__set_shortcut_to_buttons(shortcut)
         if shortcut != None:
+            self.__set_shortcut_to_buttons(shortcut)
             self.__delete_button.set_sensitive(True)
         else:
             self.__delete_button.set_sensitive(False)

From 39522cfd9ffdcf7fce1b73e8228d271828dfe55f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 31 May 2012 11:45:15 +0900
Subject: [PATCH 055/816] Enhance ibus-ui-gtk3 switcher labels.

TEST=Linux desktop

Review URL: https://codereview.appspot.com/5956045
---
 ui/gtk3/switcher.vala | 121 +++++++++++++++++++++++++++++++++---------
 1 file changed, 96 insertions(+), 25 deletions(-)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 73b58d2fb..c39fc1c6f 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -20,13 +20,50 @@
  * Boston, MA  02111-1307  USA
  */
 
-using IBus;
+using Atk;
 using GLib;
 using Gtk;
+using IBus;
+using Pango;
 
 class Switcher : Gtk.Window {
+    private const int DEFAULT_FONT_SIZE = 16;
+    private const int DESC_LABEL_MAX_LEN = 20;
+
+    private class IBusEngineButton : Gtk.Button {
+        public IBusEngineButton(IBus.EngineDesc engine) {
+            GLib.Object();
+            this.longname = engine.get_longname();
+            var language = engine.get_language();
+            var symbol = engine.get_symbol();
+            var id = language;
+
+            if (id.length > 2) {
+                id = id[0:2];
+            }
+            if (symbol.length != 0) {
+                id = symbol;
+            }
+
+            Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
+            add(align);
+            Gtk.Box box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            align.add(box);
+
+            Gtk.Label label = new Gtk.Label(id);
+            string id_font = "%d".printf(DEFAULT_FONT_SIZE);
+            string markup = "<span font=\"%s\">%s</span>".printf(id_font, id);
+
+            label.set_markup(markup);
+            box.pack_start(label, false, false, 0);
+        }
+
+        public string longname { get; set; }
+    }
+
     private Gtk.Box m_box;
-    private Gtk.Button[] m_buttons = {};
+    private Gtk.Label m_label;
+    private IBusEngineButton[] m_buttons = {};
     private IBus.EngineDesc[] m_engines;
     private uint m_selected_engine;
     private uint m_primary_modifier;
@@ -43,8 +80,23 @@ class Switcher : Gtk.Window {
             modal : true,
             focus_visible : true
         );
-        m_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        add(m_box);
+        Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        add(vbox);
+        Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
+        vbox.pack_start(align, true, true, 0);
+        m_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+        align.add(m_box);
+        m_label = new Gtk.Label("");
+
+        /* Set the accessible role of the label to a status bar so it
+         * will emit name changed events that can be used by screen
+         * readers.
+         */
+        Atk.Object obj = m_label.get_accessible();
+        obj.set_role (Atk.Role.STATUSBAR);
+
+        m_label.set_padding(3, 3);
+        vbox.pack_end(m_label, false, false, 0);
 
         grab_focus();
     }
@@ -59,6 +111,7 @@ class Switcher : Gtk.Window {
 
         update_engines(engines);
         m_selected_engine = index;
+        m_label.set_text(m_buttons[index].longname);
         m_buttons[index].grab_focus();
 
         Gdk.Device device = event.get_device();
@@ -138,6 +191,7 @@ class Switcher : Gtk.Window {
         return m_result;
     }
 
+    /* Based on metacity/src/ui/tabpopup.c:meta_ui_tab_popup_new */
     private void update_engines(IBus.EngineDesc[] engines) {
         foreach (var button in m_buttons) {
             button.destroy();
@@ -149,28 +203,15 @@ class Switcher : Gtk.Window {
             return;
         }
 
-        int width, height;
-        Gtk.icon_size_lookup(Gtk.IconSize.MENU, out width, out height);
         m_engines = engines;
+        int max_label_width = 0;
+
         for (int i = 0; i < m_engines.length; i++) {
             var index = i;
             var engine = m_engines[i];
+            var button = new IBusEngineButton(engine);
             var longname = engine.get_longname();
-            var language = engine.get_language();
-            var symbol = engine.get_symbol();
-            var id = language;
-
-            if (id.length > 2) {
-                id = id[0:2];
-            }
-            if (symbol.length != 0) {
-                id = symbol;
-            }
-            var label = "%-15s %s".printf(longname, id);
-            var button = new Gtk.Button.with_label(label);
-            button.set_image(new IconWidget(engine.get_icon(), width));
             button.set_relief(Gtk.ReliefStyle.NONE);
-            button.set_alignment(1.0f, 0.0f);
             button.show();
 
             button.enter_notify_event.connect((e) => {
@@ -186,12 +227,40 @@ class Switcher : Gtk.Window {
                 return true;
             });
 
+            if (longname.length > DESC_LABEL_MAX_LEN) {
+                longname = longname[0:DESC_LABEL_MAX_LEN];
+            }
+
+            button.longname = longname;
+            m_label.set_label(longname);
+
+            int width;
+            m_label.get_preferred_width(null, out width);
+            max_label_width = int.max(max_label_width, width);
+
             m_box.pack_start(button, true, true);
             m_buttons += button;
         }
 
-        // Cause window recalculate the perferred size.
-        resize(1, 1);
+        m_label.set_text(m_buttons[0].longname);
+        m_label.set_ellipsize(Pango.EllipsizeMode.END);
+
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Screen screen = (display != null) ?
+                display.get_default_screen() : null;
+        int screen_width = 0;
+
+        if (screen != null) {
+            screen_width = screen.get_width();
+        }
+
+        if (screen_width > 0 && max_label_width > (screen_width / 4)) {
+            max_label_width = screen_width / 4;
+        }
+
+        /* add random padding */
+        max_label_width += 20;
+        set_default_size(max_label_width, -1);
     }
 
     private void next_engine() {
@@ -199,6 +268,7 @@ class Switcher : Gtk.Window {
             m_selected_engine = 0;
         else
             m_selected_engine ++;
+        m_label.set_text(m_buttons[m_selected_engine].longname);
         set_focus(m_buttons[m_selected_engine]);
     }
 
@@ -207,6 +277,7 @@ class Switcher : Gtk.Window {
             m_selected_engine = m_engines.length - 1;
         else
             m_selected_engine --;
+        m_label.set_text(m_buttons[m_selected_engine].longname);
         set_focus(m_buttons[m_selected_engine]);
     }
 
@@ -227,18 +298,18 @@ class Switcher : Gtk.Window {
                     previous_engine();
                 break;
             case 0x08fb: /* leftarrow */
-            case 0xff51: /* Down */
+            case 0xff51: /* Left */
+                previous_engine();
                 break;
             case 0x08fc: /* uparrow */
             case 0xff52: /* Up */
-                previous_engine();
                 break;
             case 0x08fd: /* rightarrow */
             case 0xff53: /* Right */
+                next_engine();
                 break;
             case 0x08fe: /* downarrow */
             case 0xff54: /* Down */
-                next_engine();
                 break;
             default:
                 debug("0x%04x", pe->keyval);

From d4f7a90936960ba3618cb621766e993951ed20de Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Tue, 5 Jun 2012 09:59:06 -0400
Subject: [PATCH 056/816] Use IM icon in switcher dialog.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/6274044
---
 ui/gtk3/Makefile.am   |  3 +++
 ui/gtk3/switcher.vala | 44 ++++++++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 87a7373d0..639e3ea9a 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -42,6 +42,8 @@ INCLUDES = \
 	-I$(top_builddir)/src \
 	$(NULL)
 
+USE_SYMBOL_ICON = FALSE
+
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
@@ -57,6 +59,7 @@ AM_CFLAGS = \
 	-DBINDIR=\"@bindir@\" \
     -DIBUS_DISABLE_DEPRECATED \
 	-DIBUS_VERSION=\"@IBUS_VERSION@\" \
+	-DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-function \
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index c39fc1c6f..1fb04310f 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -21,41 +21,51 @@
  */
 
 using Atk;
+using Cairo;
+using Gdk;
 using GLib;
 using Gtk;
 using IBus;
 using Pango;
 
 class Switcher : Gtk.Window {
+    public extern const bool USE_SYMBOL_ICON;
     private const int DEFAULT_FONT_SIZE = 16;
     private const int DESC_LABEL_MAX_LEN = 20;
+    private const int ICON_SIZE = 48;
 
     private class IBusEngineButton : Gtk.Button {
         public IBusEngineButton(IBus.EngineDesc engine) {
             GLib.Object();
-            this.longname = engine.get_longname();
-            var language = engine.get_language();
-            var symbol = engine.get_symbol();
-            var id = language;
 
-            if (id.length > 2) {
-                id = id[0:2];
-            }
-            if (symbol.length != 0) {
-                id = symbol;
-            }
+            this.longname = engine.get_longname();
 
             Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
             add(align);
-            Gtk.Box box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-            align.add(box);
 
-            Gtk.Label label = new Gtk.Label(id);
-            string id_font = "%d".printf(DEFAULT_FONT_SIZE);
-            string markup = "<span font=\"%s\">%s</span>".printf(id_font, id);
+            if (!USE_SYMBOL_ICON) {
+                IconWidget icon = new IconWidget(engine.get_icon(), ICON_SIZE);
+                align.add(icon);
+            } else {
+                var language = engine.get_language();
+                var symbol = engine.get_symbol();
+                var id = language;
 
-            label.set_markup(markup);
-            box.pack_start(label, false, false, 0);
+                if (id.length > 2) {
+                    id = id[0:2];
+                }
+
+                if (symbol.length != 0) {
+                    id = symbol;
+                }
+
+                Gtk.Label label = new Gtk.Label(id);
+                string id_font = "%d".printf(DEFAULT_FONT_SIZE);
+                string markup = "<span font=\"%s\">%s</span>".printf(id_font, id);
+
+                label.set_markup(markup);
+                align.add(label);
+            }
         }
 
         public string longname { get; set; }

From 1ed8daa432f3fd922f26dac396f9cec1ad228f14 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Fri, 8 Jun 2012 10:12:54 -0400
Subject: [PATCH 057/816] Refine IME switch keybinding related code.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/6295047
---
 ui/gtk3/keybindingmanager.vala | 39 +++++++----------
 ui/gtk3/panel.vala             | 55 +++++++++++++++++++-----
 ui/gtk3/switcher.vala          | 77 +++++++++++++++++++++-------------
 3 files changed, 107 insertions(+), 64 deletions(-)

diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index dd3c7bdb6..d2821ad4c 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -47,17 +47,14 @@ public class KeybindingManager : GLib.Object {
      * Helper class to store keybinding
      */
     private class Keybinding {
-        public Keybinding(string accelerator,
-                          uint keysym,
+        public Keybinding(uint keysym,
                           Gdk.ModifierType modifiers,
                           KeybindingHandlerFunc handler) {
-            this.accelerator = accelerator;
             this.keysym = keysym;
             this.modifiers = modifiers;
             this.handler = handler;
         }
 
-        public string accelerator { get; set; }
         public uint keysym { get; set; }
         public Gdk.ModifierType modifiers { get; set; }
         public unowned KeybindingHandlerFunc handler { get; set; }
@@ -78,18 +75,13 @@ public class KeybindingManager : GLib.Object {
     /**
      * Bind accelerator to given handler
      *
-     * @param accelerator accelerator parsable by Gtk.accelerator_parse
+     * @param keysym
+     * @param modifiers
      * @param handler handler called when given accelerator is pressed
      */
-    public bool bind(string accelerator,
+    public bool bind(uint keysym,
+                     Gdk.ModifierType modifiers,
                      KeybindingHandlerFunc handler) {
-        debug("Binding key " + accelerator);
-
-        // convert accelerator
-        uint keysym;
-        Gdk.ModifierType modifiers;
-        Gtk.accelerator_parse(accelerator, out keysym, out modifiers);
-
         unowned X.Display display = Gdk.x11_get_default_xdisplay();
 
         int keycode = display.keysym_to_keycode(keysym);
@@ -100,27 +92,24 @@ public class KeybindingManager : GLib.Object {
         grab_keycode (Gdk.Display.get_default(), keysym, modifiers);
 
         // store binding
-        Keybinding binding = new Keybinding(accelerator,
-                                            keysym, modifiers,
-                                            handler);
+        Keybinding binding = new Keybinding(keysym, modifiers, handler);
         m_bindings.append(binding);
 
-        debug("Successfully binded key " + accelerator);
         return true;
     }
 
     /**
      * Unbind given accelerator.
      *
-     * @param accelerator accelerator parsable by Gtk.accelerator_parse
+     * @param keysym
+     * @param modifiers
      */
-    public void unbind (string accelerator) {
-        debug("Unbinding key " + accelerator);
-
+    public void unbind(uint keysym,
+                       Gdk.ModifierType modifiers) {
         // unbind all keys with given accelerator
         GLib.List<Keybinding> remove_bindings = new GLib.List<Keybinding>();
         foreach(Keybinding binding in m_bindings) {
-            if(str_equal(accelerator, binding.accelerator)) {
+            if (binding.keysym == keysym && binding.modifiers == modifiers) {
                 ungrab_keycode (Gdk.Display.get_default(),
                                 binding.keysym,
                                 binding.modifiers);
@@ -139,8 +128,8 @@ public class KeybindingManager : GLib.Object {
         return m_instance;
     }
 
-    public static uint get_primary_modifier (uint binding_mask) {
-        const uint[] masks = {
+    public static Gdk.ModifierType get_primary_modifier (uint binding_mask) {
+        const Gdk.ModifierType[] masks = {
             Gdk.ModifierType.MOD5_MASK,
             Gdk.ModifierType.MOD4_MASK,
             Gdk.ModifierType.MOD3_MASK,
@@ -150,7 +139,7 @@ public class KeybindingManager : GLib.Object {
             Gdk.ModifierType.SHIFT_MASK,
             Gdk.ModifierType.LOCK_MASK
         };
-        foreach (uint mask in masks) {
+        foreach (Gdk.ModifierType mask in masks) {
             if ((binding_mask & mask) == mask)
                 return mask;
         }
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index b494b3629..d539dde0a 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -42,7 +42,9 @@ class Panel : IBus.PanelService {
     private Gtk.AboutDialog m_about_dialog;
     private Gtk.CssProvider m_css_provider;
     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
-    private const string ACCELERATOR_SWITCH_IME_BACKWARD = "<Control><Shift>space";
+
+    private uint m_switch_keysym = 0;
+    private Gdk.ModifierType m_switch_modifiers = 0;
 
     public Panel(IBus.Bus bus) {
         GLib.assert(bus.is_connected());
@@ -65,13 +67,7 @@ class Panel : IBus.PanelService {
         m_candidate_panel.page_down.connect((w) => this.page_down());
 
         m_switcher = new Switcher();
-
-        var keybinding_manager = KeybindingManager.get_instance();
-        keybinding_manager.bind(ACCELERATOR_SWITCH_IME_FOREWARD,
-                (e) => handle_engine_switch(e, false));
-
-        keybinding_manager.bind(ACCELERATOR_SWITCH_IME_BACKWARD,
-                (e) => handle_engine_switch(e, true));
+        bind_switch_shortcut();
 
         m_property_manager = new PropertyManager();
         m_property_manager.property_activate.connect((k, s) => {
@@ -82,9 +78,45 @@ class Panel : IBus.PanelService {
     }
 
     ~Panel() {
+        unbind_switch_shortcut();
+    }
+
+    private void bind_switch_shortcut() {
         var keybinding_manager = KeybindingManager.get_instance();
-        keybinding_manager.unbind(ACCELERATOR_SWITCH_IME_FOREWARD);
-        keybinding_manager.unbind(ACCELERATOR_SWITCH_IME_BACKWARD);
+
+        Gtk.accelerator_parse(ACCELERATOR_SWITCH_IME_FOREWARD,
+                out m_switch_keysym, out m_switch_modifiers);
+
+        if (m_switch_keysym == 0 && m_switch_modifiers == 0) {
+            warning("Parse accelerator '%s' failed!",
+                    ACCELERATOR_SWITCH_IME_FOREWARD);
+            return;
+        }
+
+        keybinding_manager.bind(m_switch_keysym, m_switch_modifiers,
+                (e) => handle_engine_switch(e, false));
+
+        // accelerator already has Shift mask
+        if ((m_switch_modifiers & Gdk.ModifierType.SHIFT_MASK) != 0)
+            return;
+
+        keybinding_manager.bind(m_switch_keysym,
+                m_switch_modifiers | Gdk.ModifierType.SHIFT_MASK,
+                (e) => handle_engine_switch(e, true));
+    }
+
+    private void unbind_switch_shortcut() {
+        var keybinding_manager = KeybindingManager.get_instance();
+
+        if (m_switch_keysym == 0 && m_switch_modifiers == 0)
+            return;
+
+        keybinding_manager.unbind(m_switch_keysym, m_switch_modifiers);
+        keybinding_manager.unbind(m_switch_keysym,
+                m_switch_modifiers | Gdk.ModifierType.SHIFT_MASK);
+
+        m_switch_keysym = 0;
+        m_switch_modifiers = 0;
     }
 
     private void set_custom_font() {
@@ -220,7 +252,8 @@ class Panel : IBus.PanelService {
                 event, primary_modifiers);
         if (pressed) {
             int i = revert ? m_engines.length - 1 : 1;
-            i = m_switcher.run(event, m_engines, i);
+            i = m_switcher.run(m_switch_keysym, m_switch_modifiers, event,
+                    m_engines, i);
             if (i < 0) {
                 debug("switch cancelled");
             } else {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 1fb04310f..b543a8f94 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -76,7 +76,9 @@ class Switcher : Gtk.Window {
     private IBusEngineButton[] m_buttons = {};
     private IBus.EngineDesc[] m_engines;
     private uint m_selected_engine;
-    private uint m_primary_modifier;
+    private uint m_keyval;
+    private uint m_modifiers;
+    private Gdk.ModifierType m_primary_modifier;
     private GLib.MainLoop m_loop;
     private int m_result;
 
@@ -111,13 +113,19 @@ class Switcher : Gtk.Window {
         grab_focus();
     }
 
-    public int run(Gdk.Event event, IBus.EngineDesc[] engines, int index) {
+    public int run(uint keyval,
+                   uint state,
+                   Gdk.Event event,
+                   IBus.EngineDesc[] engines,
+                   int index) {
         assert (m_loop == null);
         assert (index < engines.length);
 
+        m_keyval = keyval;
+        m_modifiers = state;
         m_primary_modifier =
             KeybindingManager.get_primary_modifier(
-                event.key.state & KeybindingManager.MODIFIER_FILTER);
+                state & KeybindingManager.MODIFIER_FILTER);
 
         update_engines(engines);
         m_selected_engine = index;
@@ -134,7 +142,8 @@ class Switcher : Gtk.Window {
 #if VALA_0_16
             device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
 #else
-            unowned GLib.List<Gdk.Device> devices = device_manager.list_devices(Gdk.DeviceType.MASTER);
+            unowned GLib.List<Gdk.Device> devices =
+                    device_manager.list_devices(Gdk.DeviceType.MASTER);
             device = devices.data;
 #endif
         }
@@ -298,34 +307,46 @@ class Switcher : Gtk.Window {
     }
 
     public override bool key_press_event(Gdk.EventKey e) {
+        bool retval = true;
         Gdk.EventKey *pe = &e;
-        switch (pe->keyval) {
-            case 0x0020: /* space */
-            case 0xff80: /* KP_Space */
-                if ((pe->state & Gdk.ModifierType.SHIFT_MASK) == 0)
+
+        do {
+            uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state;
+
+            if ((modifiers != m_modifiers) &&
+                (modifiers != (m_modifiers | Gdk.ModifierType.SHIFT_MASK))) {
+                break;
+            }
+
+            if (pe->keyval == m_keyval) {
+                if (modifiers == m_modifiers)
                     next_engine();
-                else
+                else // modififers == m_modifiers | SHIFT_MASK
                     previous_engine();
                 break;
-            case 0x08fb: /* leftarrow */
-            case 0xff51: /* Left */
-                previous_engine();
-                break;
-            case 0x08fc: /* uparrow */
-            case 0xff52: /* Up */
-                break;
-            case 0x08fd: /* rightarrow */
-            case 0xff53: /* Right */
-                next_engine();
-                break;
-            case 0x08fe: /* downarrow */
-            case 0xff54: /* Down */
-                break;
-            default:
-                debug("0x%04x", pe->keyval);
-                break;
-        }
-        return true;
+            }
+
+            switch (pe->keyval) {
+                case 0x08fb: /* leftarrow */
+                case 0xff51: /* Left */
+                    previous_engine();
+                    break;
+                case 0x08fc: /* uparrow */
+                case 0xff52: /* Up */
+                    break;
+                case 0x08fd: /* rightarrow */
+                case 0xff53: /* Right */
+                    next_engine();
+                    break;
+                case 0x08fe: /* downarrow */
+                case 0xff54: /* Down */
+                    break;
+                default:
+                    debug("0x%04x", pe->keyval);
+                    break;
+            }
+        } while (false);
+        return retval;
     }
 
     public override bool key_release_event(Gdk.EventKey e) {

From 22ebca106794af153c01eae7e0175eb9f1a27648 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Fri, 8 Jun 2012 10:28:33 -0400
Subject: [PATCH 058/816] Fix issue - keybinding with Super, Hyper and Meta
 Modifiers does not work.

BUG=None
TEST=Manually

Review URL: https://codereview.appspot.com/6302047
---
 ui/gtk3/grabkeycode.c          | 16 ++++++++--------
 ui/gtk3/keybindingmanager.vala | 18 ++++++++++++------
 ui/gtk3/panel.vala             | 26 +++++++++++++++++++++++---
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/ui/gtk3/grabkeycode.c b/ui/gtk3/grabkeycode.c
index 200f95641..6a2d02f23 100644
--- a/ui/gtk3/grabkeycode.c
+++ b/ui/gtk3/grabkeycode.c
@@ -42,14 +42,14 @@ gboolean grab_keycode (GdkDisplay *display,
     XISetMask (mask.mask, XI_KeyRelease);
 
     XIGrabModifiers ximodifiers[] = {
-        {modifiers, 0},
-        {Mod2Mask | modifiers, 0},
-        {LockMask | modifiers, 0},
-        {Mod5Mask | modifiers, 0},
-        {Mod2Mask | LockMask | modifiers, 0},
-        {Mod2Mask | Mod5Mask | modifiers, 0},
-        {LockMask | Mod5Mask | modifiers, 0},
-        {Mod2Mask | LockMask | Mod5Mask | modifiers, 0},
+        { modifiers, 0 },
+        { LockMask | modifiers, 0 },
+        { Mod2Mask | modifiers, 0 },
+        { Mod5Mask | modifiers, 0 },
+        { LockMask | Mod2Mask | modifiers, 0 },
+        { Mod2Mask | Mod5Mask | modifiers, 0 },
+        { LockMask | Mod5Mask | modifiers, 0 },
+        { LockMask | Mod2Mask | Mod5Mask | modifiers, 0 },
     };
 
     int retval = XIGrabKeycode (xdisplay,
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index d2821ad4c..2e1be4a93 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -33,15 +33,20 @@ public class KeybindingManager : GLib.Object {
 
     public static const uint MODIFIER_FILTER =
         Gdk.ModifierType.MODIFIER_MASK & ~(
-        Gdk.ModifierType.MOD2_MASK |
-        Gdk.ModifierType.LOCK_MASK |
-        Gdk.ModifierType.MOD4_MASK |
-        Gdk.ModifierType.MOD5_MASK |
+        Gdk.ModifierType.LOCK_MASK |  // Caps Lock
+        // Gdk.ModifierType.MOD1_MASK |  // Alt
+        Gdk.ModifierType.MOD2_MASK |  // Num Lock
+        // Gdk.ModifierType.MOD3_MASK |
+        // Gdk.ModifierType.MOD4_MASK |  // Super, Hyper
+        // Gdk.ModifierType.MOD5_MASK |  //
         Gdk.ModifierType.BUTTON1_MASK |
         Gdk.ModifierType.BUTTON2_MASK |
         Gdk.ModifierType.BUTTON3_MASK |
         Gdk.ModifierType.BUTTON4_MASK |
-        Gdk.ModifierType.BUTTON5_MASK);
+        Gdk.ModifierType.BUTTON5_MASK |
+        Gdk.ModifierType.SUPER_MASK |
+        Gdk.ModifierType.HYPER_MASK |
+        Gdk.ModifierType.META_MASK);
 
     /**
      * Helper class to store keybinding
@@ -196,8 +201,9 @@ public class KeybindingManager : GLib.Object {
 
     private void event_handler(Gdk.Event event) {
         do {
-            if (event.any.window != Gdk.get_default_root_window())
+            if (event.any.window != Gdk.get_default_root_window()) {
                 break;
+            }
 
             if (event.type == Gdk.EventType.KEY_PRESS) {
                 uint modifiers = event.key.state & MODIFIER_FILTER;
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index d539dde0a..25d705d00 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -84,12 +84,32 @@ class Panel : IBus.PanelService {
     private void bind_switch_shortcut() {
         var keybinding_manager = KeybindingManager.get_instance();
 
-        Gtk.accelerator_parse(ACCELERATOR_SWITCH_IME_FOREWARD,
+        var accelerator = ACCELERATOR_SWITCH_IME_FOREWARD;
+        Gtk.accelerator_parse(accelerator,
                 out m_switch_keysym, out m_switch_modifiers);
 
+        // Map virtual modifiers to (i.e.Mod2, Mod3, ...)
+        const Gdk.ModifierType VIRTUAL_MODIFIERS = (
+                Gdk.ModifierType.SUPER_MASK |
+                Gdk.ModifierType.HYPER_MASK |
+                Gdk.ModifierType.META_MASK);
+        if ((m_switch_modifiers & VIRTUAL_MODIFIERS) != 0) {
+        // workaround a bug in gdk vapi vala > 0.18
+        // https://bugzilla.gnome.org/show_bug.cgi?id=677559
+#if VALA_0_18
+            Gdk.Keymap.get_default().map_virtual_modifiers(
+                    ref m_switch_modifiers);
+#else
+            if ((m_switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
+                m_switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+            if ((m_switch_modifiers & Gdk.ModifierType.HYPER_MASK) != 0)
+                m_switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+#endif
+            m_switch_modifiers &= ~VIRTUAL_MODIFIERS;
+        }
+
         if (m_switch_keysym == 0 && m_switch_modifiers == 0) {
-            warning("Parse accelerator '%s' failed!",
-                    ACCELERATOR_SWITCH_IME_FOREWARD);
+            warning("Parse accelerator '%s' failed!", accelerator);
             return;
         }
 

From 636dda476734869c0e1fbf4d0464779a4c6fe667 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Thu, 12 Jul 2012 11:11:23 -0400
Subject: [PATCH 059/816] bus: Own a name on the DBus session bus

This makes it easier for third parties to track the ibus-daemon life
cycle.

BUG=http://code.google.com/p/ibus/issues/detail?id=1476
TEST=

Review URL: https://codereview.appspot.com/6374058
Patch from Rui Matos <tiagomatos@gmail.com>.
---
 bus/server.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bus/server.c b/bus/server.c
index ed384602f..253b6c3e6 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -122,6 +122,10 @@ bus_server_init (void)
 
     /* write address to file */
     ibus_write_address (address);
+
+    /* own a session bus name so that third parties can easily track our life-cycle */
+    g_bus_own_name (G_BUS_TYPE_SESSION, IBUS_SERVICE_IBUS, G_BUS_NAME_OWNER_FLAGS_NONE,
+                    NULL, NULL, NULL, NULL, NULL);
 }
 
 const gchar *

From f453bf83f502d8b1e2b6f07cf669c14cbcfe008e Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Thu, 12 Jul 2012 16:41:30 -0400
Subject: [PATCH 060/816] IBusBus: honor new connect-async prop in the socket
 monitor callback

I think we should make use of the async connection here if the
property is set.

But we also need a new flag for ongoing async connection attempts
because the socket monitor callback may be called several times before
the connection is established.

BUG=http://code.google.com/p/ibus/issues/detail?id=1482
TEST=

Review URL: https://codereview.appspot.com/6346090
---
 src/ibusbus.c | 149 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 93 insertions(+), 56 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index fc3c11b9b..91180204d 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -60,6 +60,8 @@ struct _IBusBusPrivate {
     IBusConfig *config;
     gchar *unique_name;
     gboolean connect_async;
+    gchar *bus_address;
+    GCancellable *cancellable;
 };
 
 static guint    bus_signals[LAST_SIGNAL] = { 0 };
@@ -103,6 +105,8 @@ static void      ibus_bus_get_property           (IBusBus                *bus,
                                                   GValue                 *value,
                                                   GParamSpec             *pspec);
 
+static void     ibus_bus_close_connection        (IBusBus                *bus);
+
 G_DEFINE_TYPE (IBusBus, ibus_bus, IBUS_TYPE_OBJECT)
 
 static void
@@ -270,56 +274,57 @@ _connection_closed_cb (GDBusConnection  *connection,
          * However we think the error message is almost harmless. */
         g_debug ("_connection_closed_cb: %s", error->message);
     }
+    ibus_bus_close_connection (bus);
+}
 
-    g_assert (bus->priv->connection == connection);
-    g_signal_handlers_disconnect_by_func (bus->priv->connection,
-                                          G_CALLBACK (_connection_closed_cb),
-                                          bus);
-    g_object_unref (bus->priv->connection);
-    bus->priv->connection = NULL;
-
+static void
+ibus_bus_close_connection (IBusBus *bus)
+{
     g_free (bus->priv->unique_name);
     bus->priv->unique_name = NULL;
 
     bus->priv->watch_dbus_signal_id = 0;
     bus->priv->watch_ibus_signal_id = 0;
 
-    g_signal_emit (bus, bus_signals[DISCONNECTED], 0);
-}
+    g_free (bus->priv->bus_address);
+    bus->priv->bus_address = NULL;
+
+    /* Cancel ongoing connect request. */
+    g_cancellable_cancel (bus->priv->cancellable);
+    g_cancellable_reset (bus->priv->cancellable);
 
-static void
-ibus_bus_disconnect (IBusBus *bus)
-{
     /* unref the old connection at first */
     if (bus->priv->connection != NULL) {
         g_signal_handlers_disconnect_by_func (bus->priv->connection,
                                               G_CALLBACK (_connection_closed_cb),
                                               bus);
+        if (!g_dbus_connection_is_closed(bus->priv->connection))
+            g_dbus_connection_close(bus->priv->connection, NULL, NULL, NULL);
         g_object_unref (bus->priv->connection);
         bus->priv->connection = NULL;
+        g_signal_emit (bus, bus_signals[DISCONNECTED], 0);
     }
 }
 
 static void
-ibus_bus_connect_finish (IBusBus *bus)
-{
-    if (bus->priv->connection) {
-        /* FIXME */
-        ibus_bus_hello (bus);
-
-        g_signal_connect (bus->priv->connection,
-                          "closed",
-                          (GCallback) _connection_closed_cb,
-                          bus);
-        if (bus->priv->watch_dbus_signal) {
-            ibus_bus_watch_dbus_signal (bus);
-        }
-        if (bus->priv->watch_ibus_signal) {
-            ibus_bus_watch_ibus_signal (bus);
-        }
-
-        g_signal_emit (bus, bus_signals[CONNECTED], 0);
+ibus_bus_connect_completed (IBusBus *bus)
+{
+    g_assert (bus->priv->connection);
+    /* FIXME */
+    ibus_bus_hello (bus);
+
+    g_signal_connect (bus->priv->connection,
+                      "closed",
+                      (GCallback) _connection_closed_cb,
+                      bus);
+    if (bus->priv->watch_dbus_signal) {
+        ibus_bus_watch_dbus_signal (bus);
+    }
+    if (bus->priv->watch_ibus_signal) {
+        ibus_bus_watch_ibus_signal (bus);
     }
+
+    g_signal_emit (bus, bus_signals[CONNECTED], 0);
 }
 
 static void
@@ -333,7 +338,8 @@ _bus_connect_async_cb (GObject      *source_object,
     IBusBus *bus   = IBUS_BUS (user_data);
     GError  *error = NULL;
 
-    bus->priv->connection = g_dbus_connection_new_for_address_finish (res, &error);
+    bus->priv->connection =
+                g_dbus_connection_new_for_address_finish (res, &error);
 
     if (error != NULL) {
         g_warning ("Unable to connect to ibus: %s", error->message);
@@ -341,8 +347,13 @@ _bus_connect_async_cb (GObject      *source_object,
         error = NULL;
     }
 
-    if (bus->priv->connection)
-        ibus_bus_connect_finish (bus);
+    if (bus->priv->connection != NULL) {
+        ibus_bus_connect_completed (bus);
+    }
+    else {
+        g_free (bus->priv->bus_address);
+        bus->priv->bus_address = NULL;
+    }
 
     /* unref the ref from ibus_bus_connect */
     g_object_unref (bus);
@@ -351,32 +362,52 @@ _bus_connect_async_cb (GObject      *source_object,
 static void
 ibus_bus_connect_async (IBusBus *bus)
 {
-    ibus_bus_disconnect (bus);
+    const gchar *bus_address = ibus_get_address ();
 
-    if (ibus_get_address () != NULL) {
-        g_object_ref (bus);
-        g_dbus_connection_new_for_address (ibus_get_address (),
-                                           G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                                           G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
-                                           NULL, NULL,
-                                           _bus_connect_async_cb, bus);
-    }
+    if (bus_address == NULL)
+        return;
+
+    if (g_strcmp0 (bus->priv->bus_address, bus_address) == 0)
+        return;
+
+    /* Close current connection and cancel ongoing connect request. */
+    ibus_bus_close_connection (bus);
+
+    bus->priv->bus_address = g_strdup (bus_address);
+    g_object_ref (bus);
+    g_dbus_connection_new_for_address (
+            bus_address,
+            G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+            G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
+            NULL,
+            bus->priv->cancellable,
+            _bus_connect_async_cb, bus);
 }
 
 static void
 ibus_bus_connect (IBusBus *bus)
 {
-    ibus_bus_disconnect (bus);
+    const gchar *bus_address = ibus_get_address ();
 
-    if (ibus_get_address () != NULL) {
-        bus->priv->connection =
-            g_dbus_connection_new_for_address_sync (ibus_get_address (),
-                                                    G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                                                    G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
-                                                    NULL, NULL, NULL);
-    }
+    if (bus_address == NULL)
+        return;
 
-    ibus_bus_connect_finish (bus);
+    if (g_strcmp0 (bus_address, bus->priv->bus_address) == 0 &&
+        bus->priv->connection != NULL)
+        return;
+
+    /* Close current connection and cancel ongoing connect request. */
+    ibus_bus_close_connection (bus);
+
+    bus->priv->connection = g_dbus_connection_new_for_address_sync (
+            bus_address,
+            G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
+            G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
+            NULL, NULL, NULL);
+    if (bus->priv->connection) {
+        bus->priv->bus_address = g_strdup (bus_address);
+        ibus_bus_connect_completed (bus);
+    }
 }
 
 static void
@@ -391,10 +422,7 @@ _changed_cb (GFileMonitor       *monitor,
         event_type != G_FILE_MONITOR_EVENT_DELETED)
         return;
 
-    if (ibus_bus_is_connected (bus))
-        return;
-
-    ibus_bus_connect (bus);
+    ibus_bus_connect_async (bus);
 }
 
 static void
@@ -414,6 +442,8 @@ ibus_bus_init (IBusBus *bus)
     bus->priv->watch_ibus_signal_id = 0;
     bus->priv->unique_name = NULL;
     bus->priv->connect_async = FALSE;
+    bus->priv->bus_address = NULL;
+    bus->priv->cancellable = g_cancellable_new ();
 
     path = g_path_get_dirname (ibus_get_socket_path ());
 
@@ -523,6 +553,13 @@ ibus_bus_destroy (IBusObject *object)
     g_free (bus->priv->unique_name);
     bus->priv->unique_name = NULL;
 
+    g_free (bus->priv->bus_address);
+    bus->priv->bus_address = NULL;
+
+    g_cancellable_cancel (bus->priv->cancellable);
+    g_object_unref (bus->priv->cancellable);
+    bus->priv->cancellable = NULL;
+
     IBUS_OBJECT_CLASS (ibus_bus_parent_class)->destroy (object);
 }
 
@@ -1621,7 +1658,7 @@ ibus_bus_get_engines_by_names (IBusBus             *bus,
                                  G_VARIANT_TYPE ("(av)"));
     if (result == NULL)
         return NULL;
-    
+
     GArray *array = g_array_new (TRUE, TRUE, sizeof (IBusEngineDesc *));
     GVariantIter *iter = NULL;
     g_variant_get (result, "(av)", &iter);

From a454448111650c3e92fc9ba65c26a57adc9c3c6c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 19 Jul 2012 09:57:01 +0900
Subject: [PATCH 061/816] Support dconf 0.13.4

TEST=Manually

Review URL: https://codereview.appspot.com/6426044
---
 conf/dconf/Makefile.am                    |  2 +-
 conf/dconf/{config.h => config-private.h} | 11 +++++++++-
 conf/dconf/config.c                       | 26 ++++++++++++++++++++++-
 conf/dconf/main.c                         |  2 +-
 configure.ac                              |  3 +++
 5 files changed, 40 insertions(+), 4 deletions(-)
 rename conf/dconf/{config.h => config-private.h} (91%)

diff --git a/conf/dconf/Makefile.am b/conf/dconf/Makefile.am
index 148ba621f..f0e24b0a4 100644
--- a/conf/dconf/Makefile.am
+++ b/conf/dconf/Makefile.am
@@ -29,7 +29,7 @@ libexec_PROGRAMS = \
 ibus_dconf_SOURCES = \
 	main.c \
 	config.c \
-	config.h \
+	config-private.h \
 	$(NULL)
 ibus_dconf_CFLAGS = \
 	@GLIB2_CFLAGS@ \
diff --git a/conf/dconf/config.h b/conf/dconf/config-private.h
similarity index 91%
rename from conf/dconf/config.h
rename to conf/dconf/config-private.h
index 9f602d6ad..9ba4fd53b 100644
--- a/conf/dconf/config.h
+++ b/conf/dconf/config-private.h
@@ -22,8 +22,17 @@
 #ifndef __CONFIG_DCONF_H__
 #define __CONFIG_DCONF_H__
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <ibus.h>
-#include <dconf/dconf.h>
+#ifdef DCONF_0_13_4
+#  include <client/dconf-client.h>
+#  include <common/dconf-paths.h>
+#else
+#  include <dconf/dconf.h>
+#endif
 
 #define IBUS_TYPE_CONFIG_DCONF            \
     (ibus_config_dconf_get_type ())
diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index faca9328d..44d70318f 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <ibus.h>
-#include "config.h"
+#include "config-private.h"
 
 #define DCONF_PREFIX "/desktop/ibus"
 #define DCONF_PRESERVE_NAME_PREFIXES_KEY \
@@ -159,12 +159,19 @@ static void
 _watch_func (DConfClient         *client,
              const gchar         *gpath,
              const gchar * const *items,
+#ifndef DCONF_0_13_4
              gint                 n_items,
+#endif
              const gchar         *tag,
              IBusConfigDConf     *config)
 {
     gchar **gkeys = NULL;
     gint i;
+#ifdef DCONF_0_13_4
+    gint n_items;
+
+    n_items = g_strv_length ((gchar **)items);
+#endif
 
     g_return_if_fail (gpath != NULL);
     g_return_if_fail (n_items >= 0);
@@ -231,6 +238,14 @@ static void
 ibus_config_dconf_init (IBusConfigDConf *config)
 {
     GVariant *variant;
+#ifdef DCONF_0_13_4
+    config->client = dconf_client_new ();
+
+    g_signal_connect (config->client, "changed",
+                      G_CALLBACK (_watch_func), config);
+
+    dconf_client_watch_fast (config->client, DCONF_PREFIX"/");
+#else
     GError *error;
 
     config->client = dconf_client_new ("ibus",
@@ -241,6 +256,7 @@ ibus_config_dconf_init (IBusConfigDConf *config)
     error = NULL;
     if (!dconf_client_watch (config->client, DCONF_PREFIX"/", NULL, &error))
         g_warning ("Can not watch dconf path %s", DCONF_PREFIX"/");
+#endif
 
     config->preserve_name_prefixes = NULL;
     variant = dconf_client_read (config->client,
@@ -265,9 +281,13 @@ static void
 ibus_config_dconf_destroy (IBusConfigDConf *config)
 {
     if (config->client) {
+#ifdef DCONF_0_13_4
+        dconf_client_unwatch_fast (config->client, DCONF_PREFIX"/");
+#else
         GError *error = NULL;
         if (!dconf_client_unwatch (config->client, DCONF_PREFIX"/", NULL, &error))
             g_warning ("Can not unwatch dconf path %s", DCONF_PREFIX"/");
+#endif
 
         g_object_unref (config->client);
         config->client = NULL;
@@ -307,12 +327,16 @@ ibus_config_dconf_set_value (IBusConfigService *config,
         g_free (gname);
     }
 
+#ifdef DCONF_0_13_4
+    retval = dconf_client_write_fast (client, gkey, value, error);
+#else
     retval = dconf_client_write (client,
                                  gkey,
                                  value,
                                  NULL,   /* tag */
                                  NULL,   /* cancellable */
                                  error);
+#endif
     g_free (gkey);
 
     return retval;
diff --git a/conf/dconf/main.c b/conf/dconf/main.c
index 1b69baa3b..bffe9833b 100644
--- a/conf/dconf/main.c
+++ b/conf/dconf/main.c
@@ -23,7 +23,7 @@
 #include <ibus.h>
 #include <stdlib.h>
 #include <locale.h>
-#include "config.h"
+#include "config-private.h"
 
 static IBusBus *bus = NULL;
 static IBusConfigDConf *config = NULL;
diff --git a/configure.ac b/configure.ac
index 8498efe2e..cc7d0e0ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,6 +327,9 @@ if test x"$enable_dconf" = x"yes"; then
         [dconf >= 0.7.5], ,
         enable_dconf=no
     )
+    PKG_CHECK_EXISTS([dconf >= 0.13.4],
+        [AC_DEFINE(DCONF_0_13_4, TRUE, [dconf is 0.13.4 or later])],
+        [])
     # check glib-compile-schemas
     GLIB_GSETTINGS
 fi

From c013bbe9ac06c3418ca4d55c0302bcfb13d2977c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 1 Aug 2012 10:26:48 +0900
Subject: [PATCH 062/816] Fix double-unref when looping over attachment.

BUG=none

Review URL: https://codereview.appspot.com/6445057
---
 src/ibusserializable.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ibusserializable.c b/src/ibusserializable.c
index 6251c89ce..d30164b84 100644
--- a/src/ibusserializable.c
+++ b/src/ibusserializable.c
@@ -161,7 +161,6 @@ ibus_serializable_real_deserialize (IBusSerializable *object,
                                           key,
                                           attachment);
         g_variant_unref (attachment);
-        g_variant_unref (value);
     }
     g_variant_iter_free (iter);
     return 2;

From 644caf4add148deff0f697d2f48409145e414751 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 3 Aug 2012 11:34:08 +0900
Subject: [PATCH 063/816] Set proper error code when config daemon is not
 running.

BUG=none

Review URL: https://codereview.appspot.com/6453076
---
 src/ibusconfig.c | 23 +++++++++++++++++------
 src/ibustypes.h  |  6 ++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/ibusconfig.c b/src/ibusconfig.c
index 40c27699a..1f015b004 100644
--- a/src/ibusconfig.c
+++ b/src/ibusconfig.c
@@ -24,6 +24,7 @@
 #include "ibusshare.h"
 #include "ibusconfig.h"
 #include "ibusbus.h"
+#include "ibuserror.h"
 
 #define IBUS_CONFIG_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_CONFIG, IBusConfigPrivate))
@@ -306,6 +307,10 @@ ibus_config_new (GDBusConnection  *connection,
 
     if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (initable)) == NULL) {
         /* The configuration daemon, which is usually ibus-gconf, is not started yet. */
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_NO_CONFIG,
+                     "Configuration daemon is not running.");
         g_object_unref (initable);
         return NULL;
     }
@@ -365,11 +370,10 @@ ibus_config_new_async_finish (GAsyncResult  *res,
         if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object)) == NULL) {
             /* The configuration daemon, which is usually ibus-gconf, 
              * is not started yet. */
-            if (error != NULL) {
-                *error = g_error_new (G_DBUS_ERROR,
-                                      G_DBUS_ERROR_FAILED,
-                                      IBUS_SERVICE_CONFIG " does not exist.");
-            }
+            g_set_error (error,
+                         IBUS_ERROR,
+                         IBUS_ERROR_NO_CONFIG,
+                         "Configuration daemon is not running.");
             g_object_unref (object);
             return NULL;
         }
@@ -672,7 +676,14 @@ initable_init (GInitable     *initable,
     IBusConfig *config = IBUS_CONFIG (initable);
     config->priv->watch_config_signal_id =
         _signal_subscribe (G_DBUS_PROXY (initable));
-    return ibus_config_watch (config, NULL, NULL);
+
+    gboolean retval = ibus_config_watch (config, NULL, NULL);
+    if (!retval)
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "Cannot watch configuration change.");
+    return retval;
 }
 
 static void
diff --git a/src/ibustypes.h b/src/ibustypes.h
index d916265a9..737b3e2d5 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -192,9 +192,15 @@ typedef enum {
  * IBusError:
  * @IBUS_ERROR_NO_ENGINE:
  * There is no engine associated with input context.
+ * @IBUS_ERROR_NO_CONFIG:
+ * There is no config module running.
+ * @IBUS_ERROR_FAILED:
+ * General failure.
  */
 typedef enum {
     IBUS_ERROR_NO_ENGINE,
+    IBUS_ERROR_NO_CONFIG,
+    IBUS_ERROR_FAILED
 } IBusError;
 
 /**

From bd4e87f39069331791da09649eb7bf1e675cfefa Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 8 Aug 2012 12:24:12 +0900
Subject: [PATCH 064/816] conf: cleanup GError usage

- there are missing g_error_free
- some code assume error != NULL when setting *error
- src/tests/ibus-config.c has unconditional "unset" but it checks the return value

BUG=none

Review URL: https://codereview.appspot.com/6449103
---
 conf/dconf/config.c     | 21 +++++++++++++++------
 conf/gconf/config.c     | 19 +++++++++----------
 conf/gconf/main.c       |  1 +
 conf/memconf/config.c   |  8 ++++----
 src/tests/ibus-config.c | 13 +++++++++++--
 5 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index 44d70318f..dcd8744a6 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -254,8 +254,11 @@ ibus_config_dconf_init (IBusConfigDConf *config)
                                        NULL);
 
     error = NULL;
-    if (!dconf_client_watch (config->client, DCONF_PREFIX"/", NULL, &error))
-        g_warning ("Can not watch dconf path %s", DCONF_PREFIX"/");
+    if (!dconf_client_watch (config->client, DCONF_PREFIX"/", NULL, &error)) {
+        g_warning ("Can not watch dconf path %s: %s",
+                   DCONF_PREFIX"/", error->message);
+        g_error_free (error);
+    }
 #endif
 
     config->preserve_name_prefixes = NULL;
@@ -285,8 +288,11 @@ ibus_config_dconf_destroy (IBusConfigDConf *config)
         dconf_client_unwatch_fast (config->client, DCONF_PREFIX"/");
 #else
         GError *error = NULL;
-        if (!dconf_client_unwatch (config->client, DCONF_PREFIX"/", NULL, &error))
-            g_warning ("Can not unwatch dconf path %s", DCONF_PREFIX"/");
+        if (!dconf_client_unwatch (config->client, DCONF_PREFIX"/", NULL, &error)) {
+            g_warning ("Can not unwatch dconf path %s: %s",
+                       DCONF_PREFIX"/", error->message);
+            g_error_free (error);
+        }
 #endif
 
         g_object_unref (config->client);
@@ -372,8 +378,11 @@ ibus_config_dconf_get_value (IBusConfigService *config,
     g_free (gkey);
 
     if (variant == NULL) {
-        *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "Config value [%s:%s] does not exist.", section, name);
+        g_set_error (error,
+                     G_DBUS_ERROR,
+                     G_DBUS_ERROR_FAILED,
+                     "Config value [%s:%s] does not exist.",
+                     section, name);
         return NULL;
     }
 
diff --git a/conf/gconf/config.c b/conf/gconf/config.c
index 64f1c47db..5e81f7d46 100644
--- a/conf/gconf/config.c
+++ b/conf/gconf/config.c
@@ -249,9 +249,10 @@ ibus_config_gconf_set_value (IBusConfigService      *config,
     gv = _to_gconf_value (value);
     if (gv == NULL) {
         gchar *str = g_variant_print (value, TRUE);
-        *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "Can not set config value [%s:%s] to %s.",
-                        section, name, str);
+        g_set_error (error,
+                     G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                     "Can not set config value [%s:%s] to %s.",
+                     section, name, str);
         g_free (str);
         return FALSE;
     }
@@ -280,8 +281,9 @@ ibus_config_gconf_get_value (IBusConfigService      *config,
     g_free (key);
 
     if (gv == NULL) {
-        *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "Config value [%s:%s] does not exist.", section, name);
+        g_set_error (error,
+                     G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                     "Config value [%s:%s] does not exist.", section, name);
         return NULL;
     }
 
@@ -325,13 +327,10 @@ ibus_config_gconf_unset_value (IBusConfigService      *config,
 {
     gchar *key = g_strdup_printf (GCONF_PREFIX"/%s/%s", section, name);
 
-    gconf_client_unset (((IBusConfigGConf *)config)->client, key, error);
+    gboolean retval = gconf_client_unset (((IBusConfigGConf *)config)->client, key, error);
     g_free (key);
 
-    if (*error != NULL) {
-        return FALSE;
-    }
-    return TRUE;
+    return retval;
 }
 
 IBusConfigGConf *
diff --git a/conf/gconf/main.c b/conf/gconf/main.c
index b1100aa0a..8dc86b54f 100644
--- a/conf/gconf/main.c
+++ b/conf/gconf/main.c
@@ -56,6 +56,7 @@ main (gint argc, gchar **argv)
 
     if (!g_option_context_parse (context, &argc, &argv, &error)) {
         g_print ("Option parsing failed: %s\n", error->message);
+        g_error_free (error);
         exit (-1);
     }
 
diff --git a/conf/memconf/config.c b/conf/memconf/config.c
index dd18f2e70..34310c231 100644
--- a/conf/memconf/config.c
+++ b/conf/memconf/config.c
@@ -182,10 +182,10 @@ ibus_config_memconf_unset_value (IBusConfigService *config,
                                            g_variant_new_tuple (NULL, 0));
     }
     else {
-        if (error && *error) {
-            *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                                  "Config value [%s:%s] does not exist.", section, name);
-        }
+        g_set_error (error,
+                     G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                     "Config value [%s:%s] does not exist.",
+                     section, name);
     }
     return retval;
 }
diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index a91d38270..5478c532f 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -270,13 +270,22 @@ change_and_test (IBusConfig  *config,
 {
     gboolean retval;
     guint timeout_id;
+    GVariant *var;
 
     data->section = NULL;
     data->name = NULL;
 
     /* Unset won't notify value-changed signal. */
-    retval = ibus_config_unset (config, section, name);
-    g_assert (retval);
+    var = ibus_config_get_values (config, section);
+    if (var != NULL) {
+        GVariant *value = g_variant_lookup_value (var, name,
+                                                  G_VARIANT_TYPE_VARIANT);
+        if (value != NULL) {
+            ibus_config_unset (config, section, name);
+            g_variant_unref (value);
+        }
+        g_variant_unref (var);
+    }
 
     timeout_id = g_timeout_add (1, timeout_cb, data);
     g_main_loop_run (data->loop);

From bed48104cc27c4820b956f62cb853abadf8801a4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 8 Aug 2012 12:33:15 +0900
Subject: [PATCH 065/816] conf: always build ibus-memconf for testing

BUG=none

Review URL: https://codereview.appspot.com/6457087
---
 conf/Makefile.am         |  2 --
 conf/memconf/Makefile.am | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 86127b2f8..54c73b7b8 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -26,11 +26,9 @@ GCONF_DIR = \
 	$(NULL)
 endif
 
-if ENABLE_MEMCONF
 MEMCONF_DIR = \
 	memconf \
 	$(NULL)
-endif
 
 if ENABLE_DCONF
 DCONF_DIR = \
diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index f5f5c082a..5837e6617 100644
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -22,10 +22,16 @@
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-libexec_PROGRAMS = \
+memconf_programs = \
 	ibus-memconf \
 	$(NULL)
 
+if ENABLE_MEMCONF
+libexec_PROGRAMS = $(memconf_programs)
+else
+noinst_PROGRAMS = $(memconf_programs)
+endif
+
 ibus_memconf_SOURCES = \
 	main.c \
 	config.c \
@@ -48,11 +54,13 @@ ibus_memconf_DEPENDENCIES = \
 	$(libibus) \
 	$(NULL)
 
+if ENABLE_MEMCONF
 component_DATA = \
 	memconf.xml \
 	$(NULL)
 
 componentdir = $(pkgdatadir)/component
+endif
 
 CLEANFILES = \
 	memconf.xml \

From 72ecfb351a1fe56cd23f9dc1db0a1c56ce7e65d3 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 9 Aug 2012 10:58:47 +0900
Subject: [PATCH 066/816] Fix testcase failure when IBus is not installed.

BUG=none

Review URL: https://codereview.appspot.com/6455068
---
 bus/registry.c                | 41 +++++++++++++++++++++-------------
 src/tests/Makefile.am         |  9 ++++++++
 src/tests/ibus-inputcontext.c |  2 +-
 src/tests/setupenv            | 42 +++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 17 deletions(-)
 create mode 100755 src/tests/setupenv

diff --git a/bus/registry.c b/bus/registry.c
index cece1f7f3..f8f42855a 100644
--- a/bus/registry.c
+++ b/bus/registry.c
@@ -213,31 +213,40 @@ bus_registry_load (BusRegistry *registry)
 {
     g_assert (BUS_IS_REGISTRY (registry));
 
-    gchar *dirname;
-    IBusObservedPath *path;
+    const gchar *envstr;
+    GPtrArray *path;
+    gchar *dirname, **d, **search_path;
+
+    path = g_ptr_array_new();
+
+    envstr = g_getenv ("IBUS_COMPONENT_PATH");
+    if (envstr) {
+        char **dirs = g_strsplit (envstr, G_SEARCHPATH_SEPARATOR_S, 0);
+        for (d = dirs; *d != NULL; d++)
+            g_ptr_array_add (path, *d);
+        g_free (dirs);
+    }
 
     dirname = g_build_filename (PKGDATADIR, "component", NULL);
-
-    path = ibus_observed_path_new (dirname, TRUE);
-    registry->observed_paths = g_list_append (registry->observed_paths, path);
-
-    bus_registry_load_in_dir (registry, dirname);
-
-    g_free (dirname);
+    g_ptr_array_add (path, dirname);
 
 #if 0
     /* FIXME Should we support install some IME in user dir? */
     dirname = g_build_filename (g_get_user_data_dir (), "ibus", "component", NULL);
+    g_ptr_array_add (path, dirname);
+#endif
 
-    path = ibus_observed_path_new (dirname, TRUE);
-    registry->observed_paths = g_list_append (registry->observed_paths, path);
+    g_ptr_array_add (path, NULL);
+    search_path = (char**) g_ptr_array_free (path, FALSE);
+    for (d = search_path; *d != NULL; d++) {
+        IBusObservedPath *observed_path = ibus_observed_path_new (*d, TRUE);
 
-    if (g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-        bus_registry_load_in_dir (registry, dirname);
-    }
+        registry->observed_paths = g_list_append (registry->observed_paths,
+                                                  observed_path);
 
-    g_free (dirname);
-#endif
+        bus_registry_load_in_dir (registry, *d);
+    }
+    g_strfreev (search_path);
 }
 
 #define g_string_append_indent(string, indent)  \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1c34da706..0d59561e3 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -51,6 +51,15 @@ TESTS =               \
 	ibus-util         \
 	$(NULL)
 
+TESTS_ENVIRONMENT = \
+	top_builddir=$(top_builddir) \
+	top_srcdir=$(top_srcdir) \
+	buiddir=$(buiddir) \
+	$(builddir)/setupenv \
+	$(NULL)
+
+EXTRA_DIST = setupenv
+
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
 
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index 9053ca029..c782c784f 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -81,7 +81,7 @@ test_input_context (void)
     if (engines != NULL) {
         active_engine_name = get_last_engine_id (engines);
     } else {
-        active_engine_name = g_strdup ("dummy-engine-name");
+        active_engine_name = g_strdup ("dummy");
     }
     g_assert (active_engine_name);
     g_debug ("Use '%s' for testing.", active_engine_name);
diff --git a/src/tests/setupenv b/src/tests/setupenv
new file mode 100755
index 000000000..591557edf
--- /dev/null
+++ b/src/tests/setupenv
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+: ${top_builddir:=../..}
+: ${top_srcdir:=../..}
+: ${builddir:=.}
+
+trap 'exit' ERR
+trap '. $IBUS_ADDRESS_FILE; kill $IBUS_DAEMON_PID >& /dev/null; rm -fr components $IBUS_ADDRESS_FILE' EXIT
+
+# copy some component files necessary for testing, under components/
+copy_component() {
+    file=$1
+    base=`basename $file`
+    if test -f $file; then
+	mkdir -p components
+	( libexecdir=`dirname $file`;
+	    s=`cat $file.in`;
+	    eval "echo \"${s}\"" ) > components/$base
+    fi
+}
+copy_component "$top_srcdir/engine/simple.xml"
+copy_component "$top_srcdir/conf/memconf/memconf.xml"
+
+# start ibus-daemon
+IBUS_COMPONENT_PATH=$PWD/components
+export IBUS_COMPONENT_PATH
+
+IBUS_ADDRESS_FILE=$PWD/ibus-daemon.log
+export IBUS_ADDRESS_FILE
+
+$top_builddir/bus/ibus-daemon \
+    --daemonize \
+    --cache=none \
+    --panel=disable \
+    --config=default \
+    --verbose
+
+# wait until all necessary components are up
+sleep 1
+
+# run tests
+"$@"

From dd6a55663040eb34486d737cb62d9aa93f789c82 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Thu, 16 Aug 2012 15:26:39 -0400
Subject: [PATCH 067/816] Do not use deprecated glib function g_atexit().

BUG=http://code.google.com/p/ibus/issues/detail?id=1489

Review URL: https://codereview.appspot.com/6454158
---
 client/x11/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 8550a5381..328c00dc4 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -1214,7 +1214,7 @@ main (int argc, char **argv)
     signal (SIGTERM, _sighandler);
 
     if (_kill_daemon)
-        g_atexit (_atexit_cb);
+        atexit (_atexit_cb);
 
     _xim_init_IMdkit ();
     gtk_main();

From 2e81378f2251b2e5affd01b874fb0b59abd99240 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 20 Aug 2012 10:00:17 +0900
Subject: [PATCH 068/816] engine: delay D-Bus name request after factory
 creation

BUG=none

Review URL: https://codereview.appspot.com/6441157
---
 engine/main.vala     | 20 ++++++++++----------
 src/tests/ibus-bus.c | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/engine/main.vala b/engine/main.vala
index e1fd1294b..acfa7371b 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -34,16 +34,6 @@ public int main(string[] args) {
         return 1;
     }
 
-    uint flags = 
-        IBus.BusNameFlag.REPLACE_EXISTING |
-        IBus.BusNameFlag.ALLOW_REPLACEMENT;
-    uint retval = bus.request_name("org.freedesktop.IBus.Simple", flags);
-
-    if (retval == 0) {
-        warning("Registry bus name org.freedesktop.IBus.Simple failed!");
-        return 1;
-    }
-
     bus.disconnected.connect((bus) => {
         debug("bus disconnected");
         IBus.quit();
@@ -61,6 +51,16 @@ public int main(string[] args) {
         return engine;
     });
 
+    uint flags = 
+        IBus.BusNameFlag.REPLACE_EXISTING |
+        IBus.BusNameFlag.ALLOW_REPLACEMENT;
+    uint retval = bus.request_name("org.freedesktop.IBus.Simple", flags);
+
+    if (retval == 0) {
+        warning("Registry bus name org.freedesktop.IBus.Simple failed!");
+        return 1;
+    }
+
     IBus.main();
 
     return 0;
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index da1253432..4ec40cd56 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -621,6 +621,26 @@ test_bus_new_async (void)
     ibus_main ();
 }
 
+static void
+test_global_engine (void)
+{
+    IBusEngineDesc *engine_desc;
+    const gchar *engine_name;
+
+    if (!ibus_bus_get_use_global_engine (bus))
+        return;
+
+    engine_name = "xkb:us::eng";
+    ibus_bus_set_global_engine (bus, engine_name);
+    engine_desc = ibus_bus_get_global_engine (bus);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, engine_name);
+
+    engine_name = "xkb:jp::jpn";
+    ibus_bus_set_global_engine (bus, engine_name);
+    engine_desc = ibus_bus_get_global_engine (bus);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, engine_name);
+}
+
 gint
 main (gint    argc,
       gchar **argv)
@@ -646,6 +666,7 @@ main (gint    argc,
                      test_create_input_context_async);
     g_test_add_func ("/ibus/bus-new-async/get-engines-by-names", test_get_engines_by_names);
     g_test_add_func ("/ibus/bus-new-async/async-apis", test_async_apis);
+    g_test_add_func ("/ibus/global-engine", test_global_engine);
 
     result = g_test_run ();
     g_object_unref (bus);

From 6bd9e0d2d49205fda366b20b18c7b20636993776 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 20 Aug 2012 10:14:01 +0900
Subject: [PATCH 069/816] Fix to load the system gvdb with $DCONF_PROFILE in
 dconf 0.13.4

BUG=RH#844580
TEST=Manually

Review URL: https://codereview.appspot.com/6446145
---
 conf/dconf/main.c       | 1 +
 data/dconf/profile/ibus | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/dconf/main.c b/conf/dconf/main.c
index bffe9833b..2d4faadf9 100644
--- a/conf/dconf/main.c
+++ b/conf/dconf/main.c
@@ -70,6 +70,7 @@ main (gint argc, gchar **argv)
     GOptionContext *context;
 
     setlocale (LC_ALL, "");
+    g_setenv ("DCONF_PROFILE", "ibus", FALSE);
 
     context = g_option_context_new ("- ibus dconf component");
 
diff --git a/data/dconf/profile/ibus b/data/dconf/profile/ibus
index c4ac80e9e..1d3fc5f2c 100644
--- a/data/dconf/profile/ibus
+++ b/data/dconf/profile/ibus
@@ -1,2 +1,2 @@
-user
-ibus
+user-db:user
+systemd-db:ibus

From 69970b68c025a04f6ac557f8b196f2d5d3fe858e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 24 Aug 2012 21:48:56 +0900
Subject: [PATCH 070/816] tests: add engine-switch test

Moved engine specific test from ibus-bus.c to a separate
file, so that it can be conditionally built depending on
--enable-engine.

Also do not register duplicate engine when loading component files.
This is for the case when two engine descs with the
same name are in different directories in IBUS_COMPONENT_PATH.

BUG=none

Review URL: https://codereview.appspot.com/6480052
---
 bus/registry.c        | 12 +++++++++---
 src/tests/Makefile.am |  9 ++++++++-
 src/tests/ibus-bus.c  | 21 ---------------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/bus/registry.c b/bus/registry.c
index f8f42855a..946e82705 100644
--- a/bus/registry.c
+++ b/bus/registry.c
@@ -147,9 +147,15 @@ bus_registry_init (BusRegistry *registry)
         GList *p1;
         for (p1 = engines; p1 != NULL; p1 = p1->next) {
             IBusEngineDesc *desc = (IBusEngineDesc *) p1->data;
-            g_hash_table_insert (registry->engine_table,
-                                 (gpointer) ibus_engine_desc_get_name (desc),
-                                 desc);
+            const gchar *name = ibus_engine_desc_get_name (desc);
+            if (g_hash_table_lookup (registry->engine_table, name) == NULL) {
+                g_hash_table_insert (registry->engine_table,
+                                     (gpointer) name,
+                                     desc);
+            } else {
+                g_message ("Engine %s is already registered by other component",
+                           name);
+            }
         }
         g_list_free (engines);
     }
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 0d59561e3..bb7bdd497 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -51,10 +51,14 @@ TESTS =               \
 	ibus-util         \
 	$(NULL)
 
+if ENABLE_ENGINE
+TESTS += ibus-engine-switch
+endif
+
 TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir) \
-	buiddir=$(buiddir) \
+	builddir=$(builddir) \
 	$(builddir)/setupenv \
 	$(NULL)
 
@@ -69,6 +73,9 @@ ibus_config_LDADD = $(prog_ldadd)
 ibus_configservice_SOURCES = ibus-configservice.c
 ibus_configservice_LDADD = $(prog_ldadd)
 
+ibus_engine_switch_SOURCES = ibus-engine-switch.c
+ibus_engine_switch_LDADD = $(prog_ldadd)
+
 ibus_factory_SOURCES = ibus-factory.c
 ibus_factory_LDADD = $(prog_ldadd)
 
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 4ec40cd56..da1253432 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -621,26 +621,6 @@ test_bus_new_async (void)
     ibus_main ();
 }
 
-static void
-test_global_engine (void)
-{
-    IBusEngineDesc *engine_desc;
-    const gchar *engine_name;
-
-    if (!ibus_bus_get_use_global_engine (bus))
-        return;
-
-    engine_name = "xkb:us::eng";
-    ibus_bus_set_global_engine (bus, engine_name);
-    engine_desc = ibus_bus_get_global_engine (bus);
-    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, engine_name);
-
-    engine_name = "xkb:jp::jpn";
-    ibus_bus_set_global_engine (bus, engine_name);
-    engine_desc = ibus_bus_get_global_engine (bus);
-    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, engine_name);
-}
-
 gint
 main (gint    argc,
       gchar **argv)
@@ -666,7 +646,6 @@ main (gint    argc,
                      test_create_input_context_async);
     g_test_add_func ("/ibus/bus-new-async/get-engines-by-names", test_get_engines_by_names);
     g_test_add_func ("/ibus/bus-new-async/async-apis", test_async_apis);
-    g_test_add_func ("/ibus/global-engine", test_global_engine);
 
     result = g_test_run ();
     g_object_unref (bus);

From 738582c0cc4ef54e828209ba2c5d010e9a292679 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 24 Aug 2012 21:52:06 +0900
Subject: [PATCH 071/816] Fix the last commit.

Forgot to git add ibus-engine-switch.c.

Review URL: https://codereview.appspot.com/6480052
---
 src/tests/ibus-engine-switch.c | 204 +++++++++++++++++++++++++++++++++
 1 file changed, 204 insertions(+)
 create mode 100644 src/tests/ibus-engine-switch.c

diff --git a/src/tests/ibus-engine-switch.c b/src/tests/ibus-engine-switch.c
new file mode 100644
index 000000000..f1d83d0a9
--- /dev/null
+++ b/src/tests/ibus-engine-switch.c
@@ -0,0 +1,204 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+
+#include <string.h>
+#include "ibus.h"
+
+static IBusBus *bus;
+
+#define BEFORE_ENGINE "xkb:us::eng"
+#define AFTER_ENGINE "xkb:jp::jpn"
+
+static const gchar *engine_names[] = {
+    BEFORE_ENGINE,
+    AFTER_ENGINE
+};
+
+static void
+change_global_engine (void)
+{
+    gint i;
+
+    for (i = 0; i < G_N_ELEMENTS (engine_names); i++) {
+        ibus_bus_set_global_engine (bus, engine_names[i]);
+        IBusEngineDesc *engine_desc = ibus_bus_get_global_engine (bus);
+        g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc),
+                         ==,
+                         engine_names[i]);
+    }
+}
+
+static void
+change_context_engine (IBusInputContext *context)
+{
+    gint i;
+
+    for (i = 0; i < G_N_ELEMENTS (engine_names); i++) {
+        ibus_input_context_set_engine (context, engine_names[i]);
+        IBusEngineDesc *engine_desc = ibus_input_context_get_engine (context);
+        g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc),
+                         ==,
+                         engine_names[i]);
+    }
+}
+
+typedef struct {
+    gint count;
+} GlobalEngineChangedData;
+
+static void
+global_engine_changed_cb (IBusBus *bus, gchar *name, gpointer user_data)
+{
+    GlobalEngineChangedData *data = (GlobalEngineChangedData *) user_data;
+    data->count++;
+}
+
+static gboolean
+timeout_cb (gpointer user_data)
+{
+    ibus_quit ();
+    return FALSE;
+}
+
+static gboolean
+change_global_engine_cb (gpointer user_data)
+{
+    change_global_engine ();
+    return FALSE;
+}
+
+static void
+test_global_engine (void)
+{
+    GlobalEngineChangedData data;
+    guint handler_id, timeout_id, idle_id;
+
+    if (!ibus_bus_get_use_global_engine (bus))
+        return;
+
+    data.count = 0;
+
+    handler_id = g_signal_connect (bus,
+                                   "global-engine-changed",
+                                   G_CALLBACK (global_engine_changed_cb),
+                                   &data);
+    timeout_id = g_timeout_add_seconds (1, timeout_cb, &data);
+    idle_id = g_idle_add ((GSourceFunc) change_global_engine_cb, NULL);
+
+    ibus_main ();
+
+    g_assert_cmpint (data.count, ==, G_N_ELEMENTS (engine_names));
+
+    g_source_remove (idle_id);
+    g_source_remove (timeout_id);
+    g_signal_handler_disconnect (bus, handler_id);
+}
+
+static void
+test_context_engine (void)
+{
+    IBusEngineDesc *engine_desc;
+    IBusInputContext *context;
+
+    if (ibus_bus_get_use_global_engine (bus))
+        return;
+
+    context = ibus_bus_create_input_context (bus, "test");
+    ibus_input_context_set_capabilities (context, IBUS_CAP_FOCUS);
+
+    /* ibus_bus_set_global_engine() changes focused context engine. */
+    ibus_input_context_focus_in (context);
+
+    change_context_engine (context);
+    engine_desc = ibus_input_context_get_engine (context);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, AFTER_ENGINE);
+
+    g_object_unref (context);
+}
+
+static void
+test_context_engine_set_by_global (void)
+{
+    IBusEngineDesc *engine_desc;
+    IBusInputContext *context;
+
+    if (!ibus_bus_get_use_global_engine (bus))
+        return;
+
+    context = ibus_bus_create_input_context (bus, "test");
+    ibus_input_context_set_capabilities (context, IBUS_CAP_FOCUS);
+
+    /* ibus_bus_set_global_engine() changes focused context engine. */
+    ibus_input_context_focus_in (context);
+
+    change_global_engine ();
+
+    /* ibus_input_context_set_engine() does not take effect when
+       global engine is used. */
+    ibus_input_context_set_engine (context, BEFORE_ENGINE);
+
+    engine_desc = ibus_input_context_get_engine (context);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, AFTER_ENGINE);
+
+    g_object_unref (context);
+}
+
+static void
+test_context_engine_set_by_focus (void)
+{
+    IBusEngineDesc *engine_desc;
+    IBusInputContext *context, *another_context;
+
+    if (!ibus_bus_get_use_global_engine (bus))
+        return;
+
+    context = ibus_bus_create_input_context (bus, "test");
+    ibus_input_context_set_capabilities (context, IBUS_CAP_FOCUS);
+
+    another_context = ibus_bus_create_input_context (bus, "another");
+    ibus_input_context_set_capabilities (another_context, IBUS_CAP_FOCUS);
+
+    ibus_input_context_focus_in (context);
+
+    change_global_engine ();
+
+    /* When focus is lost, context engine is set to "dummy". */
+    ibus_input_context_focus_in (another_context);
+
+    engine_desc = ibus_input_context_get_engine (context);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, "dummy");
+
+    engine_desc = ibus_input_context_get_engine (another_context);
+    g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc), ==, AFTER_ENGINE);
+
+    g_object_unref (context);
+    g_object_unref (another_context);
+}
+
+gint
+main (gint    argc,
+      gchar **argv)
+{
+    gint result;
+    g_type_init ();
+    g_test_init (&argc, &argv, NULL);
+    ibus_init ();
+    bus = ibus_bus_new ();
+    g_object_unref (bus);
+    bus = ibus_bus_new (); // crosbug.com/17293
+
+    ibus_bus_set_watch_ibus_signal (bus, TRUE);
+
+    g_test_add_func ("/ibus/engine-switch/global-engine",
+                     test_global_engine);
+    g_test_add_func ("/ibus/engine-switch/context-engine",
+                     test_context_engine);
+    g_test_add_func ("/ibus/engine-switch/context-engine-set-by-global",
+                     test_context_engine_set_by_global);
+    g_test_add_func ("/ibus/engine-switch/context-engine-set-by-focus",
+                     test_context_engine_set_by_focus);
+
+    result = g_test_run ();
+    g_object_unref (bus);
+
+    return result;
+}

From 1961c2b2fc012988b0d7663c79787ab5b739c7b4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 24 Aug 2012 23:13:41 +0900
Subject: [PATCH 072/816] tests: fix "make check" with dash

/bin/dash does not support ERR trap signal and ">&" redirect.  Also
fix copying non-existing component file.

BUG=none

Review URL: https://codereview.appspot.com/6478058
---
 src/tests/setupenv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/setupenv b/src/tests/setupenv
index 591557edf..df269e4c9 100755
--- a/src/tests/setupenv
+++ b/src/tests/setupenv
@@ -4,14 +4,14 @@
 : ${top_srcdir:=../..}
 : ${builddir:=.}
 
-trap 'exit' ERR
-trap '. $IBUS_ADDRESS_FILE; kill $IBUS_DAEMON_PID >& /dev/null; rm -fr components $IBUS_ADDRESS_FILE' EXIT
+trap 'exit' 1 2 3 15
+trap '. $IBUS_ADDRESS_FILE; kill $IBUS_DAEMON_PID &> /dev/null; rm -fr components $IBUS_ADDRESS_FILE' EXIT
 
 # copy some component files necessary for testing, under components/
 copy_component() {
     file=$1
     base=`basename $file`
-    if test -f $file; then
+    if test -f $file.in; then
 	mkdir -p components
 	( libexecdir=`dirname $file`;
 	    s=`cat $file.in`;

From 489941fa3385b476a8c2daffe8d1805004349e04 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 3 Sep 2012 12:53:18 +0900
Subject: [PATCH 073/816] Cleanup the vala code of gtk3 panel and tool by:

- using config.vapi
- omitting unnecessary "using X"

Also localize ibus tool and make the argument handling better.

BUG=none

Review URL: https://codereview.appspot.com/6496066
---
 bindings/vala/Makefile.am      |   1 +
 bindings/vala/config.vapi      |  12 +++
 tools/Makefile.am              |  12 +--
 tools/main.vala                | 144 +++++++++++++++++++++------------
 ui/gtk3/Makefile.am            |  14 ++--
 ui/gtk3/application.vala       |  12 +--
 ui/gtk3/candidatearea.vala     |   4 -
 ui/gtk3/candidatepanel.vala    |   3 -
 ui/gtk3/handle.vala            |   4 -
 ui/gtk3/iconwidget.vala        |   4 -
 ui/gtk3/keybindingmanager.vala |   5 --
 ui/gtk3/panel.vala             |  18 ++---
 ui/gtk3/pango.vala             |   3 -
 ui/gtk3/property.vala          |   4 -
 ui/gtk3/separator.vala         |   2 -
 ui/gtk3/switcher.vala          |   8 --
 16 files changed, 126 insertions(+), 124 deletions(-)
 create mode 100644 bindings/vala/config.vapi

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 074140ee5..faa92a639 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -44,6 +44,7 @@ ibus-@IBUS_API_VERSION@.vapi: $(vapi_deps)
 EXTRA_DIST = \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
+	config.vapi \
 	$(NULL)
 
 MAINTAINERCLEANFILES = ibus-@IBUS_API_VERSION@.vapi
diff --git a/bindings/vala/config.vapi b/bindings/vala/config.vapi
new file mode 100644
index 000000000..f2195dabb
--- /dev/null
+++ b/bindings/vala/config.vapi
@@ -0,0 +1,12 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config
+{
+    public const string PACKAGE_DATADIR;
+    public const string PACKAGE_NAME;
+    public const string PACKAGE_VERSION;
+    public const string BINDIR;
+    public const string DATADIR;
+    public const string PKGDATADIR;
+    public const string GETTEXT_PACKAGE;
+    public const string GLIB_LOCALE_DIR;
+}
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c0cacd698..830fc4fde 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,17 +29,16 @@ INCLUDES = \
 	-I$(top_builddir)/src \
 	$(NULL)
 
+# force include config.h before gi18n.h.
+AM_CPPFLAGS = -include $(CONFIG_HEADER)
+
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
 	@GTHREAD2_CFLAGS@ \
 	$(INCLUDES) \
 	-DG_LOG_DOMAIN=\"IBUS\" \
-	-DPKGDATADIR=\"$(pkgdatadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DBINDIR=\"@bindir@\" \
-	-DIBUS_VERSION=\"@IBUS_VERSION@\" \
-    -DIBUS_DISABLE_DEPRECATED \
+	-DIBUS_DISABLE_DEPRECATED \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-function \
@@ -55,7 +54,10 @@ AM_LDADD = \
 
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
+	--vapidir=$(top_srcdir)/bindings/vala \
 	--pkg=ibus-1.0 \
+	--pkg=posix \
+	--pkg=config \
 	$(NULL)
 
 bin_PROGRAMS = ibus
diff --git a/tools/main.vala b/tools/main.vala
index 0c51c4b85..ce3fe4776 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -19,39 +19,43 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA  02111-1307  USA
  */
-using GLib;
-using IBus;
-
-
-public extern const string IBUS_VERSION;
 
 bool name_only = false;
 
 class EngineList {
-    public EngineDesc[] data = {};
+    public IBus.EngineDesc[] data = {};
 }
 
-IBus.Bus get_bus() {
+IBus.Bus? get_bus() {
     IBus.init();
     var bus = new IBus.Bus();
+    if (!bus.is_connected ())
+        return null;
     return bus;
 }
 
 int list_engine(string[] argv) {
-    const OptionEntry[] options =  {
-        { "name-only", 0, 0, OptionArg.NONE, out name_only, "engine name only", "engine name only" },
+    const OptionEntry[] options = {
+        { "name-only", 0, 0, OptionArg.NONE, out name_only,
+          N_("List engine name only"), null },
         { null }
     };
 
-    var option = new OptionContext("command [OPTIONS]");
+    var option = new OptionContext(_("command [OPTIONS]"));
     option.add_main_entries(options, "ibus");
 
     try {
         option.parse(ref argv);
     } catch (OptionError e) {
+        stderr.printf("%s\n", e.message);
+        return Posix.EXIT_FAILURE;
     }
 
     var bus = get_bus();
+    if (bus == null) {
+        stderr.printf(_("Can't connect to IBus.\n"));
+        return Posix.EXIT_FAILURE;
+    }
 
     var engines = bus.list_engines();
 
@@ -59,7 +63,7 @@ int list_engine(string[] argv) {
         foreach (var engine in engines) {
             print("%s\n", engine.get_name());
         }
-        return 0;
+        return Posix.EXIT_SUCCESS;
     }
 
     var map = new HashTable<string, EngineList>(GLib.str_hash, GLib.str_equal);
@@ -75,13 +79,13 @@ int list_engine(string[] argv) {
 
     foreach (var language in map.get_keys()) {
         var list = map.get(language);
-        print("language: %s\n", IBus.get_language_name(language));
+        print(_("language: %s\n"), IBus.get_language_name(language));
         foreach (var engine in list.data) {
             print("  %s - %s\n", engine.get_name(), engine.get_longname());
         }
     }
 
-    return 0;
+    return Posix.EXIT_SUCCESS;
 }
 
 int get_set_engine(string[] argv) {
@@ -92,48 +96,70 @@ int get_set_engine(string[] argv) {
 
     if (engine == null) {
         var desc = bus.get_global_engine();
-        if (desc == null)
-            return -1;
+        if (desc == null) {
+            stderr.printf(_("No engine is set.\n"));
+            return Posix.EXIT_FAILURE;
+        }
         print("%s\n", desc.get_name());
-        return 0;
+        return Posix.EXIT_SUCCESS;
     }
 
-    if(!bus.set_global_engine(engine))
-        return -1;
+    if(!bus.set_global_engine(engine)) {
+        stderr.printf(_("Set global engine failed.\n"));
+        return Posix.EXIT_FAILURE;
+    }
     var desc = bus.get_global_engine();
-    if (desc == null)
-        return -1;
+    if (desc == null) {
+        stderr.printf(_("Get global engine failed.\n"));
+        return Posix.EXIT_FAILURE;
+    }
+
     string cmdline = "setxkbmap %s".printf(desc.get_layout());
     try {
         if (!GLib.Process.spawn_command_line_sync(cmdline)) {
-            warning("Switch xkb layout to %s failed.",
-                desc.get_layout());
+            stderr.printf(_("Switch xkb layout to %s failed."),
+                          desc.get_layout());
+            return Posix.EXIT_FAILURE;
         }
     } catch (GLib.SpawnError e) {
-        warning("execute setxkblayout failed");
+        stderr.printf("Execute setxkbmap failed: %s", e.message);
+        return Posix.EXIT_FAILURE;
     }
-    return 0;
+    return Posix.EXIT_SUCCESS;
 }
 
 int message_watch(string[] argv) {
-    return 0;
+    return Posix.EXIT_SUCCESS;
 }
 
 int restart_daemon(string[] argv) {
     var bus = get_bus();
+    if (bus == null) {
+        stderr.printf(_("Can't connect to IBus.\n"));
+        return Posix.EXIT_FAILURE;
+    }
     bus.exit(true);
-    return 0;
+    return Posix.EXIT_SUCCESS;
 }
 
 int exit_daemon(string[] argv) {
     var bus = get_bus();
+    if (bus == null) {
+        stderr.printf(_("Can't connect to IBus.\n"));
+        return Posix.EXIT_FAILURE;
+    }
     bus.exit(false);
-    return 0;
+    return Posix.EXIT_SUCCESS;
+}
+
+int print_version(string[] argv) {
+    print("IBus %s\n", Config.PACKAGE_VERSION);
+    return Posix.EXIT_SUCCESS;
 }
 
-int print_version (string[] argv) {
-    print("IBus %s\n", IBUS_VERSION);
-    return 0;
+int print_help(string[] argv) {
+    print_usage(stdout);
+    return Posix.EXIT_SUCCESS;
 }
 
 delegate int EntryFunc(string[] argv);
@@ -143,31 +169,43 @@ struct CommandEntry {
     EntryFunc entry;
 }
 
+static const CommandEntry commands[]  = {
+    { "engine", get_set_engine },
+    { "exit", exit_daemon },
+    { "list-engine", list_engine },
+    { "watch", message_watch },
+    { "restart", restart_daemon },
+    { "version", print_version },
+    { "help", print_help }
+};
+
+static string program_name;
+
+void print_usage(FileStream stream) {
+    stream.printf(_("Usage: %s COMMAND [OPTION...]\n\n"), program_name);
+    stream.printf(_("Commands:\n"));
+    foreach (var command in commands) {
+        stream.printf("  %s\n", command.name);
+    }
+}
+
 public int main(string[] argv) {
-    const CommandEntry commands[]  = {
-        { "engine", get_set_engine },
-        { "exit", exit_daemon },
-        { "list-engine", list_engine },
-        { "watch", message_watch },
-        { "restart", restart_daemon },
-        { "version", print_version }
-    };
+    GLib.Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
+    GLib.Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
 
-    if (argv.length >= 2) {
-        if (argv[1] == "--help" || argv[1] == "help") {
-            foreach (var command in commands) {
-                print ("  %s\n", command.name);
-            }
-            return 0;
-        }
-        string[] new_argv = argv[1:argv.length];
-        foreach (var command in commands) {
-            if (command.name == argv[1])
-                return command.entry(new_argv);
-        }
-        warning("%s is unknown command!", argv[1]);
+    program_name = Path.get_basename(argv[0]);
+    if (argv.length < 2) {
+        print_usage(stderr);
+        return Posix.EXIT_FAILURE;
     }
 
-    return -1;
-}
+    string[] new_argv = argv[1:argv.length];
+    foreach (var command in commands) {
+        if (command.name == argv[1])
+            return command.entry(new_argv);
+    }
 
+    stderr.printf(_("%s is unknown command!\n"), argv[1]);
+    print_usage(stderr);
+    return Posix.EXIT_FAILURE;
+}
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 639e3ea9a..8d362bce2 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -44,6 +44,9 @@ INCLUDES = \
 
 USE_SYMBOL_ICON = FALSE
 
+# force include config.h before gi18n.h.
+AM_CPPFLAGS = -include $(CONFIG_HEADER)
+
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
@@ -51,14 +54,9 @@ AM_CFLAGS = \
 	@GTK3_CFLAGS@ \
 	@X11_CFLAGS@ \
 	$(INCLUDES) \
-	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
-	-DGLIB_LOCALE_DIR=\"@GLIB_LOCALE_DIR@\" \
 	-DG_LOG_DOMAIN=\"IBUS\" \
-	-DPKGDATADIR=\"$(pkgdatadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DBINDIR=\"@bindir@\" \
-    -DIBUS_DISABLE_DEPRECATED \
-	-DIBUS_VERSION=\"@IBUS_VERSION@\" \
+	-DBINDIR=\"$(bindir)\" \
+	-DIBUS_DISABLE_DEPRECATED \
 	-DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
@@ -78,10 +76,12 @@ AM_LDADD = \
 
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
+	--vapidir=$(top_srcdir)/bindings/vala \
 	--pkg=posix \
 	--pkg=gtk+-3.0 \
 	--pkg=gdk-x11-3.0 \
 	--pkg=ibus-1.0 \
+	--pkg=config \
 	$(NULL)
 
 libexec_PROGRAMS = ibus-ui-gtk3
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index b54821ca8..fd9ade741 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -20,21 +20,15 @@
  * Boston, MA  02111-1307  USA
  */
 
-using IBus;
-using GLib;
-using Gtk;
-
-public extern const string GETTEXT_PACKAGE;
-public extern const string GLIB_LOCALE_DIR;
-
 class Application {
     private IBus.Bus m_bus;
     private Panel m_panel;
     private IBus.Config m_config;
 
     public Application(string[] argv) {
-        GLib.Intl.bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
-        GLib.Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
+                                 Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         IBus.init();
         Gtk.init(ref argv);
 
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 85a830d16..611f8104f 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -20,10 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Gtk;
-using IBus;
-using Pango;
-
 class CandidateArea : Gtk.Box {
     private bool m_vertical;
     private Gtk.Label[] m_labels;
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 0cf3c57fc..ae40b5b9d 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -20,9 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Gtk;
-using Pango;
-
 public class CandidatePanel : Gtk.HBox{
     private bool m_vertical = true;
     private Gtk.Window m_toplevel;
diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index 4fe9a7f49..08e6ef30e 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -20,10 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Cairo;
-using Gdk;
-using Gtk;
-
 class Handle : Gtk.EventBox {
     private bool m_move_begined;
     private Gdk.Rectangle m_workarea;
diff --git a/ui/gtk3/iconwidget.vala b/ui/gtk3/iconwidget.vala
index d73cb6bef..4dfcfeaad 100644
--- a/ui/gtk3/iconwidget.vala
+++ b/ui/gtk3/iconwidget.vala
@@ -20,10 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Gdk;
-using GLib;
-using Gtk;
-
 class IconWidget: Gtk.Image {
     public IconWidget(string icon, int size) {
         Gdk.Pixbuf pixbuf = null;
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 2e1be4a93..9b53b09f1 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -10,11 +10,6 @@ valac --pkg gtk+-2.0 --pkg x11 --pkg gdk-x11-2.0 --pkg gee-1.0 keybinding-manage
  * @author Oliver Sauder <os@esite.ch>
  */
 
-using Gdk;
-using GLib;
-using Gtk;
-using X;
-
 extern bool grab_keycode (Gdk.Display display,
                           uint keyval,
                           uint modifiers);
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 25d705d00..40079ecf9 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -20,14 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using IBus;
-using GLib;
-using Gtk;
-using Posix;
-
-public extern const string IBUS_VERSION;
-public extern const string BINDIR;
-
 class Panel : IBus.PanelService {
     private IBus.Bus m_bus;
     private IBus.Config m_config;
@@ -240,7 +232,7 @@ class Panel : IBus.PanelService {
                     engine.get_layout());
             }
         } catch (GLib.SpawnError e) {
-            warning("execute setxkblayout failed");
+            warning("Execute setxkbmap failed: %s", e.message);
         }
     }
 
@@ -338,7 +330,7 @@ class Panel : IBus.PanelService {
             m_setup_pid = 0;
         }
 
-        string binary = GLib.Path.build_filename(BINDIR, "ibus-setup");
+        string binary = GLib.Path.build_filename(Config.BINDIR, "ibus-setup");
         try {
             GLib.Process.spawn_async(null,
                                      {binary, "ibus-setup"},
@@ -363,7 +355,7 @@ class Panel : IBus.PanelService {
         if (m_about_dialog == null) {
             m_about_dialog = new Gtk.AboutDialog();
             m_about_dialog.set_program_name("IBus");
-            m_about_dialog.set_version(IBUS_VERSION);
+            m_about_dialog.set_version(Config.PACKAGE_VERSION);
 
             string copyright = _(
                 "Copyright (c) 2007-2012 Peng Huang\n" +
@@ -404,7 +396,7 @@ class Panel : IBus.PanelService {
             item.activate.connect((i) => show_about_dialog());
             m_sys_menu.append(item);
 
-            m_sys_menu.append(new SeparatorMenuItem());
+            m_sys_menu.append(new Gtk.SeparatorMenuItem());
 
             item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.REFRESH, null);
             item.set_label(_("Restart"));
@@ -431,7 +423,7 @@ class Panel : IBus.PanelService {
         // Show properties and IME switching menu
         m_property_manager.create_menu_items(m_ime_menu);
 
-        m_ime_menu.append(new SeparatorMenuItem());
+        m_ime_menu.append(new Gtk.SeparatorMenuItem());
 
         int width, height;
         Gtk.icon_size_lookup(Gtk.IconSize.MENU, out width, out height);
diff --git a/ui/gtk3/pango.vala b/ui/gtk3/pango.vala
index adcce4390..9f8f06542 100644
--- a/ui/gtk3/pango.vala
+++ b/ui/gtk3/pango.vala
@@ -20,9 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using IBus;
-using Pango;
-
 Pango.AttrList get_pango_attr_list_from_ibus_text(IBus.Text text) {
     Pango.AttrList pango_attrs = new Pango.AttrList();
     unowned IBus.AttrList attrs = text.get_attributes();
diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index eb3563642..718ba94dd 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -20,10 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using IBus;
-using GLib;
-using Gtk;
-
 public class PropertyManager {
     private IBus.PropList m_props;
 
diff --git a/ui/gtk3/separator.vala b/ui/gtk3/separator.vala
index 0917f4c2b..0e1dbc884 100644
--- a/ui/gtk3/separator.vala
+++ b/ui/gtk3/separator.vala
@@ -20,8 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Gtk;
-
 class HSeparator : Gtk.HSeparator {
     public HSeparator() {
         GLib.Object(
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index b543a8f94..7566466bd 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -20,14 +20,6 @@
  * Boston, MA  02111-1307  USA
  */
 
-using Atk;
-using Cairo;
-using Gdk;
-using GLib;
-using Gtk;
-using IBus;
-using Pango;
-
 class Switcher : Gtk.Window {
     public extern const bool USE_SYMBOL_ICON;
     private const int DEFAULT_FONT_SIZE = 16;

From 0ec6166efe8f74bf8e2c3a447cfd05700c23423d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 6 Sep 2012 11:06:35 +0900
Subject: [PATCH 074/816] gtk3: Call XIGrabKeycode directly from Vala

Port the logic of grabkeycode.c into Vala.  This will make it easier to
implement XI2 GenericEvent handling in KeybindingManager.

BUG=none

Review URL: https://codereview.appspot.com/6501080
---
 bindings/vala/Makefile.am      |   1 +
 bindings/vala/xi.vapi          |  53 +++++++++++++++++
 ui/gtk3/Makefile.am            |   2 +-
 ui/gtk3/grabkeycode.c          | 105 ---------------------------------
 ui/gtk3/keybindingmanager.vala |  83 +++++++++++++++++++++++---
 5 files changed, 130 insertions(+), 114 deletions(-)
 create mode 100644 bindings/vala/xi.vapi
 delete mode 100644 ui/gtk3/grabkeycode.c

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index faa92a639..abcc5436d 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -45,6 +45,7 @@ EXTRA_DIST = \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
 	config.vapi \
+	xi.vapi \
 	$(NULL)
 
 MAINTAINERCLEANFILES = ibus-@IBUS_API_VERSION@.vapi
diff --git a/bindings/vala/xi.vapi b/bindings/vala/xi.vapi
new file mode 100644
index 000000000..29c42511a
--- /dev/null
+++ b/bindings/vala/xi.vapi
@@ -0,0 +1,53 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "X11/extensions/XInput2.h")]
+namespace XI {
+    public enum EventType {
+        [CCode (cname = "XI_KeyPress")]
+        KeyPress,
+        [CCode (cname = "XI_KeyRelease")]
+        KeyRelease,
+    }
+
+    [CCode (cname = "XIAllMasterDevices")]
+    public const int AllMasterDevices;
+
+    [CCode (cname = "XI_LASTEVENT")]
+    public const int LASTEVENT;
+
+    [Compact]
+    [CCode (cname = "XIEventMask", destroy_function = "")]
+    public struct EventMask {
+        public int deviceid;
+        [CCode (array_length_cname = "mask_len")]
+        public uchar[] mask;
+    }
+
+    [CCode (cname = "XISetMask")]
+    public void set_mask(void *mask, EventType type);
+
+    [Compact]
+    [CCode (cname = "XIGrabModifiers", destroy_function = "")]
+    public struct GrabModifiers {
+        public int modifiers;
+        public int status;
+    }
+
+    [CCode (cname = "XIGrabKeycode")]
+    public int grab_keycode (X.Display display,
+                             int deviceid,
+                             int keycode,
+                             X.Window grab_window,
+                             int grab_mode,
+                             int paired_device_mode,
+                             bool owner_events,
+                             XI.EventMask mask,
+                             [CCode (array_length_pos = 8.9)]
+                             XI.GrabModifiers[] modifiers);
+
+    [CCode (cname = "XIUngrabKeycode")]
+    public int ungrab_keycode (X.Display display,
+                               int deviceid,
+                               int keycode,
+                               X.Window grab_window,
+                               [CCode (array_length_pos = 4.9)]
+                               XI.GrabModifiers[] modifiers);
+}
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 8d362bce2..547302771 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -82,6 +82,7 @@ AM_VALAFLAGS = \
 	--pkg=gdk-x11-3.0 \
 	--pkg=ibus-1.0 \
 	--pkg=config \
+	--pkg=xi \
 	$(NULL)
 
 libexec_PROGRAMS = ibus-ui-gtk3
@@ -98,7 +99,6 @@ ibus_ui_gtk3_SOURCES = \
 	property.vala \
 	separator.vala \
 	switcher.vala \
-	grabkeycode.c \
 	$(NULL)
 
 ibus_ui_gtk3_LDADD = \
diff --git a/ui/gtk3/grabkeycode.c b/ui/gtk3/grabkeycode.c
deleted file mode 100644
index 6a2d02f23..000000000
--- a/ui/gtk3/grabkeycode.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* vim:set et sts=4 sw=4:
- *
- * ibus - The Input Bus
- *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
- *
- * 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 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
- */
-
-#include <glib.h>
-#include <gdk/gdkx.h>
-#include <X11/extensions/XInput2.h>
-
-gboolean grab_keycode (GdkDisplay *display,
-                       guint keyval,
-                       guint modifiers) {
-    Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
-    int keycode = XKeysymToKeycode (xdisplay, keyval);
-    if (keycode == 0) {
-        g_warning ("Can not convert keyval=%u to keycode!", keyval);
-        return FALSE;
-    }
-
-    XIEventMask mask;
-    mask.deviceid = XIAllMasterDevices;
-    mask.mask_len = XIMaskLen(XI_RawMotion);
-    mask.mask = g_new0 (unsigned char, mask.mask_len);
-    XISetMask (mask.mask, XI_KeyPress);
-    XISetMask (mask.mask, XI_KeyRelease);
-
-    XIGrabModifiers ximodifiers[] = {
-        { modifiers, 0 },
-        { LockMask | modifiers, 0 },
-        { Mod2Mask | modifiers, 0 },
-        { Mod5Mask | modifiers, 0 },
-        { LockMask | Mod2Mask | modifiers, 0 },
-        { Mod2Mask | Mod5Mask | modifiers, 0 },
-        { LockMask | Mod5Mask | modifiers, 0 },
-        { LockMask | Mod2Mask | Mod5Mask | modifiers, 0 },
-    };
-
-    int retval = XIGrabKeycode (xdisplay,
-                                XIAllMasterDevices,
-                                keycode,
-                                DefaultRootWindow (xdisplay),
-                                GrabModeAsync,
-                                GrabModeAsync,
-                                True,
-                                &mask,
-                                G_N_ELEMENTS (ximodifiers),
-                                ximodifiers);
-
-    g_free (mask.mask);
-
-    if (retval == -1)
-        return FALSE;
-    return TRUE;
-}
-
-gboolean ungrab_keycode (GdkDisplay *display,
-                         guint keyval,
-                         guint modifiers) {
-    Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
-    int keycode = XKeysymToKeycode (xdisplay, keyval);
-    if (keycode == 0) {
-        g_warning ("Can not convert keyval=%u to keycode!", keyval);
-        return FALSE;
-    }
-
-    XIGrabModifiers ximodifiers[] = {
-        {modifiers, 0},
-        {Mod2Mask | modifiers, 0},
-        {LockMask | modifiers, 0},
-        {Mod5Mask | modifiers, 0},
-        {Mod2Mask | LockMask | modifiers, 0},
-        {Mod2Mask | Mod5Mask | modifiers, 0},
-        {LockMask | Mod5Mask | modifiers, 0},
-        {Mod2Mask | LockMask | Mod5Mask | modifiers, 0},
-    };
-
-    int retval = XIUngrabKeycode (xdisplay,
-                                  XIAllMasterDevices,
-                                  keycode,
-                                  DefaultRootWindow (xdisplay),
-                                  G_N_ELEMENTS (ximodifiers),
-                                  ximodifiers);
-
-    if (retval == -1)
-        return FALSE;
-
-    return TRUE;
-}
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 9b53b09f1..5ff0c6564 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -10,14 +10,6 @@ valac --pkg gtk+-2.0 --pkg x11 --pkg gdk-x11-2.0 --pkg gee-1.0 keybinding-manage
  * @author Oliver Sauder <os@esite.ch>
  */
 
-extern bool grab_keycode (Gdk.Display display,
-                          uint keyval,
-                          uint modifiers);
-
-extern bool ungrab_keycode (Gdk.Display display,
-                            uint keyval,
-                            uint modifiers);
-
 public class KeybindingManager : GLib.Object {
     /**
      * list of binded keybindings
@@ -213,6 +205,81 @@ public class KeybindingManager : GLib.Object {
         } while (false);
         Gtk.main_do_event(event);
     }
+
+    // Get union of given modifiers and all the combination of the
+    // modifiers in ignored_modifiers.
+    XI.GrabModifiers[] get_grab_modifiers(uint modifiers) {
+        const int[] ignored_modifiers = {
+            X.KeyMask.LockMask,
+            X.KeyMask.Mod2Mask,
+            X.KeyMask.Mod5Mask
+        };
+        int[] masks = {};
+        foreach (var modifier in ignored_modifiers) {
+            masks += modifier;
+
+            int length = masks.length;
+            for (int j = 0; j < length - 1; j++) {
+                masks += masks[j] | modifier;
+            }
+        }
+        masks += 0;
+
+        XI.GrabModifiers[] ximodifiers = {};
+        foreach (var mask in masks) {
+            ximodifiers += XI.GrabModifiers() {
+                modifiers = mask | modifiers,
+                status = 0
+            };
+        }
+
+        return ximodifiers;
+    }
+
+    bool grab_keycode(Gdk.Display display, uint keyval, uint modifiers) {
+        unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
+        int keycode = xdisplay.keysym_to_keycode(keyval);
+        if (keycode == 0) {
+            warning("Can not convert keyval=%u to keycode!", keyval);
+            return false;
+        }
+
+        XI.EventMask evmask = XI.EventMask() {
+            deviceid = XI.AllMasterDevices,
+            mask = new uchar[(XI.LASTEVENT + 7) / 8]
+        };
+        XI.set_mask(evmask.mask, XI.EventType.KeyPress);
+        XI.set_mask(evmask.mask, XI.EventType.KeyRelease);
+
+        int retval = XI.grab_keycode (xdisplay,
+                                      XI.AllMasterDevices,
+                                      keycode,
+                                      xdisplay.default_root_window(),
+                                      X.GrabMode.Async,
+                                      X.GrabMode.Async,
+                                      true,
+                                      evmask,
+                                      get_grab_modifiers(modifiers));
+            
+        return retval == 0;
+    }
+
+    bool ungrab_keycode(Gdk.Display display, uint keyval, uint modifiers) {
+        unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
+        int keycode = xdisplay.keysym_to_keycode(keyval);
+        if (keycode == 0) {
+            warning("Can not convert keyval=%u to keycode!", keyval);
+            return false;
+        }
+
+        int retval = XI.ungrab_keycode (xdisplay,
+                                        XI.AllMasterDevices,
+                                        keycode,
+                                        xdisplay.default_root_window(),
+                                        get_grab_modifiers(modifiers));
+
+        return retval == 0;
+    }
 }
 
 /*

From b1bd749c0030d1822bb3b3dd096d071cc697d81e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 7 Sep 2012 11:55:09 +0900
Subject: [PATCH 075/816] Prevent IME menu being empty when focus out

Previously ibus-daemon did not make fake_context focused when focus-out, while it is supposed to do.

BUG=none

Review URL: https://codereview.appspot.com/6492086
---
 bus/ibusimpl.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 10a6a1888..650aace18 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -711,13 +711,7 @@ _context_focus_out_cb (BusInputContext    *context,
         return;
     }
 
-
-    if (ibus->use_global_engine == FALSE) {
-        /* Do not change the focused context, if use_global_engine option is enabled.
-         * If focused context swith to NULL, users can not swith engine in panel anymore.
-         **/
-        bus_ibus_impl_set_focused_context (ibus, NULL);
-    }
+    bus_ibus_impl_set_focused_context (ibus, NULL);
 }
 
 /**

From 8166b0b98bfe0d70c03fa26bb5e721a357ad4ef8 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Tue, 11 Sep 2012 11:21:58 -0400
Subject: [PATCH 076/816] Use gdk_threads_add_idle_full() in gtkimmodule to
 avoid race condition in some multi-threaded apps.

BUG=http://code.google.com/p/ibus/issues/detail?id=1505

Review URL: https://codereview.appspot.com/6488104
---
 client/gtk2/ibusimcontext.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 584b92dd6..cb5561b09 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -769,10 +769,10 @@ ibus_im_context_focus_in (GtkIMContext *context)
 
     /* set_cursor_location_internal() will get origin from X server,
      * it blocks UI. So delay it to idle callback. */
-    g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-                     (GSourceFunc) _set_cursor_location_internal,
-                     g_object_ref (ibusimcontext),
-                     (GDestroyNotify) g_object_unref);
+    gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
+                               (GSourceFunc) _set_cursor_location_internal,
+                               g_object_ref (ibusimcontext),
+                               (GDestroyNotify) g_object_unref);
 
     /* retrieve the initial surrounding-text (regardless of whether
      * the current IBus engine needs surrounding-text) */

From 7ab4c75aa8fb180ff7e26b60561753701581b90a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 12 Sep 2012 10:06:57 +0900
Subject: [PATCH 077/816] ibus-daemon: trigger engine to send
 RegisterProperties when panel appears

BUG=none

Review URL: https://codereview.appspot.com/6506094
---
 bus/engineproxy.c | 49 +++++++++++++++++++++++++++++++++++++++++++++--
 bus/engineproxy.h |  7 +++++++
 bus/ibusimpl.c    | 19 ++++++++++++++++--
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 417b47c0b..4d8c18be7 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -55,11 +55,16 @@ struct _BusEngineProxy {
     IBusText *surrounding_text;
     guint     surrounding_cursor_pos;
     guint     selection_anchor_pos;
+
+    /* cached properties */
+    IBusPropList *prop_list;
 };
 
 struct _BusEngineProxyClass {
     IBusProxyClass parent;
     /* class members */
+    void (* register_properties) (IBusPropList *prop_list);
+    void (* update_property) (IBusProperty *prop);
 };
 
 enum {
@@ -103,6 +108,12 @@ static void     bus_engine_proxy_get_property   (BusEngineProxy      *engine,
                                                  guint                prop_id,
                                                  GValue              *value,
                                                  GParamSpec          *pspec);
+static void     bus_engine_proxy_real_register_properties
+                                                (BusEngineProxy      *engine,
+                                                 IBusPropList        *prop_list);
+static void     bus_engine_proxy_real_update_property
+                                                (BusEngineProxy      *engine,
+                                                 IBusProperty        *prop);
 static void     bus_engine_proxy_real_destroy   (IBusProxy           *proxy);
 static void     bus_engine_proxy_g_signal       (GDBusProxy          *proxy,
                                                  const gchar         *sender_name,
@@ -125,6 +136,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
     gobject_class->set_property = (GObjectSetPropertyFunc)bus_engine_proxy_set_property;
     gobject_class->get_property = (GObjectGetPropertyFunc)bus_engine_proxy_get_property;
 
+    class->register_properties = bus_engine_proxy_real_register_properties;
+    class->update_property = bus_engine_proxy_real_update_property;
+
     IBUS_PROXY_CLASS (class)->destroy = bus_engine_proxy_real_destroy;
     G_DBUS_PROXY_CLASS (class)->g_signal = bus_engine_proxy_g_signal;
 
@@ -334,7 +348,7 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
         g_signal_new (I_("register-properties"),
             G_TYPE_FROM_CLASS (class),
             G_SIGNAL_RUN_LAST,
-            0,
+            G_STRUCT_OFFSET (BusEngineProxyClass, register_properties),
             NULL, NULL,
             bus_marshal_VOID__OBJECT,
             G_TYPE_NONE,
@@ -345,7 +359,7 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
         g_signal_new (I_("update-property"),
             G_TYPE_FROM_CLASS (class),
             G_SIGNAL_RUN_LAST,
-            0,
+            G_STRUCT_OFFSET (BusEngineProxyClass, update_property),
             NULL, NULL,
             bus_marshal_VOID__OBJECT,
             G_TYPE_NONE,
@@ -394,6 +408,24 @@ bus_engine_proxy_get_property (BusEngineProxy *engine,
 
 }
 
+static void
+bus_engine_proxy_real_register_properties (BusEngineProxy *engine,
+                                           IBusPropList   *prop_list)
+{
+    if (engine->prop_list)
+        g_object_unref (engine->prop_list);
+    engine->prop_list = (IBusPropList *) g_object_ref_sink (prop_list);
+}
+
+static void
+bus_engine_proxy_real_update_property (BusEngineProxy *engine,
+                                       IBusProperty   *prop)
+{
+    g_return_if_fail (prop);
+    if (engine->prop_list)
+        ibus_prop_list_update_property (engine->prop_list, prop);
+}
+
 static void
 bus_engine_proxy_real_destroy (IBusProxy *proxy)
 {
@@ -414,6 +446,11 @@ bus_engine_proxy_real_destroy (IBusProxy *proxy)
         engine->surrounding_text = NULL;
     }
 
+    if (engine->prop_list) {
+        g_object_unref (engine->prop_list);
+        engine->prop_list = NULL;
+    }
+
     IBUS_PROXY_CLASS (bus_engine_proxy_parent_class)->destroy ((IBusProxy *)engine);
 }
 
@@ -1203,6 +1240,14 @@ bus_engine_proxy_get_desc (BusEngineProxy *engine)
     return engine->desc;
 }
 
+IBusPropList *
+bus_engine_proxy_get_properties (BusEngineProxy *engine)
+{
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+
+    return engine->prop_list;
+}
+
 gboolean
 bus_engine_proxy_is_enabled (BusEngineProxy *engine)
 {
diff --git a/bus/engineproxy.h b/bus/engineproxy.h
index f61fc343e..b05072409 100644
--- a/bus/engineproxy.h
+++ b/bus/engineproxy.h
@@ -243,5 +243,12 @@ void             bus_engine_proxy_cancel_hand_writing
                                                     (BusEngineProxy        *engine,
                                                      guint                  n_strokes);
 
+/**
+ * bus_engine_proxy_get_properties:
+ *
+ * Get an IBusPropList object associated with the engine.
+ */
+IBusPropList    *bus_engine_proxy_get_properties    (BusEngineProxy        *engine);
+
 G_END_DECLS
 #endif
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 650aace18..25d2523a5 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -248,6 +248,7 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
         if (g_strcmp0 (new_name, "") != 0) {
             /* a Panel process is started. */
             BusConnection *connection;
+            BusInputContext *context = NULL;
 
             if (ibus->panel != NULL) {
                 ibus_proxy_destroy ((IBusProxy *) ibus->panel);
@@ -266,10 +267,24 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
                               ibus);
 
             if (ibus->focused_context != NULL) {
-                bus_panel_proxy_focus_in (ibus->panel, ibus->focused_context);
+                context = ibus->focused_context;
             }
             else if (ibus->use_global_engine) {
-                bus_panel_proxy_focus_in (ibus->panel, ibus->fake_context);
+                context = ibus->fake_context;
+            }
+
+            if (context != NULL) {
+                BusEngineProxy *engine;
+
+                bus_panel_proxy_focus_in (ibus->panel, context);
+
+                engine = bus_input_context_get_engine (context);
+                if (engine != NULL) {
+                    IBusPropList *prop_list =
+                        bus_engine_proxy_get_properties (engine);
+                    bus_panel_proxy_register_properties (ibus->panel,
+                                                         prop_list);
+                }
             }
         }
     }

From 75826b04b90f78e5c1cb94bfd429b5fc88c1de67 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 14 Sep 2012 11:24:30 +0900
Subject: [PATCH 078/816] Add IBusProperty.symbol for the short label.

IBusProperty.label had been shared between the panel menu label and
language-bar button label so the label is too short against the panel menu.
Now we redefines IBusProperty.label as the long label and the new
IBusProperty.symbol is defined as the short label for the language-bar
and the panel status icon.

TEST=Manually

Review URL: https://codereview.appspot.com/6495117
---
 ibus/property.py   |  14 +++-
 src/ibusproperty.c | 101 ++++++++++++++++++++++++---
 src/ibusproperty.h | 169 +++++++++++++++++++++++++++------------------
 3 files changed, 204 insertions(+), 80 deletions(-)

diff --git a/ibus/property.py b/ibus/property.py
index a7ea5a955..a4b18657c 100644
--- a/ibus/property.py
+++ b/ibus/property.py
@@ -63,11 +63,13 @@ class Property(Serializable):
     __gtype_name__ = "PYIBusProperty"
     __NAME__ = "IBusProperty"
     def __init__(self, key="", type=PROP_TYPE_NORMAL, label=u"", icon=u"", tooltip=u"",
-                 sensitive=True, visible=True, state=PROP_STATE_UNCHECKED):
+                 sensitive=True, visible=True, state=PROP_STATE_UNCHECKED,
+                 symbol=u""):
         super(Property, self).__init__()
         self.__key = _to_unicode(key)
         self.__type = type
         self.label = label
+        self.symbol = symbol
         self.icon = icon
         self.tooltip = tooltip
         self.sensitive = sensitive
@@ -93,6 +95,12 @@ def set_label(self, label):
     def get_label(self):
         return self.__label
 
+    def set_symbol(self, symbol):
+        self.__symbol = _to_text(symbol)
+
+    def get_symbol(self):
+        return self.__symbol
+
     def set_icon(self, icon):
         self.__icon = _to_unicode(icon)
 
@@ -126,6 +134,7 @@ def get_visible(self):
     key         = property(get_key)
     type        = property(get_type)
     label       = property(get_label, set_label)
+    symbol      = property(get_symbol, set_symbol)
     icon        = property(get_icon, set_icon)
     tooltip     = property(get_tooltip, set_tooltip)
     state       = property(get_state, set_state)
@@ -139,6 +148,7 @@ def is_same(self, prop, test_all = True):
         if not test_all:
             return True
         if self.__label != prop.__label or \
+            self.__symbol != prop.__symbol or \
             self.__icon != prop.__icon or \
             self.__tooltip != prop.__tooltip or \
             self.__sensitive != prop.__sensitive or \
@@ -160,6 +170,7 @@ def serialize(self, struct):
         struct.append(dbus.UInt32(self.__state))
         sub_props = serialize_object(self.__sub_props)
         struct.append(sub_props)
+        struct.append(serialize_object(self.__symbol))
 
     def deserialize(self, struct):
         super(Property, self).deserialize(struct)
@@ -174,6 +185,7 @@ def deserialize(self, struct):
         props = struct.pop(0)
 
         self.__sub_props = deserialize_object(props)
+        self.__symbol    = deserialize_object(struct.pop(0))
 
 class PropList(Serializable):
     __gtype_name__ = "PYIBusPropList"
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index e5480fa6a..a849319d7 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -32,6 +32,7 @@ enum {
     PROP_KEY,
     PROP_ICON,
     PROP_LABEL,
+    PROP_SYMBOL,
     PROP_TOOLTIP,
     PROP_SENSITIVE,
     PROP_VISIBLE,
@@ -45,6 +46,7 @@ struct _IBusPropertyPrivate {
     gchar    *key;
     gchar    *icon;
     IBusText *label;
+    IBusText *symbol;
     IBusText *tooltip;
 
     gboolean sensitive;
@@ -135,6 +137,19 @@ ibus_property_class_init (IBusPropertyClass *class)
                     IBUS_TYPE_TEXT,
                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
+    /**
+     * IBusPropert:symbol:
+     *
+     * The symbol of property
+     */
+    g_object_class_install_property (gobject_class,
+            PROP_SYMBOL,
+            g_param_spec_object("symbol",
+                    "symbol",
+                    "The symbol of property",
+                    IBUS_TYPE_TEXT,
+                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
     /**
      * IBusPropert:tooltip:
      *
@@ -221,6 +236,7 @@ ibus_property_init (IBusProperty *prop)
     prop->priv = IBUS_PROPERTY_GET_PRIVATE (prop);
 
     ibus_property_set_label (prop, NULL);
+    ibus_property_set_symbol (prop, NULL);
     ibus_property_set_tooltip (prop, NULL);
     ibus_property_set_sub_props (prop, NULL);
 
@@ -242,6 +258,9 @@ ibus_property_set_property (IBusProperty *prop,
     case PROP_LABEL:
         ibus_property_set_label (prop, g_value_get_object (value));
         break;
+    case PROP_SYMBOL:
+        ibus_property_set_symbol (prop, g_value_get_object (value));
+        break;
     case PROP_TOOLTIP:
         ibus_property_set_tooltip (prop, g_value_get_object (value));
         break;
@@ -282,6 +301,9 @@ ibus_property_get_property (IBusProperty *prop,
     case PROP_LABEL:
         g_value_set_object (value, ibus_property_get_label (prop));
         break;
+    case PROP_SYMBOL:
+        g_value_set_object (value, ibus_property_get_symbol (prop));
+        break;
     case PROP_TOOLTIP:
         g_value_set_object (value, ibus_property_get_tooltip (prop));
         break;
@@ -319,6 +341,11 @@ ibus_property_destroy (IBusProperty *prop)
         prop->priv->label = NULL;
     }
 
+    if (prop->priv->symbol) {
+        g_object_unref (prop->priv->symbol);
+        prop->priv->symbol = NULL;
+    }
+
     if (prop->priv->tooltip) {
         g_object_unref (prop->priv->tooltip);
         prop->priv->tooltip = NULL;
@@ -355,6 +382,9 @@ ibus_property_serialize (IBusProperty    *prop,
     g_variant_builder_add (builder, "u", prop->priv->state);
     g_variant_builder_add (builder, "v",
             ibus_serializable_serialize ((IBusSerializable *)prop->priv->sub_props));
+    /* Keep the serialized order for the compatibility when add new members. */
+    g_variant_builder_add (builder, "v",
+            ibus_serializable_serialize ((IBusSerializable *)prop->priv->symbol));
 
     return TRUE;
 }
@@ -392,6 +422,12 @@ ibus_property_deserialize (IBusProperty *prop,
     g_object_ref_sink (prop->priv->sub_props);
     g_variant_unref (subvar);
 
+    /* Keep the serialized order for the compatibility when add new members. */
+    subvar = g_variant_get_child_value (variant, retval++);
+    prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+    g_object_ref_sink (prop->priv->symbol);
+    g_variant_unref (subvar);
+
     return retval;
 }
 
@@ -414,6 +450,11 @@ ibus_property_copy (IBusProperty       *dest,
     }
     else
         dest->priv->label = ibus_text_new_from_static_string ("");
+    if (src->priv->symbol) {
+        dest->priv->symbol = (IBusText *) ibus_serializable_copy ((IBusSerializable *) src->priv->symbol);
+    }
+    else
+        dest->priv->symbol = ibus_text_new_from_static_string ("");
     if (src->priv->tooltip) {
         dest->priv->tooltip = (IBusText *) ibus_serializable_copy ((IBusSerializable *) src->priv->tooltip);
     }
@@ -446,19 +487,36 @@ ibus_property_new (const gchar   *key,
                           type <= PROP_TYPE_SEPARATOR,
                           NULL);
 
+    return ibus_property_new_varargs ("key", key,
+                                      "prop-type", type,
+                                      "label", label,
+                                      "icon", icon,
+                                      "tooltip", tooltip,
+                                      "sensitive", sensitive,
+                                      "visible", visible,
+                                      "state", state,
+                                      "sub-props", props,
+                                      NULL);
+}
+
+IBusProperty *
+ibus_property_new_varargs (const gchar *first_property_name, ...)
+{
+    va_list var_args;
     IBusProperty *prop;
 
-    prop = (IBusProperty *)g_object_new (IBUS_TYPE_PROPERTY,
-                                         "key", key,
-                                         "prop-type", type,
-                                         "label", label,
-                                         "icon", icon,
-                                         "tooltip", tooltip,
-                                         "sensitive", sensitive,
-                                         "visible", visible,
-                                         "state", state,
-                                         "sub-props", props,
-                                         NULL);
+    g_assert (first_property_name);
+
+    va_start (var_args, first_property_name);
+    prop = (IBusProperty *) g_object_new_valist (IBUS_TYPE_PROPERTY,
+                                                 first_property_name,
+                                                 var_args);
+    va_end (var_args);
+
+    g_assert (prop->priv->key);
+    g_assert (prop->priv->type >= PROP_TYPE_NORMAL &&
+              prop->priv->type <= PROP_TYPE_SEPARATOR);
+
     return prop;
 }
 
@@ -472,6 +530,7 @@ ibus_property_get_ ## field (IBusProperty *prop)                        \
 IBUS_PROPERTY_GET_FIELD (key, const gchar *)
 IBUS_PROPERTY_GET_FIELD (icon, const gchar *)
 IBUS_PROPERTY_GET_FIELD (label, IBusText *)
+IBUS_PROPERTY_GET_FIELD (symbol, IBusText *)
 IBUS_PROPERTY_GET_FIELD (tooltip, IBusText *)
 IBUS_PROPERTY_GET_FIELD (sensitive, gboolean)
 IBUS_PROPERTY_GET_FIELD (visible, gboolean)
@@ -506,6 +565,25 @@ ibus_property_set_label (IBusProperty *prop,
     }
 }
 
+void
+ibus_property_set_symbol (IBusProperty *prop,
+                          IBusText     *symbol)
+{
+    g_assert (IBUS_IS_PROPERTY (prop));
+    g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
+
+    if (prop->priv->symbol) {
+        g_object_unref (prop->priv->symbol);
+    }
+
+    if (symbol == NULL) {
+        prop->priv->symbol = ibus_text_new_from_static_string ("");
+    }
+    else {
+        prop->priv->symbol = g_object_ref_sink (symbol);
+    }
+}
+
 void
 ibus_property_set_icon (IBusProperty *prop,
                         const gchar  *icon)
@@ -609,6 +687,7 @@ ibus_property_update (IBusProperty *prop,
 
     ibus_property_set_icon (prop, ibus_property_get_icon (prop_update));
     ibus_property_set_label (prop, ibus_property_get_label (prop_update));
+    ibus_property_set_symbol (prop, ibus_property_get_symbol (prop_update));
     ibus_property_set_tooltip (prop, ibus_property_get_tooltip (prop_update));
     ibus_property_set_visible (prop, ibus_property_get_visible (prop_update));
     ibus_property_set_state (prop, ibus_property_get_state (prop_update));
diff --git a/src/ibusproperty.h b/src/ibusproperty.h
index 96b1a1384..c8265196c 100644
--- a/src/ibusproperty.h
+++ b/src/ibusproperty.h
@@ -24,6 +24,12 @@
 #error "Only <ibus.h> can be included directly"
 #endif
 
+#ifndef __IBUS_PROPERTY_H_
+#define __IBUS_PROPERTY_H_
+
+#include "ibusserializable.h"
+#include "ibustext.h"
+
 /**
  * SECTION: ibusproperty
  * @short_description: UI component for input method engine property.
@@ -37,14 +43,8 @@
  * pressing ctrl-space or click on the Eng/Chi switch button.
  * And the IBusProperty shows the change correspondingly.
  *
- * @see_also: #IBusPropList, #IBusEngine
+ * see_also: #IBusPropList, #IBusEngine
  */
-#ifndef __IBUS_PROPERTY_H_
-#define __IBUS_PROPERTY_H_
-
-#include "ibusserializable.h"
-#include "ibustext.h"
-
 G_BEGIN_DECLS
 
 /*
@@ -90,7 +90,7 @@ typedef enum {
  * @PROP_STATE_INCONSISTENT: The state is inconsistent with the associated IME
  * property.
  *
- * State of IBusProperty. The actual effect depends on #IBusPropType of the
+ * State of #IBusProperty. The actual effect depends on #IBusPropType of the
  * IBusProperty.
  *
  * <variablelist>
@@ -127,6 +127,7 @@ typedef struct _IBusPropListClass IBusPropListClass;
  * @key: Unique Identity for the IBusProperty.
  * @icon: Icon file for the IBusProperty.
  * @label: Text shown in UI.
+ * @symbol: A symbol char showned on a button or status icon for IBusProperty.
  * @tooltip: Message shown if mouse hovered the  IBusProperty.
  * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
  * @visible: Whether the IBusProperty is visible.
@@ -153,18 +154,18 @@ GType            ibus_property_get_type     ();
 
 /**
  * ibus_property_new:
- * @key: Unique Identity for the IBusProperty.
- * @type: IBusPropType of IBusProperty.
+ * @key: Unique Identity for the #IBusProperty.
+ * @type: #IBusPropType of #IBusProperty.
  * @label: Text shown in UI.
- * @icon: (allow-none): Icon file for the IBusProperty.
- * @tooltip: Message shown if mouse hovered the  IBusProperty.
- * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
- * @visible: Whether the IBusProperty is visible.
- * @state: IBusPropState of IBusProperty.
- * @prop_list: (allow-none): IBusPropList that contains sub IBusProperties.
- * @returns: A newly allocated IBusProperty.
+ * @icon: (allow-none): Icon file for the #IBusProperty.
+ * @tooltip: Message shown if mouse hovered the  #IBusProperty.
+ * @sensitive: Whether the #IBusProperty is sensitive to keyboard and mouse event.
+ * @visible: Whether the #IBusProperty is visible.
+ * @state: IBusPropState of #IBusProperty.
+ * @prop_list: (allow-none): #IBusPropList that contains sub IBusProperties.
+ * @returns: A newly allocated #IBusProperty.
  *
- * New a IBusProperty.
+ * New a #IBusProperty.
  */
 IBusProperty    *ibus_property_new          (const gchar    *key,
                                              IBusPropType    type,
@@ -176,152 +177,184 @@ IBusProperty    *ibus_property_new          (const gchar    *key,
                                              IBusPropState   state,
                                              IBusPropList   *prop_list);
 
+/**
+ * ibus_property_new_varargs:
+ * @first_property_name: Name of the first property.
+ * @Varargs: the NULL-terminated arguments of the properties and values.
+ *
+ * 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)
+ */
+IBusProperty    *ibus_property_new_varargs  (const gchar    *first_property_name,
+                                                             ...);
+
 /**
  * ibus_property_get_key:
- * @prop: An IBusProperty.
- * @returns: the key of IBusProperty. Should not be freed.
+ * @prop: An #IBusProperty.
+ * @returns: the key of #IBusProperty. Should not be freed.
  *
- * Get the key of IBusProperty.
+ * Get the key of #IBusProperty.
  */
 const gchar *    ibus_property_get_key      (IBusProperty   *prop);
 
 /**
  * ibus_property_get_label:
- * @prop: An IBusProperty.
- * @returns: (transfer none): the label of IBusProperty. Should not be freed.
+ * @prop: An #IBusProperty.
+ * @returns: (transfer none): the label of #IBusProperty. Should not be freed.
  *
- * Get the label of IBusProperty.
+ * Get the label of #IBusProperty.
  */
-IBusText *      ibus_property_get_label    (IBusProperty   *prop);
+IBusText *       ibus_property_get_label    (IBusProperty   *prop);
 
 /**
  * ibus_property_set_label:
- * @prop: An IBusProperty.
+ * @prop: An #IBusProperty.
  * @label: Text shown in UI.
  *
- * Set the label of IBusProperty.
+ * Set the label of #IBusProperty.
  */
 void             ibus_property_set_label    (IBusProperty   *prop,
                                              IBusText       *label);
 
+/**
+ * ibus_property_get_symbol:
+ * @prop: An #IBusProperty.
+ * @returns: (transfer none): the symbol of #IBusProperty. Should not be freed.
+ *
+ * Get the symbol of #IBusProperty.
+ */
+IBusText *       ibus_property_get_symbol   (IBusProperty   *prop);
+
+/**
+ * ibus_property_set_symbol:
+ * @prop: An #IBusProperty.
+ * @symbol: Text shown in UI.
+ *
+ * Set the symbol of #IBusProperty.
+ */
+void             ibus_property_set_symbol   (IBusProperty   *prop,
+                                             IBusText       *symbol);
+
 /**
  * ibus_property_get_icon:
- * @prop: An IBusProperty.
- * @returns: the icon of IBusProperty. Should not be freed.
+ * @prop: An #IBusProperty.
+ * @returns: the icon of #IBusProperty. Should not be freed.
  *
- * Get the icon of IBusProperty.
+ * Get the icon of #IBusProperty.
  */
 const gchar *    ibus_property_get_icon     (IBusProperty   *prop);
 
 /**
  * ibus_property_set_icon:
- * @prop: An IBusProperty.
+ * @prop: An #IBusProperty.
  * @icon: Icon shown in UI. It could be a full path of an icon file or an icon name.
  *
- * Set the icon of IBusProperty.
+ * Set the icon of #IBusProperty.
  */
 void             ibus_property_set_icon     (IBusProperty   *prop,
                                              const gchar    *icon);
 
 /**
  * ibus_property_get_tooltip:
- * @prop: An IBusProperty.
- * @returns: (transfer none): the tooltip of IBusProperty. Should not be freed.
+ * @prop: An #IBusProperty.
+ * @returns: (transfer none): the tooltip of #IBusProperty. Should not be freed.
  *
- * Get the tooltip of IBusProperty.
+ * Get the tooltip of #IBusProperty.
  */
-IBusText *      ibus_property_get_tooltip  (IBusProperty   *prop);
+IBusText *       ibus_property_get_tooltip  (IBusProperty   *prop);
 
 /**
  * ibus_property_set_tooltip:
- * @prop: An IBusProperty.
+ * @prop: An #IBusProperty.
  * @tooltip: Text of the tooltip.
  *
- * Set the tooltip of IBusProperty.
+ * Set the tooltip of #IBusProperty.
  */
 void             ibus_property_set_tooltip  (IBusProperty   *prop,
                                              IBusText       *tooltip);
 
 /**
  * ibus_property_get_sensitive:
- * @prop: An IBusProperty.
- * @returns: the sensitive of IBusProperty.
+ * @prop: An #IBusProperty.
+ * @returns: the sensitive of #IBusProperty.
  *
- * Get the sensitive of IBusProperty.
+ * Get the sensitive of #IBusProperty.
  */
 gboolean         ibus_property_get_sensitive(IBusProperty   *prop);
 
 /**
  * ibus_property_set_sensitive:
- * @prop: An IBusProperty.
- * @sensitive: Whether the IBusProperty is sensitive.
+ * @prop: An #IBusProperty.
+ * @sensitive: Whether the #IBusProperty is sensitive.
  *
- * Set whether the IBusProperty is sensitive.
+ * Set whether the #IBusProperty is sensitive.
  */
 void             ibus_property_set_sensitive(IBusProperty   *prop,
                                              gboolean        sensitive);
 
 /**
  * ibus_property_get_visible:
- * @prop: An IBusProperty.
- * @returns: the visible of IBusProperty.
+ * @prop: An #IBusProperty.
+ * @returns: the visible of #IBusProperty.
  *
- * Get the visible of IBusProperty.
+ * Get the visible of #IBusProperty.
  */
 gboolean         ibus_property_get_visible  (IBusProperty   *prop);
 
 /**
  * ibus_property_set_visible:
- * @prop: An IBusProperty.
- * @visible: Whether the IBusProperty is visible.
+ * @prop: An #IBusProperty.
+ * @visible: Whether the #IBusProperty is visible.
  *
- * Set whether the IBusProperty is visible.
+ * Set whether the #IBusProperty is visible.
  */
 void             ibus_property_set_visible  (IBusProperty   *prop,
                                              gboolean        visible);
 
 /**
  * ibus_property_get_property_type:
- * @prop: An IBusProperty.
- * @returns: the type of IBusProperty.
+ * @prop: An #IBusProperty.
+ * @returns: the type of #IBusProperty.
  *
- * Get the type of IBusProperty.
+ * Get the type of #IBusProperty.
  */
 IBusPropType     ibus_property_get_prop_type(IBusProperty   *prop);
 
 /**
  * ibus_property_get_state:
- * @prop: An IBusProperty.
- * @returns: the state of IBusProperty.
+ * @prop: An #IBusProperty.
+ * @returns: the state of #IBusProperty.
  *
- * Get the state of IBusProperty.
+ * Get the state of #IBusProperty.
  */
 IBusPropState    ibus_property_get_state    (IBusProperty   *prop);
 
 /**
  * ibus_property_set_state:
- * @prop: An IBusProperty.
- * @state: The state of the IBusProperty.
+ * @prop: An #IBusProperty.
+ * @state: The state of the #IBusProperty.
  *
- * Set the state of the IBusProperty.
+ * Set the state of the #IBusProperty.
  */
 void             ibus_property_set_state    (IBusProperty   *prop,
                                              IBusPropState   state);
 
 /**
  * ibus_property_get_sub_props:
- * @prop: An IBusProperty.
- * @returns: (transfer none): the IBusPropList of IBusProperty.
+ * @prop: An #IBusProperty.
+ * @returns: (transfer none): the IBusPropList of #IBusProperty.
  *     Should not be freed.
  *
- * Get the IBusPropList of IBusProperty.
+ * Get the IBusPropList of #IBusProperty.
  */
 IBusPropList *   ibus_property_get_sub_props(IBusProperty   *prop);
 
 /**
  * ibus_property_set_sub_props:
- * @prop: An IBusProperty.
- * @prop_list: IBusPropList that contains sub IBusProperties.
+ * @prop: An #IBusProperty.
+ * @prop_list: #IBusPropList that contains sub IBusProperties.
  *
  * Set the sub IBusProperties.
  */
@@ -330,12 +363,12 @@ void             ibus_property_set_sub_props(IBusProperty   *prop,
 
 /**
  * ibus_property_update:
- * @prop: An IBusProperty.
- * @prop_update: IBusPropList that contains sub IBusProperties.
+ * @prop: An #IBusProperty.
+ * @prop_update: #IBusPropList that contains sub IBusProperties.
  * @returns: TRUE for update suceeded; FALSE otherwise.
  *
- * Update the content of an IBusProperty.
- * IBusProperty @prop_update can either be sub-property of @prop,
+ * Update the content of an #IBusProperty.
+ * #IBusProperty @prop_update can either be sub-property of @prop,
  * or holds new values for @prop.
  */
 

From ea36002109cfaba8e78265a4398c17a1114fd3fe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Sep 2012 12:09:31 +0900
Subject: [PATCH 079/816] Fix make dist.

TEST=Manually

Review URL: https://codereview.appspot.com/6492121
---
 po/POTFILES.skip      | 1 +
 src/tests/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 4d9d6556e..99d0823a4 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,7 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
 ibus/_config.py
+tools/main.c
 ui/gtk3/application.c
 ui/gtk3/candidatearea.c
 ui/gtk3/candidatepanel.c
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index bb7bdd497..f146ddd4f 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -59,7 +59,7 @@ TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir) \
 	builddir=$(builddir) \
-	$(builddir)/setupenv \
+	$(srcdir)/setupenv \
 	$(NULL)
 
 EXTRA_DIST = setupenv

From b4fb74727f39697ce94c2c8a37f46044f357e17e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Sep 2012 12:12:15 +0900
Subject: [PATCH 080/816] Fix SIGABRT in bus_panel_proxy_register_properties

TEST=Manually

Review URL: https://codereview.appspot.com/6499112
---
 bus/engineproxy.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 4d8c18be7..49df07a34 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -63,8 +63,10 @@ struct _BusEngineProxy {
 struct _BusEngineProxyClass {
     IBusProxyClass parent;
     /* class members */
-    void (* register_properties) (IBusPropList *prop_list);
-    void (* update_property) (IBusProperty *prop);
+    void (* register_properties) (BusEngineProxy      *engine,
+                                  IBusPropList *prop_list);
+    void (* update_property) (BusEngineProxy      *engine,
+                              IBusProperty *prop);
 };
 
 enum {
@@ -98,6 +100,7 @@ enum {
 static guint    engine_signals[LAST_SIGNAL] = { 0 };
 
 static IBusText *text_empty = NULL;
+static IBusPropList *prop_list_empty = NULL;
 
 /* functions prototype */
 static void     bus_engine_proxy_set_property   (BusEngineProxy      *engine,
@@ -368,12 +371,16 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
 
     text_empty = ibus_text_new_from_static_string ("");
     g_object_ref_sink (text_empty);
+
+    prop_list_empty = ibus_prop_list_new ();
+    g_object_ref_sink (prop_list_empty);
 }
 
 static void
 bus_engine_proxy_init (BusEngineProxy *engine)
 {
     engine->surrounding_text = g_object_ref_sink (text_empty);
+    engine->prop_list = g_object_ref_sink (prop_list_empty);
 }
 
 static void
@@ -412,7 +419,9 @@ static void
 bus_engine_proxy_real_register_properties (BusEngineProxy *engine,
                                            IBusPropList   *prop_list)
 {
-    if (engine->prop_list)
+    g_assert (IBUS_IS_PROP_LIST (prop_list));
+
+    if (engine->prop_list != prop_list_empty)
         g_object_unref (engine->prop_list);
     engine->prop_list = (IBusPropList *) g_object_ref_sink (prop_list);
 }

From 1f66434b9cea881de0f14de105763dc650351aea Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 26 Sep 2012 10:16:32 +0900
Subject: [PATCH 081/816] Fix a docs build error with the latest
 libxslt-1.1.27.

TEST=manually

Review URL: https://codereview.appspot.com/6570048
---
 docs/reference/ibus/ibus-docs.sgml.in | 18 +++++++++++++-----
 src/ibusobservedpath.h                |  1 +
 src/ibusproperty.h                    | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/docs/reference/ibus/ibus-docs.sgml.in b/docs/reference/ibus/ibus-docs.sgml.in
index ab99ded75..febfe8ca6 100644
--- a/docs/reference/ibus/ibus-docs.sgml.in
+++ b/docs/reference/ibus/ibus-docs.sgml.in
@@ -72,10 +72,14 @@
       <xi:include href="xml/ibuscomponent.xml"/>
       <xi:include href="xml/ibusengine.xml"/>
       <xi:include href="xml/ibusenginedesc.xml"/>
+      <xi:include href="xml/ibusenginesimple.xml"/>
       <xi:include href="xml/ibusfactory.xml"/>
       <xi:include href="xml/ibusinputcontext.xml"/>
+      <xi:include href="xml/ibuskeys.xml"/>
       <xi:include href="xml/ibuskeymap.xml"/>
+      <xi:include href="xml/ibuskeysyms-compat.xml"/>
       <xi:include href="xml/ibuskeysyms.xml"/>
+      <xi:include href="xml/ibusutil.xml"/>
   </chapter>
   <chapter>
       <title>Configuration</title>
@@ -92,9 +96,6 @@
       <title>Communication</title>
       <para>Here lists the service communication functions.</para>
       <xi:include href="xml/ibusbus.xml"/>
-      <xi:include href="xml/ibusconnection.xml"/>
-      <xi:include href="xml/ibusmessage.xml"/>
-      <xi:include href="xml/ibuspendingcall.xml"/>
       <xi:include href="xml/ibusproxy.xml"/>
       <xi:include href="xml/ibusserializable.xml"/>
       <xi:include href="xml/ibusservice.xml"/>
@@ -104,11 +105,18 @@
       <para>Definition and functions for IBus internal use.</para>
       <xi:include href="xml/ibusdebug.xml"/>
       <xi:include href="xml/ibuserror.xml"/>
-      <xi:include href="xml/ibusmainloop.xml"/>
       <xi:include href="xml/ibusobject.xml"/>
-      <xi:include href="xml/ibusserver.xml"/>
       <xi:include href="xml/ibusshare.xml"/>
       <xi:include href="xml/ibustypes.xml"/>
   </chapter>
+  <index id="api-index-full">
+    <title>Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-deprecated" role="deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
 
diff --git a/src/ibusobservedpath.h b/src/ibusobservedpath.h
index e0d7033fc..e137d3913 100644
--- a/src/ibusobservedpath.h
+++ b/src/ibusobservedpath.h
@@ -75,6 +75,7 @@ struct _IBusObservedPath {
     IBusSerializable parent;
     /* instance members */
 
+    /*< public >*/
     gchar *path;
     glong mtime;
     gboolean is_dir;
diff --git a/src/ibusproperty.h b/src/ibusproperty.h
index c8265196c..59b228da3 100644
--- a/src/ibusproperty.h
+++ b/src/ibusproperty.h
@@ -124,16 +124,16 @@ typedef struct _IBusPropListClass IBusPropListClass;
 
 /**
  * IBusProperty:
- * @key: Unique Identity for the IBusProperty.
- * @icon: Icon file for the IBusProperty.
- * @label: Text shown in UI.
- * @symbol: A symbol char showned on a button or status icon for IBusProperty.
- * @tooltip: Message shown if mouse hovered the  IBusProperty.
- * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
- * @visible: Whether the IBusProperty is visible.
- * @type: IBusPropType of IBusProperty.
- * @state: IBusPropState of IBusProperty.
- * @sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
+ * key: Unique Identity for the IBusProperty.
+ * icon: Icon file for the IBusProperty.
+ * label: Text shown in UI.
+ * symbol: A symbol char showned on a button or status icon for IBusProperty.
+ * tooltip: Message shown if mouse hovered the  IBusProperty.
+ * sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
+ * visible: Whether the IBusProperty is visible.
+ * type: IBusPropType of IBusProperty.
+ * state: IBusPropState of IBusProperty.
+ * sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
  * shown as sub menu item.
  *
  * UI component for input method engine property.

From defa8ee66d4a1a780bad0e6799ed0bb166d69eba Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Sep 2012 10:11:34 +0900
Subject: [PATCH 082/816] Fix IBus.Bus.get_config is null.

Now im-ibus.so uses ibus_bus_new_async() instead of ibus_bus_new()
and then if ibus-setup-anthy calls GTK+ UI before ibus_bus_new(),
the async function is called instead and the delay is happened with
the latest ibus 1.5.
The fix is to call ibus_bus_new() before GTK+.

BUG=RH#859585
TEST=Manually

Review URL: https://codereview.appspot.com/6566053
---
 setup/main.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 300f11bce..8a2391d98 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -66,12 +66,20 @@ def __flush_gtk_events(self):
 
     def __init__(self):
         super(Setup, self).__init__()
+
+        # IBus.Bus() calls ibus_bus_new().
+        # Gtk.Builder().add_from_file() also calls ibus_bus_new_async()
+        # via ibus_im_context_new().
+        # Then if IBus.Bus() is called after Gtk.Builder().add_from_file(),
+        # the connection delay would be happened without an async
+        # finish function.
+        self.__bus = None
+        self.__init_bus()
+
         gtk_builder_file = path.join(path.dirname(__file__), "./setup.ui")
         self.__builder = Gtk.Builder()
         self.__builder.set_translation_domain(DOMAINNAME)
         self.__builder.add_from_file(gtk_builder_file);
-        self.__bus = None
-        self.__init_bus()
         self.__init_ui()
 
     def __init_hotkey(self):

From a541503e53616e4fddda59986023e7c20a198d56 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Fri, 28 Sep 2012 10:11:01 -0400
Subject: [PATCH 083/816] Fix wrong size of switcher window after removing some
 engines.

BUG=None

Review URL: https://codereview.appspot.com/6560060
---
 ui/gtk3/switcher.vala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 7566466bd..2587117f4 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -120,6 +120,9 @@ class Switcher : Gtk.Window {
                 state & KeybindingManager.MODIFIER_FILTER);
 
         update_engines(engines);
+        /* Let gtk recalculate the window size. */
+        resize(1, 1);
+
         m_selected_engine = index;
         m_label.set_text(m_buttons[index].longname);
         m_buttons[index].grab_focus();

From e97056e15badac9c0578a89d0085bfcb57ff7a2e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 3 Oct 2012 11:48:20 +0900
Subject: [PATCH 084/816] Fix SIGABRT by finalized IBusIMContext during
 _request_surrounding_text

BUG=RH#859879
TEST=Manually

Review URL: https://codereview.appspot.com/6573051
---
 client/gtk2/ibusimcontext.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index cb5561b09..17da26371 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -294,14 +294,17 @@ _key_snooper_cb (GtkWidget   *widget,
     IDEBUG ("%s", __FUNCTION__);
     gboolean retval = FALSE;
 
-    IBusIMContext *ibusimcontext = (IBusIMContext *) _focus_im_context;
+    IBusIMContext *ibusimcontext = NULL;
     IBusInputContext *ibuscontext = NULL;
 
-    if (ibusimcontext != NULL &&
-        ibusimcontext->has_focus == TRUE) {
-        /* has IC with focus and use_key_snooper is true */
-        if (_use_key_snooper)
-            ibuscontext = ibusimcontext->ibuscontext;
+    if (!_use_key_snooper)
+        return;
+
+    if (_focus_im_context != NULL &&
+        ((IBusIMContext *) _focus_im_context)->has_focus == TRUE) {
+        ibusimcontext = (IBusIMContext *) _focus_im_context;
+        /* has IC with focus */
+        ibuscontext = ibusimcontext->ibuscontext;
     }
     else {
         /* If no IC has focus, and fake IC has been created, then pass key events to fake IC. */
@@ -373,6 +376,13 @@ _key_snooper_cb (GtkWidget   *widget,
     } while (0);
 
     if (ibusimcontext != NULL) {
+        /* "retrieve-surrounding" signal sometimes calls unref by
+         * gtk_im_multicontext_get_slave() because priv->context_id is not
+         * the latest than global_context_id in GtkIMMulticontext.
+         * Since _focus_im_context is gotten by the focus_in event,
+         * it would be good to call ref here.
+         */
+        g_object_ref (ibusimcontext);
         _request_surrounding_text (ibusimcontext);
         ibusimcontext->time = event->time;
     }
@@ -410,6 +420,13 @@ _key_snooper_cb (GtkWidget   *widget,
         event->state |= IBUS_IGNORED_MASK;
     }
 
+    if (ibusimcontext != NULL) {
+        /* unref ibusimcontext could call ibus_im_context_finalize here
+         * because "retrieve-surrounding" signal could call unref.
+         */
+        g_object_unref (ibusimcontext);
+    }
+
     return retval;
 }
 

From c66a26a0e5b6909c0726ed46f0e7c3651fc38b3e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 5 Oct 2012 09:50:38 +0900
Subject: [PATCH 085/816] tests: set LC_ALL to C instead of en_US.Utf-8

If LC_* is not "C" and there is no translation found in the current locale, gettext honors the LANGUAGE envvar.

BUG=Issue#1515

Review URL: https://codereview.appspot.com/6592074
---
 src/tests/ibus-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/ibus-util.c b/src/tests/ibus-util.c
index 7a6dd4051..5db7ad243 100644
--- a/src/tests/ibus-util.c
+++ b/src/tests/ibus-util.c
@@ -10,7 +10,7 @@
 
 int main (int argc, char **argv)
 {
-    setlocale(LC_ALL, "en_US.Utf-8");
+    setlocale(LC_ALL, "C");
 
     g_assert_cmpstr (ibus_get_language_name ("eng"), ==, "English");
 

From af3da0f1f0441615db89116c7a4ae065afa210ca Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Fri, 5 Oct 2012 12:21:05 -0400
Subject: [PATCH 086/816] Fix wrong return from key snooper.

BUG=None

Review URL: https://codereview.appspot.com/6623048
---
 client/gtk2/ibusimcontext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 17da26371..011676fc2 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -298,7 +298,7 @@ _key_snooper_cb (GtkWidget   *widget,
     IBusInputContext *ibuscontext = NULL;
 
     if (!_use_key_snooper)
-        return;
+        return FALSE;
 
     if (_focus_im_context != NULL &&
         ((IBusIMContext *) _focus_im_context)->has_focus == TRUE) {

From 469438987c6aa3b87aa215648d55a7c5e0e01451 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 8 Oct 2012 13:00:21 +0900
Subject: [PATCH 087/816] Fix make dist in the latet doc build.

TEST=Manually

Review URL: https://codereview.appspot.com/6615051
---
 docs/reference/ibus/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 75e3815ec..82d11fb98 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -17,8 +17,8 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../src
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk
+DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=

From ead48c8748521537beb0fbbe4af95c6b9a99a8af Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Oct 2012 11:31:35 +0900
Subject: [PATCH 088/816] Fix typo in data/dconf/profile/ibus

http://git.gnome.org/browse/gdm/commit/?id=aa25b559c6e907485cc9e
I copied the typo by mitake. dconf_engine_source_new() supports
"user-db" or "system-db".
http://git.gnome.org/browse/dconf/tree/engine/dconf-engine-source.c#n75

TEST=Manually

Review URL: https://codereview.appspot.com/6640058
---
 data/dconf/profile/ibus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dconf/profile/ibus b/data/dconf/profile/ibus
index 1d3fc5f2c..aa8fe5f0d 100644
--- a/data/dconf/profile/ibus
+++ b/data/dconf/profile/ibus
@@ -1,2 +1,2 @@
 user-db:user
-systemd-db:ibus
+system-db:ibus

From 41c5f3d13c306a9d3e7fe969df4c50eeaddb4c0a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 Oct 2012 11:39:42 +0900
Subject: [PATCH 089/816] Fix a typo.

TEST=Manually

Review URL: https://codereview.appspot.com/6651061
---
 bus/engineproxy.c | 8 ++++----
 setup/main.py     | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 49df07a34..b0c19c14a 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -63,10 +63,10 @@ struct _BusEngineProxy {
 struct _BusEngineProxyClass {
     IBusProxyClass parent;
     /* class members */
-    void (* register_properties) (BusEngineProxy      *engine,
-                                  IBusPropList *prop_list);
-    void (* update_property) (BusEngineProxy      *engine,
-                              IBusProperty *prop);
+    void (* register_properties) (BusEngineProxy   *engine,
+                                  IBusPropList     *prop_list);
+    void (* update_property) (BusEngineProxy       *engine,
+                              IBusProperty         *prop);
 };
 
 enum {
diff --git a/setup/main.py b/setup/main.py
index 8a2391d98..aed8c7d89 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -362,7 +362,8 @@ def __init_bus(self):
             dlg.destroy()
             self.__flush_gtk_events()
         else:
-            message = _("IBus daemon coundn't be started in %d seconds")
+            # Translators: %d == 5 currently
+            message = _("IBus daemon could not be started in %d seconds")
             dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
                                     buttons = Gtk.ButtonsType.OK,
                                     text = message % timeout)

From f9059d696390c01564a196dd4a5b2cd39ef6d7ac Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 Oct 2012 11:45:30 +0900
Subject: [PATCH 090/816] Fix fallback 'C' locale in ibus-setup.

BUG=RH#863673
TEST=Manually

Review URL: https://codereview.appspot.com/6649043
---
 setup/main.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/main.py b/setup/main.py
index aed8c7d89..f527da1ed 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -549,7 +549,12 @@ def run(self):
         Gtk.main()
 
 if __name__ == "__main__":
-    locale.setlocale(locale.LC_ALL, '')
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except locale.Error:
+        print >> sys.stderr, "Using the fallback 'C' locale"
+        locale.setlocale(locale.LC_ALL, 'C')
+
     i18n_init()
     setup = Setup()
     setup.run()

From afdb7f6c33fda44c2ad4054b7c23523d59218f47 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 16 Oct 2012 10:28:26 +0900
Subject: [PATCH 091/816] Add layout_variant and layout_option in
 IBusEngineDesc for XKB.

TEST=Manually

Review URL: https://codereview.appspot.com/6586075
---
 ibus/enginedesc.py     | 71 +++++++++++++++++++++++++++---------------
 src/ibusenginedesc.c   | 66 +++++++++++++++++++++++++++++++++++++++
 src/ibusenginedesc.h   | 22 +++++++++++++
 src/ibusserializable.h |  5 +--
 tools/main.vala        | 63 ++++++++++++++++++++++++++++++-------
 ui/gtk3/panel.vala     | 55 ++++++++++++++++++++++++++------
 6 files changed, 234 insertions(+), 48 deletions(-)

diff --git a/ibus/enginedesc.py b/ibus/enginedesc.py
index 055a3a0d7..00fbade2d 100644
--- a/ibus/enginedesc.py
+++ b/ibus/enginedesc.py
@@ -31,7 +31,10 @@
 class EngineDesc(Serializable):
     __gtype_name__ = "PYIBusEngineDesc"
     __NAME__ = "IBusEngineDesc"
-    def __init__(self, name="", longname="", description="", language="", license="", author="", icon="", layout="", hotkeys="", rank=0, symbol="", setup=""):
+    def __init__(self, name="", longname="", description="", language="",
+                 license="", author="", icon="", layout="us", hotkeys="",
+                 rank=0, symbol="", setup="",
+                 layout_variant="", layout_option=""):
         super(EngineDesc, self).__init__()
         self.__name = name
         self.__longname = longname
@@ -41,6 +44,8 @@ def __init__(self, name="", longname="", description="", language="", license=""
         self.__author = author
         self.__icon = icon
         self.__layout = layout
+        self.__layout_variant = layout_variant
+        self.__layout_option = layout_option
         self.__rank = rank
         self.__hotkeys = hotkeys
         self.__symbol = symbol
@@ -70,6 +75,12 @@ def get_icon(self):
     def get_layout(self):
         return self.__layout
 
+    def get_layout_variant(self):
+        return self.__layout_variant
+
+    def get_layout_option(self):
+        return self.__layout_option
+
     def get_rank(self):
         return self.__rank
 
@@ -82,18 +93,20 @@ def get_symbol(self):
     def get_setup(self):
         return self.__setup
 
-    name        = property(get_name)
-    longname    = property(get_longname)
-    description = property(get_description)
-    language    = property(get_language)
-    license     = property(get_license)
-    author      = property(get_author)
-    icon        = property(get_icon)
-    layout      = property(get_layout)
-    rank        = property(get_rank)
-    hotkeys     = property(get_hotkeys)
-    symbol      = property(get_symbol)
-    setup       = property(get_setup)
+    name                = property(get_name)
+    longname            = property(get_longname)
+    description         = property(get_description)
+    language            = property(get_language)
+    license             = property(get_license)
+    author              = property(get_author)
+    icon                = property(get_icon)
+    layout              = property(get_layout)
+    layout_variant      = property(get_layout_variant)
+    layout_option       = property(get_layout_option)
+    rank                = property(get_rank)
+    hotkeys             = property(get_hotkeys)
+    symbol              = property(get_symbol)
+    setup               = property(get_setup)
 
     def serialize(self, struct):
         super(EngineDesc, self).serialize(struct)
@@ -106,24 +119,32 @@ def serialize(self, struct):
         struct.append(dbus.String(self.__icon))
         struct.append(dbus.String(self.__layout))
         struct.append(dbus.UInt32(self.__rank))
+        # Keep the serialize order.
         struct.append(dbus.String(self.__hotkeys))
         struct.append(dbus.String(self.__symbol))
         struct.append(dbus.String(self.__setup))
+        struct.append(dbus.String(self.__layout_variant))
+        struct.append(dbus.String(self.__layout_option))
 
     def deserialize(self, struct):
         super(EngineDesc, self).deserialize(struct)
-        self.__name = struct.pop(0)
-        self.__longname = struct.pop(0)
-        self.__description = struct.pop(0)
-        self.__language = struct.pop(0)
-        self.__license = struct.pop(0)
-        self.__author = struct.pop(0)
-        self.__icon = struct.pop(0)
-        self.__layout = struct.pop(0)
-        self.__rank = struct.pop(0)
-        self.__hotkeys = struct.pop(0)
-        self.__symbol = struct.pop(0)
-        self.__setup  = struct.pop(0)
+        self.__name             = struct.pop(0)
+        self.__longname         = struct.pop(0)
+        self.__description      = struct.pop(0)
+        self.__language         = struct.pop(0)
+        self.__license          = struct.pop(0)
+        self.__author           = struct.pop(0)
+        self.__icon             = struct.pop(0)
+        self.__layout           = struct.pop(0)
+        self.__rank             = struct.pop(0)
+        # Keep the serialize order.
+        self.__hotkeys          = struct.pop(0)
+        self.__symbol           = struct.pop(0)
+        self.__setup            = struct.pop(0)
+        if len(struct) < 2:
+            return
+        self.__layout_variant   = struct.pop(0)
+        self.__layout_option    = struct.pop(0)
 
 def test():
     engine = EngineDesc("Hello", "", "", "", "", "", "", "", "", 0, "", "")
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index 48ecb07d6..d3247e2e8 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -37,6 +37,8 @@ enum {
     PROP_AUTHOR,
     PROP_ICON,
     PROP_LAYOUT,
+    PROP_LAYOUT_VARIANT,
+    PROP_LAYOUT_OPTION,
     PROP_RANK,
     PROP_HOTKEYS,
     PROP_SYMBOL,
@@ -54,6 +56,8 @@ struct _IBusEngineDescPrivate {
     gchar      *author;
     gchar      *icon;
     gchar      *layout;
+    gchar      *layout_variant;
+    gchar      *layout_option;
     guint       rank;
     gchar      *hotkeys;
     gchar      *symbol;
@@ -209,6 +213,32 @@ ibus_engine_desc_class_init (IBusEngineDescClass *class)
                         "us",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
+    /**
+     * IBusEngineDesc:layout-variant:
+     *
+     * The keyboard variant of engine description
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_LAYOUT_VARIANT,
+                    g_param_spec_string ("layout-variant",
+                        "description keyboard variant",
+                        "The keyboard variant of engine description",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEngineDesc:layout-option:
+     *
+     * The keyboard option of engine description
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_LAYOUT_OPTION,
+                    g_param_spec_string ("layout-option",
+                        "description keyboard option",
+                        "The keyboard option of engine description",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
     /**
      * IBusEngineDesc:rank:
      *
@@ -277,6 +307,8 @@ ibus_engine_desc_init (IBusEngineDesc *desc)
     desc->priv->author = NULL;
     desc->priv->icon = NULL;
     desc->priv->layout = NULL;
+    desc->priv->layout_variant = NULL;
+    desc->priv->layout_option = NULL;
     desc->priv->rank = 0;
     desc->priv->hotkeys = NULL;
     desc->priv->symbol = NULL;
@@ -294,6 +326,8 @@ ibus_engine_desc_destroy (IBusEngineDesc *desc)
     g_free (desc->priv->author);
     g_free (desc->priv->icon);
     g_free (desc->priv->layout);
+    g_free (desc->priv->layout_variant);
+    g_free (desc->priv->layout_option);
     g_free (desc->priv->hotkeys);
     g_free (desc->priv->symbol);
     g_free (desc->priv->setup);
@@ -340,6 +374,14 @@ ibus_engine_desc_set_property (IBusEngineDesc *desc,
         g_assert (desc->priv->layout == NULL);
         desc->priv->layout = g_value_dup_string (value);
         break;
+    case PROP_LAYOUT_VARIANT:
+        g_assert (desc->priv->layout_variant == NULL);
+        desc->priv->layout_variant = g_value_dup_string (value);
+        break;
+    case PROP_LAYOUT_OPTION:
+        g_assert (desc->priv->layout_option == NULL);
+        desc->priv->layout_option = g_value_dup_string (value);
+        break;
     case PROP_RANK:
         desc->priv->rank = g_value_get_uint (value);
         break;
@@ -391,6 +433,12 @@ ibus_engine_desc_get_property (IBusEngineDesc *desc,
     case PROP_LAYOUT:
         g_value_set_string (value, ibus_engine_desc_get_layout (desc));
         break;
+    case PROP_LAYOUT_VARIANT:
+        g_value_set_string (value, ibus_engine_desc_get_layout_variant (desc));
+        break;
+    case PROP_LAYOUT_OPTION:
+        g_value_set_string (value, ibus_engine_desc_get_layout_option (desc));
+        break;
     case PROP_RANK:
         g_value_set_uint (value, ibus_engine_desc_get_rank (desc));
         break;
@@ -432,9 +480,12 @@ ibus_engine_desc_serialize (IBusEngineDesc  *desc,
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->icon));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout));
     g_variant_builder_add (builder, "u", desc->priv->rank);
+    /* The serialized order should be kept. */
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->hotkeys));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->symbol));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->setup));
+    g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_variant));
+    g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_option));
 #undef NOTNULL
 
     return TRUE;
@@ -462,9 +513,14 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
     g_variant_get_child (variant, retval++, "s", &desc->priv->icon);
     g_variant_get_child (variant, retval++, "s", &desc->priv->layout);
     g_variant_get_child (variant, retval++, "u", &desc->priv->rank);
+    /* The serialized order should be kept. */
     g_variant_get_child (variant, retval++, "s", &desc->priv->hotkeys);
     g_variant_get_child (variant, retval++, "s", &desc->priv->symbol);
     g_variant_get_child (variant, retval++, "s", &desc->priv->setup);
+    if (g_variant_n_children (variant) < retval + 2)
+        return retval;
+    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_variant);
+    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_option);
 
     return retval;
 }
@@ -487,6 +543,8 @@ ibus_engine_desc_copy (IBusEngineDesc       *dest,
     dest->priv->author           = g_strdup (src->priv->author);
     dest->priv->icon             = g_strdup (src->priv->icon);
     dest->priv->layout           = g_strdup (src->priv->layout);
+    dest->priv->layout_variant   = g_strdup (src->priv->layout_variant);
+    dest->priv->layout_option    = g_strdup (src->priv->layout_option);
     dest->priv->rank             = src->priv->rank;
     dest->priv->hotkeys          = g_strdup (src->priv->hotkeys);
     dest->priv->symbol           = g_strdup (src->priv->symbol);
@@ -527,6 +585,8 @@ ibus_engine_desc_output (IBusEngineDesc *desc,
     OUTPUT_ENTRY_1(author);
     OUTPUT_ENTRY_1(icon);
     OUTPUT_ENTRY_1(layout);
+    OUTPUT_ENTRY_1(layout_variant);
+    OUTPUT_ENTRY_1(layout_option);
     OUTPUT_ENTRY_1(hotkeys);
     OUTPUT_ENTRY_1(symbol);
     OUTPUT_ENTRY_1(setup);
@@ -562,6 +622,8 @@ ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc,
         PARSE_ENTRY_1(author);
         PARSE_ENTRY_1(icon);
         PARSE_ENTRY_1(layout);
+        PARSE_ENTRY_1(layout_variant);
+        PARSE_ENTRY_1(layout_option);
         PARSE_ENTRY_1(hotkeys);
         PARSE_ENTRY_1(symbol);
         PARSE_ENTRY_1(setup);
@@ -591,6 +653,8 @@ IBUS_ENGINE_DESC_GET_PROPERTY (license, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (author, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (icon, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (layout, const gchar *)
+IBUS_ENGINE_DESC_GET_PROPERTY (layout_variant, const gchar *)
+IBUS_ENGINE_DESC_GET_PROPERTY (layout_option, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (rank, guint)
 IBUS_ENGINE_DESC_GET_PROPERTY (hotkeys, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (symbol, const gchar *)
@@ -641,6 +705,8 @@ ibus_engine_desc_new_varargs (const gchar *first_property_name, ...)
     g_assert (desc->priv->author);
     g_assert (desc->priv->icon);
     g_assert (desc->priv->layout);
+    g_assert (desc->priv->layout_variant);
+    g_assert (desc->priv->layout_option);
     g_assert (desc->priv->hotkeys);
     g_assert (desc->priv->symbol);
     g_assert (desc->priv->setup);
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index 928743e86..35a18bfc8 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -86,6 +86,8 @@ typedef struct _IBusEngineDescClass IBusEngineDescClass;
  * author: Author of the input method engine.
  * icon: Icon file of this engine.
  * layout: Keyboard layout
+ * layout_variant: Keyboard variant
+ * layout_option: Keyboard option
  * rank: Preference rank among engines, the highest ranked IME will put in
  * the front.
  * hotkeys: One or more hotkeys for switching to this engine, separated by
@@ -230,6 +232,26 @@ const gchar     *ibus_engine_desc_get_icon      (IBusEngineDesc *info);
  */
 const gchar     *ibus_engine_desc_get_layout    (IBusEngineDesc *info);
 
+/**
+ * ibus_engine_desc_get_layout_variant:
+ * @info: An IBusEngineDesc
+ * @returns: keyboard variant property in IBusEngineDesc
+ *
+ * Return the keyboard variant property in IBusEngineDesc. It should not be freed.
+ */
+const gchar     *ibus_engine_desc_get_layout_variant
+                                                (IBusEngineDesc *info);
+
+/**
+ * ibus_engine_desc_get_layout_option:
+ * @info: An IBusEngineDesc
+ * @returns: keyboard option property in IBusEngineDesc
+ *
+ * Return the keyboard option property in IBusEngineDesc. It should not be freed.
+ */
+const gchar     *ibus_engine_desc_get_layout_option
+                                                (IBusEngineDesc *info);
+
 /**
  * ibus_engine_desc_get_rank:
  * @info: An IBusEngineDesc
diff --git a/src/ibusserializable.h b/src/ibusserializable.h
index 742aeb6a8..c7bcd6c5c 100644
--- a/src/ibusserializable.h
+++ b/src/ibusserializable.h
@@ -233,7 +233,8 @@ void                 ibus_serializable_remove_qattachment
 /**
  * ibus_serializable_copy:
  * @serializable: An #IBusSerializable.
- * @returns: A newly allocated clone object; or %NULL if @object is not serializable.
+ * @returns: (transfer none): A newly allocated clone object; or %NULL
+ *     if @object is not serializable.
  *
  * Clone an #IBusSerializable.
  * The copy method should be implemented in extended class.
@@ -257,7 +258,7 @@ GVariant            *ibus_serializable_serialize        (IBusSerializable   *ser
 /**
  * ibus_serializable_deserialize:
  * @variant: A #GVariant.
- * @returns: The deserialized #IBusSerializable.
+ * @returns: (transfer none): The deserialized #IBusSerializable.
  *
  * Deserialize a #GVariant to an #IBusSerializable/
  * The deserialize method should be implemented in extended class.
diff --git a/tools/main.vala b/tools/main.vala
index ce3fe4776..d0535905d 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -88,6 +88,56 @@ int list_engine(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+private int exec_setxkbmap(IBus.EngineDesc engine) {
+    string layout = engine.get_layout();
+    string variant = engine.get_layout_variant();
+    string option = engine.get_layout_option();
+    string standard_error = null;
+    int exit_status = 0;
+    string[] args = { "setxkbmap" };
+
+    if (layout != null && layout != "" && layout != "default") {
+        args += "-layout";
+        args += layout;
+    }
+    if (variant != null && variant != "" && variant != "default") {
+        args += "-variant";
+        args += variant;
+    }
+    if (option != null && option != "" && option != "default") {
+        /*TODO: Need to get the session XKB options */
+        args += "-option";
+        args += "-option";
+        args += option;
+    }
+
+    if (args.length == 1) {
+        return Posix.EXIT_FAILURE;
+    }
+
+    try {
+        if (!GLib.Process.spawn_sync(null, args, null,
+                                     GLib.SpawnFlags.SEARCH_PATH,
+                                     null, null,
+                                     out standard_error,
+                                     out exit_status)) {
+            warning("Switch xkb layout to %s failed.",
+                    engine.get_layout());
+            return Posix.EXIT_FAILURE;
+        }
+    } catch (GLib.SpawnError e) {
+        warning("Execute setxkbmap failed: %s", e.message);
+        return Posix.EXIT_FAILURE;
+    }
+
+    if (exit_status != 0) {
+        warning("Execute setxkbmap failed: %s", standard_error ?? "(null)");
+        return Posix.EXIT_FAILURE;
+    }
+
+    return Posix.EXIT_SUCCESS;
+}
+
 int get_set_engine(string[] argv) {
     var bus = get_bus();
     string engine = null;
@@ -114,18 +164,7 @@ int get_set_engine(string[] argv) {
         return Posix.EXIT_FAILURE;
     }
 
-    string cmdline = "setxkbmap %s".printf(desc.get_layout());
-    try {
-        if (!GLib.Process.spawn_command_line_sync(cmdline)) {
-            stderr.printf(_("Switch xkb layout to %s failed."),
-                          desc.get_layout());
-            return Posix.EXIT_FAILURE;
-        }
-    } catch (GLib.SpawnError e) {
-        stderr.printf("Execute setxkbmap failed: %s", e.message);
-        return Posix.EXIT_FAILURE;
-    }
-    return Posix.EXIT_SUCCESS;
+    return exec_setxkbmap(desc);
 }
 
 int message_watch(string[] argv) {
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 40079ecf9..6f579ac9a 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -211,6 +211,51 @@ class Panel : IBus.PanelService {
         set_custom_font();
     }
 
+    private void exec_setxkbmap(IBus.EngineDesc engine) {
+        string layout = engine.get_layout();
+        string variant = engine.get_layout_variant();
+        string option = engine.get_layout_option();
+        string standard_error = null;
+        int exit_status = 0;
+        string[] args = { "setxkbmap" };
+
+        if (layout != null && layout != "" && layout != "default") {
+            args += "-layout";
+            args += layout;
+        }
+        if (variant != null && variant != "" && variant != "default") {
+            args += "-variant";
+            args += variant;
+        }
+        if (option != null && option != "" && option != "default") {
+            /*TODO: Need to get the session XKB options */
+            args += "-option";
+            args += "-option";
+            args += option;
+        }
+
+        if (args.length == 1) {
+            return;
+        }
+
+        try {
+            if (!GLib.Process.spawn_sync(null, args, null,
+                                         GLib.SpawnFlags.SEARCH_PATH,
+                                         null, null,
+                                         out standard_error,
+                                         out exit_status)) {
+                warning("Switch xkb layout to %s failed.",
+                        engine.get_layout());
+            }
+        } catch (GLib.SpawnError e) {
+            warning("Execute setxkbmap failed: %s", e.message);
+        }
+
+        if (exit_status != 0) {
+            warning("Execute setxkbmap failed: %s", standard_error ?? "(null)");
+        }
+    }
+
     private void switch_engine(int i, bool force = false) {
         GLib.assert(i >= 0 && i < m_engines.length);
 
@@ -225,15 +270,7 @@ class Panel : IBus.PanelService {
             return;
         }
         // set xkb layout
-        string cmdline = "setxkbmap %s".printf(engine.get_layout());
-        try {
-            if (!GLib.Process.spawn_command_line_sync(cmdline)) {
-                warning("Switch xkb layout to %s failed.",
-                    engine.get_layout());
-            }
-        } catch (GLib.SpawnError e) {
-            warning("Execute setxkbmap failed: %s", e.message);
-        }
+        exec_setxkbmap(engine);
     }
 
     private void config_value_changed_cb(IBus.Config config,

From cf5de7501e28fe929ff86d9b1d7689e15bc1cc4a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 20 Oct 2012 11:45:05 +0900
Subject: [PATCH 092/816] Add version property in IBusEngineDesc.

BUG=http://code.google.com/p/ibus/issues/detail?id=1524
TEST=Manually

Review URL: https://codereview.appspot.com/6736043
---
 ibus/enginedesc.py   | 12 +++++++++++-
 src/ibusenginedesc.c | 33 +++++++++++++++++++++++++++++++++
 src/ibusenginedesc.h | 11 +++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/ibus/enginedesc.py b/ibus/enginedesc.py
index 00fbade2d..ca306f7fa 100644
--- a/ibus/enginedesc.py
+++ b/ibus/enginedesc.py
@@ -34,7 +34,8 @@ class EngineDesc(Serializable):
     def __init__(self, name="", longname="", description="", language="",
                  license="", author="", icon="", layout="us", hotkeys="",
                  rank=0, symbol="", setup="",
-                 layout_variant="", layout_option=""):
+                 layout_variant="", layout_option="",
+                 version=""):
         super(EngineDesc, self).__init__()
         self.__name = name
         self.__longname = longname
@@ -50,6 +51,7 @@ def __init__(self, name="", longname="", description="", language="",
         self.__hotkeys = hotkeys
         self.__symbol = symbol
         self.__setup = setup
+        self.__version = version
 
     def get_name(self):
         return self.__name
@@ -93,6 +95,9 @@ def get_symbol(self):
     def get_setup(self):
         return self.__setup
 
+    def get_version(self):
+        return self.__version
+
     name                = property(get_name)
     longname            = property(get_longname)
     description         = property(get_description)
@@ -107,6 +112,7 @@ def get_setup(self):
     hotkeys             = property(get_hotkeys)
     symbol              = property(get_symbol)
     setup               = property(get_setup)
+    version             = property(get_version)
 
     def serialize(self, struct):
         super(EngineDesc, self).serialize(struct)
@@ -125,6 +131,7 @@ def serialize(self, struct):
         struct.append(dbus.String(self.__setup))
         struct.append(dbus.String(self.__layout_variant))
         struct.append(dbus.String(self.__layout_option))
+        struct.append(dbus.String(self.__version))
 
     def deserialize(self, struct):
         super(EngineDesc, self).deserialize(struct)
@@ -145,6 +152,9 @@ def deserialize(self, struct):
             return
         self.__layout_variant   = struct.pop(0)
         self.__layout_option    = struct.pop(0)
+        if len(struct) < 1:
+            return
+        self.__version          = struct.pop(0)
 
 def test():
     engine = EngineDesc("Hello", "", "", "", "", "", "", "", "", 0, "", "")
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index d3247e2e8..78ae50065 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -43,6 +43,7 @@ enum {
     PROP_HOTKEYS,
     PROP_SYMBOL,
     PROP_SETUP,
+    PROP_VERSION,
 };
 
 
@@ -62,6 +63,7 @@ struct _IBusEngineDescPrivate {
     gchar      *hotkeys;
     gchar      *symbol;
     gchar      *setup;
+    gchar      *version;
 };
 
 #define IBUS_ENGINE_DESC_GET_PRIVATE(o)  \
@@ -292,6 +294,19 @@ ibus_engine_desc_class_init (IBusEngineDescClass *class)
                         "The exec lists of the engine setup command",
                         "",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEngineDesc:version:
+     *
+     * The version number of engine description
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_VERSION,
+                    g_param_spec_string ("version",
+                        "version number",
+                        "The version number of engine description",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -313,6 +328,7 @@ ibus_engine_desc_init (IBusEngineDesc *desc)
     desc->priv->hotkeys = NULL;
     desc->priv->symbol = NULL;
     desc->priv->setup = NULL;
+    desc->priv->version = NULL;
 }
 
 static void
@@ -331,6 +347,7 @@ ibus_engine_desc_destroy (IBusEngineDesc *desc)
     g_free (desc->priv->hotkeys);
     g_free (desc->priv->symbol);
     g_free (desc->priv->setup);
+    g_free (desc->priv->version);
 
     IBUS_OBJECT_CLASS (ibus_engine_desc_parent_class)->destroy (IBUS_OBJECT (desc));
 }
@@ -397,6 +414,10 @@ ibus_engine_desc_set_property (IBusEngineDesc *desc,
         g_assert (desc->priv->setup == NULL);
         desc->priv->setup = g_value_dup_string (value);
         break;
+    case PROP_VERSION:
+        g_assert (desc->priv->version == NULL);
+        desc->priv->version = g_value_dup_string (value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -451,6 +472,9 @@ ibus_engine_desc_get_property (IBusEngineDesc *desc,
     case PROP_SETUP:
         g_value_set_string (value, ibus_engine_desc_get_setup (desc));
         break;
+    case PROP_VERSION:
+        g_value_set_string (value, ibus_engine_desc_get_version (desc));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -486,6 +510,7 @@ ibus_engine_desc_serialize (IBusEngineDesc  *desc,
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->setup));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_variant));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_option));
+    g_variant_builder_add (builder, "s", NOTNULL (desc->priv->version));
 #undef NOTNULL
 
     return TRUE;
@@ -521,6 +546,9 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
         return retval;
     g_variant_get_child (variant, retval++, "s", &desc->priv->layout_variant);
     g_variant_get_child (variant, retval++, "s", &desc->priv->layout_option);
+    if (g_variant_n_children (variant) < retval + 1)
+        return retval;
+    g_variant_get_child (variant, retval++, "s", &desc->priv->version);
 
     return retval;
 }
@@ -549,6 +577,7 @@ ibus_engine_desc_copy (IBusEngineDesc       *dest,
     dest->priv->hotkeys          = g_strdup (src->priv->hotkeys);
     dest->priv->symbol           = g_strdup (src->priv->symbol);
     dest->priv->setup            = g_strdup (src->priv->setup);
+    dest->priv->version          = g_strdup (src->priv->version);
     return TRUE;
 }
 
@@ -590,6 +619,7 @@ ibus_engine_desc_output (IBusEngineDesc *desc,
     OUTPUT_ENTRY_1(hotkeys);
     OUTPUT_ENTRY_1(symbol);
     OUTPUT_ENTRY_1(setup);
+    OUTPUT_ENTRY_1(version);
     g_string_append_indent (output, indent + 1);
     g_string_append_printf (output, "<rank>%u</rank>\n", desc->priv->rank);
 #undef OUTPUT_ENTRY
@@ -627,6 +657,7 @@ ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc,
         PARSE_ENTRY_1(hotkeys);
         PARSE_ENTRY_1(symbol);
         PARSE_ENTRY_1(setup);
+        PARSE_ENTRY_1(version);
 #undef PARSE_ENTRY
 #undef PARSE_ENTRY_1
         if (g_strcmp0 (sub_node->name , "rank") == 0) {
@@ -659,6 +690,7 @@ IBUS_ENGINE_DESC_GET_PROPERTY (rank, guint)
 IBUS_ENGINE_DESC_GET_PROPERTY (hotkeys, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (symbol, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (setup, const gchar *)
+IBUS_ENGINE_DESC_GET_PROPERTY (version, const gchar *)
 #undef IBUS_ENGINE_DESC_GET_PROPERTY
 
 IBusEngineDesc *
@@ -710,6 +742,7 @@ ibus_engine_desc_new_varargs (const gchar *first_property_name, ...)
     g_assert (desc->priv->hotkeys);
     g_assert (desc->priv->symbol);
     g_assert (desc->priv->setup);
+    g_assert (desc->priv->version);
 
     return desc;
 }
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index 35a18bfc8..eda64c7a4 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -92,6 +92,8 @@ typedef struct _IBusEngineDescClass IBusEngineDescClass;
  * the front.
  * hotkeys: One or more hotkeys for switching to this engine, separated by
  *  semi-colon.
+ * setup: Exec lists of the engine setup command.
+ * version: Version number of the input method engine.
  */
 struct _IBusEngineDesc {
     IBusSerializable parent;
@@ -288,6 +290,15 @@ const gchar     *ibus_engine_desc_get_symbol    (IBusEngineDesc *info);
  */
 const gchar     *ibus_engine_desc_get_setup     (IBusEngineDesc *info);
 
+/**
+ * ibus_engine_desc_get_version:
+ * @info: An IBusEngineDesc
+ * @returns: version in IBusEngineDesc
+ *
+ * Return the version property in IBusEngineDesc. It should not be freed.
+ */
+const gchar     *ibus_engine_desc_get_version   (IBusEngineDesc *info);
+
 /**
  * ibus_engine_desc_output:
  * @info: An IBusEngineDesc

From 16295679bd6f74e5884e5872c524374945c40a05 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 23 Oct 2012 13:35:24 +0900
Subject: [PATCH 093/816] ibus-daemon: ignore standard component path if
 IBUS_COMPONENT_PATH is set

Don't load components from /usr/share/ibus/components if
IBUS_COMPONENT_PATH is set.  Currently the envvar is only useful
for testing and appending the standard path makes little sense.

BUG=none

Review URL: https://codereview.appspot.com/6753044
---
 bus/registry.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/bus/registry.c b/bus/registry.c
index 946e82705..5b0649a00 100644
--- a/bus/registry.c
+++ b/bus/registry.c
@@ -221,29 +221,33 @@ bus_registry_load (BusRegistry *registry)
 
     const gchar *envstr;
     GPtrArray *path;
-    gchar *dirname, **d, **search_path;
+    gchar **d, **search_path;
 
     path = g_ptr_array_new();
 
     envstr = g_getenv ("IBUS_COMPONENT_PATH");
     if (envstr) {
-        char **dirs = g_strsplit (envstr, G_SEARCHPATH_SEPARATOR_S, 0);
+        gchar **dirs = g_strsplit (envstr, G_SEARCHPATH_SEPARATOR_S, 0);
         for (d = dirs; *d != NULL; d++)
             g_ptr_array_add (path, *d);
         g_free (dirs);
-    }
+    } else {
+        gchar *dirname;
 
-    dirname = g_build_filename (PKGDATADIR, "component", NULL);
-    g_ptr_array_add (path, dirname);
+        dirname = g_build_filename (PKGDATADIR, "component", NULL);
+        g_ptr_array_add (path, dirname);
 
 #if 0
-    /* FIXME Should we support install some IME in user dir? */
-    dirname = g_build_filename (g_get_user_data_dir (), "ibus", "component", NULL);
-    g_ptr_array_add (path, dirname);
+        /* FIXME Should we support install some IME in user dir? */
+        dirname = g_build_filename (g_get_user_data_dir (),
+                                    "ibus", "component",
+                                    NULL);
+        g_ptr_array_add (path, dirname);
 #endif
+    }
 
     g_ptr_array_add (path, NULL);
-    search_path = (char**) g_ptr_array_free (path, FALSE);
+    search_path = (gchar **) g_ptr_array_free (path, FALSE);
     for (d = search_path; *d != NULL; d++) {
         IBusObservedPath *observed_path = ibus_observed_path_new (*d, TRUE);
 

From 1e6c42fa4fb42513ee9ae03b8534bce99dc02d73 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 26 Oct 2012 16:56:34 +0900
Subject: [PATCH 094/816] ibus-daemon: use GFileMonitor instead of polling

BUG=Issue#1514

Review URL: https://codereview.appspot.com/6589065
---
 bus/global.c           |   4 -
 bus/global.h           |   3 -
 bus/ibusimpl.c         |   8 +-
 bus/main.c             |   3 -
 bus/registry.c         | 180 ++++++++++++++++++++---------------------
 bus/registry.h         |   6 +-
 bus/server.c           |   1 -
 src/ibuscomponent.c    |  21 +++--
 src/ibuscomponent.h    |  12 +++
 src/ibusobservedpath.c |  14 ++--
 src/ibusobservedpath.h |   4 +-
 11 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/bus/global.c b/bus/global.c
index 47b872189..c9dd31b44 100644
--- a/bus/global.c
+++ b/bus/global.c
@@ -29,7 +29,3 @@ gchar *g_cache = "auto";
 gboolean g_mempro = FALSE;
 gboolean g_verbose = FALSE;
 gint   g_gdbus_timeout = 5000;
-#ifdef G_THREADS_ENABLED
-gint   g_monitor_timeout = 0;
-#endif
-
diff --git a/bus/global.h b/bus/global.h
index 7bf2a1a12..db7e992fc 100644
--- a/bus/global.h
+++ b/bus/global.h
@@ -34,9 +34,6 @@ extern gchar *g_cache;
 extern gboolean g_mempro;
 extern gboolean g_verbose;
 extern gint   g_gdbus_timeout;
-#ifdef G_THREADS_ENABLED
-extern gint   g_monitor_timeout;
-#endif
 
 G_END_DECLS
 
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 25d2523a5..cafb34adb 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -330,13 +330,7 @@ bus_ibus_impl_init (BusIBusImpl *ibus)
                       "changed",
                       G_CALLBACK (_registry_changed_cb),
                       ibus);
-#ifdef G_THREADS_ENABLED
-    extern gint g_monitor_timeout;
-    if (g_monitor_timeout != 0) {
-        /* Start the monitor of registry changes. */
-        bus_registry_start_monitor_changes (ibus->registry);
-    }
-#endif
+    bus_registry_start_monitor_changes (ibus->registry);
 
     ibus->keymap = ibus_keymap_get ("us");
 
diff --git a/bus/main.c b/bus/main.c
index d59b5b74c..791a524cb 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -65,9 +65,6 @@ static const GOptionEntry entries[] =
     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
     { "cache",     't', 0, G_OPTION_ARG_STRING, &g_cache,   "specify the cache mode. [auto/refresh/none]", NULL },
     { "timeout",   'o', 0, G_OPTION_ARG_INT,    &g_gdbus_timeout, "gdbus reply timeout in milliseconds. pass -1 to use the default timeout of gdbus.", "timeout [default is 5000]" },
-#ifdef G_THREADS_ENABLED
-    { "monitor-timeout", 'j', 0, G_OPTION_ARG_INT,    &g_monitor_timeout, "timeout of poll changes of engines in seconds. 0 to disable it. ", "timeout [default is 0]" },
-#endif
     { "mem-profile", 'm', 0, G_OPTION_ARG_NONE,   &g_mempro,   "enable memory profile, send SIGUSR2 to print out the memory profile.", NULL },
     { "restart",     'R', 0, G_OPTION_ARG_NONE,   &restart,    "restart panel and config processes when they die.", NULL },
     { "verbose",   'v', 0, G_OPTION_ARG_NONE,   &g_verbose,   "verbose.", NULL },
diff --git a/bus/registry.c b/bus/registry.c
index 5b0649a00..9f917e705 100644
--- a/bus/registry.c
+++ b/bus/registry.c
@@ -49,14 +49,10 @@ struct _BusRegistry {
     GList *components;
     /* a mapping from an engine name (e.g. 'pinyin') to the corresponding IBusEngineDesc object. */
     GHashTable *engine_table;
-
-#ifdef G_THREADS_ENABLED
-    GThread *thread;
-    gboolean thread_running;
-    GMutex  *mutex;
-    GCond   *cond;
     gboolean changed;
-#endif
+    /* a mapping from GFile to GFileMonitor. */
+    GHashTable *monitor_table;
+    guint monitor_timeout_id;
 };
 
 struct _BusRegistryClass {
@@ -103,22 +99,12 @@ bus_registry_init (BusRegistry *registry)
     registry->observed_paths = NULL;
     registry->components = NULL;
     registry->engine_table = g_hash_table_new (g_str_hash, g_str_equal);
-
-#ifdef G_THREADS_ENABLED
-    /* If glib supports thread, we'll create a thread to monitor changes in IME
-     * XML files and related files, so users can use newly installed IMEs
-     * immediatlly.
-     * Note that we don't use GFileMonitor for watching as we need to monitor
-     * not only XML files but also other related files that can be scattered in
-     * many places. Monitoring these files with GFileMonitor would be make it
-     * complicated. hence we use a thread to poll the changes.
-     */
-    registry->thread = NULL;
-    registry->thread_running = TRUE;
-    registry->mutex = g_mutex_new ();
-    registry->cond = g_cond_new ();
     registry->changed = FALSE;
-#endif
+    registry->monitor_table =
+        g_hash_table_new_full (g_file_hash,
+                               (GEqualFunc) g_file_equal,
+                               (GDestroyNotify) g_object_unref,
+                               (GDestroyNotify) g_object_unref);
 
     if (g_strcmp0 (g_cache, "none") == 0) {
         /* Only load registry, but not read and write cache. */
@@ -171,40 +157,24 @@ bus_registry_remove_all (BusRegistry *registry)
     registry->components = NULL;
 
     g_hash_table_remove_all (registry->engine_table);
+    g_hash_table_remove_all (registry->monitor_table);
 }
 
 static void
 bus_registry_destroy (BusRegistry *registry)
 {
-#ifdef G_THREADS_ENABLED
-    if (registry->thread) {
-        g_mutex_lock (registry->mutex);
-        registry->thread_running = FALSE;
-        g_mutex_unlock (registry->mutex);
-
-        /* Raise a signal to cause the loop in _checks_changes() exits
-         * immediately, and then wait until the thread finishes, and release all
-         * resources of the thread.
-         */
-        g_cond_signal (registry->cond);
-        g_thread_join (registry->thread);
-
-        registry->thread = NULL;
-    }
-#endif
-
     bus_registry_remove_all (registry);
 
     g_hash_table_destroy (registry->engine_table);
     registry->engine_table = NULL;
 
-#ifdef G_THREADS_ENABLED
-    g_cond_free (registry->cond);
-    registry->cond = NULL;
+    g_hash_table_destroy (registry->monitor_table);
+    registry->monitor_table = NULL;
 
-    g_mutex_free (registry->mutex);
-    registry->mutex = NULL;
-#endif
+    if (registry->monitor_timeout_id > 0) {
+        g_source_remove (registry->monitor_timeout_id);
+        registry->monitor_timeout_id = 0;
+    }
 
     IBUS_OBJECT_CLASS (bus_registry_parent_class)->destroy (IBUS_OBJECT (registry));
 }
@@ -554,56 +524,42 @@ bus_registry_stop_all_components (BusRegistry *registry)
 
 }
 
-#ifdef G_THREADS_ENABLED
 static gboolean
-_emit_changed_signal_cb (BusRegistry *registry)
+_monitor_timeout_cb (BusRegistry *registry)
 {
-    g_assert (BUS_IS_REGISTRY (registry));
-
+    g_hash_table_remove_all (registry->monitor_table);
+    registry->changed = TRUE;
     g_signal_emit (registry, _signals[CHANGED], 0);
+    registry->monitor_timeout_id = 0;
     return FALSE;
 }
 
-static gpointer
-_check_changes (BusRegistry *registry)
+static void
+_monitor_changed_cb (GFileMonitor     *monitor,
+                     GFile            *file,
+                     GFile            *other_file,
+                     GFileMonitorEvent event_type,
+                     BusRegistry      *registry)
 {
     g_assert (BUS_IS_REGISTRY (registry));
 
-    g_mutex_lock (registry->mutex);
-    while (registry->thread_running == TRUE && registry->changed == FALSE) {
-        extern gint g_monitor_timeout;
-        GTimeVal tv;
-        g_get_current_time (&tv);
-        g_time_val_add (&tv, g_monitor_timeout * G_USEC_PER_SEC);
-        /* Wait for the condition change or timeout. It will also unlock
-         * the mutex, so that other thread could obay the lock and modify
-         * the condition value.
-         * Note that we use g_cond_timed_wait() here rather than sleep() so
-         * that the loop can terminate immediately when the registry object
-         * is destroyed. See also comments in bus_registry_destroy().
-         */
-        if (g_cond_timed_wait (registry->cond, registry->mutex, &tv) == FALSE) {
-            /* Timeout happens. We check the modification of all IMEs' xml files
-             * and related files specified in <observed-paths> in xml files.
-             * If any file is changed, the changed signal will be emitted in
-             * main thread. It is for finding install/uninstall/upgrade of IMEs.
-             * On Linux desktop, ibus will popup UI to notificate users that
-             * some IMEs are changed and ibus need a restart.
-             */
-            if (bus_registry_check_modification (registry)) {
-                /* Emit the changed signal in main thread, and terminate
-                 * this thread.
-                 */
-                registry->changed = TRUE;
-                g_idle_add ((GSourceFunc) _emit_changed_signal_cb, registry);
-                break;
-            }
-        }
-        else
-            g_warn_if_fail (registry->thread_running == FALSE);
-    }
-    g_mutex_unlock (registry->mutex);
-    return NULL;
+    if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
+        event_type != G_FILE_MONITOR_EVENT_DELETED &&
+        event_type != G_FILE_MONITOR_EVENT_CREATED &&
+        event_type != G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED)
+        return;
+
+    /* Merge successive file changes into one, with a low priority
+       timeout handler. */
+    if (registry->monitor_timeout_id > 0)
+        return;
+
+    registry->monitor_timeout_id =
+        g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+                            5000,
+                            (GSourceFunc) _monitor_timeout_cb,
+                            g_object_ref (registry),
+                            (GDestroyNotify) g_object_unref);
 }
 
 /**
@@ -614,16 +570,53 @@ _check_changes (BusRegistry *registry)
 void
 bus_registry_start_monitor_changes (BusRegistry *registry)
 {
+    GList *observed_paths, *p;
+
     g_assert (BUS_IS_REGISTRY (registry));
 
-    g_return_if_fail (registry->thread == NULL);
-    g_return_if_fail (registry->changed == FALSE);
+    g_hash_table_remove_all (registry->monitor_table);
 
-    registry->thread_running = TRUE;
-    registry->thread = g_thread_create ((GThreadFunc) _check_changes,
-                                        registry,
-                                        TRUE,
-                                        NULL);
+    observed_paths = g_list_copy (registry->observed_paths);
+    for (p = registry->components; p != NULL; p = p->next) {
+        BusComponent *buscomp = (BusComponent *) p->data;
+        IBusComponent *component = bus_component_get_component (buscomp);
+        GList *component_observed_paths =
+            ibus_component_get_observed_paths (component);
+        observed_paths = g_list_concat (observed_paths,
+                                        component_observed_paths);
+    }
+
+    for (p = observed_paths; p != NULL; p = p->next) {
+        IBusObservedPath *path = (IBusObservedPath *) p->data;
+        GFile *file = g_file_new_for_path (path->path);
+        if (g_hash_table_lookup (registry->monitor_table,file) == NULL) {
+            GFileMonitor *monitor;
+            GError *error;
+
+            error = NULL;
+            monitor = g_file_monitor (file,
+                                      G_FILE_MONITOR_NONE,
+                                      NULL,
+                                      &error);
+
+            if (monitor != NULL) {
+                g_signal_connect (monitor, "changed",
+                                  G_CALLBACK (_monitor_changed_cb),
+                                  registry);
+
+                g_hash_table_replace (registry->monitor_table,
+                                      g_object_ref (file),
+                                      monitor);
+            } else {
+                g_warning ("Can't monitor directory %s: %s",
+                           path->path,
+                           error->message);
+                g_error_free (error);
+            }
+        }
+        g_object_unref (file);
+    }
+    g_list_free (observed_paths);
 }
 
 gboolean
@@ -632,7 +625,6 @@ bus_registry_is_changed (BusRegistry *registry)
     g_assert (BUS_IS_REGISTRY (registry));
     return (registry->changed != 0);
 }
-#endif
 
 void
 bus_registry_name_owner_changed (BusRegistry *registry,
diff --git a/bus/registry.h b/bus/registry.h
index cdabec094..2864ed9c9 100644
--- a/bus/registry.h
+++ b/bus/registry.h
@@ -58,13 +58,13 @@ BusRegistry     *bus_registry_new               (void);
 GList           *bus_registry_get_components    (BusRegistry    *registry);
 
 /**
- * bus_registry_get_components:
+ * bus_registry_get_engines:
  * @returns: a list of all IBusEngineDesc objects available. The caller has to call g_list_free for the returned list.
  */
 GList           *bus_registry_get_engines       (BusRegistry    *registry);
 
 /**
- * bus_registry_get_components:
+ * bus_registry_get_engines_by_language:
  * @language: a language name like 'ja'
  * @returns: a list of IBusEngineDesc objects for the language. The caller has to call g_list_free for the returned list.
  */
@@ -113,11 +113,9 @@ void             bus_registry_name_owner_changed
                                                  const gchar    *old_name,
                                                  const gchar    *new_name);
 
-#ifdef G_THREADS_ENABLED
 void             bus_registry_start_monitor_changes
                                                 (BusRegistry    *registry);
 gboolean         bus_registry_is_changed        (BusRegistry    *registry);
-#endif
 
 G_END_DECLS
 #endif
diff --git a/bus/server.c b/bus/server.c
index 253b6c3e6..fe8ee2f89 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -40,7 +40,6 @@ static gboolean _restart = FALSE;
 static void
 _restart_server (void)
 {
-    extern gchar **g_argv;
     gchar *exe;
     gint fd;
 
diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index e93a3b0b3..d3cc20f03 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -631,9 +631,9 @@ ibus_component_parse_engines (IBusComponent *component,
 }
 
 static void
-ibus_component_parse_observed_paths (IBusComponent    *component,
-                                    XMLNode         *node,
-                                    gboolean         access_fs)
+ibus_component_parse_observed_paths (IBusComponent *component,
+                                     XMLNode       *node,
+                                     gboolean       access_fs)
 {
     g_assert (IBUS_IS_COMPONENT (component));
     g_assert (node);
@@ -652,8 +652,8 @@ ibus_component_parse_observed_paths (IBusComponent    *component,
 
         if (access_fs && path->is_dir && path->is_exist) {
             component->priv->observed_paths =
-                    g_list_concat(component->priv->observed_paths,
-                                  ibus_observed_path_traverse(path));
+                    g_list_concat (component->priv->observed_paths,
+                                   ibus_observed_path_traverse (path, TRUE));
         }
     }
 }
@@ -790,8 +790,8 @@ ibus_component_add_observed_path (IBusComponent *component,
 
     if (access_fs && p->is_dir && p->is_exist) {
         component->priv->observed_paths =
-                g_list_concat(component->priv->observed_paths,
-                              ibus_observed_path_traverse(p));
+                g_list_concat (component->priv->observed_paths,
+                               ibus_observed_path_traverse (p, TRUE));
     }
 }
 
@@ -826,3 +826,10 @@ ibus_component_check_modification (IBusComponent *component)
     }
     return FALSE;
 }
+
+GList *
+ibus_component_get_observed_paths (IBusComponent *component)
+{
+    g_assert (IBUS_IS_COMPONENT (component));
+    return g_list_copy (component->priv->observed_paths);
+}
diff --git a/src/ibuscomponent.h b/src/ibuscomponent.h
index 8f35b940c..3f4b3b372 100644
--- a/src/ibuscomponent.h
+++ b/src/ibuscomponent.h
@@ -306,6 +306,18 @@ void             ibus_component_output_engines  (IBusComponent  *component,
  */
 gboolean         ibus_component_check_modification
                                                 (IBusComponent  *component);
+
+/**
+ * ibus_component_get_observed_paths:
+ * @component: An IBusComponent.
+ * @returns: (transfer container) (element-type IBusObservedPath): A
+ * newly allocated GList that contains observed paths.
+ *
+ * Get the observed paths of this component.
+ */
+GList           *ibus_component_get_observed_paths
+                                                (IBusComponent *component);
+
 G_END_DECLS
 #endif
 
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index b3b82a029..a63ee8d7e 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -185,7 +185,8 @@ ibus_observed_path_fill_stat (IBusObservedPath *path)
 }
 
 GList *
-ibus_observed_path_traverse (IBusObservedPath *path)
+ibus_observed_path_traverse (IBusObservedPath *path,
+                             gboolean          dir_only)
 {
     g_assert (IBUS_IS_OBSERVED_PATH (path));
 
@@ -206,10 +207,13 @@ ibus_observed_path_traverse (IBusObservedPath *path)
         sub->path = g_build_filename (path->path, name, NULL);
 
         ibus_observed_path_fill_stat (sub);
-        paths = g_list_append (paths, sub);
-
-        if (sub->is_exist && sub->is_dir)
-            paths = g_list_concat (paths, ibus_observed_path_traverse (sub));
+        if (sub->is_exist && sub->is_dir) {
+            paths = g_list_append (paths, sub);
+            paths = g_list_concat (paths,
+                                   ibus_observed_path_traverse (sub, dir_only));
+        } else if (!dir_only) {
+            paths = g_list_append (paths, sub);
+        }
     }
     g_dir_close (dir);
 
diff --git a/src/ibusobservedpath.h b/src/ibusobservedpath.h
index e137d3913..1aefa5061 100644
--- a/src/ibusobservedpath.h
+++ b/src/ibusobservedpath.h
@@ -116,12 +116,14 @@ IBusObservedPath    *ibus_observed_path_new                 (const gchar
 /**
  * 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.
  *
  * 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);
+GList               *ibus_observed_path_traverse            (IBusObservedPath   *path,
+                                                             gboolean            dir_only);
 
 /**
  * ibus_observed_path_check_modification:

From 4b044a05047dc897c8556f7c8856c53f6f4ea266 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 5 Nov 2012 14:28:02 +0900
Subject: [PATCH 095/816] Add some milliseconds interval before IME switcher is
 shown.

Review URL: https://codereview.appspot.com/6826045
---
 data/ibus.schemas.in  | 11 ++++++++++
 ui/gtk3/panel.vala    |  3 +++
 ui/gtk3/switcher.vala | 50 +++++++++++++++++++++++++++++++++----------
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 53ba05c40..d692e679f 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -25,6 +25,17 @@
             <long>Saved engines order in input method list</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/switcher-delay-time</key>
+      <applyto>/desktop/ibus/general/switcher-delay-time</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>400</default>
+      <locale name="C">
+        <short>Popup delay milliseconds for IME switcher window</short>
+            <long>Set popup delay milliseconds to show IME switcher window</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 6f579ac9a..036113100 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -204,6 +204,9 @@ class Panel : IBus.PanelService {
             m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
+            uint delay_time = (uint) m_config.get_value(
+                    "general", "switcher-delay-time").get_int32();
+            m_switcher.set_popup_delay_time(delay_time);
         } else {
             update_engines(null, null);
         }
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 2587117f4..bec50c615 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -73,6 +73,10 @@ class Switcher : Gtk.Window {
     private Gdk.ModifierType m_primary_modifier;
     private GLib.MainLoop m_loop;
     private int m_result;
+    private uint m_popup_delay_time = 400;
+    private uint m_popup_delay_time_id;
+    private int m_root_x;
+    private int m_root_y;
 
     public Switcher() {
         GLib.Object(
@@ -153,19 +157,19 @@ class Switcher : Gtk.Window {
             keyboard = device.get_associated_device();
         }
 
+        get_position(out m_root_x, out m_root_y);
+        // Pull the window from the screen so that the window gets
+        // the key press and release events but mouse does not select
+        // an IME unexpectedly.
+        move(-1000, -1000);
         show_all();
 
-        if (is_composited()) {
-            // Hide the window by set the opactiy to 0.0, because real hiden
-            // window can not grab keyboard and pointer.
-            get_window().set_opacity(0.0);
-
-            // Show window after 1/10 secound
-            GLib.Timeout.add(100, ()=> {
-                get_window().set_opacity(1.0);
-                return false;
-            });
-        }
+        // Restore the window position after m_popup_delay_time
+        m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
+                                                 () => {
+            restore_window_position("timeout");
+            return false;
+        });
 
         Gdk.GrabStatus status;
         // Grab all keyboard events
@@ -295,6 +299,19 @@ class Switcher : Gtk.Window {
         set_focus(m_buttons[m_selected_engine]);
     }
 
+    private void restore_window_position(string debug_str) {
+        debug("restore_window_position %s: (%ld, %ld)\n",
+                debug_str, m_root_x, m_root_y);
+
+        if (m_popup_delay_time_id == 0) {
+            return;
+        }
+
+        GLib.Source.remove(m_popup_delay_time_id);
+        m_popup_delay_time_id = 0;
+        move(m_root_x, m_root_y);
+    }
+
     /* override virtual functions */
     public override void show() {
         base.show();
@@ -305,6 +322,8 @@ class Switcher : Gtk.Window {
         bool retval = true;
         Gdk.EventKey *pe = &e;
 
+        restore_window_position("pressed");
+
         do {
             uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state;
 
@@ -357,8 +376,17 @@ class Switcher : Gtk.Window {
             return false;
         }
 
+        if (m_popup_delay_time_id != 0) {
+            GLib.Source.remove(m_popup_delay_time_id);
+            m_popup_delay_time_id = 0;
+        }
+
         m_loop.quit();
         m_result = (int)m_selected_engine;
         return true;
     }
+
+    public void set_popup_delay_time(uint popup_delay_time) {
+        m_popup_delay_time = popup_delay_time;
+    }
 }

From ebfb9ae7fe2af60f9c2b1c1bd56739316c01d097 Mon Sep 17 00:00:00 2001
From: Peng Huang <penghuang@google.com>
Date: Mon, 5 Nov 2012 09:24:15 -0500
Subject: [PATCH 096/816] Fix some build warnings.

BUG=None

Review URL: https://codereview.appspot.com/6775097
---
 bus/dbusimpl.c                 |  2 --
 tools/main.vala                | 10 +++++-----
 ui/gtk3/candidatearea.vala     | 14 ++++++++------
 ui/gtk3/candidatepanel.vala    |  4 ++--
 ui/gtk3/keybindingmanager.vala |  6 ++++--
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 3ff24cac9..366a24643 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -330,8 +330,6 @@ bus_name_service_new (const gchar *name)
 static void
 bus_name_service_free (BusNameService *service)
 {
-    GSList *list = NULL;
-
     g_assert (service != NULL);
 
     g_slist_free_full (service->owners,
diff --git a/tools/main.vala b/tools/main.vala
index d0535905d..28bd3369b 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -223,8 +223,8 @@ static string program_name;
 void print_usage(FileStream stream) {
     stream.printf(_("Usage: %s COMMAND [OPTION...]\n\n"), program_name);
     stream.printf(_("Commands:\n"));
-    foreach (var command in commands) {
-        stream.printf("  %s\n", command.name);
+    for (int i = 0; i < commands.length; i++) {
+        stream.printf("  %s\n", commands[i].name);
     }
 }
 
@@ -239,9 +239,9 @@ public int main(string[] argv) {
     }
 
     string[] new_argv = argv[1:argv.length];
-    foreach (var command in commands) {
-        if (command.name == argv[1])
-            return command.entry(new_argv);
+    for (int i = 0; i < commands.length; i++) {
+        if (commands[i].name == argv[1])
+            return commands[i].entry(new_argv);
     }
 
     stderr.printf(_("%s is unknown command!\n"), argv[1]);
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 611f8104f..82e03a734 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -136,10 +136,12 @@ class CandidateArea : Gtk.Box {
 
         if (m_vertical) {
             // Add Candidates
-            Gtk.HBox candidates_hbox = new Gtk.HBox(false, 0);
+            Gtk.Box candidates_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
             pack_start(candidates_hbox, false, false, 0);
-            Gtk.VBox labels_vbox = new Gtk.VBox(true, 0);
-            Gtk.VBox candidates_vbox = new Gtk.VBox(true, 0);
+            Gtk.Box labels_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            labels_vbox.set_homogeneous(true);
+            Gtk.Box candidates_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            candidates_vbox.set_homogeneous(true);
             candidates_hbox.pack_start(labels_vbox, false, false, 4);
             candidates_hbox.pack_start(new VSeparator(), false, false, 0);
             candidates_hbox.pack_start(candidates_vbox, true, true, 4);
@@ -148,7 +150,7 @@ class CandidateArea : Gtk.Box {
             pack_start(new HSeparator(), false, false, 0);
 
             // Add buttons
-            Gtk.HBox buttons_hbox = new Gtk.HBox(false, 0);
+            Gtk.Box buttons_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
             Gtk.Label state_label = new Gtk.Label(null);
             state_label.set_size_request(20, -1);
             buttons_hbox.pack_start(state_label, true, true, 0);
@@ -197,7 +199,7 @@ class CandidateArea : Gtk.Box {
                 m_widgets += candidate_ebox;
             }
         } else {
-            Gtk.HBox hbox = new Gtk.HBox(false, 0);
+            Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
             add(hbox);
 
             m_labels = {};
@@ -214,7 +216,7 @@ class CandidateArea : Gtk.Box {
                 candidate.show();
                 m_candidates += candidate;
 
-                Gtk.HBox candidate_hbox = new Gtk.HBox(false, 0);
+                Gtk.Box candidate_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
                 candidate_hbox.show();
                 candidate_hbox.pack_start(label, false, false, 2);
                 candidate_hbox.pack_start(candidate, false, false, 2);
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index ae40b5b9d..b061e954a 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -23,7 +23,7 @@
 public class CandidatePanel : Gtk.HBox{
     private bool m_vertical = true;
     private Gtk.Window m_toplevel;
-    private Gtk.VBox m_vbox;
+    private Gtk.Box m_vbox;
 
     private Gtk.Label m_preedit_label;
     private Gtk.Label m_aux_label;
@@ -60,7 +60,7 @@ public class CandidatePanel : Gtk.HBox{
         handle.set_visible(true);
         pack_start(handle, false, false, 0);
 
-        m_vbox = new Gtk.VBox(false, 0);
+        m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         m_vbox.set_visible(true);
         pack_start(m_vbox, false, false, 0);
 
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 5ff0c6564..12d731ded 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -131,7 +131,8 @@ public class KeybindingManager : GLib.Object {
             Gdk.ModifierType.SHIFT_MASK,
             Gdk.ModifierType.LOCK_MASK
         };
-        foreach (Gdk.ModifierType mask in masks) {
+        for (int i = 0; i < masks.length; i++) {
+            Gdk.ModifierType mask = masks[i];
             if ((binding_mask & mask) == mask)
                 return mask;
         }
@@ -215,7 +216,8 @@ public class KeybindingManager : GLib.Object {
             X.KeyMask.Mod5Mask
         };
         int[] masks = {};
-        foreach (var modifier in ignored_modifiers) {
+        for (int i = 0; i < ignored_modifiers.length; i++) {
+            int modifier = ignored_modifiers[i];
             masks += modifier;
 
             int length = masks.length;

From 2ad1813370111608491e22e444bffe3607519652 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 6 Nov 2012 17:31:55 +0900
Subject: [PATCH 097/816] gtk3: use different prev/next icons depending on
 orientation

Use rotated icons for prev/next buttons on lookup table.

BUG=none

Review URL: https://codereview.appspot.com/6815080
---
 ui/gtk3/candidatearea.vala | 43 ++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 82e03a734..12ab42aa2 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -35,6 +35,16 @@ class CandidateArea : Gtk.Box {
         "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
     };
 
+    private const string PREV_PAGE_ICONS[] = {
+        Gtk.Stock.GO_BACK,
+        Gtk.Stock.GO_UP
+    };
+
+    private const string NEXT_PAGE_ICONS[] = {
+        Gtk.Stock.GO_FORWARD,
+        Gtk.Stock.GO_DOWN
+    };
+
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void page_up();
     public signal void page_down();
@@ -42,24 +52,27 @@ class CandidateArea : Gtk.Box {
     public signal void cursor_down();
 
     public CandidateArea(bool vertical) {
-        GLib.Object(
-            orientation: vertical ? Gtk.Orientation.VERTICAL : Gtk.Orientation.HORIZONTAL
-        );
-        m_vertical = vertical;
-        recreate_ui();
-        show_all();
+        GLib.Object();
+        set_vertical(vertical, true);
     }
 
-    public void set_vertical(bool vertical) {
-        if (m_vertical == vertical)
+    public void set_vertical(bool vertical, bool force = false) {
+        if (!force && m_vertical == vertical)
             return;
         m_vertical = vertical;
+        orientation = vertical ?
+            Gtk.Orientation.VERTICAL :
+            Gtk.Orientation.HORIZONTAL;
         recreate_ui();
 
-        // Workaround a vala issue https://bugzilla.gnome.org/show_bug.cgi?id=661130
-        set_candidates((owned)m_ibus_candidates, m_focus_candidate, m_show_cursor);
-        if (m_candidates.length > 0)
+        if (m_ibus_candidates.length > 0) {
+            // Workaround a vala issue
+            // https://bugzilla.gnome.org/show_bug.cgi?id=661130
+            set_candidates((owned)m_ibus_candidates,
+                           m_focus_candidate,
+                           m_show_cursor);
             show_all();
+        }
     }
 
     public void set_labels(IBus.Text[] labels) {
@@ -126,12 +139,16 @@ class CandidateArea : Gtk.Box {
 
         Gtk.Button prev_button = new Gtk.Button();
         prev_button.clicked.connect((b) => page_up());
-        prev_button.set_image(new Gtk.Image.from_icon_name(Gtk.Stock.GO_UP, Gtk.IconSize.MENU));
+        prev_button.set_image(new Gtk.Image.from_stock(
+                                  PREV_PAGE_ICONS[orientation],
+                                  Gtk.IconSize.MENU));
         prev_button.set_relief(Gtk.ReliefStyle.NONE);
 
         Gtk.Button next_button = new Gtk.Button();
         next_button.clicked.connect((b) => page_down());
-        next_button.set_image(new Gtk.Image.from_icon_name(Gtk.Stock.GO_DOWN, Gtk.IconSize.MENU));
+        next_button.set_image(new Gtk.Image.from_stock(
+                                  NEXT_PAGE_ICONS[orientation],
+                                  Gtk.IconSize.MENU));
         next_button.set_relief(Gtk.ReliefStyle.NONE);
 
         if (m_vertical) {

From dce22003c388a7274dc148161cf0e02f44d29ad6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 9 Nov 2012 10:26:23 +0900
Subject: [PATCH 098/816] Disable IME switcher window when switcher-delay-time
 is less than 0

Review URL: https://codereview.appspot.com/6818102
---
 data/ibus.schemas.in  |  7 ++++++-
 ui/gtk3/panel.vala    | 35 ++++++++++++++++++++++++++++++----
 ui/gtk3/switcher.vala | 44 ++++++++++++++++++++++++++-----------------
 3 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index d692e679f..a8c7d7f68 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -33,7 +33,12 @@
       <default>400</default>
       <locale name="C">
         <short>Popup delay milliseconds for IME switcher window</short>
-            <long>Set popup delay milliseconds to show IME switcher window</long>
+            <long>Set popup delay milliseconds to show IME switcher window.
+                  The default is 400.
+                  0 = Show the window immediately.
+                  0 &lt; Delay milliseconds.
+                  0 &gt; Do not show the window and switch prev/next engines.
+            </long>
       </locale>
     </schema>
     <schema>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 036113100..c1596933f 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -33,6 +33,7 @@ class Panel : IBus.PanelService {
     private GLib.Pid m_setup_pid = 0;
     private Gtk.AboutDialog m_about_dialog;
     private Gtk.CssProvider m_css_provider;
+    private int m_switcher_delay_time = 400;
     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
 
     private uint m_switch_keysym = 0;
@@ -61,6 +62,10 @@ class Panel : IBus.PanelService {
         m_switcher = new Switcher();
         bind_switch_shortcut();
 
+        if (m_switcher_delay_time >= 0) {
+            m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
+        }
+
         m_property_manager = new PropertyManager();
         m_property_manager.property_activate.connect((k, s) => {
             property_activate(k, s);
@@ -188,6 +193,25 @@ class Panel : IBus.PanelService {
                                                  Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
+    private void set_switcher_delay_time(Variant? variant) {
+        Variant var_switcher_delay_time = variant;
+
+        if (var_switcher_delay_time == null) {
+            var_switcher_delay_time = m_config.get_value("general",
+                                                         "switcher-delay-time");
+        }
+
+        if (var_switcher_delay_time == null) {
+            return;
+        }
+
+        m_switcher_delay_time = var_switcher_delay_time.get_int32();
+
+        if (m_switcher_delay_time >= 0) {
+            m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
+        }
+    }
+
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
@@ -200,13 +224,12 @@ class Panel : IBus.PanelService {
             m_config.value_changed.connect(config_value_changed_cb);
             m_config.watch("general", "preload_engines");
             m_config.watch("general", "engines_order");
+            m_config.watch("general", "switcher_delay_time");
             m_config.watch("panel", "custom_font");
             m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
-            uint delay_time = (uint) m_config.get_value(
-                    "general", "switcher-delay-time").get_int32();
-            m_switcher.set_popup_delay_time(delay_time);
+            set_switcher_delay_time(null);
         } else {
             update_engines(null, null);
         }
@@ -290,6 +313,10 @@ class Panel : IBus.PanelService {
             set_custom_font();
             return;
         }
+
+        if (section == "general" && name == "switcher_delay_time") {
+            set_switcher_delay_time(variant);
+        }
     }
 
     private void handle_engine_switch(Gdk.Event event, bool revert) {
@@ -302,7 +329,7 @@ class Panel : IBus.PanelService {
 
         bool pressed = KeybindingManager.primary_modifier_still_pressed(
                 event, primary_modifiers);
-        if (pressed) {
+        if (pressed && m_switcher_delay_time >= 0) {
             int i = revert ? m_engines.length - 1 : 1;
             i = m_switcher.run(m_switch_keysym, m_switch_modifiers, event,
                     m_engines, i);
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index bec50c615..494fab9f1 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -73,8 +73,8 @@ class Switcher : Gtk.Window {
     private Gdk.ModifierType m_primary_modifier;
     private GLib.MainLoop m_loop;
     private int m_result;
-    private uint m_popup_delay_time = 400;
-    private uint m_popup_delay_time_id;
+    private uint m_popup_delay_time = 0;
+    private uint m_popup_delay_time_id = 0;
     private int m_root_x;
     private int m_root_y;
 
@@ -157,19 +157,25 @@ class Switcher : Gtk.Window {
             keyboard = device.get_associated_device();
         }
 
-        get_position(out m_root_x, out m_root_y);
-        // Pull the window from the screen so that the window gets
-        // the key press and release events but mouse does not select
-        // an IME unexpectedly.
-        move(-1000, -1000);
+        // Avoid regressions.
+        if (m_popup_delay_time > 0) {
+            get_position(out m_root_x, out m_root_y);
+            // Pull the window from the screen so that the window gets
+            // the key press and release events but mouse does not select
+            // an IME unexpectedly.
+            move(-1000, -1000);
+        }
+
         show_all();
 
-        // Restore the window position after m_popup_delay_time
-        m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
-                                                 () => {
-            restore_window_position("timeout");
-            return false;
-        });
+        if (m_popup_delay_time > 0) {
+            // Restore the window position after m_popup_delay_time
+            m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
+                                                     () => {
+                restore_window_position("timeout");
+                return false;
+            });
+        }
 
         Gdk.GrabStatus status;
         // Grab all keyboard events
@@ -322,7 +328,9 @@ class Switcher : Gtk.Window {
         bool retval = true;
         Gdk.EventKey *pe = &e;
 
-        restore_window_position("pressed");
+        if (m_popup_delay_time > 0) {
+            restore_window_position("pressed");
+        }
 
         do {
             uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state;
@@ -376,9 +384,11 @@ class Switcher : Gtk.Window {
             return false;
         }
 
-        if (m_popup_delay_time_id != 0) {
-            GLib.Source.remove(m_popup_delay_time_id);
-            m_popup_delay_time_id = 0;
+        if (m_popup_delay_time > 0) {
+            if (m_popup_delay_time_id != 0) {
+                GLib.Source.remove(m_popup_delay_time_id);
+                m_popup_delay_time_id = 0;
+            }
         }
 
         m_loop.quit();

From 15f3ccb38474c6bb206a2158d86171c93d6ec6a5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 13 Nov 2012 12:05:07 +0900
Subject: [PATCH 099/816] Update simple.xml to enable layout_variant tag.

Review URL: https://codereview.appspot.com/6820129
---
 engine/simple.xml.in.in | 112 +++++++++++++++++++++++++++++++++-------
 1 file changed, 93 insertions(+), 19 deletions(-)

diff --git a/engine/simple.xml.in.in b/engine/simple.xml.in.in
index 25db57821..d064ad6ad 100644
--- a/engine/simple.xml.in.in
+++ b/engine/simple.xml.in.in
@@ -24,7 +24,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us(intl)</layout>
+			<layout>us</layout>
+			<layout_variant>intl</layout_variant>
 			<longname>English (US, international with dead keys)</longname>
 			<description>English (US, international with dead keys)</description>
                         <icon>ibus-keyboard</icon>
@@ -35,7 +36,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us(colemak)</layout>
+			<layout>us</layout>
+			<layout_variant>colemak</layout_variant>
 			<longname>English (Colemak)</longname>
 			<description>English (Colemak)</description>
                         <icon>ibus-keyboard</icon>
@@ -46,7 +48,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us(dvorak)</layout>
+			<layout>us</layout>
+			<layout_variant>dvorak</layout_variant>
 			<longname>English (Dvorak)</longname>
 			<description>English (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
@@ -57,20 +60,21 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us(altgr-intl)</layout>
+			<layout>us</layout>
+			<layout_variant>altgr-intl</layout_variant>
 			<longname>English (international AltGr dead keys)</longname>
 			<description>English (international AltGr dead keys)</description>
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
 		<engine>
-			<name>xkb:us:altgr-intl:eng</name>
-			<language>eng</language>
+			<name>xkb:ara::ara</name>
+			<language>ara</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us(altgr-intl)</layout>
-			<longname>English (international AltGr dead keys)</longname>
-			<description>English (international AltGr dead keys)</description>
+			<layout>ara</layout>
+			<longname>Arabic</longname>
+			<description>Arabic</description>
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
@@ -118,6 +122,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:br:dvorak:por</name>
+			<language>por</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>br</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>Portuguese (Brazil, Dvorak)</longname>
+			<description>Portuguese (Brazil, Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:bg::bul</name>
 			<language>bul</language>
@@ -134,7 +150,8 @@
 			<language>bul</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>bg(phonetic)</layout>
+			<layout>bg</layout>
+			<layout_variant>phonetic</layout_variant>
 			<longname>Bulgarian (traditional phonetic)</longname>
 			<description>Bulgarian (traditional phonetic)</description>
                         <icon>ibus-keyboard</icon>
@@ -156,7 +173,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ca(eng)</layout>
+			<layout>ca</layout>
+			<layout_variant>eng</layout_variant>
 			<longname>English (Canada)</longname>
 			<description>English (Canada)</description>
                         <icon>ibus-keyboard</icon>
@@ -228,6 +246,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:fr:dvorak:fra</name>
+			<language>fra</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>fr</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>French (Dvorak)</longname>
+			<description>French (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:de::ger</name>
 			<language>ger</language>
@@ -239,12 +269,25 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:de:dvorak:ger</name>
+			<language>ger</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>de</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>German (Dvorak)</longname>
+			<description>German (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:de:neo:ger</name>
 			<language>ger</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>de(neo)</layout>
+			<layout>de</layout>
+			<layout_variant>neo</layout_variant>
 			<longname>German (Neo 2)</longname>
 			<description>German (Neo 2)</description>
                         <icon>ibus-keyboard</icon>
@@ -332,7 +375,8 @@
 			<language>lav</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>lv(apostrophe)</layout>
+			<layout>lv</layout>
+			<layout_variant>apostrophe</layout_variant>
 			<longname>Latvian (apostrophe variant)</longname>
 			<description>Latvian (apostrophe variant)</description>
                         <icon>ibus-keyboard</icon>
@@ -349,6 +393,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:pl:dvorak:pol</name>
+			<language>pol</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>pl</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>Polish (Dvorak)</longname>
+			<description>Polish (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:pt::por</name>
 			<language>por</language>
@@ -387,7 +443,8 @@
 			<language>rus</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ru(phonetic)</layout>
+			<layout>ru</layout>
+			<layout_variant>phonetic</layout_variant>
 			<longname>Russian (phonetic)</longname>
 			<description>Russian (phonetic)</description>
                         <icon>ibus-keyboard</icon>
@@ -442,7 +499,8 @@
 			<language>cat</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>es(cat)</layout>
+			<layout>es</layout>
+			<layout_variant>cat</layout_variant>
 			<longname>Catalan (Spain, with middle-dot L)</longname>
 			<description>Catalan (Spain, with middle-dot L)</description>
                         <icon>ibus-keyboard</icon>
@@ -459,6 +517,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:se:dvorak:swe</name>
+			<language>swe</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>se</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>Swedish (Dvorak)</longname>
+			<description>Swedish (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:ch::ger</name>
 			<language>ger</language>
@@ -475,7 +545,8 @@
 			<language>fra</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ch(fr)</layout>
+			<layout>ch</layout>
+			<layout_variant>fr</layout_variant>
 			<longname>French (Switzerland)</longname>
 			<description>French (Switzerland)</description>
                         <icon>ibus-keyboard</icon>
@@ -508,7 +579,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>gb(extd)</layout>
+			<layout>gb</layout>
+			<layout_variant>extd</layout_variant>
 			<longname>English (UK, extended WinKeys)</longname>
 			<description>English (UK, extended WinKeys)</description>
                         <icon>ibus-keyboard</icon>
@@ -519,7 +591,8 @@
 			<language>eng</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>gb(dvorak)</layout>
+			<layout>gb</layout>
+			<layout_variant>dvorak</layout_variant>
 			<longname>English (UK, Dvorak)</longname>
 			<description>English (UK, Dvorak)</description>
                         <icon>ibus-keyboard</icon>
@@ -530,7 +603,8 @@
 			<language>kor</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>kr(kr104)</layout>
+			<layout>kr</layout>
+			<layout_variant>kr104</layout_variant>
 			<longname>Korean (101/104 key compatible)</longname>
 			<description>Korean (101/104 key compatible)</description>
                         <icon>ibus-keyboard</icon>

From e129cf261f18935f073ce083169c7168bc60ff06 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 15 Nov 2012 16:58:06 +0900
Subject: [PATCH 100/816] Change the default icon to ibus-keyboard due to gnome
 ibus integration.

Review URL: https://codereview.appspot.com/6851051
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index cc7d0e0ce..89e9c2503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,7 +445,7 @@ AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS",
 # GNOME 3 uses the theme's icon.
 AC_ARG_WITH(panel-icon-keyboard,
     AS_HELP_STRING([--with-panel-icon-keyboard[=icon_name]],
-        [Set the default panel icon (default: "input-keyboard-symbolic")]),
+        [Set the default panel icon (default: "ibus-keyboard")]),
     [if test x"$with_panel_icon_keyboard" = x"yes" -o \
              x"$with_panel_icon_keyboard" = x; then
          with_panel_icon_keyboard="input-keyboard-symbolic"
@@ -455,7 +455,7 @@ AC_ARG_WITH(panel-icon-keyboard,
      fi
      IBUS_ICON_KEYBOARD=$with_panel_icon_keyboard
     ],
-    IBUS_ICON_KEYBOARD="input-keyboard-symbolic"
+    IBUS_ICON_KEYBOARD="ibus-keyboard"
 )
 AC_SUBST(IBUS_ICON_KEYBOARD)
 

From 11a83ef32c7c73f0feb48fd36cc9f33abaa8024a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 19 Nov 2012 11:58:35 +0900
Subject: [PATCH 101/816] Add cedilla_compose_seqs table for pt_BR compose
 keys.

Review URL: https://codereview.appspot.com/6814119
---
 engine/main.vala       | 44 ++++++++++++++++++++++++++++++++++++++++++
 src/ibusengine.h       |  4 ++--
 src/ibusenginesimple.h |  7 ++++---
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/engine/main.vala b/engine/main.vala
index acfa7371b..f2057f900 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -22,10 +22,26 @@
 
 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, "");
     IBus.init();
 
     IBus.Bus bus = new IBus.Bus();
@@ -45,9 +61,37 @@ public int main(string[] args) {
 
     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,
             path.printf(++id), bus.get_connection());
+
+        /* I think "c" + "'" is c with acute U+0107 and
+         * "c" + "," is c with cedilla U+00E7 and they are
+         * visually comprehensible. But pt-br people need
+         * "c" + "'" is c with cedilla and I think the
+         * cedilla_compose_seqs is needed for the specific keyboards
+         * or regions.
+         * X11 uses compose by locale:
+         * In /usr/share/X11/locale/en_US.UTF-8/Compose ,
+         * <Multi_key> <apostrophe> <c> : U0107
+         * At the moment, LC_CTYPE is checked here.
+         * 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((uint16[]) cedilla_compose_seqs,
+                             4,
+                             cedilla_compose_seqs.length / (4 + 2));
+        }
+
         return engine;
     });
 
diff --git a/src/ibusengine.h b/src/ibusengine.h
index c12e254b9..d7696c42b 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -33,7 +33,7 @@
  * An IBusEngine provides infrastructure for input method engine.
  * Developers can "extend" this class for input method engine development.
  *
- * @see_also: #IBusComponent, #IBusEngineDesc
+ * see_also: #IBusComponent, #IBusEngineDesc
  */
 #ifndef __IBUS_ENGINE_H_
 #define __IBUS_ENGINE_H_
@@ -423,7 +423,7 @@ void ibus_engine_delete_surrounding_text(IBusEngine         *engine,
  * #IBusEngine::enable handler, with both @text and @cursor set to
  * %NULL.
  *
- * @see_also #IBusEngine::set-surrounding-text
+ * see_also #IBusEngine::set-surrounding-text
  */
 void ibus_engine_get_surrounding_text(IBusEngine         *engine,
                                       IBusText          **text,
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index d5e579594..6e0e5cc52 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -32,7 +32,7 @@
  *
  * An IBusEngineSimple provides table-based input method logic.
  *
- * @see_also: #IBusEngine
+ * see_also: #IBusEngine
  */
 #ifndef __IBUS_ENGINE_SIMPLE_H__
 #define __IBUS_ENGINE_SIMPLE_H__
@@ -97,8 +97,9 @@ GType   ibus_engine_simple_get_type       (void);
 /**
  * ibus_engine_simple_add_table:
  * @simple: An IBusEngineSimple.
- * @data: The table.
- * @ max_seq_len: Maximum length of a swquence in the table (cannot be greater
+ * @data: (transfer container) (element-type guint16) (array):
+ *      The table.
+ * @max_seq_len: Maximum length of a swquence in the table (cannot be greater
  *      than %IBUS_MAX_COMPOSE_LEN)
  *
  * Adds an additional table to search to the engine. Each row of the table

From dd6acfa5013b35b61aeb4085eef7da63f581f2f8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 22 Nov 2012 15:07:12 +0900
Subject: [PATCH 102/816] Remove gnome-icon-theme-legacy dependency.

gtk_image_set_from_icon_name() accesses the icon_name only but
gtk_image_set_from_stock() can fallback the stock name to the real name.
E.g. "gtk-about.png" is the symlink of "help-about.png" and
"gtk-about.png" is included in gnome-icon-theme-legacy package in Fedora.

Review URL: https://codereview.appspot.com/6846058
---
 setup/engineabout.py    |  3 ++-
 setup/enginecombobox.py |  5 -----
 setup/enginetreeview.py |  7 -------
 setup/icon.py           | 33 +++++++++++++++++++++++++++------
 ui/gtk3/iconwidget.vala | 36 +++++++++++++++++++++++++++++-------
 ui/gtk3/panel.vala      | 15 +++++++++------
 ui/gtk3/property.vala   |  4 +---
 ui/gtk3/switcher.vala   |  4 ++--
 8 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/setup/engineabout.py b/setup/engineabout.py
index 7e2813a25..a020f8c32 100644
--- a/setup/engineabout.py
+++ b/setup/engineabout.py
@@ -38,7 +38,8 @@ def __init__(self, enginedesc):
         self.__init_ui()
 
     def __init_ui(self):
-        self.set_icon_name(Gtk.STOCK_ABOUT)
+        # set_icon_name() cannot fallback any stock ids to the real files.
+        self.set_icon_name('help-about')
         sw = Gtk.ScrolledWindow()
         sw.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
         sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index f80b164e4..0f8a6ae08 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -116,11 +116,6 @@ def __icon_cell_data_cb(self, celllayout, renderer, model, iter, data):
             renderer.set_property("visible", True)
             renderer.set_property("sensitive", True)
             pixbuf = load_icon(engine.get_icon(), Gtk.IconSize.LARGE_TOOLBAR)
-            if pixbuf == None:
-                pixbuf = load_icon("ibus-engine", Gtk.IconSize.LARGE_TOOLBAR)
-            if pixbuf == None:
-                pixbuf = load_icon(Gtk.STOCK_MISSING_IMAGE,
-                        Gtk.IconSize.LARGE_TOOLBAR)
             renderer.set_property("pixbuf", pixbuf)
 
     def __name_cell_data_cb(self, celllayout, renderer, model, iter, data):
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 8ade7dba8..51e4fa2ff 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -118,13 +118,6 @@ def __icon_cell_data_cb(self, celllayout, renderer, model, it, data):
 
         icon_size = Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)[0]
         pixbuf = load_icon(engine.get_icon(), Gtk.IconSize.LARGE_TOOLBAR)
-
-        if pixbuf == None:
-            pixbuf = load_icon("ibus-engine", Gtk.IconSize.LARGE_TOOLBAR)
-        if pixbuf == None:
-            pixbuf = load_icon(Gtk.STOCK_MISSING_IMAGE,
-                               Gtk.IconSize.LARGE_TOOLBAR)
-
         renderer.set_property("pixbuf", pixbuf)
 
     def __name_cell_data_cb(self, celllayout, renderer, model, it, data):
diff --git a/setup/icon.py b/setup/icon.py
index be8a38a1f..a4a29195c 100644
--- a/setup/icon.py
+++ b/setup/icon.py
@@ -37,9 +37,14 @@
 
 icon_cache = {}
 
-def load_icon(icon, size):
-    if (icon, size) in icon_cache:
-        return icon_cache[(icon, size)]
+# load_icon:
+# @icon_name_or_path: Can be a name or path but not stock id
+#     because gtk_icon_theme_load_icon() cannot fallback the stock id to
+#     a real file name against gtk_image_new_from_stock().
+# @size: #GtkIconSize
+def load_icon(icon_name_or_path, size):
+    if (icon_name_or_path, size) in icon_cache:
+        return icon_cache[(icon_name_or_path, size)]
 
     icon_size = Gtk.icon_size_lookup(size)
     if icon_size[0]:
@@ -47,7 +52,7 @@ def load_icon(icon, size):
 
     pixbuf = None
     try:
-        pixbuf = GdkPixbuf.Pixbuf.new_from_file(icon)
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file(icon_name_or_path)
         w, h = pixbuf.get_width(), pixbuf.get_height()
         rate = max(w, h) / float(icon_size)
         w = int(w / rate)
@@ -60,10 +65,26 @@ def load_icon(icon, size):
     if pixbuf == None:
         try:
             theme = Gtk.IconTheme.get_default()
-            pixbuf = theme.load_icon(icon, icon_size, 0)
+            pixbuf = theme.load_icon(icon_name_or_path, icon_size, 0)
         except:
             # import traceback
             # traceback.print_exc()
             pass
-    icon_cache[(icon, size)] = pixbuf
+    if pixbuf == None:
+        try:
+            theme = Gtk.IconTheme.get_default()
+            pixbuf = theme.load_icon('ibus-engine', icon_size, 0)
+        except:
+            # import traceback
+            # traceback.print_exc()
+            pass
+    if pixbuf == None:
+        try:
+            theme = Gtk.IconTheme.get_default()
+            pixbuf = theme.load_icon('image-missing', icon_size, 0)
+        except:
+            # import traceback
+            # traceback.print_exc()
+            pass
+    icon_cache[(icon_name_or_path, size)] = pixbuf
     return pixbuf
diff --git a/ui/gtk3/iconwidget.vala b/ui/gtk3/iconwidget.vala
index 4dfcfeaad..e4ff9c206 100644
--- a/ui/gtk3/iconwidget.vala
+++ b/ui/gtk3/iconwidget.vala
@@ -21,27 +21,49 @@
  */
 
 class IconWidget: Gtk.Image {
-    public IconWidget(string icon, int size) {
+    /**
+     * IconWidget:
+     * @icon_name_or_path: Can be a name or path but not stock id
+     *     because gtk_icon_theme_load_icon() cannot fallback the
+     *     stock id to a real file name against
+     *     gtk_image_new_from_stock().
+     * @size: #Gtk.IconSize
+     */
+    public IconWidget(string icon_name_or_path, Gtk.IconSize size) {
         Gdk.Pixbuf pixbuf = null;
+        int fixed_width, fixed_height;
+        Gtk.icon_size_lookup(size, out fixed_width, out fixed_height);
+
         try {
-            if (icon[0] == '/') {
-                pixbuf = new Gdk.Pixbuf.from_file(icon);
+            if (icon_name_or_path[0] == '/') {
+                pixbuf = new Gdk.Pixbuf.from_file(icon_name_or_path);
             } else {
                 var theme = Gtk.IconTheme.get_default();
-                pixbuf = theme.load_icon(icon, size, 0);
+                pixbuf = theme.load_icon(icon_name_or_path, fixed_width, 0);
             }
         } catch (GLib.Error e) {
             try {
                 var theme = Gtk.IconTheme.get_default();
-                pixbuf = theme.load_icon(Gtk.Stock.MISSING_IMAGE, size, 0);
-            } catch (GLib.Error e) {}
+                pixbuf = theme.load_icon("ibus-engine", fixed_width, 0);
+            } catch (GLib.Error e) {
+                /* "gtk-missing-image.png" is the symlink of
+                 * "image-missing.png" and included in
+                 * gnome-icon-theme-legacy package in fedora.
+                 * gtk_image_set_from_stock() can fallback the stock name
+                 * to the real name instead of gtk_image_set_from_icon_name()
+                 * or gtk_icon_theme_load_icon() and
+                 * could remove gnome-icon-theme-legacy.
+                 */
+                set_from_stock(Gtk.Stock.MISSING_IMAGE, size);
+                return;
+            }
         }
 
         if (pixbuf == null)
             return;
         float width = (float)pixbuf.get_width();
         float height = (float)pixbuf.get_height();
-        float scale = size / (width > height ? width : height);
+        float scale = fixed_width / (width > height ? width : height);
         width *= scale;
         height *= scale;
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index c1596933f..3df0be711 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -492,9 +492,6 @@ class Panel : IBus.PanelService {
 
         m_ime_menu.append(new Gtk.SeparatorMenuItem());
 
-        int width, height;
-        Gtk.icon_size_lookup(Gtk.IconSize.MENU, out width, out height);
-
         // Append IMEs
         foreach (var engine in m_engines) {
             var language = engine.get_language();
@@ -502,7 +499,7 @@ class Panel : IBus.PanelService {
             var item = new Gtk.ImageMenuItem.with_label(
                 "%s - %s".printf (IBus.get_language_name(language), longname));
             if (engine.get_icon() != "") {
-                var icon = new IconWidget(engine.get_icon(), width);
+                var icon = new IconWidget(engine.get_icon(), Gtk.IconSize.MENU);
                  item.set_image(icon);
             }
             // Make a copy of engine to workaround a bug in vala.
@@ -590,8 +587,14 @@ class Panel : IBus.PanelService {
 
         if (icon_name[0] == '/')
             m_status_icon.set_from_file(icon_name);
-        else
-            m_status_icon.set_from_icon_name(icon_name);
+        else {
+            var theme = Gtk.IconTheme.get_default();
+            if (theme.lookup_icon(icon_name, 48, 0) != null) {
+                m_status_icon.set_from_icon_name(icon_name);
+            } else {
+                m_status_icon.set_from_icon_name("ibus-engine");
+            }
+        }
 
         if (engine == null)
             return;
diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index 718ba94dd..1dabccdac 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -129,9 +129,7 @@ public class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
     }
 
     private void set_icon(string icon) {
-        int width, height;
-        Gtk.icon_size_lookup(Gtk.IconSize.MENU, out width, out height);
-        set_image(new IconWidget(icon, width));
+        set_image(new IconWidget(icon, Gtk.IconSize.MENU));
     }
 
     public override void activate() {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 494fab9f1..74c33726a 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -24,7 +24,6 @@ class Switcher : Gtk.Window {
     public extern const bool USE_SYMBOL_ICON;
     private const int DEFAULT_FONT_SIZE = 16;
     private const int DESC_LABEL_MAX_LEN = 20;
-    private const int ICON_SIZE = 48;
 
     private class IBusEngineButton : Gtk.Button {
         public IBusEngineButton(IBus.EngineDesc engine) {
@@ -36,7 +35,8 @@ class Switcher : Gtk.Window {
             add(align);
 
             if (!USE_SYMBOL_ICON) {
-                IconWidget icon = new IconWidget(engine.get_icon(), ICON_SIZE);
+                IconWidget icon = new IconWidget(engine.get_icon(),
+                                                 Gtk.IconSize.DIALOG);
                 align.add(icon);
             } else {
                 var language = engine.get_language();

From 0057397548a354b7eb359e5d45201db4077074e2 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 23 Nov 2012 08:17:23 +0900
Subject: [PATCH 103/816] Install pygobject override

To mitigate the gap between the old python binding and
pygobject, add wrapper to some classes.

BUG=none

Review URL: https://codereview.appspot.com/6842079
---
 bindings/Makefile.am                        |   5 +
 bindings/pygobject/Makefile.am              |  44 ++++
 bindings/pygobject/gi/__init__.py           |  28 +++
 bindings/pygobject/gi/overrides/IBus.py     | 234 ++++++++++++++++++++
 bindings/pygobject/gi/overrides/__init__.py |  28 +++
 bindings/pygobject/test-override-ibus.py    | 123 ++++++++++
 configure.ac                                |  15 ++
 7 files changed, 477 insertions(+)
 create mode 100644 bindings/pygobject/Makefile.am
 create mode 100644 bindings/pygobject/gi/__init__.py
 create mode 100644 bindings/pygobject/gi/overrides/IBus.py
 create mode 100644 bindings/pygobject/gi/overrides/__init__.py
 create mode 100644 bindings/pygobject/test-override-ibus.py

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 135849c75..8a2854ec6 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -24,8 +24,13 @@ if ENABLE_VALA
 VALA_DIR = vala
 endif
 
+if ENABLE_PYGOBJECT
+PYGOBJECT_DIR = pygobject
+endif
+
 SUBDIRS = \
 	$(VALA_DIR) \
+	$(PYGOBJECT_DIR) \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
new file mode 100644
index 000000000..6a1d2f3b6
--- /dev/null
+++ b/bindings/pygobject/Makefile.am
@@ -0,0 +1,44 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+#
+# 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 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 program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA
+
+NULL =
+
+overridesdir = $(pyoverridesdir)
+overrides_PYTHON =				\
+	gi/overrides/IBus.py			\
+	$(NULL)
+
+TESTS = test-override-ibus.py
+
+TESTS_ENVIRONMENT = \
+	PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
+	GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
+	$(PYTHON) -B \
+	$(NULL)
+
+EXTRA_DIST =					\
+	gi/__init__.py				\
+	gi/overrides/__init__.py		\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/pygobject/gi/__init__.py b/bindings/pygobject/gi/__init__.py
new file mode 100644
index 000000000..3ae00c376
--- /dev/null
+++ b/bindings/pygobject/gi/__init__.py
@@ -0,0 +1,28 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+#
+# 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 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 program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA
+
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
+
+__path__.reverse()
+from __init__ import *
+__path__.reverse()
diff --git a/bindings/pygobject/gi/overrides/IBus.py b/bindings/pygobject/gi/overrides/IBus.py
new file mode 100644
index 000000000..bf3000e9f
--- /dev/null
+++ b/bindings/pygobject/gi/overrides/IBus.py
@@ -0,0 +1,234 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+#
+# 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 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 program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA
+
+from gi.repository import GObject
+
+from ..overrides import override
+
+# for newer pygobject: https://bugzilla.gnome.org/show_bug.cgi?id=686828
+# from ..module import get_introspection_module
+# IBus = get_introspection_module('IBus')
+from ..importer import modules
+IBus = modules['IBus']._introspection_module
+
+__all__ = []
+
+class Attribute(IBus.Attribute):
+    def __new__(cls, type=0, value=0, start_index=0, end_index=0):
+        return IBus.Attribute.new(type, value, start_index, end_index)
+
+Attribute = override(Attribute)
+__all__.append('Attribute')
+
+class Component(IBus.Component):
+    # Backward compatibility: allow non-keyword arguments
+    def __init__(self,
+                 name='',
+                 description='',
+                 version='',
+                 laicense='',
+                 author='',
+                 homepage='',
+                 command_line='',
+                 textdomain='',
+                 **kwargs):
+        super(Component, self).__init__(name=name,
+                                        description=description,
+                                        version=version,
+                                        license=license,
+                                        author=author,
+                                        homepage=homepage,
+                                        command_line=command_line,
+                                        textdomain=textdomain,
+                                        **kwargs)
+
+    # Backward compatibility: allow keyword arguments
+    def add_engine(self, engine=None, **kwargs):
+        if engine is None:
+            engine = EngineDesc(**kwargs)
+        super(Component, self).add_engine(engine)
+
+Component = override(Component)
+__all__.append('Component')
+
+class Config(IBus.Config):
+    # Backward compatibility: accept default arg
+    def get_value(self, section, name, default=None):
+        value = super(Config, self).get_value(section, name)
+        if value is None:
+            return default
+        return value
+
+    # Backward compatibility: unset value if value is None
+    # Note that we don't call GLib.Variant.unpack here
+    def set_value(self, section, name, value):
+        if value is None:
+            self.unset(section, name)
+        else:
+            super(Config, self).set_value(section, name, value)
+
+Config = override(Config)
+__all__.append('Config')
+
+class EngineDesc(IBus.EngineDesc):
+    # Backward compatibility: allow non-keyword arguments
+    def __init__(self,
+                 name='',
+                 longname='',
+                 description='',
+                 language='',
+                 license='',
+                 author='',
+                 icon='',
+                 layout='us',
+                 hotkeys='',
+                 rank=0,
+                 symbol='',
+                 setup='',
+                 layout_variant='',
+                 layout_option='',
+                 version='',
+                 **kwargs):
+        super(EngineDesc, self).__init__(name=name,
+                                         longname=longname,
+                                         description=description,
+                                         language=language,
+                                         license=license,
+                                         author=author,
+                                         icon=icon,
+                                         layout=layout,
+                                         hotkeys=hotkeys,
+                                         rank=rank,
+                                         symbol=symbol,
+                                         setup=setup,
+                                         layout_variant=layout_variant,
+                                         layout_option=layout_option,
+                                         version=version,
+                                         **kwargs)
+
+EngineDesc = override(EngineDesc)
+__all__.append('EngineDesc')
+
+class Factory(IBus.Factory):
+    # Backward compatibility: allow non-keyword arguments
+    def __init__(self, bus=None, **kwargs):
+        if bus is not None:
+            kwargs.setdefault('connection', bus.get_connection())
+            kwargs.setdefault('object_path', IBus.PATH_FACTORY)
+        super(Factory, self).__init__(**kwargs)
+
+Factory = override(Factory)
+__all__.append('Factory')
+
+class Keymap(IBus.Keymap):
+    # Backward compatibility: allow non-keyword arguments
+    def __new__(cls, name):
+        return IBus.Keymap.new(name)
+
+    def __init__(*args, **kwargs):
+        pass
+
+Keymap = override(Keymap)
+__all__.append('Keymap')
+
+class LookupTable(IBus.LookupTable):
+    # Backward compatibility: allow non-keyword arguments
+    def __new__(cls,
+                page_size=5,
+                cursor_pos=0,
+                cursor_visible=True,
+                round=False,
+                orientation=IBus.Orientation.SYSTEM,
+                candidates=[],
+                labels=[]):
+        table = IBus.LookupTable.new(page_size,
+                                     cursor_pos,
+                                     cursor_visible,
+                                     round)
+        table.set_orientation(orientation)
+        for candidate in candidates:
+            table.append_candidate(candidate)
+        for index, label in enumerate(labels):
+            table.set_label(index, label)
+        return table
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    # Backward compatibility: rename
+    def show_cursor(self, visible):
+        self.set_cursor_visible(visible)
+
+    # Backward compatibility: rename
+    def clean(self):
+        self.clear()
+
+LookupTable = override(LookupTable)
+__all__.append('LookupTable')
+
+class Property(IBus.Property):
+    # Backward compatibility: allow non-keyword arguments
+    def __init__(self,
+                 key='',
+                 type=IBus.PropType.NORMAL,
+                 label='',
+                 icon='',
+                 tooltip='',
+                 sensitive=True,
+                 visible=True,
+                 state=IBus.PropState.UNCHECKED,
+                 symbol='',
+                 **kwargs):
+        prop_type = kwargs.get('prop_type', type)
+        if not isinstance(label, IBus.Text):
+            label = Text(label)
+        if not isinstance(tooltip, IBus.Text):
+            tooltip = Text(tooltip)
+        if not isinstance(symbol, IBus.Text):
+            symbol = Text(symbol)
+        super(Property, self).__init__(key=key,
+                                       prop_type=prop_type,
+                                       label=label,
+                                       icon=icon,
+                                       tooltip=tooltip,
+                                       sensitive=sensitive,
+                                       visible=visible,
+                                       state=state,
+                                       symbol=symbol,
+                                       **kwargs)
+
+Property = override(Property)
+__all__.append('Property')
+
+class Text(IBus.Text):
+    # Backward compatibility: allow non-keyword arguments
+    def __new__(cls, string='', attrs=None):
+        text = IBus.Text.new_from_string(string)
+        if attrs is not None:
+            text.set_attributes(attrs)
+        return text
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+Text = override(Text)
+__all__.append('Text')
diff --git a/bindings/pygobject/gi/overrides/__init__.py b/bindings/pygobject/gi/overrides/__init__.py
new file mode 100644
index 000000000..3ae00c376
--- /dev/null
+++ b/bindings/pygobject/gi/overrides/__init__.py
@@ -0,0 +1,28 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+#
+# 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 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 program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA
+
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
+
+__path__.reverse()
+from __init__ import *
+__path__.reverse()
diff --git a/bindings/pygobject/test-override-ibus.py b/bindings/pygobject/test-override-ibus.py
new file mode 100644
index 000000000..d222ecfaa
--- /dev/null
+++ b/bindings/pygobject/test-override-ibus.py
@@ -0,0 +1,123 @@
+# vim:set et sts=4 sw=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
+# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+#
+# 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 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 program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301  USA
+
+import unittest
+from gi.repository import GLib, IBus
+
+class TestOverride(unittest.TestCase):
+    def setUp(self):
+        self.__bus = IBus.Bus()
+
+    def test_attribute(self):
+        # construction with keyword args
+        attr = IBus.Attribute(type=IBus.AttrType.UNDERLINE,
+                              value=IBus.AttrUnderline.SINGLE,
+                              start_index=0,
+                              end_index=10)
+
+    def test_component(self):
+        # construction with keyword args
+        component = IBus.Component(name='foo', description='foo desc')
+        self.assertEqual(component.props.name, 'foo')
+        # construction with non-keyword args
+        component = IBus.Component('bar', 'bar desc')
+        self.assertEqual(component.props.name, 'bar')
+
+    def test_config(self):
+        if not self.__bus.is_connected():
+            self.skipTest('bus not connected')
+
+        config = self.__bus.get_config()
+        if config is None:
+            self.skipTest('config service not running')
+
+        config.unset("test", "v1")
+
+        # get_value with no default arg
+        retval = config.get_value("test", "v1")
+        self.assertEqual(retval, None)
+
+        # get_value with default arg
+        retval = config.get_value("test", "v1", GLib.Variant('i', 43))
+        self.assertEqual(retval, GLib.Variant('i', 43))
+
+        # set_value with non-null arg
+        retval = config.set_value("test", "v1", GLib.Variant('i', 43))
+        retval = config.get_value("test", "v1")
+        self.assertEqual(retval, GLib.Variant('i', 43))
+
+        # set_value with null arg (= unset)
+        retval = config.set_value("test", "v1", None)
+        self.assertEqual(retval, None)
+
+    def test_engine_desc(self):
+        # construction with keyword args
+        desc = IBus.EngineDesc(name='foo')
+        self.assertEqual(desc.props.name, 'foo')
+        # construction with non-keyword args
+        desc = IBus.EngineDesc('bar')
+        self.assertEqual(desc.props.name, 'bar')
+
+    def test_factory(self):
+        if not self.__bus.is_connected():
+            self.skipTest('bus not connected')
+
+        # construction with keyword args
+        factory = IBus.Factory(connection=self.__bus.get_connection(),
+                               object_path=IBus.PATH_FACTORY)
+        self.assertEqual(factory.props.object_path, IBus.PATH_FACTORY)
+        # construction with non-keyword args
+        factory = IBus.Factory(self.__bus)
+        self.assertEqual(factory.props.object_path, IBus.PATH_FACTORY)
+
+    def test_keymap(self):
+        # construction with non-keyword args
+        keymap = IBus.Keymap('us')
+        self.assertEqual(keymap.name, 'us')
+
+    def test_lookup_table(self):
+        # construction with keyword args
+        table = IBus.LookupTable(page_size=6)
+        self.assertEqual(table.page_size, 6)
+        # construction with non-keyword args
+        table = IBus.LookupTable()
+        self.assertEqual(table.page_size, 5)
+        table = IBus.LookupTable(7)
+        self.assertEqual(table.page_size, 7)
+
+    def test_property(self):
+        # construction with keyword args
+        prop = IBus.Property(key='foo')
+        self.assertEqual(prop.props.key, 'foo')
+        # construction with non-keyword args
+        prop = IBus.Property('bar')
+        self.assertEqual(prop.props.key, 'bar')
+
+    def test_text(self):
+        # construction with non-keyword args
+        text = IBus.Text('foo')
+        self.assertEqual(text.text, 'foo')
+        text = IBus.Text.new_from_string('bar')
+        self.assertEqual(text.text, 'bar')
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/configure.ac b/configure.ac
index 89e9c2503..e78488955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,6 +359,20 @@ AM_CONDITIONAL([ENABLE_DAEMON], [true])
 
 AM_PATH_PYTHON([2.5])
 
+PYGOBJECT_REQUIRED=3.0.0
+
+PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
+                 [enable_pygobject=yes],[enable_pygobject=no])
+
+if test "x$enable_pygobject" = "xyes"; then
+	PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
+
+	pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
+	AC_SUBST(pyoverridesdir)
+fi
+
+AM_CONDITIONAL(ENABLE_PYGOBJECT, test x"$enable_pygobject" = "xyes")
+
 if test x"$enable_python_library" = x"yes"; then
     # Check python.
     AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
@@ -538,6 +552,7 @@ ui/gtk3/gtkpanel.xml.in
 setup/Makefile
 setup/ibus-setup
 bindings/Makefile
+bindings/pygobject/Makefile
 bindings/vala/Makefile
 conf/Makefile
 conf/gconf/Makefile

From 0e8a207fff98c008b298acd0e6d7d96f3c4f263c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 23 Nov 2012 11:14:48 +0900
Subject: [PATCH 104/816] Fix out-of-tree build

Also cleanup Makefiles and fix build error with older valac.

BUG=none

Review URL: https://codereview.appspot.com/6782099
---
 bindings/vala/Makefile.am       |  4 ++--
 docs/reference/ibus/Makefile.am |  2 +-
 engine/main.vala                |  2 +-
 src/Makefile.am                 | 39 ++++++++++++++++++---------------
 src/tests/Makefile.am           |  1 +
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index abcc5436d..f293a84f3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -31,14 +31,14 @@ vapi_deps = \
 	$(srcdir)/IBus-1.0.metadata \
 	$(srcdir)/IBus-1.0-custom.vala \
 	| \
-	$(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
+	$(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
 	$(NULL)
 
 ibus-@IBUS_API_VERSION@.vapi: $(vapi_deps)
 	$(AM_V_GEN) $(VAPIGEN) --library ibus-@IBUS_API_VERSION@ \
 			--pkg gio-2.0 \
 			--metadatadir=$(srcdir) \
-			$(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
+			$(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
 			$(srcdir)/IBus-1.0-custom.vala
 
 EXTRA_DIST = \
diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 82d11fb98..e39ab7584 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src
+DOC_SOURCE_DIR=$(top_srcdir)/src $(top_builddir)/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
diff --git a/engine/main.vala b/engine/main.vala
index f2057f900..4dc373495 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -34,7 +34,7 @@ const uint16 cedilla_compose_seqs[] = {
   (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 */
+    0x00E7 /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
 };
 
 class DummyEngine : IBus.EngineSimple {
diff --git a/src/Makefile.am b/src/Makefile.am
index df4ada343..7ee5df87e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,7 @@ ibus_sources =              \
     ibusservice.c           \
     ibusfactory.c           \
     ibusengine.c            \
-    ibuserror.c				\
+    ibuserror.c             \
     ibustext.c              \
     ibuskeymap.c            \
     ibusattribute.c         \
@@ -95,8 +95,8 @@ ibus_sources =              \
     ibusobservedpath.c      \
     ibuscomponent.c         \
     ibusutil.c              \
-	ibusenginesimple.c      \
-	$(NULL)
+    ibusenginesimple.c      \
+    $(NULL)
 libibus_1_0_la_SOURCES =    \
     ibusmarshalers.c        \
     ibusenumtypes.c         \
@@ -112,7 +112,6 @@ ibus_enumtypes_sources =    \
     $(NULL)
 ibus_headers =              \
     ibus.h                  \
-    ibusversion.h           \
     ibusshare.h             \
     ibusdebug.h             \
     ibusobject.h            \
@@ -121,7 +120,7 @@ ibus_headers =              \
     ibusservice.h           \
     ibusfactory.h           \
     ibusengine.h            \
-    ibuserror.h				\
+    ibuserror.h             \
     ibustext.h              \
     ibuskeymap.h            \
     ibusattribute.h         \
@@ -144,12 +143,13 @@ ibus_headers =              \
     ibusobservedpath.h      \
     ibuscomponent.h         \
     ibusutil.h              \
-	ibusenginesimple.h      \
+    ibusenginesimple.h      \
     $(NULL)
 ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
 ibus_public_headers =       \
     $(ibus_headers)         \
     ibusenumtypes.h         \
+    ibusversion.h           \
     $(NULL)
 ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
@@ -157,32 +157,35 @@ ibusinclude_HEADERS =       \
 ibus_privite_headers =       \
     ibusinternal.h           \
     keyname-table.h          \
-	gtkimcontextsimpleseqs.h \
+    gtkimcontextsimpleseqs.h \
     $(NULL)
 noinst_HEADERS =            \
     $(ibus_privite_headers) \
     $(NULL)
 
-BUILT_SOURCES =             \
-    ibusmarshalers.h        \
-    ibusmarshalers.c        \
-    ibusenumtypes.h         \
-    ibusenumtypes.c         \
+BUILT_SOURCES =                 \
+    $(ibus_marshalers_sources)  \
+    $(ibus_enumtypes_sources)   \
     $(NULL)
 
 if HAVE_INTROSPECTION
-introspection_files =           \
-    $(ibus_public_headers)      \
+introspection_sources =         \
+    $(ibus_headers)             \
     $(ibus_sources)             \
-    ibusenumtypes.c             \
-    ibusenumtypes.h             \
+    $(NULL)
+built_introspection_sources =   \
+    $(ibus_enumtypes_sources)   \
+    ibusversion.h               \
     $(NULL)
 IBus-1.0.gir: $(libibus) Makefile
 IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
 IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
 IBus_1_0_gir_LIBS = $(libibus)
-IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
-IBus_1_0_gir_CFLAGS = -DIBUS_COMPILATION
+IBus_1_0_gir_FILES =                                            \
+    $(addprefix $(srcdir)/,$(introspection_sources))            \
+    $(addprefix $(builddir)/,$(built_introspection_sources))    \
+    $(NULL)
+IBus_1_0_gir_CFLAGS = -DIBUS_COMPILATION -I$(srcdir) -I$(builddir)
 INTROSPECTION_GIRS += IBus-1.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index f146ddd4f..cc029d1a3 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -29,6 +29,7 @@ INCLUDES =              \
 	@GLIB2_CFLAGS@      \
 	@GIO2_CFLAGS@       \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
 	$(NULL)
 
 prog_ldadd = 			\

From ae98b5a58846e1326550027dc8d2a773ed8a24c5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 30 Nov 2012 11:43:43 +0900
Subject: [PATCH 105/816] Fix xmllint errors.

Review URL: https://codereview.appspot.com/6842115
---
 conf/dconf/dconf.xml.in.in     | 2 +-
 conf/gconf/gconf.xml.in.in     | 2 +-
 conf/memconf/memconf.xml.in.in | 2 +-
 ui/gtk3/gtkpanel.xml.in.in     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in.in
index 0367008e5..ceb2b0c6b 100644
--- a/conf/dconf/dconf.xml.in.in
+++ b/conf/dconf/dconf.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <!-- filename: dconf.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
diff --git a/conf/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in.in
index 0644d7e95..d82179f32 100644
--- a/conf/gconf/gconf.xml.in.in
+++ b/conf/gconf/gconf.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <!-- filename: pinyin.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
diff --git a/conf/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in.in
index b60dbf2e8..939e40af0 100644
--- a/conf/memconf/memconf.xml.in.in
+++ b/conf/memconf/memconf.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>On-memory Config Component</description>
diff --git a/ui/gtk3/gtkpanel.xml.in.in b/ui/gtk3/gtkpanel.xml.in.in
index c480bcdc5..1d2cf7390 100644
--- a/ui/gtk3/gtkpanel.xml.in.in
+++ b/ui/gtk3/gtkpanel.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <!-- filename: gtkpanel.xml -->
 <component>
 	<name>org.freedesktop.IBus.Panel</name>

From 098bc1f5871241fec93831bc37715e45cc4182d6 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 3 Dec 2012 23:36:10 +0530
Subject: [PATCH 106/816] IBusFactory: Fix syntax of gtk-doc comment

This was always invalid, but older versions of gobject-introspection
accepted it.

BUG=https://bugzilla.gnome.org/show_bug.cgi?id=689354

Review URL: https://codereview.appspot.com/6846138
Patch from Colin Walters <walters@verbum.org>.
---
 src/ibusfactory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index c25280fed..54a94fe55 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -170,7 +170,8 @@ ibus_factory_class_init (IBusFactoryClass *class)
      * 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. */
+     * of IBusEngine.
+     */
     factory_signals[CREATE_ENGINE] =
         g_signal_new (I_("create-engine"),
             G_TYPE_FROM_CLASS (gobject_class),

From 0639472efba34707d6f2d91511fc4c59c5255611 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <maiku.fabian@gmail.com>
Date: Tue, 4 Dec 2012 10:50:40 -0500
Subject: [PATCH 107/816] Fix red colour in rgb value in pango.vala

The red part of the rgb value was always passed as 0
to Pango.attr_foreground_new(r, g, b) and
Pango.attr_background_new(r, g, b).

BUG=

Review URL: https://codereview.appspot.com/6874050
Patch from Mike FABIAN <maiku.fabian@gmail.com>.
---
 ui/gtk3/pango.vala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/pango.vala b/ui/gtk3/pango.vala
index 9f8f06542..cfa2c6713 100644
--- a/ui/gtk3/pango.vala
+++ b/ui/gtk3/pango.vala
@@ -50,17 +50,17 @@ Pango.AttrList get_pango_attr_list_from_ibus_text(IBus.Text text) {
         switch(attr.type) {
         case IBus.AttrType.FOREGROUND:
             {
-                uint16 r = (uint16)(attr.value & 0x00ff0000) >> 8;
+                uint16 r = (uint16)((attr.value & 0x00ff0000) >> 8);
                 uint16 g = (uint16)(attr.value & 0x0000ff00);
-                uint16 b = (uint16)(attr.value & 0x000000ff) << 8;
+                uint16 b = (uint16)((attr.value & 0x000000ff) << 8);
                 pango_attr = Pango.attr_foreground_new(r, g, b);
                 break;
             }
         case IBus.AttrType.BACKGROUND:
             {
-                uint16 r = (uint16)(attr.value & 0x00ff0000) >> 8;
+                uint16 r = (uint16)((attr.value & 0x00ff0000) >> 8);
                 uint16 g = (uint16)(attr.value & 0x0000ff00);
-                uint16 b = (uint16)(attr.value & 0x000000ff) << 8;
+                uint16 b = (uint16)((attr.value & 0x000000ff) << 8);
                 pango_attr = Pango.attr_background_new(r, g, b);
                 break;
             }

From 58accdcb3075beec8a8fedb5b07562eea4fdd848 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 5 Dec 2012 06:11:54 +0900
Subject: [PATCH 108/816] Modernize vala binding generation

Use vapigen.m4 and Makefile.vapigen from vala to handle vapi file
generation.  Also generate vapi always when gir is updated.

BUG=none

Review URL: https://codereview.appspot.com/6849132
---
 bindings/Makefile.am      |  2 +-
 bindings/vala/Makefile.am | 34 +++++++-------
 configure.ac              | 20 ++------
 m4/Makefile.am            |  1 +
 m4/vapigen.m4             | 96 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 119 insertions(+), 34 deletions(-)
 create mode 100644 m4/vapigen.m4

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 8a2854ec6..868474d13 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -20,7 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-if ENABLE_VALA
+if ENABLE_VAPIGEN
 VALA_DIR = vala
 endif
 
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index f293a84f3..aba3454d0 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -20,34 +20,34 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = \
-	ibus-@IBUS_API_VERSION@.vapi \
-	ibus-@IBUS_API_VERSION@.deps \
-	$(NULL)
+-include $(VAPIGEN_MAKEFILE)
 
-# Don't rebuild vapi every time gir is updated.
 vapi_deps = \
-	$(srcdir)/IBus-1.0.metadata \
+	IBus-1.0.metadata \
+	IBus-1.0-custom.vala \
+	$(top_builddir)/src/IBus-1.0.gir \
+	$(NULL)
+
+ibus-1.0.vapi: $(vapi_deps)
+
+VAPIGEN_VAPIS = ibus-1.0.vapi
+
+ibus_1_0_vapi_DEPS = gio-2.0
+ibus_1_0_vapi_METADATADIRS = $(srcdir)
+ibus_1_0_vapi_FILES = \
+	$(top_builddir)/src/IBus-1.0.gir \
 	$(srcdir)/IBus-1.0-custom.vala \
-	| \
-	$(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
 	$(NULL)
 
-ibus-@IBUS_API_VERSION@.vapi: $(vapi_deps)
-	$(AM_V_GEN) $(VAPIGEN) --library ibus-@IBUS_API_VERSION@ \
-			--pkg gio-2.0 \
-			--metadatadir=$(srcdir) \
-			$(top_builddir)/src/IBus-@IBUS_API_VERSION@.gir \
-			$(srcdir)/IBus-1.0-custom.vala
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 EXTRA_DIST = \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
+	ibus-1.0.deps \
 	config.vapi \
 	xi.vapi \
 	$(NULL)
 
-MAINTAINERCLEANFILES = ibus-@IBUS_API_VERSION@.vapi
-
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index e78488955..0ebd642ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AC_SUBST(DATE_DISPLAY)
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_STDC
-AM_PROG_VALAC([0.14])
+AM_PROG_VALAC([0.16])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
@@ -192,21 +192,6 @@ AC_ARG_ENABLE(xim,
 )
 AM_CONDITIONAL([ENABLE_XIM], [test x"$enable_xim" = x"yes"])
 
-# --disable-vala option.
-AC_ARG_ENABLE(vala,
-    AS_HELP_STRING([--disable-vala],
-                   [Do not build ibus vala binding]),
-    [enable_vala=$enableval],
-    [enable_vala=yes]
-)
-if test x"$enable_vala" = x"yes"; then
-    AC_PATH_PROG([VAPIGEN], [vapigen], [false])
-fi
-AM_CONDITIONAL([ENABLE_VALA], [test x"$enable_vala" = x"yes"])
-if test x"$enable_vala" != x"yes"; then
-    enable_vala="no (disabled, use --enable-vala to enable)"
-fi
-
 if test x"$enable_gtk2" = x"yes" -o x"$enable_xim" = x"yes" ; then
     # check for gtk2
     PKG_CHECK_MODULES(GTK2, [
@@ -267,6 +252,9 @@ if test x"$found_introspection" = x"yes" ; then
 fi
 AC_SUBST(IBUS_GIR_SCANNERFLAGS)
 
+# Check vapigen.
+VAPIGEN_CHECK([0.16])
+
 # Check for gtk-doc.
 GTK_DOC_CHECK(1.9)
 if test x"$enable_gtk_doc" = x"no"; then
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3454042f5..97b4a51e5 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -22,6 +22,7 @@
 
 EXTRA_DIST = \
     as-version.m4 \
+    vapigen.m4 \
     $(NULL)
 
 GITIGNOREFILES = \
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
new file mode 100644
index 000000000..051ccd2e4
--- /dev/null
+++ b/m4/vapigen.m4
@@ -0,0 +1,96 @@
+dnl vapigen.m4
+dnl
+dnl Copyright 2012 Evan Nemerson
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
+# --------------------------------------
+# Check vapigen existence and version
+#
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
+AC_DEFUN([VAPIGEN_CHECK],
+[
+  AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
+  AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0])
+
+  AC_ARG_ENABLE([vala],
+    [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
+      AS_IF([test "x$4" = "x"], [
+          enable_vala=auto
+        ], [
+          enable_vala=$4
+        ])
+    ])
+
+  AS_CASE([$enable_vala], [no], [enable_vala=no],
+      [yes], [
+        AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
+            AC_MSG_ERROR([Vala bindings require GObject Introspection])
+          ])
+      ], [auto], [
+        AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
+            enable_vala=no
+          ])
+      ], [
+        AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
+      ])
+
+  AS_IF([test "x$2" = "x"], [
+      vapigen_pkg_name=vapigen
+    ], [
+      vapigen_pkg_name=vapigen-$2
+    ])
+  AS_IF([test "x$1" = "x"], [
+      vapigen_pkg="$vapigen_pkg_name"
+    ], [
+      vapigen_pkg="$vapigen_pkg_name >= $1"
+    ])
+
+  PKG_PROG_PKG_CONFIG
+
+  PKG_CHECK_EXISTS([$vapigen_pkg], [
+      AS_IF([test "$enable_vala" = "auto"], [
+          enable_vala=yes
+        ])
+    ], [
+      AS_CASE([$enable_vala], [yes], [
+          AC_MSG_ERROR([$vapigen_pkg not found])
+        ], [auto], [
+          enable_vala=no
+        ])
+    ])
+
+  AC_MSG_CHECKING([for vapigen])
+
+  AS_CASE([$enable_vala],
+    [yes], [
+      VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
+      VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
+      AS_IF([test "x$2" = "x"], [
+          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
+        ], [
+          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
+        ])
+    ])
+
+  AC_MSG_RESULT([$enable_vala])
+
+  AC_SUBST([VAPIGEN])
+  AC_SUBST([VAPIGEN_VAPIDIR])
+  AC_SUBST([VAPIGEN_MAKEFILE])
+
+  AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
+])

From a1840c00fad1798e7b62f469286415e8458125c4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 5 Dec 2012 11:20:37 +0900
Subject: [PATCH 109/816] Add Ctrl+space customization.

Review URL: https://codereview.appspot.com/6822102
---
 data/ibus.schemas.in      |  14 ++++-
 setup/keyboardshortcut.py |  90 ++++++++++++++-------------
 setup/main.py             |  44 +++++++------
 setup/setup.ui            |  25 ++++----
 ui/gtk3/panel.vala        | 128 +++++++++++++++++++++++++++++---------
 5 files changed, 195 insertions(+), 106 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index a8c7d7f68..dbb6da81c 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -50,7 +50,19 @@
       <default>[Control+space,Zenkaku_Hankaku,Alt+Kanji,Alt+grave,Hangul,Alt+Release+Alt_R]</default>
       <locale name="C">
         <short>Trigger shortcut keys</short>
-	    <long>The shortcut keys for turning input method on or off</long>
+          <long>The shortcut keys for turning input method on or off</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/hotkey/triggers</key>
+      <applyto>/desktop/ibus/general/hotkey/triggers</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[&lt;Control&gt;space]</default>
+      <locale name="C">
+        <short>Trigger shortcut keys for gtk_accelerator_parse</short>
+          <long>The shortcut keys for turning input method on or off</long>
       </locale>
     </schema>
     <schema>
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 7cc8649ec..2e8ca5431 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -102,9 +102,8 @@ def __init_ui(self):
         self.__modifier_buttons.append(("Hyper",
                                         Gtk.CheckButton.new_with_mnemonic("_Hyper"),
                                         Gdk.ModifierType.HYPER_MASK))
-        self.__modifier_buttons.append(("Capslock",
-                                        Gtk.CheckButton.new_with_mnemonic("Capsloc_k"),
-                                        Gdk.ModifierType.LOCK_MASK))
+        # <CapsLock> is not parsed by gtk_accelerator_parse()
+        # FIXME: Need to check if ibus gtk panel can enable <Release>.
         self.__modifier_buttons.append(("Release",
                                         Gtk.CheckButton.new_with_mnemonic("_Release"),
                                         Gdk.ModifierType.RELEASE_MASK))
@@ -118,7 +117,6 @@ def __init_ui(self):
         table.attach(self.__modifier_buttons[4][1], 0, 1, 1, 2)
         table.attach(self.__modifier_buttons[5][1], 1, 2, 1, 2)
         table.attach(self.__modifier_buttons[6][1], 2, 3, 1, 2)
-        table.attach(self.__modifier_buttons[7][1], 3, 4, 1, 2)
         hbox.pack_start(table, True, True, 4)
         self.pack_start(hbox, False, True, 4)
 
@@ -184,19 +182,20 @@ def __get_shortcut_from_buttons(self):
                 modifiers.append(name)
         if keycode.startswith("_"):
             keycode = keycode[1:]
-        keys = modifiers + [keycode]
-        shortcut = "+".join(keys)
+        shortcut = "".join(map(lambda m: '<' + m + '>', modifiers))
+        shortcut += keycode
         return shortcut
 
     def __set_shortcut_to_buttons(self, shortcut):
-        keys = shortcut.split("+")
-        mods = keys[:-1]
+        (keyval, state) = Gtk.accelerator_parse(shortcut)
+        if keyval == 0 and state == 0:
+            return
         for name, button, mask in self.__modifier_buttons:
-            if name in mods:
+            if state & mask:
                 button.set_active(True)
             else:
                 button.set_active(False)
-        self.__keycode_entry.set_text(keys[-1])
+        self.__keycode_entry.set_text(shortcut.rsplit('>', 1)[-1])
 
     def __get_selected_shortcut(self):
         model = self.__shortcut_view.get_model()
@@ -251,49 +250,52 @@ def __keycode_button_clicked_cb(self, button):
         message = _("Please press a key (or a key combination).\nThe dialog will be closed when the key is released.")
         dlg.set_markup(message)
         dlg.set_title(_("Please press a key (or a key combination)"))
-
-        def __key_press_event(d, k, out):
-            out.append(k.copy())
-
-        def __key_release_event(d, k, out):
-            d.response(Gtk.ResponseType.OK)
-
-        dlg.connect("key-press-event", __key_press_event, out)
-        dlg.connect("key-release-event", __key_release_event, None)
+        sw = Gtk.ScrolledWindow()
+
+        def __accel_edited_cb(c, path, keyval, state, keycode):
+            out.append(keyval)
+            out.append(state)
+            out.append(keycode)
+            dlg.response(Gtk.ResponseType.OK)
+
+        model = Gtk.ListStore(GObject.TYPE_INT,
+                              GObject.TYPE_UINT,
+                              GObject.TYPE_UINT)
+        accel_view = Gtk.TreeView(model)
+        sw.add(accel_view)
+        column = Gtk.TreeViewColumn()
+        renderer = Gtk.CellRendererAccel(accel_mode=Gtk.CellRendererAccelMode.OTHER,
+                                         editable=True)
+        renderer.connect('accel-edited', __accel_edited_cb)
+        column.pack_start(renderer, True)
+        column.add_attribute(renderer, 'accel-mods', 0)
+        column.add_attribute(renderer, 'accel-key', 1)
+        column.add_attribute(renderer, 'keycode', 2)
+        accel_view.append_column(column)
+        it = model.append(None)
+        area = dlg.get_message_area()
+        area.pack_end(sw, True, True, 0)
+        sw.show_all()
         id = dlg.run()
         dlg.destroy()
-        if id != Gtk.ResponseType.OK or not out:
+        if id != Gtk.ResponseType.OK or len(out) < 3:
             return
-        keyevent = out[len(out) - 1]
-        state = keyevent.state & (Gdk.ModifierType.CONTROL_MASK | \
-                                  Gdk.ModifierType.SHIFT_MASK   | \
-                                  Gdk.ModifierType.MOD1_MASK    | \
-                                  Gdk.ModifierType.META_MASK    | \
-                                  Gdk.ModifierType.SUPER_MASK   | \
-                                  Gdk.ModifierType.HYPER_MASK)
-
-
-        if state == 0:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Control_L, Gdk.KEY_Control_R) and state == Gdk.ModifierType.CONTROL_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Shift_L, Gdk.KEY_Shift_R) and state == Gdk.ModifierType.SHIFT_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Alt_L, Gdk.KEY_Alt_R) and state == Gdk.ModifierType.MOD1_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Meta_L, Gdk.KEY_Meta_R) and state == Gdk.ModifierType.META_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Super_L, Gdk.KEY_Super_R) and state == Gdk.ModifierType.SUPER_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
-        elif keyevent.keyval in (Gdk.KEY_Hyper_L, Gdk.KEY_Hyper_R) and state == Gdk.ModifierType.HYPER_MASK:
-            state = state | Gdk.ModifierType.RELEASE_MASK
+        keyval = out[0]
+        state = out[1]
+        keycode = out[2]
 
         for name, button, mask in self.__modifier_buttons:
             if state & mask:
                 button.set_active(True)
             else:
                 button.set_active(False)
-        self.__keycode_entry.set_text(Gdk.keyval_name(keyevent.keyval))
+
+        shortcut = Gtk.accelerator_name_with_keycode(None,
+                                                     keyval,
+                                                     keycode,
+                                                     state)
+        shortcut = shortcut.replace('<Primary>', '<Control>')
+        self.__keycode_entry.set_text(shortcut.rsplit('>', 1)[-1])
 
     def __add_button_clicked_cb(self, button):
         shortcut = self.__get_shortcut_from_buttons()
diff --git a/setup/main.py b/setup/main.py
index f527da1ed..a8acc7a2a 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -83,22 +83,23 @@ def __init__(self):
         self.__init_ui()
 
     def __init_hotkey(self):
-        default_values = {
-            "trigger" : (N_("trigger"), ["Control+space"]),
-            "enable_unconditional" : (N_("enable"), []),
-            "disable_unconditional" : (N_("disable"), [])
-        }
-
-        values = dict(self.__config.get_values("general/hotkey"))
-
-        for name, (label, shortcuts) in default_values.items():
-            shortcuts = values.get(name, shortcuts)
-            button = self.__builder.get_object("button_%s" % name)
-            entry = self.__builder.get_object("entry_%s" % name)
-            entry.set_text("; ".join(shortcuts))
-            entry.set_tooltip_text("\n".join(shortcuts))
-            button.connect("clicked", self.__shortcut_button_clicked_cb,
-                    label, "general/hotkey", name, entry)
+        name = 'triggers'
+        label = 'switch_engine'
+        variant = self.__config.get_value('general/hotkey', name)
+        if variant != None:
+            shortcuts = variant.dup_strv()
+        else:
+            shortcuts =  ['<Control>space']
+
+        button = self.__builder.get_object("button_%s" % label)
+        entry = self.__builder.get_object("entry_%s" % label)
+        entry.set_text("; ".join(shortcuts))
+        tooltip = "\n".join(shortcuts)
+        tooltip += "\n" + \
+            _("Use shortcut with shift to switch to the previous input method") 
+        entry.set_tooltip_text(tooltip)
+        button.connect("clicked", self.__shortcut_button_clicked_cb,
+                name, "general/hotkey", label, entry)
 
     def __init_panel(self):
         values = dict(self.__config.get_values("panel"))
@@ -375,7 +376,8 @@ def __init_bus(self):
     def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
                 Gtk.STOCK_OK, Gtk.ResponseType.OK)
-        title = _("Select keyboard shortcut for %s") %  _(name)
+        title = _("Select keyboard shortcut for %s") % \
+                _("switching input methods")
         dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)
         text = entry.get_text()
         if text:
@@ -388,11 +390,13 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         dialog.destroy()
         if id != Gtk.ResponseType.OK:
             return
-        self.__config.set_value(section, _name, GLib.Variant.new_strv(shortcuts))
+        self.__config.set_value(section, name, GLib.Variant.new_strv(shortcuts))
         text = "; ".join(shortcuts)
         entry.set_text(text)
-        entry.set_tooltip_text(text)
-
+        tooltip = "\n".join(shortcuts)
+        tooltip += "\n" + \
+            _("Use shortcut with shift to switch to the previous input method") 
+        entry.set_tooltip_text(tooltip)
 
     def __item_started_column_toggled_cb(self, cell, path_str, model):
 
diff --git a/setup/setup.ui b/setup/setup.ui
index 8121d629f..04bb4932e 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -121,7 +121,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">The shortcut keys for switching to previous input method in the list</property>
@@ -137,7 +137,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkHBox" id="hbox4">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
@@ -180,7 +180,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkEntry" id="entry_next_engine">
+                                      <object class="GtkEntry" id="entry_switch_engine">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
@@ -192,7 +192,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkButton" id="button_next_engine">
+                                      <object class="GtkButton" id="button_switch_engine">
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
@@ -213,16 +213,17 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkHBox" id="hbox6">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry_prev_engine">
-                                        <property name="visible">True</property>
+  >                                     <property name="no_show_all">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
@@ -237,7 +238,7 @@
                                       <object class="GtkButton" id="button_prev_engine">
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
+                                        <property name="no_show_all">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -260,7 +261,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">The shortcut keys for turning input method on or off</property>
                                     <property name="xalign">0</property>
@@ -273,7 +274,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label18">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Enable:</property>
@@ -287,7 +288,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkHBox" id="hbox2">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
@@ -328,7 +329,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label19">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Disable:</property>
@@ -342,7 +343,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkHBox" id="hbox3">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
                                     <child>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 3df0be711..24e6b2e55 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -21,6 +21,20 @@
  */
 
 class Panel : IBus.PanelService {
+    private class Keybinding {
+        public Keybinding(uint keysym,
+                          Gdk.ModifierType modifiers,
+                          bool reverse) {
+            this.keysym = keysym;
+            this.modifiers = modifiers;
+            this.reverse = reverse;
+        }
+
+        public uint keysym { get; set; }
+        public Gdk.ModifierType modifiers { get; set; }
+        public bool reverse { get; set; }
+    }
+
     private IBus.Bus m_bus;
     private IBus.Config m_config;
     private Gtk.StatusIcon m_status_icon;
@@ -36,8 +50,7 @@ class Panel : IBus.PanelService {
     private int m_switcher_delay_time = 400;
     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
 
-    private uint m_switch_keysym = 0;
-    private Gdk.ModifierType m_switch_modifiers = 0;
+    private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
     public Panel(IBus.Bus bus) {
         GLib.assert(bus.is_connected());
@@ -60,7 +73,8 @@ class Panel : IBus.PanelService {
         m_candidate_panel.page_down.connect((w) => this.page_down());
 
         m_switcher = new Switcher();
-        bind_switch_shortcut();
+        // The initial shortcut is "<Control>space"
+        bind_switch_shortcut(null);
 
         if (m_switcher_delay_time >= 0) {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
@@ -78,62 +92,101 @@ class Panel : IBus.PanelService {
         unbind_switch_shortcut();
     }
 
-    private void bind_switch_shortcut() {
-        var keybinding_manager = KeybindingManager.get_instance();
+    private void keybinding_manager_bind(KeybindingManager keybinding_manager,
+                                         string?           accelerator) {
+        uint switch_keysym = 0;
+        Gdk.ModifierType switch_modifiers = 0;
+        Gdk.ModifierType reverse_modifier = Gdk.ModifierType.SHIFT_MASK;
+        Keybinding keybinding;
 
-        var accelerator = ACCELERATOR_SWITCH_IME_FOREWARD;
         Gtk.accelerator_parse(accelerator,
-                out m_switch_keysym, out m_switch_modifiers);
+                out switch_keysym, out switch_modifiers);
 
-        // Map virtual modifiers to (i.e.Mod2, Mod3, ...)
+        // Map virtual modifiers to (i.e. Mod2, Mod3, ...)
         const Gdk.ModifierType VIRTUAL_MODIFIERS = (
                 Gdk.ModifierType.SUPER_MASK |
                 Gdk.ModifierType.HYPER_MASK |
                 Gdk.ModifierType.META_MASK);
-        if ((m_switch_modifiers & VIRTUAL_MODIFIERS) != 0) {
+        if ((switch_modifiers & VIRTUAL_MODIFIERS) != 0) {
         // workaround a bug in gdk vapi vala > 0.18
         // https://bugzilla.gnome.org/show_bug.cgi?id=677559
 #if VALA_0_18
             Gdk.Keymap.get_default().map_virtual_modifiers(
-                    ref m_switch_modifiers);
+                    ref switch_modifiers);
 #else
-            if ((m_switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
-                m_switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
-            if ((m_switch_modifiers & Gdk.ModifierType.HYPER_MASK) != 0)
-                m_switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+            if ((switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
+                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+            if ((switch_modifiers & Gdk.ModifierType.HYPER_MASK) != 0)
+                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
 #endif
-            m_switch_modifiers &= ~VIRTUAL_MODIFIERS;
+            switch_modifiers &= ~VIRTUAL_MODIFIERS;
         }
 
-        if (m_switch_keysym == 0 && m_switch_modifiers == 0) {
+        if (switch_keysym == 0 && switch_modifiers == 0) {
             warning("Parse accelerator '%s' failed!", accelerator);
             return;
         }
 
-        keybinding_manager.bind(m_switch_keysym, m_switch_modifiers,
+        keybinding = new Keybinding(switch_keysym,
+                                    switch_modifiers,
+                                    false);
+        m_keybindings.append(keybinding);
+
+        keybinding_manager.bind(switch_keysym, switch_modifiers,
                 (e) => handle_engine_switch(e, false));
 
         // accelerator already has Shift mask
-        if ((m_switch_modifiers & Gdk.ModifierType.SHIFT_MASK) != 0)
+        if ((switch_modifiers & reverse_modifier) != 0) {
             return;
+        }
+
+        switch_modifiers |= reverse_modifier;
 
-        keybinding_manager.bind(m_switch_keysym,
-                m_switch_modifiers | Gdk.ModifierType.SHIFT_MASK,
+        keybinding = new Keybinding(switch_keysym,
+                                    switch_modifiers,
+                                    true);
+        m_keybindings.append(keybinding);
+
+        keybinding_manager.bind(switch_keysym, switch_modifiers,
                 (e) => handle_engine_switch(e, true));
     }
 
+    private void bind_switch_shortcut(Variant? variant) {
+        string[] accelerators = {};
+        Variant var_trigger = variant;
+
+        if (var_trigger == null && m_config != null) {
+            var_trigger = m_config.get_value("general/hotkey",
+                                             "triggers");
+        }
+
+        if (var_trigger != null) {
+            accelerators = var_trigger.dup_strv();
+        } else {
+            accelerators += ACCELERATOR_SWITCH_IME_FOREWARD;
+        }
+
+        var keybinding_manager = KeybindingManager.get_instance();
+
+        foreach (var accelerator in accelerators) {
+            keybinding_manager_bind(keybinding_manager, accelerator);
+        }
+    }
+
     private void unbind_switch_shortcut() {
         var keybinding_manager = KeybindingManager.get_instance();
 
-        if (m_switch_keysym == 0 && m_switch_modifiers == 0)
-            return;
+        unowned GLib.List<Keybinding> keybindings = m_keybindings;
 
-        keybinding_manager.unbind(m_switch_keysym, m_switch_modifiers);
-        keybinding_manager.unbind(m_switch_keysym,
-                m_switch_modifiers | Gdk.ModifierType.SHIFT_MASK);
+        while (keybindings != null) {
+            Keybinding keybinding = keybindings.data;
 
-        m_switch_keysym = 0;
-        m_switch_modifiers = 0;
+            keybinding_manager.unbind(keybinding.keysym,
+                                      keybinding.modifiers);
+            keybindings = keybindings.next;
+        }
+
+        m_keybindings = null;
     }
 
     private void set_custom_font() {
@@ -225,10 +278,13 @@ class Panel : IBus.PanelService {
             m_config.watch("general", "preload_engines");
             m_config.watch("general", "engines_order");
             m_config.watch("general", "switcher_delay_time");
+            m_config.watch("general/hotkey", "triggers");
             m_config.watch("panel", "custom_font");
             m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
+            unbind_switch_shortcut();
+            bind_switch_shortcut(null);
             set_switcher_delay_time(null);
         } else {
             update_engines(null, null);
@@ -308,6 +364,12 @@ class Panel : IBus.PanelService {
             return;
         }
 
+        if (section == "general/hotkey" && name == "triggers") {
+            unbind_switch_shortcut();
+            bind_switch_shortcut(variant);
+            return;
+        }
+
         if (section == "panel" && (name == "custom_font" ||
                                    name == "use_custom_font")) {
             set_custom_font();
@@ -316,6 +378,7 @@ class Panel : IBus.PanelService {
 
         if (section == "general" && name == "switcher_delay_time") {
             set_switcher_delay_time(variant);
+            return;
         }
     }
 
@@ -324,15 +387,22 @@ class Panel : IBus.PanelService {
         if (m_engines.length <= 1)
             return;
 
+        uint keyval = event.key.keyval;
+        uint modifiers = KeybindingManager.MODIFIER_FILTER & event.key.state;
+
         uint primary_modifiers =
             KeybindingManager.get_primary_modifier(event.key.state);
 
         bool pressed = KeybindingManager.primary_modifier_still_pressed(
                 event, primary_modifiers);
+
+        if (revert) {
+            modifiers &= ~Gdk.ModifierType.SHIFT_MASK;
+        }
+
         if (pressed && m_switcher_delay_time >= 0) {
             int i = revert ? m_engines.length - 1 : 1;
-            i = m_switcher.run(m_switch_keysym, m_switch_modifiers, event,
-                    m_engines, i);
+            i = m_switcher.run(keyval, modifiers, event, m_engines, i);
             if (i < 0) {
                 debug("switch cancelled");
             } else {

From e038d1c0084f1070afc2ff3652374c24e49faff6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 5 Dec 2012 12:00:30 +0900
Subject: [PATCH 110/816] Change the default config to ibus-dconf.

Review URL: https://codereview.appspot.com/6849070
---
 configure.ac  | 20 ++++++++++----------
 m4/gconf-2.m4 | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 m4/gconf-2.m4

diff --git a/configure.ac b/configure.ac
index 0ebd642ce..4376403a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,12 +266,12 @@ PKG_CHECK_MODULES(DBUS, [
     dbus-1
 ])
 
-# --disable-gconf option.
+# --enable-gconf option.
 AC_ARG_ENABLE(gconf,
-    AS_HELP_STRING([--disable-gconf],
-                   [Do not use GConf code]),
+    AS_HELP_STRING([--enable-gconf],
+                   [Use GConf code]),
     [enable_gconf=$enableval],
-    [enable_gconf=yes]
+    [enable_gconf=no]
 )
 AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
 
@@ -303,25 +303,25 @@ AC_ARG_ENABLE(memconf,
 AM_CONDITIONAL([ENABLE_MEMCONF], [test "x$enable_memconf" = "xyes"])
 
 AC_ARG_ENABLE(dconf,
-    AS_HELP_STRING([--enable-dconf],
-                   [Enable configure base on dconf]),
+    AS_HELP_STRING([--disable-dconf],
+                   [Disable configure base on dconf]),
     [enable_dconf=$enableval],
-    [enable_dconf=no]
+    [enable_dconf=yes]
 )
+AM_CONDITIONAL([ENABLE_DCONF], [test x"$enable_dconf" = x"yes"])
 
 if test x"$enable_dconf" = x"yes"; then
     # check dconf
     PKG_CHECK_MODULES(DCONF,
-        [dconf >= 0.7.5], ,
-        enable_dconf=no
+        [dconf >= 0.7.5],
     )
     PKG_CHECK_EXISTS([dconf >= 0.13.4],
         [AC_DEFINE(DCONF_0_13_4, TRUE, [dconf is 0.13.4 or later])],
         [])
     # check glib-compile-schemas
     GLIB_GSETTINGS
+    enable_dconf="yes (enabled, use --disable-dconf to disable)"
 fi
-AM_CONDITIONAL([ENABLE_DCONF], [test x"$enable_dconf" = x"yes"])
 
 # Check env.
 AC_PATH_PROG(ENV_IBUS_TEST, env)
diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
new file mode 100644
index 000000000..c84267201
--- /dev/null
+++ b/m4/gconf-2.m4
@@ -0,0 +1,41 @@
+dnl AM_GCONF_SOURCE_2
+dnl Copied from /usr/share/aclocal/gconf-2.m4 so that ibus build does not
+dnl need GConf2-devel
+
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  else
+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+  fi
+
+  AC_ARG_WITH([gconf-source],
+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
+			     [Config database for installing schema files.]),
+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
+
+  AC_ARG_WITH([gconf-schema-file-dir],
+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+			     [Directory for installing schema files.]),
+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+  AC_ARG_ENABLE(schemas-install,
+  	AC_HELP_STRING([--disable-schemas-install],
+		       [Disable the schemas installation]),
+     [case ${enableval} in
+       yes|no) ;;
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+      esac])
+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])

From 9b4e665262048d7119aff3a1ef02ab79490e74e2 Mon Sep 17 00:00:00 2001
From: Evan Nemerson <evan@coeus-group.com>
Date: Wed, 5 Dec 2012 12:18:51 +0900
Subject: [PATCH 111/816] build: quote $@ in autogen.sh

BUG=http://code.google.com/p/ibus/issues/detail?id=1556

Review URL: https://codereview.appspot.com/6867067
Patch from Evan Nemerson <evan@coeus-group.com>.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 4069cc999..9786ed1b7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,4 +25,4 @@ which gnome-autogen.sh || {
 CFLAGS=${CFLAGS-"-Wall -Werror"}
 
 # need --enable-gtk-doc for gnome-autogen.sh to make dist
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="$CFLAGS" . gnome-autogen.sh $@
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="$CFLAGS" . gnome-autogen.sh "$@"

From e7aa18c06be43e61776ca71815871f2c3ca7d61f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Dec 2012 11:51:09 +0900
Subject: [PATCH 112/816] Hide some unused settings on ibus-setup.

Review URL: https://codereview.appspot.com/6873058
---
 setup/setup.ui | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index 04bb4932e..e56e917d1 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -172,6 +172,7 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -257,6 +258,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -325,6 +327,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -380,6 +383,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </object>
@@ -432,6 +436,7 @@
                                   </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -449,11 +454,12 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label10">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Set the behavior of ibus how to show or hide language bar</property>
                                     <property name="xalign">0</property>
@@ -464,6 +470,7 @@
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -478,11 +485,12 @@
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="combobox_panel_show">
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="model">model_panel_show_mode</property>
                                     <child>
@@ -497,6 +505,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -516,6 +525,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -535,13 +545,14 @@
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_show_im_name">
                                     <property name="label" translatable="yes">Show input method name on language bar</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Show input method's name on language bar when check the checkbox</property>
@@ -554,6 +565,7 @@
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -573,6 +585,7 @@
                                     <property name="top_attach">5</property>
                                     <property name="bottom_attach">6</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -591,6 +604,7 @@
                                     <property name="top_attach">6</property>
                                     <property name="bottom_attach">7</property>
                                     <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -606,6 +620,7 @@
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">6</property>
                                     <property name="bottom_attach">7</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </object>
@@ -986,7 +1001,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame5">
-                        <property name="visible">True</property>
+                        <property name="no_show_all">True</property>
                         <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>

From 7198fed9f3dac572726f12aaae92a6972c7b11b4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 7 Dec 2012 06:21:56 +0900
Subject: [PATCH 113/816] Revert required valac version to 0.14.

BUG=none

Review URL: https://codereview.appspot.com/6905045
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4376403a1..563fa396a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AC_SUBST(DATE_DISPLAY)
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_STDC
-AM_PROG_VALAC([0.16])
+AM_PROG_VALAC([0.14])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 

From 9e24b05ee36ca8edab72d9accc32460fae8eed55 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 7 Dec 2012 11:18:20 +0900
Subject: [PATCH 114/816] Update translations.

Update po/LINGUAS
po/as.po po/bg.po po/bn_IN.po po/es.po po/et.po po/eu.po po/fr.po
po/gu.po po/hi.po po/hu.po po/ja.po po/ko.po po/ml.po po/nl.po
po/or.po po/pa.po po/pl.po po/ta.po po/te.po po/uk.po po/zh_CN.po
po/zh_TW.po

Review URL: https://codereview.appspot.com/6896046
---
 po/LINGUAS  |   4 +
 po/as.po    | 350 ++++++++++++++++-----------------
 po/bg.po    | 546 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/bn_IN.po | 264 ++++++++++++-------------
 po/es.po    | 299 +++++++++++++---------------
 po/et.po    | 546 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/eu.po    | 546 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po    | 258 +++++++++++--------------
 po/gu.po    | 230 +++++++++++-----------
 po/hi.po    | 232 +++++++++++-----------
 po/hu.po    | 283 ++++++++++++---------------
 po/ja.po    | 272 ++++++++++++--------------
 po/ko.po    | 244 +++++++++++------------
 po/ml.po    | 270 ++++++++++++--------------
 po/mr.po    | 233 +++++++++++-----------
 po/nb.po    | 546 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/nl.po    | 273 ++++++++++++--------------
 po/or.po    | 236 +++++++++++------------
 po/pa.po    | 264 ++++++++++++-------------
 po/pl.po    | 280 ++++++++++++---------------
 po/ta.po    | 243 +++++++++++------------
 po/te.po    | 234 ++++++++++------------
 po/uk.po    | 271 ++++++++++++--------------
 po/zh_CN.po | 275 +++++++++++++-------------
 po/zh_TW.po | 255 ++++++++++++------------
 25 files changed, 4605 insertions(+), 2849 deletions(-)
 create mode 100644 po/bg.po
 create mode 100644 po/et.po
 create mode 100644 po/eu.po
 create mode 100644 po/nb.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 10191ae9b..0397fe280 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,11 +1,14 @@
 ar
 as
+bg
 bn_IN
 ca
 da
 de
 en_GB
 es
+et
+eu
 fa
 fr
 gu
@@ -18,6 +21,7 @@ ko
 lv
 ml
 mr
+nb
 nl
 or
 pa
diff --git a/po/as.po b/po/as.po
index ef181fd7d..004ab459a 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,85 +1,86 @@
 # translation of ibus.pot to Assamese
 # Assamese translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
+# Translators:
 # Amitakhya Phukan <aphukan@fedoraproject.org>, 2009.
 # Amitakhya Phukan <aphukan@redhat.com>, 2010.
 # ngoswami <ngoswami@redhat.com>, 2011.
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.ibus.as\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-23 10:15+0000\n"
+"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-10-18 11:07+0000\n"
 "Last-Translator: ngoswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
-"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr "অনুভূমিক"
+msgstr "আনুভূমিক"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
 msgstr "উল্লম্ব"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "তালিকাত প্ৰোথিত"
+msgid "Top left corner"
+msgstr "ওপৰৰ বাওঁফালৰ কোণত"
 
 #: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "সক্ৰিয় অৱস্থাত"
+msgid "Top right corner"
+msgstr "ওপৰৰ সোঁফালৰ কোণত"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "সদায়ে"
+msgid "Bottom left corner"
+msgstr "তলৰ বাওঁফালৰ কোণত"
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
-msgstr "ওপৰৰ বাওঁফালৰ কোণত"
+msgid "Bottom right corner"
+msgstr "তলৰ সোঁফালৰ কোণত"
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
-msgstr "ওপৰৰ সোঁফালৰ কোণত"
+msgid "Custom"
+msgstr "স্বনিৰ্বাচিত"
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
-msgstr "তলৰ বাওঁফালৰ কোণত"
+msgid "Embedded in menu"
+msgstr "তালিকাত প্ৰোথিত"
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
-msgstr "তলৰ সোঁফালৰ কোণত"
+msgid "When active"
+msgstr "সামৰ্থবান অৱস্থাত"
 
 #: ../setup/setup.ui.h:10
-msgid "Custom"
-msgstr "স্বনিৰ্ধাৰিত"
+msgid "Always"
+msgstr "সদায়ে"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "IBus পছন্দ"
+msgstr "IBus পছন্দসমূহ"
 
 #: ../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:"
-msgstr "পিছৰ নিবেশ পদ্ধতি:"
+msgstr "পিছৰ ইনপুট পদ্ধতি:"
 
 #: ../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:"
-msgstr "আগৰ নিবেশ পদ্ধতি"
+msgstr "আগৰ ইনপুট পদ্ধতি"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
@@ -87,23 +88,23 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
 msgid "The shortcut keys for turning input method on or off"
-msgstr "নিবেশ পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় ছৰ্ট-কাট চাবি নিৰ্ধাৰণ কৰক"
+msgstr "ইনপুট পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় চৰ্টকাট কি' নিৰ্ধাৰণ কৰক"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "সক্ৰিয় বা নিষ্ক্ৰিয় কৰক:"
+msgstr "সামৰ্থবান বা অসামৰ্থবান কৰক:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "সামৰ্থবান কৰা:"
+msgstr "সামৰ্থবান কৰক:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "অসামৰ্থবান কৰা:"
+msgstr "অসামৰ্থবান কৰক:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>কীবৰ্ডৰ চমুপথবোৰ</b>"
+msgstr "<b>কিবৰ্ডৰ চৰ্টকাটসমূহ</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
@@ -127,23 +128,23 @@ msgstr "ভাষাৰ পেনেলৰ স্থান:"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
 msgid "Show icon on system tray"
-msgstr "প্ৰণালী ট্ৰত আইকন প্ৰদৰ্শন কৰা হ'ব"
+msgstr "চিস্টেম ট্ৰেত আইকন দেখুৱাওক"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
 msgid "Show input method name on language bar"
-msgstr "ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
+msgstr "ভাষাৰ বাৰত ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
 #: ../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"
-msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+msgstr "এপ্লিকেচনৰ উইন্ডোত পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
 #: ../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:"
@@ -159,61 +160,58 @@ msgstr "সাধাৰণ"
 
 #: ../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"
-msgstr "নিৰ্বাচিত নিবেশ পদ্ধতি সংক্ৰান্ত তথ্য প্ৰদৰ্শন কৰা হ'ব"
+msgstr "নিৰ্বাচিত ইনপুট পদ্ধতি সংক্ৰান্ত তথ্য দেখুৱাওক"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "নিৰ্বাচিত নিবেশ পদ্ধতি সংক্ৰান্ত তথ্য প্ৰদৰ্শন কৰা হ'ব"
+msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিৰ ইনস্টল দেখুৱাওক"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>অবিকল্পিত নিবেশ পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত ।\n"
-"তাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে ।</i></small>"
+msgstr "<small><i>অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\nতাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
-msgstr "নিবেশ পদ্ধতি"
+msgstr "ইনপুট পদ্ধতি"
 
 #: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
 msgid "Use system keyboard layout"
-msgstr "প্ৰণালী চাবিৰ ফলক বিন্যাস প্ৰয়োগ কৰা হ'ব"
+msgstr "চিস্টেম কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰক"
 
 #: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
 msgid "Use system keyboard (XKB) layout"
-msgstr "প্ৰণালী চাবিৰ ফলক (XKB) বিন্যাস প্ৰয়োগ কৰা হ'ব"
+msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব্যৱহাৰ কৰক"
 
 #: ../setup/setup.ui.h:46
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>চাবিৰ ফলকৰ বিন্যাস</b>"
+msgstr "<b>কিবৰ্ডৰ বিন্যাস</b>"
 
 #: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
 msgid "Share the same input method among all applications"
-msgstr "সকলো অনুপ্ৰয়োগৰ মাজত একেই নিবেশ পদ্ধতি অংশীদাৰ কৰক"
+msgstr "সকলো এপ্লিকেচনৰ মাজত একেই ইনপুট পদ্ধতি অংশীদাৰী কৰক"
 
 #: ../setup/setup.ui.h:48
 msgid "<b>Global input method settings</b>"
-msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
+msgstr "<b>বিশ্বব্যাপী ইনপুট পদ্ধতি সংহতিসমূহ</b>"
 
 #: ../setup/setup.ui.h:49
 msgid "Advanced"
@@ -227,21 +225,15 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>বুদ্ধিমান নিবেশ bus</small>\n"
-"ঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিমান ইনপুট bus</small>\nঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "প্ৰৱেশত ibus আৰম্ভ কৰক"
+msgstr "লগিনত ibus আৰম্ভ কৰক"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
-msgstr "<b>ষ্টাৰ্টআপ</b>"
+msgstr "<b>আৰম্ভণি</b>"
 
 #: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
 msgid "About"
@@ -253,75 +245,73 @@ msgstr "IBus"
 
 #: ../bus/ibus.desktop.in.h:2
 msgid "Input Method Framework"
-msgstr "ইনপুট পদ্ধতি গাথনি"
+msgstr "ইনপুট পদ্ধতি আধাৰ"
 
 #: ../bus/ibus.desktop.in.h:3
 msgid "Start IBus Input Method Framework"
-msgstr "IBus ইনপুট পদ্ধতি গাথনি আৰম্ভ কৰা"
+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"
-msgstr "ibus আৰম্ভৰ আগতে কলঘৰ তুলি লওক"
+msgstr "ibus আৰম্ভৰ আগতে ইঞ্জিন ল'ড কৰক"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ইঞ্জিনসমূহৰ ক্ৰম"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ইনপুট পদ্ধতি তালিকাত সংৰক্ষিত ইঞ্জিন ক্ৰম"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
-msgstr "ট্ৰিগাৰৰ ছৰ্টকাট চাবি"
+msgstr "ট্ৰিগাৰৰ চৰ্টকাট কি'সমূহ"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Enable shortcut keys"
-msgstr "চৰ্টকাট কিসমূহ সামৰ্থবান কৰা"
+msgstr "চৰ্টকাট কি'সমূহ সামৰ্থবান কৰক"
 
 #: ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on"
-msgstr "ইনপুট পদ্ধতি খুলিবলে চৰ্টকাট কিসমূহ"
+msgstr "ইনপুট পদ্ধতি খুলিবলে চৰ্টকাট কি'সমূহ"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Disable shortcut keys"
-msgstr "চৰ্টকাট কিসমূহ অসামৰ্থবান কৰক"
+msgstr "চৰ্টকাট কি'সমূহ অসামৰ্থবান কৰক"
 
 #: ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method off"
-msgstr "ইনপুট পদ্ধতি বন্ধ কৰিবলে চৰ্টকাট কিসমূহ"
+msgstr "ইনপুট পদ্ধতি বন্ধ কৰিবলে চৰ্টকাট কি'সমূহ"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
-msgstr "পৰবৰ্তী কলঘৰৰ বাবে ছৰ্টকাট চাবি"
+msgstr "পৰবৰ্তী ইঞ্জিন চৰ্টকাট কি'সমূহ"
 
 #: ../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"
-msgstr "পূৰ্ববৰ্তী কলঘৰৰ ছৰ্টকাট চাবি"
+msgstr "পূৰ্ববৰ্তী ইঞ্জিনৰ চৰ্টকাট কি'"
 
 #: ../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"
-msgstr "স্বয়ংক্ৰিয়ভাবে লুকাওক"
+msgstr "স্বচালিতভাৱে লুকাওক"
 
 #: ../data/ibus.schemas.in.h:16
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
-msgstr ""
-"ভাষাৰ পেনেলৰ আচৰণ । ০ = তালিকাত প্ৰোথিত, ১ = স্বয়ংক্ৰিয়ভাবে লুকাওক, ২ = সদায় "
-"দেখুৱাওক"
+msgstr "ভাষাৰ পেনেলৰ আচৰণ। ০ = মেনুত প্ৰোথিত, ১ = স্বচালিতভাৱে লুকাওক, ২ = সদায় দেখুৱাওক"
 
 #: ../data/ibus.schemas.in.h:17
 msgid "Language panel position"
@@ -331,9 +321,7 @@ msgstr "ভাষাৰ পেনেলৰ স্থান"
 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"
@@ -341,15 +329,15 @@ msgstr "লুক-আপ টেবুলৰ দিশ"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "লুকআপ টেবুলৰ দিশ । ০ = অনুভূমিক, ১ = উলম্ব"
+msgstr "লুকআপ টেবুলৰ দিশ। ০ = আনুভূমিক, ১ = উলম্ব"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Show input method name"
-msgstr "নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
+msgstr "ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
-msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব"
+msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক"
 
 #: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
@@ -357,7 +345,7 @@ msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্ব
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Custom font"
-msgstr "স্বনিৰ্ধাৰিত ফন্ট"
+msgstr "স্বনিৰ্বাচিত ফন্ট"
 
 #: ../data/ibus.schemas.in.h:29
 msgid "Custom font name for language panel"
@@ -365,15 +353,15 @@ msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্ব
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Embed Preedit Text"
-msgstr "প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+msgstr "পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
 #: ../data/ibus.schemas.in.h:31
 msgid "Embed Preedit Text in Application Window"
-msgstr "অনুপ্ৰয়োগৰ সংযোগক্ষেত্ৰত প্ৰিএডিট টেক্সট প্ৰোথিত কৰক"
+msgstr "এপ্লিকেচনৰ উইন্ডোত পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
 #: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
-msgstr "সৰ্বব্যাপী নিবেশ পদ্ধতি ব্যৱহাৰ কৰক"
+msgstr "সৰ্বব্যাপী ইনপুট পদ্ধতি ব্যৱহাৰ কৰক"
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Enable input method by default"
@@ -381,25 +369,21 @@ msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱ
 
 #: ../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"
-msgstr ""
+msgstr "DConf সংৰক্ষিত নাম উপসৰ্গসমূহ"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "নাম পৰিবৰ্তন বন্ধ কৰিবলে DConf কি'সমূহৰ উপসৰ্গসমূহ"
 
 #: ../ibus/_config.py.in:41
 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 "স্বত্বাধিকাৰ (c) ২০০৭-২০১০ পেং হুৱাং\nস্বত্বাধিকাৰ (c) ২০০৭-২০১০ Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -413,7 +397,7 @@ msgstr "ভাষা: %s\n"
 #: ../setup/engineabout.py:70
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "চাবিৰ ফলকৰ বিন্যাস: %s\n"
+msgstr "কিবৰ্ডৰ বিন্যাস: %s\n"
 
 #: ../setup/engineabout.py:73
 #, python-format
@@ -424,9 +408,9 @@ msgstr "লিখক: %s\n"
 msgid "Description:\n"
 msgstr "বিৱৰণ:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
-msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
+msgstr "এটা ইনপুট পদ্ধতি বাছক"
 
 #: ../setup/enginetreeview.py:92
 msgid "Kbd"
@@ -438,128 +422,128 @@ msgstr "IBus পছন্দসমূহ সংহতি কৰক"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
-msgstr "কীবৰ্ডৰ চমুপথবোৰ"
+msgstr "কিবৰ্ডৰ চৰ্টকাটসমূহ"
 
 #: ../setup/keyboardshortcut.py:65
 msgid "Key code:"
-msgstr "চাবিৰ কোড:"
+msgstr "কি'ৰ ক'ড:"
 
 #: ../setup/keyboardshortcut.py:80
 msgid "Modifiers:"
 msgstr "পৰিবৰ্তক:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
-msgstr "অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ)"
+msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ট্ৰিগাৰ"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
-msgstr "সামৰ্থবান কৰা"
+msgstr "সামৰ্থবান কৰক"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
-msgstr "অসামৰ্থবান কৰা"
+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 ডেমন আৰম্ভ কৰা হোৱা নাই । আপুনি ইয়াক এতিয়া আৰম্ভ কৰিব বিচাৰে নেকি ?"
+msgstr "IBus ডিমন চলি থকা নাই। আপুনি আৰম্ভ কৰিব বিচাৰে নেকি?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus আৰম্ভ কৰা হ'ল! IBus ব্যৱহাৰ কৰিব নোৱাৰিলে, এই শাৰী$HOME/.bashrc ত যোগ "
-"দিয়ক, আৰু আপোনাৰ ডেষ্কট'পত পুনঃ প্ৰৱেশ কৰক ।\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ডিমনক %d ছেকেণ্ডত আৰম্ভ কৰিব পৰা নগল"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "%s ৰ কাৰণে চাবিফলকৰ চমুপথ নিৰ্ব্বাচন কৰক"
+msgstr "%s ৰ কাৰণে কিবৰ্ডৰ চৰ্টকাট বাছক"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "কেৱল ইঞ্জিন নাম তালিকাভুক্ত কৰক"
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান নিবেশ bus ।"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "কমান্ড [OPTIONS]"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "পুনৰাৰম্ভ"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus লে সংযোগ কৰিব নোৱাৰি।\n"
 
-#~ msgid "Previous page"
-#~ msgstr "পূৰ্ববৰ্তী পৃষ্ঠা"
-
-#~ msgid "Next page"
-#~ msgstr "পৰবৰ্তী পৃষ্ঠা"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ভাষা: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "কিছুমান নিবেশ পদ্ধতিক সংস্থাপন, আঁতৰুৱা বা উন্নত কৰা হৈছে । অনুগ্ৰহ কৰি ibus "
-#~ "নিবেশৰ মঞ্চ পুনৰাৰম্ভ কৰক ।"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "কোনো ইঞ্জিন সংহতি কৰা হোৱা নাই।\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "এতিয়া পুনৰাৰম্ভ কৰক"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "বিশ্বব্যাপী ইঞ্জিন সংহতি কৰা ব্যৰ্থ হল।\n"
 
-#~ msgid "Later"
-#~ msgstr "পিছত"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "বিশ্বব্যাপী ইঞ্জিন প্ৰাপ্ত কৰা ব্যৰ্থ হল।\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus input method framework"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb বিন্যাসক %sলে পৰিবৰ্তন কৰাটো ব্যৰ্থ হয়।"
 
-#~ msgid "Turn off input method"
-#~ msgstr "নিবেশ পদ্ধতি বন্ধ কৰক"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ব্যৱহাৰ: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "নিবেশৰ সংযোগক্ষেত্ৰ নাই"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "কমান্ডসমূহ:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s এটা অজ্ঞাত কমান্ড!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "নিবেশ পদ্ধতি সলনি কৰক"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "স্বত্বাধিকাৰ (c) 2007-2012 পেং হুৱাং\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "নিবেশ পদ্ধতিৰ বিষয়ে"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
 
-#~ msgid "next input method"
-#~ msgstr "পিছৰ নিবেশ পদ্ধতি"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)"
 
-#~ msgid "previous input method"
-#~ msgstr "আগৰ নিবেশ পদ্ধতি"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "পুনাৰম্ভ"
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 000000000..050d13e7b
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,546 @@
+# translation of ibus.pot to Bulgarian
+# Bulgarian translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Valentin Laskov <laskov@festa.bg>, 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-10-15 11:55+0900\n"
+"PO-Revision-Date: 2012-11-30 22:31+0000\n"
+"Last-Translator: Valentin Laskov <laskov@festa.bg>\n"
+"Language-Team: Bulgarian <trans-bg@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\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:6
+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 "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Клавишни комбинации</b>"
+
+#: ../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:21
+msgid "Show icon on system tray"
+msgstr "Показвай икона в зоната за уведомяване"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+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 "<b>Font and Style</b>"
+msgstr "<b>Шрифт и стил</b>"
+
+#: ../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 ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr "<small><i>Подразбиращият се метод е най-горният в списъка.\nМожете да промените реда с бутоните нагоре/надолу.</i></small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Метод за писане"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr "Използване на системната клавиатурна подредба"
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr "Използване на системната клавиатурна подредба (XKB)"
+
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Клавиатурна подредба</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr "Споделяй същия метод за писане за всички приложения"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Настройки на глобалния метод за писане</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Допълнителни"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интелигентен организатор на методите за писане</small>\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 "<b>Startup</b>"
+msgstr "<b>Стартиране</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Предв. заредени механизми"
+
+#: ../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 "Trigger shortcut keys"
+msgstr "Превключващи клавишни комбинации"
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Enable shortcut keys"
+msgstr "Разреши клавишните комбинации"
+
+#: ../data/ibus.schemas.in.h:8
+msgid "The shortcut keys for turning input method on"
+msgstr "Клавишна комбинация за включване на метода за писане"
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Disable shortcut keys"
+msgstr "Забрани клавишните комбинации"
+
+#: ../data/ibus.schemas.in.h:10
+msgid "The shortcut keys for turning input method off"
+msgstr "Клавишна комбинация за изключване на метода за писане"
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Next engine shortcut keys"
+msgstr "Клавишни комбинации за следващ механизъм"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Клавишна комбинация за превключване към следващия в списъка метод за писане"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Prev engine shortcut keys"
+msgstr "Клавишни комбинации за предишен механизъм"
+
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Клавишна комбинация за превключване към предишния в списъка метод за писане"
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Автом. скриване"
+
+#: ../data/ibus.schemas.in.h:16
+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
+msgid "Language panel position"
+msgstr "Позиция на панела с езици"
+
+#: ../data/ibus.schemas.in.h:18
+msgid ""
+"The position of the language panel. 0 = Top left corner, 1 = Top right "
+"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
+msgstr "Позиция на панела с езици. 0 = Горен ляв ъгъл, 1 = Горен десен ъгъл, 2 = Долен ляв ъгъл, 3 = Долен десен ъгъл, 4 = По избор"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr "Ориентация на таблицата за преглед"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Ориентация на таблицата за преглед. 0 = Хоризонтално, 1 = Вертикално"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Показва името на метода за писане"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Use custom font"
+msgstr "Използване на избран шрифт"
+
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr "Използване на избран шрифт за панела с езици"
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Шрифт по избор"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Име на избрания шрифт за панела с езици"
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr "Вграден редактиран текст"
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr "Вгражда предв. редактиран текст в прозореца на приложението"
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Използва глобалния метод за писане"
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Разрешава метод за писане по подразбиране"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Разрешава метод за писане по подразбиране, когато приложението е на фокус"
+
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr "DConf запазва префиксите на имената"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Префикси на DConf клавишите за спиране конверсията на имената"
+
+#: ../ibus/_config.py.in:41
+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."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Друг"
+
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Език: %s\n"
+
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Клавиатурна подредба: %s\n"
+
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Автор: %s\n"
+
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Описание:\n"
+
+#: ../setup/enginecombobox.py:135
+msgid "Select an input method"
+msgstr "Избор на метод за писане"
+
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Клав."
+
+#: ../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:251
+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
+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:331
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus демонът не е стартиран. Да го стартирам ли сега?"
+
+#: ../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 "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
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus демонът не може да се стартира вече %d секунди"
+
+#: ../setup/main.py:378
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Изберете клавишна комбинация за %s"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Списък само на имена на механизми"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "команда [ОПЦИИ]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Не мога да се свържа с IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "език: %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Не е зададен механизъм.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Задаването на глобален механизъм не успя.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Получаването на глобален механизъм не успя.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "Превключването на xkb подредбата на %s не успя."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Употреба: %s КОМАНДА [ОПЦИЯ...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Команди:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s е непозната команда!\n"
+
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus е интелигентен начин за избор на метод за въвеждане на информация за Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "Валентин Ласков"
+
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "Рестартиране"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index e65d7ba37..33d6a8d6d 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,22 +1,24 @@
-# translation of ibus.master.po to Bengali INDIA
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
+# translation of ibus.pot to Bengali (India)
+# Bengali (India) translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2009.
 # Runa Bhattacharjee <runab@redhat.com>, 2009, 2010.
+#   <runabh@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-08-02 18:27+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
-"Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
-"Language: \n"
+"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 <runabh@gmail.com>\n"
+"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -28,37 +30,37 @@ msgid "Vertical"
 msgstr "উল্লম্ব"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "সক্রিয় অবস্থায়"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "সর্বদা"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "উপরে বাঁদিকের কোণায়"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "উপরে ডানদিকের কোণায়"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "নীচে বাঁদিকের কোণায়"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "নীচে ডানদিকের কোণায়"
 
-#: ../setup/setup.ui.h:10
+#: ../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 সংক্রান্ত পছন্দ"
@@ -93,11 +95,11 @@ msgstr "সক্রিয় অথা নিষ্ক্রিয় করুন:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "সক্রিয় করুন:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "নিষ্ক্রিয় করুন:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -176,18 +178,14 @@ msgid "Show information of the selected input method"
 msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
+msgstr "নির্বাচিত ইনপুট পদ্ধতির সেট-আপ প্রদর্শন করা হবে"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n"
-"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></"
-"small>"
+msgstr "<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -226,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\n"
-"হোম-পেজ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -268,35 +260,31 @@ msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি প
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ইঞ্জিনের অনুক্রম"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ইনপুট পদ্ধতির তালিকায় সংরক্ষিত ইঞ্জিনের অনুক্রম"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
 msgstr "ট্রিগারের শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
 msgid "Enable shortcut keys"
-msgstr "ট্রিগারের শর্টকাট-কি"
+msgstr "শর্ট-কাট কি সক্রিয় করুন"
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
 msgid "The shortcut keys for turning input method on"
-msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+msgstr "ইনপুট পদ্ধতি চালু করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
 #: ../data/ibus.schemas.in.h:9
-#, fuzzy
 msgid "Disable shortcut keys"
-msgstr "ট্রিগারের শর্টকাট-কি"
+msgstr "শর্ট-কাট কি নিষ্ক্রিয় করুন"
 
 #: ../data/ibus.schemas.in.h:10
-#, fuzzy
 msgid "The shortcut keys for turning input method off"
-msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+msgstr "ইনপুট পদ্ধতি বন্ধ করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
@@ -322,9 +310,7 @@ msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হব
 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"
@@ -334,9 +320,7 @@ msgstr "ভাষার প্যানেলের অবস্থান"
 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"
@@ -384,25 +368,21 @@ msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধত
 
 #: ../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"
-msgstr ""
+msgstr "DConf দ্বারা নেম প্রেফিক্স সংরক্ষণ করা হবে"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "নেম পরিবর্তন প্রতিরোধ করার জন্য DConf-কির প্রেফিক্স"
 
 #: ../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."
+msgstr "স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\nস্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -427,7 +407,7 @@ msgstr "নির্মাতা: %s\n"
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
@@ -451,118 +431,118 @@ msgstr "কি-র কোড:"
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ট্রিগার"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
-msgstr ""
+msgstr "সক্রিয় করুন"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
-msgstr ""
+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 ডেমন আরম্ভ করা হয়নি। এটি এখন আরম্ভ করা হবে কি?"
+msgstr "IBus ডেমন বর্তমানে চলছে না। এটি আরম্ভ করা হবে কি?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব নয় হলে $HOME/.bashrc ফাইলের মধ্যে "
-"নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ডেমনটি %d সেকেন্ডে আরম্ভ করা যায়নি।"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\n"
-"স্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "শুধুমাত্র ইঞ্জিনের নামের তালিকা প্রদর্শন করা হবে"
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "পুনরারম্ভ"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "পূর্ববর্তী পৃষ্ঠা"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus-র সাথে সংযোগ করতে ব্যর্থ।\n"
 
-#~ msgid "Next page"
-#~ msgstr "পরবর্তী পৃষ্ঠা"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ভাষা: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "কয়েকটি ইনপুট পদ্ধতি ইনস্টল, অপসারণ অথবা আপডেট করা হয়েছে। অনুগ্রহ করে ibus ইনপুট "
-#~ "প্ল্যাটফর্ম পুনরায় আরম্ভ করুন।"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "কোনো ইঞ্জিন নির্ধারিত হয়নি।\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "অবিলম্বে পুনরারম্ভ"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "গ্লোবাল ইঞ্জিন নির্ধারণ করতে ব্যর্থ।\n"
 
-#~ msgid "Later"
-#~ msgstr "পরে"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "গ্লোবাল ইঞ্জিন প্রাপ্ত করতে ব্যর্থ।\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb বিন্যাসকে %s-এ পরিবর্তন করতে ব্যর্থ।"
 
-#~ msgid "Turn off input method"
-#~ msgstr "ইনপুট পদ্ধতি বন্ধ করুন"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ইনপুটের উদ্দেশ্যে উইন্ডো অনুপস্থিত"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "কমান্ড:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ইনপুট পদ্ধতি পরিচিতি"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s একটি অজানা কমান্ড!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ইনপুট পদ্ধতি পরিবর্তন করুন"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "স্বত্বাধিকার (c) ২০০৭-২০১২ পেং হুয়াং\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ইনপুট পদ্ধতি পরিচিতি"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#~ msgid "next input method"
-#~ msgstr "পরবর্তী ইনপুট পদ্ধতি"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#~ msgid "previous input method"
-#~ msgstr "পূর্ববর্তী ইনপুট পদ্ধতি"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "পুনরারম্ভ"
diff --git a/po/es.po b/po/es.po
index b65e2aff7..2e090cdc0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,25 +2,26 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011.
+# Daniel Cabrera <logan@fedoraproject.org>, 2011.
+# Domingo Becker <domingobecker@gmail.com>, 2012.
+# Gladys Guerrero <gguerrer@redhat.com>, 2012.
 # Héctor Daniel Cabrera <logan@fedoraproject.org>, 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-05-17 11:48+0000\n"
-"Last-Translator: elsupergomez <elsupergomez@gmail.com>\n"
-"Language-Team: Spanish (Castilian) <trans-es@lists.fedoraproject.org>\n"
-"Language: es\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-11 14:13+0000\n"
+"Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
+"Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: ARGENTINA\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -31,45 +32,44 @@ msgid "Vertical"
 msgstr "Vertical"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Menú incrustado"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Cuando esté activo"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Siempre"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Esquina superior izquierda"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Esquina superior derecha"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Esquina inferior izquierda"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Esquina inferior derecha"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Personalizado"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Menú incrustado"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Cuando esté activo"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Siempre"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Preferencias de IBus"
 
 #: ../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:"
@@ -77,8 +77,7 @@ msgstr "Siguiente método de entrada:"
 
 #: ../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:"
@@ -94,7 +93,7 @@ msgstr "Atajo de teclado para encender o apagar el método de entrada"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "Habilitar o deshabilitar:"
+msgstr "Habilitar o inhabilitar:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
@@ -102,7 +101,7 @@ msgstr "Habilitar:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "Deshabilitar:"
+msgstr "Inhabilitar:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -118,9 +117,7 @@ msgstr "Orientaciones candidato:"
 
 #: ../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:"
@@ -140,9 +137,7 @@ msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
 #: ../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"
@@ -150,9 +145,7 @@ msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
 #: ../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:"
@@ -168,44 +161,33 @@ msgstr "General"
 
 #: ../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"
 msgstr "Mostrar información sobre el método de entrada seleccionado"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Mostrar información sobre el método de entrada seleccionado"
+msgstr "Mostrar la configuración del método de entrada seleccionado"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>El método de entrada determinado está al comienzo de la lista.\n"
-"Puede usar los botones arriba/abajo para cambiarlo.</i></small>"
+msgstr "<small><i>El método de entrada determinado está al comienzo de la lista.\nPuede usar los botones arriba/abajo para cambiarlo.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -244,13 +226,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus de entrada inteligente</small>\n"
-"Sitio web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>El bus de entrada inteligente</small>\nSitio web: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -286,11 +262,11 @@ msgstr "Precargar los motores durante el inicio de ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Orden de las máquinas"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Orden de las máquinas guardada en la lista de métodos de entrada"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -306,11 +282,11 @@ msgstr "Los atajos de teclado para habilitar el método de entrada"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Disable shortcut keys"
-msgstr "Deshabilitar atajos de teclado"
+msgstr "Inhabilitar atajos de teclado"
 
 #: ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method off"
-msgstr "Los atajos de teclado para deshabilitar el método de entrada"
+msgstr "Los atajos de teclado para  inhabilitar el método de entrada"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
@@ -318,8 +294,7 @@ msgstr "Atajo de teclado para el siguiente motor"
 
 #: ../data/ibus.schemas.in.h:12
 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:13
 msgid "Prev engine shortcut keys"
@@ -327,9 +302,7 @@ msgstr "Atajo de teclado para la máquina previa"
 
 #: ../data/ibus.schemas.in.h:14
 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:15
 msgid "Auto hide"
@@ -339,9 +312,7 @@ msgstr "Auto Ocultar"
 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:17
 msgid "Language panel position"
@@ -351,10 +322,7 @@ msgstr "Posición del panel de idioma"
 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:19
 msgid "Orientation of lookup table"
@@ -402,25 +370,21 @@ msgstr "Habilitar método de entrada en forma predeterminada"
 
 #: ../data/ibus.schemas.in.h:35
 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:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf preserva los prefijos de nombres"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -445,7 +409,7 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Descripción:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
@@ -469,121 +433,118 @@ msgstr "Código clave:"
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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).\n"
-"El diálogo será cerrado cuando la tecla sea soltada."
+msgstr "Por favor, presione una tecla (o una combinación de tecla).\nEl diálogo será cerrado cuando la tecla sea soltada."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "activador"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "habilitar"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
-msgstr "deshabilitar"
+msgstr "Inhabilitar"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
+msgstr "El demonio IBus no se está ejecutando. ¿Desea iniciarlo?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"¡IBus ha sido iniciado! Si no puede usar IBus, por favor, agregue las "
-"siguientes líneas a $HOME/.bashrc, y reingrese a su escritorio.\n"
+"IBus 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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "El demonio IBus no se pudo iniciar en %d segundos"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:40
+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:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "No se puede conectar a IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "idioma: %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "No se configuró la máquina.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Falló la configuración de la máquina global.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Falló al obtener la máquina global.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "El cambio del diseño de xkb a %s falló."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "USO: %s COMANDO [OPCION...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Comandos:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "¡%s es un comando desconocido!\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 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:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 msgstr "Reiniciar"
-
-#~ msgid "Previous page"
-#~ msgstr "Página anterior"
-
-#~ msgid "Next page"
-#~ msgstr "Siguiente página"
-
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Algunos métodos de entrada han sido instalados, eliminados o "
-#~ "actualizados. Por favor, reinicie la plataforma de entrada ibus."
-
-#~ msgid "Restart Now"
-#~ msgstr "Reiniciar ahora"
-
-#~ msgid "Later"
-#~ msgstr "Más tarde"
-
-#~ msgid "IBus Panel"
-#~ msgstr "Panel IBus"
-
-#~ msgid "IBus input method framework"
-#~ msgstr "Marco de trabajo para métodos de entrada IBus"
-
-#~ msgid "Turn off input method"
-#~ msgstr "Desactivar métodos de entrada"
-
-#~ msgid "No input window"
-#~ msgstr "Sin ventana de entrada"
-
-#~ msgid "About the input method"
-#~ msgstr "Acerca del método de entrada"
-
-#~ msgid "Switch input method"
-#~ msgstr "Cambiar método de entrada"
-
-#~ msgid "About the Input Method"
-#~ msgstr "Acerca del Método de Entrada"
-
-#~ msgid "next input method"
-#~ msgstr "siguiente método de entrada"
-
-#~ msgid "previous input method"
-#~ msgstr "método de entrada anterior"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 000000000..259a04900
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,546 @@
+# translation of ibus.pot to Estonian
+# Estonian translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+#   <turakas@gmail.com>, 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-10-15 11:55+0900\n"
+"PO-Revision-Date: 2012-12-02 11:36+0000\n"
+"Last-Translator: mihkel <turakas@gmail.com>\n"
+"Language-Team: Estonian <trans-et@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horisontaalne"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikaalne"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Ülemine vasak nurk"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Ülemine parem nurk"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Alumine vasak nurk"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Alumine parem nurk"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Kohandatud"
+
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Kui on aktiivne"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Alati"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus eelistused"
+
+#: ../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 "Järgmine sisestusmeetod."
+
+#: ../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 "Eelmine sisestusmeetod:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr ""
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Võimalda või keela:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Võimalda:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Keela:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+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 ""
+
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Kuva keele paneel."
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr ""
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+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 "Kasuta kohandatud fonti:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+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 ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Sisestusmeetod"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Käivita ibus sisselogiminsel"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Programmist"
+
+#: ../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 ""
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../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 "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Enable shortcut keys"
+msgstr "Võimalda kiirklahvid"
+
+#: ../data/ibus.schemas.in.h:8
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:10
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:16
+msgid ""
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid ""
+"The position of the language panel. 0 = Top left corner, 1 = Top right "
+"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Kohandatud font"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+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 ""
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr ""
+
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Keel: %s\n"
+
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Klaviatuuri asetus: %s\n"
+
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Kirjeldus:\n"
+
+#: ../setup/enginecombobox.py:135
+msgid "Select an input method"
+msgstr "Vali sisestusmeetod"
+
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Määra IBus eelistused"
+
+#: ../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:251
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:253
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:87
+msgid "trigger"
+msgstr "päästik"
+
+#: ../setup/main.py:88
+msgid "enable"
+msgstr "võimalda"
+
+#: ../setup/main.py:89
+msgid "disable"
+msgstr "keela"
+
+#: ../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 ""
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "käsk [VALIKUD]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "Restart"
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 000000000..0222be3ce
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,546 @@
+# translation of ibus.pot to Basque
+# Basque translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 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-10-15 11:55+0900\n"
+"PO-Revision-Date: 2012-10-15 03:22+0000\n"
+"Last-Translator: Asier Iturralde Sarasola <asier.iturralde@gmail.com>\n"
+"Language-Team: Basque <trans-eu@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontala"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Bertikala"
+
+#: ../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 "Pertsonalizatua"
+
+#: ../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 "Beti"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus hobespenak"
+
+#: ../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 "Hurrengo sarrera metodoa"
+
+#: ../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 "Aurreko sarrera metodoa"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Gaitu edo desgaitu:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Gaitu:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Desgaitu:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+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 ""
+
+#: ../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:21
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+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 "Erabili letra-tipo pertsonalizatua:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Letra-tipoa eta estiloa</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Orokorra"
+
+#: ../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 ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Sarrera metodoa"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Teklatu-diseinua</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Sarrera metodo orokorraren ezarpenak</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "Honi buruz"
+
+#: ../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 ""
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../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 "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:10
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Ezkutatu automatikoki"
+
+#: ../data/ibus.schemas.in.h:16
+msgid ""
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid ""
+"The position of the language panel. 0 = Top left corner, 1 = Top right "
+"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr "Erakutsi sarrera metodoaren izena"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Use custom font"
+msgstr "Erabili letra-tipo pertsonalizatua"
+
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Letra-tipo pertsonalizatua"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr "Erabili sarrera metodo orokorra"
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+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 "Copyright-a (c) 2007-2010 Peng Huang\nCopyright-a (c) 2007-2010 Red Hat, Inc."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Beste bat"
+
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Hizkuntza: %s\n"
+
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Teklatu-diseinua: %s\n"
+
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Egilea: %s\n"
+
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Deskribapena:\n"
+
+#: ../setup/enginecombobox.py:135
+msgid "Select an input method"
+msgstr "Hautatu sarrera metodo bat"
+
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Ezarri IBus hobespenak"
+
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Teklatu lasterbideak"
+
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Tekla kodea:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:251
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:253
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:87
+msgid "trigger"
+msgstr ""
+
+#: ../setup/main.py:88
+msgid "enable"
+msgstr "gaitu"
+
+#: ../setup/main.py:89
+msgid "disable"
+msgstr "desgaitu"
+
+#: ../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 ""
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr ""
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "Asier Iturralde Sarasola <asier.iturralde@gmail.com>"
+
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "Berrabiarazi"
diff --git a/po/fr.po b/po/fr.po
index 8e87e8c8c..7a9844bb8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,28 +2,27 @@
 # French translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009.
+# dominique bribanick <chepioq@gmail.com>, 2011.
+# Humbert Julien <julroy67@gmail.com>, 2009, 2010.
+#   <jfenal@gmail.com>, 2012.
 # Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011.
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010.
-# dominique bribanick <chepioq@gmail.com>, 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-16 04:21+0000\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-10-15 03:22+0000\n"
 "Last-Translator: dominique <chepioq@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
-"Language: fr\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-Poedit-Language: French\n"
-"X-Poedit-Country: FRANCE\n"
-"X-Generator: Lokalize 1.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -34,45 +33,44 @@ msgid "Vertical"
 msgstr "Verticale"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Insérée dans le menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Uniquement lorsque active"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Toujours afficher"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Coin supérieur gauche"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Coin supérieur droit"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Coin inférieur gauche"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Coin inférieur droit"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Personnalisée"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Insérée dans le menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Uniquement lorsque active"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Toujours afficher"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Préférences de IBus"
 
 #: ../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:"
@@ -80,8 +78,7 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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:"
@@ -93,9 +90,7 @@ msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
 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:"
@@ -143,9 +138,7 @@ 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"
@@ -153,9 +146,7 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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:"
@@ -175,37 +166,29 @@ msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée acti
 
 #: ../setup/setup.ui.h:36
 msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives"
+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 selectionné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 selectionné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"
-msgstr "Afficher les informations de la méthode d'entrée selectionnée"
+msgstr "Afficher les informations de la méthode d'entrée sélectionnée"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Afficher les informations de la méthode d'entrée selectionnée"
+msgstr "Afficher le paramétrage de la méthode d'entrée sélectectionnée"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>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.</i></small>"
+msgstr "<small><i>La méthode d'entrée par défaut se trouve en haut de la liste.\nUtilisez les boutons « Monter/Descendre » pour changer l'ordre.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -244,13 +227,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d'accueil : http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -318,8 +295,7 @@ msgstr "Raccourci clavier pour passer au moteur suivant"
 
 #: ../data/ibus.schemas.in.h:12
 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:13
 msgid "Prev engine shortcut keys"
@@ -337,9 +313,7 @@ msgstr "Masquage automatique"
 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:17
 msgid "Language panel position"
@@ -349,10 +323,7 @@ msgstr "Position de la barre"
 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:19
 msgid "Orientation of lookup table"
@@ -400,8 +371,7 @@ msgstr "Par défaut, activer la méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:35
 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:36
 msgid "DConf preserve name prefixes"
@@ -415,9 +385,7 @@ msgstr ""
 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"
@@ -442,7 +410,7 @@ msgstr "Auteur : %s\n"
 msgid "Description:\n"
 msgstr "Description :\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d'entrée"
 
@@ -466,122 +434,118 @@ msgstr "Touche :"
 msgid "Modifiers:"
 msgstr "Modificateurs :"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "déclencheur"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "activer"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 msgstr "désactiver"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
+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 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"
 
-#: ../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 "Raccourci clavier pour %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../tools/main.vala:40
+msgid "List engine name only"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus est un IME intelligent pour Linux/Unix"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Julien Humbert <julroy67@gmail.com>"
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Redémarrer IBus"
 
-#~ msgid "Previous page"
-#~ msgstr "Page précédente"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Page suivante"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Certaines méthodes d'entrée ont été installées, supprimées ou mises à "
-#~ "jour. Veuillez redémarrer iBus."
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Redémarrer IBus maintenant"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Plus tard"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
 
-#~ msgid "IBus Panel"
-#~ msgstr "Tableau de bord IBus"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "Framework de méthode de saisie iBus"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Désactiver la méthode d'entrée"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Aucune fenêtre de saisie"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "À propos de la méthode d'entrée"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Changer de méthode d'entrée"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "À propos de la méthode d'entrée"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus est un IME intelligent pour Linux/Unix"
 
-#~ msgid "next input method"
-#~ msgstr "méthode d'entrée suivante"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "méthode d'entrée précédente"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "Redémarrer"
diff --git a/po/gu.po b/po/gu.po
index 0d36d0f45..cb884492b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,23 +1,24 @@
-# translation of ibus.master.gu.po to Gujarati
+# translation of ibus.pot to Gujarati
 # Gujarati translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
+# Translators:
 # Ankit Patel <ankit@redhat.com>, 2010.
-# Sweta Kothari <swkothar@redhat.com>, 2009-2011.
+# Sweta Kothari <swkothar@redhat.com>, 2009-2010.
+# sweta <swkothar@redhat.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.gu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
-"Last-Translator: Sweta Kothari <swkothar@redhat.com>\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-20 09:23+0000\n"
+"Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,37 +30,37 @@ msgid "Vertical"
 msgstr "ઊભું"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "મેનુમાં જડિત"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "જ્યારે સક્રિય હોય"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "હંમેશા"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "ઉંચે ડાબી બાજુનો ખૂણો"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "ઉંચે જમણી બાજુનો ખૂણો"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "નીચે ડાબી બાજુનો ખૂણો"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "નીચે જમણી બાજુનો ખૂણો"
 
-#: ../setup/setup.ui.h:10
+#: ../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 પસંદગીઓ"
@@ -177,17 +178,14 @@ msgid "Show information of the selected input method"
 msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
+msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિનાં સુયોજનને બતાવો"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n"
-"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
+msgstr "<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\nતેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -226,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>હોશિયાર ઇનપુટ બસ</small>\n"
-"ઘરપાનું: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>હોશિયાર ઇનપુટ બસ</small>\nઘરપાનું: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -268,11 +260,11 @@ msgstr "ibus શરૂ કરવા દરમ્યાન એંજિનોન
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "એંજિન ક્રમ"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ઇનપુટ પદ્દતિ યાદીમાં સંગ્રહેલ એંજિન ક્રમ"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -328,9 +320,7 @@ msgstr "ભાષા પેનલ સ્થાન"
 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:19
 msgid "Orientation of lookup table"
@@ -382,19 +372,17 @@ msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf નામ ઉપસર્ગને સાચવે છે"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "નામનું રૂપાંતરણને બંધ કરવા માટે DConf કીઓનાં ઉપસર્ગો"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -419,7 +407,7 @@ msgstr "લેખક: %s\n"
 msgid "Description:\n"
 msgstr "વર્ણન:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
@@ -443,118 +431,118 @@ msgstr "કિ કોડ:"
 msgid "Modifiers:"
 msgstr "બદલનારો:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ટ્રીગર"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "સક્રિય"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 ડિમન એ શરૂ થયેલ નથી. શું તમે હવે તેને શરૂ કરવા ઇચ્છો છો?"
+msgstr "IBus ડિમન ચાલી રહ્યુ નથી. શું તમે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ને શરૂ કરી દેવામાં આવી છે! જો તમે IBus ને વાપરી શકતા ન હોય તો, મહેરબાની કરીને "
-"નીચેનાં વાક્યમાં ઉમેરો$HOME/.bashrc, અને તમારા ડેસ્કટોપમાં ફરીથી પ્રવેશ કરો.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "ફક્ત એંજિન નામની યાદી કરો"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "પુન:શરૂ કરો"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "આદેશ [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "પહેલાનુ પાનું"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus માં જોડી શકાતુ નથી.\n"
 
-#~ msgid "Next page"
-#~ msgstr "પછીનુ પાનું"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ભાષા: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "અમુક ઇનપુટ પદ્દતિઓને સ્થાપિત, દૂર અથવા સુધારી દેવામાં આવી છે. મહેરબાની કરીને ibus "
-#~ "ઇનપુટ પ્લેટફોર્મને પુન:શરૂ કરો."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "એજિંન સુયોજિત નથી.\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "હવે પુન:શરૂ કરો"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "વૈશ્ર્વિક એંજિનને સુયોજિત કરવામાં નિષ્ફળતા.\n"
 
-#~ msgid "Later"
-#~ msgstr "પછી"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "વૈશ્ર્વિક એંજિનને મેળવવામાં નિષ્ફળતા.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "%s માં xkb લેઆઉટને બદલવામાં નિષ્ફળતા."
 
-#~ msgid "Turn off input method"
-#~ msgstr "ઇનપુટ પદ્દતિને બંધ કરો"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "વપરાશ: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ઇનપુટ વિન્ડો નથી"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "આદેશો:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ઇનપુટ પદ્દતિ વિશે"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s એ અજ્ઞાત આદેશ છે!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ઇનપુટ પદ્દતિને બદલો"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ઇનપુટ પદ્દતિ વિશે"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#~ msgid "next input method"
-#~ msgstr "પછીની ઇનપુટ પદ્દતિ"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "પહેલાની ઇનપુટ પદ્દતિ"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "પુન:શરૂ કરો"
diff --git a/po/hi.po b/po/hi.po
index 199d36cf4..c92501a12 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,23 +1,23 @@
-# translation of ibus.master.po to Hindi
+# translation of ibus.pot to Hindi
 # Hindi translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
+# Translators:
 # Rajesh Ranjan <rajesh672@gmail.com>, 2009.
-# Rajesh Ranjan <rranjan@redhat.com>, 2009-2011.
+# Rajesh Ranjan <rranjan@redhat.com>, 2009,2011-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
+"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-21 07:21+0000\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
 "Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
-"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,37 +29,37 @@ msgid "Vertical"
 msgstr "लंबवत"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "मेन्यू में अंतःस्थापित"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "जब सक्रिय हो"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "हमेशा"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "ऊपरी बायां कोना"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "ऊपरी दाहिना कोना"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "निचला बायां कोना"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "निचला दाहिना कोना"
 
-#: ../setup/setup.ui.h:10
+#: ../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 वरीयता"
@@ -177,17 +177,14 @@ msgid "Show information of the selected input method"
 msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
+msgstr "चुने गए इनपुट विधि का सेटअप दिखाएँ"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\n"
-"आप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं.</i></small>"
+msgstr "<small><i>तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\nआप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -226,13 +223,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>तेज-तर्रार इनपुट बस</small>\n"
-"होमपेज: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>तेज-तर्रार इनपुट बस</small>\nहोमपेज: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -268,11 +259,11 @@ msgstr "ibus आरंभन के दौरान पहले से लो
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "इंजन क्रम"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "इंजन क्रम को इनपुट विधि सूची में सहेजा"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -318,8 +309,7 @@ msgstr "स्वतः छुपाएँ"
 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"
@@ -329,9 +319,7 @@ msgstr "भाषा पैनल स्थिति"
 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"
@@ -383,19 +371,17 @@ msgstr "जब अनुप्रयोग इनपुट फोकस पा
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf नाम उपसर्ग को संरक्षित करता है"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf कुँजी का उपसर्ग नाम वार्तालाप रोकने के लिए"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -420,7 +406,7 @@ msgstr "लेखक: %s\n"
 msgid "Description:\n"
 msgstr "विवरण:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "कोई इनपुट विधि चुनें"
 
@@ -444,118 +430,118 @@ msgstr "कुंजी कोड:"
 msgid "Modifiers:"
 msgstr "परिवर्तनकर्ता:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ट्रिगर"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "सक्रिय करें"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 अबतक आरंभ नहीं हुआ है. क्या आप इसे आरंभ करना चाहते हैं?"
+msgstr "IBus डेमॉन चल नहीं रहा है. क्या आप इसे आरंभ करना चाहते हैं?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus आरंभ किया गया है! यदि आप IBus का प्रयोग नहीं कर सकते हैं, कृपया नीचे की पंक्ति को "
-"$HOME/.bashrc में जोड़ें, और अपने डेस्कटॉप में फिर लॉगिन करें.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus %d सेकेंड में आरंभ नहीं हो सका"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "राजेश रंजन (rranjan@redhat.com)"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "इंजन नाम को केवल सूचीबद्ध करता है"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "पुनः प्रारंभ करें"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "पिछला पृष्ठ"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus में कनेक्ट नहीं हो सकता है.\n"
 
-#~ msgid "Next page"
-#~ msgstr "अगला पृष्ठ"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "भाषा: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "कुछ इनपुट विधियाँ संस्थापित, हटाई या अद्यतन की गई हैं. कृपया ibus इनपुट प्लैटफॉर्म को "
-#~ "फिर आरंभ करें."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "कोई इंजन सेट नहीं.\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "अब फिर प्रारंभ करें"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "वैश्विक इंजन विफल के रूप में सेट करें.\n"
 
-#~ msgid "Later"
-#~ msgstr "बाद में"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "वैश्विक इंजन विफल पाएँ.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus इनपुट विधि फ्रेमवर्क"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb लेआउट को %s विफल में स्विच करें."
 
-#~ msgid "Turn off input method"
-#~ msgstr "इनपुट विधि बंद करें"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "प्रयोग: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "कोई इनपुट विंडो नहीं"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "कमांड:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "इनपुट विधि का परिचय"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s अज्ञात कमांड है!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "इनपुट विधि बदलें"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "कॉपीराइट (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "इनपुट विधि का परिचय"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
 
-#~ msgid "next input method"
-#~ msgstr "अगली इनपुट विधि"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "राजेश रंजन (rranjan@redhat.com)"
 
-#~ msgid "previous input method"
-#~ msgstr "पिछली इनपुट विधि"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "पुनः प्रारंभ करें"
diff --git a/po/hu.po b/po/hu.po
index 2e0c0dd59..c5925e6ee 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,22 +2,23 @@
 # Hungarian translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
 # kelemeng <kelemeng@gnome.hu>, 2011.
 # Sulyok Péter <peti@fedoraproject.org>, 2009.
+# Zoltan Hoppár <hopparz@gmail.com>, 2012.
 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-09-01 00:45+0000\n"
-"Last-Translator: kelemeng <kelemeng@gnome.hu>\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-02 17:30+0000\n"
+"Last-Translator: Zoltan Hoppár <hopparz@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,37 +30,37 @@ msgid "Vertical"
 msgstr "Függőleges"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Beágyazva a menübe"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Amikor aktív"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Mindig"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Bal felső sarok"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Jobb felső sarok"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Bal alsó sarok"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Jobb alsó sarok"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Egyéni"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Beágyazva a menübe"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Amikor aktív"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Mindig"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus beállítások"
@@ -138,12 +139,11 @@ msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+msgstr "Előszerkesztett szöveg beágyazása az alkalmazás ablakába"
 
 #: ../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ásablakba"
+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:"
@@ -159,43 +159,33 @@ msgstr "Általános"
 
 #: ../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"
 msgstr "Információk megjelenítése a kiválasztott beviteli módról"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Információk megjelenítése a kiválasztott beviteli módról"
+msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>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.</i></small>"
+msgstr "<small><i>Az alapértelmezett beviteli mód a listában a legfelső.\nEzt a fel/le billentyűk segítségével változtathatja meg.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -234,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Az intelligens beviteli busz</small>\n"
-"Honlap: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Az intelligens beviteli busz</small>\nHonlap: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -276,15 +260,15 @@ msgstr "Alrendszerek előtöltése  az ibus indításakor"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Alrendszerek sorrendje"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Elmentett alrendszerek sorrendje a beviteli metódus listájában"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
-msgstr "Aktiváló gyorsbillentyűk"
+msgstr "Aktiválja a gyorsbillentyűket"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Enable shortcut keys"
@@ -308,8 +292,7 @@ msgstr "Következő alrendszer gyorsbillentyűi"
 
 #: ../data/ibus.schemas.in.h:12
 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:13
 msgid "Prev engine shortcut keys"
@@ -327,9 +310,7 @@ msgstr "Automatikus elrejtés"
 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:17
 msgid "Language panel position"
@@ -339,9 +320,7 @@ msgstr "Nyelvi panel pozíciója"
 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:19
 msgid "Orientation of lookup table"
@@ -389,29 +368,25 @@ msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
 #: ../data/ibus.schemas.in.h:35
 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:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf megtartja a név előtagokat"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
 
 #: ../ibus/_config.py.in:41
 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"
-msgstr "Más"
+msgstr "Egyéb"
 
 #: ../setup/engineabout.py:67
 #, python-format
@@ -432,13 +407,13 @@ msgstr "Szerző: %s\n"
 msgid "Description:\n"
 msgstr "Leírás:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Válasszon beviteli módot"
 
 #: ../setup/enginetreeview.py:92
 msgid "Kbd"
-msgstr "Bill"
+msgstr "Bill."
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
@@ -456,130 +431,118 @@ msgstr "Billentyűkód:"
 msgid "Modifiers:"
 msgstr "Módosítók:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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).\n"
-"Az ablak a billentyű felengedésekor bezáródik."
+msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\nAz ablak a billentyű felengedésekor bezáródik."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "aktiváló"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "engedélyezés"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 msgstr "letiltás"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Az IBus szolgáltatás áll. Beindítja?"
+msgstr "Az IBus daemon nem működik. El kívánja indítani?"
 
-#: ../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 működik! Ha nem tudja IBus-t használni, kérem fűzze az \n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibussorokat a $HOME/.bashrc fájlhoz, majd lépjen be "
-"újra."
+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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus daemon nem indítható %d mp belül."
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Csak az alrendszerek nevét listázza"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "parancs [OPCIÓK]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Nem tudok csatlakozni az IBus-hoz.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "nyelv: %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Nincs engine beállítva.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Általános engine beállítása nem sikerült.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Általános engine beszerzése nem sikerült.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "Az xkb kiosztás átváltása %s nem sikerült."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Használat: %s PARANCS [OPCIÓK...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Parancsok:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ismeretlen parancs!\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Szerzői jog (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
-msgstr ""
-"Sulyok Péter <peti@fedoraproject.org>, 2009.\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:371
+msgstr "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 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"
+
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 msgstr "Újraindítás"
-
-#~ msgid "Previous page"
-#~ msgstr "Előző oldal"
-
-#~ msgid "Next page"
-#~ msgstr "Következő oldal"
-
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Néhány beviteli mód telepítésre, eltávolításra vagy frissítésre került. "
-#~ "Indítsa újra az ibus beviteli rendszert."
-
-#~ msgid "Restart Now"
-#~ msgstr "Újraindítás most"
-
-#~ msgid "Later"
-#~ msgstr "Később"
-
-#~ msgid "IBus Panel"
-#~ msgstr "IBus panel"
-
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus bevitelimód-keretrendszer"
-
-#~ msgid "Turn off input method"
-#~ msgstr "Beviteli mód kikapcsolása"
-
-#~ msgid "No input window"
-#~ msgstr "Nincs beviteli ablak"
-
-#~ msgid "About the input method"
-#~ msgstr "A beviteli mód névjegye"
-
-#~ msgid "Switch input method"
-#~ msgstr "Beviteli mód váltása"
-
-#~ msgid "About the Input Method"
-#~ msgstr "A beviteli mód névjegye"
-
-#~ msgid "next input method"
-#~ msgstr "következő beviteli mód"
-
-#~ msgid "previous input method"
-#~ msgstr "előző beviteli mód"
diff --git a/po/ja.po b/po/ja.po
index 9808ece68..da5b37a5c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,27 +1,28 @@
-# translation of ja.po to Japanese
+# translation of ibus.pot to Japanese
 # Japanese translation of ibus.
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-#
-# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008.
-# IWAI, Masaharu <iwai@alib.jp>, 2009.
+# 
+# Translators:
+# Hajime Taira <htaira@redhat.com>, 2012.
 # Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>, 2009.
+# IWAI, Masaharu <iwai@alib.jp>, 2009.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
 # Makoto Mizukami <makoto@fedoraporject.org>, 2010.
+# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008.
+#   <www.carrotsoft@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ja\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-12-13 18:00+0000\n"
-"Last-Translator: Makoto Mizukami <makoto@fedoraporject.org>\n"
-"Language-Team: Japanese <jp@li.org>\n"
-"Language: ja\n"
+"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-10-28 05:56+0000\n"
+"Last-Translator: 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>\n"
+"Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"X-Generator: KBabel 1.11.4\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
@@ -33,37 +34,37 @@ msgid "Vertical"
 msgstr "縦"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "メニューに組み込む"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "アクティブであるとき"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "常に表示する"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "左上隅"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "右上隅"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "左下隅"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "右下隅"
 
-#: ../setup/setup.ui.h:10
+#: ../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 の設定"
@@ -78,8 +79,7 @@ msgstr "次のインプットメソッド:"
 
 #: ../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,9 +139,7 @@ msgstr "言語バーにインプットメソッド名を表示する"
 
 #: ../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"
@@ -149,9 +147,7 @@ msgstr "アプリケーションウィンドウに前編集テキストを組み
 
 #: ../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:"
@@ -175,13 +171,11 @@ 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"
@@ -195,9 +189,7 @@ msgstr "選択したインプットメソッドの設定を表示します"
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
-"「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
+msgstr "<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -236,13 +228,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>インテリジェントなインプットバス</small>\n"
-"ホームページ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>インテリジェントなインプットバス</small>\nホームページ: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -278,11 +264,11 @@ msgstr "ibus の開始中にエンジンをプリロード"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "エンジンの順序"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "インプットメソッドの一覧の中から保存されたエンジンの順序"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -318,8 +304,7 @@ msgstr "前のエンジンへのショートカットキー"
 
 #: ../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"
@@ -329,8 +314,7 @@ msgstr "自動的に隠す"
 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"
@@ -340,9 +324,7 @@ msgstr "言語パネルの位置"
 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"
@@ -390,25 +372,21 @@ msgstr "標準でインプットメソッドを有効にする"
 
 #: ../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"
-msgstr ""
+msgstr "DConf の名前のプレフィックスを保護する"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf キーのプレフィックスは名前変換を停止します"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -433,7 +411,7 @@ msgstr "作者: %s\n"
 msgid "Description:\n"
 msgstr "説明:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "インプットメソッドの選択"
 
@@ -443,7 +421,7 @@ msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "IBus の設定"
+msgstr "IBus を設定します"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
@@ -457,124 +435,118 @@ msgstr "キーコード:"
 msgid "Modifiers:"
 msgstr "モディファイア:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "トリガー"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "有効"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 デーモンが動いていません。起動しますか？"
+msgstr "IBus デーモンは稼働していません。開始しますか？"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus を開始しました。IBus を使えない場合は次の行を$HOME/.bashrc に書き加えて"
-"再ログインしてください。\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus デーモンは %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr ""
-"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
-"IWAI, Masaharu <iwai@alib.jp>\n"
-"日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "再起動"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "エンジンの名前のみ一覧"
 
-#~ msgid "Previous page"
-#~ msgstr "前のページ"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Next page"
-#~ msgstr "次のページ"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus へ接続できません。\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "いくつかのインプットメソッドがインストール、削除、または更新されています。"
-#~ "IBus 入力プラットフォームを再起動してください。"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "言語: %s\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "今すぐに再起動する"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "エンジンが設定されていません。\n"
 
-#~ msgid "Later"
-#~ msgstr "後でする"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus パネル"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus インプットメソッドフレームワーク"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb レイアウトから %s への切り替えに失敗しました。"
 
-#~ msgid "Turn off input method"
-#~ msgstr "インプットメソッドをオフにする"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "使い方: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "入力ウィンドウがありません"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "コマンド:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "インプットメソッドについて"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s は不明なコマンドです。\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "インプットメソッドがありません"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "インプットメソッドについて"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#~ msgid "next input method"
-#~ msgstr "次のインプットメソッド"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
 
-#~ msgid "previous input method"
-#~ msgstr "ひとつ前のインプットメソッド"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "再起動"
diff --git a/po/ko.po b/po/ko.po
index f6a840dda..562ff92d9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,23 +1,26 @@
-# translation of ibus.master.ko.po to Korean
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
+# translation of ibus.pot to Korean
+# Korean translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
 # Eunju Kim <eukim@redhat.com>, 2009.
+# Eun-Ju Kim <eukim@redhat.com>, 2012.
 # Hyunsok Oh <hoh@redhat.com>, 2010.
+# Michelle Kim <mkim33@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.ko\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-08-03 15:01+1000\n"
-"Last-Translator: \n"
+"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-12-05 03:56+0000\n"
+"Last-Translator: Michelle Kim <mkim33@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -28,37 +31,37 @@ msgid "Vertical"
 msgstr "세로"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "메뉴에 포함"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "활성화 되었을 때"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "항상"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "왼쪽 위"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "오른쪽 위"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "왼쪽 아래"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "오른쪽 아래"
 
-#: ../setup/setup.ui.h:10
+#: ../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 환경 설정  "
@@ -93,11 +96,11 @@ msgstr "활성화 또는 비활성화:  "
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "활성화: "
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "비활성화: "
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -176,17 +179,14 @@ msgid "Show information of the selected input method"
 msgstr "선택한 입력 방식의 정보 보여주기"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "선택한 입력 방식의 정보 보여주기"
+msgstr "선택한 입력 방식 설정 보기 "
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n"
-"위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
+msgstr "<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -225,13 +225,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>지능형 입력 버스</small>\n"
-"홈페이지: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페이지: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -278,24 +272,20 @@ msgid "Trigger shortcut keys"
 msgstr "트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
 msgid "Enable shortcut keys"
-msgstr "트리거 단축키"
+msgstr "단축키 활성화 "
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
 msgid "The shortcut keys for turning input method on"
-msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
+msgstr "입력 방식 전환을 위한 단축키 활성화 "
 
 #: ../data/ibus.schemas.in.h:9
-#, fuzzy
 msgid "Disable shortcut keys"
-msgstr "트리거 단축키"
+msgstr "단축키 비활성화 "
 
 #: ../data/ibus.schemas.in.h:10
-#, fuzzy
 msgid "The shortcut keys for turning input method off"
-msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
+msgstr "입력 방식 전환을 위한 단축키 비활성화 "
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
@@ -331,9 +321,7 @@ msgstr "언어 패널 위치"
 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"
@@ -395,9 +383,7 @@ msgstr ""
 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"
@@ -422,7 +408,7 @@ msgstr "저자: %s\n"
 msgid "Description:\n"
 msgstr "설명:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
@@ -436,7 +422,7 @@ msgstr "IBus 환경 설정"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
-msgstr "단축키들 "
+msgstr "단축키"
 
 #: ../setup/keyboardshortcut.py:65
 msgid "Key code:"
@@ -446,118 +432,118 @@ msgstr "키 코드:  "
 msgid "Modifiers:"
 msgstr "수정자:  "
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "트리거  "
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
-msgstr ""
+msgstr "활성화 "
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
-msgstr ""
+msgstr "비활성화 "
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Bus 데몬이 시작되지 않았습니다. 지금 시작하시겠습니까?  "
+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를 시작했습니다! IBus를 사용할 수 없는 경우, 다음을 $HOME/.bashrc에 추가"
-"하고 다시 로그인하십시오.\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 "%s의 단축키를 선택"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../tools/main.vala:40
+msgid "List engine name only"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "재시작"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "이전 페이지"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "다음 페이지"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "입력 방식이 몇가지 설치되거나, 삭제되거나, 업데이트되었습니다. ibus 입력 "
-#~ "플랫폼을 재시작 하십시오."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "지금 재시작"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "나중에"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus 입력 방식 프레임워크"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "입력 방식 해제"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "입력 창이 없음  "
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "입력 방식 정보"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "입력 방식 전환  "
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "입력 방식 정보"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#~ msgid "next input method"
-#~ msgstr "다음 입력 방식   "
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "김은주(eukim@redhat.com)"
 
-#~ msgid "previous input method"
-#~ msgstr "이전 입력 방식  "
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "재시작"
diff --git a/po/ml.po b/po/ml.po
index 5e7c060ae..bb35afd35 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,23 +1,23 @@
-# translation of ml.po to
-# translation of ibus.master.ml.po to
-# translation of ibus.master.ibus.ml.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ani Peter <apeter@redhat.com>, 2009.
-#
+# translation of ibus.pot to Malayalam
+# Malayalam translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Ani Peter <apeter@redhat.com>, 2009,2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.ml\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-08-02 17:16+0530\n"
-"Last-Translator: \n"
-"Language-Team:  <en@li.org>\n"
-"Language: \n"
+"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-22 10:10+0000\n"
+"Last-Translator: Ani Peter <apeter@redhat.com>\n"
+"Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -28,45 +28,44 @@ msgid "Vertical"
 msgstr "നേരെയുള്ള"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "മെനുവില്‍ ഉള്‍പ്പെടുത്തുക"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "സജീവമാകുമ്പോള്‍"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "എപ്പോഴും"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "മുകളില്‍ ഇടതു് കോണ്‍ "
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "മുകളില്‍ വലതു് കോണ്‍ "
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "താഴെ ഇടതു് കോണ്‍"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "താഴെ വലതു് കോണ്‍ "
 
-#: ../setup/setup.ui.h:10
+#: ../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 ""
-"അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി"
+msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
@@ -74,9 +73,7 @@ msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്:"
 
 #: ../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:"
@@ -96,11 +93,11 @@ msgstr "സജ്ജമാക്കുക അല്ലെങ്കില്‍ 
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "പ്രവര്‍ത്തന സജ്ജമാക്കുക: "
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "പ്രവര്‍ത്തന രഹിതമാക്കുക: "
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -179,17 +176,14 @@ msgid "Show information of the selected input method"
 msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള്‍ കാണിക്കുക"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള്‍ കാണിക്കുക"
+msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് രീതിയുടെ സജ്ജീകരണം കാണിയ്ക്കുക"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\n"
-"ഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
+msgstr "<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\nഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -228,13 +222,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\n"
-"പ്രധാന താള്‍: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\nപ്രധാന താള്‍: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -270,35 +258,31 @@ msgstr "ibus ആരംഭിക്കുമ്പോള്‍ സംവിധാ
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
 msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
 msgid "Enable shortcut keys"
-msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
+msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
 msgid "The shortcut keys for turning input method on"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
+msgstr "ഇന്‍പുട്ട രീതി ഓണ്‍ ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
 #: ../data/ibus.schemas.in.h:9
-#, fuzzy
 msgid "Disable shortcut keys"
-msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
+msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
 #: ../data/ibus.schemas.in.h:10
-#, fuzzy
 msgid "The shortcut keys for turning input method off"
-msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
+msgstr "ഇന്‍പുട്ട രീതി ഓഫ് ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
@@ -324,9 +308,7 @@ msgstr "സ്വയം അദൃശ്യമാക്കുക"
 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"
@@ -336,9 +318,7 @@ msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം"
 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"
@@ -390,19 +370,17 @@ msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പു
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -427,7 +405,7 @@ msgstr "രചയിതാവു്: %s\n"
 msgid "Description:\n"
 msgstr "വിവരണം:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
@@ -451,118 +429,118 @@ msgstr "കീ കോഡ്:"
 msgid "Modifiers:"
 msgstr "മോഡിഫയറുകള്‍:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ട്രിഗ്ഗര്‍ ചെയ്യുക"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
-msgstr ""
+msgstr "പ്രവര്‍ത്തന സജ്ജം"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
-msgstr ""
+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 ഡെമണ്‍ ആരംഭിച്ചിട്ടില്ല. നിങ്ങള്‍ക്കിതു് ഉടന്‍ ആരംഭിക്കണമോ?"
+msgstr "IBus ഡെമണ്‍ പ്രവര്‍ത്തനത്തിലില്ല, നിങ്ങള്‍ക്കു് ഇതു് ആരംഭിയ്ക്കണമോ?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ആരംഭിച്ചു! നിങ്ങള്‍ക്കു് IBus ആരംഭിക്കുവാന്‍ സാധ്യമല്ല എങ്കില്‍, $HOME/.bashrc-ല്‍ താഴെ "
-"പറഞ്ഞിരിക്കുന്ന വരികള്‍ ചേര്‍ക്കുക. ശേഷം നിങ്ങളുടെ പണിയിടത്തിലേക്കു് വീണ്ടും പ്രവേശിക്കുക.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "എഞ്ചിന്‍ പേരു് മാത്രം ലഭ്യമാക്കുക"
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "വീണ്ടും ആരംഭിക്കുക"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "കമാന്‍ഡ് [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "മുമ്പുള്ള താള്‍:"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല.\n"
 
-#~ msgid "Next page"
-#~ msgstr "അടുത്ത താള്‍"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ഭാഷ: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "ചില ഇന്‍പുട്ട് മെഥേഡുകള്‍ക്കു് ചില മാറ്റങ്ങള്‍ വരുത്തിയിട്ടുണ്ടു്. ദയവായി ibus ഇന്‍പുട്ട് പ്ലാറ്റ്ഫോം "
-#~ "വീണ്ടും ആരംഭിക്കുക."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "എഞ്ചിന്‍ സജ്ജമല്ല.\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "വീണ്ടും ഉടന്‍ ആരംഭിക്കുക"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ സജ്ജമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#~ msgid "Later"
-#~ msgstr "പിന്നീടു്"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ ലഭ്യമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb ശൈലി %s-ലേക്കു് മാറ്റുന്നതു് പരാജയപ്പെട്ടു."
 
-#~ msgid "Turn off input method"
-#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓഫ് ചെയ്യുക"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ഇന്‍പുട്ട് ജാലകം ലഭ്യമല്ല"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "കമാന്‍ഡുകള്‍:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ഒരു അപചിരിത കമാന്‍ഡാകുന്നു!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് മാറ്റുക"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "പകര്‍പ്പവകാശം (c) 2007-2012 പെങ് ഹുവാങ്\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് സംബന്ധിച്ചു്"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#~ msgid "next input method"
-#~ msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ്"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "വീണ്ടും ആരംഭിക്കുക"
diff --git a/po/mr.po b/po/mr.po
index 936c50b65..e4c3e3abd 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,22 +1,24 @@
 # translation of mr.po to Marathi
 # Marathi translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Sandeep Shedmake <sshedmak@redhat.com>, 2010-2011.
+# 
+# Translators:
+# Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009.
+# Sandeep Shedmake <sshedmak@redhat.com>, 2009,2012.
+# sandeeps <sshedmak@redhat.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
-"Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
+"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-10-23 17:37+0000\n"
+"Last-Translator: sandeeps <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
-"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -28,37 +30,37 @@ msgid "Vertical"
 msgstr "उभे"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "मेन्यू मध्ये एम्बेड केले"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "सक्रीय असल्यावर"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "नेहमी"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "वरील डावा कोपरा"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "वरील उजवा कोपरा"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "तळापासून डावा कोपरा"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "तळापासून उजवा कोपरा"
 
-#: ../setup/setup.ui.h:10
+#: ../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 आवड निवड"
@@ -176,17 +178,14 @@ msgid "Show information of the selected input method"
 msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
+msgstr "नीवडलेल्या इंपुट पद्धतीची मांडणी दाखवा"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n"
-"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
+msgstr "<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\nबदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -225,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>हुशार इनपुट बस</small>\n"
-"मुख्यपान: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>हुशार इनपुट बस</small>\nमुख्यपान: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -267,11 +260,11 @@ msgstr "ibus सुरू होतेवेळी इंजीन आधिप
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "इंजिनचे क्रम"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "इंपुट मेथड सूचमध्ये इंजिनचे क्रम साठवे"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -327,9 +320,7 @@ msgstr "भाषा पटलचे स्थान"
 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:19
 msgid "Orientation of lookup table"
@@ -381,19 +372,17 @@ msgstr "ऍप्लिकेशनला इंपुट फोकस प्र
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf प्रिझर्व्ह नेम प्रिफिक्सेस्"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "नाव रूपांतर थांबवण्याकरीता DConf किज्चे प्रिफिक्सेस्"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -418,7 +407,7 @@ msgstr "लेखक: %s\n"
 msgid "Description:\n"
 msgstr "वर्णन:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "इंपुट पद्धत नीवडा"
 
@@ -442,120 +431,118 @@ msgstr "कि कोड:"
 msgid "Modifiers:"
 msgstr "मॉडिफायर:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ट्रिगर"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "सुरू करा"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 डिमन सुरू केले गेले नाही. तुम्हाला आता सुरू करायचे?"
+msgstr "IBus डिमन सुरू नाही. तुम्हाला ते सुरू करायचे?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus सुरू केले गेले आहे! तुम्ही IBus चा वापर करत नसल्यास, कृपया खालिल ओळ $HOME/.bashrc "
-"अंतर्गत समावेष करा, व पुन्हा डेस्कटॉपवर पुन्हा प्रवेश करा.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s करीता कळफलक शार्टकट नीवडा"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"सर्वहक्काधिकार (c) 2007-2010 पेंग हुआंग\n"
-"सर्वहक्काधिकार (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "फक्त इंजिन नाव सूचीत दाखवा"
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr ""
-"संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat."
-"com>, 2009, 2010."
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "पुन्हा चालू करा"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "आदेश [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "पूर्वीचे पान"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus शी जोडणी अशक्य.\n"
 
-#~ msgid "Next page"
-#~ msgstr "पुढचे पान"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "भाषा: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "काहिक इंपुट पद्धत प्रतिष्ठापीत, काढून टाकले किंवा सुधारीत केले आहे. कृपया ibus इंपुट "
-#~ "प्लॅटफॉर्म पुनः सुरू करा."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "इंजिन ठरवले नाही.\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "आत्ता पुनः सुरू करा"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
 
-#~ msgid "Later"
-#~ msgstr "पुढे"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus इन्पुट पद्धती फ्रेमवर्क"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb मांडणीला %s करीता बदलण्यास अपयशी."
 
-#~ msgid "Turn off input method"
-#~ msgstr "इंपुट पद्धत बंद करा"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "वापर: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "इंपुट खिडकी आढळली नाही"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "आदेश:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "इंपुट पद्धत विषयी"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s अपरिचीत आदेश आहे!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "इंपुट पद्धत बदला"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "सर्वहक्काधिकार (c) 2007-2012 पेंग हुआंग\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "इंपुट पद्धत विषयी"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
 
-#~ msgid "next input method"
-#~ msgstr "पुढिल इंपुट पद्धत"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat.com>, 2009, 2010."
 
-#~ msgid "previous input method"
-#~ msgstr "मागील इंपुट पद्धत"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "पुन्हा चालू करा"
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 000000000..1805e0342
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,546 @@
+# translation of ibus.pot to Norwegian Bokmål
+# Norwegian Bokmål translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Kjartan Maraas <kmaraas@gnome.org>, 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-10-15 11:55+0900\n"
+"PO-Revision-Date: 2012-10-15 03:22+0000\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horisontal"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: ../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 "Nederste venstre hjørne"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Nederste høyre hjørne"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: ../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 "Alltid"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Brukervalg for 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 "Neste inndatametode:"
+
+#: ../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 "Forrige inndatametode:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr ""
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Slå på eller av:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Slå på:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Slå av:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastatursnarveier</b>"
+
+#: ../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 ""
+
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Vis språkpanel:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posisjon for språkpanel:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+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 "Bruk egendefinert skrift:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Skrift og stil</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Generelt"
+
+#: ../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 "Vis informasjon om valgt inndatametode"
+
+#: ../setup/setup.ui.h:40
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Inndatametode"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturutforming</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globale innstillinger for inndatametode</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avansert"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Start ibus ved pålogging"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Oppstart</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+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 "Rammeverk for inndatametode"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Start IBus rammeverk for inndatametode"
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../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 "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Disable shortcut keys"
+msgstr "Slå av snarveitaster"
+
+#: ../data/ibus.schemas.in.h:10
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Auto hide"
+msgstr "Skjul automatisk"
+
+#: ../data/ibus.schemas.in.h:16
+msgid ""
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid ""
+"The position of the language panel. 0 = Top left corner, 1 = Top right "
+"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Custom font"
+msgstr "Egendefinert skrift"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Custom font name for language panel"
+msgstr "Egendefinert skriftnavn for språkpanelet"
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Enable input method by default"
+msgstr "Slå på inndatametode som forvalg"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:36
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+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 "Opphavsrett © 2007-2010 Peng Huang\nOpphavsrett © 2007-2010 Red Hat, Inc."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Annet"
+
+#: ../setup/engineabout.py:67
+#, python-format
+msgid "Language: %s\n"
+msgstr "Språk: %s\n"
+
+#: ../setup/engineabout.py:70
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturutforming: %s\n"
+
+#: ../setup/engineabout.py:73
+#, python-format
+msgid "Author: %s\n"
+msgstr "Forfatter: %s\n"
+
+#: ../setup/engineabout.py:76
+msgid "Description:\n"
+msgstr "Beskrivelse: \n"
+
+#: ../setup/enginecombobox.py:135
+msgid "Select an input method"
+msgstr "Velg en inndatametode"
+
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Tastatur"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Sett brukervalg for IBus"
+
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Tastatursnarveier"
+
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Tastekode:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Endringstaster:"
+
+#: ../setup/keyboardshortcut.py:251
+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."
+
+#: ../setup/keyboardshortcut.py:253
+msgid "Please press a key (or a key combination)"
+msgstr "Vennligst trykk en tast (eller en tastekombinasjon)"
+
+#: ../setup/main.py:87
+msgid "trigger"
+msgstr "utløser"
+
+#: ../setup/main.py:88
+msgid "enable"
+msgstr "slå på"
+
+#: ../setup/main.py:89
+msgid "disable"
+msgstr "slå av"
+
+#: ../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 "Velg tastatursnarvei for %s"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr ""
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus er en intelligent inndatabuss for Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "Kjartan Maraas <kmaraas@gnome.org>"
+
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "Start på nytt"
diff --git a/po/nl.po b/po/nl.po
index b2974dcdc..347e9d9a4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,22 @@
 # translation of nl.po to Dutch
 # Dutch translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Geert Warrink <geert.warrink@onsnet.nu>, 2011.
+# 
+# Translators:
+# Geert Warrink <geert.warrink@onsnet.nu>, 2011-2012.
 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-05-13 15:18+0000\n"
-"Last-Translator: warrink <geert.warrink@onsnet.nu>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
-"Language: nl\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-10-15 10:34+0000\n"
+"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
+"Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -26,45 +28,44 @@ msgid "Vertical"
 msgstr "Verticaal"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Ingebed in menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Als deze actief is"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Altijd"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Linksboven"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Rechtsboven"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Linksonder"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Rechtsonder"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Aangepast"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Ingebed in menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Als deze actief is"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Altijd"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus voorkeuren"
 
 #: ../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:"
@@ -72,8 +73,7 @@ msgstr "Volgende invoermethode:"
 
 #: ../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,8 +113,7 @@ msgstr "Kandidaten oriëntatie:"
 
 #: ../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:"
@@ -134,9 +133,7 @@ msgstr "Toon naam van invoermethode op taalbalk"
 
 #: ../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"
@@ -160,42 +157,33 @@ msgstr "Algemeen"
 
 #: ../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"
 msgstr "Toon informatie over de geselecteerde invoermethode"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Toon informatie over de geselecteerde invoermethode"
+msgstr "Toon instelling van de geselecteerde invoermethode"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>De standaard invoermethode is de bovenste in de lijst.\n"
-"je kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
+msgstr "<small><i>De standaard invoermethode is de bovenste in de lijst.\nje kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -234,13 +222,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<bib><b>IBus</b></big>\n"
-"<small>De intelligente invoer bus</small>\n"
-"Homepagina: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\nHomepagina: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -276,11 +258,11 @@ msgstr "Engines voor-laden tijdens opstarten van ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Machine volgorde"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Opgeslagen machine volgorde in invoermethode lijst"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -308,9 +290,7 @@ msgstr "Volgende engine sneltoetsen"
 
 #: ../data/ibus.schemas.in.h:12
 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:13
 msgid "Prev engine shortcut keys"
@@ -328,9 +308,7 @@ msgstr "Automatisch verbergen"
 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:17
 msgid "Language panel position"
@@ -340,9 +318,7 @@ msgstr "Taal-paneel positie"
 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:19
 msgid "Orientation of lookup table"
@@ -394,19 +370,17 @@ msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf behoud van naam voorvoegsels"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -431,7 +405,7 @@ msgstr "Auteur: %s\n"
 msgid "Description:\n"
 msgstr "Beschrijving:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Selecteer een invoermethode"
 
@@ -455,121 +429,118 @@ msgstr "Toetscode:"
 msgid "Modifiers:"
 msgstr "Modificatietoetsen:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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).\n"
-"De dialoog wordt afgesloten als de toets losgelaten wordt."
+msgstr "Druk op een toets (of een toetsencombinatie).\nDe dialoog wordt afgesloten als de toets losgelaten wordt."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "trigger"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "aanzetten"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 msgstr "uitzetten"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus daemon was niet gestart. Wil je het nu starten?"
+msgstr "De IBus daemon draait niet. Wil je het starten?"
 
-#: ../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"
-"  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 dan de onderstaande "
-"regels toe aan $HOME/.bashrc, en log opnieuw in op je bureaublad.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Toon alleen machinenamen"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "commando[OPTIES]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Kan niet met IBus verbinden.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "taal:%s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Er is geen machine ingesteld.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Instellen van globale machine is mislukt.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Verkrijgen van globale machine is mislukt.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "Omschakelen van xkb indeling naar %s is mislukt."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Commando's:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s is een onbekend commando!\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 msgstr "Opnieuw starten"
-
-#~ msgid "Previous page"
-#~ msgstr "Vorige pagina"
-
-#~ msgid "Next page"
-#~ msgstr "Volgende pagina"
-
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Sommige invoermethoden zijn geïnstalleerd, verwijderd of bijgewerkt. "
-#~ "Start ibus invoer platform opnieuw op."
-
-#~ msgid "Restart Now"
-#~ msgstr "Nu opnieuw opstarten"
-
-#~ msgid "Later"
-#~ msgstr "Later"
-
-#~ msgid "IBus Panel"
-#~ msgstr "IBus paneel"
-
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus invoermethode kader"
-
-#~ msgid "Turn off input method"
-#~ msgstr "Schakel invoer methode uit"
-
-#~ msgid "No input window"
-#~ msgstr "Geen input venster"
-
-#~ msgid "About the input method"
-#~ msgstr "Over de invoer methode"
-
-#~ msgid "Switch input method"
-#~ msgstr "Schakel invoer methode om"
-
-#~ msgid "About the Input Method"
-#~ msgstr "Over de invoer methode"
-
-#~ msgid "next input method"
-#~ msgstr "volgende invoermethode"
-
-#~ msgid "previous input method"
-#~ msgstr "vorige invoermethode"
diff --git a/po/or.po b/po/or.po
index 9fd9c6c81..2db8ff368 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,22 +1,22 @@
-# translation of ibus.master.or.po to Oriya
+# translation of ibus.pot to Oriya
 # Oriya translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009-2011.
+# 
+# Translators:
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.or\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
+"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-23 13:13+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
-"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: or\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -28,37 +28,37 @@ msgid "Vertical"
 msgstr "ଭୂଲମ୍ବ"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "ତାଲିକାରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "ସକ୍ରିୟ ଥିବା ସମୟରେ"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "ସର୍ବଦା"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "ଉପର ପାଖ ବାମ କୋଣ"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "ତଳପାଖ ବାମ କୋଣ"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ"
 
-#: ../setup/setup.ui.h:10
+#: ../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 ପସନ୍ଦ"
@@ -176,17 +176,14 @@ msgid "Show information of the selected input method"
 msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
+msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀର ବ୍ୟବସ୍ଥାକୁ ଦର୍ଶାନ୍ତୁ"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\n"
-"ଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
+msgstr "<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\nଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -225,13 +222,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\n"
-"ମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\nମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -267,11 +258,11 @@ msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ଯନ୍ତ୍ର କ୍ରମ"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ନିବେଶ ପ୍ରଣାଳୀ ତାଲିକାରେ ସଂରକ୍ଷିତ ଯନ୍ତ୍ର କ୍ରମ"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -317,9 +308,7 @@ msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
 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"
@@ -329,9 +318,7 @@ msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
 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"
@@ -379,24 +366,21 @@ msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନି
 
 #: ../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"
-msgstr ""
+msgstr "DConf ନାମ ଉପସର୍ଗଗୁଡ଼ିକୁ ସଂରକ୍ଷିତ ରଖିଥାଏ"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "ନାମ ପରିବର୍ତ୍ତନକୁ ଅଟକାଇବା ପାଇଁ DConf କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -421,7 +405,7 @@ msgstr "ଲେଖକ: %s\n"
 msgid "Description:\n"
 msgstr "ବର୍ଣ୍ଣନା:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
 
@@ -445,118 +429,118 @@ msgstr "କି ସଂକେତ:"
 msgid "Modifiers:"
 msgstr "ରୂପାନ୍ତରକ:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ଟ୍ରିଗର"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 ଡେମନଟି ଆରମ୍ଭ ହୋଇନାହିଁ। ଆପଣ ଏହାକୁ ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
+msgstr "IBus ଡେମନ ଚାଲୁ ନାହିଁ। ଆପଣ ଏହାକୁ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ "
-"$HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ଏବଂ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ଡେମନ  %d ସେକଣ୍ଡରେ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "କେବଳ ଯନ୍ତ୍ର ନାମକୁ ତାଲିକାଭୁକ୍ତ କରନ୍ତୁ"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "ପୁନଃଚାଳନ"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "ପୂର୍ବବର୍ତ୍ତୀ ପୃଷ୍ଠା"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାରିବେ ନାହିଁ।\n"
 
-#~ msgid "Next page"
-#~ msgstr "ପରବର୍ତ୍ତୀ ପୃଷ୍ଠା"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ଭାଷା: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "କିଛି ନିବେଶ ପଦ୍ଧତିକୁ ସ୍ଥାପନ କରାଯାଇଛି, କଢ଼ାଯାଇଛି ଅଥବା ଅଦ୍ୟତନ କରାଯାଇଛି। ଦୟାକରି ibus ନିବେଶ "
-#~ "ପ୍ଲାଟଫର୍ମକୁ ପୁନର୍ଚାଳନ କରନ୍ତୁ।"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "କୋଣସି ଯନ୍ତ୍ର ସେଟ ହୋଇନାହିଁ।\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "ବର୍ତ୍ତମାନ ପୁନଃଚାଳନ କରନ୍ତୁ"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ସେଟ କରିବାରେ ବିଫଳ।\n"
 
-#~ msgid "Later"
-#~ msgstr "ପରେ"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ପାଇବାରେ ବିଫଳ।\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb ବିନ୍ୟାସକୁ %s ରେ ପରିବର୍ତ୍ତନ କରିବା ବିଫଳ ହୋଇଛି।"
 
-#~ msgid "Turn off input method"
-#~ msgstr "ନିବେଶ ପ୍ରଣୀଳୀକୁ ବନ୍ଦ କରନ୍ତୁ"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ବ୍ୟବହାର: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "କୌଣସି ନିବେଶ ୱିଣ୍ଡୋ ନାହିଁ"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "ଆଦେଶଗୁଡିକ:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ଟି ଗୋଟିଏ ଅଜଣା ନିର୍ଦ୍ଦେଶ!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ନିବେଶ ପ୍ରଣୀଳିକୁ ବଦଳାନ୍ତୁ"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ନିବେଶ ପ୍ରଣାଳୀ ବିଷୟରେ"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#~ msgid "next input method"
-#~ msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "ପୁନଃଚାଳନ"
diff --git a/po/pa.po b/po/pa.po
index 43acd259c..5522b8f79 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,26 +2,26 @@
 # Panjabi translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
 # Amanpreet Singh <aalam@users.sf.net>, 2008.
 # A S Alam <aalam@users.sf.net>, 2009.
-# A S Alam <apreet.alam@gmail.com>, 2011.
+# A S Alam <apreet.alam@gmail.com>, 2011-2012.
 # Jaswinder Singh <jsingh@redhat.com>, 2009, 2010.
+# Jaswinder Singh Phulewala <j.phulewala@gmail.com>, 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-08-18 01:36+0000\n"
-"Last-Translator: aalam <apreet.alam@gmail.com>\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-12-04 03:32+0000\n"
+"Last-Translator: A S Alam <apreet.alam@gmail.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
-"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -32,36 +32,36 @@ msgid "Vertical"
 msgstr "ਖੜ੍ਹਵਾਂ"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "ਮੇਨੂ ਵਿੱਚ ਸ਼ਾਮਿਲ"
+msgid "Top left corner"
+msgstr "ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ"
 
 #: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "ਜਦੋਂ ਐਕਟਿਵ"
+msgid "Top right corner"
+msgstr "ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "ਹਮੇਸ਼ਾ"
+msgid "Bottom left corner"
+msgstr "ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ"
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
-msgstr "ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ"
+msgid "Bottom right corner"
+msgstr "ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ"
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
-msgstr "ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ"
+msgid "Custom"
+msgstr "ਪਸੰਦ"
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
-msgstr "ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ"
+msgid "Embedded in menu"
+msgstr "ਮੇਨੂ ਵਿੱਚ ਸ਼ਾਮਲ"
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
-msgstr "ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ"
+msgid "When active"
+msgstr "ਜਦੋਂ ਐਕਟਿਵ"
 
 #: ../setup/setup.ui.h:10
-msgid "Custom"
-msgstr "ਪਸੰਦੀਦਾ"
+msgid "Always"
+msgstr "ਹਮੇਸ਼ਾ"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
@@ -89,7 +89,7 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -121,7 +121,7 @@ msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼
 
 #: ../setup/setup.ui.h:25
 msgid "Show language panel:"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖੋ:"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖਾਓ:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -133,7 +133,7 @@ msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾ
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
 msgid "Show input method name on language bar"
-msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਨਾਂ ਵੇਖੋ"
+msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
@@ -141,11 +141,11 @@ msgstr "ਜਦੋਂ ਚੈੱਕ ਬਾਕਸ ਚੁਣਿਆ ਹੋਵੇ ਤ
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
 #: ../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:"
@@ -180,17 +180,14 @@ msgid "Show information of the selected input method"
 msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸੈਟਅੱਪ ਵੇਖਾਓ"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\n"
-"ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
+msgstr "<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\nਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -199,11 +196,11 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
 #: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
 msgid "Use system keyboard layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋਂ"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ"
 
 #: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
 msgid "Use system keyboard (XKB) layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋਂ"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 
 #: ../setup/setup.ui.h:46
 msgid "<b>Keyboard Layout</b>"
@@ -211,7 +208,7 @@ msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
 #: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
 msgid "Share the same input method among all applications"
-msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨਾਂ ਵਿਚਕਾਰ ਕੁਝ ਇੰਪੁੱਟ ਸਾਂਝੀ ਕਰੋ"
+msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
 
 #: ../setup/setup.ui.h:48
 msgid "<b>Global input method settings</b>"
@@ -229,17 +226,11 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
-"ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\nਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "ਲਾਗਇਨ ਸਮੇਂ ibus ਚਲਾਉ"
+msgstr "ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ibus ਚਲਾਓ"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
@@ -251,7 +242,7 @@ msgstr "ਇਸ ਬਾਰੇ"
 
 #: ../bus/ibus.desktop.in.h:1
 msgid "IBus"
-msgstr "ਆਈ-ਬੱਸ"
+msgstr "IBus"
 
 #: ../bus/ibus.desktop.in.h:2
 msgid "Input Method Framework"
@@ -259,7 +250,7 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
 
 #: ../bus/ibus.desktop.in.h:3
 msgid "Start IBus Input Method Framework"
-msgstr "ਆਈਬਸ ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ ਸ਼ੁਰੂ ਕਰੋ"
+msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ ਸ਼ੁਰੂ ਕਰੋ"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -271,15 +262,15 @@ msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ਇੰਜਣ ਕ੍ਰਮ"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਸੂਚੀ ਵਿੱਚ ਸੰਭਾਲੇ ਇੰਜਣਾਂ ਦਾ ਕ੍ਰਮ"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
-msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Enable shortcut keys"
@@ -299,7 +290,7 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟ
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Next engine shortcut keys"
-msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for switching to the next input method in the list"
@@ -307,7 +298,7 @@ msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬ
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Prev engine shortcut keys"
-msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
+msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: ../data/ibus.schemas.in.h:14
 msgid "The shortcut keys for switching to the previous input method"
@@ -321,7 +312,7 @@ msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
 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"
@@ -331,9 +322,7 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
 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"
@@ -349,27 +338,27 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Use custom font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+msgstr "ਮਨਪਸੰਦ ਫੋਂਟ ਵਰਤੋਂ"
 
 #: ../data/ibus.schemas.in.h:27
 msgid "Use custom font name for language panel"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Custom font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ"
+msgstr "ਮਨਪਸੰਦ ਫੋਂਟ"
 
 #: ../data/ibus.schemas.in.h:29
 msgid "Custom font name for language panel"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Embed Preedit Text"
-msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
 #: ../data/ibus.schemas.in.h:31
 msgid "Embed Preedit Text in Application Window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧਿਆ ਪਾਠ"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
 #: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
@@ -395,9 +384,7 @@ msgstr ""
 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"
@@ -422,7 +409,7 @@ msgstr "ਲੇਖਕ: %s\n"
 msgid "Description:\n"
 msgstr "ਵੇਰਵਾ:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
@@ -432,7 +419,7 @@ msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "ਆਈਬਸ ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
+msgstr "IBus ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
@@ -444,125 +431,120 @@ msgstr "ਕੀ ਕੋਡ:"
 
 #: ../setup/keyboardshortcut.py:80
 msgid "Modifiers:"
-msgstr "ਮਾਡੀਫਾਇਰ:"
+msgstr "ਮੋਡੀਫਾਇਰ:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ਟਰਿੱਗਰ"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "ਚਾਲੂ ਕਰੋ"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+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 ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ! ਜੇ ਤੁਹਾਨੂੰ IBus ਨਾ ਵਰਤ ਸਕੋ ਤਾਂ ਅੱਗੇ ਦਿੱਤੀਆਂ ਲਾਈਨਾਂ ਨੂੰ $HOME/.bashrc ਵਿੱਚ "
-"ਲਿਖੋ ਅਤੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਵਿੱਚ ਮੁੜ-ਲਾਗਇਨ ਕਰੋ।\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 "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../tools/main.vala:40
+msgid "List engine name only"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
 msgstr ""
-"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੧\n"
-"http://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
-
-#~ msgid "Previous page"
-#~ msgstr "ਪਿਛਲਾ ਪੇਜ਼"
-
-#~ msgid "Next page"
-#~ msgstr "ਅਗਲਾ ਪੇਜ਼"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "ਕੁਝ ਇੰਪੁੰਟ ਢੰਗ ਇੰਸਟਾਲ ਕੀਤੇ, ਹਟਾਏ ਜਾਂ ਅੱਪਡੇਟ ਕੀਤੇ ਗਏ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ibus ਇੰਪੁੱਟ ਪਲੇਟਫਾਰਮ "
-#~ "ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ਭਾਸ਼ਾ: %s\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "ਹੁਣੇ ਮੁੜ-ਚਾਲੂ"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "ਕੋਈ ਇੰਜਣ ਸੈੱਟ ਨਹੀਂ ਹੈ।\n"
 
-#~ msgid "Later"
-#~ msgstr "ਬਾਅਦ 'ਚ"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "ਗਲੋਬਲ ਇੰਜਣ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।\n"
 
-#~ msgid "IBus Panel"
-#~ msgstr "ਆਈਬੱਸ ਪੈਨਲ"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰੋ"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ਕੋਈ ਇੰਪੁੱਟ ਵਿੰਡੋ ਨਹੀਂ"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "ਕਮਾਂਡ:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲੋ"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#~ msgid "next input method"
-#~ msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\nhttp://www.satluj.com/"
 
-#~ msgid "previous input method"
-#~ msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
diff --git a/po/pl.po b/po/pl.po
index 1b318ecde..0a06b8fd3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,23 +1,23 @@
 # translation of pl.po to Polish
 # Polish translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Piotr Drąg <piotrdrag@gmail.com>, 2009.
-# raven <piotrdrag@gmail.com>, 2011.
+# 
+# Translators:
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-05-13 07:46+0000\n"
-"Last-Translator: raven <piotrdrag@gmail.com>\n"
+"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-10-15 18:26+0000\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\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"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -28,45 +28,44 @@ msgid "Vertical"
 msgstr "Pionowo"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Osadzanie w menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "W czasie aktywności"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Zawsze"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Górny lewy róg"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Górny prawy róg"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Dolny lewy róg"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Dolny prawy róg"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Własna"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Osadzanie w menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "W czasie aktywności"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Zawsze"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Preferencje usługi iBus"
 
 #: ../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:"
@@ -74,8 +73,7 @@ msgstr "Następna metoda wprowadzania:"
 
 #: ../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:"
@@ -135,9 +133,7 @@ msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
 #: ../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"
@@ -145,8 +141,7 @@ msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia"
 
 #: ../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:"
@@ -166,37 +161,29 @@ msgstr "Dodanie wybranej metody wprowadzania do włączonych metod wprowadzania"
 
 #: ../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"
 msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
+msgstr "Wyświetlanie ustawień zaznaczonej metody wprowadzania"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\n"
-"Można użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
+msgstr "<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\nMożna użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -235,13 +222,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>iBus</b></big>\n"
-"<small>Inteligentna magistrala wprowadzania</small>\n"
-"Strona domowa: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>iBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -277,11 +258,11 @@ msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi iBus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Kolejność mechanizmów"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -309,8 +290,7 @@ msgstr "Klawisze skrótów następnego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:12
 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:13
 msgid "Prev engine shortcut keys"
@@ -318,8 +298,7 @@ msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:14
 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:15
 msgid "Auto hide"
@@ -329,9 +308,7 @@ msgstr "Automatyczne ukrywanie"
 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:17
 msgid "Language panel position"
@@ -341,9 +318,7 @@ msgstr "Pozycja panela języków"
 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:19
 msgid "Orientation of lookup table"
@@ -391,25 +366,21 @@ msgstr "Domyślne włączanie metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:35
 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:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf zachowuje przedrostki nazw"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -434,7 +405,7 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Opis:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
@@ -458,121 +429,118 @@ msgstr "Kod klawisza:"
 msgid "Modifiers:"
 msgstr "Modyfikatory:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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).\n"
-"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
+msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy).\nOkno dialogowe zostanie zamknięte po zwolnieniu klawisza."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "przełącznik"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "włączenie"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 msgstr "wyłączenie"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Demon iBus nie jest uruchomiony. Uruchomić go teraz?"
+msgstr "Demon iBus nie jest uruchomiony. Uruchomić go?"
 
-#: ../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"
-"  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"
+"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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Nie można uruchomić demona iBus od %d sekund"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Wyświetla tylko nazwę mechanizmu"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "polecenie [OPCJE]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Nie można połączyć z iBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "język: %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Nie ustawiono żadnego mechanizmu.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "Przełączenie układu XKB na %s się nie powiodło."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Użycie %s POLECENIE [OPCJA...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Polecenia:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s jest nieznanym poleceniem.\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 msgstr "Uruchom ponownie"
-
-#~ msgid "Previous page"
-#~ msgstr "Poprzednia strona"
-
-#~ msgid "Next page"
-#~ msgstr "Następna strona"
-
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Metody wprowadzania zostały zainstalowane, usunięte lub zaktualizowane. "
-#~ "Proszę ponownie uruchomić platformę wprowadzania iBus."
-
-#~ msgid "Restart Now"
-#~ msgstr "Uruchom ponownie teraz"
-
-#~ msgid "Later"
-#~ msgstr "Później"
-
-#~ msgid "IBus Panel"
-#~ msgstr "Panel iBus"
-
-#~ msgid "IBus input method framework"
-#~ msgstr "Struktura metody wprowadzania iBus"
-
-#~ msgid "Turn off input method"
-#~ msgstr "Wyłącz metodę wprowadzania"
-
-#~ msgid "No input window"
-#~ msgstr "Brak okna wprowadzania"
-
-#~ msgid "About the input method"
-#~ msgstr "O metodzie wprowadzania"
-
-#~ msgid "Switch input method"
-#~ msgstr "Przełącz metodę wprowadzania"
-
-#~ msgid "About the Input Method"
-#~ msgstr "O metodzie wprowadzania"
-
-#~ msgid "next input method"
-#~ msgstr "następna metoda wprowadzania"
-
-#~ msgid "previous input method"
-#~ msgstr "poprzednia metoda wprowadzania"
diff --git a/po/ta.po b/po/ta.po
index a78ef0b11..68720ed9b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,24 +1,27 @@
-# translation of ibus.master.ta.po to Tamil
+# translation of ibus.pot to Tamil
 # Tamil translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# I. Felix <ifelix@redhat.com>, 2009.
-# I Felix <ifelix@redhat.com>, 2010.
+# 
+# Translators:
+# Arun Prakash  <arunprakash.pts@gmail.com>, 2012.
+# Felix I <ifelix25@gmail.com>, 2011.
 # ifelix <ifelix25@gmail.com>, 2011.
+# I Felix <ifelix@redhat.com>, 2010.
+# I. Felix <ifelix@redhat.com>, 2009.
+# Shantha kumar <shkumar@redhat.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.ta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
-"Last-Translator: ifelix <ifelix25@gmail.com>\n"
+"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-10-26 11:21+0000\n"
+"Last-Translator: shkumar <shkumar@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
-"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -30,37 +33,37 @@ msgid "Vertical"
 msgstr "செங்குத்து"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "மெனுவில் உட்பொதியப்பட்டது"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "செயலிலிருக்கும் போது"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "எப்போதும்"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "மேல் இடது ஓரம்"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "மேல் வலது ஓரம்"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "கீழ் இடது ஓரம்"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "கீழ் வலது ஓரம்"
 
-#: ../setup/setup.ui.h:10
+#: ../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 முன்னுரிமைகள்"
@@ -167,8 +170,7 @@ 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"
@@ -179,17 +181,14 @@ msgid "Show information of the selected input method"
 msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
+msgstr "தேர்ந்தெடுத்த உள்ளிட்டு முறையின் அமைப்பை காட்டு"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\n"
-"மேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
+msgstr "<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\nமேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -228,13 +227,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"முதன்மை பக்கம்: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nமுதன்மை பக்கம்: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -270,11 +263,11 @@ msgstr "ibus துவங்கும் போது முன்னேற்
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "எஞ்சின்கள் வரிசை"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "உள்ளீடு முறை பட்டியலில் எஞ்சின்கள் வரிசை சேமிக்கப்பட்டது"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -320,9 +313,7 @@ msgstr "தானாக மறை"
 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"
@@ -332,9 +323,7 @@ msgstr "மொழி பேனல் இடம்"
 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"
@@ -386,19 +375,17 @@ msgstr "பயன்பாடு உள்ளீடுக்கு உட்ப
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -423,7 +410,7 @@ msgstr "ஆசிரியர்: %s\n"
 msgid "Description:\n"
 msgstr "விளக்கம்:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
@@ -447,118 +434,118 @@ msgstr "விசை குறியீடு:"
 msgid "Modifiers:"
 msgstr "மாற்றிகள்;"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ட்ரிகர்"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "செயல்படுத்து"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 daemon துவக்கப்படவில்லை. இப்போது துவக்க வேண்டுமா?"
+msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus துவக்கப்பட்டது! உங்களால் IBusஐ பயன்படுத்த முடியவில்லையெனில், பின்வரும் வரியை "
-"சேர்த்து $HOME/.bashrc, உங்கள் பணிமேடையை மறுதுவக்கவும்.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "I. Felix <ifelix@redhat.com>"
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "கட்டளை [OPTIONS]"
 
-#~ msgid "Previous page"
-#~ msgstr "முந்தைய பக்கம்"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus உடன் இணைக்க முடியாது.\n"
 
-#~ msgid "Next page"
-#~ msgstr "அடுத்த பக்கம்"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "மொழி: %s\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "சில உள்ளீடு முறைகள் நிறுவப்பட்டுள்ளது, நீக்கப்பட்டுள்ளது அல்லது மேம்படுத்தப்பட்டுள்ளது. "
-#~ "ibus உள்ளீட்டை மறுதுவக்கவும்."
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "இப்போது மறுதுவக்கு"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
 
-#~ msgid "Later"
-#~ msgstr "பின்னர்"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb லேயவுட்டை %s க்கு மாற்றுதல் தோல்வி."
 
-#~ msgid "Turn off input method"
-#~ msgstr "உள்ளீடு முறையை நிறுத்து"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "உள்ளீடு சாளரம் இல்லை"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "கட்டளைகள் :\n"
 
-#~ msgid "About the input method"
-#~ msgstr "உள்ளீடு முறை பற்றி"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s என்பது தெரியாத கட்டளை!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "உள்ளீடு முறையை மாற்று"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "பதிப்புரிமை (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "உள்ளீடு முறை பற்றி"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
 
-#~ msgid "next input method"
-#~ msgstr "அடுத்த உள்ளீடு முறை"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "I. Felix <ifelix@redhat.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "முந்தைய உள்ளீடு முறை"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "மறுதுவக்கம்"
diff --git a/po/te.po b/po/te.po
index 097d981e5..67170ed88 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,24 +2,24 @@
 # Telugu translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
+# Krishnababu Krothapalli <krisnababu@gmail.com>, 2012.
 # ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com>, 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-10-27 17:27+0000\n"
-"Last-Translator: Praveen_Illa <mail2ipn@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
-"Language: te\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-28 13:00+0000\n"
+"Last-Translator: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
+"Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -30,37 +30,37 @@ msgid "Vertical"
 msgstr "నిలువుగా"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "మెనూనందు ఎంబెడెడ్ చేయబడెను"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "క్రియాశీలముగా ఉన్నప్పుడు"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "ఎల్లప్పుడు"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "పై ఎడమ మూల"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "పై కుడి మూల"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "క్రింది ఎడమ మూల"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "క్రింది కుడి మూల"
 
-#: ../setup/setup.ui.h:10
+#: ../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 ప్రాధాన్యతలు"
@@ -178,17 +178,14 @@ msgid "Show information of the selected input method"
 msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతి యొక్క సమాచారాన్ని చూపించు"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతి యొక్క సమాచారాన్ని చూపించు"
+msgstr "ఎంపికచేసిన యిన్పట్ పద్దతి అమర్పును చూపుము"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\n"
-"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
+msgstr "<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\nదానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -227,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>తెలివైన ఇన్‌పుట్ బస్</small>\n"
-"నివాసపుట: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -269,11 +260,11 @@ msgstr "ibus ప్రారంభమునందు ఇంజన్లు మ
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ఇంజన్ల క్రమం"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ఇన్పుట్ మెథడ్ జాబితా నందు దాచిన యింజన్ల క్రమం"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -319,9 +310,7 @@ msgstr "స్వయంచాలకంగా దాగిఉండు"
 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"
@@ -331,9 +320,7 @@ msgstr "భాషా ప్యానల్ స్థానము"
 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"
@@ -385,19 +372,17 @@ msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "పేరు మార్పును ఆపుటకు DConf కీల ప్రిఫిక్సులు"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -422,7 +407,7 @@ msgstr "మూలకర్త: %s\n"
 msgid "Description:\n"
 msgstr "వివరణ:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
@@ -446,123 +431,118 @@ msgstr "కీ కోడ్:"
 msgid "Modifiers:"
 msgstr "సవరణిలు:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "ట్రిగ్గర్"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "చేతనపరుచు"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 డెమోన్ ప్రారంభమవలేదు. మీరు దానిని ప్రారంభించాలని అనుకొనుచున్నారా?"
+msgstr "IBus డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ప్రారంభమైంది! మీరు IBus ఉపయోగించలేక పోతే, క్రింది వాటిని $HOME/.bashrc నందు జతచేయుము, "
-"మరియు మీ డెస్కుటాపునకు తిరిగి లాగిన్ అవ్వుము.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"నకలుహక్కు (c) 2007-2010 Peng Huang\n"
-"నకలుహక్కు (c) 2007-2010 Red Hat, Inc."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "ఇంజన్ పేరు మాత్రమే జాబితాచేయి"
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr ""
-"కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\n"
-"ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "పునఃప్రారంభించు"
-
-#~ msgid "Previous page"
-#~ msgstr "మునుపటి పేజి"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "ఆదేశం [ఐచ్చికాలు]"
 
-#~ msgid "Next page"
-#~ msgstr "తరువాతి పేజి"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBus కు అనుసంధానం కాలేదు.\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "కొన్ని ఇన్‌పుట్ విధానములు సంస్థాపించబడెను, తీసివేయబడెను, లేదా నవీకరించబడెను. దయచేసి ibus ఇన్‌పుట్ "
-#~ "ప్లాట్‌ఫాంను పునఃప్రారంభించుము."
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "భాష: %s\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "ఇప్పుడు పునఃప్రారంభించుము"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "ఏ యింజన్ అమర్చలేదు.\n"
 
-#~ msgid "Later"
-#~ msgstr "తరువాత"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "గ్లోబల్ యింజన్ అమర్చుట విఫలమైంది.\n"
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus ప్యానల్"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "గ్లోబల్ యింజన్ పొందుట విఫలమైంది.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ఇన్‌పుట్ పద్ధతి ఆకృతి"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "xkb లేఅవుట్ %s కు మార్చుట విఫలమైంది."
 
-#~ msgid "Turn off input method"
-#~ msgstr "ఇన్‌పుట్ పద్ధతి ఆపు"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "వాడుక: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ఇన్‌పుట్ విండో లేదు"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "ఆదేశాలు:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s తెలియని ఆదేశం!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ఇన్‌పుట్ పద్ధతిని మార్చు"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "కాపీరైట్ (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ఇన్‌పుట్ పద్ధతి గురించి"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#~ msgid "next input method"
-#~ msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
 
-#~ msgid "previous input method"
-#~ msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "పునఃప్రారంభించు"
diff --git a/po/uk.po b/po/uk.po
index 887fe0dda..a4f3fe6a6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,22 +1,23 @@
 # translation of uk.po to Ukrainian
 # Ukrainian translation of ibus.
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Yuri Chornoivan <yurchor@ukr.net>, 2011.
+# 
+# Translators:
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2012.
 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-05-13 05:04+0000\n"
-"Last-Translator: yurchor <yurchor@ukr.net>\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-10-15 04:49+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -27,45 +28,44 @@ msgid "Vertical"
 msgstr "Вертикально"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Вбудувати у меню"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Якщо активна"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Завжди"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "У верхньому лівому куті"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "У верхньому правому куті"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "У нижньому лівому куті"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "У нижньому правому куті"
 
-#: ../setup/setup.ui.h:10
+#: ../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 ""
-"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
+msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
@@ -73,8 +73,7 @@ msgstr "Наступний спосіб введення:"
 
 #: ../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,8 +133,7 @@ msgstr "Показувати назву способу введення на м
 
 #: ../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"
@@ -159,42 +157,33 @@ msgstr "Загальне"
 
 #: ../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"
 msgstr "Показати відомості щодо вибраного способу введення"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Показати відомості щодо вибраного способу введення"
+msgstr "Показати панель налаштовування позначеного способу введення"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>Типовий спосіб введення — найвищий пункт у списку.\n"
-"Змінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
+msgstr "<small><i>Типовий спосіб введення — найвищий пункт у списку.\nЗмінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -233,13 +222,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Інтелектуальний канал введення</small>\n"
-"Домашня сторінка: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Інтелектуальний канал введення</small>\nДомашня сторінка: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -275,11 +258,11 @@ msgstr "Попередньо завантажувати рушії під час
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Порядок рушіїв"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Збережений порядок рушіїв у списку способів введення"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -307,8 +290,7 @@ msgstr "Скорочення для наступного рушія"
 
 #: ../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"
@@ -326,9 +308,7 @@ msgstr "Автоматично ховати"
 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"
@@ -338,10 +318,7 @@ msgstr "Розташування мовної панелі"
 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"
@@ -393,19 +370,17 @@ msgstr "Типово увімкнути спосіб введення, коли
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "Збереження DConf префіксів назв"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Префікси ключів DConf для припинення перетворення назв"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -430,7 +405,7 @@ msgstr "Автор: %s\n"
 msgid "Description:\n"
 msgstr "Опис:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "Виберіть спосіб введення"
 
@@ -454,122 +429,118 @@ msgstr "Код клавіші:"
 msgid "Modifiers:"
 msgstr "Модифікатори:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "перемикач"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "увімкнути"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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. Запустити її зараз?"
+msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus запущено! Якщо ви не можете скористатися IBus, будь ласка, додайте "
-"наведені нижче рядки до вашого файла $HOME/.bashrc, вийдіть з облікового "
-"запису і знову до нього увійдіть.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Показати лише список рушіїв"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "команда [ПАРАМЕТРИ]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Не вдалося встановити зв’язок з IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "мова: %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Рушій не встановлено.\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "Спроба перемикання розкладки xkb на розкладку %s зазнала невдачі."
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "Команди:\n"
+
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "Команда %s є невідомою програмі!\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"© Peng Huang, 2007–2010\n"
-"© Red Hat, Inc., 2007–2010"
+msgstr "© Peng Huang, 2007–2012\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 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 Panel"
-#~ msgstr "Панель IBus"
-
-#~ 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 "Switch input method"
-#~ msgstr "Перемкнути спосіб введення"
-
-#~ msgid "About the Input Method"
-#~ msgstr "Про спосіб введення"
-
-#~ msgid "next input method"
-#~ msgstr "наступний спосіб введення"
-
-#~ msgid "previous input method"
-#~ msgstr "попередній спосіб введення"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f67f5837f..ed995e53d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,27 +1,28 @@
-# translation of ibus.master.po to Simplified Chinese
-# Simplified Chinese Translation for ibus.
+# translation of ibus.pot to Simplified Chinese
+# Simplified Chinese Translation of ibus.
 # Copyright (C) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Peng Huang <shawn.p.huang@gmail.com>, 2007-2010.
-# Leah Liu <lliu@redhat.com>, 2010.
-# ekd123 <zhtx10@gmail.com>, 2011.
+# 
+# Translators:
+# Christopher Meng <cickumqt@gmail.com>, 2012.
+#   <lovenemesis@gmail.com>, 2012.
+# Mike Ma <zhtx10@gmail.com>, 2011.
+# Peng Huang <shawn.p.huang@gmail.com>, 2007.
 # simonyanix <simonyan@fedoraproject.org>, 2011.
+# Tommy He <lovenemesis@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-05-14 07:23+0000\n"
-"Last-Translator: simonyanix <simonyan@fedoraproject.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/fedora/"
-"team/zh_CN/)\n"
-"Language: zh_CN\n"
+"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-10-22 09:18+0000\n"
+"Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
+"Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -32,40 +33,40 @@ msgid "Vertical"
 msgstr "竖直"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "嵌入菜单"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "活动时"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "总是"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "左上角"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "右上角"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "左下角"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "右下角"
 
-#: ../setup/setup.ui.h:10
+#: ../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 设置"
+msgstr "IBus 首选项"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -117,7 +118,7 @@ msgstr "候选词排列方向："
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "设置显示隐藏语言栏的方式"
+msgstr "设置如何显示或隐藏语言栏的方式"
 
 #: ../setup/setup.ui.h:25
 msgid "Show language panel:"
@@ -137,7 +138,7 @@ msgstr "在语言栏上显示输入法名字"
 
 #: ../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"
@@ -161,11 +162,11 @@ msgstr "常规"
 
 #: ../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"
@@ -180,17 +181,14 @@ msgid "Show information of the selected input method"
 msgstr "显示选中输入法的信息"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "显示选中输入法的信息"
+msgstr "显示选中输入法的设置界面"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>列表中第一个输入法是默认的输入法。\n"
-"您可以使用上/下按钮来更改默认的输入法。</i></small>"
+msgstr "<small><i>列表中第一个输入法是默认的输入法。\n您可以使用上/下按钮来更改默认的输入法。</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -229,17 +227,11 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页： http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "启动桌面时自动启动IBus"
+msgstr "启动桌面时自动启动 IBus"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
@@ -259,7 +251,7 @@ msgstr "输入法框架"
 
 #: ../bus/ibus.desktop.in.h:3
 msgid "Start IBus Input Method Framework"
-msgstr "启动IBus 输入法框架"
+msgstr "启动 IBus 输入法框架"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -267,15 +259,15 @@ msgstr "预加载引擎"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr "ibus启动时预加载的引擎"
+msgstr "IBus 启动时预加载的引擎"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "引擎顺序"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "保存在输入法选单中的引擎顺序"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -303,7 +295,7 @@ msgstr "下一个引擎快捷键"
 
 #: ../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"
@@ -311,7 +303,7 @@ msgstr "上一个引擎快捷键"
 
 #: ../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"
@@ -331,7 +323,7 @@ msgstr "语言栏位置"
 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 "语言栏位置。0 = 左上角，1 = 右上角，2 = 左下角，3 = 右下角，4 = 自定义"
 
 #: ../data/ibus.schemas.in.h:19
 msgid "Orientation of lookup table"
@@ -383,19 +375,17 @@ msgstr "当应用程序需要使用输入时自动启用输入法"
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf 保留名称前缀"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "用来停止名称转换的 DConf 键前缀"
 
 #: ../ibus/_config.py.in:41
 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 公司"
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -420,7 +410,7 @@ msgstr "作者: %s\n"
 msgid "Description:\n"
 msgstr "描述:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "选择输入法"
 
@@ -430,7 +420,7 @@ msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "修改IBus偏好"
+msgstr "设定 IBus 首选项"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
@@ -444,119 +434,118 @@ msgstr "按键："
 msgid "Modifiers:"
 msgstr "修饰符："
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "开关"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "应用"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 守护进程没有启动，您是否想现在启动它？"
+msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus 已经被成功启动！如果你不能正常使用IBus，请将下面代码加入到$HOME/.bashrc"
-"中，并重新登录桌面。\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "选择%s的快捷键"
+msgstr "选择 %s 的快捷键"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "仅列出引擎名称"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "命令 [选项]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "无法连接 IBus。\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "语言： %s\n"
+
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "尚未设置引擎。\n"
+
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "设定全局引擎失败。\n"
+
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "获取全局引擎失败。\n"
+
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "切换 xkb 布局至 %s 失败。"
+
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法： %s 命令 [选项...]\n\n"
+
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "命令：\n"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s 是未知命令！\n"
+
+#: ../ui/gtk3/panel.vala:361
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"版权所有 (c) 2007-2010 黄鹏\n"
-"版权所有 (c) 2007-2010 Red Hat 公司"
+msgstr "版权所有 (c) 2007-2012 黄鹏\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:366
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:370
 msgid "translator-credits"
-msgstr "Huang Peng <shawn.p.huang@gmail.com>"
+msgstr "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:402
 msgid "Restart"
 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 Panel"
-#~ msgstr "IBus面板"
-
-#~ 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 "Switch input method"
-#~ msgstr "切换输入法"
-
-#~ msgid "About the Input Method"
-#~ msgstr "关于输入法"
-
-#~ msgid "next input method"
-#~ msgstr "下一输入法"
-
-#~ msgid "previous input method"
-#~ msgstr "上一输入法"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 569aa0958..b982614f4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,22 +2,23 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012.
 # Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-2011.
+# Walter Cheuk <wwycheuk@gmail.com>, 2012.
 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-06-17 10:37+0000\n"
-"Last-Translator: zerng07 <pswo10680@gmail.com>\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-11 13:56+0000\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,40 +30,40 @@ msgid "Vertical"
 msgstr "垂直"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "嵌入選單內"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "當啟用時"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "總是"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "左上角"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "右上角"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "左下角"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "右下角"
 
-#: ../setup/setup.ui.h:10
+#: ../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 偏好設定"
+msgstr "iBus 偏好設定"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -114,7 +115,7 @@ msgstr "候選詞排列方向："
 
 #: ../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:"
@@ -126,11 +127,11 @@ msgstr "語言面板位置："
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
 msgid "Show icon on system tray"
-msgstr "在系統匣內顯示圖示"
+msgstr "在系統匣顯示圖示"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
 msgid "Show input method name on language bar"
-msgstr "在語言列上顯示輸入法名稱"
+msgstr "在語言列顯示輸入法名稱"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
@@ -138,11 +139,11 @@ msgstr "當選取時在語言列上輸入法名稱"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "在應用程式視窗中內嵌編輯模式"
+msgstr "在應用程式視窗內嵌預先編輯文字"
 
 #: ../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:"
@@ -177,17 +178,14 @@ msgid "Show information of the selected input method"
 msgstr "顯示所選取的輸入法資訊"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "顯示所選取的輸入法資訊"
+msgstr "顯示選取輸入法的設置"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
-"您可以使用 向上/向下 按鈕進行變更。</i></small>"
+msgstr "<small><i>清單內最頂端的輸入法為預設輸入法。\n您可以以 向上/向下 按鈕進行變更。</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -208,7 +206,7 @@ msgstr "<b>鍵盤配置</b>"
 
 #: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
 msgid "Share the same input method among all applications"
-msgstr "在所有的應用程式中共享同一個輸入法"
+msgstr "在所有應用程式共用同一個輸入法"
 
 #: ../setup/setup.ui.h:48
 msgid "<b>Global input method settings</b>"
@@ -226,17 +224,11 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智慧型輸入框架</small>\n"
-"首頁: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>iBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "在登入時啟動 ibus"
+msgstr "在登入時啟動 iBus"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
@@ -248,7 +240,7 @@ msgstr "關於"
 
 #: ../bus/ibus.desktop.in.h:1
 msgid "IBus"
-msgstr "IBus"
+msgstr "iBus"
 
 #: ../bus/ibus.desktop.in.h:2
 msgid "Input Method Framework"
@@ -256,7 +248,7 @@ msgstr "輸入法框架"
 
 #: ../bus/ibus.desktop.in.h:3
 msgid "Start IBus Input Method Framework"
-msgstr "啟動 IBus 輸入法框架"
+msgstr "啟動 iBus 輸入法框架"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -264,15 +256,15 @@ msgstr "預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr "當 ibus 啟動時預先載入引擎"
+msgstr "當 iBus 啟動時預先載入引擎"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "引擎順序"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "輸入法清單中儲存的引擎順序"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Trigger shortcut keys"
@@ -360,11 +352,11 @@ msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Embed Preedit Text"
-msgstr "內嵌編輯模式"
+msgstr "內嵌預先編輯文字"
 
 #: ../data/ibus.schemas.in.h:31
 msgid "Embed Preedit Text in Application Window"
-msgstr "在應用程式視窗中內嵌編輯模式"
+msgstr "在應用程式視窗中內嵌預先編輯文字"
 
 #: ../data/ibus.schemas.in.h:32
 msgid "Use global input method"
@@ -380,23 +372,21 @@ msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
 #: ../data/ibus.schemas.in.h:36
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf 保留名稱前綴"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
 #: ../ibus/_config.py.in:41
 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"
-msgstr "其它"
+msgstr "其他"
 
 #: ../setup/engineabout.py:67
 #, python-format
@@ -417,7 +407,7 @@ msgstr "作者：%s\n"
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:135
 msgid "Select an input method"
 msgstr "選取輸入法"
 
@@ -427,7 +417,7 @@ msgstr "鍵盤"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "設置 IBus 偏好設定"
+msgstr "設置 iBus 偏好設定"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
@@ -441,121 +431,118 @@ msgstr "按鍵碼："
 msgid "Modifiers:"
 msgstr "修飾鍵："
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:251
 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:237
+#: ../setup/keyboardshortcut.py:253
 msgid "Please press a key (or a key combination)"
-msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
+msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/main.py:79
+#: ../setup/main.py:87
 msgid "trigger"
 msgstr "觸發"
 
-#: ../setup/main.py:80
+#: ../setup/main.py:88
 msgid "enable"
 msgstr "啟用"
 
-#: ../setup/main.py:81
+#: ../setup/main.py:89
 msgid "disable"
 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 幕後程式没有啟動，您是否想現在啟動它？"
+msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus 已經成功啟動！如果您無法使用 IBus，請將下列代碼加入到 $HOME/.bashrc 中，"
-"並重新登入桌面。\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"版權所有 (c) 2007-2010 黃鵬\n"
-"版權所有 (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr ""
-"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010."
-
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "重新啟動"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "僅列出引擎名稱"
 
-#~ msgid "Previous page"
-#~ msgstr "上一頁"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Next page"
-#~ msgstr "下一頁"
+#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "無法連接 IBus。\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "語言：%s\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "現在重新啟動"
+#: ../tools/main.vala:100
+#, c-format
+msgid "No engine is set.\n"
+msgstr "尚未設定引擎。\n"
 
-#~ msgid "Later"
-#~ msgstr "稍候"
+#: ../tools/main.vala:108
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "無法設定全域引擎。\n"
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus 面板"
+#: ../tools/main.vala:113
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "無法取得全域引擎。\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus 輸入法框架"
+#: ../tools/main.vala:120
+#, c-format
+msgid "Switch xkb layout to %s failed."
+msgstr "無法將 xkb 鍵盤配置切換為 %s。"
 
-#~ msgid "Turn off input method"
-#~ msgstr "關閉輸入法"
+#: ../tools/main.vala:185
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "無輸入視窗"
+#: ../tools/main.vala:186
+#, c-format
+msgid "Commands:\n"
+msgstr "指令：\n"
 
-#~ msgid "About the input method"
-#~ msgstr "關於輸入法"
+#: ../tools/main.vala:208
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s 為未知指令！\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "切換輸入法"
+#: ../ui/gtk3/panel.vala:361
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "著作權 (c) 2007-2012 黃鵬\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "關於輸入法"
+#: ../ui/gtk3/panel.vala:366
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#~ msgid "next input method"
-#~ msgstr "下一個輸入法"
+#: ../ui/gtk3/panel.vala:370
+msgid "translator-credits"
+msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010."
 
-#~ msgid "previous input method"
-#~ msgstr "上一個輸入法"
+#: ../ui/gtk3/panel.vala:402
+msgid "Restart"
+msgstr "重新啟動"

From 76817548683606113dbf9d4dccec33555b9a65dc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 8 Dec 2012 06:43:00 +0900
Subject: [PATCH 115/816] Remove transfer container in
 ibus_engine_simple_add_table.

Review URL: https://codereview.appspot.com/6909049
---
 engine/main.vala       | 2 +-
 src/ibusenginesimple.c | 2 +-
 src/ibusenginesimple.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engine/main.vala b/engine/main.vala
index 4dc373495..da6d5ee50 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -87,7 +87,7 @@ public int main(string[] args) {
         if (lang != null && 
             lang.ascii_ncasecmp("pt_br", "pt_br".length) == 0) {
             IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
-            simple.add_table((uint16[]) cedilla_compose_seqs,
+            simple.add_table(cedilla_compose_seqs,
                              4,
                              cedilla_compose_seqs.length / (4 + 2));
         }
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 5dd78f398..5bacd5e81 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -892,7 +892,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
 void
 ibus_engine_simple_add_table (IBusEngineSimple *simple,
-                              guint16          *data,
+                              const guint16    *data,
                               gint              max_seq_len,
                               gint              n_seqs)
 {
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 6e0e5cc52..0a7b55fce 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -97,8 +97,8 @@ GType   ibus_engine_simple_get_type       (void);
 /**
  * ibus_engine_simple_add_table:
  * @simple: An IBusEngineSimple.
- * @data: (transfer container) (element-type guint16) (array):
- *      The table.
+ * @data: (element-type guint16) (array): The table which must be available
+ *      during the whole life of the simple engine.
  * @max_seq_len: Maximum length of a swquence in the table (cannot be greater
  *      than %IBUS_MAX_COMPOSE_LEN)
  *
@@ -111,7 +111,7 @@ GType   ibus_engine_simple_get_type       (void);
  * symbol fields. (Values beyond the length of the sequence should be zero.)
  */
 void    ibus_engine_simple_add_table      (IBusEngineSimple     *simple,
-                                           guint16              *data,
+                                           const guint16        *data,
                                            gint                  max_seq_len,
                                            gint                  n_seqs);
 

From 9046f458ca817002e347275906555071b7d411d1 Mon Sep 17 00:00:00 2001
From: Peng Huang <penghuang@google.com>
Date: Fri, 7 Dec 2012 18:02:23 -0500
Subject: [PATCH 116/816] Relase 1.5.0

BUG=None

Review URL: https://codereview.appspot.com/6906048
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 563fa396a..729232972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,11 +22,11 @@
 
 
 # If ibus_released is 0, append datestamp to the version number.
-m4_define([ibus_released], [0])
+m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
-m4_define([ibus_minor_version], [4])
-m4_define([ibus_micro_version], [99])
+m4_define([ibus_minor_version], [5])
+m4_define([ibus_micro_version], [0])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 438e7d1d8586258cade509afb7de45327e953031 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Dec 2012 08:20:50 +0900
Subject: [PATCH 117/816] Fix IBus.py errors.

BUG=http://code.google.com/p/ibus/issues/detail?id=1559
TEST=ibus-anthy

Review URL: https://codereview.appspot.com/6867085
---
 bindings/pygobject/gi/overrides/IBus.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bindings/pygobject/gi/overrides/IBus.py b/bindings/pygobject/gi/overrides/IBus.py
index bf3000e9f..dcead0ed5 100644
--- a/bindings/pygobject/gi/overrides/IBus.py
+++ b/bindings/pygobject/gi/overrides/IBus.py
@@ -45,7 +45,7 @@ def __init__(self,
                  name='',
                  description='',
                  version='',
-                 laicense='',
+                 license='',
                  author='',
                  homepage='',
                  command_line='',
@@ -198,12 +198,12 @@ def __init__(self,
                  state=IBus.PropState.UNCHECKED,
                  symbol='',
                  **kwargs):
-        prop_type = kwargs.get('prop_type', type)
-        if not isinstance(label, IBus.Text):
+        prop_type = kwargs.pop('prop_type', type)
+        if label != None and not isinstance(label, IBus.Text):
             label = Text(label)
-        if not isinstance(tooltip, IBus.Text):
+        if tooltip != None and not isinstance(tooltip, IBus.Text):
             tooltip = Text(tooltip)
-        if not isinstance(symbol, IBus.Text):
+        if symbol != None and not isinstance(symbol, IBus.Text):
             symbol = Text(symbol)
         super(Property, self).__init__(key=key,
                                        prop_type=prop_type,

From 346b83e3e015497f6ac2ec7fe8697bea175c2d25 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Dec 2012 22:32:06 +0900
Subject: [PATCH 118/816] Add fr(bepo) XKB engine.

BUG=http://code.google.com/p/ibus/issues/detail?id=1558

Review URL: https://codereview.appspot.com/6926044
---
 engine/simple.xml.in.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in.in b/engine/simple.xml.in.in
index d064ad6ad..4ecd613db 100644
--- a/engine/simple.xml.in.in
+++ b/engine/simple.xml.in.in
@@ -246,6 +246,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:fr:bepo:fra</name>
+			<language>fra</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>fr</layout>
+			<layout_variant>bepo</layout_variant>
+			<longname>French (Bepo, ergonomic, Dvorak way)</longname>
+			<description>French (Bepo, ergonomic, Dvorak way)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>1</rank>
+		</engine>
 		<engine>
 			<name>xkb:fr:dvorak:fra</name>
 			<language>fra</language>

From d8c7e73464bdc65d7b96d7f0591aab608f66d0ea Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Dec 2012 22:35:21 +0900
Subject: [PATCH 119/816] Release 1.5.1

BUG=

Review URL: https://codereview.appspot.com/6925045
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 729232972..b328073f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [0])
+m4_define([ibus_micro_version], [1])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 8ac534fc002356b93e2015a8866f1ea89e3895f9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 15 Dec 2012 17:40:18 +0900
Subject: [PATCH 120/816] Use Variant.unpack() instead of Variant.dup_strv().

Variant.dup_strv() returns a tuple in pygobject 3.2, e.g. (['<Control>space'], 1L), and a list in pygobject 3.4, e.g. ['<Control>space'] .

BUG=RH#887153

Review URL: https://codereview.appspot.com/6941051
---
 setup/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/main.py b/setup/main.py
index a8acc7a2a..707faa46f 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -87,7 +87,7 @@ def __init_hotkey(self):
         label = 'switch_engine'
         variant = self.__config.get_value('general/hotkey', name)
         if variant != None:
-            shortcuts = variant.dup_strv()
+            shortcuts = variant.unpack()
         else:
             shortcuts =  ['<Control>space']
 

From 62cd0492e3459416e1775aedc327bced53f66828 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Wed, 9 Jan 2013 10:14:55 -0500
Subject: [PATCH 121/816] client: Queue events while the IBus context isn't
 ready

There are actually 3 patches here.

---
client: Queue events while the IBus context isn't ready

We may lose events that ought to be processed while the IBus context
isn't ready or if the connection to IBus isn't fully established yet.

To avoid that, enqueue events to be processed later when the IBus
context creation finishes.

---
client: Don't cancel an ongoing create input context on another request

This would only add more delays.

---
client: Cancel any ongoing create input context request on finalize

BUG=

Review URL: https://codereview.appspot.com/6988047
Patch from Rui Matos <tiagomatos@gmail.com>.
---
 client/gtk2/ibusimcontext.c | 220 ++++++++++++++++++++++--------------
 1 file changed, 133 insertions(+), 87 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 011676fc2..94005b712 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -40,6 +40,8 @@
 #  define IDEBUG(a...)
 #endif
 
+#define MAX_QUEUED_EVENTS 20
+
 struct _IBusIMContext {
     GtkIMContext parent;
 
@@ -63,6 +65,7 @@ struct _IBusIMContext {
 
     /* cancellable */
     GCancellable    *cancellable;
+    GQueue          *events_queue;
 };
 
 struct _IBusIMContextClass {
@@ -154,6 +157,8 @@ static GType                _ibus_type_im_context = 0;
 static GtkIMContextClass    *parent_class = NULL;
 
 static IBusBus              *_bus = NULL;
+static guint                _daemon_name_watch_id = 0;
+static gboolean             _daemon_is_running = FALSE;
 
 void
 ibus_im_context_register_type (GTypeModule *type_module)
@@ -261,6 +266,46 @@ _process_key_event_done (GObject      *object,
     gdk_event_free ((GdkEvent *)event);
 }
 
+static gboolean
+_process_key_event (IBusInputContext *context,
+                    GdkEventKey      *event)
+{
+    guint state = event->state;
+    gboolean retval = FALSE;
+
+    if (event->type == GDK_KEY_RELEASE) {
+        state |= IBUS_RELEASE_MASK;
+    }
+
+    if (_use_sync_mode) {
+        retval = ibus_input_context_process_key_event (context,
+            event->keyval,
+            event->hardware_keycode - 8,
+            state);
+    }
+    else {
+        ibus_input_context_process_key_event_async (context,
+            event->keyval,
+            event->hardware_keycode - 8,
+            state,
+            -1,
+            NULL,
+            _process_key_event_done,
+            gdk_event_copy ((GdkEvent *) event));
+
+        retval = TRUE;
+    }
+
+    if (retval) {
+        event->state |= IBUS_HANDLED_MASK;
+    }
+    else {
+        event->state |= IBUS_IGNORED_MASK;
+    }
+
+    return retval;
+}
+
 
 /* emit "retrieve-surrounding" glib signal of GtkIMContext, if
  * context->caps has IBUS_CAP_SURROUNDING_TEXT and the current IBus
@@ -387,38 +432,7 @@ _key_snooper_cb (GtkWidget   *widget,
         ibusimcontext->time = event->time;
     }
 
-    guint state = event->state;
-    if (event->type == GDK_KEY_RELEASE) {
-        state |= IBUS_RELEASE_MASK;
-    }
-
-    if (_use_sync_mode) {
-        retval = ibus_input_context_process_key_event (
-                                        ibuscontext,
-                                        event->keyval,
-                                        event->hardware_keycode - 8,
-                                        state);
-    }
-    else {
-        ibus_input_context_process_key_event_async (
-                                        ibuscontext,
-                                        event->keyval,
-                                        event->hardware_keycode - 8,
-                                        state,
-                                        -1,
-                                        NULL,
-                                        _process_key_event_done,
-                                        gdk_event_copy ((GdkEvent *) event));
-        retval = TRUE;
-
-    }
-
-    if (retval) {
-        event->state |= IBUS_HANDLED_MASK;
-    }
-    else {
-        event->state |= IBUS_IGNORED_MASK;
-    }
+    retval = _process_key_event (ibuscontext, event);
 
     if (ibusimcontext != NULL) {
         /* unref ibusimcontext could call ibus_im_context_finalize here
@@ -449,6 +463,23 @@ _get_boolean_env(const gchar *name,
     return TRUE;
 }
 
+static void
+daemon_name_appeared (GDBusConnection *connection,
+                      const gchar     *name,
+                      const gchar     *owner,
+                      gpointer         data)
+{
+    _daemon_is_running = TRUE;
+}
+
+static void
+daemon_name_vanished (GDBusConnection *connection,
+                      const gchar     *name,
+                      gpointer         data)
+{
+    _daemon_is_running = FALSE;
+}
+
 static void
 ibus_im_context_class_init (IBusIMContextClass *class)
 {
@@ -533,6 +564,14 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     /* always install snooper */
     if (_key_snooper_id == 0)
         _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
+
+    _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                              IBUS_SERVICE_IBUS,
+                                              G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                              daemon_name_appeared,
+                                              daemon_name_vanished,
+                                              NULL,
+                                              NULL);
 }
 
 static void
@@ -543,6 +582,8 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
         gtk_key_snooper_remove (_key_snooper_id);
         _key_snooper_id = 0;
     }
+
+    g_bus_unwatch_name (_daemon_name_watch_id);
 }
 
 /* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
@@ -602,6 +643,7 @@ ibus_im_context_init (GObject *obj)
     ibusimcontext->caps = IBUS_CAP_PREEDIT_TEXT | IBUS_CAP_FOCUS;
 #endif
 
+    ibusimcontext->events_queue = g_queue_new ();
 
     // Create slave im context
     ibusimcontext->slave = gtk_im_context_simple_new ();
@@ -651,6 +693,13 @@ ibus_im_context_finalize (GObject *obj)
 
     g_signal_handlers_disconnect_by_func (_bus, G_CALLBACK (_bus_connected_cb), obj);
 
+    if (ibusimcontext->cancellable != NULL) {
+        /* Cancel any ongoing create input context request */
+        g_cancellable_cancel (ibusimcontext->cancellable);
+        g_object_unref (ibusimcontext->cancellable);
+        ibusimcontext->cancellable = NULL;
+    }
+
     if (ibusimcontext->ibuscontext) {
         ibus_proxy_destroy ((IBusProxy *)ibusimcontext->ibuscontext);
     }
@@ -670,6 +719,9 @@ ibus_im_context_finalize (GObject *obj)
         pango_attr_list_unref (ibusimcontext->preedit_attrs);
     }
 
+    g_queue_free_full (ibusimcontext->events_queue,
+                       (GDestroyNotify)gdk_event_free);
+
     G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -681,65 +733,56 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
 
     IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
 
-    if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
-        /* If context does not have focus, ibus will process key event in sync mode.
-         * It is a workaround for increase search in treeview.
-         */
-        gboolean retval = FALSE;
-
-        if (event->state & IBUS_HANDLED_MASK)
-            return TRUE;
+    if (!_daemon_is_running)
+        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
 
-        if (event->state & IBUS_IGNORED_MASK)
-            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+    /* If context does not have focus, ibus will process key event in
+     * sync mode.  It is a workaround for increase search in treeview.
+     */
+    if (!ibusimcontext->has_focus)
+        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
 
-        /* XXX it is a workaround for some applications do not set client window. */
-        if (ibusimcontext->client_window == NULL && event->window != NULL)
-            gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window);
+    if (event->state & IBUS_HANDLED_MASK)
+        return TRUE;
 
-        _request_surrounding_text (ibusimcontext);
+    if (event->state & IBUS_IGNORED_MASK)
+        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
 
-        if (ibusimcontext != NULL) {
-            ibusimcontext->time = event->time;
-        }
+    /* XXX it is a workaround for some applications do not set client
+     * window. */
+    if (ibusimcontext->client_window == NULL && event->window != NULL)
+        gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext,
+                                          event->window);
 
-        guint state = event->state;
-        if (event->type == GDK_KEY_RELEASE) {
-            state |= IBUS_RELEASE_MASK;
-        }
+    _request_surrounding_text (ibusimcontext);
 
-        if (_use_sync_mode) {
-            retval = ibus_input_context_process_key_event (
-                                        ibusimcontext->ibuscontext,
-                                        event->keyval,
-                                        event->hardware_keycode - 8,
-                                        state);
-        }
-        else {
-            ibus_input_context_process_key_event_async (
-                                        ibusimcontext->ibuscontext,
-                                        event->keyval,
-                                        event->hardware_keycode - 8,
-                                        state,
-                                        -1,
-                                        NULL,
-                                        _process_key_event_done,
-                                        gdk_event_copy ((GdkEvent *) event));
-            retval = TRUE;
-        }
+    ibusimcontext->time = event->time;
 
-        if (retval) {
-            event->state |= IBUS_HANDLED_MASK;
+    if (ibusimcontext->ibuscontext) {
+        if (_process_key_event (ibusimcontext->ibuscontext, event))
             return TRUE;
-        }
-        else {
-            event->state |= IBUS_IGNORED_MASK;
-            return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
-        }
+        else
+            return gtk_im_context_filter_keypress (ibusimcontext->slave,
+                                                   event);
     }
-    else {
-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+
+    /* At this point we _should_ be waiting for the IBus context to be
+     * created or the connection to IBus to be established. If that's
+     * the case we queue events to be processed when the IBus context
+     * is ready. */
+    g_return_val_if_fail (ibusimcontext->cancellable != NULL ||
+                          ibus_bus_is_connected (_bus) == FALSE,
+                          FALSE);
+    g_queue_push_tail (ibusimcontext->events_queue,
+                       gdk_event_copy ((GdkEvent *)event));
+
+    if (g_queue_get_length (ibusimcontext->events_queue) > MAX_QUEUED_EVENTS) {
+        g_warning ("Events queue growing too big, will start to drop.");
+        gdk_event_free ((GdkEvent *)
+                        g_queue_pop_head (ibusimcontext->events_queue));
     }
+
+    return TRUE;
 }
 
 static void
@@ -1482,6 +1525,14 @@ _create_input_context_done (IBusBus       *bus,
             ibus_input_context_focus_in (ibusimcontext->ibuscontext);
             _set_cursor_location_internal (ibusimcontext);
         }
+
+        if (!g_queue_is_empty (ibusimcontext->events_queue)) {
+            GdkEventKey *event;
+            while (event = g_queue_pop_head (ibusimcontext->events_queue)) {
+                _process_key_event (context, event);
+                gdk_event_free ((GdkEvent *)event);
+            }
+        }
     }
 
     g_object_unref (ibusimcontext);
@@ -1494,12 +1545,7 @@ _create_input_context (IBusIMContext *ibusimcontext)
 
     g_assert (ibusimcontext->ibuscontext == NULL);
 
-    if (ibusimcontext->cancellable != NULL) {
-        /* Cancel previous create input context request */
-        g_cancellable_cancel (ibusimcontext->cancellable);
-        g_object_unref (ibusimcontext->cancellable);
-        ibusimcontext->cancellable = NULL;
-    }
+    g_return_if_fail (ibusimcontext->cancellable == NULL);
 
     ibusimcontext->cancellable = g_cancellable_new ();
 

From 7e07299d17156e52b0b60b2cc50a82e29ef4f550 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 15 Feb 2013 12:28:25 +0900
Subject: [PATCH 122/816] Fix no rule to make target test-override-ibus.py

BUG=http://code.google.com/p/ibus/issues/detail?id=1592

Review URL: https://codereview.appspot.com/7332043
---
 bindings/pygobject/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index 6a1d2f3b6..3980bc669 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -39,6 +39,7 @@ TESTS_ENVIRONMENT = \
 EXTRA_DIST =					\
 	gi/__init__.py				\
 	gi/overrides/__init__.py		\
+	test-override-ibus.py                   \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk

From 4d7f4ad5b5d6b29bb50cc9bf5b1442e3766151d9 Mon Sep 17 00:00:00 2001
From: Ma Xiaojun <damage3025@gmail.com>
Date: Tue, 19 Feb 2013 19:31:54 +0800
Subject: [PATCH 123/816] Show all GIR warnings

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b328073f8..dd3e01787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,7 @@ GOBJECT_INTROSPECTION_CHECK([0.6.8])
 
 IBUS_GIR_SCANNERFLAGS=
 if test x"$found_introspection" = x"yes" ; then
-    IBUS_GIR_SCANNERFLAGS="--identifier-prefix=IBus --symbol-prefix=ibus"
+    IBUS_GIR_SCANNERFLAGS="--warn-all --identifier-prefix=IBus --symbol-prefix=ibus"
     PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.6],
                      [gir_symbol_prefix=yes],
                      [gir_symbol_prefix=no])

From c79789fa1b5fd49a53b16e87813b88122168ff73 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 21 Feb 2013 12:41:08 +0900
Subject: [PATCH 124/816] Fix annotation in ibus_bus_create_input_context

BUG=http://code.google.com/p/ibus/issues/detail?id=1593

Review URL: https://codereview.appspot.com/7368044
---
 src/ibusbus.h          | 14 +++++++-------
 src/ibusinputcontext.h | 15 ++++++---------
 src/ibuspanelservice.h | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/ibusbus.h b/src/ibusbus.h
index 8fe0036a5..767336574 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -24,6 +24,9 @@
 #error "Only <ibus.h> can be included directly"
 #endif
 
+#ifndef __IBUS_BUS_H_
+#define __IBUS_BUS_H_
+
 /**
  * SECTION: ibusbus
  * @short_description: Connect with IBus daemon.
@@ -31,9 +34,6 @@
  *
  * An IBusBus connects with IBus daemon.
  */
-#ifndef __IBUS_BUS_H_
-#define __IBUS_BUS_H_
-
 #include <gio/gio.h>
 #include "ibusinputcontext.h"
 #include "ibusconfig.h"
@@ -489,8 +489,8 @@ gboolean    ibus_bus_exit_async_finish  (IBusBus        *bus,
  * ibus_bus_create_input_context:
  * @bus: An #IBusBus.
  * @client_name: Name of client.
- * @returns: An newly allocated #IBusInputContext if the "CreateInputContext"
- *      call is suceeded, %NULL otherwise.
+ * @returns: (transfer full): An newly allocated #IBusInputContext if the
+ *      "CreateInputContext" call is suceeded, %NULL otherwise.
  *
  * Create an input context for client synchronously.
  */
@@ -526,8 +526,8 @@ void        ibus_bus_create_input_context_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_create_input_context_async().
  * @error: Return location for error or %NULL.
- * @returns: An newly allocated #IBusInputContext if the "CreateInputContext"
- *      call is suceeded, %NULL otherwise.
+ * @returns: (transfer full): An newly allocated #IBusInputContext if the
+ *      "CreateInputContext" call is suceeded, %NULL otherwise.
  *
  * Finishes an operation started with ibus_bus_create_input_context_async().
  */
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index 659732b1b..2f8869b53 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -24,6 +24,9 @@
 #error "Only <ibus.h> can be included directly"
 #endif
 
+#ifndef __IBUS_INPUT_CONTEXT_H_
+#define __IBUS_INPUT_CONTEXT_H_
+
 /**
  * SECTION: ibusinputcontext
  * @short_description: IBus input context proxy object.
@@ -36,9 +39,6 @@
  * Clients call the IBusInputContext to invoke BusInputContext,
  * through which invokes IBusEngine.
  */
-#ifndef __IBUS_INPUT_CONTEXT_H_
-#define __IBUS_INPUT_CONTEXT_H_
-
 #include "ibusproxy.h"
 #include "ibusenginedesc.h"
 #include "ibustext.h"
@@ -93,7 +93,6 @@ GType        ibus_input_context_get_type    (void);
  * @connection: An #GDBusConnection.
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
- *
  * @returns: A newly allocated IBusInputContext.
  *
  * New an IBusInputContext.
@@ -125,7 +124,6 @@ void         ibus_input_context_new_async   (const gchar        *path,
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
  *      ibus_input_context_new_async().
  * @error: Return location for error or %NULL.
- *
  * @returns: A newly allocated #IBusInputContext.
  *
  * Finishes an operation started with ibus_input_context_new_async().
@@ -169,7 +167,6 @@ void         ibus_input_context_get_input_context_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
  *      ibus_input_context_get_input_context_async().
  * @error: Return location for error or %NULL.
- *
  * @returns: (transfer none): An existing #IBusInputContext.
  *
  * Finishes an operation started with ibus_input_contex_get_input_context_async().
@@ -180,7 +177,7 @@ IBusInputContext *
                                              GError            **error);
 
 /**
- * ibus_input_context_process_hand_writing_event
+ * ibus_input_context_process_hand_writing_event:
  * @context: An IBusInputContext.
  * @coordinates: An array of gdouble (0.0 to 1.0) which represents a stroke (i.e. [x1, y1, x2, y2, x3, y3, ...]).
  * @coordinates_len: The number of elements in the array. The number should be even and >= 4.
@@ -203,7 +200,7 @@ void         ibus_input_context_process_hand_writing_event
                                              guint               coordinates_len);
 
 /**
- * ibus_input_context_cancel_hand_writing
+ * ibus_input_context_cancel_hand_writing:
  * @context: An IBusInputContext.
  * @n_strokes: The number of strokes to be removed. Pass 0 to remove all.
  *
@@ -326,7 +323,7 @@ void         ibus_input_context_set_capabilities
                                              guint32             capabilities);
 
 /**
- * ibus_input_context_property_activate
+ * ibus_input_context_property_activate:
  * @context: An IBusInputContext.
  * @prop_name: A property name (e.g. "InputMode.WideLatin")
  * @state: A status of the property (e.g. PROP_STATE_CHECKED)
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index 7678922af..a47d887b7 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -23,6 +23,9 @@
 #error "Only <ibus.h> can be included directly"
 #endif
 
+#ifndef __IBUS_PANEL_SERVICE_H_
+#define __IBUS_PANEL_SERVICE_H_
+
 /**
  * SECTION: ibuspanelservice
  * @short_description: Panel service back-end.
@@ -31,9 +34,6 @@
  * An IBusPanelService is a base class for UI services.
  * Developers can "extend" this class for panel UI development.
  */
-#ifndef __IBUS_PANEL_SERVICE_H_
-#define __IBUS_PANEL_SERVICE_H_
-
 #include "ibuslookuptable.h"
 #include "ibusservice.h"
 #include "ibusproplist.h"
@@ -131,7 +131,7 @@ GType            ibus_panel_service_get_type  (void);
 IBusPanelService *ibus_panel_service_new (GDBusConnection    *connection);
 
 /**
- * ibus_panel_service_candidate_clicked
+ * ibus_panel_service_candidate_clicked:
  * @panel: An IBusPanelService
  * @index: Index in the Lookup table
  * @button: GdkEventButton::button (1: left button, etc.)
@@ -146,7 +146,7 @@ void ibus_panel_service_candidate_clicked (IBusPanelService *panel,
                                            guint             state);
 
 /**
- * ibus_panel_service_cursor_down
+ * ibus_panel_service_cursor_down:
  * @panel: An IBusPanelService
  *
  * Notify that the cursor is down
@@ -155,7 +155,7 @@ void ibus_panel_service_candidate_clicked (IBusPanelService *panel,
 void ibus_panel_service_cursor_down       (IBusPanelService *panel);
 
 /**
- * ibus_panel_service_cursor_up
+ * ibus_panel_service_cursor_up:
  * @panel: An IBusPanelService
  *
  * Notify that the cursor is up
@@ -164,7 +164,7 @@ void ibus_panel_service_cursor_down       (IBusPanelService *panel);
 void ibus_panel_service_cursor_up         (IBusPanelService *panel);
 
 /**
- * ibus_panel_service_page_down
+ * ibus_panel_service_page_down:
  * @panel: An IBusPanelService
  *
  * Notify that the page is down
@@ -173,7 +173,7 @@ void ibus_panel_service_cursor_up         (IBusPanelService *panel);
 void ibus_panel_service_page_down         (IBusPanelService *panel);
 
 /**
- * ibus_panel_service_page_up
+ * ibus_panel_service_page_up:
  * @panel: An IBusPanelService
  *
  * Notify that the page is up
@@ -182,7 +182,7 @@ void ibus_panel_service_page_down         (IBusPanelService *panel);
 void ibus_panel_service_page_up           (IBusPanelService *panel);
 
 /**
- * ibus_panel_service_property_activate
+ * ibus_panel_service_property_activate:
  * @panel: An IBusPanelService
  * @prop_name: A property name
  * @prop_state: State of the property
@@ -194,7 +194,7 @@ void ibus_panel_service_property_activate (IBusPanelService *panel,
                                            const gchar      *prop_name,
                                            guint             prop_state);
 /**
- * ibus_panel_service_property_show
+ * ibus_panel_service_property_show:
  * @panel: An IBusPanelService
  * @prop_name: A property name
  *
@@ -205,7 +205,7 @@ void ibus_panel_service_property_show     (IBusPanelService *panel,
                                            const gchar      *prop_name);
 
 /**
- * ibus_panel_service_property_hide
+ * ibus_panel_service_property_hide:
  * @panel: An IBusPanelService
  * @prop_name: A property name
  *

From f9ddda1e2d867b96889f80d9d30c0e88d3ec11b9 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 26 Feb 2013 07:42:14 +0900
Subject: [PATCH 125/816] daemon: allow "eavesdrop" match rule

Recent dbus-monitor supplies "eavesdrop" match rule which ibus-daemon
does not accept.  This patch silently ignores the rule so ibus-daemon
behave the same as before.

BUG=none

Review URL: https://codereview.appspot.com/7225062
---
 bus/matchrule.c      | 42 ++++++++++++++++++++++++------------------
 bus/test-matchrule.c |  4 ++++
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/bus/matchrule.c b/bus/matchrule.c
index 836e71eff..f79f9bf6c 100644
--- a/bus/matchrule.c
+++ b/bus/matchrule.c
@@ -198,30 +198,31 @@ find_key (const gchar **p)
 static gchar *
 find_value (const gchar **p)
 {
-    GString *text;
-
-    text = g_string_new ("");
-
     SKIP_WHITE (*p);
 
-    if (**p != '\'')
-        goto failed;
-    (*p) ++;
-
-    while (**p != '\'') {
-        if (**p == '\0')
-            goto failed;
-        if (**p == '\\')
+    if (**p == '\'') {
+        GString *text = g_string_new ("");
+        (*p) ++;
+        while (**p != '\'') {
+            if (**p == '\0') {
+                g_string_free (text, TRUE);
+                return NULL;
+            }
+            if (**p == '\\')
+                (*p) ++;
+            g_string_append_c (text, **p);
             (*p) ++;
-        g_string_append_c (text, **p);
+        }
         (*p) ++;
+        return g_string_free (text, FALSE);
+    } else if (strncmp (*p, "true", 4) == 0) {
+        *p += 4;
+        return g_strdup ("true");
+    } else if (strncmp (*p, "false", 5) == 0) {
+        *p += 5;
+        return g_strdup ("false");
     }
-    (*p) ++;
-
-    return g_string_free (text, FALSE);
 
-failed:
-    g_string_free (text, TRUE);
     return NULL;
 }
 
@@ -372,6 +373,11 @@ bus_match_rule_new (const gchar *text)
                 goto failed;
             bus_match_rule_set_arg (rule, i, p->value);
         }
+        else if (g_strcmp0 (p->key, "eavesdrop") == 0) {
+            if (g_strcmp0 (p->value, "true") != 0 &&
+                g_strcmp0 (p->value, "false") != 0)
+                goto failed;
+        }
         else
             goto failed;
     }
diff --git a/bus/test-matchrule.c b/bus/test-matchrule.c
index 07df607e6..d2e2648cd 100644
--- a/bus/test-matchrule.c
+++ b/bus/test-matchrule.c
@@ -55,6 +55,10 @@ main(gint argc, gchar **argv)
 
     rule = bus_match_rule_new ("type='method_call',interface='org.freedesktop.IBus ");
     g_assert (rule == NULL);
+
+    rule = bus_match_rule_new ("eavesdrop=true");
+    g_assert (rule != NULL);
+    g_object_unref (rule);
     
     return 0;
 }

From e0878144a704e9bfd0f5a60e6894b1de272aaa7b Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 27 Feb 2013 07:12:09 +0900
Subject: [PATCH 126/816] Fix make rpm errors due to ibus-dconf and pygobject
 override

BUG=Issue#1600

Review URL: https://codereview.appspot.com/7404047
---
 ibus.spec.in | 65 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/ibus.spec.in b/ibus.spec.in
index 58cac3863..aa36ea60d 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -1,4 +1,5 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
 %{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
 
@@ -35,6 +36,7 @@ BuildRequires:  dbus-python-devel >= %{dbus_python_version}
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk-doc
 BuildRequires:  GConf2-devel
+BuildRequires:  dconf-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
@@ -42,23 +44,19 @@ BuildRequires:  iso-codes-devel
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   %{name}-gtk2 = %{version}-%{release}
 Requires:   %{name}-gtk3 = %{version}-%{release}
+Requires:   %{name}-conf = %{version}-%{release}
 
 Requires:   pygtk2
 Requires:   pyxdg
 Requires:   iso-codes
 Requires:   dbus-python >= %{dbus_python_version}
 Requires:   im-chooser >= %{im_chooser_version}
-Requires:   GConf2 >= %{gconf2_version}
 Requires:   notify-python
 Requires:   librsvg2
 
 Requires(post):  desktop-file-utils
 Requires(postun):  desktop-file-utils
 
-Requires(pre): GConf2 >= %{gconf2_version}
-Requires(post): GConf2 >= %{gconf2_version}
-Requires(preun): GConf2 >= %{gconf2_version}
-
 Requires(post):  %{_sbindir}/alternatives
 Requires(postun):  %{_sbindir}/alternatives
 
@@ -79,6 +77,29 @@ Requires:   dbus >= 1.2.4
 %description libs
 This package contains the libraries for IBus
 
+%package gconf
+Summary:    IBus configuration module using GConf
+Group:      System Environment/Libraries
+Provides:   %{name}-conf = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
+Requires:   GConf2 >= %{gconf2_version}
+Requires(pre): GConf2 >= %{gconf2_version}
+Requires(post): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
+
+%description gconf
+This package contains ibus configuration module using GConf
+
+%package dconf
+Summary:    IBus configuration module using DConf
+Group:      System Environment/Libraries
+Provides:   %{name}-conf = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
+Requires(posttrans): dconf
+
+%description dconf
+This package contains ibus configuration module using DConf
+
 %package gtk2
 Summary:    IBus im module for gtk2
 Group:      System Environment/Libraries
@@ -124,7 +145,7 @@ The ibus-devel-docs package contains developer documentation for ibus
 
 %build
 
-OPTIONS="--disable-static --enable-gtk2 --enable-gtk3 --enable-xim --disable-gtk-doc --enable-introspection"
+OPTIONS="--disable-static --enable-gtk2 --enable-gtk3 --enable-xim --disable-gtk-doc --enable-introspection --enable-gconf"
 
 %if %{build_python_library}
 OPTIONS="$OPTIONS --enable-python-library"
@@ -167,16 +188,17 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
 
+%post gconf
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 
-%pre
+%pre gconf
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 fi
 
-%preun
+%preun gconf
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
@@ -194,6 +216,16 @@ if [ "$1" = "0" ]; then
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
 fi
 
+%postun dconf
+if [ "$1" -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+    rm -f %{_sysconfdir}/dconf/db/ibus
+fi
+
+%posttrans dconf
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+dconf update &> /dev/null || :
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -219,6 +251,8 @@ fi
     %{python_sitelib}/ibus/*
 %endif
 
+%{python_sitearch}/gi/overrides/IBus.py*
+
 %dir %{_datadir}/ibus/
 %{_bindir}/ibus
 %{_bindir}/ibus-daemon
@@ -226,7 +260,6 @@ fi
 %{_datadir}/ibus/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_libexecdir}/ibus-gconf
 %if %{build_python_library}
     %{_libexecdir}/ibus-ui-gtk
 %endif
@@ -234,7 +267,6 @@ fi
 %{_libexecdir}/ibus-x11
 %{_libexecdir}/ibus-engine-simple
 # %{_sysconfdir}/xdg/autostart/ibus.desktop
-%{_sysconfdir}/gconf/schemas/ibus.schemas
 %{_sysconfdir}/bash_completion.d/ibus.bash
 %config %{_xinputconf}
 
@@ -243,6 +275,19 @@ fi
 %{_libdir}/libibus-1.0.so.*
 %{_libdir}/girepository-1.0/IBus-1.0.typelib
 
+%files gconf
+%defattr(-,root,root,-)
+%{_libexecdir}/ibus-gconf
+%{_sysconfdir}/gconf/schemas/ibus.schemas
+
+%files dconf
+%defattr(-,root,root,-)
+%{_libexecdir}/ibus-dconf
+%{_sysconfdir}/dconf/db/ibus.d
+%{_sysconfdir}/dconf/profile/ibus
+%{_datadir}/GConf/gsettings/ibus.convert
+%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
+
 %files gtk2
 %defattr(-,root,root,-)
 %{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so

From 4b2f6a477019b50375aba2e5f9c43e618b6905ad Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 4 Mar 2013 10:10:53 +0900
Subject: [PATCH 127/816] Implement use-system-keyboard-layout

BUG=http://code.google.com/p/ibus/issues/detail?id=1558

Review URL: https://codereview.appspot.com/7414045
---
 data/ibus.schemas.in |  2 +-
 ui/gtk3/panel.vala   | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index dbb6da81c..54ccb4cba 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -224,7 +224,7 @@
       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>
       <owner>ibus</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
         <short>Use system keyboard layout</short>
 	    <long>Use system keyboard (XKB) layout</long>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 24e6b2e55..9f6e5e37c 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -48,6 +48,7 @@ class Panel : IBus.PanelService {
     private Gtk.AboutDialog m_about_dialog;
     private Gtk.CssProvider m_css_provider;
     private int m_switcher_delay_time = 400;
+    private bool m_use_system_keyboard_layout = false;
     private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
@@ -265,6 +266,22 @@ class Panel : IBus.PanelService {
         }
     }
 
+    private void set_use_system_keyboard_layout(Variant? variant) {
+        Variant var_use_system_kbd_layout = variant;
+
+        if (var_use_system_kbd_layout == null) {
+            var_use_system_kbd_layout = m_config.get_value(
+                    "general",
+                    "use_system_keyboard_layout");
+        }
+
+        if (var_use_system_kbd_layout == null) {
+            return;
+        }
+
+        m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean();
+    }
+
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
@@ -278,6 +295,7 @@ class Panel : IBus.PanelService {
             m_config.watch("general", "preload_engines");
             m_config.watch("general", "engines_order");
             m_config.watch("general", "switcher_delay_time");
+            m_config.watch("general", "use_system_keyboard_layout");
             m_config.watch("general/hotkey", "triggers");
             m_config.watch("panel", "custom_font");
             m_config.watch("panel", "use_custom_font");
@@ -286,6 +304,7 @@ class Panel : IBus.PanelService {
             unbind_switch_shortcut();
             bind_switch_shortcut(null);
             set_switcher_delay_time(null);
+            set_use_system_keyboard_layout(null);
         } else {
             update_engines(null, null);
         }
@@ -352,7 +371,9 @@ class Panel : IBus.PanelService {
             return;
         }
         // set xkb layout
-        exec_setxkbmap(engine);
+        if (!m_use_system_keyboard_layout) {
+            exec_setxkbmap(engine);
+        }
     }
 
     private void config_value_changed_cb(IBus.Config config,
@@ -380,6 +401,11 @@ class Panel : IBus.PanelService {
             set_switcher_delay_time(variant);
             return;
         }
+
+        if (section == "general" && name == "use_system_keyboard_layout") {
+            set_use_system_keyboard_layout(variant);
+            return;
+        }
     }
 
     private void handle_engine_switch(Gdk.Event event, bool revert) {

From 5fa461889939a91fecff89a67630076b8cb987b2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 7 Mar 2013 13:16:10 +0900
Subject: [PATCH 128/816] Change set_use_system_keyboard_layout() timing.

Call set_use_system_keyboard_layout() before update_engines() is called
in panel.vala because update_engines() calls switch_engine().

BUG=http://code.google.com/p/ibus/issues/detail?id=1558#c43

Review URL: https://codereview.appspot.com/7559043
---
 ui/gtk3/panel.vala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 9f6e5e37c..18ef5c09e 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -299,12 +299,14 @@ class Panel : IBus.PanelService {
             m_config.watch("general/hotkey", "triggers");
             m_config.watch("panel", "custom_font");
             m_config.watch("panel", "use_custom_font");
+            // Update m_use_system_keyboard_layout before update_engines()
+            // is called.
+            set_use_system_keyboard_layout(null);
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
             unbind_switch_shortcut();
             bind_switch_shortcut(null);
             set_switcher_delay_time(null);
-            set_use_system_keyboard_layout(null);
         } else {
             update_engines(null, null);
         }

From cff35929a9330081db25a86a8258489a27d4bdd5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 8 Mar 2013 11:21:25 +0900
Subject: [PATCH 129/816] Launch the second ibus engine too to reduce the
 launching time.

Currently the first ibus engine only is running but the second engine
is also frequently used. It is good to run the second engine before
user types Ctrl+space.

BUG=RH#838734
TEST=src/tests/ibus-bus

Review URL: https://codereview.appspot.com/7433049
---
 bus/ibusimpl.c       | 68 ++++++++++++++++++++++++++++++++++++++++++++
 src/ibusbus.c        | 62 ++++++++++++++++++++++++++++++++++++++++
 src/ibusbus.h        | 48 +++++++++++++++++++++++++++++++
 src/tests/ibus-bus.c | 26 +++++++++++++++++
 ui/gtk3/panel.vala   | 18 ++++++++++++
 5 files changed, 222 insertions(+)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index cafb34adb..62185786a 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -176,6 +176,9 @@ static const gchar introspection_xml[] =
     "    <method name='IsGlobalEngineEnabled'>\n"
     "      <arg direction='out' type='b' name='enabled' />\n"
     "    </method>\n"
+    "    <method name='PreloadEngines'>\n"
+    "      <arg direction='in' type='as' name='names' />\n"
+    "    </method>\n"
     "    <signal name='RegistryChanged'>\n"
     "    </signal>\n"
     "    <signal name='GlobalEngineChanged'>\n"
@@ -1210,6 +1213,70 @@ _ibus_is_global_engine_enabled (BusIBusImpl           *ibus,
                     g_variant_new ("(b)", enabled));
 }
 
+/**
+ * _ibus_preload_engines:
+ *
+ * Implement the "PreloadEngines" method call of the
+ * org.freedesktop.IBus interface.
+ */
+static void
+_ibus_preload_engines (BusIBusImpl           *ibus,
+                       GVariant              *parameters,
+                       GDBusMethodInvocation *invocation)
+{
+    int i, j;
+    const gchar **names = NULL;
+    IBusEngineDesc *desc = NULL;
+    BusComponent *component = NULL;
+    BusFactoryProxy *factory = NULL;
+    GPtrArray *array = g_ptr_array_new ();
+
+    g_variant_get (parameters, "(^a&s)", &names);
+
+    for (i = 0; names[i] != NULL; i++) {
+        gboolean has_component = FALSE;
+
+        desc = bus_ibus_impl_get_engine_desc(ibus, names[i]);
+
+        if (desc == NULL) {
+            g_dbus_method_invocation_return_error (invocation,
+                                                   G_DBUS_ERROR,
+                                                   G_DBUS_ERROR_FAILED,
+                                                   "Can not find engine %s.",
+                                                   names[i]);
+            g_ptr_array_free (array, FALSE);
+            return;
+        }
+
+        component = bus_component_from_engine_desc (desc);
+        factory = bus_component_get_factory (component);
+
+        if (factory != NULL) {
+            continue;
+        }
+
+        for (j = 0; j < array->len; j++) {
+            if (component == (BusComponent *) g_ptr_array_index (array, j)) {
+                has_component = TRUE;
+                break;
+            }
+        }
+
+        if (!has_component) {
+            g_ptr_array_add (array, component);
+        }
+    }
+
+    for (j = 0; j < array->len; j++) {
+        bus_component_start ((BusComponent *) g_ptr_array_index (array, j),
+                             g_verbose);
+    }
+
+    g_ptr_array_free (array, FALSE);
+
+    g_dbus_method_invocation_return_value (invocation, NULL);
+}
+
 /**
  * bus_ibus_impl_service_method_call:
  *
@@ -1252,6 +1319,7 @@ bus_ibus_impl_service_method_call (IBusService           *service,
         { "GetGlobalEngine",       _ibus_get_global_engine },
         { "SetGlobalEngine",       _ibus_set_global_engine },
         { "IsGlobalEngineEnabled", _ibus_is_global_engine_enabled },
+        { "PreloadEngines",        _ibus_preload_engines },
     };
 
     gint i;
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 91180204d..66a848666 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2006,6 +2006,68 @@ ibus_bus_set_global_engine_async_finish (IBusBus      *bus,
     return _async_finish_void (res, error);
 }
 
+gboolean
+ibus_bus_preload_engines (IBusBus             *bus,
+                          const gchar * const *names)
+{
+    GVariant *result;
+
+    g_return_val_if_fail (IBUS_IS_BUS (bus), FALSE);
+    g_return_val_if_fail (names != NULL && names[0] != NULL, FALSE);
+
+    result = ibus_bus_call_sync (bus,
+                                 IBUS_SERVICE_IBUS,
+                                 IBUS_PATH_IBUS,
+                                 IBUS_INTERFACE_IBUS,
+                                 "PreloadEngines",
+                                 g_variant_new("(^as)", names),
+                                 NULL);
+
+    if (result) {
+        g_variant_unref (result);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void
+ibus_bus_preload_engines_async (IBusBus             *bus,
+                                const gchar * const *names,
+                                gint                 timeout_msec,
+                                GCancellable        *cancellable,
+                                GAsyncReadyCallback  callback,
+                                gpointer             user_data)
+{
+    g_return_if_fail (IBUS_IS_BUS (bus));
+    g_return_if_fail (names != NULL && names[0] != NULL);
+
+    ibus_bus_call_async (bus,
+                         IBUS_SERVICE_IBUS,
+                         IBUS_PATH_IBUS,
+                         IBUS_INTERFACE_IBUS,
+                         "PreloadEngines",
+                         g_variant_new("(^as)", names),
+                         NULL, /* no return value */
+                         ibus_bus_preload_engines_async,
+                         timeout_msec,
+                         cancellable,
+                         callback,
+                         user_data);
+}
+
+gboolean
+ibus_bus_preload_engines_async_finish (IBusBus       *bus,
+                                       GAsyncResult  *res,
+                                       GError       **error)
+{
+    g_assert (IBUS_IS_BUS (bus));
+    g_assert (g_simple_async_result_is_valid (
+            res, (GObject *) bus,
+            ibus_bus_preload_engines_async));
+    return _async_finish_void (res, error);
+}
+
 static GVariant *
 ibus_bus_call_sync (IBusBus            *bus,
                     const gchar        *bus_name,
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 767336574..12883177e 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -995,5 +995,53 @@ void         ibus_bus_set_watch_ibus_signal
  */
 IBusConfig  *ibus_bus_get_config        (IBusBus        *bus);
 
+/**
+ * ibus_bus_preload_engines:
+ * @bus: An #IBusBus.
+ * @names: (array zero-terminated=1): A %NULL-terminated array of engine names.
+ * @returns: %TRUE if components start. %FALSE otherwise.
+ *
+ * Start bus components by engine names synchronously.
+ */
+gboolean     ibus_bus_preload_engines   (IBusBus        *bus,
+                                         const gchar * const *names);
+
+/**
+ * ibus_bus_preload_engines_async:
+ * @bus: An #IBusBus.
+ * @names: (array zero-terminated=1): A %NULL-terminated array of engine names.
+ * @timeout_msec: The timeout in milliseconds or -1 to use the default timeout.
+ * @cancellable: A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied
+ *      or %NULL if you don't care about the result of the method invocation.
+ * @user_data: The data to pass to callback.
+ *
+ * Start bus components by engine names asynchronously.
+ */
+void         ibus_bus_preload_engines_async
+                                        (IBusBus        *bus,
+                                         const gchar * const
+                                                        *names,
+                                         gint            timeout_msec,
+                                         GCancellable   *cancellable,
+                                         GAsyncReadyCallback
+                                                         callback,
+                                         gpointer        user_data);
+
+/**
+ * ibus_bus_preload_engines_async_finish:
+ * @bus: An #IBusBus.
+ * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
+ *   ibus_bus_preload_engines_async().
+ * @error: Return location for error or %NULL.
+ * @returns: %TRUE if component starts. %FALSE otherwise.
+ *
+ * Finishes an operation started with ibus_bus_preload_engines_async().
+ */
+gboolean     ibus_bus_preload_engines_async_finish
+                                        (IBusBus        *bus,
+                                         GAsyncResult   *res,
+                                         GError        **error);
+
 G_END_DECLS
 #endif
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index da1253432..c0d4a104f 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -497,6 +497,31 @@ start_set_global_engine_async (void)
                                       NULL); /* user_data */
 }
 
+static void
+finish_preload_engines_async (GObject      *source_object,
+                              GAsyncResult *res,
+                              gpointer      user_data)
+{
+    GError *error = NULL;
+    ibus_bus_preload_engines_async_finish (bus, res, &error);
+    g_debug ("ibus_bus_preload_engines_async_finish: OK");
+    call_next_async_function ();
+}
+
+static void
+start_preload_engines_async (void)
+{
+    const gchar *preload_engines[] = { "xkb:us::eng", NULL };
+
+    ibus_bus_preload_engines_async (
+            bus,
+            preload_engines,
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_preload_engines_async,
+            NULL); /* user_data */
+}
+
 static void
 finish_exit_async (GObject *source_object,
                    GAsyncResult *res,
@@ -593,6 +618,7 @@ call_next_async_function (void)
         start_is_global_engine_enabled_async,
         start_set_global_engine_async,
         start_get_global_engine_async,
+        start_preload_engines_async,
         start_exit_async,
     };
     static guint index = 0;
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 18ef5c09e..0d7a5b2f1 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -443,6 +443,17 @@ class Panel : IBus.PanelService {
         }
     }
 
+    private void run_preload_engines(IBus.EngineDesc[] engines, int index) {
+        string[] names = {};
+
+        if (engines.length <= index) {
+            return;
+        }
+
+        names += engines[index].get_name();
+        m_bus.preload_engines_async(names, -1, null);
+    }
+
     private void update_engines(GLib.Variant? var_engines,
                                 GLib.Variant? var_order) {
         string[] engine_names = null;
@@ -473,6 +484,7 @@ class Panel : IBus.PanelService {
         if (m_engines.length == 0) {
             m_engines = engines;
             switch_engine(0, true);
+            run_preload_engines(engines, 1);
         } else {
             var current_engine = m_engines[0];
             m_engines = engines;
@@ -480,10 +492,16 @@ class Panel : IBus.PanelService {
             for (i = 0; i < m_engines.length; i++) {
                 if (current_engine.get_name() == engines[i].get_name()) {
                     switch_engine(i);
+                    if (i != 0) {
+                        run_preload_engines(engines, 0);
+                    } else {
+                        run_preload_engines(engines, 1);
+                    }
                     return;
                 }
             }
             switch_engine(0, true);
+            run_preload_engines(engines, 1);
         }
 
     }

From 69b48942e8ac9d39afeadfd9eb34f83247e8082a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Sun, 10 Mar 2013 14:55:42 +0900
Subject: [PATCH 130/816] Simplify component xml generation using sed

BUG=none

Review URL: https://codereview.appspot.com/7445048
---
 conf/dconf/Makefile.am                             | 12 +++++-------
 conf/dconf/{dconf.xml.in.in => dconf.xml.in}       |  4 ++--
 conf/gconf/Makefile.am                             | 12 +++++-------
 conf/gconf/{gconf.xml.in.in => gconf.xml.in}       |  4 ++--
 conf/memconf/Makefile.am                           | 12 +++++-------
 conf/memconf/{memconf.xml.in.in => memconf.xml.in} |  4 ++--
 configure.ac                                       |  5 -----
 engine/Makefile.am                                 | 12 +++++-------
 engine/gensimple.py                                |  5 +++--
 engine/{simple.xml.in.in => simple.xml.in}         |  3 ++-
 ui/gtk2/Makefile.am                                | 12 +++++-------
 ui/gtk2/{gtkpanel.xml.in.in => gtkpanel.xml.in}    |  2 +-
 ui/gtk3/Makefile.am                                | 12 +++++-------
 ui/gtk3/{gtkpanel.xml.in.in => gtkpanel.xml.in}    |  4 ++--
 14 files changed, 44 insertions(+), 59 deletions(-)
 rename conf/dconf/{dconf.xml.in.in => dconf.xml.in} (80%)
 rename conf/gconf/{gconf.xml.in.in => gconf.xml.in} (80%)
 rename conf/memconf/{memconf.xml.in.in => memconf.xml.in} (80%)
 rename engine/{simple.xml.in.in => simple.xml.in} (99%)
 rename ui/gtk2/{gtkpanel.xml.in.in => gtkpanel.xml.in} (90%)
 rename ui/gtk3/{gtkpanel.xml.in.in => gtkpanel.xml.in} (80%)

diff --git a/conf/dconf/Makefile.am b/conf/dconf/Makefile.am
index f0e24b0a4..48dd0ce0e 100644
--- a/conf/dconf/Makefile.am
+++ b/conf/dconf/Makefile.am
@@ -66,16 +66,14 @@ DISTCLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	dconf.xml.in.in \
+	dconf.xml.in \
 	$(NULL)
 
 dconf.xml: dconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in
similarity index 80%
rename from conf/dconf/dconf.xml.in.in
rename to conf/dconf/dconf.xml.in
index ceb2b0c6b..4e546a970 100644
--- a/conf/dconf/dconf.xml.in.in
+++ b/conf/dconf/dconf.xml.in
@@ -1,9 +1,9 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: dconf.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>Dconf Config Component</description>
-	<exec>${libexecdir}/ibus-dconf</exec>
+	<exec>@libexecdir@/ibus-dconf</exec>
 	<version>@VERSION@</version>
 	<author>Daiki Ueno &lt;ueno@unixuser.org&gt;</author>
 	<license>GPL</license>
diff --git a/conf/gconf/Makefile.am b/conf/gconf/Makefile.am
index cf74a4aba..40cde9006 100644
--- a/conf/gconf/Makefile.am
+++ b/conf/gconf/Makefile.am
@@ -62,16 +62,14 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	gconf.xml.in.in \
+	gconf.xml.in \
 	$(NULL)
 
 gconf.xml: gconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in
similarity index 80%
rename from conf/gconf/gconf.xml.in.in
rename to conf/gconf/gconf.xml.in
index d82179f32..96d12f390 100644
--- a/conf/gconf/gconf.xml.in.in
+++ b/conf/gconf/gconf.xml.in
@@ -1,9 +1,9 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: pinyin.xml -->
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>GConf Config Component</description>
-	<exec>${libexecdir}/ibus-gconf</exec>
+	<exec>@libexecdir@/ibus-gconf</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index 5837e6617..ebaf76e43 100644
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -67,16 +67,14 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	memconf.xml.in.in \
+	memconf.xml.in \
 	$(NULL)
 
 memconf.xml: memconf.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/conf/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in
similarity index 80%
rename from conf/memconf/memconf.xml.in.in
rename to conf/memconf/memconf.xml.in
index 939e40af0..b6fdacf30 100644
--- a/conf/memconf/memconf.xml.in.in
+++ b/conf/memconf/memconf.xml.in
@@ -1,8 +1,8 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <component>
 	<name>org.freedesktop.IBus.Config</name>
 	<description>On-memory Config Component</description>
-	<exec>${libexecdir}/ibus-memconf</exec>
+	<exec>@libexecdir@/ibus-memconf</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;, modified by the Chromium OS Authors</author>
 	<license>GPL</license>
diff --git a/configure.ac b/configure.ac
index b328073f8..e4bf865a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,6 @@ src/ibusversion.h
 src/tests/Makefile
 bus/Makefile
 engine/Makefile
-engine/simple.xml.in
 util/Makefile
 util/IMdkit/Makefile
 data/Makefile
@@ -536,7 +535,6 @@ ibus/Makefile
 ibus/interface/Makefile
 ui/Makefile
 ui/gtk3/Makefile
-ui/gtk3/gtkpanel.xml.in
 setup/Makefile
 setup/ibus-setup
 bindings/Makefile
@@ -544,11 +542,8 @@ bindings/pygobject/Makefile
 bindings/vala/Makefile
 conf/Makefile
 conf/gconf/Makefile
-conf/gconf/gconf.xml.in
 conf/dconf/Makefile
-conf/dconf/dconf.xml.in
 conf/memconf/Makefile
-conf/memconf/memconf.xml.in
 tools/Makefile
 ])
 
diff --git a/engine/Makefile.am b/engine/Makefile.am
index b3b46bef5..aa1450d55 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -83,16 +83,14 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	simple.xml.in.in \
+	simple.xml.in \
 	$(NULL)
 
 simple.xml: simple.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/engine/gensimple.py b/engine/gensimple.py
index 9dd06ead5..857397ea3 100644
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -63,10 +63,11 @@ def parse_xml():
             yield name, variant_name, variant_short_desc, variant_desc, languages + variant_languages
 
 def gen_xml():
-    header = u"""<component>
+    header = u"""<?xml version="1.0" encoding="utf-8"?>
+<component>
 	<name>org.freedesktop.IBus.Simple</name>
 	<description>A table based simple engine</description>
-	<exec>${libexecdir}/ibus-engine-simple</exec>
+	<exec>@libexecdir@/ibus-engine-simple</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
diff --git a/engine/simple.xml.in.in b/engine/simple.xml.in
similarity index 99%
rename from engine/simple.xml.in.in
rename to engine/simple.xml.in
index 4ecd613db..68174d721 100644
--- a/engine/simple.xml.in.in
+++ b/engine/simple.xml.in
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <component>
 	<name>org.freedesktop.IBus.Simple</name>
 	<description>A table based simple engine</description>
-	<exec>${libexecdir}/ibus-engine-simple</exec>
+	<exec>@libexecdir@/ibus-engine-simple</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
diff --git a/ui/gtk2/Makefile.am b/ui/gtk2/Makefile.am
index 1f1974842..8e6f39195 100644
--- a/ui/gtk2/Makefile.am
+++ b/ui/gtk2/Makefile.am
@@ -52,16 +52,14 @@ CLEANFILES = \
 
 EXTRA_DIST = \
 	ibus-ui-gtk.in \
-	gtkpanel.xml.in.in \
+	gtkpanel.xml.in \
 	$(NULL)
 
 gtkpanel.xml: gtkpanel.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 test:
 	$(ENV) DBUS_DEBUG=true \
diff --git a/ui/gtk2/gtkpanel.xml.in.in b/ui/gtk2/gtkpanel.xml.in
similarity index 90%
rename from ui/gtk2/gtkpanel.xml.in.in
rename to ui/gtk2/gtkpanel.xml.in
index edeed1cb8..5f25ddb03 100644
--- a/ui/gtk2/gtkpanel.xml.in.in
+++ b/ui/gtk2/gtkpanel.xml.in
@@ -3,7 +3,7 @@
 <component>
 	<name>org.freedesktop.IBus.Panel</name>
 	<description>Gtk Panel Component</description>
-	<exec>${libexecdir}/ibus-ui-gtk</exec>
+	<exec>@libexecdir@/ibus-ui-gtk</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 547302771..43454bc5d 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -30,12 +30,10 @@ component_DATA = \
 componentdir = $(pkgdatadir)/component
 
 gtkpanel.xml: gtkpanel.xml.in
-	$(AM_V_GEN) \
-	( \
-		libexecdir=${libexecdir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+		mv $@.tmp $@
 
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -110,7 +108,7 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	gtkpanel.xml.in.in \
+	gtkpanel.xml.in \
 	$(NULL)
 
 
diff --git a/ui/gtk3/gtkpanel.xml.in.in b/ui/gtk3/gtkpanel.xml.in
similarity index 80%
rename from ui/gtk3/gtkpanel.xml.in.in
rename to ui/gtk3/gtkpanel.xml.in
index 1d2cf7390..a68d05484 100644
--- a/ui/gtk3/gtkpanel.xml.in.in
+++ b/ui/gtk3/gtkpanel.xml.in
@@ -1,9 +1,9 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: gtkpanel.xml -->
 <component>
 	<name>org.freedesktop.IBus.Panel</name>
 	<description>Gtk Panel Component</description>
-	<exec>${libexecdir}/ibus-ui-gtk3</exec>
+	<exec>@libexecdir@/ibus-ui-gtk3</exec>
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>

From 42dd60fe1fcdce11e7ac517786b398eba0cb9e17 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 12 Mar 2013 06:41:43 +0900
Subject: [PATCH 131/816] Add textdomain property to IBusEngineDesc

BUG=Issue#1580

Review URL: https://codereview.appspot.com/7692043
---
 bindings/pygobject/gi/overrides/IBus.py |  2 ++
 src/ibusenginedesc.c                    | 33 +++++++++++++++++++++++++
 src/ibusenginedesc.h                    | 11 +++++++++
 3 files changed, 46 insertions(+)

diff --git a/bindings/pygobject/gi/overrides/IBus.py b/bindings/pygobject/gi/overrides/IBus.py
index dcead0ed5..51c849b4d 100644
--- a/bindings/pygobject/gi/overrides/IBus.py
+++ b/bindings/pygobject/gi/overrides/IBus.py
@@ -107,6 +107,7 @@ def __init__(self,
                  layout_variant='',
                  layout_option='',
                  version='',
+                 textdomain='',
                  **kwargs):
         super(EngineDesc, self).__init__(name=name,
                                          longname=longname,
@@ -123,6 +124,7 @@ def __init__(self,
                                          layout_variant=layout_variant,
                                          layout_option=layout_option,
                                          version=version,
+                                         textdomain=textdomain,
                                          **kwargs)
 
 EngineDesc = override(EngineDesc)
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index 78ae50065..2923462c0 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -44,6 +44,7 @@ enum {
     PROP_SYMBOL,
     PROP_SETUP,
     PROP_VERSION,
+    PROP_TEXTDOMAIN,
 };
 
 
@@ -64,6 +65,7 @@ struct _IBusEngineDescPrivate {
     gchar      *symbol;
     gchar      *setup;
     gchar      *version;
+    gchar      *textdomain;
 };
 
 #define IBUS_ENGINE_DESC_GET_PRIVATE(o)  \
@@ -307,6 +309,19 @@ ibus_engine_desc_class_init (IBusEngineDescClass *class)
                         "The version number of engine description",
                         "",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEngineDesc:textdomain:
+     *
+     * The textdomain of engine description
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_TEXTDOMAIN,
+                    g_param_spec_string ("textdomain",
+                        "textdomain",
+                        "The textdomain of engine description",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -329,6 +344,7 @@ ibus_engine_desc_init (IBusEngineDesc *desc)
     desc->priv->symbol = NULL;
     desc->priv->setup = NULL;
     desc->priv->version = NULL;
+    desc->priv->textdomain = NULL;
 }
 
 static void
@@ -348,6 +364,7 @@ ibus_engine_desc_destroy (IBusEngineDesc *desc)
     g_free (desc->priv->symbol);
     g_free (desc->priv->setup);
     g_free (desc->priv->version);
+    g_free (desc->priv->textdomain);
 
     IBUS_OBJECT_CLASS (ibus_engine_desc_parent_class)->destroy (IBUS_OBJECT (desc));
 }
@@ -418,6 +435,10 @@ ibus_engine_desc_set_property (IBusEngineDesc *desc,
         g_assert (desc->priv->version == NULL);
         desc->priv->version = g_value_dup_string (value);
         break;
+    case PROP_TEXTDOMAIN:
+        g_assert (desc->priv->textdomain == NULL);
+        desc->priv->textdomain = g_value_dup_string (value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -475,6 +496,9 @@ ibus_engine_desc_get_property (IBusEngineDesc *desc,
     case PROP_VERSION:
         g_value_set_string (value, ibus_engine_desc_get_version (desc));
         break;
+    case PROP_TEXTDOMAIN:
+        g_value_set_string (value, ibus_engine_desc_get_textdomain (desc));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -511,6 +535,7 @@ ibus_engine_desc_serialize (IBusEngineDesc  *desc,
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_variant));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_option));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->version));
+    g_variant_builder_add (builder, "s", NOTNULL (desc->priv->textdomain));
 #undef NOTNULL
 
     return TRUE;
@@ -549,6 +574,9 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
     if (g_variant_n_children (variant) < retval + 1)
         return retval;
     g_variant_get_child (variant, retval++, "s", &desc->priv->version);
+    if (g_variant_n_children (variant) < retval + 1)
+        return retval;
+    g_variant_get_child (variant, retval++, "s", &desc->priv->textdomain);
 
     return retval;
 }
@@ -578,6 +606,7 @@ ibus_engine_desc_copy (IBusEngineDesc       *dest,
     dest->priv->symbol           = g_strdup (src->priv->symbol);
     dest->priv->setup            = g_strdup (src->priv->setup);
     dest->priv->version          = g_strdup (src->priv->version);
+    dest->priv->textdomain       = g_strdup (src->priv->textdomain);
     return TRUE;
 }
 
@@ -620,6 +649,7 @@ ibus_engine_desc_output (IBusEngineDesc *desc,
     OUTPUT_ENTRY_1(symbol);
     OUTPUT_ENTRY_1(setup);
     OUTPUT_ENTRY_1(version);
+    OUTPUT_ENTRY_1(textdomain);
     g_string_append_indent (output, indent + 1);
     g_string_append_printf (output, "<rank>%u</rank>\n", desc->priv->rank);
 #undef OUTPUT_ENTRY
@@ -658,6 +688,7 @@ ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc,
         PARSE_ENTRY_1(symbol);
         PARSE_ENTRY_1(setup);
         PARSE_ENTRY_1(version);
+        PARSE_ENTRY_1(textdomain);
 #undef PARSE_ENTRY
 #undef PARSE_ENTRY_1
         if (g_strcmp0 (sub_node->name , "rank") == 0) {
@@ -691,6 +722,7 @@ IBUS_ENGINE_DESC_GET_PROPERTY (hotkeys, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (symbol, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (setup, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (version, const gchar *)
+IBUS_ENGINE_DESC_GET_PROPERTY (textdomain, const gchar *)
 #undef IBUS_ENGINE_DESC_GET_PROPERTY
 
 IBusEngineDesc *
@@ -743,6 +775,7 @@ ibus_engine_desc_new_varargs (const gchar *first_property_name, ...)
     g_assert (desc->priv->symbol);
     g_assert (desc->priv->setup);
     g_assert (desc->priv->version);
+    g_assert (desc->priv->textdomain);
 
     return desc;
 }
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index eda64c7a4..2d761f24c 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -94,6 +94,7 @@ typedef struct _IBusEngineDescClass IBusEngineDescClass;
  *  semi-colon.
  * setup: Exec lists of the engine setup command.
  * version: Version number of the input method engine.
+ * textdomain: Domain name for dgettext()
  */
 struct _IBusEngineDesc {
     IBusSerializable parent;
@@ -299,6 +300,16 @@ const gchar     *ibus_engine_desc_get_setup     (IBusEngineDesc *info);
  */
 const gchar     *ibus_engine_desc_get_version   (IBusEngineDesc *info);
 
+/**
+ * ibus_engine_desc_get_textdomain:
+ * @info: An IBusEngineDesc
+ * @returns: textdomain in IBusEngineDesc
+ *
+ * Return the textdomain property in IBusEngineDesc. It should not be freed.
+ */
+const gchar     *ibus_engine_desc_get_textdomain
+                                                (IBusEngineDesc *info);
+
 /**
  * ibus_engine_desc_output:
  * @info: An IBusEngineDesc

From 2e7ece775f5412ab8e83a11e4d423b32a6114159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 12 Mar 2013 11:17:59 +0900
Subject: [PATCH 132/816] bash completion: No need to install it as executable.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BUG=http://code.google.com/p/ibus/issues/detail?id=1601

Review URL: https://codereview.appspot.com/7696043
Patch from Ville Skyttä <ville.skytta@iki.fi>.
---
 tools/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 830fc4fde..de3041093 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -70,7 +70,7 @@ ibus_LDADD = \
 	$(AM_LDADD) \
 	$(NULL)
 
-bash_completion_SCRIPTS= \
+bash_completion_DATA= \
 	ibus.bash \
 	$(NULL)
 bash_completiondir=@sysconfdir@/bash_completion.d

From 175df2261b431eff65349b47bc6bd086051cde41 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 21 Mar 2013 11:13:52 +0900
Subject: [PATCH 133/816] Move ibus.bash script from /etc to /usr/share

BUG=RH#922996

Review URL: https://codereview.appspot.com/7863045
---
 tools/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index de3041093..5aa109910 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -73,7 +73,7 @@ ibus_LDADD = \
 bash_completion_DATA= \
 	ibus.bash \
 	$(NULL)
-bash_completiondir=@sysconfdir@/bash_completion.d
+bash_completiondir=@datadir@/bash-completion/completions
 
 EXTRA_DIST = \
 	ibus.bash \

From af1f409a3eace2ea9a063957a8797a50a77d131a Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Tue, 26 Mar 2013 06:54:43 -0400
Subject: [PATCH 134/816] Fix build error and warnings in Fedora 18.

BUG=None
TEST=Manual

Review URL: https://codereview.appspot.com/7531047
---
 bus/dbusimpl.c              | 31 +++++++++++++++++--------------
 bus/main.c                  |  3 ---
 client/gtk2/ibusimcontext.c | 11 +++++++++--
 configure.ac                |  4 ++--
 ibus.spec.in                | 11 +++++++++--
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 366a24643..7b8294b29 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -61,10 +61,10 @@ struct _BusDBusImpl {
     /* a serial number used to generate a unique name of a bus. */
     guint id;
 
-    GMutex *dispatch_lock;
+    GMutex dispatch_lock;
     GList *dispatch_queue;
 
-    GMutex *forward_lock;
+    GMutex forward_lock;
     GList *forward_queue;
 
     /* a list of BusMethodCall to be used to reply when services are
@@ -582,8 +582,8 @@ bus_dbus_impl_init (BusDBusImpl *dbus)
                                          NULL,
                                          (GDestroyNotify) bus_name_service_free);
 
-    dbus->dispatch_lock = g_mutex_new ();
-    dbus->forward_lock = g_mutex_new ();
+    g_mutex_init (&dbus->dispatch_lock);
+    g_mutex_init (&dbus->forward_lock);
 
     /* other members are automatically zero-initialized. */
 }
@@ -633,6 +633,9 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus)
                       (GDestroyNotify) bus_method_call_free);
     dbus->start_service_calls = NULL;
 
+    g_mutex_clear (&dbus->dispatch_lock);
+    g_mutex_clear (&dbus->forward_lock);
+
     /* FIXME destruct _lock and _queue members. */
     IBUS_OBJECT_CLASS(bus_dbus_impl_parent_class)->destroy ((IBusObject *) dbus);
 }
@@ -1711,11 +1714,11 @@ bus_dbus_impl_forward_message_idle_cb (BusDBusImpl   *dbus)
 {
     g_return_val_if_fail (dbus->forward_queue != NULL, FALSE);
 
-    g_mutex_lock (dbus->forward_lock);
+    g_mutex_lock (&dbus->forward_lock);
     BusForwardData *data = (BusForwardData *) dbus->forward_queue->data;
     dbus->forward_queue = g_list_delete_link (dbus->forward_queue, dbus->forward_queue);
     gboolean has_message = (dbus->forward_queue != NULL);
-    g_mutex_unlock (dbus->forward_lock);
+    g_mutex_unlock (&dbus->forward_lock);
 
     do {
         const gchar *destination = g_dbus_message_get_destination (data->message);
@@ -1782,10 +1785,10 @@ bus_dbus_impl_forward_message (BusDBusImpl   *dbus,
     data->message = g_object_ref (message);
     data->sender_connection = g_object_ref (connection);
 
-    g_mutex_lock (dbus->forward_lock);
+    g_mutex_lock (&dbus->forward_lock);
     gboolean is_running = (dbus->forward_queue != NULL);
     dbus->forward_queue = g_list_append (dbus->forward_queue, data);
-    g_mutex_unlock (dbus->forward_lock);
+    g_mutex_unlock (&dbus->forward_lock);
 
     if (!is_running) {
         g_idle_add_full (G_PRIORITY_DEFAULT,
@@ -1832,20 +1835,20 @@ bus_dbus_impl_dispatch_message_by_rule_idle_cb (BusDBusImpl *dbus)
 
     if (G_UNLIKELY (IBUS_OBJECT_DESTROYED (dbus))) {
         /* dbus was destryed */
-        g_mutex_lock (dbus->dispatch_lock);
+        g_mutex_lock (&dbus->dispatch_lock);
         g_list_free_full (dbus->dispatch_queue,
                           (GDestroyNotify) bus_dispatch_data_free);
         dbus->dispatch_queue = NULL;
-        g_mutex_unlock (dbus->dispatch_lock);
+        g_mutex_unlock (&dbus->dispatch_lock);
         return FALSE; /* return FALSE to prevent this callback to be called again. */
     }
 
     /* remove fist node */
-    g_mutex_lock (dbus->dispatch_lock);
+    g_mutex_lock (&dbus->dispatch_lock);
     BusDispatchData *data = (BusDispatchData *) dbus->dispatch_queue->data;
     dbus->dispatch_queue = g_list_delete_link (dbus->dispatch_queue, dbus->dispatch_queue);
     gboolean has_message = (dbus->dispatch_queue != NULL);
-    g_mutex_unlock (dbus->dispatch_lock);
+    g_mutex_unlock (&dbus->dispatch_lock);
 
     GList *link = NULL;
     GList *recipients = NULL;
@@ -1899,11 +1902,11 @@ bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl     *dbus,
     g_object_set_qdata ((GObject *) message, dispatched_quark, GINT_TO_POINTER (1));
 
     /* append dispatch data into the queue, and start idle task if necessary */
-    g_mutex_lock (dbus->dispatch_lock);
+    g_mutex_lock (&dbus->dispatch_lock);
     gboolean is_running = (dbus->dispatch_queue != NULL);
     dbus->dispatch_queue = g_list_append (dbus->dispatch_queue,
                     bus_dispatch_data_new (message, skip_connection));
-    g_mutex_unlock (dbus->dispatch_lock);
+    g_mutex_unlock (&dbus->dispatch_lock);
     if (!is_running) {
         g_idle_add_full (G_PRIORITY_DEFAULT,
                          (GSourceFunc) bus_dbus_impl_dispatch_message_by_rule_idle_cb,
diff --git a/bus/main.c b/bus/main.c
index 791a524cb..676988fef 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -214,9 +214,6 @@ main (gint argc, gchar **argv)
 
     ibus_init ();
 
-#ifdef G_THREADS_ENABLED
-    g_thread_init (NULL);
-#endif
     ibus_set_log_handler (g_verbose);
 
     /* check if ibus-daemon is running in this session */
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 94005b712..49598b439 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -562,8 +562,12 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 
 
     /* always install snooper */
-    if (_key_snooper_id == 0)
+    if (_key_snooper_id == 0) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
+#pragma GCC diagnostic pop
+    }
 
     _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                               IBUS_SERVICE_IBUS,
@@ -579,7 +583,10 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
 {
     if (_key_snooper_id != 0) {
         IDEBUG ("snooper is terminated.");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         gtk_key_snooper_remove (_key_snooper_id);
+#pragma GCC diagnostic pop
         _key_snooper_id = 0;
     }
 
@@ -1528,7 +1535,7 @@ _create_input_context_done (IBusBus       *bus,
 
         if (!g_queue_is_empty (ibusimcontext->events_queue)) {
             GdkEventKey *event;
-            while (event = g_queue_pop_head (ibusimcontext->events_queue)) {
+            while ((event = g_queue_pop_head (ibusimcontext->events_queue))) {
                 _process_key_event (context, event);
                 gdk_event_free ((GdkEvent *)event);
             }
diff --git a/configure.ac b/configure.ac
index e48cc7351..21c0d49a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ m4_define([ibus_binary_version],
           [ibus_major_version.ibus_abi_current_minus_age.ibus_abi_age.ibus_abi_revision])
 
 # Required versions of other packages.
-m4_define([glib_required_version], [2.26.0])
+m4_define([glib_required_version], [2.32.0])
 
 
 # Init automake.
@@ -350,7 +350,7 @@ AM_PATH_PYTHON([2.5])
 PYGOBJECT_REQUIRED=3.0.0
 
 PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
-                 [enable_pygobject=yes],[enable_pygobject=no])
+                 [enable_pygobject=yes], [enable_pygobject=no])
 
 if test "x$enable_pygobject" = "xyes"; then
 	PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
diff --git a/ibus.spec.in b/ibus.spec.in
index aa36ea60d..7989949bf 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -257,7 +257,12 @@ dconf update &> /dev/null || :
 %{_bindir}/ibus
 %{_bindir}/ibus-daemon
 %{_bindir}/ibus-setup
-%{_datadir}/ibus/*
+%{_datadir}/ibus/component/gtkpanel.xml
+%{_datadir}/ibus/component/simple.xml
+%{_datadir}/ibus/keymaps/*
+%{_datadir}/ibus/setup/*
+
+
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
 %if %{build_python_library}
@@ -267,7 +272,7 @@ dconf update &> /dev/null || :
 %{_libexecdir}/ibus-x11
 %{_libexecdir}/ibus-engine-simple
 # %{_sysconfdir}/xdg/autostart/ibus.desktop
-%{_sysconfdir}/bash_completion.d/ibus.bash
+%{_datadir}/bash-completion/completions/ibus.bash
 %config %{_xinputconf}
 
 %files libs
@@ -277,11 +282,13 @@ dconf update &> /dev/null || :
 
 %files gconf
 %defattr(-,root,root,-)
+%{_datadir}/ibus/component/gconf.xml
 %{_libexecdir}/ibus-gconf
 %{_sysconfdir}/gconf/schemas/ibus.schemas
 
 %files dconf
 %defattr(-,root,root,-)
+%{_datadir}/ibus/component/dconf.xml
 %{_libexecdir}/ibus-dconf
 %{_sysconfdir}/dconf/db/ibus.d
 %{_sysconfdir}/dconf/profile/ibus

From 261bc3046f1e5deb5879bac23900ff7dbfa5a20d Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Tue, 26 Mar 2013 06:55:09 -0400
Subject: [PATCH 135/816] Draw highlight for focused IME in IME switcher.

BUG=None
TEST=Manual

Review URL: https://codereview.appspot.com/7689046
---
 ui/gtk3/switcher.vala | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 74c33726a..4a027432f 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -61,6 +61,19 @@ class Switcher : Gtk.Window {
         }
 
         public string longname { get; set; }
+
+        public override bool draw(Cairo.Context cr) {
+            base.draw(cr);
+            if (is_focus) {
+                cr.save();
+                cr.rectangle(
+                        0, 0, get_allocated_width(), get_allocated_height());
+                cr.set_source_rgba(0.0, 0.0, 1.0, 0.1);
+                cr.fill();
+                cr.restore();
+            }
+            return true;
+        }
     }
 
     private Gtk.Box m_box;

From fe321d51ee5f7f4e7f3886ef6f55e4820a92675f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 17 Apr 2013 09:57:33 +0900
Subject: [PATCH 136/816] Release 1.5.2

Review URL: https://codereview.appspot.com/7530044
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 21c0d49a8..303679245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [1])
+m4_define([ibus_micro_version], [2])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 0b612dfb8ab52a61896b9079acd2d76a360f8666 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 22 Apr 2013 20:16:31 +0900
Subject: [PATCH 137/816] Fix make dist errors.

Review URL: https://codereview.appspot.com/8850043
---
 bindings/pygobject/Makefile.am | 6 +++++-
 bindings/vala/Makefile.am      | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index 3980bc669..636039785 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -27,7 +27,11 @@ overrides_PYTHON =				\
 	gi/overrides/IBus.py			\
 	$(NULL)
 
-TESTS = test-override-ibus.py
+TESTS =
+
+if ENABLE_TESTS
+TESTS += test-override-ibus.py
+endif
 
 TESTS_ENVIRONMENT = \
 	PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index aba3454d0..381ef319a 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -50,4 +50,6 @@ EXTRA_DIST = \
 	xi.vapi \
 	$(NULL)
 
+DIST_SOURCES = $(VAPIGEN_VAPIS)
+
 -include $(top_srcdir)/git.mk

From 4e175e3337337f2c261088d4576ea63a144cee3a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 24 Apr 2013 13:44:35 +0900
Subject: [PATCH 138/816] Use EXTRA_DIST instead of DIST_SOURCES.

Review URL: https://codereview.appspot.com/8698047
---
 bindings/vala/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 381ef319a..be45e41a8 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -42,7 +42,10 @@ ibus_1_0_vapi_FILES = \
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
+MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
+
 EXTRA_DIST = \
+	$(VAPIGEN_VAPIS) \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
 	ibus-1.0.deps \
@@ -50,6 +53,4 @@ EXTRA_DIST = \
 	xi.vapi \
 	$(NULL)
 
-DIST_SOURCES = $(VAPIGEN_VAPIS)
-
 -include $(top_srcdir)/git.mk

From 667b7f0b96e5a7e1190e606a9c680bcbda8c2a88 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 30 Apr 2013 21:46:02 +0900
Subject: [PATCH 139/816] Implement embed_preedit_text.

BUG=http://code.google.com/p/ibus/issues/detail?id=1606

Review URL: https://codereview.appspot.com/8112044
---
 bus/ibusimpl.c     | 310 +++++++++++++++++++++++++++++++++++++++------
 src/ibusbus.c      |  54 ++++++++
 src/ibusbus.h      |  24 ++++
 ui/gtk3/panel.vala |  23 ++++
 4 files changed, 370 insertions(+), 41 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 62185786a..594216ab8 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -51,11 +51,13 @@ struct _BusIBusImpl {
     /* a fake input context for global engine support */
     BusInputContext *fake_context;
     
-    /* a list of engines that are started by a user (without the --ibus command line flag.) */
+    /* a list of engines that are started by a user (without the --ibus
+     * command line flag.) */
     GList *register_engine_list;
 
-    /* if TRUE, ibus-daemon uses a keysym translated by the system (i.e. XKB) as-is.
-     * otherwise, ibus-daemon itself converts keycode into keysym. */
+    /* if TRUE, ibus-daemon uses a keysym translated by the system
+     * (i.e. XKB) as-is. otherwise, ibus-daemon itself converts keycode
+     * into keysym. */
     gboolean use_sys_layout;
 
     gboolean embed_preedit_text;
@@ -65,7 +67,8 @@ struct _BusIBusImpl {
     BusInputContext *focused_context;
     BusPanelProxy   *panel;
 
-    /* a default keymap of ibus-daemon (usually "us") which is used only when use_sys_layout is FALSE. */
+    /* a default keymap of ibus-daemon (usually "us") which is used only
+     * when use_sys_layout is FALSE. */
     IBusKeymap      *keymap;
 
     gboolean use_global_engine;
@@ -92,45 +95,70 @@ static guint            _signals[LAST_SIGNAL] = { 0 };
 */
 
 /* functions prototype */
-static void      bus_ibus_impl_destroy           (BusIBusImpl        *ibus);
+static void      bus_ibus_impl_destroy  (BusIBusImpl        *ibus);
 static void      bus_ibus_impl_service_method_call
-                                                 (IBusService        *service,
-                                                  GDBusConnection    *connection,
-                                                  const gchar        *sender,
-                                                  const gchar        *object_path,
-                                                  const gchar        *interface_name,
-                                                  const gchar        *method_name,
-                                                  GVariant           *parameters,
-                                                  GDBusMethodInvocation
-                                                                     *invocation);
-static void     bus_ibus_impl_registry_changed  (BusIBusImpl        *ibus);
+                                        (IBusService        *service,
+                                         GDBusConnection    *connection,
+                                         const gchar        *sender,
+                                         const gchar        *object_path,
+                                         const gchar        *interface_name,
+                                         const gchar        *method_name,
+                                         GVariant           *parameters,
+                                         GDBusMethodInvocation
+                                                            *invocation);
+static GVariant *
+                bus_ibus_impl_service_get_property
+                                        (IBusService        *service,
+                                         GDBusConnection    *connection,
+                                         const gchar        *sender,
+                                         const gchar        *object_path,
+                                         const gchar        *interface_name,
+                                         const gchar        *property_name,
+                                         GError            **error);
+static gboolean
+                bus_ibus_impl_service_set_property
+                                        (IBusService        *service,
+                                         GDBusConnection    *connection,
+                                         const gchar        *sender,
+                                         const gchar        *object_path,
+                                         const gchar        *interface_name,
+                                         const gchar        *property_name,
+                                         GVariant           *value,
+                                         GError            **error);
+static void     bus_ibus_impl_registry_changed
+                                        (BusIBusImpl        *ibus);
 static void     bus_ibus_impl_global_engine_changed
-                                                (BusIBusImpl        *ibus);
+                                        (BusIBusImpl        *ibus);
 static void     bus_ibus_impl_set_context_engine_from_desc
-                                                (BusIBusImpl        *ibus,
-                                                 BusInputContext    *context,
-                                                 IBusEngineDesc     *desc);
+                                        (BusIBusImpl        *ibus,
+                                         BusInputContext    *context,
+                                         IBusEngineDesc     *desc);
 static BusInputContext
                *bus_ibus_impl_create_input_context
-                                                (BusIBusImpl        *ibus,
-                                                 BusConnection      *connection,
-                                                 const gchar        *client);
+                                        (BusIBusImpl        *ibus,
+                                         BusConnection      *connection,
+                                         const gchar        *client);
 static IBusEngineDesc
-               *bus_ibus_impl_get_engine_desc   (BusIBusImpl        *ibus,
-                                                 const gchar        *engine_name);
+               *bus_ibus_impl_get_engine_desc
+                                        (BusIBusImpl        *ibus,
+                                         const gchar        *engine_name);
 static void     bus_ibus_impl_set_focused_context
-                                                (BusIBusImpl        *ibus,
-                                                 BusInputContext    *context);
+                                        (BusIBusImpl        *ibus,
+                                         BusInputContext    *context);
 /* some callback functions */
-static void     _context_engine_changed_cb      (BusInputContext    *context,
-                                                 BusIBusImpl        *ibus);
-
-/* The interfaces available in this class, which consists of a list of methods this class implements and
- * a list of signals this class may emit. Method calls to the interface that are not defined in this XML
- * will be automatically rejected by the GDBus library (see src/ibusservice.c for details.) */
+static void     _context_engine_changed_cb
+                                        (BusInputContext    *context,
+                                         BusIBusImpl        *ibus);
+
+/* The interfaces available in this class, which consists of a list of
+ * methods this class implements and a list of signals this class may emit.
+ * Method calls to the interface that are not defined in this XML will 
+ * be automatically rejected by the GDBus library (see src/ibusservice.c
+ * for details.) */
 static const gchar introspection_xml[] =
     "<node>\n"
     "  <interface name='org.freedesktop.IBus'>\n"
+    "    <property name='EmbedPreeditText' type='b' access='readwrite' />\n"
     "    <method name='GetAddress'>\n"
     "      <arg direction='out' type='s' name='address' />\n"
     "    </method>\n"
@@ -193,12 +221,20 @@ G_DEFINE_TYPE (BusIBusImpl, bus_ibus_impl, IBUS_TYPE_SERVICE)
 static void
 bus_ibus_impl_class_init (BusIBusImplClass *class)
 {
-    IBUS_OBJECT_CLASS (class)->destroy = (IBusObjectDestroyFunc) bus_ibus_impl_destroy;
+    IBUS_OBJECT_CLASS (class)->destroy =
+            (IBusObjectDestroyFunc) bus_ibus_impl_destroy;
 
     /* override the parent class's implementation. */
-    IBUS_SERVICE_CLASS (class)->service_method_call = bus_ibus_impl_service_method_call;
-    /* register the xml so that bus_ibus_impl_service_method_call will be called on a method call defined in the xml (e.g. 'GetAddress'.) */
-    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class), introspection_xml);
+    IBUS_SERVICE_CLASS (class)->service_method_call =
+            bus_ibus_impl_service_method_call;
+    IBUS_SERVICE_CLASS (class)->service_get_property =
+            bus_ibus_impl_service_get_property;
+    IBUS_SERVICE_CLASS (class)->service_set_property =
+            bus_ibus_impl_service_set_property;
+    /* register the xml so that bus_ibus_impl_service_method_call will be
+     * called on a method call defined in the xml (e.g. 'GetAddress'.) */
+    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class),
+                                       introspection_xml);
 }
 
 /**
@@ -1277,10 +1313,50 @@ _ibus_preload_engines (BusIBusImpl           *ibus,
     g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
+/**
+ * _ibus_get_embed_preedit_text:
+ *
+ * Implement the "EmbedPreeditText" method call of
+ * the org.freedesktop.IBus interface.
+ */
+static GVariant *
+_ibus_get_embed_preedit_text (BusIBusImpl     *ibus,
+                              GDBusConnection *connection,
+                              GError         **error)
+{
+    if (error) {
+        *error = NULL;
+    }
+
+    return g_variant_new_boolean (ibus->embed_preedit_text);
+}
+
+/**
+ * _ibus_set_embed_preedit_text:
+ *
+ * Implement the "EmbedPreeditText" method call of
+ * the org.freedesktop.IBus interface.
+ */
+static gboolean
+_ibus_set_embed_preedit_text (BusIBusImpl     *ibus,
+                              GDBusConnection *connection,
+                              GVariant        *value,
+                              GError         **error)
+{
+    if (error) {
+        *error = NULL;
+    }
+
+    ibus->embed_preedit_text = g_variant_get_boolean (value);
+
+    return TRUE;
+}
+
 /**
  * bus_ibus_impl_service_method_call:
  *
- * Handle a D-Bus method call whose destination and interface name are both "org.freedesktop.IBus"
+ * Handle a D-Bus method call whose destination and interface name are
+ * both "org.freedesktop.IBus"
  */
 static void
 bus_ibus_impl_service_method_call (IBusService           *service,
@@ -1294,7 +1370,8 @@ bus_ibus_impl_service_method_call (IBusService           *service,
 {
     if (g_strcmp0 (interface_name, "org.freedesktop.IBus") != 0) {
         IBUS_SERVICE_CLASS (bus_ibus_impl_parent_class)->service_method_call (
-                        service, connection, sender, object_path, interface_name, method_name,
+                        service, connection, sender, object_path,
+                        interface_name, method_name,
                         parameters, invocation);
         return;
     }
@@ -1325,13 +1402,164 @@ bus_ibus_impl_service_method_call (IBusService           *service,
     gint i;
     for (i = 0; i < G_N_ELEMENTS (methods); i++) {
         if (g_strcmp0 (methods[i].method_name, method_name) == 0) {
-            methods[i].method_callback ((BusIBusImpl *) service, parameters, invocation);
+            methods[i].method_callback ((BusIBusImpl *) service,
+                                        parameters,
+                                        invocation);
             return;
         }
     }
 
-    /* notreached - unknown method calls that are not in the introspection_xml should be handled by the GDBus library. */
-    g_return_if_reached ();
+    g_warning ("service_method_call received an unknown method: %s",
+               method_name ? method_name : "(null)");
+}
+
+/**
+ * bus_ibus_impl_service_get_property:
+ *
+ * Handle org.freedesktop.DBus.Properties.Get
+ */
+static GVariant *
+bus_ibus_impl_service_get_property (IBusService     *service,
+                                    GDBusConnection *connection,
+                                    const gchar     *sender,
+                                    const gchar     *object_path,
+                                    const gchar     *interface_name,
+                                    const gchar     *property_name,
+                                    GError         **error)
+{
+    gint i;
+
+    static const struct {
+        const gchar *method_name;
+        GVariant * (* method_callback) (BusIBusImpl *,
+                                        GDBusConnection *,
+                                        GError **);
+    } methods [] =  {
+        { "EmbedPreeditText",      _ibus_get_embed_preedit_text },
+    };
+
+    if (g_strcmp0 (interface_name, IBUS_INTERFACE_IBUS) != 0) {
+        return IBUS_SERVICE_CLASS (
+                bus_ibus_impl_parent_class)->service_get_property (
+                        service, connection, sender, object_path,
+                        interface_name, property_name,
+                        error);
+    }
+
+    for (i = 0; i < G_N_ELEMENTS (methods); i++) {
+        if (g_strcmp0 (methods[i].method_name, property_name) == 0) {
+            return methods[i].method_callback ((BusIBusImpl *) service,
+                                               connection,
+                                               error);
+        }
+    }
+
+    g_warning ("service_get_property received an unknown property: %s",
+               property_name ? property_name : "(null)");
+    return NULL;
+}
+
+static void
+_emit_properties_changed (BusIBusImpl     *service,
+                          GDBusConnection *connection,
+                          const gchar     *object_path,
+                          const gchar     *interface_name,
+                          const gchar     *property_name,
+                          GVariant        *value,
+                          gboolean         is_changed)
+{
+    GVariantBuilder *builder;
+    GVariantBuilder *invalidated_builder;
+    GError *error = NULL;
+
+    builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+    invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+    if (is_changed) {
+        g_variant_builder_add (builder, "{sv}", property_name, value);
+    } else {
+        g_variant_builder_add (invalidated_builder, "s", property_name);
+    }
+
+    g_dbus_connection_emit_signal (connection,
+                                   NULL,
+                                   object_path,
+                                   "org.freedesktop.DBus.Properties",
+                                   "PropertiesChanged",
+                                   g_variant_new ("(sa{sv}as)",
+                                                  interface_name,
+                                                  builder,
+                                                  invalidated_builder),
+                                   &error);
+
+    if (error) {
+        g_warning ("Failed to emit property %s in %s.%s: %s",
+                   property_name,
+                   "org.freedesktop.DBus.Properties",
+                   "PropertiesChanged",
+                   error->message);
+        g_error_free (error);
+    }
+}
+
+/**
+ * bus_ibus_impl_service_set_property:
+ *
+ * Handle org.freedesktop.DBus.Properties.Set
+ */
+static gboolean
+bus_ibus_impl_service_set_property (IBusService     *service,
+                                    GDBusConnection *connection,
+                                    const gchar     *sender,
+                                    const gchar     *object_path,
+                                    const gchar     *interface_name,
+                                    const gchar     *property_name,
+                                    GVariant        *value,
+                                    GError         **error)
+{
+    gint i;
+
+    static const struct {
+        const gchar *method_name;
+        gboolean (* method_callback) (BusIBusImpl *,
+                                      GDBusConnection *,
+                                      GVariant *,
+                                      GError **);
+    } methods [] =  {
+        { "EmbedPreeditText",      _ibus_set_embed_preedit_text },
+    };
+
+    if (g_strcmp0 (interface_name, IBUS_INTERFACE_IBUS) != 0) {
+        return IBUS_SERVICE_CLASS (
+                bus_ibus_impl_parent_class)->service_set_property (
+                        service, connection, sender, object_path,
+                        interface_name, property_name,
+                        value, error);
+    }
+
+    for (i = 0; i < G_N_ELEMENTS (methods); i++) {
+        if (g_strcmp0 (methods[i].method_name, property_name) == 0) {
+            gboolean retval = methods[i].method_callback (
+                    (BusIBusImpl *) service,
+                    connection,
+                    value,
+                    error);
+
+            _emit_properties_changed ((BusIBusImpl *) service,
+                                      connection,
+                                      object_path,
+                                      interface_name,
+                                      property_name,
+                                      value,
+                                      retval);
+
+            return retval;
+        }
+    }
+
+    g_warning ("service_set_property received an unknown property: %s",
+               property_name ? property_name : "(null)");
+    return FALSE;
 }
 
 BusIBusImpl *
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 66a848666..5fa03c3cf 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2068,6 +2068,60 @@ ibus_bus_preload_engines_async_finish (IBusBus       *bus,
     return _async_finish_void (res, error);
 }
 
+GVariant *
+ibus_bus_get_ibus_property (IBusBus     *bus,
+                            const gchar *property_name)
+{
+    GVariant *result;
+    GVariant *retval = NULL;
+
+    g_return_val_if_fail (IBUS_IS_BUS (bus), NULL);
+    g_return_val_if_fail (property_name != NULL, NULL);
+
+    result = ibus_bus_call_sync (bus,
+                                 IBUS_SERVICE_IBUS,
+                                 IBUS_PATH_IBUS,
+                                 "org.freedesktop.DBus.Properties",
+                                 "Get",
+                                 g_variant_new ("(ss)",
+                                                IBUS_INTERFACE_IBUS,
+                                                property_name),
+                                 G_VARIANT_TYPE ("(v)"));
+
+    if (result) {
+        g_variant_get (result, "(v)", &retval);
+        g_variant_unref (result);
+    }
+
+    return retval;
+}
+
+void
+ibus_bus_set_ibus_property (IBusBus     *bus,
+                            const gchar *property_name,
+                            GVariant    *value)
+{
+    GVariant *result;
+
+    g_return_if_fail (IBUS_IS_BUS (bus));
+    g_return_if_fail (property_name != NULL);
+
+    result = ibus_bus_call_sync (bus,
+                                 IBUS_SERVICE_IBUS,
+                                 IBUS_PATH_IBUS,
+                                 "org.freedesktop.DBus.Properties",
+                                 "Set",
+                                 g_variant_new ("(ssv)",
+                                                IBUS_INTERFACE_IBUS,
+                                                property_name,
+                                                value),
+                                 NULL);
+
+    if (result) {
+        g_variant_unref (result);
+    }
+}
+
 static GVariant *
 ibus_bus_call_sync (IBusBus            *bus,
                     const gchar        *bus_name,
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 12883177e..6344337cf 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -1043,5 +1043,29 @@ gboolean     ibus_bus_preload_engines_async_finish
                                          GAsyncResult   *res,
                                          GError        **error);
 
+/**
+ * ibus_bus_get_ibus_property:
+ * @bus: An #IBusBus.
+ * @property_name: property name in org.freedesktop.DBus.Properties.Get
+ * @returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
+ *           The returned value must be freed with g_variant_unref().
+ *
+ * Get org.freedesktop.DBus.Properties.
+ */
+GVariant *   ibus_bus_get_ibus_property (IBusBus        *bus,
+                                         const gchar    *property_name);
+
+/**
+ * ibus_bus_set_ibus_property:
+ * @bus: An #IBusBus.
+ * @property_name: property name in org.freedesktop.DBus.Properties.Set
+ * @value: value in org.freedesktop.DBus.Properties.Set
+ *
+ * Set org.freedesktop.DBus.Properties.
+ */
+void         ibus_bus_set_ibus_property (IBusBus        *bus,
+                                         const gchar    *property_name,
+                                         GVariant       *value);
+
 G_END_DECLS
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 0d7a5b2f1..8090a4289 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -282,6 +282,22 @@ class Panel : IBus.PanelService {
         m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean();
     }
 
+    private void set_embed_preedit_text(Variant? variant) {
+        Variant var_embed_preedit = variant;
+
+        if (var_embed_preedit == null) {
+            var_embed_preedit = m_config.get_value("general",
+                                                   "embed_preedit_text");
+        }
+
+        if (var_embed_preedit == null) {
+            return;
+        }
+
+        m_bus.set_ibus_property("EmbedPreeditText",
+                                var_embed_preedit);
+    }
+
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
@@ -293,6 +309,7 @@ class Panel : IBus.PanelService {
         if (m_config != null) {
             m_config.value_changed.connect(config_value_changed_cb);
             m_config.watch("general", "preload_engines");
+            m_config.watch("general", "embed_preedit_text");
             m_config.watch("general", "engines_order");
             m_config.watch("general", "switcher_delay_time");
             m_config.watch("general", "use_system_keyboard_layout");
@@ -307,6 +324,7 @@ class Panel : IBus.PanelService {
             unbind_switch_shortcut();
             bind_switch_shortcut(null);
             set_switcher_delay_time(null);
+            set_embed_preedit_text(null);
         } else {
             update_engines(null, null);
         }
@@ -408,6 +426,11 @@ class Panel : IBus.PanelService {
             set_use_system_keyboard_layout(variant);
             return;
         }
+
+        if (section == "general" && name == "embed_preedit_text") {
+            set_embed_preedit_text(variant);
+            return;
+        }
     }
 
     private void handle_engine_switch(Gdk.Event event, bool revert) {

From 927e9f58da9b4a9898403c8e339109e2ad2fa966 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 13 May 2013 11:47:29 +0900
Subject: [PATCH 140/816] Check GtkIMContext:input-purpose to disable IM on
 lock screen

Recent GtkIMContext has "input-purpose" property, which can be used to check if the target widget is a password entry, in a more reliable way.

BUG=none
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/7064059
---
 client/gtk2/ibusimcontext.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 49598b439..3694dd46c 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -803,6 +803,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;
 

From f3d80dc026853c1024cdf6bda31b1496939cb095 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 May 2013 16:36:19 +0900
Subject: [PATCH 141/816] Defalut triggers key is changed to <Super>space.

We have been used <Control>space as the default triggers key.
GNOME3 and Windows7 applied <Super>space as the default trigger key
and IBus follows it for the consistent key between desktops.

BUG=RH#953404

Review URL: https://codereview.appspot.com/9081043
---
 data/ibus.schemas.in | 2 +-
 setup/main.py        | 2 +-
 ui/gtk3/panel.vala   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 54ccb4cba..9263adc71 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -59,7 +59,7 @@
       <owner>ibus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[&lt;Control&gt;space]</default>
+      <default>[&lt;Super&gt;space]</default>
       <locale name="C">
         <short>Trigger shortcut keys for gtk_accelerator_parse</short>
           <long>The shortcut keys for turning input method on or off</long>
diff --git a/setup/main.py b/setup/main.py
index 707faa46f..0281ac7f1 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -89,7 +89,7 @@ def __init_hotkey(self):
         if variant != None:
             shortcuts = variant.unpack()
         else:
-            shortcuts =  ['<Control>space']
+            shortcuts =  ['<Super>space']
 
         button = self.__builder.get_object("button_%s" % label)
         entry = self.__builder.get_object("entry_%s" % label)
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 8090a4289..0c793f43f 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -49,7 +49,7 @@ 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;
-    private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Control>space";
+    private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Super>space";
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -74,7 +74,7 @@ class Panel : IBus.PanelService {
         m_candidate_panel.page_down.connect((w) => this.page_down());
 
         m_switcher = new Switcher();
-        // The initial shortcut is "<Control>space"
+        // The initial shortcut is "<Super>space"
         bind_switch_shortcut(null);
 
         if (m_switcher_delay_time >= 0) {

From 3c96d67404da274c34631ad821da736cf55a2b62 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 15 May 2013 12:03:54 +0900
Subject: [PATCH 142/816] Add man files of /usr/bin files.

Review URL: https://codereview.appspot.com/9413043
---
 bus/Makefile.am       | 21 ++++++++++--
 bus/ibus-daemon.1.in  | 77 +++++++++++++++++++++++++++++++++++++++++++
 setup/Makefile.am     | 18 ++++++++--
 setup/ibus-setup.1.in | 33 +++++++++++++++++++
 tools/Makefile.am     | 21 ++++++++++--
 tools/ibus.1.in       | 58 ++++++++++++++++++++++++++++++++
 6 files changed, 222 insertions(+), 6 deletions(-)
 create mode 100644 bus/ibus-daemon.1.in
 create mode 100644 setup/ibus-setup.1.in
 create mode 100644 tools/ibus.1.in

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 7024b8fb8..f06b70c7e 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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,6 +162,7 @@ test_stress_LDADD = \
 
 EXTRA_DIST =                \
 	$(desktop_in_files)     \
+	$(man_one_in_files)     \
 	marshalers.list         \
 	$(NULL)
 
@@ -169,6 +170,11 @@ DISTCLEANFILES =            \
 	$(desktop_DATA)         \
 	$(NULL)
 
+CLEANFILES = \
+	$(man_one_DATA)            \
+	$(man_one_files)        \
+	$(NULL)
+
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
 
@@ -182,4 +188,15 @@ desktop_in_files = ibus.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+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
+%.1: %.1.in
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+		mv $@.tmp $@
+%.1.gz: %.1
+	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
 -include $(top_srcdir)/git.mk
diff --git a/bus/ibus-daemon.1.in b/bus/ibus-daemon.1.in
new file mode 100644
index 000000000..74e7431b5
--- /dev/null
+++ b/bus/ibus-daemon.1.in
@@ -0,0 +1,77 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013.
+.\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
+.\"
+.TH IBUS-DAEMON "1" "April 2010" "@VERSION@" "User Commands"
+.SH NAME
+.B ibus\-daemon
+\- daemon program for ibus
+
+.SH SYNOPSIS
+.B ibus\-daemon
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.
+
+.PP
+.B ibus\-daemon
+is a daemon program for ibus and it is also a start up program for users
+to activate ibus daemon, engines and panel.
+
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+
+.SS "Application Options:"
+.TP
+\fB\-d\fR, \fB\-\-daemonize\fR
+run ibus as background process.
+.TP
+\fB\-s\fR, \fB\-\-single\fR
+do not execute panel and config module.
+.TP
+\fB\-x\fR, \fB\-\-xim\fR
+execute ibus XIM server.
+.TP
+\fB\-n\fR, \fB\-\-desktop\fR=\fIname\fR
+specify the name of desktop session. [default=gnome]
+.TP
+\fB\-p\fR, \fB\-\-panel\fR=\fIcmdline\fR
+specify the cmdline of panel program.
+.TP
+\fB\-c\fR, \fB\-\-config\fR=\fIcmdline\fR
+specify the cmdline of config program.
+.TP
+\fB\-a\fR, \fB\-\-address\fR=\fIaddress\fR
+specify the address of ibus daemon.
+.TP
+\fB\-r\fR, \fB\-\-replace\fR
+if there is an old ibus\-daemon is running, it will be replaced.
+.TP
+\fB\-t\fR, \fB\-\-re\-scan\fR
+force to re\-scan components, and re\-create registry cache.
+.TP
+\fB\-o\fR, \fB\-\-timeout\fR=\fItimeout\fR [default is 2000]
+dbus reply timeout in milliseconds.
+.TP
+\fB\-j\fR, \fB\-\-monitor\-timeout\fR=\fItimeout\fR [default is 0]
+timeout of poll changes of engines in seconds. 0 to disable it.
+.TP
+\fB\-m\fR, \fB\-\-mem\-profile\fR
+enable memory profile, send SIGUSR2 to print out the memory profile.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+verbose.
+
+.SH BUGS
+If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
+
+.SH "SEE ALSO"
+.BR ibus (1)
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 9618d7fae..5274f1946 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -42,12 +42,26 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktopdir = $(datadir)/applications
 @INTLTOOL_DESKTOP_RULE@
 
+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
+%.1: %.1.in
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+		mv $@.tmp $@
+%.1.gz: %.1
+	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
 CLEANFILES = \
+	$(man_one_DATA) \
+	$(man_one_files) \
 	*.pyc \
 	ibus-setup \
 	$(NULL)
 
 EXTRA_DIST = \
+	$(man_one_in_files) \
 	ibus-setup.in \
 	setup.ui \
 	ibus-setup.desktop.in \
diff --git a/setup/ibus-setup.1.in b/setup/ibus-setup.1.in
new file mode 100644
index 000000000..3daafe437
--- /dev/null
+++ b/setup/ibus-setup.1.in
@@ -0,0 +1,33 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013.
+.\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
+.\"
+.TH "IBUS-SETUP" 1 "November 2008" "@VERSION@" "User Commands"
+.SH NAME
+.B ibus-setup
+\- configuration program for ibus
+
+.SH "SYNOPSIS"
+.B ibus-setup
+
+.SH "DESCRIPTION"
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.  
+
+.PP
+.B ibus-setup
+is the configuration program for IBus.
+
+.PP
+Homepage: http://code.google.com/p/ibus/
+
+.SH BUGS
+If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
+
+.SH "SEE ALSO"
+.BR ibus (1)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5aa109910..65d18772d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -75,8 +75,25 @@ bash_completion_DATA= \
 	$(NULL)
 bash_completiondir=@datadir@/bash-completion/completions
 
+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
+%.1: %.1.in
+	$(AM_V_GEN) sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+		mv $@.tmp $@
+%.1.gz: %.1
+	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
 EXTRA_DIST = \
+	$(man_one_in_files) \
 	ibus.bash \
 	$(NULL)
 
+CLEANFILES = \
+	$(man_one_DATA) \
+	$(man_one_files) \
+	$(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/tools/ibus.1.in b/tools/ibus.1.in
new file mode 100644
index 000000000..05bf63daa
--- /dev/null
+++ b/tools/ibus.1.in
@@ -0,0 +1,58 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013.
+.\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
+.\"
+.TH "IBUS" 1 "May 2013" "@VERSION@" "User Commands"
+.SH NAME
+.B ibus
+\- command line utility for ibus
+
+.SH "SYNOPSIS"
+.B ibus
+\fICOMMAND\fR [\fIOPTION\fR]...
+
+.SH "DESCRIPTION"
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.  
+
+.PP
+.B ibus
+is a command line utility which can restart or exit ibus-daemon,
+get or set the current ibus engine or list the ibus engines.
+
+.PP
+Homepage: http://code.google.com/p/ibus/
+
+.SH "COMMAND"
+.TP
+\fBhelp\fR
+Show the commands list.
+.TP
+\fBengine\fR [\fBENGINE_NAME\fR]
+Show the curent ibus engine when
+.B ENGINE_NAME
+is not given. Set 
+.B ENGINE_NAME
+to the current ibus engine.
+.TP
+\fBexit\fR
+Exit ibus-daemon.
+.TP
+\fBlist-engine\fR
+Show ibus engines list.
+.TP
+\fBrestart\fR
+Restart ibus-daemon.
+.TP
+\fBversion\fR
+Show the ibus version.
+.TP
+\fBwatch\fR
+Under construction.
+
+.SH BUGS
+If you find a bug, please report it at http://code.google.com/p/ibus/issues/list.

From 62f07b7a6904b8b03a59f3baf413becb2d5d9e14 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 17 May 2013 12:12:54 +0900
Subject: [PATCH 143/816] Let users know the default hotkey is Super+space with
 libnotify.

Review URL: https://codereview.appspot.com/9407043
---
 configure.ac         | 20 +++++++++-
 data/ibus.schemas.in | 14 +++++++
 ui/gtk3/Makefile.am  | 19 ++++++++-
 ui/gtk3/panel.vala   | 94 +++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 141 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 303679245..781bbf552 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -498,6 +498,21 @@ if test x"$enable_engine" = x"yes"; then
     enable_engine="yes (enabled, use --disable-engine to disable)"
 fi
 
+# --disable-libnotify
+AC_ARG_ENABLE(libnotify,
+    AS_HELP_STRING([--disable-libnotify],
+                   [Disable to link libnotify]),
+    [enable_libnotify=$enableval],
+    [enable_libnotify=yes]
+)
+AM_CONDITIONAL([ENABLE_LIBNOTIFY], [test x"$enable_libnotify" = x"yes"])
+if test x"$enable_libnotify" = x"yes"; then
+    PKG_CHECK_MODULES(LIBNOTIFY, [
+        libnotify >= 0.7
+    ])
+    enable_libnotify="yes (enabled, use --disable-libnotify to disable)"
+fi
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -574,6 +589,7 @@ Build options:
   No snooper regexes        "$NO_SNOOPER_APPS"
   Panel icon                "$IBUS_ICON_KEYBOARD"
   Enable surrounding-text   $enable_surrounding_text
+  Enable libnotify          $enable_libnotify
   Run test cases            $enable_tests
 ])
 
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 9263adc71..9cfe83b20 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -41,6 +41,20 @@
             </long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/version</key>
+      <applyto>/desktop/ibus/general/version</applyto>
+      <owner>ibus</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Saved version number</short>
+            <long>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.
+            </long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 43454bc5d..203881440 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -83,6 +83,21 @@ AM_VALAFLAGS = \
 	--pkg=xi \
 	$(NULL)
 
+if ENABLE_LIBNOTIFY
+AM_CFLAGS += \
+	@LIBNOTIFY_CFLAGS@ \
+	$(NULL)
+
+AM_LDADD += \
+	@LIBNOTIFY_LIBS@ \
+	$(NULL)
+
+AM_VALAFLAGS += \
+	--pkg=libnotify \
+	-D ENABLE_LIBNOTIFY \
+	$(NULL)
+endif
+
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 0c793f43f..39aca08b5 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -298,6 +298,95 @@ class Panel : IBus.PanelService {
                                 var_embed_preedit);
     }
 
+    private int compare_versions(string version1, string version2) {
+        string[] version1_list = version1.split(".");
+        string[] version2_list = version2.split(".");
+        int major1, minor1, micro1, major2, minor2, micro2;
+
+        if (version1 == version2) {
+            return 0;
+        }
+
+        // The initial dconf value of "version" is "".
+        if (version1 == "") {
+            return -1;
+        }
+        if (version2 == "") {
+            return 1;
+        }
+
+        assert(version1_list.length >= 3);
+        assert(version2_list.length >= 3);
+
+        major1 = int.parse(version1_list[0]);
+        minor1 = int.parse(version1_list[1]);
+        micro1 = int.parse(version1_list[2]);
+
+        major2 = int.parse(version2_list[0]);
+        minor2 = int.parse(version2_list[1]);
+        micro2 = int.parse(version2_list[2]);
+
+        if (major1 == minor1 && minor1 == minor2 && micro1 == micro2) {
+            return 0;
+        }
+        if ((major1 > major2) ||
+            (major1 == major2 && minor1 > minor2) ||
+            (major1 == major2 && minor1 == minor2 &&
+             micro1 > micro2)) {
+            return 1;
+        }
+        return -1;
+    }
+
+    private void update_version_1_5_3() {
+#if ENABLE_LIBNOTIFY
+        if (!Notify.is_initted()) {
+            Notify.init ("ibus");
+        }
+
+        var notification = new Notify.Notification(
+                _("IBus Update"),
+                _("Super+space is now the default hotkey."),
+                "ibus");
+        notification.set_timeout(30 * 1000);
+        notification.set_category("hotkey");
+
+        try {
+            notification.show();
+        } catch (GLib.Error e){
+            warning ("Notification is failed for IBus 1.5.3: %s", e.message);
+        }
+#else
+        warning(_("Super+space is now the default hotkey."));
+#endif
+    }
+
+    private void set_version() {
+        Variant var_prev_version = m_config.get_value("general", "version");
+        Variant var_current_version = null;
+        string prev_version = "".dup();
+        string current_version = null;
+
+        if (var_prev_version != null) {
+            prev_version = var_prev_version.dup_string();
+        }
+
+        if (compare_versions(prev_version, "1.5.3") < 0) {
+            update_version_1_5_3();
+        }
+
+        current_version = "%d.%d.%d".printf(IBus.MAJOR_VERSION,
+                                            IBus.MINOR_VERSION,
+                                            IBus.MICRO_VERSION);
+
+        if (prev_version == current_version) {
+            return;
+        }
+
+        var_current_version = new Variant.string(current_version);
+        m_config.set_value("general", "version", var_current_version);
+    }
+
     public void set_config(IBus.Config config) {
         if (m_config != null) {
             m_config.value_changed.disconnect(config_value_changed_cb);
@@ -325,11 +414,12 @@ class Panel : IBus.PanelService {
             bind_switch_shortcut(null);
             set_switcher_delay_time(null);
             set_embed_preedit_text(null);
+            set_custom_font();
+
+            set_version();
         } else {
             update_engines(null, null);
         }
-
-        set_custom_font();
     }
 
     private void exec_setxkbmap(IBus.EngineDesc engine) {

From 5bb877682c218a5c0cd41e86a80655a7fd2269b9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 29 May 2013 10:56:17 +0900
Subject: [PATCH 144/816] Delete ibus.desktop

This is not an actual application, it just starts the daemon in the
background.  That's not something that should be in the application
list.  It should be started in the background when necessary.

BUG=http://code.google.com/p/ibus/issues/detail?id=1628

Review URL: https://codereview.appspot.com/9833043
Patch from Colin Walters <walters@verbum.org>.
---
 bus/Makefile.am     | 10 ----------
 bus/ibus.desktop.in | 13 -------------
 2 files changed, 23 deletions(-)
 delete mode 100644 bus/ibus.desktop.in

diff --git a/bus/Makefile.am b/bus/Makefile.am
index f06b70c7e..7d60d15ed 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -161,15 +161,10 @@ test_stress_LDADD = \
 	$(NULL)
 
 EXTRA_DIST =                \
-	$(desktop_in_files)     \
 	$(man_one_in_files)     \
 	marshalers.list         \
 	$(NULL)
 
-DISTCLEANFILES =            \
-	$(desktop_DATA)         \
-	$(NULL)
-
 CLEANFILES = \
 	$(man_one_DATA)            \
 	$(man_one_files)        \
@@ -183,11 +178,6 @@ test: ibus-daemon
 		G_DEBUG=fatal_warnings \
 		$(builddir)/ibus-daemon -v
 
-desktopdir = $(datadir)/applications
-desktop_in_files = ibus.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
 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) 
diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in
deleted file mode 100644
index 9784f1142..000000000
--- a/bus/ibus.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-_Name=IBus
-_GenericName=Input Method Framework
-_Comment=Start IBus Input Method Framework
-Exec=ibus-daemon --xim
-Icon=ibus
-Terminal=false
-Type=Application
-Categories=System;Utility;
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-AutoRestart=false
-X-GNOME-Autostart-Notify=true
-X-KDE-autostart-after=panel

From 7ff8271dee2e3f5a9f65f64ee5ba798f4aa00b84 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 4 Jun 2013 11:12:53 +0900
Subject: [PATCH 145/816] Remove g_type_init() calls.

https://git.gnome.org/browse/glib/commit/?id=1dc774a653e992e1153fbed16f90097fa8db467f
https://git.gnome.org/browse/vala/commit/?id=f1fbafdfdc91fadaa57d2e073fc29cc6804d6ae3

Review URL: https://codereview.appspot.com/9727047
---
 bus/dbusimpl.c                       | 3 ++-
 bus/test-matchrule.c                 | 2 ++
 bus/test-registry.c                  | 2 ++
 configure.ac                         | 3 +++
 engine/Makefile.am                   | 1 +
 po/POTFILES.in                       | 1 -
 src/ibusshare.c                      | 2 ++
 src/ibusshare.h                      | 4 +---
 src/tests/ibus-bus.c                 | 3 +--
 src/tests/ibus-config.c              | 3 +--
 src/tests/ibus-configservice.c       | 2 ++
 src/tests/ibus-engine-switch.c       | 3 +--
 src/tests/ibus-engine.c              | 2 ++
 src/tests/ibus-factory.c             | 2 ++
 src/tests/ibus-global-engine.c       | 4 ++--
 src/tests/ibus-inputcontext-create.c | 3 +--
 src/tests/ibus-inputcontext.c        | 3 +--
 src/tests/ibus-keymap.c              | 2 ++
 src/tests/ibus-keynames.c            | 2 ++
 src/tests/ibus-proxy.c               | 6 ++++--
 src/tests/ibus-serializable.c        | 4 +++-
 src/tests/ibus-share.c               | 4 +++-
 tools/Makefile.am                    | 1 +
 ui/gtk3/Makefile.am                  | 1 +
 24 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 7b8294b29..4a4781a40 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -733,7 +733,8 @@ bus_dbus_impl_name_has_owner (BusDBusImpl           *dbus,
         g_dbus_method_invocation_return_error (invocation,
                                                G_DBUS_ERROR,
                                                G_DBUS_ERROR_FAILED,
-                                               "'%s' is not a legal bus name");
+                                               "'%s' is not a legal bus name",
+                                               name ? name : "(null)");
         return;
     }
 
diff --git a/bus/test-matchrule.c b/bus/test-matchrule.c
index d2e2648cd..d85fc90c8 100644
--- a/bus/test-matchrule.c
+++ b/bus/test-matchrule.c
@@ -20,7 +20,9 @@ int
 main(gint argc, gchar **argv)
 {
     BusMatchRule *rule, *rule1;
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
 
     rule = bus_match_rule_new (" type='signal' , interface = 'org.freedesktop.IBus' ");
     g_assert (rule->message_type == G_DBUS_MESSAGE_TYPE_SIGNAL);
diff --git a/bus/test-registry.c b/bus/test-registry.c
index 97f05790c..225722046 100644
--- a/bus/test-registry.c
+++ b/bus/test-registry.c
@@ -3,7 +3,9 @@
 
 int main()
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	BusRegistry *registry = bus_registry_new ();
 	g_object_unref (registry);
 	return 0;
diff --git a/configure.ac b/configure.ac
index 781bbf552..369b505f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,9 @@ PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= glib_required_version
 ])
 
+GLIB_VERSION=`$PKG_CONFIG --modversion glib-2.0`
+AC_SUBST(GLIB_VERSION)
+
 # --disable-tests option.
 AC_ARG_ENABLE(tests,
     AS_HELP_STRING([--disable-tests],
diff --git a/engine/Makefile.am b/engine/Makefile.am
index aa1450d55..3571edd36 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -53,6 +53,7 @@ AM_LDADD = \
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--pkg=ibus-1.0 \
+	--target-glib="$(GLIB_VERSION)" \
 	$(NULL)
 
 libexec_PROGRAMS = \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 135f53742..ff6e8b447 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 [type: gettext/glade]setup/setup.ui
 bus/dbusimpl.c
 bus/engineproxy.c
-bus/ibus.desktop.in
 bus/inputcontext.c
 bus/panelproxy.c
 bus/registry.c
diff --git a/src/ibusshare.c b/src/ibusshare.c
index ce332ba55..79c2e0878 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -275,7 +275,9 @@ ibus_free_strv (gchar **strv)
 void
 ibus_init (void)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
     IBUS_ERROR;
     IBUS_TYPE_TEXT;
     IBUS_TYPE_ATTRIBUTE;
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 4ff41289b..512fa599e 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -291,9 +291,7 @@ gboolean         ibus_key_event_from_string
 /**
  * ibus_init:
  *
- * Init the ibus types.
- *
- * It is actually a wrapper of g_type_init().
+ * Initialize the ibus types.
  */
 void             ibus_init              (void);
 
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index c0d4a104f..f3f93bdf3 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -652,9 +652,8 @@ main (gint    argc,
       gchar **argv)
 {
     gint result;
-    g_type_init ();
-    g_test_init (&argc, &argv, NULL);
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
     g_object_unref (bus);
     bus = ibus_bus_new (); // crosbug.com/17293
diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index 5478c532f..e48b8710c 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -377,9 +377,8 @@ main (gint    argc,
       gchar **argv)
 {
     gint result;
-    g_type_init ();
-    g_test_init (&argc, &argv, NULL);
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
 
     g_test_add ("/ibus/config-watch/default",
diff --git a/src/tests/ibus-configservice.c b/src/tests/ibus-configservice.c
index 38d500fde..c05e096cd 100644
--- a/src/tests/ibus-configservice.c
+++ b/src/tests/ibus-configservice.c
@@ -34,7 +34,9 @@ main (gint    argc,
       gchar **argv)
 {
     g_mem_set_vtable (glib_mem_profiler_table);
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/configservice", test_configservice);
diff --git a/src/tests/ibus-engine-switch.c b/src/tests/ibus-engine-switch.c
index f1d83d0a9..7a13ffb72 100644
--- a/src/tests/ibus-engine-switch.c
+++ b/src/tests/ibus-engine-switch.c
@@ -179,9 +179,8 @@ main (gint    argc,
       gchar **argv)
 {
     gint result;
-    g_type_init ();
-    g_test_init (&argc, &argv, NULL);
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
     g_object_unref (bus);
     bus = ibus_bus_new (); // crosbug.com/17293
diff --git a/src/tests/ibus-engine.c b/src/tests/ibus-engine.c
index 75bdb1f49..1c2961100 100644
--- a/src/tests/ibus-engine.c
+++ b/src/tests/ibus-engine.c
@@ -3,7 +3,9 @@
 
 int main()
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 
 	GMainLoop *mainloop;
 	IBusConnection *connection;
diff --git a/src/tests/ibus-factory.c b/src/tests/ibus-factory.c
index e3fa40552..c9a6f0300 100644
--- a/src/tests/ibus-factory.c
+++ b/src/tests/ibus-factory.c
@@ -34,7 +34,9 @@ main (gint    argc,
       gchar **argv)
 {
     g_mem_set_vtable (glib_mem_profiler_table);
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/factory", test_factory);
diff --git a/src/tests/ibus-global-engine.c b/src/tests/ibus-global-engine.c
index c6fff63e8..fd6d61ae5 100644
--- a/src/tests/ibus-global-engine.c
+++ b/src/tests/ibus-global-engine.c
@@ -48,11 +48,11 @@ change_global_engine_cb (IBusBus *bus)
 
 int main()
 {
-	g_type_init ();
-
 	IBusBus *bus;
 
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	IBUS_TYPE_ENGINE_DESC;
 
 	bus = ibus_bus_new ();
diff --git a/src/tests/ibus-inputcontext-create.c b/src/tests/ibus-inputcontext-create.c
index 2a5a64acd..a086f436c 100644
--- a/src/tests/ibus-inputcontext-create.c
+++ b/src/tests/ibus-inputcontext-create.c
@@ -93,9 +93,8 @@ main (gint    argc,
       gchar **argv)
 {
     gint result;
-    g_type_init ();
-    g_test_init (&argc, &argv, NULL);
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
 
     g_test_add_func ("/ibus/input_context_async_create_success", test_success);
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index c782c784f..f1565b0b5 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -208,9 +208,8 @@ main (gint    argc,
       gchar **argv)
 {
     gint result;
-    g_type_init ();
-    g_test_init (&argc, &argv, NULL);
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
 
     g_test_add_func ("/ibus/input_context", test_input_context);
diff --git a/src/tests/ibus-keymap.c b/src/tests/ibus-keymap.c
index 9e5c46d48..24fefc496 100644
--- a/src/tests/ibus-keymap.c
+++ b/src/tests/ibus-keymap.c
@@ -23,7 +23,9 @@ int main (int argc, char **argv)
     gint fd;
     struct input_event e;
 
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
 
     IBusKeymap *keymap = ibus_keymap_get (argc > 1 ? argv[1] : "us");
 
diff --git a/src/tests/ibus-keynames.c b/src/tests/ibus-keynames.c
index aa0bdc0b2..58095504d 100644
--- a/src/tests/ibus-keynames.c
+++ b/src/tests/ibus-keynames.c
@@ -11,7 +11,9 @@ gint
 main (gint    argc,
       gchar **argv)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/keyname", test_keyname);
diff --git a/src/tests/ibus-proxy.c b/src/tests/ibus-proxy.c
index 911579b51..1f46ab611 100644
--- a/src/tests/ibus-proxy.c
+++ b/src/tests/ibus-proxy.c
@@ -9,11 +9,13 @@ _value_changed_cb (IBusConfig *config, gchar *section, gchar *name, GValue *valu
 
 int main()
 {
-	g_type_init ();
-
 	IBusBus *bus;
 	IBusConfig *config;
 
+#if !GLIB_CHECK_VERSION(2,35,0)
+	g_type_init ();
+#endif
+
 	bus = ibus_bus_new ();
 	config = ibus_bus_get_config (bus);
 
diff --git a/src/tests/ibus-serializable.c b/src/tests/ibus-serializable.c
index d2bd61a4e..a5d8af95b 100644
--- a/src/tests/ibus-serializable.c
+++ b/src/tests/ibus-serializable.c
@@ -184,7 +184,9 @@ main (gint    argc,
       gchar **argv)
 {
     g_mem_set_vtable (glib_mem_profiler_table);
-	g_type_init ();
+#if !GLIB_CHECK_VERSION(2,35,0)
+    g_type_init ();
+#endif
     g_test_init (&argc, &argv, NULL);
     g_test_add_func ("/ibus/varianttypeinfo", test_varianttypeinfo);
     g_test_add_func ("/ibus/attrlist", test_attr_list);
diff --git a/src/tests/ibus-share.c b/src/tests/ibus-share.c
index 332e9c54f..b1098ba0a 100644
--- a/src/tests/ibus-share.c
+++ b/src/tests/ibus-share.c
@@ -16,7 +16,9 @@ main (gint    argc,
       gchar **argv)
 {
     g_mem_set_vtable (glib_mem_profiler_table);
-	g_type_init ();
+#if !GLIB_CHECK_VERSION(2,35,0)
+    g_type_init ();
+#endif
     g_test_init (&argc, &argv, NULL);
     g_test_add_func ("/ibus/marchine-id", test_machine_id);
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 65d18772d..bcb67db45 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -58,6 +58,7 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=posix \
 	--pkg=config \
+	--target-glib="$(GLIB_VERSION)" \
 	$(NULL)
 
 bin_PROGRAMS = ibus
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 203881440..183ea6fb0 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -81,6 +81,7 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=config \
 	--pkg=xi \
+	--target-glib="$(GLIB_VERSION)" \
 	$(NULL)
 
 if ENABLE_LIBNOTIFY

From 2a34936437e5c3c3e5e7f3621cf92fa94eaa466a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 7 Jun 2013 13:01:44 +0900
Subject: [PATCH 146/816] build: improve test harness

Run each test in isolated directory so it can run in parallel.  Also
improve the test wrapper and rename it to a better name.

BUG=

Review URL: https://codereview.appspot.com/9937047
---
 autogen.sh            |   2 +-
 configure.ac          |   2 +-
 src/tests/Makefile.am |   5 +-
 src/tests/runtest     | 117 ++++++++++++++++++++++++++++++++++++++++++
 src/tests/setupenv    |  42 ---------------
 5 files changed, 122 insertions(+), 46 deletions(-)
 create mode 100755 src/tests/runtest
 delete mode 100755 src/tests/setupenv

diff --git a/autogen.sh b/autogen.sh
index 9786ed1b7..fb1a9ec4a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,4 +25,4 @@ which gnome-autogen.sh || {
 CFLAGS=${CFLAGS-"-Wall -Werror"}
 
 # need --enable-gtk-doc for gnome-autogen.sh to make dist
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="$CFLAGS" . gnome-autogen.sh "$@"
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.11 CFLAGS="$CFLAGS" . gnome-autogen.sh "$@"
diff --git a/configure.ac b/configure.ac
index 369b505f4..1aba305d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ m4_define([glib_required_version], [2.32.0])
 
 
 # Init automake.
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.11.1 parallel-tests])
 AM_MAINTAINER_MODE([enable])
 AC_GNU_SOURCE
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index cc029d1a3..a46113cad 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -60,10 +60,11 @@ TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir) \
 	builddir=$(builddir) \
-	$(srcdir)/setupenv \
 	$(NULL)
 
-EXTRA_DIST = setupenv
+LOG_COMPILER = $(srcdir)/runtest
+
+EXTRA_DIST = runtest
 
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
diff --git a/src/tests/runtest b/src/tests/runtest
new file mode 100755
index 000000000..a600f6b0f
--- /dev/null
+++ b/src/tests/runtest
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Run a test case given by the first argument in a separate directory.
+# This script may also launch $top_builddir/bus/ibus-daemon for testing.
+
+# Executing a test that uses this file
+# ====================================
+#
+# Running a single test:
+#
+#   $ make check TESTS=ibus-foo
+#
+#   or
+#
+#   $ top_builddir=<...> top_srcdir=<...> builddir=<...> ./runtest ibus-foo
+
+: ${top_builddir:=../..}
+: ${top_srcdir:=../..}
+: ${builddir:=.}
+
+BUS_REQUIRED_TESTS="
+ibus-bus
+ibus-config
+ibus-configservice
+ibus-factory
+ibus-inputcontext
+ibus-inputcontext-create
+ibus-engine-switch
+"
+
+# Portable replacement of basename.
+func_basename () {
+  case "$1" in
+    */*)
+      expr "$1" : '.*/\(.*\)'
+      ;;
+    *)
+      echo "$1"
+  esac
+}
+
+# Portable replacement of dirname.
+func_dirname () {
+  case "$1" in
+    */*)
+      expr "$1" : '\(.*\)/.*'
+      ;;
+    *)
+      echo .
+  esac
+}
+
+# Kill ibus-daemon process and remove temporary files.
+func_cleanup () {
+  tstdir=$1
+  if test -f $tstdir/ibus-daemon.pid; then
+    . $tstdir/ibus-daemon.pid
+    kill $IBUS_DAEMON_PID &> /dev/null
+  fi
+  rm -fr $tstdir
+}
+
+# Prepare component files necessary for testing, under components/.
+func_copy_component () {
+  file=$1
+  base=`func_basename $file`
+  if test -f $file.in; then
+    mkdir -p components
+    sed 's|@libexecdir@|'`func_dirname $file`'|g' < $file.in > components/$base
+  fi
+}
+
+trap 'func_cleanup $tstdir' 1 2 3 15
+
+tst=$1; shift
+tstdir=tmp-`func_basename $tst`
+
+test -d $tstdir || mkdir $tstdir
+
+( cd $tstdir
+
+  need_bus=no
+  for t in $BUS_REQUIRED_TESTS; do
+    if test $t = `func_basename $tst`; then
+      need_bus=yes
+    fi
+  done
+
+  if test $need_bus = yes; then
+    func_copy_component "../$top_srcdir/engine/simple.xml"
+    func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
+
+    IBUS_COMPONENT_PATH=$PWD/components
+    export IBUS_COMPONENT_PATH
+
+    IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
+    export IBUS_ADDRESS_FILE
+
+    # Start ibus-daemon.
+    ../$top_builddir/bus/ibus-daemon \
+    --daemonize \
+    --cache=none \
+    --panel=disable \
+    --config=default \
+    --verbose;
+
+    # Wait until all necessary components are up.
+    sleep 1
+  fi
+
+  exec "../$tst" ${1+"$@"} )
+
+retval=$?
+
+func_cleanup $tstdir
+
+exit $retval
diff --git a/src/tests/setupenv b/src/tests/setupenv
deleted file mode 100755
index df269e4c9..000000000
--- a/src/tests/setupenv
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-: ${top_builddir:=../..}
-: ${top_srcdir:=../..}
-: ${builddir:=.}
-
-trap 'exit' 1 2 3 15
-trap '. $IBUS_ADDRESS_FILE; kill $IBUS_DAEMON_PID &> /dev/null; rm -fr components $IBUS_ADDRESS_FILE' EXIT
-
-# copy some component files necessary for testing, under components/
-copy_component() {
-    file=$1
-    base=`basename $file`
-    if test -f $file.in; then
-	mkdir -p components
-	( libexecdir=`dirname $file`;
-	    s=`cat $file.in`;
-	    eval "echo \"${s}\"" ) > components/$base
-    fi
-}
-copy_component "$top_srcdir/engine/simple.xml"
-copy_component "$top_srcdir/conf/memconf/memconf.xml"
-
-# start ibus-daemon
-IBUS_COMPONENT_PATH=$PWD/components
-export IBUS_COMPONENT_PATH
-
-IBUS_ADDRESS_FILE=$PWD/ibus-daemon.log
-export IBUS_ADDRESS_FILE
-
-$top_builddir/bus/ibus-daemon \
-    --daemonize \
-    --cache=none \
-    --panel=disable \
-    --config=default \
-    --verbose
-
-# wait until all necessary components are up
-sleep 1
-
-# run tests
-"$@"

From 5f78b55ee930a671c8ef63435925dcef9cd0ab5c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 10 Jun 2013 11:22:39 +0900
Subject: [PATCH 147/816] Suppress warnings with Automake 1.13

The make variable INCLUDES is now obsoleted by AM_CPPFLAGS.

BUG=
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/9915054
---
 bus/Makefile.am         | 3 +--
 client/gtk2/Makefile.am | 2 +-
 client/gtk3/Makefile.am | 2 +-
 engine/Makefile.am      | 3 +--
 src/tests/Makefile.am   | 2 +-
 tools/Makefile.am       | 8 +++-----
 ui/gtk3/Makefile.am     | 8 +++-----
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 7d60d15ed..826c673c5 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -24,7 +24,7 @@ NULL =
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES =                \
+AM_CPPFLAGS =                \
 	-I$(top_srcdir)/src   \
 	-I$(top_builddir)/src \
 	$(NULL)
@@ -38,7 +38,6 @@ AM_CFLAGS = \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DBINDIR=\"@bindir@\" \
 	-DIBUS_DISABLE_DEPRECATED \
-	$(INCLUDES) \
 	$(NULL)
 AM_LDADD = \
 	@GOBJECT2_LIBS@ \
diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 471a11c66..e7c2883e0 100644
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -22,7 +22,7 @@
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
 	$(NULL)
diff --git a/client/gtk3/Makefile.am b/client/gtk3/Makefile.am
index 450562241..e654980a4 100644
--- a/client/gtk3/Makefile.am
+++ b/client/gtk3/Makefile.am
@@ -22,7 +22,7 @@
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
 	$(NULL)
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 3571edd36..73f82f8cb 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -22,7 +22,7 @@
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
 	$(NULL)
@@ -31,7 +31,6 @@ AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
 	@GTHREAD2_CFLAGS@ \
-	$(INCLUDES) \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index a46113cad..bf7c6a9e0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -24,7 +24,7 @@ NULL =
 
 DEPS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES =              \
+AM_CPPFLAGS =              \
 	-g                  \
 	@GLIB2_CFLAGS@      \
 	@GIO2_CFLAGS@       \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bcb67db45..bd9244135 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,19 +24,17 @@ NULL =
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-INCLUDES = \
+# force include config.h before gi18n.h.
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
+	-include $(CONFIG_HEADER) \
 	$(NULL)
 
-# force include config.h before gi18n.h.
-AM_CPPFLAGS = -include $(CONFIG_HEADER)
-
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
 	@GTHREAD2_CFLAGS@ \
-	$(INCLUDES) \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DIBUS_DISABLE_DEPRECATED \
 	-Wno-unused-variable \
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 183ea6fb0..ab58f203d 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -35,23 +35,21 @@ gtkpanel.xml: gtkpanel.xml.in
 		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
 		mv $@.tmp $@
 
-INCLUDES = \
+# force include config.h before gi18n.h.
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
+	-include $(CONFIG_HEADER) \
 	$(NULL)
 
 USE_SYMBOL_ICON = FALSE
 
-# force include config.h before gi18n.h.
-AM_CPPFLAGS = -include $(CONFIG_HEADER)
-
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
 	@GTHREAD2_CFLAGS@ \
 	@GTK3_CFLAGS@ \
 	@X11_CFLAGS@ \
-	$(INCLUDES) \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DBINDIR=\"$(bindir)\" \
 	-DIBUS_DISABLE_DEPRECATED \

From 4a68e97e32cc58baf233a8357d423614def3aac0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Jun 2013 12:42:16 +0900
Subject: [PATCH 148/816] Fix an error message of gnome-autogen in autogen.sh

BUG=http://code.google.com/p/ibus/issues/detail?id=1631

Review URL: https://codereview.appspot.com/10167044
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index fb1a9ec4a..7b9507963 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ PKG_NAME="ibus"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "Not found gnome-autogen.sh. You may need to install gnome-common"
     exit 1
 }
 

From 7b9633ab6e20920710cd1f422bd4e6d18a363f35 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Jun 2013 12:46:02 +0900
Subject: [PATCH 149/816] Modify valac --target-glib.

valac --ccode --target-glib=2.36 can disable g_type_init in the
generated C files since g_type_init is deprecated in glib 2.36.
But ibus tarball includes C files so that users do not require
vala and vala versions are different between dist and build.
If dist could have glib 2.36 to generate the ibus tarball but
a user build would have glib 2.34, the user build would be
failed because glib 2.34 requires g_type_init.
This change makes sure the target-glib is minimum of the glib
version for ibus.

Review URL: https://codereview.appspot.com/10156044
---
 configure.ac        | 8 +++++---
 engine/Makefile.am  | 2 +-
 tools/Makefile.am   | 2 +-
 ui/gtk3/Makefile.am | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1aba305d0..45c195a84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,11 @@ m4_define([ibus_binary_version],
 # Required versions of other packages.
 m4_define([glib_required_version], [2.32.0])
 
+# VALA_TARGET_GLIB_VERSION is used by valac --ccode --target-glib .
+# VALA_TARGET_GLIB_VERSION and glib_required_version will be different
+# in the future.
+VALA_TARGET_GLIB_VERSION=2.32
+AC_SUBST(VALA_TARGET_GLIB_VERSION)
 
 # Init automake.
 AM_INIT_AUTOMAKE([1.11.1 parallel-tests])
@@ -153,9 +158,6 @@ PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= glib_required_version
 ])
 
-GLIB_VERSION=`$PKG_CONFIG --modversion glib-2.0`
-AC_SUBST(GLIB_VERSION)
-
 # --disable-tests option.
 AC_ARG_ENABLE(tests,
     AS_HELP_STRING([--disable-tests],
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 73f82f8cb..7d65558ad 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -52,7 +52,7 @@ AM_LDADD = \
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--pkg=ibus-1.0 \
-	--target-glib="$(GLIB_VERSION)" \
+	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
 libexec_PROGRAMS = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bd9244135..264e37082 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -56,7 +56,7 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=posix \
 	--pkg=config \
-	--target-glib="$(GLIB_VERSION)" \
+	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
 bin_PROGRAMS = ibus
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index ab58f203d..97c915c62 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -79,7 +79,7 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=config \
 	--pkg=xi \
-	--target-glib="$(GLIB_VERSION)" \
+	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
 if ENABLE_LIBNOTIFY

From c9ba5e1d155ab711c68f18d26de38bdba3128f03 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 14 Jun 2013 11:01:08 +0900
Subject: [PATCH 150/816] Make ibus-config tests side effect free

Previously we assumed that test cases are executed in the order of
registration.  This is no longer true after glib change 89aa9dbd which
fixed test case grouping.  Clear the default match rule in each test
case to avoid side effect.

BUG=

Review URL: https://codereview.appspot.com/10069045
---
 src/tests/ibus-config.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index e48b8710c..b6f9e68f7 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -17,6 +17,10 @@ finish_create_config_async_sucess (GObject      *source_object,
           ibus_config_new_async_finish (res, &error);
 
     g_assert (IBUS_IS_CONFIG (config));
+
+    /* Since we reuse single D-Bus connection, we need to remove the
+       default match rule for the next ibus_config_new() call.  */
+    ibus_config_unwatch (config, NULL, NULL);
     g_object_unref (config);
     if (--create_config_count == 0)
         g_main_loop_quit (loop);
@@ -123,6 +127,9 @@ test_config_set_get (void)
     g_assert_cmpint (g_variant_n_children (var), ==, 0);
     g_variant_unref (var);
 
+    /* Since we reuse single D-Bus connection, we need to remove the
+       default match rule for the next ibus_config_new() call.  */
+    ibus_config_unwatch (config, NULL, NULL);
     g_object_unref (config);
 }
 
@@ -363,11 +370,8 @@ test_config_watch (WatchFixture *fixture, gconstpointer user_data)
                              &fixture->data);
         }
     } else {
-        /* If ibus_config_unwatch has not been called, need to manually
-           unwatch the default rule here, otherwise the recipient of
-           the default match rule will be ref'd twice on the next
-           ibus_config_new(), since we reuse single D-Bus
-           connection. */
+        /* Since we reuse single D-Bus connection, we need to remove the
+           default match rule for the next ibus_config_new() call.  */
         ibus_config_unwatch (fixture->config, NULL, NULL);
     }
 }

From 458945e7308ab2661355edbf6880102c5f628dbe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 14 Jun 2013 12:13:13 +0900
Subject: [PATCH 151/816] Refactor old getter and setter to dbus property in
 bus/ibusimpl.c

Review URL: https://codereview.appspot.com/9477043
---
 bus/ibusimpl.c        | 524 +++++++++++++++++++++++++++++++-----------
 src/Makefile.am       |   1 +
 src/ibusbus.c         | 249 +++++++++++++++-----
 src/ibusbus.h         | 139 ++++++++++-
 src/ibusshare.h       |   6 +
 src/tests/Makefile.am |  13 +-
 src/tests/ibus-bus.c  | 242 +++++++++++++++++++
 7 files changed, 978 insertions(+), 196 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 594216ab8..3fca02a5a 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -152,34 +152,37 @@ static void     _context_engine_changed_cb
 
 /* The interfaces available in this class, which consists of a list of
  * methods this class implements and a list of signals this class may emit.
- * Method calls to the interface that are not defined in this XML will 
+ * Method calls to the interface that are not defined in this XML will
  * be automatically rejected by the GDBus library (see src/ibusservice.c
- * for details.) */
+ * for details.)
+ * Implement org.freedesktop.DBus.Properties
+ * http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties */
 static const gchar introspection_xml[] =
     "<node>\n"
     "  <interface name='org.freedesktop.IBus'>\n"
-    "    <property name='EmbedPreeditText' type='b' access='readwrite' />\n"
-    "    <method name='GetAddress'>\n"
-    "      <arg direction='out' type='s' name='address' />\n"
-    "    </method>\n"
+    "    <property name='Address' type='s' access='read' />\n"
+    "    <property name='CurrentInputContext' type='o' access='read' />\n"
+    "    <property name='Engines' type='av' access='read' />\n"
+    "    <property name='GlobalEngine' type='v' access='read' />\n"
+    "    <property name='PreloadEngines' type='as' access='write'>\n"
+    "      <annotation\n"
+    "          name='org.freedesktop.DBus.Property.EmitsChangedSignal'\n"
+    "          value='true' />\n"
+    "    </property>\n"
+    "    <property name='EmbedPreeditText' type='b' access='readwrite'>\n"
+    "      <annotation\n"
+    "          name='org.freedesktop.DBus.Property.EmitsChangedSignal'\n"
+    "          value='true' />\n"
+    "    </property>\n"
     "    <method name='CreateInputContext'>\n"
     "      <arg direction='in'  type='s' name='client_name' />\n"
     "      <arg direction='out' type='o' name='object_path' />\n"
     "    </method>\n"
-    "    <method name='CurrentInputContext'>\n"
-    "      <arg direction='out' type='o' name='object_path' />\n"
-    "    </method>\n"
     "    <method name='RegisterComponent'>\n"
     "      <arg direction='in'  type='v' name='component' />\n"
     "    </method>\n"
-    "    <method name='ListEngines'>\n"
-    "      <arg direction='out' type='av' name='engines' />\n"
-    "    </method>\n"
     "    <method name='GetEnginesByNames'>\n"
-    "      <arg direction='in' type='as' name='names' />\n"
-    "      <arg direction='out' type='av' name='engines' />\n"
-    "    </method>\n"
-    "    <method name='ListActiveEngines'>\n"
+    "      <arg direction='in'  type='as' name='names' />\n"
     "      <arg direction='out' type='av' name='engines' />\n"
     "    </method>\n"
     "    <method name='Exit'>\n"
@@ -189,29 +192,46 @@ static const gchar introspection_xml[] =
     "      <arg direction='in'  type='v' name='data' />\n"
     "      <arg direction='out' type='v' name='data' />\n"
     "    </method>\n"
+    "    <method name='SetGlobalEngine'>\n"
+    "      <arg direction='in'  type='s' name='engine_name' />\n"
+    "    </method>\n"
+    "    <signal name='RegistryChanged'>\n"
+    "    </signal>\n"
+    "    <signal name='GlobalEngineChanged'>\n"
+    "      <arg type='s' name='engine_name' />\n"
+    "    </signal>\n"
+    "    <property name='ActiveEngines' type='av' access='read' />\n"
+    "    <method name='GetAddress'>\n"
+    "      <arg direction='out' type='s' name='address' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
+    "    </method>\n"
+    "    <method name='CurrentInputContext'>\n"
+    "      <arg direction='out' type='o' name='object_path' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
+    "    </method>\n"
+    "    <method name='ListEngines'>\n"
+    "      <arg direction='out' type='av' name='engines' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
+    "    </method>\n"
+    "    <method name='ListActiveEngines'>\n"
+    "      <arg direction='out' type='av' name='engines' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
+    "    </method>\n"
     "    <method name='GetUseSysLayout'>\n"
     "      <arg direction='out' type='b' name='enabled' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
     "    </method>\n"
     "    <method name='GetUseGlobalEngine'>\n"
     "      <arg direction='out' type='b' name='enabled' />\n"
     "    </method>\n"
-    "    <method name='GetGlobalEngine'>\n"
-    "      <arg direction='out' type='v' name='desc' />\n"
-    "    </method>\n"
-    "    <method name='SetGlobalEngine'>\n"
-    "      <arg direction='in'  type='s' name='engine_name' />\n"
-    "    </method>\n"
     "    <method name='IsGlobalEngineEnabled'>\n"
     "      <arg direction='out' type='b' name='enabled' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
     "    </method>\n"
-    "    <method name='PreloadEngines'>\n"
-    "      <arg direction='in' type='as' name='names' />\n"
+    "    <method name='GetGlobalEngine'>\n"
+    "      <arg direction='out' type='v' name='desc' />\n"
+    "      <annotation name='org.freedesktop.DBus.Deprecated' value='true'/>\n"
     "    </method>\n"
-    "    <signal name='RegistryChanged'>\n"
-    "    </signal>\n"
-    "    <signal name='GlobalEngineChanged'>\n"
-    "      <arg type='s' name='engine_name' />\n"
-    "    </signal>\n"
     "  </interface>\n"
     "</node>\n";
 
@@ -463,15 +483,38 @@ bus_ibus_impl_destroy (BusIBusImpl *ibus)
 /**
  * _ibus_get_address:
  *
- * Implement the "GetAddress" method call of the org.freedesktop.IBus interface.
+ * Implement the "Address" method call of the org.freedesktop.IBus interface.
  */
+static GVariant *
+_ibus_get_address (BusIBusImpl     *ibus,
+                   GDBusConnection *connection,
+                   GError         **error)
+{
+    if (error) {
+        *error = NULL;
+    }
+
+    return g_variant_new_string (bus_server_get_address ());
+}
+
 static void
-_ibus_get_address (BusIBusImpl           *ibus,
-                   GVariant              *parameters,
-                   GDBusMethodInvocation *invocation)
+_ibus_get_address_depre (BusIBusImpl           *ibus,
+                         GVariant              *parameters,
+                         GDBusMethodInvocation *invocation)
 {
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.GetAddress() is deprecated!");
+
+    variant = _ibus_get_address (ibus, connection, &error);
+
     g_dbus_method_invocation_return_value (invocation,
-                                           g_variant_new ("(s)", bus_server_get_address ()));
+            g_variant_new ("(s)", g_variant_get_string (variant, NULL)));
+
+    g_variant_unref (variant);
 }
 
 static IBusEngineDesc *
@@ -861,24 +904,58 @@ _ibus_create_input_context (BusIBusImpl           *ibus,
 }
 
 /**
- * _ibus_current_input_context:
+ * _ibus_get_current_input_context:
  *
- * Implement the "CurrentInputContext" method call of the org.freedesktop.IBus interface.
+ * Implement the "CurrentInputContext" method call of the
+ * org.freedesktop.IBus interface.
  */
-static void
-_ibus_current_input_context (BusIBusImpl           *ibus,
-                             GVariant              *parameters,
-                             GDBusMethodInvocation *invocation)
+static GVariant *
+_ibus_get_current_input_context (BusIBusImpl     *ibus,
+                                 GDBusConnection *connection,
+                                 GError         **error)
 {
+    if (error) {
+        *error = NULL;
+    }
+
     if (!ibus->focused_context)
     {
-        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "No focused input context");
+        g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                     "No focused input context");
+        return NULL;
     }
     else {
-        const gchar *path = ibus_service_get_object_path ((IBusService *) ibus->focused_context);
+        const gchar *path = ibus_service_get_object_path (
+                (IBusService *) ibus->focused_context);
         /* the format-string 'o' is for a D-Bus object path. */
-        g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", path));
+        return g_variant_new_object_path (path);
+    }
+}
+
+static void
+_ibus_current_input_context_depre (BusIBusImpl           *ibus,
+                                   GVariant              *parameters,
+                                   GDBusMethodInvocation *invocation)
+{
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GVariant *variant = NULL;
+    GError *error = NULL;
+
+    g_warning ("org.freedesktop.IBus.CurrentInputContext() is deprecated!");
+
+    variant = _ibus_get_current_input_context (ibus, connection, &error);
+
+    if (variant == NULL) {
+        g_dbus_method_invocation_return_error (
+                invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                error->message);
+        g_error_free (error);
+    } else {
+        const gchar *path = g_variant_get_string (variant, NULL);
+        g_dbus_method_invocation_return_value (invocation,
+                                               g_variant_new ("(o)", path));
+        g_variant_unref (variant);
     }
 }
 
@@ -910,7 +987,8 @@ _component_destroy_cb (BusComponent *component,
 /**
  * _ibus_register_component:
  *
- * Implement the "RegisterComponent" method call of the org.freedesktop.IBus interface.
+ * Implement the "RegisterComponent" method call of the
+ * org.freedesktop.IBus interface.
  */
 static void
 _ibus_register_component (BusIBusImpl           *ibus,
@@ -918,23 +996,27 @@ _ibus_register_component (BusIBusImpl           *ibus,
                           GDBusMethodInvocation *invocation)
 {
     GVariant *variant = g_variant_get_child_value (parameters, 0);
-    IBusComponent *component = (IBusComponent *) ibus_serializable_deserialize (variant);
+    IBusComponent *component =
+            (IBusComponent *) ibus_serializable_deserialize (variant);
 
     if (!IBUS_IS_COMPONENT (component)) {
         if (component)
             g_object_unref (component);
-        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "The first argument should be an IBusComponent.");
+        g_dbus_method_invocation_return_error (
+                invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                "The first argument should be an IBusComponent.");
         return;
     }
 
-    BusConnection *connection = bus_connection_lookup (g_dbus_method_invocation_get_connection (invocation));
+    BusConnection *connection = bus_connection_lookup (
+            g_dbus_method_invocation_get_connection (invocation));
     BusFactoryProxy *factory = bus_factory_proxy_new (connection);
 
     if (factory == NULL) {
         g_object_unref (component);
-        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                        "Create factory failed.");
+        g_dbus_method_invocation_return_error (
+                invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                "Create factory failed.");
         return;
     }
 
@@ -952,31 +1034,63 @@ _ibus_register_component (BusIBusImpl           *ibus,
     ibus->register_engine_list = g_list_concat (ibus->register_engine_list,
                                                engines);
 
-    g_signal_connect (buscomp, "destroy", G_CALLBACK (_component_destroy_cb), ibus);
+    g_signal_connect (buscomp,
+                      "destroy",
+                      G_CALLBACK (_component_destroy_cb),
+                      ibus);
 
     g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
 /**
- * _ibus_list_engines:
+ * _ibus_get_engines:
  *
- * Implement the "ListEngines" method call of the org.freedesktop.IBus interface.
+ * Implement the "Engines" method call of the org.freedesktop.IBus interface.
  */
-static void
-_ibus_list_engines (BusIBusImpl           *ibus,
-                    GVariant              *parameters,
-                    GDBusMethodInvocation *invocation)
+static GVariant *
+_ibus_get_engines (BusIBusImpl     *ibus,
+                   GDBusConnection *connection,
+                   GError         **error)
 {
     GVariantBuilder builder;
+    GList *engines = NULL;
+    GList *p;
+
+    if (error) {
+        *error = NULL;
+    }
+
     g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
 
-    GList *engines = bus_registry_get_engines (ibus->registry);
-    GList *p;
+    engines = bus_registry_get_engines (ibus->registry);
+
     for (p = engines; p != NULL; p = p->next) {
-        g_variant_builder_add (&builder, "v", ibus_serializable_serialize ((IBusSerializable *) p->data));
+        g_variant_builder_add (
+                &builder, "v",
+                ibus_serializable_serialize ((IBusSerializable *) p->data));
     }
+
     g_list_free (engines);
-    g_dbus_method_invocation_return_value (invocation, g_variant_new ("(av)", &builder));
+
+    return g_variant_builder_end (&builder);
+}
+
+static void
+_ibus_list_engines_depre (BusIBusImpl           *ibus,
+                          GVariant              *parameters,
+                          GDBusMethodInvocation *invocation)
+{
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.ListEngines() is deprecated!");
+
+    variant = _ibus_get_engines (ibus, connection, &error);
+
+    g_dbus_method_invocation_return_value (invocation,
+                                           g_variant_new ("(@av)", variant));
 }
 
 /**
@@ -1011,23 +1125,50 @@ _ibus_get_engines_by_names (BusIBusImpl           *ibus,
 }
 
 /**
- * _ibus_list_active_engines:
+ * _ibus_get_active_engines:
  *
- * Implement the "ListActiveEngines" method call of the org.freedesktop.IBus interface.
+ * Implement the "ActiveEngines" method call of the
+ * org.freedesktop.IBus interface.
  */
-static void
-_ibus_list_active_engines (BusIBusImpl           *ibus,
-                           GVariant              *parameters,
-                           GDBusMethodInvocation *invocation)
+static GVariant *
+_ibus_get_active_engines (BusIBusImpl     *ibus,
+                          GDBusConnection *connection,
+                          GError         **error)
 {
     GVariantBuilder builder;
+    GList *p;
+
+    if (error) {
+        *error = NULL;
+    }
+
     g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
 
-    GList *p;
     for (p = ibus->register_engine_list; p != NULL; p = p->next) {
-        g_variant_builder_add (&builder, "v", ibus_serializable_serialize ((IBusSerializable *) p->data));
+        g_variant_builder_add (
+                &builder, "v",
+                ibus_serializable_serialize ((IBusSerializable *) p->data));
     }
-    g_dbus_method_invocation_return_value (invocation, g_variant_new ("(av)", &builder));
+
+    return g_variant_builder_end (&builder);
+}
+
+static void
+_ibus_list_active_engines_depre (BusIBusImpl           *ibus,
+                                 GVariant              *parameters,
+                                 GDBusMethodInvocation *invocation)
+{
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.ListActiveEngines() is deprecated!");
+
+    variant = _ibus_get_active_engines (ibus, connection, &error);
+
+    g_dbus_method_invocation_return_value (invocation,
+                                           g_variant_new ("(@av)", variant));
 }
 
 /**
@@ -1046,9 +1187,10 @@ _ibus_exit (BusIBusImpl           *ibus,
     g_dbus_method_invocation_return_value (invocation, NULL);
 
     /* Make sure the reply has been sent out before exit */
-    g_dbus_connection_flush_sync (g_dbus_method_invocation_get_connection (invocation),
-                                  NULL,
-                                  NULL);
+    g_dbus_connection_flush_sync (
+            g_dbus_method_invocation_get_connection (invocation),
+            NULL,
+            NULL);
 
     bus_server_quit (restart);
 }
@@ -1069,43 +1211,96 @@ _ibus_ping (BusIBusImpl           *ibus,
 /**
  * _ibus_get_use_sys_layout:
  *
- * Implement the "GetUseSysLayout" method call of the org.freedesktop.IBus interface.
+ * Implement the "UseSysLayout" method call of the
+ * org.freedesktop.IBus interface.
  */
+static GVariant *
+_ibus_get_use_sys_layout (BusIBusImpl     *ibus,
+                          GDBusConnection *connection,
+                          GError         **error)
+{
+    if (error) {
+        *error = NULL;
+    }
+
+    return g_variant_new_boolean (ibus->use_sys_layout);
+}
+
 static void
-_ibus_get_use_sys_layout (BusIBusImpl           *ibus,
-                          GVariant              *parameters,
-                          GDBusMethodInvocation *invocation)
+_ibus_get_use_sys_layout_depre (BusIBusImpl           *ibus,
+                                GVariant              *parameters,
+                                GDBusMethodInvocation *invocation)
 {
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.GetUseSysLayout() is deprecated!");
+
+    variant = _ibus_get_use_sys_layout (ibus, connection, &error);
+
     g_dbus_method_invocation_return_value (invocation,
-                    g_variant_new ("(b)", ibus->use_sys_layout));
+            g_variant_new ("(b)", g_variant_get_boolean (variant)));
+
+    g_variant_unref (variant);
 }
 
 /**
  * _ibus_get_use_global_engine:
  *
- * Implement the "GetUseGlobalEngine" method call of the org.freedesktop.IBus interface.
+ * Implement the "UseGlobalEngine" method call of the
+ * org.freedesktop.IBus interface.
  */
+static GVariant *
+_ibus_get_use_global_engine (BusIBusImpl     *ibus,
+                             GDBusConnection *connection,
+                             GError         **error)
+{
+    if (error) {
+        *error = NULL;
+    }
+
+    return g_variant_new_boolean (ibus->use_global_engine);
+}
+
 static void
-_ibus_get_use_global_engine (BusIBusImpl           *ibus,
-                             GVariant              *parameters,
-                             GDBusMethodInvocation *invocation)
+_ibus_get_use_global_engine_depre (BusIBusImpl           *ibus,
+                                   GVariant              *parameters,
+                                   GDBusMethodInvocation *invocation)
 {
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.GetUseGlobalEngine() is deprecated!");
+
+    variant = _ibus_get_use_global_engine (ibus, connection, &error);
+
     g_dbus_method_invocation_return_value (invocation,
-                    g_variant_new ("(b)", ibus->use_global_engine));
+            g_variant_new ("(b)", g_variant_get_boolean (variant)));
+
+    g_variant_unref (variant);
 }
 
 /**
  * _ibus_get_global_engine:
  *
- * Implement the "GetGlobalEngine" method call of the org.freedesktop.IBus interface.
+ * Implement the "GlobalEngine" method call of the
+ * org.freedesktop.IBus interface.
  */
-static void
-_ibus_get_global_engine (BusIBusImpl           *ibus,
-                         GVariant              *parameters,
-                         GDBusMethodInvocation *invocation)
+static GVariant *
+_ibus_get_global_engine (BusIBusImpl     *ibus,
+                         GDBusConnection *connection,
+                         GError         **error)
 {
     IBusEngineDesc *desc = NULL;
 
+    if (error) {
+        *error = NULL;
+    }
+
     do {
         if (!ibus->use_global_engine)
             break;
@@ -1118,15 +1313,44 @@ _ibus_get_global_engine (BusIBusImpl           *ibus,
         if (desc == NULL)
             break;
 
-        GVariant *variant = ibus_serializable_serialize ((IBusSerializable *) desc);
-        g_dbus_method_invocation_return_value (invocation,
-                                               g_variant_new ("(v)", variant));
-        return;
+        GVariant *variant = ibus_serializable_serialize (
+                (IBusSerializable *) desc);
+        // Set type "v" for introspection_xml.
+        return g_variant_new_variant (variant);
     } while (0);
 
-    g_dbus_method_invocation_return_error (invocation,
-                    G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                    "No global engine.");
+    g_set_error (error,
+                 G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                 "No global engine.");
+    return NULL;
+}
+
+static void
+_ibus_get_global_engine_depre (BusIBusImpl           *ibus,
+                               GVariant              *parameters,
+                               GDBusMethodInvocation *invocation)
+{
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.GetGlobalEngine() is deprecated!");
+
+    variant = _ibus_get_global_engine (ibus, connection, &error);
+
+    if (variant == NULL) {
+        g_dbus_method_invocation_return_error (
+                invocation,
+                G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                error->message);
+        g_error_free (error);
+    } else {
+        GVariant *retval = g_variant_get_variant (variant);
+        g_dbus_method_invocation_return_value (invocation,
+                g_variant_new ("(v)", retval));
+        g_variant_unref (variant);
+    }
 }
 
 struct _SetGlobalEngineData {
@@ -1149,7 +1373,6 @@ _ibus_set_global_engine_ready_cb (BusInputContext       *context,
                                                G_DBUS_ERROR,
                                                G_DBUS_ERROR_FAILED,
                                                "Set global engine failed.");
-
     }
     else {
         g_dbus_method_invocation_return_value (data->invocation, NULL);
@@ -1178,7 +1401,8 @@ _ibus_set_global_engine_ready_cb (BusInputContext       *context,
 /**
  * _ibus_set_global_engine:
  *
- * Implement the "SetGlobalEngine" method call of the org.freedesktop.IBus interface.
+ * Implement the "SetGlobalEngine" method call of the
+ * org.freedesktop.IBus interface.
  */
 static void
 _ibus_set_global_engine (BusIBusImpl           *ibus,
@@ -1221,17 +1445,22 @@ _ibus_set_global_engine (BusIBusImpl           *ibus,
 }
 
 /**
- * _ibus_is_global_engine_enabled:
+ * _ibus_get_global_engine_enabled:
  *
- * Implement the "IsGlobalEngineEnabled" method call of the org.freedesktop.IBus interface.
+ * Implement the "GlobalEngineEnabled" method call of the
+ * org.freedesktop.IBus interface.
  */
-static void
-_ibus_is_global_engine_enabled (BusIBusImpl           *ibus,
-                                GVariant              *parameters,
-                                GDBusMethodInvocation *invocation)
+static GVariant *
+_ibus_get_global_engine_enabled (BusIBusImpl     *ibus,
+                                 GDBusConnection *connection,
+                                 GError         **error)
 {
     gboolean enabled = FALSE;
 
+    if (error) {
+        *error = NULL;
+    }
+
     do {
         if (!ibus->use_global_engine)
             break;
@@ -1245,20 +1474,40 @@ _ibus_is_global_engine_enabled (BusIBusImpl           *ibus,
         enabled = TRUE;
     } while (0);
 
+    return g_variant_new_boolean (enabled);
+}
+
+static void
+_ibus_is_global_engine_enabled_depre (BusIBusImpl           *ibus,
+                                      GVariant              *parameters,
+                                      GDBusMethodInvocation *invocation)
+{
+    GDBusConnection *connection =
+            g_dbus_method_invocation_get_connection (invocation);
+    GError *error = NULL;
+    GVariant *variant = NULL;
+
+    g_warning ("org.freedesktop.IBus.IsGlobalEngineEnabled() is deprecated!");
+
+    variant = _ibus_get_global_engine_enabled (ibus, connection, &error);
+
     g_dbus_method_invocation_return_value (invocation,
-                    g_variant_new ("(b)", enabled));
+            g_variant_new ("(b)", g_variant_get_boolean (variant)));
+
+    g_variant_unref (variant);
 }
 
 /**
- * _ibus_preload_engines:
+ * _ibus_set_preload_engines:
  *
  * Implement the "PreloadEngines" method call of the
  * org.freedesktop.IBus interface.
  */
-static void
-_ibus_preload_engines (BusIBusImpl           *ibus,
-                       GVariant              *parameters,
-                       GDBusMethodInvocation *invocation)
+static gboolean
+_ibus_set_preload_engines (BusIBusImpl     *ibus,
+                           GDBusConnection *connection,
+                           GVariant        *value,
+                           GError         **error)
 {
     int i, j;
     const gchar **names = NULL;
@@ -1267,7 +1516,11 @@ _ibus_preload_engines (BusIBusImpl           *ibus,
     BusFactoryProxy *factory = NULL;
     GPtrArray *array = g_ptr_array_new ();
 
-    g_variant_get (parameters, "(^a&s)", &names);
+    if (error) {
+        *error = NULL;
+    }
+
+    g_variant_get (value, "^a&s", &names);
 
     for (i = 0; names[i] != NULL; i++) {
         gboolean has_component = FALSE;
@@ -1275,13 +1528,13 @@ _ibus_preload_engines (BusIBusImpl           *ibus,
         desc = bus_ibus_impl_get_engine_desc(ibus, names[i]);
 
         if (desc == NULL) {
-            g_dbus_method_invocation_return_error (invocation,
-                                                   G_DBUS_ERROR,
-                                                   G_DBUS_ERROR_FAILED,
-                                                   "Can not find engine %s.",
-                                                   names[i]);
+            g_set_error (error,
+                         G_DBUS_ERROR,
+                         G_DBUS_ERROR_FAILED,
+                         "Can not find engine %s.",
+                         names[i]);
             g_ptr_array_free (array, FALSE);
-            return;
+            return FALSE;
         }
 
         component = bus_component_from_engine_desc (desc);
@@ -1310,7 +1563,7 @@ _ibus_preload_engines (BusIBusImpl           *ibus,
 
     g_ptr_array_free (array, FALSE);
 
-    g_dbus_method_invocation_return_value (invocation, NULL);
+    return TRUE;
 }
 
 /**
@@ -1368,7 +1621,7 @@ bus_ibus_impl_service_method_call (IBusService           *service,
                                    GVariant              *parameters,
                                    GDBusMethodInvocation *invocation)
 {
-    if (g_strcmp0 (interface_name, "org.freedesktop.IBus") != 0) {
+    if (g_strcmp0 (interface_name, IBUS_INTERFACE_IBUS) != 0) {
         IBUS_SERVICE_CLASS (bus_ibus_impl_parent_class)->service_method_call (
                         service, connection, sender, object_path,
                         interface_name, method_name,
@@ -1379,24 +1632,27 @@ bus_ibus_impl_service_method_call (IBusService           *service,
     /* all methods in the xml definition above should be listed here. */
     static const struct {
         const gchar *method_name;
-        void (* method_callback) (BusIBusImpl *, GVariant *, GDBusMethodInvocation *);
+        void (* method_callback) (BusIBusImpl *,
+                                  GVariant *,
+                                  GDBusMethodInvocation *);
     } methods [] =  {
         /* IBus interface */
-        { "GetAddress",            _ibus_get_address },
         { "CreateInputContext",    _ibus_create_input_context },
-        { "CurrentInputContext",   _ibus_current_input_context },
         { "RegisterComponent",     _ibus_register_component },
-        { "ListEngines",           _ibus_list_engines },
         { "GetEnginesByNames",     _ibus_get_engines_by_names },
-        { "ListActiveEngines",     _ibus_list_active_engines },
         { "Exit",                  _ibus_exit },
         { "Ping",                  _ibus_ping },
-        { "GetUseSysLayout",       _ibus_get_use_sys_layout },
-        { "GetUseGlobalEngine",    _ibus_get_use_global_engine },
-        { "GetGlobalEngine",       _ibus_get_global_engine },
         { "SetGlobalEngine",       _ibus_set_global_engine },
-        { "IsGlobalEngineEnabled", _ibus_is_global_engine_enabled },
-        { "PreloadEngines",        _ibus_preload_engines },
+        /* Start of deprecated methods */
+        { "GetAddress",            _ibus_get_address_depre },
+        { "CurrentInputContext",   _ibus_current_input_context_depre },
+        { "ListEngines",           _ibus_list_engines_depre },
+        { "ListActiveEngines",     _ibus_list_active_engines_depre },
+        { "GetUseSysLayout",       _ibus_get_use_sys_layout_depre },
+        { "GetUseGlobalEngine",    _ibus_get_use_global_engine_depre },
+        { "GetGlobalEngine",       _ibus_get_global_engine_depre },
+        { "IsGlobalEngineEnabled", _ibus_is_global_engine_enabled_depre },
+        /* End of deprecated methods */
     };
 
     gint i;
@@ -1435,6 +1691,11 @@ bus_ibus_impl_service_get_property (IBusService     *service,
                                         GDBusConnection *,
                                         GError **);
     } methods [] =  {
+        { "Address",               _ibus_get_address },
+        { "CurrentInputContext",   _ibus_get_current_input_context },
+        { "Engines",               _ibus_get_engines },
+        { "ActiveEngines",         _ibus_get_active_engines },
+        { "GlobalEngine",          _ibus_get_global_engine },
         { "EmbedPreeditText",      _ibus_get_embed_preedit_text },
     };
 
@@ -1526,6 +1787,7 @@ bus_ibus_impl_service_set_property (IBusService     *service,
                                       GVariant *,
                                       GError **);
     } methods [] =  {
+        { "PreloadEngines",        _ibus_set_preload_engines },
         { "EmbedPreeditText",      _ibus_set_embed_preedit_text },
     };
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ee5df87e..b2793c8a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,6 +48,7 @@ AM_CPPFLAGS =                                   \
     @GOBJECT2_CFLAGS@                           \
     @GIO2_CFLAGS@                               \
     -DIBUS_DATA_DIR=\"$(pkgdatadir)\"           \
+    -DIBUS_DISABLE_DEPRECATION_WARNINGS         \
     -DIBUS_COMPILATION                          \
     -DISOCODES_PREFIX=\"$(ISOCODES_PREFIX)\"    \
     $(NULL)
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 5fa03c3cf..fc401f14b 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -580,10 +580,13 @@ _async_finish_object_path (GAsyncResult *res,
     GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
     if (g_simple_async_result_propagate_error (simple, error))
         return NULL;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
-    g_return_val_if_fail (variant != NULL, NULL);
+    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    GVariant *variant = NULL;
+    g_return_val_if_fail (result != NULL, NULL);
     gchar *path = NULL;
-    g_variant_get (variant, "(&o)", &path);
+    g_variant_get (result, "(v)", &variant);
+    path = g_variant_dup_string (variant, NULL);
+    g_variant_unref (variant);
     return path;
 }
 
@@ -830,13 +833,18 @@ ibus_bus_current_input_context (IBusBus      *bus)
     result = ibus_bus_call_sync (bus,
                                  IBUS_SERVICE_IBUS,
                                  IBUS_PATH_IBUS,
-                                 IBUS_INTERFACE_IBUS,
-                                 "CurrentInputContext",
-                                 NULL,
-                                 G_VARIANT_TYPE ("(o)"));
+                                 "org.freedesktop.DBus.Properties",
+                                 "Get",
+                                 g_variant_new ("(ss)",
+                                                IBUS_INTERFACE_IBUS,
+                                                "CurrentInputContext"),
+                                 G_VARIANT_TYPE ("(v)"));
 
     if (result != NULL) {
-        g_variant_get (result, "(o)", &path);
+        GVariant *variant = NULL;
+        g_variant_get (result, "(v)", &variant);
+        path = g_variant_dup_string (variant, NULL);
+        g_variant_unref (variant);
         g_variant_unref (result);
     }
 
@@ -855,10 +863,12 @@ ibus_bus_current_input_context_async (IBusBus            *bus,
     ibus_bus_call_async (bus,
                          IBUS_SERVICE_IBUS,
                          IBUS_PATH_IBUS,
-                         IBUS_INTERFACE_IBUS,
-                         "CurrentInputContext",
-                         NULL,
-                         G_VARIANT_TYPE ("(o)"),
+                         "org.freedesktop.DBus.Properties",
+                         "Get",
+                         g_variant_new ("(ss)",
+                                        IBUS_INTERFACE_IBUS,
+                                        "CurrentInputContext"),
+                         G_VARIANT_TYPE ("(v)"),
                          ibus_bus_current_input_context_async,
                          timeout_msec,
                          cancellable,
@@ -874,7 +884,7 @@ ibus_bus_current_input_context_async_finish (IBusBus      *bus,
     g_assert (IBUS_IS_BUS (bus));
     g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
                                               ibus_bus_current_input_context_async));
-    return g_strdup (_async_finish_object_path (res, error));
+    return _async_finish_object_path (res, error);
 }
 
 static void
@@ -1528,17 +1538,24 @@ ibus_bus_do_list_engines (IBusBus *bus, gboolean active_engines_only)
 
     GList *retval = NULL;
     GVariant *result;
+    const gchar *property =
+            active_engines_only ? "ActiveEngines" : "Engines";
     result = ibus_bus_call_sync (bus,
                                  IBUS_SERVICE_IBUS,
                                  IBUS_PATH_IBUS,
-                                 IBUS_INTERFACE_IBUS,
-                                 active_engines_only ? "ListActiveEngines" : "ListEngines",
-                                 NULL,
-                                 G_VARIANT_TYPE ("(av)"));
+                                 "org.freedesktop.DBus.Properties",
+                                 "Get",
+                                 g_variant_new ("(ss)",
+                                                IBUS_INTERFACE_IBUS,
+                                                property),
+                                 G_VARIANT_TYPE ("(v)"));
 
     if (result) {
+        GVariant *variant = NULL;
         GVariantIter *iter = NULL;
-        g_variant_get (result, "(av)", &iter);
+
+        g_variant_get (result, "(v)", &variant);
+        iter = g_variant_iter_new (variant);
         GVariant *var;
         while (g_variant_iter_loop (iter, "v", &var)) {
             IBusSerializable *serializable = ibus_serializable_deserialize (var);
@@ -1546,6 +1563,7 @@ ibus_bus_do_list_engines (IBusBus *bus, gboolean active_engines_only)
             retval = g_list_append (retval, serializable);
         }
         g_variant_iter_free (iter);
+        g_variant_unref (variant);
         g_variant_unref (result);
     }
 
@@ -1570,10 +1588,12 @@ ibus_bus_list_engines_async (IBusBus            *bus,
     ibus_bus_call_async (bus,
                          IBUS_SERVICE_IBUS,
                          IBUS_PATH_IBUS,
-                         IBUS_INTERFACE_IBUS,
-                         "ListEngines",
-                         NULL,
-                         G_VARIANT_TYPE ("(av)"),
+                         "org.freedesktop.DBus.Properties",
+                         "Get",
+                         g_variant_new ("(ss)",
+                                        IBUS_INTERFACE_IBUS,
+                                        "Engines"),
+                         G_VARIANT_TYPE ("(v)"),
                          ibus_bus_list_engines_async,
                          timeout_msec,
                          cancellable,
@@ -1589,12 +1609,14 @@ ibus_bus_list_engines_async_finish (IBusBus      *bus,
     GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
     if (g_simple_async_result_propagate_error (simple, error))
         return NULL;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
-    g_return_val_if_fail (variant != NULL, NULL);
+    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    g_return_val_if_fail (result != NULL, NULL);
 
+    GVariant *variant = NULL;
     GList *retval = NULL;
     GVariantIter *iter = NULL;
-    g_variant_get (variant, "(av)", &iter);
+    g_variant_get (result, "(v)", &variant);
+    iter = g_variant_iter_new (variant);
     GVariant *var;
     while (g_variant_iter_loop (iter, "v", &var)) {
         IBusSerializable *serializable = ibus_serializable_deserialize (var);
@@ -1602,9 +1624,11 @@ ibus_bus_list_engines_async_finish (IBusBus      *bus,
         retval = g_list_append (retval, serializable);
     }
     g_variant_iter_free (iter);
+    g_variant_unref (variant);
     return retval;
 }
 
+#ifndef IBUS_DISABLE_DEPRECATED
 GList *
 ibus_bus_list_active_engines (IBusBus *bus)
 {
@@ -1623,10 +1647,12 @@ ibus_bus_list_active_engines_async (IBusBus            *bus,
     ibus_bus_call_async (bus,
                          IBUS_SERVICE_IBUS,
                          IBUS_PATH_IBUS,
-                         IBUS_INTERFACE_IBUS,
-                         "ListActiveEngines",
-                         NULL,
-                         G_VARIANT_TYPE ("(av)"),
+                         "org.freedesktop.DBus.Properties",
+                         "Get",
+                         g_variant_new ("(ss)",
+                                        IBUS_INTERFACE_IBUS,
+                                        "ActiveEngines"),
+                         G_VARIANT_TYPE ("(v)"),
                          ibus_bus_list_active_engines_async,
                          timeout_msec,
                          cancellable,
@@ -1641,6 +1667,7 @@ ibus_bus_list_active_engines_async_finish (IBusBus      *bus,
 {
     return ibus_bus_list_engines_async_finish (bus, res, error);
 }
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 IBusEngineDesc **
 ibus_bus_get_engines_by_names (IBusBus             *bus,
@@ -1706,6 +1733,7 @@ ibus_bus_get_config (IBusBus *bus)
     return priv->config;
 }
 
+#ifndef IBUS_DISABLE_DEPRECATED
 gboolean
 ibus_bus_get_use_sys_layout (IBusBus *bus)
 {
@@ -1758,8 +1786,9 @@ ibus_bus_get_use_sys_layout_async_finish (IBusBus      *bus,
                                           GError      **error)
 {
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_get_use_sys_layout_async));
+    g_assert (g_simple_async_result_is_valid (
+                      res, (GObject *) bus,
+                      ibus_bus_get_use_sys_layout_async));
     return _async_finish_gboolean (res, error);
 }
 
@@ -1815,8 +1844,9 @@ ibus_bus_get_use_global_engine_async_finish (IBusBus      *bus,
                                              GError      **error)
 {
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_get_use_global_engine_async));
+    g_assert (g_simple_async_result_is_valid (
+                      res, (GObject *) bus,
+                      ibus_bus_get_use_global_engine_async));
     return _async_finish_gboolean (res, error);
 }
 
@@ -1870,10 +1900,12 @@ gboolean ibus_bus_is_global_engine_enabled_async_finish (IBusBus      *bus,
                                                          GError      **error)
 {
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_is_global_engine_enabled_async));
+    g_assert (g_simple_async_result_is_valid (
+                      res, (GObject *) bus,
+                      ibus_bus_is_global_engine_enabled_async));
     return _async_finish_gboolean (res, error);
 }
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 IBusEngineDesc *
 ibus_bus_get_global_engine (IBusBus *bus)
@@ -1885,16 +1917,20 @@ ibus_bus_get_global_engine (IBusBus *bus)
     result = ibus_bus_call_sync (bus,
                                  IBUS_SERVICE_IBUS,
                                  IBUS_PATH_IBUS,
-                                 IBUS_INTERFACE_IBUS,
-                                 "GetGlobalEngine",
-                                 NULL,
+                                 "org.freedesktop.DBus.Properties",
+                                 "Get",
+                                 g_variant_new ("(ss)",
+                                                IBUS_INTERFACE_IBUS,
+                                                "GlobalEngine"),
                                  G_VARIANT_TYPE ("(v)"));
 
     if (result) {
         GVariant *variant = NULL;
         g_variant_get (result, "(v)", &variant);
         if (variant) {
-            engine = IBUS_ENGINE_DESC (ibus_serializable_deserialize (variant));
+            GVariant *obj = g_variant_get_variant (variant);
+            engine = IBUS_ENGINE_DESC (ibus_serializable_deserialize (obj));
+            g_variant_unref (obj);
             g_variant_unref (variant);
         }
         g_variant_unref (result);
@@ -1915,9 +1951,11 @@ ibus_bus_get_global_engine_async (IBusBus            *bus,
     ibus_bus_call_async (bus,
                          IBUS_SERVICE_IBUS,
                          IBUS_PATH_IBUS,
-                         IBUS_INTERFACE_IBUS,
-                         "GetGlobalEngine",
-                         NULL,
+                         "org.freedesktop.DBus.Properties",
+                         "Get",
+                         g_variant_new ("(ss)",
+                                        IBUS_INTERFACE_IBUS,
+                                        "GlobalEngine"),
                          G_VARIANT_TYPE ("(v)"),
                          ibus_bus_get_global_engine_async,
                          timeout_msec,
@@ -1934,15 +1972,17 @@ ibus_bus_get_global_engine_async_finish (IBusBus      *bus,
     GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
     if (g_simple_async_result_propagate_error (simple, error))
         return NULL;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
-    g_return_val_if_fail (variant != NULL, NULL);
-    GVariant *inner_variant = NULL;
-    g_variant_get (variant, "(v)", &inner_variant);
+    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    g_return_val_if_fail (result != NULL, NULL);
+    GVariant *variant = NULL;
+    g_variant_get (result, "(v)", &variant);
 
     IBusEngineDesc *engine = NULL;
-    if (inner_variant) {
-        engine = IBUS_ENGINE_DESC (ibus_serializable_deserialize (inner_variant));
-        g_variant_unref (inner_variant);
+    if (variant) {
+        GVariant *obj = g_variant_get_variant (variant);
+        engine = IBUS_ENGINE_DESC (ibus_serializable_deserialize (obj));
+        g_variant_unref (obj);
+        g_variant_unref (variant);
     }
     return engine;
 }
@@ -2011,16 +2051,21 @@ ibus_bus_preload_engines (IBusBus             *bus,
                           const gchar * const *names)
 {
     GVariant *result;
+    GVariant *variant = NULL;
 
     g_return_val_if_fail (IBUS_IS_BUS (bus), FALSE);
     g_return_val_if_fail (names != NULL && names[0] != NULL, FALSE);
 
+    variant = g_variant_new_strv(names, -1);
     result = ibus_bus_call_sync (bus,
                                  IBUS_SERVICE_IBUS,
                                  IBUS_PATH_IBUS,
-                                 IBUS_INTERFACE_IBUS,
-                                 "PreloadEngines",
-                                 g_variant_new("(^as)", names),
+                                 "org.freedesktop.DBus.Properties",
+                                 "Set",
+                                 g_variant_new ("(ssv)",
+                                                IBUS_INTERFACE_IBUS,
+                                                "PreloadEngines",
+                                                variant),
                                  NULL);
 
     if (result) {
@@ -2039,15 +2084,21 @@ ibus_bus_preload_engines_async (IBusBus             *bus,
                                 GAsyncReadyCallback  callback,
                                 gpointer             user_data)
 {
+    GVariant *variant = NULL;
+
     g_return_if_fail (IBUS_IS_BUS (bus));
     g_return_if_fail (names != NULL && names[0] != NULL);
 
+    variant = g_variant_new_strv(names, -1);
     ibus_bus_call_async (bus,
                          IBUS_SERVICE_IBUS,
                          IBUS_PATH_IBUS,
-                         IBUS_INTERFACE_IBUS,
-                         "PreloadEngines",
-                         g_variant_new("(^as)", names),
+                         "org.freedesktop.DBus.Properties",
+                         "Set",
+                         g_variant_new ("(ssv)",
+                                        IBUS_INTERFACE_IBUS,
+                                        "PreloadEngines",
+                                        variant),
                          NULL, /* no return value */
                          ibus_bus_preload_engines_async,
                          timeout_msec,
@@ -2096,6 +2147,49 @@ ibus_bus_get_ibus_property (IBusBus     *bus,
     return retval;
 }
 
+void
+ibus_bus_get_ibus_property_async (IBusBus            *bus,
+                                  const gchar        *property_name,
+                                  gint                timeout_msec,
+                                  GCancellable       *cancellable,
+                                  GAsyncReadyCallback callback,
+                                  gpointer            user_data)
+{
+    g_return_if_fail (IBUS_IS_BUS (bus));
+    g_return_if_fail (property_name != NULL);
+
+    ibus_bus_call_async (bus,
+                         IBUS_SERVICE_IBUS,
+                         IBUS_PATH_IBUS,
+                         "org.freedesktop.DBus.Properties",
+                         "Get",
+                         g_variant_new ("(ss)",
+                                        IBUS_INTERFACE_IBUS,
+                                        property_name),
+                         G_VARIANT_TYPE ("(v)"),
+                         ibus_bus_get_ibus_property_async,
+                         timeout_msec,
+                         cancellable,
+                         callback,
+                         user_data);
+}
+
+GVariant *
+ibus_bus_get_ibus_property_async_finish (IBusBus      *bus,
+                                         GAsyncResult *res,
+                                         GError      **error)
+{
+    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
+    if (g_simple_async_result_propagate_error (simple, error))
+        return NULL;
+    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    g_return_val_if_fail (result != NULL, NULL);
+    GVariant *retval = NULL;
+    g_variant_get (result, "(v)", &retval);
+
+    return retval;
+}
+
 void
 ibus_bus_set_ibus_property (IBusBus     *bus,
                             const gchar *property_name,
@@ -2122,6 +2216,47 @@ ibus_bus_set_ibus_property (IBusBus     *bus,
     }
 }
 
+void
+ibus_bus_set_ibus_property_async (IBusBus             *bus,
+                                  const gchar         *property_name,
+                                  GVariant            *value,
+                                  gint                 timeout_msec,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
+{
+    g_return_if_fail (IBUS_IS_BUS (bus));
+    g_return_if_fail (property_name != NULL);
+
+    ibus_bus_call_async (bus,
+                         IBUS_SERVICE_IBUS,
+                         IBUS_PATH_IBUS,
+                         "org.freedesktop.DBus.Properties",
+                         "Set",
+                         g_variant_new ("(ssv)",
+                                        IBUS_INTERFACE_IBUS,
+                                        property_name,
+                                        value),
+                         NULL, /* no return value */
+                         ibus_bus_set_ibus_property_async,
+                         timeout_msec,
+                         cancellable,
+                         callback,
+                         user_data);
+}
+
+gboolean
+ibus_bus_set_ibus_property_async_finish (IBusBus       *bus,
+                                         GAsyncResult  *res,
+                                         GError       **error)
+{
+    g_assert (IBUS_IS_BUS (bus));
+    g_assert (g_simple_async_result_is_valid (
+            res, (GObject *) bus,
+            ibus_bus_set_ibus_property_async));
+    return _async_finish_void (res, error);
+}
+
 static GVariant *
 ibus_bus_call_sync (IBusBus            *bus,
                     const gchar        *bus_name,
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 6344337cf..4e25a9a31 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -35,9 +35,11 @@
  * An IBusBus connects with IBus daemon.
  */
 #include <gio/gio.h>
+#include <glib.h>
 #include "ibusinputcontext.h"
 #include "ibusconfig.h"
 #include "ibuscomponent.h"
+#include "ibusshare.h"
 
 /*
  * Type macros.
@@ -676,13 +678,18 @@ GList       *ibus_bus_list_engines_async_finish
                                          GAsyncResult   *res,
                                          GError        **error);
 
+#ifndef IBUS_DISABLE_DEPRECATED
 /**
  * ibus_bus_list_active_engines:
  * @bus: An #IBusBus.
  * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
  *
  * List active engines synchronously.
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/preload-engines instead.
  */
+IBUS_DEPRECATED
 GList       *ibus_bus_list_active_engines
                                         (IBusBus        *bus);
 
@@ -696,7 +703,11 @@ GList       *ibus_bus_list_active_engines
  * @user_data: The data to pass to callback.
  *
  * List active engines asynchronously.
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/preload-engines instead.
  */
+IBUS_DEPRECATED
 void         ibus_bus_list_active_engines_async
                                         (IBusBus        *bus,
                                          gint            timeout_msec,
@@ -714,11 +725,16 @@ void         ibus_bus_list_active_engines_async
  * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
  *
  * Finishes an operation started with ibus_bus_list_active_engines_async().
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/preload-engines instead.
  */
+IBUS_DEPRECATED
 GList       *ibus_bus_list_active_engines_async_finish
                                         (IBusBus        *bus,
                                          GAsyncResult   *res,
                                          GError         **error);
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 /**
  * ibus_bus_get_engines_by_names:
@@ -734,13 +750,18 @@ IBusEngineDesc **
              ibus_bus_get_engines_by_names
                                         (IBusBus             *bus,
                                          const gchar * const *names);
+#ifndef IBUS_DISABLE_DEPRECATED
 /**
  * ibus_bus_get_use_sys_layout:
  * @bus: An #IBusBus.
  * @returns: %TRUE if "use_sys_layout" option is enabled.
  *
  * Check if the bus's "use_sys_layout" option is enabled or not synchronously.
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/use_system_keyboard_layout instead.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_get_use_sys_layout
                                         (IBusBus        *bus);
 
@@ -754,7 +775,11 @@ gboolean     ibus_bus_get_use_sys_layout
  * @user_data: The data to pass to callback.
  *
  * Check if the bus's "use_sys_layout" option is enabled or not asynchronously.
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/use_system_keyboard_layout instead.
  */
+IBUS_DEPRECATED
 void         ibus_bus_get_use_sys_layout_async
                                         (IBusBus        *bus,
                                          gint            timeout_msec,
@@ -772,7 +797,11 @@ void         ibus_bus_get_use_sys_layout_async
  * @returns: TRUE if "use_sys_layout" option is enabled.
  *
  * Finishes an operation started with ibus_bus_get_use_sys_layout_async().
+ *
+ * Deprecated: 1.5.3: Read dconf value
+ * /desktop/ibus/general/use_system_keyboard_layout instead.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_get_use_sys_layout_async_finish
                                         (IBusBus        *bus,
                                          GAsyncResult   *res,
@@ -784,7 +813,10 @@ gboolean     ibus_bus_get_use_sys_layout_async_finish
  * @returns: TRUE if "use_global_engine" option is enabled.
  *
  * Check if the bus's "use_global_engine" option is enabled or not synchronously.
+ *
+ * Deprecated: 1.5.3: Currently global engine is always used.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_get_use_global_engine
                                         (IBusBus        *bus);
 
@@ -798,7 +830,10 @@ gboolean     ibus_bus_get_use_global_engine
  * @user_data: The data to pass to callback.
  *
  * Check if the bus's "use_global_engine" option is enabled or not asynchronously.
+ *
+ * Deprecated: 1.5.3: Currently global engine is always used.
  */
+IBUS_DEPRECATED
 void         ibus_bus_get_use_global_engine_async
                                         (IBusBus        *bus,
                                          gint            timeout_msec,
@@ -816,7 +851,10 @@ void         ibus_bus_get_use_global_engine_async
  * @returns: %TRUE if "use_global_engine" option is enabled.
  *
  * Finishes an operation started with ibus_bus_get_use_global_engine_async().
+ *
+ * Deprecated: 1.5.3: Currently global engine is always used.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_get_use_global_engine_async_finish
                                         (IBusBus        *bus,
                                          GAsyncResult   *res,
@@ -828,7 +866,14 @@ gboolean     ibus_bus_get_use_global_engine_async_finish
  * @returns: %TRUE if the current global engine is enabled.
  *
  * Check if the current global engine is enabled or not synchronously.
+ *
+ * Deprecated: 1.5.3: 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.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_is_global_engine_enabled
                                         (IBusBus        *bus);
 
@@ -842,7 +887,14 @@ gboolean     ibus_bus_is_global_engine_enabled
  * @user_data: The data to pass to callback.
  *
  * Check if the current global engine is enabled or not asynchronously.
+ *
+ * Deprecated: 1.5.3: 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.
  */
+IBUS_DEPRECATED
 void         ibus_bus_is_global_engine_enabled_async
                                         (IBusBus        *bus,
                                          gint            timeout_msec,
@@ -860,11 +912,19 @@ void         ibus_bus_is_global_engine_enabled_async
  * @returns: %TRUE if the current global engine is enabled.
  *
  * Finishes an operation started with ibus_bus_is_global_engine_enabled_async().
+ *
+ * Deprecated: 1.5.3: 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.
  */
+IBUS_DEPRECATED
 gboolean     ibus_bus_is_global_engine_enabled_async_finish
                                         (IBusBus        *bus,
                                          GAsyncResult   *res,
                                          GError        **error);
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 /**
  * ibus_bus_get_global_engine:
@@ -1055,6 +1115,43 @@ gboolean     ibus_bus_preload_engines_async_finish
 GVariant *   ibus_bus_get_ibus_property (IBusBus        *bus,
                                          const gchar    *property_name);
 
+/**
+ * ibus_bus_get_ibus_property_async:
+ * @bus: An #IBusBus.
+ * @property_name: property name in org.freedesktop.DBus.Properties.Get
+ * @timeout_msec: The timeout in milliseconds or -1 to use the default timeout.
+ * @cancellable: A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied
+ *      or %NULL if you don't care about the result of the method invocation.
+ * @user_data: The data to pass to callback.
+ *
+ * Get org.freedesktop.DBus.Properties asynchronously.
+ */
+void         ibus_bus_get_ibus_property_async
+                                        (IBusBus        *bus,
+                                         const gchar    *property_name,
+                                         gint            timeout_msec,
+                                         GCancellable   *cancellable,
+                                         GAsyncReadyCallback
+                                                         callback,
+                                         gpointer             user_data);
+
+/**
+ * ibus_bus_get_ibus_property_async_finish:
+ * @bus: An #IBusBus.
+ * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
+ *   ibus_bus_get_property_async().
+ * @error: Return location for error or %NULL.
+ * @returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
+ *           The returned value must be freed with g_variant_unref().
+ *
+ * Finishes an operation started with ibus_bus_get_ibus_property_async().
+ */
+GVariant *   ibus_bus_get_ibus_property_async_finish
+                                        (IBusBus        *bus,
+                                         GAsyncResult   *res,
+                                         GError        **error);
+
 /**
  * ibus_bus_set_ibus_property:
  * @bus: An #IBusBus.
@@ -1067,5 +1164,43 @@ void         ibus_bus_set_ibus_property (IBusBus        *bus,
                                          const gchar    *property_name,
                                          GVariant       *value);
 
+/**
+ * ibus_bus_set_ibus_property_async:
+ * @bus: An #IBusBus.
+ * @property_name: property name in org.freedesktop.DBus.Properties.Set
+ * @value: value in org.freedesktop.DBus.Properties.Set
+ * @timeout_msec: The timeout in milliseconds or -1 to use the default timeout.
+ * @cancellable: A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied
+ *      or %NULL if you don't care about the result of the method invocation.
+ * @user_data: The data to pass to callback.
+ *
+ * Set org.freedesktop.DBus.Properties asynchronously.
+ */
+void         ibus_bus_set_ibus_property_async
+                                        (IBusBus        *bus,
+                                         const gchar    *property_name,
+                                         GVariant       *value,
+                                         gint            timeout_msec,
+                                         GCancellable   *cancellable,
+                                         GAsyncReadyCallback
+                                                         callback,
+                                         gpointer             user_data);
+
+/**
+ * ibus_bus_set_ibus_property_async_finish:
+ * @bus: An #IBusBus.
+ * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
+ *   ibus_bus_set_property_async().
+ * @error: Return location for error or %NULL.
+ * @returns: %TRUE if property is set with async. %FALSE failed.
+ *
+ * Finishes an operation started with ibus_bus_set_ibus_property_async().
+ */
+gboolean     ibus_bus_set_ibus_property_async_finish
+                                        (IBusBus        *bus,
+                                         GAsyncResult   *res,
+                                         GError        **error);
+
 G_END_DECLS
 #endif
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 512fa599e..5fc135db4 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -38,6 +38,12 @@
 
 #include <glib.h>
 
+#ifdef IBUS_DISABLE_DEPRECATION_WARNINGS
+#define IBUS_DEPRECATED
+#else
+#define IBUS_DEPRECATED G_DEPRECATED
+#endif
+
 /**
  * IBUS_SERVICE_IBUS:
  *
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index bf7c6a9e0..ad8bb8e5b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -24,12 +24,13 @@ NULL =
 
 DEPS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-AM_CPPFLAGS =              \
-	-g                  \
-	@GLIB2_CFLAGS@      \
-	@GIO2_CFLAGS@       \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
+AM_CPPFLAGS = \
+	-g                                      \
+	@GLIB2_CFLAGS@                          \
+	@GIO2_CFLAGS@                           \
+	-DIBUS_DISABLE_DEPRECATION_WARNINGS     \
+	-I$(top_srcdir)/src                     \
+	-I$(top_builddir)/src                   \
 	$(NULL)
 
 prog_ldadd = 			\
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index f3f93bdf3..e370eb294 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -20,6 +20,7 @@ print_engines (const GList *engines)
     }
 }
 
+#ifndef IBUS_DISABLE_DEPRECATED
 static void
 test_list_active_engines (void)
 {
@@ -32,6 +33,7 @@ test_list_active_engines (void)
     g_list_foreach (engines, (GFunc) g_object_unref, NULL);
     g_list_free (engines);
 }
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 static void
 test_list_engines (void)
@@ -353,6 +355,7 @@ start_list_engines_async (void)
                                  NULL); /* user_data */
 }
 
+#ifndef IBUS_DISABLE_DEPRECATED
 static void
 finish_list_active_engines_async (GObject *source_object,
                                   GAsyncResult *res,
@@ -447,6 +450,7 @@ start_is_global_engine_enabled_async (void)
                                              finish_is_global_engine_enabled_async,
                                              NULL); /* user_data */
 }
+#endif /* IBUS_DISABLE_DEPRECATED */
 
 static void
 finish_get_global_engine_async (GObject *source_object,
@@ -522,6 +526,233 @@ start_preload_engines_async (void)
             NULL); /* user_data */
 }
 
+static void
+test_get_address (void)
+{
+    GVariant *result;
+
+    result = ibus_bus_get_ibus_property (bus, "Address");
+    g_variant_get_string (result, NULL);
+    g_variant_unref (result);
+}
+
+static void
+test_get_current_input_context (void)
+{
+    GVariant *result;
+
+    result = ibus_bus_get_ibus_property (bus, "CurrentInputContext");
+    g_variant_get_string (result, NULL);
+    g_variant_unref (result);
+}
+
+static void
+test_get_engines (void)
+{
+    GVariant *result, *var;
+    GVariantIter *iter;
+    GList *engines = NULL;
+
+    result = ibus_bus_get_ibus_property (bus, "Engines");
+    iter = g_variant_iter_new (result);
+    while (g_variant_iter_loop (iter, "v", &var)) {
+        IBusSerializable *serializable = ibus_serializable_deserialize (var);
+        g_object_ref_sink (serializable);
+        engines = g_list_append (engines, serializable);
+    }
+    g_variant_iter_free (iter);
+    g_variant_unref (result);
+
+    print_engines (engines);
+
+    g_list_foreach (engines, (GFunc) g_object_unref, NULL);
+    g_list_free (engines);
+}
+
+static void
+test_get_global_engine (void)
+{
+    GVariant *result, *obj;
+    IBusEngineDesc *desc = NULL;
+
+    result = ibus_bus_get_ibus_property (bus, "GlobalEngine");
+    obj = g_variant_get_variant (result);
+    desc = IBUS_ENGINE_DESC (ibus_serializable_deserialize (obj));
+    g_variant_unref (obj);
+    g_variant_unref (result);
+
+    if (desc)
+        g_object_unref (desc);
+}
+
+static void
+test_set_preload_engines (void)
+{
+    const gchar *preload_engines[] = { "xkb:us::eng", "xkb:jp::jpn", NULL };
+    GVariant *variant;
+
+    variant = g_variant_new_strv (preload_engines, -1);
+    ibus_bus_set_ibus_property (bus, "PreloadEngines", variant);
+}
+
+static void
+finish_get_address_async (GObject      *source_object,
+                          GAsyncResult *res,
+                          gpointer      user_data)
+{
+    GError *error = NULL;
+    GVariant *result;
+
+    result = ibus_bus_get_ibus_property_async_finish (bus, res, &error);
+    g_variant_get_string (result, NULL);
+    g_variant_unref (result);
+    g_debug ("finish_get_address_async: OK");
+    call_next_async_function ();
+}
+
+static void
+start_get_address_async (void)
+{
+    ibus_bus_get_ibus_property_async (
+            bus,
+            "Address",
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_get_address_async,
+            NULL); /* user_data */
+}
+
+static void
+finish_get_current_input_context_async (GObject      *source_object,
+                                        GAsyncResult *res,
+                                        gpointer      user_data)
+{
+    GError *error = NULL;
+    GVariant *result;
+
+    result = ibus_bus_get_ibus_property_async_finish (bus, res, &error);
+    g_variant_get_string (result, NULL);
+    g_variant_unref (result);
+    g_debug ("finish_get_current_input_context_async: OK");
+    call_next_async_function ();
+}
+
+static void
+start_get_current_input_context_async (void)
+{
+    ibus_bus_get_ibus_property_async (
+            bus,
+            "CurrentInputContext",
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_get_current_input_context_async,
+            NULL); /* user_data */
+}
+
+static void
+finish_get_engines_async (GObject      *source_object,
+                          GAsyncResult *res,
+                          gpointer      user_data)
+{
+    GError *error = NULL;
+    GVariant *result, *var;
+    GVariantIter *iter;
+    GList *engines = NULL;
+
+    result = ibus_bus_get_ibus_property_async_finish (bus, res, &error);
+    iter = g_variant_iter_new (result);
+    while (g_variant_iter_loop (iter, "v", &var)) {
+        IBusSerializable *serializable = ibus_serializable_deserialize (var);
+        g_object_ref_sink (serializable);
+        engines = g_list_append (engines, serializable);
+    }
+    g_variant_iter_free (iter);
+    g_variant_unref (result);
+
+    print_engines (engines);
+
+    g_list_foreach (engines, (GFunc) g_object_unref, NULL);
+    g_list_free (engines);
+
+    g_debug ("finish_get_engines_async: OK");
+    call_next_async_function ();
+}
+
+static void
+start_get_engines_async (void)
+{
+    ibus_bus_get_ibus_property_async (
+            bus,
+            "Engines",
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_get_engines_async,
+            NULL); /* user_data */
+}
+
+static void
+finish_get_prop_global_engine_async (GObject *source_object,
+                                     GAsyncResult *res,
+                                     gpointer user_data)
+{
+    GError *error = NULL;
+    GVariant *result, *obj;
+    IBusEngineDesc *desc = NULL;
+
+    result = ibus_bus_get_ibus_property_async_finish (bus, res, &error);
+    obj = g_variant_get_variant (result);
+    desc = IBUS_ENGINE_DESC (ibus_serializable_deserialize (obj));
+    g_variant_unref (obj);
+    g_variant_unref (result);
+
+    if (desc)
+        g_object_unref (desc);
+
+    g_debug ("finish_get_prop_global_engine_async: OK");
+    call_next_async_function ();
+}
+
+static void
+start_get_prop_global_engine_async (void)
+{
+    ibus_bus_get_ibus_property_async (
+            bus,
+            "GlobalEngine",
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_get_prop_global_engine_async,
+            NULL); /* user_data */
+}
+
+static void
+finish_set_preload_engines_async (GObject      *source_object,
+                                  GAsyncResult *res,
+                                  gpointer      user_data)
+{
+    GError *error = NULL;
+
+    ibus_bus_set_ibus_property_async_finish (bus, res, &error);
+    g_debug ("finish_set_preload_engines_async: OK");
+    call_next_async_function ();
+}
+
+static void
+start_set_preload_engines_async (void)
+{
+    const gchar *preload_engines[] = { "xkb:us::eng", "xkb:jp::jpn", NULL };
+    GVariant *variant;
+
+    variant = g_variant_new_strv (preload_engines, -1);
+    ibus_bus_set_ibus_property_async (
+            bus,
+            "PreloadEngines",
+            variant,
+            -1, /* timeout */
+            NULL, /* cancellable */
+            finish_set_preload_engines_async,
+            NULL); /* user_data */
+}
+
 static void
 finish_exit_async (GObject *source_object,
                    GAsyncResult *res,
@@ -619,6 +850,11 @@ call_next_async_function (void)
         start_set_global_engine_async,
         start_get_global_engine_async,
         start_preload_engines_async,
+        start_get_address_async,
+        start_get_current_input_context_async,
+        start_get_engines_async,
+        start_get_prop_global_engine_async,
+        start_set_preload_engines_async,
         start_exit_async,
     };
     static guint index = 0;
@@ -663,6 +899,12 @@ main (gint    argc,
     g_test_add_func ("/ibus/create-input-context-async",
                      test_create_input_context_async);
     g_test_add_func ("/ibus/get-engines-by-names", test_get_engines_by_names);
+    g_test_add_func ("/ibus/get-address", test_get_address);
+    g_test_add_func ("/ibus/get-current-input-context",
+                     test_get_current_input_context);
+    g_test_add_func ("/ibus/get-engines", test_get_engines);
+    g_test_add_func ("/ibus/get-global-engine", test_get_global_engine);
+    g_test_add_func ("/ibus/set-preload-engines", test_set_preload_engines);
     g_test_add_func ("/ibus/async-apis", test_async_apis);
     g_test_add_func ("/ibus/bus-new-async", test_bus_new_async);
     g_test_add_func ("/ibus/bus-new-async/list-engines", test_list_engines);

From 5ed2b8c8253717b6c26281a8721403b006db04e6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 5 Jul 2013 13:03:49 +0900
Subject: [PATCH 152/816] Delete the python xdg dependency.

BUG=RH#980749

Review URL: https://codereview.appspot.com/10930043
---
 debian/control |  2 +-
 ibus.spec.in   |  1 -
 ibus/common.py |  2 +-
 setup/main.py  | 18 ++++++++++++------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 0d5a89dcc..da39a2ac3 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Vcs-Browser: https://code.launchpad.net/~lidaobing/ibus/ibus
 Package: ibus
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-glade2,
- python-ibus (= ${source:Version}), python-xdg, librsvg2-common
+ python-ibus (= ${source:Version}), librsvg2-common
 Recommends: im-switch, ibus-gtk2, ibus-gtk3, ibus-qt4
 Conflicts: ibus-anthy (<< 1.2),
  ibus-table (<< 1.2),
diff --git a/ibus.spec.in b/ibus.spec.in
index 7989949bf..334f37ec9 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -47,7 +47,6 @@ Requires:   %{name}-gtk3 = %{version}-%{release}
 Requires:   %{name}-conf = %{version}-%{release}
 
 Requires:   pygtk2
-Requires:   pyxdg
 Requires:   iso-codes
 Requires:   dbus-python >= %{dbus_python_version}
 Requires:   im-chooser >= %{im_chooser_version}
diff --git a/ibus/common.py b/ibus/common.py
index fb39d5641..ec4a4d845 100644
--- a/ibus/common.py
+++ b/ibus/common.py
@@ -57,7 +57,7 @@
 
 import os
 import sys
-from xdg import BaseDirectory
+#from xdg import BaseDirectory
 import ctypes
 import _config
 
diff --git a/setup/main.py b/setup/main.py
index 0281ac7f1..c1e05a7fe 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -29,7 +29,11 @@
 from gi.repository import Gtk
 from gi.repository import IBus
 from os import path
-from xdg import BaseDirectory
+
+try:
+    from xdg.BaseDirectory import xdg_config_home
+except ImportError:
+    xdg_config_home = ".config"
 
 import keyboardshortcut
 import locale
@@ -456,8 +460,9 @@ def __item_preload_column_toggled_cb(self, cell, path_str, model):
         model.set(iter, COLUMN_PRELOAD, data[DATA_PRELOAD])
 
     def __is_auto_start(self):
-        link_file = path.join(BaseDirectory.xdg_config_home, "autostart/IBus.desktop")
-        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"), "share/applications/IBus.desktop")
+        link_file = path.join(xdg_config_home, "autostart/ibus.desktop")
+        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
+                                 "share/applications/ibus.desktop")
 
         if not path.exists(link_file):
             return False
@@ -468,12 +473,13 @@ def __is_auto_start(self):
         return True
 
     def __checkbutton_auto_start_toggled_cb(self, button):
-        auto_start_dir = path.join(BaseDirectory.xdg_config_home, "autostart")
+        auto_start_dir = path.join(xdg_config_home, "autostart")
         if not path.isdir(auto_start_dir):
             os.makedirs(auto_start_dir)
 
-        link_file = path.join(BaseDirectory.xdg_config_home, "autostart/IBus.desktop")
-        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"), "share/applications/IBus.desktop")
+        link_file = path.join(xdg_config_home, "autostart/ibus.desktop")
+        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
+                                 "share/applications/ibus.desktop")
         # unlink file
         try:
             os.unlink(link_file)

From 88ce21749e84cc92cbc91c919d27721c0f2e1ceb Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 10 Jul 2013 16:55:19 +0900
Subject: [PATCH 153/816] Load the system registry cache prior to the user one.

gnome-settings-daemon runs ibus-daemon after the user configures
any input method engines and causes a delay to show the engines
on UI because no cache exists for ibus-daemon.
The system cache can avoid the user timing.

Review URL: https://codereview.appspot.com/10364043
---
 bus/Makefile.am                       |  14 -
 bus/dbusimpl.c                        |  10 +-
 bus/ibus-daemon.1.in                  |   3 +-
 bus/ibusimpl.c                        | 222 ++++++++-
 bus/ibusimpl.h                        |  12 +-
 bus/main.c                            |  10 +-
 bus/registry.c                        | 673 --------------------------
 bus/registry.h                        | 122 -----
 bus/test-registry.c                   |  12 -
 docs/reference/ibus/ibus-docs.sgml.in |   1 +
 docs/reference/ibus/ibus.types        |   1 +
 src/Makefile.am                       |  25 +-
 src/ibus.h                            |   5 +-
 src/ibusregistry.c                    | 557 +++++++++++++++++++++
 src/ibusregistry.h                    | 223 +++++++++
 src/tests/Makefile.am                 |  30 +-
 src/tests/ibus-registry.c             |  11 +
 tools/ibus.1.in                       |  29 ++
 tools/main.vala                       |  85 +++-
 19 files changed, 1156 insertions(+), 889 deletions(-)
 delete mode 100644 bus/registry.c
 delete mode 100644 bus/registry.h
 delete mode 100644 bus/test-registry.c
 create mode 100644 src/ibusregistry.c
 create mode 100644 src/ibusregistry.h
 create mode 100644 src/tests/ibus-registry.c

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 826c673c5..2e06386c4 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -70,8 +70,6 @@ commonsrc = \
 	connection.h \
 	matchrule.c \
 	matchrule.h \
-	registry.c \
-	registry.h \
 	marshalers.c \
 	marshalers.h \
 	types.h \
@@ -111,24 +109,12 @@ marshalers.c: marshalers.h marshalers.list
 if ENABLE_TESTS
 TESTS = \
 	test-matchrule \
-	test-registry \
 	test-stress	\
 	$(NULL)
 endif
 
 noinst_PROGRAMS = $(TESTS)
 
-test_registry_SOURCES = \
-	$(commonsrc) \
-	test-registry.c \
-	$(NULL)
-test_registry_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(NULL)
-test_registry_LDADD = \
-	$(AM_LDADD) \
-	$(NULL)
-
 test_matchrule_DEPENDENCIES = \
 	$(libibus) \
 	$(NULL)
diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 4a4781a40..ad69c8ed9 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -28,7 +28,6 @@
 #include "ibusimpl.h"
 #include "marshalers.h"
 #include "matchrule.h"
-#include "registry.h"
 #include "types.h"
 
 enum {
@@ -1189,9 +1188,8 @@ bus_dbus_impl_start_service_by_name (BusDBusImpl           *dbus,
         return;
     }
 
-    BusRegistry *registry = BUS_DEFAULT_REGISTRY;
-    BusComponent *component = bus_registry_lookup_component_by_name (registry,
-                                                                     name);
+    BusComponent *component = bus_ibus_impl_lookup_component_by_name (
+            BUS_DEFAULT_IBUS, name);
 
     if (component == NULL || !bus_component_start (component, g_verbose)) {
         g_dbus_method_invocation_return_error (invocation,
diff --git a/bus/ibus-daemon.1.in b/bus/ibus-daemon.1.in
index 74e7431b5..fe06e2b49 100644
--- a/bus/ibus-daemon.1.in
+++ b/bus/ibus-daemon.1.in
@@ -55,8 +55,9 @@ specify the address of ibus daemon.
 \fB\-r\fR, \fB\-\-replace\fR
 if there is an old ibus\-daemon is running, it will be replaced.
 .TP
-\fB\-t\fR, \fB\-\-re\-scan\fR
+\fB\-t\fR, \fB\-\-cache\fR=\fImode\fR [default is auto]
 force to re\-scan components, and re\-create registry cache.
+auto, refresh, none is available.
 .TP
 \fB\-o\fR, \fB\-\-timeout\fR=\fItimeout\fR [default is 2000]
 dbus reply timeout in milliseconds.
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 3fca02a5a..2cd293d2b 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -35,7 +35,6 @@
 #include "global.h"
 #include "inputcontext.h"
 #include "panelproxy.h"
-#include "registry.h"
 #include "server.h"
 #include "types.h"
 
@@ -62,7 +61,15 @@ struct _BusIBusImpl {
 
     gboolean embed_preedit_text;
 
-    BusRegistry     *registry;
+    IBusRegistry    *registry;
+
+    /* a list of BusComponent objects that are created from component XML
+     * files (or from the cache of them). */
+    GList *components;
+
+    /* a mapping from an engine name (e.g. 'pinyin') to the corresponding
+     * IBusEngineDesc object. */
+    GHashTable *engine_table;
 
     BusInputContext *focused_context;
     BusPanelProxy   *panel;
@@ -95,8 +102,8 @@ static guint            _signals[LAST_SIGNAL] = { 0 };
 */
 
 /* functions prototype */
-static void      bus_ibus_impl_destroy  (BusIBusImpl        *ibus);
-static void      bus_ibus_impl_service_method_call
+static void     bus_ibus_impl_destroy   (BusIBusImpl        *ibus);
+static void     bus_ibus_impl_service_method_call
                                         (IBusService        *service,
                                          GDBusConnection    *connection,
                                          const gchar        *sender,
@@ -125,8 +132,17 @@ static gboolean
                                          const gchar        *property_name,
                                          GVariant           *value,
                                          GError            **error);
+static void     bus_ibus_impl_registry_init
+                                        (BusIBusImpl        *ibus);
 static void     bus_ibus_impl_registry_changed
                                         (BusIBusImpl        *ibus);
+static void     bus_ibus_impl_registry_destroy
+                                        (BusIBusImpl        *ibus);
+static void     bus_ibus_impl_component_name_owner_changed
+                                        (BusIBusImpl        *ibus,
+                                         const gchar        *name,
+                                         const gchar        *old_name,
+                                         const gchar        *new_name);
 static void     bus_ibus_impl_global_engine_changed
                                         (BusIBusImpl        *ibus);
 static void     bus_ibus_impl_set_context_engine_from_desc
@@ -277,8 +293,8 @@ _panel_destroy_cb (BusPanelProxy *panel,
 }
 
 static void
-_registry_changed_cb (BusRegistry *registry,
-                      BusIBusImpl *ibus)
+_registry_changed_cb (IBusRegistry *registry,
+                      BusIBusImpl  *ibus)
 {
     bus_ibus_impl_registry_changed (ibus);
 }
@@ -348,7 +364,7 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
         }
     }
 
-    bus_registry_name_owner_changed (ibus->registry, name, old_name, new_name);
+    bus_ibus_impl_component_name_owner_changed (ibus, name, old_name, new_name);
 }
 
 /**
@@ -383,13 +399,6 @@ bus_ibus_impl_init (BusIBusImpl *ibus)
     ibus->contexts = NULL;
     ibus->focused_context = NULL;
     ibus->panel = NULL;
-    ibus->registry = bus_registry_new ();
-
-    g_signal_connect (ibus->registry,
-                      "changed",
-                      G_CALLBACK (_registry_changed_cb),
-                      ibus);
-    bus_registry_start_monitor_changes (ibus->registry);
 
     ibus->keymap = ibus_keymap_get ("us");
 
@@ -407,6 +416,8 @@ bus_ibus_impl_init (BusIBusImpl *ibus)
                       "name-owner-changed",
                       G_CALLBACK (_dbus_name_owner_changed_cb),
                       ibus);
+
+    bus_ibus_impl_registry_init (ibus);
 }
 
 /**
@@ -422,7 +433,7 @@ bus_ibus_impl_destroy (BusIBusImpl *ibus)
     gint status;
     gboolean flag;
 
-    bus_registry_stop_all_components (ibus->registry);
+    g_list_foreach (ibus->components, (GFunc) bus_component_stop, NULL);
 
     pid = 0;
     timeout = 0;
@@ -477,6 +488,8 @@ bus_ibus_impl_destroy (BusIBusImpl *ibus)
         ibus->fake_context = NULL;
     }
 
+    bus_ibus_impl_registry_destroy (ibus);
+
     IBUS_OBJECT_CLASS (bus_ibus_impl_parent_class)->destroy (IBUS_OBJECT (ibus));
 }
 
@@ -565,7 +578,8 @@ bus_ibus_impl_get_engine_desc (BusIBusImpl *ibus,
 
     IBusEngineDesc *desc = _find_engine_desc_by_name (ibus, engine_name);
     if (desc == NULL) {
-        desc = bus_registry_find_engine_by_name (ibus->registry, engine_name);
+        desc = (IBusEngineDesc *) g_hash_table_lookup (ibus->engine_table,
+                                                       engine_name);
     }
     return desc;
 }
@@ -1062,7 +1076,7 @@ _ibus_get_engines (BusIBusImpl     *ibus,
 
     g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
 
-    engines = bus_registry_get_engines (ibus->registry);
+    engines = g_hash_table_get_values (ibus->engine_table);
 
     for (p = engines; p != NULL; p = p->next) {
         g_variant_builder_add (
@@ -1112,8 +1126,8 @@ _ibus_get_engines_by_names (BusIBusImpl           *ibus,
     GVariantBuilder builder;
     g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
     while (names[i] != NULL) {
-        IBusEngineDesc *desc = bus_registry_find_engine_by_name (
-                ibus->registry, names[i++]);
+        IBusEngineDesc *desc = (IBusEngineDesc *) g_hash_table_lookup (
+                ibus->engine_table, names[i++]);
         if (desc == NULL)
             continue;
         g_variant_builder_add (
@@ -1859,13 +1873,177 @@ bus_ibus_impl_get_keymap (BusIBusImpl *ibus)
     return ibus->keymap;
 }
 
-BusRegistry *
-bus_ibus_impl_get_registry (BusIBusImpl *ibus)
+/**
+ * bus_ibus_impl_registry_init:
+ *
+ * Initialize IBusRegistry.
+ */
+static void
+bus_ibus_impl_registry_init (BusIBusImpl *ibus)
+{
+    GList *p;
+    GList *components;
+    IBusRegistry *registry = ibus_registry_new ();
+
+    ibus->registry = NULL;
+    ibus->components = NULL;
+    ibus->engine_table = g_hash_table_new (g_str_hash, g_str_equal);
+
+    if (g_strcmp0 (g_cache, "none") == 0) {
+        /* Only load registry, but not read and write cache. */
+        ibus_registry_load (registry);
+    }
+    else if (g_strcmp0 (g_cache, "refresh") == 0) {
+        /* Load registry and overwrite the cache. */
+        ibus_registry_load (registry);
+        ibus_registry_save_cache (registry, TRUE);
+    }
+    else if (g_strcmp0 (g_cache, "auto") == 0) {
+        /* Load registry from cache. If the cache does not exist or
+         * it is outdated, then generate it.
+         */
+        if (ibus_registry_load_cache (registry, FALSE) == FALSE ||
+            ibus_registry_check_modification (registry)) {
+
+            ibus_object_destroy (IBUS_OBJECT (registry));
+            registry = ibus_registry_new ();
+
+            if (ibus_registry_load_cache (registry, TRUE) == FALSE ||
+                ibus_registry_check_modification (registry)) {
+
+                ibus_object_destroy (IBUS_OBJECT (registry));
+                registry = ibus_registry_new ();
+                ibus_registry_load (registry);
+                ibus_registry_save_cache (registry, TRUE);
+            }
+        }
+    }
+
+    ibus->registry = registry;
+    components = ibus_registry_get_components (registry);
+
+    for (p = components; p != NULL; p = p->next) {
+        IBusComponent *component = (IBusComponent *) p->data;
+        BusComponent *buscomp = bus_component_new (component,
+                                                   NULL /* factory */);
+        GList *engines = NULL;
+        GList *p1;
+
+        g_object_ref_sink (buscomp);
+        ibus->components = g_list_append (ibus->components, buscomp);
+
+        engines = bus_component_get_engines (buscomp);
+        for (p1 = engines; p1 != NULL; p1 = p1->next) {
+            IBusEngineDesc *desc = (IBusEngineDesc *) p1->data;
+            const gchar *name = ibus_engine_desc_get_name (desc);
+            if (g_hash_table_lookup (ibus->engine_table, name) == NULL) {
+                g_hash_table_insert (ibus->engine_table,
+                                     (gpointer) name,
+                                     desc);
+            } else {
+                g_message ("Engine %s is already registered by other component",
+                           name);
+            }
+        }
+        g_list_free (engines);
+    }
+
+    g_list_free (components);
+
+    g_signal_connect (ibus->registry,
+                      "changed",
+                      G_CALLBACK (_registry_changed_cb),
+                      ibus);
+    ibus_registry_start_monitor_changes (ibus->registry);
+}
+
+static void
+bus_ibus_impl_registry_destroy (BusIBusImpl *ibus)
 {
+    g_list_free_full (ibus->components, g_object_unref);
+    ibus->components = NULL;
+
+    g_hash_table_destroy (ibus->engine_table);
+    ibus->engine_table = NULL;
+
+    ibus_object_destroy (IBUS_OBJECT (ibus->registry));
+    ibus->registry = NULL;
+}
+
+static gint
+_component_is_name_cb (BusComponent *component,
+                       const gchar  *name)
+{
+    g_assert (BUS_IS_COMPONENT (component));
+    g_assert (name);
+
+    return g_strcmp0 (bus_component_get_name (component), name);
+}
+
+static void
+bus_ibus_impl_component_name_owner_changed (BusIBusImpl *ibus,
+                                            const gchar *name,
+                                            const gchar *old_name,
+                                            const gchar *new_name)
+{
+    BusComponent *component;
+    BusFactoryProxy *factory;
 
     g_assert (BUS_IS_IBUS_IMPL (ibus));
+    g_assert (name);
+    g_assert (old_name);
+    g_assert (new_name);
+
+    component = bus_ibus_impl_lookup_component_by_name (ibus, name);
 
-    return ibus->registry;
+    if (component == NULL) {
+        /* name is a unique name, or a well-known name we don't know. */
+        return;
+    }
+
+    if (g_strcmp0 (old_name, "") != 0) {
+        /* the component is stopped. */
+        factory = bus_component_get_factory (component);
+
+        if (factory != NULL) {
+            ibus_proxy_destroy ((IBusProxy *) factory);
+        }
+    }
+
+    if (g_strcmp0 (new_name, "") != 0) {
+        /* the component is started. */
+        BusConnection *connection =
+                bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS,
+                                                      new_name);
+        if (connection == NULL)
+            return;
+
+        factory = bus_factory_proxy_new (connection);
+        if (factory == NULL)
+            return;
+        bus_component_set_factory (component, factory);
+        g_object_unref (factory);
+    }
+}
+
+BusComponent *
+bus_ibus_impl_lookup_component_by_name (BusIBusImpl *ibus,
+                                        const gchar *name)
+{
+    GList *p;
+
+    g_assert (BUS_IS_IBUS_IMPL (ibus));
+    g_assert (name);
+
+    p = g_list_find_custom (ibus->components,
+                            name,
+                            (GCompareFunc) _component_is_name_cb);
+    if (p) {
+        return (BusComponent *) p->data;
+    }
+    else {
+        return NULL;
+    }
 }
 
 /**
diff --git a/bus/ibusimpl.h b/bus/ibusimpl.h
index ade022bbd..4263778c8 100644
--- a/bus/ibusimpl.h
+++ b/bus/ibusimpl.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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,8 +24,8 @@
 
 #include <ibus.h>
 #include "connection.h"
+#include "component.h"
 #include "inputcontext.h"
-#include "registry.h"
 #include "factoryproxy.h"
 #include "panelproxy.h"
 #include "engineproxy.h"
@@ -52,8 +52,6 @@
     (bus_ibus_impl_get_default ())
 #define BUS_DEFAULT_KEYMAP \
     (bus_ibus_impl_get_keymap (BUS_DEFAULT_IBUS))
-#define BUS_DEFAULT_REGISTRY \
-    (bus_ibus_impl_get_registry (BUS_DEFAULT_IBUS))
 
 G_BEGIN_DECLS
 
@@ -75,7 +73,9 @@ BusIBusImpl     *bus_ibus_impl_get_default          (void);
 BusFactoryProxy *bus_ibus_impl_lookup_factory       (BusIBusImpl        *ibus,
                                                      const gchar        *path);
 IBusKeymap      *bus_ibus_impl_get_keymap           (BusIBusImpl        *ibus);
-BusRegistry     *bus_ibus_impl_get_registry         (BusIBusImpl        *ibus);
+BusComponent    *bus_ibus_impl_lookup_component_by_name
+                                                    (BusIBusImpl        *ibus,
+                                                     const gchar        *name);
 gboolean         bus_ibus_impl_is_use_sys_layout    (BusIBusImpl        *ibus);
 gboolean         bus_ibus_impl_is_embed_preedit_text
                                                     (BusIBusImpl        *ibus);
diff --git a/bus/main.c b/bus/main.c
index 676988fef..34ae0c6c2 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -238,7 +238,8 @@ main (gint argc, gchar **argv)
         /* execute config component */
         if (g_strcmp0 (config, "default") == 0) {
             BusComponent *component;
-            component = bus_registry_lookup_component_by_name (BUS_DEFAULT_REGISTRY, IBUS_SERVICE_CONFIG);
+            component = bus_ibus_impl_lookup_component_by_name (
+                    BUS_DEFAULT_IBUS, IBUS_SERVICE_CONFIG);
             if (component) {
                 bus_component_set_restart (component, restart);
             }
@@ -254,7 +255,8 @@ main (gint argc, gchar **argv)
         /* execute panel component */
         if (g_strcmp0 (panel, "default") == 0) {
             BusComponent *component;
-            component = bus_registry_lookup_component_by_name (BUS_DEFAULT_REGISTRY, IBUS_SERVICE_PANEL);
+            component = bus_ibus_impl_lookup_component_by_name (
+                    BUS_DEFAULT_IBUS, IBUS_SERVICE_PANEL);
             if (component) {
                 bus_component_set_restart (component, restart);
             }
diff --git a/bus/registry.c b/bus/registry.c
deleted file mode 100644
index 9f917e705..000000000
--- a/bus/registry.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/* -*- 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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 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
- * License as published by the Free Software Foundation; either
- * version 2 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include "registry.h"
-
-#include <gio/gio.h>
-#include <glib/gstdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "dbusimpl.h"
-#include "global.h"
-#include "marshalers.h"
-#include "types.h"
-
-enum {
-    CHANGED,
-    LAST_SIGNAL,
-};
-
-static guint             _signals[LAST_SIGNAL] = { 0 };
-
-struct _BusRegistry {
-    IBusObject parent;
-
-    /* instance members */
-
-    /* a list of IBusObservedPath objects. */
-    GList *observed_paths;
-    /* a list of BusComponent objects that are created from component XML files (or from the cache of them). */
-    GList *components;
-    /* a mapping from an engine name (e.g. 'pinyin') to the corresponding IBusEngineDesc object. */
-    GHashTable *engine_table;
-    gboolean changed;
-    /* a mapping from GFile to GFileMonitor. */
-    GHashTable *monitor_table;
-    guint monitor_timeout_id;
-};
-
-struct _BusRegistryClass {
-    IBusObjectClass parent;
-
-    /* class members */
-};
-
-/* functions prototype */
-static void              bus_registry_destroy           (BusRegistry        *registry);
-static void              bus_registry_load              (BusRegistry        *registry);
-static void              bus_registry_load_in_dir       (BusRegistry        *registry,
-                                                         const gchar        *dirname);
-static gboolean          bus_registry_save_cache        (BusRegistry        *registry);
-static gboolean          bus_registry_load_cache        (BusRegistry        *registry);
-static gboolean          bus_registry_check_modification(BusRegistry        *registry);
-static void              bus_registry_remove_all        (BusRegistry        *registry);
-
-G_DEFINE_TYPE (BusRegistry, bus_registry, IBUS_TYPE_OBJECT)
-
-static void
-bus_registry_class_init (BusRegistryClass *class)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-    IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
-
-    _signals[CHANGED] =
-        g_signal_new (I_("changed"),
-            G_TYPE_FROM_CLASS (gobject_class),
-            G_SIGNAL_RUN_LAST,
-            0, /* does not associate a method in this class. the "changed" signal would be handled in other classes. */
-            NULL, NULL,
-            bus_marshal_VOID__VOID,
-            G_TYPE_NONE,
-            0);
-
-    ibus_object_class->destroy = (IBusObjectDestroyFunc) bus_registry_destroy;
-}
-
-static void
-bus_registry_init (BusRegistry *registry)
-{
-    GList *p;
-    registry->observed_paths = NULL;
-    registry->components = NULL;
-    registry->engine_table = g_hash_table_new (g_str_hash, g_str_equal);
-    registry->changed = FALSE;
-    registry->monitor_table =
-        g_hash_table_new_full (g_file_hash,
-                               (GEqualFunc) g_file_equal,
-                               (GDestroyNotify) g_object_unref,
-                               (GDestroyNotify) g_object_unref);
-
-    if (g_strcmp0 (g_cache, "none") == 0) {
-        /* Only load registry, but not read and write cache. */
-        bus_registry_load (registry);
-    }
-    else if (g_strcmp0 (g_cache, "refresh") == 0) {
-        /* Load registry and overwrite the cache. */
-        bus_registry_load (registry);
-        bus_registry_save_cache (registry);
-    }
-    else {
-        /* Load registry from cache. If the cache does not exist or
-         * it is outdated, then generate it.
-         */
-        if (bus_registry_load_cache (registry) == FALSE ||
-            bus_registry_check_modification (registry)) {
-            bus_registry_remove_all (registry);
-            bus_registry_load (registry);
-            bus_registry_save_cache (registry);
-        }
-    }
-
-    for (p = registry->components; p != NULL; p = p->next) {
-        BusComponent *comp = (BusComponent *) p->data;
-        GList *engines = bus_component_get_engines (comp);
-        GList *p1;
-        for (p1 = engines; p1 != NULL; p1 = p1->next) {
-            IBusEngineDesc *desc = (IBusEngineDesc *) p1->data;
-            const gchar *name = ibus_engine_desc_get_name (desc);
-            if (g_hash_table_lookup (registry->engine_table, name) == NULL) {
-                g_hash_table_insert (registry->engine_table,
-                                     (gpointer) name,
-                                     desc);
-            } else {
-                g_message ("Engine %s is already registered by other component",
-                           name);
-            }
-        }
-        g_list_free (engines);
-    }
-}
-
-static void
-bus_registry_remove_all (BusRegistry *registry)
-{
-    g_list_free_full (registry->observed_paths, g_object_unref);
-    registry->observed_paths = NULL;
-
-    g_list_free_full (registry->components, g_object_unref);
-    registry->components = NULL;
-
-    g_hash_table_remove_all (registry->engine_table);
-    g_hash_table_remove_all (registry->monitor_table);
-}
-
-static void
-bus_registry_destroy (BusRegistry *registry)
-{
-    bus_registry_remove_all (registry);
-
-    g_hash_table_destroy (registry->engine_table);
-    registry->engine_table = NULL;
-
-    g_hash_table_destroy (registry->monitor_table);
-    registry->monitor_table = NULL;
-
-    if (registry->monitor_timeout_id > 0) {
-        g_source_remove (registry->monitor_timeout_id);
-        registry->monitor_timeout_id = 0;
-    }
-
-    IBUS_OBJECT_CLASS (bus_registry_parent_class)->destroy (IBUS_OBJECT (registry));
-}
-
-/**
- * bus_registry_load:
- *
- * Read all XML files in the PKGDATADIR (typically /usr/share/ibus/components/ *.xml) and update the registry object.
- */
-static void
-bus_registry_load (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    const gchar *envstr;
-    GPtrArray *path;
-    gchar **d, **search_path;
-
-    path = g_ptr_array_new();
-
-    envstr = g_getenv ("IBUS_COMPONENT_PATH");
-    if (envstr) {
-        gchar **dirs = g_strsplit (envstr, G_SEARCHPATH_SEPARATOR_S, 0);
-        for (d = dirs; *d != NULL; d++)
-            g_ptr_array_add (path, *d);
-        g_free (dirs);
-    } else {
-        gchar *dirname;
-
-        dirname = g_build_filename (PKGDATADIR, "component", NULL);
-        g_ptr_array_add (path, dirname);
-
-#if 0
-        /* FIXME Should we support install some IME in user dir? */
-        dirname = g_build_filename (g_get_user_data_dir (),
-                                    "ibus", "component",
-                                    NULL);
-        g_ptr_array_add (path, dirname);
-#endif
-    }
-
-    g_ptr_array_add (path, NULL);
-    search_path = (gchar **) g_ptr_array_free (path, FALSE);
-    for (d = search_path; *d != NULL; d++) {
-        IBusObservedPath *observed_path = ibus_observed_path_new (*d, TRUE);
-
-        registry->observed_paths = g_list_append (registry->observed_paths,
-                                                  observed_path);
-
-        bus_registry_load_in_dir (registry, *d);
-    }
-    g_strfreev (search_path);
-}
-
-#define g_string_append_indent(string, indent)  \
-    {                                           \
-        gint i;                                 \
-        for (i = 0; i < (indent); i++) {        \
-            g_string_append (string, "    ");   \
-        }                                       \
-    }
-
-static gboolean
-bus_registry_load_cache (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    gchar *filename;
-    XMLNode *node;
-    GList *p;
-
-    filename = g_build_filename (g_get_user_cache_dir (), "ibus", "bus", "registry.xml", NULL);
-    node = ibus_xml_parse_file (filename);
-    g_free (filename);
-
-    if (node == NULL) {
-        return FALSE;
-    }
-
-    if (g_strcmp0 (node->name, "ibus-registry") != 0) {
-        ibus_xml_free (node);
-        return FALSE;
-    }
-
-    for (p = node->sub_nodes; p != NULL; p = p->next) {
-        XMLNode *sub_node = (XMLNode *) p->data;
-
-        if (g_strcmp0 (sub_node->name, "observed-paths") == 0) {
-            GList *pp;
-            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
-                IBusObservedPath *path;
-                path = ibus_observed_path_new_from_xml_node (pp->data, FALSE);
-                if (path) {
-                    g_object_ref_sink (path);
-                    registry->observed_paths = g_list_append (registry->observed_paths, path);
-                }
-            }
-            continue;
-        }
-        if (g_strcmp0 (sub_node->name, "components") == 0) {
-            GList *pp;
-            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
-                IBusComponent *component;
-                component = ibus_component_new_from_xml_node (pp->data);
-                if (component) {
-                    BusComponent *buscomp = bus_component_new (component,
-                                                               NULL /* factory */);
-                    g_object_ref_sink (buscomp);
-                    registry->components =
-                        g_list_append (registry->components, buscomp);
-                }
-            }
-
-            continue;
-        }
-        g_warning ("Unknown element <%s>", sub_node->name);
-    }
-
-    ibus_xml_free (node);
-    return TRUE;
-}
-
-static gboolean
-bus_registry_check_modification (BusRegistry *registry)
-{
-    GList *p;
-
-    for (p = registry->observed_paths; p != NULL; p = p->next) {
-        if (ibus_observed_path_check_modification ((IBusObservedPath *) p->data))
-            return TRUE;
-    }
-
-    for (p = registry->components; p != NULL; p = p->next) {
-        if (ibus_component_check_modification (bus_component_get_component ((BusComponent *) p->data)))
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-static gboolean
-bus_registry_save_cache (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    gchar *cachedir;
-    gchar *filename;
-    GString *output;
-    GList *p;
-    FILE *pf;
-    size_t items = 0;
-
-    cachedir = g_build_filename (g_get_user_cache_dir (), "ibus", "bus", NULL);
-    filename = g_build_filename (cachedir, "registry.xml", NULL);
-    g_mkdir_with_parents (cachedir, 0775);
-    pf = g_fopen (filename, "w");
-    g_free (filename);
-    g_free (cachedir);
-
-    if (pf == NULL) {
-        g_warning ("create registry.xml failed");
-        return FALSE;
-    }
-
-    output = g_string_new ("");
-    g_string_append (output, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
-    g_string_append (output, "<!-- \n"
-                             "    This file was generated by ibus-daemon. Please don't modify it.\n"
-                             "    -->\n");
-    g_string_append (output, "<ibus-registry>\n");
-
-    if (registry->observed_paths) {
-        g_string_append_indent (output, 1);
-        g_string_append (output, "<observed-paths>\n");
-        for (p = registry->observed_paths; p != NULL; p = p->next) {
-            ibus_observed_path_output ((IBusObservedPath *) p->data,
-                                      output, 2);
-        }
-        g_string_append_indent (output, 1);
-        g_string_append (output, "</observed-paths>\n");
-    }
-
-    if (registry->components) {
-        g_string_append_indent (output, 1);
-        g_string_append (output, "<components>\n");
-        for (p = registry->components; p != NULL; p = p->next) {
-            ibus_component_output (bus_component_get_component ((BusComponent *) p->data),
-                                   output, 2);
-        }
-        g_string_append_indent (output, 1);
-        g_string_append (output, "</components>\n");
-    }
-
-    g_string_append (output, "</ibus-registry>\n");
-    items = fwrite (output->str, output->len, 1, pf);
-    g_string_free (output, TRUE);
-    fclose (pf);
-    return (items == 1 ? TRUE : FALSE);
-}
-
-/**
- * bus_registry_load_in_dir:
- *
- * Read all XML files in dirname, create a BusComponent object for each file, and add the component objects to the registry.
- */
-static void
-bus_registry_load_in_dir (BusRegistry *registry,
-                          const gchar *dirname)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    g_assert (dirname);
-
-    GError *error = NULL;
-    GDir *dir;
-    const gchar *filename;
-
-    dir = g_dir_open (dirname, 0, &error);
-
-    if (dir == NULL) {
-        g_warning ("Unable open directory %s : %s", dirname, error->message);
-        g_error_free (error);
-        return;
-    }
-
-    while ((filename = g_dir_read_name (dir)) != NULL) {
-        glong size;
-        gchar *path;
-        IBusComponent *component;
-
-        size = g_utf8_strlen (filename, -1);
-        if (g_strcmp0 (MAX (filename, filename + size - 4), ".xml") != 0)
-            continue;
-
-        path = g_build_filename (dirname, filename, NULL);
-        component = ibus_component_new_from_file (path);
-        if (component != NULL) {
-            BusComponent *buscomp = bus_component_new (component,
-                                                       NULL /* factory */);
-            g_object_ref_sink (buscomp);
-            registry->components =
-                g_list_append (registry->components, buscomp);
-        }
-
-        g_free (path);
-    }
-
-    g_dir_close (dir);
-}
-
-
-BusRegistry *
-bus_registry_new (void)
-{
-    BusRegistry *registry;
-    registry = (BusRegistry *) g_object_new (BUS_TYPE_REGISTRY, NULL);
-    return registry;
-}
-
-static gint
-bus_register_component_is_name_cb (BusComponent *component,
-                                   const gchar  *name)
-{
-    g_assert (BUS_IS_COMPONENT (component));
-    g_assert (name);
-
-    return g_strcmp0 (bus_component_get_name (component), name);
-}
-
-BusComponent *
-bus_registry_lookup_component_by_name (BusRegistry *registry,
-                                       const gchar *name)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    g_assert (name);
-
-    GList *p;
-    p = g_list_find_custom (registry->components,
-                            name,
-                            (GCompareFunc) bus_register_component_is_name_cb);
-    if (p) {
-        return (BusComponent *) p->data;
-    }
-    else {
-        return NULL;
-    }
-}
-
-GList *
-bus_registry_get_components (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    return g_list_copy (registry->components);
-}
-
-GList *
-bus_registry_get_engines (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    return g_hash_table_get_values (registry->engine_table);
-}
-
-GList *
-bus_registry_get_engines_by_language (BusRegistry *registry,
-                                      const gchar *language)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    g_assert (language);
-
-    gint n;
-    GList *p1, *p2, *engines;
-
-    n = strlen (language);
-
-    p1 = bus_registry_get_engines (registry);
-
-    engines = NULL;
-
-    for (p2 = p1; p2 != NULL; p2 = p2->next) {
-        IBusEngineDesc *desc = (IBusEngineDesc *) p2->data;
-        if (strncmp (ibus_engine_desc_get_language (desc), language, n) == 0) {
-            engines = g_list_append (engines, desc);
-        }
-    }
-
-    g_list_free (p1);
-    return engines;
-}
-
-IBusEngineDesc *
-bus_registry_find_engine_by_name (BusRegistry *registry,
-                                  const gchar *name)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    g_assert (name);
-
-    return (IBusEngineDesc *) g_hash_table_lookup (registry->engine_table, name);
-}
-
-void
-bus_registry_stop_all_components (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    g_list_foreach (registry->components, (GFunc) bus_component_stop, NULL);
-
-}
-
-static gboolean
-_monitor_timeout_cb (BusRegistry *registry)
-{
-    g_hash_table_remove_all (registry->monitor_table);
-    registry->changed = TRUE;
-    g_signal_emit (registry, _signals[CHANGED], 0);
-    registry->monitor_timeout_id = 0;
-    return FALSE;
-}
-
-static void
-_monitor_changed_cb (GFileMonitor     *monitor,
-                     GFile            *file,
-                     GFile            *other_file,
-                     GFileMonitorEvent event_type,
-                     BusRegistry      *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
-        event_type != G_FILE_MONITOR_EVENT_DELETED &&
-        event_type != G_FILE_MONITOR_EVENT_CREATED &&
-        event_type != G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED)
-        return;
-
-    /* Merge successive file changes into one, with a low priority
-       timeout handler. */
-    if (registry->monitor_timeout_id > 0)
-        return;
-
-    registry->monitor_timeout_id =
-        g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
-                            5000,
-                            (GSourceFunc) _monitor_timeout_cb,
-                            g_object_ref (registry),
-                            (GDestroyNotify) g_object_unref);
-}
-
-/**
- * bus_registry_start_monitor_changes:
- *
- * Start the monitor thread.
- */
-void
-bus_registry_start_monitor_changes (BusRegistry *registry)
-{
-    GList *observed_paths, *p;
-
-    g_assert (BUS_IS_REGISTRY (registry));
-
-    g_hash_table_remove_all (registry->monitor_table);
-
-    observed_paths = g_list_copy (registry->observed_paths);
-    for (p = registry->components; p != NULL; p = p->next) {
-        BusComponent *buscomp = (BusComponent *) p->data;
-        IBusComponent *component = bus_component_get_component (buscomp);
-        GList *component_observed_paths =
-            ibus_component_get_observed_paths (component);
-        observed_paths = g_list_concat (observed_paths,
-                                        component_observed_paths);
-    }
-
-    for (p = observed_paths; p != NULL; p = p->next) {
-        IBusObservedPath *path = (IBusObservedPath *) p->data;
-        GFile *file = g_file_new_for_path (path->path);
-        if (g_hash_table_lookup (registry->monitor_table,file) == NULL) {
-            GFileMonitor *monitor;
-            GError *error;
-
-            error = NULL;
-            monitor = g_file_monitor (file,
-                                      G_FILE_MONITOR_NONE,
-                                      NULL,
-                                      &error);
-
-            if (monitor != NULL) {
-                g_signal_connect (monitor, "changed",
-                                  G_CALLBACK (_monitor_changed_cb),
-                                  registry);
-
-                g_hash_table_replace (registry->monitor_table,
-                                      g_object_ref (file),
-                                      monitor);
-            } else {
-                g_warning ("Can't monitor directory %s: %s",
-                           path->path,
-                           error->message);
-                g_error_free (error);
-            }
-        }
-        g_object_unref (file);
-    }
-    g_list_free (observed_paths);
-}
-
-gboolean
-bus_registry_is_changed (BusRegistry *registry)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    return (registry->changed != 0);
-}
-
-void
-bus_registry_name_owner_changed (BusRegistry *registry,
-                                 const gchar *name,
-                                 const gchar *old_name,
-                                 const gchar *new_name)
-{
-    g_assert (BUS_IS_REGISTRY (registry));
-    g_assert (name);
-    g_assert (old_name);
-    g_assert (new_name);
-
-    BusComponent *component;
-    BusFactoryProxy *factory;
-
-    component = bus_registry_lookup_component_by_name (registry, name);
-
-    if (component == NULL) {
-        /* name is a unique name, or a well-known name we don't know. */
-        return;
-    }
-
-    if (g_strcmp0 (old_name, "") != 0) {
-        /* the component is stopped. */
-        factory = bus_component_get_factory (component);
-
-        if (factory != NULL) {
-            ibus_proxy_destroy ((IBusProxy *) factory);
-        }
-    }
-
-    if (g_strcmp0 (new_name, "") != 0) {
-        /* the component is started. */
-        BusConnection *connection =
-                bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS,
-                                                      new_name);
-        if (connection == NULL)
-            return;
-
-        factory = bus_factory_proxy_new (connection);
-        if (factory == NULL)
-            return;
-        bus_component_set_factory (component, factory);
-        g_object_unref (factory);
-    }
-}
diff --git a/bus/registry.h b/bus/registry.h
deleted file mode 100644
index 2864ed9c9..000000000
--- a/bus/registry.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- 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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 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
- * License as published by the Free Software Foundation; either
- * version 2 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __BUS_REGISTRY_H_
-#define __BUS_REGISTRY_H_
-
-#include <ibus.h>
-#include "component.h"
-
-/*
- * Type macros.
- */
-
-/* define GOBJECT macros */
-#define BUS_TYPE_REGISTRY             \
-    (bus_registry_get_type ())
-#define BUS_REGISTRY(obj)             \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), BUS_TYPE_REGISTRY, BusRegistry))
-#define BUS_REGISTRY_CLASS(klass)     \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), BUS_TYPE_REGISTRY, BusRegistryClass))
-#define BUS_IS_REGISTRY(obj)          \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BUS_TYPE_REGISTRY))
-#define BUS_IS_REGISTRY_CLASS(klass)  \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), BUS_TYPE_REGISTRY))
-#define BUS_REGISTRY_GET_CLASS(obj)   \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), BUS_TYPE_REGISTRY, BusRegistryClass))
-
-G_BEGIN_DECLS
-
-typedef struct _BusRegistry BusRegistry;
-typedef struct _BusRegistryClass BusRegistryClass;
-
-GType            bus_registry_get_type          (void);
-BusRegistry     *bus_registry_new               (void);
-
-/**
- * bus_registry_get_components:
- * @returns: a list of BusComponent objects. The caller has to call g_list_free for the returned list.
- */
-GList           *bus_registry_get_components    (BusRegistry    *registry);
-
-/**
- * bus_registry_get_engines:
- * @returns: a list of all IBusEngineDesc objects available. The caller has to call g_list_free for the returned list.
- */
-GList           *bus_registry_get_engines       (BusRegistry    *registry);
-
-/**
- * bus_registry_get_engines_by_language:
- * @language: a language name like 'ja'
- * @returns: a list of IBusEngineDesc objects for the language. The caller has to call g_list_free for the returned list.
- */
-GList           *bus_registry_get_engines_by_language
-                                                (BusRegistry    *registry,
-                                                 const gchar    *language);
-
-/**
- * bus_registry_stop_all_components:
- *
- * Terminate all component processes.
- */
-void             bus_registry_stop_all_components
-                                                (BusRegistry    *registry);
-
-/**
- * bus_registry_lookup_component_by_name:
- * @name: a component name such as 'org.freedesktop.IBus.Panel' and 'com.google.IBus.Mozc'
- * @returns: a BusComponent object, or NULL if such component is not found.
- */
-BusComponent    *bus_registry_lookup_component_by_name
-                                                (BusRegistry    *registry,
-                                                 const gchar    *name);
-
-/**
- * bus_registry_find_engine_by_name:
- * @name: an engine name like 'pinyin'
- * @returns: an IBusEngineDesc object, or NULL if not found.
- */
-IBusEngineDesc  *bus_registry_find_engine_by_name
-                                                (BusRegistry    *registry,
-                                                 const gchar    *name);
-
-/**
- * bus_registry_name_owner_changed:
- * @name: a unique or well-known name like ":1.1", "org.freedesktop.IBus.Config", "com.google.IBus.Mozc".
- * @old_name: a unique name like ":1.1", or empty string "" when the client is started.
- * @new_name: a unique name like ":1.1", or empty string "" when the client is stopped.
- *
- * Handle the "name-owner-changed" glib signal from dbusimpl. If a component is stopped, remove a BusFactoryProxy object from the
- * bus for the component. If a component is started, create a new BusFactoryProxy object for the bus.
- */
-void             bus_registry_name_owner_changed
-                                                (BusRegistry    *registry,
-                                                 const gchar    *name,
-                                                 const gchar    *old_name,
-                                                 const gchar    *new_name);
-
-void             bus_registry_start_monitor_changes
-                                                (BusRegistry    *registry);
-gboolean         bus_registry_is_changed        (BusRegistry    *registry);
-
-G_END_DECLS
-#endif
-
diff --git a/bus/test-registry.c b/bus/test-registry.c
deleted file mode 100644
index 225722046..000000000
--- a/bus/test-registry.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
-#include "registry.h"
-
-int main()
-{
-#if !GLIB_CHECK_VERSION(2,35,0)
-	g_type_init ();
-#endif
-	BusRegistry *registry = bus_registry_new ();
-	g_object_unref (registry);
-	return 0;
-}
diff --git a/docs/reference/ibus/ibus-docs.sgml.in b/docs/reference/ibus/ibus-docs.sgml.in
index febfe8ca6..ca158c225 100644
--- a/docs/reference/ibus/ibus-docs.sgml.in
+++ b/docs/reference/ibus/ibus-docs.sgml.in
@@ -89,6 +89,7 @@
       <xi:include href="xml/ibusconfig.xml"/>
       <xi:include href="xml/ibusconfigservice.xml"/>
       <xi:include href="xml/ibusobservedpath.xml"/>
+      <xi:include href="xml/ibusregistry.xml"/>
       <xi:include href="xml/ibusversion.xml"/>
       <xi:include href="xml/ibusxml.xml"/>
   </chapter>
diff --git a/docs/reference/ibus/ibus.types b/docs/reference/ibus/ibus.types
index 016e9ceac..8055cae50 100644
--- a/docs/reference/ibus/ibus.types
+++ b/docs/reference/ibus/ibus.types
@@ -27,3 +27,4 @@ ibus_property_get_type
 ibus_prop_list_get_type
 ibus_input_context_get_type
 ibus_observed_path_get_type
+ibus_registry_get_type
diff --git a/src/Makefile.am b/src/Makefile.am
index b2793c8a3..74b6838d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -42,15 +42,16 @@ INTROSPECTION_GIRS =
 CLEANFILES =
 
 # C preprocessor flags
-AM_CPPFLAGS =                                   \
-    -DG_LOG_DOMAIN=\"IBUS\"                     \
-    @GLIB2_CFLAGS@                              \
-    @GOBJECT2_CFLAGS@                           \
-    @GIO2_CFLAGS@                               \
-    -DIBUS_DATA_DIR=\"$(pkgdatadir)\"           \
-    -DIBUS_DISABLE_DEPRECATION_WARNINGS         \
-    -DIBUS_COMPILATION                          \
-    -DISOCODES_PREFIX=\"$(ISOCODES_PREFIX)\"    \
+AM_CPPFLAGS =                                           \
+    -DG_LOG_DOMAIN=\"IBUS\"                             \
+    @GLIB2_CFLAGS@                                      \
+    @GOBJECT2_CFLAGS@                                   \
+    @GIO2_CFLAGS@                                       \
+    -DIBUS_CACHE_DIR=\""$(localstatedir)/cache/ibus"\"  \
+    -DIBUS_DATA_DIR=\"$(pkgdatadir)\"                   \
+    -DIBUS_DISABLE_DEPRECATION_WARNINGS                 \
+    -DIBUS_COMPILATION                                  \
+    -DISOCODES_PREFIX=\"$(ISOCODES_PREFIX)\"            \
     $(NULL)
 
 # ibus library
@@ -97,6 +98,7 @@ ibus_sources =              \
     ibuscomponent.c         \
     ibusutil.c              \
     ibusenginesimple.c      \
+    ibusregistry.c          \
     $(NULL)
 libibus_1_0_la_SOURCES =    \
     ibusmarshalers.c        \
@@ -145,6 +147,7 @@ ibus_headers =              \
     ibuscomponent.h         \
     ibusutil.h              \
     ibusenginesimple.h      \
+    ibusregistry.h          \
     $(NULL)
 ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
 ibus_public_headers =       \
diff --git a/src/ibus.h b/src/ibus.h
index ef811a4cc..e27f845c1 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -55,6 +55,7 @@
 #include <ibusconfigservice.h>
 #include <ibuspanelservice.h>
 #include <ibusutil.h>
+#include <ibusregistry.h>
 
 #ifndef IBUS_DISABLE_DEPRECATED
 #include <ibuskeysyms-compat.h>
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
new file mode 100644
index 000000000..d239955ef
--- /dev/null
+++ b/src/ibusregistry.c
@@ -0,0 +1,557 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 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
+ * License as published by the Free Software Foundation; either
+ * version 2 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#include <gio/gio.h>
+#include <glib/gstdio.h>
+#include <string.h>
+
+#include "ibusinternal.h"
+#include "ibusmarshalers.h"
+#include "ibusregistry.h"
+
+enum {
+    CHANGED,
+    LAST_SIGNAL,
+};
+
+static guint             _signals[LAST_SIGNAL] = { 0 };
+
+struct _IBusRegistryPrivate {
+    /* a list of IBusObservedPath objects. */
+    GList *observed_paths;
+
+    /* a list of IBusComponent objects that are created from component XML
+     * files (or from the cache of them). */
+    GList *components;
+
+    gboolean changed;
+
+    /* a mapping from GFile to GFileMonitor. */
+    GHashTable *monitor_table;
+
+    guint monitor_timeout_id;
+};
+
+#define IBUS_REGISTRY_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_REGISTRY, IBusRegistryPrivate))
+
+/* functions prototype */
+static void     ibus_registry_destroy        (IBusRegistry           *registry);
+static void     ibus_registry_remove_all     (IBusRegistry           *registry);
+
+G_DEFINE_TYPE (IBusRegistry, ibus_registry, IBUS_TYPE_OBJECT)
+
+static void
+ibus_registry_class_init (IBusRegistryClass *class)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
+
+    ibus_object_class->destroy = (IBusObjectDestroyFunc) ibus_registry_destroy;
+
+    g_type_class_add_private (class, sizeof (IBusRegistryPrivate));
+
+    /* install signals */
+    /**
+     * IBusRegistry::changed:
+     * @registry: An #IBusRegistry.
+     *
+     * Emitted when any observed paths are changed.
+     * A method is not associated in this class. the "changed"
+     * signal would be handled in other classes.
+     *
+     * See also: ibus_registry_start_monitor_changes().
+     */
+    _signals[CHANGED] =
+        g_signal_new (I_("changed"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            _ibus_marshal_VOID__VOID,
+            G_TYPE_NONE,
+            0);
+}
+
+static void
+ibus_registry_init (IBusRegistry *registry)
+{
+    registry->priv = IBUS_REGISTRY_GET_PRIVATE (registry);
+
+    registry->priv->observed_paths = NULL;
+    registry->priv->components = NULL;
+    registry->priv->changed = FALSE;
+    registry->priv->monitor_table =
+        g_hash_table_new_full (g_file_hash,
+                               (GEqualFunc) g_file_equal,
+                               (GDestroyNotify) g_object_unref,
+                               (GDestroyNotify) g_object_unref);
+}
+
+static void
+ibus_registry_destroy (IBusRegistry *registry)
+{
+    ibus_registry_remove_all (registry);
+
+    g_hash_table_destroy (registry->priv->monitor_table);
+    registry->priv->monitor_table = NULL;
+
+    if (registry->priv->monitor_timeout_id > 0) {
+        g_source_remove (registry->priv->monitor_timeout_id);
+        registry->priv->monitor_timeout_id = 0;
+    }
+
+    IBUS_OBJECT_CLASS (ibus_registry_parent_class)->
+            destroy (IBUS_OBJECT (registry));
+}
+
+/**
+ * ibus_registry_remove_all:
+ *
+ * Remove the loaded registry.
+ */
+static void
+ibus_registry_remove_all (IBusRegistry *registry)
+{
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    g_list_free_full (registry->priv->observed_paths, g_object_unref);
+    registry->priv->observed_paths = NULL;
+
+    g_list_free_full (registry->priv->components, g_object_unref);
+    registry->priv->components = NULL;
+}
+
+void
+ibus_registry_load (IBusRegistry *registry)
+{
+    const gchar *envstr;
+    GPtrArray *path;
+    gchar **d, **search_path;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    path = g_ptr_array_new();
+
+    envstr = g_getenv ("IBUS_COMPONENT_PATH");
+    if (envstr) {
+        gchar **dirs = g_strsplit (envstr, G_SEARCHPATH_SEPARATOR_S, 0);
+        for (d = dirs; *d != NULL; d++)
+            g_ptr_array_add (path, *d);
+        g_free (dirs);
+    } else {
+        gchar *dirname;
+
+        dirname = g_build_filename (IBUS_DATA_DIR, "component", NULL);
+        g_ptr_array_add (path, dirname);
+
+#if 0
+        /* FIXME Should we support install some IME in user dir? */
+        dirname = g_build_filename (g_get_user_data_dir (),
+                                    "ibus", "component",
+                                    NULL);
+        g_ptr_array_add (path, dirname);
+#endif
+    }
+
+    g_ptr_array_add (path, NULL);
+    search_path = (gchar **) g_ptr_array_free (path, FALSE);
+    for (d = search_path; *d != NULL; d++) {
+        ibus_registry_load_in_dir (registry, *d);
+    }
+    g_strfreev (search_path);
+}
+
+gboolean
+ibus_registry_load_cache (IBusRegistry *registry, gboolean is_user)
+{
+    gchar *filename;
+    gboolean retval;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    if (is_user) {
+        filename = g_build_filename (g_get_user_cache_dir (),
+                                     "ibus", "bus", "registry.xml", NULL);
+    } else {
+        filename = g_build_filename (IBUS_CACHE_DIR,
+                                     "bus", "registry.xml", NULL);
+    }
+
+    retval = ibus_registry_load_cache_file (registry, filename);
+    g_free (filename);
+
+    return retval;
+}
+
+gboolean
+ibus_registry_load_cache_file (IBusRegistry *registry, const gchar *filename)
+{
+    XMLNode *node;
+    GList *p;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+    g_assert (filename != NULL);
+
+    node = ibus_xml_parse_file (filename);
+
+    if (node == NULL) {
+        return FALSE;
+    }
+
+    if (g_strcmp0 (node->name, "ibus-registry") != 0) {
+        ibus_xml_free (node);
+        return FALSE;
+    }
+
+    for (p = node->sub_nodes; p != NULL; p = p->next) {
+        XMLNode *sub_node = (XMLNode *) p->data;
+
+        if (g_strcmp0 (sub_node->name, "observed-paths") == 0) {
+            GList *pp;
+            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
+                IBusObservedPath *path;
+                path = ibus_observed_path_new_from_xml_node (pp->data, FALSE);
+                if (path) {
+                    g_object_ref_sink (path);
+                    registry->priv->observed_paths =
+                            g_list_append (registry->priv->observed_paths,
+                                           path);
+                }
+            }
+            continue;
+        }
+        if (g_strcmp0 (sub_node->name, "components") == 0) {
+            GList *pp;
+            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
+                IBusComponent *component;
+                component = ibus_component_new_from_xml_node (pp->data);
+                if (component) {
+                    g_object_ref_sink (component);
+                    registry->priv->components =
+                        g_list_append (registry->priv->components, component);
+                }
+            }
+
+            continue;
+        }
+        g_warning ("Unknown element <%s>", sub_node->name);
+    }
+
+    ibus_xml_free (node);
+    return TRUE;
+}
+
+gboolean
+ibus_registry_check_modification (IBusRegistry *registry)
+{
+    GList *p;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    for (p = registry->priv->observed_paths; p != NULL; p = p->next) {
+        if (ibus_observed_path_check_modification (
+                    (IBusObservedPath *) p->data))
+            return TRUE;
+    }
+
+    for (p = registry->priv->components; p != NULL; p = p->next) {
+        if (ibus_component_check_modification ((IBusComponent *) p->data))
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+gboolean
+ibus_registry_save_cache (IBusRegistry *registry, gboolean is_user)
+{
+    gchar *filename;
+    gboolean retval;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    if (is_user) {
+        filename = g_build_filename (g_get_user_cache_dir (),
+                                     "ibus", "bus", "registry.xml", NULL);
+    } else {
+        filename = g_build_filename (IBUS_CACHE_DIR,
+                                     "bus", "registry.xml", NULL);
+    }
+
+    retval = ibus_registry_save_cache_file (registry, filename);
+    g_free (filename);
+
+    return retval;
+}
+
+gboolean
+ibus_registry_save_cache_file (IBusRegistry *registry, const gchar *filename)
+{
+    gchar *cachedir;
+    const gchar *user_cachedir;
+    gboolean is_user = TRUE;
+    GString *output;
+    FILE *pf;
+    size_t items = 0;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+    g_assert (filename != NULL);
+
+    cachedir = g_path_get_dirname (filename);
+    g_mkdir_with_parents (cachedir, 0775);
+    g_free (cachedir);
+    pf = g_fopen (filename, "w");
+
+    if (pf == NULL) {
+        g_warning ("create %s failed", filename);
+        return FALSE;
+    }
+
+    output = g_string_new ("");
+
+    ibus_registry_output (registry, output, 1);
+
+    items = fwrite (output->str, output->len, 1, pf);
+    g_string_free (output, TRUE);
+    fclose (pf);
+
+    user_cachedir = g_get_user_cache_dir ();
+    is_user = (strncmp (user_cachedir, filename, strlen (user_cachedir)) == 0);
+
+    if (!is_user) {
+        g_chmod (filename, 0644);
+    }
+
+    return (items == 1 ? TRUE : FALSE);
+}
+
+#define g_string_append_indent(string, indent)  \
+    {                                           \
+        gint i;                                 \
+        for (i = 0; i < (indent); i++) {        \
+            g_string_append (string, "    ");   \
+        }                                       \
+    }
+
+void
+ibus_registry_output (IBusRegistry *registry, GString *output, int indent)
+{
+    GList *p;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+    g_return_if_fail (output != NULL);
+
+    g_string_append (output, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+    g_string_append (output, "<!-- \n"
+                             "    This file was generated by ibus-daemon. "
+                             "Please don't modify it.\n"
+                             "    -->\n");
+    g_string_append (output, "<ibus-registry>\n");
+
+    if (registry->priv->observed_paths) {
+        g_string_append_indent (output, indent);
+        g_string_append (output, "<observed-paths>\n");
+        for (p = registry->priv->observed_paths; p != NULL; p = p->next) {
+            ibus_observed_path_output ((IBusObservedPath *) p->data,
+                                      output, indent * 2);
+        }
+        g_string_append_indent (output, indent);
+        g_string_append (output, "</observed-paths>\n");
+    }
+
+    if (registry->priv->components) {
+        g_string_append_indent (output, indent);
+        g_string_append (output, "<components>\n");
+        for (p = registry->priv->components; p != NULL; p = p->next) {
+            ibus_component_output ((IBusComponent *) p->data,
+                                   output, indent * 2);
+        }
+        g_string_append_indent (output, indent);
+        g_string_append (output, "</components>\n");
+    }
+
+    g_string_append (output, "</ibus-registry>\n");
+}
+
+void
+ibus_registry_load_in_dir (IBusRegistry *registry,
+                           const gchar  *dirname)
+{
+    GError *error = NULL;
+    GDir *dir;
+    IBusObservedPath *observed_path = NULL;
+    const gchar *filename;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+    g_assert (dirname);
+
+    dir = g_dir_open (dirname, 0, &error);
+
+    if (dir == NULL) {
+        g_warning ("Unable open directory %s : %s", dirname, error->message);
+        g_error_free (error);
+        return;
+    }
+
+    observed_path = ibus_observed_path_new (dirname, TRUE);
+
+    registry->priv->observed_paths =
+            g_list_append (registry->priv->observed_paths,
+                           observed_path);
+
+    while ((filename = g_dir_read_name (dir)) != NULL) {
+        glong size;
+        gchar *path;
+        IBusComponent *component;
+
+        size = g_utf8_strlen (filename, -1);
+        if (g_strcmp0 (MAX (filename, filename + size - 4), ".xml") != 0)
+            continue;
+
+        path = g_build_filename (dirname, filename, NULL);
+        component = ibus_component_new_from_file (path);
+        if (component != NULL) {
+            g_object_ref_sink (component);
+            registry->priv->components =
+                g_list_append (registry->priv->components, component);
+        }
+
+        g_free (path);
+    }
+
+    g_dir_close (dir);
+}
+
+
+IBusRegistry *
+ibus_registry_new (void)
+{
+    IBusRegistry *registry;
+    registry = (IBusRegistry *) g_object_new (IBUS_TYPE_REGISTRY, NULL);
+    return registry;
+}
+
+GList *
+ibus_registry_get_components (IBusRegistry *registry)
+{
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    return g_list_copy (registry->priv->components);
+}
+
+GList *
+ibus_registry_get_observed_paths (IBusRegistry *registry)
+{
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    return g_list_copy (registry->priv->observed_paths);
+}
+
+static gboolean
+_monitor_timeout_cb (IBusRegistry *registry)
+{
+    g_hash_table_remove_all (registry->priv->monitor_table);
+    registry->priv->changed = TRUE;
+    g_signal_emit (registry, _signals[CHANGED], 0);
+    registry->priv->monitor_timeout_id = 0;
+    return FALSE;
+}
+
+static void
+_monitor_changed_cb (GFileMonitor     *monitor,
+                     GFile            *file,
+                     GFile            *other_file,
+                     GFileMonitorEvent event_type,
+                     IBusRegistry     *registry)
+{
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
+        event_type != G_FILE_MONITOR_EVENT_DELETED &&
+        event_type != G_FILE_MONITOR_EVENT_CREATED &&
+        event_type != G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED)
+        return;
+
+    /* Merge successive file changes into one, with a low priority
+       timeout handler. */
+    if (registry->priv->monitor_timeout_id > 0)
+        return;
+
+    registry->priv->monitor_timeout_id =
+        g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+                            5000,
+                            (GSourceFunc) _monitor_timeout_cb,
+                            g_object_ref (registry),
+                            (GDestroyNotify) g_object_unref);
+}
+
+void
+ibus_registry_start_monitor_changes (IBusRegistry *registry)
+{
+    GList *observed_paths, *p;
+
+    g_assert (IBUS_IS_REGISTRY (registry));
+
+    g_hash_table_remove_all (registry->priv->monitor_table);
+
+    observed_paths = g_list_copy (registry->priv->observed_paths);
+    for (p = registry->priv->components; p != NULL; p = p->next) {
+        IBusComponent *component = (IBusComponent *) p->data;
+        GList *component_observed_paths =
+            ibus_component_get_observed_paths (component);
+        observed_paths = g_list_concat (observed_paths,
+                                        component_observed_paths);
+    }
+
+    for (p = observed_paths; p != NULL; p = p->next) {
+        IBusObservedPath *path = (IBusObservedPath *) p->data;
+        GFile *file = g_file_new_for_path (path->path);
+        if (g_hash_table_lookup (registry->priv->monitor_table, file) == NULL) {
+            GFileMonitor *monitor;
+            GError *error;
+
+            error = NULL;
+            monitor = g_file_monitor (file,
+                                      G_FILE_MONITOR_NONE,
+                                      NULL,
+                                      &error);
+
+            if (monitor != NULL) {
+                g_signal_connect (monitor, "changed",
+                                  G_CALLBACK (_monitor_changed_cb),
+                                  registry);
+
+                g_hash_table_replace (registry->priv->monitor_table,
+                                      g_object_ref (file),
+                                      monitor);
+            } else {
+                g_warning ("Can't monitor directory %s: %s",
+                           path->path,
+                           error->message);
+                g_error_free (error);
+            }
+        }
+        g_object_unref (file);
+    }
+    g_list_free (observed_paths);
+}
diff --git a/src/ibusregistry.h b/src/ibusregistry.h
new file mode 100644
index 000000000..288dc07f0
--- /dev/null
+++ b/src/ibusregistry.h
@@ -0,0 +1,223 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 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
+ * License as published by the Free Software Foundation; either
+ * version 2 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
+#error "Only <ibus.h> can be included directly"
+#endif
+
+#ifndef __IBUS_REGISTRY_H_
+#define __IBUS_REGISTRY_H_
+
+/**
+ * SECTION: ibusregistry
+ * @short_description: Registry cache handling.
+ * @title: IBusRegistry
+ * @stability: Stable
+ *
+ * An #IBusRegistry loads IBus component files and generates the cache files.
+ *
+ * see_also: #IBusComponent
+ */
+
+#include "ibuscomponent.h"
+
+/*
+ * Type macros.
+ */
+
+/* define GOBJECT macros */
+#define IBUS_TYPE_REGISTRY            \
+    (ibus_registry_get_type ())
+#define IBUS_REGISTRY(obj)            \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_REGISTRY, IBusRegistry))
+#define IBUS_REGISTRY_CLASS(klass)    \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_REGISTRY, IBusRegistryClass))
+#define IBUS_IS_REGISTRY(obj)         \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_REGISTRY))
+#define IBUS_IS_REGISTRY_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_REGISTRY))
+#define IBUS_REGISTRY_GET_CLASS(obj)  \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_REGISTRY, IBusRegistryClass))
+
+G_BEGIN_DECLS
+
+typedef struct _IBusRegistry IBusRegistry;
+typedef struct _IBusRegistryPrivate IBusRegistryPrivate;
+typedef struct _IBusRegistryClass IBusRegistryClass;
+
+/**
+ * IBusRegistry:
+ *
+ * Registry cache handling.
+ * You can load the registry from compose files or a cache file.
+ */
+struct _IBusRegistry {
+    /* instance members */
+    /*< private >*/
+    IBusObject parent;
+    IBusRegistryPrivate *priv;
+};
+
+struct _IBusRegistryClass {
+    /* class members */
+    /*< private >*/
+    IBusObjectClass parent;
+};
+
+GType            ibus_registry_get_type         (void);
+
+/**
+ * ibus_registry_new:
+ * @returns: A newly allocated #IBusRegistry.
+ *
+ * New a #IBusRegistry
+ */
+IBusRegistry    *ibus_registry_new              (void);
+
+/**
+ * ibus_registry_load:
+ * @registry: An #IBusRegistry.
+ *
+ * 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 ':'.
+ */
+void             ibus_registry_load             (IBusRegistry   *registry);
+
+/**
+ * ibus_registry_load_in_dir:
+ * @registry: An #IBusRegistry.
+ * @dirname: IBus component directory which includes XML files.
+ *
+ * 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.
+ */
+void             ibus_registry_load_in_dir      (IBusRegistry   *registry,
+                                                 const gchar    *dirname);
+
+/**
+ * ibus_registry_load_cache:
+ * @registry: An #IBusRegistry.
+ * @is_user: %TRUE if the registry cache is loaded in the user directory.
+ * @returns: %TRUE if the cache exists and is loaded successfully,
+ *           %FALSE otherwise.
+ *
+ * Load the user or system registry cache.
+ */
+gboolean         ibus_registry_load_cache       (IBusRegistry   *registry,
+                                                 gboolean        is_user);
+
+/**
+ * ibus_registry_load_cache_file:
+ * @registry: An #IBusRegistry.
+ * @filename: The file path of the registry cache
+ * @returns: %TRUE if the cache exists and is loaded successfully,
+ *           %FALSE otherwise.
+ *
+ * Load the registry cache @filename.
+ */
+gboolean         ibus_registry_load_cache_file  (IBusRegistry   *registry,
+                                                 const gchar    *filename);
+
+/**
+ * ibus_registry_save_cache:
+ * @registry: An #IBusRegistry.
+ * @is_user: %TRUE if the registry cache is saved in the user directory.
+ * @returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
+ *
+ * Save the registry in a user directory or system directory.
+ */
+gboolean         ibus_registry_save_cache       (IBusRegistry   *registry,
+                                                 gboolean        is_user);
+
+/**
+ * ibus_registry_save_cache_file:
+ * @registry: An #IBusRegistry.
+ * @filename: The file path of the registry cache
+ * @returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
+ *
+ * Save the registry cache @filename.
+ */
+gboolean         ibus_registry_save_cache_file  (IBusRegistry   *registry,
+                                                 const gchar    *filename);
+
+/**
+ * ibus_registry_output:
+ * @registry: An #IBusRegistry.
+ * @output: GString that holds the result.
+ * @indent: level of indent.
+ *
+ * Output #IBusRegistry as an XML-formatted string.
+ * The output string can be then shown on the screen or written to file.
+ */
+void             ibus_registry_output           (IBusRegistry   *registry,
+                                                 GString        *output,
+                                                 int             indent);
+
+/**
+ * ibus_registry_check_modification:
+ * @registry: An #IBusRegistry.
+ * @returns: %TRUE if mtime is changed; %FALSE otherwise.
+ *
+ * Check if the registry is updated.
+ */
+gboolean         ibus_registry_check_modification
+                                                (IBusRegistry   *registry);
+
+/**
+ * ibus_registry_get_components:
+ * @registry: An #IBusRegistry.
+ * @returns: (transfer container) (element-type IBusComponent):
+ * a list of #IBusComponent objects.
+ * The caller has to call g_list_free() for the returned list.
+ *
+ * List components.
+ */
+GList           *ibus_registry_get_components   (IBusRegistry   *registry);
+
+/**
+ * ibus_registry_get_observed_paths:
+ * @registry: An #IBusRegistry.
+ * @returns: (transfer container) (element-type IBusObservedPath):
+ * a list of #IBusObservedPath objects.
+ * The caller has to call g_list_free() for the returned list.
+ *
+ * List observed paths.
+ */
+GList           *ibus_registry_get_observed_paths
+                                                (IBusRegistry   *registry);
+
+/**
+ * ibus_registry_start_monitor_changes:
+ * @registry: An #IBusRegistry.
+ *
+ * Start to monitor observed paths.
+ */
+void             ibus_registry_start_monitor_changes
+                                                (IBusRegistry   *registry);
+
+G_END_DECLS
+#endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index ad8bb8e5b..b5b2da3ee 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
@@ -40,17 +40,18 @@ prog_ldadd = 			\
 	$(NULL)
 
 noinst_PROGRAMS = $(TESTS)
-TESTS =               \
-	ibus-bus          \
-	ibus-config       \
-	ibus-configservice\
-	ibus-factory      \
-	ibus-inputcontext \
-	ibus-inputcontext-create \
-	ibus-keynames     \
-	ibus-serializable \
-	ibus-share        \
-	ibus-util         \
+TESTS = \
+	ibus-bus                        \
+	ibus-config                     \
+	ibus-configservice              \
+	ibus-factory                    \
+	ibus-inputcontext               \
+	ibus-inputcontext-create        \
+	ibus-keynames                   \
+	ibus-registry                   \
+	ibus-serializable               \
+	ibus-share                      \
+	ibus-util                       \
 	$(NULL)
 
 if ENABLE_ENGINE
@@ -91,6 +92,9 @@ ibus_inputcontext_create_LDADD = $(prog_ldadd)
 ibus_keynames_SOURCES = ibus-keynames.c
 ibus_keynames_LDADD = $(prog_ldadd)
 
+ibus_registry_SOURCES = ibus-registry.c
+ibus_registry_LDADD = $(prog_ldadd)
+
 ibus_serializable_SOURCES = ibus-serializable.c
 ibus_serializable_LDADD = $(prog_ldadd)
 
diff --git a/src/tests/ibus-registry.c b/src/tests/ibus-registry.c
new file mode 100644
index 000000000..c1cfd8a1c
--- /dev/null
+++ b/src/tests/ibus-registry.c
@@ -0,0 +1,11 @@
+#include <ibus.h>
+
+int main()
+{
+#if !GLIB_CHECK_VERSION(2,35,0)
+    g_type_init ();
+#endif
+    IBusRegistry *registry = ibus_registry_new ();
+    g_object_unref (registry);
+    return 0;
+}
diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index 05bf63daa..80fcf41b8 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -51,8 +51,37 @@ Restart ibus-daemon.
 \fBversion\fR
 Show the ibus version.
 .TP
+\fBread\-cache\fR [\fB\-\-system|\-\-file=FILE\fR]
+Show the content of the user registry cache if
+.B \-\-system
+is not given.
+Show the content of the system registry cache if
+.B \-\-system
+is given.
+Show the content of the custom registry cache 
+.B FILE
+if
+.B \-\-file=FILE
+is given.
+.TP
+\fBwrite\-cache\fR [\fB\-\-system|\-\-file=FILE\fR]
+Save the user registry cache if
+.B \-\-system
+is not given.
+Save the system registry cache if
+.B \-\-system
+is given.
+Save the custom registry cache
+.B FILE
+if
+.B \-\-file=FILE
+is given.
+IBUS_COMPONENT_PATH environment valuable is also available for
+the custom component directories, whose delimiter is ':'.
+.TP
 \fBwatch\fR
 Under construction.
+.TP
 
 .SH BUGS
 If you find a bug, please report it at http://code.google.com/p/ibus/issues/list.
diff --git a/tools/main.vala b/tools/main.vala
index 28bd3369b..b3589745e 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,9 @@
  */
 
 bool name_only = false;
+/* system() exists as a public API. */
+bool is_system = false;
+string cache_file = null;
 
 class EngineList {
     public IBus.EngineDesc[] data = {};
@@ -41,8 +44,8 @@ int list_engine(string[] argv) {
         { null }
     };
 
-    var option = new OptionContext(_("command [OPTIONS]"));
-    option.add_main_entries(options, "ibus");
+    var option = new OptionContext();
+    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
 
     try {
         option.parse(ref argv);
@@ -196,6 +199,78 @@ int print_version(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+int read_cache (string[] argv) {
+    const OptionEntry[] options = {
+        { "system", 0, 0, OptionArg.NONE, out is_system,
+          N_("Read the system registry cache."), null },
+        { "file", 0, 0, OptionArg.STRING, out cache_file,
+          N_("Read the registry cache FILE."), "FILE" },
+        { null }
+    };
+
+    var option = new OptionContext();
+    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+
+    try {
+        option.parse(ref argv);
+    } catch (OptionError e) {
+        stderr.printf("%s\n", e.message);
+        return Posix.EXIT_FAILURE;
+    }
+
+    var registry = new IBus.Registry();
+
+    if (cache_file != null) {
+        if (!registry.load_cache_file(cache_file)) {
+            stderr.printf(_("The registry cache is invalid.\n"));
+            return Posix.EXIT_FAILURE;
+        }
+    } else {
+        if (!registry.load_cache(!is_system)) {
+            stderr.printf(_("The registry cache is invalid.\n"));
+            return Posix.EXIT_FAILURE;
+        }
+    }
+
+    var output = new GLib.StringBuilder();
+    registry.output(output, 1);
+
+    print ("%s\n", output.str);
+    return Posix.EXIT_SUCCESS;
+}
+
+int write_cache (string[] argv) {
+    const OptionEntry[] options = {
+        { "system", 0, 0, OptionArg.NONE, out is_system,
+          N_("Write the system registry cache."), null },
+        { "file", 0, 0, OptionArg.STRING, out cache_file,
+          N_("Write the registry cache FILE."),
+          "FILE" },
+        { null }
+    };
+
+    var option = new OptionContext();
+    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+
+    try {
+        option.parse(ref argv);
+    } catch (OptionError e) {
+        stderr.printf("%s\n", e.message);
+        return Posix.EXIT_FAILURE;
+    }
+
+    var registry = new IBus.Registry();
+    registry.load();
+
+    if (cache_file != null) {
+        return registry.save_cache_file(cache_file) ?
+                Posix.EXIT_SUCCESS : Posix.EXIT_FAILURE;
+    }
+
+    return registry.save_cache(!is_system) ?
+            Posix.EXIT_SUCCESS : Posix.EXIT_FAILURE;
+}
+
 int print_help(string[] argv) {
     print_usage(stdout);
     return Posix.EXIT_SUCCESS;
@@ -215,6 +290,8 @@ static const CommandEntry commands[]  = {
     { "watch", message_watch },
     { "restart", restart_daemon },
     { "version", print_version },
+    { "read-cache", read_cache },
+    { "write-cache", write_cache },
     { "help", print_help }
 };
 
@@ -229,6 +306,7 @@ void print_usage(FileStream stream) {
 }
 
 public int main(string[] argv) {
+    GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
     GLib.Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
     GLib.Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
 
@@ -239,6 +317,7 @@ public int main(string[] argv) {
     }
 
     string[] new_argv = argv[1:argv.length];
+    new_argv[0] = "%s %s".printf(program_name, new_argv[0]);
     for (int i = 0; i < commands.length; i++) {
         if (commands[i].name == argv[1])
             return commands[i].entry(new_argv);

From ecced4f45a46cb7557717b04e1ce1b284a397b8c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Jul 2013 10:41:38 +0900
Subject: [PATCH 154/816] Delete xdg in ibus-setup.

Review URL: https://codereview.appspot.com/11100044
---
 setup/main.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index c1e05a7fe..9703d5e4d 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -30,11 +30,6 @@
 from gi.repository import IBus
 from os import path
 
-try:
-    from xdg.BaseDirectory import xdg_config_home
-except ImportError:
-    xdg_config_home = ".config"
-
 import keyboardshortcut
 import locale
 from enginecombobox import EngineComboBox
@@ -460,7 +455,8 @@ def __item_preload_column_toggled_cb(self, cell, path_str, model):
         model.set(iter, COLUMN_PRELOAD, data[DATA_PRELOAD])
 
     def __is_auto_start(self):
-        link_file = path.join(xdg_config_home, "autostart/ibus.desktop")
+        link_file = path.join(GLib.get_user_config_dir(),
+                              "autostart/ibus.desktop")
         ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
                                  "share/applications/ibus.desktop")
 
@@ -473,11 +469,12 @@ def __is_auto_start(self):
         return True
 
     def __checkbutton_auto_start_toggled_cb(self, button):
-        auto_start_dir = path.join(xdg_config_home, "autostart")
+        auto_start_dir = path.join(GLib.get_user_config_dir(), "autostart")
         if not path.isdir(auto_start_dir):
             os.makedirs(auto_start_dir)
 
-        link_file = path.join(xdg_config_home, "autostart/ibus.desktop")
+        link_file = path.join(GLib.get_user_config_dir(),
+                              "autostart/ibus.desktop")
         ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
                                  "share/applications/ibus.desktop")
         # unlink file

From 9037ffe0f3ab419554903de6f12d00ee74f2f3ff Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 12 Jul 2013 18:05:06 +0900
Subject: [PATCH 155/816] build: fix make check

This contains several fixes to the current tests:

- Remove glib mem profiler call from src/tests, which is known not to
  work with the latest glib release:
  https://bugzilla.gnome.org/show_bug.cgi?id=701694
  valgrind could be used instead.

- Replace g_type_init() call in tests with ibus_init().

- Fix ibus-bus test after the DBus property change (commit 458945e7).
  no global engine may be set in the test environment.  Also add more
  assertions to check the return values.

- Fix pygobject test to use LOG_COMPILER and move sys.path adjustment
  into the test script itself.

- Add new files to po/POTFILES.in.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/11156043
---
 bindings/pygobject/Makefile.am              |  3 +-
 bindings/pygobject/gi/__init__.py           |  4 -
 bindings/pygobject/gi/overrides/__init__.py |  4 -
 bindings/pygobject/test-override-ibus.py    | 10 +++
 po/POTFILES.in                              |  2 +-
 po/POTFILES.skip                            |  6 ++
 src/tests/ibus-bus.c                        | 13 +++-
 src/tests/ibus-configservice.c              |  6 +-
 src/tests/ibus-engine.c                     | 20 +++--
 src/tests/ibus-factory.c                    |  6 +-
 src/tests/ibus-global-engine.c              | 81 ++++++++++-----------
 src/tests/ibus-inputcontext-create.c        |  2 +-
 src/tests/ibus-inputcontext.c               |  2 +-
 src/tests/ibus-keymap.c                     |  6 +-
 src/tests/ibus-keynames.c                   |  5 +-
 src/tests/ibus-proxy.c                      | 26 +++----
 src/tests/ibus-registry.c                   |  5 +-
 src/tests/ibus-serializable.c               |  6 +-
 src/tests/ibus-share.c                      |  6 +-
 19 files changed, 106 insertions(+), 107 deletions(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index 636039785..d4389c360 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -37,9 +37,10 @@ TESTS_ENVIRONMENT = \
 	PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
 	GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
-	$(PYTHON) -B \
 	$(NULL)
 
+LOG_COMPILER = $(PYTHON) -B
+
 EXTRA_DIST =					\
 	gi/__init__.py				\
 	gi/overrides/__init__.py		\
diff --git a/bindings/pygobject/gi/__init__.py b/bindings/pygobject/gi/__init__.py
index 3ae00c376..4730fc914 100644
--- a/bindings/pygobject/gi/__init__.py
+++ b/bindings/pygobject/gi/__init__.py
@@ -22,7 +22,3 @@
 
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
-
-__path__.reverse()
-from __init__ import *
-__path__.reverse()
diff --git a/bindings/pygobject/gi/overrides/__init__.py b/bindings/pygobject/gi/overrides/__init__.py
index 3ae00c376..4730fc914 100644
--- a/bindings/pygobject/gi/overrides/__init__.py
+++ b/bindings/pygobject/gi/overrides/__init__.py
@@ -22,7 +22,3 @@
 
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
-
-__path__.reverse()
-from __init__ import *
-__path__.reverse()
diff --git a/bindings/pygobject/test-override-ibus.py b/bindings/pygobject/test-override-ibus.py
index d222ecfaa..5492268ef 100644
--- a/bindings/pygobject/test-override-ibus.py
+++ b/bindings/pygobject/test-override-ibus.py
@@ -21,6 +21,16 @@
 # Boston, MA  02110-1301  USA
 
 import unittest
+
+import os
+import sys
+
+# move the script path at the end, so the necessary modules in system
+# pygobject can be loaded first
+tests_builddir = os.path.abspath(os.path.dirname(__file__))
+sys.path = [path for path in sys.path if path != tests_builddir]
+sys.path.append(tests_builddir)
+
 from gi.repository import GLib, IBus
 
 class TestOverride(unittest.TestCase):
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff6e8b447..29b3b7604 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ bus/dbusimpl.c
 bus/engineproxy.c
 bus/inputcontext.c
 bus/panelproxy.c
-bus/registry.c
 data/ibus.schemas.in
 ibus/__init__.py
 ibus/_config.py.in
@@ -47,6 +46,7 @@ src/ibusinputcontext.c
 src/ibusobject.c
 src/ibuspanelservice.c
 src/ibusproxy.c
+src/ibusregistry.c
 src/ibusservice.c
 src/ibusutil.c
 src/keyname-table.h
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 99d0823a4..870823152 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,13 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
+# Files under ui/gtk2/ are not shipped in the distribution, but kept
+# in the git repository for reference.
 ibus/_config.py
 tools/main.c
+ui/gtk2/candidatepanel.py
+ui/gtk2/engineabout.py
+ui/gtk2/languagebar.py
+ui/gtk2/panel.py
 ui/gtk3/application.c
 ui/gtk3/candidatearea.c
 ui/gtk3/candidatepanel.c
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index e370eb294..3492c43df 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -575,14 +575,23 @@ test_get_global_engine (void)
     GVariant *result, *obj;
     IBusEngineDesc *desc = NULL;
 
+    if (!ibus_bus_set_global_engine (bus, "xkb:us::eng"))
+        return;
+
     result = ibus_bus_get_ibus_property (bus, "GlobalEngine");
+    g_assert (result);
+
     obj = g_variant_get_variant (result);
+    g_assert (obj);
+
     desc = IBUS_ENGINE_DESC (ibus_serializable_deserialize (obj));
+    g_assert (desc);
+    g_assert_cmpstr (ibus_engine_desc_get_name (desc), ==, "xkb:us::eng");
+
     g_variant_unref (obj);
     g_variant_unref (result);
 
-    if (desc)
-        g_object_unref (desc);
+    g_object_unref (desc);
 }
 
 static void
diff --git a/src/tests/ibus-configservice.c b/src/tests/ibus-configservice.c
index c05e096cd..718e13a7e 100644
--- a/src/tests/ibus-configservice.c
+++ b/src/tests/ibus-configservice.c
@@ -33,10 +33,8 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-    g_mem_set_vtable (glib_mem_profiler_table);
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/configservice", test_configservice);
diff --git a/src/tests/ibus-engine.c b/src/tests/ibus-engine.c
index 1c2961100..225328d62 100644
--- a/src/tests/ibus-engine.c
+++ b/src/tests/ibus-engine.c
@@ -3,17 +3,15 @@
 
 int main()
 {
-#if !GLIB_CHECK_VERSION(2,35,0)
-	g_type_init ();
-#endif
+    ibus_init ();
 
-	GMainLoop *mainloop;
-	IBusConnection *connection;
-	IBusService *service;
+    GMainLoop *mainloop;
+    IBusConnection *connection;
+    IBusService *service;
 
-	mainloop = g_main_loop_new (NULL, FALSE);
-	connection = ibus_connection_open ("unix:path=/tmp/ibus-phuang/ibus--0.0");
-	service = IBUS_SERVICE (ibus_engine_new ("/a/Engine", connection));
-	g_main_loop_run (mainloop);
-	return 0;
+    mainloop = g_main_loop_new (NULL, FALSE);
+    connection = ibus_connection_open ("unix:path=/tmp/ibus-phuang/ibus--0.0");
+    service = IBUS_SERVICE (ibus_engine_new ("/a/Engine", connection));
+    g_main_loop_run (mainloop);
+    return 0;
 }
diff --git a/src/tests/ibus-factory.c b/src/tests/ibus-factory.c
index c9a6f0300..7b5459885 100644
--- a/src/tests/ibus-factory.c
+++ b/src/tests/ibus-factory.c
@@ -33,10 +33,8 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-    g_mem_set_vtable (glib_mem_profiler_table);
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/factory", test_factory);
diff --git a/src/tests/ibus-global-engine.c b/src/tests/ibus-global-engine.c
index fd6d61ae5..9007af2be 100644
--- a/src/tests/ibus-global-engine.c
+++ b/src/tests/ibus-global-engine.c
@@ -8,71 +8,68 @@ static GList *current_engine = NULL;
 void
 global_engine_changed_cb (IBusBus *bus)
 {
-	IBusEngineDesc *global_engine = ibus_bus_get_global_engine (bus);
-	const gchar *name = NULL;
+    IBusEngineDesc *global_engine = ibus_bus_get_global_engine (bus);
+    const gchar *name = NULL;
 
-	g_assert (global_engine);
+    g_assert (global_engine);
 
-	name = ibus_engine_desc_get_name (global_engine);
-	g_debug ("%s (id:%s, icon:%s)",
-	         ibus_engine_desc_get_longname (global_engine),
-	         name,
-	         ibus_engine_desc_get_icon (global_engine));
-	IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (current_engine->data);
+    name = ibus_engine_desc_get_name (global_engine);
+    g_debug ("%s (id:%s, icon:%s)",
+             ibus_engine_desc_get_longname (global_engine),
+             name,
+             ibus_engine_desc_get_icon (global_engine));
+    IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (current_engine->data);
 
-	g_assert (strcmp (name,
-	                  ibus_engine_desc_get_name (engine_desc)) == 0);
-	g_object_unref (global_engine);
+    g_assert (strcmp (name,
+                      ibus_engine_desc_get_name (engine_desc)) == 0);
+    g_object_unref (global_engine);
 }
 
 gboolean
 change_global_engine_cb (IBusBus *bus)
 {
-	if (!current_engine)
-		current_engine = engines;
-	else
-		current_engine = g_list_next (current_engine);
+    if (!current_engine)
+        current_engine = engines;
+    else
+        current_engine = g_list_next (current_engine);
 
-	if (!current_engine) {
-		ibus_quit();
-		return FALSE;
-	}
+    if (!current_engine) {
+        ibus_quit();
+        return FALSE;
+    }
 
-	IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (current_engine->data);
+    IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (current_engine->data);
 
-	ibus_bus_set_global_engine (bus,
-	                            ibus_engine_desc_get_name (engine_desc));
+    ibus_bus_set_global_engine (bus,
+                                ibus_engine_desc_get_name (engine_desc));
 
-	return TRUE;
+    return TRUE;
 }
 
 int main()
 {
-	IBusBus *bus;
+    IBusBus *bus;
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-	g_type_init ();
-#endif
-	IBUS_TYPE_ENGINE_DESC;
+    ibus_init ();
 
-	bus = ibus_bus_new ();
-	engines = ibus_bus_list_active_engines (bus);
-	g_assert (engines);
+    bus = ibus_bus_new ();
+    engines = ibus_bus_list_active_engines (bus);
+    g_assert (engines);
 
-	g_debug ("===== Global engine:");
-	if (ibus_bus_get_use_global_engine (bus) == FALSE)
+    g_debug ("===== Global engine:");
+    if (ibus_bus_get_use_global_engine (bus) == FALSE)
         return 0;
 
-	g_signal_connect (bus, "global-engine-changed",
-                          G_CALLBACK (global_engine_changed_cb), bus);
+    g_signal_connect (bus, "global-engine-changed",
+                      G_CALLBACK (global_engine_changed_cb), bus);
 
-	g_idle_add ((GSourceFunc)change_global_engine_cb, bus);
+    g_idle_add ((GSourceFunc)change_global_engine_cb, bus);
 
-	ibus_main();
+    ibus_main();
 
-	g_debug ("Test ibusbus.c's global engine api: passed.");
-	g_list_free (engines);
-	g_object_unref (bus);
+    g_debug ("Test ibusbus.c's global engine api: passed.");
+    g_list_free (engines);
+    g_object_unref (bus);
 
-	return 0;
+    return 0;
 }
diff --git a/src/tests/ibus-inputcontext-create.c b/src/tests/ibus-inputcontext-create.c
index a086f436c..aca653a5d 100644
--- a/src/tests/ibus-inputcontext-create.c
+++ b/src/tests/ibus-inputcontext-create.c
@@ -10,7 +10,7 @@
  *
  * 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
+ * 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
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index f1565b0b5..fb6fabb26 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -10,7 +10,7 @@
  *
  * 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
+ * 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
diff --git a/src/tests/ibus-keymap.c b/src/tests/ibus-keymap.c
index 24fefc496..ede5bb396 100644
--- a/src/tests/ibus-keymap.c
+++ b/src/tests/ibus-keymap.c
@@ -23,14 +23,12 @@ int main (int argc, char **argv)
     gint fd;
     struct input_event e;
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
 
     IBusKeymap *keymap = ibus_keymap_get (argc > 1 ? argv[1] : "us");
 
     g_object_unref (keymap);
-	return 0;
+    return 0;
 
     fd = open (KEYBOARDPATH, O_RDONLY);
 
diff --git a/src/tests/ibus-keynames.c b/src/tests/ibus-keynames.c
index 58095504d..0793e7be1 100644
--- a/src/tests/ibus-keynames.c
+++ b/src/tests/ibus-keynames.c
@@ -11,9 +11,8 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/ibus/keyname", test_keyname);
diff --git a/src/tests/ibus-proxy.c b/src/tests/ibus-proxy.c
index 1f46ab611..dbfb79d28 100644
--- a/src/tests/ibus-proxy.c
+++ b/src/tests/ibus-proxy.c
@@ -4,26 +4,24 @@
 static
 _value_changed_cb (IBusConfig *config, gchar *section, gchar *name, GValue *value, gpointer data)
 {
-	g_debug ("value-changed %s %s", section, name);
+    g_debug ("value-changed %s %s", section, name);
 }
 
 int main()
 {
-	IBusBus *bus;
-	IBusConfig *config;
+    IBusBus *bus;
+    IBusConfig *config;
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-	g_type_init ();
-#endif
+    ibus_init ();
 
-	bus = ibus_bus_new ();
-	config = ibus_bus_get_config (bus);
+    bus = ibus_bus_new ();
+    config = ibus_bus_get_config (bus);
 
-	g_signal_connect (config,
-					  "value-changed",
-					  G_CALLBACK (_value_changed_cb),
-					  NULL);
-	g_main_loop_run (g_main_loop_new (NULL, FALSE));
+    g_signal_connect (config,
+                      "value-changed",
+                      G_CALLBACK (_value_changed_cb),
+                      NULL);
+    g_main_loop_run (g_main_loop_new (NULL, FALSE));
 
-	return 0;
+    return 0;
 }
diff --git a/src/tests/ibus-registry.c b/src/tests/ibus-registry.c
index c1cfd8a1c..4c612926c 100644
--- a/src/tests/ibus-registry.c
+++ b/src/tests/ibus-registry.c
@@ -2,9 +2,8 @@
 
 int main()
 {
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     IBusRegistry *registry = ibus_registry_new ();
     g_object_unref (registry);
     return 0;
diff --git a/src/tests/ibus-serializable.c b/src/tests/ibus-serializable.c
index a5d8af95b..82e08621a 100644
--- a/src/tests/ibus-serializable.c
+++ b/src/tests/ibus-serializable.c
@@ -183,10 +183,8 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-    g_mem_set_vtable (glib_mem_profiler_table);
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     g_test_init (&argc, &argv, NULL);
     g_test_add_func ("/ibus/varianttypeinfo", test_varianttypeinfo);
     g_test_add_func ("/ibus/attrlist", test_attr_list);
diff --git a/src/tests/ibus-share.c b/src/tests/ibus-share.c
index b1098ba0a..6ff9c2d5b 100644
--- a/src/tests/ibus-share.c
+++ b/src/tests/ibus-share.c
@@ -15,10 +15,8 @@ gint
 main (gint    argc,
       gchar **argv)
 {
-    g_mem_set_vtable (glib_mem_profiler_table);
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
+    ibus_init ();
+
     g_test_init (&argc, &argv, NULL);
     g_test_add_func ("/ibus/marchine-id", test_machine_id);
 

From 632a5c13072312015226c408ddb3d4eb478abe6f Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 12 Jul 2013 18:39:54 +0900
Subject: [PATCH 156/816] registry: use binary format instead of XML for cache

Currently the registry cache is in the XML format, that may cause
unnecessary parsing overhead on ibus-daemon startup.  This patch
changes the format to GVariant based binary representation.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/9963043
---
 src/ibusregistry.c | 259 ++++++++++++++++++++++++++++++++-------------
 src/ibusregistry.h |   4 +-
 src/ibusshare.c    |   2 +
 tools/main.vala    |   3 +-
 4 files changed, 194 insertions(+), 74 deletions(-)

diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index d239955ef..c76fae791 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -28,6 +28,9 @@
 #include "ibusmarshalers.h"
 #include "ibusregistry.h"
 
+#define IBUS_CACHE_MAGIC 0x49425553 /* "IBUS" */
+#define IBUS_CACHE_VERSION 0x00010502
+
 enum {
     CHANGED,
     LAST_SIGNAL,
@@ -57,17 +60,30 @@ struct _IBusRegistryPrivate {
 /* functions prototype */
 static void     ibus_registry_destroy        (IBusRegistry           *registry);
 static void     ibus_registry_remove_all     (IBusRegistry           *registry);
+static gboolean ibus_registry_serialize      (IBusRegistry           *registry,
+                                              GVariantBuilder        *builder);
+static gint     ibus_registry_deserialize    (IBusRegistry           *registry,
+                                              GVariant               *variant);
+static gboolean ibus_registry_copy           (IBusRegistry           *dest,
+                                              const IBusRegistry     *src);
 
-G_DEFINE_TYPE (IBusRegistry, ibus_registry, IBUS_TYPE_OBJECT)
+G_DEFINE_TYPE (IBusRegistry, ibus_registry, IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_registry_class_init (IBusRegistryClass *class)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
     IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
     ibus_object_class->destroy = (IBusObjectDestroyFunc) ibus_registry_destroy;
 
+    serializable_class->serialize =
+        (IBusSerializableSerializeFunc) ibus_registry_serialize;
+    serializable_class->deserialize =
+        (IBusSerializableDeserializeFunc) ibus_registry_deserialize;
+    serializable_class->copy = (IBusSerializableCopyFunc) ibus_registry_copy;
+
     g_type_class_add_private (class, sizeof (IBusRegistryPrivate));
 
     /* install signals */
@@ -124,6 +140,91 @@ ibus_registry_destroy (IBusRegistry *registry)
             destroy (IBUS_OBJECT (registry));
 }
 
+static gboolean
+ibus_registry_serialize (IBusRegistry    *registry,
+                         GVariantBuilder *builder)
+{
+    gboolean retval;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_registry_parent_class)->
+        serialize ((IBusSerializable *)registry, builder);
+    g_return_val_if_fail (retval, FALSE);
+
+    GList *p;
+    GVariantBuilder *array;
+
+    array = g_variant_builder_new (G_VARIANT_TYPE ("av"));
+    for (p = registry->priv->observed_paths; p != NULL; p = p->next) {
+        IBusSerializable *serializable = (IBusSerializable *) p->data;
+        g_variant_builder_add (array,
+                               "v",
+                               ibus_serializable_serialize (serializable));
+    }
+    g_variant_builder_add (builder, "av", array);
+    g_variant_builder_unref (array);
+
+    array = g_variant_builder_new (G_VARIANT_TYPE ("av"));
+    for (p = registry->priv->components; p != NULL; p = p->next) {
+        IBusSerializable *serializable = (IBusSerializable *) p->data;
+        g_variant_builder_add (array,
+                               "v",
+                               ibus_serializable_serialize (serializable));
+    }
+    g_variant_builder_add (builder, "av", array);
+    g_variant_builder_unref (array);
+
+    return TRUE;
+}
+
+static gint
+ibus_registry_deserialize (IBusRegistry *registry,
+                           GVariant     *variant)
+{
+    GVariant *var;
+    GVariantIter *iter;
+    gint retval;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_registry_parent_class)->
+        deserialize ((IBusSerializable *)registry, variant);
+    g_return_val_if_fail (retval, 0);
+
+    g_variant_get_child (variant, retval++, "av", &iter);
+    while (g_variant_iter_loop (iter, "v", &var)) {
+        IBusSerializable *serializable = ibus_serializable_deserialize (var);
+        registry->priv->observed_paths =
+            g_list_append (registry->priv->observed_paths,
+                           IBUS_OBSERVED_PATH (serializable));
+    }
+    g_variant_iter_free (iter);
+
+    g_variant_get_child (variant, retval++, "av", &iter);
+    while (g_variant_iter_loop (iter, "v", &var)) {
+        IBusSerializable *serializable = ibus_serializable_deserialize (var);
+        registry->priv->components =
+            g_list_append (registry->priv->components,
+                           IBUS_COMPONENT (serializable));
+    }
+    g_variant_iter_free (iter);
+
+    return retval;
+}
+
+static gboolean
+ibus_registry_copy (IBusRegistry       *dest,
+                    const IBusRegistry *src)
+{
+    gboolean retval;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_registry_parent_class)->
+        copy ((IBusSerializable *)dest, (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest->priv->components = g_list_copy (src->priv->components);
+    dest->priv->observed_paths = g_list_copy (src->priv->observed_paths);
+
+    return TRUE;
+}
+
 /**
  * ibus_registry_remove_all:
  *
@@ -182,7 +283,8 @@ ibus_registry_load (IBusRegistry *registry)
 }
 
 gboolean
-ibus_registry_load_cache (IBusRegistry *registry, gboolean is_user)
+ibus_registry_load_cache (IBusRegistry *registry,
+                          gboolean      is_user)
 {
     gchar *filename;
     gboolean retval;
@@ -191,10 +293,10 @@ ibus_registry_load_cache (IBusRegistry *registry, gboolean is_user)
 
     if (is_user) {
         filename = g_build_filename (g_get_user_cache_dir (),
-                                     "ibus", "bus", "registry.xml", NULL);
+                                     "ibus", "bus", "registry", NULL);
     } else {
         filename = g_build_filename (IBUS_CACHE_DIR,
-                                     "bus", "registry.xml", NULL);
+                                     "bus", "registry", NULL);
     }
 
     retval = ibus_registry_load_cache_file (registry, filename);
@@ -204,60 +306,63 @@ ibus_registry_load_cache (IBusRegistry *registry, gboolean is_user)
 }
 
 gboolean
-ibus_registry_load_cache_file (IBusRegistry *registry, const gchar *filename)
+ibus_registry_load_cache_file (IBusRegistry *registry,
+                               const gchar  *filename)
 {
-    XMLNode *node;
-    GList *p;
+    gchar *contents, *p;
+    gsize length;
+    GVariant *variant;
+    GError *error;
 
     g_assert (IBUS_IS_REGISTRY (registry));
     g_assert (filename != NULL);
 
-    node = ibus_xml_parse_file (filename);
+    if (!g_file_test (filename, G_FILE_TEST_EXISTS))
+        return FALSE;
 
-    if (node == NULL) {
+    error = NULL;
+    if (!g_file_get_contents (filename, &contents, &length, &error)) {
+        g_warning ("cannot read %s: %s", filename, error->message);
+        g_error_free (error);
         return FALSE;
     }
 
-    if (g_strcmp0 (node->name, "ibus-registry") != 0) {
-        ibus_xml_free (node);
+    p = contents;
+
+    /* read file header including magic and version */
+    if (length < 8) {
+        g_free (contents);
         return FALSE;
     }
 
-    for (p = node->sub_nodes; p != NULL; p = p->next) {
-        XMLNode *sub_node = (XMLNode *) p->data;
-
-        if (g_strcmp0 (sub_node->name, "observed-paths") == 0) {
-            GList *pp;
-            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
-                IBusObservedPath *path;
-                path = ibus_observed_path_new_from_xml_node (pp->data, FALSE);
-                if (path) {
-                    g_object_ref_sink (path);
-                    registry->priv->observed_paths =
-                            g_list_append (registry->priv->observed_paths,
-                                           path);
-                }
-            }
-            continue;
-        }
-        if (g_strcmp0 (sub_node->name, "components") == 0) {
-            GList *pp;
-            for (pp = sub_node->sub_nodes; pp != NULL; pp = pp->next) {
-                IBusComponent *component;
-                component = ibus_component_new_from_xml_node (pp->data);
-                if (component) {
-                    g_object_ref_sink (component);
-                    registry->priv->components =
-                        g_list_append (registry->priv->components, component);
-                }
-            }
+    if (GUINT32_FROM_BE (*(guint32 *) p) != IBUS_CACHE_MAGIC) {
+        g_free (contents);
+        return FALSE;
+    }
+    p += 4;
 
-            continue;
-        }
-        g_warning ("Unknown element <%s>", sub_node->name);
+    if (GUINT32_FROM_BE (*(guint32 *) p) != IBUS_CACHE_VERSION) {
+        g_free (contents);
+        return FALSE;
+    }
+    p += 4;
+
+    /* read serialized IBusRegistry */
+    variant = g_variant_new_from_data (G_VARIANT_TYPE ("(sa{sv}avav)"),
+                                       p,
+                                       length - (p - contents),
+                                       FALSE,
+                                       (GDestroyNotify) g_free,
+                                       NULL);
+    if (variant == NULL) {
+        g_free (contents);
+        return FALSE;
     }
 
-    ibus_xml_free (node);
+    ibus_registry_deserialize (registry, variant);
+    g_variant_unref (variant);
+    g_free (contents);
+
     return TRUE;
 }
 
@@ -283,7 +388,8 @@ ibus_registry_check_modification (IBusRegistry *registry)
 }
 
 gboolean
-ibus_registry_save_cache (IBusRegistry *registry, gboolean is_user)
+ibus_registry_save_cache (IBusRegistry *registry,
+                          gboolean      is_user)
 {
     gchar *filename;
     gboolean retval;
@@ -292,10 +398,10 @@ ibus_registry_save_cache (IBusRegistry *registry, gboolean is_user)
 
     if (is_user) {
         filename = g_build_filename (g_get_user_cache_dir (),
-                                     "ibus", "bus", "registry.xml", NULL);
+                                     "ibus", "bus", "registry", NULL);
     } else {
         filename = g_build_filename (IBUS_CACHE_DIR,
-                                     "bus", "registry.xml", NULL);
+                                     "bus", "registry", NULL);
     }
 
     retval = ibus_registry_save_cache_file (registry, filename);
@@ -305,14 +411,16 @@ ibus_registry_save_cache (IBusRegistry *registry, gboolean is_user)
 }
 
 gboolean
-ibus_registry_save_cache_file (IBusRegistry *registry, const gchar *filename)
+ibus_registry_save_cache_file (IBusRegistry *registry,
+                               const gchar  *filename)
 {
     gchar *cachedir;
-    const gchar *user_cachedir;
-    gboolean is_user = TRUE;
-    GString *output;
-    FILE *pf;
-    size_t items = 0;
+    GVariant *variant;
+    gchar *contents, *p;
+    gsize length;
+    gboolean retval;
+    guint32 intval;
+    GError *error;
 
     g_assert (IBUS_IS_REGISTRY (registry));
     g_assert (filename != NULL);
@@ -320,29 +428,40 @@ ibus_registry_save_cache_file (IBusRegistry *registry, const gchar *filename)
     cachedir = g_path_get_dirname (filename);
     g_mkdir_with_parents (cachedir, 0775);
     g_free (cachedir);
-    pf = g_fopen (filename, "w");
 
-    if (pf == NULL) {
-        g_warning ("create %s failed", filename);
-        return FALSE;
-    }
+    variant = ibus_serializable_serialize (IBUS_SERIALIZABLE (registry));
+    length = 8 + g_variant_get_size (variant);
+    p = contents = g_slice_alloc (length);
+
+    /* write file header */
+    intval = GUINT32_TO_BE (IBUS_CACHE_MAGIC);
+    memcpy (p, (gchar *) &intval, 4);
+    p += 4;
 
-    output = g_string_new ("");
+    intval = GUINT32_TO_BE (IBUS_CACHE_VERSION);
+    memcpy (p, (gchar *) &intval, 4);
+    p += 4;
 
-    ibus_registry_output (registry, output, 1);
+    /* write serialized IBusRegistry */
+    g_variant_store (variant, p);
 
-    items = fwrite (output->str, output->len, 1, pf);
-    g_string_free (output, TRUE);
-    fclose (pf);
+    error = NULL;
+    retval = g_file_set_contents (filename, contents, length, &error);
 
-    user_cachedir = g_get_user_cache_dir ();
-    is_user = (strncmp (user_cachedir, filename, strlen (user_cachedir)) == 0);
+    g_variant_unref (variant);
+    g_slice_free1 (length, contents);
 
-    if (!is_user) {
+    if (!retval) {
+        g_warning ("cannot write %s: %s", filename, error->message);
+        g_error_free (error);
+        return FALSE;
+    }
+
+    if (g_str_has_prefix (filename, g_get_user_cache_dir ())) {
         g_chmod (filename, 0644);
     }
 
-    return (items == 1 ? TRUE : FALSE);
+    return TRUE;
 }
 
 #define g_string_append_indent(string, indent)  \
@@ -354,7 +473,9 @@ ibus_registry_save_cache_file (IBusRegistry *registry, const gchar *filename)
     }
 
 void
-ibus_registry_output (IBusRegistry *registry, GString *output, int indent)
+ibus_registry_output (IBusRegistry *registry,
+                      GString      *output,
+                      int           indent)
 {
     GList *p;
 
@@ -362,10 +483,6 @@ ibus_registry_output (IBusRegistry *registry, GString *output, int indent)
     g_return_if_fail (output != NULL);
 
     g_string_append (output, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
-    g_string_append (output, "<!-- \n"
-                             "    This file was generated by ibus-daemon. "
-                             "Please don't modify it.\n"
-                             "    -->\n");
     g_string_append (output, "<ibus-registry>\n");
 
     if (registry->priv->observed_paths) {
diff --git a/src/ibusregistry.h b/src/ibusregistry.h
index 288dc07f0..336944799 100644
--- a/src/ibusregistry.h
+++ b/src/ibusregistry.h
@@ -74,14 +74,14 @@ typedef struct _IBusRegistryClass IBusRegistryClass;
 struct _IBusRegistry {
     /* instance members */
     /*< private >*/
-    IBusObject parent;
+    IBusSerializable parent;
     IBusRegistryPrivate *priv;
 };
 
 struct _IBusRegistryClass {
     /* class members */
     /*< private >*/
-    IBusObjectClass parent;
+    IBusSerializableClass parent;
 };
 
 GType            ibus_registry_get_type         (void);
diff --git a/src/ibusshare.c b/src/ibusshare.c
index 79c2e0878..20a144fcb 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -285,6 +285,8 @@ ibus_init (void)
     IBUS_TYPE_LOOKUP_TABLE;
     IBUS_TYPE_COMPONENT;
     IBUS_TYPE_ENGINE_DESC;
+    IBUS_TYPE_OBSERVED_PATH;
+    IBUS_TYPE_REGISTRY;
 }
 
 static GMainLoop *main_loop = NULL;
diff --git a/tools/main.vala b/tools/main.vala
index b3589745e..f3959af5b 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -30,7 +30,6 @@ class EngineList {
 }
 
 IBus.Bus? get_bus() {
-    IBus.init();
     var bus = new IBus.Bus();
     if (!bus.is_connected ())
         return null;
@@ -310,6 +309,8 @@ public int main(string[] argv) {
     GLib.Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
     GLib.Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
 
+    IBus.init();
+
     program_name = Path.get_basename(argv[0]);
     if (argv.length < 2) {
         print_usage(stderr);

From f64d4fdf43a17dc39132354ffdb1060a185fa715 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 17 Jul 2013 11:50:25 +0900
Subject: [PATCH 157/816] Remove ibus_bus_list_active_engines in
 bus/test-client.c

BUG=http://code.google.com/p/ibus/issues/detail?id=1637
TEST=bus/test-client.c

Review URL: https://codereview.appspot.com/11336044
---
 bus/test-client.c | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/bus/test-client.c b/bus/test-client.c
index 6192c8f3e..6abc36736 100644
--- a/bus/test-client.c
+++ b/bus/test-client.c
@@ -35,7 +35,6 @@ static void          bus_test_client_class_init      (BusTestClientClass *class)
 static void          bus_test_client_destroy         (IBusObject         *object);
 
 /* static methods*/
-static gchar*        _get_active_engine_name        (void);
 static void          _store_modifier_state          (BusTestClient      *client,
                                                      guint               modifier);
 static gboolean      _is_shift_set                  (BusTestClient      *client);
@@ -83,7 +82,6 @@ static void
 bus_test_client_init (BusTestClient *client)
 {
     IDEBUG ("%s", __FUNCTION__);
-    gchar *active_engine_name;
     client->connected = FALSE;
     client->enabled = FALSE;
 
@@ -104,13 +102,7 @@ bus_test_client_init (BusTestClient *client)
     client->caps = IBUS_CAP_FOCUS;
     ibus_input_context_set_capabilities (client->ibuscontext, client->caps);
 
-    active_engine_name = _get_active_engine_name ();
-
-    g_return_if_fail (active_engine_name != NULL);
-    IDEBUG ("engine:%s", active_engine_name);
-    ibus_input_context_focus_in (client->ibuscontext);
-    ibus_input_context_set_engine (client->ibuscontext, active_engine_name);
-    g_free (active_engine_name);
+    ibus_bus_set_global_engine (_bus, "xkb:us::eng");
 
     client->enabled = TRUE;
 }
@@ -219,32 +211,6 @@ void bus_test_client_clear_modifier (BusTestClient *client)
     }
 }
 
-static gchar *
-_get_active_engine_name (void)
-{
-    GList *engines;
-    gchar *result;
-
-    engines = ibus_bus_list_active_engines (_bus);
-    if (engines == NULL) {
-        return NULL;
-    }
-
-    IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data);
-    if (engine_desc != NULL) {
-        result = g_strdup (ibus_engine_desc_get_name(engine_desc));
-    } else {
-        result = NULL;
-    }
-
-    for (; engines != NULL; engines = g_list_next (engines)) {
-        g_object_unref (IBUS_ENGINE_DESC (engines->data));
-    }
-    g_list_free (engines);
-
-    return result;
-}
-
 static void
 _store_modifier_state (BusTestClient    *client,
                        guint         modifier)

From 7fdcd865f14d5de6a276e71c2ed958a736dc34db Mon Sep 17 00:00:00 2001
From: Peter Michael Green <plugwash@debian.org>
Date: Fri, 19 Jul 2013 18:09:43 +0900
Subject: [PATCH 158/816] Fix error with gcc -Wformat -Werror=format-security

BUG=http://code.google.com/p/ibus/issues/detail?id=1638
TEST=src/ibusfactory.c

Review URL: https://codereview.appspot.com/11503043
Patch from Peter Michael Green <plugwash@debian.org>.
---
 autogen.sh        | 2 +-
 src/ibusfactory.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7b9507963..1c82d5f42 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,7 @@ which gnome-autogen.sh || {
     touch $srcdir/ChangeLog
 }
 
-CFLAGS=${CFLAGS-"-Wall -Werror"}
+CFLAGS=${CFLAGS-"-Wall -Werror -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 --git a/src/ibusfactory.c b/src/ibusfactory.c
index 54a94fe55..204fc1199 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -287,12 +287,11 @@ ibus_factory_service_method_call (IBusService           *service,
             g_free (object_path);
         }
         else {
-            gchar *error_message = g_strdup_printf ("Can not fond engine %s", engine_name);
             g_dbus_method_invocation_return_error (invocation,
                                                    G_DBUS_ERROR,
                                                    G_DBUS_ERROR_FAILED,
-                                                   error_message);
-            g_free (error_message);
+                                                   "Can not fond engine %s",
+                                                   engine_name);
         }
         return;
     }

From 5f356a34e88ccdd316a960fcb33703aacf28ff09 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Fri, 19 Jul 2013 18:14:19 +0900
Subject: [PATCH 159/816] Fix error with gcc -Wformat -Werror=format-security

BUG=http://code.google.com/p/ibus/issues/detail?id=1638
TEST=bus/ibusimpl.c

Review URL: https://codereview.appspot.com/11471044
Patch from Osamu Aoki <osamu@debian.org>.
---
 bus/ibusimpl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 2cd293d2b..4f8afe953 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -963,7 +963,7 @@ _ibus_current_input_context_depre (BusIBusImpl           *ibus,
     if (variant == NULL) {
         g_dbus_method_invocation_return_error (
                 invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                error->message);
+                "%s", error->message);
         g_error_free (error);
     } else {
         const gchar *path = g_variant_get_string (variant, NULL);
@@ -1357,7 +1357,7 @@ _ibus_get_global_engine_depre (BusIBusImpl           *ibus,
         g_dbus_method_invocation_return_error (
                 invocation,
                 G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-                error->message);
+                "%s", error->message);
         g_error_free (error);
     } else {
         GVariant *retval = g_variant_get_variant (variant);

From ee6b756b9b89af0343ebcb5f60d6f49ac1813f94 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 19 Jul 2013 18:19:07 +0900
Subject: [PATCH 160/816] Remove arrow buttons in ibus-setup, which no longer
 work.

BUG=RH#851758
TEST=ibus-setup

Review URL: https://codereview.appspot.com/6475068
---
 setup/enginetreeview.py | 11 +++++++++++
 setup/setup.ui          |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 51e4fa2ff..1a18cc78e 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -59,6 +59,8 @@ def __init__(self):
         self.__model.connect("row-deleted", self.__emit_changed_delay_cb, "row-deleted")
         self.__model.connect("row-inserted", self.__emit_changed_delay_cb, "row-inserted")
         self.__model.connect("rows-reordered", self.__emit_changed_delay_cb, "rows-reordered")
+        self.__model.set_default_sort_func(self.__sort_engines, None)
+        self.__model.set_sort_column_id(-1, Gtk.SortType.ASCENDING)
 
         # create im name & icon column
         column = Gtk.TreeViewColumn(_("Input Method"))
@@ -99,6 +101,15 @@ def __init__(self):
 
         self.get_selection().connect("changed", self.__selection_changed_cb)
 
+    def __sort_engines(self, model, a, b, data):
+        engine_a = model[a][0]
+        engine_b = model[b][0]
+        language_a = IBus.get_language_name(engine_a.get_language())
+        language_b = IBus.get_language_name(engine_b.get_language())
+        label_a = "%s - %s" % (language_a, engine_a.get_longname())
+        label_b = "%s - %s" % (language_b, engine_b.get_longname())
+        return cmp(label_a, label_b)
+
     def __selection_changed_cb(self, *args):
         self.notify("active-engine");
 
diff --git a/setup/setup.ui b/setup/setup.ui
index e56e917d1..204226350 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -777,7 +777,7 @@
                                   <object class="GtkButton" id="button_engine_up">
                                     <property name="label">gtk-go-up</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -795,7 +795,7 @@
                                   <object class="GtkButton" id="button_engine_down">
                                     <property name="label">gtk-go-down</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>

From 77189092184d00f4ae1838e422026da0d0d96ae2 Mon Sep 17 00:00:00 2001
From: "Eduardo Lima (Etrunko)" <eduardo.lima@intel.com>
Date: Tue, 23 Jul 2013 10:43:36 +0900
Subject: [PATCH 161/816] Remove reference to primary owner on ReleaseName

BUG=http://code.google.com/p/ibus/issues/detail?id=1636
TEST=src/tests/ibus-bus.c

Review URL: https://codereview.appspot.com/11004043
Patch from Eduardo Lima (Etrunko) <eduardo.lima@intel.com>.
---
 bus/dbusimpl.c       | 17 +++++++++++++-
 src/tests/ibus-bus.c | 54 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index ad69c8ed9..688502f15 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -1093,6 +1093,7 @@ bus_dbus_impl_release_name (BusDBusImpl           *dbus,
                             GDBusMethodInvocation *invocation)
 {
     const gchar *name= NULL;
+    BusNameService *service;
     g_variant_get (parameters, "(&s)", &name);
 
     if (name == NULL ||
@@ -1113,11 +1114,25 @@ bus_dbus_impl_release_name (BusDBusImpl           *dbus,
     }
 
     guint retval;
-    if (g_hash_table_lookup (dbus->names, name) == NULL) {
+    service = g_hash_table_lookup (dbus->names, name);
+    if (service == NULL) {
         retval = 2; /* DBUS_RELEASE_NAME_REPLY_NON_EXISTENT */
     }
     else {
+        /* "ReleaseName" method removes the name in connection->names
+         * and the connection owner.
+         * bus_dbus_impl_connection_destroy_cb() removes all
+         * connection->names and the connection owners.
+         * See also comments in bus_dbus_impl_connection_destroy_cb().
+         */
         if (bus_connection_remove_name (connection, name)) {
+            BusConnectionOwner *owner =
+                    bus_name_service_find_owner (service, connection);
+            bus_name_service_remove_owner (service, owner, dbus);
+            if (service->owners == NULL) {
+                g_hash_table_remove (dbus->names, service->name);
+            }
+            bus_connection_owner_free (owner);
             retval = 1; /* DBUS_RELEASE_NAME_REPLY_RELEASED */
         }
         else {
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 3492c43df..fddb19cdd 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -48,6 +48,16 @@ test_list_engines (void)
     g_list_free (engines);
 }
 
+static void
+name_owner_changed_cb (IBusBus  *bus,
+                       gchar    *name,
+                       gchar    *old,
+                       gchar    *new,
+                       gpointer  data)
+{
+    g_debug ("%s: bus=%s, old=%s, new=%s", G_STRFUNC, name, old, new);
+}
+
 static void call_next_async_function (void);
 
 static void
@@ -56,10 +66,34 @@ finish_request_name_async (GObject *source_object,
                            gpointer user_data)
 {
     GError *error = NULL;
-    guint id = ibus_bus_request_name_async_finish (bus,
-                                                   res,
-                                                   &error);
+    guint id = ibus_bus_request_name_async_finish (bus, res, &error);
+
     g_assert (id != 0);
+
+    g_debug ("request name returned %d: ", id);
+
+    switch (id) {
+    case IBUS_BUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
+        g_debug ("got ownership");
+        break;
+    case IBUS_BUS_REQUEST_NAME_REPLY_IN_QUEUE:
+        g_debug ("got queued");
+        break;
+    case IBUS_BUS_REQUEST_NAME_REPLY_EXISTS:
+        g_debug ("request already in queue");
+        break;
+    case IBUS_BUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
+        g_debug ("already owner");
+        break;
+    default:
+        g_assert_not_reached ();
+    }
+
+    if (error) {
+        g_warning ("Error %s: %s", G_STRFUNC, error->message);
+        g_error_free (error);
+    }
+
     g_debug ("ibus_bus_request_name_async_finish: OK");
     call_next_async_function ();
 }
@@ -67,9 +101,15 @@ finish_request_name_async (GObject *source_object,
 static void
 start_request_name_async (void)
 {
+    ibus_bus_set_watch_dbus_signal (bus, TRUE);
+    ibus_bus_set_watch_ibus_signal (bus, TRUE);
+
+    g_signal_connect (bus, "name-owner-changed",
+                      (GCallback) name_owner_changed_cb, NULL);
+
     ibus_bus_request_name_async (bus,
                                  "org.freedesktop.IBus.IBusBusTest",
-                                 0,
+                                 IBUS_BUS_NAME_FLAG_REPLACE_EXISTING,
                                  -1, /* timeout */
                                  NULL, /* cancellable */
                                  finish_request_name_async,
@@ -903,6 +943,12 @@ main (gint    argc,
     g_object_unref (bus);
     bus = ibus_bus_new (); // crosbug.com/17293
 
+    if (!ibus_bus_is_connected (bus)) {
+        g_warning ("Not connected to ibus-daemon");
+        g_object_unref (bus);
+        return -1;
+    }
+
     g_test_add_func ("/ibus/list-engines", test_list_engines);
     g_test_add_func ("/ibus/list-active-engines", test_list_active_engines);
     g_test_add_func ("/ibus/create-input-context-async",

From 583bfe6d59e9b5a8514bc250fcccb9cb793d8a02 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 25 Jul 2013 18:12:26 +0900
Subject: [PATCH 162/816] daemon: fix PropertiesChanged signal emission

This fixes a few problems of PropertiesChanged signal emission.
First, it should be sent only when the properties have changed.
Second, invalidated_properties should be set when the properties have
been reset, not on error.  Finally, the sender should be
"org.freedesktop.IBus" rather than "org.freedesktop.DBus".

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/11465045
---
 bus/ibusimpl.c | 106 ++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 59 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 4f8afe953..ce5313e60 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -161,6 +161,10 @@ static IBusEngineDesc
 static void     bus_ibus_impl_set_focused_context
                                         (BusIBusImpl        *ibus,
                                          BusInputContext    *context);
+static void     bus_ibus_impl_property_changed
+                                        (BusIBusImpl        *service,
+                                         const gchar        *property_name,
+                                         GVariant           *value);
 /* some callback functions */
 static void     _context_engine_changed_cb
                                         (BusInputContext    *context,
@@ -1577,6 +1581,8 @@ _ibus_set_preload_engines (BusIBusImpl     *ibus,
 
     g_ptr_array_free (array, FALSE);
 
+    bus_ibus_impl_property_changed (ibus, "PreloadEngines", value);
+
     return TRUE;
 }
 
@@ -1614,7 +1620,11 @@ _ibus_set_embed_preedit_text (BusIBusImpl     *ibus,
         *error = NULL;
     }
 
-    ibus->embed_preedit_text = g_variant_get_boolean (value);
+    gboolean embed_preedit_text = g_variant_get_boolean (value);
+    if (embed_preedit_text != ibus->embed_preedit_text) {
+        ibus->embed_preedit_text = embed_preedit_text;
+        bus_ibus_impl_property_changed (ibus, "EmbedPreeditText", value);
+    }
 
     return TRUE;
 }
@@ -1734,49 +1744,6 @@ bus_ibus_impl_service_get_property (IBusService     *service,
     return NULL;
 }
 
-static void
-_emit_properties_changed (BusIBusImpl     *service,
-                          GDBusConnection *connection,
-                          const gchar     *object_path,
-                          const gchar     *interface_name,
-                          const gchar     *property_name,
-                          GVariant        *value,
-                          gboolean         is_changed)
-{
-    GVariantBuilder *builder;
-    GVariantBuilder *invalidated_builder;
-    GError *error = NULL;
-
-    builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
-    invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
-
-    if (is_changed) {
-        g_variant_builder_add (builder, "{sv}", property_name, value);
-    } else {
-        g_variant_builder_add (invalidated_builder, "s", property_name);
-    }
-
-    g_dbus_connection_emit_signal (connection,
-                                   NULL,
-                                   object_path,
-                                   "org.freedesktop.DBus.Properties",
-                                   "PropertiesChanged",
-                                   g_variant_new ("(sa{sv}as)",
-                                                  interface_name,
-                                                  builder,
-                                                  invalidated_builder),
-                                   &error);
-
-    if (error) {
-        g_warning ("Failed to emit property %s in %s.%s: %s",
-                   property_name,
-                   "org.freedesktop.DBus.Properties",
-                   "PropertiesChanged",
-                   error->message);
-        g_error_free (error);
-    }
-}
-
 /**
  * bus_ibus_impl_service_set_property:
  *
@@ -1815,21 +1782,10 @@ bus_ibus_impl_service_set_property (IBusService     *service,
 
     for (i = 0; i < G_N_ELEMENTS (methods); i++) {
         if (g_strcmp0 (methods[i].method_name, property_name) == 0) {
-            gboolean retval = methods[i].method_callback (
-                    (BusIBusImpl *) service,
-                    connection,
-                    value,
-                    error);
-
-            _emit_properties_changed ((BusIBusImpl *) service,
-                                      connection,
-                                      object_path,
-                                      interface_name,
-                                      property_name,
-                                      value,
-                                      retval);
-
-            return retval;
+            return methods[i].method_callback ((BusIBusImpl *) service,
+                                               connection,
+                                               value,
+                                               error);
         }
     }
 
@@ -2046,6 +2002,38 @@ bus_ibus_impl_lookup_component_by_name (BusIBusImpl *ibus,
     }
 }
 
+/**
+ * bus_ibus_impl_property_changed
+ *
+ * Send a "PropertiesChanged" D-Bus signal for a property to buses
+ * (connections) that are listening to the signal.
+ */
+static void
+bus_ibus_impl_property_changed (BusIBusImpl *service,
+                                const gchar *property_name,
+                                GVariant    *value)
+{
+    GDBusMessage *message =
+        g_dbus_message_new_signal ("/org/freedesktop/IBus",
+                                   "org.freedesktop.DBus.Properties",
+                                   "PropertiesChanged");
+
+    /* set a non-zero serial to make libdbus happy */
+    g_dbus_message_set_serial (message, 1);
+    g_dbus_message_set_sender (message, "org.freedesktop.IBus");
+
+    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+    g_variant_builder_add (builder, "{sv}", property_name, value);
+    g_dbus_message_set_body (message,
+                             g_variant_new ("(sa{sv}as)",
+                                            "org.freedesktop.IBus",
+                                            builder,
+                                            NULL));
+
+    bus_dbus_impl_dispatch_message_by_rule (BUS_DEFAULT_DBUS, message, NULL);
+    g_object_unref (message);
+}
+
 /**
  * bus_ibus_impl_emit_signal:
  *

From bc2d0010ed29cb85e5507f2d91488bf1afab102c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 26 Jul 2013 10:00:46 +0900
Subject: [PATCH 163/816] Add Norwegian keyboard in engine/simple.xml.in

BUG=RH#987222

Review URL: https://codereview.appspot.com/11805043
---
 engine/simple.xml.in | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 68174d721..fbca5cecb 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -395,6 +395,29 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+		<engine>
+			<name>xkb:no::nor</name>
+			<language>nor</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>no</layout>
+			<longname>Norwegian</longname>
+			<description>Norwegian</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
+		<engine>
+			<name>xkb:no:dvorak:nor</name>
+			<language>nor</language>
+			<license>GPL</license>
+			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+			<layout>no</layout>
+			<layout_variant>dvorak</layout_variant>
+			<longname>Norwegian (Dvorak)</longname>
+			<description>Norwegian (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+			<rank>99</rank>
+		</engine>
 		<engine>
 			<name>xkb:pl::pol</name>
 			<language>pol</language>

From f16865829ff3dcc3fe835be1d40fd22322500d36 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 26 Jul 2013 17:18:24 +0900
Subject: [PATCH 164/816] Release 1.5.3

Review URL: https://codereview.appspot.com/11708043
---
 README            | 3 +--
 configure.ac      | 2 +-
 src/ibusfactory.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 01b870ea1..7df9cf718 100644
--- a/README
+++ b/README
@@ -18,8 +18,7 @@ ibus:
 It is ibus daemon.
 
 hotkeys:
-Ctrl + Space: Enable or Disable input method
-Ctrl + Shift: Change input method.
+Super + Space: Change input method.
 
 For more detail please refer to http://code.google.com/p/ibus/wiki/ReadMe .
 
diff --git a/configure.ac b/configure.ac
index 45c195a84..a18889683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [2])
+m4_define([ibus_micro_version], [3])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])
diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index 204fc1199..f35f7e624 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -290,7 +290,7 @@ ibus_factory_service_method_call (IBusService           *service,
             g_dbus_method_invocation_return_error (invocation,
                                                    G_DBUS_ERROR,
                                                    G_DBUS_ERROR_FAILED,
-                                                   "Can not fond engine %s",
+                                                   "Cannot find engine %s",
                                                    engine_name);
         }
         return;

From 3b013c9ee3e071a83351eb1bff59697b770f8b3a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 31 Jul 2013 09:59:26 +0900
Subject: [PATCH 165/816] Remove IBUS_IS_ENGINE_DESC for freed pointer in
 ibus-bus.c

BUG=http://code.google.com/p/ibus/issues/detail?id=1646
TEST=src/tests/ibus-bus.c

Review URL: https://codereview.appspot.com/12093043
---
 src/tests/ibus-bus.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index fddb19cdd..7fa1bc4a1 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -859,8 +859,6 @@ test_get_engines_by_names (void)
         g_assert_cmpstr (names[i], ==, ibus_engine_desc_get_name (*p));
         i++;
         g_object_unref (*p);
-        // The ref should be zero, *p is released.
-        g_assert (!IBUS_IS_ENGINE_DESC (*p));
     }
 
     // The last engine does not exist.

From 1f2a94e0519021131cef2e509cfa11a0c6c3a291 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 2 Aug 2013 10:33:21 +0200
Subject: [PATCH 166/816] tool: add "address" command to print D-Bus address

This would be helpful to debug with dbus-monitor.  Instead of:

  $ . .config/ibus/bus/*
  $ dbus-monitor --address $IBUS_ADDRESS ...

one can do:

  $ dbus-monitor --address $(ibus address) ...

This patch also adds help message to each sub-command.

BUG=

Review URL: https://codereview.appspot.com/11901044
---
 tools/ibus.1.in | 10 ++++++++--
 tools/main.vala | 38 ++++++++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index 80fcf41b8..ab99db482 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -76,8 +76,14 @@ Save the custom registry cache
 if
 .B \-\-file=FILE
 is given.
-IBUS_COMPONENT_PATH environment valuable is also available for
-the custom component directories, whose delimiter is ':'.
+
+By default, it reads the component XML files from the standard
+component directory (\fI/usr/share/ibus/component\fP), you can set
+\fIIBUS_COMPONENT_PATH\fP environment variable for custom component
+directories, separated by ':'.
+.TP
+\fBaddress\fR
+Show the D-Bus address of ibus-daemon.
 .TP
 \fBwatch\fR
 Under construction.
diff --git a/tools/main.vala b/tools/main.vala
index f3959af5b..4595e2128 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -270,6 +270,11 @@ int write_cache (string[] argv) {
             Posix.EXIT_SUCCESS : Posix.EXIT_FAILURE;
 }
 
+int print_address(string[] argv) {
+    print("%s\n", IBus.get_address());
+    return Posix.EXIT_SUCCESS;
+}
+
 int print_help(string[] argv) {
     print_usage(stdout);
     return Posix.EXIT_SUCCESS;
@@ -278,20 +283,22 @@ int print_help(string[] argv) {
 delegate int EntryFunc(string[] argv);
 
 struct CommandEntry {
-    string name;
-    EntryFunc entry;
+    unowned string name;
+    unowned string description;
+    unowned EntryFunc entry;
 }
 
 static const CommandEntry commands[]  = {
-    { "engine", get_set_engine },
-    { "exit", exit_daemon },
-    { "list-engine", list_engine },
-    { "watch", message_watch },
-    { "restart", restart_daemon },
-    { "version", print_version },
-    { "read-cache", read_cache },
-    { "write-cache", write_cache },
-    { "help", print_help }
+    { "engine", N_("Set or get engine"), get_set_engine },
+    { "exit", N_("Exit ibus-daemon"), exit_daemon },
+    { "list-engine", N_("Show available engines"), list_engine },
+    { "watch", N_("(Not implemented)"), message_watch },
+    { "restart", N_("Restart ibus-daemon"), restart_daemon },
+    { "version", N_("Show version"), print_version },
+    { "read-cache", N_("Show the content of registry cache"), read_cache },
+    { "write-cache", N_("Create registry cache"), write_cache },
+    { "address", N_("Print the D-Bus address of ibus-daemon"), print_address },
+    { "help", N_("Show this information"), print_help }
 };
 
 static string program_name;
@@ -300,14 +307,17 @@ void print_usage(FileStream stream) {
     stream.printf(_("Usage: %s COMMAND [OPTION...]\n\n"), program_name);
     stream.printf(_("Commands:\n"));
     for (int i = 0; i < commands.length; i++) {
-        stream.printf("  %s\n", commands[i].name);
+        stream.printf("  %-11s    %s\n",
+                      commands[i].name,
+                      GLib.dgettext(null, commands[i].description));
     }
 }
 
 public int main(string[] argv) {
     GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
-    GLib.Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
-    GLib.Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+    GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
+    GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
+    GLib.Intl.textdomain(Config.GETTEXT_PACKAGE);
 
     IBus.init();
 

From 1bdcf218eeda728391b5b4e33d536d2debfef1bc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 9 Aug 2013 13:48:17 +0900
Subject: [PATCH 167/816] Update source files with LGP 2.1 according to
 COPYING.

BUG=http://code.google.com/p/ibus/issues/detail?id=1424
TEST=rpmlint

Review URL: https://codereview.appspot.com/12526043
---
 Makefile.am                                 | 12 ++++++------
 bindings/Makefile.am                        | 12 ++++++------
 bindings/pygobject/Makefile.am              | 12 ++++++------
 bindings/pygobject/gi/__init__.py           | 12 ++++++------
 bindings/pygobject/gi/overrides/IBus.py     | 12 ++++++------
 bindings/pygobject/gi/overrides/__init__.py | 12 ++++++------
 bindings/pygobject/test-override-ibus.py    | 12 ++++++------
 bindings/vala/Makefile.am                   | 12 ++++++------
 bus/Makefile.am                             | 12 ++++++------
 bus/component.c                             | 10 +++++-----
 bus/component.h                             | 10 +++++-----
 bus/connection.c                            | 10 +++++-----
 bus/connection.h                            | 10 +++++-----
 bus/dbusimpl.c                              | 10 +++++-----
 bus/dbusimpl.h                              | 10 +++++-----
 bus/engineproxy.c                           | 10 +++++-----
 bus/engineproxy.h                           | 10 +++++-----
 bus/factoryproxy.c                          | 10 +++++-----
 bus/factoryproxy.h                          | 10 +++++-----
 bus/global.c                                | 10 +++++-----
 bus/global.h                                | 10 +++++-----
 bus/ibusimpl.c                              | 10 +++++-----
 bus/ibusimpl.h                              | 10 +++++-----
 bus/inputcontext.c                          | 10 +++++-----
 bus/inputcontext.h                          | 10 +++++-----
 bus/main.c                                  | 10 +++++-----
 bus/matchrule.c                             | 10 +++++-----
 bus/matchrule.h                             | 10 +++++-----
 bus/panelproxy.c                            | 10 +++++-----
 bus/panelproxy.h                            | 10 +++++-----
 bus/server.c                                | 10 +++++-----
 bus/server.h                                | 10 +++++-----
 bus/test-client.c                           | 10 +++++-----
 bus/test-client.h                           | 10 +++++-----
 bus/test-stress.c                           |  8 ++++----
 bus/types.h                                 | 10 +++++-----
 client/Makefile.am                          | 12 ++++++------
 client/gtk2/Makefile.am                     | 12 ++++++------
 client/gtk2/ibusim.c                        | 10 +++++-----
 client/gtk2/ibusimcontext.c                 | 10 +++++-----
 client/gtk2/ibusimcontext.h                 | 10 +++++-----
 client/gtk3/Makefile.am                     | 12 ++++++------
 client/x11/Makefile.am                      | 12 ++++++------
 client/x11/gdk-private.c                    | 16 ++++++++--------
 client/x11/gdk-private.h                    | 16 ++++++++--------
 client/x11/main.c                           | 16 ++++++++--------
 conf/Makefile.am                            | 12 ++++++------
 conf/dconf/Makefile.am                      | 12 ++++++------
 conf/dconf/config-private.h                 |  8 ++++----
 conf/dconf/config.c                         |  8 ++++----
 conf/dconf/main.c                           |  8 ++++----
 conf/gconf/Makefile.am                      | 12 ++++++------
 conf/memconf/Makefile.am                    | 12 ++++++------
 conf/memconf/config.c                       | 10 +++++-----
 conf/memconf/config.h                       | 10 +++++-----
 conf/memconf/main.c                         | 10 +++++-----
 configure.ac                                | 12 ++++++------
 data/Makefile.am                            | 12 ++++++------
 data/dconf/Makefile.am                      | 12 ++++++------
 data/icons/Makefile.am                      | 12 ++++++------
 data/keymaps/Makefile.am                    | 12 ++++++------
 docs/Makefile.am                            | 12 ++++++------
 docs/reference/Makefile.am                  | 12 ++++++------
 engine/Makefile.am                          | 12 ++++++------
 engine/main.vala                            | 12 ++++++------
 ibus/Makefile.am                            | 12 ++++++------
 ibus/__init__.py                            | 12 ++++++------
 ibus/_config.py.in                          | 12 ++++++------
 ibus/_gtk.py                                | 12 ++++++------
 ibus/application.py                         | 12 ++++++------
 ibus/attribute.py                           | 12 ++++++------
 ibus/bus.py                                 | 12 ++++++------
 ibus/common.py                              | 12 ++++++------
 ibus/component.py                           | 12 ++++++------
 ibus/config.py                              | 12 ++++++------
 ibus/engine.py                              | 12 ++++++------
 ibus/enginedesc.py                          | 12 ++++++------
 ibus/exception.py                           | 12 ++++++------
 ibus/factory.py                             | 12 ++++++------
 ibus/inputcontext.py                        | 12 ++++++------
 ibus/interface/Makefile.am                  | 12 ++++++------
 ibus/interface/__init__.py                  | 12 ++++++------
 ibus/interface/iconfig.py                   | 12 ++++++------
 ibus/interface/iengine.py                   | 12 ++++++------
 ibus/interface/ienginefactory.py            | 12 ++++++------
 ibus/interface/iibus.py                     | 12 ++++++------
 ibus/interface/iinputcontext.py             | 12 ++++++------
 ibus/interface/inotifications.py            | 12 ++++++------
 ibus/interface/ipanel.py                    | 12 ++++++------
 ibus/lang.py                                | 12 ++++++------
 ibus/lookuptable.py                         | 12 ++++++------
 ibus/modifier.py                            | 12 ++++++------
 ibus/notifications.py                       | 12 ++++++------
 ibus/object.py                              | 12 ++++++------
 ibus/observedpath.py                        | 12 ++++++------
 ibus/panel.py                               | 12 ++++++------
 ibus/property.py                            | 12 ++++++------
 ibus/serializable.py                        | 12 ++++++------
 ibus/text.py                                | 12 ++++++------
 ibus/utility.py                             | 12 ++++++------
 m4/Makefile.am                              | 12 ++++++------
 setup/Makefile.am                           | 12 ++++++------
 setup/engineabout.py                        | 12 ++++++------
 setup/enginecombobox.py                     | 12 ++++++------
 setup/enginetreeview.py                     | 12 ++++++------
 setup/ibus-setup.in                         | 12 ++++++------
 setup/icon.py                               | 12 ++++++------
 setup/keyboardshortcut.py                   | 12 ++++++------
 setup/main.py                               | 12 ++++++------
 src/Makefile.am                             | 12 ++++++------
 src/gtkimcontextsimpleseqs.h                |  4 +---
 src/ibus.h                                  | 10 +++++-----
 src/ibusattribute.c                         | 10 +++++-----
 src/ibusattribute.h                         | 10 +++++-----
 src/ibusattrlist.c                          | 10 +++++-----
 src/ibusattrlist.h                          | 10 +++++-----
 src/ibusbus.c                               | 10 +++++-----
 src/ibusbus.h                               | 10 +++++-----
 src/ibuscomponent.c                         | 10 +++++-----
 src/ibuscomponent.h                         | 10 +++++-----
 src/ibusconfig.c                            | 10 +++++-----
 src/ibusconfig.h                            | 10 +++++-----
 src/ibusconfigservice.c                     | 10 +++++-----
 src/ibusconfigservice.h                     | 10 +++++-----
 src/ibusdebug.h                             | 10 +++++-----
 src/ibusengine.c                            | 10 +++++-----
 src/ibusengine.h                            | 10 +++++-----
 src/ibusenginedesc.c                        | 10 +++++-----
 src/ibusenginedesc.h                        | 10 +++++-----
 src/ibusenginesimple.c                      | 20 ++++++++++++++++++++
 src/ibusenginesimple.h                      | 10 +++++-----
 src/ibuserror.c                             | 10 +++++-----
 src/ibuserror.h                             | 10 +++++-----
 src/ibusfactory.c                           | 10 +++++-----
 src/ibusfactory.h                           | 10 +++++-----
 src/ibushotkey.c                            | 10 +++++-----
 src/ibushotkey.h                            | 10 +++++-----
 src/ibusinputcontext.c                      | 10 +++++-----
 src/ibusinputcontext.h                      | 10 +++++-----
 src/ibusinternal.h                          | 10 +++++-----
 src/ibuskeymap.c                            | 10 +++++-----
 src/ibuskeymap.h                            | 10 +++++-----
 src/ibuskeynames.c                          |  4 +---
 src/ibuskeys.h                              | 10 +++++-----
 src/ibuskeysyms-compat.h                    | 10 +++++-----
 src/ibuskeysyms.h                           | 10 +++++-----
 src/ibuskeyuni.c                            |  4 +---
 src/ibuslookuptable.c                       | 10 +++++-----
 src/ibuslookuptable.h                       | 10 +++++-----
 src/ibusobject.c                            | 10 +++++-----
 src/ibusobject.h                            | 10 +++++-----
 src/ibusobservedpath.c                      | 10 +++++-----
 src/ibusobservedpath.h                      | 10 +++++-----
 src/ibuspanelservice.c                      | 10 +++++-----
 src/ibuspanelservice.h                      | 10 +++++-----
 src/ibusproperty.c                          | 10 +++++-----
 src/ibusproperty.h                          | 10 +++++-----
 src/ibusproplist.c                          | 10 +++++-----
 src/ibusproplist.h                          | 10 +++++-----
 src/ibusproxy.c                             | 10 +++++-----
 src/ibusproxy.h                             | 10 +++++-----
 src/ibusregistry.c                          | 10 +++++-----
 src/ibusregistry.h                          | 10 +++++-----
 src/ibusserializable.c                      | 10 +++++-----
 src/ibusserializable.h                      | 10 +++++-----
 src/ibusservice.c                           | 10 +++++-----
 src/ibusservice.h                           | 10 +++++-----
 src/ibusshare.c                             | 10 +++++-----
 src/ibusshare.h                             | 10 +++++-----
 src/ibustext.c                              | 10 +++++-----
 src/ibustext.h                              | 10 +++++-----
 src/ibustypes.h                             | 10 +++++-----
 src/ibusutil.c                              | 10 +++++-----
 src/ibusutil.h                              | 10 +++++-----
 src/ibusversion.h.in                        | 10 +++++-----
 src/ibusxml.c                               | 10 +++++-----
 src/ibusxml.h                               | 10 +++++-----
 src/tests/Makefile.am                       | 12 ++++++------
 src/tests/ibus-inputcontext-create.c        |  8 ++++----
 src/tests/ibus-inputcontext.c               |  8 ++++----
 tools/Makefile.am                           | 12 ++++++------
 tools/ibus.bash                             | 12 ++++++------
 tools/main.vala                             | 12 ++++++------
 ui/Makefile.am                              | 12 ++++++------
 ui/gtk2/Makefile.am                         | 12 ++++++------
 ui/gtk2/candidatepanel.py                   | 12 ++++++------
 ui/gtk2/engineabout.py                      | 12 ++++++------
 ui/gtk2/handle.py                           | 12 ++++++------
 ui/gtk2/i18n.py                             | 12 ++++++------
 ui/gtk2/ibus-ui-gtk.in                      | 12 ++++++------
 ui/gtk2/icon.py                             | 12 ++++++------
 ui/gtk2/languagebar.py                      | 12 ++++++------
 ui/gtk2/main.py                             | 12 ++++++------
 ui/gtk2/menu.py                             | 12 ++++++------
 ui/gtk2/notifications.py                    | 12 ++++++------
 ui/gtk2/panel.py                            | 12 ++++++------
 ui/gtk2/propitem.py                         | 12 ++++++------
 ui/gtk2/toolitem.py                         | 12 ++++++------
 ui/gtk3/Makefile.am                         | 12 ++++++------
 ui/gtk3/application.vala                    | 12 ++++++------
 ui/gtk3/candidatearea.vala                  | 12 ++++++------
 ui/gtk3/candidatepanel.vala                 | 12 ++++++------
 ui/gtk3/handle.vala                         | 12 ++++++------
 ui/gtk3/iconwidget.vala                     | 12 ++++++------
 ui/gtk3/panel.vala                          | 12 ++++++------
 ui/gtk3/pango.vala                          | 12 ++++++------
 ui/gtk3/property.vala                       | 12 ++++++------
 ui/gtk3/separator.vala                      | 12 ++++++------
 ui/gtk3/switcher.vala                       | 12 ++++++------
 util/IMdkit/Makefile.am                     | 12 ++++++------
 util/Makefile.am                            | 12 ++++++------
 211 files changed, 1164 insertions(+), 1150 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6d6e55174..54cdb0182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 868474d13..01766b466 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ENABLE_VAPIGEN
 VALA_DIR = vala
diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index d4389c360..fc232099a 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/bindings/pygobject/gi/__init__.py b/bindings/pygobject/gi/__init__.py
index 4730fc914..bb1f50a43 100644
--- a/bindings/pygobject/gi/__init__.py
+++ b/bindings/pygobject/gi/__init__.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
diff --git a/bindings/pygobject/gi/overrides/IBus.py b/bindings/pygobject/gi/overrides/IBus.py
index 51c849b4d..4f42e3eb2 100644
--- a/bindings/pygobject/gi/overrides/IBus.py
+++ b/bindings/pygobject/gi/overrides/IBus.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from gi.repository import GObject
 
diff --git a/bindings/pygobject/gi/overrides/__init__.py b/bindings/pygobject/gi/overrides/__init__.py
index 4730fc914..bb1f50a43 100644
--- a/bindings/pygobject/gi/overrides/__init__.py
+++ b/bindings/pygobject/gi/overrides/__init__.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
diff --git a/bindings/pygobject/test-override-ibus.py b/bindings/pygobject/test-override-ibus.py
index 5492268ef..087a6558f 100644
--- a/bindings/pygobject/test-override-ibus.py
+++ b/bindings/pygobject/test-override-ibus.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import unittest
 
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index be45e41a8..84aa1b475 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# 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 $(VAPIGEN_MAKEFILE)
 
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 2e06386c4..d058d4cc3 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/bus/component.c b/bus/component.c
index 868aa16c3..6d0bc0ae9 100644
--- a/bus/component.c
+++ b/bus/component.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "component.h"
 
diff --git a/bus/component.h b/bus/component.h
index e675eab21..0822484f8 100644
--- a/bus/component.h
+++ b/bus/component.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_COMPONENT_H_
 #define __BUS_COMPONENT_H_
diff --git a/bus/connection.c b/bus/connection.c
index 5273fcc16..559e9d918 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <unistd.h>
diff --git a/bus/connection.h b/bus/connection.h
index 2a34319f1..440faf1e6 100644
--- a/bus/connection.h
+++ b/bus/connection.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_CONNECTION_H_
 #define __BUS_CONNECTION_H_
diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 688502f15..b54ef817a 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "dbusimpl.h"
diff --git a/bus/dbusimpl.h b/bus/dbusimpl.h
index 13cdde676..56114e381 100644
--- a/bus/dbusimpl.h
+++ b/bus/dbusimpl.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_DBUS_IMPL_H_
 #define __BUS_DBUS_IMPL_H_
diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index b0c19c14a..200b89be9 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "engineproxy.h"
diff --git a/bus/engineproxy.h b/bus/engineproxy.h
index b05072409..8fe025dbd 100644
--- a/bus/engineproxy.h
+++ b/bus/engineproxy.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_ENGINE_PROXY_H_
 #define __BUS_ENGINE_PROXY_H_
diff --git a/bus/factoryproxy.c b/bus/factoryproxy.c
index 973424e8a..f92662da7 100644
--- a/bus/factoryproxy.c
+++ b/bus/factoryproxy.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "factoryproxy.h"
 
diff --git a/bus/factoryproxy.h b/bus/factoryproxy.h
index 504501901..50bf05c84 100644
--- a/bus/factoryproxy.h
+++ b/bus/factoryproxy.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_FACTORY_PROXY_H_
 #define __BUS_FACTORY_PROXY_H_
diff --git a/bus/global.c b/bus/global.c
index c9dd31b44..24677b5b1 100644
--- a/bus/global.c
+++ b/bus/global.c
@@ -8,17 +8,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "global.h"
diff --git a/bus/global.h b/bus/global.h
index db7e992fc..abaebbd81 100644
--- a/bus/global.h
+++ b/bus/global.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_GLOBAL_H_
 #define __BUS_GLOBAL_H_
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index ce5313e60..bd4e488fd 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusimpl.h"
diff --git a/bus/ibusimpl.h b/bus/ibusimpl.h
index 4263778c8..0bb18daf0 100644
--- a/bus/ibusimpl.h
+++ b/bus/ibusimpl.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_IBUS_IMPL_H_
 #define __BUS_IBUS_IMPL_H_
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 91f2a9d9d..d7ada6efa 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "inputcontext.h"
 
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index 43e04cd85..50f615f54 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_INPUT_CONTEXT_H_
 #define __BUS_INPUT_CONTEXT_H_
diff --git a/bus/main.c b/bus/main.c
index 34ae0c6c2..056826e46 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <config.h>
 #include <fcntl.h>
diff --git a/bus/matchrule.c b/bus/matchrule.c
index f79f9bf6c..4fb1d902e 100644
--- a/bus/matchrule.c
+++ b/bus/matchrule.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "matchrule.h"
diff --git a/bus/matchrule.h b/bus/matchrule.h
index 3ecc18855..1dd304cd6 100644
--- a/bus/matchrule.h
+++ b/bus/matchrule.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_MATCH_RULE_H_
 #define __BUS_MATCH_RULE_H_
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index abca0741e..8099e88a8 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "panelproxy.h"
 
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index 427e409f9..cc3183ea5 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_PANEL_PROXY_H_
 #define __BUS_PANEL_PROXY_H_
diff --git a/bus/server.c b/bus/server.c
index fe8ee2f89..a86e12e54 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "server.h"
 
diff --git a/bus/server.h b/bus/server.h
index e1cb3ecf6..346f6cdde 100644
--- a/bus/server.h
+++ b/bus/server.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_SERVER_H_
 #define __BUS_SERVER_H_
diff --git a/bus/test-client.c b/bus/test-client.c
index 6abc36736..ec6ab6359 100644
--- a/bus/test-client.c
+++ b/bus/test-client.c
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <ibus.h>
diff --git a/bus/test-client.h b/bus/test-client.h
index 6a059d17b..9887069f7 100644
--- a/bus/test-client.h
+++ b/bus/test-client.h
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_TEST_CLIENT_H_
diff --git a/bus/test-stress.c b/bus/test-stress.c
index e428f5eea..6393af5f9 100644
--- a/bus/test-stress.c
+++ b/bus/test-stress.c
@@ -6,7 +6,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -14,9 +14,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <stdlib.h>
 #include <time.h>
diff --git a/bus/types.h b/bus/types.h
index efb914f70..27e6d1fe1 100644
--- a/bus/types.h
+++ b/bus/types.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __BUS_TYPES_H_
 #define __BUS_TYPES_H_
diff --git a/client/Makefile.am b/client/Makefile.am
index 535610245..0074b9961 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ENABLE_GTK2
 GTK2 = gtk2
diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index e7c2883e0..e10635f40 100644
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/client/gtk2/ibusim.c b/client/gtk2/ibusim.c
index 13c738002..bfacd0f05 100644
--- a/client/gtk2/ibusim.c
+++ b/client/gtk2/ibusim.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <gtk/gtk.h>
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 3694dd46c..340a645de 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/client/gtk2/ibusimcontext.h b/client/gtk2/ibusimcontext.h
index 56cece40f..c73b3d538 100644
--- a/client/gtk2/ibusimcontext.h
+++ b/client/gtk2/ibusimcontext.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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_IM_CONTEXT_H_
 #define __IBUS_IM_CONTEXT_H_
diff --git a/client/gtk3/Makefile.am b/client/gtk3/Makefile.am
index e654980a4..aa4a06313 100644
--- a/client/gtk3/Makefile.am
+++ b/client/gtk3/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 91d97ddc5..9813ceb56 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 
 libIMdkit = $(top_builddir)/util/IMdkit/libIMdkit.la
diff --git a/client/x11/gdk-private.c b/client/x11/gdk-private.c
index 009a5b077..941b39f5e 100644
--- a/client/x11/gdk-private.c
+++ b/client/x11/gdk-private.c
@@ -5,20 +5,20 @@
  *
  * gdk-private.c: Copied some code from gtk2
  *
- * This tool is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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 of the License, or (at your option) any later version.
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "config.h"
diff --git a/client/x11/gdk-private.h b/client/x11/gdk-private.h
index e79e45c54..035df35f1 100644
--- a/client/x11/gdk-private.h
+++ b/client/x11/gdk-private.h
@@ -5,20 +5,20 @@
  *
  * gdk-private.h:
  *
- * This tool is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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 of the License, or (at your option) any later version.
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __GTK_PRIVATE_H_
 #define __GTK_PRIVATE_H_
diff --git a/client/x11/main.c b/client/x11/main.c
index 328c00dc4..c06186fbb 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -6,20 +6,20 @@
  *
  * main.c:
  *
- * This tool is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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 of the License, or (at your option) any later version.
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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
  */
 #define _GNU_SOURCE
 
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 54c73b7b8..efa864990 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ENABLE_GCONF
 GCONF_DIR = \
diff --git a/conf/dconf/Makefile.am b/conf/dconf/Makefile.am
index 48dd0ce0e..f95165d5a 100644
--- a/conf/dconf/Makefile.am
+++ b/conf/dconf/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/conf/dconf/config-private.h b/conf/dconf/config-private.h
index 9ba4fd53b..a7318f40a 100644
--- a/conf/dconf/config-private.h
+++ b/conf/dconf/config-private.h
@@ -7,7 +7,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -15,9 +15,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __CONFIG_DCONF_H__
 #define __CONFIG_DCONF_H__
diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index dcd8744a6..0dd317ae0 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -8,7 +8,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -16,9 +16,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <string.h>
diff --git a/conf/dconf/main.c b/conf/dconf/main.c
index 2d4faadf9..e68784247 100644
--- a/conf/dconf/main.c
+++ b/conf/dconf/main.c
@@ -7,7 +7,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -15,9 +15,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <ibus.h>
diff --git a/conf/gconf/Makefile.am b/conf/gconf/Makefile.am
index 40cde9006..017b35411 100644
--- a/conf/gconf/Makefile.am
+++ b/conf/gconf/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index ebaf76e43..7c3bd659c 100644
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/conf/memconf/config.c b/conf/memconf/config.c
index 34310c231..cb1ef7916 100644
--- a/conf/memconf/config.c
+++ b/conf/memconf/config.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <string.h>
 #include <ibus.h>
diff --git a/conf/memconf/config.h b/conf/memconf/config.h
index 2b745d4f4..00ca196bc 100644
--- a/conf/memconf/config.h
+++ b/conf/memconf/config.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 __CONFIG_MEMCONF_H__
 #define __CONFIG_MEMCONF_H__
diff --git a/conf/memconf/main.c b/conf/memconf/main.c
index 51dfd7f1d..0eec41d49 100644
--- a/conf/memconf/main.c
+++ b/conf/memconf/main.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <ibus.h>
 #include <stdlib.h>
diff --git a/configure.ac b/configure.ac
index a18889683..3e9996def 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 
 # If ibus_released is 0, append datestamp to the version number.
diff --git a/data/Makefile.am b/data/Makefile.am
index 99be41c95..e41c9a260 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 SUBDIRS = \
 	icons \
diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index b99380f44..d27e87c38 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -9,17 +9,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 gsettings_schemas_in_files = org.freedesktop.ibus.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c1862a191..0411fdca2 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 icons_DATA = \
 	$(NULL)
diff --git a/data/keymaps/Makefile.am b/data/keymaps/Makefile.am
index 61d864458..81219d50f 100644
--- a/data/keymaps/Makefile.am
+++ b/data/keymaps/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 # keymaps = \
 # 	ar \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 962d37dd8..ec6bbc2ac 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 SUBDIRS = 		\
 	reference 	\
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 050c78d2f..1006511a3 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 SUBDIRS = 	\
 	ibus 	\
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 7d65558ad..0adf286ff 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
diff --git a/engine/main.vala b/engine/main.vala
index da6d5ee50..9c60f622d 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * 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;
diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index c71df1b76..f120de13c 100644
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 SUBDIRS = \
 	interface \
 	$(NULL)
diff --git a/ibus/__init__.py b/ibus/__init__.py
index 933bba7e3..1c16f3022 100644
--- a/ibus/__init__.py
+++ b/ibus/__init__.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import warnings
 warnings.warn("The ibus module is deprecated; "
diff --git a/ibus/_config.py.in b/ibus/_config.py.in
index c9d11bba2..21c9cafc8 100644
--- a/ibus/_config.py.in
+++ b/ibus/_config.py.in
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
     "get_version",
diff --git a/ibus/_gtk.py b/ibus/_gtk.py
index b9eea1f05..5b8fb1dd7 100644
--- a/ibus/_gtk.py
+++ b/ibus/_gtk.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "PangoAttrList",
diff --git a/ibus/application.py b/ibus/application.py
index e21f17e54..c088f1513 100644
--- a/ibus/application.py
+++ b/ibus/application.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import ibus
 import dbus
diff --git a/ibus/attribute.py b/ibus/attribute.py
index 127048817..750e3fd54 100644
--- a/ibus/attribute.py
+++ b/ibus/attribute.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "ATTR_TYPE_UNDERLINE",
diff --git a/ibus/bus.py b/ibus/bus.py
index 179fd4eae..c55586d19 100644
--- a/ibus/bus.py
+++ b/ibus/bus.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "Bus",
diff --git a/ibus/common.py b/ibus/common.py
index ec4a4d845..41759bf6b 100644
--- a/ibus/common.py
+++ b/ibus/common.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "IBUS_IFACE_IBUS",
diff --git a/ibus/component.py b/ibus/component.py
index 7255ee1c2..7c1d7d2d3 100644
--- a/ibus/component.py
+++ b/ibus/component.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "Component",
diff --git a/ibus/config.py b/ibus/config.py
index 7a0557f44..92936ae00 100644
--- a/ibus/config.py
+++ b/ibus/config.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "ConfigBase",
diff --git a/ibus/engine.py b/ibus/engine.py
index d6282063e..7442745f0 100644
--- a/ibus/engine.py
+++ b/ibus/engine.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "EngineBase",
diff --git a/ibus/enginedesc.py b/ibus/enginedesc.py
index ca306f7fa..70e207721 100644
--- a/ibus/enginedesc.py
+++ b/ibus/enginedesc.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "EngineDesc",
diff --git a/ibus/exception.py b/ibus/exception.py
index f5ba1310a..b41569d9d 100644
--- a/ibus/exception.py
+++ b/ibus/exception.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IBusException", )
 
diff --git a/ibus/factory.py b/ibus/factory.py
index b9be700d4..c13745d78 100644
--- a/ibus/factory.py
+++ b/ibus/factory.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "EngineFactoryBase",
diff --git a/ibus/inputcontext.py b/ibus/inputcontext.py
index a2989091a..c93a9149f 100644
--- a/ibus/inputcontext.py
+++ b/ibus/inputcontext.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "InputContext",
diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
index 2d9ae4226..6ce510b5e 100644
--- a/ibus/interface/Makefile.am
+++ b/ibus/interface/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 ibus_interface_PYTHON = \
 	iconfig.py \
diff --git a/ibus/interface/__init__.py b/ibus/interface/__init__.py
index 7ee0dd829..8fb35a685 100644
--- a/ibus/interface/__init__.py
+++ b/ibus/interface/__init__.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from iibus import *
 from iinputcontext import *
diff --git a/ibus/interface/iconfig.py b/ibus/interface/iconfig.py
index 5f3f0404f..425b61a80 100644
--- a/ibus/interface/iconfig.py
+++ b/ibus/interface/iconfig.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IConfig", )
 
diff --git a/ibus/interface/iengine.py b/ibus/interface/iengine.py
index d04e70a2c..67a2012d1 100644
--- a/ibus/interface/iengine.py
+++ b/ibus/interface/iengine.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IEngine", )
 
diff --git a/ibus/interface/ienginefactory.py b/ibus/interface/ienginefactory.py
index f16fe4355..37c9e9b16 100644
--- a/ibus/interface/ienginefactory.py
+++ b/ibus/interface/ienginefactory.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IEngineFactory", )
 
diff --git a/ibus/interface/iibus.py b/ibus/interface/iibus.py
index 99874c415..b5677ba92 100644
--- a/ibus/interface/iibus.py
+++ b/ibus/interface/iibus.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IIBus", )
 
diff --git a/ibus/interface/iinputcontext.py b/ibus/interface/iinputcontext.py
index 62047919f..da5838e19 100644
--- a/ibus/interface/iinputcontext.py
+++ b/ibus/interface/iinputcontext.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IInputContext", )
 
diff --git a/ibus/interface/inotifications.py b/ibus/interface/inotifications.py
index a94c54fcc..6cbb6d273 100644
--- a/ibus/interface/inotifications.py
+++ b/ibus/interface/inotifications.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("INotifications", )
 
diff --git a/ibus/interface/ipanel.py b/ibus/interface/ipanel.py
index 26b6b03d9..c400eefb0 100644
--- a/ibus/interface/ipanel.py
+++ b/ibus/interface/ipanel.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = ("IPanel", )
 
diff --git a/ibus/lang.py b/ibus/lang.py
index 705ef70f7..3b3f552f9 100644
--- a/ibus/lang.py
+++ b/ibus/lang.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "get_language_name",
diff --git a/ibus/lookuptable.py b/ibus/lookuptable.py
index 5eaa35838..3caa31892 100644
--- a/ibus/lookuptable.py
+++ b/ibus/lookuptable.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "LookupTable",
diff --git a/ibus/modifier.py b/ibus/modifier.py
index 844933ccf..648600e7d 100644
--- a/ibus/modifier.py
+++ b/ibus/modifier.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 SHIFT_MASK = 1 << 0
 LOCK_MASK = 1 << 1
diff --git a/ibus/notifications.py b/ibus/notifications.py
index f55c3ceae..319ca6ff2 100644
--- a/ibus/notifications.py
+++ b/ibus/notifications.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "NotificationsBase",
diff --git a/ibus/object.py b/ibus/object.py
index a7dd8b4f4..6f5e312c7 100644
--- a/ibus/object.py
+++ b/ibus/object.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "Object",
diff --git a/ibus/observedpath.py b/ibus/observedpath.py
index 1301f597d..1f4007db0 100644
--- a/ibus/observedpath.py
+++ b/ibus/observedpath.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "ObservedPath",
diff --git a/ibus/panel.py b/ibus/panel.py
index 204219f4e..0cc63efb1 100644
--- a/ibus/panel.py
+++ b/ibus/panel.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "PanelBase",
diff --git a/ibus/property.py b/ibus/property.py
index a4b18657c..733803258 100644
--- a/ibus/property.py
+++ b/ibus/property.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "PROP_TYPE_NORMAL",
diff --git a/ibus/serializable.py b/ibus/serializable.py
index c928356b9..105372d1b 100644
--- a/ibus/serializable.py
+++ b/ibus/serializable.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "Serializable",
diff --git a/ibus/text.py b/ibus/text.py
index a99520a40..a68c930a8 100644
--- a/ibus/text.py
+++ b/ibus/text.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "Text",
diff --git a/ibus/utility.py b/ibus/utility.py
index c644821a5..eff094a6c 100644
--- a/ibus/utility.py
+++ b/ibus/utility.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
         "unichar_half_to_full",
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 97b4a51e5..57e008079 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 EXTRA_DIST = \
     as-version.m4 \
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 5274f1946..9d0843c02 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 ibussetup_PYTHON = \
 	main.py \
diff --git a/setup/engineabout.py b/setup/engineabout.py
index a020f8c32..897ca69bb 100644
--- a/setup/engineabout.py
+++ b/setup/engineabout.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from gi.repository import IBus
 from gi.repository import Gdk
diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index 0f8a6ae08..b45ad5622 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import locale
 
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 1a18cc78e..f8ee0920e 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 from gi.repository import GLib
 from gi.repository import GObject
diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
index f3c37309b..e0ed9ff5a 100644
--- a/setup/ibus-setup.in
+++ b/setup/ibus-setup.in
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff --git a/setup/icon.py b/setup/icon.py
index a4a29195c..31b7df885 100644
--- a/setup/icon.py
+++ b/setup/icon.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
     "load_icon"
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 2e8ca5431..1a885250a 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 __all__ = (
     "KeyboardShortcutSelection",
diff --git a/setup/main.py b/setup/main.py
index 9703d5e4d..e3767dc52 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import os
 import signal
diff --git a/src/Makefile.am b/src/Makefile.am
index 74b6838d8..811d09707 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/src/gtkimcontextsimpleseqs.h b/src/gtkimcontextsimpleseqs.h
index fab1c6a96..df09defed 100644
--- a/src/gtkimcontextsimpleseqs.h
+++ b/src/gtkimcontextsimpleseqs.h
@@ -12,9 +12,7 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/ibus.h b/src/ibus.h
index e27f845c1..d8e226ed4 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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_H_
diff --git a/src/ibusattribute.c b/src/ibusattribute.c
index aac14d48a..52af32e27 100644
--- a/src/ibusattribute.c
+++ b/src/ibusattribute.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusattribute.h"
 
diff --git a/src/ibusattribute.h b/src/ibusattribute.h
index 7a7fcb64d..d8304494f 100644
--- a/src/ibusattribute.h
+++ b/src/ibusattribute.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusattrlist.c b/src/ibusattrlist.c
index b90077c01..1c991641f 100644
--- a/src/ibusattrlist.c
+++ b/src/ibusattrlist.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusattrlist.h"
 
diff --git a/src/ibusattrlist.h b/src/ibusattrlist.h
index bbdf4bd15..5ed3b27c4 100644
--- a/src/ibusattrlist.h
+++ b/src/ibusattrlist.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusbus.c b/src/ibusbus.c
index fc401f14b..92fdeabe1 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusbus.h"
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 4e25a9a31..675ede9a6 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index d3cc20f03..67b9818a0 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <glib/gstdio.h>
 #include "ibuscomponent.h"
diff --git a/src/ibuscomponent.h b/src/ibuscomponent.h
index 3f4b3b372..3926891e3 100644
--- a/src/ibuscomponent.h
+++ b/src/ibuscomponent.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusconfig.c b/src/ibusconfig.c
index 1f015b004..4e76cfa4b 100644
--- a/src/ibusconfig.c
+++ b/src/ibusconfig.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusinternal.h"
 #include "ibusmarshalers.h"
diff --git a/src/ibusconfig.h b/src/ibusconfig.h
index 2bdd23184..0bcdc1a47 100644
--- a/src/ibusconfig.h
+++ b/src/ibusconfig.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusconfigservice.c b/src/ibusconfigservice.c
index 4c21da54c..e1777f9d6 100644
--- a/src/ibusconfigservice.c
+++ b/src/ibusconfigservice.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusshare.h"
 #include "ibusconfigservice.h"
diff --git a/src/ibusconfigservice.h b/src/ibusconfigservice.h
index 23dcfc6d9..fb4921ef8 100644
--- a/src/ibusconfigservice.h
+++ b/src/ibusconfigservice.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusdebug.h b/src/ibusdebug.h
index 294164e95..692ae7e26 100644
--- a/src/ibusdebug.h
+++ b/src/ibusdebug.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusengine.c b/src/ibusengine.c
index 1c22d6a5c..d1bbed70c 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusengine.h"
 #include <stdarg.h>
diff --git a/src/ibusengine.h b/src/ibusengine.h
index d7696c42b..bae63d5cf 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index 2923462c0..ca4885528 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <stdlib.h>
 #include "ibusenginedesc.h"
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index 2d761f24c..f37ae0a46 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 5bacd5e81..84004e554 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -1,5 +1,25 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 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
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 0a7b55fce..413843063 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuserror.c b/src/ibuserror.c
index c50c164ae..c6e53a1f3 100644
--- a/src/ibuserror.c
+++ b/src/ibuserror.c
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibuserror.h"
diff --git a/src/ibuserror.h b/src/ibuserror.h
index 75c64b908..c02b4403f 100644
--- a/src/ibuserror.h
+++ b/src/ibuserror.h
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index f35f7e624..2903d7e9a 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusfactory.h"
 #include "ibusengine.h"
diff --git a/src/ibusfactory.h b/src/ibusfactory.h
index dd683d078..1357e17c0 100644
--- a/src/ibusfactory.h
+++ b/src/ibusfactory.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibushotkey.c b/src/ibushotkey.c
index e39456a29..0cdfa78b4 100644
--- a/src/ibushotkey.c
+++ b/src/ibushotkey.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibushotkey.h"
 #include "ibusmarshalers.h"
diff --git a/src/ibushotkey.h b/src/ibushotkey.h
index 65cdc5b57..7e6f8ed7d 100644
--- a/src/ibushotkey.h
+++ b/src/ibushotkey.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index fa8301b0a..ac7fffa22 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusinputcontext.h"
 #include <gio/gio.h>
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index 2f8869b53..b87a7dcca 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusinternal.h b/src/ibusinternal.h
index c1ebf6c52..1135d8f8d 100644
--- a/src/ibusinternal.h
+++ b/src/ibusinternal.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
index e6d454770..79550332d 100644
--- a/src/ibuskeymap.c
+++ b/src/ibuskeymap.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <errno.h>
 #include <string.h>
diff --git a/src/ibuskeymap.h b/src/ibuskeymap.h
index 9221babbb..a20c0976e 100644
--- a/src/ibuskeymap.h
+++ b/src/ibuskeymap.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuskeynames.c b/src/ibuskeynames.c
index 39ec4275b..2935bcb50 100644
--- a/src/ibuskeynames.c
+++ b/src/ibuskeynames.c
@@ -14,9 +14,7 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/ibuskeys.h b/src/ibuskeys.h
index e728c227d..6acb0d689 100644
--- a/src/ibuskeys.h
+++ b/src/ibuskeys.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuskeysyms-compat.h b/src/ibuskeysyms-compat.h
index c131ed13d..993b26381 100644
--- a/src/ibuskeysyms-compat.h
+++ b/src/ibuskeysyms-compat.h
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuskeysyms.h b/src/ibuskeysyms.h
index ff46414a1..cf55f0cfa 100644
--- a/src/ibuskeysyms.h
+++ b/src/ibuskeysyms.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuskeyuni.c b/src/ibuskeyuni.c
index ec0bcebf9..0ac400a8c 100644
--- a/src/ibuskeyuni.c
+++ b/src/ibuskeyuni.c
@@ -12,9 +12,7 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
index 9782f39c4..48f3a94a4 100644
--- a/src/ibuslookuptable.c
+++ b/src/ibuslookuptable.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibuslookuptable.h"
 
diff --git a/src/ibuslookuptable.h b/src/ibuslookuptable.h
index 53d08d3e3..07cc6050b 100644
--- a/src/ibuslookuptable.h
+++ b/src/ibuslookuptable.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusobject.c b/src/ibusobject.c
index 12a4fb009..930311e22 100644
--- a/src/ibusobject.c
+++ b/src/ibusobject.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusobject.h"
diff --git a/src/ibusobject.h b/src/ibusobject.h
index 790adf657..0e01c9bdc 100644
--- a/src/ibusobject.h
+++ b/src/ibusobject.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index a63ee8d7e..dcbfa8643 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <glib/gstdio.h>
 #include <stdlib.h>
diff --git a/src/ibusobservedpath.h b/src/ibusobservedpath.h
index 1aefa5061..fac4fbd17 100644
--- a/src/ibusobservedpath.h
+++ b/src/ibusobservedpath.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index f02739077..ac9c7c756 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusshare.h"
 #include "ibuspanelservice.h"
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index a47d887b7..941df07ef 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index a849319d7..3abd5e7a0 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusproperty.h"
 #include "ibusproplist.h"
diff --git a/src/ibusproperty.h b/src/ibusproperty.h
index 59b228da3..0dee88040 100644
--- a/src/ibusproperty.h
+++ b/src/ibusproperty.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusproplist.c b/src/ibusproplist.c
index 7eaeca1a5..535aad99b 100644
--- a/src/ibusproplist.c
+++ b/src/ibusproplist.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusproplist.h"
 
diff --git a/src/ibusproplist.h b/src/ibusproplist.h
index 91c1284c2..60276b021 100644
--- a/src/ibusproplist.h
+++ b/src/ibusproplist.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusproxy.c b/src/ibusproxy.c
index 40e8d4b2e..c8a2c1f9f 100644
--- a/src/ibusproxy.c
+++ b/src/ibusproxy.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusproxy.h"
diff --git a/src/ibusproxy.h b/src/ibusproxy.h
index 758479234..f050e8867 100644
--- a/src/ibusproxy.h
+++ b/src/ibusproxy.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index c76fae791..2830a0870 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -8,17 +8,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <gio/gio.h>
 #include <glib/gstdio.h>
diff --git a/src/ibusregistry.h b/src/ibusregistry.h
index 336944799..9522f1a86 100644
--- a/src/ibusregistry.h
+++ b/src/ibusregistry.h
@@ -8,17 +8,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusserializable.c b/src/ibusserializable.c
index d30164b84..d7f867f41 100644
--- a/src/ibusserializable.c
+++ b/src/ibusserializable.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusinternal.h"
 #include "ibusserializable.h"
diff --git a/src/ibusserializable.h b/src/ibusserializable.h
index c7bcd6c5c..8b4cf85e9 100644
--- a/src/ibusserializable.h
+++ b/src/ibusserializable.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusservice.c b/src/ibusservice.c
index e94feda57..8f77af95c 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusservice.h"
 #include "ibusinternal.h"
diff --git a/src/ibusservice.h b/src/ibusservice.h
index 94f9bb7a6..c19b22897 100644
--- a/src/ibusservice.h
+++ b/src/ibusservice.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusshare.c b/src/ibusshare.c
index 20a144fcb..d36232d08 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibusshare.h"
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 5fc135db4..2e936d612 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibustext.c b/src/ibustext.c
index e5218d048..a5e3c43b4 100644
--- a/src/ibustext.c
+++ b/src/ibustext.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 "ibustext.h"
 
diff --git a/src/ibustext.h b/src/ibustext.h
index cff913146..be130d97a 100644
--- a/src/ibustext.h
+++ b/src/ibustext.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibustypes.h b/src/ibustypes.h
index 737b3e2d5..d2abeab73 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 1b1a83312..215cb3f2e 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -8,17 +8,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/ibusutil.h b/src/ibusutil.h
index 7cf199582..ad8b8890f 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -8,17 +8,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/ibusversion.h.in b/src/ibusversion.h.in
index ac94143a2..3caa2ec36 100644
--- a/src/ibusversion.h.in
+++ b/src/ibusversion.h.in
@@ -6,17 +6,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 /**
  * SECTION: ibusversion
diff --git a/src/ibusxml.c b/src/ibusxml.c
index 89d009ebe..fb444476b 100644
--- a/src/ibusxml.c
+++ b/src/ibusxml.c
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <stdio.h>
 #include <string.h>
diff --git a/src/ibusxml.h b/src/ibusxml.h
index ff5e65e03..0c558d3e2 100644
--- a/src/ibusxml.h
+++ b/src/ibusxml.h
@@ -7,17 +7,17 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
+ * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 #if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index b5b2da3ee..4a764a1a6 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/src/tests/ibus-inputcontext-create.c b/src/tests/ibus-inputcontext-create.c
index aca653a5d..000f53f53 100644
--- a/src/tests/ibus-inputcontext-create.c
+++ b/src/tests/ibus-inputcontext-create.c
@@ -6,7 +6,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -14,9 +14,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <string.h>
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index fb6fabb26..fab183aa9 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -6,7 +6,7 @@
  * 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 of the License, or (at your option) any later version.
+ * 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
@@ -14,9 +14,9 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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 <string.h>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 264e37082..b3cd00cdb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/tools/ibus.bash b/tools/ibus.bash
index 18e9d6c6f..da68ef777 100644
--- a/tools/ibus.bash
+++ b/tools/ibus.bash
@@ -9,17 +9,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
 if [[ -z ${ZSH_VERSION:+set} ]]; then
diff --git a/tools/main.vala b/tools/main.vala
index 4595e2128..b6a5e18f4 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 bool name_only = false;
diff --git a/ui/Makefile.am b/ui/Makefile.am
index b3a81e133..4987a3ff2 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ENABLE_GTK3
 GTK3_UI = gtk3
diff --git a/ui/gtk2/Makefile.am b/ui/gtk2/Makefile.am
index 8e6f39195..7824bfe6e 100644
--- a/ui/gtk2/Makefile.am
+++ b/ui/gtk2/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 ui_gtk_PYTHON = \
 	candidatepanel.py \
diff --git a/ui/gtk2/candidatepanel.py b/ui/gtk2/candidatepanel.py
index 159b2bcf4..374f96493 100644
--- a/ui/gtk2/candidatepanel.py
+++ b/ui/gtk2/candidatepanel.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import operator
 import gtk
diff --git a/ui/gtk2/engineabout.py b/ui/gtk2/engineabout.py
index a34e93049..0b6cd2dbe 100644
--- a/ui/gtk2/engineabout.py
+++ b/ui/gtk2/engineabout.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 from gtk import gdk
diff --git a/ui/gtk2/handle.py b/ui/gtk2/handle.py
index 1e1db99d8..bb5494927 100644
--- a/ui/gtk2/handle.py
+++ b/ui/gtk2/handle.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk2/i18n.py b/ui/gtk2/i18n.py
index 41669b327..5a73eeed8 100644
--- a/ui/gtk2/i18n.py
+++ b/ui/gtk2/i18n.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import locale
 import gettext
diff --git a/ui/gtk2/ibus-ui-gtk.in b/ui/gtk2/ibus-ui-gtk.in
index d73e76d45..5e60b5e4d 100644
--- a/ui/gtk2/ibus-ui-gtk.in
+++ b/ui/gtk2/ibus-ui-gtk.in
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff --git a/ui/gtk2/icon.py b/ui/gtk2/icon.py
index 5b5f97ff1..f58d9b7ce 100644
--- a/ui/gtk2/icon.py
+++ b/ui/gtk2/icon.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk2/languagebar.py b/ui/gtk2/languagebar.py
index c3701a6e3..54a843197 100644
--- a/ui/gtk2/languagebar.py
+++ b/ui/gtk2/languagebar.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk2/main.py b/ui/gtk2/main.py
index cadcc96ce..e142670d4 100644
--- a/ui/gtk2/main.py
+++ b/ui/gtk2/main.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 # try Cython
 # try:
diff --git a/ui/gtk2/menu.py b/ui/gtk2/menu.py
index 53fa39fd3..c229fa056 100644
--- a/ui/gtk2/menu.py
+++ b/ui/gtk2/menu.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gobject
diff --git a/ui/gtk2/notifications.py b/ui/gtk2/notifications.py
index 979149e46..887acd07b 100644
--- a/ui/gtk2/notifications.py
+++ b/ui/gtk2/notifications.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk2/panel.py b/ui/gtk2/panel.py
index 42dde5d0f..d00c5a5e0 100644
--- a/ui/gtk2/panel.py
+++ b/ui/gtk2/panel.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk2/propitem.py b/ui/gtk2/propitem.py
index 3bd1e92e8..97c87ac5c 100644
--- a/ui/gtk2/propitem.py
+++ b/ui/gtk2/propitem.py
@@ -8,17 +8,17 @@
 # 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 of the License, or(at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 class PropItem:
     def __init__(self, prop):
diff --git a/ui/gtk2/toolitem.py b/ui/gtk2/toolitem.py
index 4f4f97d42..743e7f0b9 100644
--- a/ui/gtk2/toolitem.py
+++ b/ui/gtk2/toolitem.py
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 import gtk
 import gtk.gdk as gdk
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 97c915c62..547ef5361 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 NULL =
 
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index fd9ade741..71309e00b 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class Application {
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 12ab42aa2..066b26ccc 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class CandidateArea : Gtk.Box {
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index b061e954a..e9d3a3441 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 public class CandidatePanel : Gtk.HBox{
diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index 08e6ef30e..b9c3bbc06 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class Handle : Gtk.EventBox {
diff --git a/ui/gtk3/iconwidget.vala b/ui/gtk3/iconwidget.vala
index e4ff9c206..fbb9e3cb7 100644
--- a/ui/gtk3/iconwidget.vala
+++ b/ui/gtk3/iconwidget.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class IconWidget: Gtk.Image {
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 39aca08b5..3821b3c80 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class Panel : IBus.PanelService {
diff --git a/ui/gtk3/pango.vala b/ui/gtk3/pango.vala
index cfa2c6713..bbcfcc785 100644
--- a/ui/gtk3/pango.vala
+++ b/ui/gtk3/pango.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 Pango.AttrList get_pango_attr_list_from_ibus_text(IBus.Text text) {
diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index 1dabccdac..eb0a7714a 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 public class PropertyManager {
diff --git a/ui/gtk3/separator.vala b/ui/gtk3/separator.vala
index 0e1dbc884..a8b23b8ea 100644
--- a/ui/gtk3/separator.vala
+++ b/ui/gtk3/separator.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class HSeparator : Gtk.HSeparator {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 4a027432f..bc57b086e 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -7,17 +7,17 @@
  * 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 of the License, or(at your option) any later version.
+ * 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.
+ * 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA  02111-1307  USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
  */
 
 class Switcher : Gtk.Window {
diff --git a/util/IMdkit/Makefile.am b/util/IMdkit/Makefile.am
index f07f5aaef..e3946d7d2 100644
--- a/util/IMdkit/Makefile.am
+++ b/util/IMdkit/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 noinst_LTLIBRARIES = libIMdkit.la
 
diff --git a/util/Makefile.am b/util/Makefile.am
index b41bc9105..fcb79770c 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -8,17 +8,17 @@
 # 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 of the License, or (at your option) any later version.
+# 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.
+# 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
 
 if ENABLE_XIM
 SUBDIRS = \

From 5136dbc59fd3048445826c534fd6b5f3f8ca6b1e Mon Sep 17 00:00:00 2001
From: Jan Arne Petersen <jan.petersen@kdab.com>
Date: Tue, 13 Aug 2013 10:30:52 +0200
Subject: [PATCH 168/816] wayland: Add wayland client

This patch adds a new client which supports the Wayland input method
protocol.  Note that the support is disabled by default until the
input method protocol becomes official in the Wayland upstream.
Supply --enable-wayland to configure to try it.  Also, you will need
to set the executable path of ibus-wayland under the "input-method"
section of weston.ini, like this:

 [input-method]
 path=.../libexec/ibus-wayland

BUG=Issue#1617

Review URL: https://codereview.appspot.com/11320043
Patch from Jan Arne Petersen <jan.petersen@kdab.com>.
---
 client/Makefile.am                            |   5 +
 client/wayland/Makefile.am                    |  62 ++
 client/wayland/README                         |  17 +
 client/wayland/input-method-client-protocol.h | 419 ++++++++++
 client/wayland/input-method-protocol.c        | 115 +++
 client/wayland/main.c                         | 755 ++++++++++++++++++
 configure.ac                                  |  21 +
 7 files changed, 1394 insertions(+)
 create mode 100644 client/wayland/Makefile.am
 create mode 100644 client/wayland/README
 create mode 100644 client/wayland/input-method-client-protocol.h
 create mode 100644 client/wayland/input-method-protocol.c
 create mode 100644 client/wayland/main.c

diff --git a/client/Makefile.am b/client/Makefile.am
index 0074b9961..546ca132f 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -32,10 +32,15 @@ if ENABLE_XIM
 X11 = x11
 endif
 
+if ENABLE_WAYLAND
+WAYLAND = wayland
+endif
+
 SUBDIRS = \
 	$(GTK2) \
 	$(GTK3) \
 	$(X11) \
+	$(WAYLAND) \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/client/wayland/Makefile.am b/client/wayland/Makefile.am
new file mode 100644
index 000000000..67b104d45
--- /dev/null
+++ b/client/wayland/Makefile.am
@@ -0,0 +1,62 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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 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.
+
+libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+
+libexec_PROGRAMS = ibus-wayland
+
+protocol_sources = \
+	input-method-protocol.c \
+	input-method-client-protocol.h \
+	$(NULL)
+
+ibus_wayland_SOURCES = \
+	$(protocol_sources) \
+	main.c \
+	$(NULL)
+
+ibus_wayland_DEPENDENCIES = \
+	$(libibus) \
+	$(NULL)
+
+ibus_wayland_LDADD = \
+	$(libibus) \
+	$(GIO2_LIBS) \
+	$(WAYLAND_LIBS) \
+	$(NULL)
+
+ibus_wayland_CFLAGS = \
+	$(GIO2_CFLAGS) \
+	$(WAYLAND_CFLAGS) \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	$(NULL)
+
+$(libibus):
+	(cd $(top_builddir)/src; make)
+
+EXTRA_DIST = \
+	README \
+	$(protocol_sources) \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/client/wayland/README b/client/wayland/README
new file mode 100644
index 000000000..e5b42f6a3
--- /dev/null
+++ b/client/wayland/README
@@ -0,0 +1,17 @@
+The following two files are generated with wayland-scanner:
+
+input-method-protocol.c
+input-method-client-protocol.h
+
+We include them in the distribution instead of generating them, since
+the Wayland protocol structure will unlikely change.  Do not modify
+those files manually.
+
+To generate them, use the wayland-scanner command as follows.  You can
+find input-method.xml in the Weston source code (maybe it will be
+moved to the Wayland source code later).
+
+$ wayland-scanner code < input-method.xml \
+  > input-method-protocol.c
+$ wayland-scanner client-header < input-method.xml \
+  > input-method-client-protocol.h
diff --git a/client/wayland/input-method-client-protocol.h b/client/wayland/input-method-client-protocol.h
new file mode 100644
index 000000000..05d03a3b4
--- /dev/null
+++ b/client/wayland/input-method-client-protocol.h
@@ -0,0 +1,419 @@
+/* 
+ * Copyright © 2012, 2013 Intel Corporation
+ * 
+ * Permission to use, copy, modify, distribute, and sell this
+ * software and its documentation for any purpose is hereby granted
+ * without fee, provided that the above copyright notice appear in
+ * all copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of
+ * the copyright holders not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ * 
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+
+#ifndef INPUT_METHOD_CLIENT_PROTOCOL_H
+#define INPUT_METHOD_CLIENT_PROTOCOL_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-client.h"
+
+struct wl_client;
+struct wl_resource;
+
+struct wl_input_method_context;
+struct wl_input_method;
+struct wl_input_panel;
+struct wl_input_panel_surface;
+
+extern const struct wl_interface wl_input_method_context_interface;
+extern const struct wl_interface wl_input_method_interface;
+extern const struct wl_interface wl_input_panel_interface;
+extern const struct wl_interface wl_input_panel_surface_interface;
+
+/**
+ * wl_input_method_context - input method context
+ * @surrounding_text: surrounding text event
+ * @reset: (none)
+ * @content_type: (none)
+ * @invoke_action: (none)
+ * @commit_state: (none)
+ * @preferred_language: (none)
+ *
+ * Corresponds to a text model on input method side. An input method
+ * context is created on text mode activation on the input method side. It
+ * allows to receive information about the text model from the application
+ * via events. Input method contexts do not keep state after deactivation
+ * and should be destroyed after deactivation is handled.
+ *
+ * Text is generally UTF-8 encoded, indices and lengths are in bytes.
+ *
+ * Serials are used to synchronize the state between the text input and an
+ * input method. New serials are sent by the text input in the commit_state
+ * request and are used by the input method to indicate the known text
+ * input state in events like preedit_string, commit_string, and keysym.
+ * The text input can then ignore events from the input method which are
+ * based on an outdated state (for example after a reset).
+ */
+struct wl_input_method_context_listener {
+	/**
+	 * surrounding_text - surrounding text event
+	 * @text: (none)
+	 * @cursor: (none)
+	 * @anchor: (none)
+	 *
+	 * The plain surrounding text around the input position. Cursor
+	 * is the position in bytes within the surrounding text relative to
+	 * the beginning of the text. Anchor is the position in bytes of
+	 * the selection anchor within the surrounding text relative to the
+	 * beginning of the text. If there is no selected text anchor is
+	 * the same as cursor.
+	 */
+	void (*surrounding_text)(void *data,
+				 struct wl_input_method_context *wl_input_method_context,
+				 const char *text,
+				 uint32_t cursor,
+				 uint32_t anchor);
+	/**
+	 * reset - (none)
+	 */
+	void (*reset)(void *data,
+		      struct wl_input_method_context *wl_input_method_context);
+	/**
+	 * content_type - (none)
+	 * @hint: (none)
+	 * @purpose: (none)
+	 */
+	void (*content_type)(void *data,
+			     struct wl_input_method_context *wl_input_method_context,
+			     uint32_t hint,
+			     uint32_t purpose);
+	/**
+	 * invoke_action - (none)
+	 * @button: (none)
+	 * @index: (none)
+	 */
+	void (*invoke_action)(void *data,
+			      struct wl_input_method_context *wl_input_method_context,
+			      uint32_t button,
+			      uint32_t index);
+	/**
+	 * commit_state - (none)
+	 * @serial: serial of text input state
+	 */
+	void (*commit_state)(void *data,
+			     struct wl_input_method_context *wl_input_method_context,
+			     uint32_t serial);
+	/**
+	 * preferred_language - (none)
+	 * @language: (none)
+	 */
+	void (*preferred_language)(void *data,
+				   struct wl_input_method_context *wl_input_method_context,
+				   const char *language);
+};
+
+static inline int
+wl_input_method_context_add_listener(struct wl_input_method_context *wl_input_method_context,
+				     const struct wl_input_method_context_listener *listener, void *data)
+{
+	return wl_proxy_add_listener((struct wl_proxy *) wl_input_method_context,
+				     (void (**)(void)) listener, data);
+}
+
+#define WL_INPUT_METHOD_CONTEXT_DESTROY	0
+#define WL_INPUT_METHOD_CONTEXT_COMMIT_STRING	1
+#define WL_INPUT_METHOD_CONTEXT_PREEDIT_STRING	2
+#define WL_INPUT_METHOD_CONTEXT_PREEDIT_STYLING	3
+#define WL_INPUT_METHOD_CONTEXT_PREEDIT_CURSOR	4
+#define WL_INPUT_METHOD_CONTEXT_DELETE_SURROUNDING_TEXT	5
+#define WL_INPUT_METHOD_CONTEXT_CURSOR_POSITION	6
+#define WL_INPUT_METHOD_CONTEXT_MODIFIERS_MAP	7
+#define WL_INPUT_METHOD_CONTEXT_KEYSYM	8
+#define WL_INPUT_METHOD_CONTEXT_GRAB_KEYBOARD	9
+#define WL_INPUT_METHOD_CONTEXT_KEY	10
+#define WL_INPUT_METHOD_CONTEXT_MODIFIERS	11
+#define WL_INPUT_METHOD_CONTEXT_LANGUAGE	12
+#define WL_INPUT_METHOD_CONTEXT_TEXT_DIRECTION	13
+
+static inline void
+wl_input_method_context_set_user_data(struct wl_input_method_context *wl_input_method_context, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) wl_input_method_context, user_data);
+}
+
+static inline void *
+wl_input_method_context_get_user_data(struct wl_input_method_context *wl_input_method_context)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_method_context);
+}
+
+static inline void
+wl_input_method_context_destroy(struct wl_input_method_context *wl_input_method_context)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_DESTROY);
+
+	wl_proxy_destroy((struct wl_proxy *) wl_input_method_context);
+}
+
+static inline void
+wl_input_method_context_commit_string(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *text)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_COMMIT_STRING, serial, text);
+}
+
+static inline void
+wl_input_method_context_preedit_string(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *text, const char *commit)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_PREEDIT_STRING, serial, text, commit);
+}
+
+static inline void
+wl_input_method_context_preedit_styling(struct wl_input_method_context *wl_input_method_context, uint32_t index, uint32_t length, uint32_t style)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_PREEDIT_STYLING, index, length, style);
+}
+
+static inline void
+wl_input_method_context_preedit_cursor(struct wl_input_method_context *wl_input_method_context, int32_t index)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_PREEDIT_CURSOR, index);
+}
+
+static inline void
+wl_input_method_context_delete_surrounding_text(struct wl_input_method_context *wl_input_method_context, int32_t index, uint32_t length)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_DELETE_SURROUNDING_TEXT, index, length);
+}
+
+static inline void
+wl_input_method_context_cursor_position(struct wl_input_method_context *wl_input_method_context, int32_t index, int32_t anchor)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_CURSOR_POSITION, index, anchor);
+}
+
+static inline void
+wl_input_method_context_modifiers_map(struct wl_input_method_context *wl_input_method_context, struct wl_array *map)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_MODIFIERS_MAP, map);
+}
+
+static inline void
+wl_input_method_context_keysym(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_KEYSYM, serial, time, sym, state, modifiers);
+}
+
+static inline struct wl_keyboard *
+wl_input_method_context_grab_keyboard(struct wl_input_method_context *wl_input_method_context)
+{
+	struct wl_proxy *keyboard;
+
+	keyboard = wl_proxy_create((struct wl_proxy *) wl_input_method_context,
+			     &wl_keyboard_interface);
+	if (!keyboard)
+		return NULL;
+
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_GRAB_KEYBOARD, keyboard);
+
+	return (struct wl_keyboard *) keyboard;
+}
+
+static inline void
+wl_input_method_context_key(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t time, uint32_t key, uint32_t state)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_KEY, serial, time, key, state);
+}
+
+static inline void
+wl_input_method_context_modifiers(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_MODIFIERS, serial, mods_depressed, mods_latched, mods_locked, group);
+}
+
+static inline void
+wl_input_method_context_language(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *language)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_LANGUAGE, serial, language);
+}
+
+static inline void
+wl_input_method_context_text_direction(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t direction)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
+			 WL_INPUT_METHOD_CONTEXT_TEXT_DIRECTION, serial, direction);
+}
+
+/**
+ * wl_input_method - input method
+ * @activate: activate event
+ * @deactivate: activate event
+ *
+ * An input method object is responsible to compose text in response to
+ * input from hardware or virtual keyboards. There is one input method
+ * object per seat. On activate there is a new input method context object
+ * created which allows the input method to communicate with the text
+ * model.
+ */
+struct wl_input_method_listener {
+	/**
+	 * activate - activate event
+	 * @id: (none)
+	 *
+	 * A text model was activated. Creates an input method context
+	 * object which allows communication with the text model.
+	 */
+	void (*activate)(void *data,
+			 struct wl_input_method *wl_input_method,
+			 struct wl_input_method_context *id);
+	/**
+	 * deactivate - activate event
+	 * @context: (none)
+	 *
+	 * The text model corresponding to the context argument was
+	 * deactivated. The input method context should be destroyed after
+	 * deactivation is handled.
+	 */
+	void (*deactivate)(void *data,
+			   struct wl_input_method *wl_input_method,
+			   struct wl_input_method_context *context);
+};
+
+static inline int
+wl_input_method_add_listener(struct wl_input_method *wl_input_method,
+			     const struct wl_input_method_listener *listener, void *data)
+{
+	return wl_proxy_add_listener((struct wl_proxy *) wl_input_method,
+				     (void (**)(void)) listener, data);
+}
+
+static inline void
+wl_input_method_set_user_data(struct wl_input_method *wl_input_method, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) wl_input_method, user_data);
+}
+
+static inline void *
+wl_input_method_get_user_data(struct wl_input_method *wl_input_method)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_method);
+}
+
+static inline void
+wl_input_method_destroy(struct wl_input_method *wl_input_method)
+{
+	wl_proxy_destroy((struct wl_proxy *) wl_input_method);
+}
+
+#define WL_INPUT_PANEL_GET_INPUT_PANEL_SURFACE	0
+
+static inline void
+wl_input_panel_set_user_data(struct wl_input_panel *wl_input_panel, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) wl_input_panel, user_data);
+}
+
+static inline void *
+wl_input_panel_get_user_data(struct wl_input_panel *wl_input_panel)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_panel);
+}
+
+static inline void
+wl_input_panel_destroy(struct wl_input_panel *wl_input_panel)
+{
+	wl_proxy_destroy((struct wl_proxy *) wl_input_panel);
+}
+
+static inline struct wl_input_panel_surface *
+wl_input_panel_get_input_panel_surface(struct wl_input_panel *wl_input_panel, struct wl_surface *surface)
+{
+	struct wl_proxy *id;
+
+	id = wl_proxy_create((struct wl_proxy *) wl_input_panel,
+			     &wl_input_panel_surface_interface);
+	if (!id)
+		return NULL;
+
+	wl_proxy_marshal((struct wl_proxy *) wl_input_panel,
+			 WL_INPUT_PANEL_GET_INPUT_PANEL_SURFACE, id, surface);
+
+	return (struct wl_input_panel_surface *) id;
+}
+
+#ifndef WL_INPUT_PANEL_SURFACE_POSITION_ENUM
+#define WL_INPUT_PANEL_SURFACE_POSITION_ENUM
+enum wl_input_panel_surface_position {
+	WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM = 0,
+};
+#endif /* WL_INPUT_PANEL_SURFACE_POSITION_ENUM */
+
+#define WL_INPUT_PANEL_SURFACE_SET_TOPLEVEL	0
+#define WL_INPUT_PANEL_SURFACE_SET_OVERLAY_PANEL	1
+
+static inline void
+wl_input_panel_surface_set_user_data(struct wl_input_panel_surface *wl_input_panel_surface, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) wl_input_panel_surface, user_data);
+}
+
+static inline void *
+wl_input_panel_surface_get_user_data(struct wl_input_panel_surface *wl_input_panel_surface)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_panel_surface);
+}
+
+static inline void
+wl_input_panel_surface_destroy(struct wl_input_panel_surface *wl_input_panel_surface)
+{
+	wl_proxy_destroy((struct wl_proxy *) wl_input_panel_surface);
+}
+
+static inline void
+wl_input_panel_surface_set_toplevel(struct wl_input_panel_surface *wl_input_panel_surface, struct wl_output *output, uint32_t position)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_panel_surface,
+			 WL_INPUT_PANEL_SURFACE_SET_TOPLEVEL, output, position);
+}
+
+static inline void
+wl_input_panel_surface_set_overlay_panel(struct wl_input_panel_surface *wl_input_panel_surface)
+{
+	wl_proxy_marshal((struct wl_proxy *) wl_input_panel_surface,
+			 WL_INPUT_PANEL_SURFACE_SET_OVERLAY_PANEL);
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/client/wayland/input-method-protocol.c b/client/wayland/input-method-protocol.c
new file mode 100644
index 000000000..7bd5a9a72
--- /dev/null
+++ b/client/wayland/input-method-protocol.c
@@ -0,0 +1,115 @@
+/* 
+ * Copyright © 2012, 2013 Intel Corporation
+ * 
+ * Permission to use, copy, modify, distribute, and sell this
+ * software and its documentation for any purpose is hereby granted
+ * without fee, provided that the above copyright notice appear in
+ * all copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of
+ * the copyright holders not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ * 
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "wayland-util.h"
+
+extern const struct wl_interface wl_keyboard_interface;
+extern const struct wl_interface wl_input_method_context_interface;
+extern const struct wl_interface wl_input_method_context_interface;
+extern const struct wl_interface wl_input_panel_surface_interface;
+extern const struct wl_interface wl_surface_interface;
+extern const struct wl_interface wl_output_interface;
+
+static const struct wl_interface *types[] = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	&wl_keyboard_interface,
+	&wl_input_method_context_interface,
+	&wl_input_method_context_interface,
+	&wl_input_panel_surface_interface,
+	&wl_surface_interface,
+	&wl_output_interface,
+	NULL,
+};
+
+static const struct wl_message wl_input_method_context_requests[] = {
+	{ "destroy", "", types + 0 },
+	{ "commit_string", "us", types + 0 },
+	{ "preedit_string", "uss", types + 0 },
+	{ "preedit_styling", "uuu", types + 0 },
+	{ "preedit_cursor", "i", types + 0 },
+	{ "delete_surrounding_text", "iu", types + 0 },
+	{ "cursor_position", "ii", types + 0 },
+	{ "modifiers_map", "a", types + 0 },
+	{ "keysym", "uuuuu", types + 0 },
+	{ "grab_keyboard", "n", types + 5 },
+	{ "key", "uuuu", types + 0 },
+	{ "modifiers", "uuuuu", types + 0 },
+	{ "language", "us", types + 0 },
+	{ "text_direction", "uu", types + 0 },
+};
+
+static const struct wl_message wl_input_method_context_events[] = {
+	{ "surrounding_text", "suu", types + 0 },
+	{ "reset", "", types + 0 },
+	{ "content_type", "uu", types + 0 },
+	{ "invoke_action", "uu", types + 0 },
+	{ "commit_state", "u", types + 0 },
+	{ "preferred_language", "s", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface wl_input_method_context_interface = {
+	"wl_input_method_context", 1,
+	14, wl_input_method_context_requests,
+	6, wl_input_method_context_events,
+};
+
+static const struct wl_message wl_input_method_events[] = {
+	{ "activate", "n", types + 6 },
+	{ "deactivate", "o", types + 7 },
+};
+
+WL_EXPORT const struct wl_interface wl_input_method_interface = {
+	"wl_input_method", 1,
+	0, NULL,
+	2, wl_input_method_events,
+};
+
+static const struct wl_message wl_input_panel_requests[] = {
+	{ "get_input_panel_surface", "no", types + 8 },
+};
+
+WL_EXPORT const struct wl_interface wl_input_panel_interface = {
+	"wl_input_panel", 1,
+	1, wl_input_panel_requests,
+	0, NULL,
+};
+
+static const struct wl_message wl_input_panel_surface_requests[] = {
+	{ "set_toplevel", "ou", types + 10 },
+	{ "set_overlay_panel", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface wl_input_panel_surface_interface = {
+	"wl_input_panel_surface", 1,
+	2, wl_input_panel_surface_requests,
+	0, NULL,
+};
+
diff --git a/client/wayland/main.c b/client/wayland/main.c
new file mode 100644
index 000000000..7a7490bef
--- /dev/null
+++ b/client/wayland/main.c
@@ -0,0 +1,755 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2013 Intel Corporation
+ * Copyright (C) 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 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 "config.h"
+
+#include <errno.h>
+#include <ibus.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wayland-client.h>
+#include <xkbcommon/xkbcommon.h>
+
+#include "input-method-client-protocol.h"
+
+struct _IBusWaylandIM
+{
+    struct wl_input_method *input_method;
+    struct wl_input_method_context *context;
+    struct wl_keyboard *keyboard;
+
+    IBusInputContext *ibuscontext;
+    IBusText *preedit_text;
+    guint preedit_cursor_pos;
+    IBusModifierType modifiers;
+
+    struct xkb_context *xkb_context;
+
+    struct xkb_keymap *keymap;
+    struct xkb_state *state;
+
+    xkb_mod_mask_t shift_mask;
+    xkb_mod_mask_t lock_mask;
+    xkb_mod_mask_t control_mask;
+    xkb_mod_mask_t mod1_mask;
+    xkb_mod_mask_t mod2_mask;
+    xkb_mod_mask_t mod3_mask;
+    xkb_mod_mask_t mod4_mask;
+    xkb_mod_mask_t mod5_mask;
+    xkb_mod_mask_t super_mask;
+    xkb_mod_mask_t hyper_mask;
+    xkb_mod_mask_t meta_mask;
+
+    uint32_t serial;
+
+    GCancellable *cancellable;
+};
+typedef struct _IBusWaylandIM IBusWaylandIM;
+
+struct _IBusWaylandKeyEvent
+{
+    struct wl_input_method_context *context;
+    uint32_t serial;
+    uint32_t time;
+    uint32_t key;
+    enum wl_keyboard_key_state state;
+};
+typedef struct _IBusWaylandKeyEvent IBusWaylandKeyEvent;
+
+struct _IBusWaylandSource
+{
+    GSource source;
+    GPollFD pfd;
+    uint32_t mask;
+    struct wl_display *display;
+};
+typedef struct _IBusWaylandSource IBusWaylandSource;
+
+struct wl_display *_display = NULL;
+struct wl_registry *_registry = NULL;
+static IBusBus *_bus = NULL;
+
+static gboolean _use_sync_mode = FALSE;
+
+static gboolean
+_get_boolean_env (const gchar *name,
+                  gboolean     defval)
+{
+    const gchar *value = g_getenv (name);
+
+    if (value == NULL)
+      return defval;
+
+    if (g_strcmp0 (value, "") == 0 ||
+        g_strcmp0 (value, "0") == 0 ||
+        g_strcmp0 (value, "false") == 0 ||
+        g_strcmp0 (value, "False") == 0 ||
+        g_strcmp0 (value, "FALSE") == 0)
+      return FALSE;
+
+    return TRUE;
+}
+
+static gboolean
+ibus_wayland_source_prepare (GSource *base,
+                             gint    *timeout)
+{
+    IBusWaylandSource *source = (IBusWaylandSource *) base;
+
+    *timeout = -1;
+
+    wl_display_flush (source->display);
+
+    return FALSE;
+}
+
+static gboolean
+ibus_wayland_source_check (GSource *base)
+{
+    IBusWaylandSource *source = (IBusWaylandSource *) base;
+
+    if (source->pfd.revents & (G_IO_ERR | G_IO_HUP))
+        g_error ("Lost connection to wayland compositor");
+
+    return source->pfd.revents;
+}
+
+static gboolean
+ibus_wayland_source_dispatch (GSource    *base,
+                              GSourceFunc callback,
+                              gpointer    data)
+{
+    IBusWaylandSource *source = (IBusWaylandSource *) base;
+
+    if (source->pfd.revents) {
+        wl_display_dispatch (source->display);
+        source->pfd.revents = 0;
+    }
+
+    return TRUE;
+}
+
+static void
+ibus_wayland_source_finalize (GSource *source)
+{
+}
+
+static GSourceFuncs ibus_wayland_source_funcs = {
+    ibus_wayland_source_prepare,
+    ibus_wayland_source_check,
+    ibus_wayland_source_dispatch,
+    ibus_wayland_source_finalize
+};
+
+GSource *
+ibus_wayland_source_new (struct wl_display *display)
+{
+    GSource *source;
+    IBusWaylandSource *wlsource;
+
+    source = g_source_new (&ibus_wayland_source_funcs,
+                           sizeof (IBusWaylandSource));
+    wlsource = (IBusWaylandSource *) source;
+
+    wlsource->display = display;
+    wlsource->pfd.fd = wl_display_get_fd (display);
+    wlsource->pfd.events = G_IO_IN | G_IO_ERR | G_IO_HUP;
+    g_source_add_poll (source, &wlsource->pfd);
+
+    return source;
+}
+
+static void
+_context_commit_text_cb (IBusInputContext *context,
+                         IBusText         *text,
+                         IBusWaylandIM    *wlim)
+{
+    wl_input_method_context_commit_string (wlim->context,
+                                           wlim->serial,
+                                           text->text);
+}
+
+static void
+_context_forward_key_event_cb (IBusInputContext *context,
+                               guint             keyval,
+                               guint             keycode,
+                               guint             modifiers,
+                               IBusWaylandIM    *wlim)
+{
+    uint32_t state;
+
+    if (modifiers & IBUS_RELEASE_MASK)
+        state = WL_KEYBOARD_KEY_STATE_RELEASED;
+    else
+        state = WL_KEYBOARD_KEY_STATE_PRESSED;
+
+    wl_input_method_context_keysym (wlim->context,
+                                    wlim->serial,
+                                    0,
+                                    keyval,
+                                    state,
+                                    modifiers);
+}
+
+static void
+_context_show_preedit_text_cb (IBusInputContext *context,
+                               IBusWaylandIM    *wlim)
+{
+    /* CURSOR is byte offset.  */
+    uint32_t cursor =
+        g_utf8_offset_to_pointer (wlim->preedit_text->text,
+                                  wlim->preedit_cursor_pos) -
+        wlim->preedit_text->text;
+
+    wl_input_method_context_preedit_cursor (wlim->context,
+                                            cursor);
+    wl_input_method_context_preedit_string (wlim->context,
+                                            wlim->serial,
+                                            wlim->preedit_text->text,
+                                            wlim->preedit_text->text);
+}
+
+static void
+_context_hide_preedit_text_cb (IBusInputContext *context,
+                               IBusWaylandIM    *wlim)
+{
+    wl_input_method_context_preedit_string (wlim->context,
+                                            wlim->serial,
+                                            "",
+                                            "");
+}
+
+static void
+_context_update_preedit_text_cb (IBusInputContext *context,
+                                 IBusText         *text,
+                                 gint              cursor_pos,
+                                 gboolean          visible,
+                                 IBusWaylandIM    *wlim)
+{
+    if (wlim->preedit_text)
+        g_object_unref (wlim->preedit_text);
+    wlim->preedit_text = g_object_ref_sink (text);
+    wlim->preedit_cursor_pos = cursor_pos;
+
+    if (visible)
+        _context_show_preedit_text_cb (context, wlim);
+    else
+        _context_hide_preedit_text_cb (context, wlim);
+}
+
+static void
+handle_surrounding_text (void                           *data,
+                         struct wl_input_method_context *context,
+                         const char                     *text,
+                         uint32_t                        cursor,
+                         uint32_t                        anchor)
+{
+#if ENABLE_SURROUNDING
+    IBusWaylandIM *wlim = data;
+
+    if (wlim->ibuscontext != NULL &&
+        ibus_input_context_needs_surrounding_text (wlim->ibuscontext)) {
+        /* CURSOR_POS and ANCHOR_POS are character offset.  */
+        guint cursor_pos = g_utf8_pointer_to_offset (text, text + cursor);
+        guint anchor_pos = g_utf8_pointer_to_offset (text, text + anchor);
+        IBusText *ibustext = ibus_text_new_from_string (text);
+
+        ibus_input_context_set_surrounding_text (wlim->ibuscontext,
+                                                 ibustext,
+                                                 cursor_pos,
+                                                 anchor_pos);
+    }
+#endif
+}
+
+static void
+handle_reset (void                           *data,
+              struct wl_input_method_context *context)
+{
+}
+
+static void
+handle_content_type (void                           *data,
+                     struct wl_input_method_context *context,
+                     uint32_t                        hint,
+                     uint32_t                        purpose)
+{
+}
+
+static void
+handle_invoke_action (void                           *data,
+                      struct wl_input_method_context *context,
+                      uint32_t                        button,
+                      uint32_t                        index)
+{
+}
+
+static void
+handle_commit_state (void                           *data,
+                     struct wl_input_method_context *context,
+                     uint32_t                        serial)
+{
+    IBusWaylandIM *wlim = data;
+
+    wlim->serial = serial;
+}
+
+static void
+handle_preferred_language (void                           *data,
+                           struct wl_input_method_context *context,
+                           const char                     *language)
+{
+}
+
+static const struct wl_input_method_context_listener context_listener = {
+    handle_surrounding_text,
+    handle_reset,
+    handle_content_type,
+    handle_invoke_action,
+    handle_commit_state,
+    handle_preferred_language
+};
+
+static void
+input_method_keyboard_keymap (void               *data,
+                              struct wl_keyboard *wl_keyboard,
+                              uint32_t            format,
+                              int32_t             fd,
+                              uint32_t            size)
+{
+    IBusWaylandIM *wlim = data;
+    GMappedFile *map;
+    GError *error;
+
+    if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+        close(fd);
+        return;
+    }
+
+    error = NULL;
+    map = g_mapped_file_new_from_fd (fd, FALSE, &error);
+    if (map == NULL) {
+        close (fd);
+        return;
+    }
+
+    wlim->keymap =
+        xkb_map_new_from_string (wlim->xkb_context,
+                                 g_mapped_file_get_contents (map),
+                                 XKB_KEYMAP_FORMAT_TEXT_V1,
+                                 0);
+
+    g_mapped_file_unref (map);
+    close(fd);
+
+    if (!wlim->keymap) {
+        return;
+    }
+
+    wlim->state = xkb_state_new (wlim->keymap);
+    if (!wlim->state) {
+        xkb_map_unref (wlim->keymap);
+        return;
+    }
+
+    wlim->shift_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Shift");
+    wlim->lock_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Lock");
+    wlim->control_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Control");
+    wlim->mod1_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Mod1");
+    wlim->mod2_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Mod2");
+    wlim->mod3_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Mod3");
+    wlim->mod4_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Mod4");
+    wlim->mod5_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Mod5");
+    wlim->super_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Super");
+    wlim->hyper_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Hyper");
+    wlim->meta_mask =
+        1 << xkb_map_mod_get_index (wlim->keymap, "Meta");
+}
+
+static void
+_process_key_event_done (GObject      *object,
+                         GAsyncResult *res,
+                         gpointer      user_data)
+{
+    IBusInputContext *context = (IBusInputContext *)object;
+    IBusWaylandKeyEvent *event = (IBusWaylandKeyEvent *) user_data;
+
+    GError *error = NULL;
+    gboolean retval = ibus_input_context_process_key_event_async_finish (
+            context,
+            res,
+            &error);
+
+    if (error != NULL) {
+        g_warning ("Process Key Event failed: %s.", error->message);
+        g_error_free (error);
+    }
+
+    if (!retval) {
+        wl_input_method_context_key (event->context,
+                                     event->serial,
+                                     event->time,
+                                     event->key,
+                                     event->state);
+    }
+
+    g_free (event);
+}
+
+static void
+input_method_keyboard_key (void               *data,
+                           struct wl_keyboard *wl_keyboard,
+                           uint32_t            serial,
+                           uint32_t            time,
+                           uint32_t            key,
+                           uint32_t            state)
+{
+    IBusWaylandIM *wlim = data;
+    uint32_t code;
+    uint32_t num_syms;
+    const xkb_keysym_t *syms;
+    xkb_keysym_t sym;
+    guint32 modifiers;
+
+    if (!wlim->state)
+        return;
+
+    if (!wlim->ibuscontext) {
+        wl_input_method_context_key (wlim->context,
+                                     serial,
+                                     time,
+                                     key,
+                                     state);
+        return;
+    }
+        
+    code = key + 8;
+    num_syms = xkb_key_get_syms (wlim->state, code, &syms);
+
+    sym = XKB_KEY_NoSymbol;
+    if (num_syms == 1)
+        sym = syms[0];
+
+    modifiers = wlim->modifiers;
+    if (state == WL_KEYBOARD_KEY_STATE_RELEASED)
+        modifiers |= IBUS_RELEASE_MASK;
+
+    if (_use_sync_mode) {
+        gboolean retval =
+            ibus_input_context_process_key_event (wlim->ibuscontext,
+                                                  sym,
+                                                  code,
+                                                  modifiers);
+        if (!retval) {
+            wl_input_method_context_key (wlim->context,
+                                         serial,
+                                         time,
+                                         key,
+                                         state);
+        }
+    } else {
+        IBusWaylandKeyEvent *event = g_new (IBusWaylandKeyEvent, 1);
+        event->context = wlim->context;
+        event->serial = serial;
+        event->time = time;
+        event->key = key;
+        event->state = state;
+        ibus_input_context_process_key_event_async (wlim->ibuscontext,
+                                                    sym,
+                                                    code,
+                                                    modifiers,
+                                                    -1,
+                                                    NULL,
+                                                    _process_key_event_done,
+                                                    event);
+    }
+}
+
+static void
+input_method_keyboard_modifiers (void               *data,
+                                 struct wl_keyboard *wl_keyboard,
+                                 uint32_t            serial,
+                                 uint32_t            mods_depressed,
+                                 uint32_t            mods_latched,
+                                 uint32_t            mods_locked,
+                                 uint32_t            group)
+{
+    IBusWaylandIM *wlim = data;
+    struct wl_input_method_context *context = wlim->context;
+    xkb_mod_mask_t mask;
+
+    xkb_state_update_mask (wlim->state, mods_depressed,
+                           mods_latched, mods_locked, 0, 0, group);
+    mask = xkb_state_serialize_mods (wlim->state,
+                                     XKB_STATE_DEPRESSED |
+                                     XKB_STATE_LATCHED);
+
+    wlim->modifiers = 0;
+    if (mask & wlim->shift_mask)
+        wlim->modifiers |= IBUS_SHIFT_MASK;
+    if (mask & wlim->lock_mask)
+        wlim->modifiers |= IBUS_LOCK_MASK;
+    if (mask & wlim->control_mask)
+        wlim->modifiers |= IBUS_CONTROL_MASK;
+    if (mask & wlim->mod1_mask)
+        wlim->modifiers |= IBUS_MOD1_MASK;
+    if (mask & wlim->mod2_mask)
+        wlim->modifiers |= IBUS_MOD2_MASK;
+    if (mask & wlim->mod3_mask)
+        wlim->modifiers |= IBUS_MOD3_MASK;
+    if (mask & wlim->mod4_mask)
+        wlim->modifiers |= IBUS_MOD4_MASK;
+    if (mask & wlim->mod5_mask)
+        wlim->modifiers |= IBUS_MOD5_MASK;
+    if (mask & wlim->super_mask)
+        wlim->modifiers |= IBUS_SUPER_MASK;
+    if (mask & wlim->hyper_mask)
+        wlim->modifiers |= IBUS_HYPER_MASK;
+    if (mask & wlim->meta_mask)
+        wlim->modifiers |= IBUS_META_MASK;
+
+    wl_input_method_context_modifiers (context, serial,
+                                       mods_depressed, mods_depressed,
+                                       mods_latched, group);
+}
+
+static const struct wl_keyboard_listener keyboard_listener = {
+    input_method_keyboard_keymap,
+    NULL, /* enter */
+    NULL, /* leave */
+    input_method_keyboard_key,
+    input_method_keyboard_modifiers
+};
+
+static void
+_create_input_context_done (GObject      *object,
+                            GAsyncResult *res,
+                            gpointer      user_data)
+{
+    IBusWaylandIM *wlim = (IBusWaylandIM *) user_data;
+
+    GError *error = NULL;
+    IBusInputContext *context = ibus_bus_create_input_context_async_finish (
+            _bus, res, &error);
+
+    if (wlim->cancellable != NULL) {
+        g_object_unref (wlim->cancellable);
+        wlim->cancellable = NULL;
+    }
+
+    if (context == NULL) {
+        g_warning ("Create input context failed: %s.", error->message);
+        g_error_free (error);
+    }
+    else {
+        wlim->ibuscontext = context;
+
+        g_signal_connect (wlim->ibuscontext, "commit-text",
+                          G_CALLBACK (_context_commit_text_cb),
+                          wlim);
+        g_signal_connect (wlim->ibuscontext, "forward-key-event",
+                          G_CALLBACK (_context_forward_key_event_cb),
+                          wlim);
+
+        g_signal_connect (wlim->ibuscontext, "update-preedit-text",
+                          G_CALLBACK (_context_update_preedit_text_cb),
+                          wlim);
+        g_signal_connect (wlim->ibuscontext, "show-preedit-text",
+                          G_CALLBACK (_context_show_preedit_text_cb),
+                          wlim);
+        g_signal_connect (wlim->ibuscontext, "hide-preedit-text",
+                          G_CALLBACK (_context_hide_preedit_text_cb),
+                          wlim);
+    
+#ifdef ENABLE_SURROUNDING
+        ibus_input_context_set_capabilities (wlim->ibuscontext,
+                                             IBUS_CAP_FOCUS |
+                                             IBUS_CAP_PREEDIT_TEXT |
+                                             IBUS_CAP_SURROUNDING_TEXT);
+#else
+        ibus_input_context_set_capabilities (wlim->ibuscontext,
+                                             IBUS_CAP_FOCUS |
+                                             IBUS_CAP_PREEDIT_TEXT);
+#endif
+
+        ibus_input_context_focus_in (wlim->ibuscontext);
+    }
+}
+
+static void
+input_method_activate (void                           *data,
+                       struct wl_input_method         *input_method,
+                       struct wl_input_method_context *context)
+{
+    IBusWaylandIM *wlim = data;
+
+    if (wlim->context) {
+        wl_input_method_context_destroy (wlim->context);
+        wlim->context = NULL;
+    }
+
+    wlim->serial = 0;
+    wlim->context = context;
+
+    wl_input_method_context_add_listener (context, &context_listener, wlim);
+    wlim->keyboard = wl_input_method_context_grab_keyboard (context);
+    wl_keyboard_add_listener(wlim->keyboard,
+                             &keyboard_listener,
+                             wlim);
+
+    if (wlim->ibuscontext) {
+        g_object_unref (wlim->ibuscontext);
+        wlim->ibuscontext = NULL;
+    }
+
+    wlim->cancellable = g_cancellable_new ();
+    ibus_bus_create_input_context_async (_bus,
+                                         "wayland",
+                                         -1,
+                                         wlim->cancellable,
+                                         _create_input_context_done,
+                                         wlim);
+}
+
+static void
+input_method_deactivate (void                           *data,
+                         struct wl_input_method         *input_method,
+                         struct wl_input_method_context *context)
+{
+    IBusWaylandIM *wlim = data;
+
+    if (wlim->cancellable) {
+        /* Cancel any ongoing create input context request.  */
+        g_cancellable_cancel (wlim->cancellable);
+        g_object_unref (wlim->cancellable);
+        wlim->cancellable = NULL;
+    }
+
+    if (wlim->ibuscontext) {
+        ibus_input_context_focus_out (wlim->ibuscontext);
+        g_object_unref (wlim->ibuscontext);
+        wlim->ibuscontext = NULL;
+    }
+
+    if (wlim->preedit_text) {
+        g_object_unref (wlim->preedit_text);
+        wlim->preedit_text = NULL;
+    }
+
+    if (wlim->context) {
+        wl_input_method_context_destroy (wlim->context);
+        wlim->context = NULL;
+    }
+}
+
+static const struct wl_input_method_listener input_method_listener = {
+    input_method_activate,
+    input_method_deactivate
+};
+
+static void
+registry_handle_global (void               *data,
+                        struct wl_registry *registry,
+                        uint32_t            name,
+                        const char         *interface,
+                        uint32_t            version)
+{
+    IBusWaylandIM *wlim = data;
+
+    if (!g_strcmp0 (interface, "wl_input_method")) {
+        wlim->input_method =
+            wl_registry_bind (registry, name, &wl_input_method_interface, 1);
+        wl_input_method_add_listener (wlim->input_method,
+                                      &input_method_listener, wlim);
+    }
+}
+
+static void
+registry_handle_global_remove (void               *data,
+                               struct wl_registry *registry,
+                               uint32_t            name)
+{
+}
+
+static const struct wl_registry_listener registry_listener = {
+    registry_handle_global,
+    registry_handle_global_remove
+};
+
+gint
+main (gint    argc,
+      gchar **argv)
+{
+    IBusWaylandIM wlim;
+    GSource *source;
+
+    ibus_init ();
+
+    _bus = ibus_bus_new ();
+    if (!ibus_bus_is_connected (_bus)) {
+        g_printerr ("Cannot connect to ibus-daemon\n");
+        return EXIT_FAILURE;
+    }
+
+    _display = wl_display_connect (NULL);
+    if (_display == NULL) {
+        g_printerr ("Failed to connect to Wayland server: %s\n",
+                    g_strerror (errno));
+        return EXIT_FAILURE;
+    }
+
+    _registry = wl_display_get_registry (_display);
+    memset (&wlim, 0, sizeof (wlim));
+    wl_registry_add_listener (_registry, &registry_listener, &wlim);
+    wl_display_roundtrip (_display);
+    if (wlim.input_method == NULL) {
+        g_printerr ("No input_method global\n");
+        return EXIT_FAILURE;
+    }
+
+    wlim.xkb_context = xkb_context_new (0);
+    if (wlim.xkb_context == NULL) {
+        g_printerr ("Failed to create XKB context\n");
+        return EXIT_FAILURE;
+    }
+
+    _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
+
+    source = ibus_wayland_source_new (_display);
+    g_source_set_priority (source, G_PRIORITY_DEFAULT);
+    g_source_set_can_recurse (source, TRUE);
+    g_source_attach (source, NULL);
+
+    ibus_main ();
+
+    return EXIT_SUCCESS;
+}
diff --git a/configure.ac b/configure.ac
index 3e9996def..36515e290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,15 @@ AC_ARG_ENABLE(xim,
 )
 AM_CONDITIONAL([ENABLE_XIM], [test x"$enable_xim" = x"yes"])
 
+# --enable-wayland option.
+AC_ARG_ENABLE(wayland,
+    AS_HELP_STRING([--enable-wayland],
+                   [Build wayland support]),
+    [enable_wayland=$enableval],
+    [enable_wayland=no]
+)
+AM_CONDITIONAL([ENABLE_WAYLAND], [test x"$enable_wayland" = x"yes"])
+
 if test x"$enable_gtk2" = x"yes" -o x"$enable_xim" = x"yes" ; then
     # check for gtk2
     PKG_CHECK_MODULES(GTK2, [
@@ -242,6 +251,16 @@ else
     enable_xim="no (disabled, use --enable-xim to enable)"
 fi
 
+if test x"$enable_wayland" = x"yes"; then
+    # Check for wayland
+    PKG_CHECK_MODULES(WAYLAND, [
+        wayland-client >= 1.2.0
+        xkbcommon
+    ])
+else
+    enable_wayland="no (disabled, use --enable-wayland to enable)"
+fi
+
 # GObject introspection
 GOBJECT_INTROSPECTION_CHECK([0.6.8])
 
@@ -534,6 +553,7 @@ client/Makefile
 client/gtk2/Makefile
 client/gtk3/Makefile
 client/x11/Makefile
+client/wayland/Makefile
 src/Makefile
 src/ibusversion.h
 src/tests/Makefile
@@ -580,6 +600,7 @@ Build options:
   Build gtk2 immodule       $enable_gtk2
   Build gtk3 immodule       $enable_gtk3
   Build XIM agent server    $enable_xim
+  Build wayland support     $enable_wayland
   Build python library      $enable_python_library
   Build gconf modules       $enable_gconf
   Build memconf modules     $enable_memconf

From 3b3a7ceccbf75f36dee0df45589d79f7e96131f4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 14 Aug 2013 13:29:45 +0200
Subject: [PATCH 169/816] Notify engines of the content-type of input context

Add a new D-Bus method SetContentType to InputContext and Engine, to
notify engines of the content-type (primary purpose and hints) of
input context.  This is useful to implement intelligent features in
engines, such as automatic input-mode switch and text prediction.

The "purpose" and "hints" arguments are compatible with
GtkInputPurpose and GtkInputHints:
https://developer.gnome.org/gtk3/unstable/GtkEntry.html#GtkInputPurpose
https://developer.gnome.org/gtk3/unstable/GtkEntry.html#GtkInputHints

and the API is similar to the content_type event in the Wayland Input
Method Framework:
http://cgit.freedesktop.org/wayland/weston/tree/protocol/input-method.xml#n202

BUG=

Review URL: https://codereview.appspot.com/11422043
---
 bus/engineproxy.c           |  40 +++++-
 bus/engineproxy.h           | 221 +++++++++++++++++++++-----------
 bus/inputcontext.c          | 249 +++++++++++++++++++++++++++---------
 client/gtk2/ibusimcontext.c |  54 ++++++--
 src/ibusengine.c            | 167 ++++++++++++++++++++++--
 src/ibusengine.h            |  37 ++++--
 src/ibusinputcontext.c      |  44 ++++++-
 src/ibusinputcontext.h      |  24 +++-
 src/ibustypes.h             |  72 ++++++++++-
 9 files changed, 727 insertions(+), 181 deletions(-)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 200b89be9..19c286167 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -642,8 +642,7 @@ bus_engine_proxy_new_internal (const gchar     *path,
     g_assert (IBUS_IS_ENGINE_DESC (desc));
     g_assert (G_IS_DBUS_CONNECTION (connection));
 
-    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
+    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
     BusEngineProxy *engine =
         (BusEngineProxy *) g_initable_new (BUS_TYPE_ENGINE_PROXY,
                                            NULL,
@@ -1134,6 +1133,39 @@ void bus_engine_proxy_set_surrounding_text (BusEngineProxy *engine,
     }
 }
 
+void
+bus_engine_proxy_set_content_type (BusEngineProxy *engine,
+                                   guint           purpose,
+                                   guint           hints)
+{
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+
+    GVariant *cached_content_type =
+        g_dbus_proxy_get_cached_property ((GDBusProxy *) engine,
+                                          "ContentType");
+    GVariant *content_type = g_variant_new ("(uu)", purpose, hints);
+
+    g_variant_ref_sink (content_type);
+    if (cached_content_type == NULL ||
+        !g_variant_equal (content_type, cached_content_type)) {
+        g_dbus_proxy_call ((GDBusProxy *) engine,
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new ("(ssv)",
+                                          IBUS_INTERFACE_ENGINE,
+                                          "ContentType",
+                                          content_type),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           NULL,
+                           NULL,
+                           NULL);
+    }
+
+    if (cached_content_type != NULL)
+        g_variant_unref (cached_content_type);
+    g_variant_unref (content_type);
+}
+
 /* a macro to generate a function to call a nullary D-Bus method. */
 #define DEFINE_FUNCTION(Name, name)                         \
     void                                                    \
diff --git a/bus/engineproxy.h b/bus/engineproxy.h
index 8fe025dbd..528e61b74 100644
--- a/bus/engineproxy.h
+++ b/bus/engineproxy.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -49,7 +49,7 @@ G_BEGIN_DECLS
 typedef struct _BusEngineProxy BusEngineProxy;
 typedef struct _BusEngineProxyClass BusEngineProxyClass;
 
-GType            bus_engine_proxy_get_type          (void);
+GType           bus_engine_proxy_get_type    (void);
 
 /**
  * bus_engine_proxy_new:
@@ -59,196 +59,271 @@ GType            bus_engine_proxy_get_type          (void);
  * @callback: a function to be called when the method invocation is done.
  * @user_data: a pointer that will be passed to the callback.
  */
-void             bus_engine_proxy_new               (IBusEngineDesc        *desc,
-                                                     gint                   timeout,
-                                                     GCancellable          *cancellable,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               user_data);
+void            bus_engine_proxy_new         (IBusEngineDesc     *desc,
+                                              gint                timeout,
+                                              GCancellable       *cancellable,
+                                              GAsyncReadyCallback callback,
+                                              gpointer            user_data);
 
 /**
  * bus_engine_proxy_new_finish:
- * @returns: On success, return an engine object. On error, return NULL.
+ * @res: A #GAsyncResult.
+ * @error: Return location for error or %NULL.
+ * @returns: On success, return an engine object. On error, return %NULL.
  *
- * Get the result of bus_engine_proxy_new call. You have to call this function in the GAsyncReadyCallback function.
+ * Get the result of bus_engine_proxy_new() call. You have to call this
+ * function in the #GAsyncReadyCallback function.
  */
-BusEngineProxy  *bus_engine_proxy_new_finish        (GAsyncResult          *res,
-                                                     GError               **error);
+BusEngineProxy *bus_engine_proxy_new_finish  (GAsyncResult       *res,
+                                              GError            **error);
 
 /**
  * bus_engine_proxy_get_desc:
+ * @engine: A #BusEngineProxy.
  *
- * Get an IBusEngineDesc object associated with the engine.
+ * Get an #IBusEngineDesc object associated with the engine.
  */
-IBusEngineDesc  *bus_engine_proxy_get_desc          (BusEngineProxy        *engine);
+IBusEngineDesc *bus_engine_proxy_get_desc    (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_process_key_event:
- * @callback: a function to be called when the method invocation is done.
+ * @engine: A #BusEngineProxy.
+ * @keyval: Key symbol of the key press.
+ * @keycode: KeyCode of the key press.
+ * @state: Key modifier flags.
+ * @callback: A function to be called when the method invocation is done.
+ * @user_data: Data supplied to @callback.
  *
  * Call "ProcessKeyEvent" method of an engine asynchronously.
  */
-void             bus_engine_proxy_process_key_event (BusEngineProxy        *engine,
-                                                     guint                  keyval,
-                                                     guint                  keycode,
-                                                     guint                  state,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               user_data);
+void            bus_engine_proxy_process_key_event
+                                             (BusEngineProxy     *engine,
+                                              guint               keyval,
+                                              guint               keycode,
+                                              guint               state,
+                                              GAsyncReadyCallback callback,
+                                              gpointer            user_data);
 /**
  * bus_engine_proxy_set_cursor_location:
+ * @engine: A #BusEngineProxy.
+ * @x: X coordinate of the cursor.
+ * @y: Y coordinate of the cursor.
+ * @w: Width of the cursor.
+ * @h: Height of the cursor.
  *
- * Call "SetCursorLocation" method of an engine asynchronously. Unlike bus_engine_proxy_process_key_event, there's no way to know the
- * result of the method invocation. If the same coordinate is given twice or more, the function does nothing from the second time.
+ * Call "SetCursorLocation" method of an engine asynchronously. Unlike
+ * bus_engine_proxy_process_key_event(), there's no way to know the
+ * result of the method invocation. If the same coordinate is given
+ * twice or more, the function does nothing from the second time.
  */
-void             bus_engine_proxy_set_cursor_location
-                                                    (BusEngineProxy        *engine,
-                                                     gint                   x,
-                                                     gint                   y,
-                                                     gint                   w,
-                                                     gint                   h);
+void            bus_engine_proxy_set_cursor_location
+                                             (BusEngineProxy     *engine,
+                                              gint                x,
+                                              gint                y,
+                                              gint                w,
+                                              gint                h);
 /**
  * bus_engine_proxy_focus_in:
+ * @engine: A #BusEngineProxy.
  *
- * Call "FocusIn" method of an engine asynchronously. Do nothing if the engine already has a focus.
+ * Call "FocusIn" method of an engine asynchronously. Do nothing if
+ * the engine already has a focus.
  */
-void             bus_engine_proxy_focus_in          (BusEngineProxy        *engine);
+void            bus_engine_proxy_focus_in    (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_focus_out:
+ * @engine: A #BusEngineProxy.
  *
- * Call "FocusOut" method of an engine asynchronously. Do nothing if the engine does not have a focus.
+ * Call "FocusOut" method of an engine asynchronously. Do nothing if
+ * the engine does not have a focus.
  */
-void             bus_engine_proxy_focus_out         (BusEngineProxy        *engine);
+void            bus_engine_proxy_focus_out   (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_reset:
+ * @engine: A #BusEngineProxy.
  *
  * Call "Reset" method of an engine asynchronously.
  */
-void             bus_engine_proxy_reset             (BusEngineProxy        *engine);
+void            bus_engine_proxy_reset       (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_set_capabilities:
+ * @engine: A #BusEngineProxy.
+ * @caps: Capabilities flags of IBusEngine, see #IBusCapabilite.
  *
  * Call "SetCapabilities" method of an engine asynchronously.
  */
-void             bus_engine_proxy_set_capabilities  (BusEngineProxy        *engine,
-                                                     guint                  caps);
+void            bus_engine_proxy_set_capabilities
+                                             (BusEngineProxy     *engine,
+                                              guint               caps);
 /**
  * bus_engine_proxy_page_up:
+ * @engine: A #BusEngineProxy.
  *
  * Call "PageUp" method of an engine asynchronously.
  */
-void             bus_engine_proxy_page_up           (BusEngineProxy        *engine);
+void            bus_engine_proxy_page_up     (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_page_down:
+ * @engine: A #BusEngineProxy.
  *
  * Call "PageDown" method of an engine asynchronously.
  */
-void             bus_engine_proxy_page_down         (BusEngineProxy        *engine);
+void            bus_engine_proxy_page_down   (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_cursor_up:
+ * @engine: A #BusEngineProxy.
  *
  * Call "CursorUp" method of an engine asynchronously.
  */
-void             bus_engine_proxy_cursor_up         (BusEngineProxy        *engine);
+void            bus_engine_proxy_cursor_up   (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_cursor_down:
+ * @engine: A #BusEngineProxy.
  *
  * Call "CursorDown" method of an engine asynchronously.
  */
-void             bus_engine_proxy_cursor_down       (BusEngineProxy        *engine);
+void            bus_engine_proxy_cursor_down (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_candidate_clicked:
+ * @engine: A #BusEngineProxy.
+ * @index:  Index of candidate be clicked.
+ * @button: Mouse button.
+ * @state:  Keyboard state.
  *
  * Call "CandidateClicked" method of an engine asynchronously.
  */
-void             bus_engine_proxy_candidate_clicked (BusEngineProxy        *engine,
-                                                     guint                  index,
-                                                     guint                  button,
-                                                     guint                  state);
+void            bus_engine_proxy_candidate_clicked
+                                             (BusEngineProxy     *engine,
+                                              guint               index,
+                                              guint               button,
+                                              guint               state);
 /**
  * bus_engine_proxy_enable:
+ * @engine: A #BusEngineProxy.
  *
- * Call "Enable" method of an engine asynchronously. Do nothing if the engine is already enabled.
+ * Call "Enable" method of an engine asynchronously. Do nothing if the
+ * engine is already enabled.
  */
-void             bus_engine_proxy_enable            (BusEngineProxy        *engine);
+void            bus_engine_proxy_enable      (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_disable:
+ * @engine: A #BusEngineProxy.
  *
- * Call "Disable" method of an engine asynchronously. Do nothing if the engine is already disabled.
+ * Call "Disable" method of an engine asynchronously. Do nothing if
+ * the engine is already disabled.
  */
-void             bus_engine_proxy_disable           (BusEngineProxy        *engine);
+void            bus_engine_proxy_disable     (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_property_activate:
+ * @engine: A #BusEngineProxy.
+ * @name: Property name.
+ * @state: Property state.
  *
  * Call "PropertyActivate" method of an engine asynchronously.
  */
-void             bus_engine_proxy_property_activate (BusEngineProxy        *engine,
-                                                     const gchar           *prop_name,
-                                                     guint                  state);
+void            bus_engine_proxy_property_activate
+                                             (BusEngineProxy     *engine,
+                                              const gchar        *prop_name,
+                                              guint               state);
 /**
  * bus_engine_proxy_property_show:
+ * @engine: A #BusEngineProxy.
+ * @prop_name: Property name.
  *
  * Call "PropertyShow" method of an engine asynchronously.
  */
-void             bus_engine_proxy_property_show     (BusEngineProxy        *engine,
-                                                     const gchar           *prop_name);
+void            bus_engine_proxy_property_show
+                                             (BusEngineProxy     *engine,
+                                              const gchar        *prop_name);
 /**
  * bus_engine_proxy_property_hide:
+ * @engine: A #BusEngineProxy.
+ * @prop_name: Property name.
  *
  * Call "PropertyHide" method of an engine asynchronously.
  */
-void             bus_engine_proxy_property_hide     (BusEngineProxy *engine,
-                                                     const gchar    *prop_name);
+void            bus_engine_proxy_property_hide
+                                             (BusEngineProxy     *engine,
+                                              const gchar        *prop_name);
 /**
  * bus_engine_proxy_is_enabled:
- * @returns: TRUE if the engine is enabled.
+ * @engine: A #BusEngineProxy.
+ * @returns: %TRUE if the engine is enabled.
  */
-gboolean         bus_engine_proxy_is_enabled        (BusEngineProxy *engine);
+gboolean        bus_engine_proxy_is_enabled  (BusEngineProxy     *engine);
 
 /**
  * bus_engine_proxy_set_surrounding_text:
+ * @engine: A #BusEngineProxy.
+ * @text: The surrounding text.
+ * @cursor_pos: The cursor position on surrounding text.
+ * @anchor_pos: The anchor position on selection area.
  *
  * Call "SetSurroundingText" method of an engine asynchronously.
  */
-void             bus_engine_proxy_set_surrounding_text
-                                                    (BusEngineProxy *engine,
-                                                     IBusText       *text,
-                                                     guint           cursor_pos,
-                                                     guint           anchor_pos);
+void            bus_engine_proxy_set_surrounding_text
+                                             (BusEngineProxy     *engine,
+                                              IBusText           *text,
+                                              guint               cursor_pos,
+                                              guint               anchor_pos);
 
 /**
  * bus_engine_proxy_process_hand_writing_event:
+ * @engine: A #BusEngineProxy.
+ * @coordinates: A #GVariant containing an array of coordinates.
  *
- * Call "ProcessHandWritingEvent" method of an engine asynchronously. The type of the GVariant should be "(ad)".
- * See ibus_input_context_process_hand_writing_event for details.
+ * Call "ProcessHandWritingEvent" method of an engine
+ * asynchronously. The type of the GVariant should be "(ad)".  See
+ * ibus_input_context_process_hand_writing_event() for details.
  */
-void             bus_engine_proxy_process_hand_writing_event
-                                                    (BusEngineProxy        *engine,
-                                                     GVariant              *coordinates);
+void            bus_engine_proxy_process_hand_writing_event
+                                             (BusEngineProxy     *engine,
+                                              GVariant           *coordinates);
 
 /**
  * bus_engine_proxy_cancel_hand_writing:
+ * @engine: A #BusEngineProxy.
+ * @n_strokes: The number of strokes to be removed. 0 means "remove all".
  *
  * Call "CancelHandWriting" method of an engine asynchronously.
- * See ibus_input_context_cancel_hand_writing for details.
+ * See ibus_input_context_cancel_hand_writing() for details.
+ */
+void            bus_engine_proxy_cancel_hand_writing
+                                             (BusEngineProxy     *engine,
+                                              guint               n_strokes);
+
+/**
+ * bus_engine_proxy_set_content_type:
+ * @engine: A #BusEngineProxy.
+ * @purpose: Primary purpose of the input context, as an #IBusInputPurpose.
+ * @hints: Hints that augment @purpose, as an #IBusInputHints.
+ *
+ * Call "SetContentType" method of an engine asynchronously.
+ * See ibus_input_context_set_content_type() for details.
  */
-void             bus_engine_proxy_cancel_hand_writing
-                                                    (BusEngineProxy        *engine,
-                                                     guint                  n_strokes);
+void            bus_engine_proxy_set_content_type
+                                             (BusEngineProxy     *engine,
+                                              guint               purpose,
+                                              guint               hints);
 
 /**
  * bus_engine_proxy_get_properties:
+ * @engine: A #BusEngineProxy.
+ * @returns: An #IBusPropList.
  *
- * Get an IBusPropList object associated with the engine.
+ * Get an #IBusPropList object associated with the engine.
  */
-IBusPropList    *bus_engine_proxy_get_properties    (BusEngineProxy        *engine);
+IBusPropList   *bus_engine_proxy_get_properties
+                                             (BusEngineProxy     *engine);
 
 G_END_DECLS
 #endif
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index d7ada6efa..a2d1d52c8 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -89,6 +89,10 @@ struct _BusInputContext {
 
     /* incompleted set engine by desc request */
     SetEngineByDescData *data;
+
+    /* content-type (primary purpose and hints) */
+    guint    purpose;
+    guint    hints;
 };
 
 struct _BusInputContextClass {
@@ -132,69 +136,83 @@ typedef struct _BusInputContextPrivate BusInputContextPrivate;
 static guint    context_signals[LAST_SIGNAL] = { 0 };
 
 /* functions prototype */
-static void     bus_input_context_destroy       (BusInputContext        *context);
+static void     bus_input_context_destroy
+                                   (BusInputContext       *context);
 static void     bus_input_context_service_method_call
-                                                (IBusService            *service,
-                                                 GDBusConnection        *connection,
-                                                 const gchar            *sender,
-                                                 const gchar            *object_path,
-                                                 const gchar            *interface_name,
-                                                 const gchar            *method_name,
-                                                 GVariant               *parameters,
-                                                 GDBusMethodInvocation  *invocation);
-static void     bus_input_context_unset_engine  (BusInputContext        *context);
-static void     bus_input_context_commit_text   (BusInputContext        *context,
-                                                 IBusText               *text);
+                                   (IBusService           *service,
+                                    GDBusConnection       *connection,
+                                    const gchar           *sender,
+                                    const gchar           *object_path,
+                                    const gchar           *interface_name,
+                                    const gchar           *method_name,
+                                    GVariant              *parameters,
+                                    GDBusMethodInvocation *invocation);
+static gboolean bus_input_context_service_set_property
+                                   (IBusService           *service,
+                                    GDBusConnection       *connection,
+                                    const gchar           *sender,
+                                    const gchar           *object_path,
+                                    const gchar           *interface_name,
+                                    const gchar           *property_name,
+                                    GVariant              *value,
+                                    GError               **error);
+static void     bus_input_context_unset_engine
+                                   (BusInputContext       *context);
+static void     bus_input_context_commit_text
+                                   (BusInputContext       *context,
+                                    IBusText              *text);
 static void     bus_input_context_update_preedit_text
-                                                (BusInputContext        *context,
-                                                 IBusText               *text,
-                                                 guint                   cursor_pos,
-                                                 gboolean                visible,
-                                                 guint                   mode);
+                                   (BusInputContext       *context,
+                                    IBusText              *text,
+                                    guint                  cursor_pos,
+                                    gboolean               visible,
+                                    guint                  mode);
 static void     bus_input_context_show_preedit_text
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_hide_preedit_text
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_update_auxiliary_text
-                                                (BusInputContext        *context,
-                                                 IBusText               *text,
-                                                 gboolean                visible);
+                                   (BusInputContext       *context,
+                                    IBusText              *text,
+                                    gboolean               visible);
 static void     bus_input_context_show_auxiliary_text
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_hide_auxiliary_text
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_update_lookup_table
-                                                (BusInputContext        *context,
-                                                 IBusLookupTable        *table,
-                                                 gboolean                visible);
+                                   (BusInputContext       *context,
+                                    IBusLookupTable       *table,
+                                    gboolean               visible);
 static void     bus_input_context_show_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_hide_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_page_up_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_page_down_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_cursor_up_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_cursor_down_lookup_table
-                                                (BusInputContext        *context);
+                                   (BusInputContext       *context);
 static void     bus_input_context_register_properties
-                                                (BusInputContext        *context,
-                                                 IBusPropList           *props);
+                                   (BusInputContext       *context,
+                                    IBusPropList          *props);
 static void     bus_input_context_update_property
-                                                (BusInputContext        *context,
-                                                 IBusProperty           *prop);
-static void     _engine_destroy_cb              (BusEngineProxy         *factory,
-                                                 BusInputContext        *context);
+                                   (BusInputContext       *context,
+                                    IBusProperty          *prop);
+static void     _engine_destroy_cb (BusEngineProxy        *factory,
+                                    BusInputContext       *context);
 
 static IBusText *text_empty = NULL;
 static IBusLookupTable *lookup_table_empty = NULL;
 static IBusPropList    *props_empty = NULL;
 
-/* The interfaces available in this class, which consists of a list of methods this class implements and
- * a list of signals this class may emit. Method calls to the interface that are not defined in this XML
- * will be automatically rejected by the GDBus library (see src/ibusservice.c for details.) */
+/* The interfaces available in this class, which consists of a list of
+ * methods this class implements and a list of signals this class may
+ * emit. Method calls to the interface that are not defined in this
+ * XML will be automatically rejected by the GDBus library (see
+ * src/ibusservice.c for details.) */
 static const gchar introspection_xml[] =
     "<node>"
     "  <interface name='org.freedesktop.IBus.InputContext'>"
@@ -277,6 +295,9 @@ static const gchar introspection_xml[] =
     "    <signal name='UpdateProperty'>"
     "      <arg type='v' name='prop' />"
     "    </signal>"
+
+    /* properties */
+    "    <property name='ContentType' type='(uu)' access='write' />"
     "  </interface>"
     "</node>";
 
@@ -316,7 +337,10 @@ bus_input_context_class_init (BusInputContextClass *class)
     ibus_object_class->destroy = (IBusObjectDestroyFunc) bus_input_context_destroy;
 
     /* override the parent class's implementation. */
-    IBUS_SERVICE_CLASS (class)->service_method_call = bus_input_context_service_method_call;
+    IBUS_SERVICE_CLASS (class)->service_method_call =
+        bus_input_context_service_method_call;
+    IBUS_SERVICE_CLASS (class)->service_set_property =
+        bus_input_context_service_set_property;
     /* register the xml so that bus_ibus_impl_service_method_call will be called on a method call defined in the xml (e.g. 'FocusIn'.) */
     ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class), introspection_xml);
 
@@ -607,14 +631,9 @@ bus_input_context_destroy (BusInputContext *context)
     IBUS_OBJECT_CLASS (bus_input_context_parent_class)->destroy (IBUS_OBJECT (context));
 }
 
-/**
- * bus_input_context_emit_signal:
- * @signal_name: The D-Bus signal name to emit which is in the introspection_xml.
- *
- * Emit the D-Bus signal.
- */
 static gboolean
-bus_input_context_emit_signal (BusInputContext *context,
+bus_input_context_send_signal (BusInputContext *context,
+                               const gchar     *interface_name,
                                const gchar     *signal_name,
                                GVariant        *parameters,
                                GError         **error)
@@ -623,7 +642,7 @@ bus_input_context_emit_signal (BusInputContext *context,
         return TRUE;
 
     GDBusMessage *message = g_dbus_message_new_signal (ibus_service_get_object_path ((IBusService *)context),
-                                                       "org.freedesktop.IBus.InputContext",
+                                                       interface_name,
                                                        signal_name);
     g_dbus_message_set_sender (message, "org.freedesktop.IBus");
     g_dbus_message_set_destination (message, bus_connection_get_unique_name (context->connection));
@@ -638,6 +657,58 @@ bus_input_context_emit_signal (BusInputContext *context,
     return retval;
 }
 
+/**
+ * bus_input_context_emit_signal:
+ * @signal_name: The D-Bus signal name to emit which is in the introspection_xml.
+ *
+ * Emit the D-Bus signal.
+ */
+static gboolean
+bus_input_context_emit_signal (BusInputContext *context,
+                               const gchar     *signal_name,
+                               GVariant        *parameters,
+                               GError         **error)
+{
+    if (context->connection == NULL)
+        return TRUE;
+
+    return bus_input_context_send_signal (context,
+                                          "org.freedesktop.IBus.InputContext",
+                                          signal_name,
+                                          parameters,
+                                          error);
+}
+
+/**
+ * bus_input_context_property_changed:
+ * @context: a #BusInputContext
+ * @property_name: The D-Bus property name which has changed
+ * @value: The new value of the property
+ *
+ * Emit the D-Bus "PropertiesChanged" signal for a property.
+ * Returns: %TRUE on success, %FALSE on failure
+ */
+static gboolean
+bus_input_context_property_changed (BusInputContext *context,
+                                    const gchar     *property_name,
+                                    GVariant        *value,
+                                    GError         **error)
+{
+    if (context->connection == NULL)
+        return TRUE;
+
+    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+    g_variant_builder_add (builder, "{sv}", property_name, value);
+    return bus_input_context_send_signal (context,
+                                          "org.freedesktop.DBus.Properties",
+                                          "PropertiesChanged",
+                                          g_variant_new ("(sa{sv}as)",
+                                                         "org.freedesktop.IBus",
+                                                         builder,
+                                                         NULL),
+                                          error);
+}
+
 /**
  * _ic_process_key_event_reply_cb:
  *
@@ -948,11 +1019,6 @@ _ic_get_engine (BusInputContext       *context,
             g_variant_new ("(v)", ibus_serializable_serialize ((IBusSerializable *)desc)));
 }
 
-/**
- * bus_input_context_service_method_call:
- *
- * Handle a D-Bus method call whose destination and interface name are both "org.freedesktop.IBus.InputContext"
- */
 static void
 _ic_set_surrounding_text (BusInputContext       *context,
                           GVariant              *parameters,
@@ -985,6 +1051,11 @@ _ic_set_surrounding_text (BusInputContext       *context,
     g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
+/**
+ * bus_input_context_service_method_call:
+ *
+ * Handle a D-Bus method call whose destination and interface name are both "org.freedesktop.IBus.InputContext"
+ */
 static void
 bus_input_context_service_method_call (IBusService            *service,
                                        GDBusConnection        *connection,
@@ -1024,7 +1095,7 @@ bus_input_context_service_method_call (IBusService            *service,
         { "PropertyActivate",  _ic_property_activate },
         { "SetEngine",         _ic_set_engine },
         { "GetEngine",         _ic_get_engine },
-        { "SetSurroundingText", _ic_set_surrounding_text},
+        { "SetSurroundingText", _ic_set_surrounding_text }
     };
 
     gint i;
@@ -1038,6 +1109,63 @@ bus_input_context_service_method_call (IBusService            *service,
     g_return_if_reached ();
 }
 
+static gboolean
+bus_input_context_service_set_property (IBusService     *service,
+                                        GDBusConnection *connection,
+                                        const gchar     *sender,
+                                        const gchar     *object_path,
+                                        const gchar     *interface_name,
+                                        const gchar     *property_name,
+                                        GVariant        *value,
+                                        GError         **error)
+{
+    if (g_strcmp0 (interface_name, IBUS_INTERFACE_INPUT_CONTEXT) != 0) {
+        return IBUS_SERVICE_CLASS (bus_input_context_parent_class)->
+            service_set_property (service,
+                                  connection,
+                                  sender,
+                                  object_path,
+                                  interface_name,
+                                  property_name,
+                                  value,
+                                  error);
+    }
+
+    if (g_strcmp0 (property_name, "ContentType") == 0) {
+        BusInputContext *context = (BusInputContext *) service;
+        guint purpose = 0;
+        guint hints = 0;
+
+        g_variant_get (value, "(uu)", &purpose, &hints);
+        if (purpose != context->purpose || hints != context->hints) {
+            GError *error;
+            gboolean retval;
+
+            context->purpose = purpose;
+            context->hints = hints;
+
+            if (context->has_focus && context->engine)
+                bus_engine_proxy_set_content_type (context->engine,
+                                                   purpose,
+                                                   hints);
+
+            error = NULL;
+            retval = bus_input_context_property_changed (context,
+                                                         "ContentType",
+                                                         value,
+                                                         &error);
+            if (!retval) {
+                g_warning ("Failed to emit PropertiesChanged signal: %s",
+                           error->message);
+                g_error_free (error);
+            }
+        }
+        return TRUE;
+    }
+
+    g_return_val_if_reached (FALSE);
+}
+
 gboolean
 bus_input_context_has_focus (BusInputContext *context)
 {
@@ -1066,6 +1194,7 @@ bus_input_context_focus_in (BusInputContext *context)
         bus_engine_proxy_enable (context->engine);
         bus_engine_proxy_set_capabilities (context->engine, context->capabilities);
         bus_engine_proxy_set_cursor_location (context->engine, context->x, context->y, context->w, context->h);
+        bus_engine_proxy_set_content_type (context->engine, context->purpose, context->hints);
     }
 
     if (context->capabilities & IBUS_CAP_FOCUS) {
@@ -1953,6 +2082,7 @@ bus_input_context_enable (BusInputContext *context)
     bus_engine_proxy_enable (context->engine);
     bus_engine_proxy_set_capabilities (context->engine, context->capabilities);
     bus_engine_proxy_set_cursor_location (context->engine, context->x, context->y, context->w, context->h);
+    bus_engine_proxy_set_content_type (context->engine, context->purpose, context->hints);
 }
 
 void
@@ -2057,6 +2187,7 @@ bus_input_context_set_engine (BusInputContext *context,
             bus_engine_proxy_enable (context->engine);
             bus_engine_proxy_set_capabilities (context->engine, context->capabilities);
             bus_engine_proxy_set_cursor_location (context->engine, context->x, context->y, context->w, context->h);
+            bus_engine_proxy_set_content_type (context->engine, context->purpose, context->hints);
         }
     }
     g_signal_emit (context,
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 340a645de..5eb0414b7 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -95,6 +95,8 @@ static GtkWidget *_input_widget = NULL;
 static void     ibus_im_context_class_init  (IBusIMContextClass    *class);
 static void     ibus_im_context_class_fini  (IBusIMContextClass    *class);
 static void     ibus_im_context_init        (GObject               *obj);
+static void     ibus_im_context_notify      (GObject               *obj,
+                                             GParamSpec            *pspec);
 static void     ibus_im_context_finalize    (GObject               *obj);
 static void     ibus_im_context_reset       (GtkIMContext          *context);
 static gboolean ibus_im_context_filter_keypress
@@ -150,6 +152,7 @@ static gboolean _slave_delete_surrounding_cb
                                              IBusIMContext      *context);
 static void     _request_surrounding_text   (IBusIMContext      *context);
 static void     _create_fake_input_context  (void);
+static void     _set_content_type           (IBusIMContext      *context);
 
 
 
@@ -330,6 +333,26 @@ _request_surrounding_text (IBusIMContext *context)
     }
 }
 
+static void
+_set_content_type (IBusIMContext *context)
+{
+#if GTK_CHECK_VERSION (3, 6, 0)
+    if (context->ibuscontext != NULL) {
+        GtkInputPurpose purpose;
+        GtkInputHints hints;
+
+        g_object_get (G_OBJECT (context),
+                      "input-purpose", &purpose,
+                      "input-hints", &hints,
+                      NULL);
+
+        ibus_input_context_set_content_type (context->ibuscontext,
+                                             purpose,
+                                             hints);
+    }
+#endif
+}
+
 
 static gint
 _key_snooper_cb (GtkWidget   *widget,
@@ -499,6 +522,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     im_context_class->set_cursor_location = ibus_im_context_set_cursor_location;
     im_context_class->set_use_preedit = ibus_im_context_set_use_preedit;
     im_context_class->set_surrounding = ibus_im_context_set_surrounding;
+    gobject_class->notify = ibus_im_context_notify;
     gobject_class->finalize = ibus_im_context_finalize;
 
     _signal_commit_id =
@@ -691,6 +715,18 @@ ibus_im_context_init (GObject *obj)
     g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), obj);
 }
 
+static void
+ibus_im_context_notify (GObject    *obj,
+                        GParamSpec *pspec)
+{
+    IDEBUG ("%s", __FUNCTION__);
+
+    if (g_strcmp0 (pspec->name, "input-purpose") == 0 ||
+        g_strcmp0 (pspec->name, "input-hints") == 0) {
+        _set_content_type (IBUS_IM_CONTEXT (obj));
+    }
+}
+
 static void
 ibus_im_context_finalize (GObject *obj)
 {
@@ -803,18 +839,6 @@ 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;
 
@@ -846,6 +870,8 @@ ibus_im_context_focus_in (GtkIMContext *context)
 
     gtk_im_context_focus_in (ibusimcontext->slave);
 
+    _set_content_type (ibusimcontext);
+
     /* set_cursor_location_internal() will get origin from X server,
      * it blocks UI. So delay it to idle callback. */
     gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
diff --git a/src/ibusengine.c b/src/ibusengine.c
index d1bbed70c..6962949e5 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -49,6 +49,7 @@ enum {
     SET_SURROUNDING_TEXT,
     PROCESS_HAND_WRITING_EVENT,
     CANCEL_HAND_WRITING,
+    SET_CONTENT_TYPE,
     LAST_SIGNAL,
 };
 
@@ -68,6 +69,10 @@ struct _IBusEnginePrivate {
     IBusText *surrounding_text;
     guint surrounding_cursor_pos;
     guint selection_anchor_pos;
+
+    /* cached content-type */
+    guint content_purpose;
+    guint content_hints;
 };
 
 static guint            engine_signals[LAST_SIGNAL] = { 0 };
@@ -159,9 +164,17 @@ static void      ibus_engine_process_hand_writing_event
 static void      ibus_engine_cancel_hand_writing
                                              (IBusEngine         *engine,
                                               guint               n_strokes);
+static void      ibus_engine_set_content_type
+                                             (IBusEngine         *engine,
+                                              guint               purpose,
+                                              guint               hints);
 static void      ibus_engine_emit_signal     (IBusEngine         *engine,
                                               const gchar        *signal_name,
                                               GVariant           *parameters);
+static void      ibus_engine_dbus_property_changed
+                                             (IBusEngine         *engine,
+                                              const gchar        *property_name,
+                                              GVariant           *value);
 
 
 G_DEFINE_TYPE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
@@ -249,6 +262,8 @@ static const gchar introspection_xml[] =
     "      <arg type='u' name='keycode' />"
     "      <arg type='u' name='state' />"
     "    </signal>"
+    /* FIXME properties */
+    "    <property name='ContentType' type='(uu)' access='write' />"
     "  </interface>"
     "</node>";
 
@@ -289,6 +304,7 @@ ibus_engine_class_init (IBusEngineClass *class)
     class->process_hand_writing_event
                                 = ibus_engine_process_hand_writing_event;
     class->cancel_hand_writing  = ibus_engine_cancel_hand_writing;
+    class->set_content_type     = ibus_engine_set_content_type;
 
     /* install properties */
     /**
@@ -698,8 +714,6 @@ ibus_engine_class_init (IBusEngineClass *class)
             1,
             G_TYPE_UINT);
 
-    g_type_class_add_private (class, sizeof (IBusEnginePrivate));
-
     /**
      * IBusEngine::set-surrounding-text:
      * @engine: An IBusEngine.
@@ -727,6 +741,40 @@ ibus_engine_class_init (IBusEngineClass *class)
             G_TYPE_UINT,
             G_TYPE_UINT);
 
+    /**
+     * IBusEngine::set-content-type:
+     * @engine: An #IBusEngine.
+     * @purpose: Primary purpose of the input context, as an #IBusInputPurpose.
+     * @hints: Hints that augment @purpose, as an #IBusInputHints.
+     *
+     * 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
+     * signal.
+     *
+     * For example, if the client application wants to restrict input
+     * to numbers, this signal will be emitted with @purpose set to
+     * #IBUS_INPUT_PURPOSE_NUMBER, so the engine can switch the input
+     * mode to latin.
+     *
+     * <note><para>Argument @user_data is ignored in this
+     * function.</para></note>
+     */
+    engine_signals[SET_CONTENT_TYPE] =
+        g_signal_new (I_("set-content-type"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusEngineClass, set_content_type),
+            NULL, NULL,
+            _ibus_marshal_VOID__UINT_UINT,
+            G_TYPE_NONE,
+            2,
+            G_TYPE_UINT,
+            G_TYPE_UINT);
+
+    g_type_class_add_private (class, sizeof (IBusEnginePrivate));
+
     text_empty = ibus_text_new_from_static_string ("");
     g_object_ref_sink (text_empty);
 }
@@ -1004,15 +1052,43 @@ ibus_engine_service_set_property (IBusService        *service,
                                   GVariant           *value,
                                   GError            **error)
 {
-    return IBUS_SERVICE_CLASS (ibus_engine_parent_class)->
-                service_set_property (service,
-                                      connection,
-                                      sender,
-                                      object_path,
-                                      interface_name,
-                                      property_name,
-                                      value,
-                                      error);
+    IBusEngine *engine = IBUS_ENGINE (service);
+
+    if (g_strcmp0 (interface_name, IBUS_INTERFACE_ENGINE) != 0) {
+        return IBUS_SERVICE_CLASS (ibus_engine_parent_class)->
+            service_set_property (service,
+                                  connection,
+                                  sender,
+                                  object_path,
+                                  interface_name,
+                                  property_name,
+                                  value,
+                                  error);
+    }
+
+    if (g_strcmp0 (property_name, "ContentType") == 0) {
+        guint purpose = 0;
+        guint hints = 0;
+
+        g_variant_get (value, "(uu)", &purpose, &hints);
+        if (purpose != engine->priv->content_purpose ||
+            hints != engine->priv->content_hints) {
+            engine->priv->content_purpose = purpose;
+            engine->priv->content_hints = hints;
+
+            g_signal_emit (engine,
+                           engine_signals[SET_CONTENT_TYPE],
+                           0,
+                           purpose,
+                           hints);
+
+            ibus_engine_dbus_property_changed (engine, "ContentType", value);
+        }
+
+        return TRUE;
+    }
+
+    g_return_val_if_reached (FALSE);
 }
 
 static gboolean
@@ -1160,6 +1236,14 @@ ibus_engine_cancel_hand_writing (IBusEngine         *engine,
     // g_debug ("cancel-hand-writing (%u)", n_strokes);
 }
 
+static void
+ibus_engine_set_content_type (IBusEngine *engine,
+                              guint       purpose,
+                              guint       hints)
+{
+    // g_debug ("set-content-type (%u %u)", purpose, hints);
+}
+
 static void
 ibus_engine_emit_signal (IBusEngine  *engine,
                          const gchar *signal_name,
@@ -1173,6 +1257,52 @@ ibus_engine_emit_signal (IBusEngine  *engine,
                               NULL);
 }
 
+static void
+ibus_engine_dbus_property_changed (IBusEngine  *engine,
+                                   const gchar *property_name,
+                                   GVariant    *value)
+{
+    const gchar *object_path;
+    GDBusConnection *connection;
+    GDBusMessage *message;
+    GVariantBuilder *builder;
+    gboolean retval;
+    GError *error;
+
+    /* we cannot use ibus_service_emit_signal() here, since we need to
+       set sender of the signal so that GDBusProxy can properly track
+       the property change. */
+    object_path = ibus_service_get_object_path ((IBusService *)engine);
+    message = g_dbus_message_new_signal (object_path,
+                                         "org.freedesktop.DBus.Properties",
+                                         "PropertiesChanged");
+
+    g_dbus_message_set_sender (message, "org.freedesktop.IBus");
+
+    builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+    g_variant_builder_add (builder, "{sv}", property_name, value);
+    g_dbus_message_set_body (message,
+                             g_variant_new ("(sa{sv}as)",
+                                            IBUS_INTERFACE_ENGINE,
+                                            builder,
+                                            NULL));
+
+    error = NULL;
+    connection = ibus_service_get_connection ((IBusService *)engine);
+    retval = g_dbus_connection_send_message (connection,
+                                             message,
+                                             G_DBUS_SEND_MESSAGE_FLAGS_NONE,
+                                             NULL,
+                                             &error);
+    if (!retval) {
+        g_warning ("Failed to emit PropertiesChanged signal: %s",
+                   error->message);
+        g_error_free (error);
+    }
+    g_object_unref (message);
+    return retval;
+}
+
 IBusEngine *
 ibus_engine_new (const gchar     *engine_name,
                  const gchar     *object_path,
@@ -1423,6 +1553,17 @@ ibus_engine_get_surrounding_text (IBusEngine   *engine,
     // g_debug ("get-surrounding-text ('%s', %d, %d)", (*text)->text, *cursor_pos, *anchor_pos);
 }
 
+void
+ibus_engine_get_content_type (IBusEngine *engine,
+                              guint      *purpose,
+                              guint      *hints)
+{
+    g_return_if_fail (IBUS_IS_ENGINE (engine));
+
+    *purpose = engine->priv->content_purpose;
+    *hints = engine->priv->content_hints;
+}
+
 void
 ibus_engine_register_properties (IBusEngine   *engine,
                                  IBusPropList *prop_list)
diff --git a/src/ibusengine.h b/src/ibusengine.h
index bae63d5cf..81b1d0e6c 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -73,6 +73,8 @@ typedef struct _IBusEnginePrivate IBusEnginePrivate;
  * @has_focus: Whether the engine has focus.
  * @cursor_area: Area of cursor.
  * @client_capabilities: IBusCapabilite (client capabilities) flags.
+ * @client_purpose: IBusInputPurpose (client input purpose).
+ * @client_hints: IBusInputHints (client input hints) flags.
  *
  * IBusEngine properties.
  */
@@ -148,10 +150,14 @@ struct _IBusEngineClass {
     void        (* cancel_hand_writing)
                                     (IBusEngine     *engine,
                                      guint           n_strokes);
+    void        (* set_content_type)
+                                    (IBusEngine     *engine,
+                                     guint           purpose,
+                                     guint           hints);
 
     /*< private >*/
     /* padding */
-    gpointer pdummy[5];
+    gpointer pdummy[4];
 };
 
 GType        ibus_engine_get_type       (void);
@@ -423,13 +429,28 @@ void ibus_engine_delete_surrounding_text(IBusEngine         *engine,
  * #IBusEngine::enable handler, with both @text and @cursor set to
  * %NULL.
  *
- * see_also #IBusEngine::set-surrounding-text
+ * See also: #IBusEngine::set-surrounding-text
  */
-void ibus_engine_get_surrounding_text(IBusEngine         *engine,
-                                      IBusText          **text,
-                                      guint              *cursor_pos,
-                                      guint              *anchor_pos);
+void ibus_engine_get_surrounding_text   (IBusEngine         *engine,
+                                         IBusText          **text,
+                                         guint              *cursor_pos,
+                                         guint              *anchor_pos);
+
 
+/**
+ * ibus_engine_get_content_type:
+ * @engine: An #IBusEngine.
+ * @purpose: (out) (allow-none): Primary purpose of the input context.
+ * @hints: (out) (allow-none): Hints that augument @purpose.
+ *
+ * Get content-type (primary purpose and hints) of the current input
+ * context.
+ *
+ * See also: #IBusEngine::set-content-type
+ */
+void ibus_engine_get_content_type       (IBusEngine         *engine,
+                                         guint              *purpose,
+                                         guint              *hints);
 
 /**
  * ibus_engine_get_name:
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index ac7fffa22..fb0c6e91a 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -685,8 +685,7 @@ ibus_input_context_new (const gchar     *path,
 
     GInitable *initable;
 
-    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
+    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
 
     initable = g_initable_new (IBUS_TYPE_INPUT_CONTEXT,
                                cancellable,
@@ -714,8 +713,7 @@ ibus_input_context_new_async (const gchar         *path,
     g_assert (G_IS_DBUS_CONNECTION (connection));
     g_assert (callback != NULL);
 
-    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES;
+    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
 
     g_async_initable_new_async (IBUS_TYPE_INPUT_CONTEXT,
                                 G_PRIORITY_DEFAULT,
@@ -1057,6 +1055,40 @@ ibus_input_context_needs_surrounding_text (IBusInputContext *context)
     return priv->needs_surrounding_text;
 }
 
+void
+ibus_input_context_set_content_type (IBusInputContext *context,
+                                     guint             purpose,
+                                     guint             hints)
+{
+    g_assert (IBUS_IS_INPUT_CONTEXT (context));
+
+    GVariant *cached_content_type =
+        g_dbus_proxy_get_cached_property ((GDBusProxy *) context,
+                                          "ContentType");
+    GVariant *content_type = g_variant_new ("(uu)", purpose, hints);
+
+    g_variant_ref_sink (content_type);
+    if (cached_content_type == NULL ||
+        !g_variant_equal (content_type, cached_content_type)) {
+        g_dbus_proxy_call ((GDBusProxy *) context,
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new ("(ssv)",
+                                          IBUS_INTERFACE_INPUT_CONTEXT,
+                                          "ContentType",
+                                          content_type),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           NULL, /* cancellable */
+                           NULL, /* callback */
+                           NULL  /* user_data */
+                           );
+    }
+
+    if (cached_content_type != NULL)
+        g_variant_unref (cached_content_type);
+    g_variant_unref (content_type);
+}
+
 void
 ibus_input_context_get_engine_async (IBusInputContext   *context,
                                      gint                timeout_msec,
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index b87a7dcca..0fd6ef88f 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -448,5 +448,25 @@ void         ibus_input_context_set_surrounding_text
 gboolean     ibus_input_context_needs_surrounding_text
                                             (IBusInputContext   *context);
 
+/**
+ * ibus_input_context_set_content_type:
+ * @context: An #IBusInputContext.
+ * @purpose: Primary purpose of the input context, as an #IBusInputPurpose.
+ * @hints: Hints that augment @purpose, as an #IBusInputHints.
+ *
+ * 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
+ * can call this function with @purpose set to
+ * #IBUS_INPUT_PURPOSE_NUMBER.
+ *
+ * See also: #IBusEngine::set-content-type
+ */
+void         ibus_input_context_set_content_type
+                                            (IBusInputContext   *context,
+                                             guint               purpose,
+                                             guint               hints);
+
 G_END_DECLS
 #endif
diff --git a/src/ibustypes.h b/src/ibustypes.h
index d2abeab73..6d30a8669 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -228,5 +228,73 @@ struct _IBusRectangle {
  */
 typedef void (* IBusFreeFunc) (gpointer object);
 
+/**
+ * IBusInputPurpose:
+ * @IBUS_INPUT_PURPOSE_FREE_FORM: Allow any character
+ * @IBUS_INPUT_PURPOSE_ALPHA: Allow only alphabetic characters
+ * @IBUS_INPUT_PURPOSE_DIGITS: Allow only digits
+ * @IBUS_INPUT_PURPOSE_NUMBER: Edited field expects numbers
+ * @IBUS_INPUT_PURPOSE_PHONE: Edited field expects phone number
+ * @IBUS_INPUT_PURPOSE_URL: Edited field expects URL
+ * @IBUS_INPUT_PURPOSE_EMAIL: Edited field expects email address
+ * @IBUS_INPUT_PURPOSE_NAME: Edited field expects the name of a person
+ * @IBUS_INPUT_PURPOSE_PASSWORD: Like @IBUS_INPUT_PURPOSE_FREE_FORM,
+ * but characters are hidden
+ * @IBUS_INPUT_PURPOSE_PIN: Like @IBUS_INPUT_PURPOSE_DIGITS, but
+ * characters are hidden
+ *
+ * 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.
+ *
+ * This enumeration may be extended in the future; engines should
+ * interpret unknown values as 'free form'.
+ */
+typedef enum
+{
+  IBUS_INPUT_PURPOSE_FREE_FORM,
+  IBUS_INPUT_PURPOSE_ALPHA,
+  IBUS_INPUT_PURPOSE_DIGITS,
+  IBUS_INPUT_PURPOSE_NUMBER,
+  IBUS_INPUT_PURPOSE_PHONE,
+  IBUS_INPUT_PURPOSE_URL,
+  IBUS_INPUT_PURPOSE_EMAIL,
+  IBUS_INPUT_PURPOSE_NAME,
+  IBUS_INPUT_PURPOSE_PASSWORD,
+  IBUS_INPUT_PURPOSE_PIN
+} IBusInputPurpose;
+
+/**
+ * IBusInputHints:
+ * @IBUS_INPUT_HINT_NONE: No special behaviour suggested
+ * @IBUS_INPUT_HINT_SPELLCHECK: Suggest checking for typos
+ * @IBUS_INPUT_HINT_NO_SPELLCHECK: Suggest not checking for typos
+ * @IBUS_INPUT_HINT_WORD_COMPLETION: Suggest word completion
+ * @IBUS_INPUT_HINT_LOWERCASE: Suggest to convert all text to lowercase
+ * @IBUS_INPUT_HINT_UPPERCASE_CHARS: Suggest to capitalize all text
+ * @IBUS_INPUT_HINT_UPPERCASE_WORDS: Suggest to capitalize the first
+ *     character of each word
+ * @IBUS_INPUT_HINT_UPPERCASE_SENTENCES: Suggest to capitalize the
+ *     first word of each sentence
+ * @IBUS_INPUT_HINT_INHIBIT_OSK: Suggest to not show an onscreen keyboard
+ *     (e.g for a calculator that already has all the keys).
+ *
+ * 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.
+ */
+typedef enum
+{
+  IBUS_INPUT_HINT_NONE                = 0,
+  IBUS_INPUT_HINT_SPELLCHECK          = 1 << 0,
+  IBUS_INPUT_HINT_NO_SPELLCHECK       = 1 << 1,
+  IBUS_INPUT_HINT_WORD_COMPLETION     = 1 << 2,
+  IBUS_INPUT_HINT_LOWERCASE           = 1 << 3,
+  IBUS_INPUT_HINT_UPPERCASE_CHARS     = 1 << 4,
+  IBUS_INPUT_HINT_UPPERCASE_WORDS     = 1 << 5,
+  IBUS_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
+  IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7
+} IBusInputHints;
+
 #endif
 

From 4adc001208cec701ca8f5fe53154c2c1e93c851e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 15 Aug 2013 15:18:21 +0900
Subject: [PATCH 170/816] Update translations

Update po/LINGUAS po/as.po po/de.po po/es.po po/fr.po po/gu.po
po/hi.po po/hu.po po/ia.po po/it.po po/ja.po po/kn.po po/ko.po
po/ml.po po/mr.po po/nl.po po/or.po po/pa.po po/pl.po po/pt_BR.po
po/ru.po po/uk.po po/ta.po po/te.po po/uk.po po/zh_CN.po po/zh_TW.po

Review URL: https://codereview.appspot.com/12583045
---
 po/LINGUAS  |   1 +
 po/as.po    | 251 +++++++++++++++---------
 po/de.po    | 371 ++++++++++++++++-------------------
 po/es.po    | 164 ++++++++--------
 po/fr.po    | 192 +++++++++---------
 po/gu.po    | 161 +++++++--------
 po/hi.po    | 159 +++++++--------
 po/hu.po    | 167 ++++++++--------
 po/ia.po    | 553 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po    | 392 +++++++++++++++++--------------------
 po/ja.po    | 356 ++++++++++++++++++++++-----------
 po/kn.po    | 409 +++++++++++++++++++-------------------
 po/ko.po    | 196 ++++++++++---------
 po/ml.po    | 154 ++++++++-------
 po/mr.po    | 249 ++++++++++++++---------
 po/nl.po    | 245 ++++++++++++++---------
 po/or.po    | 155 ++++++++-------
 po/pa.po    | 184 ++++++++---------
 po/pl.po    | 267 +++++++++++++++----------
 po/pt_BR.po | 383 +++++++++++++++++-------------------
 po/ru.po    | 376 +++++++++++++++++------------------
 po/ta.po    | 164 ++++++++--------
 po/te.po    | 162 +++++++--------
 po/uk.po    | 248 ++++++++++++++---------
 po/zh_CN.po | 190 +++++++++---------
 po/zh_TW.po | 249 ++++++++++++++---------
 26 files changed, 3727 insertions(+), 2671 deletions(-)
 create mode 100644 po/ia.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 0397fe280..5f67d81f9 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -14,6 +14,7 @@ fr
 gu
 hi
 hu
+ia
 it
 ja
 kn
diff --git a/po/as.po b/po/as.po
index 004ab459a..ca65e5f1c 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,19 +1,19 @@
 # translation of ibus.pot to Assamese
 # Assamese translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Amitakhya Phukan <aphukan@fedoraproject.org>, 2009.
-# Amitakhya Phukan <aphukan@redhat.com>, 2010.
-# ngoswami <ngoswami@redhat.com>, 2011.
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012.
+# Amitakhya Phukan <aphukan@fedoraproject.org>, 2009
+# Amitakhya Phukan <aphukan@redhat.com>, 2010
+# ngoswami <ngoswami@redhat.com>, 2011
+# ngoswami <ngoswami@redhat.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-18 11:07+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-13 08:17+0000\n"
 "Last-Translator: ngoswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgstr "আগৰ ইনপুট পদ্ধতি"
 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 "ইনপুট পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় চৰ্টকাট কি' নিৰ্ধাৰণ কৰক"
 
@@ -126,11 +126,11 @@ msgstr "ভাষাৰ পেনেল দেখুৱাওক:"
 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 "ভাষাৰ বাৰত ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
@@ -189,15 +189,15 @@ msgid ""
 msgstr "<small><i>অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\nতাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।</i></small>"
 
 #. 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) বিন্যাস ব্যৱহাৰ কৰক"
 
@@ -205,7 +205,7 @@ msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কিবৰ্ডৰ বিন্যাস</b>"
 
-#: ../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 "সকলো এপ্লিকেচনৰ মাজত একেই ইনপুট পদ্ধতি অংশীদাৰী কৰক"
 
@@ -239,18 +239,6 @@ msgstr "<b>আৰম্ভণি</b>"
 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 "ইঞ্জিনসমূহ আগতে ল'ড কৰক"
@@ -268,114 +256,139 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল 400. 0 = উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 &lt; মিলিছেকেণ্ডত বিলম্ব। 0 &gt; উইন্ডো নেদেখুৱাব আৰু পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।"
+
+#: ../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 "ভাষাৰ পেনেলৰ আচৰণ। ০ = মেনুত প্ৰোথিত, ১ = স্বচালিতভাৱে লুকাওক, ২ = সদায় দেখুৱাওক"
 
-#: ../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 "লুকআপ টেবুলৰ দিশ। ০ = আনুভূমিক, ১ = উলম্ব"
 
-#: ../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 কি'সমূহৰ উপসৰ্গসমূহ"
 
@@ -389,30 +402,30 @@ msgstr "স্বত্বাধিকাৰ (c) ২০০৭-২০১০ প
 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"
 
@@ -432,27 +445,19 @@ msgstr "কি'ৰ ক'ড:"
 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 "পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলৈ চুইচ কৰিবলে shift ৰ সৈতে চৰ্টকাট ব্যৱহাৰ কৰক"
 
 #: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -477,73 +482,137 @@ msgstr "IBus ডিমনক %d ছেকেণ্ডত আৰম্ভ কৰ
 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 "কমান্ড [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:185
+#: ../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: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) 2007-2012 পেং হুৱাং\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "পুনাৰম্ভ"
diff --git a/po/de.po b/po/de.po
index 6aebb882e..55382b414 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,27 +1,26 @@
 # translation of ibus.pot to German
 # German translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
+# 
 # Translators:
-# Fabian Affolter <fab@fedoraproject.org>, 2009.
-# Hedda Peters <hpeters@redhat.com>, 2009.
-# Mario Blättermann <mariobl@freenet.de>, 2011.
+# Fabian Affolter <fab@fedoraproject.org>, 2009
+# hpeters <hpeters@redhat.com>, 2009
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2011
+# Roman Spirgi <bigant@fedoraproject.org>, 2012
 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-06-23 14:37+0000\n"
-"Last-Translator: mariobl <mariobl@freenet.de>\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 <bigant@fedoraproject.org>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -32,45 +31,44 @@ msgid "Vertical"
 msgstr "Vertikal"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "In Menü eingebettet"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Wenn aktiv"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Immer"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Ecke oben links"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Ecke oben rechts"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Ecke unten links"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Ecke unten rechts"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "In Menü eingebettet"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Wenn aktiv"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Immer"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus-Einstellungen"
 
 #: ../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:"
@@ -78,8 +76,7 @@ msgstr "Nächste Eingabemethode:"
 
 #: ../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:"
@@ -89,7 +86,7 @@ msgstr "Vorherige Eingabemethode:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
@@ -119,8 +116,7 @@ msgstr "Ausrichtung der Kandidaten:"
 
 #: ../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:"
@@ -130,19 +126,17 @@ msgstr "Sprach-Panel anzeigen:"
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
 #: ../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"
@@ -166,55 +160,44 @@ msgstr "Allgemein"
 
 #: ../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"
 msgstr "Informationen zur gewählten Eingabemethode anzeigen"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Informationen zur gewählten Eingabemethode anzeigen"
+msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster "
-"Stelle.\n"
-"Sie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
+msgstr "<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\nSie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
@@ -222,7 +205,7 @@ msgstr "System-Tastatur (XKB) Belegung verwenden"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
@@ -242,13 +225,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Der intelligente Eingabe-Bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Der intelligente Eingabe-Bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -284,163 +261,169 @@ msgstr "Engines vorladen, während IBus startet"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Engine-Reihenfolge"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Gespeicherte Engine-Reihenfolge in der Eingabemethoden-Liste"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Popup-Verzögerung für IME-Wechsel-Fenster in Millisekunden"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Verzögerung in Millisekunden. 0 &gt; Fenster nicht anzeigen und zur vorhergehenden/ nachfolgenden Engine wechseln."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Auslöser-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Tastenkombinationen auslösen für gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "Tastenkürzel aktivieren"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "Tastenkürzel deaktivieren"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Nächste Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Vorherige Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Automatisch verstecken"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Position des Sprach-Panels"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Name der Eingabemethode anzeigen"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 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:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
 #: ../ibus/_config.py.in:41
 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"
 msgstr "Sonstige"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturbelegung: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Beschreibung:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Eingabemethode wählen"
 
@@ -464,123 +447,109 @@ msgstr "Tasten-Code:"
 msgid "Modifiers:"
 msgstr "Hilfstasten:"
 
-#: ../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 ""
-"Bitte eine Taste (oder eine Tastenkombination drücken).\n"
-"Der Dialog wird geschlossen, wenn die Taste losgelassen wird."
+msgstr "Bitte eine Taste (oder eine Tastenkombination drücken).\nDer Dialog wird geschlossen, wenn die Taste losgelassen wird."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "Auslöser"
+#: ../setup/main.py:99 ../setup/main.py:398
+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:80
-msgid "enable"
-msgstr "aktivieren"
-
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "deaktivieren"
-
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-Daemon wurde nicht gestartet. Möchten Sie ihn jetzt starten?"
+msgstr "Der IBus-Dienst läuft nicht. Möchten Sie ihn starten?"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../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"
-"  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 "
-"folgende Zeilen in $HOME/.bashrc hinzu und melden sich neu am Desktop an.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:367
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus-Dienst konnte innerhalb von %d Sekunden nicht gestartet werden"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ist ein intelligenter Eingabe-Bus für Linux/Unix."
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "Eingabemethoden wechseln"
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr ""
-"Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
-"Hedda Peters <hpeters@redhat.com>, 2009."
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Nur Engine-Name auflisten"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Neustart"
-
-#~ msgid "Previous page"
-#~ msgstr "Vorherige Seite"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "Befehl [OPTIONEN]"
 
-#~ msgid "Next page"
-#~ msgstr "Nächste Seite"
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Keine Verbindung zu IBus.\n"
 
-#~ 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"
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "Sprache: %s\n"
 
-#~ msgid "Later"
-#~ msgstr "Später"
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Keine Engine gesetzt.\n\n"
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus-Panel"
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus-Eingabemethode-Framework"
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
 
-#~ msgid "Turn off input method"
-#~ msgstr "Eingabemethode ausschalten"
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Anwendung: %s BEFEHL [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "Kein Eingabefenster"
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "Befehle:\n"
 
-#~ msgid "About the input method"
-#~ msgstr "Über die Eingabemethode"
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ist ein unbekannter Befehl!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "Eingabemethode wechseln"
+#: ../ui/gtk3/panel.vala:498
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "Info zu Eingabemethoden"
+#: ../ui/gtk3/panel.vala:503
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ist ein intelligenter Eingabe-Bus für Linux/Unix."
 
-#~ msgid "next input method"
-#~ msgstr "Nächste Eingabemethode"
+#: ../ui/gtk3/panel.vala:507
+msgid "translator-credits"
+msgstr "Fabian Affolter <fab@fedoraproject.org>, 2009.\nHedda Peters <hpeters@redhat.com>, 2009."
 
-#~ msgid "previous input method"
-#~ msgstr "Vorherige Eingabemethode"
+#: ../ui/gtk3/panel.vala:539
+msgid "Restart"
+msgstr "Neustart"
diff --git a/po/es.po b/po/es.po
index 2e090cdc0..86cb6f61b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,21 +1,21 @@
 # translation of ibus.pot to Spanish
 # Spanish translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011.
-# Daniel Cabrera <logan@fedoraproject.org>, 2011.
-# Domingo Becker <domingobecker@gmail.com>, 2012.
-# Gladys Guerrero <gguerrer@redhat.com>, 2012.
-# Héctor Daniel Cabrera <logan@fedoraproject.org>, 2011.
+# Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011
+# Daniel Cabrera <logan@fedoraproject.org>, 2011
+# Domingo Becker <domingobecker@gmail.com>, 2012
+# Gladys Guerrero <gguerrer@redhat.com>, 2012-2013
+# Daniel Cabrera <logan@fedoraproject.org>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-11 14:13+0000\n"
-"Last-Translator: Domingo Becker <domingobecker@gmail.com>\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 <gguerrer@redhat.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +87,7 @@ msgstr "Método de entrada anterior:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 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 +127,11 @@ msgstr "Mostrar el panel de idioma:"
 msgid "Language panel position:"
 msgstr "Posición del panel de idioma:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 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:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
@@ -194,11 +194,11 @@ msgstr "<small><i>El método de entrada determinado está al comienzo de la list
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar el diseño del teclado del sistema (XKB)"
 
@@ -206,7 +206,7 @@ msgstr "Usar el diseño del teclado del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Diseño del Teclado</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
@@ -269,114 +269,129 @@ msgid "Saved engines order in input method list"
 msgstr "Orden de las máquinas guardada en la lista de métodos de entrada"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Retraso en milisegundos de Popup para ventana del interruptor 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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Demora en milisegundos. 0 &gt; No muestra la ventana ni los motores siguientes o anteriores."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Activadora de los Atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Activador de llaves de atajos para leer gtk_accelerator "
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "Habilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 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:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "Inhabilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 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:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Atajo de teclado para el siguiente motor"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Atajo de teclado para la máquina previa"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 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:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Auto Ocultar"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Posición del panel de idioma"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 msgstr "La posicion el panel de idioma. 0 = esquina superior izquierda, 1 = esquina superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior derecha, 4 = personalizado"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Orientación de búsqueda en la tabla "
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 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:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Mostrar el nombre del método de entrada"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada en forma predeterminada"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 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:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -390,26 +405,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Otro"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Diseño del teclado: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Descripción:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
@@ -433,33 +448,25 @@ msgstr "Código clave:"
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
-#: ../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 "Por favor, presione una tecla (o una combinación de tecla).\nEl diálogo será cerrado cuando la tecla sea soltada."
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "activador"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "habilitar"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "Inhabilitar"
+#: ../setup/main.py:99 ../setup/main.py:398
+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:331
+#: ../setup/main.py:332
 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:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -468,16 +475,20 @@ msgid ""
 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
+#: ../setup/main.py:367
 #, 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:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "Cambiando métodos de entrada"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
@@ -486,7 +497,7 @@ msgstr "Listar sólo los nombres de máquinas"
 msgid "command [OPTIONS]"
 msgstr "comando [OPCIONES]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
@@ -496,55 +507,50 @@ msgstr "No se puede conectar a IBus.\n"
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "El cambio del diseño de xkb a %s falló."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "USO: %s COMANDO [OPCION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 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:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "Reiniciar"
diff --git a/po/fr.po b/po/fr.po
index 7a9844bb8..30d06b988 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,22 +1,22 @@
 # translation of ibus.pot to French
 # French translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009.
 # dominique bribanick <chepioq@gmail.com>, 2011.
 # Humbert Julien <julroy67@gmail.com>, 2009, 2010.
-#   <jfenal@gmail.com>, 2012.
+# Jérôme Fenal <jfenal@gmail.com>, 2012, 2013.
 # Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011.
 # Sam Friedmann <sam.friedmann@redhat.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-15 03:22+0000\n"
-"Last-Translator: dominique <chepioq@gmail.com>\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-03-10 21:30+0000\n"
+"Last-Translator: Jérôme Fenal <jfenal@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,7 +88,7 @@ msgstr "Méthode d'entrée précédente :"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 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"
 
@@ -128,11 +128,11 @@ msgstr "Afficher la barre de langue :"
 msgid "Language panel position:"
 msgstr "Afficher la barre de langue :"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 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:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
 
@@ -195,11 +195,11 @@ msgstr "<small><i>La méthode d'entrée par défaut se trouve en haut de la list
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
@@ -207,7 +207,7 @@ msgstr "Utiliser la disposition clavier système (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Partager la même méthode d'entrée pour toutes les applications"
 
@@ -263,123 +263,138 @@ msgstr "Précharger les moteurs au démarrage d'ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Ordre des moteurs"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
 #: ../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"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; ne pas afficher la fenêtre et commmuteur avec le moteur précédent ou suivant."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Raccourci clavier déclencheur"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Raccourci clavier déclencheur pour gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "Activer les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 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:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "Désactiver les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 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:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Raccourci clavier pour passer au moteur suivant"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Raccourci clavier pour revenir au moteur précédent"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 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:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Masquage automatique"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Position de la barre"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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é"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 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:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Afficher le nom de la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langue"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour le panneau de langue"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d'édition"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 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:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 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"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "Préfixes de préservation de nom DConf"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -391,26 +406,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Autre"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Langue : %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposition du clavier : %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur : %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Description :\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d'entrée"
 
@@ -434,118 +449,109 @@ msgstr "Touche :"
 msgid "Modifiers:"
 msgstr "Modificateurs :"
 
-#: ../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 "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:253
+#: ../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:87
-msgid "trigger"
-msgstr "déclencheur"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "activer"
+#: ../setup/main.py:99 ../setup/main.py:398
+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"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "désactiver"
-
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer ?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr ""
+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:366
+#: ../setup/main.py:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "Le démon IBus n'a pas pu être démarré en %d secondes"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Raccourci clavier pour %s"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "Changer de méthodes d'entrée"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
-msgstr ""
+msgstr "Ne lister que les noms des moteurs"
 
 #: ../tools/main.vala:44
 msgid "command [OPTIONS]"
-msgstr ""
+msgstr "commande [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "Connexion à IBus impossible.\n"
 
 #: ../tools/main.vala:82
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "langue : %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "Aucun moteur n'est configuré.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr ""
-
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr ""
+msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
+msgstr "Utilisation : %s COMMANDE [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
-msgstr ""
+msgstr "Commandes :\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s n'est pas unecommande connue !\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "Redémarrer"
diff --git a/po/gu.po b/po/gu.po
index cb884492b..442be8419 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,18 +1,19 @@
 # translation of ibus.pot to Gujarati
 # Gujarati translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Ankit Patel <ankit@redhat.com>, 2010.
-# Sweta Kothari <swkothar@redhat.com>, 2009-2010.
-# sweta <swkothar@redhat.com>, 2011-2012.
+# Ankit Patel <ankit@redhat.com>, 2010
+# sweta <swkothar@redhat.com>, 2009-2010
+# sweta <swkothar@redhat.com>, 2011-2012
+# sweta <swkothar@redhat.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.gu\n"
+"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-20 09:23+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-04-01 06:06+0000\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +86,7 @@ msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ઇનપુટ પદ્દતિને ફેરબદલી કરવાનું ચાલુ અથવા ા બંધ કરવા માટે ટૂંકાણ કીઓ"
 
@@ -125,11 +126,11 @@ msgstr "ભાષા પેનલને બતાવો:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ નામને બતાવો"
 
@@ -192,11 +193,11 @@ msgstr "<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યા
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
 
@@ -204,7 +205,7 @@ msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
 
@@ -267,114 +268,129 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = વિન્ડોને તરત જ બતાવો. 0 &lt; મિલિસેકંડમાં વિલંબ. 0 &gt; વિન્ડોને બતાવો નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "ટ્રીગર ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse માટે ટ્રીગર ટૂંકાણ કી"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "ટૂંકાણ કીઓને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "ઇનપુટ પદ્દતિને ચાલુ કરવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "ટૂંકાણ કીઓને નિષ્ક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "ઇનપુટ પદ્દતિને બંધ કરવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "પછીની એંજિન ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "પહેલાંની એંજિન ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને લાવવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "આપમેળે છુપાવો"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "ભાષા પેનલ સ્થાન"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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 "ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "કોષ્ટકને જોવાની દિશા"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "કોષ્ટકને જોવાની દિશા. 0 = આડુ, 1 = ઊભુ "
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "વૈવિધ્ય ફોન્ટ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf નામ ઉપસર્ગને સાચવે છે"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "નામનું રૂપાંતરણને બંધ કરવા માટે DConf કીઓનાં ઉપસર્ગો"
 
@@ -388,26 +404,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "ઇનપુટ પદ્દતિને પસંદ કરો"
 
@@ -431,33 +447,25 @@ msgstr "કિ કોડ:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "પહેલાંની ઇનપુટ પદ્દતિને બદલવા shift સાથે ટૂંકાણ વાપરો"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ડિમન ચાલી રહ્યુ નથી. શું તમે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -466,16 +474,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ઇનપુટ પદ્દતિને બદલી રહ્યા છે"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "ફક્ત એંજિન નામની યાદી કરો"
@@ -484,7 +496,7 @@ msgstr "ફક્ત એંજિન નામની યાદી કરો"
 msgid "command [OPTIONS]"
 msgstr "આદેશ [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus માં જોડી શકાતુ નથી.\n"
@@ -494,55 +506,50 @@ msgstr "IBus માં જોડી શકાતુ નથી.\n"
 msgid "language: %s\n"
 msgstr "ભાષા: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "એજિંન સુયોજિત નથી.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "વૈશ્ર્વિક એંજિનને સુયોજિત કરવામાં નિષ્ફળતા.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "વૈશ્ર્વિક એંજિનને મેળવવામાં નિષ્ફળતા.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "%s માં xkb લેઆઉટને બદલવામાં નિષ્ફળતા."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "વપરાશ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "આદેશો:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s એ અજ્ઞાત આદેશ છે!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
diff --git a/po/hi.po b/po/hi.po
index c92501a12..877f4a3ad 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,19 +1,20 @@
 # translation of ibus.pot to Hindi
 # Hindi translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Rajesh Ranjan <rajesh672@gmail.com>, 2009.
-# Rajesh Ranjan <rranjan@redhat.com>, 2009,2011-2012.
+# Rajesh Ranjan <rajesh672@gmail.com>, 2009
+# Rajesh Ranjan <rranjan@redhat.com>, 2009,2011-2012
+# Rajesh Ranjan <rranjan@redhat.com>, 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-21 07:21+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-04-15 08:25+0000\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
-"Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
+"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr "पिछली इनपुट विधि:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "इनपुट विधि को चालू या बंद रखने के लिए शॉर्टकट कुंजी"
 
@@ -124,11 +125,11 @@ msgstr "भाषा पैनल दिखाएँ:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ"
 
@@ -191,11 +192,11 @@ msgstr "<small><i>तयशुदा इनपुट विधि सूची 
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "तंत्र कुंजीपट (XKB) लेआउट का प्रयोग करें"
 
@@ -203,7 +204,7 @@ msgstr "तंत्र कुंजीपट (XKB) लेआउट का प
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कुंजीपट लेआउट</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "सभी अनुप्रयोगों के बीच समान इनपुट विधि को साझा करें"
 
@@ -266,114 +267,129 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME स्विचर विंडो दिखाने के लिए पॉपअप विलंब को मिलीसेकेंड में सेट करें. तयशुदा है400. 0 = विंडो को तत्काल दिखाएँ. 0 &lt; मिलीसेकेंड विलंब. 0 &gt; विंडो को मत दिखाएँ और पिछला/अगला इंजन में स्विच करें."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "शॉर्टकट कुंजी ट्रिगर करें"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse के लिए शॉर्टकट कुंजी ट्रिगर करें"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "शॉर्टकट कुँजियाँ सक्रिय करें"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "इनपुट विधि को चालू करने के लिए शॉर्टकट कुँजियाँ"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "शॉर्टकट कुँजियाँ निष्क्रिय करें"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "इनपुट विधि को बंद करने के लिए शॉर्टकट कुँजियाँ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "अगला इंजन शॉर्टकट कुंजी"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "पिछला इंजन शॉर्टकट कुंजी"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजियाँ"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "स्वतः छुपाएँ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "भाषा पैनल स्थिति"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "लुकअप सारणी की दिशा"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "सारणी देखने के लिए दिशा. 0 = क्षैतिज, 1 = लंबवत"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "इनपुट विधि नाम दिखाएँ"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "मनपसंद फ़ॉन्ट"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "पूर्वसंपादित पाठ अंतःस्थापित करें"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "लक्ष्य इनपुट विधि का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "जब अनुप्रयोग इनपुट फोकस पाता है तो इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf नाम उपसर्ग को संरक्षित करता है"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf कुँजी का उपसर्ग नाम वार्तालाप रोकने के लिए"
 
@@ -387,26 +403,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "कोई इनपुट विधि चुनें"
 
@@ -430,33 +446,25 @@ msgstr "कुंजी कोड:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "पिछले इनपुट विधि में जाने के लिए शिफ्ट के साथ शॉर्टकट का उपयोग करें"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus डेमॉन चल नहीं रहा है. क्या आप इसे आरंभ करना चाहते हैं?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -465,16 +473,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus %d सेकेंड में आरंभ नहीं हो सका"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "इनपुट विधि स्विच कर रहा है"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "इंजन नाम को केवल सूचीबद्ध करता है"
@@ -483,7 +495,7 @@ msgstr "इंजन नाम को केवल सूचीबद्ध क
 msgid "command [OPTIONS]"
 msgstr "command [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus में कनेक्ट नहीं हो सकता है.\n"
@@ -493,55 +505,50 @@ msgstr "IBus में कनेक्ट नहीं हो सकता ह
 msgid "language: %s\n"
 msgstr "भाषा: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "कोई इंजन सेट नहीं.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "वैश्विक इंजन विफल के रूप में सेट करें.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "वैश्विक इंजन विफल पाएँ.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb लेआउट को %s विफल में स्विच करें."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "प्रयोग: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "कमांड:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s अज्ञात कमांड है!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "कॉपीराइट (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "राजेश रंजन (rranjan@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "पुनः प्रारंभ करें"
diff --git a/po/hu.po b/po/hu.po
index c5925e6ee..d74bb870d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,18 +1,19 @@
 # translation of ibus.pot to Hungarian
 # Hungarian translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# kelemeng <kelemeng@gnome.hu>, 2011.
-# Sulyok Péter <peti@fedoraproject.org>, 2009.
-# Zoltan Hoppár <hopparz@gmail.com>, 2012.
+# kelemeng <kelemeng@gnome.hu>, 2011
+# kelemeng <kelemeng@gnome.hu>, 2011
+# Sulyok Péter <peti@fedoraproject.org>, 2009
+# Zoltan Hoppár <hopparz@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-02 17:30+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-01-09 18:26+0000\n"
 "Last-Translator: Zoltan Hoppár <hopparz@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +86,7 @@ msgstr "Előző beviteli mód:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
@@ -125,11 +126,11 @@ msgstr "Nyelv panel megjelenítése:"
 msgid "Language panel position:"
 msgstr "A nyelvi panel elhelyezése:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 msgid "Show icon on system tray"
 msgstr "Ikon megjelenítése az értesítési területen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
 
@@ -192,11 +193,11 @@ msgstr "<small><i>Az alapértelmezett beviteli mód a listában a legfelső.\nEz
 msgid "Input Method"
 msgstr "Beviteli mód"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "Rendszer-billentyűzetkiosztás használata"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
@@ -204,7 +205,7 @@ msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
@@ -264,117 +265,132 @@ msgstr "Alrendszerek sorrendje"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr "Elmentett alrendszerek sorrendje a beviteli metódus listájában"
+msgstr "Elmentett motorok sorrendje a beviteli metódus listájában"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Felugró ablak késése az IME váltóablaknál"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Késés milliszekundumban. 0 &gt; 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"
 msgstr "Aktiválja a gyorsbillentyűket"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Alkalmazza a gyorsbillentyűket a  gtk_accelerator_parse részére"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "Gyorsbillentyűk engedélyezése"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "Gyorsbillentyűk letiltása"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Következő alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../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ű"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Előző alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Automatikus elrejtés"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Nyelvi panel pozíciója"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Keresési tábla tájolása"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Beviteli mód megjelenítése"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Egyéni betűkészlet használata"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Egyéni betűkészlet használata a nyelv panelen"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Egyéni betűkészlet"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../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"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf megtartja a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
 
@@ -388,26 +404,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Nyelv: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Billentyűzetkiosztás: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Szerző: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Leírás:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Válasszon beviteli módot"
 
@@ -431,33 +447,25 @@ msgstr "Billentyűkód:"
 msgid "Modifiers:"
 msgstr "Módosítók:"
 
-#: ../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 "Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\nAz ablak a billentyű felengedésekor bezáródik."
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "aktiváló"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "engedélyezés"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "letiltás"
+#: ../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"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Az IBus daemon nem működik. El kívánja indítani?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -466,16 +474,20 @@ msgid ""
 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:366
+#: ../setup/main.py:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus daemon nem indítható %d mp belül."
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "beviteli módok váltása"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevét listázza"
@@ -484,7 +496,7 @@ msgstr "Csak az alrendszerek nevét listázza"
 msgid "command [OPTIONS]"
 msgstr "parancs [OPCIÓK]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "Nem tudok csatlakozni az IBus-hoz.\n"
@@ -494,55 +506,50 @@ msgstr "Nem tudok csatlakozni az IBus-hoz.\n"
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
-msgstr "Nincs engine beállítva.\n"
+msgstr "Nincs motor beállítva.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr "Általános engine beállítása nem sikerült.\n"
+msgstr "Általános motor beállítása nem sikerült.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr "Általános engine beszerzése nem sikerült.\n"
-
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "Az xkb kiosztás átváltása %s nem sikerült."
+msgstr "Általános motor beszerzése nem sikerült.\n"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Használat: %s PARANCS [OPCIÓK...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ismeretlen parancs!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Szerzői jog (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 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"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "Újraindítás"
diff --git a/po/ia.po b/po/ia.po
new file mode 100644
index 000000000..071369235
--- /dev/null
+++ b/po/ia.po
@@ -0,0 +1,553 @@
+# translation of ibus.pot to Interlingua
+# Interlingua translation of ibus.
+# Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Nik Kalach <nikka@fedoraproject.org>, 2013
+# Nik Kalach <nik.kalach@inbox.ru>, 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-28 01:32+0000\n"
+"Last-Translator: Nik Kalach <nik.kalach@inbox.ru>\n"
+"Language-Team: Interlingua <trans-ia@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertical"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Angulo superior siniste"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Angelo superior dextere"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Angulo inferior sinistre"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Angulo inferior dextere"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Personalisate"
+
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Inserite in le menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Quando active"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Sempre"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferentias IBus"
+
+#: ../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"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Methodo de ingresso sequente:"
+
+#: ../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"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Methodo de ingresso precedente"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Le claves acceleratori pro activar e disactivar le methodo de ingresso"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Activar o disactivar:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Activar:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Disactivar:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Claves acceleratori</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Configurar le orientation del tabula de cerca de candidatos"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientation de candidatos:"
+
+#: ../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"
+
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "Monstrar le pannello de lingua:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Position del pannello de lingua:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+msgid "Show icon on system tray"
+msgstr "Monstrar le icone in le area de indicatores"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+msgid "Show input method name on language bar"
+msgstr "Monstrar le nomine del methodo de ingresso sur le barra de lingua"
+
+#: ../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 "
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Inserer le texto pre-editate in le fenestra de application"
+
+#: ../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"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Usar characteres personalisate:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Typo de characteres e stilo</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "General"
+
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Adder le methodo de ingresso seligite al methodos de ingresso active"
+
+#: ../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"
+
+#: ../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"
+
+#: ../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"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "Monstrar le information del methodo de ingresso seligite"
+
+#: ../setup/setup.ui.h:40
+msgid "Show setup of the selected input method"
+msgstr "Monstrar le configuration del methodo de ingresso seligite"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr "<small><i>Le methodo de ingresso predefinite es le entrata superior del lista.\nUsar le buttones 'supra' e 'infra' pro cambiar lo.</i></small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+msgid "Input Method"
+msgstr "Methodo de ingresso"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+msgid "Use system keyboard layout"
+msgstr "Usar le disposition de claviero del systema"
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usar le disposition de claviero del systema (XKB)"
+
+#: ../setup/setup.ui.h:46
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposition de claviero</b>"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+msgid "Share the same input method among all applications"
+msgstr "Usar le mesme methodo de ingresso pro tote le applicationes"
+
+#: ../setup/setup.ui.h:48
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configuration del methodo de ingresso global</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "Avantiate"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Le bus de ingresso intelligente</small>\nPagina del projecto: http://code.google.com/p/ibus\n\n\n\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "Initiar ibus al connexion"
+
+#: ../setup/setup.ui.h:58
+msgid "<b>Startup</b>"
+msgstr "<b>Initiation</b>"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "A proposito"
+
+#: ../bus/ibus.desktop.in.h:1
+msgid "IBus"
+msgstr "IBus"
+
+#: ../bus/ibus.desktop.in.h:2
+msgid "Input Method Framework"
+msgstr "Infrastructura de methodos de ingresso"
+
+#: ../bus/ibus.desktop.in.h:3
+msgid "Start IBus Input Method Framework"
+msgstr "Initiar le systema de methodos de ingresso IBus"
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr "Precargar le ingenios"
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr "Precargar le ingenios durante le initiation de ibus"
+
+#: ../data/ibus.schemas.in.h:3
+msgid "Engines order"
+msgstr "Ordine de ingenios"
+
+#: ../data/ibus.schemas.in.h:4
+msgid "Saved engines order in input method list"
+msgstr "Le ordine de ingenios registrate in le lista de methodos de ingresso"
+
+#: ../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"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; demora (in ms). 0 &gt; non monstrar le fenestra e commutar inter ingenios precedente o sequente."
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Trigger shortcut keys"
+msgstr "Activator de claves acceleratori"
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Activator de claves acceleratori pro gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:10
+msgid "Enable shortcut keys"
+msgstr "Activar claves acceleratori"
+
+#: ../data/ibus.schemas.in.h:11
+msgid "The shortcut keys for turning input method on"
+msgstr "Le combination de claves pro activar le methodo de ingresso"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "Disable shortcut keys"
+msgstr "Disactivar claves acceleratori"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "The shortcut keys for turning input method off"
+msgstr "Le combination de claves pro disactivar le methodo de ingresso"
+
+#: ../data/ibus.schemas.in.h:14
+msgid "Next engine shortcut keys"
+msgstr "Claves acceleratori del ingenio sequente"
+
+#: ../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"
+
+#: ../data/ibus.schemas.in.h:16
+msgid "Prev engine shortcut keys"
+msgstr "Claves acceleratori del ingenio precedente"
+
+#: ../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"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Auto hide"
+msgstr "Occultar automaticamente"
+
+#: ../data/ibus.schemas.in.h:19
+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"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Language panel position"
+msgstr "Position del pannello de lingua"
+
+#: ../data/ibus.schemas.in.h:21
+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"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Orientation of lookup table"
+msgstr "Orientation del tabula de cerca"
+
+#: ../data/ibus.schemas.in.h:23
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientation del tabula de cerca. 0 = horizontal, 1 = vertical"
+
+#: ../data/ibus.schemas.in.h:25
+msgid "Show input method name"
+msgstr "Monstrar le nomine del methodo de ingresso"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Use custom font"
+msgstr "Usar characteres personalisate"
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Use custom font name for language panel"
+msgstr "Usar un typo de characteres personalisate pro le pannello de lingua"
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Custom font"
+msgstr "Characteres personalisate"
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Custom font name for language panel"
+msgstr "Nomine del typo de characteres personalisate pro le pannello de lingua"
+
+#: ../data/ibus.schemas.in.h:33
+msgid "Embed Preedit Text"
+msgstr "Inserer le texto pre-editate"
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Embed Preedit Text in Application Window"
+msgstr "Inserer le texto pre-editate in le fenestra de application"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Use global input method"
+msgstr "Usar le methodo de ingresso global"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Enable input method by default"
+msgstr "Activar le methodo de ingresso predefinite"
+
+#: ../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"
+
+#: ../data/ibus.schemas.in.h:39
+msgid "DConf preserve name prefixes"
+msgstr "DConf preserva le prefixos de nomines"
+
+#: ../data/ibus.schemas.in.h:40
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefixos de claves DConf pro parar le conversion de nomines"
+
+#: ../ibus/_config.py.in:41
+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."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Altere"
+
+#: ../setup/engineabout.py:68
+#, python-format
+msgid "Language: %s\n"
+msgstr "Lingua: %s\n"
+
+#: ../setup/engineabout.py:71
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Disposition de claviero: %s\n"
+
+#: ../setup/engineabout.py:74
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: ../setup/engineabout.py:77
+msgid "Description:\n"
+msgstr "Description:\n"
+
+#: ../setup/enginecombobox.py:130
+msgid "Select an input method"
+msgstr "Seliger un methodo de ingresso"
+
+#: ../setup/enginetreeview.py:92
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Definir preferentias IBus"
+
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "Claves acceleratori"
+
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "Codice de clave:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "Modificatores:"
+
+#: ../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 "Preme un clave (o un combination de claves).\nLe dialogo se claudera quando le clave es liberate."
+
+#: ../setup/keyboardshortcut.py:252
+msgid "Please press a key (or a key combination)"
+msgstr "Preme un clave (o combination de claves)"
+
+#: ../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"
+
+#: ../setup/main.py:332
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Le demonio IBus non functiona. Initiar lo?"
+
+#: ../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"
+"  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
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Le demonio IBus non pote initiar se in %d secundas"
+
+#: ../setup/main.py:379
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selige le clave acceleratori pro %s"
+
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "cambiamento de methodos de ingresso"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Monstrar solmente nomines de ingenios"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "commando [OPTIONES]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Le connexion a IBus es impossibile.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "lingua: %s\n"
+
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Necun ingenio es configurate.\n"
+
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Falta al configuration del ingenio global.\n"
+
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Falta al obtener le ingenio global.\n"
+
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Usage: %s COMMANDO [OPTION...]\n\n"
+
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "Commandos:\n"
+
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s es un commando incognite!\n"
+
+#: ../ui/gtk3/panel.vala:498
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+
+#: ../ui/gtk3/panel.vala:503
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus es un bus de ingresso intelligente pro Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:507
+msgid "translator-credits"
+msgstr "Nik Kalach <nikka@fedoraproject.org>"
+
+#: ../ui/gtk3/panel.vala:539
+msgid "Restart"
+msgstr "Reinitiar"
diff --git a/po/it.po b/po/it.po
index 5af4476d8..f9d0a8159 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,26 +1,27 @@
-# translation of ibus.master.po to
-# translation of it.po to
-# Italian translation for ibus
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# Copyright (c) 2009 the ibus copyright holder
+# translation of ibus.pot to Italian
+# Italian translation of ibus.
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# Sergio Zanchetta <primes2h@ubuntu.com> 2009
+# 
+# Translators:
+# fvalen <fvalen@redhat.com>, 2013
+# fvalen <fvalen@redhat.com>, 2012
 # Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione@ubuntu-it.org>, 2009
-# Milo Casagrande <milo@ubuntu.com>, 2009.
+# milo <milo@ubuntu.com>, 2009
+# primes2h <primes2h@ubuntu.com>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-07-30 08:36+1000\n"
-"Last-Translator: \n"
+"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 03:21+0000\n"
+"Last-Translator: fvalen <fvalen@redhat.com>\n"
 "Language-Team:  <it@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-01 17:40+0000\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -31,45 +32,44 @@ msgid "Vertical"
 msgstr "Verticale"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Inserito nel menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Quando attivoB"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Angolo superiore sinistro"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Angolo superiore destro"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Angolo inferiore sinistro"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Angolo inferiore destro"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Personalizzato"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Inserito nel menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Quando attivoB"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Sempre"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Preferenze di IBus"
 
 #: ../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,8 +77,7 @@ msgstr "Metodo di input successivo:"
 
 #: ../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:"
@@ -88,7 +87,7 @@ msgstr "Metodo di input precedente:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
@@ -98,11 +97,11 @@ msgstr "Abilitare o disabilitare:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "Abilita:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "Disabilita:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -118,9 +117,7 @@ msgstr "Orientamento dei candidati:"
 
 #: ../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:"
@@ -130,19 +127,17 @@ msgstr "Mostrare pannello della lingua:"
 msgid "Language panel position:"
 msgstr "Posizione pannello della lingua:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 msgid "Show icon on system tray"
 msgstr "Mostrare l'icona nell'area di notifica"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Mostrare il nome del metodo di input nella barra della lingua"
 
 #: ../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"
@@ -150,9 +145,7 @@ msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
 #: ../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,28 +180,25 @@ msgid "Show information of the selected input method"
 msgstr "Mostra le informazioni sul metodo di input selezionato"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Mostra le informazioni sul metodo di input selezionato"
+msgstr "Mostra l'impostazione dell'input method selezionato"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>Il metodo di input predefinito è il primo in alto nell'elenco.\n"
-"Per cambiarlo è possibile usare i pulsanti su/giù.</i></small>"
+msgstr "<small><i>Il metodo di input predefinito è il primo in alto nell'elenco.\nPer cambiarlo è possibile usare i pulsanti su/giù.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Metodo di input"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "Usa la disposizione di tastiera del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 
@@ -216,7 +206,7 @@ msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Condivide lo stesso metodo di input tra le applicazioni"
 
@@ -236,13 +226,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Il bus di input intelligente</small>\n"
-"Sito web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Il bus di input intelligente</small>\nSito web: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -278,168 +262,169 @@ msgstr "Precarica i motori durante l'avvio di ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Ordine motori"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Ordine motori salvati nell'elenco del metodo di input"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Ritardo popup in millisecondi per la finestra del selettore 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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Ritardo in millisecondi. 0 &gt; Non mostrare la finestra e passa ai motori prec/succ."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Tasto di scelta rapida di avvio"
 
-#: ../data/ibus.schemas.in.h:7
-#, fuzzy
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Attiva i tasti scorciatoia per gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
-msgstr "Tasto di scelta rapida di avvio"
+msgstr "Abilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:8
-#, fuzzy
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
-msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
+msgstr "I tasti scorciatoia per abilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:9
-#, fuzzy
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
-msgstr "Tasto di scelta rapida di avvio"
+msgstr "Disabilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
-msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
+msgstr "I tasti scorciatoia per disabilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida successivo"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../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:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida precedente"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "I tasti scorciatoia per passare al metodo di input precedente"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Nasconde automaticamente"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Posizione pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Orientamento della tabella di ricerca"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Mostra il nome del metodo di input"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Usare carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Inserire il testo pre-modificato"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Usa il metodo di input globale"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Abilita per impostazione predefinita il metodo di input"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../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:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "Mantieni i prefissi dei nomi DConf"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
 
 #: ../ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Copyright © 2007-2010 Peng Huang\n"
-"Copyright © 2007-2010 Red Hat, Inc."
+msgstr "Copyright © 2007-2010 Peng Huang\nCopyright © 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
 msgstr "Altro"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Lingua: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposizione tastiera: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autore: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Descrizione:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Seleziona un metodo di input"
 
@@ -463,120 +448,109 @@ msgstr "Codice del tasto:"
 msgid "Modifiers:"
 msgstr "Modificatori:"
 
-#: ../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 ""
-"Premere un tasto (o una combinazione di tasti).\n"
-"La finestra verrà chiusa dopo il rilascio del tasto stesso."
+msgstr "Premere un tasto (o una combinazione di tasti).\nLa finestra verrà chiusa dopo il rilascio del tasto stesso."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Premere un tasto (o una combinazione di tasti)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "l'avvio"
+#: ../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"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
-
-#: ../setup/main.py:81
-msgid "disable"
-msgstr ""
-
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Il demone IBus non è in esecuzione. Avviarlo ora?"
+msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus è stato avviato. Se non è possibile usare IBus, aggiungere le righe "
-"sottostanti in $HOME/.bashrc e rieseguire l'accesso.\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\""
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:367
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Impossibile avviare il demone IBus in %d secondi"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selezione delle scorciatoie da tastiera per %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "selezione metodi di input in corso"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Elenca solo il nome del motore"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "comando [OPZIONI]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Impossibile collegarsi a IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "lingua: %s\n"
+
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Nessun motore impostato.\n"
+
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Impostazione motore globale fallita.\n"
+
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Acquisizione motore globale fallita.\n"
+
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n\n"
+
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "Comandi:\n"
+
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s è un comando sconosciuto!\n"
+
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright © 2007-2010 Peng Huang\n"
-"Copyright © 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../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:371
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "Riavvia"
-
-#~ 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 "Switch input method"
-#~ msgstr "Cambia metodo 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"
diff --git a/po/ja.po b/po/ja.po
index da5b37a5c..e9f8da246 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,28 +1,28 @@
 # translation of ibus.pot to Japanese
 # Japanese translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Hajime Taira <htaira@redhat.com>, 2012.
-# Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>, 2009.
-# IWAI, Masaharu <iwai@alib.jp>, 2009.
-# Kiyoto Hashida <khashida@redhat.com>, 2010.
-# Makoto Mizukami <makoto@fedoraporject.org>, 2010.
-# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008.
-#   <www.carrotsoft@gmail.com>, 2012.
+# Hajime Taira <htaira@redhat.com>, 2012
+# hyuugabaru <hyu_gabaru@yahoo.co.jp>, 2009
+# IWAI, Masaharu <iwai@alib.jp>, 2009
+# Kiyoto Hashida <khashida@redhat.com>, 2010
+# Makoto Mizukami <makoto@fedoraporject.org>, 2010
+# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
+# 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-28 05:56+0000\n"
-"Last-Translator: 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>\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"
+"Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\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,7 +79,8 @@ msgstr "次のインプットメソッド:"
 
 #: ../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:"
@@ -87,9 +88,9 @@ msgstr "ひとつ前のインプットメソッド:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
-msgstr "..."
+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 "インプットメソッドをオン、オフするためのショートカットキーを設定します"
 
@@ -129,17 +130,19 @@ msgstr "言語パネルの表示:"
 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 "言語バーにインプットメソッド名を表示する"
 
 #: ../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 @@ msgstr "アプリケーションウィンドウに前編集テキストを組み
 
 #: ../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 @@ 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"
@@ -189,18 +196,20 @@ msgstr "選択したインプットメソッドの設定を表示します"
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
+msgstr ""
+"<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
+"「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
 
 #. 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) レイアウトを使用する"
 
@@ -208,7 +217,7 @@ msgstr "システムキーボード (XKB) レイアウトを使用する"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../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 "すべてのアプリケーション間で同じインプットメソッドを共有する"
 
@@ -228,7 +237,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>インテリジェントなインプットバス</small>\nホームページ: http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>インテリジェントなインプットバス</small>\n"
+"ホームページ: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -242,18 +257,6 @@ msgstr "<b>スタートアップ</b>"
 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 "エンジンのプリロード"
@@ -271,114 +274,150 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr ""
+"IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してくださ"
+"い。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 &lt; ミリ秒単位"
+"の遅延。0 &gt; ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
+
+#: ../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 "リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー"
+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 = 常に表示"
+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 = カスタム"
+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 "アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効にする"
+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 キーのプレフィックスは名前変換を停止します"
 
@@ -386,36 +425,38 @@ msgstr "DConf キーのプレフィックスは名前変換を停止します"
 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"
 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"
 
@@ -435,27 +476,21 @@ msgstr "キーコード:"
 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キーを離すとダイアログを閉じます"
+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?"
@@ -463,11 +498,17 @@ msgstr "IBus デーモンは稼働していません。開始しますか？"
 
 #: ../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
@@ -480,73 +521,154 @@ msgstr "IBus デーモンは %d 秒以内に開始できませんでした。"
 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:185
+#: ../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"
+msgstr ""
+"使い方: %s コマンド [オプション...]\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 "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../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:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
-msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
+msgstr ""
+"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
+"IWAI, Masaharu <iwai@alib.jp>\n"
+"日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 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 --git a/po/kn.po b/po/kn.po
index d48f6ea6a..73306b536 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,24 +1,26 @@
-# translation of ibus.master.kn.po to Kannada
+# translation of ibus.pot to Kannada
 # Kannada translation of ibus.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Shankar Prasad <svenkate@redhat.com>, 2009, 2010.
-# shanky <prasad.mvs@gmail.com>, 2011.
+# 
+# Translators:
+# shanky <prasad.mvs@gmail.com>, 2013
+# shanky <prasad.mvs@gmail.com>, 2012
+# shankar <svenkate@redhat.com>, 2009-2010,2013
+# shanky <prasad.mvs@gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.kn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-23 12:03+0000\n"
+"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"
 "Last-Translator: shanky <prasad.mvs@gmail.com>\n"
-"Language-Team: kn_IN <kde-i18n-doc@kde.org>\n"
-"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"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -29,36 +31,36 @@ msgid "Vertical"
 msgstr "ಲಂಬ"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "ಮೆನುವನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
+msgid "Top left corner"
+msgstr "ಮೇಲಿನ ಎಡ ಮೂಲೆ"
 
 #: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
+msgid "Top right corner"
+msgstr "ಮೇಲಿನ ಬಲ ಮೂಲೆ"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "ಯಾವಾಗಲೂ"
+msgid "Bottom left corner"
+msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲ"
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
-msgstr "ಮೇಲಿನ ಎಡ ಮೂಲೆ"
+msgid "Bottom right corner"
+msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
-msgstr "ಮೇಲಿನ ಬಲ ಮೂಲೆ"
+msgid "Custom"
+msgstr "ಅಗತ್ಯಾನುಗುಣ"
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
-msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲ"
+msgid "Embedded in menu"
+msgstr "ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
-msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
+msgid "When active"
+msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
 
 #: ../setup/setup.ui.h:10
-msgid "Custom"
-msgstr "ಇಚ್ಛೆಯ"
+msgid "Always"
+msgstr "ಯಾವಾಗಲೂ"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
@@ -66,7 +68,7 @@ msgstr "IBus ಆದ್ಯತೆಗಳು"
 
 #: ../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,7 @@ msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 
 #: ../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:"
@@ -84,25 +86,25 @@ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
+msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "ಶಕ್ತಗೊಂಡ ಅಥವ ಅಶಕ್ತಗೊಂಡ:"
+msgstr "ಸಕ್ರಿಯಗೊಂಡ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಂಡ:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "ಶಕ್ತಗೊಳಿಸು:"
+msgstr "ಸಕ್ರಿಯಗೊಳಿಸು:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "ಅಶಕ್ತಗೊಳಿಸು:"
+msgstr "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು</b>"
+msgstr "<b>ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆಗಳು</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
@@ -114,8 +116,7 @@ msgstr "ಅಭ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
 
 #: ../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:"
@@ -125,11 +126,11 @@ msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
@@ -139,15 +140,15 @@ msgstr "ಗುರುತುಚೌಕದಲ್ಲಿ ಗುರುತು ಹಾಕ
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
+msgstr "ಅಗತ್ಯಾನುಗುಣ (ಕಸ್ಟಮ್) ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -159,51 +160,44 @@ msgstr "ಸಾಮಾನ್ಯ"
 
 #: ../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"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಸಿದ್ಧತೆಯನ್ನು ತೋರಿಸು"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\n"
-"ಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></"
-"small>"
+msgstr "<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\nಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
@@ -211,7 +205,7 @@ msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
 
@@ -231,13 +225,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -273,161 +261,169 @@ msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎ
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "ಎಂಜಿನ್‌ಗಳ ಕ್ರಮ"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಪಟ್ಟಿಯಲ್ಲಿ ಉಳಿಸಲಾದ ಎಂಜಿನ್‌ಗಳು"
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Trigger shortcut keys"
+msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ಗೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಆರಂಭಿಸುತ್ತದೆ"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
+msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
-msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
+msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
-msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
+msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
+msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
+msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
+msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
-msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
-msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
+msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "ಹೆಸರಿನ ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು DConf ಕಾದಿರುಸುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "ಹೆಸರನ್ನು ಪರಿವರ್ತಿಸುವುದನ್ನು ತಡೆಯಲು DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
 
 #: ../ibus/_config.py.in:41
 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"
 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:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
@@ -441,7 +437,7 @@ msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸ
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
-msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
+msgstr "ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆಗಳು"
 
 #: ../setup/keyboardshortcut.py:65
 msgid "Key code:"
@@ -451,118 +447,109 @@ msgstr "ಕೀಲಿ ಸಂಕೇತ:"
 msgid "Modifiers:"
 msgstr "ಮಾರ್ಪಡಕಗಳು:"
 
-#: ../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 ""
-"ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\n"
-"ಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
+msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\nಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "ಟ್ರಿಗರ್"
+#: ../setup/main.py:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಬಳಸು"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "ಶಕ್ತಗೊಳಿಸು"
-
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "ಅಶಕ್ತಗೊಳಿಸು"
-
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus ಡೀಮನ್ ಇನ್ನೂ ಸಹ ಆರಂಭಗೊಂಡಿಲ್ಲ. ನೀವದನ್ನು ಈಗಲೆ ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
+msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನಿಮಗೆ IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದಲ್ಲಿ, ನಿಮ್ಮ $HOME/."
-"bashrc ಯಲ್ಲಿ ಈ ಕೆಳಗಿನ ಸಾಲನ್ನು ಸೇರಿಸಿ, ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ದಾಖಲಾಗಿ.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:367
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬದಲಿಸುವಿಕೆ"
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
-
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "ಕೇವಲ ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "ಪುನರಾರಂಭಿಸು"
-
-#~ msgid "Previous page"
-#~ msgstr "ಹಿಂದಿನ ಪುಟ"
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "command [OPTIONS]"
 
-#~ msgid "Next page"
-#~ msgstr "ಮುಂದಿನ ಪುಟ"
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "IBusಗೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "ಕೆಲವು ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ, ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಅಥವ ಅಪ್‌ಡೇಟ್ "
-#~ "ಮಾಡಲಾಗಿದೆ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ibus ಇನ್‌ಪುಟ್ ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಿ."
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "ಭಾಷೆ: %s\n"
 
-#~ msgid "Restart Now"
-#~ msgstr "ಮರಳಿ ಆರಂಭಿಸು"
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\n"
 
-#~ msgid "Later"
-#~ msgstr "ನಂತರ"
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#~ msgid "Turn off input method"
-#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್‌ ಮಾಡಿ"
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n\n"
 
-#~ msgid "No input window"
-#~ msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ವಿಂಡೊ ಇಲ್ಲ"
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "ಆದೇಶಗಳು:\n\n"
 
-#~ msgid "About the input method"
-#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ಗೊತ್ತಿರದ ಆದೇಶ!\n"
 
-#~ msgid "Switch input method"
-#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಾಯಿಸು"
+#: ../ui/gtk3/panel.vala:498
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr "ಹಕ್ಕು (c) 2007-2012 Peng Huang\n"
 
-#~ msgid "About the Input Method"
-#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
+#: ../ui/gtk3/panel.vala:503
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#~ msgid "next input method"
-#~ msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
+#: ../ui/gtk3/panel.vala:507
+msgid "translator-credits"
+msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#~ msgid "previous input method"
-#~ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
+#: ../ui/gtk3/panel.vala:539
+msgid "Restart"
+msgstr "ಮರಳಿ ಆರಂಭಿಸು"
diff --git a/po/ko.po b/po/ko.po
index 562ff92d9..8110bf0ab 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,20 +1,20 @@
 # translation of ibus.pot to Korean
 # Korean translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Eunju Kim <eukim@redhat.com>, 2009.
-# Eun-Ju Kim <eukim@redhat.com>, 2012.
-# Hyunsok Oh <hoh@redhat.com>, 2010.
-# Michelle Kim <mkim33@gmail.com>, 2012.
+# Eunju Kim <eukim@redhat.com>, 2009
+# Eun-Ju Kim <eukim@redhat.com>, 2012
+# Hyunsok Oh <hoh@redhat.com>, 2010
+# Michelle Kim <mkim33@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-12-05 03:56+0000\n"
-"Last-Translator: Michelle Kim <mkim33@gmail.com>\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-04-05 00:44+0000\n"
+"Last-Translator: eukim <eukim@redhat.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgstr "이전 입력 방식:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
@@ -126,11 +126,11 @@ msgstr "언어 패널 표시:  "
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
 
@@ -193,11 +193,11 @@ msgstr "<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 
@@ -205,7 +205,7 @@ msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>키보드 레이아웃</b>  "
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
@@ -261,123 +261,138 @@ msgstr "ibus 시작 시 엔진 미리 로드  "
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "엔진 순서"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Saved engines order in input method list"
 
 #: ../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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; 밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "트리거 단축키"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse의 트리거 단축키 "
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "입력 방식 전환을 위한 단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "입력 방식 전환을 위한 단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "다음 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "이전 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "자동 숨기기"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "언어 패널 위치"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "검색 테이블의 방향  "
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용  "
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "편집전 텍스트 포함"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "입력기를 디폴트로 활성화"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf는 이름 접두사를 보존합니다 "
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf 키 접두사는 이름 변환을 중지합니다 "
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -389,26 +404,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "입력 방식을 선택합니다"
 
@@ -432,118 +447,109 @@ msgstr "키 코드:  "
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr ""
+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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "입력 방식 전환 중 "
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
-msgstr ""
+msgstr "엔진 이름만 나열 "
 
 #: ../tools/main.vala:44
 msgid "command [OPTIONS]"
-msgstr ""
+msgstr "command [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "IBus에 연결할 수 없습니다.\n"
 
 #: ../tools/main.vala:82
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "언어: %s⏎\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "엔진이 설정되어 있지 않습니다.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr ""
-
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr ""
+msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
+msgstr "사용법: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
-msgstr ""
+msgstr "명령:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s는 알 수 없는 명령입니다!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "재시작"
diff --git a/po/ml.po b/po/ml.po
index bb35afd35..6a3038dc5 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Malayalam
 # Malayalam translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Ani Peter <apeter@redhat.com>, 2009,2012.
+# Ani Peter <apeter@redhat.com>, 2009,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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-22 10:10+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-04-04 14:57+0000\n"
 "Last-Translator: Ani Peter <apeter@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേ
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
@@ -123,11 +123,11 @@ msgstr "ഭാഷയുടെ പാനല്‍ കാണിക്കുക:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
@@ -190,11 +190,11 @@ msgstr "<small><i>പട്ടികയില്‍ ആദ്യമുള്ള
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
 
@@ -202,7 +202,7 @@ msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
 
@@ -265,114 +265,129 @@ 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "ഐഎംഇ സ്വിച്ചര്‍ ജാലകം കാണിയ്ക്കുന്നതിനായി പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍ സജ്ജമാക്കുക. സ്വതവേയുള്ളതു് 400. 0 = ജാലകം ഉടന്‍ കാണിയ്ക്കുക. 0 &lt; താമസം മില്ലിസെക്കന്‍ഡുകളില്‍. 0 &gt; ജാലകം കാണിയ്ക്കരുതു്, അടുത്തതു്/മുമ്പുള്ള എഞ്ചിനുകളിലേക്കു് മാറുക."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse-നു് കുറുക്കുവഴികള്‍ ഉപയോഗിയ്ക്കുക"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "ഇന്‍പുട്ട രീതി ഓണ്‍ ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "ഇന്‍പുട്ട രീതി ഓഫ് ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറുന്നതിനുള്ള എളുപ്പവഴി"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "സ്വയം അദൃശ്യമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം. 0 = നേരെയുള്ള, 1 = കുറുകയുള്ള"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്ങള്‍ സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "അക്ഷരസഞ്ചയം യഥേഷ്ടമാക്കുക:"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "ഭാഷയുടെ പാനലിലേക്കുള്ള അക്ഷരസഞ്ചയത്തിനുള്ള പേരു് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പുട്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുമ്പോള്‍ സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
@@ -386,26 +401,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
@@ -429,33 +444,25 @@ msgstr "കീ കോഡ്:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് രീതിയിലേക്കു് പോകുന്നതിനായി shift-നൊപ്പമുള്ള കുറുക്കുവഴി ഉപയോഗിയ്ക്കുക"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ഡെമണ്‍ പ്രവര്‍ത്തനത്തിലില്ല, നിങ്ങള്‍ക്കു് ഇതു് ആരംഭിയ്ക്കണമോ?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -464,16 +471,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ഇന്‍പുട്ട് രീതികള്‍ തമ്മില്‍ മാറുക"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "എഞ്ചിന്‍ പേരു് മാത്രം ലഭ്യമാക്കുക"
@@ -482,7 +493,7 @@ msgstr "എഞ്ചിന്‍ പേരു് മാത്രം ലഭ്യ
 msgid "command [OPTIONS]"
 msgstr "കമാന്‍ഡ് [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല.\n"
@@ -492,55 +503,50 @@ msgstr "IBus-ലേക്കു് കണക്ട് ചെയ്യുവാ
 msgid "language: %s\n"
 msgstr "ഭാഷ: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "എഞ്ചിന്‍ സജ്ജമല്ല.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ സജ്ജമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ ലഭ്യമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb ശൈലി %s-ലേക്കു് മാറ്റുന്നതു് പരാജയപ്പെട്ടു."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "കമാന്‍ഡുകള്‍:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ഒരു അപചിരിത കമാന്‍ഡാകുന്നു!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "പകര്‍പ്പവകാശം (c) 2007-2012 പെങ് ഹുവാങ്\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "വീണ്ടും ആരംഭിക്കുക"
diff --git a/po/mr.po b/po/mr.po
index e4c3e3abd..b675ca845 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,18 +1,18 @@
 # translation of mr.po to Marathi
 # Marathi translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009.
-# Sandeep Shedmake <sshedmak@redhat.com>, 2009,2012.
-# sandeeps <sshedmak@redhat.com>, 2011.
+# Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009
+# sandeeps <sshedmak@redhat.com>, 2009,2012
+# sandeeps <sshedmak@redhat.com>, 2009,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: 2012-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-23 17:37+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-12 07:34+0000\n"
 "Last-Translator: sandeeps <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr "मागील इंपुट पद्धत:"
 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 +125,11 @@ msgstr "भाषा पटल दाखवा:"
 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 +188,15 @@ msgid ""
 msgstr "<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\nबदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
 
 #. 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 +204,7 @@ msgstr "प्रणाली कळफलक (XKB) मांडणीचा व
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कळफलक मांडणी</b>"
 
-#: ../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 +238,6 @@ msgstr "<b>स्टार्टअप</b>"
 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 +255,139 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. पूर्वनिर्धारित 400. 0 = पटल पटकन दाखवा. 0 &lt; मिलिसेकंदातील विलंब. 0 &gt; पटल दाखवू नका व मागील किंवा पुढील इंजिन्स्चा वापर करू नका."
+
+#: ../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 = Embedded in menu, 1 = Auto hide, 2 = Always show"
 
-#: ../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 = Top left corner, 1 = Top right corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 
-#: ../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 = Horizontal, 1 = Vertical"
 
-#: ../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 +401,30 @@ msgstr "सर्वहक्काधिकार (c) 2007-2010 पेंग 
 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 +444,19 @@ msgstr "कि कोड:"
 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 +481,137 @@ msgstr "IBus डिमन %d सेकंदात सुरू करणे अ
 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 "आदेश [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:185
+#: ../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: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) 2007-2012 पेंग हुआंग\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 "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat.com>, 2009, 2010."
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "पुन्हा चालू करा"
diff --git a/po/nl.po b/po/nl.po
index 347e9d9a4..39349d765 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,16 +1,16 @@
 # translation of nl.po to Dutch
 # Dutch translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Geert Warrink <geert.warrink@onsnet.nu>, 2011-2012.
+# Geert Warrink <geert.warrink@onsnet.nu>, 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: 2012-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-15 10:34+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-12 14:48+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Vorige invoermethode:"
 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 "De sneltoetsen om invoermethode aan of uit te zetten"
 
@@ -123,11 +123,11 @@ msgstr "Toon taal paneel:"
 msgid "Language panel position:"
 msgstr "Taal panel positie:"
 
-#: ../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 "Toon icoon op systeemvak"
 
-#: ../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 "Toon naam van invoermethode op taalbalk"
 
@@ -186,15 +186,15 @@ msgid ""
 msgstr "<small><i>De standaard invoermethode is de bovenste in de lijst.\nje kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
 
 #. 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 "Invoermethode"
 
-#: ../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 "Gebruik systeem toetsenbordindeling"
 
-#: ../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 "Gebruik systeem toetsenbord (XKB) indeling"
 
@@ -202,7 +202,7 @@ msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../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 "Deel dezelfde input-methode voor alle toepassingen"
 
@@ -236,18 +236,6 @@ msgstr "<b>Opstarten</b>"
 msgid "About"
 msgstr "Over"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Invoer methode kader"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus invoer methode kader"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Engines voor-laden"
@@ -265,114 +253,139 @@ msgid "Saved engines order in input method list"
 msgstr "Opgeslagen machine volgorde in invoermethode lijst"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Pop-up vertraging milliseconden voor IME omschakelvenster"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Vertraging in milliseconden. 0 &gt; Laat het venster niet zien  en schakel vorige/volgende engine om."
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Versienummer opgeslagen"
+
+#: ../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 "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"
 msgstr "Trigger sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Activeer snelkoppeltoetsen voor gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Zet sneltoetsen aan"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "De sneltoetsen om invoermethode aan te zetten"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Zet sneltoetsen uit"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "De sneltoetsen om invoermethode uit te zetten"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Volgende engine sneltoetsen"
 
-#: ../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 "De sneltoetsen voor het omschakelen naar de volgende invoermethode in de lijst"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Vorige engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Automatisch verbergen"
 
-#: ../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 "Het gedrag van het taal paneel. 0 = Ingebed in het menu, 1 = Automatisch verbergen, 2 = Altijd tonen"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Taal-paneel positie"
 
-#: ../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 "De positie van de taal paneel. 0 = linksboven, 1 = rechtsboven, 2 = linksonder,  3 = rechtsonder, 4 = aangepast"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Toon naam van invoermethode"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../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 "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -386,30 +399,30 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Andere"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Taal: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Toetsenbordindeling: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Beschrijving:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Selecteer een invoermethode"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Toetsenbord"
 
@@ -429,27 +442,19 @@ msgstr "Toetscode:"
 msgid "Modifiers:"
 msgstr "Modificatietoetsen:"
 
-#: ../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 "Druk op een toets (of een toetsencombinatie).\nDe dialoog wordt afgesloten als de toets losgelaten wordt."
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "trigger"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "aanzetten"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "uitzetten"
+#: ../setup/main.py:98 ../setup/main.py:397
+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
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -474,73 +479,137 @@ msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
-#: ../tools/main.vala:40
+#: ../setup/main.py:379
+msgid "switching input methods"
+msgstr "bezig met omschakelen van invoermethodes "
+
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "commando[OPTIES]"
-
-#: ../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 "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:120
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Lees de systeem registry cache."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Lees het registry cache BESTAND."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "Omschakelen van xkb indeling naar %s is mislukt."
+msgid "The registry cache is invalid.\n"
+msgstr "De registry cache is ongeldig.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Schrijf de systeem registry cache."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Schrijf het registry cache BESTAND."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "Stel engine in of haal deze op"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "Verlaat ibus-daemon"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(Niet geimplementeerd)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "Start ibus-daemon opnieuw op"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "Toon versie"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "Toon de inhoud van registry cache"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "Maak registry cache aan"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Print het D-Bus adres van ibus-daemon"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "Toon deze informatie"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus update"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+spatie is nu de standaard snelkoppeling."
+
+#: ../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:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Opnieuw starten"
diff --git a/po/or.po b/po/or.po
index 2db8ff368..67117215d 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,16 +1,17 @@
 # translation of ibus.pot to Oriya
 # Oriya translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2012.
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2012
+# Manoj Kumar Giri <mgiri@redhat.com>, 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-23 13:13+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-04-02 09:47+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +84,7 @@ msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
@@ -123,11 +124,11 @@ msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
@@ -190,11 +191,11 @@ msgstr "<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେ
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
@@ -202,7 +203,7 @@ msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
 
@@ -265,114 +266,129 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ ସେଟ କରନ୍ତୁ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି400. 0 = ସଙ୍ଗେ ସଙ୍ଗେ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ। 0 &lt; ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 &gt; ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ଟ୍ରିଗର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ପାଇଁ ସଂକ୍ଷିପ୍ତ ପଥ ଚାବିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "ପରବର୍ତ୍ତି ଯନ୍ତ୍ର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf ନାମ ଉପସର୍ଗଗୁଡ଼ିକୁ ସଂରକ୍ଷିତ ରଖିଥାଏ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ନାମ ପରିବର୍ତ୍ତନକୁ ଅଟକାଇବା ପାଇଁ DConf କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
 
@@ -386,26 +402,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
 
@@ -429,33 +445,25 @@ msgstr "କି ସଂକେତ:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "shift ସହିତ ସଂକ୍ଷିପ୍ତ ପଥକୁ ପୂର୍ବ ନିବେଶ ପଦ୍ଧତିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ଡେମନ ଚାଲୁ ନାହିଁ। ଆପଣ ଏହାକୁ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -464,16 +472,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ଡେମନ  %d ସେକଣ୍ଡରେ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରୁଅଛି"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "କେବଳ ଯନ୍ତ୍ର ନାମକୁ ତାଲିକାଭୁକ୍ତ କରନ୍ତୁ"
@@ -482,7 +494,7 @@ msgstr "କେବଳ ଯନ୍ତ୍ର ନାମକୁ ତାଲିକାଭୁ
 msgid "command [OPTIONS]"
 msgstr "command [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାରିବେ ନାହିଁ।\n"
@@ -492,55 +504,50 @@ msgstr "IBus ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାର
 msgid "language: %s\n"
 msgstr "ଭାଷା: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "କୋଣସି ଯନ୍ତ୍ର ସେଟ ହୋଇନାହିଁ।\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ସେଟ କରିବାରେ ବିଫଳ।\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ପାଇବାରେ ବିଫଳ।\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb ବିନ୍ୟାସକୁ %s ରେ ପରିବର୍ତ୍ତନ କରିବା ବିଫଳ ହୋଇଛି।"
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ବ୍ୟବହାର: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "ଆଦେଶଗୁଡିକ:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ଟି ଗୋଟିଏ ଅଜଣା ନିର୍ଦ୍ଦେଶ!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "ପୁନଃଚାଳନ"
diff --git a/po/pa.po b/po/pa.po
index 5522b8f79..b6df1c3f5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,21 +1,21 @@
 # translation of ibus.pot to Panjabi
 # Panjabi translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Amanpreet Singh <aalam@users.sf.net>, 2008.
-# A S Alam <aalam@users.sf.net>, 2009.
-# A S Alam <apreet.alam@gmail.com>, 2011-2012.
-# Jaswinder Singh <jsingh@redhat.com>, 2009, 2010.
-# Jaswinder Singh Phulewala <j.phulewala@gmail.com>, 2011.
+# Amanpreet Singh <aalam@users.sf.net>, 2008
+# A S Alam <aalam@users.sf.net>, 2009
+# A S Alam <apreet.alam@gmail.com>, 2011-2012
+# Jaswinder Singh <jsingh@redhat.com>, 2009-2010
+# Jaswinder Singh <phulewala.j@gmail.com>, 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: 2012-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-12-04 03:32+0000\n"
-"Last-Translator: A S Alam <apreet.alam@gmail.com>\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-01-04 11:04+0000\n"
+"Last-Translator: Jaswinder Singh <phulewala.j@gmail.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +87,7 @@ msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
@@ -127,11 +127,11 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖਾਓ:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
@@ -194,11 +194,11 @@ msgstr "<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ 
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 
@@ -206,7 +206,7 @@ msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
 
@@ -269,116 +269,131 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Delay milliseconds. 0 &gt; Do not show the window and switch prev/next engines."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਟਰਿੱਗਰ ਕਰੋ"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਬੰਦ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf ਨਾਂ ਅਗੇਤਰ ਰੱਖਦਾ ਹੈ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -390,26 +405,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
@@ -433,118 +448,109 @@ msgstr "ਕੀ ਕੋਡ:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲੇ ਇੰਪੁੱਟ ਢੰਗ ਤੇ ਜਾਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਬਟਨ"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "ਬੰਦ ਕਰੋ"
-
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "IBus ਡੈਮਨ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr ""
+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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਨਾ"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
-msgstr ""
+msgstr "ਸਿਰਫ ਇੰਜਣ ਨਾਂ ਵੇਖਾਓ"
 
 #: ../tools/main.vala:44
 msgid "command [OPTIONS]"
-msgstr ""
+msgstr "command [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "IBus ਨਾਲ ਨਹੀਂ ਜੁੜ ਸਕਿਆ।\n"
 
 #: ../tools/main.vala:82
 #, c-format
 msgid "language: %s\n"
 msgstr "ਭਾਸ਼ਾ: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "ਕੋਈ ਇੰਜਣ ਸੈੱਟ ਨਹੀਂ ਹੈ।\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "ਗਲੋਬਲ ਇੰਜਣ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "ਗਲੋਬਲ ਇੰਜਣ ਫੇਲ ਹੋਇਆ।\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr ""
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "ਕਮਾਂਡ:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s ਅਣਜਾਣ ਕਮਾਂਡ ਹੈ!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\nhttp://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
diff --git a/po/pl.po b/po/pl.po
index 0a06b8fd3..bece1b417 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,16 +1,16 @@
 # translation of pl.po to Polish
 # Polish translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2012.
+# Piotr Drąg <piotrdrag@gmail.com>, 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: 2012-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-15 18:26+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-09 16:52+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Zawsze"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "Preferencje usługi iBus"
+msgstr "Preferencje usługi IBus"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -83,7 +83,7 @@ msgstr "Poprzednia metoda wprowadzania:"
 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 "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
 
@@ -113,7 +113,7 @@ msgstr "Orientacja kandydatów:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi iBus"
+msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi IBus"
 
 #: ../setup/setup.ui.h:25
 msgid "Show language panel:"
@@ -123,11 +123,11 @@ msgstr "Wyświetlanie panelu języków:"
 msgid "Language panel position:"
 msgstr "Pozycja panelu języków:"
 
-#: ../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 "Wyświetlanie ikony w obszarze powiadamiania"
 
-#: ../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 "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
@@ -186,15 +186,15 @@ msgid ""
 msgstr "<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\nMożna użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
 
 #. 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 "Metoda wprowadzania"
 
-#: ../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 "Użycie systemowych ustawień układu klawiatury"
 
-#: ../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 "Użycie systemowego układu klawiatury (XKB)"
 
@@ -202,7 +202,7 @@ msgstr "Użycie systemowego układu klawiatury (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../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 "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
@@ -222,11 +222,11 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>iBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "Uruchamianie iBus podczas logowania"
+msgstr "Uruchamianie IBus podczas logowania"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
@@ -236,25 +236,13 @@ msgstr "<b>Uruchomienie</b>"
 msgid "About"
 msgstr "O programie"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "iBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Struktura metody wprowadzania"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Uruchomienie struktury metody wprowadzania iBus"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Wcześniejsze wczytanie mechanizmów"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi iBus"
+msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi IBus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
@@ -265,114 +253,139 @@ msgid "Saved engines order in input method list"
 msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na następny/poprzedni mechanizm."
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Zapisany numer wersji"
+
+#: ../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 "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"
 msgstr "Klawisze skrótów przełącznika"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Klawisz skrótu dla gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Włącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Wyłącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Klawisze skrótów następnego mechanizmu"
 
-#: ../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 "Klawisze skrótu do przełączania na następną metodę wprowadzania na liście"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../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"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Automatyczne ukrywanie"
 
-#: ../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 "Zachowanie panela języków. 0 = osadzony w menu, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Pozycja panela języków"
 
-#: ../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 "Pozycja panela języków. 0 = górny lewy róg, 1 = górny prawy róg, 2 = dolny lewy róg, 3 = dolny prawy róg, 4 = własna"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Wyświetlanie nazwy metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Własna czcionka"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Nazwa własnej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../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 "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność wprowadzania"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -386,36 +399,36 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Inne"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Język: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Układ klawiatury: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Opis:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "KBD"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "Ustawianie preferencji usługi iBus"
+msgstr "Ustawianie preferencji usługi IBus"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
@@ -429,31 +442,23 @@ msgstr "Kod klawisza:"
 msgid "Modifiers:"
 msgstr "Modyfikatory:"
 
-#: ../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 "Proszę nacisnąć klawisz (lub kombinację klawiszy).\nOkno dialogowe zostanie zamknięte po zwolnieniu klawisza."
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "przełącznik"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "włączenie"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "wyłączenie"
+#: ../setup/main.py:98 ../setup/main.py:397
+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
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Demon iBus nie jest uruchomiony. Uruchomić go?"
+msgstr "Usługa IBus nie jest uruchomiona. Uruchomić ją?"
 
 #: ../setup/main.py:352
 msgid ""
@@ -461,86 +466,150 @@ msgid ""
 "  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:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "Nie można uruchomić demona iBus od %d sekund"
+msgstr "Nie można uruchomić usługi IBus od %d sekund"
 
 #: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
-#: ../tools/main.vala:40
+#: ../setup/main.py:379
+msgid "switching input methods"
+msgstr "przełączanie metod wprowadzania"
+
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "polecenie [OPCJE]"
-
-#: ../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 "Nie można połączyć z iBus.\n"
+msgstr "Nie można połączyć z IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:120
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Odczytuje pamięć podręczną rejestru systemu."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "Przełączenie układu XKB na %s się nie powiodło."
+msgid "The registry cache is invalid.\n"
+msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Zapisuje pamięć podręczną rejestru systemu."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Zapisuje PLIK pamięci podręcznej systemu."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "Ustawia lub uzyskuje mechanizm"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "Kończy działanie usługi ibus-daemon"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(Niezaimplementowane)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "Ponownie uruchamia usługę ibus-daemon"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "Wyświetla wersję"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "Tworzy pamięć podręczną rejestru"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "Wyświetla tę informację"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie %s POLECENIE [OPCJA...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "Aktualizacja IBus"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
+
+#: ../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:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "iBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
+msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Uruchom ponownie"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1d0dd1d68..8ce4eb144 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,23 +1,25 @@
-# translation of ibus.master.pt_BR.po to Portuguese
-# Gujarati translations for el package.
-# Copyright (C) 2010 THE el'S COPYRIGHT HOLDER
+# translation of ibus.pot to Portuguese (Brazil)
+# Portuguese (Brazil) translation of ibus.
+# Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-#
-# Automatically generated, 2010.
-# Glaucia Cintra <gcintra@redhat.com>, 2010-2011.
+# 
+# Translators:
+# Arthur Rodrigues Araruna <araruna@gmail.com>, 2012
+# Automatically generated, 2010
+# Glaucia Freitas <gcintra@redhat.com>, 2013
+# Taylon Silmer <taylon@taylon.eti.br>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus.master.pt_BR\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-03-22 15:23+0000\n"
-"Last-Translator: Glaucia Cintra <gcintra@redhat.com>\n"
-"Language-Team: Portuguese (Brazilian) <trans-pt_br@lists.fedoraproject.org>\n"
-"Language: pt_BR\n"
+"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 04:48+0000\n"
+"Last-Translator: Glaucia Freitas <gcintra@redhat.com>\n"
+"Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,45 +31,44 @@ msgid "Vertical"
 msgstr "Vertical"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Embutido no menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Quando ativado"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Canto esquerdo superior"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Canto direito superior"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Canto esquerdo inferior"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Canto direito superior"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Padrão"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Embutido no menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Quando ativado"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Sempre"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Preferências do IBus"
 
 #: ../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:"
@@ -85,7 +86,7 @@ msgstr "Método de entrada anterior:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
@@ -115,9 +116,7 @@ msgstr "Orientação dos candidatos:"
 
 #: ../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:"
@@ -127,19 +126,17 @@ msgstr "Apresente o painel de linguagem:"
 msgid "Language panel position:"
 msgstr "Posição do Painel de Linguagem:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
 msgid "Show icon on system tray"
 msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
 msgid "Show input method name on language bar"
 msgstr "Apresenta o nome do método de entrada na barra de linguagem"
 
 #: ../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"
@@ -147,8 +144,7 @@ msgstr "Embutir texto de pré-edição na janela do aplicativo "
 
 #: ../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:"
@@ -164,55 +160,44 @@ msgstr "Geral"
 
 #: ../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"
 msgstr "Apresente a informação do método de entrada selecionado"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Apresente a informação do método de entrada selecionado"
+msgstr "Mostrar configuração do método de entrada selecionado"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>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.</i></"
-"small>"
+msgstr "<small><i>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.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
@@ -220,7 +205,7 @@ msgstr "Usa o desenho do teclado do sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
@@ -240,13 +225,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -282,164 +261,169 @@ msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Ordem dos Motores"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Ordem dos motores salvas na lista de método de entrada"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Popup atrasou milisegundos para a janela de alterador 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 &lt; Delay milliseconds. 0 &gt; 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 &lt; Atrasa milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Realiza o trigger nas teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Desencadeia chaves de atalho para o "
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "Habilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "As teclas de atalho para ligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "Desabilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "As teclas de atalho para desligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Próximo mecanismo de teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../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:13
+#: ../data/ibus.schemas.in.h:16
 msgid "Prev engine shortcut keys"
 msgstr "Visualização do mecanismo das teclas de atalho "
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Ocultar Automaticamente"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:17
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Posição do Painel de Linguagem"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:19
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Orientação da tabela de pesquisa"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Apresenta o nome do método de entrada"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Usa o nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Fonte padrão"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../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:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
 #: ../ibus/_config.py.in:41
 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"
 msgstr "Outros"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Linguagem: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Desenho do teclado: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Descrição:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Selecione um método de entrada"
 
@@ -463,118 +447,109 @@ msgstr "Código de tecla:"
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
-#: ../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 ""
-"Por favor pressione uma tecla (ou uma combinação de tecla).\n"
-"O diálogo será encerrado quando a tecla for liberada."
+msgstr "Por favor pressione uma tecla (ou uma combinação de tecla).\nO diálogo será encerrado quando a tecla for liberada."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "trigger"
-
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "habilitar"
+#: ../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"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "desabiltar"
-
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "O IBus daemon não foi inciado. Você deseja iniciá-lo agora?"
+msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus has been started! If you can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
+"IBus has been started! If you 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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:367
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "mudando métodos de entrada"
+
+#: ../tools/main.vala:40
+msgid "List engine name only"
+msgstr "Somente o Nome do motor da lista"
+
+#: ../tools/main.vala:44
+msgid "command [OPTIONS]"
+msgstr "comando [OPÇÕES]"
+
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Não foi possível conectar ao IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "idioma: %s\n"
+
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Nenhum motor configurado.\n"
+
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Configurar motor global falhou.\n"
+
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Obter motor global falhour.\n"
+
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Uso: %s COMMAND [OPTION...]\n\n"
+
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "Comandos:\n"
+
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s é um comando desconhecido!\n"
+
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "Reinicie"
-
-#~ 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 "Sobre o método de entrada"
-
-#~ msgid "Switch input method"
-#~ msgstr "Altere o método 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"
diff --git a/po/ru.po b/po/ru.po
index def84f4c2..70f7afaf6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,24 +1,25 @@
-# Russian translations for IBus package.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Alexey Kotlyarov <koterpillar@gmail.com>, 2009.
-# Yulia <ypoyarko@redhat.com>, 2010.
+# translation of ibus.pot to Russian
+# Russian translation of ibus.
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+# Koterpillar <koterpillar@gmail.com>, 2009
+# Yulia <ypoyarko@redhat.com>, 2010
+# Yulia <yulia.poyarkova@redhat.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-07-30 10:25\n"
-"Last-Translator: Yulia <ypoyarko@redhat.com>\n"
-"Language-Team: Russian\n"
-"Language: \n"
+"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"
+"Last-Translator: Yulia <yulia.poyarkova@redhat.com>\n"
+"Language-Team: Russian <trans-ru@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: KBabel 1.11.4\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"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -29,37 +30,37 @@ msgid "Vertical"
 msgstr "Вертикально"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Встроена в меню"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Когда активно"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Всегда"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Левый верхний угол"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Правый верхний угол"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Левый нижний угол"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Правый нижний угол"
 
-#: ../setup/setup.ui.h:10
+#: ../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"
@@ -84,7 +85,7 @@ msgstr "Предыдущий метод ввода:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Сочетание клавиш для включения/выключения метода ввода"
 
@@ -94,11 +95,11 @@ msgstr "Включить или выключить:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "Включить:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "Выключить:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -124,18 +125,17 @@ msgstr "Показывать языковую панель:"
 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:24
 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:26
 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 ""
-"Показывать название метода ввода на языковой панели, когда пункт выбран"
+msgstr "Показывать название метода ввода на языковой панели, когда пункт выбран"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -178,28 +178,25 @@ msgid "Show information of the selected input method"
 msgstr "Показать информацию о выбранном методе ввода"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Показать информацию о выбранном методе ввода"
+msgstr "Показать настройки выбранного метода ввода"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>По умолчанию используется первый в списке метод ввода.\n"
-"Используйте кнопки вверх/вниз для изменения.</i></small>"
+msgstr "<small><i>По умолчанию используется первый в списке метод ввода.\nИспользуйте кнопки вверх/вниз для изменения.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "Использовать системную раскладку (XKB)"
 
@@ -207,7 +204,7 @@ msgstr "Использовать системную раскладку (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Раскладка клавиатуры</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "Использовать один метод ввода для всех приложений"
 
@@ -227,13 +224,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Интеллектуальная система ввода</small>\n"
-"Домашняя страница: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интеллектуальная система ввода</small>\nДомашняя страница: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -269,165 +260,169 @@ msgstr "Загружать методы ввода при запуске iBus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "Порядок модулей"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "Настройте задержку показа окна выбора метода ввода, которое по умолчанию будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 &lt; задержка в миллисекундах, 0 &gt; окно не будет показано."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "Сочетание клавиш для включения/выключения"
 
-#: ../data/ibus.schemas.in.h:7
-#, fuzzy
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Сочетание клавиш для "
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
-msgstr "Сочетание клавиш для включения/выключения"
+msgstr "Включить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:8
-#, fuzzy
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
-msgstr "Сочетание клавиш для включения/выключения метода ввода"
+msgstr "Сочетания для включения метода ввода"
 
-#: ../data/ibus.schemas.in.h:9
-#, fuzzy
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
-msgstr "Сочетание клавиш для включения/выключения"
+msgstr "Отключить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
-msgstr "Сочетание клавиш для включения/выключения метода ввода"
+msgstr "Сочетание для отключения метода ввода"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "Клавиши для следующего метода ввода"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "Клавиши для предыдущего метода ввода"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "Автоматически скрывать"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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
+#: ../data/ibus.schemas.in.h:20
 msgid "Language panel position"
 msgstr "Расположение языковой панели"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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
+#: ../data/ibus.schemas.in.h:22
 msgid "Orientation of lookup table"
 msgstr "Ориентация таблицы поиска"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "Показывать название метода ввода"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "Использовать свой шрифт"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "Использовать свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "Свой шрифт"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "Свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "Вставить готовый текст"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вставить готовый текст в окно приложения"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "Использовать глобальный метод ввода"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "Включить метод ввода по умолчанию"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Включить метод ввода по умолчанию при получении приложением фокуса ввода"
+msgstr "Включить метод ввода по умолчанию при получении приложением фокуса ввода"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf не сохраняет префиксы имен."
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Префиксы ключей DConf для предотвращения преобразования имен"
 
 #: ../ibus/_config.py.in:41
 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"
 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"
+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:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Выберите метод ввода"
 
@@ -451,120 +446,109 @@ msgstr "Код клавиши:"
 msgid "Modifiers:"
 msgstr "Модификаторы:"
 
-#: ../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 ""
-"Нажмите клавишу (или сочетание клавиш).\n"
-"Когда клавиша будет отпущена, окно закроется."
+msgstr "Нажмите клавишу (или сочетание клавиш).\nКогда клавиша будет отпущена, окно закроется."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Нажмите клавишу (или сочетание клавиш)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "переключатель"
-
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
-
-#: ../setup/main.py:81
-msgid "disable"
-msgstr ""
+#: ../setup/main.py:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "Использовать сочетание SHIFT для выбора предыдущего метода ввода"
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Служба IBus не запущена. Запустить?"
+msgstr "IBus не выполняется. Запустить?"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../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"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus запущен! Если вы не можете пользоваться IBus, добавьте приведённые "
-"строки в $HOME/.bashrc и заново войдите в систему.\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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:367
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
-msgstr ""
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Не удалось запустить IBus через %d сек."
 
-#: ../setup/main.py:369
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Выберите комбинацию клавиш для %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "изменение методов ввода"
+
+#: ../tools/main.vala:40
+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
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Не удалось подключиться к IBus.\n"
+
+#: ../tools/main.vala:82
+#, c-format
+msgid "language: %s\n"
+msgstr "язык: %s\n"
+
+#: ../tools/main.vala:150
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Модуль не выбран.\n"
+
+#: ../tools/main.vala:158
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Не удалось настроить глобальный модуль.\n"
+
+#: ../tools/main.vala:163
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Не удалось получить глобальный модуль.\n"
+
+#: ../tools/main.vala:224
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Формат: %s КОМАНДА [ПАРАМЕТР...]\n\n"
+
+#: ../tools/main.vala:225
+#, c-format
+msgid "Commands:\n"
+msgstr "Команды:\n"
+
+#: ../tools/main.vala:247
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "Неизвестная команда: %s\n"
+
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr ""
-"(c) 2007-2010 Peng Huang\n"
-"(c) 2007-2010 Red Hat, Inc."
+msgstr "(c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:335
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus &mdash; интеллектуальная система ввода для Linux и Unix."
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
-msgstr ""
-"Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\n"
-"Yulia <ypoyarko@redhat.com>, 2010."
+msgstr "Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\nYulia <ypoyarko@redhat.com>, 2010."
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 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 "Switch input method"
-#~ msgstr "Переключить метод ввода"
-
-#~ msgid "About the Input Method"
-#~ msgstr "О методе ввода"
-
-#~ msgid "next input method"
-#~ msgstr "следующий метод ввода"
-
-#~ msgid "previous input method"
-#~ msgstr "предыдущий метод ввода"
diff --git a/po/ta.po b/po/ta.po
index 68720ed9b..ea038f693 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,21 +1,21 @@
 # translation of ibus.pot to Tamil
 # Tamil translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Arun Prakash  <arunprakash.pts@gmail.com>, 2012.
-# Felix I <ifelix25@gmail.com>, 2011.
-# ifelix <ifelix25@gmail.com>, 2011.
-# I Felix <ifelix@redhat.com>, 2010.
-# I. Felix <ifelix@redhat.com>, 2009.
-# Shantha kumar <shkumar@redhat.com>, 2012.
+# Arun Prakash <arunprakash.pts@gmail.com>, 2012
+# Felix I <ifelix25@gmail.com>, 2011
+# Felix I <ifelix25@gmail.com>, 2011
+# I Felix <ifelix@redhat.com>, 2010
+# I. Felix <ifelix@redhat.com>, 2009
+# shkumar <shkumar@redhat.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-26 11:21+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2012-12-06 11:22+0000\n"
 "Last-Translator: shkumar <shkumar@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "முந்தைய உள்ளீடு முறை:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
 
@@ -128,11 +128,11 @@ msgstr "மொழி பலகத்தை காட்டு:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
@@ -195,11 +195,11 @@ msgstr "<small><i>பட்டியலில் முன்னிருப்
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
@@ -207,7 +207,7 @@ msgstr "கணினி விசைப்பலகை (XKB) அமைப்ப
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
@@ -270,114 +270,129 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 &lt; தாமத மில்லிசெகன்ட். 0 &gt; சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "ட்ரிகர் குறுக்குவிசை"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse க்கான குறுக்கு விசைகளை இயக்கு"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "குறுக்குவிசைக்களை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "உள்ளீடு முறையை இயக்கும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "குறுக்குவிசைகளை செயல்நீக்கு"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "உள்ளீடு முறையை நிறுத்தும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "அடுத்த இயந்திர குறுக்குவிசை"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "முந்தைய இயந்திர குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "முந்தைய உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "தானாக மறை"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "மொழி பேனல் இடம்"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "காணும் அட்டவணையின் திசை"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "தனிபயன் எழுத்துரு"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "தனிபயன் எழுத்துரு பெயர் மொழி பலகத்துக்கு"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -391,26 +406,26 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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 "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
@@ -434,33 +449,25 @@ msgstr "விசை குறியீடு:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் பயன்படுத்தவும்"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -469,16 +476,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
@@ -487,7 +498,7 @@ msgstr "எஞ்சின் பெயரை மட்டும் பட்ட
 msgid "command [OPTIONS]"
 msgstr "கட்டளை [OPTIONS]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus உடன் இணைக்க முடியாது.\n"
@@ -497,55 +508,50 @@ msgstr "IBus உடன் இணைக்க முடியாது.\n"
 msgid "language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb லேயவுட்டை %s க்கு மாற்றுதல் தோல்வி."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "கட்டளைகள் :\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s என்பது தெரியாத கட்டளை!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "பதிப்புரிமை (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
diff --git a/po/te.po b/po/te.po
index 67170ed88..2fa6b4470 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,18 +1,18 @@
 # translation of ibus.pot to Telugu
 # Telugu translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Krishna Babu K <kkrothap@redhat.com>, 2009.
-# Krishnababu Krothapalli <krisnababu@gmail.com>, 2012.
-# ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com>, 2011.
+# Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
+# Krishnababu Krothapalli <krisnababu@gmail.com>, 2012-2013
+# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-28 13:00+0000\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-03-29 12:30+0000\n"
 "Last-Translator: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
 "Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -79,13 +79,13 @@ msgstr "జాబితానందలి ముందరి ఇన్‌పు
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
-msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి:"
+msgstr "క్రితం ఇన్‌పుట్ పద్ధతి:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ఇన్‌పుట్ పద్ధతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
 
@@ -125,11 +125,11 @@ msgstr "భాషా ప్యానల్ చూపించు:"
 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:24
 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:26
 msgid "Show input method name on language bar"
 msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
@@ -192,11 +192,11 @@ msgstr "<small><i>జాబితాలో పైన వున్నది అ
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
@@ -204,7 +204,7 @@ msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>కీబోర్డు నమూనా</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "అన్ని అనువర్తనములనందు యిన్పుట్ పద్దతిని భాగస్వామ్యపరచుము"
 
@@ -267,114 +267,129 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 &lt; ఆలస్యం మిల్లీసెకన్లలో. 0 &gt; విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "లఘవులను నొక్కుము"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse కొరకు ట్రిగ్గర్ లఘ కీలు"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "లఘు కీ లను చేతనంచేయి"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "ఇన్‌పుట్ పద్ధతి ఆన్ చేయుటకు కీ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "అడ్డదారి కీలను అచేతనంచేయి"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "ఇన్‌పుట్ పద్ధతి ఆపుటకు కీ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "తరువాతి ఇంజన్‌కు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
-msgstr "మునుపటి ఇంజన్ లఘువులు"
+msgstr "క్రితం ఇంజన్ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "స్వయంచాలకంగా దాగిఉండు"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "భాషా ప్యానల్ స్థానము"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "లుకప్ పట్టిక సర్దుబాటు"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = చదరముగా, 1 = నిలువుగా"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
 msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "మలచుకొనిన ఫాంటు ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
 msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "అనురూపిత ఫాంటు"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "భాష ప్యానల్ కొరకు మలచుకొనిన ఫాంటు పేరు"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "అనువర్తన విండోనందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "గ్లోబల్ ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనముచేయుము"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనము చేయుము"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "పేరు మార్పును ఆపుటకు DConf కీల ప్రిఫిక్సులు"
 
@@ -388,26 +403,26 @@ msgstr "నకలుహక్కు (c) 2007-2010 Peng Huang\nనకలుహక
 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 "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
@@ -431,33 +446,25 @@ msgstr "కీ కోడ్:"
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "క్రితం యిన్పుట్ పద్దతికి మారుటకు లఘవును shift తో వుపయోగించు"
 
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "చేతనపరుచు"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "అచేతనపరుచు"
-
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -466,16 +473,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "ఇన్పుట్ పద్దతులు మార్చుట"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "ఇంజన్ పేరు మాత్రమే జాబితాచేయి"
@@ -484,7 +495,7 @@ msgstr "ఇంజన్ పేరు మాత్రమే జాబితాచ
 msgid "command [OPTIONS]"
 msgstr "ఆదేశం [ఐచ్చికాలు]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus కు అనుసంధానం కాలేదు.\n"
@@ -494,55 +505,50 @@ msgstr "IBus కు అనుసంధానం కాలేదు.\n"
 msgid "language: %s\n"
 msgstr "భాష: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "ఏ యింజన్ అమర్చలేదు.\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "గ్లోబల్ యింజన్ అమర్చుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "గ్లోబల్ యింజన్ పొందుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb లేఅవుట్ %s కు మార్చుట విఫలమైంది."
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "వాడుక: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "ఆదేశాలు:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s తెలియని ఆదేశం!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "కాపీరైట్ (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
diff --git a/po/uk.po b/po/uk.po
index a4f3fe6a6..a2e13784e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,16 +1,17 @@
-# translation of uk.po to Ukrainian
+# translation of ibus.pot to Ukrainian
 # Ukrainian translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2012.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2012
+# Yuri Chornoivan <yurchor@ukr.net>, 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-10-15 04:49+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-09 12:44+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +84,7 @@ msgstr "Попередній спосіб введення:"
 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 "Клавіатурне скорочення для вмикання і вимикання способів введення"
 
@@ -123,11 +124,11 @@ msgstr "Показ мовної панелі:"
 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 "Показувати назву способу введення на мовній панелі"
 
@@ -186,15 +187,15 @@ msgid ""
 msgstr "<small><i>Типовий спосіб введення — найвищий пункт у списку.\nЗмінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
 
 #. 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)"
 
@@ -202,7 +203,7 @@ msgstr "Використовувати розкладку клавіатури 
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../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 "Використовувати один спосіб введення для всіх програм"
 
@@ -236,18 +237,6 @@ msgstr "<b>Запуск</b>"
 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 "Попередньо завантажувати рушії"
@@ -265,114 +254,139 @@ 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "Встановити затримку появи контекстного вікна перемикача способів введення у мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 &lt; — затримка у мілісекундах. 0 &gt; — не показувати вікно і перемикатися на попередній або наступний рушій."
+
+#: ../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 для припинення перетворення назв"
 
@@ -386,30 +400,30 @@ msgstr "© Peng Huang, 2007–2010\n© Red Hat, Inc., 2007–2010"
 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"
 
@@ -429,27 +443,19 @@ msgstr "Код клавіші:"
 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 "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
 
 #: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -474,73 +480,137 @@ msgstr "Не вдалося запустити фонову службу IBus п
 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 "команда [ПАРАМЕТРИ]"
-
-#: ../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 "Читати дані з кешу регістру у файлі ФАЙЛ."
+
+#: ../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 "Записати дані до кешу регістру у файлі ФАЙЛ."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "Завершити роботу фонової служби ibus"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(не реалізовано)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "Перезапустити фонову службу ibus"
+
+#: ../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 "Вивести адресу D-Bus фонової служби ibus"
+
+#: ../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: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+Пробіл."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "© Peng Huang, 2007–2012\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Перезапустити"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed995e53d..c85b3e2f5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,22 +1,22 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
-# Copyright (C) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Christopher Meng <cickumqt@gmail.com>, 2012.
-#   <lovenemesis@gmail.com>, 2012.
-# Mike Ma <zhtx10@gmail.com>, 2011.
-# Peng Huang <shawn.p.huang@gmail.com>, 2007.
-# simonyanix <simonyan@fedoraproject.org>, 2011.
-# Tommy He <lovenemesis@gmail.com>, 2012.
+# Christopher Meng <cickumqt@gmail.com>, 2012-2013
+# Tommy He <lovenemesis@gmail.com>, 2012
+# Mike Manilone <zhtx10@gmail.com>, 2011
+# Peng Huang <shawn.p.huang@gmail.com>, 2007
+# simonyanix <simonyan@fedoraproject.org>, 2011
+# Tommy He <lovenemesis@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-22 09:18+0000\n"
-"Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
+"POT-Creation-Date: 2012-12-06 15:35+0900\n"
+"PO-Revision-Date: 2013-03-01 13:24+0000\n"
+"Last-Translator: Christopher Meng <cickumqt@gmail.com>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,7 +88,7 @@ msgstr "上一输入法："
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
@@ -98,7 +98,7 @@ msgstr "开关："
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "应用："
+msgstr "启用："
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
@@ -128,13 +128,13 @@ msgstr "显示语言栏："
 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:24
 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:26
 msgid "Show input method name on language bar"
-msgstr "在语言栏上显示输入法名字"
+msgstr "语言栏上显示输入法名称"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
@@ -188,18 +188,18 @@ msgstr "显示选中输入法的设置界面"
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>列表中第一个输入法是默认的输入法。\n您可以使用上/下按钮来更改默认的输入法。</i></small>"
+msgstr "<small><i>列表中的第一个输入法是默认输入法。\n您可以使用上/下按钮更改。</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
 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:27
 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:28
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
@@ -207,7 +207,7 @@ msgstr "使用系统键盘（XKB）布局"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
@@ -227,11 +227,11 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页： http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页：http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
-msgstr "启动桌面时自动启动 IBus"
+msgstr "登录时运行 IBus"
 
 #: ../setup/setup.ui.h:58
 msgid "<b>Startup</b>"
@@ -270,114 +270,129 @@ 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/下一个输入法引擎时不显示窗口。"
+
+#: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
 msgstr "触发快捷键"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "为 gtk_accelerator_parse 触发快捷键"
+
+#: ../data/ibus.schemas.in.h:10
 msgid "Enable shortcut keys"
 msgstr "应用快捷键"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:11
 msgid "The shortcut keys for turning input method on"
 msgstr "开启输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:12
 msgid "Disable shortcut keys"
 msgstr "禁用快捷键"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method off"
 msgstr "关闭输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:14
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:15
 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:16
 msgid "Prev engine shortcut keys"
 msgstr "上一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "切换到列表中上一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:18
 msgid "Auto hide"
 msgstr "自动隐藏"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:19
 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:20
 msgid "Language panel position"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:21
 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:22
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:23
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:25
 msgid "Show input method name"
-msgstr "在语言栏上显示输入法名字"
+msgstr "显示输入法名称"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:29
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:30
 msgid "Use custom font name for language panel"
-msgstr "语言栏是否使用自定义字体"
+msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:31
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:32
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:33
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:34
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:35
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:37
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:38
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:39
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -391,26 +406,26 @@ msgstr "版权所有 (c) 2007-2010 黄鹏\n版权所有 (c) 2007-2010 Red Hat 
 msgid "Other"
 msgstr "其他"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
-msgstr "语言: %s\n"
+msgstr "语言：%s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "键盘: %s\n"
+msgstr "键盘布局：%s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
-msgstr "作者: %s\n"
+msgstr "作者：%s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
-msgstr "描述:\n"
+msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "选择输入法"
 
@@ -434,33 +449,25 @@ msgstr "按键："
 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:99 ../setup/main.py:398
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:332
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:352
+#: ../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"
 "  export GTK_IM_MODULE=ibus\n"
@@ -469,16 +476,20 @@ msgid ""
 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:367
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
+#: ../setup/main.py:380
+msgid "switching input methods"
+msgstr "切换输入法"
+
 #: ../tools/main.vala:40
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
@@ -487,7 +498,7 @@ msgstr "仅列出引擎名称"
 msgid "command [OPTIONS]"
 msgstr "命令 [选项]"
 
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
@@ -497,55 +508,50 @@ msgstr "无法连接 IBus。\n"
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:150
 #, c-format
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:158
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:163
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:120
-#, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "切换 xkb 布局至 %s 失败。"
-
-#: ../tools/main.vala:185
+#: ../tools/main.vala:224
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "用法： %s 命令 [选项...]\n\n"
+msgstr "用法：%s 命令 [选项...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:225
 #, c-format
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "版权所有 (c) 2007-2012 黄鹏\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"
 msgstr "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:539
 msgid "Restart"
 msgstr "重新启动"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b982614f4..f6a8698b7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,18 +1,18 @@
 # translation of ibus.pot to Traditional Chinese
 # Traditional Chinese translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012.
-# Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.
-# Walter Cheuk <wwycheuk@gmail.com>, 2012.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012
+# Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009
+# Walter Cheuk <wwycheuk@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-11 13:56+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-09 12:51+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr "上一個輸入法："
 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 +125,11 @@ msgstr "顯示語言面板："
 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 +188,15 @@ msgid ""
 msgstr "<small><i>清單內最頂端的輸入法為預設輸入法。\n您可以以 向上/向下 按鈕進行變更。</i></small>"
 
 #. 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 +204,7 @@ msgstr "使用系統鍵盤 (XKB) 配置"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../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 +238,6 @@ msgstr "<b>啟動</b>"
 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 +255,139 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接往前/往後切換引擎。"
+
+#: ../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 +401,30 @@ msgstr "版權所有 (c) 2007-2010 黃鵬\n版權所有 (c) 2007-2010 Red Hat, I
 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 "鍵盤"
 
@@ -431,27 +444,19 @@ msgstr "按鍵碼："
 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 "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
 #: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -476,73 +481,137 @@ msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 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:185
+#: ../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: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 "超級鍵+空白鍵為現在的預設熱鍵。"
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "著作權 (c) 2007-2012 黃鵬\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010."
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "重新啟動"

From e5ca9e5b4bf2ad2499ccbfad588342a143eba24e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 20 Aug 2013 15:01:42 +0900
Subject: [PATCH 171/816] Use gsettings instead of ibus-config in ibus-setup
 and ibus-ui-gtk3.

TEST=ibus-setup and ibus-ui-gtk3

Review URL: https://codereview.appspot.com/12442044
---
 setup/main.py            | 185 ++++++++++--------------------
 ui/gtk3/application.vala |  34 +-----
 ui/gtk3/panel.vala       | 242 +++++++++++++--------------------------
 3 files changed, 141 insertions(+), 320 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index e3767dc52..d3f441422 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -25,6 +25,7 @@
 import sys
 import time
 
+from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import IBus
@@ -66,6 +67,11 @@ def __flush_gtk_events(self):
     def __init__(self):
         super(Setup, self).__init__()
 
+        self.__settings_general = Gio.Settings("org.freedesktop.ibus.general");
+        self.__settings_hotkey = Gio.Settings(
+                "org.freedesktop.ibus.general.hotkey");
+        self.__settings_panel = Gio.Settings("org.freedesktop.ibus.panel");
+
         # IBus.Bus() calls ibus_bus_new().
         # Gtk.Builder().add_from_file() also calls ibus_bus_new_async()
         # via ibus_im_context_new().
@@ -84,12 +90,7 @@ def __init__(self):
     def __init_hotkey(self):
         name = 'triggers'
         label = 'switch_engine'
-        variant = self.__config.get_value('general/hotkey', name)
-        if variant != None:
-            shortcuts = variant.unpack()
-        else:
-            shortcuts =  ['<Super>space']
-
+        shortcuts = self.__settings_hotkey.get_strv(name)
         button = self.__builder.get_object("button_%s" % label)
         entry = self.__builder.get_object("entry_%s" % label)
         entry.set_text("; ".join(shortcuts))
@@ -101,93 +102,90 @@ def __init_hotkey(self):
                 name, "general/hotkey", label, entry)
 
     def __init_panel(self):
-        values = dict(self.__config.get_values("panel"))
-
         # lookup table orientation
         self.__combobox_lookup_table_orientation = self.__builder.get_object(
                 "combobox_lookup_table_orientation")
-        self.__combobox_lookup_table_orientation.set_active(
-                values.get("lookup_table_orientation", 0))
-        self.__combobox_lookup_table_orientation.connect("changed",
-                self.__combobox_lookup_table_orientation_changed_cb)
+        self.__settings_panel.bind('lookup-table-orientation',
+                                   self.__combobox_lookup_table_orientation,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
         # auto hide
         self.__combobox_panel_show = self.__builder.get_object(
                 "combobox_panel_show")
-        self.__combobox_panel_show.set_active(values.get("show", 0))
-        self.__combobox_panel_show.connect("changed",
-                self.__combobox_panel_show_changed_cb)
+        self.__settings_panel.bind('show',
+                                   self.__combobox_panel_show,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
         # panel position
         self.__combobox_panel_position = self.__builder.get_object(
                 "combobox_panel_position")
-        self.__combobox_panel_position.set_active(values.get("position", 3))
-        self.__combobox_panel_position.connect("changed",
-                self.__combobox_panel_position_changed_cb)
+        self.__combobox_panel_position.set_active(3)
+        #self.__settings_panel.bind('position',
+        #                           self.__combobox_panel_position,
+        #                           'active',
+        #                           Gio.SettingsBindFlags.DEFAULT)
 
         # custom font
         self.__checkbutton_custom_font = self.__builder.get_object(
                 "checkbutton_custom_font")
-        self.__checkbutton_custom_font.set_active(
-                values.get("use_custom_font", False))
-        self.__checkbutton_custom_font.connect("toggled",
-                self.__checkbutton_custom_font_toggled_cb)
+        self.__settings_panel.bind('use-custom-font',
+                                   self.__checkbutton_custom_font,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
         self.__fontbutton_custom_font = self.__builder.get_object(
                 "fontbutton_custom_font")
-        if values.get("use_custom_font", False):
-            self.__fontbutton_custom_font.set_sensitive(True)
-        else:
-            self.__fontbutton_custom_font.set_sensitive(False)
-        font_name = Gtk.Settings.get_default().get_property("gtk-font-name")
-        font_name = unicode(font_name, "utf-8")
-        font_name = values.get("custom_font", font_name)
-        self.__fontbutton_custom_font.connect("notify::font-name",
-                self.__fontbutton_custom_font_notify_cb)
-        self.__fontbutton_custom_font.set_font_name(font_name)
+        self.__settings_panel.bind('custom-font',
+                                    self.__fontbutton_custom_font,
+                                   'font-name',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__settings_panel.bind('use-custom-font',
+                                    self.__fontbutton_custom_font,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.GET)
 
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(
                 "checkbutton_show_icon_on_systray")
-        self.__checkbutton_show_icon_on_systray.set_active(
-                values.get("show_icon_on_systray", True))
-        self.__checkbutton_show_icon_on_systray.connect("toggled",
-                self.__checkbutton_show_icon_on_systray_toggled_cb)
+        self.__settings_panel.bind('show-icon-on-systray',
+                                   self.__checkbutton_show_icon_on_systray,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
         # show ime name
         self.__checkbutton_show_im_name = self.__builder.get_object(
                 "checkbutton_show_im_name")
-        self.__checkbutton_show_im_name.set_active(
-                values.get("show_im_name", False))
-        self.__checkbutton_show_im_name.connect("toggled",
-                self.__checkbutton_show_im_name_toggled_cb)
+        self.__settings_panel.bind('show-im-name',
+                                   self.__checkbutton_show_im_name,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
     def __init_general(self):
-        values = dict(self.__config.get_values("general"))
-
         # embed preedit text
         self.__checkbutton_embed_preedit_text = self.__builder.get_object(
                 "checkbutton_embed_preedit_text")
-        self.__checkbutton_embed_preedit_text.set_active(
-                values.get("embed_preedit_text", True))
-        self.__checkbutton_embed_preedit_text.connect("toggled",
-                self.__checkbutton_embed_preedit_text_toggled_cb)
+        self.__settings_general.bind('embed-preedit-text',
+                                    self.__checkbutton_embed_preedit_text,
+                                    'active',
+                                    Gio.SettingsBindFlags.DEFAULT)
 
         # use system keyboard layout setting
         self.__checkbutton_use_sys_layout = self.__builder.get_object(
                 "checkbutton_use_sys_layout")
-        self.__checkbutton_use_sys_layout.set_active(
-                values.get("use_system_keyboard_layout", True))
-        self.__checkbutton_use_sys_layout.connect("toggled",
-                self.__checkbutton_use_sys_layout_toggled_cb)
+        self.__settings_general.bind('use-system-keyboard-layout',
+                                    self.__checkbutton_use_sys_layout,
+                                    'active',
+                                    Gio.SettingsBindFlags.DEFAULT)
 
         # use global ime setting
         self.__checkbutton_use_global_engine = self.__builder.get_object(
                 "checkbutton_use_global_engine")
-        self.__checkbutton_use_global_engine.set_active(
-                values.get("use_global_engine", False))
-        self.__checkbutton_use_global_engine.connect("toggled",
-                self.__checkbutton_use_global_engine_toggled_cb)
+        self.__settings_general.bind('use-global-engine',
+                                    self.__checkbutton_use_global_engine,
+                                    'active',
+                                    Gio.SettingsBindFlags.DEFAULT)
 
         # init engine page
         self.__engines = self.__bus.list_engines()
@@ -197,7 +195,7 @@ def __init_general(self):
         tmp_dict = {}
         for e in self.__engines:
             tmp_dict[e.get_name()] = e
-        engine_names = values.get("preload_engines", [])
+        engine_names = self.__settings_general.get_strv('preload-engines')
         engines = [tmp_dict[name] for name in engine_names if name in tmp_dict]
 
         self.__treeview = self.__builder.get_object("treeview_engines")
@@ -241,8 +239,6 @@ def __init_ui(self):
         self.__checkbutton_auto_start.connect("toggled",
                 self.__checkbutton_auto_start_toggled_cb)
 
-        self.__config = self.__bus.get_config()
-
         self.__init_hotkey()
         self.__init_panel()
         self.__init_general()
@@ -291,8 +287,7 @@ def __treeview_notify_cb(self, treeview, prop):
 
         if prop.name == "engines":
             engine_names = map(lambda e: e.get_name(), engines)
-            value = GLib.Variant.new_strv(engine_names)
-            self.__config.set_value("general", "preload_engines", value)
+            self.__settings_general.set_strv('preload-engines', engine_names)
 
     def __button_engine_add_cb(self, button):
         engine = self.__combobox.get_active_engine()
@@ -389,7 +384,7 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         dialog.destroy()
         if id != Gtk.ResponseType.OK:
             return
-        self.__config.set_value(section, name, GLib.Variant.new_strv(shortcuts))
+        self.__settings_hotkey.set_strv(name, shortcuts)
         text = "; ".join(shortcuts)
         entry.set_text(text)
         tooltip = "\n".join(shortcuts)
@@ -443,13 +438,13 @@ def __item_preload_column_toggled_cb(self, cell, path_str, model):
         if data[DATA_PRELOAD]:
             if engine not in self.__preload_engines:
                 self.__preload_engines.add(engine)
-                value = GLib.Variant.new_strv(list(self.__preload_engines))
-                self.__config.set_value("general", "preload_engines", value)
+                self.__settings_general.set_strv('preload-engines',
+                                                 list(self.__preload_engines))
         else:
             if engine in self.__preload_engines:
                 self.__preload_engines.remove(engine)
-                value = GLib.Variant.new_strv(list(self.__preload_engines))
-                self.__config.set_value("general", "preload_engines", value)
+                self.__settings_general.set_strv('preload-engines',
+                                                 list(self.__preload_engines))
 
         # set new value
         model.set(iter, COLUMN_PRELOAD, data[DATA_PRELOAD])
@@ -485,68 +480,6 @@ def __checkbutton_auto_start_toggled_cb(self, button):
         if self.__checkbutton_auto_start.get_active():
             os.symlink(ibus_desktop, link_file)
 
-    def __combobox_lookup_table_orientation_changed_cb(self, combobox):
-        self.__config.set_value(
-                "panel", "lookup_table_orientation",
-                GLib.Variant.new_int32(self.__combobox_lookup_table_orientation.get_active()))
-
-    def __combobox_panel_show_changed_cb(self, combobox):
-        self.__config.set_value(
-                "panel", "show",
-                GLib.Variant.new_int32(self.__combobox_panel_show.get_active()))
-
-    def __combobox_panel_position_changed_cb(self, combobox):
-        self.__config.set_value(
-                "panel", "position",
-                GLib.Variant.new_int32(self.__combobox_panel_position.get_active()))
-
-    def __checkbutton_custom_font_toggled_cb(self, button):
-        if self.__checkbutton_custom_font.get_active():
-            self.__fontbutton_custom_font.set_sensitive(True)
-            self.__config.set_value("panel", "use_custom_font",
-                    GLib.Variant.new_boolean(True))
-        else:
-            self.__fontbutton_custom_font.set_sensitive(False)
-            self.__config.set_value("panel", "use_custom_font",
-                    GLib.Variant.new_boolean(False))
-
-    def __fontbutton_custom_font_notify_cb(self, button, arg):
-        font_name = self.__fontbutton_custom_font.get_font_name()
-        font_name = unicode(font_name, "utf-8")
-        self.__config.set_value("panel", "custom_font",
-                GLib.Variant.new_string(font_name))
-
-    def __checkbutton_show_icon_on_systray_toggled_cb(self, button):
-        value = self.__checkbutton_show_icon_on_systray.get_active()
-        value = GLib.Variant.new_boolean(value)
-        self.__config.set_value("panel", "show_icon_on_systray", value)
-
-    def __checkbutton_show_im_name_toggled_cb(self, button):
-        value = self.__checkbutton_show_im_name.get_active()
-        value = GLib.Variant.new_boolean(value)
-        self.__config.set_value("panel", "show_im_name", value)
-
-    def __checkbutton_embed_preedit_text_toggled_cb(self, button):
-        value = self.__checkbutton_embed_preedit_text.get_active()
-        value = GLib.Variant.new_boolean(value)
-        self.__config.set_value("general", "embed_preedit_text", value)
-
-    def __checkbutton_use_sys_layout_toggled_cb(self, button):
-        value = self.__checkbutton_use_sys_layout.get_active()
-        value = GLib.Variant.new_boolean(value)
-        self.__config.set_value("general", "use_system_keyboard_layout", value)
-
-    def __checkbutton_use_global_engine_toggled_cb(self, button):
-        value = self.__checkbutton_use_global_engine.get_active()
-        value = GLib.Variant.new_boolean(value)
-        self.__config.set_value("general", "use_global_engine", value)
-
-    def __config_value_changed_cb(self, bus, section, name, value):
-        pass
-
-    def __config_reloaded_cb(self, bus):
-        pass
-
     def __sigusr1_cb(self, *args):
         self.__window.present()
 
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index 71309e00b..5ae6e8372 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -23,7 +23,6 @@
 class Application {
     private IBus.Bus m_bus;
     private Panel m_panel;
-    private IBus.Config m_config;
 
     public Application(string[] argv) {
         GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
@@ -62,15 +61,6 @@ class Application {
                 IBus.BusNameFlag.ALLOW_REPLACEMENT |
                 IBus.BusNameFlag.REPLACE_EXISTING;
         m_bus.request_name(IBus.SERVICE_PANEL, flags);
-
-        m_config = m_bus.get_config();
-        connection.signal_subscribe("org.freedesktop.DBus",
-                                    "org.freedesktop.DBus",
-                                    "NameOwnerChanged",
-                                    "/org/freedesktop/DBus",
-                                    IBus.SERVICE_CONFIG,
-                                    DBusSignalFlags.NONE,
-                                    config_name_owner_changed_cb);
     }
 
     public int run() {
@@ -86,10 +76,7 @@ class Application {
                                       Variant parameters) {
         debug("signal_name = %s", signal_name);
         m_panel = new Panel(m_bus);
-
-        if (m_config != null) {
-            m_panel.set_config(m_config);
-        }
+        m_panel.load_settings();
     }
 
     private void bus_name_lost_cb(DBusConnection connection,
@@ -102,25 +89,6 @@ class Application {
         m_panel = null;
     }
 
-    private void config_name_owner_changed_cb(DBusConnection connection,
-                                              string sender_name,
-                                              string object_path,
-                                              string interface_name,
-                                              string signal_name,
-                                              Variant parameters) {
-        debug("signal_name = %s", signal_name);
-        string name, new_owner, old_owner;
-        parameters.get("(sss)", out name, out old_owner, out new_owner);
-
-        if (new_owner == "") {
-            m_config = null;
-        } else {
-            m_config = m_bus.get_config();
-        }
-        if (m_panel != null)
-            m_panel.set_config(m_config);
-    }
-
     private void bus_disconnected(IBus.Bus bus) {
         debug("connection is lost.");
         Gtk.main_quit();
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 3821b3c80..8e23bf9e4 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -36,7 +36,9 @@ class Panel : IBus.PanelService {
     }
 
     private IBus.Bus m_bus;
-    private IBus.Config m_config;
+    private GLib.Settings m_settings_general = null;
+    private GLib.Settings m_settings_hotkey = null;
+    private GLib.Settings m_settings_panel = null;
     private Gtk.StatusIcon m_status_icon;
     private Gtk.Menu m_ime_menu;
     private Gtk.Menu m_sys_menu;
@@ -49,7 +51,6 @@ 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;
-    private const string ACCELERATOR_SWITCH_IME_FOREWARD = "<Super>space";
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -61,6 +62,8 @@ class Panel : IBus.PanelService {
 
         m_bus = bus;
 
+        init_settings();
+
         // init ui
         m_status_icon = new Gtk.StatusIcon();
         m_status_icon.set_name("ibus-ui-gtk");
@@ -75,7 +78,7 @@ class Panel : IBus.PanelService {
 
         m_switcher = new Switcher();
         // The initial shortcut is "<Super>space"
-        bind_switch_shortcut(null);
+        bind_switch_shortcut();
 
         if (m_switcher_delay_time >= 0) {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
@@ -93,6 +96,44 @@ class Panel : IBus.PanelService {
         unbind_switch_shortcut();
     }
 
+    private void init_settings() {
+        m_settings_general = new GLib.Settings("org.freedesktop.ibus.general");
+        m_settings_hotkey =
+                new GLib.Settings("org.freedesktop.ibus.general.hotkey");
+        m_settings_panel = new GLib.Settings("org.freedesktop.ibus.panel");
+
+        m_settings_general.changed["preload-engines"].connect((key) => {
+                update_engines(m_settings_general.get_strv(key),
+                               null);
+        });
+
+        m_settings_general.changed["switcher-delay-time"].connect((key) => {
+                set_switcher_delay_time();
+        });
+
+        m_settings_general.changed["use-system-keyboard-layout"].connect(
+            (key) => {
+                set_use_system_keyboard_layout();
+        });
+
+        m_settings_general.changed["embed-preedit-text"].connect((key) => {
+                set_embed_preedit_text();
+        });
+
+        m_settings_hotkey.changed["triggers"].connect((key) => {
+                unbind_switch_shortcut();
+                bind_switch_shortcut();
+        });
+
+        m_settings_panel.changed["custom-font"].connect((key) => {
+                set_custom_font();
+        });
+
+        m_settings_panel.changed["use-custom-font"].connect((key) => {
+                set_custom_font();
+        });
+    }
+
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
                                          string?           accelerator) {
         uint switch_keysym = 0;
@@ -152,20 +193,8 @@ class Panel : IBus.PanelService {
                 (e) => handle_engine_switch(e, true));
     }
 
-    private void bind_switch_shortcut(Variant? variant) {
-        string[] accelerators = {};
-        Variant var_trigger = variant;
-
-        if (var_trigger == null && m_config != null) {
-            var_trigger = m_config.get_value("general/hotkey",
-                                             "triggers");
-        }
-
-        if (var_trigger != null) {
-            accelerators = var_trigger.dup_strv();
-        } else {
-            accelerators += ACCELERATOR_SWITCH_IME_FOREWARD;
-        }
+    private void bind_switch_shortcut() {
+        string[] accelerators = m_settings_hotkey.get_strv("triggers");
 
         var keybinding_manager = KeybindingManager.get_instance();
 
@@ -200,13 +229,7 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        bool use_custom_font = false;
-        GLib.Variant var_use_custom_font = m_config.get_value("panel",
-                                                              "use_custom_font");
-
-        if (var_use_custom_font != null) {
-            use_custom_font = var_use_custom_font.get_boolean();
-        }
+        bool use_custom_font = m_settings_panel.get_boolean("use-custom-font");
 
         if (m_css_provider != null) {
             Gtk.StyleContext.remove_provider_for_screen(screen,
@@ -218,15 +241,10 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        string font_name = null;
-        GLib.Variant var_custom_font = m_config.get_value("panel",
-                                                          "custom_font");
-        if (var_custom_font != null) {
-            font_name = var_custom_font.dup_string();
-        }
+        string font_name = m_settings_panel.get_string("custom-font");
 
         if (font_name == null) {
-            warning("No config panel:custom_font.");
+            warning("No config panel:custom-font.");
             return;
         }
 
@@ -247,55 +265,29 @@ class Panel : IBus.PanelService {
                                                  Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
-    private void set_switcher_delay_time(Variant? variant) {
-        Variant var_switcher_delay_time = variant;
-
-        if (var_switcher_delay_time == null) {
-            var_switcher_delay_time = m_config.get_value("general",
-                                                         "switcher-delay-time");
-        }
-
-        if (var_switcher_delay_time == null) {
-            return;
-        }
-
-        m_switcher_delay_time = var_switcher_delay_time.get_int32();
+    private void set_switcher_delay_time() {
+        m_switcher_delay_time =
+                m_settings_general.get_int("switcher-delay-time");
 
         if (m_switcher_delay_time >= 0) {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
     }
 
-    private void set_use_system_keyboard_layout(Variant? variant) {
-        Variant var_use_system_kbd_layout = variant;
-
-        if (var_use_system_kbd_layout == null) {
-            var_use_system_kbd_layout = m_config.get_value(
-                    "general",
-                    "use_system_keyboard_layout");
-        }
-
-        if (var_use_system_kbd_layout == null) {
-            return;
-        }
-
-        m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean();
+    private void set_use_system_keyboard_layout() {
+        m_use_system_keyboard_layout =
+                m_settings_general.get_boolean("use-system-keyboard-layout");
     }
 
-    private void set_embed_preedit_text(Variant? variant) {
-        Variant var_embed_preedit = variant;
-
-        if (var_embed_preedit == null) {
-            var_embed_preedit = m_config.get_value("general",
-                                                   "embed_preedit_text");
-        }
+    private void set_embed_preedit_text() {
+        Variant variant =
+                    m_settings_general.get_value("embed-preedit-text");
 
-        if (var_embed_preedit == null) {
+        if (variant == null) {
             return;
         }
 
-        m_bus.set_ibus_property("EmbedPreeditText",
-                                var_embed_preedit);
+        m_bus.set_ibus_property("EmbedPreeditText", variant);
     }
 
     private int compare_versions(string version1, string version2) {
@@ -362,15 +354,9 @@ class Panel : IBus.PanelService {
     }
 
     private void set_version() {
-        Variant var_prev_version = m_config.get_value("general", "version");
-        Variant var_current_version = null;
-        string prev_version = "".dup();
+        string prev_version = m_settings_general.get_string("version");
         string current_version = null;
 
-        if (var_prev_version != null) {
-            prev_version = var_prev_version.dup_string();
-        }
-
         if (compare_versions(prev_version, "1.5.3") < 0) {
             update_version_1_5_3();
         }
@@ -383,43 +369,22 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        var_current_version = new Variant.string(current_version);
-        m_config.set_value("general", "version", var_current_version);
-    }
-
-    public void set_config(IBus.Config config) {
-        if (m_config != null) {
-            m_config.value_changed.disconnect(config_value_changed_cb);
-            m_config.watch(null, null);
-            m_config = null;
-        }
-
-        m_config = config;
-        if (m_config != null) {
-            m_config.value_changed.connect(config_value_changed_cb);
-            m_config.watch("general", "preload_engines");
-            m_config.watch("general", "embed_preedit_text");
-            m_config.watch("general", "engines_order");
-            m_config.watch("general", "switcher_delay_time");
-            m_config.watch("general", "use_system_keyboard_layout");
-            m_config.watch("general/hotkey", "triggers");
-            m_config.watch("panel", "custom_font");
-            m_config.watch("panel", "use_custom_font");
-            // Update m_use_system_keyboard_layout before update_engines()
-            // is called.
-            set_use_system_keyboard_layout(null);
-            update_engines(m_config.get_value("general", "preload_engines"),
-                           m_config.get_value("general", "engines_order"));
-            unbind_switch_shortcut();
-            bind_switch_shortcut(null);
-            set_switcher_delay_time(null);
-            set_embed_preedit_text(null);
-            set_custom_font();
-
-            set_version();
-        } else {
-            update_engines(null, null);
-        }
+        m_settings_general.set_string("version", current_version);
+    }
+
+    public void load_settings() {
+        // Update m_use_system_keyboard_layout before update_engines()
+        // is called.
+        set_use_system_keyboard_layout();
+        update_engines(m_settings_general.get_strv("preload-engines"),
+                       m_settings_general.get_strv("engines-order"));
+        unbind_switch_shortcut();
+        bind_switch_shortcut();
+        set_switcher_delay_time();
+        set_embed_preedit_text();
+        set_custom_font();
+
+        set_version();
     }
 
     private void exec_setxkbmap(IBus.EngineDesc engine) {
@@ -486,43 +451,6 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private void config_value_changed_cb(IBus.Config config,
-                                         string section,
-                                         string name,
-                                         Variant variant) {
-        if (section == "general" && name == "preload_engines") {
-            update_engines(variant, null);
-            return;
-        }
-
-        if (section == "general/hotkey" && name == "triggers") {
-            unbind_switch_shortcut();
-            bind_switch_shortcut(variant);
-            return;
-        }
-
-        if (section == "panel" && (name == "custom_font" ||
-                                   name == "use_custom_font")) {
-            set_custom_font();
-            return;
-        }
-
-        if (section == "general" && name == "switcher_delay_time") {
-            set_switcher_delay_time(variant);
-            return;
-        }
-
-        if (section == "general" && name == "use_system_keyboard_layout") {
-            set_use_system_keyboard_layout(variant);
-            return;
-        }
-
-        if (section == "general" && name == "embed_preedit_text") {
-            set_embed_preedit_text(variant);
-            return;
-        }
-    }
-
     private void handle_engine_switch(Gdk.Event event, bool revert) {
         // Do not need switch IME
         if (m_engines.length <= 1)
@@ -567,18 +495,13 @@ class Panel : IBus.PanelService {
         m_bus.preload_engines_async(names, -1, null);
     }
 
-    private void update_engines(GLib.Variant? var_engines,
-                                GLib.Variant? var_order) {
-        string[] engine_names = null;
+    private void update_engines(string[]? unowned_engine_names,
+                                string[]? order_names) {
+        string[]? engine_names = unowned_engine_names;
 
-        if (var_engines != null)
-            engine_names = var_engines.dup_strv();
         if (engine_names == null || engine_names.length == 0)
             engine_names = {"xkb:us::eng"};
 
-        string[] order_names =
-            (var_order != null) ? var_order.dup_strv() : null;
-
         string[] names = {};
 
         foreach (var name in order_names) {
@@ -851,9 +774,6 @@ class Panel : IBus.PanelService {
         foreach(var desc in m_engines) {
             names += desc.get_name();
         }
-        if (m_config != null)
-            m_config.set_value("general",
-                               "engines_order",
-                               new GLib.Variant.strv(names));
+        m_settings_general.set_strv("engines-order", names);
     }
 }

From b4bb7c2d103170e30e86b55fb61a9344f62252bb Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Wed, 28 Aug 2013 09:53:56 +0900
Subject: [PATCH 172/816] Update french translation

Review URL: https://codereview.appspot.com/13260043
Patch from Julien Humbert <julroy67@gmail.com>.
---
 po/fr.po | 112 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 80 insertions(+), 32 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 30d06b988..11dc2779f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,27 +2,27 @@
 # French translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009.
 # dominique bribanick <chepioq@gmail.com>, 2011.
-# Humbert Julien <julroy67@gmail.com>, 2009, 2010.
 # Jérôme Fenal <jfenal@gmail.com>, 2012, 2013.
-# Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011.
+# Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011, 2012, 2013.
 # Sam Friedmann <sam.friedmann@redhat.com>, 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-03-10 21:30+0000\n"
-"Last-Translator: Jérôme Fenal <jfenal@gmail.com>\n"
+"PO-Revision-Date: 2013-08-16 11:20+0100\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\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,7 +70,8 @@ msgstr "Préférences de IBus"
 
 #: ../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 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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 @@ msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
 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 @@ 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"
@@ -146,7 +152,9 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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 @@ msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée acti
 
 #: ../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"
@@ -188,7 +201,9 @@ msgstr "Afficher le paramétrage de la méthode d'entrée sélectectionnée"
 msgid ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>La méthode d'entrée par défaut se trouve en haut de la liste.\nUtilisez les boutons « Monter/Descendre » pour changer l'ordre.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
@@ -227,7 +242,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Page d'accueil : http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -271,14 +292,20 @@ msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
 #: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; ne pas afficher la fenêtre et commmuteur 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 &lt; délai en millisecondes. 0 &gt; ne pas "
+"afficher la fenêtre et permuter avec le moteur précédent ou suivant."
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Trigger shortcut keys"
@@ -310,7 +337,8 @@ msgstr "Raccourci clavier pour passer au moteur suivant"
 
 #: ../data/ibus.schemas.in.h:15
 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
 msgid "Prev engine shortcut keys"
@@ -328,7 +356,9 @@ msgstr "Masquage automatique"
 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
 msgid "Language panel position"
@@ -338,7 +368,10 @@ msgstr "Position de la barre"
 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
 msgid "Orientation of lookup table"
@@ -386,11 +419,12 @@ msgstr "Par défaut, activer la méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:38
 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
 msgid "DConf preserve name prefixes"
-msgstr "Préfixes de préservation de nom DConf"
+msgstr "Préservation des préfixes de nom DConf"
 
 #: ../data/ibus.schemas.in.h:40
 msgid "Prefixes of DConf keys to stop name conversion"
@@ -400,7 +434,9 @@ msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 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 +489,9 @@ msgstr "Modificateurs :"
 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)"
@@ -461,19 +499,27 @@ msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
 #: ../setup/main.py:99 ../setup/main.py:398
 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
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer ?"
+msgstr "Le démon IBus n'est pas démarré. Souhaitez-vous le démarrer ?"
 
 #: ../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 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:367
@@ -501,7 +547,7 @@ msgstr "commande [OPTIONS]"
 #: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr "Connexion à IBus impossible.\n"
+msgstr "Connexion impossible à IBus.\n"
 
 #: ../tools/main.vala:82
 #, c-format
@@ -528,7 +574,9 @@ msgstr "Échec de la récupération du moteur global.\n"
 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
 #, c-format
@@ -538,7 +586,7 @@ msgstr "Commandes :\n"
 #: ../tools/main.vala:247
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s n'est pas unecommande connue !\n"
+msgstr "%s n'est pas une commande connue !\n"
 
 #: ../ui/gtk3/panel.vala:498
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
@@ -546,7 +594,7 @@ msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
 #: ../ui/gtk3/panel.vala:503
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus est un IME intelligent pour Linux/Unix"
+msgstr "IBus est un IME intelligent pour Linux/Unix."
 
 #: ../ui/gtk3/panel.vala:507
 msgid "translator-credits"

From 47fbb130190f31e8a9e385c8b58718f999119b6c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 28 Aug 2013 13:10:46 +0900
Subject: [PATCH 173/816] Implement IME state per window.

BUG=http://code.google.com/p/ibus/issues/detail?id=1568
TEST=Disable global engine with ibus-setup.

Review URL: https://codereview.appspot.com/12957046
---
 bus/ibusimpl.c         |  10 +-
 bus/panelproxy.c       |  24 ++-
 bus/panelproxy.h       |  95 +++++++-----
 data/ibus.schemas.in   |   2 +-
 setup/setup.ui         |   2 +-
 src/ibuspanelservice.c | 338 +++++++++++++++++++++++++++--------------
 src/ibuspanelservice.h |  15 +-
 ui/gtk3/panel.vala     | 128 ++++++++++++++--
 8 files changed, 442 insertions(+), 172 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index bd4e488fd..eec6da3fc 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -826,7 +826,8 @@ _context_focus_out_cb (BusInputContext    *context,
 /**
  * _context_destroy_cb:
  *
- * A callback function to be called when the "destroy" signal is sent to the context.
+ * A callback function to be called when the "destroy" signal is sent to the
+ * context.
  */
 static void
 _context_destroy_cb (BusInputContext    *context,
@@ -835,9 +836,12 @@ _context_destroy_cb (BusInputContext    *context,
     g_assert (BUS_IS_IBUS_IMPL (ibus));
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    if (context == ibus->focused_context) {
+    if (context == ibus->focused_context)
         bus_ibus_impl_set_focused_context (ibus, NULL);
-    }
+
+    if (ibus->panel &&
+        bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS)
+        bus_panel_proxy_destroy_context (ibus->panel, context);
 
     ibus->contexts = g_list_remove (ibus->contexts, context);
     g_object_unref (context);
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 8099e88a8..d49f1e103 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -694,3 +694,23 @@ bus_panel_proxy_focus_out (BusPanelProxy    *panel,
     panel->focused_context = NULL;
 }
 
+void
+bus_panel_proxy_destroy_context (BusPanelProxy    *panel,
+                                 BusInputContext  *context)
+{
+    const gchar *path;
+
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    g_object_ref_sink (context);
+    path = ibus_service_get_object_path ((IBusService *)context);
+
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "DestroyContext",
+                       g_variant_new ("(o)", path),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+
+    g_object_unref (context);
+}
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index cc3183ea5..ff7e5ceb8 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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
@@ -36,62 +36,79 @@
 #define BUS_PANEL_PROXY(obj)             \
     (G_TYPE_CHECK_INSTANCE_CAST ((obj), BUS_TYPE_PANEL_PROXY, BusPanelProxy))
 #define BUS_PANEL_PROXY_CLASS(klass)     \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), BUS_TYPE_PANEL_PROXY, BusPanelProxyClass))
+    (G_TYPE_CHECK_CLASS_CAST ((klass),   \
+                              BUS_TYPE_PANEL_PROXY, \
+                              BusPanelProxyClass))
 #define BUS_IS_PANEL_PROXY(obj)          \
     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BUS_TYPE_PANEL_PROXY))
 #define BUS_IS_PANEL_PROXY_CLASS(klass)  \
     (G_TYPE_CHECK_CLASS_TYPE ((klass), BUS_TYPE_PANEL_PROXY))
 #define BUS_PANEL_PROXY_GET_CLASS(obj)   \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), BUS_TYPE_PANEL_PROXY, BusPanelProxyClass))
+    (G_TYPE_INSTANCE_GET_CLASS ((obj),   \
+                                BUS_TYPE_PANEL_PROXY, \
+                                BusPanelProxyClass))
 
 G_BEGIN_DECLS
 
 typedef struct _BusPanelProxy BusPanelProxy;
 typedef struct _BusPanelProxyClass BusPanelProxyClass;
 
-GType            bus_panel_proxy_get_type           (void);
-BusPanelProxy   *bus_panel_proxy_new                (BusConnection      *connection);
+GType            bus_panel_proxy_get_type      (void);
+BusPanelProxy   *bus_panel_proxy_new           (BusConnection     *connection);
 
 /* functions that invoke D-Bus methods of the panel component. */
-void             bus_panel_proxy_focus_in           (BusPanelProxy      *panel,
-                                                     BusInputContext    *context);
-void             bus_panel_proxy_focus_out          (BusPanelProxy      *panel,
-                                                     BusInputContext    *context);
+void             bus_panel_proxy_focus_in      (BusPanelProxy     *panel,
+                                                BusInputContext   *context);
+void             bus_panel_proxy_focus_out     (BusPanelProxy     *panel,
+                                                BusInputContext   *context);
+void             bus_panel_proxy_destroy_context
+                                               (BusPanelProxy     *panel,
+                                                BusInputContext   *context);
 void             bus_panel_proxy_set_cursor_location
-                                                    (BusPanelProxy      *panel,
-                                                     gint32              x,
-                                                     gint32              y,
-                                                     gint32              w,
-                                                     gint32              h);
-void             bus_panel_proxy_update_preedit_text(BusPanelProxy      *panel,
-                                                     IBusText           *text,
-                                                     guint               cursor_pos,
-                                                     gboolean            visible);
-void             bus_panel_proxy_show_preedit_text  (BusPanelProxy      *panel);
-void             bus_panel_proxy_hide_preedit_text  (BusPanelProxy      *panel);
+                                               (BusPanelProxy     *panel,
+                                                gint32             x,
+                                                gint32             y,
+                                                gint32             w,
+                                                gint32             h);
+void             bus_panel_proxy_update_preedit_text
+                                               (BusPanelProxy     *panel,
+                                                IBusText          *text,
+                                                guint              cursor_pos,
+                                                gboolean           visible);
+void             bus_panel_proxy_show_preedit_text
+                                               (BusPanelProxy     *panel);
+void             bus_panel_proxy_hide_preedit_text
+                                               (BusPanelProxy     *panel);
 void             bus_panel_proxy_update_auxiliary_text
-                                                    (BusPanelProxy      *panel,
-                                                     IBusText           *text,
-                                                     gboolean            visible);
-void             bus_panel_proxy_show_auxiliary_text(BusPanelProxy      *panel);
-void             bus_panel_proxy_hide_auxiliary_text(BusPanelProxy      *panel);
-void             bus_panel_proxy_update_lookup_table(BusPanelProxy      *panel,
-                                                     IBusLookupTable    *table,
-                                                     gboolean           visible);
-void             bus_panel_proxy_show_lookup_table  (BusPanelProxy      *panel);
-void             bus_panel_proxy_hide_lookup_table  (BusPanelProxy      *panel);
+                                               (BusPanelProxy     *panel,
+                                                IBusText          *text,
+                                                gboolean           visible);
+void             bus_panel_proxy_show_auxiliary_text
+                                               (BusPanelProxy     *panel);
+void             bus_panel_proxy_hide_auxiliary_text
+                                               (BusPanelProxy     *panel);
+void             bus_panel_proxy_update_lookup_table
+                                               (BusPanelProxy     *panel,
+                                                IBusLookupTable   *table,
+                                                gboolean           visible);
+void             bus_panel_proxy_show_lookup_table
+                                               (BusPanelProxy     *panel);
+void             bus_panel_proxy_hide_lookup_table
+                                               (BusPanelProxy     *panel);
 void             bus_panel_proxy_page_up_lookup_table
-                                                    (BusPanelProxy      *panel);
+                                               (BusPanelProxy     *panel);
 void             bus_panel_proxy_page_down_lookup_table
-                                                    (BusPanelProxy      *panel);
+                                               (BusPanelProxy     *panel);
 void             bus_panel_proxy_cursor_up_lookup_table
-                                                    (BusPanelProxy      *panel);
+                                               (BusPanelProxy     *panel);
 void             bus_panel_proxy_cursor_down_lookup_table
-                                                    (BusPanelProxy      *panel);
-void             bus_panel_proxy_register_properties(BusPanelProxy      *panel,
-                                                     IBusPropList       *prop_list);
-void             bus_panel_proxy_update_property    (BusPanelProxy      *panel,
-                                                     IBusProperty       *prop);
+                                               (BusPanelProxy     *panel);
+void             bus_panel_proxy_register_properties
+                                               (BusPanelProxy     *panel,
+                                                IBusPropList      *prop_list);
+void             bus_panel_proxy_update_property
+                                               (BusPanelProxy     *panel,
+                                                IBusProperty      *prop);
 G_END_DECLS
 #endif
 
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 9cfe83b20..2779139fd 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -282,7 +282,7 @@
       <applyto>/desktop/ibus/general/use_global_engine</applyto>
       <owner>ibus</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Use global input method</short>
 	    <long>Share the same input method among all applications</long>
diff --git a/setup/setup.ui b/setup/setup.ui
index 204226350..1638abbe1 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1001,7 +1001,7 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame5">
-                        <property name="no_show_all">True</property>
+                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index ac9c7c756..eadbf5ea2 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -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) 2009, Google Inc. All rights reserved.
- * Copyright (C) 2010 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2009-2013 Google Inc. All rights reserved.
+ * Copyright (C) 2010-2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,6 +48,7 @@ enum {
     SHOW_PREEDIT_TEXT,
     START_SETUP,
     STATE_CHANGED,
+    DESTROY_CONTEXT,
     LAST_SIGNAL,
 };
 
@@ -58,62 +59,80 @@ enum {
 static guint            panel_signals[LAST_SIGNAL] = { 0 };
 
 /* functions prototype */
-static void      ibus_panel_service_set_property          (IBusPanelService       *panel,
-                                                           guint                   prop_id,
-                                                           const GValue           *value,
-                                                           GParamSpec             *pspec);
-static void      ibus_panel_service_get_property          (IBusPanelService       *panel,
-                                                           guint                   prop_id,
-                                                           GValue                 *value,
-                                                           GParamSpec             *pspec);
-static void      ibus_panel_service_real_destroy          (IBusPanelService       *panel);
-static void      ibus_panel_service_service_method_call   (IBusService            *service,
-                                                           GDBusConnection        *connection,
-                                                           const gchar            *sender,
-                                                           const gchar            *object_path,
-                                                           const gchar            *interface_name,
-                                                           const gchar            *method_name,
-                                                           GVariant               *parameters,
-                                                           GDBusMethodInvocation  *invocation);
-static GVariant *ibus_panel_service_service_get_property  (IBusService            *service,
-                                                           GDBusConnection        *connection,
-                                                           const gchar            *sender,
-                                                           const gchar            *object_path,
-                                                           const gchar            *interface_name,
-                                                           const gchar            *property_name,
-                                                           GError                **error);
-static gboolean  ibus_panel_service_service_set_property  (IBusService            *service,
-                                                           GDBusConnection        *connection,
-                                                           const gchar            *sender,
-                                                           const gchar            *object_path,
-                                                           const gchar            *interface_name,
-                                                           const gchar            *property_name,
-                                                           GVariant               *value,
-                                                           GError                **error);
-static void      ibus_panel_service_not_implemented       (IBusPanelService      *panel);
-static void      ibus_panel_service_focus_in              (IBusPanelService      *panel,
-                                                           const gchar           *input_context_path);
-static void      ibus_panel_service_focus_out             (IBusPanelService      *panel,
-                                                           const gchar           *input_context_path);
-static void      ibus_panel_service_register_properties   (IBusPanelService      *panel,
-                                                           IBusPropList          *prop_list);
-static void      ibus_panel_service_set_cursor_location   (IBusPanelService      *panel,
-                                                           gint                   x,
-                                                           gint                   y,
-                                                           gint                   w,
-                                                           gint                   h);
-static void      ibus_panel_service_update_auxiliary_text (IBusPanelService      *panel,
-                                                           IBusText              *text,
-                                                           gboolean               visible);
-static void      ibus_panel_service_update_lookup_table   (IBusPanelService      *panel,
-                                                           IBusLookupTable       *lookup_table,
-                                                           gboolean               visible);
-static void      ibus_panel_service_update_preedit_text   (IBusPanelService      *panel,
-                                                           IBusText              *text,
-                                                           guint                  cursor_pos,
-                                                           gboolean               visible);
-static void      ibus_panel_service_update_property       (IBusPanelService      *panel,
-                                                           IBusProperty          *prop);
+static void      ibus_panel_service_set_property
+                                   (IBusPanelService       *panel,
+                                    guint                   prop_id,
+                                    const GValue           *value,
+                                    GParamSpec             *pspec);
+static void      ibus_panel_service_get_property
+                                   (IBusPanelService       *panel,
+                                    guint                   prop_id,
+                                    GValue                 *value,
+                                    GParamSpec             *pspec);
+static void      ibus_panel_service_real_destroy
+                                   (IBusPanelService       *panel);
+static void      ibus_panel_service_service_method_call
+                                   (IBusService            *service,
+                                    GDBusConnection        *connection,
+                                    const gchar            *sender,
+                                    const gchar            *object_path,
+                                    const gchar            *interface_name,
+                                    const gchar            *method_name,
+                                    GVariant               *parameters,
+                                    GDBusMethodInvocation  *invocation);
+static GVariant *ibus_panel_service_service_get_property
+                                   (IBusService            *service,
+                                    GDBusConnection        *connection,
+                                    const gchar            *sender,
+                                    const gchar            *object_path,
+                                    const gchar            *interface_name,
+                                    const gchar            *property_name,
+                                    GError                **error);
+static gboolean  ibus_panel_service_service_set_property
+                                   (IBusService            *service,
+                                    GDBusConnection        *connection,
+                                    const gchar            *sender,
+                                    const gchar            *object_path,
+                                    const gchar            *interface_name,
+                                    const gchar            *property_name,
+                                    GVariant               *value,
+                                    GError                **error);
+static void      ibus_panel_service_not_implemented
+                                   (IBusPanelService       *panel);
+static void      ibus_panel_service_focus_in
+                                   (IBusPanelService       *panel,
+                                    const gchar            *input_context_path);
+static void      ibus_panel_service_focus_out
+                                   (IBusPanelService       *panel,
+                                    const gchar            *input_context_path);
+static void      ibus_panel_service_destroy_context
+                                   (IBusPanelService       *panel,
+                                    const gchar            *input_context_path);
+static void      ibus_panel_service_register_properties
+                                   (IBusPanelService       *panel,
+                                    IBusPropList           *prop_list);
+static void      ibus_panel_service_set_cursor_location
+                                   (IBusPanelService       *panel,
+                                    gint                    x,
+                                    gint                    y,
+                                    gint                    w,
+                                    gint                    h);
+static void      ibus_panel_service_update_auxiliary_text
+                                   (IBusPanelService       *panel,
+                                    IBusText               *text,
+                                    gboolean                visible);
+static void      ibus_panel_service_update_lookup_table
+                                   (IBusPanelService       *panel,
+                                    IBusLookupTable        *lookup_table,
+                                    gboolean                visible);
+static void      ibus_panel_service_update_preedit_text
+                                   (IBusPanelService       *panel,
+                                    IBusText               *text,
+                                    guint                   cursor_pos,
+                                    gboolean                visible);
+static void      ibus_panel_service_update_property
+                                   (IBusPanelService       *panel,
+                                    IBusProperty           *prop);
 
 G_DEFINE_TYPE (IBusPanelService, ibus_panel_service, IBUS_TYPE_SERVICE)
 
@@ -156,6 +175,9 @@ static const gchar introspection_xml[] =
     "    <method name='FocusOut'>"
     "      <arg direction='in'  type='o' name='ic' />"
     "    </method>"
+    "    <method name='DestroyContext'>"
+    "      <arg direction='in'  type='o' name='ic' />"
+    "    </method>"
     "    <method name='SetCursorLocation'>"
     "      <arg direction='in' type='i' name='x' />"
     "      <arg direction='in' type='i' name='y' />"
@@ -194,21 +216,30 @@ static void
 ibus_panel_service_class_init (IBusPanelServiceClass *class)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-    ibus_panel_service_parent_class = IBUS_SERVICE_CLASS (g_type_class_peek_parent (class));
+    ibus_panel_service_parent_class =
+            IBUS_SERVICE_CLASS (g_type_class_peek_parent (class));
 
-    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_panel_service_set_property;
-    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_panel_service_get_property;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_panel_service_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_panel_service_get_property;
 
-    IBUS_OBJECT_CLASS (gobject_class)->destroy = (IBusObjectDestroyFunc) ibus_panel_service_real_destroy;
+    IBUS_OBJECT_CLASS (gobject_class)->destroy =
+            (IBusObjectDestroyFunc) ibus_panel_service_real_destroy;
 
-    IBUS_SERVICE_CLASS (class)->service_method_call  = ibus_panel_service_service_method_call;
-    IBUS_SERVICE_CLASS (class)->service_get_property = ibus_panel_service_service_get_property;
-    IBUS_SERVICE_CLASS (class)->service_set_property = ibus_panel_service_service_set_property;
+    IBUS_SERVICE_CLASS (class)->service_method_call  =
+            ibus_panel_service_service_method_call;
+    IBUS_SERVICE_CLASS (class)->service_get_property =
+            ibus_panel_service_service_get_property;
+    IBUS_SERVICE_CLASS (class)->service_set_property =
+            ibus_panel_service_service_set_property;
 
-    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class), introspection_xml);
+    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class),
+                                       introspection_xml);
 
     class->focus_in              = ibus_panel_service_focus_in;
     class->focus_out             = ibus_panel_service_focus_out;
+    class->destroy_context       = ibus_panel_service_destroy_context;
     class->register_properties   = ibus_panel_service_register_properties;
     class->set_cursor_location   = ibus_panel_service_set_cursor_location;
     class->update_lookup_table   = ibus_panel_service_update_lookup_table;
@@ -240,9 +271,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @visible: Whether the update is visible.
      *
      * Emitted when the client application get the update-preedit-text.
-     * Implement the member function update_preedit_text() in extended class to receive this signal.
+     * Implement the member function update_preedit_text() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[UPDATE_PREEDIT_TEXT] =
         g_signal_new (I_("update-preedit-text"),
@@ -263,9 +296,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @visible: Whether the update is visible.
      *
      * Emitted when the client application get the update-auxiliary-text.
-     * Implement the member function update_auxiliary_text() in extended class to receive this signal.
+     * Implement the member function update_auxiliary_text() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[UPDATE_AUXILIARY_TEXT] =
         g_signal_new (I_("update-auxiliary-text"),
@@ -285,9 +320,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @visible: Whether the update is visible.
      *
      * Emitted when the client application get the update-lookup-table.
-     * Implement the member function update_lookup_table() in extended class to receive this signal.
+     * Implement the member function update_lookup_table() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[UPDATE_LOOKUP_TABLE] =
         g_signal_new (I_("update-lookup-table"),
@@ -306,9 +343,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application get the focus-in.
-     * Implement the member function focus_in() in extended class to receive this signal.
+     * Implement the member function focus_in() in extended class to receive
+     * this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[FOCUS_IN] =
         g_signal_new (I_("focus-in"),
@@ -326,9 +365,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application get the focus-out.
-     * Implement the member function focus_out() in extended class to receive this signal.
+     * Implement the member function focus_out() in extended class to receive
+     * this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[FOCUS_OUT] =
         g_signal_new (I_("focus-out"),
@@ -346,9 +387,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @prop_list: An IBusPropList that contains properties.
      *
      * Emitted when the client application get the register-properties.
-     * Implement the member function register_properties() in extended class to receive this signal.
+     * Implement the member function register_properties() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[REGISTER_PROPERTIES] =
         g_signal_new (I_("register-properties"),
@@ -366,9 +409,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @prop: The IBusProperty to be updated.
      *
      * Emitted when the client application get the update-property.
-     * Implement the member function update_property() in extended class to receive this signal.
+     * Implement the member function update_property() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[UPDATE_PROPERTY] =
         g_signal_new (I_("update-property"),
@@ -389,9 +434,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @h: Height of the cursor.
      *
      * Emitted when the client application get the set-cursor-location.
-     * Implement the member function set_cursor_location() in extended class to receive this signal.
+     * Implement the member function set_cursor_location() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[SET_CURSOR_LOCATION] =
         g_signal_new (I_("set-cursor-location"),
@@ -411,9 +458,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function cursor_up_lookup_table() in extended
+     * class to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[CURSOR_UP_LOOKUP_TABLE] =
         g_signal_new (I_("cursor-up-lookup-table"),
@@ -428,9 +477,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function cursor_down_lookup_table() in extended
+     * class to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[CURSOR_DOWN_LOOKUP_TABLE] =
         g_signal_new (I_("cursor-down-lookup-table"),
@@ -445,9 +496,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function hide_auxiliary_text() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[HIDE_AUXILIARY_TEXT] =
         g_signal_new (I_("hide-auxiliary-text"),
@@ -462,9 +515,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function hide_language_bar() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[HIDE_LANGUAGE_BAR] =
         g_signal_new (I_("hide-language-bar"),
@@ -479,9 +534,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function hide_lookup_table() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[HIDE_LOOKUP_TABLE] =
         g_signal_new (I_("hide-lookup-table"),
@@ -496,9 +553,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function hide_preedit_text() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[HIDE_PREEDIT_TEXT] =
         g_signal_new (I_("hide-preedit-text"),
@@ -513,9 +572,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function page_up_lookup_table() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[PAGE_UP_LOOKUP_TABLE] =
         g_signal_new (I_("page-up-lookup-table"),
@@ -530,9 +591,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function page_down_lookup_table() in extended
+     * class to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[PAGE_DOWN_LOOKUP_TABLE] =
         g_signal_new (I_("page-down-lookup-table"),
@@ -547,9 +610,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::reset:
      *
      * Emitted when the client application get the reset.
-     * Implement the member function reset() in extended class to receive this signal.
+     * Implement the member function reset() in extended class to receive this
+     * signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[RESET] =
         g_signal_new (I_("reset"),
@@ -564,9 +629,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function show_auxiliary_text() in extended class
+     * to receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[SHOW_AUXILIARY_TEXT] =
         g_signal_new (I_("show-auxiliary-text"),
@@ -581,9 +648,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function show_language_bar() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[SHOW_LANGUAGE_BAR] =
         g_signal_new (I_("show-language-bar"),
@@ -598,9 +667,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function show_lookup_table() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[SHOW_LOOKUP_TABLE] =
         g_signal_new (I_("show-lookup-table"),
@@ -615,9 +686,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::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.
+     * Implement the member function show_preedit_text() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[SHOW_PREEDIT_TEXT] =
         g_signal_new (I_("show-preedit-text"),
@@ -632,9 +705,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::start-setup:
      *
      * Emitted when the client application get the start-setup.
-     * Implement the member function start_setup() in extended class to receive this signal.
+     * Implement the member function start_setup() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[START_SETUP] =
         g_signal_new (I_("start-setup"),
@@ -649,9 +724,11 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::state-changed:
      *
      * Emitted when the client application get the state-changed.
-     * Implement the member function state_changed() in extended class to receive this signal.
+     * Implement the member function state_changed() in extended class to
+     * receive this signal.
      *
-     * <note><para>Argument @user_data is ignored in this function.</para></note>
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
      */
     panel_signals[STATE_CHANGED] =
         g_signal_new (I_("state-changed"),
@@ -661,6 +738,28 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             NULL, NULL,
             _ibus_marshal_VOID__VOID,
             G_TYPE_NONE, 0);
+
+    /**
+     * IBusPanelService::destroy-context:
+     * @input_context_path: Object path of InputContext.
+     *
+     * Emitted when the client application destroys.
+     * Implement the member function destroy_context() in extended class to
+     * receive this signal.
+     *
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
+     */
+    panel_signals[DESTROY_CONTEXT] =
+        g_signal_new (I_("destroy-context"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, destroy_context),
+            NULL, NULL,
+            _ibus_marshal_VOID__STRING,
+            G_TYPE_NONE,
+            1,
+            G_TYPE_STRING);
 }
 
 static void
@@ -790,6 +889,14 @@ ibus_panel_service_service_method_call (IBusService           *service,
         return;
     }
 
+    if (g_strcmp0 (method_name, "DestroyContext") == 0) {
+        const gchar *path;
+        g_variant_get (parameters, "(&o)", &path);
+        g_signal_emit (panel, panel_signals[DESTROY_CONTEXT], 0, path);
+        g_dbus_method_invocation_return_value (invocation, NULL);
+        return;
+    }
+
     if (g_strcmp0 (method_name, "RegisterProperties") == 0) {
         GVariant *variant = g_variant_get_child_value (parameters, 0);
         IBusPropList *prop_list = IBUS_PROP_LIST (ibus_serializable_deserialize (variant));
@@ -917,6 +1024,13 @@ ibus_panel_service_focus_out (IBusPanelService    *panel,
     ibus_panel_service_not_implemented(panel);
 }
 
+static void
+ibus_panel_service_destroy_context (IBusPanelService    *panel,
+                                    const gchar         *input_context_path)
+{
+    ibus_panel_service_not_implemented(panel);
+}
+
 static void
 ibus_panel_service_register_properties (IBusPanelService *panel,
                                         IBusPropList     *prop_list)
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index 941df07ef..e88a3a778 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -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) 2009, Google Inc. All rights reserved.
+ * Copyright (c) 2009-2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -76,9 +76,11 @@ struct _IBusPanelServiceClass {
 
     /* class members */
     void     (* focus_in)                  (IBusPanelService       *panel,
-                                            const gchar            *input_context_path);
+                                            const gchar
+                                                   *input_context_path);
     void     (* focus_out)                 (IBusPanelService       *panel,
-                                            const gchar            *input_context_path);
+                                            const gchar
+                                                   *input_context_path);
     void     (* register_properties)       (IBusPanelService       *panel,
                                             IBusPropList           *prop_list);
     void     (* set_cursor_location)       (IBusPanelService       *panel,
@@ -93,7 +95,7 @@ struct _IBusPanelServiceClass {
                                             IBusLookupTable        *lookup_table,
                                             gboolean                visible);
     void     (* update_preedit_text)       (IBusPanelService       *panel,
-                                            IBusText              *text,
+                                            IBusText               *text,
                                             guint                  cursor_pos,
                                             gboolean               visible);
     void     (* update_property)           (IBusPanelService       *panel,
@@ -113,10 +115,13 @@ struct _IBusPanelServiceClass {
     void     (* show_preedit_text)         (IBusPanelService       *panel);
     void     (* start_setup)               (IBusPanelService       *panel);
     void     (* state_changed)             (IBusPanelService       *panel);
+    void     (* destroy_context)           (IBusPanelService       *panel,
+                                            const gchar
+                                                   *input_context_path);
 
     /*< private >*/
     /* padding */
-    gpointer pdummy[8];  // We can add 8 pointers without breaking the ABI.
+    gpointer pdummy[7];  // We can add 8 pointers without breaking the ABI.
 };
 
 GType            ibus_panel_service_get_type  (void);
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 8e23bf9e4..e0cdf7d62 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -43,8 +43,14 @@ class Panel : IBus.PanelService {
     private Gtk.Menu m_ime_menu;
     private Gtk.Menu m_sys_menu;
     private IBus.EngineDesc[] m_engines = {};
+    private GLib.HashTable<string, IBus.EngineDesc> m_engine_contexts =
+            new GLib.HashTable<string, IBus.EngineDesc>(GLib.str_hash,
+                                                        GLib.str_equal);
+    private string m_current_context_path = "";
+    private bool m_use_global_engine = true;
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
+    private bool m_switcher_is_running = false;
     private PropertyManager m_property_manager;
     private GLib.Pid m_setup_pid = 0;
     private Gtk.AboutDialog m_about_dialog;
@@ -120,6 +126,10 @@ class Panel : IBus.PanelService {
                 set_embed_preedit_text();
         });
 
+        m_settings_general.changed["use-global-engine"].connect((key) => {
+                set_use_global_engine();
+        });
+
         m_settings_hotkey.changed["triggers"].connect((key) => {
                 unbind_switch_shortcut();
                 bind_switch_shortcut();
@@ -290,6 +300,11 @@ class Panel : IBus.PanelService {
         m_bus.set_ibus_property("EmbedPreeditText", variant);
     }
 
+    private void set_use_global_engine() {
+        m_use_global_engine =
+                m_settings_general.get_boolean("use-global-engine");
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -376,6 +391,7 @@ class Panel : IBus.PanelService {
         // Update m_use_system_keyboard_layout before update_engines()
         // is called.
         set_use_system_keyboard_layout();
+        set_use_global_engine();
         update_engines(m_settings_general.get_strv("preload-engines"),
                        m_settings_general.get_strv("engines-order"));
         unbind_switch_shortcut();
@@ -432,23 +448,41 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private void switch_engine(int i, bool force = false) {
-        GLib.assert(i >= 0 && i < m_engines.length);
-
-        // Do not need switch
-        if (i == 0 && !force)
+    private void engine_contexts_insert(IBus.EngineDesc engine) {
+        if (m_use_global_engine)
             return;
 
-        IBus.EngineDesc engine = m_engines[i];
+        if (m_engine_contexts.size() >= 200) {
+            warning ("Contexts by windows are too much counted!");
+            m_engine_contexts.remove_all();
+        }
+
+        m_engine_contexts.replace(m_current_context_path, engine);
+    }
 
+    private void set_engine(IBus.EngineDesc engine) {
         if (!m_bus.set_global_engine(engine.get_name())) {
             warning("Switch engine to %s failed.", engine.get_name());
             return;
         }
+
         // set xkb layout
-        if (!m_use_system_keyboard_layout) {
+        if (!m_use_system_keyboard_layout)
             exec_setxkbmap(engine);
-        }
+
+        engine_contexts_insert(engine);
+    }
+
+    private void switch_engine(int i, bool force = false) {
+        GLib.assert(i >= 0 && i < m_engines.length);
+
+        // Do not need switch
+        if (i == 0 && !force)
+            return;
+
+        IBus.EngineDesc engine = m_engines[i];
+
+        set_engine(engine);
     }
 
     private void handle_engine_switch(Gdk.Event event, bool revert) {
@@ -471,7 +505,20 @@ class Panel : IBus.PanelService {
 
         if (pressed && m_switcher_delay_time >= 0) {
             int i = revert ? m_engines.length - 1 : 1;
+
+            /* The flag of m_switcher_is_running avoids the following problem:
+             *
+             * When an IME is chosen on m_switcher, focus_in() is called
+             * for the root window. If an engine is set in focus_in()
+             * during running m_switcher when m_use_global_engine is false,
+             * state_changed() is also called and m_engines[] is modified
+             * in state_changed() and m_switcher.run() returns the index
+             * for m_engines[] but m_engines[] was modified by state_changed()
+             * and the index is not correct. */
+            m_switcher_is_running = true;
             i = m_switcher.run(keyval, modifiers, event, m_engines, i);
+            m_switcher_is_running = false;
+
             if (i < 0) {
                 debug("switch cancelled");
             } else {
@@ -686,9 +733,68 @@ class Panel : IBus.PanelService {
     }
 
     public override void focus_in(string input_context_path) {
+        if (m_use_global_engine)
+            return;
+
+        /* Do not change the order of m_engines during running switcher. */
+        if (m_switcher_is_running)
+            return;
+
+        m_current_context_path = input_context_path;
+
+        var engine = m_engine_contexts[m_current_context_path];
+
+        if (engine == null) {
+            /* If engine == null, need to call set_engine(m_engines[0])
+             * here and update m_engine_contexts[] to avoid the
+             * following problem:
+             *
+             * If context1 is focused and does not set an engine and
+             * return here, the current engine1 is used for context1.
+             * When context2 is focused and switch engine1 to engine2,
+             * the current engine becomes engine2.
+             * And when context1 is focused again, context1 still
+             * does not set an engine and return here,
+             * engine2 is used for context2 instead of engine1. */
+            engine = m_engines.length > 0 ? m_engines[0] : null;
+
+            if (engine == null)
+                return;
+        } else {
+            bool in_engines = false;
+
+            foreach (var e in m_engines) {
+                if (engine.get_name() == e.get_name()) {
+                    in_engines = true;
+                    break;
+                }
+            }
+
+            /* The engine is deleted by ibus-setup before focus_in()
+             * is called. */
+            if (!in_engines)
+                return;
+        }
+
+        set_engine(engine);
     }
 
     public override void focus_out(string input_context_path) {
+        if (m_use_global_engine)
+            return;
+
+        /* Do not change the order of m_engines during running switcher. */
+        if (m_switcher_is_running)
+            return;
+
+        m_current_context_path = "";
+    }
+
+    public override void destroy_context(string input_context_path) {
+        if (m_use_global_engine)
+            return;
+
+        m_engine_contexts.remove(input_context_path);
     }
 
     public override void register_properties(IBus.PropList props) {
@@ -731,6 +837,10 @@ class Panel : IBus.PanelService {
     }
 
     public override void state_changed() {
+        /* Do not change the order of m_engines during running switcher. */
+        if (m_switcher_is_running)
+            return;
+
         var icon_name = "ibus-keyboard";
 
         var engine = m_bus.get_global_engine();

From b24efef988af48cbf7defd8db10a25a77fa646c6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 30 Aug 2013 18:25:42 +0900
Subject: [PATCH 174/816] Call _set_content_type in _create_input_context_done
 in im-ibus.so

TEST=password dialog in gnome-shell

Review URL: https://codereview.appspot.com/13255047
---
 client/gtk2/ibusimcontext.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 5eb0414b7..b6fe2c039 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -865,13 +865,12 @@ ibus_im_context_focus_in (GtkIMContext *context)
 
     ibusimcontext->has_focus = TRUE;
     if (ibusimcontext->ibuscontext) {
+        _set_content_type (ibusimcontext);
         ibus_input_context_focus_in (ibusimcontext->ibuscontext);
     }
 
     gtk_im_context_focus_in (ibusimcontext->slave);
 
-    _set_content_type (ibusimcontext);
-
     /* set_cursor_location_internal() will get origin from X server,
      * it blocks UI. So delay it to idle callback. */
     gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
@@ -1567,6 +1566,13 @@ _create_input_context_done (IBusBus       *bus,
         ibus_input_context_set_capabilities (ibusimcontext->ibuscontext, ibusimcontext->caps);
 
         if (ibusimcontext->has_focus) {
+            /* The time order is _create_input_context() ->
+             * ibus_im_context_notify() -> ibus_im_context_focus_in() ->
+             * _create_input_context_done()
+             * so _set_content_type() is called at the beginning here
+             * because ibusimcontext->ibuscontext == NULL before. */
+            _set_content_type (ibusimcontext);
+
             ibus_input_context_focus_in (ibusimcontext->ibuscontext);
             _set_cursor_location_internal (ibusimcontext);
         }

From 1e40a48cc47f2158d7ef45693158615b5f4ee029 Mon Sep 17 00:00:00 2001
From: David King <dking@redhat.com>
Date: Mon, 2 Sep 2013 11:15:13 +0900
Subject: [PATCH 175/816] Avoid compiler error in
 ibus_engine_dbus_property_changed

Do not return a value in a function that returns void.

BUG=http://code.google.com/p/ibus/issues/detail?id=1650

Review URL: https://codereview.appspot.com/13334044
Patch from David King <dking@redhat.com>.
---
 src/ibusengine.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 6962949e5..7543c99c7 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -1300,7 +1300,6 @@ ibus_engine_dbus_property_changed (IBusEngine  *engine,
         g_error_free (error);
     }
     g_object_unref (message);
-    return retval;
 }
 
 IBusEngine *

From 729b0aa1febccbba97286f2aceb9044d907f9ffe Mon Sep 17 00:00:00 2001
From: David King <dking@redhat.com>
Date: Mon, 2 Sep 2013 11:19:06 +0900
Subject: [PATCH 176/816] Check for gsettings-schema-convert for dconf support

BUG=http://code.google.com/p/ibus/issues/detail?id=1650

Review URL: https://codereview.appspot.com/13423043
Patch from David King <dking@redhat.com>.
---
 configure.ac           | 3 +++
 data/dconf/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 36515e290..c3cf98a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,9 @@ if test x"$enable_dconf" = x"yes"; then
         [])
     # check glib-compile-schemas
     GLIB_GSETTINGS
+    AC_PATH_PROG([GSETTINGS_SCHEMA_CONVERT], [gsettings-schema-convert])
+    AS_IF([test x"$ac_cv_path_GSETTINGS_SCHEMA_CONVERT" = x""],
+          [AC_MSG_ERROR([gsettings-schema-convert from GConf2 is required for dconf support])])
     enable_dconf="yes (enabled, use --disable-dconf to disable)"
 fi
 
diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index d27e87c38..c841a3445 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -51,7 +51,7 @@ dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
 dconfdb_DATA = 00-upstream-settings
 
 org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
-	$(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
+	$(AM_V_GEN) $(GSETTINGS_SCHEMA_CONVERT) --force --gconf --xml \
 		--schema-id "org.freedesktop.ibus" \
 		--output $@ $<
 

From 10b9225bb3ec9131c827cfad007bad65bc9f0b12 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 5 Sep 2013 11:41:50 +0900
Subject: [PATCH 177/816] Implement show-icon-on-systray in ibus-ui-gtk3.

BUG=http://code.google.com/p/ibus/issues/detail?id=1635
TEST="show icon on system tray" on ibus-setup

Review URL: https://codereview.appspot.com/13514043
---
 ui/gtk3/panel.vala | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index e0cdf7d62..22944f896 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -142,6 +142,10 @@ class Panel : IBus.PanelService {
         m_settings_panel.changed["use-custom-font"].connect((key) => {
                 set_custom_font();
         });
+
+        m_settings_panel.changed["show-icon-on-systray"].connect((key) => {
+                set_show_icon_on_systray();
+        });
     }
 
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
@@ -305,6 +309,11 @@ class Panel : IBus.PanelService {
                 m_settings_general.get_boolean("use-global-engine");
     }
 
+    private void set_show_icon_on_systray() {
+        m_status_icon.set_visible(
+                m_settings_panel.get_boolean("show-icon-on-systray"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -399,6 +408,7 @@ class Panel : IBus.PanelService {
         set_switcher_delay_time();
         set_embed_preedit_text();
         set_custom_font();
+        set_show_icon_on_systray();
 
         set_version();
     }

From e91f403a8e099ce26642eb58a105671ec730f277 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Sep 2013 13:24:34 +0900
Subject: [PATCH 178/816] Connect candidate-clicked signal on ibus-ui-gtk3 for
 mouse click.

Review URL: https://codereview.appspot.com/13303049
---
 ui/gtk3/panel.vala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 22944f896..82b9ee5f7 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -81,6 +81,8 @@ class Panel : IBus.PanelService {
         m_candidate_panel = new CandidatePanel();
         m_candidate_panel.page_up.connect((w) => this.page_up());
         m_candidate_panel.page_down.connect((w) => this.page_down());
+        m_candidate_panel.candidate_clicked.connect(
+                (w, i, b, s) => this.candidate_clicked(i, b, s));
 
         m_switcher = new Switcher();
         // The initial shortcut is "<Super>space"

From 84f3510427398947c2f11bc17f3094ddbaea3598 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 17 Sep 2013 12:15:17 +0900
Subject: [PATCH 179/816] Update translations.

Update po/gu.po po/ml.po po/or.po po/pa.po

Review URL: https://codereview.appspot.com/13514044
---
 po/gu.po | 209 +++++++++++++++++++++++++++++++++++-------------------
 po/ml.po | 207 +++++++++++++++++++++++++++++++++++-------------------
 po/or.po | 209 +++++++++++++++++++++++++++++++++++-------------------
 po/pa.po | 210 ++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 544 insertions(+), 291 deletions(-)

diff --git a/po/gu.po b/po/gu.po
index 442be8419..8fde9fa6e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,14 +6,14 @@
 # Translators:
 # Ankit Patel <ankit@redhat.com>, 2010
 # sweta <swkothar@redhat.com>, 2009-2010
-# sweta <swkothar@redhat.com>, 2011-2012
+# sweta <swkothar@redhat.com>, 2011-2013
 # sweta <swkothar@redhat.com>, 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-01 06:06+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-16 07:29+0000\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
 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 @@ msgstr "ભાષા પેનલને બતાવો:"
 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 @@ msgid ""
 msgstr "<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\nતેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
 
 #. 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 @@ msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
 
-#: ../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 @@ msgstr "<b>શરૂઆત કરો</b>"
 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 @@ msgid ""
 msgstr "IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = વિન્ડોને તરત જ બતાવો. 0 &lt; મિલિસેકંડમાં વિલંબ. 0 &gt; વિન્ડોને બતાવો નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો."
 
 #: ../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 "ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
 
-#: ../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 "બેસાડેલ 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 કીઓનાં ઉપસર્ગો"
 
@@ -427,7 +425,7 @@ msgstr "વર્ણન:\n"
 msgid "Select an input method"
 msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +455,15 @@ msgstr "મહેરબાની કરીને કીને દબાવો (
 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 @@ msgid ""
 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 "આદેશ [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 "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 "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
diff --git a/po/ml.po b/po/ml.po
index 6a3038dc5..7ea89f3da 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,8 +9,8 @@ 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-04 14:57+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-20 06:40+0000\n"
 "Last-Translator: Ani Peter <apeter@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേ
 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 "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
@@ -123,11 +123,11 @@ msgstr "ഭാഷയുടെ പാനല്‍ കാണിക്കുക:"
 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 "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
@@ -186,15 +186,15 @@ msgid ""
 msgstr "<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\nഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
 
 #. 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) മാതൃക ഉപയോഗിക്കുക"
 
@@ -202,7 +202,7 @@ msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
 
-#: ../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 "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
 
@@ -236,18 +236,6 @@ msgstr "<b>ആരംഭത്തില്‍</b>"
 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 "സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
@@ -276,118 +264,128 @@ msgid ""
 msgstr "ഐഎംഇ സ്വിച്ചര്‍ ജാലകം കാണിയ്ക്കുന്നതിനായി പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍ സജ്ജമാക്കുക. സ്വതവേയുള്ളതു് 400. 0 = ജാലകം ഉടന്‍ കാണിയ്ക്കുക. 0 &lt; താമസം മില്ലിസെക്കന്‍ഡുകളില്‍. 0 &gt; ജാലകം കാണിയ്ക്കരുതു്, അടുത്തതു്/മുമ്പുള്ള എഞ്ചിനുകളിലേക്കു് മാറുക."
 
 #: ../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 "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
@@ -424,7 +422,7 @@ msgstr "വിവരണം:\n"
 msgid "Select an input method"
 msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -454,15 +452,15 @@ msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അ
 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"
@@ -471,82 +469,147 @@ msgid ""
 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 "കമാന്‍ഡ് [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 "രജിസ്ട്രി ക്യാഷ് അസാധു.\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 "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-ന്റെ ഡി-ബസ് വിലാസം പ്രിന്റ് ചെയ്യുക"
+
+#: ../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 പെങ് ഹുവാങ്\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "വീണ്ടും ആരംഭിക്കുക"
diff --git a/po/or.po b/po/or.po
index 67117215d..93806642b 100644
--- a/po/or.po
+++ b/po/or.po
@@ -4,14 +4,14 @@
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2012
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2013
 # Manoj Kumar Giri <mgiri@redhat.com>, 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-02 09:47+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-08-19 10:14+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
 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 "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
 
@@ -124,11 +124,11 @@ msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
 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 "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
@@ -187,15 +187,15 @@ msgid ""
 msgstr "<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\nଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
 
 #. 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) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
@@ -203,7 +203,7 @@ msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
 
-#: ../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 "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
 
@@ -237,18 +237,6 @@ msgstr "<b>ଆରମ୍ଭ</b>"
 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 "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
@@ -277,118 +265,128 @@ msgid ""
 msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ ସେଟ କରନ୍ତୁ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି400. 0 = ସଙ୍ଗେ ସଙ୍ଗେ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ। 0 &lt; ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 &gt; ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"
 
 #: ../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 କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
 
@@ -425,7 +423,7 @@ msgstr "ବର୍ଣ୍ଣନା:\n"
 msgid "Select an input method"
 msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -455,15 +453,15 @@ msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟ
 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"
@@ -472,82 +470,147 @@ msgid ""
 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 "ପଞ୍ଜିକରଣ କ୍ୟାଶେ ଅବୈଧ ଅଟେ।\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 "ibus-ଡେମନରୁ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
+
+#: ../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-ଡେମନକୁ ପୁନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ"
+
+#: ../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-ଡେମନର 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 "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 "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "ପୁନଃଚାଳନ"
diff --git a/po/pa.po b/po/pa.po
index b6df1c3f5..f4eb54249 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,6 +4,7 @@
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
+# asaini <asaini@redhat.com>, 2013
 # Amanpreet Singh <aalam@users.sf.net>, 2008
 # A S Alam <aalam@users.sf.net>, 2009
 # A S Alam <apreet.alam@gmail.com>, 2011-2012
@@ -13,9 +14,9 @@ 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-01-04 11:04+0000\n"
-"Last-Translator: Jaswinder Singh <phulewala.j@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-09-11 13:58+0000\n"
+"Last-Translator: asaini <asaini@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@ msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
 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 "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
@@ -127,11 +128,11 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖਾਓ:"
 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 "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
@@ -190,15 +191,15 @@ msgid ""
 msgstr "<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\nਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
 
 #. 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) ਲੇਆਉਟ ਵਰਤੋ"
 
@@ -206,7 +207,7 @@ msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
-#: ../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 "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
 
@@ -240,18 +241,6 @@ msgstr "<b>ਸ਼ੁਰੂ</b>"
 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 "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
@@ -280,118 +269,128 @@ msgid ""
 msgstr "Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not show the window and switch prev/next engines."
 
 #: ../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 ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
 
@@ -428,7 +427,7 @@ msgstr "ਵੇਰਵਾ:\n"
 msgid "Select an input method"
 msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -458,15 +457,15 @@ msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸ
 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"
@@ -475,82 +474,147 @@ msgid ""
 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 "ਰਜਿਸਟਰੀ ਕੈਚੇ ਅਯੋਗ ਹੈ।\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 "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 "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 ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\nhttp://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"

From 98c7bdc5d92d5d2f25eb5f81fe90397664c2d435 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Sep 2013 10:58:34 +0900
Subject: [PATCH 180/816] Fix no output when ibus-daemon is running on another
 display.

Using ssh -X or another display, the hostname and display numbers
can be different between the GTK clients and ibus-daemon.
This patch fixes the output:
"Events queue growing too big, will start to drop."

BUG=RH#1004135
TEST=clients/gtk*/im-ibus.so

Review URL: https://codereview.appspot.com/13707046
---
 client/gtk2/ibusimcontext.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index b6fe2c039..eef062c91 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -492,7 +492,13 @@ daemon_name_appeared (GDBusConnection *connection,
                       const gchar     *owner,
                       gpointer         data)
 {
-    _daemon_is_running = TRUE;
+    /* If ibus-daemon is running and run ssh -X localhost,
+     * daemon_name_appeared() is called but ibus_get_address() == NULL
+     * because the hostname and display number are different between
+     * ibus-daemon and clients. So IBusBus would not be connected and
+     * ibusimcontext->ibuscontext == NULL and ibusimcontext->events_queue
+     * could go beyond MAX_QUEUED_EVENTS . */
+    _daemon_is_running = (ibus_get_address () != NULL);
 }
 
 static void

From f4b09140783834cb19e3bd7dcf63671ec304b9dd Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Sep 2013 11:39:25 +0900
Subject: [PATCH 181/816] Release 1.5.4

Review URL: https://codereview.appspot.com/13468047
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c3cf98a0d..e8fde49ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [3])
+m4_define([ibus_micro_version], [4])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From a3f47e6509f19c6f11fca0328d63e973daec48ab Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Wed, 2 Oct 2013 10:45:32 +0900
Subject: [PATCH 182/816] Add french layout variant oss to simple engine

Review URL: https://codereview.appspot.com/14115044
Patch from Julien Humbert <julroy67@gmail.com>.
---
 engine/simple.xml.in | 82 +++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index fbca5cecb..3b168208f 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -236,41 +236,53 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
-		<engine>
-			<name>xkb:fr::fra</name>
-			<language>fra</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>fr</layout>
-			<longname>French</longname>
-			<description>French</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:fr:bepo:fra</name>
-			<language>fra</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>fr</layout>
-			<layout_variant>bepo</layout_variant>
-			<longname>French (Bepo, ergonomic, Dvorak way)</longname>
-			<description>French (Bepo, ergonomic, Dvorak way)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:fr:dvorak:fra</name>
-			<language>fra</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>fr</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>French (Dvorak)</longname>
-			<description>French (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
+                <engine>
+                        <name>xkb:fr::fra</name>
+                        <language>fra</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>fr</layout>
+                        <longname>French</longname>
+                        <description>French</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
+                <engine>
+                        <name>xkb:fr:oss:fra</name>
+                        <language>fra</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>fr</layout>
+                        <layout_variant>oss</layout_variant>
+                        <longname>French (alternative)</longname>
+                        <description>French (alternative)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
+                <engine>
+                        <name>xkb:fr:bepo:fra</name>
+                        <language>fra</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>fr</layout>
+                        <layout_variant>bepo</layout_variant>
+                        <longname>French (Bepo, ergonomic, Dvorak way)</longname>
+                        <description>French (Bepo, ergonomic, Dvorak way)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
+                <engine>
+                        <name>xkb:fr:dvorak:fra</name>
+                        <language>fra</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>fr</layout>
+                        <layout_variant>dvorak</layout_variant>
+                        <longname>French (Dvorak)</longname>
+                        <description>French (Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
 		<engine>
 			<name>xkb:de::ger</name>
 			<language>ger</language>

From d41791da67ac66665868f18fc447f2fc2a6ce75a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 2 Oct 2013 10:49:47 +0900
Subject: [PATCH 183/816] 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
---
 bus/Makefile.am   | 2 +-
 setup/Makefile.am | 2 +-
 tools/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index d058d4cc3..26cb2f881 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -166,7 +166,7 @@ test: ibus-daemon
 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 --git a/setup/Makefile.am b/setup/Makefile.am
index 9d0843c02..b8b3d457c 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -45,7 +45,7 @@ desktopdir = $(datadir)/applications
 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 --git a/tools/Makefile.am b/tools/Makefile.am
index b3cd00cdb..53c209a2c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -77,7 +77,7 @@ bash_completiondir=@datadir@/bash-completion/completions
 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 && \

From b8f36164d9b405d95bdcb76e38daca6c531e7da5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 2 Oct 2013 10:55:09 +0900
Subject: [PATCH 184/816] Implement lookup-table-orientation in ibus-ui-gtk3.

BUG=RH#1012781
TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/14198043
---
 ui/gtk3/panel.vala | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 82b9ee5f7..5903e051d 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -148,6 +148,10 @@ class Panel : IBus.PanelService {
         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 @@ class Panel : IBus.PanelService {
         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 @@ class Panel : IBus.PanelService {
     }
 
     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 @@ class Panel : IBus.PanelService {
         set_embed_preedit_text();
         set_custom_font();
         set_show_icon_on_systray();
+        set_lookup_table_orientation();
 
         set_version();
     }

From 9596aea2e2df4cd3ac9b795ad9f354723cf83317 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 2 Oct 2013 10:58:36 +0900
Subject: [PATCH 185/816] 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
---
 bus/engineproxy.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 19c286167..efd95867c 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -1159,6 +1159,11 @@ bus_engine_proxy_set_content_type (BusEngineProxy *engine,
                            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)

From e64b25c0ab8fadeae97fe78dcfcbc3a5d0869c6b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 1 Nov 2013 11:19:39 +0900
Subject: [PATCH 186/816] 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
---
 bindings/vala/Makefile.am       |    1 +
 bindings/vala/ibus-private.vapi |   22 +
 engine/Makefile.am              |   28 +-
 engine/main.vala                |   33 +-
 engine/test-compose.vala        |  193 +++
 src/Makefile.am                 |   19 +
 src/gencomposetable.c           |  957 +++++++++++
 src/gtkimcontextsimpleseqs.h    |  309 +++-
 src/ibuscomposetable.h          | 2658 +++++++++++++++++++++++++++++++
 src/ibusenginesimple.c          |   48 +-
 src/ibusenginesimple.h          |   25 +-
 src/ibuskeysyms.h               |    7 +-
 tools/main.vala                 |    3 +-
 13 files changed, 4220 insertions(+), 83 deletions(-)
 create mode 100644 bindings/vala/ibus-private.vapi
 create mode 100644 engine/test-compose.vala
 create mode 100644 src/gencomposetable.c
 create mode 100644 src/ibuscomposetable.h

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 84aa1b475..29cc1eb24 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST = \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
 	ibus-1.0.deps \
+	ibus-private.vapi \
 	config.vapi \
 	xi.vapi \
 	$(NULL)
diff --git a/bindings/vala/ibus-private.vapi b/bindings/vala/ibus-private.vapi
new file mode 100644
index 000000000..acf5c4dc5
--- /dev/null
+++ b/bindings/vala/ibus-private.vapi
@@ -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 --git a/engine/Makefile.am b/engine/Makefile.am
index 0adf286ff..c51317af8 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2010, Google Inc. All rights reserved.
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2010-2013, Google Inc. All rights reserved.
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
 #
 # 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 @@ ibus_engine_simple_DEPENDENCIES = \
 	$(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 --git a/engine/main.vala b/engine/main.vala
index 9c60f622d..d2b2b481e 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * 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 @@ public int main(string[] args) {
 
     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 @@ public int main(string[] args) {
          * 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 --git a/engine/test-compose.vala b/engine/test-compose.vala
new file mode 100644
index 000000000..082a9ab2a
--- /dev/null
+++ b/engine/test-compose.vala
@@ -0,0 +1,193 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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 <takao.fujiwara1@gmail.com>",
+                "http://code.google.com/p/ibus/",
+                "",
+                "ibus");
+
+        component.add_engine (new IBus.EngineDesc(
+                "xkbtest:us::eng",
+                "XKB Test",
+                "XKB Test",
+                "en",
+                "GPL",
+                "Takao Fujiwara <takao.fujiwara1@gmail.com>",
+                "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 --git a/src/Makefile.am b/src/Makefile.am
index 811d09707..404e1d223 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,6 +159,7 @@ ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
     $(NULL)
 ibus_privite_headers =       \
+    ibuscomposetable.h       \
     ibusinternal.h           \
     keyname-table.h          \
     gtkimcontextsimpleseqs.h \
@@ -226,6 +227,24 @@ ibusmarshalers.c: ibusmarshalers.h ibusmarshalers.list
 	$(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 --git a/src/gencomposetable.c b/src/gencomposetable.c
new file mode 100644
index 000000000..da929d0d5
--- /dev/null
+++ b/src/gencomposetable.c
@@ -0,0 +1,957 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* ibus - The Input Bus
+ * Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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 <glib.h>
+#include <glib/gprintf.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#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 <shawn.p.huang@gmail.com>\n"                \
+" * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>\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 --git a/src/gtkimcontextsimpleseqs.h b/src/gtkimcontextsimpleseqs.h
index df09defed..4198a3a7d 100644
--- a/src/gtkimcontextsimpleseqs.h
+++ b/src/gtkimcontextsimpleseqs.h
@@ -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_greaterthanequal, 0x2271,
 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_alpha, 0x1FB1,
 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, 0x1E64,
 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_m, 0x0271,
 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 @@ IBUS_KEY_abreve, 0x1EB3,
 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_omicron, 0x1F41,
 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_exclam, IBUS_KEY_z, 0x1E93,
 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_U, 0x00DC,
 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_iota, 0x03CA,
 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, 0x1F60, 0x1F64,
 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_A, 0x00C5,
 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_parenleft, 0x007B,
 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_N, 0x00D1,
 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_n, 0x00F1,
 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_sacute, 0x1E65,
 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_m, 0x20A5,
 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_Cyrillic_KA, 0x049E,
 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_asciicircum, 0x00B0,
 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_4, IBUS_KEY_5, 0x2158,
 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_slash, 0x005C,
 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_R, 0x0158,
 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_s, 0x0161,
 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_O, 0x0150,
 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_u, 0x04F3,
 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_E, 0x00CA,
 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_ecircumflex, 0x1EC3,
 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_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_grave, 0x00C8,
 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_O, 0x00A7,
 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_Y, IBUS_KEY_acute, 0x00DD,
 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_7, 0x2077,
 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_6, 0x2086,
 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, 0x1E36, 0x1E38,
 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_z, 0x017E,
 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_diaeresis, 0x00EB,
 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_m, 0x2120,
 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_u, 0x016D,
 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_y, IBUS_KEY_acute, 0x00FD,
 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_o, 0x00F5,
 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, 0x1F60, 0x1F66,
 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_u, 0x00FC,
 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, 0x1E36, 0x1E38,
 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_n, 0x0146,
 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 @@ IBUS_KEY_righttack, 0x0338, 0x22AC,
 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 @@ IBUS_KEY_righttack, 0x0338, 0x22AC,
 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 @@ IBUS_KEY_righttack, 0x0338, 0x22AC,
 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_6, IBUS_KEY_parenright, 0x2465,
 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, 0x1E66,
 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_o, 0x1EDF,
 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, 0x01D9,
 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_OMEGA, 0x1FA9,
 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_8, IBUS_KEY_parenright, 0x32BD,
 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 --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
new file mode 100644
index 000000000..ba8e3efc4
--- /dev/null
+++ b/src/ibuscomposetable.h
@@ -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 <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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 --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 84004e554..8c076ac59 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -29,20 +29,18 @@
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
 
-#include <stdlib.h>
+#include "ibuscomposetable.h"
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 #include <memory.h>
+#include <stdlib.h>
 
 #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 @@ struct _IBusEngineSimplePrivate {
 static const IBusComposeTableCompact ibus_compose_table_compact = {
     gtk_compose_seqs_compact,
     5,
-    24,
+    25,
     6
 };
 
@@ -930,3 +928,33 @@ ibus_engine_simple_add_table (IBusEngineSimple *simple,
     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 --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 413843063..0c839d48a 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -24,6 +24,9 @@
 #error "Only <ibus.h> 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 @@ GType   ibus_engine_simple_get_type       (void);
  * 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 --git a/src/ibuskeysyms.h b/src/ibuskeysyms.h
index cf55f0cfa..d35eb4a71 100644
--- a/src/ibuskeysyms.h
+++ b/src/ibuskeysyms.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 --git a/tools/main.vala b/tools/main.vala
index b6a5e18f4..db4fd23a6 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -271,7 +271,8 @@ int write_cache (string[] argv) {
 }
 
 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;
 }
 

From 6488b87792b81d20ceeb5f3f69381887e12bf4c7 Mon Sep 17 00:00:00 2001
From: "Eduardo Lima (Etrunko)" <eduardo.lima@intel.com>
Date: Tue, 5 Nov 2013 18:07:33 +0900
Subject: [PATCH 187/816] 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) <eduardo.lima@intel.com>.
---
 client/wayland/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/wayland/main.c b/client/wayland/main.c
index 7a7490bef..ec7b95a0f 100644
--- a/client/wayland/main.c
+++ b/client/wayland/main.c
@@ -538,8 +538,8 @@ input_method_keyboard_modifiers (void               *data,
         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 = {

From f35184a187b787e8507cb1e34b24dc0575fad838 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 5 Nov 2013 18:12:41 +0900
Subject: [PATCH 188/816] Fix gir annotations.

TEST=g-ir-scanner@src

Review URL: https://codereview.appspot.com/18100044
---
 engine/Makefile.am           |  4 ++--
 src/ibusattribute.h          | 12 +++++++-----
 src/ibusattrlist.h           |  9 +++++----
 src/ibuscomponent.h          |  9 +++++----
 src/ibusconfig.h             | 10 +++++-----
 src/ibusconfigservice.h      | 14 +++++++-------
 src/ibusdebug.h              |  9 +++++----
 src/ibusengine.h             |  5 +++--
 src/ibusenginedesc.h         | 12 ++++++------
 src/ibusenumtypes.h.template |  5 +++--
 src/ibuserror.h              | 15 +++++++--------
 src/ibusfactory.h            | 11 ++++++-----
 src/ibushotkey.h             |  9 +++++----
 src/ibusinputcontext.c       |  2 ++
 src/ibuskeymap.h             | 11 ++++++-----
 src/ibuskeysyms-compat.h     | 12 ++++++------
 src/ibuskeyuni.c             | 20 --------------------
 src/ibuslookuptable.h        | 15 +++++++++------
 src/ibusobject.c             | 11 ++---------
 src/ibusobject.h             | 11 ++++++-----
 src/ibusobservedpath.h       | 16 +++++++++-------
 src/ibuspanelservice.c       | 24 ++++++++++++++++++++++++
 src/ibusproplist.h           | 11 ++++++-----
 src/ibusproxy.h              | 18 +++++++++++-------
 src/ibusserializable.h       |  9 +++++----
 src/ibusservice.h            | 12 ++++++------
 src/ibusshare.h              | 10 +++++-----
 src/ibustext.h               | 13 +++++++------
 src/ibustypes.h              |  8 +++++---
 src/ibusutil.h               | 12 ++++++------
 src/ibusversion.h.in         |  6 ++++--
 src/ibusxml.h                |  9 +++++----
 32 files changed, 190 insertions(+), 164 deletions(-)

diff --git a/engine/Makefile.am b/engine/Makefile.am
index c51317af8..e3e491013 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -84,11 +84,11 @@ test_compose_SOURCES = \
         $(NULL)
 test_compose_CFLAGS = \
         $(AM_CFLAGS) \
-	@GTK3_CFLAGS@ \
+        @GTK3_CFLAGS@ \
         $(NULL)
 test_compose_LDADD = \
         $(AM_LDADD) \
-	@GTK3_LIBS@ \
+        @GTK3_LIBS@ \
         $(NULL)
 test_compose_VALAFLAGS = \
         $(AM_VALAFLAGS) \
diff --git a/src/ibusattribute.h b/src/ibusattribute.h
index d8304494f..7f287bac3 100644
--- a/src/ibusattribute.h
+++ b/src/ibusattribute.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusattrlist.h b/src/ibusattrlist.h
index 5ed3b27c4..cd8788f83 100644
--- a/src/ibusattrlist.h
+++ b/src/ibusattrlist.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibuscomponent.h b/src/ibuscomponent.h
index 3926891e3..be36d029e 100644
--- a/src/ibuscomponent.h
+++ b/src/ibuscomponent.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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
  * <ulink url="http://code.google.com/p/ibus/wiki/DevXML">http://code.google.com/p/ibus/wiki/DevXML</ulink>
  */
-#ifndef __IBUS_COMPONENT_H_
-#define __IBUS_COMPONENT_H_
 
 #include "ibusserializable.h"
 #include "ibusobservedpath.h"
diff --git a/src/ibusconfig.h b/src/ibusconfig.h
index 0bcdc1a47..4bde4bd93 100644
--- a/src/ibusconfig.h
+++ b/src/ibusconfig.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 @@ void             ibus_config_new_async      (GDBusConnection    *connection,
  * @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 --git a/src/ibusconfigservice.h b/src/ibusconfigservice.h
index fb4921ef8..343af97a9 100644
--- a/src/ibusconfigservice.h
+++ b/src/ibusconfigservice.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 @@
  *             <varlistentry>
  *                 <term>Returns:</term>
  *                 <listitem>TRUE if succeed; FALSE otherwise.</listitem>
-*             </varlistentry>
-*         </variablelist>
+ *             </varlistentry>
+ *        </variablelist>
  *        <para>Get value of a configuration option.
  *        </para>
  *     </listitem>
@@ -131,8 +134,6 @@
  *     </listitem>
  * </itemizedlist>
  */
-#ifndef __IBUS_CONFIG_SERVICE_H_
-#define __IBUS_CONFIG_SERVICE_H_
 
 #include "ibusservice.h"
 
@@ -188,7 +189,6 @@ struct _IBusConfigServiceClass {
      * @config: An IBusConfig.
      * @section: section name
      * @name: value name
-     *
      * @returns: (transfer full): The value in config associated with section and name.
      *
      */
diff --git a/src/ibusdebug.h b/src/ibusdebug.h
index 692ae7e26..fdd40fcbf 100644
--- a/src/ibusdebug.h
+++ b/src/ibusdebug.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusengine.h b/src/ibusengine.h
index 81b1d0e6c..e77fdb27c 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -24,6 +24,9 @@
 #error "Only <ibus.h> 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 --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index f37ae0a46..63eb99e7c 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusenumtypes.h.template b/src/ibusenumtypes.h.template
index 734d4ef1b..3ad389800 100644
--- a/src/ibusenumtypes.h.template
+++ b/src/ibusenumtypes.h.template
@@ -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 <glib-object.h>
 
diff --git a/src/ibuserror.h b/src/ibuserror.h
index c02b4403f..03fab52cc 100644
--- a/src/ibuserror.h
+++ b/src/ibuserror.h
@@ -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 <shawn.p.huang@gmail.com>
+ * Copyright (C) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * 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 <ibus.h> 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 <glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/ibusfactory.h b/src/ibusfactory.h
index 1357e17c0..806918336 100644
--- a/src/ibusfactory.h
+++ b/src/ibusfactory.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibushotkey.h b/src/ibushotkey.h
index 7e6f8ed7d..9f985eb72 100644
--- a/src/ibushotkey.h
+++ b/src/ibushotkey.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index fb0c6e91a..5c37b8192 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -250,6 +250,8 @@ ibus_input_context_class_init (IBusInputContextClass *class)
     /**
      * IBusInputContext::update-auxiliary-text:
      * @context: An IBusInputContext.
+     * @text: An auxiliary text
+     * @visible: The visibility of @text
      *
      * Emitted to hide auxilary text.
      *
diff --git a/src/ibuskeymap.h b/src/ibuskeymap.h
index a20c0976e..2f6627314 100644
--- a/src/ibuskeymap.h
+++ b/src/ibuskeymap.h
@@ -24,6 +24,9 @@
 #error "Only <ibus.h> 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 @@ IBusKeymap        *ibus_keymap_new                  (const gchar        *name)
 /**
  * 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 --git a/src/ibuskeysyms-compat.h b/src/ibuskeysyms-compat.h
index 993b26381..111b8da9f 100644
--- a/src/ibuskeysyms-compat.h
+++ b/src/ibuskeysyms-compat.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibuskeyuni.c b/src/ibuskeyuni.c
index 0ac400a8c..8d66ac3a7 100644
--- a/src/ibuskeyuni.c
+++ b/src/ibuskeyuni.c
@@ -861,16 +861,6 @@ static const struct {
   { 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 @@ static const struct {
   { 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 --git a/src/ibuslookuptable.h b/src/ibuslookuptable.h
index 07cc6050b..77124360a 100644
--- a/src/ibuslookuptable.h
+++ b/src/ibuslookuptable.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusobject.c b/src/ibusobject.c
index 930311e22..258048c00 100644
--- a/src/ibusobject.c
+++ b/src/ibusobject.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 @@ ibus_object_real_destroy (IBusObject *obj)
     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 --git a/src/ibusobject.h b/src/ibusobject.h
index 0e01c9bdc..cfc27b1f6 100644
--- a/src/ibusobject.h
+++ b/src/ibusobject.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 <glib-object.h>
 #include "ibustypes.h"
@@ -90,7 +91,7 @@ struct _IBusObject {
     IBusObjectPrivate *priv;
 };
 
-typedef void ( *IBusObjectDestroyFunc) (IBusObject *);
+typedef void ( *IBusObjectDestroyFunc) (IBusObject *object);
 
 struct _IBusObjectClass {
     GInitiallyUnownedClass parent;
diff --git a/src/ibusobservedpath.h b/src/ibusobservedpath.h
index fac4fbd17..8c8d18c38 100644
--- a/src/ibusobservedpath.h
+++ b/src/ibusobservedpath.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 @@ IBusObservedPath    *ibus_observed_path_new                 (const gchar
  * 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 --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index eadbf5ea2..ef3b9804d 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -266,6 +266,7 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
     /* 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * IBusPanelService::update-auxiliary-text:
+     * @panel: An #IBusPanelService
      * @text: A preedit text to be updated.
      * @visible: Whether the update is visible.
      *
@@ -316,6 +318,7 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * 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 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
 
     /**
      * IBusPanelService::destroy-context:
+     * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application destroys.
diff --git a/src/ibusproplist.h b/src/ibusproplist.h
index 60276b021..a8dbda231 100644
--- a/src/ibusproplist.h
+++ b/src/ibusproplist.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusproxy.h b/src/ibusproxy.h
index f050e8867..a2b52f56c 100644
--- a/src/ibusproxy.h
+++ b/src/ibusproxy.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 <gio/gio.h>
 
diff --git a/src/ibusserializable.h b/src/ibusserializable.h
index 8b4cf85e9..d12c47be1 100644
--- a/src/ibusserializable.h
+++ b/src/ibusserializable.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusservice.h b/src/ibusservice.h
index c19b22897..2d37c746d 100644
--- a/src/ibusservice.h
+++ b/src/ibusservice.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 <gio/gio.h>
 #include "ibusobject.h"
 
@@ -178,7 +178,7 @@ void             ibus_service_unregister        (IBusService        *service,
  *
  * 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 --git a/src/ibusshare.h b/src/ibusshare.h
index 2e936d612..744bab883 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 <glib.h>
 
 #ifdef IBUS_DISABLE_DEPRECATION_WARNINGS
diff --git a/src/ibustext.h b/src/ibustext.h
index be130d97a..021160725 100644
--- a/src/ibustext.h
+++ b/src/ibustext.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibustypes.h b/src/ibustypes.h
index 6d30a8669..86fc2ccbd 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -24,16 +24,18 @@
 #error "Only <ibus.h> 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 --git a/src/ibusutil.h b/src/ibusutil.h
index ad8b8890f..d5d593f8b 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2011 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2011 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * 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 <ibus.h> 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 --git a/src/ibusversion.h.in b/src/ibusversion.h.in
index 3caa2ec36..243982584 100644
--- a/src/ibusversion.h.in
+++ b/src/ibusversion.h.in
@@ -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 --git a/src/ibusxml.h b/src/ibusxml.h
index 0c558d3e2..826c9abe1 100644
--- a/src/ibusxml.h
+++ b/src/ibusxml.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 <ibus.h> 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 <glib.h>
 

From 4b20ca1b98265fde358a2863a954b49f61d79921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maro=C5=A1=20Za=C5=A5ko?= <hacxman@gmail.com>
Date: Tue, 26 Nov 2013 14:10:03 +0900
Subject: [PATCH 189/816] simple.xml.in: add Slovak qwerty layout variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Review URL: https://codereview.appspot.com/32030043
Patch from Maroš Zaťko <hacxman@gmail.com>.
---
 engine/simple.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 3b168208f..4218f6ca4 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -531,6 +531,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+                <engine>
+                        <name>xkb:sk:qwerty:slo</name>
+                        <language>slo</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>sk</layout>
+                        <layout_variant>qwerty</layout_variant>
+                        <longname>Slovak (qwerty)</longname>
+                        <description>Slovak (qwerty)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
 		<engine>
 			<name>xkb:es::spa</name>
 			<language>spa</language>

From 291bacf99d6da1e7f3952784e83d45400254b15b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 27 Nov 2013 11:29:58 +0900
Subject: [PATCH 190/816] 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
---
 setup/setup.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index 1638abbe1..cf3359abb 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -889,8 +889,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The default input method is the top one in the list.
-You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
+                                <property name="wrap">True</property>
+                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;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.&lt;/i&gt;&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                               <packing>

From bf18adb00f2e6f656c35ab2ee169db6f38be5fbe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Dec 2013 11:45:04 +0900
Subject: [PATCH 191/816] 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
---
 ui/gtk3/candidatepanel.vala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index e9d3a3441..396c78a0a 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -55,6 +55,9 @@ public class CandidatePanel : Gtk.HBox{
             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 @@ public class CandidatePanel : Gtk.HBox{
         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) {

From e99a1b0fda7214ff9332a7619b02772a8ae38602 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 11 Dec 2013 12:30:46 +0900
Subject: [PATCH 192/816] 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
---
 po/LINGUAS  |   1 +
 po/bn.po    | 620 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/bn_IN.po | 254 +++++++++++++--------
 po/da.po    | 396 ++++++++++++++++++---------------
 po/de.po    | 212 +++++++++++-------
 po/es.po    | 212 +++++++++++-------
 po/fr.po    | 332 +++++++++++++++-------------
 po/ja.po    | 176 ++++++---------
 po/kn.po    | 209 +++++++++++-------
 po/ko.po    | 215 +++++++++++-------
 po/nl.po    |  85 +++----
 po/pl.po    |  85 +++----
 po/ru.po    | 213 +++++++++++-------
 po/ta.po    | 229 ++++++++++++-------
 po/te.po    | 211 +++++++++++-------
 po/uk.po    |  87 ++++----
 po/zh_CN.po | 213 +++++++++++-------
 17 files changed, 2482 insertions(+), 1268 deletions(-)
 create mode 100644 po/bn.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 5f67d81f9..cfa9bd058 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,6 +1,7 @@
 ar
 as
 bg
+bn
 bn_IN
 ca
 da
diff --git a/po/bn.po b/po/bn.po
new file mode 100644
index 000000000..61ceb63ce
--- /dev/null
+++ b/po/bn.po
@@ -0,0 +1,620 @@
+# translation of ibus.pot to Bengali
+# Bengali translation of ibus.
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# Ayesha Akhtar <ayesha@ankur.org.bd>, 2012
+# Mahay Alam Khan <mak@ankur.org.bd>, 2012
+# Newton Baidya <newton@ankur.org.bd>, 2012
+# Robin Mehdee <robin@ankur.org.bd>, 2012
+# Runa Bhattacharjee <runab@fedoraproject.org>, 2009
+# runab <runab@redhat.com>, 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 <ayesha@ankur.org.bd>\n"
+"Language-Team: Bengali <trans-bn@lists.fedoraproject.org>\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 "<b>Keyboard Shortcuts</b>"
+msgstr "<b>কি-বোর্ড শর্ট-কাট</b>"
+
+#: ../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 "<b>Font and Style</b>"
+msgstr "<b>ফন্ট ও বিন্যাস</b>"
+
+#: ../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 ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr "<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
+
+#. 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 "<b>Keyboard Layout</b>"
+msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
+
+#: ../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 "<b>Global input method settings</b>"
+msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "উন্নত"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\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 "<b>Startup</b>"
+msgstr "<b>প্রারম্ভ</b>"
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 --git a/po/bn_IN.po b/po/bn_IN.po
index 33d6a8d6d..67083afa7 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,19 +1,20 @@
 # translation of ibus.pot to Bengali (India)
 # Bengali (India) translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Runa Bhattacharjee <runab@fedoraproject.org>, 2009.
-# Runa Bhattacharjee <runab@redhat.com>, 2009, 2010.
-#   <runabh@gmail.com>, 2012.
+# Runa Bhattacharjee <runab@fedoraproject.org>, 2009
+# runab <runab@redhat.com>, 2009, 2010
+# runa <runabh@gmail.com>, 2012
+# bnin <sray@redhat.com>, 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 <runabh@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: bnin <sray@redhat.com>\n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +86,7 @@ msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
 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 @@ msgstr "ভাষার প্যানেল প্রদর্শন করা
 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 @@ msgid ""
 msgstr "<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
 
 #. 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 @@ msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../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 @@ msgstr "<b>প্রারম্ভ</b>"
 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 @@ msgid "Saved engines order in input method list"
 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr "IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = উইন্ডো সংগে সংগে দেখান। 0 &lt; মিলিসেকেন্ড বিলম্ব। 0 &gt; উইন্ডো দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।"
+
+#: ../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 @@ msgstr "স্বত্বাধিকার (c) ২০০৭-২০০৯ প
 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 @@ msgstr "কি-র কোড:"
 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 @@ msgstr "IBus ডেমনটি %d সেকেন্ডে আরম্ভ ক
 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:185
+#: ../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: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 --git a/po/da.po b/po/da.po
index f894ba0fe..82ae18a6d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,22 +1,22 @@
 # translation of ibus.pot to Danish
 # Danish translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Kris Thomsen <lakristho@gmail.com>, 2009, 2011.
+# Kris Thomsen <lakristho@gmail.com>, 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 <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\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 @@ msgid "Vertical"
 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 @@ msgstr "Forrige inddatametode:"
 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 @@ msgstr "Vis sprogpanel:"
 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 @@ msgid "Show information of the selected input method"
 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 ""
 "<small><i>The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>Standard inputmetoden er den øverste i listen.\n"
-"Du kan bruge op/ned-knapperne for at ændre det.</i></small>"
+msgstr "<small><i>Standard inputmetoden er den øverste i listen.\nDu kan bruge op/ned-knapperne for at ændre det.</i></small>"
 
 #. 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 @@ msgstr "Brug systemttastaturlayout (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturlayout</b>"
 
-#: ../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 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligente inddatabus</small>\n"
-"Netsted: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Den intelligente inddatabus</small>\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 @@ msgstr "<b>Opstart</b>"
 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 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 @@ msgstr ""
 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 @@ msgstr "Nøglekode:"
 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 <dansk@dansk-gruppen.dk>\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 ""
+
+#: ../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 ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus-ramme for 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 ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Sluk for inputmetode"
+#: ../tools/main.vala:337
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Intet inputvindue"
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "Om inputmetoden"
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Skift inddatametode"
+#: ../ui/gtk3/panel.vala:657
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "Om inputmetoden"
+#: ../ui/gtk3/panel.vala:662
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus er en intelligent inddatabus til Linux/Unix."
 
-#~ msgid "next input method"
-#~ msgstr "næste inddatametode"
+#: ../ui/gtk3/panel.vala:666
+msgid "translator-credits"
+msgstr "Kris Thomsen\n\nDansk-gruppen <dansk@dansk-gruppen.dk>\nMere info: http://www.dansk-gruppen.dk"
 
-#~ msgid "previous input method"
-#~ msgstr "forrige inddatametode"
+#: ../ui/gtk3/panel.vala:698
+msgid "Restart"
+msgstr "Genstart"
diff --git a/po/de.po b/po/de.po
index 55382b414..c52da2922 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,19 +2,20 @@
 # German translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Fabian Affolter <fab@fedoraproject.org>, 2009
 # hpeters <hpeters@redhat.com>, 2009
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2011
+# Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 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 <bigant@fedoraproject.org>\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: Rainer <rgromans@redhat.com>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +87,7 @@ msgstr "Vorherige Eingabemethode:"
 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 @@ msgstr "Sprach-Panel anzeigen:"
 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 @@ msgid ""
 msgstr "<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\nSie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
 
 #. 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 @@ msgstr "System-Tastatur (XKB) Belegung verwenden"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../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 @@ msgstr "<b>Starten</b>"
 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 @@ msgid ""
 msgstr "Popup-Verzögerung für IME-Wechsel-Fenster setzen. Standardmäßig ist der Wert von 400 gesetzt. 0 = Fenster sofort anzeigen. 0 &lt; Verzögerung in Millisekunden. 0 &gt; 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 @@ msgstr "Beschreibung:\n"
 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 @@ msgstr "Bitte eine Taste (oder eine Tastenkombination drücken).\nDer Dialog wir
 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 @@ msgid ""
 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 <fab@fedoraproject.org>, 2009.\nHedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Neustart"
diff --git a/po/es.po b/po/es.po
index 86cb6f61b..ddc50d16f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,20 +2,21 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
 # Domingo Becker <domingobecker@gmail.com>, 2012
+# Domingo Becker <domingobecker@gmail.com>, 2013
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2013
 # Daniel Cabrera <logan@fedoraproject.org>, 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 <gguerrer@redhat.com>\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 <domingobecker@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@ msgstr "Método de entrada anterior:"
 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 @@ msgstr "Mostrar el panel de idioma:"
 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 @@ msgid ""
 msgstr "<small><i>El método de entrada determinado está al comienzo de la lista.\nPuede usar los botones arriba/abajo para cambiarlo.</i></small>"
 
 #. 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 @@ msgstr "Usar el diseño del teclado del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Diseño del Teclado</b>"
 
-#: ../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 @@ msgstr "<b>Inicio</b>"
 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 @@ msgid ""
 msgstr "Establece retraso del Popup en milisegundos para mostrar la ventana del  interruptor IME. Lo predeterminado es 400. 0 = Muestra la ventana inmediatamente. 0 &lt; Demora en milisegundos. 0 &gt; 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 @@ msgstr "Descripción:\n"
 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 @@ msgstr "Por favor, presione una tecla (o una combinación de tecla).\nEl diálog
 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 @@ msgid ""
 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, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Reiniciar"
diff --git a/po/fr.po b/po/fr.po
index 11dc2779f..e167b55fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,25 +4,25 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009.
-# dominique bribanick <chepioq@gmail.com>, 2011.
-# Jérôme Fenal <jfenal@gmail.com>, 2012, 2013.
-# Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011, 2012, 2013.
-# Sam Friedmann <sam.friedmann@redhat.com>, 2010.
+# Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
+# dominique bribanick <chepioq@gmail.com>, 2011
+# Jérôme Fenal <jfenal@gmail.com>, 2012-2013
+# Jérôme Fenal <jfenal@gmail.com>, 2012
+# Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011, 2012, 2013
+# Sam Friedmann <sam.friedmann@redhat.com>, 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 <julroy67@gmail.com>\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 <jfenal@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\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 @@ msgstr "Préférences de IBus"
 
 #: ../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 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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 @@ msgstr "Méthode d'entrée précédente :"
 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 @@ msgstr "Afficher la barre de langue :"
 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 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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 @@ msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée acti
 
 #: ../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 @@ msgstr "Afficher le paramétrage de la méthode d'entrée sélectectionnée"
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>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.</i></small>"
+"<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>"
+msgstr "<small><i>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.</i></small>"
 
 #. 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 "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../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 "<b>Global input method settings</b>"
 msgstr "<b>Configuration de la méthode d'éntrée globale</b>"
 
-#: ../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 ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -242,38 +228,20 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d'accueil : http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\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 "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../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 @@ msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
 #: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; 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 @@ msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 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 @@ msgstr "Description :\n"
 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 @@ msgstr "Modificateurs :"
 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 <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Redémarrer"
diff --git a/po/ja.po b/po/ja.po
index e9f8da246..1f277d507 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -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 <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\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 @@ msgstr "次のインプットメソッド:"
 
 #: ../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 @@ msgstr "言語バーにインプットメソッド名を表示する"
 
 #: ../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 @@ msgstr "アプリケーションウィンドウに前編集テキストを組み
 
 #: ../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 @@ 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"
@@ -194,42 +187,41 @@ msgstr "選択したインプットメソッドの設定を表示します"
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr ""
-"<small><i>デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
-"「上へ/下へ」ボタンを使ってデフォルトを変更できます。</i></small>"
+"<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>"
+msgstr "<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</i></small>"
 
 #. 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 "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../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 "<b>Global input method settings</b>"
 msgstr "<b>グローバルインプットメソッドの設定</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -237,23 +229,17 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>インテリジェントなインプットバス</small>\n"
-"ホームページ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>インテリジェントなインプットバス</small>\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 "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../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 @@ msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
-msgstr ""
-"IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してくださ"
-"い。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 &lt; ミリ秒単位"
-"の遅延。0 &gt; ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
+msgstr "IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してください。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 &lt; ミリ秒単位の遅延。0 &gt; ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
@@ -295,9 +278,7 @@ msgstr "保存されているバージョンナンバー"
 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 @@ msgstr "前のエンジンへのショートカットキー"
 
 #: ../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 @@ msgstr "自動的に隠す"
 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 @@ msgstr "言語パネルの位置"
 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 @@ msgstr "標準でインプットメソッドを有効にする"
 
 #: ../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 @@ msgstr "DConf キーのプレフィックスは名前変換を停止します"
 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 @@ msgstr "モディファイア:"
 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 @@ msgstr "システムレジストリーキャッシュを書き込む。"
 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 <utuhiro78@yahoo.co.jp>\n"
-"IWAI, Masaharu <iwai@alib.jp>\n"
-"日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
+msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
 
-#: ../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 --git a/po/kn.po b/po/kn.po
index 73306b536..44dec8998 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,7 +2,7 @@
 # Kannada translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # shanky <prasad.mvs@gmail.com>, 2013
 # shanky <prasad.mvs@gmail.com>, 2012
@@ -12,8 +12,8 @@ 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-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 <prasad.mvs@gmail.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 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 @@ msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
 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 @@ msgid ""
 msgstr "<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\nಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></small>"
 
 #. 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 @@ msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
 
-#: ../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 @@ msgstr "<b>ಆರಂಭ</b>"
 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 @@ msgid ""
 msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
 #: ../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 @@ msgstr "ವಿವರಣೆ:\n"
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +455,15 @@ msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅ
 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 @@ msgid ""
 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 "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "ಮರಳಿ ಆರಂಭಿಸು"
diff --git a/po/ko.po b/po/ko.po
index 8110bf0ab..c51be603f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,19 +2,19 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Eunju Kim <eukim@redhat.com>, 2009
-# Eun-Ju Kim <eukim@redhat.com>, 2012
+# eukim <eukim@redhat.com>, 2009
+# eukim <eukim@redhat.com>, 2012
 # Hyunsok Oh <hoh@redhat.com>, 2010
 # Michelle Kim <mkim33@gmail.com>, 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 <eukim@redhat.com>\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 <mkim33@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgstr "이전 입력 방식:"
 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 @@ msgstr "언어 패널 표시:  "
 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 @@ msgid ""
 msgstr "<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
 
 #. 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 @@ msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>키보드 레이아웃</b>  "
 
-#: ../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 @@ msgstr "<b>시작</b>  "
 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 @@ msgid ""
 msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; 밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
 #: ../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 @@ msgstr "설명:\n"
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +455,15 @@ msgstr "키 또는 키 조합을 입력하십시오.\n키를 입력하면 대화
 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 @@ msgid ""
 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 --git a/po/nl.po b/po/nl.po
index 39349d765..2cbc5a860 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,15 +2,15 @@
 # Dutch translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Geert Warrink <geert.warrink@onsnet.nu>, 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 <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -181,40 +181,41 @@ msgstr "Toon instelling van de geselecteerde invoermethode"
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>De standaard invoermethode is de bovenste in de lijst.\nje kunt op/neer toetsen gebruiken om dit te veranderen.</i></small>"
+"<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>"
+msgstr "<small><i>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.</i></small>"
 
 #. 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 "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../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 "<b>Global input method settings</b>"
 msgstr "<b>Globale invoermethode instellingen</b>"
 
-#: ../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 ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,15 +225,15 @@ msgid ""
 "\n"
 msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\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 "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../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 @@ msgstr "Druk op een toets (of een toetsencombinatie).\nDe dialoog wordt afgeslot
 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 @@ msgid ""
 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 @@ msgstr "Schrijf de systeem registry cache."
 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 --git a/po/pl.po b/po/pl.po
index bece1b417..333632aa0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,15 +2,15 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Piotr Drąg <piotrdrag@gmail.com>, 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 <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -181,40 +181,41 @@ msgstr "Wyświetlanie ustawień zaznaczonej metody wprowadzania"
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Domyślna metoda wprowadzania znajduje się na górze listy.\nMożna użyć klawiszy w górę/w dół, aby ją zmienić.</i></small>"
+"<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>"
+msgstr "<small><i>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.</i></small>"
 
 #. 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 "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../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 "<b>Global input method settings</b>"
 msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: ../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 ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,15 +225,15 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\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 "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../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 @@ msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy).\nOkno dialogowe z
 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 @@ msgid ""
 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 @@ msgstr "Zapisuje pamięć podręczną rejestru systemu."
 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 <piotrdrag@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Uruchom ponownie"
diff --git a/po/ru.po b/po/ru.po
index 70f7afaf6..ab588b05a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@
 # Russian translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Koterpillar <koterpillar@gmail.com>, 2009
 # Yulia <ypoyarko@redhat.com>, 2010
@@ -11,8 +11,8 @@ 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-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 <yulia.poyarkova@redhat.com>\n"
 "Language-Team: Russian <trans-ru@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr "Предыдущий метод ввода:"
 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 @@ msgstr "Показывать языковую панель:"
 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 @@ msgid ""
 msgstr "<small><i>По умолчанию используется первый в списке метод ввода.\nИспользуйте кнопки вверх/вниз для изменения.</i></small>"
 
 #. 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 @@ msgstr "Использовать системную раскладку (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Раскладка клавиатуры</b>"
 
-#: ../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 @@ msgstr "<b>Запуск</b>"
 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 @@ msgid ""
 msgstr "Настройте задержку показа окна выбора метода ввода, которое по умолчанию будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 &lt; задержка в миллисекундах, 0 &gt; окно не будет показано."
 
 #: ../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 @@ msgstr "Описание:\n"
 msgid "Select an input method"
 msgstr "Выберите метод ввода"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -456,15 +454,15 @@ msgstr "Нажмите клавишу (или сочетание клавиш).\
 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 @@ msgid ""
 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 &mdash; интеллектуальная система ввода для Linux и Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\nYulia <ypoyarko@redhat.com>, 2010."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Перезапустить"
diff --git a/po/ta.po b/po/ta.po
index ea038f693..0929ffcdf 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2,20 +2,22 @@
 # Tamil translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Arun Prakash <arunprakash.pts@gmail.com>, 2012
+# Arun Prakash <arunprakash.pts@gmail.com>, 2012
 # Felix I <ifelix25@gmail.com>, 2011
 # Felix I <ifelix25@gmail.com>, 2011
 # I Felix <ifelix@redhat.com>, 2010
 # I. Felix <ifelix@redhat.com>, 2009
 # shkumar <shkumar@redhat.com>, 2012
+# shkumar <shkumar@redhat.com>, 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 <shkumar@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +52,7 @@ msgstr "கீழ் வலது ஓரம்"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "தனிபயன்"
+msgstr "தனிப்பயன்"
 
 #: ../setup/setup.ui.h:8
 msgid "Embedded in menu"
@@ -88,7 +90,7 @@ msgstr "முந்தைய உள்ளீடு முறை:"
 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 @@ msgstr "மொழி பலகத்தை காட்டு:"
 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 @@ msgstr "பயன்பாட்டு சாளரத்தில் preedit 
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து:"
+msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -191,15 +193,15 @@ msgid ""
 msgstr "<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\nமேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
 
 #. 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 @@ msgstr "கணினி விசைப்பலகை (XKB) அமைப்ப
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../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 @@ msgstr "<b>துவக்கம்</b>"
 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 @@ msgid ""
 msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 &lt; தாமத மில்லிசெகன்ட். 0 &gt; சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற."
 
 #: ../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 @@ msgstr "பெயர் மரபை நிறுத்த DConf விசைக
 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 @@ msgstr "விளக்கம்:\n"
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -459,15 +459,15 @@ msgstr "ஒரு விசையை அழுத்தவும் (அல்
 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 @@ msgid ""
 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 <ifelix@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
diff --git a/po/te.po b/po/te.po
index 2fa6b4470..c39d2d450 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,17 +2,19 @@
 # Telugu translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
+# Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
 # Krishnababu Krothapalli <krisnababu@gmail.com>, 2012-2013
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011
+# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 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 <krisnababu@gmail.com>\n"
 "Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +87,7 @@ msgstr "క్రితం ఇన్‌పుట్ పద్ధతి:"
 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 @@ msgstr "భాషా ప్యానల్ చూపించు:"
 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 @@ msgid ""
 msgstr "<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\nదానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
 
 #. 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 @@ msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>కీబోర్డు నమూనా</b>"
 
-#: ../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 @@ msgstr "<b>ప్రారంభము</b>"
 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 @@ msgid ""
 msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 &lt; ఆలస్యం మిల్లీసెకన్లలో. 0 &gt; విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
 
 #: ../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 @@ msgstr "వివరణ:\n"
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -456,15 +456,15 @@ msgstr "దయచేసి వొక కీను వత్తండి (లే
 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 @@ msgid ""
 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 "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
diff --git a/po/uk.po b/po/uk.po
index a2e13784e..2cbfc6fa7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,16 +2,16 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2012
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2013
 # Yuri Chornoivan <yurchor@ukr.net>, 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 <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -182,40 +182,41 @@ msgstr "Показати панель налаштовування познач
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Типовий спосіб введення — найвищий пункт у списку.\nЗмінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз».</i></small>"
+"<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>"
+msgstr "<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище списку натисканням клавіатурного скорочення або піктограми на панелі.</i></small>"
 
 #. 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 "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../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 "<b>Global input method settings</b>"
 msgstr "<b>Загальні параметри способів введення</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,15 +226,15 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Інтелектуальний канал введення</small>\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 "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../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 @@ msgstr "Будь ласка, натисніть клавішу (або комб
 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 @@ msgid ""
 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 @@ msgstr "Записати дані до загальносистемного ке
 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 "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Перезапустити"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c85b3e2f5..80a8de6e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
-# Copyright (C) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Christopher Meng <cickumqt@gmail.com>, 2012-2013
 # Tommy He <lovenemesis@gmail.com>, 2012
@@ -14,8 +14,8 @@ 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-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 <cickumqt@gmail.com>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "上一输入法："
 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 @@ msgstr "显示语言栏："
 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 @@ msgid ""
 msgstr "<small><i>列表中的第一个输入法是默认输入法。\n您可以使用上/下按钮更改。</i></small>"
 
 #. 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 @@ msgstr "使用系统键盘（XKB）布局"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../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 @@ msgstr "<b>启动</b>"
 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 @@ msgid ""
 msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/下一个输入法引擎时不显示窗口。"
 
 #: ../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 @@ msgstr "用来停止名称转换的 DConf 键前缀"
 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 @@ msgstr "描述：\n"
 msgid "Select an input method"
 msgstr "选择输入法"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -459,15 +457,15 @@ msgstr "请按一个键盘按键（或者一个组合按键）\n当您松开任
 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 @@ msgid ""
 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 "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "重新启动"

From e0ca43cb4e72e1390750addf6407074ee32a955a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Dec 2013 11:56:41 +0900
Subject: [PATCH 193/816] Remove -Werror in autogen.sh since the build still
 have errors.

Review URL: https://codereview.appspot.com/38250043
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 1c82d5f42..73ca174fe 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,7 @@ which gnome-autogen.sh || {
     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 "$@"

From dddd29edaf32d31e1c98047288c54a23edb5979b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 17 Dec 2013 12:02:56 +0900
Subject: [PATCH 194/816] 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
---
 data/ibus.schemas.in       |  16 +-
 setup/setup.ui             |  10 +-
 src/ibusattrlist.c         |   8 +-
 ui/gtk3/Makefile.am        |   1 +
 ui/gtk3/panel.vala         |  46 +++-
 ui/gtk3/property.vala      |   8 +-
 ui/gtk3/propertypanel.vala | 520 +++++++++++++++++++++++++++++++++++++
 7 files changed, 592 insertions(+), 17 deletions(-)
 create mode 100644 ui/gtk3/propertypanel.vala

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 2779139fd..82a6a70d4 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -161,10 +161,10 @@
       <applyto>/desktop/ibus/panel/show</applyto>
       <owner>ibus</owner>
       <type>int</type>
-      <default>0</default>
+      <default>1</default>
       <locale name="C">
         <short>Auto hide</short>
-	    <long>The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show</long>
+	    <long>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</long>
       </locale>
     </schema>
     <schema>
@@ -200,6 +200,18 @@
       </locale>
     </schema>
     -->
+    <schema>
+      <key>/schemas/desktop/ibus/panel/timeout</key>
+      <applyto>/desktop/ibus/panel/timeout</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>3000</default>
+      <locale name="C">
+        <short>The milliseconds to show property panel</short>
+          <long>The milliseconds to show property panel after focus-in or
+                properties are changed.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/lookup_table_orientation</key>
       <applyto>/desktop/ibus/panel/lookup_table_orientation</applyto>
diff --git a/setup/setup.ui b/setup/setup.ui
index cf3359abb..65dcee445 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -45,10 +45,10 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Embedded in menu</col>
+        <col id="0" translatable="yes">Do not show</col>
       </row>
       <row>
-        <col id="0" translatable="yes">When active</col>
+        <col id="0" translatable="yes">Hide automatically</col>
       </row>
       <row>
         <col id="0" translatable="yes">Always</col>
@@ -459,11 +459,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label10">
-                                    <property name="no_show_all">True</property>
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Set the behavior of ibus how to show or hide language bar</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Show language panel:</property>
+                                    <property name="label" translatable="yes">Show property panel:</property>
                                     <property name="justify">right</property>
                                   </object>
                                   <packing>
@@ -490,7 +490,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="combobox_panel_show">
-                                    <property name="no_show_all">True</property>
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="model">model_panel_show_mode</property>
                                     <child>
diff --git a/src/ibusattrlist.c b/src/ibusattrlist.c
index 1c991641f..ea735fb1d 100644
--- a/src/ibusattrlist.c
+++ b/src/ibusattrlist.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * 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 @@ ibus_attr_list_copy (IBusAttrList       *dest,
                                  (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 --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 547ef5361..6012cfa0a 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -109,6 +109,7 @@ ibus_ui_gtk3_SOURCES = \
 	panel.vala \
 	pango.vala \
 	property.vala \
+	propertypanel.vala \
 	separator.vala \
 	switcher.vala \
 	$(NULL)
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 5903e051d..0d229e77e 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -52,6 +52,7 @@ class Panel : IBus.PanelService {
     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 @@ class Panel : IBus.PanelService {
         }
 
         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);
         });
 
@@ -152,6 +158,14 @@ class Panel : IBus.PanelService {
         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,
@@ -332,6 +346,21 @@ class Panel : IBus.PanelService {
                 == 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_timeout(
+                (uint) m_settings_panel.get_int("timeout"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -428,6 +457,8 @@ class Panel : IBus.PanelService {
         set_custom_font();
         set_show_icon_on_systray();
         set_lookup_table_orientation();
+        set_show_property_panel();
+        set_timeout_property_panel();
 
         set_version();
     }
@@ -568,7 +599,7 @@ class Panel : IBus.PanelService {
         }
 
         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,
@@ -652,9 +683,9 @@ class Panel : IBus.PanelService {
             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");
@@ -759,9 +790,12 @@ class Panel : IBus.PanelService {
     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;
 
@@ -828,10 +862,12 @@ class Panel : IBus.PanelService {
 
     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,
diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index eb0a7714a..0ce93cd80 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
  *
  * 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 class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
     }
 
     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 class PropCheckMenuItem : Gtk.RadioMenuItem, IPropItem {
     }
 
     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 --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
new file mode 100644
index 000000000..762e18e29
--- /dev/null
+++ b/ui/gtk3/propertypanel.vala
@@ -0,0 +1,520 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Red Hat, Inc.
+ * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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;
+    private int m_show = PanelShow.AUTO_HIDE;
+    private uint m_timeout = 3000;
+    private uint m_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);
+        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);
+
+        set_show_timer();
+    }
+
+    public void set_cursor_location(int x, int y, int width, int height) {
+        Gdk.Rectangle location = Gdk.Rectangle(){
+            x = x, y = y, width = width, height = height };
+        if (m_cursor_location == location)
+            return;
+        m_cursor_location = location;
+        adjust_window_position();
+    }
+
+    public new void show() {
+        if (m_show == PanelShow.DO_NOT_SHOW)
+            return;
+
+        m_toplevel.show_all();
+    }
+
+    public new void hide() {
+        m_toplevel.hide();
+    }
+
+    public void focus_in() {
+        set_show_timer();
+    }
+
+    public void set_show(int _show) {
+        m_show = _show;
+        show();
+    }
+
+    public void set_timeout(uint timeout) {
+        m_timeout = timeout;
+    }
+
+    private int 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));
+            }
+        }
+        return i;
+    }
+
+    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 set_show_timer() {
+        if (m_show != PanelShow.AUTO_HIDE)
+            return;
+
+        if (m_timeout_id != 0)
+            GLib.Source.remove(m_timeout_id);
+
+        m_toplevel.show_all();
+
+        /* Change the priority because IME typing sometimes freezes. */
+        m_timeout_id = GLib.Timeout.add(m_timeout, () => {
+            m_toplevel.hide();
+            m_timeout_id = 0;
+            return false;
+        },
+        GLib.Priority.DEFAULT_IDLE);
+    }
+
+    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) {
+    }
+}

From 8ce7ac6088e440ee539ed3299d9a219aac1c8089 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 18 Dec 2013 11:39:40 +0900
Subject: [PATCH 195/816] 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
---
 ui/gtk3/propertypanel.vala | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 762e18e29..114d5317c 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -62,6 +62,7 @@ public class PropertyPanel : Gtk.Box {
         m_props = props;
 
         create_menu_items();
+        show();
     }
 
     public void update_property(IBus.Property prop) {
@@ -86,8 +87,10 @@ public class PropertyPanel : Gtk.Box {
     }
 
     public new void show() {
-        if (m_show == PanelShow.DO_NOT_SHOW)
+        if (m_show == PanelShow.DO_NOT_SHOW || m_items.length == 0) {
+            m_toplevel.hide();
             return;
+        }
 
         m_toplevel.show_all();
     }
@@ -109,7 +112,19 @@ public class PropertyPanel : Gtk.Box {
         m_timeout = timeout;
     }
 
-    private int create_menu_items() {
+    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);
@@ -143,7 +158,6 @@ public class PropertyPanel : Gtk.Box {
                                                property_activate(k, s));
             }
         }
-        return i;
     }
 
     private void move(int x, int y) {
@@ -188,7 +202,7 @@ public class PropertyPanel : Gtk.Box {
         if (m_timeout_id != 0)
             GLib.Source.remove(m_timeout_id);
 
-        m_toplevel.show_all();
+        show();
 
         /* Change the priority because IME typing sometimes freezes. */
         m_timeout_id = GLib.Timeout.add(m_timeout, () => {

From 7587b8e6a2f690dd52fcabc2e0da31062fb02128 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 8 Jan 2014 16:36:47 +0900
Subject: [PATCH 196/816] 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
---
 data/ibus.schemas.in       |   6 +-
 ui/gtk3/panel.vala         |  13 ++--
 ui/gtk3/propertypanel.vala | 125 ++++++++++++++++++++++++++++++++-----
 3 files changed, 121 insertions(+), 23 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 82a6a70d4..d256cbb1b 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -201,11 +201,11 @@
     </schema>
     -->
     <schema>
-      <key>/schemas/desktop/ibus/panel/timeout</key>
-      <applyto>/desktop/ibus/panel/timeout</applyto>
+      <key>/schemas/desktop/ibus/panel/auto-hide-timeout</key>
+      <applyto>/desktop/ibus/panel/auto-hide-timeout</applyto>
       <owner>ibus</owner>
       <type>int</type>
-      <default>3000</default>
+      <default>10000</default>
       <locale name="C">
         <short>The milliseconds to show property panel</short>
           <long>The milliseconds to show property panel after focus-in or
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 0d229e77e..a7a0c409f 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -357,8 +357,8 @@ class Panel : IBus.PanelService {
         if (m_property_panel == null)
             return;
 
-        m_property_panel.set_timeout(
-                (uint) m_settings_panel.get_int("timeout"));
+        m_property_panel.set_auto_hide_timeout(
+                (uint) m_settings_panel.get_int("auto-hide-timeout"));
     }
 
     private int compare_versions(string version1, string version2) {
@@ -873,10 +873,13 @@ class Panel : IBus.PanelService {
     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() {
@@ -886,6 +889,7 @@ class Panel : IBus.PanelService {
     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() {
@@ -895,6 +899,7 @@ class Panel : IBus.PanelService {
     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 --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 114d5317c..64b509208 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -32,10 +32,11 @@ 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;
+    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_timeout = 3000;
-    private uint m_timeout_id = 0;
+    private uint m_auto_hide_timeout = 10000;
+    private uint m_auto_hide_timeout_id = 0;
 
     public PropertyPanel() {
         /* Chain up base class constructor */
@@ -62,11 +63,13 @@ public class PropertyPanel : Gtk.Box {
         m_props = props;
 
         create_menu_items();
-        show();
     }
 
     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);
 
@@ -74,16 +77,82 @@ public class PropertyPanel : Gtk.Box {
         foreach (var item in m_items)
             item.update_property(prop);
 
-        set_show_timer();
+        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() {
@@ -91,8 +160,12 @@ public class PropertyPanel : Gtk.Box {
             m_toplevel.hide();
             return;
         }
+        else if (m_show == PanelShow.ALWAYS) {
+            m_toplevel.show_all();
+            return;
+        }
 
-        m_toplevel.show_all();
+        /* Do not change the state here if m_show == AUTO_HIDE. */
     }
 
     public new void hide() {
@@ -100,7 +173,19 @@ public class PropertyPanel : Gtk.Box {
     }
 
     public void focus_in() {
-        set_show_timer();
+        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) {
@@ -108,8 +193,8 @@ public class PropertyPanel : Gtk.Box {
         show();
     }
 
-    public void set_timeout(uint timeout) {
-        m_timeout = timeout;
+    public void set_auto_hide_timeout(uint timeout) {
+        m_auto_hide_timeout = timeout;
     }
 
     public override void get_preferred_width(out int minimum_width,
@@ -195,24 +280,32 @@ public class PropertyPanel : Gtk.Box {
         move(x, y);
     }
 
-    private void set_show_timer() {
-        if (m_show != PanelShow.AUTO_HIDE)
+    private void show_with_auto_hide_timer() {
+        if (m_show != PanelShow.AUTO_HIDE || m_items.length == 0)
             return;
 
-        if (m_timeout_id != 0)
-            GLib.Source.remove(m_timeout_id);
+        if (m_auto_hide_timeout_id != 0)
+            GLib.Source.remove(m_auto_hide_timeout_id);
 
-        show();
+        m_toplevel.show_all();
 
         /* Change the priority because IME typing sometimes freezes. */
-        m_timeout_id = GLib.Timeout.add(m_timeout, () => {
+        m_auto_hide_timeout_id = GLib.Timeout.add(m_auto_hide_timeout, () => {
             m_toplevel.hide();
-            m_timeout_id = 0;
+            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);
 }
 

From 4e860c1ef4d056c91e63f3c39a67800ed3e8e5bc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 14 Jan 2014 12:50:34 +0900
Subject: [PATCH 197/816] Release 1.5.5

Review URL: https://codereview.appspot.com/41200044
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e8fde49ad..d71c4159f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 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)])

From e6ec45d64a32d16245770f8b80e795a63e6ad553 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 16 Jan 2014 13:22:12 +0900
Subject: [PATCH 198/816] 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 <walters@verbum.org>.
---
 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 c841a3445..62c20a35c 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

From 65f583483529b98dc2bec96d3e6524629c585234 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 17 Jan 2014 12:13:35 +0900
Subject: [PATCH 199/816] Fix the access out of bounds in gencomposetable

TEST=src/gencomposetable

Review URL: https://codereview.appspot.com/52670044
---
 src/gencomposetable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gencomposetable.c b/src/gencomposetable.c
index da929d0d5..bffda07dd 100644
--- a/src/gencomposetable.c
+++ b/src/gencomposetable.c
@@ -647,7 +647,7 @@ check_duplicated_compose (GList *compose_table)
         int i;
         int n_compose = 0;
 
-        for (i = 0; i <= GTK_MAX_COMPOSE_LEN + 2; i++) {
+        for (i = 0; i < GTK_MAX_COMPOSE_LEN + 2; i++) {
             keysyms[i] = 0;
         }
 

From 5d94d8cc7b9a322f4639200c4a10076cb57a0294 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 23 Jan 2014 15:34:31 +0900
Subject: [PATCH 200/816] Use LT_INIT instead of AM_PROG_LIBTOOL

BUG=http://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html

Review URL: https://codereview.appspot.com/55480044
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d71c4159f..b7ef1ebd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ AM_GLIB_GNU_GETTEXT
 AM_DISABLE_STATIC
 AC_ISC_POSIX
 AC_HEADER_STDC
-AM_PROG_LIBTOOL
+LT_INIT
 IT_PROG_INTLTOOL([0.35.0])
 
 # Check functions.

From 8468de2f165ca7dba45b13cec09fdcde83a88204 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 24 Jan 2014 11:11:40 +0900
Subject: [PATCH 201/816] Enable python3 ibus-setup.

The default uses 'python' and if the path of python 3 is 'python3',
./configure --with-python=python3

Review URL: https://codereview.appspot.com/54930043
---
 configure.ac              |  8 ++++++++
 setup/enginecombobox.py   | 25 +++++++++++++++++--------
 setup/enginetreeview.py   | 13 +++++++------
 setup/keyboardshortcut.py | 10 +++++-----
 setup/main.py             | 21 ++++++++++++---------
 5 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7ef1ebd2..73d99ee15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,6 +372,13 @@ AM_CONDITIONAL([ENABLE_PYTHON_LIBRARY], [test x"$enable_python_library" = x"yes"
 AM_CONDITIONAL([ENABLE_SETUP], [test x"$enable_setup" = x"yes"])
 AM_CONDITIONAL([ENABLE_DAEMON], [true])
 
+# Define python version
+AC_ARG_WITH(python,
+    AS_HELP_STRING([--with-python[=PATH]],
+        [Select python2 or python3]),
+    [PYTHON=$with_python], []
+)
+
 AM_PATH_PYTHON([2.5])
 
 PYGOBJECT_REQUIRED=3.0.0
@@ -598,6 +605,7 @@ Build options:
   Build shared libs         $enable_shared
   Build static libs         $enable_static
   CFLAGS                    $CFLAGS
+  python                    $PYTHON
   Gtk2 immodule dir         $GTK2_IM_MODULEDIR
   Gtk3 immodule dir         $GTK3_IM_MODULEDIR
   Build gtk2 immodule       $enable_gtk2
diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index b45ad5622..2a2a6777a 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -21,6 +21,8 @@
 # USA
 
 import locale
+import functools
+import sys
 
 from gi.repository import GObject
 from gi.repository import Gtk
@@ -72,8 +74,8 @@ def set_engines(self, engines):
                 langs[l] = []
             langs[l].append(e)
 
-        keys = langs.keys()
-        keys.sort(locale.strcoll)
+        keys = list(langs.keys())
+        keys.sort(key=functools.cmp_to_key(locale.strcoll))
         loc = locale.getlocale()[0]
         # None on C locale
         if loc == None:
@@ -95,7 +97,7 @@ def cmp_engine(a, b):
                 if a.get_rank() == b.get_rank():
                     return locale.strcoll(a.get_longname(), b.get_longname())
                 return int(b.get_rank() - a.get_rank())
-            langs[l].sort(cmp_engine)
+            langs[l].sort(key=functools.cmp_to_key(cmp_engine))
             for e in langs[l]:
                 iter2 = self.__model.append(iter1)
                 self.__model.set(iter2, 0, e)
@@ -106,7 +108,10 @@ def cmp_engine(a, b):
     def __icon_cell_data_cb(self, celllayout, renderer, model, iter, data):
         engine = self.__model.get_value(iter, 0)
 
-        if isinstance(engine, str) or isinstance (engine, unicode):
+        if isinstance(engine, str):
+            renderer.set_property("visible", False)
+            renderer.set_property("sensitive", False)
+        elif sys.version < '3' and isinstance (engine, unicode):
             renderer.set_property("visible", False)
             renderer.set_property("sensitive", False)
         elif isinstance(engine, int):
@@ -121,7 +126,11 @@ def __icon_cell_data_cb(self, celllayout, renderer, model, iter, data):
     def __name_cell_data_cb(self, celllayout, renderer, model, iter, data):
         engine = self.__model.get_value(iter, 0)
 
-        if isinstance (engine, str) or isinstance (engine, unicode):
+        if isinstance (engine, str):
+            renderer.set_property("sensitive", False)
+            renderer.set_property("text", engine)
+            renderer.set_property("weight", Pango.Weight.NORMAL)
+        elif sys.version < '3' and isinstance (engine, unicode):
             renderer.set_property("sensitive", False)
             renderer.set_property("text", engine)
             renderer.set_property("weight", Pango.Weight.NORMAL)
@@ -146,7 +155,7 @@ def do_get_property(self, property):
             iter = self.get_active_iter()
             return self.get_model()[iter][0]
         else:
-            raise AttributeError, 'unknown property %s' % property.name
+            raise AttributeError('unknown property %s' % property.name)
 
     def get_active_engine(self):
         return self.get_property("active-engine")
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index f8ee0920e..b116c54f2 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -108,7 +108,8 @@ def __sort_engines(self, model, a, b, data):
         language_b = IBus.get_language_name(engine_b.get_language())
         label_a = "%s - %s" % (language_a, engine_a.get_longname())
         label_b = "%s - %s" % (language_b, engine_b.get_longname())
-        return cmp(label_a, label_b)
+        # http://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons
+        return (label_a > label_b) - (label_a < label_b)
 
     def __selection_changed_cb(self, *args):
         self.notify("active-engine");
@@ -173,15 +174,15 @@ def do_get_property(self, prop):
             engines = [ r[0] for r in self.__model if r[0] != None]
             return engines
         else:
-            raise AttributeError, 'unknown property %s' % prop.name
+            raise AttributeError('unknown property %s' % prop.name)
 
     def do_set_property(self, prop, value):
         if prop.name == "active-engine":
-            raise AttributeError, "active-engine is readonly"
+            raise AttributeError("active-engine is readonly")
         elif prop.name == "engines":
             set_engines(value)
         else:
-            raise AttributeError, 'unknown property %s' % prop.name
+            raise AttributeError('unknown property %s' % prop.name)
 
     def set_engines(self, engines):
         self.__model.clear()
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 1a885250a..26bd77fcb 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -182,7 +182,7 @@ def __get_shortcut_from_buttons(self):
                 modifiers.append(name)
         if keycode.startswith("_"):
             keycode = keycode[1:]
-        shortcut = "".join(map(lambda m: '<' + m + '>', modifiers))
+        shortcut = "".join(['<' + m + '>' for m in modifiers])
         shortcut += keycode
         return shortcut
 
@@ -335,6 +335,6 @@ def get_shortcuts(self):
                    Gtk.STOCK_OK, Gtk.ResponseType.OK))
     dlg.add_shortcut("Control+Shift+space")
     dlg.set_shortcuts(None)
-    print dlg.run()
-    print dlg.get_shortcuts()
+    print((dlg.run()))
+    print((dlg.get_shortcuts()))
 
diff --git a/setup/main.py b/setup/main.py
index d3f441422..cac10dec9 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -20,6 +20,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 # USA
 
+# for python2
+from __future__ import print_function
+
 import os
 import signal
 import sys
@@ -45,7 +48,7 @@
     COLUMN_VISIBLE,
     COLUMN_ICON,
     COLUMN_DATA,
-) = range(6)
+) = list(range(6))
 
 (
     DATA_NAME,
@@ -57,7 +60,7 @@
     DATA_EXEC,
     DATA_STARTED,
     DATA_PRELOAD
-) = range(9)
+) = list(range(9))
 
 class Setup(object):
     def __flush_gtk_events(self):
@@ -286,7 +289,7 @@ def __treeview_notify_cb(self, treeview, prop):
             obj.set_sensitive(False)
 
         if prop.name == "engines":
-            engine_names = map(lambda e: e.get_name(), engines)
+            engine_names = [e.get_name() for e in engines]
             self.__settings_general.set_strv('preload-engines', engine_names)
 
     def __button_engine_add_cb(self, button):
@@ -306,7 +309,7 @@ def __button_engine_preferences_cb(self, button):
         if len(args) == 0:
             return
         name = engine.get_name()
-        if name in self.__engine_setup_exec_list.keys():
+        if name in list(self.__engine_setup_exec_list.keys()):
             try:
                 wpid, sts = os.waitpid(self.__engine_setup_exec_list[name],
                                        os.WNOHANG)
@@ -402,7 +405,7 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
         if data[DATA_STARTED] == False:
             try:
                 self.__bus.register_start_engine(data[DATA_LANG], data[DATA_NAME])
-            except Exception, e:
+            except Exception as e:
                 dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
                         buttons = Gtk.ButtonsType.CLOSE,
                         message_format = str(e))
@@ -413,7 +416,7 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
         else:
             try:
                 self.__bus.register_stop_engine(data[DATA_LANG], data[DATA_NAME])
-            except Exception, e:
+            except Exception as e:
                 dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
                         buttons = Gtk.ButtonsType.CLOSE,
                         message_format = str(e))
@@ -492,7 +495,7 @@ def run(self):
     try:
         locale.setlocale(locale.LC_ALL, '')
     except locale.Error:
-        print >> sys.stderr, "Using the fallback 'C' locale"
+        print("Using the fallback 'C' locale", file=sys.stderr)
         locale.setlocale(locale.LC_ALL, 'C')
 
     i18n_init()

From e2cd8f0870d8b15af71e839f9035dce333af3c4e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 27 Jan 2014 11:38:46 +0900
Subject: [PATCH 202/816] Install IBus.py in python2 gi.override.

Review URL: https://codereview.appspot.com/56510043
---
 bindings/pygobject/Makefile.am |  5 +++++
 configure.ac                   | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index fc232099a..d257b0442 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -22,6 +22,11 @@
 
 NULL =
 
+overrides2dir = $(py2overridesdir)
+overrides2_DATA =				\
+	gi/overrides/IBus.py			\
+	$(NULL)
+
 overridesdir = $(pyoverridesdir)
 overrides_PYTHON =				\
 	gi/overrides/IBus.py			\
diff --git a/configure.ac b/configure.ac
index 73d99ee15..43071bc40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,7 @@ AC_ARG_WITH(python,
 )
 
 AM_PATH_PYTHON([2.5])
+AC_PATH_PROG(PYTHON2, python2)
 
 PYGOBJECT_REQUIRED=3.0.0
 
@@ -387,10 +388,16 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
                  [enable_pygobject=yes], [enable_pygobject=no])
 
 if test "x$enable_pygobject" = "xyes"; then
-	PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
+    PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
 
-	pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
-	AC_SUBST(pyoverridesdir)
+    pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
+    AC_SUBST(pyoverridesdir)
+
+    py2overridesdir="$pyoverridesdir"
+    if test x"$PYTHON2" != x""; then
+        py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
+    fi
+    AC_SUBST(py2overridesdir)
 fi
 
 AM_CONDITIONAL(ENABLE_PYGOBJECT, test x"$enable_pygobject" = "xyes")

From a6f886a7279dd85b5b0d4caa709a222e34eaa3f7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 3 Feb 2014 11:18:24 +0900
Subject: [PATCH 203/816] Disable AC_MSG_ERROR if gsettings-schema-convert is
 not found.

Reverted 729b0aa1febccbba97286f2aceb9044d907f9ffe
data/dconf/org.freedesktop.ibus.gschema.xml.in is included in tarball
so gsettings-schema-convert is not required.

BUG=http://code.google.com/p/ibus/issues/detail?id=1650

Review URL: https://codereview.appspot.com/58870044
---
 configure.ac           | 3 ---
 data/dconf/Makefile.am | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 43071bc40..77396ce39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,9 +344,6 @@ if test x"$enable_dconf" = x"yes"; then
         [])
     # check glib-compile-schemas
     GLIB_GSETTINGS
-    AC_PATH_PROG([GSETTINGS_SCHEMA_CONVERT], [gsettings-schema-convert])
-    AS_IF([test x"$ac_cv_path_GSETTINGS_SCHEMA_CONVERT" = x""],
-          [AC_MSG_ERROR([gsettings-schema-convert from GConf2 is required for dconf support])])
     enable_dconf="yes (enabled, use --disable-dconf to disable)"
 fi
 
diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index 62c20a35c..7f0d0fd8a 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -51,7 +51,7 @@ dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
 dconfdb_DATA = 00-upstream-settings
 
 org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
-	$(AM_V_GEN) $(GSETTINGS_SCHEMA_CONVERT) --force --gconf --xml \
+	$(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
 		--schema-id "org.freedesktop.ibus" \
 		--output $@ $<
 

From 51cb6c01060bf5b41aba1317fae47204b015a5c3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 3 Feb 2014 13:07:40 +0900
Subject: [PATCH 204/816] Install pygtk2 libraries to python2 site-packages.

Review URL: https://codereview.appspot.com/58930044
---
 bindings/pygobject/Makefile.am | 13 ++++++++++++-
 configure.ac                   | 23 ++++++++++++++++-------
 ibus/Makefile.am               |  8 +++++---
 ibus/interface/Makefile.am     |  8 +++++---
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index d257b0442..53b36ef3e 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
-# Copyright (c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
 
 NULL =
 
+py2_compile = PYTHON=$(PYTHON2) $(SHELL) $(py_compile)
 overrides2dir = $(py2overridesdir)
 overrides2_DATA =				\
 	gi/overrides/IBus.py			\
@@ -52,4 +53,14 @@ EXTRA_DIST =					\
 	test-override-ibus.py                   \
 	$(NULL)
 
+install-data-hook:
+	@for data in $(overrides2_DATA); do \
+	    file=`echo $$data | sed -e 's|^.*/||'`; \
+	    dlist="$$dlist $$file"; \
+	done; \
+	$(py2_compile) --destdir "$(DESTDIR)" \
+	               --basedir "$(overrides2dir)" \
+	               $$dlist
+	$(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 77396ce39..3b2ac6222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -379,6 +379,10 @@ AC_ARG_WITH(python,
 AM_PATH_PYTHON([2.5])
 AC_PATH_PROG(PYTHON2, python2)
 
+if test x"$PYTHON2" = x""; then
+    PYTHON2=$PYTHON
+fi
+
 PYGOBJECT_REQUIRED=3.0.0
 
 PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
@@ -390,10 +394,7 @@ if test "x$enable_pygobject" = "xyes"; then
     pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
     AC_SUBST(pyoverridesdir)
 
-    py2overridesdir="$pyoverridesdir"
-    if test x"$PYTHON2" != x""; then
-        py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
-    fi
+    py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
     AC_SUBST(py2overridesdir)
 fi
 
@@ -416,6 +417,13 @@ if test x"$enable_python_library" = x"yes"; then
     AC_SUBST(PYTHON_CFLAGS)
     AC_SUBST(PYTHON_INCLUDES)
     AC_SUBST(PYTHON_LIBS)
+
+    PYTHON2_PREFIX=`$PYTHON2 -c "import sys; sys.stdout.write(sys.prefix)"`
+    PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"`
+    PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION"
+    python2dir="$PYTHON2_LIBDIR/site-packages"
+    pkgpython2dir="$python2dir/ibus"
+    AC_SUBST(pkgpython2dir)
 else
     enable_python_library="no (disabled, use --enable-python-library to enable)"
 fi
@@ -609,7 +617,8 @@ Build options:
   Build shared libs         $enable_shared
   Build static libs         $enable_static
   CFLAGS                    $CFLAGS
-  python                    $PYTHON
+  PYTHON                    $PYTHON
+  PYTHON2                   $PYTHON2
   Gtk2 immodule dir         $GTK2_IM_MODULEDIR
   Gtk3 immodule dir         $GTK3_IM_MODULEDIR
   Build gtk2 immodule       $enable_gtk2
diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index f120de13c..0ed14823f 100644
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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,8 @@ SUBDIRS = \
 	interface \
 	$(NULL)
 
+PYTHON = $(PYTHON2)
+
 ibus_PYTHON = \
 	ascii.py \
 	application.py \
@@ -56,7 +58,7 @@ nodist_ibus_PYTHON = \
 	_config.py \
 	$(NULL)
 
-ibusdir = @pkgpythondir@
+ibusdir = @pkgpython2dir@
 
 EXTRA_DIST = \
 	_config.py.in \
diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
index 6ce510b5e..443e8269f 100644
--- a/ibus/interface/Makefile.am
+++ b/ibus/interface/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 # USA
 
+PYTHON = $(PYTHON2)
+
 ibus_interface_PYTHON = \
 	iconfig.py \
 	ienginefactory.py \
@@ -31,7 +33,7 @@ ibus_interface_PYTHON = \
 	__init__.py \
 	$(NULL)
 
-ibus_interfacedir = @pkgpythondir@/interface
+ibus_interfacedir = @pkgpython2dir@/interface
 
 CLEANFILES = \
 	*.pyc \

From 5b03cc67cc8a9c5ac4b907ff7e236b303e76454a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 4 Feb 2014 14:02:26 +0900
Subject: [PATCH 205/816] Fix "RING ABOVE" key in the Finnish compose file.

Recently fi_FI compose table was updated in xorg/lib/libX11.
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=20fdccd8
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=aacf95da

BUG=rhbz#1060180

Review URL: https://codereview.appspot.com/59540043
---
 src/ibuscomposetable.h | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index ba8e3efc4..2ba3571e6 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -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) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -2006,47 +2006,49 @@ static const IBusComposeTable ibus_compose_table_el_gr = {
 
 static const guint16 ibus_compose_seqs_fi_fi[] = {
   IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
-    0, 0x00B4, /* # ACUTE ACCENT */
+    0, 0x00B4, /* U00B4  #  ACUTE ACCENT */
   IBUS_KEY_dead_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0,
-    0, 0x1EC6, /* # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+    0, 0x1EC6, /* U1EC6  #  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
   IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0,
-    0, 0x00A8, /* # DIAERESIS */
+    0, 0x00A8, /* U00A8  #  DIAERESIS */
+  IBUS_KEY_dead_abovering, IBUS_KEY_space, 0, 0,
+    0, 0x02DA, /* U02DA  #  RING ABOVE */
   IBUS_KEY_dead_hook, IBUS_KEY_dead_horn, IBUS_KEY_o, 0,
-    0, 0x1EDD, /* # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
+    0, 0x1EDD, /* U1EDD  #  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 */
+    0, 0x0110, /* U0110  #  LATIN CAPITAL LETTER D WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_G, 0, 0,
-    0, 0x01E4, /* # LATIN CAPITAL LETTER G WITH STROKE */
+    0, 0x01E4, /* U01E4  #  LATIN CAPITAL LETTER G WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_H, 0, 0,
-    0, 0x0126, /* # LATIN CAPITAL LETTER H WITH STROKE */
+    0, 0x0126, /* U0126  #  LATIN CAPITAL LETTER H WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_L, 0, 0,
-    0, 0x0141, /* # LATIN CAPITAL LETTER L WITH STROKE */
+    0, 0x0141, /* U0141  #  LATIN CAPITAL LETTER L WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_O, 0, 0,
-    0, 0x00D8, /* # LATIN CAPITAL LETTER O WITH STROKE */
+    0, 0x00D8, /* U00D8  #  LATIN CAPITAL LETTER O WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_T, 0, 0,
-    0, 0x0166, /* # LATIN CAPITAL LETTER T WITH STROKE */
+    0, 0x0166, /* U0166  #  LATIN CAPITAL LETTER T WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_d, 0, 0,
-    0, 0x0111, /* # LATIN SMALL LETTER D WITH STROKE */
+    0, 0x0111, /* U0111  #  LATIN SMALL LETTER D WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_g, 0, 0,
-    0, 0x01E5, /* # LATIN SMALL LETTER G WITH STROKE */
+    0, 0x01E5, /* U01E5  #  LATIN SMALL LETTER G WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_h, 0, 0,
-    0, 0x0127, /* # LATIN SMALL LETTER H WITH STROKE */
+    0, 0x0127, /* U0127  #  LATIN SMALL LETTER H WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_l, 0, 0,
-    0, 0x0142, /* # LATIN SMALL LETTER L WITH STROKE */
+    0, 0x0142, /* U0142  #  LATIN SMALL LETTER L WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_o, 0, 0,
-    0, 0x00F8, /* # LATIN SMALL LETTER O WITH STROKE */
+    0, 0x00F8, /* U00F8  #  LATIN SMALL LETTER O WITH STROKE */
   IBUS_KEY_dead_stroke, IBUS_KEY_t, 0, 0,
-    0, 0x0167, /* # LATIN SMALL LETTER T WITH STROKE */
+    0, 0x0167, /* U0167  #  LATIN SMALL LETTER T WITH STROKE */
   IBUS_KEY_dead_belowcomma, IBUS_KEY_S, 0, 0,
-    0, 0x0218, /* # LATIN CAPITAL LETTER S WITH COMMA BELOW */
+    0, 0x0218, /* U0218  #  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 */
+    0, 0x021A, /* U021A  #  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 */
+    0, 0x0219, /* U0219  #  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 */
+    0, 0x021B, /* U021B  #  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 */
+    0, 0x0149  /* U0149  #  LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
 };
 
 static const IBusComposeTable ibus_compose_table_fi_fi = {

From c5d86760da26cbce469b3ca4ed48fb6159613251 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 10 Feb 2014 11:55:57 +0900
Subject: [PATCH 206/816] Fix to show Property Panel when the mode is auto
 hide.

Property panel sometimes is not shown when the mode is auto hide and
focus is changed between existent windows.
It's a timing issue of PropertyPanel.set_properties().

Review URL: https://codereview.appspot.com/54300049
---
 ui/gtk3/propertypanel.vala | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 64b509208..9ea6bad69 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -2,9 +2,9 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2013 Red Hat, Inc.
- * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2013-2014 Red Hat, Inc.
+ * Copyright(c) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -56,6 +56,8 @@ public class PropertyPanel : Gtk.Box {
     }
 
     public void set_properties(IBus.PropList props) {
+        debug("set_properties()\n");
+
         foreach (var item in m_items)
             (item as Gtk.Widget).destroy();
         m_items = {};
@@ -63,6 +65,20 @@ public class PropertyPanel : Gtk.Box {
         m_props = props;
 
         create_menu_items();
+
+        /* show_with_auto_hide_timer() needs to call here because
+         * if the event order is, focus_in(), set_cursor_location() and
+         * set_properties(), m_items.length can be 0 when
+         * set_cursor_location() is called and Property Panel is not shown.
+         *
+         * If all windows are closed, desktop background is focused and
+         * focus_in() and set_properties() are called but
+         * set_cursor_location() is not called.
+         * Then we should not show Property panel when m_cursor_location
+         * is (-1, -1) because of no windows.
+         */
+        if (m_cursor_location.x != -1 && m_cursor_location.y != -1)
+            show_with_auto_hide_timer();
     }
 
     public void update_property(IBus.Property prop) {
@@ -77,7 +93,8 @@ public class PropertyPanel : Gtk.Box {
         foreach (var item in m_items)
             item.update_property(prop);
 
-        show_with_auto_hide_timer();
+        if (m_cursor_location.x != -1 && m_cursor_location.y != -1)
+            show_with_auto_hide_timer();
     }
 
     public void set_cursor_location(int x, int y, int width, int height) {

From 644a749ec444fcccff7dc5c0dff04c567dc0433c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 12 Feb 2014 12:48:46 +0900
Subject: [PATCH 207/816] Do not let property panel follow cursor when it's
 always shown.

Review URL: https://codereview.appspot.com/60560043
---
 data/ibus.schemas.in       | 13 +++++
 po/POTFILES.in             |  1 +
 po/POTFILES.skip           |  1 +
 ui/gtk3/panel.vala         | 17 ++++++-
 ui/gtk3/propertypanel.vala | 98 ++++++++++++++++++++++++++++++++++++--
 5 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index d256cbb1b..ca4a0e295 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -200,6 +200,19 @@
       </locale>
     </schema>
     -->
+    <schema>
+      <key>/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown</key>
+      <applyto>/desktop/ibus/panel/follow-input-cursor-when-always-shown</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Follow the input cursor in case the panel is always shown</short>
+          <long>If true, the panel follows the input cursor in case the
+                panel is always shown. If false, the panel is shown at
+                a fixed location.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/auto-hide-timeout</key>
       <applyto>/desktop/ibus/panel/auto-hide-timeout</applyto>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29b3b7604..1c2ab0be9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -60,5 +60,6 @@ ui/gtk3/keybindingmanager.vala
 ui/gtk3/panel.vala
 ui/gtk3/pango.vala
 ui/gtk3/property.vala
+ui/gtk3/propertypanel.vala
 ui/gtk3/separator.vala
 ui/gtk3/switcher.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 870823152..1d1229340 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,5 +17,6 @@ ui/gtk3/keybindingmanager.c
 ui/gtk3/panel.c
 ui/gtk3/pango.c
 ui/gtk3/property.c
+ui/gtk3/propertypanel.c
 ui/gtk3/separator.c
 ui/gtk3/switcher.c
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index a7a0c409f..aecaae8d5 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -166,6 +166,11 @@ class Panel : IBus.PanelService {
         m_settings_panel.changed["timeout"].connect((key) => {
                 set_timeout_property_panel();
         });
+
+        m_settings_panel.changed["follow-input-cursor-when-always-shown"]
+            .connect((key) => {
+                set_follow_input_cursor_when_always_shown_property_panel();
+        });
     }
 
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
@@ -361,6 +366,15 @@ class Panel : IBus.PanelService {
                 (uint) m_settings_panel.get_int("auto-hide-timeout"));
     }
 
+    private void set_follow_input_cursor_when_always_shown_property_panel() {
+        if (m_property_panel == null)
+            return;
+
+        m_property_panel.set_follow_input_cursor_when_always_shown(
+                m_settings_panel.get_boolean(
+                        "follow-input-cursor-when-always-shown"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -459,6 +473,7 @@ class Panel : IBus.PanelService {
         set_lookup_table_orientation();
         set_show_property_panel();
         set_timeout_property_panel();
+        set_follow_input_cursor_when_always_shown_property_panel();
 
         set_version();
     }
diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 9ea6bad69..e6a192f99 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -37,6 +37,7 @@ public class PropertyPanel : Gtk.Box {
     private int m_show = PanelShow.AUTO_HIDE;
     private uint m_auto_hide_timeout = 10000;
     private uint m_auto_hide_timeout_id = 0;
+    private bool m_follow_input_cursor_when_always_shown = false;
 
     public PropertyPanel() {
         /* Chain up base class constructor */
@@ -53,6 +54,16 @@ public class PropertyPanel : Gtk.Box {
         pack_start(handle, false, false, 0);
 
         m_toplevel.add(this);
+
+        m_toplevel.size_allocate.connect((w, a) => {
+            if (!m_follow_input_cursor_when_always_shown &&
+                m_show == PanelShow.ALWAYS && m_items.length > 0 &&
+                m_cursor_location.x == -1 && m_cursor_location.y == -1) {
+                set_default_location();
+                m_cursor_location.x = 0;
+                m_cursor_location.y = 0;
+            }
+        });
     }
 
     public void set_properties(IBus.PropList props) {
@@ -98,6 +109,10 @@ public class PropertyPanel : Gtk.Box {
     }
 
     public void set_cursor_location(int x, int y, int width, int height) {
+        if (!m_follow_input_cursor_when_always_shown &&
+            m_show == PanelShow.ALWAYS)
+            return;
+
         /* FIXME: set_cursor_location() has a different behavior
          * in embedded preedit by applications.
          * GtkTextView applications, e.g. gedit, always call
@@ -173,7 +188,9 @@ public class PropertyPanel : Gtk.Box {
     }
 
     public new void show() {
-        if (m_show == PanelShow.DO_NOT_SHOW || m_items.length == 0) {
+        /* m_items.length is not checked here because set_properties()
+         * is not called yet when set_show() is called. */
+        if (m_show == PanelShow.DO_NOT_SHOW) {
             m_toplevel.hide();
             return;
         }
@@ -200,7 +217,9 @@ public class PropertyPanel : Gtk.Box {
          * focus is changed.
          * E.g. Two tabs on gnome-terminal can keep the cursor position.
          */
-        m_cursor_location = { -1, -1, 0, 0 };
+        if (m_follow_input_cursor_when_always_shown ||
+            m_show != PanelShow.ALWAYS)
+            m_cursor_location = { -1, -1, 0, 0 };
 
        /* set_cursor_location() will be called later. */
     }
@@ -214,6 +233,10 @@ public class PropertyPanel : Gtk.Box {
         m_auto_hide_timeout = timeout;
     }
 
+    public void set_follow_input_cursor_when_always_shown(bool is_follow) {
+        m_follow_input_cursor_when_always_shown = is_follow;
+    }
+
     public override void get_preferred_width(out int minimum_width,
                                              out int natural_width) {
         base.get_preferred_width(out minimum_width, out natural_width);
@@ -297,9 +320,78 @@ public class PropertyPanel : Gtk.Box {
         move(x, y);
     }
 
+    private void set_default_location() {
+        Gtk.Allocation allocation;
+        m_toplevel.get_allocation(out allocation);
+
+        unowned Gdk.Window root = Gdk.get_default_root_window();
+        int root_width = root.get_width();
+        int root_x = 0;
+        int root_y = 0;
+        int ws_num = 0;
+
+        unowned Gdk.Display display = root.get_display();
+        unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
+        X.Window xwindow = Gdk.X11Window.get_xid(root);
+
+        X.Atom _net_current_desktop =
+                xdisplay.intern_atom("_NET_CURRENT_DESKTOP", false);
+        X.Atom type = X.None;
+        int format;
+        ulong nitems = 0;
+        ulong bytes_after;
+        void *prop;
+        xdisplay.get_window_property(xwindow,
+                                     _net_current_desktop,
+                                     0, 32, false, X.XA_CARDINAL,
+                                     out type, out format,
+                                     out nitems, out bytes_after,
+                                     out prop);
+
+        if (type != X.None && nitems >= 1)
+            ws_num = (int) ((ulong *)prop)[0];
+
+        X.Atom _net_workarea =
+                xdisplay.intern_atom("_NET_WORKAREA", false);
+        type = X.None;
+        nitems = 0;
+
+        xdisplay.get_window_property(xwindow,
+                                     _net_workarea,
+                                     0, 32, false, X.XA_CARDINAL,
+                                     out type, out format,
+                                     out nitems, out bytes_after,
+                                     out prop);
+
+        if (type != X.None && nitems >= 2) {
+            root_x = (int) ((ulong *)prop)[ws_num * 4];
+            root_y = (int) ((ulong *)prop)[ws_num * 4 + 1];
+        }
+
+        int x, y;
+        /* Translators: If your locale is RTL, the msgstr is "default:RTL".
+         * Otherwise the msgstr is "default:LTR". */
+        if (_("default:LTR") != "default:RTL") {
+            x = root_width - allocation.width;
+            y = root_y;
+        } else {
+            x = root_x;
+            y = root_y;
+        }
+
+        move(x, y);
+    }
+
     private void show_with_auto_hide_timer() {
-        if (m_show != PanelShow.AUTO_HIDE || m_items.length == 0)
+        if (m_items.length == 0) {
+            m_toplevel.hide();
+            return;
+        }
+
+        if (m_show != PanelShow.AUTO_HIDE) {
+            show();
             return;
+        }
 
         if (m_auto_hide_timeout_id != 0)
             GLib.Source.remove(m_auto_hide_timeout_id);

From 02f18ee424e14cbe592fbb293097fd8a7f0f0324 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Feb 2014 11:52:39 +0900
Subject: [PATCH 208/816] Fix deprecated GtkHBox, GtkVBox and GtkStock since
 GTK+ 3.10.

Review URL: https://codereview.appspot.com/63750043
---
 setup/setup.ui                 | 72 ++++++++++++++++++++--------------
 ui/gtk3/candidatearea.vala     | 14 +++----
 ui/gtk3/candidatepanel.vala    |  5 ++-
 ui/gtk3/iconwidget.vala        | 12 +-----
 ui/gtk3/keybindingmanager.vala |  3 +-
 ui/gtk3/panel.vala             | 17 +++-----
 ui/gtk3/property.vala          | 11 +-----
 ui/gtk3/separator.vala         |  8 ++--
 8 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index 65dcee445..ec207d2ee 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -63,7 +63,8 @@
     <property name="window_position">center-always</property>
     <property name="icon_name">ibus-setup</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
@@ -80,7 +81,8 @@
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox5">
+                  <object class="GtkBox" id="vbox5">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">18</property>
@@ -136,7 +138,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox4">
+                                  <object class="GtkBox" id="hbox4">
+                                    <property name="orientation">horizontal</property>
                                     <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -176,7 +179,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox5">
+                                  <object class="GtkBox" id="hbox5">
+                                    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -218,7 +222,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox6">
+                                  <object class="GtkBox" id="hbox6">
+                                    <property name="orientation">horizontal</property>
                                     <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -289,7 +294,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox2">
+                                  <object class="GtkBox" id="hbox2">
+                                    <property name="orientation">horizontal</property>
                                     <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -345,7 +351,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox3">
+                                  <object class="GtkBox" id="hbox3">
+                                    <property name="orientation">horizontal</property>
                                     <property name="no_show_all">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -665,7 +672,8 @@
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -677,7 +685,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkVBox" id="vbox3">
+                              <object class="GtkBox" id="vbox3">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
@@ -739,7 +748,8 @@
                                 <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="button_engine_add">
-                                    <property name="label">gtk-add</property>
+                                    <property name="label" translatable="yes">_Add</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
@@ -747,7 +757,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Add the selected input method into the enabled input methods</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -757,7 +766,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_engine_remove">
-                                    <property name="label">gtk-remove</property>
+                                    <property name="label" translatable="yes">_Remove</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
@@ -765,7 +775,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Remove the selected input method from the enabled input methods</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -775,7 +784,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_engine_up">
-                                    <property name="label">gtk-go-up</property>
+                                    <property name="label" translatable="yes">_Up</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
@@ -783,7 +793,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Move up the selected input method in the enabled input methods list</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -793,7 +802,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_engine_down">
-                                    <property name="label">gtk-go-down</property>
+                                    <property name="label" translatable="yes">_Down</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
@@ -801,7 +811,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Move down the selected input method in the enabled input methods</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -811,7 +820,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_engine_about">
-                                    <property name="label">gtk-about</property>
+                                    <property name="label" translatable="yes">_About</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
@@ -819,7 +829,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Show information of the selected input method</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -829,7 +838,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_engine_preferences">
-                                    <property name="label">gtk-preferences</property>
+                                    <property name="label" translatable="yes">_Preferences</property>
+                                    <property name="use_underline">True</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="sensitive">False</property>
@@ -837,7 +847,6 @@
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Show setup of the selected input method</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="use_stock">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -867,7 +876,8 @@
                         <property name="can_focus">False</property>
                         <property name="top_padding">6</property>
                         <child>
-                          <object class="GtkHBox" id="hbox8">
+                          <object class="GtkBox" id="hbox8">
+                            <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
@@ -875,7 +885,7 @@
                               <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-info</property>
+                                <property name="icon-name">dialog-information</property>
                                 <property name="icon-size">2</property>
                               </object>
                               <packing>
@@ -935,7 +945,8 @@
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox7">
+                  <object class="GtkBox" id="vbox7">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -956,7 +967,8 @@
                                 <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox8">
+                                  <object class="GtkBox" id="vbox8">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -1017,7 +1029,8 @@
                                 <property name="top_padding">6</property>
                                 <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox9">
+                                  <object class="GtkBox" id="vbox9">
+                                    <property name="orientation">vertical</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="spacing">6</property>
@@ -1078,7 +1091,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox4">
+              <object class="GtkBox" id="vbox4">
+                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <child>
@@ -1177,13 +1191,13 @@ Homepage: http://code.google.com/p/ibus
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
+                <property name="use_underline">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 066b26ccc..b9f500cfc 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,13 +36,13 @@ class CandidateArea : Gtk.Box {
     };
 
     private const string PREV_PAGE_ICONS[] = {
-        Gtk.Stock.GO_BACK,
-        Gtk.Stock.GO_UP
+        "go-previous",
+        "go-up"
     };
 
     private const string NEXT_PAGE_ICONS[] = {
-        Gtk.Stock.GO_FORWARD,
-        Gtk.Stock.GO_DOWN
+        "go-next",
+        "go-down"
     };
 
     public signal void candidate_clicked(uint index, uint button, uint state);
@@ -139,14 +139,14 @@ class CandidateArea : Gtk.Box {
 
         Gtk.Button prev_button = new Gtk.Button();
         prev_button.clicked.connect((b) => page_up());
-        prev_button.set_image(new Gtk.Image.from_stock(
+        prev_button.set_image(new Gtk.Image.from_icon_name(
                                   PREV_PAGE_ICONS[orientation],
                                   Gtk.IconSize.MENU));
         prev_button.set_relief(Gtk.ReliefStyle.NONE);
 
         Gtk.Button next_button = new Gtk.Button();
         next_button.clicked.connect((b) => page_down());
-        next_button.set_image(new Gtk.Image.from_stock(
+        next_button.set_image(new Gtk.Image.from_icon_name(
                                   NEXT_PAGE_ICONS[orientation],
                                   Gtk.IconSize.MENU));
         next_button.set_relief(Gtk.ReliefStyle.NONE);
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 396c78a0a..e22135b14 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
  * USA
  */
 
-public class CandidatePanel : Gtk.HBox{
+public class CandidatePanel : Gtk.Box{
     private bool m_vertical = true;
     private Gtk.Window m_toplevel;
     private Gtk.Box m_vbox;
@@ -44,6 +44,7 @@ public class CandidatePanel : Gtk.HBox{
         // Call base class constructor
         GLib.Object(
             name : "IBusCandidate",
+            orientation: Gtk.Orientation.HORIZONTAL,
             visible: true
         );
 
diff --git a/ui/gtk3/iconwidget.vala b/ui/gtk3/iconwidget.vala
index fbb9e3cb7..d322650c7 100644
--- a/ui/gtk3/iconwidget.vala
+++ b/ui/gtk3/iconwidget.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,15 +46,7 @@ class IconWidget: Gtk.Image {
                 var theme = Gtk.IconTheme.get_default();
                 pixbuf = theme.load_icon("ibus-engine", fixed_width, 0);
             } catch (GLib.Error e) {
-                /* "gtk-missing-image.png" is the symlink of
-                 * "image-missing.png" and included in
-                 * gnome-icon-theme-legacy package in fedora.
-                 * gtk_image_set_from_stock() can fallback the stock name
-                 * to the real name instead of gtk_image_set_from_icon_name()
-                 * or gtk_icon_theme_load_icon() and
-                 * could remove gnome-icon-theme-legacy.
-                 */
-                set_from_stock(Gtk.Stock.MISSING_IMAGE, size);
+                set_from_icon_name("image-missing", size);
                 return;
             }
         }
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 12d731ded..4f5f0da44 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -152,8 +152,9 @@ public class KeybindingManager : GLib.Object {
         else
             pointer = device;
 
+        double[] axes = null;
         uint modifier = 0;
-        pointer.get_state(keyevent.window, null, out modifier);
+        pointer.get_state(keyevent.window, axes, out modifier);
         if ((primary_modifier & modifier) == primary_modifier)
             return true;
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index aecaae8d5..8cca3a7c7 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -726,25 +726,24 @@ class Panel : IBus.PanelService {
                                            uint activate_time) {
         // Show system menu
         if (m_sys_menu == null) {
-            Gtk.ImageMenuItem item;
+            Gtk.MenuItem item;
             m_sys_menu = new Gtk.Menu();
 
-            item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.PREFERENCES, null);
+            item = new Gtk.MenuItem.with_label(_("Preferences"));
             item.activate.connect((i) => show_setup_dialog());
             m_sys_menu.append(item);
 
-            item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.ABOUT, null);
+            item = new Gtk.MenuItem.with_label(_("About"));
             item.activate.connect((i) => show_about_dialog());
             m_sys_menu.append(item);
 
             m_sys_menu.append(new Gtk.SeparatorMenuItem());
 
-            item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.REFRESH, null);
-            item.set_label(_("Restart"));
+            item = new Gtk.MenuItem.with_label(_("Restart"));
             item.activate.connect((i) => m_bus.exit(true));
             m_sys_menu.append(item);
 
-            item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.QUIT, null);
+            item = new Gtk.MenuItem.with_label(_("Quit"));
             item.activate.connect((i) => m_bus.exit(false));
             m_sys_menu.append(item);
 
@@ -770,12 +769,8 @@ class Panel : IBus.PanelService {
         foreach (var engine in m_engines) {
             var language = engine.get_language();
             var longname = engine.get_longname();
-            var item = new Gtk.ImageMenuItem.with_label(
+            var item = new Gtk.MenuItem.with_label(
                 "%s - %s".printf (IBus.get_language_name(language), longname));
-            if (engine.get_icon() != "") {
-                var icon = new IconWidget(engine.get_icon(), Gtk.IconSize.MENU);
-                 item.set_image(icon);
-            }
             // Make a copy of engine to workaround a bug in vala.
             // https://bugzilla.gnome.org/show_bug.cgi?id=628336
             var e = engine;
diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index 0ce93cd80..aef880f10 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -100,7 +100,7 @@ public interface IPropItem : GLib.Object {
     public signal void property_activate(string key, int state);
 }
 
-public class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
+public class PropImageMenuItem : Gtk.MenuItem, IPropItem {
     private IBus.Property m_property;
     public PropImageMenuItem(IBus.Property property) {
         assert(property != null);
@@ -115,7 +115,6 @@ public class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
             return;
 
         m_property.set_label(property.get_label());
-        m_property.set_icon(property.get_icon());
         m_property.set_visible(property.get_visible());
         m_property.set_sensitive(property.get_sensitive());
         m_property.set_tooltip(property.get_tooltip());
@@ -125,16 +124,10 @@ public class PropImageMenuItem : Gtk.ImageMenuItem, IPropItem {
 
     private void sync() {
         set_label(m_property.get_label().get_text());
-        if (m_property.get_icon() != "")
-            set_icon(m_property.get_icon());
         set_visible(m_property.get_visible());
         set_sensitive(m_property.get_sensitive());
     }
 
-    private void set_icon(string icon) {
-        set_image(new IconWidget(icon, Gtk.IconSize.MENU));
-    }
-
     public override void activate() {
         property_activate(m_property.get_key(), m_property.get_state());
     }
diff --git a/ui/gtk3/separator.vala b/ui/gtk3/separator.vala
index a8b23b8ea..b5ff5471a 100644
--- a/ui/gtk3/separator.vala
+++ b/ui/gtk3/separator.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,17 +20,19 @@
  * USA
  */
 
-class HSeparator : Gtk.HSeparator {
+class HSeparator : Gtk.Separator {
     public HSeparator() {
         GLib.Object(
+            orientation : Gtk.Orientation.HORIZONTAL,
             margin : 2
         );
     }
 }
 
-class VSeparator : Gtk.VSeparator {
+class VSeparator : Gtk.Separator {
     public VSeparator() {
         GLib.Object(
+            orientation : Gtk.Orientation.VERTICAL,
             margin : 2
         );
     }

From 5c25f8c6218847f56829338479d4f1af866fa6f2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Feb 2014 15:07:35 +0900
Subject: [PATCH 209/816] Fix deprecated GtkStock in ibus-setup

Review URL: https://codereview.appspot.com/65300043
---
 setup/engineabout.py      | 19 ++++++++++++-------
 setup/keyboardshortcut.py | 24 ++++++++++++++----------
 setup/main.py             |  4 ++--
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/setup/engineabout.py b/setup/engineabout.py
index 897ca69bb..50ab001b7 100644
--- a/setup/engineabout.py
+++ b/setup/engineabout.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -33,7 +33,7 @@ def __init__(self, enginedesc):
         self.__engine_desc = enginedesc
         super(EngineAbout, self).__init__(_("About"), None,
                 Gtk.DialogFlags.MODAL,
-                (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
+                (_("_Close"), Gtk.ResponseType.CLOSE))
 
         self.__init_ui()
 
@@ -99,14 +99,19 @@ def __create_tags(self, text_buffer):
         text_buffer.create_tag("left_margin_32",
                         left_margin=32)
 
-    def __load_icon(self, icon):
+    def __load_icon(self, icon_name):
         try:
-            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(icon, 48, 48, True)
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(icon_name,
+                                                             48,
+                                                             48,
+                                                             True)
         except:
             theme = Gtk.IconTheme.get_default()
-            icon = theme.lookup_icon("ibus-engine", 48, 0)
+            icon = theme.lookup_icon(icon_name, 48, 0)
             if icon == None:
-                icon = theme.lookup_icon(Gtk.STOCK_MISSING_IMAGE, 48, 0)
+                icon = theme.lookup_icon("ibus-engine", 48, 0)
+            if icon == None:
+                icon = theme.lookup_icon("image-missing", 48, 0)
             pixbuf = icon.load_icon()
         return pixbuf
 
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 26bd77fcb..d82fea864 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -35,9 +35,10 @@
 
 MAX_HOTKEY = 6
 
-class KeyboardShortcutSelection(Gtk.VBox):
+class KeyboardShortcutSelection(Gtk.Box):
     def __init__(self, shortcuts = None):
-        super(KeyboardShortcutSelection, self).__init__()
+        super(KeyboardShortcutSelection, self).__init__(
+                orientation=Gtk.Orientation.VERTICAL)
         self.__init_ui()
         self.set_shortcuts(shortcuts)
 
@@ -61,7 +62,7 @@ def __init_ui(self):
         self.pack_start(scrolledwindow, True, True, 4)
 
         # key code
-        hbox = Gtk.HBox()
+        hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         label = Gtk.Label(_("Key code:"))
         label.set_justify(Gtk.Justification.LEFT)
         label.set_alignment(0.0, 0.5)
@@ -76,7 +77,7 @@ def __init_ui(self):
         self.pack_start(hbox, False, True, 4)
 
         # modifiers
-        hbox = Gtk.HBox()
+        hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         label = Gtk.Label(_("Modifiers:"))
         label.set_justify(Gtk.Justification.LEFT)
         label.set_alignment(0.0, 0.5)
@@ -121,19 +122,22 @@ def __init_ui(self):
         self.pack_start(hbox, False, True, 4)
 
         # buttons
-        hbox = Gtk.HBox()
+        hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         # add button
-        self.__add_button = Gtk.Button(stock = Gtk.STOCK_ADD)
+        self.__add_button = Gtk.Button(label = _("_Add"),
+                                       use_underline = True)
         self.__add_button.set_sensitive(False)
         self.__add_button.connect("clicked", self.__add_button_clicked_cb)
         hbox.pack_start(self.__add_button, False, True, 0)
         # apply button
-        self.__apply_button = Gtk.Button(stock = Gtk.STOCK_APPLY)
+        self.__apply_button = Gtk.Button(label = _("_Apply"),
+                                         use_underline = True)
         self.__apply_button.set_sensitive(False)
         self.__apply_button.connect("clicked", self.__apply_button_clicked_cb)
         hbox.pack_start(self.__apply_button, False, True, 0)
         # delete button
-        self.__delete_button = Gtk.Button(stock = Gtk.STOCK_DELETE)
+        self.__delete_button = Gtk.Button(label = _("_Delete"),
+                                          use_underline = True)
         self.__delete_button.set_sensitive(False)
         self.__delete_button.connect("clicked", self.__delete_button_clicked_cb)
         hbox.pack_start(self.__delete_button, False, True, 0)
@@ -331,8 +335,8 @@ def get_shortcuts(self):
 if __name__ == "__main__":
     dlg = KeyboardShortcutSelectionDialog(
         title = "Select test",
-        buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                   Gtk.STOCK_OK, Gtk.ResponseType.OK))
+        buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
+                   _("_OK"), Gtk.ResponseType.OK))
     dlg.add_shortcut("Control+Shift+space")
     dlg.set_shortcuts(None)
     print((dlg.run()))
diff --git a/setup/main.py b/setup/main.py
index cac10dec9..699ba0e8b 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -371,8 +371,8 @@ def __init_bus(self):
             sys.exit(0)
 
     def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
-        buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OK, Gtk.ResponseType.OK)
+        buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
+                   _("_OK"), Gtk.ResponseType.OK)
         title = _("Select keyboard shortcut for %s") % \
                 _("switching input methods")
         dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)

From d5319e4f3ed5318e20a4a1556af657fd75792eeb Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Feb 2014 18:01:25 +0900
Subject: [PATCH 210/816] Update translations.

Merged GTK+ translations.

Review URL: https://codereview.appspot.com/50490045
---
 po/LINGUAS     |   2 +
 po/ar.po       | 564 ++++++++++++++++++++++++-----------------
 po/as.po       | 246 ++++++++++++------
 po/bg.po       | 389 +++++++++++++++++++---------
 po/bn.po       | 246 ++++++++++++------
 po/bn_IN.po    | 245 ++++++++++++------
 po/ca.po       | 551 ++++++++++++++++++++++++----------------
 po/da.po       | 244 ++++++++++++------
 po/de.po       | 245 ++++++++++++------
 po/en_GB.po    | 513 +++++++++++++++++++++++--------------
 po/es.po       | 250 +++++++++++-------
 po/et.po       | 380 +++++++++++++++++++---------
 po/eu.po       | 373 ++++++++++++++++++---------
 po/fa.po       | 458 +++++++++++++++++++++++----------
 po/fr.po       | 209 ++++++++++-----
 po/gu.po       | 249 +++++++++++-------
 po/he.po       | 673 +++++++++++++++++++++++++++++++++++++++++++++++++
 po/hi.po       | 357 ++++++++++++++++++--------
 po/hu.po       | 355 ++++++++++++++++++--------
 po/ia.po       | 355 ++++++++++++++++++--------
 po/it.po       | 358 ++++++++++++++++++--------
 po/ja.po       | 328 +++++++++++++++---------
 po/kn.po       | 362 +++++++++++++++-----------
 po/ko.po       | 243 ++++++++++++------
 po/lv.po       | 529 +++++++++++++++++++++++---------------
 po/ml.po       | 244 ++++++++++++------
 po/mr.po       | 244 ++++++++++++------
 po/nb.po       | 375 ++++++++++++++++++---------
 po/nl.po       | 211 +++++++++++-----
 po/or.po       | 244 ++++++++++++------
 po/pa.po       | 246 ++++++++++++------
 po/pl.po       | 211 +++++++++++-----
 po/pt_BR.po    | 355 ++++++++++++++++++--------
 po/ru.po       | 257 ++++++++++++-------
 po/sr.po       | 613 ++++++++++++++++++++++++--------------------
 po/sr@latin.po | 613 ++++++++++++++++++++++++--------------------
 po/ta.po       | 244 ++++++++++++------
 po/te.po       | 406 +++++++++++++++++------------
 po/tg.po       | 437 +++++++++++++++++++++++---------
 po/uk.po       | 211 +++++++++++-----
 po/ur.po       | 637 ++++++++++++++++++++++++++++++++++++++++++++++
 po/vi.po       | 541 ++++++++++++++++++++++++---------------
 po/zh_CN.po    | 245 ++++++++++++------
 po/zh_HK.po    | 535 ++++++++++++++++++++++++---------------
 po/zh_TW.po    | 248 +++++++++++-------
 45 files changed, 10721 insertions(+), 5120 deletions(-)
 create mode 100644 po/he.po
 create mode 100644 po/ur.po

diff --git a/po/LINGUAS b/po/LINGUAS
index cfa9bd058..d57590798 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -13,6 +13,7 @@ eu
 fa
 fr
 gu
+he
 hi
 hu
 ia
@@ -36,6 +37,7 @@ ta
 te
 tg
 uk
+ur
 vi
 zh_CN
 zh_HK
diff --git a/po/ar.po b/po/ar.po
index dee26d1dc..1a49f4cff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,68 +1,63 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# translation of ibus.pot to Arabic
+# Arabic translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
 #
+# Translators:
+# Muayyad Alsadi <alsadi@ojuba.org>, 2009
 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: 2009-04-06 11:45+0800\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Muayyad Alsadi <alsadi@ojuba.org>\n"
 "Language-Team: Arabic <AR@li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../setup/setup.ui.h:1
-#, fuzzy
 msgid "Horizontal"
 msgstr ""
-"أفقي\n"
-"عمودي"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
 msgstr ""
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
+msgid "Top left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:4
-#, fuzzy
-msgid "When active"
+msgid "Top right corner"
 msgstr ""
-"أبدا\n"
-"عند التفعيل\n"
-"دائما"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
+msgid "Bottom left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
+msgid "Bottom right corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
+msgid "Custom"
 msgstr ""
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
-#, fuzzy
-msgid "Custom"
-msgstr "خط مخصص:"
+msgid "Always"
+msgstr ""
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
@@ -88,7 +83,7 @@ msgstr "طريقة الإدخال السابقة"
 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 ""
 
@@ -121,27 +116,24 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "إظهار لوحة اللغات:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
-#, fuzzy
 msgid "Language panel position:"
-msgstr "إظهار لوحة اللغات:"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
-#, fuzzy
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
-msgstr "اسم الخط المخصص للوحة اللغة"
+msgstr ""
 
 #: ../setup/setup.ui.h:29
-#, fuzzy
 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"
@@ -152,9 +144,8 @@ msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
 #: ../setup/setup.ui.h:32
-#, fuzzy
 msgid "Use custom font:"
-msgstr "استعمال خط مخصص"
+msgstr ""
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -164,69 +155,92 @@ msgstr "<b>الخط والتنسيق</b>"
 msgid "General"
 msgstr "عام"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "أ_ضف"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "ا_حذِف"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ف_وق"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "أ_سفل"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_عنْ"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_التفضيلات"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "طرق الإدخال"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
-#, fuzzy
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr "طرق الإدخال"
+msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
-#, fuzzy
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>اختصارات لوحة المفاتيح</b>"
+msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "اختر طريقة الإدخال"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -234,49 +248,31 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ناقل الإدخال الذكي</small>\n"
-"الموقع: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>ناقل الإدخال الذكي</small>\nالموقع: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "بدء ibus عند الولوج"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>البدء</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "حول"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "إطار إطرق الإدخال IBUS"
-
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "إطار إطرق الإدخال IBUS"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "أ_غلق"
 
 #: ../data/ibus.schemas.in.h:1
-#, fuzzy
 msgid "Preload engines"
-msgstr "المحركات المحملة مسبقا"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:2
-#, fuzzy
 msgid "Preload engines during ibus starts up"
-msgstr "المحركات المحملة مسبقا عند بدء ibus"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
@@ -287,125 +283,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-#, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "مفتاح الزناد"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
-msgid "Enable shortcut keys"
-msgstr "مفتاح الزناد"
+msgid "Saved version number"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-msgid "The shortcut keys for turning input method on"
+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
-#, fuzzy
+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 "مفتاح الزناد"
+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
-#, fuzzy
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr "مفتاح المحرك التالي"
+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
-#, fuzzy
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
-msgstr "مفتاح المحرك السابق"
+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
-#, fuzzy
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
-msgstr "اخفاء تلقائي"
+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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-#, fuzzy
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
-msgstr "إظهار لوحة اللغات:"
+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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-#, fuzzy
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
-msgstr "اسم الخط المخصص للوحة اللغة"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "استعمال خط مخصص"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "استخدم خط مخصص في لوحة اللغة"
 
-#: ../data/ibus.schemas.in.h:28
-#, fuzzy
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr "خط مخصص:"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "اسم الخط المخصص للوحة اللغة"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
-#, fuzzy
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr "اختر طريقة الإدخال"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
-#, fuzzy
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "طريقة الإدخال التالية"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -419,177 +449,245 @@ msgstr ""
 msgid "Other"
 msgstr "أخرى"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:70
-#, fuzzy, python-format
+#: ../setup/engineabout.py:71
+#, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "اختصارات لوحة المفاتيح"
+msgstr ""
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr ""
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "اختر طريقة الإدخال"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr ""
 
 #: ../setup/ibus-setup.desktop.in.h:2
-#, fuzzy
 msgid "Set IBus Preferences"
-msgstr "تفضيلات IBus"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "كود المفتاح"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_طبّق"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "ا_حذف"
+
+#: ../setup/keyboardshortcut.py:254
 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:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "فضلا اضغط مفتاح أو عدة مفاتيح"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "زناد"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "أل_غِ"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_نعم"
 
-#: ../setup/main.py:81
-msgid "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "خادم IBUS لم يبدأ من قبل. هل تريد تشغيله الآن؟"
+msgstr ""
 
-#: ../setup/main.py:344
+#: ../setup/main.py:350
 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 ""
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "اختر الاختصار ل %s"
 
-#: ../ui/gtk3/panel.vala:330
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "نظام IBus هو ناقل إدخال ذكي لنظام لينكس ويونكس."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "إعادة تشغيل"
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Previous page"
-#~ msgstr "طريقة الإدخال السابقة"
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Restart Now"
-#~ msgstr "إعادة تشغيل"
+#: ../tools/main.vala:160
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Later"
-#~ msgstr "أخرى"
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "إطار إطرق الإدخال IBUS"
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Turn off input method"
-#~ msgstr "لا يوجد طريقة إدخال"
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "تبديل طريقة الإدخال"
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "About the Input Method"
-#~ msgstr "طرق الإدخال"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#~ msgid "next input method"
-#~ msgstr "طريقة الإدخال التالية"
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#~ msgid "previous input method"
-#~ msgstr "طريقة الإدخال السابقة"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use global engine"
-#~ msgstr "المحركات المحملة مسبقا"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Langauge panel position"
-#~ msgstr "إظهار لوحة اللغات:"
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#~ msgid "Custom font:"
-#~ msgstr "خط مخصص:"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Font for language bar and candidates"
-#~ msgstr "اسم الخط المخصص للوحة اللغة"
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use custom font for language bar and candidates"
-#~ msgstr "استخدم خط مخصص في لوحة اللغة"
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#~ msgid "Custom Font"
-#~ msgstr "خط مخصص"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show IM name on language bar"
-#~ msgstr "اسم الخط المخصص للوحة اللغة"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "Use Custom Font"
-#~ msgstr "استخدم خط مخصص"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "نظام IBus هو ناقل إدخال ذكي لنظام لينكس ويونكس."
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "التفضيلات"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "إعادة تشغيل"
 
-#~ msgid "Trigger hotkey for enable or disable input context"
-#~ msgstr "مفتاح الزناد لتفعيل وتثبيط سياق الإدخال"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "أنهِ"
 
-#~ msgid "[Control+space]"
-#~ msgstr "[Control+space]"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:RTL"
diff --git a/po/as.po b/po/as.po
index ca65e5f1c..da574d7bd 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,19 +1,19 @@
 # translation of ibus.pot to Assamese
 # Assamese translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Amitakhya Phukan <aphukan@fedoraproject.org>, 2009
 # Amitakhya Phukan <aphukan@redhat.com>, 2010
 # ngoswami <ngoswami@redhat.com>, 2011
-# ngoswami <ngoswami@redhat.com>, 2012-2013
+# ngoswami <ngoswami@redhat.com>, 2012-2014
 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-13 08:17+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: ngoswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -51,12 +51,12 @@ msgid "Custom"
 msgstr "স্বনিৰ্বাচিত"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "তালিকাত প্ৰোথিত"
+msgid "Do not show"
+msgstr "নেদেখুৱাব"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "সামৰ্থবান অৱস্থাত"
+msgid "Hide automatically"
+msgstr "স্বচালিতভাৱে লুকুৱাওক"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -119,18 +119,18 @@ 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 "ভাষাৰ পেনেল দেখুৱাওক:"
+msgid "Show property panel:"
+msgstr "বৈশিষ্ট্য পেনেল দেখুৱাওক:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ভাষাৰ পেনেলৰ স্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "চিস্টেম ট্ৰেত আইকন দেখুৱাওক"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ভাষাৰ বাৰত ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
@@ -158,66 +158,92 @@ msgstr "<b>ফন্ট আৰু শৈলী</b>"
 msgid "General"
 msgstr "সাধাৰণ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "যোগ কৰক (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাত যোগ কৰক"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "আঁতৰাওক (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ পৰা নিৰ্বাচিত ইনপুট পদ্ধতি আঁতৰুৱা হ'ব"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ওপৰত (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ ওপৰলৈ স্থানান্তৰ কৰক"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "তলত (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ তললৈ স্থানান্তৰ কৰক"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "বিষয়ে (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "নিৰ্বাচিত ইনপুট পদ্ধতি সংক্ৰান্ত তথ্য দেখুৱাওক"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "পছন্দ (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিৰ ইনস্টল দেখুৱাওক"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\nতাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।</i></small>"
+"<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>"
+msgstr "<small><i>কি'বৰ্ড চৰ্টকাট কি অথবা পেনেল আইকন ক্লিক কৰি সক্ৰিয় ইনপুট পদ্ধতিত ওপৰৰ তালিকাত নিৰ্বাচিতসমূহৰ পৰা চুইচ কৰিব পৰা যাব। </i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "চিস্টেম কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰক"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব্যৱহাৰ কৰক"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কিবৰ্ডৰ বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "সকলো এপ্লিকেচনৰ মাজত একেই ইনপুট পদ্ধতি অংশীদাৰী কৰক"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>বিশ্বব্যাপী ইনপুট পদ্ধতি সংহতিসমূহ</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,18 +253,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিমান ইনপুট bus</small>\nঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "লগিনত ibus আৰম্ভ কৰক"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>আৰম্ভণি</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "বিষয়ে"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "বন্ধ কৰক (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ইঞ্জিনসমূহ আগতে ল'ড কৰক"
@@ -322,9 +352,9 @@ msgstr "স্বচালিতভাৱে লুকাওক"
 
 #: ../data/ibus.schemas.in.h:21
 msgid ""
-"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
-"Always show"
-msgstr "ভাষাৰ পেনেলৰ আচৰণ। ০ = মেনুত প্ৰোথিত, ১ = স্বচালিতভাৱে লুকাওক, ২ = সদায় দেখুৱাওক"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "বৈশিষ্ট্য পেনেলৰ আচৰণ। 0 = নেদেখুৱাব,  1 = স্বচালিতভাৱে লুকুৱাওক, 2 = সদায় দেখুৱাব"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -337,58 +367,78 @@ msgid ""
 msgstr "ভাষাৰ পেনেলৰ স্থান। 0 = ওপৰৰ বাওঁফালৰ কোণত, 1 = ওপৰৰ সোঁফালৰ কোণত, 2 = তলৰ বাওঁফালৰ কোণত, 3 = তলৰ সোঁফালৰ কোণত, 4 = স্বনিৰ্বাচিত"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "বৈশিষ্ট্য পেনেল দেখুৱাবলৈ মিলিছেকেণ্ড"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "ফকাচ-ইন আৰু বৈশিষ্ট্যসমূহ পৰিবৰ্তন হোৱাৰ পিছত বৈশিষ্ট্য পেনেল দেখুৱাবলৈ মিলিছেকেণ্ড।"
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবুলৰ দিশ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুকআপ টেবুলৰ দিশ। ০ = আনুভূমিক, ১ = উলম্ব"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "এপ্লিকেচনৰ উইন্ডোত পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "সৰ্বব্যাপী ইনপুট পদ্ধতি ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱে সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf সংৰক্ষিত নাম উপসৰ্গসমূহ"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নাম পৰিবৰ্তন বন্ধ কৰিবলে DConf কি'সমূহৰ উপসৰ্গসমূহ"
 
@@ -421,7 +471,7 @@ msgstr "লিখক: %s\n"
 msgid "Description:\n"
 msgstr "বিৱৰণ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "এটা ইনপুট পদ্ধতি বাছক"
 
@@ -433,37 +483,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus পছন্দসমূহ সংহতি কৰক"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "কিবৰ্ডৰ চৰ্টকাটসমূহ"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "কি'ৰ ক'ড:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "পৰিবৰ্তক:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "প্ৰয়োগ কৰক (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "আঁতৰাওক (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলৈ চুইচ কৰিবলে shift ৰ সৈতে চৰ্টকাট ব্যৱহাৰ কৰক"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডিমন চলি থকা নাই। আপুনি আৰম্ভ কৰিব বিচাৰে নেকি?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -472,17 +540,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডিমনক %d ছেকেণ্ডত আৰম্ভ কৰিব পৰা নগল"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ৰ কাৰণে কিবৰ্ডৰ চৰ্টকাট বাছক"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতিসমূহ চুইচ কৰা"
 
@@ -536,83 +604,93 @@ msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ ল
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus আপডেইট"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "পছন্দ"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "পুনাৰম্ভ"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "প্ৰস্থান"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/bg.po b/po/bg.po
index 050d13e7b..05a73277a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Bulgarian
 # Bulgarian translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Valentin Laskov <laskov@festa.bg>, 2012.
+# Valentin Laskov <laskov@festa.bg>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-30 22:31+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Valentin Laskov <laskov@festa.bg>\n"
 "Language-Team: Bulgarian <trans-bg@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,12 @@ msgid "Custom"
 msgstr "По избор"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Вграден в меню"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Когато е активен"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,7 +83,7 @@ msgstr "Предишен метод:"
 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 "Клавишна комбинация за включване или изключване на метода за писане"
 
@@ -116,18 +116,18 @@ 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 "Показвай панела с езици:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr "Показва името на метода за писане на лентата за език"
 
@@ -155,66 +155,92 @@ msgstr "<b>Шрифт и стил</b>"
 msgid "General"
 msgstr "Основни"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Добавяне"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Добавя избрания метод в списъка с разрешени методи за писане"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Премахване"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Премахва избрания метод за писане от списъка с разрешени методи"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "На_горе"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Премества нагоре избрания метод за писане в списъка с разрешени методи"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "На_долу"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Премества надолу избрания метод за писане в списъка с разрешени методи"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Относно"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Показва информация от избрания метод за писане"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Предпочитания"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Показва настройки на избрания метод за писане"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Подразбиращият се метод е най-горният в списъка.\nМожете да промените реда с бутоните нагоре/надолу.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Метод за писане"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Използване на системната клавиатурна подредба"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Използване на системната клавиатурна подредба (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Клавиатурна подредба</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Споделяй същия метод за писане за всички приложения"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Настройки на глобалния метод за писане</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Допълнителни"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,29 +250,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Интелигентен организатор на методите за писане</small>\nСтраница на проекта: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Стартирай ibus при влизане"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Стартиране</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 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 избор на метод за писане"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "Зат_варяне"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -265,114 +283,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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: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 "Разреши клавишните комбинации"
 
-#: ../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 = Видим винаги"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Ориентация на таблицата за преглед"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ориентация на таблицата за преглед. 0 = Хоризонтално, 1 = Вертикално"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Показва името на метода за писане"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Използване на избран шрифт"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Използване на избран шрифт за панела с езици"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Шрифт по избор"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Име на избрания шрифт за панела с езици"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Вграден редактиран текст"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вгражда предв. редактиран текст в прозореца на приложението"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Използва глобалния метод за писане"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Разрешава метод за писане по подразбиране"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Разрешава метод за писане по подразбиране, когато приложението е на фокус"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf запазва префиксите на имената"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префикси на DConf клавишите за спиране конверсията на имената"
 
@@ -386,30 +449,30 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 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:139
 msgid "Select an input method"
 msgstr "Избор на метод за писане"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Клав."
 
@@ -417,45 +480,55 @@ msgstr "Клав."
 msgid "Set IBus Preferences"
 msgstr "Задава предпочитания за IBUS"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Клавишни комбинации"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Код на клавиш:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Модифициращи:"
 
-#: ../setup/keyboardshortcut.py:251
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "П_рилагане"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Изтриване"
+
+#: ../setup/keyboardshortcut.py:254
 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:256
 msgid "Please press a key (or a key combination)"
 msgstr "Моля, натиснете клавиш (или комбинация клавиши)"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "ключ"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Отказване"
 
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "разреши"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Добре"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "забрани"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus демонът не е стартиран. Да го стартирам ли сега?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -464,83 +537,157 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus демонът не може да се стартира вече %d секунди"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Изберете клавишна комбинация за %s"
 
-#: ../tools/main.vala:40
+#: ../setup/main.py:377
+msgid "switching input methods"
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../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 ""
+
+#: ../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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Употреба: %s КОМАНДА [ОПЦИЯ...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s е непозната команда!\n"
 
-#: ../ui/gtk3/panel.vala:361
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus е интелигентен начин за избор на метод за въвеждане на информация за Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Валентин Ласков"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Предпочитания"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Рестартиране"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Спиране на програмата"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/bn.po b/po/bn.po
index 61ceb63ce..a91c118cd 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,21 +1,23 @@
 # translation of ibus.pot to Bengali
 # Bengali translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Ayesha Akhtar <ayesha@ankur.org.bd>, 2012
 # Mahay Alam Khan <mak@ankur.org.bd>, 2012
-# Newton Baidya <newton@ankur.org.bd>, 2012
+# newton <newton@ankur.org.bd>, 2012
+# newton <newton@ankur.org.bd>, 2012
 # Robin Mehdee <robin@ankur.org.bd>, 2012
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2009
 # runab <runab@redhat.com>, 2009, 2010
+# runab <runab@redhat.com>, 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Ayesha Akhtar <ayesha@ankur.org.bd>\n"
 "Language-Team: Bengali <trans-bn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +55,12 @@ msgid "Custom"
 msgstr "স্বনির্ধারিত"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "সক্রিয় অবস্থায়"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -121,18 +123,18 @@ 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 "ভাষার প্যানেল প্রদর্শন করা হবে:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
@@ -160,66 +162,92 @@ msgstr "<b>ফন্ট ও বিন্যাস</b>"
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকা যোগ করা হবে"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "অপসারণ (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "উপরে (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "নীচে (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "পরিচিতি (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "পছন্দসমূহ (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "নির্বাচিত ইনপুট মেথডের সেটআপ প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -229,18 +257,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>প্রারম্ভ</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "পরিচিতি"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "বন্ধ (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
@@ -324,9 +356,9 @@ 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 (২) = সর্বদা প্রদর্শন করা হবে"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -339,58 +371,78 @@ msgid ""
 msgstr "ভাষার প্যানেলের অবস্থান। 0 = উপরে বাঁদিকের কোণায়, 1 = উপরে ডানদিকের কোণায়, 2 = নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -423,7 +475,7 @@ msgstr "নির্মাতা: %s\n"
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
@@ -435,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "কি-বোর্ড শর্ট-কাট"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "কি-র কোড:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "প্রয়োগ করুন (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "মুছে ফেলুন (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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,17 +544,17 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr ""
 
@@ -538,83 +608,93 @@ msgstr ""
 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "পছন্দসমূহ"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "পুনরারম্ভ"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "প্রস্থান"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 67083afa7..c711a692a 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,19 +1,22 @@
 # translation of ibus.pot to Bengali (India)
 # Bengali (India) translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
+# bnin <sray@redhat.com>, 2013
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2009
 # runab <runab@redhat.com>, 2009, 2010
 # runa <runabh@gmail.com>, 2012
+# runab <runab@redhat.com>, 2009-2010
+# runa <runabh@gmail.com>, 2012
 # bnin <sray@redhat.com>, 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-11-20 11:18+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: bnin <sray@redhat.com>\n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -51,12 +54,12 @@ msgid "Custom"
 msgstr "স্বনির্ধারিত"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "সক্রিয় অবস্থায়"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -119,18 +122,18 @@ 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 "ভাষার প্যানেল প্রদর্শন করা হবে:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
@@ -158,66 +161,92 @@ msgstr "<b>ফন্ট ও বিন্যাস</b>"
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকা যোগ করা হবে"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "মুছে ফেলুন (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "উপরে (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "নীচে (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "পরিচিতি (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "পছন্দ (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "নির্বাচিত ইনপুট পদ্ধতির সেট-আপ প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,18 +256,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>প্রারম্ভ</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "পরিচিতি"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "বন্ধ করুন (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
@@ -322,9 +355,9 @@ 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 (২) = সর্বদা প্রদর্শন করা হবে"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -337,58 +370,78 @@ msgid ""
 msgstr "ভাষার প্যানেলের অবস্থান। 0 = উপরে বাঁদিকের কোণায়, 1 = উপরে ডানদিকের কোণায়, 2 = নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf দ্বারা নেম প্রেফিক্স সংরক্ষণ করা হবে"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নেম পরিবর্তন প্রতিরোধ করার জন্য DConf-কির প্রেফিক্স"
 
@@ -421,7 +474,7 @@ msgstr "নির্মাতা: %s\n"
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
@@ -433,37 +486,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "কি-বোর্ড শর্ট-কাট"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "কি-র কোড:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "প্রয়োগ করুন (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "মুছে ফেলুন (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য শিফ্ট সমেত শর্ট-কাট কি ব্যবহার করুন"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডেমন বর্তমানে চলছে না। এটি আরম্ভ করা হবে কি?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -472,17 +543,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডেমনটি %d সেকেন্ডে আরম্ভ করা যায়নি।"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতি পরিবর্তন"
 
@@ -536,83 +607,93 @@ msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ ল
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus অাপডেট"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "পছন্দ"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "পুনরারম্ভ"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "প্রস্থান"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ca.po b/po/ca.po
index a2b2ec5db..cb9e5b8a5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,23 +1,24 @@
 # translation of ibus.pot to Catalan
 # Catalan translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Oscar Osta <oostap.listas@gmail.com>, 2011.
-# Oscar Osta Pueyo <oostap@gmail.com>, 2009.
+# Bernabé Borrero <bernabeborrero@gmail.com>, 2012
+# Oscar Osta <oostap.listas@gmail.com>, 2011
+# Oscar Osta Pueyo <oostap@gmail.com>, 2009
 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-05-24 07:17+0000\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: oostap <oostap.listas@gmail.com>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -29,45 +30,44 @@ msgid "Vertical"
 msgstr "Vertical"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Incrusta al menú"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Quan estigui actiu"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Cantonada superior esquerra"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Cantonada superior dreta"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Cantonada inferior esquerra"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Cantonada inferior dreta"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Personalitzat"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Sempre"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Preferències de l'IBus"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+msgstr "Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
@@ -75,8 +75,7 @@ msgstr "Mètode d'entrada següent:"
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
+msgstr "Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
@@ -86,7 +85,7 @@ msgstr "Mètode d'entrada anterior:"
 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 "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
@@ -116,31 +115,27 @@ msgstr "Orientació dels candidats:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
-"d'idiomes"
+msgstr "Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra d'idiomes"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Mostra el quadre d'idiomes:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posició del quadre d'idiomes:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Mostra la icona a la safata del sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
-"casella de selecció"
+msgstr "Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la casella de selecció"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -148,9 +143,7 @@ msgstr "Incrusta el text editat prèviament en la finestra d'aplicació"
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Incrusta el text editat prèviament del mètode d'entrada en la finestra "
-"d'aplicació"
+msgstr "Incrusta el text editat prèviament del mètode d'entrada en la finestra d'aplicació"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
@@ -164,73 +157,92 @@ msgstr "<b>Tipus de lletra i estil</b>"
 msgid "General"
 msgstr "General"
 
-#: ../setup/setup.ui.h:35
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Afegeix"
 
 #: ../setup/setup.ui.h:36
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
 
 #: ../setup/setup.ui.h:37
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
+msgid "_Remove"
+msgstr "_Suprimeix"
 
 #: ../setup/setup.ui.h:38
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
 
 #: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "A_munt"
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "A_vall"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Quant a"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Mostra la informació del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Preferències"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Mostra la informació del mètode d'entrada seleccionat"
+msgstr "Mostra la configuració del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
-"<small><i>El mètode d'entrada predeterminat és el primer de la llista.\n"
-"Podeu utilitzar els botons de pujar i baixar per canviar-lo.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Mètode d'entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada en totes les aplicacions"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Paràmetres del mètode d'entrada global</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -238,37 +250,23 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus d'entrada intel·ligent</small>\n"
-"Lloc web: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>El bus d'entrada intel·ligent</small>\nLloc web: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Inicia l'IBus en entrar"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Quant a"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Entorn de mètodes d'entrada"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Inicia l'entorn de mètodes d'entrada IBus"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Tanca"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -287,123 +285,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 "Dreceres de teclat de l'activador"
 
-#: ../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 "Habilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Inhabilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Dreceres de teclat del motor següent"
 
-#: ../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 ""
-"Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+msgstr "Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Dreceres de teclat del motor anterior"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista"
+msgstr "Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Oculta automàticament"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
-"El comportament del quadre d'idiomes. 0 = incrustat al menú, 1 = oculta "
-"automàticament, 2 = mostra sempre"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Posició del quadre d'idiomes"
 
-#: ../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 "La posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada inferior dreta, 4 = personalitzat"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
-"La posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = "
-"cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
-"inferior dreta, 4 = personalitzat"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Mostra el nom del mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Utilitza un tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Integra el text editat prèviament"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Integra el text editat prèviament en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
-"d'entrada"
+msgstr "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus d'entrada"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -411,38 +445,36 @@ msgstr ""
 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"
 msgstr "Altres"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposició del teclat: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Descripció: \n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -450,137 +482,214 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Estableix les preferències de l'IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Codi de lletra:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificadors:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Aplica"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Suprimeix"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Premeu una tecla (o una combinació de tecles).\n"
-"El diàleg es tancarà quan es deixi anar la tecla."
+msgstr "Premeu una tecla (o una combinació de tecles).\nEl diàleg es tancarà quan es deixi anar la tecla."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "activador"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "habilita"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_D'acord"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "inhabilita"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "No s'ha iniciat el dimoni de l'IBus. Voleu iniciar-lo ara?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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 ""
-"S'ha iniciat l'IBus. Si no podeu utilitzar l'IBus, afegiu les línies "
-"següents a $HOME/.bashrc, i torneu a entrar a l'escriptori.\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:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "L'IBus és un bus d'entrada intel·ligent per al 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 ""
-"Oscar Osta Pueyo <oostap@gmail.com>, 2009\n"
-"Patricia Rivera Escuder <patysya@gmail.com>, 2009\n"
-"Xavier Conde Rueda <xavi.conde@gmail.com>\n"
-"Joan Duran <jodufi@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Reinicia"
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "Pàgina anterior"
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Pàgina següent"
+#: ../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 ""
-#~ "S'han instal·lat, suprimit o actualitzat alguns mètodes d'entrada. "
-#~ "Reinicieu la plataforma d'entrada IBus."
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Reinicia ara"
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Després"
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
 
-#~ msgid "IBus Panel"
-#~ msgstr "Quadre de l'IBus"
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "Entorn de mètodes d'entrada IBus"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Inhabilita el mètode d'entrada"
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Cap finestra d'entrada"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "Quant al mètode d'entrada"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Commuta el mètode d'entrada"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "Quant al mètode d'entrada"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Oscar Osta Pueyo <oostap@gmail.com>, 2009\nPatricia Rivera Escuder <patysya@gmail.com>, 2009\nXavier Conde Rueda <xavi.conde@gmail.com>\nJoan Duran <jodufi@gmail.com>"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferències"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Reinicia"
 
-#~ msgid "next input method"
-#~ msgstr "mètode d'entrada següent"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Surt"
 
-#~ msgid "previous input method"
-#~ msgstr "mètode d'entrada anterior"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/da.po b/po/da.po
index 82ae18a6d..d28048d83 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Danish
 # Danish translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Kris Thomsen <lakristho@gmail.com>, 2009, 2011
+# Kris Thomsen <lakristho@gmail.com>, 2009,2011
 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: kristho <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,12 @@ msgid "Custom"
 msgstr "Brugertilpasset"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Indlejret i menu"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Når aktiv"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -116,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Vis sprogpanel:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Placering af sprogpanel:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Vis ikon i statusfelt"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Vis navn på inputmetode i sprogpanel"
 
@@ -155,66 +155,92 @@ msgstr "<b>Skrifttype og stil</b>"
 msgid "General"
 msgstr "Generelt"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Tilføj de valgte inputmetoder i de aktiverede inputmetoder"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Fjern"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Fjern den valgte inputmetode fra de aktiverede inputmetoder"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Op"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Flyt den valgte inputmetode op i listen over aktiverede inputmetode"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Ned"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Flyt den valgte inputmetode i de aktiverede inputmetoder ned"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Om"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Vis information om den valgte inputmetode"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Indstillinger"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Vis opsætning for den valgte input-metode"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Standard inputmetoden er den øverste i listen.\nDu kan bruge op/ned-knapperne for at ændre det.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Inputmetode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Brug tastaturlayout for system"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Brug systemttastaturlayout (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturlayout</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Del den samme inputmetode i alle programmer"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Indstillinger for global inputmetode</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,18 +250,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Den intelligente inddatabus</small>\nNetsted: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Start ibus ved logind"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Opstart</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Om"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Luk"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Forindlæs motorer"
@@ -319,9 +349,9 @@ msgstr "Skjul automatisk"
 
 #: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -334,58 +364,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientering af opslagstabel"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Vis navn på inputmetode"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Brug tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Brugertilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Indbyg forudredigeret tekst"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Aktivér inputmetode som standard"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 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:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -418,7 +468,7 @@ msgstr "Forfatter: %s\n"
 msgid "Description:\n"
 msgstr "Beskrivelse:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Vælg en inddatametode"
 
@@ -430,37 +480,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Angiv indstillinger for IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Tastaturgenveje"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Nøglekode:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Kombinationstaster:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Anvend"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Slet"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Tryk venligst på en tast (eller en tastekombination)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_O.k."
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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 +537,17 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vælg tastaturgenveje til %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr ""
 
@@ -533,83 +601,93 @@ msgstr ""
 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inddatabus til Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Kris Thomsen\n\nDansk-gruppen <dansk@dansk-gruppen.dk>\nMere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Genstart"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Afslut"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/de.po b/po/de.po
index c52da2922..cadcd50da 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,20 +1,23 @@
 # translation of ibus.pot to German
 # German translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Fabian Affolter <fab@fedoraproject.org>, 2009
 # hpeters <hpeters@redhat.com>, 2009
+# hpeters <hpeters@redhat.com>, 2009
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2011
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2011
 # Rainer <rgromans@redhat.com>, 2013
+# Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Rainer <rgromans@redhat.com>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -52,12 +55,12 @@ msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "In Menü eingebettet"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Wenn aktiv"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -120,18 +123,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu verstecken"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Sprach-Panel anzeigen:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
@@ -159,66 +162,92 @@ msgstr "<b>Schriftart und Stil</b>"
 msgid "General"
 msgstr "Allgemein"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden hinzu"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Entfernen"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Entfernen Sie die gewählte Eingabemethode aus den aktivierten Eingabemethoden"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Hoch"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Runter"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Info"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Informationen zur gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Einstellungen"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\nSie können dies mit den Hoch/Runter-Schaltflächen ändern.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -228,18 +257,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Der intelligente Eingabe-Bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "IBus bei der Anmeldung starten"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Starten</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Info"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "S_chließen"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Engines vorladen"
@@ -323,9 +356,9 @@ msgstr "Automatisch verstecken"
 
 #: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -338,58 +371,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Name der Eingabemethode anzeigen"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 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:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -422,7 +475,7 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Beschreibung:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Eingabemethode wählen"
 
@@ -434,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus-Einstellungen konfigurieren"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Tastenkombinationen"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Tasten-Code:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Hilfstasten:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "An_wenden"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Löschen"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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:331
+#: ../setup/main.py:329
 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:352
+#: ../setup/main.py:350
 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,17 +544,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, 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:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "Eingabemethoden wechseln"
 
@@ -537,83 +608,93 @@ msgstr "Schreiben Sie den System-Registry-Cache."
 msgid "Write the registry cache FILE."
 msgstr "Schreiben Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "Setzen oder erhalten Modul"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "Beenden ibus-daemon"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "Anzeigen verfügbare Module"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(Nicht implementiert)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "Neustart ibus-daemon"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "Anzeigen Version"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "Anzeigen Inhalt des Registry-Cache."
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "Erstellen Registry-Cache"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "Anzeige dieser Information"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Anwendung: %s BEFEHL [OPTION...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "IBus Aktualisierung"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 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:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Fabian Affolter <fab@fedoraproject.org>, 2009.\nHedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Neustart"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Beenden"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/en_GB.po b/po/en_GB.po
index f5db17704..0a6abd696 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,20 +1,22 @@
-# English translations for ibus package.
-# Copyright (C) 2011 THE ibus'S COPYRIGHT HOLDER
+# translation of ibus.pot to English (United Kingdom)
+# English (United Kingdom) translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# Steven Panek <Majora700@gmail.com>, 2011.
 #
+# Translators:
+# Steven Panek <Majora700@gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.3.99.20110430\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-04-30 01:19-0500\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Steven Panek (Espreon) <Majora700@gmail.com>\n"
 "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"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -26,37 +28,37 @@ msgid "Vertical"
 msgstr "Vertical"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Embedded in menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "When active"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Always"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Top left corner"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Top right corner"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Bottom left corner"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Bottom right corner"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Custom"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Always"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus Preferences"
@@ -81,7 +83,7 @@ msgstr "Previous input method:"
 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 "The shortcut keys for turning input method on or off"
 
@@ -114,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Set the behaviour of ibus how to show or hide language bar"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Show language panel:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Language panel position:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Show icon on system tray"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Show input method name on language bar"
 
@@ -153,69 +155,92 @@ msgstr "<b>Font and Style</b>"
 msgid "General"
 msgstr "General"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Add"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Add the selected input method into the enabled input methods"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Remove the selected input method from the enabled input methods"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Up"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Move up the selected input method in the enabled input methods list"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Down"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Move down the selected input method in the enabled input methods"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_About"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Show information of the selected input method"
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Preferences"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Show information of the selected input method"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Input Method"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Use system keyboard layout"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Use system keyboard (XKB) layout"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Keyboard Layout</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Share the same input method among all applications"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Global input method settings</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -223,37 +248,23 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Start ibus on login"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Startup</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "About"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Input Method Framework"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus Input Method Framework"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Close"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -272,118 +283,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 "Trigger shortcut keys"
 
-#: ../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 "Enable shortcut keys"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "The shortcut keys for turning input method on"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Disable shortcut keys"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "The shortcut keys for turning input method off"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Next engine shortcut keys"
 
-#: ../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 "The shortcut keys for switching to the next input method in the list"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Prev engine shortcut keys"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "The shortcut keys for switching to the previous input method"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Auto hide"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
-"The behaviour of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
-"Always show"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Language panel position"
 
-#: ../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 "The position of the language panel. 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 "Follow the input cursor in case the panel is always shown"
 msgstr ""
-"The position of the language panel. 0 = Top left corner, 1 = Top right "
-"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientation of lookup table"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Show input method name"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Use custom font"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Use custom font name for language panel"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Custom font"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Custom font name for language panel"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Embed Pre-edit Text"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embed Pre-edit Text in Application Window"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Use global input method"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Enable input method by default"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Enable input method by default when the application gets input focus"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -391,38 +443,36 @@ msgstr ""
 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"
 msgstr "Other"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Language: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Keyboard layout: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Author: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Description:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Select an input method"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -430,133 +480,214 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Set IBus Preferences"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Keyboard shortcuts"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Key code:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modifiers:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Apply"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+msgstr "Please press a key (or a key combination).\nThe dialog will be closed when the key is released."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Please press a key (or a key combination)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "trigger"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "enable"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus daemon is not started. Do you want to start it now?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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 can not use IBus, please add below lines in "
-"$HOME/.bashrc, and relogin your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Select keyboard shortcut for %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus is an intelligent input bus for Linux/Unix."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Steven Panek, <Majora700@gmail.com>"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Restart"
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "Previous page"
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Next page"
+#: ../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 ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Restart Now"
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Later"
+#: ../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 input method framework"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Turn off input method"
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "No input window"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "About the input method"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Switch input method"
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "About the Input Method"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus is an intelligent input bus for Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Steven Panek, <Majora700@gmail.com>"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Restart"
 
-#~ msgid "next input method"
-#~ msgstr "next input method"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Quit"
 
-#~ msgid "previous input method"
-#~ msgstr "previous input method"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/es.po b/po/es.po
index ddc50d16f..f111cbbd3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,21 +1,23 @@
 # translation of ibus.pot to Spanish
 # Spanish translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
-# Domingo Becker <domingobecker@gmail.com>, 2012
+# Domingo Becker <domingobecker@gmail.com>, 2012-2013
 # Domingo Becker <domingobecker@gmail.com>, 2013
-# Gladys Guerrero <gguerrer@redhat.com>, 2012-2013
+# Eduardo Villagrán M <gotencool@gmail.com>, 2013
+# Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +55,12 @@ msgid "Custom"
 msgstr "Personalizado"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Menú incrustado"
+msgid "Do not show"
+msgstr "No mostrar"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Cuando esté activo"
+msgid "Hide automatically"
+msgstr "Ocultar automáticamente"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -121,18 +123,18 @@ 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"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Mostrar el panel de idioma:"
+msgid "Show property panel:"
+msgstr "Mostrar panel de propiedades:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posición del panel de idioma:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 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:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
@@ -160,66 +162,92 @@ msgstr "<b>Fuente y Estilo</b>"
 msgid "General"
 msgstr "General"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Añadir"
+
+#: ../setup/setup.ui.h:36
 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"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Quitar"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Eliminar el método de entrada seleccionado de los métodos de entrada habilitados"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Subir"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Bajar"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "Acerca _de"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Mostrar información sobre el método de entrada seleccionado"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "Prefere_ncias"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostrar la configuración del método de entrada seleccionado"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>El método de entrada determinado está al comienzo de la lista.\nPuede usar los botones arriba/abajo para cambiarlo.</i></small>"
+"<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>"
+msgstr "<small><i>Puede elegir el método de entrada activo de los seleccionados en la lista anterior, mediante el atajo de teclado o pulsando en el icono del panel.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar el diseño del teclado del sistema (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Diseño del Teclado</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuraciones globales de método de entrada</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -229,18 +257,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>El bus de entrada inteligente</small>\nSitio web: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Iniciar ibus al ingresar"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Acerca de"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Cerrar"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Precargar máquinas"
@@ -324,9 +356,9 @@ msgstr "Auto Ocultar"
 
 #: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "La conducta del panel de propiedad,0= No mostrar, 1 = Auto ocultar, 2 = Mostrar siempre"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -339,58 +371,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "Los milisegundos para mostrar el panel de propiedad"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "Los milisegundos para mostrar el panel de propiedad después de enfocar o que las propiedades cambien."
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientación de búsqueda en la tabla "
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Mostrar el nombre del método de entrada"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada en forma predeterminada"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 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:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -398,7 +450,7 @@ msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 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 © 2007–2010 Peng Huang\nCopyright © 2007–2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -423,7 +475,7 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Descripción:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
@@ -435,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Defina las preferencias de IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Código clave:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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:331
+#: ../setup/main.py:329
 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:352
+#: ../setup/main.py:350
 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,17 +544,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, 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:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "Cambiando métodos de entrada"
 
@@ -538,83 +608,93 @@ msgstr "Escriba al caché del registro del sistema."
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "USO: %s COMANDO [OPCION...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 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:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Reiniciar"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Salir"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/et.po b/po/et.po
index 259a04900..f7e42af1e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,16 +1,17 @@
 # translation of ibus.pot to Estonian
 # Estonian translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-#   <turakas@gmail.com>, 2012.
+# mihkel <turakas@gmail.com>, 2012
+# mihkel <turakas@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-12-02 11:36+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: mihkel <turakas@gmail.com>\n"
 "Language-Team: Estonian <trans-et@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +49,12 @@ msgid "Custom"
 msgstr "Kohandatud"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Kui on aktiivne"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,7 +84,7 @@ msgstr "Eelmine sisestusmeetod:"
 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 ""
 
@@ -116,18 +117,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Kuva keele paneel."
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr ""
 
@@ -155,66 +156,92 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "L_isa"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Eemalda"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Üles"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Alla"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Programmist lähemalt"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Eelistused"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Sisestusmeetod"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,29 +251,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Käivita ibus sisselogiminsel"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Programmist"
 
-#: ../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 ""
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "Sul_ge"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -265,114 +284,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
+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 &lt; Delay milliseconds. 0 &gt; 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 "Võimalda kiirklahvid"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Kohandatud font"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -386,30 +450,30 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Keel: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviatuuri asetus: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Kirjeldus:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Vali sisestusmeetod"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -417,45 +481,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Määra IBus eelistused"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:251
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Rakenda"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "Ku_stuta"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "päästik"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Loobu"
 
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "võimalda"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Olgu"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "keela"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -464,83 +538,157 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../tools/main.vala:40
-msgid "List engine name only"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "käsk [VALIKUD]"
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr ""
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../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 ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
+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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:361
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Restart"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Lõpeta"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/eu.po b/po/eu.po
index 0222be3ce..32fa6a246 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Basque
 # Basque translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2012.
+# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-15 03:22+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Asier Iturralde Sarasola <asier.iturralde@gmail.com>\n"
 "Language-Team: Basque <trans-eu@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,11 +48,11 @@ msgid "Custom"
 msgstr "Pertsonalizatua"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
@@ -83,7 +83,7 @@ msgstr "Aurreko sarrera metodoa"
 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 ""
 
@@ -116,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
+msgid "Show property panel:"
 msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr ""
 
@@ -155,66 +155,92 @@ msgstr "<b>Letra-tipoa eta estiloa</b>"
 msgid "General"
 msgstr "Orokorra"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Kendu"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Gora"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Behera"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "Honi _buruz"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Hobespenak"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Sarrera metodoa"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Teklatu-diseinua</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Sarrera metodo orokorraren ezarpenak</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,29 +250,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr ""
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../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 ""
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "It_xi"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -265,114 +283,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable shortcut keys"
+msgid "Saved version number"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-msgid "The shortcut keys for turning input method on"
+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: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 "Ezkutatu automatikoki"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Erakutsi sarrera metodoaren izena"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Erabili letra-tipo pertsonalizatua"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Letra-tipo pertsonalizatua"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Erabili sarrera metodo orokorra"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -386,30 +449,30 @@ msgstr "Copyright-a (c) 2007-2010 Peng Huang\nCopyright-a (c) 2007-2010 Red Hat,
 msgid "Other"
 msgstr "Beste bat"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Hizkuntza: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Teklatu-diseinua: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Egilea: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Deskribapena:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Hautatu sarrera metodo bat"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr ""
 
@@ -417,45 +480,55 @@ msgstr ""
 msgid "Set IBus Preferences"
 msgstr "Ezarri IBus hobespenak"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Teklatu lasterbideak"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Tekla kodea:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:251
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Aplikatu"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Ezabatu"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr ""
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "gaitu"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Ados"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "desgaitu"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -464,83 +537,157 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../tools/main.vala:40
-msgid "List engine name only"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
+#: ../tools/main.vala:42
+msgid "List engine name only"
 msgstr ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr ""
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../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 ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
+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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:361
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Asier Iturralde Sarasola <asier.iturralde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Berrabiarazi"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Irten"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/fa.po b/po/fa.po
index bba8125a7..5b8f2ed79 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,24 +1,23 @@
 # translation of ibus.pot to Persian
 # Persian translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Daniyal Yousefi <da.yousefi@gmail.com>, 2011.
-# Mostafa Daneshvar <lashar@fedoraproject.org>, 2011.
+# Daniyal Yousefi <da.yousefi@gmail.com>, 2011
+# Mostafa Daneshvar <lashar@fedoraproject.org>, 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-30 19:07+0000\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: danialyousefi <da.yousefi@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/fedora/team/"
-"fa/)\n"
-"Language: fa\n"
+"Language-Team: Persian <trans-fa@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
@@ -30,37 +29,37 @@ msgid "Vertical"
 msgstr "عمودی"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr ""
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr ""
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "همیشه"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "گوشه بالا سمت چپ"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "گوشه بالا سمت راست"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "گوشه پایین سمت چپ"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "چوشه پایین سمت راست"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "انتخابی"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+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 ""
@@ -85,7 +84,7 @@ msgstr ""
 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 ""
 
@@ -118,18 +117,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "نمایش پنل زبان:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr ""
 
@@ -157,66 +156,92 @@ msgstr ""
 msgid "General"
 msgstr "اصلی"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "ا_فزودن"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_حذف"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_بالا"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_پایین"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_درباره"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_ترجیحات"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,29 +251,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr ""
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 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 ""
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_بستن"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -267,114 +284,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
+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 &lt; Delay milliseconds. 0 &gt; 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: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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -382,38 +444,36 @@ msgstr ""
 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"
 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 ""
 
-#: ../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:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr ""
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr ""
 
@@ -421,90 +481,214 @@ msgstr ""
 msgid "Set IBus Preferences"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "میانبرهای صفحه‌کلید"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_اعمال"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_حذف"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr ""
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_انصراف"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "فعال"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_تأیید"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "غیرفعال"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:344
+#: ../setup/main.py:350
 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 ""
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
+#: ../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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "ترجیحات"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "راه‌اندازی مجدد"
 
-#~ msgid "Previous page"
-#~ msgstr "صفحهٔ قبل"
-
-#~ msgid "Next page"
-#~ msgstr "صفحهٔ بعد"
-
-#~ msgid "Restart Now"
-#~ msgstr "راه‌اندازی مجدد، همین حالا"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "ترک"
 
-#~ msgid "Later"
-#~ msgstr "بعداً"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:RTL"
diff --git a/po/fr.po b/po/fr.po
index e167b55fb..14c94cada 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to French
 # French translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\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-12-03 08:56+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Jérôme Fenal <jfenal@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +53,12 @@ msgid "Custom"
 msgstr "Personnalisée"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Insérée dans le menu"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Uniquement lorsque active"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -121,18 +121,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Afficher la barre de langue :"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Afficher la barre de langue :"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 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:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
 
@@ -160,31 +160,56 @@ msgstr "<b>Police et Style</b>"
 msgid "General"
 msgstr "Général"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "A_jouter"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Enlever"
+
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Monter"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Descendre"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "À _propos"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Afficher les informations de la méthode d'entrée sélectionnée"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Afficher le paramétrage de la méthode d'entrée sélectectionnée"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -192,35 +217,35 @@ msgid ""
 msgstr "<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 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:47
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuration de la méthode d'éntrée globale</b>"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -230,18 +255,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Démarrer IBus lors de la connexion"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "À propos"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Fermer"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Précharger les moteurs"
@@ -325,9 +354,9 @@ msgstr "Masquage automatique"
 
 #: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -340,58 +369,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Afficher le nom de la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langue"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour le panneau de langue"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d'édition"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 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:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 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"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -424,7 +473,7 @@ msgstr "Auteur : %s\n"
 msgid "Description:\n"
 msgstr "Description :\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d'entrée"
 
@@ -436,37 +485,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Définir les préférences de IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Raccourci clavier"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Touche :"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificateurs :"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "A_ppliquer"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Supprimer"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 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:392
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "A_nnuler"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Valider"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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"
 
-#: ../setup/main.py:326
+#: ../setup/main.py:329
 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:347
+#: ../setup/main.py:350
 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,17 +542,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, 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:373
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Raccourci clavier pour %s"
 
-#: ../setup/main.py:374
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "Changer de méthodes d'entrée"
 
@@ -596,26 +663,36 @@ msgstr "Commandes :\n"
 msgid "%s is unknown command!\n"
 msgstr "%s n'est pas une commande connue !\n"
 
-#: ../ui/gtk3/panel.vala:382
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:661
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:665
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:697
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Redémarrer"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Quitter"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/gu.po b/po/gu.po
index 8fde9fa6e..001d39080 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,9 +1,10 @@
 # translation of ibus.pot to Gujarati
 # Gujarati translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
+# Ankit Patel <ankit644@yahoo.com>, 2014
 # Ankit Patel <ankit@redhat.com>, 2010
 # sweta <swkothar@redhat.com>, 2009-2010
 # sweta <swkothar@redhat.com>, 2011-2013
@@ -12,10 +13,10 @@ 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-16 07:29+0000\n"
-"Last-Translator: sweta <swkothar@redhat.com>\n"
-"Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
+"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/fedora/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,12 @@ msgid "Custom"
 msgstr "વૈવિધ્ય"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "મેનુમાં જડિત"
+msgid "Do not show"
+msgstr "બતાવશો નહિ"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "જ્યારે સક્રિય હોય"
+msgid "Hide automatically"
+msgstr "આપોઆપ છુપાવો"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -119,18 +120,18 @@ 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 "ભાષા પેનલને બતાવો:"
+msgid "Show property panel:"
+msgstr "ગુણધર્મ પેનલ બતાવો:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ભાષા પેનલનું સ્થાન:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતાવો"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ નામને બતાવો"
 
@@ -158,66 +159,92 @@ msgstr "<b>ફોન્ટ અને શૈલીઓ</b>"
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "ઉમેરો (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓમાં પસંદ થયેલ ઇનપુટ પદ્દતિને ઉમેરો"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "દૂર કરો (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ માંથી પસંદ થયેલ ઇનપુટ પદ્દતિને દૂર કરો"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ઉપર કરો (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ યાદીમાં પસંદ થયેલ ઇનપુટ પદ્દતિને ઉપર ખસેડો"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "નીચે કરો (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓમાં પસંદ થયેલ ઇનપુટ પદ્દતિને નીચે ખસેડો"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "વિશે (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "પસંદગીઓ (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિનાં સુયોજનને બતાવો"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\nતેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ઇનપુટ પદ્દતિ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>વૈશ્ર્વિક ઇનપુટ પદ્દતિ સુયોજનો</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "ઉન્નત"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,18 +254,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>હોશિયાર ઇનપુટ બસ</small>\nઘરપાનું: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>શરૂઆત કરો</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "વિશે"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "બંધ કરો (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "એંજિનોને ફરીથી લોડ કરો"
@@ -322,9 +353,9 @@ 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 = હંમેશા બતાવો"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -337,58 +368,78 @@ msgid ""
 msgstr "ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "કોષ્ટકને જોવાની દિશા"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "કોષ્ટકને જોવાની દિશા. 0 = આડુ, 1 = ઊભુ "
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "વૈવિધ્ય ફોન્ટ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf નામ ઉપસર્ગને સાચવે છે"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "નામનું રૂપાંતરણને બંધ કરવા માટે DConf કીઓનાં ઉપસર્ગો"
 
@@ -421,7 +472,7 @@ msgstr "લેખક: %s\n"
 msgid "Description:\n"
 msgstr "વર્ણન:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
@@ -433,37 +484,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus પસંદગીઓને સુયોજિત કરો"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "કિબોર્ડ ટૂંકાણો"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "કિ કોડ:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "બદલનારો:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "અમલમાં મૂકો (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "કાઢી નાંખો (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "બરાબર (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "પહેલાંની ઇનપુટ પદ્દતિને બદલવા shift સાથે ટૂંકાણ વાપરો"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ડિમન ચાલી રહ્યુ નથી. શું તમે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -472,17 +541,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ઇનપુટ પદ્દતિને બદલી રહ્યા છે"
 
@@ -536,83 +605,93 @@ msgstr "સિસ્ટમ રજીસ્ટરી કેશને લખો."
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus સુધારો"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "પસંદગીઓ "
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "બહાર નીકળો "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/he.po b/po/he.po
new file mode 100644
index 000000000..03d8ea6f9
--- /dev/null
+++ b/po/he.po
@@ -0,0 +1,673 @@
+# translation of ibus.pot to Hebrew
+# Hebrew translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-17 12:25+0900\n"
+"PO-Revision-Date: 2014-02-17 05:02+0000\n"
+"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
+"Language-Team: Hebrew <trans-he@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\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 "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+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 ""
+
+#: ../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 "<b>Keyboard Shortcuts</b>"
+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 ""
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr ""
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr ""
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+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 "<b>Font and Style</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr ""
+
+#: ../setup/setup.ui.h:35
+msgid "_Add"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr ""
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr ""
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr ""
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:47
+msgid ""
+"<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>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+msgid "Input Method"
+msgstr ""
+
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:62
+msgid "Start ibus on login"
+msgstr ""
+
+#: ../setup/setup.ui.h:63
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+msgid "About"
+msgstr ""
+
+#: ../setup/setup.ui.h:65
+msgid "_Close"
+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 ""
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:36
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:38
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:39
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:40
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:45
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
+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 ""
+
+#: ../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 ""
+
+#: ../setup/engineabout.py:71
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:74
+#, python-format
+msgid "Author: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:77
+msgid "Description:\n"
+msgstr ""
+
+#: ../setup/enginecombobox.py:139
+msgid "Select an input method"
+msgstr ""
+
+#: ../setup/enginetreeview.py:94
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: ../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 ""
+
+#: ../setup/keyboardshortcut.py:252
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:329
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: ../setup/main.py:350
+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:364
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:376
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#: ../setup/main.py:377
+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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr ""
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:RTL"
diff --git a/po/hi.po b/po/hi.po
index 877f4a3ad..46d3096c5 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,18 +1,18 @@
 # translation of ibus.pot to Hindi
 # Hindi translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Rajesh Ranjan <rajesh672@gmail.com>, 2009
-# Rajesh Ranjan <rranjan@redhat.com>, 2009,2011-2012
+# Rajesh Ranjan <rranjan@redhat.com>, 2009,2011-2013
 # Rajesh Ranjan <rranjan@redhat.com>, 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-15 08:25+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -50,12 +50,12 @@ msgid "Custom"
 msgstr "मनपसंद"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "मेन्यू में अंतःस्थापित"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "जब सक्रिय हो"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -85,7 +85,7 @@ msgstr "पिछली इनपुट विधि:"
 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 "इनपुट विधि को चालू या बंद रखने के लिए शॉर्टकट कुंजी"
 
@@ -118,18 +118,18 @@ 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 "भाषा पैनल दिखाएँ:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ"
 
@@ -157,66 +157,92 @@ msgstr "<b>फ़ॉन्ट व शैली</b>"
 msgid "General"
 msgstr "सामान्य"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "जोड़ें (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "सक्रिय किए गए इनपुट विधि में चुनी गई इनपुट विधियों को जोड़ें"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "हटाएँ (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "सक्रिय की गई इनपुट विधियों में चुनी गई इनपुट विधियों हटाएँ"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ऊपर (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "सक्रिय की गई इनपुट विधि सूची में चुनी गई इनपुट विधियों को ले जाएँ"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "नीचे (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "सक्रिय की गई इनपुट विधियों में चुनी गई इनपुट विधियों को खिसकाएँ"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "परिचय (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "वरीयता (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "चुने गए इनपुट विधि का सेटअप दिखाएँ"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\nआप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "इनपुट विधि"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "तंत्र कुंजीपट लेआउट का प्रयोग करें"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "तंत्र कुंजीपट (XKB) लेआउट का प्रयोग करें"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कुंजीपट लेआउट</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "सभी अनुप्रयोगों के बीच समान इनपुट विधि को साझा करें"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "कोई इनपुट विधि चुनें"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "उन्नत"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,29 +252,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>तेज-तर्रार इनपुट बस</small>\nहोमपेज: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "लॉगिन पर ibus आरंभ करें"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>स्टार्टअप</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 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 इनपुट विधि फ्रेमवर्क आरंभ करें"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "बंद करें (_C)"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -278,118 +296,148 @@ msgid ""
 msgstr "IME स्विचर विंडो दिखाने के लिए पॉपअप विलंब को मिलीसेकेंड में सेट करें. तयशुदा है400. 0 = विंडो को तत्काल दिखाएँ. 0 &lt; मिलीसेकेंड विलंब. 0 &gt; विंडो को मत दिखाएँ और पिछला/अगला इंजन में स्विच करें."
 
 #: ../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 = हमेशा दिखाएँ"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "लुकअप सारणी की दिशा"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "सारणी देखने के लिए दिशा. 0 = क्षैतिज, 1 = लंबवत"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "इनपुट विधि नाम दिखाएँ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "मनपसंद फ़ॉन्ट"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "पूर्वसंपादित पाठ अंतःस्थापित करें"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "अनुप्रयोग विंडो में पूर्वसंपादित पाठ अंतःस्थापित करें"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "लक्ष्य इनपुट विधि का प्रयोग करें"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "जब अनुप्रयोग इनपुट फोकस पाता है तो इनपुट विधि को तयशुदा रूप से सक्रिय करें"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf नाम उपसर्ग को संरक्षित करता है"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf कुँजी का उपसर्ग नाम वार्तालाप रोकने के लिए"
 
@@ -422,11 +470,11 @@ msgstr "लेखक: %s\n"
 msgid "Description:\n"
 msgstr "विवरण:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "कोई इनपुट विधि चुनें"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -434,37 +482,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus वरीयताएँ सेट करें"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "कुंजीपटल शॉर्टकर्ट"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "कुंजी कोड:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "परिवर्तनकर्ता:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "लागू करें (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "मिटाएँ (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "रद्द करें (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ठीक (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "पिछले इनपुट विधि में जाने के लिए शिफ्ट के साथ शॉर्टकट का उपयोग करें"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus डेमॉन चल नहीं रहा है. क्या आप इसे आरंभ करना चाहते हैं?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:350
 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 +539,157 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus %d सेकेंड में आरंभ नहीं हो सका"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:377
 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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "प्रयोग: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "कमांड:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s अज्ञात कमांड है!\n"
 
-#: ../ui/gtk3/panel.vala:498
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "कॉपीराइट (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "राजेश रंजन (rranjan@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "वरीयता "
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "पुनः प्रारंभ करें"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "बाहर जाएँ"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/hu.po b/po/hu.po
index d74bb870d..57be5731c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Hungarian
 # Hungarian translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # kelemeng <kelemeng@gnome.hu>, 2011
 # kelemeng <kelemeng@gnome.hu>, 2011
@@ -12,8 +12,8 @@ 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-01-09 18:26+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Zoltan Hoppár <hopparz@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,12 +51,12 @@ msgid "Custom"
 msgstr "Egyéni"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Beágyazva a menübe"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Amikor aktív"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -86,7 +86,7 @@ msgstr "Előző beviteli mód:"
 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 "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
@@ -119,18 +119,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Nyelv panel megjelenítése:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "A nyelvi panel elhelyezése:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Ikon megjelenítése az értesítési területen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
 
@@ -158,66 +158,92 @@ msgstr "<b>Betűkészlet és stílus</b>"
 msgid "General"
 msgstr "Általános"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "Hozzá_adás"
+
+#: ../setup/setup.ui.h:36
 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"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Eltávolítás"
+
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Fel"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Le"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Névjegy"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Információk megjelenítése a kiválasztott beviteli módról"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "B_eállítások"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Az alapértelmezett beviteli mód a listában a legfelső.\nEzt a fel/le billentyűk segítségével változtathatja meg.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Beviteli mód"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Rendszer-billentyűzetkiosztás használata"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globális bevitelimód-beállítások</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Speciális"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,29 +253,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Az intelligens beviteli busz</small>\nHonlap: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Az IBus indítása bejelentkezéskor"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Névjegy"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Bevitelimód-keretrendszer"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus bevitelimód-keretrendszer elindítása"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Bezárás"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -279,118 +297,148 @@ msgid ""
 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 &lt; Késés milliszekundumban. 0 &gt; Nem jeleníti meg az ablakot, és átváltja a köv./előző motorra."
 
 #: ../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 "Aktiválja a gyorsbillentyűket"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Alkalmazza a gyorsbillentyűket a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Gyorsbillentyűk engedélyezése"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Gyorsbillentyűk letiltása"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Következő alrendszer gyorsbillentyűi"
 
-#: ../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 "A lista következő beviteli módjára váltáshoz használandó gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Előző alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Automatikus elrejtés"
 
-#: ../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 "A nyelvi panel viselkedése. 0 = beágyazva a menübe, 1 = automatikus elrejtés, 2 = megjelenítés mindig"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Nyelvi panel pozíciója"
 
-#: ../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 "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
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Keresési tábla tájolása"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Beviteli mód megjelenítése"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Egyéni betűkészlet használata"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Egyéni betűkészlet használata a nyelv panelen"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Egyéni betűkészlet"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:44
 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"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf megtartja a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
 
@@ -423,11 +471,11 @@ msgstr "Szerző: %s\n"
 msgid "Description:\n"
 msgstr "Leírás:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Válasszon beviteli módot"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Bill."
 
@@ -435,37 +483,55 @@ msgstr "Bill."
 msgid "Set IBus Preferences"
 msgstr "IBus beállításai"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Billentyűkód:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Módosítók:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Alkalmaz"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Törlés"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "Mé_gse"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Az IBus daemon nem működik. El kívánja indítani?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:350
 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 +540,157 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus daemon nem indítható %d mp belül."
 
-#: ../setup/main.py:379
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "beviteli módok váltása"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevét listázza"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "parancs [OPCIÓK]"
-
-#: ../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 "Nem tudok csatlakozni az IBus-hoz.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Nincs motor beállítva.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Általános motor beállítása nem sikerült.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Általános motor beszerzése nem sikerült.\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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Használat: %s PARANCS [OPCIÓK...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ismeretlen parancs!\n"
 
-#: ../ui/gtk3/panel.vala:498
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "Szerzői jog (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 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"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Újraindítás"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Kilépés"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ia.po b/po/ia.po
index 071369235..e1ed35673 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Interlingua
 # Interlingua translation of ibus.
-# Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Nik Kalach <nikka@fedoraproject.org>, 2013
 # Nik Kalach <nik.kalach@inbox.ru>, 2013
@@ -10,8 +10,8 @@ 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-28 01:32+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Nik Kalach <nik.kalach@inbox.ru>\n"
 "Language-Team: Interlingua <trans-ia@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -49,12 +49,12 @@ msgid "Custom"
 msgstr "Personalisate"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Inserite in le menu"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Quando active"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -84,7 +84,7 @@ msgstr "Methodo de ingresso precedente"
 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 "Le claves acceleratori pro activar e disactivar le methodo de ingresso"
 
@@ -117,18 +117,18 @@ 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"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Monstrar le pannello de lingua:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Position del pannello de lingua:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Monstrar le icone in le area de indicatores"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Monstrar le nomine del methodo de ingresso sur le barra de lingua"
 
@@ -156,66 +156,92 @@ msgstr "<b>Typo de characteres e stilo</b>"
 msgid "General"
 msgstr "General"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Adder"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Adder le methodo de ingresso seligite al methodos de ingresso active"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Remover le methodo de ingresso seligite del methodos de ingresso active"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Supra"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Infra"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "A _proposito"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Monstrar le information del methodo de ingresso seligite"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Preferentias"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Monstrar le configuration del methodo de ingresso seligite"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Le methodo de ingresso predefinite es le entrata superior del lista.\nUsar le buttones 'supra' e 'infra' pro cambiar lo.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Methodo de ingresso"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Usar le disposition de claviero del systema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar le disposition de claviero del systema (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition de claviero</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Usar le mesme methodo de ingresso pro tote le applicationes"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuration del methodo de ingresso global</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,29 +251,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Le bus de ingresso intelligente</small>\nPagina del projecto: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Initiar ibus al connexion"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Initiation</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "A proposito"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Infrastructura de methodos de ingresso"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Initiar le systema de methodos de ingresso IBus"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Clauder"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -277,118 +295,148 @@ msgid ""
 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 &lt; demora (in ms). 0 &gt; non monstrar le fenestra e commutar inter ingenios precedente o sequente."
 
 #: ../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 "Activator de claves acceleratori"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activator de claves acceleratori pro gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Activar claves acceleratori"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Le combination de claves pro activar le methodo de ingresso"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Disactivar claves acceleratori"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Le combination de claves pro disactivar le methodo de ingresso"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Claves acceleratori del ingenio sequente"
 
-#: ../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 "Le combination de claves pro cambiar al methodo de ingresso sequente in le lista"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Claves acceleratori del ingenio precedente"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 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"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Occultar automaticamente"
 
-#: ../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 "Le comportamento del pannello de lingua. 0 = inserite in le menu, 1 = occultar lo automaticamente, 2 = monstrar lo sempre"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Position del pannello de lingua"
 
-#: ../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 "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
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientation del tabula de cerca"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientation del tabula de cerca. 0 = horizontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Monstrar le nomine del methodo de ingresso"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Usar characteres personalisate"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Usar un typo de characteres personalisate pro le pannello de lingua"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Characteres personalisate"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Nomine del typo de characteres personalisate pro le pannello de lingua"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Inserer le texto pre-editate"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Inserer le texto pre-editate in le fenestra de application"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Usar le methodo de ingresso global"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Activar le methodo de ingresso predefinite"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:44
 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"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva le prefixos de nomines"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos de claves DConf pro parar le conversion de nomines"
 
@@ -421,11 +469,11 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Description:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Seliger un methodo de ingresso"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -433,37 +481,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Definir preferentias IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Claves acceleratori"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Codice de clave:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificatores:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Applicar"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Deler"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Preme un clave (o combination de claves)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "A_nnullar"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Usa accellerator con majuscula pro revinir al methodo previe de ingresso"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Le demonio IBus non functiona. Initiar lo?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:350
 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"
@@ -472,82 +538,157 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Le demonio IBus non pote initiar se in %d secundas"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selige le clave acceleratori pro %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "cambiamento de methodos de ingresso"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Monstrar solmente nomines de ingenios"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "commando [OPTIONES]"
-
-#: ../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 "Le connexion a IBus es impossibile.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "lingua: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Necun ingenio es configurate.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Falta al configuration del ingenio global.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Falta al obtener le ingenio global.\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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Usage: %s COMMANDO [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Commandos:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s es un commando incognite!\n"
 
-#: ../ui/gtk3/panel.vala:498
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus es un bus de ingresso intelligente pro Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Nik Kalach <nikka@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferentias"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Reinitiar"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Quitar"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/it.po b/po/it.po
index f9d0a8159..2cb116622 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,23 @@
 # translation of ibus.pot to Italian
 # Italian translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
+# fvalen <fvalen@redhat.com>, 2012-2013
 # fvalen <fvalen@redhat.com>, 2013
 # fvalen <fvalen@redhat.com>, 2012
 # Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione@ubuntu-it.org>, 2009
 # milo <milo@ubuntu.com>, 2009
+# milo <milo@ubuntu.com>, 2009
+# primes2h <primes2h@ubuntu.com>, 2009
 # primes2h <primes2h@ubuntu.com>, 2009
 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-08 03:21+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: fvalen <fvalen@redhat.com>\n"
 "Language-Team:  <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -52,12 +55,12 @@ msgid "Custom"
 msgstr "Personalizzato"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Inserito nel menu"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Quando attivoB"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -87,7 +90,7 @@ msgstr "Metodo di input precedente:"
 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 "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
@@ -120,18 +123,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Imposta il comportamento di IBus su come mostrare o nascondere la barra della lingua"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Mostrare pannello della lingua:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posizione pannello della lingua:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Mostrare l'icona nell'area di notifica"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Mostrare il nome del metodo di input nella barra della lingua"
 
@@ -159,66 +162,92 @@ msgstr "<b>Tipo di carattere e stile</b>"
 msgid "General"
 msgstr "Generali"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "A_ggiungi"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Rimuovi"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Su"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Giù"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "I_nformazioni"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Mostra le informazioni sul metodo di input selezionato"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "Preferen_ze"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostra l'impostazione dell'input method selezionato"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>Il metodo di input predefinito è il primo in alto nell'elenco.\nPer cambiarlo è possibile usare i pulsanti su/giù.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Metodo di input"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Usa la disposizione di tastiera del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Condivide lo stesso metodo di input tra le applicazioni"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "Seleziona un metodo di input"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -228,29 +257,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Il bus di input intelligente</small>\nSito web: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Avvia IBus all'accesso"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Avvio</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Informazioni"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework del metodo di input"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Avvia il framework del metodo di input di IBus"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Chiudi"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -280,118 +301,148 @@ msgid ""
 msgstr "Imposta ritardo del popup in millisecondi per mostrare la finestra del selettore IME. Il valore predefinito è 400. 0 = Mostra la finestra immediatamente. 0 &lt; Ritardo in millisecondi. 0 &gt; Non mostrare la finestra e passa ai motori prec/succ."
 
 #: ../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 "Tasto di scelta rapida di avvio"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Attiva i tasti scorciatoia per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Abilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "I tasti scorciatoia per abilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Disabilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "I tasti scorciatoia per disabilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida successivo"
 
-#: ../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 "I tasti scorciatoia per passare al metodo di input successivo nell'elenco"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida precedente"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "I tasti scorciatoia per passare al metodo di input precedente"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Nasconde automaticamente"
 
-#: ../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 "Il comportamento del pannello della lingua. 0 = Inserito nel menu, 1 = Nasconde automaticamente, 2 = Mostra sempre"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Posizione pannello della lingua"
 
-#: ../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 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
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientamento della tabella di ricerca"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Mostra il nome del metodo di input"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Usare carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Inserire il testo pre-modificato"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Usa il metodo di input globale"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Abilita per impostazione predefinita il metodo di input"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:44
 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"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "Mantieni i prefissi dei nomi DConf"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
 
@@ -424,11 +475,11 @@ msgstr "Autore: %s\n"
 msgid "Description:\n"
 msgstr "Descrizione:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Seleziona un metodo di input"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -436,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Imposta Preferenze di IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Codice del tasto:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificatori:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "A_pplica"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "Eli_mina"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Premere un tasto (o una combinazione di tasti)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "A_nnulla"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:350
 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 +544,157 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Impossibile avviare il demone IBus in %d secondi"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selezione delle scorciatoie da tastiera per %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "selezione metodi di input in corso"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Elenca solo il nome del motore"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "comando [OPZIONI]"
-
-#: ../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 "Impossibile collegarsi a IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "lingua: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Nessun motore impostato.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Impostazione motore globale fallita.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Acquisizione motore globale fallita.\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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s è un comando sconosciuto!\n"
 
-#: ../ui/gtk3/panel.vala:498
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Launchpad Contributions:\n  Sergio Zanchetta https://launchpad.net/~primes2h"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Riavvia"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Esci"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ja.po b/po/ja.po
index 1f277d507..50a51b39f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Japanese
 # Japanese translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,14 +9,15 @@
 # IWAI, Masaharu <iwai@alib.jp>, 2009
 # Kiyoto Hashida <khashida@redhat.com>, 2010
 # Makoto Mizukami <makoto@fedoraporject.org>, 2010
+# noriko <noriko@redhat.com>, 2013
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
 # 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,31 +36,31 @@ msgstr "縦"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
-msgstr "左上隅"
+msgstr "左上"
 
 #: ../setup/setup.ui.h:4
 msgid "Top right corner"
-msgstr "右上隅"
+msgstr "右上"
 
 #: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
-msgstr "左下隅"
+msgstr "左下"
 
 #: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
-msgstr "右下隅"
+msgstr "右下"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "カスタム"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "メニューに組み込む"
+msgid "Do not show"
+msgstr "表示しない"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "アクティブであるとき"
+msgid "Hide automatically"
+msgstr "自動的に隠す"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -71,19 +72,19 @@ msgstr "IBus の設定"
 
 #: ../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:"
-msgstr "次のインプットメソッド:"
+msgstr "次の入力メソッド:"
 
 #: ../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:"
-msgstr "ひとつ前のインプットメソッド:"
+msgstr "ひとつ前の入力メソッド:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
@@ -91,7 +92,7 @@ msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
-msgstr "インプットメソッドをオン、オフするためのショートカットキーを設定します"
+msgstr "入力メソッドをオンまたはオフするためのショートカットキー"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -122,24 +123,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 "言語パネルの表示:"
+msgid "Show property panel:"
+msgstr "プロパティーパネルを表示する:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "言語パネルの位置"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "システムトレイにアイコンを表示する"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
-msgstr "言語バーにインプットメソッド名を表示する"
+msgstr "言語バーに入力メソッド名を表示する"
 
 #: ../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 +148,7 @@ msgstr "アプリケーションウィンドウに前編集テキストを組み
 
 #: ../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:"
@@ -161,31 +162,56 @@ msgstr "<b>フォントとスタイル</b>"
 msgid "General"
 msgstr "一般"
 
-#: ../setup/setup.ui.h:35
-msgid "Add the selected input method into the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドへ追加します"
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "追加(_A)"
 
 #: ../setup/setup.ui.h:36
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドから削除します"
+msgid "Add the selected input method into the enabled input methods"
+msgstr "選択した入力メソッドを有効な入力メソッドへ追加します"
 
 #: ../setup/setup.ui.h:37
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
+msgid "_Remove"
+msgstr "削除(_R)"
 
 #: ../setup/setup.ui.h:38
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します"
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "選択した入力メソッドを有効な入力メソッドから削除します"
 
 #: ../setup/setup.ui.h:39
-msgid "Show information of the selected input method"
-msgstr "選択したインプットメソッドの情報を表示します"
+msgid "_Up"
+msgstr "上へ(_U)"
 
 #: ../setup/setup.ui.h:40
-msgid "Show setup of the selected input method"
-msgstr "選択したインプットメソッドの設定を表示します"
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "有効な入力メソッド一覧内で選択した入力メソッドを上へ移動させます"
 
 #: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "下へ(_D)"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "有効な入力メソッド一覧内で選択した入力メソッドを下へ移動させます"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "情報(_A)"
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr "選択した入力メソッドの情報を表示します"
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "設定(_P)"
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr "選択した入力メソッドの設定を表示します"
+
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -193,35 +219,35 @@ msgid ""
 msgstr "<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr "インプットメソッド"
+msgstr "入力メソッド"
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
-msgstr "システムキーボードレイアウトを使用する"
+msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
-msgstr "システムキーボード (XKB) レイアウトを使用する"
+msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
-msgstr "すべてのアプリケーション間で同じインプットメソッドを共有する"
+msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
-msgstr "<b>グローバルインプットメソッドの設定</b>"
+msgstr "<b>グローバル入力メソッドの設定</b>"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -231,25 +257,29 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>インテリジェントなインプットバス</small>\nホームページ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "ログイン時に IBus を起動"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "情報"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
-msgstr "エンジンのプリロード"
+msgstr "プリロードエンジン"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr "ibus の開始中にエンジンをプリロード"
+msgstr "ibus 起動時のプリロードエンジン"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
@@ -257,28 +287,28 @@ msgstr "エンジンの順序"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr "インプットメソッドの一覧の中から保存されたエンジンの順序"
+msgstr "入力メソッドの一覧の中から保存されたエンジンの順序"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME スイッチャーウィンドウのためのポップアップのミリ秒単位の遅延"
+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 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
-msgstr "IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してください。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 &lt; ミリ秒単位の遅延。0 &gt; ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
+msgstr "IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デフォルトは 400 ミリ秒です。「0 =」ならウィンドウが直ちに表示されます。「0 &lt;」にすると指定したミリ秒数遅延します。「0 &gt;」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
-msgstr "保存されているバージョンナンバー"
+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 のバージョンの違いを検査するために使用されます。"
+msgstr "保存されているバージョン番号は、以前インストールした ibus のバージョンと現在の ibus のバージョンの違いをチェックする場合に使用されます。"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
@@ -294,7 +324,7 @@ msgstr "ショートカットキーを有効にする"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr "インプットメソッドをオンに切り替えるためのショートカットキー"
+msgstr "入力メソッドをオンに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
@@ -302,7 +332,7 @@ msgstr "ショートカットキーを無効にする"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr "インプットメソッドをオフに切り替えるためのショートカットキー"
+msgstr "入力メソッドをオフに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
@@ -310,7 +340,7 @@ msgstr "次のエンジンへのショートカットキー"
 
 #: ../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"
@@ -318,7 +348,7 @@ msgstr "前のエンジンへのショートカットキー"
 
 #: ../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"
@@ -326,9 +356,9 @@ 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 = 常に表示"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -338,63 +368,83 @@ msgstr "言語パネルの位置"
 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"
-msgstr "検索テーブルの方位"
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "パネルが常に表示されている場合に入力カーソルに従う"
 
 #: ../data/ibus.schemas.in.h:25
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "検索テーブルの方位。0 = 横、1 = 縦"
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr "true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。false ならば、パネルは固定位置に表示されます。"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "プロパティーパネルを表示するミリ秒"
 
 #: ../data/ibus.schemas.in.h:27
-msgid "Show input method name"
-msgstr "インプットメソッド名を表示する"
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミリ秒。"
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Orientation of lookup table"
+msgstr "検索テーブルの向き"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "検索テーブルの向きです。0 = 横、1 = 縦"
 
 #: ../data/ibus.schemas.in.h:31
+msgid "Show input method name"
+msgstr "入力メソッド名を表示する"
+
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
-msgstr "アプリケーションウィンドウにプリエディットテキストを組み込む"
+msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr "グローバルインプットメソッドを使用する"
+msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "標準でインプットメソッドを有効にする"
+msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
-msgstr "アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効にする"
+msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
-msgstr "DConf の名前のプレフィックスを保護する"
+msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf キーのプレフィックスは名前変換を停止します"
+msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -425,9 +475,9 @@ msgstr "作者: %s\n"
 msgid "Description:\n"
 msgstr "説明:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
-msgstr "インプットメソッドの選択"
+msgstr "入力メソッドの選択"
 
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
@@ -437,67 +487,85 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus を設定します"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "キーコード:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
-msgstr "モディファイア:"
+msgstr "修飾キー:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "適用(_A)"
 
-#: ../setup/keyboardshortcut.py:250
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "削除(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/main.py:99 ../setup/main.py:392
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "OK(_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "以前のインプットメソッドに切り替えるを使用する"
+msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:326
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus デーモンは稼働していません。開始しますか？"
+msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:347
+#: ../setup/main.py:350
 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 は開始しました。もし 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus デーモンは %d 秒以内に開始できませんでした。"
+msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:373
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
-#: ../setup/main.py:374
+#: ../setup/main.py:377
 msgid "switching input methods"
-msgstr "インプットメソッドの切り替え"
+msgstr "入力メソッドの切り替え中"
 
 #: ../tools/main.vala:42
 msgid "List engine name only"
-msgstr "エンジンの名前のみ一覧"
+msgstr "エンジン名のみ表示"
 
 #: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr "IBus へ接続できません。\n"
+msgstr "IBus に接続できません。\n"
 
 #: ../tools/main.vala:84
 #, c-format
@@ -521,11 +589,11 @@ msgstr "グローバルエンジンの取得に失敗しました。\n"
 
 #: ../tools/main.vala:204
 msgid "Read the system registry cache."
-msgstr "システムレジストリーキャッシュを読み込む。"
+msgstr "システムレジストリーキャッシュを読み込みます。"
 
 #: ../tools/main.vala:206
 msgid "Read the registry cache FILE."
-msgstr "レジストリーキャッシュ FILE を読み込む。"
+msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
 #: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
@@ -534,11 +602,11 @@ msgstr "レジストリーキャッシュは無効です。\n"
 
 #: ../tools/main.vala:244
 msgid "Write the system registry cache."
-msgstr "システムレジストリーキャッシュを書き込む。"
+msgstr "システムレジストリーキャッシュを書き込みます。"
 
 #: ../tools/main.vala:246
 msgid "Write the registry cache FILE."
-msgstr "レジストリーキャッシュ FILE を書き込む。"
+msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
 #: ../tools/main.vala:293
 msgid "Set or get engine"
@@ -597,26 +665,36 @@ msgstr "コマンド:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:382
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../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:661
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:665
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
-msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>"
+msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>\nMIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:697
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "設定"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "再起動"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "終了"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/kn.po b/po/kn.po
index 44dec8998..efad3826a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,21 +1,21 @@
 # translation of ibus.pot to Kannada
 # Kannada translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # shanky <prasad.mvs@gmail.com>, 2013
 # shanky <prasad.mvs@gmail.com>, 2012
 # shankar <svenkate@redhat.com>, 2009-2010,2013
-# shanky <prasad.mvs@gmail.com>, 2011
+# shanky <prasad.mvs@gmail.com>, 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-11-20 11:18+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: shanky <prasad.mvs@gmail.com>\n"
-"Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/kn/)\n"
+"Language-Team: Kannada <trans-kn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,15 +48,15 @@ msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "ಅಗತ್ಯಾನುಗುಣ"
+msgstr "ಇಚ್ಛೆಯ"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -68,7 +68,7 @@ msgstr "IBus ಆದ್ಯತೆಗಳು"
 
 #: ../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:"
@@ -76,7 +76,7 @@ msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 
 #: ../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:"
@@ -88,23 +88,23 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
+msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "ಸಕ್ರಿಯಗೊಂಡ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಂಡ:"
+msgstr "ಶಕ್ತಗೊಂಡ ಅಥವ ಅಶಕ್ತಗೊಂಡ:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "ಸಕ್ರಿಯಗೊಳಿಸು:"
+msgstr "ಶಕ್ತಗೊಳಿಸು:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು:"
+msgstr "ಅಶಕ್ತಗೊಳಿಸು:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆಗಳು</b>"
+msgstr "<b>ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
@@ -119,18 +119,18 @@ 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 "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
@@ -140,15 +140,15 @@ msgstr "ಗುರುತುಚೌಕದಲ್ಲಿ ಗುರುತು ಹಾಕ
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "ಅಗತ್ಯಾನುಗುಣ (ಕಸ್ಟಮ್) ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -158,66 +158,92 @@ msgstr "<b>ಅಕ್ಷರಶೈಲಿ ಹಾಗು ವಿನ್ಯಾಸ</b>"
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../setup/setup.ui.h:35
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "ಸೇರಿಸು (_A)"
 
 #: ../setup/setup.ui.h:36
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ"
+msgid "Add the selected input method into the enabled input methods"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
 
 #: ../setup/setup.ui.h:37
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
+msgid "_Remove"
+msgstr "ತೆಗೆದು ಹಾಕು (_R)"
 
 #: ../setup/setup.ui.h:38
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ"
 
 #: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ಮೇಲಕ್ಕೆ (_U)"
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "ಕೆಳಕ್ಕೆ (_D)"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "ಕುರಿತು (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "ಆದ್ಯತೆಗಳು (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಸಿದ್ಧತೆಯನ್ನು ತೋರಿಸು"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಸೆಟ್ಅಪ್‌ ಅನ್ನು ತೋರಿಸು"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\nಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ಜಾಗತಿಕ ಇನ್‌ಪುಟ್‌ ವಿಧಾನದ ಸಿದ್ಧತೆಗಳು</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "ಸುಧಾರಿತ"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,21 +253,25 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭಿಸು"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>ಆರಂಭ</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "ಮುಚ್ಚು (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
-msgstr "ಎಂಜಿನ್‌ಗಳನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡು"
+msgstr "ಪ್ರಿಲೋಡ್ ಎಂಜಿನ್‌ಗಳು"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
@@ -253,18 +283,18 @@ msgstr "ಎಂಜಿನ್‌ಗಳ ಕ್ರಮ"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಪಟ್ಟಿಯಲ್ಲಿ ಉಳಿಸಲಾದ ಎಂಜಿನ್‌ಗಳು"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಪಟ್ಟಿಯಲ್ಲಿನ ಉಳಿಸಲಾದ ಎಂಜಿನ್‌ಗಳು"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ"
+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 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
-msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
+msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಲು ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುಟಿಕೆ (ಪಾಪ್ಅಪ್) ವಿಳಂಬವನ್ನು ಹೊಂದಿಸಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400 ಆಗಿರುತ್ತದೆ. 0 = ಕಿಟಕಿಯನ್ನು ತಕ್ಷಣವೆ ತೋರಿಸು. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಹಿಂದಿನ/ಮುಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
@@ -274,47 +304,47 @@ msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆ"
 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 ಮತ್ತು ಪ್ರಸಕ್ತ ಲಭ್ಯವಿರುವ ibus ನಡುವಿನ ವ್ಯತ್ಯಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿರುತ್ತದೆ."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
-msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse ಗೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಆರಂಭಿಸುತ್ತದೆ"
+msgstr "gtk_accelerator_parse ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
-msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
 #: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
-msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
 #: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
+msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
 #: ../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"
-msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
+msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
 #: ../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"
@@ -322,9 +352,9 @@ 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 = ಯಾವಾಗಲೂ ತೋರಿಸು"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -337,60 +367,80 @@ msgid ""
 msgstr "ಭಾಷೆಯ ಫಲಕವು ಇರುವ ಸ್ಥಳ. 0 = ಮೇಲಿನ ಎಡ ಮೂಲೆ, 1 = ಮೇಲಿನ ಬಲ ಮೂಲೆ, 2 = ಕೆಳಗಿನ ಎಡ ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
-msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿ"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
-msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
+msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
-msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
-msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
+msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
-msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
+msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
-msgstr "ಹೆಸರಿನ ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು DConf ಕಾದಿರುಸುತ್ತದೆ"
+msgstr "DConf ಹೆಸರುಗಳು ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು ಹಾಗೆಯೆ ಇರಿಸಿಕೊಳ್ಳುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "ಹೆಸರನ್ನು ಪರಿವರ್ತಿಸುವುದನ್ನು ತಡೆಯಲು DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
+msgstr "ಹೆಸರಿನ ಪರಿವರ್ತನೆಯನ್ನು ಬದಲಿಸುವ DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -421,7 +471,7 @@ msgstr "ಕತೃ: %s\n"
 msgid "Description:\n"
 msgstr "ವಿವರಣೆ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
@@ -433,67 +483,85 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸು"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
-msgstr "ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆಗಳು"
+msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "ಕೀಲಿ ಸಂಕೇತ:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "ಮಾರ್ಪಡಕಗಳು:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "ಅನ್ವಯಿಸು (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "ಅಳಿಸು (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "ರದ್ದು ಮಾಡು (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ಸರಿ (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಬಳಸು"
+msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಸಮೀಪಮಾರ್ಗವನ್ನು ಬಳಸಿ"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
+msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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 ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನೀವು 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಆರಂಭಿಸಲಾಗಿಲ್ಲ"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬದಲಿಸುವಿಕೆ"
 
 #: ../tools/main.vala:42
 msgid "List engine name only"
-msgstr "ಕೇವಲ ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
+msgstr "ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
 
 #: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr "IBusಗೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+msgstr "IBus ನೊಂದಿಗೆ ಸಂಪರ್ಕಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
 
 #: ../tools/main.vala:84
 #, c-format
@@ -508,16 +576,16 @@ msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸ
 #: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
 #: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
 #: ../tools/main.vala:204
 msgid "Read the system registry cache."
-msgstr "ವ್ಯವಸ್ಥೆಯ ನೋಂದಣಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
+msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
 
 #: ../tools/main.vala:206
 msgid "Read the registry cache FILE."
@@ -526,7 +594,7 @@ msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು 
 #: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
 msgid "The registry cache is invalid.\n"
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ ಅಮಾನ್ಯವಾಗಿದೆ.\n"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯು ಅಮಾನ್ಯವಾಗಿದೆ.\n"
 
 #: ../tools/main.vala:244
 msgid "Write the system registry cache."
@@ -536,83 +604,93 @@ msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾ
 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 COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
-msgstr "ಆದೇಶಗಳು:\n\n"
+msgstr "ಆದೇಶಗಳು:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s ಗೊತ್ತಿರದ ಆದೇಶ!\n"
+msgstr "%s ಎನ್ನುವುದು ಗೊತ್ತಿರದ ಆದೇಶ!\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
-msgstr "IBus ಅಪ್‌ಡೇಟ್"
+msgstr "IBus ಅಪ್‌ಡೇಟ್‌"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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"
+msgstr "Super+space ಎನ್ನುವುದು ಈಗ ಪೂರ್ವನಿಯೋಜಿತ ಹಾಟ್‌ಕೀಲ್ ಆಗಿರುತ್ತದೆ."
 
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "ಆದ್ಯತೆಗಳು "
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
-msgstr "ಮರಳಿ ಆರಂಭಿಸು"
+msgstr "ಪುನರಾರಂಭಿಸು"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "ಬಿಟ್ಟು ಬಿಡು "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ko.po b/po/ko.po
index c51be603f..2ea4c54d9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,9 +1,10 @@
 # translation of ibus.pot to Korean
 # Korean translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
+# eukim <eukim@redhat.com>, 2009,2012
 # eukim <eukim@redhat.com>, 2009
 # eukim <eukim@redhat.com>, 2012
 # Hyunsok Oh <hoh@redhat.com>, 2010
@@ -12,8 +13,8 @@ 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Michelle Kim <mkim33@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,12 +52,12 @@ msgid "Custom"
 msgstr "사용자 정의"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "메뉴에 포함"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "활성화 되었을 때"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -119,18 +120,18 @@ 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 "언어 패널 표시:  "
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "언어 패널 위치:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "시스템 트레이에 아이콘 보여주기"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
 
@@ -158,66 +159,92 @@ msgstr "<b>글꼴 및 스타일</b> "
 msgid "General"
 msgstr "일반  "
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "추가(_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다  "
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "제거(_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "위로(_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "아래로(_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "정보(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "선택한 입력 방식의 정보 보여주기"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "기본 설정(_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "선택한 입력 방식 설정 보기 "
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>기본 입력 방식은 목록의 맨 위에 있습니다.\n위로/아래 버튼을 사용하여 변경할 수 있습니다.</i></small> "
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "입력 방식  "
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "시스템 키보드 레이아웃 사용  "
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>키보드 레이아웃</b>  "
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>전역 입력 방식 설정</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "고급  "
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,18 +254,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페이지: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "로그인 시 ibus 시작  "
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>시작</b>  "
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "정보  "
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "닫기(_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "엔진 미리로드"
@@ -322,9 +353,9 @@ 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 = 항상 표시  "
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -337,58 +368,78 @@ msgid ""
 msgstr "언어 패널의 위치. 0 = 왼쪽 위, 1 = 오른쪽 위, 2 = 왼쪽 아래, 3 = 오른쪽 아래, 4 = 사용자 지정"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "검색 테이블의 방향  "
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용  "
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "편집전 텍스트 포함"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "입력기를 디폴트로 활성화"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf는 이름 접두사를 보존합니다 "
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 키 접두사는 이름 변환을 중지합니다 "
 
@@ -421,7 +472,7 @@ msgstr "저자: %s\n"
 msgid "Description:\n"
 msgstr "설명:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
@@ -433,37 +484,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus 환경 설정"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "단축키"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "키 코드:  "
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "수정자:  "
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "삭제(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "확인(_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -472,17 +541,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "입력 방식 전환 중 "
 
@@ -536,83 +605,93 @@ msgstr ""
 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-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 ""
 
-#: ../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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus 업데이트"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "재시작"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "끝내기"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/lv.po b/po/lv.po
index c6d2d4577..6fa9126a1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,25 +1,25 @@
-# translation of ibus.pot to Source
-# Source translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# translation of ibus.pot to Latvian
+# Latvian translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# rudolfs.mazurs <rudolfs.mazurs@gmail.com>, 2011.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011-2012
 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-09-28 14:03+0000\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Tranzistors <rudolfs.mazurs@gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/fedora/team/"
-"lv/)\n"
-"Language: lv\n"
+"Language-Team: Latvian <trans-lv@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -30,37 +30,37 @@ msgid "Vertical"
 msgstr "Vertikāli"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Iegults izvēlnē"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Kad aktīvs"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Vienmēr"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Augšējais kreisais stūris"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Augšējais labais stūris"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Apakšējais kreisais stūris"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Apakšējais labais stūris"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Izvēlēts"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Vienmēr"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus iestatījumi"
@@ -85,7 +85,7 @@ msgstr "Iepriekšējā ievades metode:"
 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 "Saīsņu taustiņi, lai ieslēgtu vai izslēgtu ievades metodi"
 
@@ -118,26 +118,24 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Iestatīt ibus uzvedību kā rādīt vai slēpt valodas joslu"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Parādīt valodas paneli:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Valodas paneļa pozīcija:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Rādīt ikonu sistēmas ikonu joslā"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Parādīt ievades metodes nosaukumu valodas joslā"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Parādīt ievades metodes nosaukumu valodas joslā, kad tiek atzīmēta izvēles "
-"rūtiņa"
+msgstr "Parādīt ievades metodes nosaukumu valodas joslā, kad tiek atzīmēta izvēles rūtiņa"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -159,71 +157,92 @@ msgstr "<b>Fonts un stils</b>"
 msgid "General"
 msgstr "Vispārīgi"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Pievienot izvēlēto ievades metodi pie aktivētajām ievades metodēm"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Izņemt"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Noņemt izvēlēto metodi no ieslēgto ievades metožu saraksta"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Augšup"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Pārvietojiet augšup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
+msgstr "Pārvietojiet augšup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Lejup"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Pārvietojiet lejup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
+msgstr "Pārvietojiet lejup izvēlēto ievades metodi ieslēgto ievades metožu sarakstā"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "P_ar"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Parādīt informāciju par izvēlēto ievades metodi"
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Iestatījumi"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Parādīt informāciju par izvēlēto ievades metodi"
+msgstr "Rādīt izvēlētās ievadies metodes iestatījumus"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
-"<small><i>Noklusētā ievades metode atrodas saraksta augšpusē.\n"
-"Jūs varat izmantot pogas uz augšu/uz leju, lai to izmainītu.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Ievades metode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Izmantot sistēmas tastatūras izkārtojumu"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Izmantot sistēmas tastatūras (XKB) izkārtojumu "
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastatūras izkārtojums</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Starp lietotnēm izmantot vienu un to pašu ievades metodi"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globālās ievades metodes iestatījumi</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Paplašināti"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -231,37 +250,23 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteliģentā ievades kopne</small>\n"
-"Mājas lapa: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Inteliģentā ievades kopne</small>\nMājas lapa: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Startēt ibus līdz ar pieslēgšanos"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Startēšana</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Par"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Ievades metožu rāmja sistēma"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Startēt IBus ievades metožu rāmja sistēmu"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Aizvērt"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -280,119 +285,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 "Trigera saīsņu taustiņi"
 
-#: ../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ēt īsinājuma taustiņus"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Saīsņu taustiņi, lai ieslēgtu ievades metodi "
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Deaktivēt īsinājumu taustiņus"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Saīsņu taustiņi, lai izslēgtu ievades metodi "
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Nākošā dzinēja saīsņu taustiņi"
 
-#: ../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 "Saīsņu taustiņi, lai pārslēgtos uz nākamo ievades metodi sarakstā"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Iepriekšējā dzinēja saīsņu taustiņi"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Autom. slēpšana"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
-"Valodas paneļa uzvedība. 0 = iegults izvēlnē, 1 = automātiski slēpt, 2 = "
-"vienmēr rādīt"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Valodas paneļa pozīcija"
 
-#: ../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 "Valodas paneļa pozīcija. 0 = augšējais kreisais stūris, 1 = augšējais labais stūris, 2 = apakšējais kreisais stūris, 3 = apakšējais labais stūris, 4 = izvēlēts"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
-"Valodas paneļa pozīcija. 0 = augšējais kreisais stūris, 1 = augšējais labais "
-"stūris, 2 = apakšējais kreisais stūris, 3 = apakšējais labais stūris, 4 = "
-"izvēlēts"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Apsekošanas tabulas novietojums"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Apsekošanas tabulas novietojums. 0 = horizontāls, 1 = vertikāls"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Rādīt ievades metodes nosaukumu"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Izmantot izvēles fontu"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Izmantojamais izvēles fonta nosaukums valodas panelim"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Izvēlēts fonts"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Izvēlētā fonta nosaukums valodas panelim"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Iegult pirmsrediģēšanas tekstu"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Iegult pirmsrediģēšanas tekstu lietotnes logā"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Izmantot  globālo ievades metodi"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Aktivēt ievades metodi pēc noklusējuma"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Aktivēt ievades metodi pēc noklusējuma, kad lietotne saņem fokusu"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -400,38 +445,36 @@ msgstr ""
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Autortiesības (c) 2007-2010 Peng Huang\n"
-"Autortiesības (c) 2007-2010 Red Hat, Inc."
+msgstr "Autortiesības (c) 2007-2010 Peng Huang\nAutortiesības (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
 msgstr "Cits"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Valoda: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatūras izkārtojums: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autors: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Apraksts:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Izvēlieties ievades metodi"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -439,136 +482,214 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Iestatīt IBus iestatījumus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Tastatūras saīsnes"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Taustiņa kods:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modifikatoru taustiņi:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Pielietot"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Dzēst"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju).\n"
-"Dialoga logs tiks aizvērts, kad taustiņš tiks atlaists."
+msgstr "Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju).\nDialoga logs tiks aizvērts, kad taustiņš tiks atlaists."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "trigeris"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "At_celt"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "aktivēt"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Labi"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "deaktivēt"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus dēmons nav startēts. Vai vēlaties to startēt tagad?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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 tika startēts! Ja nevarat izmantot IBus, pievienojiet sekojošās "
-"rindiņas failā $HOME/.bashrc, un atkal piesakieties sesijā.\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:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Izvēlieties tastatūras saīsni priekš %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"Autortiesības (c) 2007-2010 Peng Huang\n"
-"Autortiesības (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus ir inteliģenta ievades kopne 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 ""
-"Arvis Lācis\n"
-"Pēteris Krišjānis\n"
-"Rūdolfs Mazurs"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Pārstartēt"
+#: ../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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "Iepriekšējā lapa"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Nākamā lapa"
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Dažas ievades metodes ir uzinstalētas, izņemtas vai atjauninātas. Lūdzu, "
-#~ "pārstartējiet ibus ievades platformu."
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Pārstartēt tagad"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Vēlāk"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus panelis"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus ievades metodes rāmja sistēma"
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Izslēgt ievades metodi"
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Nav ievades loga"
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "Par ievades metodi"
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Pārslēgt ievades metodi"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus ir inteliģenta ievades kopne Linux/Unix."
 
-#~ msgid "About the Input Method"
-#~ msgstr "Par ievades metodi"
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Arvis Lācis\nPēteris Krišjānis\nRūdolfs Mazurs"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Pārstartēt"
 
-#~ msgid "next input method"
-#~ msgstr "nākošā ievades metode"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Iziet"
 
-#~ msgid "previous input method"
-#~ msgstr "iepriekšējā ievades metode"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ml.po b/po/ml.po
index 7ea89f3da..7eb7b7515 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Malayalam
 # Malayalam translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Ani Peter <apeter@redhat.com>, 2009,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: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-08-20 06:40+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Ani Peter <apeter@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,12 @@ msgid "Custom"
 msgstr "യഥേഷ്ടം:"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "മെനുവില്‍ ഉള്‍പ്പെടുത്തുക"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "സജീവമാകുമ്പോള്‍"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -116,18 +116,18 @@ 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 "ഭാഷയുടെ പാനല്‍ കാണിക്കുക:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "സിസ്റ്റം ട്രേയില്‍ ചിഹ്നം കാണിക്കുക"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
@@ -155,66 +155,92 @@ msgstr "<b>അക്ഷരസഞ്ചയവും രീതിയും</b>"
 msgid "General"
 msgstr "സാധാരണ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_ചേര്‍ക്കുക"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളിലേക്കു് തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് ചേര്‍ക്കുക"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_നീക്കം ചെയ്യുക"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് നീക്കം ചെയ്യുക"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_മുകളിലേക്ക്"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് മുകളിലേക്ക് നീക്കുക"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_താഴോട്ട്"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "സജ്ജമാക്കിയ ഇന്‍പുട്ട് മെഥേഡുകളില്‍ നിന്നും തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡ് താഴേക്ക് നീക്കുക"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_അണിയറ വിശേഷങ്ങള്‍"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള്‍ കാണിക്കുക"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_മുന്‍ഗണനകള്‍ "
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "തെരഞ്ഞെടുത്ത ഇന്‍പുട്ട് രീതിയുടെ സജ്ജീകരണം കാണിയ്ക്കുക"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\nഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ്"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "മെച്ചപ്പെട്ടവ"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,18 +250,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\nപ്രധാന താള്‍: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "പ്രവേശിക്കുമ്പോള്‍ തന്നെ ibus ആരംഭിക്കുക"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>ആരംഭത്തില്‍</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "സംബന്ധിച്ചു്"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_അടയ്ക്കുക"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
@@ -319,9 +349,9 @@ 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 = എപ്പോഴും കാണിക്കുക"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -334,58 +364,78 @@ msgid ""
 msgstr "ഭാഷയുടെ പാനലിന്റെ സ്ഥാനം. 0 = മുകളില്‍ ഇടതു് കോണ്‍, 1 = മുകളില്‍ വലതു് കോണ്‍, 2 = താഴെ ഇടതു് കോണ്‍, 3 = താഴെ വലതു് കോണ്‍, 4 = യഥേഷ്ടം"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം. 0 = നേരെയുള്ള, 1 = കുറുകയുള്ള"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്ങള്‍ സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "അക്ഷരസഞ്ചയം യഥേഷ്ടമാക്കുക:"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ഭാഷയുടെ പാനലിലേക്കുള്ള അക്ഷരസഞ്ചയത്തിനുള്ള പേരു് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പുട്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുമ്പോള്‍ സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
@@ -418,7 +468,7 @@ msgstr "രചയിതാവു്: %s\n"
 msgid "Description:\n"
 msgstr "വിവരണം:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
@@ -430,37 +480,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus മുന്‍ഗണനകള്‍ സജ്ജമാക്കുക"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "കീബോര്‍ഡ് എളുപ്പവഴികള്‍"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "കീ കോഡ്:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "മോഡിഫയറുകള്‍:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_കംപ്യൂട്ടറില്‍ സൂക്ഷിക്കുക"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_വെട്ടി നീക്കുക"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_ശരി"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് രീതിയിലേക്കു് പോകുന്നതിനായി shift-നൊപ്പമുള്ള കുറുക്കുവഴി ഉപയോഗിയ്ക്കുക"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ഡെമണ്‍ പ്രവര്‍ത്തനത്തിലില്ല, നിങ്ങള്‍ക്കു് ഇതു് ആരംഭിയ്ക്കണമോ?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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 +537,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ഇന്‍പുട്ട് രീതികള്‍ തമ്മില്‍ മാറുക"
 
@@ -533,83 +601,93 @@ msgstr "സിസ്റ്റം രജിസ്ട്രി ക്യാഷി
 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-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-ന്റെ ഡി-ബസ് വിലാസം പ്രിന്റ് ചെയ്യുക"
 
-#: ../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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus പരിഷ്കരണം"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "മുന്‍ഗണനകള്‍ "
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "വീണ്ടും ആരംഭിക്കുക"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "പുറത്ത് കടക്കുക"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/mr.po b/po/mr.po
index b675ca845..a1a393575 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,8 +1,8 @@
 # translation of mr.po to Marathi
 # Marathi translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009
 # sandeeps <sshedmak@redhat.com>, 2009,2012
@@ -11,8 +11,8 @@ 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 07:34+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: sandeeps <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -50,12 +50,12 @@ msgid "Custom"
 msgstr "मनपसंत"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "मेन्यू मध्ये एम्बेड केले"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "सक्रीय असल्यावर"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -118,18 +118,18 @@ 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 "भाषा पटल दाखवा:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "भाषा पटलाचे स्थान:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "चिन्ह प्रणाली ट्रेवर दाखवा"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
 
@@ -157,66 +157,92 @@ msgstr "<b>फॉन्ट व शैली</b>"
 msgid "General"
 msgstr "सर्वसाधारण"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "समावेष करा (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "नीवडलेली इंपुट पद्धत कार्यक्षम इंपुट पद्धतींमध्ये समावेश करा"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "काढूण टाका (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "कार्यक्षम इंपुट पद्धतीपासून नीवडलेली इंपुट पद्धत काढून टाका"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "वर (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "कार्यक्षम इंपुट पद्धतींमध्ये नीवडलेली इंपुट पद्धत वर सरकवा"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "खाली (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "कार्यक्षम इंपुट पद्धतींमध्ये नीवडलेली इंपुट पद्धत खाली सरकवा"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "विषयी(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "आवड निवड (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "नीवडलेल्या इंपुट पद्धतीची मांडणी दाखवा"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\nबदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "इंपुट पद्धत"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कळफलक मांडणी</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ग्लोबल इंपुट पद्धत सेटिंग्स्</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "प्रगत"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,18 +252,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>हुशार इनपुट बस</small>\nमुख्यपान: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "प्रवेशवेळी ibus सुरू करा"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>स्टार्टअप</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "विषयी"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "बंद करा (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "प्रीलोड इंजीन्स्"
@@ -321,9 +351,9 @@ 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 = Embedded in menu, 1 = Auto hide, 2 = Always show"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -336,58 +366,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "लुकअप टेबलचे निर्देशन"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "लुकअप टेबलचे निर्देशन. 0 = Horizontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "इंपुट पद्धतीचे नाव दाखवा"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "स्वपसंत फॉन्ट वापरा"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "मनपसंत फॉन्ट"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "भाषा पटल करीता स्वपसंत फॉन्ट नाव"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "ग्लोबल इंपुट पद्धत नीवडा"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "पूर्वनितर्धारीतपणे इंपुट पद्धत सुरू करा"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू करा"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf प्रिझर्व्ह नेम प्रिफिक्सेस्"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "नाव रूपांतर थांबवण्याकरीता DConf किज्चे प्रिफिक्सेस्"
 
@@ -420,7 +470,7 @@ msgstr "लेखक: %s\n"
 msgid "Description:\n"
 msgstr "वर्णन:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "इंपुट पद्धत नीवडा"
 
@@ -432,37 +482,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus पसंती सुरू करा"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "कळफलक शार्टकट"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "कि कोड:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "मॉडिफायर:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "लागू करा (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "नष्ट करा (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ठिक आहे (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "मागील इंपुट पद्धतीचा वापर करण्यासाठी शिफ्टसह शार्टकटचा वापर करा"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus डिमन सुरू नाही. तुम्हाला ते सुरू करायचे?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -471,17 +539,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s करीता कळफलक शार्टकट नीवडा"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "इंपुट पद्धतींचा वापर करत आहे"
 
@@ -535,83 +603,93 @@ msgstr "प्रणाली रेजिस्ट्रि कॅशे लि
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus सुधारणा"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat.com>, 2009, 2010."
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "आवड निवड"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "पुन्हा चालू करा"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "बाहेर पडा "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/nb.po b/po/nb.po
index 1805e0342..c0a5f04db 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Norwegian Bokmål
 # Norwegian Bokmål translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Kjartan Maraas <kmaraas@gnome.org>, 2012.
+# Kjartan Maraas <kmaraas@gnome.org>, 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-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-10-15 03:22+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -48,11 +48,11 @@ msgid "Custom"
 msgstr "Egendefinert"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
@@ -83,7 +83,7 @@ msgstr "Forrige inndatametode:"
 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 ""
 
@@ -116,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Vis språkpanel:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posisjon for språkpanel:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 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:32
 msgid "Show input method name on language bar"
 msgstr ""
 
@@ -155,66 +155,92 @@ msgstr "<b>Skrift og stil</b>"
 msgid "General"
 msgstr "Generelt"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Legg til"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Opp"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "Ne_d"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Om"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Vis informasjon om valgt inndatametode"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Brukervalg"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Inndatametode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturutforming</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globale innstillinger for inndatametode</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,29 +250,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Start ibus ved pålogging"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Oppstart</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 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 "Rammeverk for inndatametode"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus rammeverk for inndatametode"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Lukk"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -265,114 +283,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable shortcut keys"
+msgid "Saved version number"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-msgid "The shortcut keys for turning input method on"
+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 "Slå av snarveitaster"
 
-#: ../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 "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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Egendefinert skrift"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Egendefinert skriftnavn for språkpanelet"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Slå på inndatametode som forvalg"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -386,30 +449,30 @@ msgstr "Opphavsrett © 2007-2010 Peng Huang\nOpphavsrett © 2007-2010 Red Hat, I
 msgid "Other"
 msgstr "Annet"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Språk: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturutforming: %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:135
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Velg en inndatametode"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Tastatur"
 
@@ -417,45 +480,55 @@ msgstr "Tastatur"
 msgid "Set IBus Preferences"
 msgstr "Sett brukervalg for IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Tastekode:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Endringstaster:"
 
-#: ../setup/keyboardshortcut.py:251
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Bruk"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Vennligst trykk en tast (eller en tastekombinasjon)"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "utløser"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "slå på"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
 
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "slå av"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -464,83 +537,157 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Velg tastatursnarvei for %s"
 
-#: ../tools/main.vala:40
-msgid "List engine name only"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
+#: ../tools/main.vala:42
+msgid "List engine name only"
 msgstr ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr ""
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../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 ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
+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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:361
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inndatabuss for Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Brukervalg"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Start på nytt"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Avslutt"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/nl.po b/po/nl.po
index 2cbc5a860..d561d2e2a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,16 +1,16 @@
 # translation of nl.po to Dutch
 # Dutch translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Geert Warrink <geert.warrink@onsnet.nu>, 2011-2013
+# Geert Warrink <geert.warrink@onsnet.nu>, 2011-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\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 12:13+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,12 @@ msgid "Custom"
 msgstr "Aangepast"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Ingebed in menu"
+msgid "Do not show"
+msgstr "Toon dit niet"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Als deze actief is"
+msgid "Hide automatically"
+msgstr "Automatisch verbergen"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -116,18 +116,18 @@ 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"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Toon taal paneel:"
+msgid "Show property panel:"
+msgstr "Toon eigenschapspaneel"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Taal panel positie:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Toon icoon op systeemvak"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Toon naam van invoermethode op taalbalk"
 
@@ -155,31 +155,56 @@ msgstr "<b>Lettertype en stijl</b>"
 msgid "General"
 msgstr "Algemeen"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Verwijderen"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Omhoog"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Verplaats de geselecteerde invoermethode omhoog in de aangezette invoermethoden lijst"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "O_mlaag"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Verplaats de geselecteerde invoermethode omlaag in de aangezette invoermethoden lijst"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "I_nfo"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Toon informatie over de geselecteerde invoermethode"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Voorkeuren"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Toon instelling van de geselecteerde invoermethode"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -187,35 +212,35 @@ msgid ""
 msgstr "<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globale invoermethode instellingen</b>"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,18 +250,22 @@ msgid ""
 "\n"
 msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\nHomepagina: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Start ibus bij inloggen"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Over"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "Sl_uiten"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Engines voor-laden"
@@ -320,9 +349,9 @@ msgstr "Automatisch verbergen"
 
 #: ../data/ibus.schemas.in.h:21
 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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch verbergen, 2 = Toon het altijd"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -335,58 +364,78 @@ msgid ""
 msgstr "De positie van de taal paneel. 0 = linksboven, 1 = rechtsboven, 2 = linksonder,  3 = rechtsonder, 4 = aangepast"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "Volg de input cursor als het paneel altijd getoond wordt"
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr "Als dit waar is zal het paneel de input cursor volgen als het panel altijd getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie getoond."
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "Het aanral milliseconden om het eigenschapspaneel te tonen "
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of eigenschappen veranderd zijn."
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Toon naam van invoermethode"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -419,7 +468,7 @@ msgstr "Auteur: %s\n"
 msgid "Description:\n"
 msgstr "Beschrijving:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Selecteer een invoermethode"
 
@@ -431,37 +480,55 @@ msgstr "Toetsenbord"
 msgid "Set IBus Preferences"
 msgstr "Stel IBus voorkeuren in"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Toetscode:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificatietoetsen:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "Toe_passen"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Verwijderen"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/main.py:99 ../setup/main.py:392
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Ok"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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:326
+#: ../setup/main.py:329
 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:347
+#: ../setup/main.py:350
 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 +537,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, 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:373
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
-#: ../setup/main.py:374
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
@@ -591,26 +658,36 @@ msgstr "Commando's:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:382
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../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:661
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:665
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:697
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Opnieuw starten"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Afsluiten"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/or.po b/po/or.po
index 93806642b..238d32ee3 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Oriya
 # Oriya translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2013
 # Manoj Kumar Giri <mgiri@redhat.com>, 2013
@@ -10,8 +10,8 @@ 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-19 10:14+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -49,12 +49,12 @@ msgid "Custom"
 msgstr "ଇଚ୍ଛାରୂପୀ"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "ତାଲିକାରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "ସକ୍ରିୟ ଥିବା ସମୟରେ"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -117,18 +117,18 @@ 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 "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
@@ -156,66 +156,92 @@ msgstr "<b>ଅକ୍ଷରରୂପ ଏବଂ ଶୈଳୀ</b>"
 msgid "General"
 msgstr "ସାଧାରଣ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀରେ ଯୋଗକରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "କାଢ଼ନ୍ତୁ (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିରୁ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ କାଢ଼ିଦିଅନ୍ତୁ"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ଉପର (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତି ତାଲିକାରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "ତଳ (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିଗୁଡ଼ିକରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ତଳକୁ ଘୁଞ୍ଚାନ୍ତୁ"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "ବିବରଣୀ (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "ପସନ୍ଦ (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀର ବ୍ୟବସ୍ଥାକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\nଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ନିବେଶ ପ୍ରଣାଳୀ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀ ବିନ୍ୟାସ</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "ଉନ୍ନତ"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,18 +251,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\nମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>ଆରମ୍ଭ</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "ବିବରଣୀ"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
@@ -320,9 +350,9 @@ 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 = ସର୍ବଦା ଦର୍ଶାନ୍ତୁ"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -335,58 +365,78 @@ msgid ""
 msgstr "ଭାଷା ଫଳକର ଅବସ୍ଥାନ। 0 = ଉପର ପାଖ ବାମ କୋଣ, 1 = ଉପର ପାଖ ଡାହାଣ କୋଣ, 2 = ତଳ ପାଖ ବାମ କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf ନାମ ଉପସର୍ଗଗୁଡ଼ିକୁ ସଂରକ୍ଷିତ ରଖିଥାଏ"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ନାମ ପରିବର୍ତ୍ତନକୁ ଅଟକାଇବା ପାଇଁ DConf କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
 
@@ -419,7 +469,7 @@ msgstr "ଲେଖକ: %s\n"
 msgid "Description:\n"
 msgstr "ବର୍ଣ୍ଣନା:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
 
@@ -431,37 +481,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟକରନ୍ତୁ"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "କି ସଂକେତ:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "ରୂପାନ୍ତରକ:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "ଲିଭାନ୍ତୁ (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ଠିକ ଅଛି (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "shift ସହିତ ସଂକ୍ଷିପ୍ତ ପଥକୁ ପୂର୍ବ ନିବେଶ ପଦ୍ଧତିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ଡେମନ ଚାଲୁ ନାହିଁ। ଆପଣ ଏହାକୁ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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 +538,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ଡେମନ  %d ସେକଣ୍ଡରେ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରୁଅଛି"
 
@@ -534,83 +602,93 @@ msgstr "ତନ୍ତ୍ର ପଞ୍ଜିକରଣ କ୍ୟାଶେକୁ ଲ
 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 "ibus-ଡେମନର 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus ଅଦ୍ୟତନ"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "ପସନ୍ଦ"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "ପୁନଃଚାଳନ"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "ବିଦାୟ ନିଅନ୍ତୁ"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/pa.po b/po/pa.po
index f4eb54249..b1d58a4d4 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,21 +1,23 @@
 # translation of ibus.pot to Panjabi
 # Panjabi translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # asaini <asaini@redhat.com>, 2013
 # Amanpreet Singh <aalam@users.sf.net>, 2008
+# asaini <asaini@redhat.com>, 2013
 # A S Alam <aalam@users.sf.net>, 2009
 # A S Alam <apreet.alam@gmail.com>, 2011-2012
 # Jaswinder Singh <jsingh@redhat.com>, 2009-2010
 # Jaswinder Singh <phulewala.j@gmail.com>, 2011,2013
+# Jaswinder Singh <phulewala.j@gmail.com>, 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-09-11 13:58+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: asaini <asaini@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +55,12 @@ msgid "Custom"
 msgstr "ਪਸੰਦ"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "ਮੇਨੂ ਵਿੱਚ ਸ਼ਾਮਲ"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "ਜਦੋਂ ਐਕਟਿਵ"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -121,18 +123,18 @@ 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 "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖਾਓ:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
@@ -160,66 +162,92 @@ msgstr "<b>ਫੋਂਟ ਅਤੇ ਸਟਾਈਲ</b>"
 msgid "General"
 msgstr "ਆਮ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕੀਤੇ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚੋਂ ਹਟਾਓ"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "ਉੱਤੇ(_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "ਹੇਠਾਂ(_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "ਇਸ ਬਾਰੇ(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ(_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸੈਟਅੱਪ ਵੇਖਾਓ"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\nਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -229,18 +257,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\nਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ibus ਚਲਾਓ"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>ਸ਼ੁਰੂ</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
@@ -324,9 +356,9 @@ 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 = ਹਮੇਸ਼ਾ ਵੇਖੋ"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -339,58 +371,78 @@ msgid ""
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਦੀ ਸਥਿਤੀ. 0 = ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ, 1 = ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ, 2 = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ, 3 = ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf ਨਾਂ ਅਗੇਤਰ ਰੱਖਦਾ ਹੈ"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
 
@@ -423,7 +475,7 @@ msgstr "ਲੇਖਕ: %s\n"
 msgid "Description:\n"
 msgstr "ਵੇਰਵਾ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
@@ -435,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "ਕੀ ਕੋਡ:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "ਮੋਡੀਫਾਇਰ:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "ਲਾਗੂ ਕਰੋ(_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "ਹਟਾਓ(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "ਠੀਕ ਹੈ(_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲੇ ਇੰਪੁੱਟ ਢੰਗ ਤੇ ਜਾਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਬਟਨ"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ਡੈਮਨ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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,17 +544,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਨਾ"
 
@@ -538,83 +608,93 @@ msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਲਿਖੋ।"
 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-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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus ਅੱਪਡੇਟ"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\nhttp://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "ਬਾਹਰ"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index 333632aa0..c475e67cb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,16 +1,16 @@
 # translation of pl.po to Polish
 # Polish translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2013
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\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-12-01 15:22+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,12 @@ msgid "Custom"
 msgstr "Własna"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Osadzanie w menu"
+msgid "Do not show"
+msgstr "Bez wyświetlania"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "W czasie aktywności"
+msgid "Hide automatically"
+msgstr "Automatyczne ukrywanie"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -116,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi IBus"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Wyświetlanie panelu języków:"
+msgid "Show property panel:"
+msgstr "Wyświetlanie panelu właściwości:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Pozycja panelu języków:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Wyświetlanie ikony w obszarze powiadamiania"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
@@ -155,31 +155,56 @@ msgstr "<b>Czcionka i styl</b>"
 msgid "General"
 msgstr "Ogólne"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Dodanie wybranej metody wprowadzania do włączonych metod wprowadzania"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Usuń"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Usunięcie zaznaczonej metody wprowadzania we włączonych metodach wprowadzania"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "W _górę"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "W _dół"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach wprowadzania"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_O programie"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "P_referencje"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Wyświetlanie ustawień zaznaczonej metody wprowadzania"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -187,35 +212,35 @@ msgid ""
 msgstr "<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Użycie systemowego układu klawiatury (XKB)"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,18 +250,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Uruchamianie IBus podczas logowania"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "O programie"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "Za_mknij"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Wcześniejsze wczytanie mechanizmów"
@@ -320,9 +349,9 @@ msgstr "Automatyczne ukrywanie"
 
 #: ../data/ibus.schemas.in.h:21
 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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -335,58 +364,78 @@ msgid ""
 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 "Follow the input cursor in case the panel is always shown"
+msgstr "Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr "Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to panel jest wyświetlany w stałym położeniu."
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "Milisekundy do wyświetlenia panelu właściwości"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub właściwości."
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Wyświetlanie nazwy metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Własna czcionka"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Nazwa własnej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność wprowadzania"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -419,7 +468,7 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Opis:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
@@ -431,37 +480,55 @@ msgstr "KBD"
 msgid "Set IBus Preferences"
 msgstr "Ustawianie preferencji usługi IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Kod klawisza:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modyfikatory:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Zastosuj"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Usuń"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/main.py:99 ../setup/main.py:392
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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:326
+#: ../setup/main.py:329
 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:347
+#: ../setup/main.py:350
 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 +537,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, 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:373
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
-#: ../setup/main.py:374
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -591,26 +658,36 @@ msgstr "Polecenia:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:382
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../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:661
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:665
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:697
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Uruchom ponownie"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Zakończ"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8ce4eb144..61293d74c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Portuguese (Brazil)
 # Portuguese (Brazil) translation of ibus.
-# Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Arthur Rodrigues Araruna <araruna@gmail.com>, 2012
 # Automatically generated, 2010
@@ -12,8 +12,8 @@ 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 04:48+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Glaucia Freitas <gcintra@redhat.com>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,12 +51,12 @@ msgid "Custom"
 msgstr "Padrão"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Embutido no menu"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Quando ativado"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -86,7 +86,7 @@ msgstr "Método de entrada anterior:"
 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 "As teclas de atalho para ligar ou desligar o método de entrada"
 
@@ -119,18 +119,18 @@ 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"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Apresente o painel de linguagem:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posição do Painel de Linguagem:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Apresenta o nome do método de entrada na barra de linguagem"
 
@@ -158,66 +158,92 @@ msgstr "<b>Fonte e Estilo</b>"
 msgid "General"
 msgstr "Geral"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: ../setup/setup.ui.h:36
 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"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "A_cima"
+
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "A_baixo"
+
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Sobre"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Apresente a informação do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostrar configuração do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>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.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configurações de Método de Entrada Global</b> "
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -227,29 +253,21 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Inicie o ibus na conexão "
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Sobre"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework do método de entrada"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Iniciar Framework do método de entrada IBus"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Fechar"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -279,118 +297,148 @@ msgid ""
 msgstr "Configuração do popup atrasa milisegundos par exibir a janela do alterador IME. O padrão é 400.0 = Exibe a janela imediatamente. 0 &lt; Atrasa milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
 
 #: ../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 "Realiza o trigger nas teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Desencadeia chaves de atalho para o "
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Habilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "As teclas de atalho para ligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Desabilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "As teclas de atalho para desligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Próximo mecanismo de teclas de atalho"
 
-#: ../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 "As teclas de atalho para alteração ao próximo método de entrada na lista "
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Visualização do mecanismo das teclas de atalho "
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Ocultar Automaticamente"
 
-#: ../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 "O comportamento do painel de linguagem. 0 = Embutido no menu, 1 = Ocultar automaticamente, 2 = Apresentar sempre"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Posição do Painel de Linguagem"
 
-#: ../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 "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
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Orientação da tabela de pesquisa"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Apresenta o nome do método de entrada"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Usa o nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Fonte padrão"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:44
 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"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -423,11 +471,11 @@ msgstr "Autor: %s\n"
 msgid "Description:\n"
 msgstr "Descrição:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Selecione um método de entrada"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -435,37 +483,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Definir Preferências do IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Atalhos do teclado"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Código de tecla:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "E_xcluir"
+
+#: ../setup/keyboardshortcut.py:254
 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."
 
-#: ../setup/keyboardshortcut.py:252
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 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"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:350
 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 +540,157 @@ msgid ""
 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"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "mudando métodos de entrada"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Somente o Nome do motor da lista"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "comando [OPÇÕES]"
-
-#: ../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 "Não foi possível conectar ao 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 "Nenhum motor configurado.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Configurar motor global falhou.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Obter motor global falhour.\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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
-#: ../ui/gtk3/panel.vala:498
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Reinicie"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Sair"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ru.po b/po/ru.po
index ab588b05a..aacda15eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,18 +1,19 @@
 # translation of ibus.pot to Russian
 # Russian translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Koterpillar <koterpillar@gmail.com>, 2009
+# Koterpillar <koterpillar@gmail.com>, 2009
 # Yulia <ypoyarko@redhat.com>, 2010
-# Yulia <yulia.poyarkova@redhat.com>, 2013
+# Yulia <yulia.poyarkova@redhat.com>, 2013-2014
 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Yulia <yulia.poyarkova@redhat.com>\n"
 "Language-Team: Russian <trans-ru@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -50,12 +51,12 @@ msgid "Custom"
 msgstr "Свой"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Встроена в меню"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Когда активно"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -118,18 +119,18 @@ 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 "Показывать языковую панель:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Расположение языковой панели:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Показать значок в области уведомлений"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Показывать название метода ввода на языковой панели"
 
@@ -147,7 +148,7 @@ msgstr "Вставить готовый текст метода ввода в о
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "Произвольный шрифт:"
+msgstr "Выбрать шрифт:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -157,66 +158,92 @@ msgstr "<b>Шрифт и стиль</b>"
 msgid "General"
 msgstr "Основные"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Добавить"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Добавить выбранный метод ввода к используемым"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Удалить"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Удалить выбранный метод ввода из списка"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "Вв_ерх"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Переместить выбранный метод ввода вверх в списке используемых"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "В_низ"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Переместить выбранный метод ввода вниз в списке используемых"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_О программе"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Показать информацию о выбранном методе ввода"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Параметры"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Показать настройки выбранного метода ввода"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>По умолчанию используется первый в списке метод ввода.\nИспользуйте кнопки вверх/вниз для изменения.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Метод ввода"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Использовать системную раскладку клавиатуры"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Использовать системную раскладку (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Раскладка клавиатуры</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Использовать один метод ввода для всех приложений"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Настройки глобального метода ввода</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,18 +253,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Интеллектуальная система ввода</small>\nДомашняя страница: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Запускать iBus при входе в систему:"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "О программе"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Предварительная загрузка методов ввода"
@@ -321,9 +352,9 @@ 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 = всегда показывать"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -336,58 +367,78 @@ msgid ""
 msgstr "Расположение языковой панели: 0 = левый верхний угол, 1 = правый верхний угол, 2 = левый нижний угол, 3 = правый нижний угол, 4 = произвольное"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Ориентация таблицы поиска"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Показывать название метода ввода"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Использовать свой шрифт"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Использовать свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Свой шрифт"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Вставить готовый текст"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вставить готовый текст в окно приложения"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Использовать глобальный метод ввода"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Включить метод ввода по умолчанию"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Включить метод ввода по умолчанию при получении приложением фокуса ввода"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf сохраняет префиксы имен."
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префиксы ключей DConf для предотвращения преобразования имен"
 
@@ -420,7 +471,7 @@ msgstr "Автор: %s\n"
 msgid "Description:\n"
 msgstr "Описание:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Выберите метод ввода"
 
@@ -432,37 +483,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Настроить параметры IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Комбинации клавиш"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Код клавиши:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Модификаторы:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Применить"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Нажмите клавишу (или сочетание клавиш)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "О_тменить"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Использовать сочетание SHIFT для выбора предыдущего метода ввода"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus не выполняется. Запустить?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -471,17 +540,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не удалось запустить IBus через %d сек."
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Выберите комбинацию клавиш для %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "изменение методов ввода"
 
@@ -520,7 +589,7 @@ msgstr "Чтение кэша системного реестра."
 
 #: ../tools/main.vala:206
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Чтение файла кэша реестра."
 
 #: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
@@ -529,89 +598,99 @@ msgstr "Недействительный кэш реестра.\n"
 
 #: ../tools/main.vala:244
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Запись в кэш системного реестра."
 
 #: ../tools/main.vala:246
 msgid "Write the registry cache FILE."
-msgstr ""
+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 ""
 
-#: ../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 ""
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
-msgstr ""
+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 ""
 
-#: ../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:425
 msgid "IBus Update"
-msgstr ""
+msgstr "Обновление IBus"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus &mdash; интеллектуальная система ввода для Linux и Unix."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\nYulia <ypoyarko@redhat.com>, 2010."
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Параметры"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Перезапустить"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Выход"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/sr.po b/po/sr.po
index ab2c17874..ba16bf684 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,104 +1,91 @@
-# Serbian translations for ibus
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# translation of ibus.pot to Serbian
+# Serbian translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# Miloš Komarčević <kmilos@gmail.com>, 2009.
 #
+# Translators:
+# Miloš Komarčević <kmilos@gmail.com>, 2009
 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: 2009-04-01 19:58+0100\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"Language: sr\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
-#, fuzzy
 msgid "Horizontal"
 msgstr ""
-"Водоравно\n"
-"Усправно"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
 msgstr ""
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
+msgid "Top left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:4
-#, fuzzy
-msgid "When active"
+msgid "Top right corner"
 msgstr ""
-"Никад\n"
-"Када је активно\n"
-"Увек"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
+msgid "Bottom left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
+msgid "Bottom right corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
+msgid "Custom"
 msgstr ""
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
-#, fuzzy
-msgid "Custom"
-msgstr "Прилагођени фонт:"
+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
-#, fuzzy
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
+msgstr ""
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
 msgstr "Следећа метода уноса:"
 
 #: ../setup/setup.ui.h:14
-#, fuzzy
 msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
 #: ../setup/setup.ui.h:15
-#, fuzzy
 msgid "Previous input method:"
-msgstr "Претходна метода уноса:"
+msgstr ""
 
 #: ../setup/setup.ui.h:16
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
-#, fuzzy
+#: ../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:"
@@ -117,9 +104,8 @@ msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Пречице тастатуре</b>"
 
 #: ../setup/setup.ui.h:22
-#, fuzzy
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Оријентација референтне табеле"
+msgstr ""
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
@@ -130,27 +116,24 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Прикажи језички панел:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
-#, fuzzy
 msgid "Language panel position:"
-msgstr "Прикажи језички панел:"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
-#, fuzzy
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
-msgstr "Назив прилагођеног фонта за језички панел"
+msgstr ""
 
 #: ../setup/setup.ui.h:29
-#, fuzzy
 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"
@@ -161,9 +144,8 @@ msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
 #: ../setup/setup.ui.h:32
-#, fuzzy
 msgid "Use custom font:"
-msgstr "Употреби прилагођени фонт"
+msgstr ""
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -173,69 +155,92 @@ msgstr "<b>Фонт и стил</b>"
 msgid "General"
 msgstr "Опште"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Додај"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Горе"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Доле"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_О програму"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "Пос_тавке"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Методе уноса"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
-#, fuzzy
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr "Методе уноса"
+msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
-#, fuzzy
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Пречице тастатуре</b>"
+msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "Изаберите методу уноса"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -243,191 +248,194 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Интелигентна магистрала уноса</small>\n"
-"Матична страница: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интелигентна магистрала уноса</small>\nМатична страница: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Покрени ibus при пријави"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Покретање</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "О програму"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus радни оквир методе уноса"
-
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus радни оквир методе уноса"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Затвори"
 
 #: ../data/ibus.schemas.in.h:1
-#, fuzzy
 msgid "Preload engines"
-msgstr "Унапред учитај погоне"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:2
-#, fuzzy
 msgid "Preload engines during ibus starts up"
-msgstr "Унапред учитај погоне током ibus покретања"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-#, fuzzy
 msgid "Saved engines order in input method list"
-msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-#, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "Пречица окидача"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
-msgid "Enable shortcut keys"
-msgstr "Пречица окидача"
+msgid "Saved version number"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "The shortcut keys for turning input method on"
+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
-#, fuzzy
+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 "Пречица окидача"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
-#: ../data/ibus.schemas.in.h:11
-#, fuzzy
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr "Пречица следећег погона"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-#, fuzzy
+#: ../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:13
-#, fuzzy
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
-msgstr "Пречица претходног погона"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
-"Пречица претходног погона за пребацивање на претходни погон методе уноса"
 
-#: ../data/ibus.schemas.in.h:15
-#, fuzzy
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
-msgstr "Самостално сакривање"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-#, fuzzy
+#: ../data/ibus.schemas.in.h:21
 msgid ""
-"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"
 msgstr ""
-"Понашање језичког панела. 0 = увек сакривен, 1 = самостално сакривање, 2 = "
-"увек приказан"
 
-#: ../data/ibus.schemas.in.h:17
-#, fuzzy
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
-msgstr "Прикажи језички панел:"
+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 ""
 
-#: ../data/ibus.schemas.in.h:19
-#, fuzzy
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
-msgstr "Оријентација референтне табеле"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-#, fuzzy
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Оријентација референтне табеле. 0 = водоравно, 1 = усправно"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-#, fuzzy
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
-msgstr "Назив прилагођеног фонта за језички панел"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Употреби прилагођени фонт"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Користи прилагођени фонт за језички панел"
 
-#: ../data/ibus.schemas.in.h:28
-#, fuzzy
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr "Прилагођени фонт:"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Назив прилагођеног фонта за језички панел"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
-#, fuzzy
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr "Изаберите методу уноса"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
-#, fuzzy
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "Следећа метода уноса"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -441,200 +449,245 @@ msgstr ""
 msgid "Other"
 msgstr "Друго"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:70
-#, fuzzy, python-format
+#: ../setup/engineabout.py:71
+#, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "Пречице тастатуре"
+msgstr ""
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr ""
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Изаберите методу уноса"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr ""
 
 #: ../setup/ibus-setup.desktop.in.h:2
-#, fuzzy
 msgid "Set IBus Preferences"
-msgstr "IBus поставке"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Пречице тастатуре"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Код тастера:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Модификатори:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Примени"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Обриши"
+
+#: ../setup/keyboardshortcut.py:254
 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:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Притисните тастер (или комбинацију тастера)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "окидач"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "О_дустани"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "У _реду"
 
-#: ../setup/main.py:81
-msgid "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus демон није покренут. Да ли желите да га сада покренете?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Изаберите пречицу тастатуре за %s"
 
-#: ../ui/gtk3/panel.vala:330
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus је интелигентна магистрала уноса за Linux/Unix."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Serbian <fedora-trans-sr@redhat.com>"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-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 ""
 
-#, fuzzy
-#~ msgid "Previous page"
-#~ msgstr "Претходна метода уноса:"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Next page"
-#~ msgstr "следећи погон"
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Restart Now"
-#~ msgstr "Покрени поново"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Later"
-#~ msgstr "Друго"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus радни оквир методе уноса"
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Turn off input method"
-#~ msgstr "Нема методе уноса"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Switch input method"
-#~ msgstr "Нема методе уноса"
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "About the Input Method"
-#~ msgstr "Методе уноса"
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#, fuzzy
-#~ msgid "next input method"
-#~ msgstr "Следећа метода уноса"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#, fuzzy
-#~ msgid "previous input method"
-#~ msgstr "Претходна метода уноса"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use global engine"
-#~ msgstr "Унапред учитај погоне"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Langauge panel position"
-#~ msgstr "Прикажи језички панел:"
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
 
-#~ msgid "Custom font:"
-#~ msgstr "Прилагођени фонт:"
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Font for language bar and candidates"
-#~ msgstr "Назив прилагођеног фонта за језички панел"
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use custom font for language bar and candidates"
-#~ msgstr "Користи прилагођени фонт за језички панел"
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Custom Font"
-#~ msgstr "Прилагођени фонт"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show IM name on language bar"
-#~ msgstr "Назив прилагођеног фонта за језички панел"
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#~ msgid "Use Custom Font"
-#~ msgstr "Користи прилагођени фонт"
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus је интелигентна магистрала уноса за Linux/Unix."
 
-#~ msgid "Prev engine hotkey for switch to previous input method engine"
-#~ msgstr ""
-#~ "Пречица претходног погона за пребацивање на претходни погон методе уноса"
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
-#~ msgid "Trigger hotkey for enable or disable input context"
-#~ msgstr "Пречица окидача за укључивање или искључивање контекста уноса"
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Поставке"
 
-#~ msgid "[Control+space]"
-#~ msgstr "[Control+space]"
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Покрени поново"
 
-#~ msgid "Switch engine"
-#~ msgstr "Промени погон"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Изађи"
 
-#~ msgid "prev engine"
-#~ msgstr "претходни погон"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index f4bfb741f..efca35200 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,104 +1,91 @@
-# Serbian(Latin) translations for ibus
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# translation of ibus.pot to Serbian (Latin)
+# Serbian (Latin) translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# Miloš Komarčević <kmilos@gmail.com>, 2009.
 #
+# Translators:
+# Miloš Komarčević <kmilos@gmail.com>, 2009
 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: 2009-04-01 19:58+0100\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"Language: sr@latin\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
-#, fuzzy
 msgid "Horizontal"
 msgstr ""
-"Vodoravno\n"
-"Uspravno"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
 msgstr ""
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
+msgid "Top left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:4
-#, fuzzy
-msgid "When active"
+msgid "Top right corner"
 msgstr ""
-"Nikad\n"
-"Kada je aktivno\n"
-"Uvek"
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
+msgid "Bottom left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
+msgid "Bottom right corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
+msgid "Custom"
 msgstr ""
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
-#, fuzzy
-msgid "Custom"
-msgstr "Prilagođeni font:"
+msgid "Always"
+msgstr ""
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "IBus postavke"
 
 #: ../setup/setup.ui.h:12
-#, fuzzy
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
+msgstr ""
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
 msgstr "Sledeća metoda unosa:"
 
 #: ../setup/setup.ui.h:14
-#, fuzzy
 msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
 #: ../setup/setup.ui.h:15
-#, fuzzy
 msgid "Previous input method:"
-msgstr "Prethodna metoda unosa:"
+msgstr ""
 
 #: ../setup/setup.ui.h:16
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
-#, fuzzy
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -117,9 +104,8 @@ msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Prečice tastature</b>"
 
 #: ../setup/setup.ui.h:22
-#, fuzzy
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Orijentacija referentne tabele"
+msgstr ""
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
@@ -130,27 +116,24 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Prikaži jezički panel:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
-#, fuzzy
 msgid "Language panel position:"
-msgstr "Prikaži jezički panel:"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
-#, fuzzy
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgstr ""
 
 #: ../setup/setup.ui.h:29
-#, fuzzy
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgstr ""
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -161,9 +144,8 @@ msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
 #: ../setup/setup.ui.h:32
-#, fuzzy
 msgid "Use custom font:"
-msgstr "Upotrebi prilagođeni font"
+msgstr ""
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -173,69 +155,92 @@ msgstr "<b>Font i stil</b>"
 msgid "General"
 msgstr "Opšte"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Gore"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Dole"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_O programu"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "Pos_tavke"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Metode unosa"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
-#, fuzzy
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr "Metode unosa"
+msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
-#, fuzzy
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Prečice tastature</b>"
+msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "Izaberite metodu unosa"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -243,191 +248,194 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteligentna magistrala unosa</small>\n"
-"Matična stranica: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala unosa</small>\nMatična stranica: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Pokreni ibus pri prijavi"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Pokretanje</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "O programu"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus radni okvir metode unosa"
-
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus radni okvir metode unosa"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Zatvori"
 
 #: ../data/ibus.schemas.in.h:1
-#, fuzzy
 msgid "Preload engines"
-msgstr "Unapred učitaj pogone"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:2
-#, fuzzy
 msgid "Preload engines during ibus starts up"
-msgstr "Unapred učitaj pogone tokom ibus pokretanja"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:4
-#, fuzzy
 msgid "Saved engines order in input method list"
-msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-#, fuzzy
-msgid "Trigger shortcut keys"
-msgstr "Prečica okidača"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-#, fuzzy
-msgid "Enable shortcut keys"
-msgstr "Prečica okidača"
+msgid "Saved version number"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "The shortcut keys for turning input method on"
+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 ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
 #: ../data/ibus.schemas.in.h:9
-#, fuzzy
+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 "Prečica okidača"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
-#: ../data/ibus.schemas.in.h:11
-#, fuzzy
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr "Prečica sledećeg pogona"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-#, fuzzy
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-#, fuzzy
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
-msgstr "Prečica prethodnog pogona"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
-"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
 
-#: ../data/ibus.schemas.in.h:15
-#, fuzzy
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
-msgstr "Samostalno sakrivanje"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-#, fuzzy
+#: ../data/ibus.schemas.in.h:21
 msgid ""
-"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"
 msgstr ""
-"Ponašanje jezičkog panela. 0 = uvek sakriven, 1 = samostalno sakrivanje, 2 = "
-"uvek prikazan"
 
-#: ../data/ibus.schemas.in.h:17
-#, fuzzy
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
-msgstr "Prikaži jezički panel:"
+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 ""
 
-#: ../data/ibus.schemas.in.h:19
-#, fuzzy
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
-msgstr "Orijentacija referentne tabele"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-#, fuzzy
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orijentacija referentne tabele. 0 = vodoravno, 1 = uspravno"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-#, fuzzy
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
-msgstr "Naziv prilagođenog fonta za jezički panel"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Upotrebi prilagođeni font"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Koristi prilagođeni font za jezički panel"
 
-#: ../data/ibus.schemas.in.h:28
-#, fuzzy
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr "Prilagođeni font:"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Naziv prilagođenog fonta za jezički panel"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
-#, fuzzy
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr "Izaberite metodu unosa"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
-#, fuzzy
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "sledeća metoda unosa"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -441,200 +449,245 @@ msgstr ""
 msgid "Other"
 msgstr "Drugo"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:70
-#, fuzzy, python-format
+#: ../setup/engineabout.py:71
+#, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "Prečice tastature"
+msgstr ""
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr ""
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr ""
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Izaberite metodu unosa"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr ""
 
 #: ../setup/ibus-setup.desktop.in.h:2
-#, fuzzy
 msgid "Set IBus Preferences"
-msgstr "IBus postavke"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Prečice tastature"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Kod tastera:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Modifikatori:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Primeni"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Obriši"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Pritisnite taster (ili kombinaciju tastera).\n"
-"Prozorče će biti zatvoreno kada se taster otpusti."
+msgstr "Pritisnite taster (ili kombinaciju tastera).\nProzorče će biti zatvoreno kada se taster otpusti."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Pritisnite taster (ili kombinaciju tastera)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "okidač"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "O_dustani"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "U _redu"
 
-#: ../setup/main.py:81
-msgid "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus demon nije pokrenut. Da li želite da ga sada pokrenete?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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 je pokrenut! Ako ne možete da koristite IBus, dodajte redove ispod u "
-"$HOME/.bashrc, i ponovo se prijavite u vaše radno okruženje.\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:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Izaberite prečicu tastature za %s"
 
-#: ../ui/gtk3/panel.vala:330
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus je inteligentna magistrala unosa za Linux/Unix."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Serbian <fedora-trans-sr@redhat.com>"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Pokreni ponovo"
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Previous page"
-#~ msgstr "Prethodna metoda unosa:"
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Next page"
-#~ msgstr "sledeći pogon"
+#: ../tools/main.vala:160
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Restart Now"
-#~ msgstr "Pokreni ponovo"
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Later"
-#~ msgstr "Drugo"
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus radni okvir metode unosa"
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Turn off input method"
-#~ msgstr "Nema metode unosa"
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Switch input method"
-#~ msgstr "Nema metode unosa"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#, fuzzy
-#~ msgid "About the Input Method"
-#~ msgstr "Metode unosa"
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#, fuzzy
-#~ msgid "next input method"
-#~ msgstr "sledeća metoda unosa"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#, fuzzy
-#~ msgid "previous input method"
-#~ msgstr "prethodna metoda unosa"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use global engine"
-#~ msgstr "Unapred učitaj pogone"
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Langauge panel position"
-#~ msgstr "Prikaži jezički panel:"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
 
-#~ msgid "Custom font:"
-#~ msgstr "Prilagođeni font:"
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Font for language bar and candidates"
-#~ msgstr "Naziv prilagođenog fonta za jezički panel"
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use custom font for language bar and candidates"
-#~ msgstr "Koristi prilagođeni font za jezički panel"
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "Custom Font"
-#~ msgstr "Prilagođeni font"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show IM name on language bar"
-#~ msgstr "Naziv prilagođenog fonta za jezički panel"
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
 
-#~ msgid "Use Custom Font"
-#~ msgstr "Koristi prilagođeni font"
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus je inteligentna magistrala unosa za Linux/Unix."
 
-#~ msgid "Prev engine hotkey for switch to previous input method engine"
-#~ msgstr ""
-#~ "Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
-#~ msgid "Trigger hotkey for enable or disable input context"
-#~ msgstr "Prečica okidača za uključivanje ili isključivanje konteksta unosa"
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Postavke"
 
-#~ msgid "[Control+space]"
-#~ msgstr "[Control+space]"
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Pokreni ponovo"
 
-#~ msgid "Switch engine"
-#~ msgstr "Promeni pogon"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Izađi"
 
-#~ msgid "prev engine"
-#~ msgstr "prethodni pogon"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ta.po b/po/ta.po
index 0929ffcdf..9aa8184ab 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Tamil
 # Tamil translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,13 +11,13 @@
 # I Felix <ifelix@redhat.com>, 2010
 # I. Felix <ifelix@redhat.com>, 2009
 # shkumar <shkumar@redhat.com>, 2012
-# shkumar <shkumar@redhat.com>, 2012
+# shkumar <shkumar@redhat.com>, 2012,2014
 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"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: shkumar <shkumar@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -55,12 +55,12 @@ msgid "Custom"
 msgstr "தனிப்பயன்"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "மெனுவில் உட்பொதியப்பட்டது"
+msgid "Do not show"
+msgstr "காண்பிக்க வேண்டாம்"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "செயலிலிருக்கும் போது"
+msgid "Hide automatically"
+msgstr "தானாக மறை"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -123,18 +123,18 @@ 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 "மொழி பலகத்தை காட்டு:"
+msgid "Show property panel:"
+msgstr "பண்புகள் பலகத்தைக் காட்டு:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
@@ -162,66 +162,92 @@ msgstr "<b>எழுத்துரு மற்றும் தோற்றம
 msgid "General"
 msgstr "பொது"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "சேர் (_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "நீக்கு (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை நீக்கு"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "மேலே (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "கீழே (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே நகர்த்து"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "பற்றி (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "முன்னுரிமைகள் (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "தேர்ந்தெடுத்த உள்ளிட்டு முறையின் அமைப்பை காட்டு"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\nமேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்.</i></small>"
+"<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>"
+msgstr "<small><i>மேலே உள்ள பட்டியலில் விசைப்பலகைக் குறுக்குவழி விசைகளை அழுத்துவதன் மூலம் அல்லது பலகம் சின்னத்தை சொடுக்குவதன் மூலம், செயலில் உள்ள உள்ளீட்டு முறையை தேர்ந்தெடுத்துள்ள ஒன்றிலிருந்து வேறொன்றுக்கு மாற்ற முடியும்.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "கூடுதல்"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -231,18 +257,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nமுதன்மை பக்கம்: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "புகுபதிவில் ibusஐ துவக்கு"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>துவக்கம்</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "பற்றி"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "மூடு (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "முன்ஏற்றல் இயந்திரங்கள்"
@@ -326,9 +356,9 @@ 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 = எப்போதும் காட்டு"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "பண்புகள் பலகத்தின் நடத்தை. 0 = காண்பிக்க வேண்டாம், 1 = தானாக மறை, 2 = எப்போதும் காண்பி"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -341,58 +371,78 @@ msgid ""
 msgstr "மொழி பேனலின் இடம். 0 = மேல் இடது ஓரம், 1 = மேல் வலது ஓரம், 2 = கீழ் இடது ஓரம், 3 = கீழ் வலது ஓரம், 4 = தனிபயன்"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "பண்புகள் பலகத்தை காட்ட வேண்டிய மில்லிசெக்கன்ட்"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "பண்புகள் பலகத்தில் கவனம் செலுத்திய பிறகு அல்லது பண்புகளை மாற்றிய பிறகு பலகத்தைக் காட்ட வேண்டிய மில்லிசெக்கன்ட்."
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "காணும் அட்டவணையின் திசை"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "தனிப்பயன் எழுத்துரு"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "மொழி பலகத்துக்கான தனிப்பயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -425,7 +475,7 @@ msgstr "ஆசிரியர்: %s\n"
 msgid "Description:\n"
 msgstr "விளக்கம்:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
@@ -437,37 +487,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus முன்னுரிமைகளை அமை"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "விசைப்பலகை குறுக்குவழிகள்"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "விசை குறியீடு:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "மாற்றிகள்;"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "செயல்படுத்து (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "அழி (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "சரி (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் பயன்படுத்தவும்"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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,17 +544,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
 
@@ -540,83 +608,93 @@ msgstr "கணினி பதிவக தேக்ககத்தில் எ
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus புதுப்பிப்பு"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "முன்னுரிமைகள் "
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "வெளியேறு "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/te.po b/po/te.po
index c39d2d450..4e95b6e5f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,21 +1,21 @@
 # translation of ibus.pot to Telugu
 # Telugu translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
 # Krishnababu Krothapalli <krisnababu@gmail.com>, 2012-2013
-# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011
+# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011,2014
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011
 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: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
+"Last-Translator: ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr ""
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr "అడ్డముగా"
+msgstr "అడ్డము"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
-msgstr "నిలువుగా"
+msgstr "నిలువు"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
@@ -49,15 +49,15 @@ msgstr "క్రింది కుడి మూల"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "మలచుకొనిన"
+msgstr "అనురూపితం"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "మెనూనందు ఎంబెడెడ్ చేయబడెను"
+msgid "Do not show"
+msgstr "చూపించవద్దు"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "క్రియాశీలముగా ఉన్నప్పుడు"
+msgid "Hide automatically"
+msgstr "స్వయంచాలకంగా దాయి"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -65,11 +65,11 @@ msgstr "ఎల్లప్పుడు"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "IBus ప్రాధాన్యతలు"
+msgstr "ఐబస్ ప్రాధాన్యతలు"
 
 #: ../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:"
@@ -77,11 +77,11 @@ msgstr "తరువాతి ఇన్‌పుట్ పద్ధతి:"
 
 #: ../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:"
-msgstr "క్రితం ఇన్‌పుట్ పద్ధతి:"
+msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
@@ -89,15 +89,15 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ఇన్‌పుట్ పద్ధతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
+msgstr "ఇన్‌పుట్ పద్ధతిని చేతనించుటకు లేదా అచేతనించుటకు అడ్డదారి మీటలు"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "చేతనముచేయి లేదా అచేతనముచేయి:"
+msgstr "చేతనించు లేదా అచేతనించు:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "చేతనపరుచు"
+msgstr "చేతనించు:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
@@ -105,33 +105,33 @@ msgstr "అచేతనపరుచు:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>కీబోర్డు లఘువులు</b>"
+msgstr "<b>కీబోర్డు అడ్డదార్లు</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr "లుకప్ పట్టికనందు కాండిడేట్ల సర్దుబాటును అమర్చుము"
+msgstr "లుకప్ పట్టికనందు కాండిడేట్ల సర్దుబాటును అమర్చండి"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
-msgstr "సభ్యుల దృక్పధము:"
+msgstr "సభ్యుల దృక్పథం:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ibus ప్రవర్తనను అమర్చుము"
+msgstr "భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ఐబస్ ప్రవర్తనను అమర్చండి"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "భాషా ప్యానల్ చూపించు:"
+msgid "Show property panel:"
+msgstr "ప్రాపర్టీ ప్యానలును చూపించు:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
-msgstr "భాషా ప్యానల్ స్థానము:"
+msgstr "భాషా ప్యానల్ స్థానం:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
-msgstr "సిస్టమ్ ట్రే నందు ప్రతీకను చూపించు"
+msgstr "వ్యవస్థ పళ్లెము పై ప్రతీకను చూపించు"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
@@ -141,84 +141,110 @@ msgstr "చెక్‌బాక్సు చెక్ చేసినప్ప
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "అనువర్తనము విండో నందు ముందుగాసరికూర్చిన పాఠమును ఎంబెడెడ్ చేయుము"
+msgstr "అనువర్తనము కిటికీ నందు ముందుగా సరికూర్చిన పాఠ్యాన్ని ఎంబెడెడ్ చేయి"
 
 #: ../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:"
-msgstr "మలచుకొనిన ఫాంటు ఉపయోగించుము:"
+msgstr "అనురూపిత ఖతిని ఉపయోగించు:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
-msgstr "<b>ఫాంటు మరియు శైలి</b>"
+msgstr "<b>ఖతి మరియు శైలి</b>"
 
 #: ../setup/setup.ui.h:34
 msgid "General"
-msgstr "సాధారణ"
+msgstr "సాధారణం"
 
-#: ../setup/setup.ui.h:35
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని చేతనమైన ఇన్పుట్ పద్ధతులలోనికి జతచేయుము"
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "జతచేయి (_A)"
 
 #: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని చేతనమైన ఇన్‌పుట్ పద్ధతులలోనికి జతచేయి"
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "తీసివేయి (_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతుల నుంచి ఎంపికచేసిన ఇన్‌పుట్ పద్ధతిని తొలగించు"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "పైన (_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతుల జాబితాలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని పైకి కదుపుము"
+msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతుల జాబితాలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని పైకి కదుపు"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "క్రింద (_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతులలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని క్రిందకి కదుపుము"
+msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతులలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని క్రిందకి కదుపు"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "గురించి (_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "ఎంచుకున్న ఇన్‌పుట్ పద్ధతి యొక్క సమాచారాన్ని చూపించు"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "ప్రాధాన్యతలు (_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "ఎంపికచేసిన యిన్పట్ పద్దతి అమర్పును చూపుము"
+msgstr "ఎంపికచేసిన ఇన్పుట్ పద్ధతి యొక్క అమర్పును చూపించు"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\nదానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
+"<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>"
+msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ఇన్‌పుట్ పద్ధతి"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>కీబోర్డు నమూనా</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
-msgstr "అన్ని అనువర్తనములనందు యిన్పుట్ పద్దతిని భాగస్వామ్యపరచుము"
+msgstr "అన్ని అనువర్తనాలలోనూ ఇన్పుట్ పద్దతిని పంచుకొను"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
-msgstr "<b>గ్లోబల్ ఇన్‌పుట్ పద్ధతి అమరికలు</b>"
+msgstr "<b>సార్వత్రిక ఇన్‌పుట్ పద్ధతి అమరికలు</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
-msgstr "అధునాతన"
+msgstr "అధునాతనం"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,35 +252,39 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>ఐబస్</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
-msgstr "లాగిన్‌నందు ibus ప్రారంభించుము"
+msgstr "ప్రవేశించేప్పుడు ఐబస్‌ను ప్రారంభించు"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>ప్రారంభము</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "గురించి"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "మూసివేయి (_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
-msgstr "ముందుగా లోడైన ఇంజన్లు"
+msgstr "ముందుగా లోడైన యంత్రాలు"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr "ibus ప్రారంభమునందు ఇంజన్లు ముందుగా లోడుచేయి"
+msgstr "ఐబస్ ప్రారంభము నందు యంత్రాలను ముందుగా లోడుచేయి"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr "ఇంజన్ల క్రమం"
+msgstr "యంత్రాల క్రమం"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr "ఇన్పుట్ మెథడ్ జాబితా నందు దాచిన యింజన్ల క్రమం"
+msgstr "ఇన్పుట్ పద్ధతి జాబితా నందు భద్రపరచిన యంత్రాల క్రమం"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Popup delay milliseconds for IME switcher window"
@@ -269,129 +299,149 @@ msgstr "IME స్విజర్ విండోను చూపుటకు 
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
-msgstr "దాచిన వర్షన్ సంఖ్య"
+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 వర్షనుకు మధ్యని తేడాను పరిశీలించుటకు వుపయోగించును."
+msgstr "భద్రపరచిన రూపాంతరం సంఖ్య అనునది గతంలో స్థాపించిన ఐబస్ రూపాంతరానికి మరియు ప్రస్తుత ఐబస్ రూపాంతరానికి మధ్యని తేడాను పరిశీలించుటకు ఉపయోగించును."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
-msgstr "లఘవులను నొక్కుము"
+msgstr "అడ్డదారి మీటలను నొక్కండి"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse కొరకు ట్రిగ్గర్ లఘ కీలు"
+msgstr "gtk_accelerator_parse కొరకు ట్రిగ్గర్ అడ్డదారి మీటలు"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
-msgstr "లఘు కీ లను చేతనంచేయి"
+msgstr "అడ్డదారి మీటలను చేతనించు"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr "ఇన్‌పుట్ పద్ధతి ఆన్ చేయుటకు కీ లఘువులు"
+msgstr "ఇన్‌పుట్ పద్ధతి చేతనించుటకు అడ్డదారి మీటలు"
 
 #: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
-msgstr "అడ్డదారి కీలను అచేతనంచేయి"
+msgstr "అడ్డదారి మీటలను అచేతనించు"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr "ఇన్‌పుట్ పద్ధతి ఆపుటకు కీ లఘువులు"
+msgstr "ఇన్‌పుట్ పద్ధతి అచేతనించుటకు అడ్డదారి మీటలు"
 
 #: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr "తరువాతి ఇంజన్‌కు లఘువులు"
+msgstr "తరువాతి యంత్రానికి అడ్డదార్లు"
 
 #: ../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"
-msgstr "క్రితం ఇంజన్ లఘువులు"
+msgstr "మునుపటి యంత్ర అడ్డదారి మీటలు"
 
 #: ../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"
-msgstr "స్వయంచాలకంగా దాగిఉండు"
+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 = ఎల్లప్పుడూ చూపించు"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
-msgstr "భాషా ప్యానల్ స్థానము"
+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 = మలచుకొనిన"
+msgstr "భాషా ప్యానల్ యొక్క స్థానము. 0 = పై ఎడమ మూల, 1 = పై కుడి మూల, 2 = క్రింది ఎడమ మూల, 3 = క్రింది కుడి మూల, 4 = అనురూపితం"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "లుకప్ పట్టిక సర్దుబాటు"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = చదరముగా, 1 = నిలువుగా"
+msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = అడ్డము, 1 = నిలువు"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
-msgstr "మలచుకొనిన ఫాంటు ఉపయోగించు"
+msgstr "అనురూపిత ఖతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
-msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
+msgstr "భాషా ప్యానల్ కొరకు అనురూపిత ఖతి పేరును ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr "అనురూపిత ఫాంటు"
+msgstr "అనురూపిత ఖతి"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
-msgstr "భాష ప్యానల్ కొరకు మలచుకొనిన ఫాంటు పేరు"
+msgstr "భాష ప్యానల్ కొరకు అనురూపించిన ఖతి పేరు"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
-msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
+msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
-msgstr "అనువర్తన విండోనందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
+msgstr "అనువర్తన కిటికీ నందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr "గ్లోబల్ ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
+msgstr "సార్వత్రిక ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనముచేయుము"
+msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
-msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనము చేయుము"
+msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "పేరు మార్పును ఆపుటకు DConf కీల ప్రిఫిక్సులు"
+msgstr "పేరు మార్పును ఆపుటకు DConf మీటల ప్రిఫిక్సులు"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -422,7 +472,7 @@ msgstr "మూలకర్త: %s\n"
 msgid "Description:\n"
 msgstr "వివరణ:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
@@ -432,69 +482,87 @@ msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "IBus ప్రాధాన్యతలను అమర్చు"
+msgstr "ఐబస్ ప్రాధాన్యతలను అమర్చు"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
-msgstr "కీబోర్డు లఘువులు"
+msgstr "కీబోర్డు అడ్డదార్లు"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
-msgstr "కీ కోడ్:"
+msgstr "మీట సంకేతం:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "సవరణిలు:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "అనువర్తించు (_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "తొలగించు (_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
-msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
+msgstr "దయచేసి మీటను వత్తండి (లేదా మీటల సమ్మేళనం)"
+
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "సరే (_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "క్రితం యిన్పుట్ పద్దతికి మారుటకు లఘవును shift తో వుపయోగించు"
+msgstr "మునుపటి ఇన్పుట్ పద్దతికి మారుటకు అడ్డదారిని shift తో ఉపయోగించు"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
+msgstr "ఐబస్ డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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 ప్రారంభమైంది! మీరు IBus వుపయోగించలేకుంటే, మీ $HOME/.bashrc కు కింది పంక్తులను జతచేయండి; అప్పుడు తిరిగి డెస్కుటాప్‌కు ప్రవేశించండి.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
+msgstr "ఐబస్ ప్రారంభమైంది! మీరు ఐబస్ ఉపయోగించలేకుంటే, మీ $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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
+msgstr "ఐబస్ డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "ఇన్పుట్ పద్దతులు మార్చుట"
 
 #: ../tools/main.vala:42
 msgid "List engine name only"
-msgstr "ఇంజన్ పేరు మాత్రమే జాబితాచేయి"
+msgstr "యంత్రం పేరు మాత్రమే జాబితాచేయి"
 
 #: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr "IBus కు అనుసంధానం కాలేదు.\n"
+msgstr "ఐబస్‌కు అనుసంధానం కాలేదు.\n"
 
 #: ../tools/main.vala:84
 #, c-format
@@ -504,17 +572,17 @@ msgstr "భాష: %s\n"
 #: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
-msgstr "ఏ యింజన్ అమర్చలేదు.\n"
+msgstr "ఏ యంత్రము అమర్చలేదు.\n"
 
 #: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr "గ్లోబల్ యింజన్ అమర్చుట విఫలమైంది.\n"
+msgstr "సార్వత్రిక యంత్రం అమర్చుట విఫలమైంది.\n"
 
 #: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr "గ్లోబల్ యింజన్ పొందుట విఫలమైంది.\n"
+msgstr "సార్వత్రిక యంత్రం పొందుట విఫలమైంది.\n"
 
 #: ../tools/main.vala:204
 msgid "Read the system registry cache."
@@ -537,83 +605,93 @@ msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ
 msgid "Write the registry cache FILE."
 msgstr "రిజిస్ట్రీ క్యాచీ FILE వ్రాయి."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
-msgstr "ఇంజన్ అమర్చు లేదా పొందు"
+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 "అందుబాటులోని ఇంజన్లు చూపుము"
+msgstr "అందుబాటులోని యంత్రాలను చూపించు"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
-msgstr "(ఇంప్లిమెంట్ చేయలేదు)"
+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 "వర్షన్ చూపు"
+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 "ఈ సమాచారం చూపుము"
+msgstr "ఈ సమాచారం చూపించు"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "వాడుక: %s COMMAND [OPTION...]\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:425
 msgid "IBus Update"
-msgstr "IBus నవీకరణ"
+msgstr "ఐబస్ నవీకరణ"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
-msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-11."
+msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-14."
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "ప్రాధాన్యతలు "
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "నిష్క్రమించు "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/tg.po b/po/tg.po
index 62ef35dbb..0656d68ca 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -1,22 +1,23 @@
 # translation of ibus.pot to Tajik
 # Tajik translation of ibus.
-# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# tajikfedora <victor.ibragimov@gmail.com>, 2011.
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 2011
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 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-12-09 09:55+0000\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: tajikfedora <victor.ibragimov@gmail.com>\n"
-"Language-Team: Tajik (http://www.transifex.net/projects/p/fedora/team/tg/)\n"
-"Language: tg\n"
+"Language-Team: Tajik <trans-tg@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -28,36 +29,36 @@ msgid "Vertical"
 msgstr "Амудӣ"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
+msgid "Top left corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:4
-msgid "When active"
+msgid "Top right corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Ҳамеша"
+msgid "Bottom left corner"
+msgstr ""
 
 #: ../setup/setup.ui.h:6
-msgid "Top left corner"
+msgid "Bottom right corner"
 msgstr ""
 
 #: ../setup/setup.ui.h:7
-msgid "Top right corner"
-msgstr ""
+msgid "Custom"
+msgstr "Танзимот"
 
 #: ../setup/setup.ui.h:8
-msgid "Bottom left corner"
+msgid "Do not show"
 msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "Bottom right corner"
+msgid "Hide automatically"
 msgstr ""
 
 #: ../setup/setup.ui.h:10
-msgid "Custom"
-msgstr "Танзимот"
+msgid "Always"
+msgstr "Ҳамеша"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
@@ -83,7 +84,7 @@ msgstr ""
 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 ""
 
@@ -116,18 +117,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
+msgid "Show property panel:"
 msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr ""
 
@@ -155,66 +156,92 @@ msgstr ""
 msgid "General"
 msgstr "Умумӣ"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Илова кардан"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Тоза кардан"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Боло"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Поён"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Дар бораи барнома"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Хусусиятҳо"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr ""
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -224,29 +251,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr ""
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr ""
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Дар бораи"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr ""
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr ""
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr ""
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Пӯшидан"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -265,114 +284,159 @@ msgid "Saved engines order in input method list"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
-msgid "Trigger shortcut keys"
+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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Enable shortcut keys"
+msgid "Saved version number"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:8
-msgid "The shortcut keys for turning input method on"
+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: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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
 
-#: ../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 ""
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -386,30 +450,30 @@ msgstr ""
 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 ""
 
-#: ../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:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr ""
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -417,87 +481,214 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Миёнбурҳои клавиатура"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Рамзи тугма:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "_Татбиқ кардан"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Нест кардан"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "оғоздиҳӣ"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Бекор кардан"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "фаъол"
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
 
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "ғайрифаъол"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:344
+#: ../setup/main.py:350
 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 ""
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:330
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:335
+#: ../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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Хусусиятҳо"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Бозоғозӣ"
 
-#~ msgid "Previous page"
-#~ msgstr "Саҳифаи пешина"
-
-#~ msgid "Next page"
-#~ msgstr "Саҳифаи навбатӣ"
-
-#~ msgid "Later"
-#~ msgstr "Баъдтар"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Хуруҷ"
 
-#~ msgid "IBus Panel"
-#~ msgstr "Лавҳаи IBus"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/uk.po b/po/uk.po
index 2cbfc6fa7..02f4f8277 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,17 +1,17 @@
 # translation of ibus.pot to Ukrainian
 # Ukrainian translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2013
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
 # Yuri Chornoivan <yurchor@ukr.net>, 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-11-29 18:44+0900\n"
-"PO-Revision-Date: 2013-11-30 07:01+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -49,12 +49,12 @@ msgid "Custom"
 msgstr "Нетиповий"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "Вбудувати у меню"
+msgid "Do not show"
+msgstr "Не показувати"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "Якщо активна"
+msgid "Hide automatically"
+msgstr "Автоматично ховати"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -117,18 +117,18 @@ 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 "Показ мовної панелі:"
+msgid "Show property panel:"
+msgstr "Показ панелі властивостей:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Розташування мовної панелі:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Показувати піктограму у системному лотку"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Показувати назву способу введення на мовній панелі"
 
@@ -156,31 +156,56 @@ msgstr "<b>Шрифт і стиль</b>"
 msgid "General"
 msgstr "Загальне"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "_Додати"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Додати позначений спосіб введення до списку увімкнених способів введення"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "В_илучити"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Вилучити позначений спосіб введення зі списку увімкнених способів введення"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "В_гору"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Пересунути вгору позначений спосіб введення у списку увімкнених способів введення"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "В_низ"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Пересунути нижче позначений спосіб введення у списку увімкнених способів введення"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Про програму"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Показати відомості щодо вибраного способу введення"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Параметри"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Показати панель налаштовування позначеного способу введення"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -188,35 +213,35 @@ msgid ""
 msgstr "<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище списку натисканням клавіатурного скорочення або піктограми на панелі.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Загальні параметри способів введення</b>"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,18 +251,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>Інтелектуальний канал введення</small>\nДомашня сторінка: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Запускати ibus при вході"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Інформація"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Закрити"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Попередньо завантажувати рушії"
@@ -321,9 +350,9 @@ 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 = завжди показувати"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 = завжди показувати"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -336,58 +365,78 @@ msgid ""
 msgstr "Розташування мовної панелі. 0 = у верхньому лівому куті, 1 = у верхньому правому куті, 2 = у нижньому лівому куті, 3 = у нижньому правому куті, 4 = нетипове"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "Слідувати за курсором введення, якщо панель показано завжди"
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr "Якщо має значення «true», панель слідуватиме за курсором введення, якщо панель працює у режимі безумовного показу. Якщо має значення «false», панель буде показано у фіксованій позиції."
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "Тривалість показу панелі властивостей у мілісекундах"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "Тривалість показу панелі властивостей (у мілісекундах) після фокусування або зміни властивостей."
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Орієнтація таблиці пошуку"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Показувати назву способу введення"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -420,7 +469,7 @@ msgstr "Автор: %s\n"
 msgid "Description:\n"
 msgstr "Опис:\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Виберіть спосіб введення"
 
@@ -432,37 +481,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Налаштувати IBus"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Клавіатурні скорочення"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Код клавіші:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Модифікатори:"
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "Заст_осувати"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "В_илучити"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/main.py:99 ../setup/main.py:392
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_Гаразд"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
 
-#: ../setup/main.py:326
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:347
+#: ../setup/main.py:350
 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"
@@ -471,17 +538,17 @@ msgid ""
 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
+#: ../setup/main.py:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:373
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
-#: ../setup/main.py:374
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -592,26 +659,36 @@ msgstr "Команди:\n"
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:382
+#: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:656
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
-msgstr "© Peng Huang, 2007–2012\n"
-
-#: ../ui/gtk3/panel.vala:661
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:665
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:697
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Параметри"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "Перезапустити"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Вийти"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ur.po b/po/ur.po
new file mode 100644
index 000000000..15b180ab5
--- /dev/null
+++ b/po/ur.po
@@ -0,0 +1,637 @@
+# translation of ibus.pot to Urdu
+# Urdu translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-12 15:12+0900\n"
+"PO-Revision-Date: 2014-02-12 07:40+0000\n"
+"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
+"Language-Team: Urdu <trans-ur@lists.fedoraproject.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ur\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 "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+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 ""
+
+#: ../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 "<b>Keyboard Shortcuts</b>"
+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 ""
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr ""
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr ""
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+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 "<b>Font and Style</b>"
+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 ""
+"<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>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
+msgid "Input Method"
+msgstr ""
+
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:33
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:34
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:45
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:42
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:47
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:49
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid "Start ibus on login"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:58 ../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 ""
+
+#: ../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 &lt; Delay milliseconds. 0 &gt; 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 property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:36
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:38
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:39
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:40
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:45
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
+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 ""
+
+#: ../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 ""
+
+#: ../setup/engineabout.py:71
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:74
+#, python-format
+msgid "Author: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:77
+msgid "Description:\n"
+msgstr ""
+
+#: ../setup/enginecombobox.py:139
+msgid "Select an input method"
+msgstr ""
+
+#: ../setup/enginetreeview.py:94
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: ../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 ""
+
+#: ../setup/keyboardshortcut.py:252
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:329
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: ../setup/main.py:350
+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:364
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:376
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#: ../setup/main.py:377
+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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:743
+msgid "Restart"
+msgstr ""
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:RTL"
diff --git a/po/vi.po b/po/vi.po
index 0f6c3ccfb..bf586489b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,20 +1,22 @@
-# Vietnamese translations for data package.
-# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the data package.
-# Lê Quốc Tuấn <mr.lequoctuan@gmail.com>, 2009.
+# translation of ibus.pot to Vietnamese
+# Vietnamese translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
 #
+# Translators:
+# Lê Quốc Tuấn <mr.lequoctuan@gmail.com>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: data 1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-06-01 13:17+0700\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Lê Quốc Tuấn <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Vietnamese\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -26,37 +28,37 @@ msgid "Vertical"
 msgstr "Dọc"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Nhúng vào menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Khi hoạt động"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Luôn luôn"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Góc trên bên trái"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Góc trên bên phải"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Góc dưới bên trái"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Góc dưới bên phải"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Tùy biến"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Luôn luôn"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Tùy chọn IBus"
@@ -81,7 +83,7 @@ msgstr "Kiểu gõ trước:"
 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 "Phím tắt để bật hoặc tắt kiểu gõ"
 
@@ -114,18 +116,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Thiết lập việc ẩn hay hiển thị thanh ngôn ngữ"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "Hiển thị thanh ngôn ngữ:"
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Vị trí thanh ngôn ngữ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "Hiển thị biểu tượng trên khay hệ thống"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "Hiển thị tên kiểu gõ trên thanh ngôn ngữ"
 
@@ -153,71 +155,92 @@ msgstr "<b>Phông và kiểu</b>"
 msgid "General"
 msgstr "Chung"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "Thê_m"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Thêm kiểu gõ đã chọn vào những kiểu gõ cho phép sử dụng"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Bỏ"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Xóa kiểu gõ đã chọn ra khỏi những kiểu gõ cho phép sử dụng"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Lên"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
+msgstr "Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Xuống"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
+msgstr "Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "G_iới thiệu"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "Tù_y thích"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
-"<small><i>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ó</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Kiểu gõ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "Dùng kiểu bố trí bàn phím của hệ thống"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "Dùng kiểu bố trí bàn phím hệ thống (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Bố trí bàn phím</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "Chia sẻ cùng kiểu gõ cho tất cả các ứng dụng"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "Chọn một kiểu gõ"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -225,39 +248,23 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Bộ gõ thông minh</small>\n"
-"Trang chủ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>Bộ gõ thông minh</small>\nTrang chủ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "Khởi động ibus khi đăng nhập"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>Khởi động</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "Giới thiệu"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "Bộ gõ IBus"
-
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "Bộ gõ IBus"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "Đón_g"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -276,125 +283,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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 "Phím tắt kích hoạt"
 
-#: ../data/ibus.schemas.in.h:7
-#, fuzzy
+#: ../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 "Phím tắt kích hoạt"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
-#, fuzzy
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-#, fuzzy
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
-msgstr "Phím tắt kích hoạt"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Phím tắt cho kiểu gõ kế tiếp"
 
-#: ../data/ibus.schemas.in.h:12
-#, fuzzy
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Phím tắt cho kiểu gõ trước"
 
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Tự động ẩn"
 
-#: ../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"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
 msgstr ""
-"Cách hiển thị thanh ngôn ngữ. 0 = Nhúng vào menu, 1 = Tự  động ẩn, 2 = Luôn "
-"hiện"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Vị trí thanh ngôn ngữ:"
 
-#: ../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 "Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
-"Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = "
-"góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "Hướng của bảng tra cứu"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Hướng của bảng tra cứu. 0 = Ngang, 1 = Dọc"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "Hiển thị tên kiểu gõ"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "Dùng phông chữ tùy biến"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "Tùy biến phông"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "Tùy biến phông cho thanh ngôn ngữ"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "Nhúng văn bản tiền soạn thảo"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "Dùng chung kiểu gõ cho toàn hệ thống"
 
-#: ../data/ibus.schemas.in.h:34
-#, fuzzy
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "chuyển đến kiểu gõ kế tiếp"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -402,171 +443,251 @@ msgstr ""
 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"
 msgstr "Khác"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Ngôn ngữ: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Bố trí bàn phím: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Tác giả: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Mô tả:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "Chọn một kiểu gõ"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
-#, fuzzy
 msgid "Set IBus Preferences"
-msgstr "Tùy chọn IBus"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Những phím tắt"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "Mã phím:"
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "Phím bổ sung:"
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "Á_p dụng"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "_Xoá"
+
+#: ../setup/keyboardshortcut.py:254
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Vui lòng nhấn một phím (hoặc tổ hợp phím).\n"
-"Hộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
+msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím).\nHộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "kích hoạt"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "_Thôi"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
 
-#: ../setup/main.py:81
-msgid "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
-"Trình nền IBus chưa được khởi động. Bạn có muốn khởi động nó ngay bây giờ?"
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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 vừa được khởi động! Nếu bạn không thể dùng IBus, vui lòng thêm những "
-"dòng bên dưới vào $HOME/.bashrc, và đăng nhập lại.\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:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Chọn phím tắt để %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
-msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Khởi động lại"
+#: ../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 ""
 
-#~ msgid "Previous page"
-#~ msgstr "Trang trước"
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Trang sau"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Một vài kiểu gõ vừa được cài đặt, xóa hoặc cập nhật. Vui lòng khởi động "
-#~ "lại bộ gõ ibus."
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Khởi động lại ngay"
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Sau"
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "Bộ gõ IBus"
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Tắt kiểu gõ"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Không có cửa sổ nhập"
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "Giới thiệu về kiểu gõ"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Chuyển kiểu gõ"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "Giới thiệu về kiểu gõ"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Tùy thích"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Khởi động lại"
 
-#~ msgid "next input method"
-#~ msgstr "chuyển đến kiểu gõ kế tiếp"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Thoát"
 
-#~ msgid "previous input method"
-#~ msgstr "chuyển đến kiểu gõ trước"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 80a8de6e3..9dfa15411 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,22 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Christopher Meng <cickumqt@gmail.com>, 2012-2013
 # Tommy He <lovenemesis@gmail.com>, 2012
 # Mike Manilone <zhtx10@gmail.com>, 2011
+# Mike Manilone <zhtx10@gmail.com>, 2011
 # Peng Huang <shawn.p.huang@gmail.com>, 2007
 # simonyanix <simonyan@fedoraproject.org>, 2011
-# Tommy He <lovenemesis@gmail.com>, 2012
+# Tommy He <lovenemesis@gmail.com>, 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: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Christopher Meng <cickumqt@gmail.com>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +54,12 @@ msgid "Custom"
 msgstr "自定义"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "嵌入菜单"
+msgid "Do not show"
+msgstr ""
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "活动时"
+msgid "Hide automatically"
+msgstr ""
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -121,18 +122,18 @@ msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "设置如何显示或隐藏语言栏的方式"
 
 #: ../setup/setup.ui.h:25
-msgid "Show language panel:"
-msgstr "显示语言栏："
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
@@ -160,66 +161,92 @@ msgstr "<b>字体和风格</b>"
 msgid "General"
 msgstr "常规"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "添加选中的输入法到启用输入法列表"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "从启用输入法列表删除选中的输入法"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移选中的输入法"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "向下(_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移选中的输入法"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "显示选中输入法的信息"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "显示选中输入法的设置界面"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>列表中的第一个输入法是默认输入法。\n您可以使用上/下按钮更改。</i></small>"
+"<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>"
+msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全局输入法设置</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "高级"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -229,18 +256,22 @@ msgid ""
 "\n"
 msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页：http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "登录时运行 IBus"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "关于"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "关闭(_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "预加载引擎"
@@ -324,9 +355,9 @@ 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 = 总是显示。"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -339,58 +370,78 @@ msgid ""
 msgstr "语言栏位置。0 = 左上角，1 = 右上角，2 = 左下角，3 = 右下角，4 = 自定义"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "显示输入法名称"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -423,7 +474,7 @@ msgstr "作者：%s\n"
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "选择输入法"
 
@@ -435,37 +486,55 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "设定 IBus 首选项"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "按键："
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "修饰符："
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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,17 +543,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "切换输入法"
 
@@ -538,83 +607,93 @@ msgstr "写入系统注册缓存。"
 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"
 
-#: ../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:425
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
 msgstr "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "重新启动"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "退出"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 6751990cf..4c2b440b8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,27 +1,26 @@
 # translation of zh_TW.po to Traditional Chinese
 # Traditional Chinese translation for ibus.
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
-# Terry Chuang <tchuang@redhat.com>, 2010.
+# Translators:
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010
+# Peng Huang <shawn.p.huang@gmail.com>, 2008
+# Peng Huang <shawn.p.huang@gmail.com>, 2008
+# Terry Chuang <tchuang@redhat.com>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: zh_TW\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2010-05-06 13:25+1000\n"
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:50+0000\n"
 "Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_HK\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: TAIWAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -32,37 +31,37 @@ msgid "Vertical"
 msgstr "垂直"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "嵌入選單內"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "當啟用時"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "總是"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "左上角"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "右上角"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "左下角"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "右下角"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "自訂"
 
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+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 偏好設定"
@@ -87,7 +86,7 @@ msgstr "上一個輸入法："
 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 "用來開啟或關閉輸入法的快捷鍵"
 
@@ -120,18 +119,18 @@ 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 "顯示語言面板："
+msgid "Show property panel:"
+msgstr ""
 
 #: ../setup/setup.ui.h:26
 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:30
 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:32
 msgid "Show input method name on language bar"
 msgstr "在語言列上顯示輸入法名稱"
 
@@ -159,69 +158,92 @@ msgstr "<b>字型與風格</b>"
 msgid "General"
 msgstr "通用"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "加入(_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "加入選取的輸入法到已啟用的輸入法內"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "從已啟用的輸入法中移除所選的輸入法"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移所選取的輸入法"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "向下(_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移所選取的輸入法"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/setup.ui.h:40
-#, fuzzy
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "顯示所選取的輸入法資訊"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
+"<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>"
 msgstr ""
-"<small><i>清單內最頂端的輸入法為預設輸入法。\n"
-"您可以使用 向上/向下 按鈕進行變更。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "在所有的應用程式中共享同一個輸入法"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -229,39 +251,23 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智慧型輸入框架</small>\n"
-"首頁: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "在登入時啟動 ibus"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "關於"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-#, fuzzy
-msgid "Input Method Framework"
-msgstr "IBus 輸入法框架"
-
-#: ../bus/ibus.desktop.in.h:3
-#, fuzzy
-msgid "Start IBus Input Method Framework"
-msgstr "IBus 輸入法框架"
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "關閉(_C)"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
@@ -280,121 +286,159 @@ 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 &lt; Delay milliseconds. 0 &gt; 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:7
-#, fuzzy
+#: ../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 "觸發用快捷鍵"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
-#, fuzzy
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr "用來開啟或關閉輸入法的快捷鍵"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-#, fuzzy
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
-msgstr "觸發用快捷鍵"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr "用來開啟或關閉輸入法的快捷鍵"
+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
-#, fuzzy
+#: ../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:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "「上一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+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 = 永遠顯示"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../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 "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:34
-#, fuzzy
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr "下一個輸入法"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -402,170 +446,251 @@ msgstr ""
 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"
 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:136
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "選取輸入法"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "鍵盤"
 
 #: ../setup/ibus-setup.desktop.in.h:2
-#, fuzzy
 msgid "Set IBus Preferences"
-msgstr "IBus 偏好設定"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "鍵盤快捷鍵"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "按鍵碼："
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "組合按鍵："
 
-#: ../setup/keyboardshortcut.py:235
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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:237
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "觸發"
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../setup/main.py:80
-msgid "enable"
-msgstr ""
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "確定(_O)"
 
-#: ../setup/main.py:81
-msgid "disable"
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus 幕後程式没有啟動，您是否想現在啟動它？"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:350
 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"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
 #, 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:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:377
+msgid "switching input methods"
 msgstr ""
-"版權所有 (c) 2007-2010 黃鵬\n"
-"版權所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus 為 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 ""
-"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-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:293
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "上一頁"
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "下一頁"
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr "有些輸入法已經被安裝、移除或更新。請重新啟動 ibus 輸入平台。"
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "現在重新啟動"
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "稍候"
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus 輸入法框架"
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "關閉輸入法"
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "無輸入視窗"
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "關於輸入法"
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "切換輸入法"
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "關於輸入法"
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "重新啟動"
 
-#~ msgid "next input method"
-#~ msgstr "下一個輸入法"
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "結束"
 
-#~ msgid "previous input method"
-#~ msgstr "上一個輸入法"
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f6a8698b7..b749cf758 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,18 +1,18 @@
 # translation of ibus.pot to Traditional Chinese
 # Traditional Chinese translation of ibus.
-# Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012,2014
 # Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
 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:51+0000\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2014-02-18 05:50+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -50,12 +50,12 @@ msgid "Custom"
 msgstr "自訂"
 
 #: ../setup/setup.ui.h:8
-msgid "Embedded in menu"
-msgstr "嵌入選單內"
+msgid "Do not show"
+msgstr "不要顯示"
 
 #: ../setup/setup.ui.h:9
-msgid "When active"
-msgstr "當啟用時"
+msgid "Hide automatically"
+msgstr "自動隱藏"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -118,18 +118,18 @@ 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 "顯示語言面板："
+msgid "Show property panel:"
+msgstr "顯示屬性面板："
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "語言面板位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
 msgstr "在系統匣顯示圖示"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
 msgstr "在語言列顯示輸入法名稱"
 
@@ -157,66 +157,92 @@ msgstr "<b>字型與風格</b>"
 msgid "General"
 msgstr "通用"
 
-#: ../setup/setup.ui.h:35
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "加入(_A)"
+
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "加入選取的輸入法到已啟用的輸入法內"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "從已啟用的輸入法中移除所選的輸入法"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移所選取的輸入法"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "向下(_D)"
+
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移所選取的輸入法"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
+
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "顯示選取輸入法的設置"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid ""
-"<small><i>The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it.</i></small>"
-msgstr "<small><i>清單內最頂端的輸入法為預設輸入法。\n您可以以 向上/向下 按鈕進行變更。</i></small>"
+"<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>"
+msgstr "<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:54
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:55
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -226,18 +252,22 @@ msgid ""
 "\n"
 msgstr "<big><b>iBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
 msgstr "在登入時啟動 iBus"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
 msgstr "關於"
 
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "關閉(_C)"
+
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "預先載入引擎"
@@ -321,9 +351,9 @@ 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 = 永遠顯示"
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr "屬性面板的行為。0 = 不要顯示，1 = 自動隱藏，2 = 總是顯示"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -336,58 +366,78 @@ msgid ""
 msgstr "語言列的位置。0 = 左上角, 1 = 右上角, 2 = 左下角, 3 = 右下角, 4 = 自訂"
 
 #: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "在面板總是顯示的情況下跟隨輸入游標"
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr "若為真，則面板會在總是顯示的情況下跟隨輸入游標。若為假，則面板會顯示在固定位置上。"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "顯示屬性面板的毫秒數"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "當焦點落在屬性面板內，或屬性變更時屬性面板的顯示毫秒數。"
+
+#: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
 msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
 msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -420,7 +470,7 @@ msgstr "作者：%s\n"
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:130
+#: ../setup/enginecombobox.py:139
 msgid "Select an input method"
 msgstr "選取輸入法"
 
@@ -432,37 +482,55 @@ msgstr "鍵盤"
 msgid "Set IBus Preferences"
 msgstr "設置 iBus 偏好設定"
 
-#: ../setup/keyboardshortcut.py:54
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "鍵盤快捷鍵"
 
-#: ../setup/keyboardshortcut.py:65
+#: ../setup/keyboardshortcut.py:66
 msgid "Key code:"
 msgstr "按鍵碼："
 
-#: ../setup/keyboardshortcut.py:80
+#: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
 msgstr "修飾鍵："
 
-#: ../setup/keyboardshortcut.py:250
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../setup/keyboardshortcut.py:254
 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
+#: ../setup/keyboardshortcut.py:256
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:350
 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"
@@ -471,17 +539,17 @@ msgid ""
 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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:377
 msgid "switching input methods"
 msgstr "切換輸入法"
 
@@ -535,83 +603,93 @@ msgstr "寫入系統註冊快取。"
 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 COMMAND [OPTION...]\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:425
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 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 黃鵬\n"
-
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
-msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010."
+msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:742
 msgid "Restart"
 msgstr "重新啟動"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "結束"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"

From ee7f9147d6ec6e07023f6c4b84acafe3ef42a881 Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Fri, 21 Feb 2014 11:42:17 +0900
Subject: [PATCH 211/816] Update french translation

Review URL: https://codereview.appspot.com/66450044
Patch from Julien Humbert <julroy67@gmail.com>.
---
 po/fr.po | 119 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 87 insertions(+), 32 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 14c94cada..45d004d47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,24 +5,24 @@
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
+# Sam Friedmann <sam.friedmann@redhat.com>, 2010
 # dominique bribanick <chepioq@gmail.com>, 2011
 # Jérôme Fenal <jfenal@gmail.com>, 2012-2013
-# Jérôme Fenal <jfenal@gmail.com>, 2012
-# Julien Humbert <julroy67@gmail.com>, 2009, 2010, 2011, 2012, 2013
-# Sam Friedmann <sam.friedmann@redhat.com>, 2010
+# Julien Humbert <julroy67@gmail.com>, 2009-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:46+0000\n"
-"Last-Translator: Jérôme Fenal <jfenal@gmail.com>\n"
+"PO-Revision-Date: 2014-02-20 10:23+0100\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\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.6.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -54,11 +54,11 @@ msgstr "Personnalisée"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Ne pas afficher"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Cacher automatiquement"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -70,7 +70,8 @@ msgstr "Préférences de IBus"
 
 #: ../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 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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 @@ msgstr "…"
 
 #: ../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:"
@@ -122,7 +126,7 @@ msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Afficher le panneau de propriété :"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -138,7 +142,9 @@ 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"
@@ -146,7 +152,9 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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:"
@@ -175,7 +183,8 @@ msgstr "_Enlever"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -183,7 +192,9 @@ msgstr "_Monter"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -191,7 +202,9 @@ msgstr "_Descendre"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -214,7 +227,10 @@ msgid ""
 "<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>"
-msgstr "<small><i>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.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
@@ -253,7 +269,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Page d'accueil : http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -289,14 +311,20 @@ msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
 #: ../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 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; 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"
@@ -306,7 +334,9 @@ msgstr "Numéro de version enregistré"
 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"
@@ -338,7 +368,8 @@ msgstr "Raccourci clavier pour passer au moteur suivant"
 
 #: ../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"
@@ -357,6 +388,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher "
+"automatiquement, 2 = Toujours afficher"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -366,27 +399,34 @@ msgstr "Position de la barre"
 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 "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Suivre le curseur d'insertion lorsque le panneau est toujours affiché"
 
 #: ../data/ibus.schemas.in.h:25
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Si activé, le panneau suit le curseur d'insertion lorsque le panneau est "
+"toujours affiché. Sinon, le panneau est affiché à une position fixe."
 
 #: ../data/ibus.schemas.in.h:26
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Millisecondes pour afficher le panneau de propriété"
 
 #: ../data/ibus.schemas.in.h:27
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Millisecondes pour afficher le panneau de propriété après prise du focus ou "
+"changement des propriétés."
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
@@ -434,7 +474,8 @@ msgstr "Par défaut, activer la méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:44
 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:45
 msgid "DConf preserve name prefixes"
@@ -448,7 +489,9 @@ msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 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"
@@ -511,7 +554,9 @@ msgstr "_Supprimer"
 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:256
 msgid "Please press a key (or a key combination)"
@@ -527,7 +572,8 @@ msgstr "_Valider"
 
 #: ../setup/main.py:102 ../setup/main.py:395
 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:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -535,11 +581,18 @@ msgstr "Le démon IBus n'est pas démarré. Souhaitez-vous le démarrer ?"
 
 #: ../setup/main.py:350
 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:364
@@ -651,7 +704,9 @@ msgstr "Afficher cette information"
 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

From b300a7f747ddfa5146ff6edd23f8747e37d1de46 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Feb 2014 11:45:55 +0900
Subject: [PATCH 212/816] Fix a build error of Gdk.EventKey with vala 0.23.2

Review URL: https://codereview.appspot.com/66480044
---
 ui/gtk3/switcher.vala | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index bc57b086e..4b4c0639d 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -339,21 +339,29 @@ class Switcher : Gtk.Window {
 
     public override bool key_press_event(Gdk.EventKey e) {
         bool retval = true;
+
+/* Gdk.EventKey is changed to the pointer.
+ * https://git.gnome.org/browse/vala/commit/?id=598942f1
+ */
+#if VALA_0_24
+        Gdk.EventKey pe = e;
+#else
         Gdk.EventKey *pe = &e;
+#endif
 
         if (m_popup_delay_time > 0) {
             restore_window_position("pressed");
         }
 
         do {
-            uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state;
+            uint modifiers = KeybindingManager.MODIFIER_FILTER & pe.state;
 
             if ((modifiers != m_modifiers) &&
                 (modifiers != (m_modifiers | Gdk.ModifierType.SHIFT_MASK))) {
                 break;
             }
 
-            if (pe->keyval == m_keyval) {
+            if (pe.keyval == m_keyval) {
                 if (modifiers == m_modifiers)
                     next_engine();
                 else // modififers == m_modifiers | SHIFT_MASK
@@ -361,7 +369,7 @@ class Switcher : Gtk.Window {
                 break;
             }
 
-            switch (pe->keyval) {
+            switch (pe.keyval) {
                 case 0x08fb: /* leftarrow */
                 case 0xff51: /* Left */
                     previous_engine();
@@ -377,7 +385,7 @@ class Switcher : Gtk.Window {
                 case 0xff54: /* Down */
                     break;
                 default:
-                    debug("0x%04x", pe->keyval);
+                    debug("0x%04x", pe.keyval);
                     break;
             }
         } while (false);
@@ -385,9 +393,13 @@ class Switcher : Gtk.Window {
     }
 
     public override bool key_release_event(Gdk.EventKey e) {
+#if VALA_0_24
+        Gdk.EventKey pe = e;
+#else
         Gdk.EventKey *pe = &e;
+#endif
 
-        if (KeybindingManager.primary_modifier_still_pressed((Gdk.Event *)pe,
+        if (KeybindingManager.primary_modifier_still_pressed((Gdk.Event) pe,
             m_primary_modifier)) {
             return true;
         }

From b233f5796aa7eec7555a31d51ea065c978429759 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 25 Feb 2014 17:41:13 +0900
Subject: [PATCH 213/816] Use XKB layout string instead of ibus-keyboard icon
 on panel.

Review URL: https://codereview.appspot.com/66330043
---
 data/ibus.schemas.in  | 20 +++++++++
 ui/gtk3/Makefile.am   |  3 --
 ui/gtk3/panel.vala    | 99 ++++++++++++++++++++++++++++++++++++++++---
 ui/gtk3/switcher.vala | 73 ++++++++++++++++++++++---------
 4 files changed, 167 insertions(+), 28 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index ca4a0e295..fbbe2a602 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -258,6 +258,26 @@
 	    <long>Show input method name on language bar</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/xkb-icon-rgba</key>
+      <applyto>/desktop/ibus/panel/xkb-icon-rgba</applyto>
+      <owner>ibus</owner>
+      <type>string</type>
+      <default>#415099</default>
+      <locale name="C">
+        <short>RGBA value of XKB icon</short>
+	    <long>XKB icon shows the layout string and the string is
+                  rendered with the RGBA value. The RGBA value can be
+                  1. a color name from X11, 2. a hex value in form '#rrggbb'
+                  where 'r', 'g' and 'b' are hex digits of the red, green,
+                  and blue, 3. a RGB color in form 'rgb(r,g,b)' or
+                  4. a RGBA color in form 'rgba(r,g,b,a)' where 'r',
+                  'g', and 'b' are either integers in the range 0 to 255
+                  or precentage values in the range 0% to 100%, and
+                  'a' is a floating point value in the range 0 to 1
+                  of the alpha.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/use_system_keyboard_layout</key>
       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 6012cfa0a..b2fb8005e 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -42,8 +42,6 @@ AM_CPPFLAGS = \
 	-include $(CONFIG_HEADER) \
 	$(NULL)
 
-USE_SYMBOL_ICON = FALSE
-
 AM_CFLAGS = \
 	@GLIB2_CFLAGS@ \
 	@GIO2_CFLAGS@ \
@@ -53,7 +51,6 @@ AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DBINDIR=\"$(bindir)\" \
 	-DIBUS_DISABLE_DEPRECATED \
-	-DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-function \
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 8cca3a7c7..748cb32e0 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -58,6 +58,11 @@ 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;
+    private GLib.HashTable<string, Gdk.Pixbuf> m_xkb_icon_pixbufs =
+            new GLib.HashTable<string, Gdk.Pixbuf>(GLib.str_hash,
+                                                   GLib.str_equal);
+    private Gdk.RGBA m_xkb_icon_rgba = Gdk.RGBA(){
+            red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -171,6 +176,10 @@ class Panel : IBus.PanelService {
             .connect((key) => {
                 set_follow_input_cursor_when_always_shown_property_panel();
         });
+
+        m_settings_panel.changed["xkb-icon-rgba"].connect((key) => {
+                set_xkb_icon_rgba();
+        });
     }
 
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
@@ -375,6 +384,26 @@ class Panel : IBus.PanelService {
                         "follow-input-cursor-when-always-shown"));
     }
 
+    private void set_xkb_icon_rgba() {
+        string spec = m_settings_panel.get_string("xkb-icon-rgba");
+
+        Gdk.RGBA rgba = { 0, };
+
+        if (!rgba.parse(spec)) {
+            warning("invalid format of xkb-icon-rgba: %s", spec);
+            m_xkb_icon_rgba = Gdk.RGBA(){
+                    red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
+        } else
+            m_xkb_icon_rgba = rgba;
+
+        if (m_xkb_icon_pixbufs.size() > 0) {
+            m_xkb_icon_pixbufs.remove_all();
+
+            if (m_status_icon != null && m_switcher != null)
+                state_changed();
+        }
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -474,6 +503,7 @@ class Panel : IBus.PanelService {
         set_show_property_panel();
         set_timeout_property_panel();
         set_follow_input_cursor_when_always_shown_property_panel();
+        set_xkb_icon_rgba();
 
         set_version();
     }
@@ -664,6 +694,51 @@ class Panel : IBus.PanelService {
 
     }
 
+    private void context_render_string(Cairo.Context cr,
+                                       string        symbol,
+                                       int           image_width,
+                                       int           image_height) {
+        int lwidth = 0;
+        int lheight = 0;
+        var desc = Pango.FontDescription.from_string("Monospace Bold 22");
+        var layout = Pango.cairo_create_layout(cr);
+
+        if (symbol.length >= 3)
+            desc = Pango.FontDescription.from_string("Monospace Bold 18");
+
+        layout.set_font_description(desc);
+        layout.set_text(symbol, -1);
+        layout.get_size(out lwidth, out lheight);
+        cr.move_to((image_width - lwidth / Pango.SCALE) / 2,
+                   (image_height - lheight / Pango.SCALE) / 2);
+        cr.set_source_rgba(m_xkb_icon_rgba.red,
+                           m_xkb_icon_rgba.green,
+                           m_xkb_icon_rgba.blue,
+                           m_xkb_icon_rgba.alpha);
+        Pango.cairo_show_layout(cr, layout);
+    }
+
+    private Gdk.Pixbuf create_icon_pixbuf_with_string(string symbol) {
+        Gdk.Pixbuf pixbuf = m_xkb_icon_pixbufs[symbol];
+
+        if (pixbuf != null)
+            return pixbuf;
+
+        var image = new Cairo.ImageSurface(Cairo.Format.ARGB32, 48, 48);
+        var cr = new Cairo.Context(image);
+        int width = image.get_width();
+        int height = image.get_height();
+
+        cr.set_source_rgba(0.0, 0.0, 0.0, 0.0);
+        cr.set_operator(Cairo.Operator.SOURCE);
+        cr.paint();
+        cr.set_operator(Cairo.Operator.OVER);
+        context_render_string(cr, symbol, width, height);
+        pixbuf = Gdk.pixbuf_get_from_surface(image, 0, 0, width, height);
+        m_xkb_icon_pixbufs.insert(symbol, pixbuf);
+        return pixbuf;
+    }
+
     private void show_setup_dialog() {
         if (m_setup_pid != 0) {
             if (Posix.kill(m_setup_pid, Posix.SIGUSR1) == 0)
@@ -699,8 +774,8 @@ class Panel : IBus.PanelService {
             m_about_dialog.set_version(Config.PACKAGE_VERSION);
 
             string copyright =
-                "Copyright © 2007-2013 Peng Huang\n" +
-                "Copyright © 2007-2013 Red Hat, Inc.\n";
+                "Copyright © 2007-2014 Peng Huang\n" +
+                "Copyright © 2007-2014 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);
             m_about_dialog.set_license("LGPL");
@@ -930,11 +1005,23 @@ class Panel : IBus.PanelService {
         if (icon_name[0] == '/')
             m_status_icon.set_from_file(icon_name);
         else {
-            var theme = Gtk.IconTheme.get_default();
-            if (theme.lookup_icon(icon_name, 48, 0) != null) {
-                m_status_icon.set_from_icon_name(icon_name);
+            string symbol = null;
+
+            if (engine != null) {
+                var name = engine.get_name();
+                if (name.length >= 4 && name[0:4] == "xkb:")
+                    symbol = m_switcher.get_xkb_symbol(engine);
+            }
+
+            if (symbol != null) {
+                Gdk.Pixbuf pixbuf = create_icon_pixbuf_with_string(symbol);
+                m_status_icon.set_from_pixbuf(pixbuf);
             } else {
-                m_status_icon.set_from_icon_name("ibus-engine");
+                var theme = Gtk.IconTheme.get_default();
+                if (theme.lookup_icon(icon_name, 48, 0) != null)
+                    m_status_icon.set_from_icon_name(icon_name);
+                else
+                    m_status_icon.set_from_icon_name("ibus-engine");
             }
         }
 
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 4b4c0639d..e6e916612 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,12 +21,10 @@
  */
 
 class Switcher : Gtk.Window {
-    public extern const bool USE_SYMBOL_ICON;
-    private const int DEFAULT_FONT_SIZE = 16;
     private const int DESC_LABEL_MAX_LEN = 20;
 
     private class IBusEngineButton : Gtk.Button {
-        public IBusEngineButton(IBus.EngineDesc engine) {
+        public IBusEngineButton(IBus.EngineDesc engine, Switcher switcher) {
             GLib.Object();
 
             this.longname = engine.get_longname();
@@ -34,28 +32,28 @@ class Switcher : Gtk.Window {
             Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
             add(align);
 
-            if (!USE_SYMBOL_ICON) {
+            var name = engine.get_name();
+
+            if (name.length < 4 || name[0:4] != "xkb:") {
                 IconWidget icon = new IconWidget(engine.get_icon(),
                                                  Gtk.IconSize.DIALOG);
                 align.add(icon);
             } else {
-                var language = engine.get_language();
-                var symbol = engine.get_symbol();
-                var id = language;
+                var symbol = switcher.get_xkb_symbol(engine);
 
-                if (id.length > 2) {
-                    id = id[0:2];
-                }
+                Gtk.Label label = new Gtk.Label(symbol);
+                string symbol_font = "Monospace Bold 16";
+                string markup = "<span font=\"%s\">%s</span>".
+                        printf(symbol_font, symbol);
 
-                if (symbol.length != 0) {
-                    id = symbol;
-                }
+                label.set_markup(markup);
 
-                Gtk.Label label = new Gtk.Label(id);
-                string id_font = "%d".printf(DEFAULT_FONT_SIZE);
-                string markup = "<span font=\"%s\">%s</span>".printf(id_font, id);
+                int fixed_width, fixed_height;
+                Gtk.icon_size_lookup(Gtk.IconSize.DIALOG,
+                                     out fixed_width,
+                                     out fixed_height);
+                label.set_size_request(fixed_width, fixed_height);
 
-                label.set_markup(markup);
                 align.add(label);
             }
         }
@@ -90,6 +88,9 @@ class Switcher : Gtk.Window {
     private uint m_popup_delay_time_id = 0;
     private int m_root_x;
     private int m_root_y;
+    private GLib.HashTable<string, string> m_xkb_symbols =
+            new GLib.HashTable<string, string>(GLib.str_hash,
+                                               GLib.str_equal);
 
     public Switcher() {
         GLib.Object(
@@ -246,7 +247,7 @@ class Switcher : Gtk.Window {
         for (int i = 0; i < m_engines.length; i++) {
             var index = i;
             var engine = m_engines[i];
-            var button = new IBusEngineButton(engine);
+            var button = new IBusEngineButton(engine, this);
             var longname = engine.get_longname();
             button.set_relief(Gtk.ReliefStyle.NONE);
             button.show();
@@ -424,4 +425,38 @@ class Switcher : Gtk.Window {
     public void set_popup_delay_time(uint popup_delay_time) {
         m_popup_delay_time = popup_delay_time;
     }
+
+    public string get_xkb_symbol(IBus.EngineDesc engine) {
+        var name = engine.get_name();
+
+        assert(name[0:4] == "xkb:");
+
+        var symbol = m_xkb_symbols[name];
+
+        if (symbol != null)
+            return symbol;
+
+        var layout = engine.get_layout();
+
+        /* Maybe invalid layout */
+        if (layout.length < 2)
+            return layout;
+
+        symbol = layout[0:2].up();
+
+        int index = 0;
+
+        foreach (var saved_symbol in m_xkb_symbols.get_values()) {
+            if (symbol == saved_symbol[0:2])
+                index++;
+        }
+
+        if (index > 0) {
+            unichar u = 0x2081 + index;
+            symbol = "%s%s".printf(symbol, u.to_string());
+        }
+
+        m_xkb_symbols.insert(name, symbol);
+        return symbol;
+    }
 }

From 3e0abec1e26657316649ffc15415281890c2fde9 Mon Sep 17 00:00:00 2001
From: Nilamdyuti Goswami <ngoswami@redhat.com>
Date: Fri, 28 Feb 2014 11:37:30 +0900
Subject: [PATCH 214/816] Add contextual information on translatable strings.

Source String Contextualization Group (SSCG) is a Fedora SIG group
initiated to provide meaningful descriptions of the source strings
for translators to ensure the correctness and quality of the translations.

https://fedoraproject.org/wiki/SSCG

BUG=rhbz#1069594

Review URL: https://codereview.appspot.com/69010043
Patch from Nilamdyuti Goswami <ngoswami@redhat.com>.
---
 data/ibus.schemas.in | 4 ++--
 setup/main.py        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index fbbe2a602..2f76ce338 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -9,8 +9,8 @@
       <default>[]</default>
       <list_type>string</list_type>
       <locale name="C">
-        <short>Preload engines</short>
-	    <long>Preload engines during ibus starts up</long>
+        <short><!-- Translators: Here “Preload” is a verb -->Preload engines</short>
+	    <long><!-- Translators: Tooltip for the button “Preload Engines” -->Preload engines during ibus starts up</long>
       </locale>
     </schema>
     <schema>
diff --git a/setup/main.py b/setup/main.py
index 699ba0e8b..9c98c41f1 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -374,6 +374,7 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
                    _("_OK"), Gtk.ResponseType.OK)
         title = _("Select keyboard shortcut for %s") % \
+                # Translators: Title of the window
                 _("switching input methods")
         dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)
         text = entry.get_text()

From 698e85bce8ec948c55997b0a59e0a59803a5a312 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Mar 2014 11:44:01 +0900
Subject: [PATCH 215/816] Fix python comment in escape sequence.

Review URL: https://codereview.appspot.com/69840043
---
 setup/main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 9c98c41f1..dee7be4d7 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -373,9 +373,10 @@ def __init_bus(self):
     def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
                    _("_OK"), Gtk.ResponseType.OK)
-        title = _("Select keyboard shortcut for %s") % \
-                # Translators: Title of the window
-                _("switching input methods")
+        title1 = _("Select keyboard shortcut for %s")
+        # Translators: Title of the window
+        title2 = _("switching input methods")
+        title = title1 % title2
         dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)
         text = entry.get_text()
         if text:

From 427475201d351f5888fb6b4d90cf604514335707 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Mar 2014 11:50:10 +0900
Subject: [PATCH 216/816] Update translations.

Update po/ja.po po/nl.po po/pl.po po/uk.po

Review URL: https://codereview.appspot.com/69920043
---
 po/ja.po | 133 +++++++++++++++++++++++++++++-----------------------
 po/nl.po | 133 +++++++++++++++++++++++++++++-----------------------
 po/pl.po | 139 +++++++++++++++++++++++++++++++------------------------
 po/uk.po | 133 +++++++++++++++++++++++++++++-----------------------
 4 files changed, 307 insertions(+), 231 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 50a51b39f..546c9c44b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
+"POT-Creation-Date: 2014-02-26 14:33+0900\n"
+"PO-Revision-Date: 2014-02-28 03:56+0000\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "ひとつ前の入力メソッド:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for turning input method on or off"
 msgstr "入力メソッドをオンまたはオフするためのショートカットキー"
 
@@ -130,11 +130,11 @@ msgstr "プロパティーパネルを表示する:"
 msgid "Language panel position:"
 msgstr "言語パネルの位置"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
 msgid "Show icon on system tray"
 msgstr "システムトレイにアイコンを表示する"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
 msgid "Show input method name on language bar"
 msgstr "言語バーに入力メソッド名を表示する"
 
@@ -223,11 +223,11 @@ msgstr "<small><i>アクティブなインプットメソッドは、キーボ
 msgid "Input Method"
 msgstr "入力メソッド"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
 msgid "Use system keyboard layout"
 msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
@@ -235,7 +235,7 @@ msgstr "システムのキーボード (XKB) レイアウトを使用する"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
@@ -265,7 +265,7 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
 msgid "About"
 msgstr "情報"
 
@@ -273,176 +273,194 @@ msgstr "情報"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "プリロードエンジン"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus 起動時のプリロードエンジン"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "エンジンの順序"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "入力メソッドの一覧の中から保存されたエンジンの順序"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 切り替えウィンドウのポップアップ遅延時間 (ミリ秒単位)"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デフォルトは 400 ミリ秒です。「0 =」ならウィンドウが直ちに表示されます。「0 &lt;」にすると指定したミリ秒数遅延します。「0 &gt;」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "保存されているバージョン番号"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 のバージョンの違いをチェックする場合に使用されます。"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys"
 msgstr "トリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のためのトリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Enable shortcut keys"
 msgstr "ショートカットキーを有効にする"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method on"
 msgstr "入力メソッドをオンに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Disable shortcut keys"
 msgstr "ショートカットキーを無効にする"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for turning input method off"
 msgstr "入力メソッドをオフに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Next engine shortcut keys"
 msgstr "次のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "一覧内の次の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Prev engine shortcut keys"
 msgstr "前のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "一覧内のひとつ前の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Auto hide"
 msgstr "自動的に隠す"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Language panel position"
 msgstr "言語パネルの位置"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 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
+#: ../data/ibus.schemas.in.h:26
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "パネルが常に表示されている場合に入力カーソルに従う"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。false ならば、パネルは固定位置に表示されます。"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "The milliseconds to show property panel"
 msgstr "プロパティーパネルを表示するミリ秒"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミリ秒。"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Orientation of lookup table"
 msgstr "検索テーブルの向き"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "検索テーブルの向きです。0 = 横、1 = 縦"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Show input method name"
 msgstr "入力メソッド名を表示する"
 
 #: ../data/ibus.schemas.in.h:35
+msgid "RGBA value of XKB icon"
+msgstr "XKB アイコンの RGBA 値"
+
+#: ../data/ibus.schemas.in.h:37
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 からの色彩名、2. 書式 '#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、3. 書式 'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラーで、その 'r', 'g', 'b' は 0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 までの範囲内の浮動小数値のこと。"
+
+#: ../data/ibus.schemas.in.h:40
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:43
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:44
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:45
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:46
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:48
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:49
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:50
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:51
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -527,7 +545,7 @@ msgstr "キャンセル(_C)"
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:396
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
@@ -554,7 +572,8 @@ msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:378
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
@@ -665,31 +684,31 @@ msgstr "コマンド:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:454
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:782
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:786
 msgid "translator-credits"
 msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>\nMIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:807
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:817
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:821
 msgid "Quit"
 msgstr "終了"
 
diff --git a/po/nl.po b/po/nl.po
index d561d2e2a..1ef6cd4de 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
+"POT-Creation-Date: 2014-02-26 14:33+0900\n"
+"PO-Revision-Date: 2014-02-28 13:30+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Vorige invoermethode:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for turning input method on or off"
 msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
 
@@ -123,11 +123,11 @@ msgstr "Toon eigenschapspaneel"
 msgid "Language panel position:"
 msgstr "Taal panel positie:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
 msgid "Show icon on system tray"
 msgstr "Toon icoon op systeemvak"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
 msgid "Show input method name on language bar"
 msgstr "Toon naam van invoermethode op taalbalk"
 
@@ -216,11 +216,11 @@ msgstr "<small><i>De actieve invoermethode kan omgeschakeld worden tussen de ges
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
@@ -228,7 +228,7 @@ msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
@@ -258,7 +258,7 @@ msgstr "Start ibus bij inloggen"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
 msgid "About"
 msgstr "Over"
 
@@ -266,176 +266,194 @@ msgstr "Over"
 msgid "_Close"
 msgstr "Sl_uiten"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Engines voor-laden"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Engines voor-laden tijdens opstarten van ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Machine volgorde"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Opgeslagen machine volgorde in invoermethode lijst"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Pop-up vertraging milliseconden voor IME omschakelvenster"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Vertraging in milliseconden. 0 &gt; Laat het venster niet zien  en schakel vorige/volgende engine om."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Versienummer opgeslagen"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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. "
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys"
 msgstr "Trigger sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activeer snelkoppeltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Enable shortcut keys"
 msgstr "Zet sneltoetsen aan"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method on"
 msgstr "De sneltoetsen om invoermethode aan te zetten"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Disable shortcut keys"
 msgstr "Zet sneltoetsen uit"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for turning input method off"
 msgstr "De sneltoetsen om invoermethode uit te zetten"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Next engine shortcut keys"
 msgstr "Volgende engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 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"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Prev engine shortcut keys"
 msgstr "Vorige engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Auto hide"
 msgstr "Automatisch verbergen"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch verbergen, 2 = Toon het altijd"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Language panel position"
 msgstr "Taal-paneel positie"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:26
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Volg de input cursor als het paneel altijd getoond wordt"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Als dit waar is zal het paneel de input cursor volgen als het panel altijd getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie getoond."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "The milliseconds to show property panel"
 msgstr "Het aanral milliseconden om het eigenschapspaneel te tonen "
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of eigenschappen veranderd zijn."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Orientation of lookup table"
 msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Show input method name"
 msgstr "Toon naam van invoermethode"
 
 #: ../data/ibus.schemas.in.h:35
+msgid "RGBA value of XKB icon"
+msgstr "RGBA waarde van XKB icoon"
+
+#: ../data/ibus.schemas.in.h:37
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB icoon toont de indelingsstring en deze string wordt van de RGBA waarde afgeleid. De RGBA waarde kan zijn 1. een X11 kleurnaam, 2. een hexadecimale waarde in de vorm '#rrggbb' waarin 'r', 'g' en 'b' hexadecimale getallen zijn voor het rood, groen en blauw, 3. een RGB kleur in de vorm 'rgb(r,g,b)' of 4. een RGBA kleur in de vorm 'rgba(r,g,b,a)' waarin 'r', 'g' en 'b' gehele getallen zijn in de reeks van 0 tot 255 of procentuele waardes in de reeks van 0% tot 100%, en 'a' een waarde met drijvende komma is in de reeks van 0 tot 1 van alfa."
+
+#: ../data/ibus.schemas.in.h:40
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:43
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:44
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:45
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:46
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:48
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:49
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:50
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:51
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -520,7 +538,7 @@ msgstr "_Annuleren"
 msgid "_OK"
 msgstr "_Ok"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:396
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Gebruik snelkoppeling met Shift voor het omschakelen naar de vorige invoermethode"
 
@@ -547,7 +565,8 @@ msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:378
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
@@ -658,31 +677,31 @@ msgstr "Commando's:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:454
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:782
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:786
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:807
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:817
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:821
 msgid "Quit"
 msgstr "Afsluiten"
 
diff --git a/po/pl.po b/po/pl.po
index c475e67cb..6f5596a8f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
+"POT-Creation-Date: 2014-02-26 14:33+0900\n"
+"PO-Revision-Date: 2014-02-28 14:35+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Poprzednia metoda wprowadzania:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
 
@@ -123,11 +123,11 @@ msgstr "Wyświetlanie panelu właściwości:"
 msgid "Language panel position:"
 msgstr "Pozycja panelu języków:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
 msgid "Show icon on system tray"
 msgstr "Wyświetlanie ikony w obszarze powiadamiania"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
 msgid "Show input method name on language bar"
 msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
@@ -216,11 +216,11 @@ msgstr "<small><i>Aktywna metoda wprowadzania może być przełączana z wybrany
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
 msgid "Use system keyboard layout"
 msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
 msgid "Use system keyboard (XKB) layout"
 msgstr "Użycie systemowego układu klawiatury (XKB)"
 
@@ -228,7 +228,7 @@ msgstr "Użycie systemowego układu klawiatury (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Share the same input method among all applications"
 msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
@@ -258,7 +258,7 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
 msgid "About"
 msgstr "O programie"
 
@@ -266,176 +266,194 @@ msgstr "O programie"
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Wcześniejsze wczytanie mechanizmów"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi IBus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Kolejność mechanizmów"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na następny/poprzedni mechanizm."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Zapisany numer wersji"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 "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
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys"
 msgstr "Klawisze skrótów przełącznika"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu dla gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Enable shortcut keys"
 msgstr "Włącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method on"
 msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Disable shortcut keys"
 msgstr "Wyłącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for turning input method off"
 msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Next engine shortcut keys"
 msgstr "Klawisze skrótów następnego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 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"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Prev engine shortcut keys"
 msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 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"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Auto hide"
 msgstr "Automatyczne ukrywanie"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Language panel position"
 msgstr "Pozycja panela języków"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:26
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to panel jest wyświetlany w stałym położeniu."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "The milliseconds to show property panel"
 msgstr "Milisekundy do wyświetlenia panelu właściwości"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub właściwości."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Orientation of lookup table"
 msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Show input method name"
 msgstr "Wyświetlanie nazwy metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:35
+msgid "RGBA value of XKB icon"
+msgstr "Wartość RGBA ikony XKB"
+
+#: ../data/ibus.schemas.in.h:37
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość szesnastkową w formie \"#rrggbb\", gdzie \"r\", \"g\" i \"b\" są cyframi szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB w formie \"rgb(r,g,b)\" lub 4. kolor RGBA w formie \"rgba(r,g,b,a)\", gdzie \"r\", \"g\" i \"b\" są liczbami całkowitymi w zakresie od 0 do 255 lub wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością zmiennoprzecinkową w zakresie od 0 do 1 alfy."
+
+#: ../data/ibus.schemas.in.h:40
 msgid "Use custom font"
 msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "Use custom font name for language panel"
 msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Custom font"
 msgstr "Własna czcionka"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:43
 msgid "Custom font name for language panel"
 msgstr "Nazwa własnej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:44
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:45
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:46
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:48
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:49
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność wprowadzania"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:50
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:51
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -520,7 +538,7 @@ msgstr "_Anuluj"
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:396
 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"
 
@@ -534,7 +552,7 @@ msgid ""
 "  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:364
@@ -547,7 +565,8 @@ msgstr "Nie można uruchomić usługi IBus od %d sekund"
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:378
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -646,7 +665,7 @@ msgstr "Wyświetla tę informację"
 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
@@ -658,31 +677,31 @@ msgstr "Polecenia:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:454
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:782
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:786
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2014"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:807
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:817
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:821
 msgid "Quit"
 msgstr "Zakończ"
 
diff --git a/po/uk.po b/po/uk.po
index 02f4f8277..b6b163d18 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
+"POT-Creation-Date: 2014-02-26 14:33+0900\n"
+"PO-Revision-Date: 2014-02-28 14:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgstr "Попередній спосіб введення:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання способів введення"
 
@@ -124,11 +124,11 @@ msgstr "Показ панелі властивостей:"
 msgid "Language panel position:"
 msgstr "Розташування мовної панелі:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
 msgid "Show icon on system tray"
 msgstr "Показувати піктограму у системному лотку"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
 msgid "Show input method name on language bar"
 msgstr "Показувати назву способу введення на мовній панелі"
 
@@ -217,11 +217,11 @@ msgstr "<small><i>Активний спосіб введення можна пе
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
@@ -229,7 +229,7 @@ msgstr "Використовувати розкладку клавіатури 
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
@@ -259,7 +259,7 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
 msgid "About"
 msgstr "Інформація"
 
@@ -267,176 +267,194 @@ msgstr "Інформація"
 msgid "_Close"
 msgstr "_Закрити"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Попередньо завантажувати рушії"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Попередньо завантажувати рушії під час запуску ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Порядок рушіїв"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Збережений порядок рушіїв у списку способів введення"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Затримка появи контекстного вікна для перемикача способів введення"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "Встановити затримку появи контекстного вікна перемикача способів введення у мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 &lt; — затримка у мілісекундах. 0 &gt; — не показувати вікно і перемикатися на попередній або наступний рушій."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Збережений номер версії"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys"
 msgstr "Клавіатурні скорочення-перемикачі"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Комбінації клавіш для перемикання gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Enable shortcut keys"
 msgstr "Увімкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method on"
 msgstr "Клавіатурне скорочення для вмикання способів введення"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Disable shortcut keys"
 msgstr "Вимкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for turning input method off"
 msgstr "Клавіатурне скорочення для вимикання способів введення"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Next engine shortcut keys"
 msgstr "Скорочення для наступного рушія"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Prev engine shortcut keys"
 msgstr "Скорочення для попереднього рушія"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Auto hide"
 msgstr "Автоматично ховати"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 = завжди показувати"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Language panel position"
 msgstr "Розташування мовної панелі"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 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
+#: ../data/ibus.schemas.in.h:26
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Слідувати за курсором введення, якщо панель показано завжди"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Якщо має значення «true», панель слідуватиме за курсором введення, якщо панель працює у режимі безумовного показу. Якщо має значення «false», панель буде показано у фіксованій позиції."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "The milliseconds to show property panel"
 msgstr "Тривалість показу панелі властивостей у мілісекундах"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Тривалість показу панелі властивостей (у мілісекундах) після фокусування або зміни властивостей."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Orientation of lookup table"
 msgstr "Орієнтація таблиці пошуку"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Show input method name"
 msgstr "Показувати назву способу введення"
 
 #: ../data/ibus.schemas.in.h:35
+msgid "RGBA value of XKB icon"
+msgstr "Значення RGBA для піктограми XKB"
+
+#: ../data/ibus.schemas.in.h:37
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде використано вказане значення RGBA. Значенням RGBA може бути: 1. назва кольору у X11, 2. шістнадцяткове число у форматі «#ччззсс», де «ч», «з», «с» є цифрами для червоного, зеленого та синього кольорів, 3. колір RGB у форматі «rgb(ч,з,с)» або 4. колір RGBA у форматі «rgba(ч,з,с,п)», де «ч», «з», «с» є або цілими значеннями у діапазоні від 0 до 255, або відсотковими значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для прозорості у діапазоні від 0 до 1."
+
+#: ../data/ibus.schemas.in.h:40
 msgid "Use custom font"
 msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:43
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:44
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:45
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:46
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:48
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:49
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:50
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:51
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -521,7 +539,7 @@ msgstr "_Скасувати"
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:396
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
 
@@ -548,7 +566,8 @@ msgstr "Не вдалося запустити фонову службу IBus п
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:378
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -659,31 +678,31 @@ msgstr "Команди:\n"
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:454
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:782
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:786
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:807
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:817
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:821
 msgid "Quit"
 msgstr "Вийти"
 

From 43719baaa67cf9f3832f5341776570cf161df9db Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 7 Mar 2014 13:51:59 +0900
Subject: [PATCH 217/816] Fix deprecated GtkHBox in setup.ui

Review URL: https://codereview.appspot.com/72000043
---
 setup/setup.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index ec207d2ee..ad5386bce 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -677,7 +677,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkBox" id="hbox1">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>

From 2a75303fd88adfd8e041c90a3ecc0cc93a74aed3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 7 Mar 2014 13:56:37 +0900
Subject: [PATCH 218/816] Release 1.5.6

Review URL: https://codereview.appspot.com/68530043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3b2ac6222..9a502ec70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [5])
+m4_define([ibus_micro_version], [6])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 9782a20c544001a211a788975f55ded5064b7273 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Mar 2014 11:41:33 +0900
Subject: [PATCH 219/816] Add Czech (qwerty) keymap.

BUG=rhbz#1074879

Review URL: https://codereview.appspot.com/74520044
---
 engine/simple.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 4218f6ca4..b3ac6a5df 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -203,6 +203,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+                <engine>
+                        <name>xkb:cz:qwerty:cze</name>
+                        <language>cze</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>cz</layout>
+                        <layout_variant>qwerty</layout_variant>
+                        <longname>Czech (qwerty)</longname>
+                        <description>Czech (qwerty)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
 		<engine>
 			<name>xkb:dk::dan</name>
 			<language>dan</language>

From 18612e19fe4e9d3c89cbcf92c6562d48677412d6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Mar 2014 11:49:08 +0900
Subject: [PATCH 220/816] Update supported vala version to 0.20.

Review URL: https://codereview.appspot.com/76830043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9a502ec70..d2fd34181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY)
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_STDC
-AM_PROG_VALAC([0.14])
+AM_PROG_VALAC([0.20])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 

From 6ca5ddb302c98e52c78326ed0dfaaf90481d4d8c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 3 Apr 2014 12:19:47 +0900
Subject: [PATCH 221/816] Send panel input purpose.

gnome-shell gets input purpose so that disables IME with password mode.

Review URL: https://codereview.appspot.com/81770044
---
 bus/inputcontext.c     |  16 ++++-
 bus/inputcontext.h     | 158 ++++++++++++++++++++++++++---------------
 bus/panelproxy.c       |  22 +++++-
 bus/panelproxy.h       |   8 ++-
 src/ibuspanelservice.c |  56 ++++++++++++++-
 src/ibuspanelservice.h |   7 +-
 6 files changed, 199 insertions(+), 68 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index a2d1d52c8..512a0ec38 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2014 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
@@ -2459,3 +2459,15 @@ bus_input_context_get_client (BusInputContext *context)
     g_assert (BUS_IS_INPUT_CONTEXT (context));
     return context->client;
 }
+
+void
+bus_input_context_get_content_type (BusInputContext *context,
+                                    guint           *purpose,
+                                    guint           *hints)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+    g_return_if_fail (purpose != NULL && hints != NULL);
+
+    *purpose = context->purpose;
+    *hints = context->hints;
+}
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index 50f615f54..f282faee2 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+/* ibus - The Input Bus
+ * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2014 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
@@ -32,181 +32,223 @@
  */
 
 /* define GOBJECT macros */
-#define BUS_TYPE_INPUT_CONTEXT             \
+#define BUS_TYPE_INPUT_CONTEXT                                  \
     (bus_input_context_get_type ())
-#define BUS_INPUT_CONTEXT(obj)             \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), BUS_TYPE_INPUT_CONTEXT, BusInputContext))
-#define BUS_INPUT_CONTEXT_CLASS(klass)     \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), BUS_TYPE_INPUT_CONTEXT, BusInputContextClass))
-#define BUS_IS_INPUT_CONTEXT(obj)          \
+#define BUS_INPUT_CONTEXT(obj)                                  \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj),                         \
+                                 BUS_TYPE_INPUT_CONTEXT,        \
+                                 BusInputContext))
+#define BUS_INPUT_CONTEXT_CLASS(klass)                          \
+    (G_TYPE_CHECK_CLASS_CAST ((klass),                          \
+                              BUS_TYPE_INPUT_CONTEXT,           \
+                              BusInputContextClass))
+#define BUS_IS_INPUT_CONTEXT(obj)                               \
     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BUS_TYPE_INPUT_CONTEXT))
-#define BUS_IS_INPUT_CONTEXT_CLASS(klass)  \
+#define BUS_IS_INPUT_CONTEXT_CLASS(klass)                       \
     (G_TYPE_CHECK_CLASS_TYPE ((klass), BUS_TYPE_INPUT_CONTEXT))
-#define BUS_INPUT_CONTEXT_GET_CLASS(obj)   \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), BUS_TYPE_INPUT_CONTEXT, BusInputContextClass))
+#define BUS_INPUT_CONTEXT_GET_CLASS(obj)                        \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj),                          \
+                                BUS_TYPE_INPUT_CONTEXT,         \
+                                BusInputContextClass))
 
 G_BEGIN_DECLS
 
 typedef struct _BusInputContext BusInputContext;
 typedef struct _BusInputContextClass BusInputContextClass;
 
-GType                bus_input_context_get_type         (void);
-BusInputContext     *bus_input_context_new              (BusConnection      *connection,
-                                                         const gchar        *client);
+GType                bus_input_context_get_type (void);
+BusInputContext     *bus_input_context_new      (BusConnection      *connection,
+                                                 const gchar        *client);
 
 /**
  * bus_input_context_focus_in:
  *
- * Give a focus to the context. Call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods of the engine for the context,
- * and then emit glib signals to the context object. This function does nothing if the context already has a focus.
+ * Give a focus to the context. Call FocusIn, Enable, SetCapabilities,
+ * and SetCursorLocation methods of the engine for the context,
+ * and then emit glib signals to the context object. This function does
+ * nothing if the context already has a focus.
  */
-void                 bus_input_context_focus_in         (BusInputContext    *context);
+void                 bus_input_context_focus_in (BusInputContext    *context);
 
 /**
  * bus_input_context_focus_out:
  *
- * Remove a focus from the context. Call FocusOut method of the engine for the context.
+ * Remove a focus from the context. Call FocusOut method of the engine for
+ * the context.
  * This function does nothing if the context does not have a focus.
  */
-void                 bus_input_context_focus_out        (BusInputContext    *context);
+void                 bus_input_context_focus_out
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_has_focus:
  * @returns: context->has_focus.
  */
-gboolean             bus_input_context_has_focus        (BusInputContext    *context);
+gboolean             bus_input_context_has_focus
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_enable:
  *
- * Enable the current engine for the context. Request an engine (if needed), call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
- * of the engine for the context, and then emit glib and D-Bus "enabled" signals.
+ * Enable the current engine for the context. Request an engine (if needed),
+ * call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
+ * of the engine for the context, and then emit glib and D-Bus "enabled"
+ * signals.
  */
-void                 bus_input_context_enable           (BusInputContext    *context);
+void                 bus_input_context_enable   (BusInputContext    *context);
 
 /**
  * bus_input_context_disable:
  *
- * Disable the current engine for the context. Request an engine (if needed), call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
- * of the engine for the context, and then emit glib and D-Bus "enabled" signals.
+ * Disable the current engine for the context. Request an engine (if needed),
+ * call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
+ * of the engine for the context, and then emit glib and D-Bus "enabled"
+ * signals.
  */
-void                 bus_input_context_disable          (BusInputContext    *context);
+void                 bus_input_context_disable  (BusInputContext    *context);
 
 /**
  * bus_input_context_page_up:
  *
  * Call page_up method of the current engine proxy.
  */
-void                 bus_input_context_page_up          (BusInputContext    *context);
+void                 bus_input_context_page_up  (BusInputContext    *context);
 
 /**
  * bus_input_context_page_down:
  *
  * Call page_down method of the current engine proxy.
  */
-void                 bus_input_context_page_down        (BusInputContext    *context);
+void                 bus_input_context_page_down
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_cursor_up:
  *
  * Call cursor_up method of the current engine proxy.
  */
-void                 bus_input_context_cursor_up        (BusInputContext    *context);
+void                 bus_input_context_cursor_up
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_cursor_down:
  *
  * Call cursor_down method of the current engine proxy.
  */
-void                 bus_input_context_cursor_down      (BusInputContext    *context);
+void                 bus_input_context_cursor_down
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_candidate_clicked:
  *
  * Call candidate_clicked method of the current engine proxy.
  */
-void                 bus_input_context_candidate_clicked(BusInputContext    *context,
-                                                         guint               index,
-                                                         guint               button,
-                                                         guint               state);
+void                 bus_input_context_candidate_clicked
+                                                (BusInputContext    *context,
+                                                 guint               index,
+                                                 guint               button,
+                                                 guint               state);
 
 /**
  * bus_input_context_set_engine:
  *
  * Use the engine on the context.
  */
-void                 bus_input_context_set_engine       (BusInputContext    *context,
-                                                         BusEngineProxy     *engine);
+void                 bus_input_context_set_engine
+                                                (BusInputContext    *context,
+                                                 BusEngineProxy     *engine);
 
 /**
  * bus_input_context_set_engine_by_desc:
  * @desc: the engine to use on the context.
  * @timeout: timeout (in ms) for D-Bus calls.
- * @callback: a function to be called when bus_input_context_set_engine_by_desc is finished. if NULL, the default callback
- *            function, which just calls bus_input_context_set_engine_by_desc_finish, is used.
+ * @callback: a function to be called when bus_input_context_set_engine_by_desc
+ *            is finished. if NULL, the default callback
+ *            function, which just calls
+ *            bus_input_context_set_engine_by_desc_finish, is used.
  *
  * Create a new BusEngineProxy object and use it on the context.
  */
 void                 bus_input_context_set_engine_by_desc
-                                                        (BusInputContext    *context,
-                                                         IBusEngineDesc     *desc,
-                                                         gint                timeout,
-                                                         GCancellable       *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer            user_data);
+                                                (BusInputContext    *context,
+                                                 IBusEngineDesc     *desc,
+                                                 gint                timeout,
+                                                 GCancellable
+                                                                   *cancellable,
+                                                 GAsyncReadyCallback callback,
+                                                 gpointer            user_data);
 
 /**
  * bus_input_context_set_engine_by_desc_finish:
  *
- * A function to be called by the GAsyncReadyCallback function for bus_input_context_set_engine_by_desc.
+ * A function to be called by the GAsyncReadyCallback function for
+ * bus_input_context_set_engine_by_desc.
  */
 gboolean             bus_input_context_set_engine_by_desc_finish
-                                                         (BusInputContext   *context,
-                                                          GAsyncResult      *res,
-                                                          GError           **error);
+                                                (BusInputContext    *context,
+                                                 GAsyncResult       *res,
+                                                 GError            **error);
 
 /**
  * bus_input_context_get_engine:
  *
  * Get a BusEngineProxy object of the current engine.
  */
-BusEngineProxy      *bus_input_context_get_engine       (BusInputContext    *context);
+BusEngineProxy      *bus_input_context_get_engine
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_get_engine_desc:
  *
  * Get an IBusEngineDesc object of the current engine.
  */
-IBusEngineDesc      *bus_input_context_get_engine_desc  (BusInputContext    *context);
+IBusEngineDesc      *bus_input_context_get_engine_desc
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_property_activate:
  *
  * Call property_activate method of the current engine proxy.
  */
-void                 bus_input_context_property_activate(BusInputContext    *context,
-                                                         const gchar        *prop_name,
-                                                         gint                prop_state);
+void                 bus_input_context_property_activate
+                                                (BusInputContext    *context,
+                                                 const gchar        *prop_name,
+                                                 gint
+                                                                    prop_state);
 
 /**
  * bus_input_context_get_capabilities:
  * @returns: context->capabilities.
  */
-guint                bus_input_context_get_capabilities (BusInputContext    *context);
+guint                bus_input_context_get_capabilities
+                                                (BusInputContext    *context);
 
 /**
  * bus_input_context_set_capabilities:
  *
  * Call set_capabilities method of the current engine proxy.
  */
-void                 bus_input_context_set_capabilities (BusInputContext    *context,
-                                                         guint               capabilities);
+void                 bus_input_context_set_capabilities
+                                                (BusInputContext    *context,
+                                                 guint
+                                                                  capabilities);
 
 /**
  * bus_input_context_get_client:
  * @returns: context->client.
  */
-const gchar         *bus_input_context_get_client       (BusInputContext    *context);
+const gchar         *bus_input_context_get_client
+                                                (BusInputContext    *context);
+
+/**
+ * bus_input_context_get_content_type:
+ * @purpose: Input purpose.
+ * @hints: Input hints.
+ */
+void                 bus_input_context_get_content_type
+                                                (BusInputContext    *context,
+                                                 guint              *purpose,
+                                                 guint              *hints);
 
 G_END_DECLS
 #endif
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index d49f1e103..cdb3d20ca 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2014 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
@@ -398,6 +398,20 @@ bus_panel_proxy_update_property (BusPanelProxy  *panel,
                        -1, NULL, NULL, NULL);
 }
 
+void
+bus_panel_proxy_set_content_type (BusPanelProxy  *panel,
+                                  guint           purpose,
+                                  guint           hints)
+{
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "ContentType",
+                       g_variant_new ("(uu)", purpose, hints),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
+
 #define DEFINE_FUNC(name)                                       \
     static void                                                 \
     bus_panel_proxy_##name (BusPanelProxy *panel)               \
@@ -663,6 +677,10 @@ bus_panel_proxy_focus_in (BusPanelProxy     *panel,
                           input_context_signals[i].callback,
                           panel);
     }
+
+    guint purpose, hints;
+    bus_input_context_get_content_type (context, &purpose, &hints);
+    bus_panel_proxy_set_content_type (panel, purpose, hints);
 }
 
 void
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index ff7e5ceb8..57cf9db31 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2014 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
@@ -109,6 +109,10 @@ void             bus_panel_proxy_register_properties
 void             bus_panel_proxy_update_property
                                                (BusPanelProxy     *panel,
                                                 IBusProperty      *prop);
+void             bus_panel_proxy_set_content_type
+                                               (BusPanelProxy     *panel,
+                                                guint              purpose,
+                                                guint              hints);
 G_END_DECLS
 #endif
 
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index ef3b9804d..3a8040320 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -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) 2009-2013 Google Inc. All rights reserved.
- * Copyright (C) 2010-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2009-2014 Google Inc. All rights reserved.
+ * Copyright (C) 2010-2014 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -49,6 +49,7 @@ enum {
     START_SETUP,
     STATE_CHANGED,
     DESTROY_CONTEXT,
+    SET_CONTENT_TYPE,
     LAST_SIGNAL,
 };
 
@@ -133,6 +134,10 @@ static void      ibus_panel_service_update_preedit_text
 static void      ibus_panel_service_update_property
                                    (IBusPanelService       *panel,
                                     IBusProperty           *prop);
+static void      ibus_panel_service_set_content_type
+                                   (IBusPanelService       *panel,
+                                    guint                   purpose,
+                                    guint                   hints);
 
 G_DEFINE_TYPE (IBusPanelService, ibus_panel_service, IBUS_TYPE_SERVICE)
 
@@ -189,6 +194,10 @@ static const gchar introspection_xml[] =
     "    <method name='StateChanged' />"
     "    <method name='HideLanguageBar' />"
     "    <method name='ShowLanguageBar' />"
+    "    <method name='ContentType'>"
+    "      <arg direction='in'  type='u' name='purpose' />"
+    "      <arg direction='in'  type='u' name='hints' />"
+    "    </method>"
     /* Signals */
     "    <signal name='CursorUp' />"
     "    <signal name='CursorDown' />"
@@ -246,6 +255,7 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
     class->update_auxiliary_text = ibus_panel_service_update_auxiliary_text;
     class->update_preedit_text   = ibus_panel_service_update_preedit_text;
     class->update_property       = ibus_panel_service_update_property;
+    class->set_content_type      = ibus_panel_service_set_content_type;
 
     class->cursor_down_lookup_table = ibus_panel_service_not_implemented;
     class->cursor_up_lookup_table   = ibus_panel_service_not_implemented;
@@ -784,6 +794,31 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             G_TYPE_NONE,
             1,
             G_TYPE_STRING);
+
+    /**
+     * IBusPanelService::set-content-type:
+     * @panel: An #IBusPanelService
+     * @purpose: Input purpose.
+     * @hints: Input hints.
+     *
+     * Emitted when the client application get the set-content-type.
+     * Implement the member function set_content_type() in extended class to
+     * receive this signal.
+     *
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
+     */
+    panel_signals[SET_CONTENT_TYPE] =
+        g_signal_new (I_("set-content-type"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, set_content_type),
+            NULL, NULL,
+            _ibus_marshal_VOID__UINT_UINT,
+            G_TYPE_NONE,
+            2,
+            G_TYPE_UINT,
+            G_TYPE_UINT);
 }
 
 static void
@@ -951,6 +986,15 @@ ibus_panel_service_service_method_call (IBusService           *service,
         return;
     }
 
+    if (g_strcmp0 (method_name, "ContentType") == 0) {
+        guint purpose, hints;
+        g_variant_get (parameters, "(uu)", &purpose, &hints);
+        g_signal_emit (panel, panel_signals[SET_CONTENT_TYPE], 0,
+                       purpose, hints);
+        g_dbus_method_invocation_return_value (invocation, NULL);
+        return;
+    }
+
     const static struct {
         const gchar *name;
         const gint signal_id;
@@ -1104,6 +1148,14 @@ ibus_panel_service_update_property (IBusPanelService *panel,
     ibus_panel_service_not_implemented(panel);
 }
 
+static void
+ibus_panel_service_set_content_type (IBusPanelService *panel,
+                                     guint             purpose,
+                                     guint             hints)
+{
+    ibus_panel_service_not_implemented(panel);
+}
+
 IBusPanelService *
 ibus_panel_service_new (GDBusConnection *connection)
 {
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index e88a3a778..0399a2f3f 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -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) 2009-2013 Google Inc. All rights reserved.
+ * Copyright (c) 2009-2014 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -118,10 +118,13 @@ struct _IBusPanelServiceClass {
     void     (* destroy_context)           (IBusPanelService       *panel,
                                             const gchar
                                                    *input_context_path);
+    void     (* set_content_type)          (IBusPanelService       *panel,
+                                            guint                   purpose,
+                                            guint                   hints);
 
     /*< private >*/
     /* padding */
-    gpointer pdummy[7];  // We can add 8 pointers without breaking the ABI.
+    gpointer pdummy[6];  // We can add 8 pointers without breaking the ABI.
 };
 
 GType            ibus_panel_service_get_type  (void);

From ca128d1eee6599263b5e43b087781a00ada2732c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 7 Apr 2014 18:06:10 +0900
Subject: [PATCH 222/816] Keep track of content-type change after focus-in

This is an amendment to 6ca5ddb3.  As content-type (input-purpose and hints)
can change after focus-in, we should monitor the changes.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/83920043
---
 bus/inputcontext.c  | 21 +++++++++++++++++++++
 bus/marshalers.list |  1 +
 bus/panelproxy.c    | 16 ++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 512a0ec38..9cbd2ecaa 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -124,6 +124,7 @@ enum {
     UPDATE_PROPERTY,
     ENGINE_CHANGED,
     REQUEST_ENGINE,
+    SET_CONTENT_TYPE,
     LAST_SIGNAL,
 };
 
@@ -566,6 +567,18 @@ bus_input_context_class_init (BusInputContextClass *class)
             1,
             G_TYPE_STRING);
 
+    context_signals[SET_CONTENT_TYPE] =
+        g_signal_new (I_("set-content-type"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__UINT_UINT,
+            G_TYPE_NONE,
+            2,
+            G_TYPE_UINT,
+            G_TYPE_UINT);
+
     text_empty = ibus_text_new_from_string ("");
     g_object_ref_sink (text_empty);
     lookup_table_empty = ibus_lookup_table_new (9 /* page size */, 0, FALSE, FALSE);
@@ -1149,6 +1162,14 @@ bus_input_context_service_set_property (IBusService     *service,
                                                    purpose,
                                                    hints);
 
+            if (context->has_focus) {
+                g_signal_emit (context,
+                               context_signals[SET_CONTENT_TYPE],
+                               0,
+                               context->purpose,
+                               context->hints);
+            }
+
             error = NULL;
             retval = bus_input_context_property_changed (context,
                                                          "ContentType",
diff --git a/bus/marshalers.list b/bus/marshalers.list
index 7bc5dc3a9..c032cdaae 100644
--- a/bus/marshalers.list
+++ b/bus/marshalers.list
@@ -10,5 +10,6 @@ VOID:OBJECT,UINT,BOOLEAN,UINT
 VOID:OBJECT,STRING,STRING,STRING
 VOID:STRING
 VOID:STRING,INT
+VOID:UINT,UINT
 VOID:UINT,UINT,UINT
 VOID:VOID
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index cdb3d20ca..9d47b1365 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -589,6 +589,20 @@ _context_destroy_cb (BusInputContext *context,
     bus_panel_proxy_focus_out (panel, context);
 }
 
+static void
+_context_set_content_type_cb (BusInputContext *context,
+                              guint            purpose,
+                              guint            hints,
+                              BusPanelProxy   *panel)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+
+    g_return_if_fail (panel->focused_context == context);
+
+    bus_panel_proxy_set_content_type (panel, purpose, hints);
+}
+
 #define DEFINE_FUNCTION(name)                                   \
     static void _context_##name##_cb (BusInputContext *context, \
                                       BusPanelProxy   *panel)   \
@@ -643,6 +657,8 @@ static const struct {
     { "engine-changed",             G_CALLBACK (_context_state_changed_cb) },
 
     { "destroy",                    G_CALLBACK (_context_destroy_cb) },
+
+    { "set-content-type",           G_CALLBACK (_context_set_content_type_cb) },
 };
 
 void

From 274c4f21a56bc90e2c5666192c40c69c414d8ac7 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu, 17 Apr 2014 12:42:23 +0900
Subject: [PATCH 223/816] Fix leak in ibus_get_local_machine_id()

If /var/lib/dbus/machine-id does not exist but /etc/machine-id exists,
'error' will be set but will never be freed.

BUG=http://code.google.com/p/ibus/issues/detail?id=1701

Review URL: https://codereview.appspot.com/88770043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusshare.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index d36232d08..c4a724417 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -50,12 +50,14 @@ ibus_get_local_machine_id (void)
                                   NULL,
                                   NULL)) {
             g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
-            g_error_free (error);
             machine_id = "machine-id";
         }
         else {
             g_strstrip (machine_id);
         }
+        if (error != NULL) {
+            g_error_free (error);
+        }
     }
 
     return machine_id;

From 8f4bd6d745707c26d7ccd66ae71e8f4833501b3c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 18 Apr 2014 11:41:02 +0900
Subject: [PATCH 224/816] Change deprecated GtkHButtonBox to GtkButtonBox in
 ibus-setup.

Review URL: https://codereview.appspot.com/88850043
---
 setup/setup.ui | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index ad5386bce..5ffbe4743 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -742,7 +742,8 @@
                             <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox1">
+                              <object class="GtkButtonBox" id="vbuttonbox1">
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
@@ -1185,7 +1186,8 @@ Homepage: http://code.google.com/p/ibus
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
+            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">12</property>

From 98bf852afe1cedeaa256e6a9763a73bd3f78cbfd Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 24 Apr 2014 11:37:44 +0900
Subject: [PATCH 225/816] Do not show property panel by default.

Property panel sometimes hides text entry box on firefox in case
the mode is auto-hide because firefox does not provide the right
cursor locations and firefox does not update cursor locales
when preedit is updated so property panel hides text entry box
for a while and auto-hide is not useful with firefox and thunderbird.

TEST=gsettings reset org.freedesktop.ibus.panel show

Review URL: https://codereview.appspot.com/90480043
---
 data/ibus.schemas.in       | 2 +-
 ui/gtk3/propertypanel.vala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 2f76ce338..328437b96 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -161,7 +161,7 @@
       <applyto>/desktop/ibus/panel/show</applyto>
       <owner>ibus</owner>
       <type>int</type>
-      <default>1</default>
+      <default>0</default>
       <locale name="C">
         <short>Auto hide</short>
 	    <long>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</long>
diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index e6a192f99..99de6f865 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -34,7 +34,7 @@ public class PropertyPanel : Gtk.Box {
     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 int m_show = PanelShow.DO_NOT_SHOW;
     private uint m_auto_hide_timeout = 10000;
     private uint m_auto_hide_timeout_id = 0;
     private bool m_follow_input_cursor_when_always_shown = false;

From 90d23e28e82dbcf08cb6d8e3779648731ff8cb40 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 28 Apr 2014 11:17:09 +0900
Subject: [PATCH 226/816] Do not move property panel with focus-in in case
 panel is always shown.

Review URL: https://codereview.appspot.com/98770043
---
 ui/gtk3/propertypanel.vala | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 99de6f865..9ae92fb6a 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -81,15 +81,8 @@ public class PropertyPanel : Gtk.Box {
          * if the event order is, focus_in(), set_cursor_location() and
          * set_properties(), m_items.length can be 0 when
          * set_cursor_location() is called and Property Panel is not shown.
-         *
-         * If all windows are closed, desktop background is focused and
-         * focus_in() and set_properties() are called but
-         * set_cursor_location() is not called.
-         * Then we should not show Property panel when m_cursor_location
-         * is (-1, -1) because of no windows.
          */
-        if (m_cursor_location.x != -1 && m_cursor_location.y != -1)
-            show_with_auto_hide_timer();
+        show_with_auto_hide_timer();
     }
 
     public void update_property(IBus.Property prop) {
@@ -104,8 +97,7 @@ public class PropertyPanel : Gtk.Box {
         foreach (var item in m_items)
             item.update_property(prop);
 
-        if (m_cursor_location.x != -1 && m_cursor_location.y != -1)
-            show_with_auto_hide_timer();
+        show_with_auto_hide_timer();
     }
 
     public void set_cursor_location(int x, int y, int width, int height) {
@@ -384,7 +376,12 @@ public class PropertyPanel : Gtk.Box {
 
     private void show_with_auto_hide_timer() {
         if (m_items.length == 0) {
-            m_toplevel.hide();
+            /* Do not blink the panel with focus-in in case the panel
+             * is always shown. */
+            if (m_follow_input_cursor_when_always_shown ||
+                m_show != PanelShow.ALWAYS)
+                m_toplevel.hide();
+
             return;
         }
 
@@ -393,6 +390,15 @@ public class PropertyPanel : Gtk.Box {
             return;
         }
 
+        /* If all windows are closed, desktop background is focused and
+         * focus_in() and set_properties() are called but
+         * set_cursor_location() is not called.
+         * Then we should not show Property panel when m_cursor_location
+         * is (-1, -1) because of no windows.
+         */
+        if (m_cursor_location.x == -1 && m_cursor_location.y == -1)
+            return;
+
         if (m_auto_hide_timeout_id != 0)
             GLib.Source.remove(m_auto_hide_timeout_id);
 

From 68fcd6f65b3e3af05e2c794b85827ad88c6f9281 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 30 Apr 2014 15:01:15 +0900
Subject: [PATCH 227/816] Update translation zh_CN.po

Review URL: https://codereview.appspot.com/96740044
---
 po/zh_CN.po | 153 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 86 insertions(+), 67 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9dfa15411..a47918a94 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,14 +10,14 @@
 # Mike Manilone <zhtx10@gmail.com>, 2011
 # Peng Huang <shawn.p.huang@gmail.com>, 2007
 # simonyanix <simonyan@fedoraproject.org>, 2011
-# Tommy He <lovenemesis@gmail.com>, 2012-2013
+# Tommy He <lovenemesis@gmail.com>, 2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
-"Last-Translator: Christopher Meng <cickumqt@gmail.com>\n"
+"POT-Creation-Date: 2014-02-26 14:33+0900\n"
+"PO-Revision-Date: 2014-03-19 06:43+0000\n"
+"Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,11 @@ msgstr "自定义"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "不再显示"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "自动隐藏"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -89,7 +89,7 @@ msgstr "上一输入法："
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
@@ -123,17 +123,17 @@ msgstr "设置如何显示或隐藏语言栏的方式"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "显示属性栏："
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
@@ -222,11 +222,11 @@ msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
@@ -234,7 +234,7 @@ msgstr "使用系统键盘（XKB）布局"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
@@ -264,7 +264,7 @@ msgstr "登录时运行 IBus"
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
 msgid "About"
 msgstr "关于"
 
@@ -272,176 +272,194 @@ msgstr "关于"
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "预加载引擎"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "IBus 启动时预加载的引擎"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "引擎顺序"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "保存在输入法选单中的引擎顺序"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "输入法切换窗口弹出延时微秒数"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/下一个输入法引擎时不显示窗口。"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "已储存的版本号"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 版本和当前版本间的区别。"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys"
 msgstr "触发快捷键"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "为 gtk_accelerator_parse 触发快捷键"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Enable shortcut keys"
 msgstr "应用快捷键"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method on"
 msgstr "开启输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Disable shortcut keys"
 msgstr "禁用快捷键"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for turning input method off"
 msgstr "关闭输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "切换到列表中下一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Prev engine shortcut keys"
 msgstr "上一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "切换到列表中上一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Auto hide"
 msgstr "自动隐藏"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "属性面板的行为。 0 = 不再显示，1 = 自动隐藏，2 = 始终显示"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Language panel position"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 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
+#: ../data/ibus.schemas.in.h:26
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "在始终显示的情况下面板跟随输入光标"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "若为真，当面板设为始终显示时面板将跟随输入光标。若为假，面板将在固定位置显示。"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Show input method name"
 msgstr "显示输入法名称"
 
 #: ../data/ibus.schemas.in.h:35
+msgid "RGBA value of XKB icon"
+msgstr "XKB 图标的 RGBA 值"
+
+#: ../data/ibus.schemas.in.h:37
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜色名；2. '#rrggbb' 形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. 'rgba(r,g,b,a)' 形式的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
+
+#: ../data/ibus.schemas.in.h:40
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:43
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:44
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:45
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:46
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:48
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:49
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:50
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:51
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -526,7 +544,7 @@ msgstr "取消(_C)"
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:396
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
@@ -553,7 +571,8 @@ msgstr "IBus 守护在 %d 秒内无法启动"
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:378
 msgid "switching input methods"
 msgstr "切换输入法"
 
@@ -664,31 +683,31 @@ msgstr "命令：\n"
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:454
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space 是目前默认的快捷键。"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:782
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:786
 msgid "translator-credits"
 msgstr "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:807
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:817
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:821
 msgid "Quit"
 msgstr "退出"
 

From 15126830212fabfd5d6ec359a5d7554746462f4b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 30 Apr 2014 15:03:48 +0900
Subject: [PATCH 228/816] Release 1.5.7

Review URL: https://codereview.appspot.com/96800043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d2fd34181..64ad250f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [6])
+m4_define([ibus_micro_version], [7])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 0be4664b2ea3071c01ff479443033eb1accdfb03 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 2 May 2014 11:55:08 +0900
Subject: [PATCH 229/816] Set max-width-chars property in ibus-setup wrapped
 GtkLabel.

If GtkWindow has 'resizable' property = FALSE, the wrap in GtkLabel
is not done automatically and need to set 'max-width-chars' property.

TEST=ibus-setup

Review URL: https://codereview.appspot.com/92940043
---
 setup/setup.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/setup.ui b/setup/setup.ui
index 5ffbe4743..bb78433c3 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -902,6 +902,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="wrap">True</property>
+                                <property name="max_width_chars">74</property>
                                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;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.&lt;/i&gt;&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>

From 318836a647460e28dcc682543a118567474f9854 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Thu, 8 May 2014 11:16:02 +0900
Subject: [PATCH 230/816] Add the nodeadkeys variant of the German keyboard
 layout.

BUG=http://code.google.com/p/ibus/issues/detail?id=1710

Review URL: https://codereview.appspot.com/96040043
Patch from Eike Hein <hein@kde.org>.
---
 engine/simple.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index b3ac6a5df..97364217b 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -330,6 +330,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+                <engine>
+                        <name>xkb:de:nodeadkeys:ger</name>
+                        <language>ger</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>de</layout>
+                        <layout_variant>nodeadkeys</layout_variant>
+                        <longname>German (eliminate dead keys)</longname>
+                        <description>German (eliminate dead keys)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
 		<engine>
 			<name>xkb:gr::gre</name>
 			<language>gre</language>

From 386bafb0b91a61d51385e0bba2b3fc4b1e2d9013 Mon Sep 17 00:00:00 2001
From: Ryu Changwoo <ryu.changwoo@gmail.com>
Date: Thu, 8 May 2014 11:23:14 +0900
Subject: [PATCH 231/816] Delete Korean keymap.

BUG=http://code.google.com/p/ibus/issues/detail?id=1708

Review URL: https://codereview.appspot.com/92090043
Patch from Ryu Changwoo <ryu.changwoo@gmail.com>.
---
 engine/simple.xml.in | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 97364217b..1b617f853 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -682,17 +682,5 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
-		<engine>
-			<name>xkb:kr:kr104:kor</name>
-			<language>kor</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>kr</layout>
-			<layout_variant>kr104</layout_variant>
-			<longname>Korean (101/104 key compatible)</longname>
-			<description>Korean (101/104 key compatible)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
 	</engines>
 </component>

From 34692850bd58543e016e35ea7c863d311ca92519 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 9 May 2014 11:40:21 +0900
Subject: [PATCH 232/816] Let ibus-ui-gtk3 not to show zero-lenght preedit
 text.

preedit text is shown by ibus-ui-gtk3 on X11 applications
and do not have to show it likes GTK+ when the lenght is zero.

BUG=http://code.google.com/p/ibus/issues/detail?id=1709
TEST=ibus-ui-gtk3 with ibus-pinyin and x11 applications

Review URL: https://codereview.appspot.com/93150043
---
 ui/gtk3/candidatepanel.vala | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index e22135b14..db2d5aa79 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -112,8 +112,15 @@ public class CandidatePanel : Gtk.Box{
 
     public void set_preedit_text(IBus.Text? text, uint cursor) {
         if (text != null) {
-            m_preedit_label.set_text(text.get_text());
-            m_preedit_label.show();
+            var str = text.get_text();
+
+            if (str.length > 0) {
+                m_preedit_label.set_text(str);
+                m_preedit_label.show();
+            } else {
+                m_preedit_label.set_text("");
+                m_preedit_label.hide();
+            }
         } else {
             m_preedit_label.set_text("");
             m_preedit_label.hide();

From e6ee958b0120c4445c06db24ed7ac8f87675646e Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 15:23:50 +0900
Subject: [PATCH 233/816] build-sys: Fix 'privite' typo in Makefile.am

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/102140044
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 404e1d223..5679f23ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,14 +158,14 @@ ibus_public_headers =       \
 ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
     $(NULL)
-ibus_privite_headers =       \
+ibus_private_headers =       \
     ibuscomposetable.h       \
     ibusinternal.h           \
     keyname-table.h          \
     gtkimcontextsimpleseqs.h \
     $(NULL)
 noinst_HEADERS =            \
-    $(ibus_privite_headers) \
+    $(ibus_private_headers) \
     $(NULL)
 
 BUILT_SOURCES =                 \

From 23c784d45cbab7ae7a12e7b3c02c4299a446e03b Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 15:38:47 +0900
Subject: [PATCH 234/816] Fix small typo in gtk-doc API doc

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/108740043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusbus.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusbus.h b/src/ibusbus.h
index 675ede9a6..fc37b2585 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -743,7 +743,7 @@ GList       *ibus_bus_list_active_engines_async_finish
  * @returns: (array zero-terminated=1) (transfer full): A %NULL-terminated array of engines.
  *
  * Get engines by given names synchronously. If some engine names do not exist, this function
- * will simplly ignore them, and return rest of engines.
+ * will simply ignore them, and return rest of engines.
  * TODO(penghuang): add asynchronous version
  */
 IBusEngineDesc **

From 87fb61f76fc0ffbac316b0090b206faadfbd82fd Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 15:42:47 +0900
Subject: [PATCH 235/816] Fix GVariant leaks

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/109720043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusbus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index 92fdeabe1..a843fa754 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -737,6 +737,7 @@ _create_input_context_async_step_one_done (GDBusConnection    *connection,
          * The connection is closed, can not contine next steps, so complete
          * the asynchronous request with error.
          */
+        g_variant_unref(variant);
         g_simple_async_result_set_error (simple,
                 G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Connection is closed.");
         g_simple_async_result_complete_in_idle (simple);
@@ -745,6 +746,7 @@ _create_input_context_async_step_one_done (GDBusConnection    *connection,
 
     const gchar *path = NULL;
     g_variant_get (variant, "(&o)", &path);
+    g_variant_unref(variant);
 
 
     IBusBus *bus = (IBusBus *)g_async_result_get_source_object (

From f3e8aaff559e56efe54c43af123e0ab87a17423b Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:17:19 +0900
Subject: [PATCH 236/816] Fix string leaks in deserialize vfuncs

When an object contains char * properties, its deserialize function will
overwrite these string values without freeing them first. They are not
necessarily NULL as they can have (default) values set upon construction,
so they need to be g_free'd before being overwritten.

For example, IBusEngineDesc::longname, IBusEngineDesc::description,
IBusEngineDesc::language, ... are all set to "" upon construction (instead of
NULL), so the corresponding IBusEngineDesc fields must be freed before
being overwritten during deserialization.

This commit introduces a ibus_g_variant_get_child_string() to do this
and set the string value.

This leak was reported by valgrind:

==22163== 59 bytes in 59 blocks are definitely lost in loss record 1,633 of 2,720
==22163==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==22163==    by 0x56DFDF2: g_malloc (gmem.c:97)
==22163==    by 0x56E011D: g_malloc_n (gmem.c:338)
==22163==    by 0x56FAFCC: g_strdup (gstrfuncs.c:356)
==22163==    by 0x546CDB8: g_value_dup_string (gvaluetypes.c:1136)
==22163==    by 0x4E43A98: ibus_engine_desc_set_property (ibusenginedesc.c:385)
==22163==    by 0x5446CA3: object_set_property (gobject.c:1378)
==22163==    by 0x54484BB: g_object_constructor (gobject.c:2020)
==22163==    by 0x4E24564: ibus_object_constructor (ibusobject.c:111)
==22163==    by 0x5447577: g_object_new_with_custom_constructor (gobject.c:1645)
==22163==    by 0x5447787: g_object_new_internal (gobject.c:1722)
==22163==    by 0x5447C75: g_object_newv (gobject.c:1868)
==22163==    by 0x544737A: g_object_new (gobject.c:1568)
==22163==    by 0x4E2521C: ibus_serializable_deserialize (ibusserializable.c:292)
==22163==    by 0x4E480E0: ibus_component_deserialize (ibuscomponent.c:408)
==22163==    by 0x4E2523E: ibus_serializable_deserialize (ibusserializable.c:294)
==22163==    by 0x4E4C1D1: ibus_registry_deserialize (ibusregistry.c:202)
==22163==    by 0x4E4C95C: ibus_registry_load_cache_file (ibusregistry.c:362)
==22163==    by 0x4E4C6A4: ibus_registry_load_cache (ibusregistry.c:302)
==22163==    by 0x40EBCD: bus_ibus_impl_registry_init (ibusimpl.c:1871)
==22163==    by 0x40C1D4: bus_ibus_impl_init (ibusimpl.c:424)
==22163==    by 0x5460FCD: g_type_create_instance (gtype.c:1868)
==22163==    by 0x5448466: g_object_constructor (gobject.c:2006)
==22163==    by 0x4E24564: ibus_object_constructor (ibusobject.c:111)
==22163==    by 0x5447577: g_object_new_with_custom_constructor (gobject.c:1645)
==22163==    by 0x5447787: g_object_new_internal (gobject.c:1722)
==22163==    by 0x54483C1: g_object_new_valist (gobject.c:1980)
==22163==    by 0x54473C9: g_object_new (gobject.c:1571)
==22163==    by 0x40E94A: bus_ibus_impl_get_default (ibusimpl.c:1807)
==22163==    by 0x41D880: bus_server_init (server.c:100)
==22163==    by 0x420E91: main (main.c:236)

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/104850043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibuscomponent.c    | 25 +++++++++++++++--------
 src/ibusenginedesc.c   | 46 ++++++++++++++++++++++++++++--------------
 src/ibusinternal.h     |  3 +++
 src/ibusobservedpath.c |  3 ++-
 src/ibusproperty.c     |  3 ++-
 src/ibusutil.c         |  9 +++++++++
 6 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index 67b9818a0..755e9f653 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -21,6 +21,7 @@
  */
 #include <glib/gstdio.h>
 #include "ibuscomponent.h"
+#include "ibusinternal.h"
 
 enum {
     LAST_SIGNAL,
@@ -384,14 +385,22 @@ ibus_component_deserialize (IBusComponent   *component,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_component_parent_class)->deserialize ((IBusSerializable *)component, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &component->priv->name);
-    g_variant_get_child (variant, retval++, "s", &component->priv->description);
-    g_variant_get_child (variant, retval++, "s", &component->priv->version);
-    g_variant_get_child (variant, retval++, "s", &component->priv->license);
-    g_variant_get_child (variant, retval++, "s", &component->priv->author);
-    g_variant_get_child (variant, retval++, "s", &component->priv->homepage);
-    g_variant_get_child (variant, retval++, "s", &component->priv->exec);
-    g_variant_get_child (variant, retval++, "s", &component->priv->textdomain);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->name);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->description);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->version);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->license);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->author);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->homepage);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->exec);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &component->priv->textdomain);
 
     GVariant *var;
     GVariantIter *iter = NULL;
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index ca4885528..f1a04a097 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -21,6 +21,7 @@
  */
 #include <stdlib.h>
 #include "ibusenginedesc.h"
+#include "ibusinternal.h"
 #include "ibusxml.h"
 
 enum {
@@ -554,29 +555,44 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
      * you should not change the serialized order of name, longname,
      * description, ... because the order is also used in other applications
      * likes ibus-qt. */
-    g_variant_get_child (variant, retval++, "s", &desc->priv->name);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->longname);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->description);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->language);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->license);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->author);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->icon);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->name);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->longname);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->description);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->language);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->license);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->author);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->icon);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->layout);
     g_variant_get_child (variant, retval++, "u", &desc->priv->rank);
     /* The serialized order should be kept. */
-    g_variant_get_child (variant, retval++, "s", &desc->priv->hotkeys);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->symbol);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->setup);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->hotkeys);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->symbol);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->setup);
     if (g_variant_n_children (variant) < retval + 2)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_variant);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_option);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->layout_variant);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->layout_option);
     if (g_variant_n_children (variant) < retval + 1)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->version);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->version);
     if (g_variant_n_children (variant) < retval + 1)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->textdomain);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->textdomain);
 
     return retval;
 }
diff --git a/src/ibusinternal.h b/src/ibusinternal.h
index 1135d8f8d..49dc5646e 100644
--- a/src/ibusinternal.h
+++ b/src/ibusinternal.h
@@ -68,5 +68,8 @@
  */
 #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
 
+G_GNUC_INTERNAL void
+ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str);
+
 #endif
 
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index dcbfa8643..684cd77cc 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -21,6 +21,7 @@
  */
 #include <glib/gstdio.h>
 #include <stdlib.h>
+#include "ibusinternal.h"
 #include "ibusobservedpath.h"
 
 
@@ -105,7 +106,7 @@ ibus_observed_path_deserialize (IBusObservedPath *path,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->deserialize ((IBusSerializable *)path, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &path->path);
+    ibus_g_variant_get_child_string (variant, retval++, &path->path);
     g_variant_get_child (variant, retval++, "x", &path->mtime);
 
     return retval;
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index 3abd5e7a0..5a3eee034 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+#include "ibusinternal.h"
 #include "ibusproperty.h"
 #include "ibusproplist.h"
 #include "ibusenumtypes.h"
@@ -398,7 +399,7 @@ ibus_property_deserialize (IBusProperty *prop,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_property_parent_class)->deserialize ((IBusSerializable *) prop, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &prop->priv->key);
+    ibus_g_variant_get_child_string (variant, retval++, &prop->priv->key);
     g_variant_get_child (variant, retval++, "u", &prop->priv->type);
 
     GVariant *subvar = g_variant_get_child_value (variant, retval++);
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 215cb3f2e..3eddc99cf 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -153,3 +153,12 @@ ibus_get_language_name(const gchar *_locale) {
 #endif
     }
 }
+
+void
+ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str)
+{
+    g_return_if_fail (str != NULL);
+
+    g_free (*str);
+    g_variant_get_child (variant, index, "s", str);
+}

From 18687d77de1ad755db022e7da565dc8ad44ae5ac Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:21:15 +0900
Subject: [PATCH 237/816] Fix g_dbus_proxy_get_name_owner() leaks

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/105830043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusconfig.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ibusconfig.c b/src/ibusconfig.c
index 4e76cfa4b..621a4e532 100644
--- a/src/ibusconfig.c
+++ b/src/ibusconfig.c
@@ -287,6 +287,7 @@ ibus_config_new (GDBusConnection  *connection,
     g_assert (G_IS_DBUS_CONNECTION (connection));
 
     GInitable *initable;
+    char *owner;
 
     GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
                             G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
@@ -305,7 +306,8 @@ ibus_config_new (GDBusConnection  *connection,
     if (initable == NULL)
         return NULL;
 
-    if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (initable)) == NULL) {
+    owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (initable));
+    if (owner == NULL) {
         /* The configuration daemon, which is usually ibus-gconf, is not started yet. */
         g_set_error (error,
                      IBUS_ERROR,
@@ -314,6 +316,7 @@ ibus_config_new (GDBusConnection  *connection,
         g_object_unref (initable);
         return NULL;
     }
+    g_free (owner);
 
     /* clients should not destroy the config service. */
     IBUS_PROXY (initable)->own = FALSE;
@@ -367,7 +370,9 @@ ibus_config_new_async_finish (GAsyncResult  *res,
     g_object_unref (source_object);
 
     if (object != NULL) {
-        if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object)) == NULL) {
+        char *owner;
+        owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
+        if (owner == NULL) {
             /* The configuration daemon, which is usually ibus-gconf, 
              * is not started yet. */
             g_set_error (error,
@@ -377,6 +382,7 @@ ibus_config_new_async_finish (GAsyncResult  *res,
             g_object_unref (object);
             return NULL;
         }
+        g_free (owner);
         /* clients should not destroy the config service. */
         IBUS_PROXY (object)->own = FALSE;
         return IBUS_CONFIG (object);

From d0aaf7763d315161085aeaa00b6cdfa0e2569071 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:38:11 +0900
Subject: [PATCH 238/816] Fix GObject leaks in ibus_property_deserialize()

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/103100043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusproperty.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index 5a3eee034..c6a37534f 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -403,13 +403,19 @@ ibus_property_deserialize (IBusProperty *prop,
     g_variant_get_child (variant, retval++, "u", &prop->priv->type);
 
     GVariant *subvar = g_variant_get_child_value (variant, retval++);
+    if (prop->priv->label != NULL) {
+        g_object_unref (prop->priv->label);
+    }
     prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
     g_object_ref_sink (prop->priv->label);
     g_variant_unref (subvar);
 
-    g_variant_get_child (variant, retval++, "s", &prop->priv->icon);
+    ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
 
     subvar = g_variant_get_child_value (variant, retval++);
+    if (prop->priv->tooltip != NULL) {
+        g_object_unref (prop->priv->tooltip);
+    }
     prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
     g_object_ref_sink (prop->priv->tooltip);
     g_variant_unref (subvar);
@@ -419,12 +425,18 @@ ibus_property_deserialize (IBusProperty *prop,
     g_variant_get_child (variant, retval++, "u", &prop->priv->state);
 
     subvar = g_variant_get_child_value (variant, retval++);
+    if (prop->priv->sub_props != NULL) {
+        g_object_unref (prop->priv->sub_props);
+    }
     prop->priv->sub_props = IBUS_PROP_LIST (ibus_serializable_deserialize (subvar));
     g_object_ref_sink (prop->priv->sub_props);
     g_variant_unref (subvar);
 
     /* Keep the serialized order for the compatibility when add new members. */
     subvar = g_variant_get_child_value (variant, retval++);
+    if (prop->priv->symbol != NULL) {
+        g_object_unref (prop->priv->symbol);
+    }
     prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
     g_object_ref_sink (prop->priv->symbol);
     g_variant_unref (subvar);

From ca8cac8b95505140bc51d98d42c9af1122338920 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:43:34 +0900
Subject: [PATCH 239/816] Fix GDBusNodeInfo leak in
 ibus_service_class_add_interfaces

A call to g_dbus_node_info_unref was in place but commented out.

This fixes:

==20039== 424 (40 direct, 384 indirect) bytes in 1 blocks are definitely lost in loss record 2,115 of 2,159
==20039==    at 0x4A081D4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==20039==    by 0x56ECE69: g_malloc0 (gmem.c:127)
==20039==    by 0x56ED191: g_malloc0_n (gmem.c:362)
==20039==    by 0x519FBF2: parse_data_get_node (gdbusintrospection.c:1171)
==20039==    by 0x519FFE1: parser_start_element (gdbusintrospection.c:1290)
==20039==    by 0x56E9C2E: emit_start_element (gmarkup.c:1048)
==20039==    by 0x56EA7CB: g_markup_parse_context_parse (gmarkup.c:1395)
==20039==    by 0x51A1082: g_dbus_node_info_new_for_xml (gdbusintrospection.c:1797)
==20039==    by 0x4E33D38: ibus_service_class_add_interfaces (ibusservice.c:610)
==20039==    by 0x4E32C24: ibus_service_class_init (ibusservice.c:213)
==20039==    by 0x546EE85: type_class_init_Wm (gtype.c:2220)
==20039==    by 0x5470586: g_type_class_ref (gtype.c:2935)
==20039==    by 0x5470539: g_type_class_ref (gtype.c:2927)
==20039==    by 0x5470539: g_type_class_ref (gtype.c:2927)
==20039==    by 0x5454D21: g_object_new_valist (gobject.c:1906)
==20039==    by 0x54543C9: g_object_new (gobject.c:1571)
==20039==    by 0x402AF0: ibus_config_dconf_new (config.c:449)
==20039==    by 0x401D59: ibus_dconf_start (main.c:61)
==20039==    by 0x401E30: main (main.c:85)
==20039==~

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/100990043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusservice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusservice.c b/src/ibusservice.c
index 8f77af95c..d0ef4e04b 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -620,7 +620,7 @@ ibus_service_class_add_interfaces (IBusServiceClass   *class,
             g_array_append_val (class->interfaces, *p);
             p++;
         }
-        // g_dbus_node_info_unref (introspection_data);
+        g_dbus_node_info_unref (introspection_data);
         return TRUE;
     }
 }

From f4d7ceafb588737212a21216cb30ccdc9ff02cdf Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:47:20 +0900
Subject: [PATCH 240/816] Fix leak in ibus-engine-switch test

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/104860043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/tests/ibus-engine-switch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/ibus-engine-switch.c b/src/tests/ibus-engine-switch.c
index 7a13ffb72..4c99b79c6 100644
--- a/src/tests/ibus-engine-switch.c
+++ b/src/tests/ibus-engine-switch.c
@@ -24,6 +24,7 @@ change_global_engine (void)
         g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc),
                          ==,
                          engine_names[i]);
+        g_object_unref (G_OBJECT (engine_desc));
     }
 }
 

From 0d17c2507d38e62a149f3fe7d32e6c3e7c3bcd0e Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:51:52 +0900
Subject: [PATCH 241/816] tests/ibus-config: Fix typo in function name

"success" was misspelt "sucess"

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/102160043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/tests/ibus-config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index b6f9e68f7..e50e78a21 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -7,9 +7,9 @@ static IBusBus *bus = NULL;
 static int create_config_count = 0;
 
 static void
-finish_create_config_async_sucess (GObject      *source_object,
-                                   GAsyncResult *res,
-                                   gpointer      user_data)
+finish_create_config_async_success (GObject      *source_object,
+                                    GAsyncResult *res,
+                                    gpointer      user_data)
 {
     GMainLoop *loop = (GMainLoop *)user_data;
     GError *error = NULL;
@@ -54,7 +54,7 @@ test_create_config_async (void)
     loop = g_main_loop_new (NULL, TRUE);
     ibus_config_new_async (ibus_bus_get_connection (bus),
                            NULL,
-                           finish_create_config_async_sucess,
+                           finish_create_config_async_success,
                            loop);
     g_main_loop_run (loop);
     g_main_loop_unref (loop);

From 70ddaf10acce9eb96294a2513967042ecb2a91d4 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 16:56:55 +0900
Subject: [PATCH 242/816] Fix GVariantBuilder leaks

When using g_variant_builder_new(), we must call
g_variant_builder_unref() to free it:
"You should call g_variant_builder_unref() on the return value when it
is no longer needed. The memory will not be automatically freed by any
other call.

In most cases it is easier to place a GVariantBuilder directly on the
stack of the calling function and initialise it with
g_variant_builder_init()."

One of these leaks showed up in valgrind as:
==20702== 16,416 bytes in 114 blocks are definitely lost in loss record 2,114 of 2,115
==20702==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==20702==    by 0x56EDDF2: g_malloc (gmem.c:97)
==20702==    by 0x570691C: g_slice_alloc (gslice.c:1007)
==20702==    by 0x5729743: g_variant_builder_new (gvariant.c:3169)
==20702==    by 0x40297B: ibus_config_dconf_get_values (config.c:413)
==20702==    by 0x4E44FF2: ibus_config_service_service_method_call (ibusconfigservice.c:214)
==20702==    by 0x4E33249: ibus_service_service_method_call_cb (ibusservice.c:395)
==20702==    by 0x51880D8: call_in_idle_cb (gdbusconnection.c:4875)
==20702==    by 0x56E81D7: g_idle_dispatch (gmain.c:5319)
==20702==    by 0x56E58F1: g_main_dispatch (gmain.c:3064)
==20702==    by 0x56E6667: g_main_context_dispatch (gmain.c:3663)
==20702==    by 0x56E6859: g_main_context_iterate (gmain.c:3734)

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/104850044
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 bus/ibusimpl.c      | 1 +
 bus/inputcontext.c  | 7 ++++---
 conf/dconf/config.c | 8 ++++----
 conf/gconf/config.c | 8 +++++---
 src/ibuscomponent.c | 2 ++
 src/ibusengine.c    | 1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index eec6da3fc..97f360237 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2033,6 +2033,7 @@ bus_ibus_impl_property_changed (BusIBusImpl *service,
                                             "org.freedesktop.IBus",
                                             builder,
                                             NULL));
+    g_variant_builder_unref (builder);
 
     bus_dbus_impl_dispatch_message_by_rule (BUS_DEFAULT_DBUS, message, NULL);
     g_object_unref (message);
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 9cbd2ecaa..b7e1ff8fb 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -710,14 +710,15 @@ bus_input_context_property_changed (BusInputContext *context,
     if (context->connection == NULL)
         return TRUE;
 
-    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
-    g_variant_builder_add (builder, "{sv}", property_name, value);
+    GVariantBuilder builder;
+    g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+    g_variant_builder_add (&builder, "{sv}", property_name, value);
     return bus_input_context_send_signal (context,
                                           "org.freedesktop.DBus.Properties",
                                           "PropertiesChanged",
                                           g_variant_new ("(sa{sv}as)",
                                                          "org.freedesktop.IBus",
-                                                         builder,
+                                                         &builder,
                                                          NULL),
                                           error);
 }
diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index 0dd317ae0..f0e195b3c 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -399,7 +399,7 @@ ibus_config_dconf_get_values (IBusConfigService *config,
     gchar *dir, *gdir;
     gint len;
     gchar **entries, **p;
-    GVariantBuilder *builder;
+    GVariantBuilder builder;
     gboolean preserve_name;
 
     dir = g_strdup_printf (DCONF_PREFIX"/%s/", section);
@@ -409,7 +409,7 @@ ibus_config_dconf_get_values (IBusConfigService *config,
     preserve_name = _has_prefixes (gdir, dconf->preserve_name_prefixes);
 
     entries = dconf_client_list (client, gdir, &len);
-    builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
     for (p = entries; *p != NULL; p++) {
         gchar *gkey = g_strconcat (gdir, *p, NULL);
         GVariant *value = dconf_client_read (client, gkey);
@@ -419,7 +419,7 @@ ibus_config_dconf_get_values (IBusConfigService *config,
             if (!preserve_name) {
                 name = _from_gsettings_name (*p);
             }
-            g_variant_builder_add (builder, "{sv}", name, value);
+            g_variant_builder_add (&builder, "{sv}", name, value);
             if (name != *p) {
                 g_free (name);
             }
@@ -429,7 +429,7 @@ ibus_config_dconf_get_values (IBusConfigService *config,
     g_strfreev (entries);
     g_free (gdir);
 
-    return g_variant_builder_end (builder);
+    return g_variant_builder_end (&builder);
 }
 
 static gboolean
diff --git a/conf/gconf/config.c b/conf/gconf/config.c
index 5e81f7d46..73007ca79 100644
--- a/conf/gconf/config.c
+++ b/conf/gconf/config.c
@@ -304,19 +304,21 @@ ibus_config_gconf_get_values (IBusConfigService      *config,
     g_free (dir);
 
     GSList *p;
-    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
+    GVariantBuilder *builder;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
     for (p = entries; p != NULL; p = p->next) {
         GConfEntry *entry = (GConfEntry *)p->data;
         if (entry->key != NULL && entry->value != NULL) {
             const gchar *name = entry->key + len;
             GVariant *value = _from_gconf_value (entry->value);
-            g_variant_builder_add (builder, "{sv}", name, value);
+            g_variant_builder_add (&builder, "{sv}", name, value);
         }
         gconf_entry_free (entry);
     }
     g_slist_free (entries);
 
-    return g_variant_builder_end (builder);
+    return g_variant_builder_end (&builder);
 }
 
 static gboolean
diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index 755e9f653..a933e79b8 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -365,6 +365,7 @@ ibus_component_serialize (IBusComponent   *component,
         g_variant_builder_add (array, "v", ibus_serializable_serialize ((IBusSerializable *)p->data));
     }
     g_variant_builder_add (builder, "av", array);
+    g_variant_builder_unref (array);
 
     /* serialize engine desc list */
     array = g_variant_builder_new (G_VARIANT_TYPE ("av"));
@@ -372,6 +373,7 @@ ibus_component_serialize (IBusComponent   *component,
         g_variant_builder_add (array, "v", ibus_serializable_serialize ((IBusSerializable *)p->data));
     }
     g_variant_builder_add (builder, "av", array);
+    g_variant_builder_unref (array);
 
     return TRUE;
 }
diff --git a/src/ibusengine.c b/src/ibusengine.c
index 7543c99c7..53d57df11 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -1286,6 +1286,7 @@ ibus_engine_dbus_property_changed (IBusEngine  *engine,
                                             IBUS_INTERFACE_ENGINE,
                                             builder,
                                             NULL));
+    g_variant_builder_unref (builder);
 
     error = NULL;
     connection = ibus_service_get_connection ((IBusService *)engine);

From 0d153293b7a7a69796a61cd87832bbb583351778 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 17:17:11 +0900
Subject: [PATCH 243/816] dconf: Fix GVariant refcounting in watch_func()

IBusConfigDConf::watch_func() is roughly doing:
GVariant *variant = dconf_client_read(...)
if (variant == NULL) {
    variant = g_variant_new(...);
}
ibus_config_service_value_changed(..., variant);
g_variant_unref(variant);

The problem with that is that the GVariant returned by
dconf_client_read() is non-floating while the one returned by
g_variant_new() is floating.
Since ibus_config_service_value_changed() will take ownership of
floating references, we should not unref 'variant' if it was created
through g_variant_new(), but we must call it when 'variant' is created
through dconf_client_read() or we will leak memory.

This commit fixes that by making sure we sink the reference we got
through g_variant_new().

This was sometimes causing crashes of ibus-dconf when repeatedly running
tests/ibus-config:

(ibus-dconf:24679): GLib-CRITICAL **: g_variant_unref: assertion
'value->ref_count > 0' failed

==24679== Invalid read of size 4
==24679==    at 0x572E140: g_variant_unref (gvariant-core.c:625)
==24679==    by 0x572DBB3: g_variant_release_children (gvariant-core.c:257)
==24679==    by 0x572E202: g_variant_unref (gvariant-core.c:640)
==24679==    by 0x572DBB3: g_variant_release_children (gvariant-core.c:257)
==24679==    by 0x572E202: g_variant_unref (gvariant-core.c:640)
==24679==    by 0x518CFDE: g_dbus_message_finalize (gdbusmessage.c:534)
==24679==    by 0x5459628: g_object_unref (gobject.c:3112)
==24679==    by 0x519C911: message_to_write_data_free (gdbusprivate.c:898)
==24679==    by 0x519D687: write_message_cb (gdbusprivate.c:1353)
==24679==    by 0x510F7F2: g_simple_async_result_complete (gsimpleasyncresult.c:763)
==24679==    by 0x519CEF2: write_message_continue_writing (gdbusprivate.c:1077)
==24679==    by 0x519D040: write_message_async (gdbusprivate.c:1131)
==24679==  Address 0x5d8c9c4 is 36 bytes inside a block of size 40 free'd
==24679==    at 0x4A07577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==24679==    by 0x56EDF6B: g_free (gmem.c:190)
==24679==    by 0x5706B53: g_slice_free1 (gslice.c:1112)
==24679==    by 0x572E229: g_variant_unref (gvariant-core.c:643)
==24679==    by 0x40240F: _watch_func (config.c:232)
==24679==    by 0x3DEA605D8B: ffi_call_unix64 (in /usr/lib64/libffi.so.6.0.1)
==24679==    by 0x3DEA6056BB: ffi_call (in /usr/lib64/libffi.so.6.0.1)
==24679==    by 0x544EE88: g_cclosure_marshal_generic_va (gclosure.c:1541)
==24679==    by 0x544D396: _g_closure_invoke_va (gclosure.c:831)
==24679==    by 0x5468808: g_signal_emit_valist (gsignal.c:3215)
==24679==    by 0x54699DF: g_signal_emit (gsignal.c:3363)
==24679==    by 0x4C1478D: dconf_client_dispatch_change_signal (dconf-client.c:150)

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/107800044
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 conf/dconf/config.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index f0e195b3c..500ea1d8f 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -205,6 +205,7 @@ _watch_func (DConfClient         *client,
         if (variant == NULL) {
             /* Use a empty tuple for a unset value */
             variant = g_variant_new_tuple (NULL, 0);
+            g_variant_ref_sink (variant);
         }
 
         gname = strrchr (gkeys[i], '/');

From 167d1d7841eb5dd3957ceb72c4dcce784ea46456 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 17:20:38 +0900
Subject: [PATCH 244/816] Return non-floating ref from
 IBusConfigGConf::get_value

Both IBusConfigDConf::get_value and IBusConfigMemconf::get_value
return a non-floating reference, so we need to be consistent in the
gconf backend and also return a non-floating reference.

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/106830043
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 conf/gconf/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/gconf/config.c b/conf/gconf/config.c
index 73007ca79..6c294649b 100644
--- a/conf/gconf/config.c
+++ b/conf/gconf/config.c
@@ -290,7 +290,7 @@ ibus_config_gconf_get_value (IBusConfigService      *config,
     GVariant *variant = _from_gconf_value (gv);
     gconf_value_free (gv);
 
-    return variant;
+    return g_variant_ref_sink (variant);
 }
 
 static GVariant *

From 5d887bde04d2fcfeb18437bbf675baf4a21e31e2 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 17:23:00 +0900
Subject: [PATCH 245/816] Fix GVariant leak in IBusService::SetValue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When handling the DBus SetValue call,
ibusconfigservice.c:ibus_config_service_service_method_call()
gets a GVariant through g_variant_get("(&s&sv)")
GVariant documentation says that:
« Upon encountering a 'v', g_variant_get() takes a pointer to a
(GVariant *) (ie: (GVariant **) ). It is set to a new reference to a
GVariant instance containing the contents of the variant value. It is
appropriate to free this reference using g_variant_unref(). »
so we need to unreference it when we are done with it.

Running ibus-dconf in valgrind and then running tests/ibus-config
shows this leak:

==28085== 3,934 (1,520 direct, 2,414 indirect) bytes in 38 blocks are definitely lost in loss record 2,112 of 2,121
==28085==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==28085==    by 0x56EDDF2: g_malloc (gmem.c:97)
==28085==    by 0x570691C: g_slice_alloc (gslice.c:1007)
==28085==    by 0x572E6D9: g_variant_get_child_value (gvariant-core.c:1009)
==28085==    by 0x57261C0: g_variant_get_variant (gvariant.c:715)
==28085==    by 0x572BD03: g_variant_valist_get_nnp (gvariant.c:4794)
==28085==    by 0x572C3F1: g_variant_valist_get_leaf (gvariant.c:4911)
==28085==    by 0x572CAD4: g_variant_valist_get (gvariant.c:5092)
==28085==    by 0x572CC59: g_variant_valist_get (gvariant.c:5127)
==28085==    by 0x572D079: g_variant_get_va (gvariant.c:5354)
==28085==    by 0x572CF9B: g_variant_get (gvariant.c:5301)
==28085==    by 0x4E44E5B: ibus_config_service_service_method_call (ibusconfigservice.c:173)

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/108740044
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusconfigservice.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ibusconfigservice.c b/src/ibusconfigservice.c
index e1777f9d6..28db52e33 100644
--- a/src/ibusconfigservice.c
+++ b/src/ibusconfigservice.c
@@ -180,6 +180,7 @@ ibus_config_service_service_method_call (IBusService           *service,
             g_dbus_method_invocation_return_gerror (invocation, error);
             g_error_free (error);
         }
+        g_variant_unref (value);
         return;
     }
 

From b07dedfb72eb65e4432efdd1348167db89c19639 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 6 Jun 2014 17:26:19 +0900
Subject: [PATCH 246/816] Fix GVariant leak in IBusService::GetValue

When handling the DBus GetValue call,
ibusconfigservice.c:ibus_config_service_service_method_call()
gets a non-floating GVariant reference through
IBusConfigService::get_value() but never unrefs it.

Running ibus-dconf in valgrind and then running tests/ibus-config
shows this leak:

=28085== 232 (80 direct, 152 indirect) bytes in 2 blocks are definitely lost in loss record 2,025 of 2,121
==28085==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==28085==    by 0x56EDDF2: g_malloc (gmem.c:97)
==28085==    by 0x570691C: g_slice_alloc (gslice.c:1007)
==28085==    by 0x572E6D9: g_variant_get_child_value (gvariant-core.c:1009)
==28085==    by 0x57261C0: g_variant_get_variant (gvariant.c:715)
==28085==    by 0x4C1A732: gvdb_table_value_from_item (gvdb-reader.c:578)
==28085==    by 0x4C1A7A1: gvdb_table_get_value (gvdb-reader.c:610)
==28085==    by 0x4C1589C: dconf_engine_read (dconf-engine.c:528)
==28085==    by 0x4C14A79: dconf_client_read (dconf-client.c:242)
==28085==    by 0x40286F: ibus_config_dconf_get_value (config.c:378)
==28085==    by 0x4E44F29: ibus_config_service_service_method_call (ibusconfigservice.c:194)
==28085==    by 0x4E33249: ibus_service_service_method_call_cb (ibusservice.c:395)

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/103100045
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/ibusconfigservice.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ibusconfigservice.c b/src/ibusconfigservice.c
index 28db52e33..4b3c991b7 100644
--- a/src/ibusconfigservice.c
+++ b/src/ibusconfigservice.c
@@ -195,6 +195,7 @@ ibus_config_service_service_method_call (IBusService           *service,
         value = IBUS_CONFIG_SERVICE_GET_CLASS (config)->get_value (config, section, name, &error);
         if (value != NULL) {
             g_dbus_method_invocation_return_value (invocation, g_variant_new ("(v)", value));
+            g_variant_unref (value);
         }
         else {
             g_dbus_method_invocation_return_gerror (invocation, error);

From ee4c5ec0a39b5ed4a22fe34307a44f3f9fa1303b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Jun 2014 17:38:08 +0900
Subject: [PATCH 247/816] Add Polish (qwertz) keymap in simple.xml

BUG=http://code.google.com/p/ibus/issues/detail?id=1716
TEST=ibus-setup

Review URL: https://codereview.appspot.com/102150045
---
 bus/ibusimpl.c       |  4 ++--
 engine/simple.xml.in | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 97f360237..dd254e2ed 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -1450,7 +1450,7 @@ _ibus_set_global_engine (BusIBusImpl           *ibus,
         g_dbus_method_invocation_return_error (invocation,
                                                G_DBUS_ERROR,
                                                G_DBUS_ERROR_FAILED,
-                                               "Can not find engine %s.",
+                                               "Cannot find engine %s.",
                                                engine_name);
         return;
     }
@@ -1553,7 +1553,7 @@ _ibus_set_preload_engines (BusIBusImpl     *ibus,
             g_set_error (error,
                          G_DBUS_ERROR,
                          G_DBUS_ERROR_FAILED,
-                         "Can not find engine %s.",
+                         "Cannot find engine %s.",
                          names[i]);
             g_ptr_array_free (array, FALSE);
             return FALSE;
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 1b617f853..c16f86a0e 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -477,6 +477,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+                <engine>
+                        <name>xkb:pl:qwertz:pol</name>
+                        <language>pol</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>pl</layout>
+                        <layout_variant>qwertz</layout_variant>
+                        <longname>Polish (qwertz)</longname>
+                        <description>Polish (qwertz)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
 		<engine>
 			<name>xkb:pt::por</name>
 			<language>por</language>

From 6291feb259cee5589683cf7ac1a87c44582ba3c0 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Mon, 9 Jun 2014 15:58:37 +0900
Subject: [PATCH 248/816] tests/ibus-config Fix timeout_id handling

tests/ibus-config queues a timeout whose callback calls
g_main_loop_quit() before returning FALSE. After exiting the mainloop,
g_source_remove(timeout_id) is called, but if the mainloop was exited
through the timeout callback, the source will already have been removed.

This commit makes sure we only try to call g_source_remove() on that
timeout if we did not exit the mainloop through the timeout callback.

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

Review URL: https://codereview.appspot.com/108730044
Patch from Christophe Fergeau <cfergeau@redhat.com>.
---
 src/tests/ibus-config.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index e50e78a21..c6141ab55 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -135,6 +135,7 @@ test_config_set_get (void)
 
 typedef struct {
     GMainLoop *loop;
+    guint timeout_id;
     gchar *section;
     gchar *name;
 } WatchData;
@@ -264,6 +265,7 @@ timeout_cb (gpointer user_data)
 {
     WatchData *data = (WatchData *) user_data;
     g_main_loop_quit (data->loop);
+    data->timeout_id = 0;
     return FALSE;
 }
 
@@ -276,7 +278,6 @@ change_and_test (IBusConfig  *config,
                  WatchData   *data)
 {
     gboolean retval;
-    guint timeout_id;
     GVariant *var;
 
     data->section = NULL;
@@ -294,17 +295,21 @@ change_and_test (IBusConfig  *config,
         g_variant_unref (var);
     }
 
-    timeout_id = g_timeout_add (1, timeout_cb, data);
+    data->timeout_id = g_timeout_add (1, timeout_cb, data);
     g_main_loop_run (data->loop);
-    g_source_remove (timeout_id);
+    if (data->timeout_id != 0) {
+        g_source_remove (data->timeout_id);
+    }
 
     retval = ibus_config_set_value (config, section, name,
                                     g_variant_new_int32 (1));
     g_assert (retval);
 
-    timeout_id = g_timeout_add (1, timeout_cb, data);
+    data->timeout_id = g_timeout_add (1, timeout_cb, data);
     g_main_loop_run (data->loop);
-    g_source_remove (timeout_id);
+    if (data->timeout_id != 0) {
+        g_source_remove (data->timeout_id);
+    }
 
     g_assert_cmpstr (data->section, ==, expected_section);
     g_assert_cmpstr (data->name, ==, expected_name);

From e46502f1d3a8c69e6e473cdb35e790e565d89705 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 10 Jun 2014 11:41:23 +0900
Subject: [PATCH 249/816] Fix a typo in src/ibusinputcontext.c

BUG=http://code.google.com/p/ibus/issues/detail?id=1717

Review URL: https://codereview.appspot.com/107860043
---
 src/ibusinputcontext.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 5c37b8192..908011fa7 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -133,9 +133,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The text object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[COMMIT_TEXT] =
         g_signal_new (I_("commit-text"),
@@ -200,9 +200,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The text object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[UPDATE_PREEDIT_TEXT] =
         g_signal_new (I_("update-preedit-text"),
@@ -255,9 +255,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The text object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[UPDATE_AUXILIARY_TEXT] =
         g_signal_new (I_("update-auxiliary-text"),
@@ -308,9 +308,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The table object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[UPDATE_LOOKUP_TABLE] =
         g_signal_new (I_("update-lookup-table"),
@@ -421,9 +421,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The props object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[REGISTER_PROPERTIES] =
         g_signal_new (I_("register-properties"),
@@ -443,9 +443,9 @@ ibus_input_context_class_init (IBusInputContextClass *class)
      *
      * 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()
-     *  to get the ownership of the object.)
+     * (Note: The prop object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
      */
     context_signals[UPDATE_PROPERTY] =
         g_signal_new (I_("update-property"),

From 9bad0c944162a1700dcb6615aab2a6a9cfd9eff5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 12 Jun 2014 11:38:43 +0900
Subject: [PATCH 250/816] Fix escape key with Ctrl+Shift+U ISO 14755.

GtkIMContextSimple uses gdk_keymap_get_for_display() to check the readable
hex codes but IBusEngineSimple ignored it because does not have the display
argument.
I added is_hex_keyval() to check the escape key and fix this bug.

BUG=http://code.google.com/p/ibus/issues/detail?id=1715
TEST=src/libibus.so

Review URL: https://codereview.appspot.com/101160044
---
 src/ibusenginesimple.c | 47 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 8c076ac59..300a828a0 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -692,6 +692,14 @@ no_sequence_matches (IBusEngineSimple *simple,
     }
 }
 
+static gboolean
+is_hex_keyval (guint keyval)
+{
+  gunichar ch = ibus_keyval_to_unicode (keyval);
+
+  return g_unichar_isxdigit (ch);
+}
+
 static gboolean
 ibus_engine_simple_process_key_event (IBusEngine *engine,
                                       guint       keyval,
@@ -712,9 +720,6 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     while (priv->compose_buffer[n_compose] != 0)
         n_compose++;
 
-    if (n_compose >= IBUS_MAX_COMPOSE_LEN)
-        return TRUE;
-
     if (modifiers & IBUS_RELEASE_MASK) {
         if (priv->in_hex_sequence &&
             (keyval == IBUS_KEY_Control_L || keyval == IBUS_KEY_Control_R ||
@@ -761,7 +766,32 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                   keyval == IBUS_KEY_KP_Enter);
     is_backspace = keyval == IBUS_KEY_BackSpace;
     is_escape = keyval == IBUS_KEY_Escape;
-    hex_keyval = keyval;
+    hex_keyval = is_hex_keyval (keyval) ? keyval : 0;
+
+    /* gtkimcontextsimple causes a buffer overflow in priv->compose_buffer.
+     * Add the check code here.
+     */
+    if (n_compose >= IBUS_MAX_COMPOSE_LEN) {
+        if (is_backspace) {
+            priv->compose_buffer[--n_compose] = 0;
+        }
+        else if (is_hex_end) {
+            /* invalid hex sequence */
+            // beep_window (event->window);
+            priv->tentative_match = 0;
+            priv->in_hex_sequence = FALSE;
+            priv->compose_buffer[0] = 0;
+        }
+        else if (is_escape) {
+            ibus_engine_simple_reset (engine);
+            return TRUE;
+        }
+
+        if (have_hex_mods)
+            ibus_engine_simple_update_preedit_text (simple);
+
+        return TRUE;
+    }
 
     /* If we are already in a non-hex sequence, or
      * this keystroke is not hex modifiers + hex digit, don't filter
@@ -787,13 +817,12 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     /* Handle backspace */
     if (priv->in_hex_sequence && have_hex_mods && is_backspace) {
         if (n_compose > 0) {
-        n_compose--;
+            n_compose--;
             priv->compose_buffer[n_compose] = 0;
             check_hex (simple, n_compose);
-    }
-        else {
-        priv->in_hex_sequence = FALSE;
-    }
+        } else {
+            priv->in_hex_sequence = FALSE;
+        }
 
         ibus_engine_simple_update_preedit_text (simple);
 

From b6afffbd1a06ecf17af009f1de3e513988ecb92e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 18 Jun 2014 11:42:34 +0900
Subject: [PATCH 251/816] Update ibuscomposetable.h for pt-br.

pt_BR.UTF-8/Compose file is updated:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=e3dc0d1733

TEST=engine/test-compose on pt_BR.UTF-8

Review URL: https://codereview.appspot.com/101330044
---
 src/gencomposetable.c  |  19 +-
 src/ibuscomposetable.h | 608 ++---------------------------------------
 2 files changed, 38 insertions(+), 589 deletions(-)

diff --git a/src/gencomposetable.c b/src/gencomposetable.c
index bffda07dd..793a75e48 100644
--- a/src/gencomposetable.c
+++ b/src/gencomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
- * Copyright (C) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,17 @@
  * USA
  */
 
+/* This tool converts COMPOSE_FILES[] to ibuscompose.h .
+ * To update ibuscompose.h:
+ * # rm ibuscompose.h
+ * # make ibuscompose.h
+ *
+ * If you copy libX11/nls/??/Compose.pre in xorg git HEAD to
+ * /usr/share/X11/locale/??/Compose , need to convert:
+ * # sed -e 's/^XCOMM/#/' -e 's|X11_LOCALEDATADIR|/usr/share/X11/locale|'
+ *   Compose.pre > /usr/share/X11/locale/foo/Compose
+ */
+
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <locale.h>
@@ -36,8 +47,8 @@
 "/* -*- 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 <shawn.p.huang@gmail.com>\n"                \
-" * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>\n"          \
+" * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>\n"           \
+" * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>\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"             \
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 2ba3571e6..22aab4811 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -2058,596 +2058,34 @@ static const IBusComposeTable ibus_compose_table_fi_fi = {
 };
 
 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,
+  IBUS_KEY_dead_acute, IBUS_KEY_C, 0, 0,
+    0, 0x00C7, /* Ccedilla	# LATIN CAPITAL LETTER C WITH CEDILLA */
+  IBUS_KEY_dead_acute, IBUS_KEY_c, 0, 0,
+    0, 0x00E7, /* ccedilla	# LATIN SMALL LETTER C WITH CEDILLA */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_slash, 0,
+    0, 0x301E, /* U301e	# DOUBLE PRIME QUOTATION MARK */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_backslash, 0,
+    0, 0x301D, /* U301d	# REVERSED DOUBLE PRIME QUOTATION MARK */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x03D2, 0,
+    0, 0x03D3, /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
+  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E, 0,
+    0, 0x0228, /* U0228	# LATIN CAPITAL LETTER E WITH CEDILLA */
+  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e, 0,
+    0, 0x0229, /* U0229	# LATIN SMALL LETTER E WITH CEDILLA */
+  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_E,
+    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, 0x1E1D, /* U1E1D	# LATIN SMALL LETTER E WITH CEDILLA AND BREVE */
+  IBUS_KEY_Multi_key, IBUS_KEY_e, IBUS_KEY_e, 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 */
+  IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x03D2, 0,
+    0, 0x03D3  /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
 };
 
 static const IBusComposeTable ibus_compose_table_pt_br = {
     ibus_compose_seqs_pt_br,
-    5,
-    G_N_ELEMENTS (ibus_compose_seqs_pt_br) / (5 + 2)
+    4,
+    G_N_ELEMENTS (ibus_compose_seqs_pt_br) / (4 + 2)
 };
 
 static const IBusComposeTableLocaleList ibus_compose_table_locale_list[] = {

From 38fa3e8a57262e4d76afe9bc348d14cc37af5cfc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 23 Jun 2014 15:19:03 +0900
Subject: [PATCH 252/816] Set up ibus engines when users log into the session
 for the first time.

XKB engines are configured by the session XKB.
IM engines are configured by the current locale and IBusEngineDesc.lang.
Also append 'us' layout after non-ascii layout likes 'ara', 'ru'.

BUG=rhbz#541492
TEST=ui/gtk3/ibus-ui-gtk3 data/dconf/org.freedesktop.ibus.gschema.xml

Review URL: https://codereview.appspot.com/103440043
---
 data/ibus.schemas.in   |  14 +++
 ui/gtk3/Makefile.am    |   1 +
 ui/gtk3/panel.vala     | 211 +++++++++++++++++++++++++++++++----------
 ui/gtk3/xkblayout.vala | 202 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 378 insertions(+), 50 deletions(-)
 create mode 100644 ui/gtk3/xkblayout.vala

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 328437b96..26fa3909a 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -55,6 +55,20 @@
             </long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/xkb-latin-layouts</key>
+      <applyto>/desktop/ibus/general/xkb-latin-layouts</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[ara,bg,cz,dev,gr,gur,in,jp(kana),mal,mkd,ru,ua]</default>
+      <locale name="C">
+        <short>Latin layouts which have no ASCII</short>
+           <long>US layout is appended to the latin layouts. variant can be
+                 omitted.
+           </long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index b2fb8005e..2a4da5e9f 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -109,6 +109,7 @@ ibus_ui_gtk3_SOURCES = \
 	propertypanel.vala \
 	separator.vala \
 	switcher.vala \
+	xkblayout.vala \
 	$(NULL)
 
 ibus_ui_gtk3_LDADD = \
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 748cb32e0..26c7eac52 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -63,6 +63,8 @@ class Panel : IBus.PanelService {
                                                    GLib.str_equal);
     private Gdk.RGBA m_xkb_icon_rgba = Gdk.RGBA(){
             red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
+    private XKBLayout m_xkblayout = new XKBLayout();
+    private bool inited_engines_order = true;
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -267,6 +269,152 @@ class Panel : IBus.PanelService {
         m_keybindings = null;
     }
 
+    /**
+     * panel_get_engines_from_xkb:
+     * @self: #Panel class
+     * @engines: all engines from ibus_bus_list_engines()
+     * @returns: ibus xkb engines
+     *
+     * Made ibus engines from the current XKB keymaps.
+     * This returns only XKB engines whose name start with "xkb:".
+     */
+    private GLib.List<IBus.EngineDesc>
+            get_engines_from_xkb(GLib.List<IBus.EngineDesc> engines) {
+        string layouts;
+        string variants;
+        string option;
+        XKBLayout.get_layout(out layouts, out variants, out option);
+
+        GLib.List<IBus.EngineDesc> xkb_engines =
+                new GLib.List<IBus.EngineDesc>();
+        IBus.EngineDesc us_engine =
+                new IBus.EngineDesc("xkb:us::eng",
+                                    "", "", "", "", "", "", "");
+        string[] layout_array = layouts.split(",");
+        string[] variant_array = variants.split(",");
+
+        for (int i = 0; i < layout_array.length; i++) {
+            string layout = layout_array[i];
+            string variant = null;
+            IBus.EngineDesc current_engine = null;
+
+            if (i < variant_array.length)
+                variant = variant_array[i];
+
+            /* If variants == "", variants.split(",") is { null }.
+             * To meet engine.get_layout_variant(), convert null to ""
+             * here.
+             */
+            if (variant == null)
+                variant = "";
+
+            foreach (unowned IBus.EngineDesc engine in engines) {
+
+                string name = engine.get_name();
+                if (!name.has_prefix("xkb:"))
+                    continue;
+
+                if (engine.get_layout() == layout &&
+                    engine.get_layout_variant() == variant) {
+                    current_engine = engine;
+                    break;
+                }
+            }
+
+            if (current_engine != null) {
+                xkb_engines.append(current_engine);
+            } else if (xkb_engines.find(us_engine) == null) {
+                warning("Fallback %s(%s) to us layout.", layout, variant);
+                xkb_engines.append(us_engine);
+            }
+        }
+
+        if (xkb_engines.length() == 0)
+            warning("Not found IBus XKB engines from the session.");
+
+        return xkb_engines;
+    }
+
+    /**
+     * panel_get_engines_from_locale:
+     * @self: #Panel class
+     * @engines: all engines from ibus_bus_list_engines()
+     * @returns: ibus im engines
+     *
+     * Made ibus engines from the current locale and IBus.EngineDesc.lang .
+     * This returns non-XKB engines whose name does not start "xkb:".
+     */
+    private GLib.List<IBus.EngineDesc>
+            get_engines_from_locale(GLib.List<IBus.EngineDesc> engines) {
+        string locale = Intl.setlocale(LocaleCategory.CTYPE, null);
+
+        if (locale == null)
+            locale = "C";
+
+        string lang = locale.split(".")[0];
+        GLib.List<IBus.EngineDesc> im_engines =
+                new GLib.List<IBus.EngineDesc>();
+
+        foreach (unowned IBus.EngineDesc engine in engines) {
+            string name = engine.get_name();
+
+            if (name.has_prefix("xkb:"))
+                continue;
+
+            if (engine.get_language() == lang &&
+                engine.get_rank() > 0)
+                im_engines.append(engine);
+        }
+
+        if (im_engines.length() == 0) {
+            lang = lang.split("_")[0];
+
+            foreach (unowned IBus.EngineDesc engine in engines) {
+                string name = engine.get_name();
+
+                if (name.has_prefix("xkb:"))
+                    continue;
+
+                if (engine.get_language() == lang &&
+                    engine.get_rank() > 0)
+                    im_engines.append(engine);
+            }
+        }
+
+        if (im_engines.length() == 0)
+            return im_engines;
+
+        im_engines.sort((a, b) => {
+            return (int) b.get_rank() - (int) a.get_rank();
+        });
+
+        return im_engines;
+    }
+
+    private void init_engines_order() {
+        m_xkblayout.set_latin_layouts(
+                m_settings_general.get_strv("xkb-latin-layouts"));
+
+        if (inited_engines_order)
+            return;
+
+        if (m_settings_general.get_strv("preload-engines").length > 0)
+            return;
+
+        GLib.List<IBus.EngineDesc> engines = m_bus.list_engines();
+        GLib.List<IBus.EngineDesc> xkb_engines = get_engines_from_xkb(engines);
+        GLib.List<IBus.EngineDesc> im_engines =
+                get_engines_from_locale(engines);
+
+        string[] names = {};
+        foreach (unowned IBus.EngineDesc engine in xkb_engines)
+            names += engine.get_name();
+        foreach (unowned IBus.EngineDesc engine in im_engines)
+            names += engine.get_name();
+
+        m_settings_general.set_strv("preload-engines", names);
+    }
+
     private void set_custom_font() {
         Gdk.Display display = Gdk.Display.get_default();
         Gdk.Screen screen = (display != null) ?
@@ -467,13 +615,19 @@ class Panel : IBus.PanelService {
 #endif
     }
 
+    private void update_version_1_5_8() {
+        inited_engines_order = false;
+    }
+
     private void set_version() {
         string prev_version = m_settings_general.get_string("version");
         string current_version = null;
 
-        if (compare_versions(prev_version, "1.5.3") < 0) {
+        if (compare_versions(prev_version, "1.5.3") < 0)
             update_version_1_5_3();
-        }
+
+        if (compare_versions(prev_version, "1.5.8") < 0)
+            update_version_1_5_8();
 
         current_version = "%d.%d.%d".printf(IBus.MAJOR_VERSION,
                                             IBus.MINOR_VERSION,
@@ -487,6 +641,10 @@ class Panel : IBus.PanelService {
     }
 
     public void load_settings() {
+        set_version();
+
+        init_engines_order();
+
         // Update m_use_system_keyboard_layout before update_engines()
         // is called.
         set_use_system_keyboard_layout();
@@ -504,53 +662,6 @@ class Panel : IBus.PanelService {
         set_timeout_property_panel();
         set_follow_input_cursor_when_always_shown_property_panel();
         set_xkb_icon_rgba();
-
-        set_version();
-    }
-
-    private void exec_setxkbmap(IBus.EngineDesc engine) {
-        string layout = engine.get_layout();
-        string variant = engine.get_layout_variant();
-        string option = engine.get_layout_option();
-        string standard_error = null;
-        int exit_status = 0;
-        string[] args = { "setxkbmap" };
-
-        if (layout != null && layout != "" && layout != "default") {
-            args += "-layout";
-            args += layout;
-        }
-        if (variant != null && variant != "" && variant != "default") {
-            args += "-variant";
-            args += variant;
-        }
-        if (option != null && option != "" && option != "default") {
-            /*TODO: Need to get the session XKB options */
-            args += "-option";
-            args += "-option";
-            args += option;
-        }
-
-        if (args.length == 1) {
-            return;
-        }
-
-        try {
-            if (!GLib.Process.spawn_sync(null, args, null,
-                                         GLib.SpawnFlags.SEARCH_PATH,
-                                         null, null,
-                                         out standard_error,
-                                         out exit_status)) {
-                warning("Switch xkb layout to %s failed.",
-                        engine.get_layout());
-            }
-        } catch (GLib.SpawnError e) {
-            warning("Execute setxkbmap failed: %s", e.message);
-        }
-
-        if (exit_status != 0) {
-            warning("Execute setxkbmap failed: %s", standard_error ?? "(null)");
-        }
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {
@@ -573,7 +684,7 @@ class Panel : IBus.PanelService {
 
         // set xkb layout
         if (!m_use_system_keyboard_layout)
-            exec_setxkbmap(engine);
+            m_xkblayout.set_layout(engine);
 
         engine_contexts_insert(engine);
     }
diff --git a/ui/gtk3/xkblayout.vala b/ui/gtk3/xkblayout.vala
new file mode 100644
index 000000000..1c6d9cfee
--- /dev/null
+++ b/ui/gtk3/xkblayout.vala
@@ -0,0 +1,202 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2014 Red Hat, Inc.
+ * Copyright(c) 2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2014 Takao Fujiwara <tfujiwar@redhat.com>
+ *
+ * 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
+ */
+
+class XKBLayout
+{
+    private const string XKB_COMMAND = "setxkbmap";
+    private const string XKB_QUERY_ARG = "-query";
+    private const string XKB_LAYOUT_ARG = "-layout";
+    private string[] m_xkb_latin_layouts = {};
+    private string m_default_layout = "";
+    private string m_default_variant = "";
+    private string m_default_option = "";
+
+    public XKBLayout() {
+    }
+
+    public void set_latin_layouts(string[] xkb_latin_layouts) {
+        m_xkb_latin_layouts = xkb_latin_layouts;
+    }
+
+    public static void get_layout(out string layout,
+                                  out string variant,
+                                  out string option) {
+        string[] exec_command = {};
+        exec_command += XKB_COMMAND;
+        exec_command += XKB_QUERY_ARG;
+        string standard_output = null;
+        string standard_error = null;
+        int exit_status = 0;
+
+        layout = "";
+        variant = "";
+        option = "";
+
+        try {
+            GLib.Process.spawn_sync(null,
+                                    exec_command,
+                                    null,
+                                    GLib.SpawnFlags.SEARCH_PATH,
+                                    null,
+                                    out standard_output,
+                                    out standard_error,
+                                    out exit_status);
+        } catch (GLib.SpawnError err) {
+            stderr.printf("IBUS_ERROR: %s\n", err.message);
+        }
+        if (exit_status != 0) {
+            stderr.printf("IBUS_ERROR: %s\n", standard_error ?? "");
+        }
+        if (standard_output == null) {
+            return;
+        }
+
+        foreach (string line in standard_output.split("\n")) {
+            string element = "layout:";
+            string retval = "";
+            if (line.has_prefix(element)) {
+                retval = line[element.length:line.length];
+                if (retval != null) {
+                    retval = retval.strip();
+                }
+                layout = retval;
+            }
+
+            element = "variant:";
+            retval = "";
+            if (line.has_prefix(element)) {
+                retval = line[element.length:line.length];
+                if (retval != null) {
+                    retval = retval.strip();
+                }
+                variant = retval;
+            }
+
+            element = "options:";
+            retval = "";
+            if (line.has_prefix(element)) {
+                retval = line[element.length:line.length];
+                if (retval != null) {
+                    retval = retval.strip();
+                }
+                option = retval;
+            }
+        }
+    }
+
+    public void set_layout(IBus.EngineDesc engine) {
+        string layout = engine.get_layout();
+        string variant = engine.get_layout_variant();
+        string option = engine.get_layout_option();
+
+        assert (layout != null);
+
+        /* If the layout is "default", return here so that the current
+         * keymap is not changed.
+         * Some engines do not wish to change the current keymap.
+         */
+        if (layout == "default" &&
+            (variant == "default" || variant == "") &&
+            (option == "default" || option == "")) {
+            return;
+        }
+
+        bool need_us_layout = false;
+        if (variant != "eng")
+            need_us_layout = layout in m_xkb_latin_layouts;
+        if (!need_us_layout && variant != null)
+            need_us_layout =
+                    "%s(%s)".printf(layout, variant) in m_xkb_latin_layouts;
+
+        if (m_default_layout == "") {
+            get_layout (out m_default_layout,
+                        out m_default_variant,
+                        out m_default_option);
+        }
+
+        if (layout == "default" || layout == "") {
+            layout = m_default_layout;
+            variant = m_default_variant;
+        }
+
+        if (layout == "") {
+            warning("Could not get the correct layout");
+            return;
+        }
+
+        if (option == "default" || option == "") {
+            option = m_default_option;
+        } else {
+            if (!(option in m_default_option.split(","))) {
+                option = "%s,%s".printf(m_default_option, option);
+            } else {
+                option = m_default_option;
+            }
+        }
+
+        if (need_us_layout) {
+            layout += ",us";
+            if (variant != null) {
+                variant += ",";
+            }
+        }
+
+        string[] args = {};
+        args += XKB_COMMAND;
+        args += XKB_LAYOUT_ARG;
+        args += layout;
+        if (variant != null && variant != "" && variant != "default") {
+            args += "-variant";
+            args += variant;
+        }
+        if (option != null && option != "" && option != "default") {
+            /*TODO: Need to get the session XKB options */
+            args += "-option";
+            args += "-option";
+            args += option;
+        }
+
+        string standard_error = null;
+        int exit_status = 0;
+        try {
+            if (!GLib.Process.spawn_sync(null,
+                                         args,
+                                         null,
+                                         GLib.SpawnFlags.SEARCH_PATH,
+                                         null,
+                                         null,
+                                         out standard_error,
+                                         out exit_status))
+                warning("Switch xkb layout to %s failed.",
+                        engine.get_layout());
+        } catch (GLib.SpawnError e) {
+            warning("Execute setxkbmap failed: %s", e.message);
+            return;
+        }
+
+        if (exit_status != 0)
+            warning("Execute setxkbmap failed: %s",
+                    standard_error ?? "(null)");
+    }
+}

From a5300750e38b5327bdd255d777544d0c0ebcb4d9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 24 Jun 2014 11:24:40 +0900
Subject: [PATCH 253/816] Do not sort ibus engines when they are saved by
 ibus-setup.

ibus 1.5 changes the engine order with Super+space shortcut key
and now ibus-setup shows the sorted engines by longname on UI.
This fixes not to save the sorted order with ibus-setup.

TEST=setup

Review URL: https://codereview.appspot.com/102610044
---
 setup/enginetreeview.py | 13 ++++++++-----
 setup/main.py           |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index b116c54f2..3ab81b772 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -47,7 +47,7 @@ class EngineTreeView(Gtk.TreeView):
     def __init__(self):
         super(EngineTreeView, self).__init__()
 
-        self.__engines = set([])
+        self.__engines = []
         self.__changed = False
 
         # self.set_headers_visible(True)
@@ -186,13 +186,13 @@ def do_set_property(self, prop, value):
 
     def set_engines(self, engines):
         self.__model.clear()
-        self.__engines = set([])
+        self.__engines = []
         for e in engines:
             if e in self.__engines:
                 continue
             it = self.__model.append(None)
             self.__model.set(it, 0, e)
-            self.__engines.add(e)
+            self.__engines.append(e)
         self.__emit_changed()
 
     def get_selected_iter(self):
@@ -201,6 +201,9 @@ def get_selected_iter(self):
             return selection.get_selected()[1]
 
     def get_engines(self):
+        return self.__engines
+
+    def get_sorted_engines(self):
         return self.get_property("engines")
 
     def get_active_engine(self):
@@ -211,7 +214,7 @@ def prepend_engine(self, engine):
             return
         it = self.__model.prepend(None)
         self.__model.set(it, 0, engine)
-        self.__engines.add(engine)
+        self.__engines = [engine] + self.__engines
         self.scroll_to_cell(self.__model[0].path, None)
 
     def append_engine(self, engine):
@@ -219,7 +222,7 @@ def append_engine(self, engine):
             return
         it = self.__model.append(None)
         self.__model.set(it, 0, engine)
-        self.__engines.add(engine)
+        self.__engines.append(engine)
         self.scroll_to_cell(self.__model[-1].path, None)
 
     def remove_engine(self):
diff --git a/setup/main.py b/setup/main.py
index dee7be4d7..1d89f3dd8 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -274,7 +274,7 @@ def __treeview_notify_cb(self, treeview, prop):
         if prop.name not in ("active-engine", "engines"):
             return
 
-        engines = self.__treeview.get_engines()
+        engines = self.__treeview.get_sorted_engines()
         engine = self.__treeview.get_active_engine()
 
         self.__builder.get_object("button_engine_remove").set_sensitive(engine != None)
@@ -289,6 +289,7 @@ def __treeview_notify_cb(self, treeview, prop):
             obj.set_sensitive(False)
 
         if prop.name == "engines":
+            engines = self.__treeview.get_engines()
             engine_names = [e.get_name() for e in engines]
             self.__settings_general.set_strv('preload-engines', engine_names)
 

From 8ef258ec31f12405e4f5ded6a7a4d80114a219d4 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Thu, 3 Jul 2014 11:39:32 +0900
Subject: [PATCH 254/816] Use "keycode Linux_keycode = X11_keysym" format

Delete non-Linux keyboard compatibility.

These are tested for both PC and Mac. Using showkey and xev

Notably:

  Hangul = Eisuu-on-mac-keyboard
  Hangul_Hanja = Kana/kana -on-mac-keyboard

BUG=http://code.google.com/p/ibus/issues/detail?id=1724
TEST=data/keymaps/keycode.py

Review URL: https://codereview.appspot.com/106250045
Patch from Osamu Aoki <osamu@debian.org>.
---
 data/keymaps/jp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/keymaps/jp b/data/keymaps/jp
index 2c78347e6..e5546facc 100644
--- a/data/keymaps/jp
+++ b/data/keymaps/jp
@@ -31,11 +31,14 @@ keycode 52 = period
 keycode 53 = slash
     shift keycode 53 = question
     shift keycode 58 = Eisu_toggle
-    shift keycode 84 = Execute
-keycode 112 = Katakana
-keycode 115 = backslash
-    shift keycode 115 = underscore
-keycode 121 = Henkan_Mode
-keycode 123 = Muhenkan
+keycode 89 = backslash
+    shift keycode 89 = underscore
+keycode 92 = Henkan_Mode
+keycode 93 = Hiragana_Katakana
+keycode 94 = Muhenkan
 keycode 124 = yen
     shift keycode 124 = bar
+keycode 122 = Hangul
+keycode 123 = Hangul_Hanja
+    shift keycode 84 = Execute
+keycode 112 = Katakana

From 14bd9381127e692b944eb31f56a2cc5b9de2e7a1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 4 Jul 2014 16:00:16 +0900
Subject: [PATCH 255/816] Run xmodmap after run setxkbmap -l layout.

BUG=rhbz#750484
TEST=ui/gtk3/ibus-ui-gtk3 data/dconf/org.freedesktop.ibus.gschema.xml

Review URL: https://codereview.appspot.com/101490043
---
 data/ibus.schemas.in   | 12 ++++++++++
 ui/gtk3/panel.vala     | 10 +++++++++
 ui/gtk3/xkblayout.vala | 50 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 26fa3909a..1fc64f94c 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -69,6 +69,18 @@
            </long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/use-xmodmap</key>
+      <applyto>/desktop/ibus/general/use-xmodmap</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Use xmodmap</short>
+          <long>Run xmodmap if .xmodmap or .Xmodmap exists when
+                ibus engines are switched.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 26c7eac52..76cea238a 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -145,6 +145,10 @@ class Panel : IBus.PanelService {
                 set_use_global_engine();
         });
 
+        m_settings_general.changed["use-xmodmap"].connect((key) => {
+                set_use_xmodmap();
+        });
+
         m_settings_hotkey.changed["triggers"].connect((key) => {
                 unbind_switch_shortcut();
                 bind_switch_shortcut();
@@ -491,6 +495,11 @@ class Panel : IBus.PanelService {
                 m_settings_general.get_boolean("use-global-engine");
     }
 
+    private void set_use_xmodmap() {
+        m_xkblayout.set_use_xmodmap(
+                m_settings_general.get_boolean("use-xmodmap"));
+    }
+
     private void set_show_icon_on_systray() {
         if (m_status_icon == null)
             return;
@@ -649,6 +658,7 @@ class Panel : IBus.PanelService {
         // is called.
         set_use_system_keyboard_layout();
         set_use_global_engine();
+        set_use_xmodmap();
         update_engines(m_settings_general.get_strv("preload-engines"),
                        m_settings_general.get_strv("engines-order"));
         unbind_switch_shortcut();
diff --git a/ui/gtk3/xkblayout.vala b/ui/gtk3/xkblayout.vala
index 1c6d9cfee..729b48ced 100644
--- a/ui/gtk3/xkblayout.vala
+++ b/ui/gtk3/xkblayout.vala
@@ -27,10 +27,14 @@ class XKBLayout
     private const string XKB_COMMAND = "setxkbmap";
     private const string XKB_QUERY_ARG = "-query";
     private const string XKB_LAYOUT_ARG = "-layout";
+    private const string XMODMAP_COMMAND = "xmodmap";
+    private const string[] XMODMAP_KNOWN_FILES = {".xmodmap", ".xmodmaprc",
+                                                  ".Xmodmap", ".Xmodmaprc"};
     private string[] m_xkb_latin_layouts = {};
     private string m_default_layout = "";
     private string m_default_variant = "";
     private string m_default_option = "";
+    private bool m_use_xmodmap = true;
 
     public XKBLayout() {
     }
@@ -198,5 +202,51 @@ class XKBLayout
         if (exit_status != 0)
             warning("Execute setxkbmap failed: %s",
                     standard_error ?? "(null)");
+
+        run_xmodmap();
+    }
+
+    public void run_xmodmap() {
+        if (!m_use_xmodmap) {
+            return;
+        }
+
+        string homedir = GLib.Environment.get_home_dir();
+        foreach (string xmodmap_file in XMODMAP_KNOWN_FILES) {
+            string xmodmap_filepath = GLib.Path.build_filename(homedir,
+                                                               xmodmap_file);
+
+            if (!GLib.FileUtils.test(xmodmap_filepath, GLib.FileTest.EXISTS)) {
+                continue;
+            }
+
+            string[] args = {XMODMAP_COMMAND, xmodmap_filepath};
+
+            /* Call async here because if both setxkbmap and xmodmap is
+             * sync, it seems a DBus timeout happens and xmodmap causes
+             * a loop for a while and users would think panel icon is
+             * frozen in case the global engine mode is disabled.
+             *
+             * Do not return here even if the previous async is running
+             * so that all xmodmap can be done after setxkbmap is called.
+             */
+            try {
+                GLib.Process.spawn_async(null,
+                                         args,
+                                         null,
+                                         GLib.SpawnFlags.SEARCH_PATH,
+                                         null,
+                                         null);
+            } catch (GLib.SpawnError e) {
+                warning("Execute xmodmap is failed: %s\n", e.message);
+                return;
+            }
+
+            break;
+        }
+    }
+
+    public void set_use_xmodmap(bool use_xmodmap) {
+        m_use_xmodmap = use_xmodmap;
     }
 }

From 3dcf24742216d6234a45ace1b433b864efdf08a2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 4 Jul 2014 16:03:57 +0900
Subject: [PATCH 256/816] Add ibus reset-config and read-config sub-commands.

BUG=rhbz#530711
TEST=tools/ibus

Review URL: https://codereview.appspot.com/103670044
---
 tools/main.vala | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/tools/main.vala b/tools/main.vala
index db4fd23a6..ecce80ade 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -20,6 +20,12 @@
  * USA
  */
 
+private const string[] IBUS_SCHEMAS = {
+    "org.freedesktop.ibus.general",
+    "org.freedesktop.ibus.general.hotkey",
+    "org.freedesktop.ibus.panel",
+};
+
 bool name_only = false;
 /* system() exists as a public API. */
 bool is_system = false;
@@ -276,6 +282,44 @@ int print_address(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+int read_config(string[] argv) {
+    var output = new GLib.StringBuilder();
+
+    foreach (string schema in IBUS_SCHEMAS) {
+        GLib.Settings settings = new GLib.Settings(schema);
+
+        output.append_printf("SCHEMA: %s\n", schema);
+
+        foreach (string key in settings.list_keys()) {
+            GLib.Variant variant = settings.get_value(key);
+            output.append_printf("  %s: %s\n", key, variant.print(true));
+        }
+    }
+    print("%s", output.str);
+
+    return Posix.EXIT_SUCCESS;
+}
+
+int reset_config(string[] argv) {
+    print("%s\n", _("Resetting…"));
+
+    foreach (string schema in IBUS_SCHEMAS) {
+        GLib.Settings settings = new GLib.Settings(schema);
+
+        print("SCHEMA: %s\n", schema);
+
+        foreach (string key in settings.list_keys()) {
+            print("  %s\n", key);
+            settings.reset(key);
+        }
+    }
+
+    GLib.Settings.sync();
+    print("%s\n", _("Done"));
+
+    return Posix.EXIT_SUCCESS;
+}
+
 int print_help(string[] argv) {
     print_usage(stdout);
     return Posix.EXIT_SUCCESS;
@@ -299,6 +343,8 @@ static const CommandEntry commands[]  = {
     { "read-cache", N_("Show the content of registry cache"), read_cache },
     { "write-cache", N_("Create registry cache"), write_cache },
     { "address", N_("Print the D-Bus address of ibus-daemon"), print_address },
+    { "read-config", N_("Show the configuration values"), read_config },
+    { "reset-config", N_("Reset the configuration values"), reset_config },
     { "help", N_("Show this information"), print_help }
 };
 
@@ -308,7 +354,7 @@ void print_usage(FileStream stream) {
     stream.printf(_("Usage: %s COMMAND [OPTION...]\n\n"), program_name);
     stream.printf(_("Commands:\n"));
     for (int i = 0; i < commands.length; i++) {
-        stream.printf("  %-11s    %s\n",
+        stream.printf("  %-12s    %s\n",
                       commands[i].name,
                       GLib.dgettext(null, commands[i].description));
     }

From 9e5a2bd2c40f9eed8d99710b63b3dab737aa9b95 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 Jul 2014 11:42:12 +0900
Subject: [PATCH 257/816] Update ibus(1) for read-config and reset-config.

TEST=tools/ibus.1.gz

Review URL: https://codereview.appspot.com/111900044
---
 tools/ibus.1.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index ab99db482..6ac92ff2c 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -85,6 +85,13 @@ directories, separated by ':'.
 \fBaddress\fR
 Show the D-Bus address of ibus-daemon.
 .TP
+\fBread\-config\fR
+Print the setting values in a gsettings configuration file.
+.TP
+\fBreset\-config\fR
+Reset the user setting values to the default ones in a gsettings
+configuration file.
+.TP
 \fBwatch\fR
 Under construction.
 .TP

From 10483bfebd1f51ffa52ad7d017193ae728f93bf5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 10 Jul 2014 11:54:30 +0900
Subject: [PATCH 258/816] Fix ibus-setup SEGV in enginetreeview.py

When an engine is added on ibus-setup, enginetreeview.append_engine()
calls self.__model.append(None) and it causes engine == None in
__icon_cell_data_cb() and __name_cell_data_cb() in enginetreeview
with python3-gobject 3.13.x which version has implemented several
deprecated warnings in gi/overrides/Gtk.py .
I think this problem also could happen in the old versions if
the system would be slow.

BUG=rhbz#1048429
TEST=setup in Fedora 21

Review URL: https://codereview.appspot.com/104620043
---
 setup/enginetreeview.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 3ab81b772..afb23fcd9 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -128,12 +128,25 @@ def __emit_changed_delay_cb(self, *args):
     def __icon_cell_data_cb(self, celllayout, renderer, model, it, data):
         engine = self.__model.get_value(it, 0)
 
+        # When append_engine() is called, self.__model.append(None)
+        # is called internally and engine == None could happen in
+        # a slow system.
+        if engine == None:
+            return
+
         icon_size = Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)[0]
         pixbuf = load_icon(engine.get_icon(), Gtk.IconSize.LARGE_TOOLBAR)
         renderer.set_property("pixbuf", pixbuf)
 
     def __name_cell_data_cb(self, celllayout, renderer, model, it, data):
         engine = self.__model.get_value(it, 0)
+
+        # When append_engine() is called, self.__model.append(None)
+        # is called internally and engine == None could happen in
+        # a slow system.
+        if engine == None:
+            return
+
         renderer.set_property("sensitive", True)
         language = IBus.get_language_name(engine.get_language())
         renderer.set_property("text",
@@ -215,7 +228,6 @@ def prepend_engine(self, engine):
         it = self.__model.prepend(None)
         self.__model.set(it, 0, engine)
         self.__engines = [engine] + self.__engines
-        self.scroll_to_cell(self.__model[0].path, None)
 
     def append_engine(self, engine):
         if engine == None or engine in self.__engines:
@@ -223,7 +235,6 @@ def append_engine(self, engine):
         it = self.__model.append(None)
         self.__model.set(it, 0, engine)
         self.__engines.append(engine)
-        self.scroll_to_cell(self.__model[-1].path, None)
 
     def remove_engine(self):
         it = self.get_selected_iter()

From a17dc8e8bd288adedb77ae417d6825419337daae Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 11 Jul 2014 11:45:05 +0900
Subject: [PATCH 259/816] Fix deprecated warnings with python3-gobject 3.13.3.

python3-gobject adds several warnings in gi/overrides/Gtk.py

/usr/share/ibus/setup/main.py:74: PyGIDeprecationWarning:
Using positional arguments with the GObject constructor has been
deprecated. Please specify keyword(s) for "schema" or use a class
specific constructor.
See: https://wiki.gnome.org/PyGObject/InitializerDeprecations

/usr/share/ibus/setup/main.py:364: PyGTKDeprecationWarning:
The keyword(s) "type" have been deprecated in favor of "message_type"
respectively.
See: https://wiki.gnome.org/PyGObject/InitializerDeprecations

TEST=setup

Review URL: https://codereview.appspot.com/110990044
---
 setup/engineabout.py      | 12 +++++++-----
 setup/keyboardshortcut.py | 32 ++++++++++++++++++--------------
 setup/main.py             | 30 ++++++++++++++++++------------
 setup/setup.ui            |  2 ++
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/setup/engineabout.py b/setup/engineabout.py
index 50ab001b7..09e9b5cb7 100644
--- a/setup/engineabout.py
+++ b/setup/engineabout.py
@@ -29,12 +29,14 @@
 from i18n import _, N_
 
 class EngineAbout(Gtk.Dialog):
-    def __init__(self, enginedesc):
-        self.__engine_desc = enginedesc
-        super(EngineAbout, self).__init__(_("About"), None,
-                Gtk.DialogFlags.MODAL,
-                (_("_Close"), Gtk.ResponseType.CLOSE))
+    def __init__(self, engine, transient_for = None):
+        self.__engine_desc = engine
+        super(EngineAbout, self).__init__(
+                title = _("About"),
+                transient_for = transient_for)
 
+        buttons = (_("_Close"), Gtk.ResponseType.CLOSE)
+        self.add_buttons(*buttons)
         self.__init_ui()
 
     def __init_ui(self):
diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index d82fea864..91595f74e 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -49,7 +49,8 @@ def __init_ui(self):
         # self.pack_start(label, False, True, 4)
 
         # shortcuts view
-        self.__shortcut_view = Gtk.TreeView(Gtk.ListStore(GObject.TYPE_STRING))
+        self.__shortcut_view = Gtk.TreeView(
+                model = Gtk.ListStore(GObject.TYPE_STRING))
         self.__shortcut_view.set_size_request(-1, 100)
         renderer = Gtk.CellRendererText()
         column = Gtk.TreeViewColumn(_("Keyboard shortcuts"), renderer, text = 0)
@@ -63,7 +64,7 @@ def __init_ui(self):
 
         # key code
         hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
-        label = Gtk.Label(_("Key code:"))
+        label = Gtk.Label(label = _("Key code:"))
         label.set_justify(Gtk.Justification.LEFT)
         label.set_alignment(0.0, 0.5)
         hbox.pack_start(label, False, True, 4)
@@ -71,19 +72,19 @@ def __init_ui(self):
         self.__keycode_entry = Gtk.Entry()
         self.__keycode_entry.connect("notify::text", self.__keycode_entry_notify_cb)
         hbox.pack_start(self.__keycode_entry, True, True, 4)
-        self.__keycode_button = Gtk.Button("...")
+        self.__keycode_button = Gtk.Button(label = "...")
         self.__keycode_button.connect("clicked", self.__keycode_button_clicked_cb)
         hbox.pack_start(self.__keycode_button, False, True, 4)
         self.pack_start(hbox, False, True, 4)
 
         # modifiers
         hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
-        label = Gtk.Label(_("Modifiers:"))
+        label = Gtk.Label(label = _("Modifiers:"))
         label.set_justify(Gtk.Justification.LEFT)
         label.set_alignment(0.0, 0.5)
         hbox.pack_start(label, False, True, 4)
 
-        table = Gtk.Table(4, 2)
+        table = Gtk.Table(n_rows = 4, n_columns = 2)
         self.__modifier_buttons = []
         self.__modifier_buttons.append(("Control",
                                         Gtk.CheckButton.new_with_mnemonic("_Control"),
@@ -250,8 +251,10 @@ def __keycode_entry_notify_cb(self, entry, arg):
 
     def __keycode_button_clicked_cb(self, button):
         out = []
-        dlg = Gtk.MessageDialog(parent = self.get_toplevel(), buttons = Gtk.ButtonsType.CLOSE)
-        message = _("Please press a key (or a key combination).\nThe dialog will be closed when the key is released.")
+        dlg = Gtk.MessageDialog(transient_for = self.get_toplevel(),
+                                buttons = Gtk.ButtonsType.CLOSE)
+        message = _("Please press a key (or a key combination).\n" \
+                    "The dialog will be closed when the key is released.")
         dlg.set_markup(message)
         dlg.set_title(_("Please press a key (or a key combination)"))
         sw = Gtk.ScrolledWindow()
@@ -265,7 +268,7 @@ def __accel_edited_cb(c, path, keyval, state, keycode):
         model = Gtk.ListStore(GObject.TYPE_INT,
                               GObject.TYPE_UINT,
                               GObject.TYPE_UINT)
-        accel_view = Gtk.TreeView(model)
+        accel_view = Gtk.TreeView(model = model)
         sw.add(accel_view)
         column = Gtk.TreeViewColumn()
         renderer = Gtk.CellRendererAccel(accel_mode=Gtk.CellRendererAccelMode.OTHER,
@@ -315,8 +318,9 @@ def __delete_button_clicked_cb(self, button):
         self.__apply_button.set_sensitive(False)
 
 class KeyboardShortcutSelectionDialog(Gtk.Dialog):
-    def __init__(self, title = None, parent = None, flags = 0, buttons = None):
-        super(KeyboardShortcutSelectionDialog, self).__init__(title, parent, flags, buttons)
+    def __init__(self, title = None, transient_for = None, flags = 0):
+        super(KeyboardShortcutSelectionDialog, self).__init__(
+                title = title, transient_for = transient_for, flags = flags)
         self.__selection_view = KeyboardShortcutSelection()
         self.vbox.pack_start(self.__selection_view, False, True, 0)
         self.vbox.show_all()
@@ -333,10 +337,10 @@ def get_shortcuts(self):
 
 
 if __name__ == "__main__":
-    dlg = KeyboardShortcutSelectionDialog(
-        title = "Select test",
-        buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
-                   _("_OK"), Gtk.ResponseType.OK))
+    dlg = KeyboardShortcutSelectionDialog(title = "Select test")
+    buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
+               _("_OK"), Gtk.ResponseType.OK)
+    dlg.add_buttons(buttons)
     dlg.add_shortcut("Control+Shift+space")
     dlg.set_shortcuts(None)
     print((dlg.run()))
diff --git a/setup/main.py b/setup/main.py
index 1d89f3dd8..1bc9cfbe3 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -70,10 +70,12 @@ def __flush_gtk_events(self):
     def __init__(self):
         super(Setup, self).__init__()
 
-        self.__settings_general = Gio.Settings("org.freedesktop.ibus.general");
+        self.__settings_general = Gio.Settings(
+                schema = "org.freedesktop.ibus.general");
         self.__settings_hotkey = Gio.Settings(
-                "org.freedesktop.ibus.general.hotkey");
-        self.__settings_panel = Gio.Settings("org.freedesktop.ibus.panel");
+                schema = "org.freedesktop.ibus.general.hotkey");
+        self.__settings_panel = Gio.Settings(
+                schema = "org.freedesktop.ibus.panel");
 
         # IBus.Bus() calls ibus_bus_new().
         # Gtk.Builder().add_from_file() also calls ibus_bus_new_async()
@@ -300,7 +302,7 @@ def __button_engine_add_cb(self, button):
     def __button_engine_about_cb(self, button):
         engine = self.__treeview.get_active_engine()
         if engine:
-            about = EngineAbout(engine)
+            about = EngineAbout(engine = engine, transient_for = self.__window)
             about.run()
             about.destroy()
 
@@ -328,7 +330,7 @@ def __init_bus(self):
             return
 
         message = _("The IBus daemon is not running. Do you wish to start it?")
-        dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION,
+        dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION,
                                 buttons = Gtk.ButtonsType.YES_NO,
                                 text = message)
         id = dlg.run()
@@ -354,7 +356,7 @@ def __init_bus(self):
                 "  export XMODIFIERS=@im=ibus\n"
                 "  export QT_IM_MODULE=ibus"
                 )
-            dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
+            dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO,
                                     buttons = Gtk.ButtonsType.OK,
                                     text = message)
             id = dlg.run()
@@ -363,7 +365,7 @@ def __init_bus(self):
         else:
             # Translators: %d == 5 currently
             message = _("IBus daemon could not be started in %d seconds")
-            dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO,
+            dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO,
                                     buttons = Gtk.ButtonsType.OK,
                                     text = message % timeout)
             id = dlg.run()
@@ -378,7 +380,9 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         # Translators: Title of the window
         title2 = _("switching input methods")
         title = title1 % title2
-        dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)
+        dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(
+                title = title, transient_for = self.__window)
+        dialog.add_buttons(*buttons)
         text = entry.get_text()
         if text:
             shortcuts = text.split("; ")
@@ -409,9 +413,10 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
             try:
                 self.__bus.register_start_engine(data[DATA_LANG], data[DATA_NAME])
             except Exception as e:
-                dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
+                dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.ERROR,
+                        transient_for = self.__window,
                         buttons = Gtk.ButtonsType.CLOSE,
-                        message_format = str(e))
+                        text = str(e))
                 dlg.run()
                 dlg.destroy()
                 self.__flush_gtk_events()
@@ -420,9 +425,10 @@ def __item_started_column_toggled_cb(self, cell, path_str, model):
             try:
                 self.__bus.register_stop_engine(data[DATA_LANG], data[DATA_NAME])
             except Exception as e:
-                dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
+                dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.ERROR,
+                        transient_for = self.__window,
                         buttons = Gtk.ButtonsType.CLOSE,
-                        message_format = str(e))
+                        text = str(e))
                 dlg.run()
                 dlg.destroy()
                 self.__flush_gtk_events()
diff --git a/setup/setup.ui b/setup/setup.ui
index bb78433c3..d7801eacb 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -62,6 +62,8 @@
     <property name="resizable">False</property>
     <property name="window_position">center-always</property>
     <property name="icon_name">ibus-setup</property>
+    <!-- for GtkFontChooserDialog -->
+    <property name="modal">True</property>
     <child>
       <object class="GtkBox" id="vbox1">
         <property name="orientation">vertical</property>

From b1b4e2946682e3d53aa396d8469c7fa16a2dbca8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 11 Jul 2014 11:50:04 +0900
Subject: [PATCH 260/816] Export the 'IBUS_SETUP_XID' environment variable for
 each engine setup.

Follow GNOME_CONTROL_CENTER_XID.
https://wiki.gnome.org/AllanDay/IMEGuidelines

TEST=setup

Review URL: https://codereview.appspot.com/112920044
---
 setup/main.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup/main.py b/setup/main.py
index 1bc9cfbe3..e4ddd4599 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -28,6 +28,7 @@
 import sys
 import time
 
+from gi.repository import GdkX11
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import Gtk
@@ -233,6 +234,7 @@ def __init_ui(self):
         # add icon search path
         self.__window = self.__builder.get_object("window_preferences")
         self.__window.connect("delete-event", Gtk.main_quit)
+        self.__window.connect("notify::window", self.__gdk_window_set_cb)
 
         self.__button_close = self.__builder.get_object("button_close")
         self.__button_close.connect("clicked", Gtk.main_quit)
@@ -248,6 +250,10 @@ def __init_ui(self):
         self.__init_panel()
         self.__init_general()
 
+    def __gdk_window_set_cb(self, object, pspec):
+        str = '%u' % GdkX11.X11Window.get_xid(object.get_window())
+        GLib.setenv('IBUS_SETUP_XID', str, True)
+
     def __combobox_notify_active_engine_cb(self, combobox, property):
         engine = self.__combobox.get_active_engine()
         button = self.__builder.get_object("button_engine_add")

From 9b2004efcd26e11bbd56cf51656fe326fc11be8e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Jul 2014 11:45:25 +0900
Subject: [PATCH 261/816] Call GLib.set_prgname('ibus-setup') for ibus-setup
 main.py

TEST=xlsclients

Review URL: https://codereview.appspot.com/108550043
---
 setup/main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup/main.py b/setup/main.py
index e4ddd4599..9bd0af123 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -28,9 +28,13 @@
 import sys
 import time
 
+from gi.repository import GLib
+# set_prgname before importing other modules to show the name in warning
+# messages when import modules are failed.
+GLib.set_prgname('ibus-setup')
+
 from gi.repository import GdkX11
 from gi.repository import Gio
-from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import IBus
 from os import path

From 47a6b86f197918147693a7b4774d02a287950e6a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Jul 2014 18:00:51 +0900
Subject: [PATCH 262/816] Update translations.

Update es.po fr.po ja.po ko.po pl.po pt_BR.po uk.po zh_TW.po

Review URL: https://codereview.appspot.com/108480043
---
 po/es.po    | 248 ++++++++++++++++++++++---------------
 po/fr.po    | 346 +++++++++++++++++++++++++---------------------------
 po/ja.po    | 206 +++++++++++++++++--------------
 po/ko.po    | 244 +++++++++++++++++++++---------------
 po/pl.po    | 203 +++++++++++++++++-------------
 po/pt_BR.po | 259 +++++++++++++++++++++++----------------
 po/uk.po    | 203 +++++++++++++++++-------------
 po/zh_TW.po | 238 +++++++++++++++++++++---------------
 8 files changed, 1102 insertions(+), 845 deletions(-)

diff --git a/po/es.po b/po/es.po
index f111cbbd3..40b93dcfe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,11 +4,11 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
-# Domingo Becker <domingobecker@gmail.com>, 2012-2013
-# Domingo Becker <domingobecker@gmail.com>, 2013
+# beckerde <domingobecker@gmail.com>, 2012-2013
+# beckerde <domingobecker@gmail.com>, 2013-2014
 # Eduardo Villagrán M <gotencool@gmail.com>, 2013
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:46+0000\n"
-"Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 03:29+0000\n"
+"Last-Translator: beckerde <domingobecker@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,7 +90,7 @@ msgstr "Método de entrada anterior:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Atajo de teclado para encender o apagar el método de entrada"
 
@@ -130,11 +130,11 @@ msgstr "Mostrar panel de propiedades:"
 msgid "Language panel position:"
 msgstr "Posición del panel de idioma:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 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:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
@@ -223,11 +223,11 @@ msgstr "<small><i>Puede elegir el método de entrada activo de los seleccionados
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar el diseño del teclado del sistema (XKB)"
 
@@ -235,7 +235,7 @@ msgstr "Usar el diseño del teclado del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Diseño del Teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
@@ -265,7 +265,7 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Acerca de"
 
@@ -273,176 +273,211 @@ msgstr "Acerca de"
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Precargar máquinas"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Precargar los motores durante el inicio de ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Orden de las máquinas"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Orden de las máquinas guardada en la lista de métodos de entrada"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Retraso en milisegundos de Popup para ventana del interruptor IME"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Demora en milisegundos. 0 &gt; No muestra la ventana ni los motores siguientes o anteriores."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Número de versión guardada"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 "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
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Activadora de los Atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activador de llaves de atajos para leer gtk_accelerator "
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Habilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 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:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Inhabilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 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:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Atajo de teclado para el siguiente motor"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Atajo de teclado para la máquina previa"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 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:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Auto Ocultar"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "La conducta del panel de propiedad,0= No mostrar, 1 = Auto ocultar, 2 = Mostrar siempre"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Posición del panel de idioma"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Siga el cursor de entrada en caso de que el panel siempre se muestre"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "Si es verdadero, el panel sigue el cursor de entrada en el caso que siempre se muestre. Si es falso, el panel se muestra en una ubicación fija."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Los milisegundos para mostrar el panel de propiedad"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Los milisegundos para mostrar el panel de propiedad después de enfocar o que las propiedades cambien."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientación de búsqueda en la tabla "
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 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:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Mostrar el nombre del método de entrada"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "Valor RGBA del ícono XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "El ícono XKB muestra la cadena de diseño que se renderiza con el valor RGBA. El valor RGBA puede ser 1. un color de X11, 2. un valor hexa en la forma '#rrggbb' donde 'r', 'g' y 'b' son dígitos hexa para el rojo, verde y azul, 3. un color RGB en elformato 'rgb(r,g,b)' o 4. Un color RGBA en el formato 'rgba(r,g,b,a)' donde 'r', 'g', y 'b' son o bien enteros en el rango de 0 a 255 o valores de porcentaje en el rango de 0% a 100%, y  'a' es un valor de punto flotante en el rango de 0 a 1 para el alfa."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada en forma predeterminada"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 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:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -519,23 +554,23 @@ msgstr "Por favor, presione una tecla (o una combinación de tecla).\nEl diálog
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:398
 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:329
+#: ../setup/main.py:330
 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:350
+#: ../setup/main.py:351
 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"
@@ -544,157 +579,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, 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:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "Cambiando métodos de entrada"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Lea el cache del registro del sistema."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "Lea el ARCHIVO de caché del registro."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "El caché del registro es inválido.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Escriba al caché del registro del sistema."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "USO: %s COMANDO [OPCION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 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:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/fr.po b/po/fr.po
index 45d004d47..bc905a30d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,24 +5,23 @@
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
-# Sam Friedmann <sam.friedmann@redhat.com>, 2010
-# dominique bribanick <chepioq@gmail.com>, 2011
+# dominique bribanick <chepioq@gmail.com>, 2011,2014
 # Jérôme Fenal <jfenal@gmail.com>, 2012-2013
 # Julien Humbert <julroy67@gmail.com>, 2009-2014
+# Sam Friedmann <sam.friedmann@redhat.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-20 10:23+0100\n"
-"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 03:29+0000\n"
+"Last-Translator: dominique bribanick <chepioq@gmail.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\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.6.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -70,8 +69,7 @@ msgstr "Préférences de IBus"
 
 #: ../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 +77,7 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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 +87,9 @@ msgstr "Méthode d'entrée précédente :"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 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 +127,17 @@ msgstr "Afficher le panneau de propriété :"
 msgid "Language panel position:"
 msgstr "Afficher la barre de langue :"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 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:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 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 +145,7 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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:"
@@ -183,8 +174,7 @@ msgstr "_Enlever"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -192,9 +182,7 @@ msgstr "_Monter"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -202,9 +190,7 @@ msgstr "_Descendre"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -227,21 +213,18 @@ msgid ""
 "<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>"
-msgstr ""
-"<small><i>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.</i></small>"
+msgstr "<small><i>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.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
@@ -249,7 +232,7 @@ msgstr "Utiliser la disposition clavier système (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Partager la même méthode d'entrée pour toutes les applications"
 
@@ -269,13 +252,7 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d'accueil : http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -285,7 +262,7 @@ msgstr "Démarrer IBus lors de la connexion"
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "À propos"
 
@@ -293,195 +270,211 @@ msgstr "À propos"
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Précharger les moteurs"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Précharger les moteurs au démarrage d'ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Ordre des moteurs"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 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
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; ne pas afficher la fenêtre et permuter avec le moteur précédent ou suivant."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Numéro de version enregistré"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 "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:11
+msgid "Latin layouts which have no ASCII"
 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
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Raccourci clavier déclencheur"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourci clavier déclencheur pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Activer les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 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:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Désactiver les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 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:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Raccourci clavier pour passer au moteur suivant"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Raccourci clavier pour revenir au moteur précédent"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 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:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Masquage automatique"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
-"Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher "
-"automatiquement, 2 = Toujours afficher"
+msgstr "Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher automatiquement, 2 = Toujours afficher"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Position de la barre"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Suivre le curseur d'insertion lorsque le panneau est toujours affiché"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
-"Si activé, le panneau suit le curseur d'insertion lorsque le panneau est "
-"toujours affiché. Sinon, le panneau est affiché à une position fixe."
+msgstr "Si activé, le panneau suit le curseur d'insertion lorsque le panneau est toujours affiché. Sinon, le panneau est affiché à une position fixe."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Millisecondes pour afficher le panneau de propriété"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
-"Millisecondes pour afficher le panneau de propriété après prise du focus ou "
-"changement des propriétés."
+msgstr "Millisecondes pour afficher le panneau de propriété après prise du focus ou changement des propriétés."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 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:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Afficher le nom de la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "Valeur RGBA de l'icône XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langue"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour le panneau de langue"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d'édition"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 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:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 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:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -489,9 +482,7 @@ msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 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"
@@ -554,200 +545,199 @@ msgstr "_Supprimer"
 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:256
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:398
 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:329
+#: ../setup/main.py:330
 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:350
+#: ../setup/main.py:351
 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:364
+#: ../setup/main.py:365
 #, 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:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Raccourci clavier pour %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "Changer de méthodes d'entrée"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion impossible à IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "Aucun moteur n'est configuré.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Lire le cache du registre système."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 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
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "Le cache du registre est invalide.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Enregistrer le cache du registre système."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Enregistrer le fichier FILE du cache du registre."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Définir ou obtenir le moteur"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Quitter ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Afficher les moteurs disponibles"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(Non développé)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Redémarrer ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Afficher le contenu du cache du registre"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Créer le cache du registre"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Afficher l'adresse D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Afficher cette information"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, 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:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s n'est pas une commande connue !\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Quitter"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ja.po b/po/ja.po
index 546c9c44b..d376c0d48 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,13 +11,13 @@
 # Makoto Mizukami <makoto@fedoraporject.org>, 2010
 # noriko <noriko@redhat.com>, 2013
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
-# 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>, 2012
+# carrotsoft <www.carrotsoft@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-26 14:33+0900\n"
-"PO-Revision-Date: 2014-02-28 03:56+0000\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 03:30+0000\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "ひとつ前の入力メソッド:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "入力メソッドをオンまたはオフするためのショートカットキー"
 
@@ -130,11 +130,11 @@ msgstr "プロパティーパネルを表示する:"
 msgid "Language panel position:"
 msgstr "言語パネルの位置"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "システムトレイにアイコンを表示する"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "言語バーに入力メソッド名を表示する"
 
@@ -223,11 +223,11 @@ msgstr "<small><i>アクティブなインプットメソッドは、キーボ
 msgid "Input Method"
 msgstr "入力メソッド"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
@@ -235,7 +235,7 @@ msgstr "システムのキーボード (XKB) レイアウトを使用する"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
@@ -265,7 +265,7 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "情報"
 
@@ -313,102 +313,120 @@ msgid ""
 msgstr "保存されているバージョン番号は、以前インストールした ibus のバージョンと現在の ibus のバージョンの違いをチェックする場合に使用されます。"
 
 #: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ASCII を持たないラテンレイアウト"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US レイアウトはラテンレイアウトに追加されます。variant は省略可能です。"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap を使用する"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+"ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば xmodmap を実行します。"
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "トリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のためのトリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "ショートカットキーを有効にする"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "入力メソッドをオンに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "ショートカットキーを無効にする"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "入力メソッドをオフに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "次のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "一覧内の次の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "前のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "一覧内のひとつ前の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "自動的に隠す"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "言語パネルの位置"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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:26
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "パネルが常に表示されている場合に入力カーソルに従う"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。false ならば、パネルは固定位置に表示されます。"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "プロパティーパネルを表示するミリ秒"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミリ秒。"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "検索テーブルの向き"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "検索テーブルの向きです。0 = 横、1 = 縦"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "入力メソッド名を表示する"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "XKB アイコンの RGBA 値"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -420,47 +438,47 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr "XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 からの色彩名、2. 書式 '#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、3. 書式 'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラーで、その 'r', 'g', 'b' は 0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 までの範囲内の浮動小数値のこと。"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -537,23 +555,23 @@ msgstr "キーもしくはキーの組み合わせを入力してください。
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:396
+#: ../setup/main.py:102 ../setup/main.py:398
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:330
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:351
 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"
@@ -562,158 +580,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
 #. Translators: Title of the window
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "エンジン名のみ表示"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus に接続できません。\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "エンジンが設定されていません。\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "システムレジストリーキャッシュを読み込みます。"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "レジストリーキャッシュは無効です。\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "システムレジストリーキャッシュを書き込みます。"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "初期化中…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "完了"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "設定値を表示する"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "設定値を初期化する"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "使い方: %s コマンド [オプション...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:454
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:782
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:786
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>\nMIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:807
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:817
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:821
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ko.po b/po/ko.po
index 2ea4c54d9..2bcaec5d0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,13 +8,13 @@
 # eukim <eukim@redhat.com>, 2009
 # eukim <eukim@redhat.com>, 2012
 # Hyunsok Oh <hoh@redhat.com>, 2010
-# Michelle Kim <mkim33@gmail.com>, 2012-2013
+# Michelle Kim <mkim33@gmail.com>, 2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 03:29+0000\n"
 "Last-Translator: Michelle Kim <mkim33@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "항상"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "IBus 환경 설정  "
+msgstr "IBus 환경 설정"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -87,7 +87,7 @@ msgstr "이전 입력 방식:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
@@ -105,7 +105,7 @@ msgstr "비활성화: "
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>단축키들</b>  "
+msgstr "<b>단축키</b>  "
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
@@ -127,11 +127,11 @@ msgstr ""
 msgid "Language panel position:"
 msgstr "언어 패널 위치:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "시스템 트레이에 아이콘 보여주기"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
 
@@ -220,11 +220,11 @@ msgstr ""
 msgid "Input Method"
 msgstr "입력 방식  "
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "시스템 키보드 레이아웃 사용  "
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 
@@ -232,7 +232,7 @@ msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>키보드 레이아웃</b>  "
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
@@ -262,7 +262,7 @@ msgstr "로그인 시 ibus 시작  "
 msgid "<b>Startup</b>"
 msgstr "<b>시작</b>  "
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "정보  "
 
@@ -270,176 +270,211 @@ msgstr "정보  "
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "엔진 미리로드"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus 시작 시 엔진 미리 로드  "
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "엔진 순서"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Saved engines order in input method list"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연 "
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; 밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "트리거 단축키"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse의 트리거 단축키 "
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "입력 방식 전환을 위한 단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "입력 방식 전환을 위한 단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "다음 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "이전 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "자동 숨기기"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "언어 패널 위치"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "검색 테이블의 방향  "
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용  "
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "편집전 텍스트 포함"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "입력기를 디폴트로 활성화"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf는 이름 접두사를 보존합니다 "
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 키 접두사는 이름 변환을 중지합니다 "
 
@@ -516,23 +551,23 @@ msgstr "키 또는 키 조합을 입력하십시오.\n키를 입력하면 대화
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "확인(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:398
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:330
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:351
 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"
@@ -541,157 +576,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "입력 방식 전환 중 "
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "엔진 이름만 나열 "
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus에 연결할 수 없습니다.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
-msgstr "언어: %s⏎\n"
+msgstr "언어: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "엔진이 설정되어 있지 않습니다.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon 종료"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr ""
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon 재시작"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "버전 보기"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "사용법: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "명령:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s는 알 수 없는 명령입니다!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus 업데이트"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space는 이제 기본 단축키입니다."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "재시작"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "끝내기"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index 6f5596a8f..e15db5340 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-26 14:33+0900\n"
-"PO-Revision-Date: 2014-02-28 14:35+0000\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 12:54+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Poprzednia metoda wprowadzania:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
 
@@ -123,11 +123,11 @@ msgstr "Wyświetlanie panelu właściwości:"
 msgid "Language panel position:"
 msgstr "Pozycja panelu języków:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Wyświetlanie ikony w obszarze powiadamiania"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
@@ -216,11 +216,11 @@ msgstr "<small><i>Aktywna metoda wprowadzania może być przełączana z wybrany
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Użycie systemowego układu klawiatury (XKB)"
 
@@ -228,7 +228,7 @@ msgstr "Użycie systemowego układu klawiatury (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
@@ -258,7 +258,7 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "O programie"
 
@@ -306,102 +306,119 @@ msgid ""
 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:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Układy łacińskie nie posiadające ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "Układ US jest dołączany do układów łacińskich. Można pominąć variant."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Użycie xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Wykonuje xmodmap, jeśli istnieje .xmodmap lub .Xmodmap, kiedy mechanizmy IBus są przełączane."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Klawisze skrótów przełącznika"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu dla gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Włącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Wyłącza skróty klawiszowe"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Klawisze skrótów następnego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:23
 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"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:25
 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"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Automatyczne ukrywanie"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Pozycja panela języków"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to panel jest wyświetlany w stałym położeniu."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Milisekundy do wyświetlenia panelu właściwości"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub właściwości."
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Wyświetlanie nazwy metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "Wartość RGBA ikony XKB"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -413,47 +430,47 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość szesnastkową w formie \"#rrggbb\", gdzie \"r\", \"g\" i \"b\" są cyframi szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB w formie \"rgb(r,g,b)\" lub 4. kolor RGBA w formie \"rgba(r,g,b,a)\", gdzie \"r\", \"g\" i \"b\" są liczbami całkowitymi w zakresie od 0 do 255 lub wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością zmiennoprzecinkową w zakresie od 0 do 1 alfy."
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Własna czcionka"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Nazwa własnej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność wprowadzania"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -530,23 +547,23 @@ msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy).\nOkno dialogowe z
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:396
+#: ../setup/main.py:102 ../setup/main.py:398
 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:329
+#: ../setup/main.py:330
 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:350
+#: ../setup/main.py:351
 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"
@@ -555,158 +572,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, 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:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Nie można połączyć z IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Odczytuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Zapisuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "Przywracanie…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "Gotowe"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "Wyświetla wartości konfiguracji"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "Przywraca wartości konfiguracji"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie: %s POLECENIE [OPCJA...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:454
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:782
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:786
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2014"
 
-#: ../ui/gtk3/panel.vala:807
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:817
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:821
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 61293d74c..565029eb5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,14 +7,15 @@
 # Arthur Rodrigues Araruna <araruna@gmail.com>, 2012
 # Automatically generated, 2010
 # Glaucia Freitas <gcintra@redhat.com>, 2013
+# jonataszv <jonatas.zv@openmailbox.org>, 2014
 # Taylon Silmer <taylon@taylon.eti.br>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
-"Last-Translator: Glaucia Freitas <gcintra@redhat.com>\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 03:29+0000\n"
+"Last-Translator: jonataszv <jonatas.zv@openmailbox.org>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +53,11 @@ msgstr "Padrão"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Não mostrar"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Ocultar automaticamente"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -86,7 +87,7 @@ msgstr "Método de entrada anterior:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
@@ -120,17 +121,17 @@ msgstr "Configure o comportamento do ibus para como demonstrar ou ocultar a barr
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Mostrar painel de propriedades:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posição do Painel de Linguagem:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Apresenta o nome do método de entrada na barra de linguagem"
 
@@ -219,11 +220,11 @@ msgstr ""
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
@@ -231,7 +232,7 @@ msgstr "Usa o desenho do teclado do sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
@@ -261,7 +262,7 @@ msgstr "Inicie o ibus na conexão "
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Sobre"
 
@@ -269,176 +270,211 @@ msgstr "Sobre"
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Mecanismos de carregamento"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Ordem dos Motores"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Ordem dos motores salvas na lista de método de entrada"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Popup atrasou milisegundos para a janela de alterador IME"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Atrasa milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "Número da versão salvo"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Realiza o trigger nas teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Desencadeia chaves de atalho para o "
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Habilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "As teclas de atalho para ligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Desabilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "As teclas de atalho para desligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Próximo mecanismo de teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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 "
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Visualização do mecanismo das teclas de atalho "
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Ocultar Automaticamente"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "Comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar automaticamente,  2 = Sempre mostrar"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Posição do Painel de Linguagem"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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 "
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientação da tabela de pesquisa"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Apresenta o nome do método de entrada"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Usa o nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Fonte padrão"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 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"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -515,23 +551,23 @@ msgstr "Por favor pressione uma tecla (ou uma combinação de tecla).\nO diálog
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../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"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:330
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:351
 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"
@@ -540,157 +576,168 @@ msgid ""
 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"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:365
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "mudando métodos de entrada"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Somente o Nome do motor da lista"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Não foi possível conectar ao IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "Nenhum motor configurado.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Configurar motor global falhou.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Obter motor global falhour.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Não implementado)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Reiniciar ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
-msgstr ""
+msgstr "Mostrar versão"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Mostrar conteúdo de cachê do registro"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
-msgid "Show this information"
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
+msgid "Show this information"
+msgstr "Mostrar essa informação"
+
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Sair"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/uk.po b/po/uk.po
index b6b163d18..6dd649294 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-26 14:33+0900\n"
-"PO-Revision-Date: 2014-02-28 14:28+0000\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 04:11+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgstr "Попередній спосіб введення:"
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання способів введення"
 
@@ -124,11 +124,11 @@ msgstr "Показ панелі властивостей:"
 msgid "Language panel position:"
 msgstr "Розташування мовної панелі:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Показувати піктограму у системному лотку"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Показувати назву способу введення на мовній панелі"
 
@@ -217,11 +217,11 @@ msgstr "<small><i>Активний спосіб введення можна пе
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
@@ -229,7 +229,7 @@ msgstr "Використовувати розкладку клавіатури 
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
@@ -259,7 +259,7 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Інформація"
 
@@ -307,102 +307,119 @@ msgid ""
 msgstr "Збережений номер версії буде використано для визначення відмінностей між попередньою встановленою версією ibus та поточною версією ibus."
 
 #: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Розкладки латиниці, у яких немає символів ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "Американська розкладка додається до латинських розкладок, варіант можна пропустити."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Використовувати xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Запускати xmodmap, якщо є .xmodmap або .Xmodmap під час перемикання рушіїв ibus."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Клавіатурні скорочення-перемикачі"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Комбінації клавіш для перемикання gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Увімкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Клавіатурне скорочення для вмикання способів введення"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Вимкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Клавіатурне скорочення для вимикання способів введення"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Скорочення для наступного рушія"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Скорочення для попереднього рушія"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Автоматично ховати"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 = завжди показувати"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Розташування мовної панелі"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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:26
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Слідувати за курсором введення, якщо панель показано завжди"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Якщо має значення «true», панель слідуватиме за курсором введення, якщо панель працює у режимі безумовного показу. Якщо має значення «false», панель буде показано у фіксованій позиції."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Тривалість показу панелі властивостей у мілісекундах"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Тривалість показу панелі властивостей (у мілісекундах) після фокусування або зміни властивостей."
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Орієнтація таблиці пошуку"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Показувати назву способу введення"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "Значення RGBA для піктограми XKB"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -414,47 +431,47 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr "На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде використано вказане значення RGBA. Значенням RGBA може бути: 1. назва кольору у X11, 2. шістнадцяткове число у форматі «#ччззсс», де «ч», «з», «с» є цифрами для червоного, зеленого та синього кольорів, 3. колір RGB у форматі «rgb(ч,з,с)» або 4. колір RGBA у форматі «rgba(ч,з,с,п)», де «ч», «з», «с» є або цілими значеннями у діапазоні від 0 до 255, або відсотковими значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для прозорості у діапазоні від 0 до 1."
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -531,23 +548,23 @@ msgstr "Будь ласка, натисніть клавішу (або комб
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../setup/main.py:102 ../setup/main.py:396
+#: ../setup/main.py:102 ../setup/main.py:398
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:330
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:351
 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"
@@ -556,158 +573,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:378
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Показати лише список рушіїв"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Не вдалося встановити зв’язок з IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "мова: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "Рушій не встановлено.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Читати дані з загальносистемного кешу регістру."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "Читати дані з кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "Кеш регістру є некоректним.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Записати дані до загальносистемного кешу регістру."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "Скидаємо…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "Виконано"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "Показати значення налаштувань"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "Скинути значення налаштувань до початкових"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:454
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:782
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:786
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:807
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:817
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:821
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b749cf758..b0cd13edd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,14 +5,14 @@
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012,2014
-# Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009
+# Ding-Yi Chen <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:50+0000\n"
+"POT-Creation-Date: 2014-07-08 12:15+0900\n"
+"PO-Revision-Date: 2014-07-08 14:02+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr "上一個輸入法："
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "用來開啟或關閉輸入法的快捷鍵"
 
@@ -125,11 +125,11 @@ msgstr "顯示屬性面板："
 msgid "Language panel position:"
 msgstr "語言面板位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系統匣顯示圖示"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "在語言列顯示輸入法名稱"
 
@@ -218,11 +218,11 @@ msgstr "<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
@@ -230,7 +230,7 @@ msgstr "使用系統鍵盤 (XKB) 配置"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
@@ -260,7 +260,7 @@ msgstr "在登入時啟動 iBus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "關於"
 
@@ -268,176 +268,211 @@ msgstr "關於"
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "預先載入引擎"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "當 iBus 啟動時預先載入引擎"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "引擎順序"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "輸入法清單中儲存的引擎順序"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 切換器視窗彈出延遲的毫秒數"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接往前/往後切換引擎。"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "儲存的版本號碼"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 版本之間的差異。"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "無 ASCII 之拉丁鍵盤配置"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US 鍵盤配置附加到拉丁鍵盤配置。variant 可以省略。"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "使用 xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "當 ibus 引擎切換之時，若 .xmodmap 或 .Xmodmap 存在的話，則執行 xmodmap。 "
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "觸發用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse 的觸發快捷鍵"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "啟用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "開啟輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "停用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "關閉輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "「下一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "「上一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "自動隱藏"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "屬性面板的行為。0 = 不要顯示，1 = 自動隱藏，2 = 總是顯示"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "語言面板位置"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "在面板總是顯示的情況下跟隨輸入游標"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "若為真，則面板會在總是顯示的情況下跟隨輸入游標。若為假，則面板會顯示在固定位置上。"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "顯示屬性面板的毫秒數"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "當焦點落在屬性面板內，或屬性變更時屬性面板的顯示毫秒數。"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB 圖示的 RGBA 值"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2.「#rrggbb」格式的十六進位值，其中 r、g、b 分別是紅色、綠色與藍色，3. 「rgb(r,g,b)」格式的 RGB 色彩，4.「rgba(r,g,b,a)」格式的 RGBA 採，其中的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a 則是 0 至 1 之間的浮點 alpha 值。"
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -514,23 +549,23 @@ msgstr "請按鍵盤按鍵 (或是按鍵組合)\n當您放開按鍵時，對話
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:102 ../setup/main.py:398
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:330
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:351
 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"
@@ -539,157 +574,168 @@ msgid ""
 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:364
+#: ../setup/main.py:365
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:377
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "切換輸入法"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "無法連接 IBus。\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "寫入註冊快取 FILE。"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "重設中…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "完成"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "設定引擎或取得引擎"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(尚未實作)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "顯示版本"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "建立註冊快取"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "顯示組態值"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "重設組態值"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "顯示此資訊"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "指令：\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:366
 msgid "default:LTR"
 msgstr "default:LTR"

From 130d3108902ed3e7c61930e3a24ee957c3d3e658 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 17 Jul 2014 12:41:36 +0900
Subject: [PATCH 263/816] Fix deprecated gtk3 GtkMisc, GtkAlignment and vala
 Gdk.X11Display

gtk 3.13.4 warns GtkMisc and GtkAlignment
vala 0.24 warns Gdk.X11Display

https://git.gnome.org/browse/gtk+/commit/?id=ec0a60a248
https://git.gnome.org/browse/gtk+/commit/?id=04703689b8
https://git.gnome.org/browse/vala/commit/?id=b65e3dc87c

TEST=make ui/gtk3

Review URL: https://codereview.appspot.com/114820044
---
 ui/gtk3/candidatearea.vala     | 17 +++++++++++------
 ui/gtk3/candidatepanel.vala    |  8 ++++++--
 ui/gtk3/keybindingmanager.vala | 14 ++++++++++++++
 ui/gtk3/propertypanel.vala     |  7 ++++++-
 ui/gtk3/switcher.vala          | 19 +++++++++++--------
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index b9f500cfc..f3f60edbf 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -180,17 +180,20 @@ class CandidateArea : Gtk.Box {
             m_widgets = {};
             for (int i = 0; i < 16; i++) {
                 Gtk.Label label = new Gtk.Label(LABELS[i]);
-                label.set_alignment(0.0f, 0.5f);
+                label.set_halign(Gtk.Align.START);
+                label.set_valign(Gtk.Align.CENTER);
                 label.show();
                 m_labels += label;
 
                 Gtk.Label candidate = new Gtk.Label("test");
-                candidate.set_alignment(0.0f, 0.5f);
+                candidate.set_halign(Gtk.Align.START);
+                candidate.set_valign(Gtk.Align.CENTER);
                 candidate.show();
                 m_candidates += candidate;
 
-                label.set_property("xpad", 8);
-                candidate.set_property("xpad", 8);
+                /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
+                label.set_padding(8, 0);
+                candidate.set_padding(8, 0);
 
                 // Make a copy of i to workaround a bug in vala.
                 // https://bugzilla.gnome.org/show_bug.cgi?id=628336
@@ -224,12 +227,14 @@ class CandidateArea : Gtk.Box {
             m_widgets = {};
             for (int i = 0; i < 16; i++) {
                 Gtk.Label label = new Gtk.Label(LABELS[i]);
-                label.set_alignment(0.0f, 0.5f);
+                label.set_halign(Gtk.Align.START);
+                label.set_valign(Gtk.Align.CENTER);
                 label.show();
                 m_labels += label;
 
                 Gtk.Label candidate = new Gtk.Label("test");
-                candidate.set_alignment(0.0f, 0.5f);
+                candidate.set_halign(Gtk.Align.START);
+                candidate.set_valign(Gtk.Align.CENTER);
                 candidate.show();
                 m_candidates += candidate;
 
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index db2d5aa79..1440b2b3e 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -212,13 +212,17 @@ public class CandidatePanel : Gtk.Box{
     private void create_ui() {
         m_preedit_label = new Gtk.Label(null);
         m_preedit_label.set_size_request(20, -1);
-        m_preedit_label.set_alignment(0.0f, 0.5f);
+        m_preedit_label.set_halign(Gtk.Align.START);
+        m_preedit_label.set_valign(Gtk.Align.CENTER);
+        /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
         m_preedit_label.set_padding(8, 0);
         m_preedit_label.set_no_show_all(true);
 
         m_aux_label = new Gtk.Label(null);
         m_aux_label.set_size_request(20, -1);
-        m_aux_label.set_alignment(0.0f, 0.5f);
+        m_aux_label.set_halign(Gtk.Align.START);
+        m_aux_label.set_valign(Gtk.Align.CENTER);
+        /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
         m_aux_label.set_padding(8, 0);
         m_aux_label.set_no_show_all(true);
 
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 4f5f0da44..c5eccc867 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -74,7 +74,11 @@ public class KeybindingManager : GLib.Object {
     public bool bind(uint keysym,
                      Gdk.ModifierType modifiers,
                      KeybindingHandlerFunc handler) {
+#if VALA_0_24
+        unowned X.Display display = Gdk.X11.get_default_xdisplay();
+#else
         unowned X.Display display = Gdk.x11_get_default_xdisplay();
+#endif
 
         int keycode = display.keysym_to_keycode(keysym);
 
@@ -240,7 +244,12 @@ public class KeybindingManager : GLib.Object {
     }
 
     bool grab_keycode(Gdk.Display display, uint keyval, uint modifiers) {
+#if VALA_0_24
+        unowned X.Display xdisplay =
+                (display as Gdk.X11.Display).get_xdisplay();
+#else
         unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
+#endif
         int keycode = xdisplay.keysym_to_keycode(keyval);
         if (keycode == 0) {
             warning("Can not convert keyval=%u to keycode!", keyval);
@@ -268,7 +277,12 @@ public class KeybindingManager : GLib.Object {
     }
 
     bool ungrab_keycode(Gdk.Display display, uint keyval, uint modifiers) {
+#if VALA_0_24
+        unowned X.Display xdisplay =
+                (display as Gdk.X11.Display).get_xdisplay();
+#else
         unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
+#endif
         int keycode = xdisplay.keysym_to_keycode(keyval);
         if (keycode == 0) {
             warning("Can not convert keyval=%u to keycode!", keyval);
diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 9ae92fb6a..6c023bf8a 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -323,9 +323,14 @@ public class PropertyPanel : Gtk.Box {
         int ws_num = 0;
 
         unowned Gdk.Display display = root.get_display();
+#if VALA_0_24
+        unowned X.Display xdisplay =
+                (display as Gdk.X11.Display).get_xdisplay();
+        X.Window xwindow = (root as Gdk.X11.Window).get_xid();
+#else
         unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
         X.Window xwindow = Gdk.X11Window.get_xid(root);
-
+#endif
         X.Atom _net_current_desktop =
                 xdisplay.intern_atom("_NET_CURRENT_DESKTOP", false);
         X.Atom type = X.None;
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index e6e916612..7601d8040 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -29,19 +29,20 @@ class Switcher : Gtk.Window {
 
             this.longname = engine.get_longname();
 
-            Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
-            add(align);
-
             var name = engine.get_name();
 
             if (name.length < 4 || name[0:4] != "xkb:") {
                 IconWidget icon = new IconWidget(engine.get_icon(),
                                                  Gtk.IconSize.DIALOG);
-                align.add(icon);
+                icon.set_halign(Gtk.Align.CENTER);
+                icon.set_valign(Gtk.Align.CENTER);
+                add(icon);
             } else {
                 var symbol = switcher.get_xkb_symbol(engine);
 
                 Gtk.Label label = new Gtk.Label(symbol);
+                label.set_halign(Gtk.Align.CENTER);
+                label.set_valign(Gtk.Align.CENTER);
                 string symbol_font = "Monospace Bold 16";
                 string markup = "<span font=\"%s\">%s</span>".
                         printf(symbol_font, symbol);
@@ -54,7 +55,7 @@ class Switcher : Gtk.Window {
                                      out fixed_height);
                 label.set_size_request(fixed_width, fixed_height);
 
-                align.add(label);
+                add(label);
             }
         }
 
@@ -104,10 +105,10 @@ class Switcher : Gtk.Window {
         );
         Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(vbox);
-        Gtk.Alignment align = new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f);
-        vbox.pack_start(align, true, true, 0);
         m_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-        align.add(m_box);
+        m_box.set_halign(Gtk.Align.CENTER);
+        m_box.set_valign(Gtk.Align.CENTER);
+        vbox.pack_start(m_box, true, true, 0);
         m_label = new Gtk.Label("");
 
         /* Set the accessible role of the label to a status bar so it
@@ -117,6 +118,8 @@ class Switcher : Gtk.Window {
         Atk.Object obj = m_label.get_accessible();
         obj.set_role (Atk.Role.STATUSBAR);
 
+        /* Use Gtk.Widget.set_margin_start() and
+         * Gtk.Widget.set_margin_top() since gtk 3.12 */
         m_label.set_padding(3, 3);
         vbox.pack_end(m_label, false, false, 0);
 

From 3e6178c04869cceba3e5d681c9827ab54098f3b4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 18 Jul 2014 13:00:50 +0900
Subject: [PATCH 264/816] Enhance UI to add engines on ibus-setup

BUG=rhbz#803583
TEST=setup

Review URL: https://codereview.appspot.com/118830043
---
 po/POTFILES.in          |   1 +
 setup/Makefile.am       |   5 +-
 setup/enginedialog.py   | 365 ++++++++++++++++++++++++++++++++++++++++
 setup/enginetreeview.py |  12 +-
 setup/main.py           |  30 +++-
 5 files changed, 399 insertions(+), 14 deletions(-)
 create mode 100644 setup/enginedialog.py

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1c2ab0be9..d760cf5c3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,6 +33,7 @@ ibus/property.py
 ibus/utility.py
 setup/engineabout.py
 setup/enginecombobox.py
+setup/enginedialog.py
 setup/enginetreeview.py
 setup/ibus-setup.desktop.in
 setup/keyboardshortcut.py
diff --git a/setup/Makefile.am b/setup/Makefile.am
index b8b3d457c..2d822d2ad 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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,7 @@ ibussetup_PYTHON = \
 	i18n.py \
 	icon.py \
 	enginecombobox.py \
+	enginedialog.py \
 	enginetreeview.py \
 	engineabout.py \
 	keyboardshortcut.py \
diff --git a/setup/enginedialog.py b/setup/enginedialog.py
new file mode 100644
index 000000000..f7259c2cd
--- /dev/null
+++ b/setup/enginedialog.py
@@ -0,0 +1,365 @@
+# vim:set et sts=4 sw=4:
+# -*- coding: utf-8 -*-
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2013-2014 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+# This file is ported from
+# gnome-control-center/panels/region/cc-input-chooser.c
+
+from gi.repository import Gtk
+from gi.repository import GLib
+from gi.repository import IBus
+
+import functools
+import gettext
+import locale
+
+from icon import load_icon
+from i18n import _, N_
+
+ROW_TRAVEL_DIRECTION_NONE,      \
+ROW_TRAVEL_DIRECTION_FORWARD,   \
+ROW_TRAVEL_DIRECTION_BACKWARD = list(range(3))
+
+class EngineDialog(Gtk.Dialog):
+    __gtype_name__ = 'EngineDialog'
+    __initial_languages = [ IBus.get_language_name('en_US'),
+                            IBus.get_language_name('en_GB'),
+                            IBus.get_language_name('de_DE'),
+                            IBus.get_language_name('fr_FR'),
+                            IBus.get_language_name('es_ES'),
+                            IBus.get_language_name('zh_CN'),
+                            IBus.get_language_name('ja_JP'),
+                            IBus.get_language_name('ru_RU'),
+                            IBus.get_language_name('ar_EG') ]
+
+
+    def __init__(self, transient_for = None):
+        super(EngineDialog, self).__init__(
+                title = _("Select an input method"),
+                transient_for = transient_for,
+                resizable = True)
+        buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
+                   _("_Add"), Gtk.ResponseType.APPLY)
+        self.add_buttons(*buttons)
+        self.set_response_sensitive(Gtk.ResponseType.APPLY, False)
+
+        self.__engines_for_lang = {}
+        self.__untrans_for_lang = {}
+        self.__langs = {}
+
+        self.__scrolled = Gtk.ScrolledWindow(
+                hscrollbar_policy = Gtk.PolicyType.NEVER,
+                vscrollbar_policy = Gtk.PolicyType.NEVER,
+                shadow_type = Gtk.ShadowType.IN,
+                margin_left = 6,
+                margin_right = 6,
+                margin_top = 6,
+                margin_bottom = 6)
+        self.vbox.add(self.__scrolled)
+        viewport = Gtk.Viewport()
+        self.__scrolled.add(viewport)
+        self.__list = Gtk.ListBox(vexpand = True,
+                                  halign = Gtk.Align.FILL,
+                                  valign = Gtk.Align.FILL)
+        viewport.add(self.__list)
+
+        self.__adjustment = self.__scrolled.get_vadjustment()
+        self.__list.set_adjustment(self.__adjustment)
+        self.__list.set_filter_func(self.__list_filter, None)
+        self.__list.connect('row-activated', self.__row_activated)
+        self.__list.connect('row-selected', self.__row_selected)
+
+        self.__showing_extra = False
+        self.__more_row = self.__more_row_new()
+
+        self.__filter_timeout_id = 0
+        self.__filter_word = None
+        self.__filter_entry = Gtk.SearchEntry(hexpand = True,
+                                              margin_left = 6,
+                                              margin_right = 6,
+                                              margin_top = 6,
+                                              margin_bottom = 6)
+        self.__filter_entry.set_no_show_all(True)
+        self.__filter_entry.connect('search-changed', self.__filter_changed)
+        self.vbox.add(self.__filter_entry)
+
+        self.show_all()
+
+
+    def __list_filter(self, row, data):
+        if row == self.__more_row:
+            return not self.__showing_extra
+        if not self.__showing_extra and row.is_extra:
+            return False
+        if self.__filter_word == None:
+            return True
+
+        name = row.name.lower()
+        untrans = row.untrans.lower()
+        if self.__filter_word != None:
+            word = self.__filter_word.lower()
+            if name.startswith(word):
+                return True
+            if untrans.startswith(word):
+                return True
+        return False
+
+
+    def __row_activated(self, box, row):
+        if row == self.__more_row:
+            self.__show_more()
+            return
+        if row.back:
+            self.__filter_entry.set_text('')
+            self.__show_lang_rows()
+            return
+        if row.lang_info:
+            self.__filter_entry.set_text('')
+            self.__show_engines_for_lang(row)
+            return
+
+
+    def __row_selected(self, box, row):
+        self.set_response_sensitive(Gtk.ResponseType.APPLY, row != None)
+
+
+    def __padded_label_new(self, text, icon, alignment, direction):
+        hbox = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL)
+
+        if direction == ROW_TRAVEL_DIRECTION_BACKWARD:
+            rtl = (Gtk.Widget.get_default_direction() == \
+                   Gtk.TextDirection.RTL)
+            if rtl:
+                arrow = Gtk.Image.new_from_icon_name(
+                    'go-previous-rtl-symbolic', Gtk.IconSize.MENU)
+            else:
+                arrow = Gtk.Image.new_from_icon_name(
+                    'go-previous-symbolic', Gtk.IconSize.MENU)
+            hbox.pack_start(arrow, False, True, 0)
+
+        if icon != None:
+            pixbuf = load_icon(icon, Gtk.IconSize.LARGE_TOOLBAR)
+            image = Gtk.Image(pixbuf = pixbuf)
+            hbox.pack_start(image, False, True, 0)
+
+        label = Gtk.Label(label = text)
+        label.set_halign(alignment)
+        label.set_valign(Gtk.Align.CENTER)
+        label.set_margin_left(20)
+        label.set_margin_right(20)
+        label.set_margin_top(6)
+        label.set_margin_bottom(6)
+        hbox.pack_start(label, True, True, 0)
+        return hbox
+
+
+    def __list_box_row_new(self, text):
+        row = Gtk.ListBoxRow()
+        row.name = text
+        row.is_extra = False
+        row.lang_info = False
+        row.back = False
+        row.untrans = ''
+        row.engine = None
+        return row
+
+
+    def __lang_row_new(self, text):
+        row = self.__list_box_row_new(text)
+        row.lang_info = True
+        row.untrans = self.__untrans_for_lang[text]
+        if not self.__showing_extra and text not in self.__initial_languages:
+            row.is_extra = True
+        widget = self.__padded_label_new(text,
+                                         None,
+                                         Gtk.Align.CENTER,
+                                         ROW_TRAVEL_DIRECTION_NONE)
+        row.add(widget)
+        return row
+
+
+    def __more_row_new(self):
+        row = Gtk.ListBoxRow()
+        hbox = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL)
+        row.add(hbox)
+        row.set_tooltip_text(_("More…"))
+        arrow = Gtk.Image.new_from_icon_name('view-more-symbolic',
+                                             Gtk.IconSize.MENU)
+        arrow.set_margin_left(20)
+        arrow.set_margin_right(20)
+        arrow.set_margin_top(6)
+        arrow.set_margin_bottom(6)
+        arrow.set_halign(Gtk.Align.CENTER)
+        arrow.set_valign(Gtk.Align.CENTER)
+        hbox.pack_start(arrow, True, True, 0)
+        return row
+
+
+    def __back_row_new(self, text):
+        row = self.__list_box_row_new(text)
+        row.lang_info = True
+        row.back = True
+        widget = self.__padded_label_new(text,
+                                         None,
+                                         Gtk.Align.CENTER,
+                                         ROW_TRAVEL_DIRECTION_BACKWARD)
+        row.add(widget)
+        return row
+
+
+    def __engine_row_new(self, engine):
+        row = self.__list_box_row_new(engine.get_longname())
+        row.set_tooltip_text(engine.get_description())
+        row.engine = engine
+        widget = self.__padded_label_new(engine.get_longname(),
+                                         engine.get_icon(),
+                                         Gtk.Align.START,
+                                         ROW_TRAVEL_DIRECTION_NONE)
+        row.add(widget)
+        return row
+
+
+    def __set_fixed_size(self):
+        if self.__scrolled.get_policy()[0] == Gtk.PolicyType.AUTOMATIC:
+            return
+        (width, height) = self.get_size()
+        self.set_size_request(width, height)
+        self.__scrolled.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                   Gtk.PolicyType.AUTOMATIC)
+
+
+    def __remove_all_children(self):
+        for l in self.__list.get_children():
+            self.__list.remove(l)
+
+
+    def __add_engine_rows_for_lang(self, row):
+        lang = row.name
+
+        def cmp_engine(a, b):
+            if a.get_rank() == b.get_rank():
+                return locale.strcoll(a.get_longname(), b.get_longname())
+            return int(b.get_rank() - a.get_rank())
+
+        self.__engines_for_lang[lang].sort(
+                key = functools.cmp_to_key(cmp_engine))
+        for e in self.__engines_for_lang[lang]:
+            row = self.__engine_row_new(e)
+            self.__list.add(row)
+
+
+    def __show_lang_rows(self):
+        self.__remove_all_children()
+        for lang in self.__langs:
+            row = self.__lang_row_new(lang)
+            self.__list.add(row)
+        self.__list.add(self.__more_row)
+        self.__list.show_all()
+        self.__adjustment.set_value(self.__adjustment.get_lower())
+        self.__list.invalidate_filter()
+        self.__list.set_selection_mode(Gtk.SelectionMode.SINGLE)
+
+
+    def __show_more(self):
+        self.__set_fixed_size()
+        self.__filter_entry.show()
+        self.__showing_extra = True
+        self.__list.invalidate_filter()
+
+
+    def __show_engines_for_lang(self, row):
+        text = row.name
+        self.__set_fixed_size()
+        self.__remove_all_children()
+        row = self.__back_row_new(text)
+        self.__list.add(row)
+        self.__add_engine_rows_for_lang(row)
+        self.__list.show_all()
+
+
+    def __do_filter(self):
+        text = self.__filter_entry.get_text()
+        if text == '':
+            self.__filter_word = None
+        else:
+            self.__filter_word = text
+        self.__list.invalidate_filter()
+        self.__filter_timeout_id = 0
+        return False
+
+
+    def __filter_changed(self, entry):
+        if self.__filter_timeout_id == 0:
+            self.__filter_timeout_id = GLib.timeout_add(150, self.__do_filter)
+
+
+    def set_engines(self, engines):
+        self.__engines_for_lang = {}
+        self.__untrans_for_lang = {}
+        for e in engines:
+            l = IBus.get_language_name(e.get_language())
+            if l == None:
+                l = ''
+            if l not in self.__engines_for_lang:
+                self.__engines_for_lang[l] = []
+            self.__engines_for_lang[l].append(e)
+
+            # Retrieve Untranslated language names.
+            backup_locale = locale.setlocale(locale.LC_ALL, None)
+            locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+            untrans = IBus.get_language_name(e.get_language())
+            locale.setlocale(locale.LC_ALL, backup_locale)
+            if untrans == None:
+                untrans = ''
+            self.__untrans_for_lang[l] = untrans
+
+        keys = list(self.__engines_for_lang.keys())
+        keys.sort(key=functools.cmp_to_key(locale.strcoll))
+        loc = locale.getlocale()[0]
+        # None on C locale
+        if loc == None:
+            loc = 'en_US'
+        current_lang = IBus.get_language_name(loc)
+        # move current language to the first place
+        if current_lang in keys:
+            keys.remove(current_lang)
+            keys.insert(0, current_lang)
+
+        # move English to the second place
+        en_lang = IBus.get_language_name('en_US')
+        if en_lang != current_lang and en_lang in keys:
+            keys.remove(en_lang)
+            keys.insert(1, en_lang)
+
+        #add 'Others' to the end of the combo box
+        if IBus.get_language_name('Other') in keys:
+            keys.remove(IBus.get_language_name('Other'))
+            keys += [IBus.get_language_name('Other')]
+
+        self.__langs = keys
+        self.__show_lang_rows()
+
+
+    def get_selected_engine(self):
+        row = self.__list.get_selected_row()
+        if row == None:
+            return None
+        return row.engine
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index afb23fcd9..75ff04b30 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -151,11 +151,7 @@ def __name_cell_data_cb(self, celllayout, renderer, model, it, data):
         language = IBus.get_language_name(engine.get_language())
         renderer.set_property("text",
                 "%s - %s" % (language, engine.get_longname()))
-        if self.__model.get_path(it).get_indices()[0] == 0:
-            # default engine
-            renderer.set_property("weight", Pango.Weight.BOLD)
-        else:
-            renderer.set_property("weight", Pango.Weight.NORMAL)
+        renderer.set_property("weight", Pango.Weight.NORMAL)
 
     def __layout_cell_data_cb(self, celllayout, renderer, model, it, data):
         engine = self.__model.get_value(it, 0)
@@ -164,11 +160,7 @@ def __layout_cell_data_cb(self, celllayout, renderer, model, it, data):
         if not layout:
             layout = engine.layout
         renderer.set_property("text", layout)
-        if self.__model.get_path(it).get_indices()[0] == 0:
-            #default engine
-            renderer.set_property("weight", Pango.Weight.BOLD)
-        else:
-            renderer.set_property("weight", Pango.Weight.NORMAL)
+        renderer.set_property("weight", Pango.Weight.NORMAL)
 
     def __engine_layout_changed_cb(self, combo, path, it):
         return
diff --git a/setup/main.py b/setup/main.py
index 9bd0af123..c1d5c55ac 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -42,6 +42,7 @@
 import keyboardshortcut
 import locale
 from enginecombobox import EngineComboBox
+from enginedialog import EngineDialog
 from enginetreeview import EngineTreeView
 from engineabout import EngineAbout
 from i18n import DOMAINNAME, _, N_, init as i18n_init
@@ -91,6 +92,9 @@ def __init__(self):
         self.__bus = None
         self.__init_bus()
 
+        # Gtk.ListBox has been available since gtk 3.10
+        self.__has_list_box = hasattr(Gtk, 'ListBox')
+
         gtk_builder_file = path.join(path.dirname(__file__), "./setup.ui")
         self.__builder = Gtk.Builder()
         self.__builder.set_translation_domain(DOMAINNAME)
@@ -200,7 +204,11 @@ def __init_general(self):
         # init engine page
         self.__engines = self.__bus.list_engines()
         self.__combobox = self.__builder.get_object("combobox_engines")
-        self.__combobox.set_engines(self.__engines)
+        if self.__has_list_box:
+            self.__combobox.set_no_show_all(True)
+            self.__combobox.hide()
+        else:
+            self.__combobox.set_engines(self.__engines)
 
         tmp_dict = {}
         for e in self.__engines:
@@ -212,7 +220,11 @@ def __init_general(self):
         self.__treeview.set_engines(engines)
 
         button = self.__builder.get_object("button_engine_add")
-        button.connect("clicked", self.__button_engine_add_cb)
+        if self.__has_list_box:
+            button.set_sensitive(True)
+            button.connect("clicked", self.__button_engine_add_cb)
+        else:
+            button.connect("clicked", self.__button_engine_add_cb_deprecate)
         button = self.__builder.get_object("button_engine_remove")
         button.connect("clicked", lambda *args:self.__treeview.remove_engine())
         button = self.__builder.get_object("button_engine_up")
@@ -306,6 +318,20 @@ def __treeview_notify_cb(self, treeview, prop):
             self.__settings_general.set_strv('preload-engines', engine_names)
 
     def __button_engine_add_cb(self, button):
+        dialog = EngineDialog(transient_for = self.__window)
+        dialog.set_engines(self.__engines)
+        id = dialog.run()
+
+        if id != Gtk.ResponseType.APPLY:
+            dialog.destroy()
+            return
+
+        engine = dialog.get_selected_engine()
+        dialog.destroy()
+
+        self.__treeview.append_engine(engine)
+
+    def __button_engine_add_cb_deprecate(self, button):
         engine = self.__combobox.get_active_engine()
         self.__treeview.append_engine(engine)
 

From 54e01d4343766467269e0d0cb8b6f208bbb35c4c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 24 Jul 2014 12:58:50 +0900
Subject: [PATCH 265/816] Update translations.

Update ja.po

Review URL: https://codereview.appspot.com/118890043
---
 po/ja.po | 67 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d376c0d48..20fae7c2a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 03:30+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-07-18 04:14+0000\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -163,7 +163,8 @@ msgid "General"
 msgstr "一般"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -265,11 +266,11 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "情報"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -327,8 +328,7 @@ msgstr "xmodmap を使用する"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
-"ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば xmodmap を実行します。"
+msgstr "ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば xmodmap を実行します。"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -492,29 +492,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "その他"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "キーボードレイアウト: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "説明:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "入力メソッドの選択"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "さらに…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -523,55 +532,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus を設定します"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "キーコード:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "修飾キー:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "適用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:330
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:351
+#: ../setup/main.py:389
 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"
@@ -580,18 +585,18 @@ msgid ""
 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:365
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
@@ -742,6 +747,6 @@ msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"

From 78dfe648c736d62921c77f2de931898762409b0e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 24 Jul 2014 13:00:40 +0900
Subject: [PATCH 266/816] Release 1.5.8

Review URL: https://codereview.appspot.com/113280043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 64ad250f7..7774be10e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [7])
+m4_define([ibus_micro_version], [8])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 2e8de03a949bf1a7dabe8217d42017bf75685b1a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 7 Aug 2014 11:45:00 +0900
Subject: [PATCH 267/816] Enable preedit color on external preedit window with
 x11 applications.

BUG=http://code.google.com/p/ibus/issues/detail?id=1731
TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/119480043
---
 ui/gtk3/candidatepanel.vala | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 1440b2b3e..1b7bec7ce 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -110,6 +110,25 @@ public class CandidatePanel : Gtk.Box{
         m_candidate_area.set_labels(labels);
     }
 
+    private void set_attributes(Gtk.Label label, IBus.Text text) {
+        Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(text);
+
+        Gtk.StyleContext context = label.get_style_context();
+        Gdk.RGBA color;
+
+        if (context.lookup_color("placeholder_text_color", out color)) {
+            Pango.Attribute pango_attr = Pango.attr_foreground_new(
+                        (uint16)(color.red * uint16.MAX),
+                        (uint16)(color.green * uint16.MAX),
+                        (uint16)(color.blue * uint16.MAX));
+            pango_attr.start_index = 0;
+            pango_attr.end_index = label.get_text().length;
+            attrs.insert((owned)pango_attr);
+        }
+
+        label.set_attributes(attrs);
+    }
+
     public void set_preedit_text(IBus.Text? text, uint cursor) {
         if (text != null) {
             var str = text.get_text();
@@ -117,6 +136,7 @@ public class CandidatePanel : Gtk.Box{
             if (str.length > 0) {
                 m_preedit_label.set_text(str);
                 m_preedit_label.show();
+                set_attributes(m_preedit_label, text);
             } else {
                 m_preedit_label.set_text("");
                 m_preedit_label.hide();

From a78c0b8cb379a0799b1a28450af8ee9d07016709 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 3 Sep 2014 14:09:33 +0900
Subject: [PATCH 268/816] Do not fail ibus-setup when en_US.UTF-8 is not
 installed.

BUG=https://code.google.com/p/ibus/issues/detail?id=1740
TEST=setup

Review URL: https://codereview.appspot.com/136080043
---
 setup/enginedialog.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index f7259c2cd..8a5690122 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -185,7 +185,8 @@ def __list_box_row_new(self, text):
     def __lang_row_new(self, text):
         row = self.__list_box_row_new(text)
         row.lang_info = True
-        row.untrans = self.__untrans_for_lang[text]
+        if len(self.__untrans_for_lang) != 0:
+            row.untrans = self.__untrans_for_lang[text]
         if not self.__showing_extra and text not in self.__initial_languages:
             row.is_extra = True
         widget = self.__padded_label_new(text,
@@ -324,12 +325,15 @@ def set_engines(self, engines):
 
             # Retrieve Untranslated language names.
             backup_locale = locale.setlocale(locale.LC_ALL, None)
-            locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-            untrans = IBus.get_language_name(e.get_language())
+            try:
+                locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+                untrans = IBus.get_language_name(e.get_language())
+                if untrans == None:
+                    untrans = ''
+                self.__untrans_for_lang[l] = untrans
+            except locale.Error:
+                pass
             locale.setlocale(locale.LC_ALL, backup_locale)
-            if untrans == None:
-                untrans = ''
-            self.__untrans_for_lang[l] = untrans
 
         keys = list(self.__engines_for_lang.keys())
         keys.sort(key=functools.cmp_to_key(locale.strcoll))

From 6dcb2dd20d2ee3abd6e26f2aac7666bfedf352df Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 8 Sep 2014 12:03:40 +0900
Subject: [PATCH 269/816] Fix compose keys in French layout bepo variant.

fr(bepo) sends dead_currency with Shift+AltGr+e and
ibus should send currency with dead_currency+dead_currency but
gtkimcontextsimpleseqs.h was not sorted in the descending order
and failed to get dead_currency.
Also need to add dead_stroke and dead_belowcomma for
AltGr+l and Shift+AltGr+Cedilla

BUG=https://code.google.com/p/ibus/issues/detail?id=1742
TEST=src/libibus.so

Review URL: https://codereview.appspot.com/135470043
---
 src/gtkimcontextsimpleseqs.h | 313 ++++++++++++++++++++---------------
 src/ibusenginesimple.c       |   8 +-
 2 files changed, 184 insertions(+), 137 deletions(-)

diff --git a/src/gtkimcontextsimpleseqs.h b/src/gtkimcontextsimpleseqs.h
index 4198a3a7d..632391a15 100644
--- a/src/gtkimcontextsimpleseqs.h
+++ b/src/gtkimcontextsimpleseqs.h
@@ -18,7 +18,7 @@
 /*
  * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896
  * using the input files
- *  Input   : http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre
+ *  Input   : http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre
  *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
  *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
  *
@@ -65,79 +65,36 @@
  */
 
 static const guint16 gtk_compose_seqs_compact[] = {
-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, 
-IBUS_KEY_B, 0x0243, 
-IBUS_KEY_C, 0x023B, 
-IBUS_KEY_D, 0x0110, 
-IBUS_KEY_E, 0x0246, 
-IBUS_KEY_G, 0x01E4, 
-IBUS_KEY_H, 0x0126, 
-IBUS_KEY_I, 0x0197, 
-IBUS_KEY_J, 0x0248, 
-IBUS_KEY_L, 0x0141, 
-IBUS_KEY_O, 0x00D8, 
-IBUS_KEY_P, 0x2C63, 
-IBUS_KEY_R, 0x024C, 
-IBUS_KEY_T, 0x0166, 
-IBUS_KEY_U, 0x0244, 
-IBUS_KEY_Y, 0x024E, 
-IBUS_KEY_Z, 0x01B5, 
-IBUS_KEY_a, 0x2C65, 
-IBUS_KEY_b, 0x0180, 
-IBUS_KEY_c, 0x023C, 
-IBUS_KEY_d, 0x0111, 
-IBUS_KEY_e, 0x0247, 
-IBUS_KEY_g, 0x01E5, 
-IBUS_KEY_h, 0x0127, 
-IBUS_KEY_i, 0x0268, 
-IBUS_KEY_j, 0x0249, 
-IBUS_KEY_l, 0x0142, 
-IBUS_KEY_o, 0x00F8, 
-IBUS_KEY_p, 0x1D7D, 
-IBUS_KEY_r, 0x024D, 
-IBUS_KEY_t, 0x0167, 
-IBUS_KEY_u, 0x0289, 
-IBUS_KEY_y, 0x024F, 
-IBUS_KEY_z, 0x01B6, 
-IBUS_KEY_nobreakspace, 0x0338, 
-IBUS_KEY_Oacute, 0x01FE, 
-IBUS_KEY_oacute, 0x01FF, 
-0x0237, 0x025F, 
-0x0269, 0x1D7C, 
-IBUS_KEY_dead_stroke, 0x002F, 
-IBUS_KEY_lessthanequal, 0x2270, 
-IBUS_KEY_greaterthanequal, 0x2271, 
-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_accentdieresis, 180, 184, 184, 184, 184, 
+IBUS_KEY_dead_grave, 184, 246, 333, 545, 545, 
+IBUS_KEY_dead_acute, 545, 609, 705, 981, 981, 
+IBUS_KEY_dead_circumflex, 981, 1105, 1105, 1305, 1305, 
+IBUS_KEY_dead_tilde, 1305, 1389, 1452, 1592, 1592, 
+IBUS_KEY_dead_macron, 1592, 1638, 1656, 1728, 1728, 
+IBUS_KEY_dead_breve, 1728, 1778, 1778, 1802, 1802, 
+IBUS_KEY_dead_abovedot, 1802, 1832, 1835, 1871, 1871, 
+IBUS_KEY_dead_diaeresis, 1871, 1959, 1971, 1995, 1995, 
+IBUS_KEY_dead_abovering, 1995, 2005, 2005, 2005, 2005, 
+IBUS_KEY_dead_doubleacute, 2005, 2015, 2015, 2015, 2015, 
+IBUS_KEY_dead_caron, 2015, 2057, 2057, 2065, 2065, 
+IBUS_KEY_dead_cedilla, 2065, 2077, 2083, 2083, 2083, 
+IBUS_KEY_dead_ogonek, 2083, 2093, 2093, 2093, 2093, 
+IBUS_KEY_dead_iota, 2093, 2115, 2214, 2646, 3306, 
+IBUS_KEY_dead_voiced_sound, 3306, 3352, 3352, 3352, 3352, 
+IBUS_KEY_dead_semivoiced_sound, 3352, 3362, 3362, 3362, 3362, 
+IBUS_KEY_dead_belowdot, 3362, 3378, 3378, 3394, 3394, 
+IBUS_KEY_dead_hook, 3394, 3472, 3475, 3531, 3531, 
+IBUS_KEY_dead_horn, 3531, 3541, 3541, 3541, 3541, 
+IBUS_KEY_dead_stroke, 3541, 3629, 3641, 3641, 3641, 
+IBUS_KEY_dead_psili, 3641, 3669, 3669, 3669, 3669, 
+IBUS_KEY_dead_dasia, 3669, 3701, 3701, 3701, 3701, 
+IBUS_KEY_dead_belowring, 3701, 3703, 3703, 3703, 3703, 
+IBUS_KEY_dead_belowtilde, 3703, 3705, 3705, 3705, 3705, 
+IBUS_KEY_dead_belowdiaeresis, 3705, 3705, 3708, 3708, 3708, 
+IBUS_KEY_dead_belowcomma, 3708, 3722, 3722, 3722, 3722, 
+IBUS_KEY_dead_currency, 3722, 3820, 3826, 3826, 3826, 
+IBUS_KEY_dead_greek, 3826, 3928, 3952, 3952, 3952, 
+IBUS_KEY_Multi_key, 3952, 3952, 10348, 14044, 15919, 
 IBUS_KEY_Greek_iota, 0x0390, 
 IBUS_KEY_Greek_upsilon, 0x03B0, 
 IBUS_KEY_space, 0x0060, 
@@ -285,11 +242,11 @@ IBUS_KEY_Greek_omicron, 0x03CC,
 IBUS_KEY_Greek_upsilon, 0x03CD, 
 IBUS_KEY_Greek_omega, 0x03CE, 
 IBUS_KEY_dead_acute, 0x00B4, 
-IBUS_KEY_dead_stroke, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_dead_stroke, IBUS_KEY_o, 0x01FF, 
 IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0x0385, 
 IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x0390, 
 IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x03B0, 
+IBUS_KEY_dead_stroke, IBUS_KEY_O, 0x01FE, 
+IBUS_KEY_dead_stroke, IBUS_KEY_o, 0x01FF, 
 IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
 IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
 IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2C, 
@@ -746,6 +703,7 @@ IBUS_KEY_dead_diaeresis, 0x00A8,
 IBUS_KEY_dead_acute, IBUS_KEY_space, 0x0385, 
 IBUS_KEY_dead_acute, IBUS_KEY_Greek_iota, 0x0390, 
 IBUS_KEY_dead_acute, IBUS_KEY_Greek_upsilon, 0x03B0, 
+IBUS_KEY_dead_belowdiaeresis, IBUS_KEY_equal, 0x2A77, 
 IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_U, 0x1E7A, 
 IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_u, 0x1E7B, 
 IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4E, 
@@ -791,6 +749,8 @@ IBUS_KEY_cent, 0x20B5,
 IBUS_KEY_Cacute, 0x1E08, 
 IBUS_KEY_cacute, 0x1E09, 
 IBUS_KEY_dead_cedilla, 0x00B8, 
+IBUS_KEY_dead_currency, IBUS_KEY_C, 0x20B5, 
+IBUS_KEY_dead_currency, IBUS_KEY_c, 0x20B5, 
 IBUS_KEY_space, 0x02DB, 
 IBUS_KEY_nobreakspace, 0x0328, 
 IBUS_KEY_Omacron, 0x01EC, 
@@ -1179,6 +1139,54 @@ IBUS_KEY_nobreakspace, 0x031B,
 IBUS_KEY_Utilde, 0x1EEE, 
 IBUS_KEY_utilde, 0x1EEF, 
 IBUS_KEY_dead_horn, 0x031B, 
+IBUS_KEY_space, 0x002F, 
+IBUS_KEY_2, 0x01BB, 
+IBUS_KEY_A, 0x023A, 
+IBUS_KEY_B, 0x0243, 
+IBUS_KEY_C, 0x023B, 
+IBUS_KEY_D, 0x0110, 
+IBUS_KEY_E, 0x0246, 
+IBUS_KEY_G, 0x01E4, 
+IBUS_KEY_H, 0x0126, 
+IBUS_KEY_I, 0x0197, 
+IBUS_KEY_J, 0x0248, 
+IBUS_KEY_L, 0x0141, 
+IBUS_KEY_O, 0x00D8, 
+IBUS_KEY_P, 0x2C63, 
+IBUS_KEY_R, 0x024C, 
+IBUS_KEY_T, 0x0166, 
+IBUS_KEY_U, 0x0244, 
+IBUS_KEY_Y, 0x024E, 
+IBUS_KEY_Z, 0x01B5, 
+IBUS_KEY_a, 0x2C65, 
+IBUS_KEY_b, 0x0180, 
+IBUS_KEY_c, 0x023C, 
+IBUS_KEY_d, 0x0111, 
+IBUS_KEY_e, 0x0247, 
+IBUS_KEY_g, 0x01E5, 
+IBUS_KEY_h, 0x0127, 
+IBUS_KEY_i, 0x0268, 
+IBUS_KEY_j, 0x0249, 
+IBUS_KEY_l, 0x0142, 
+IBUS_KEY_o, 0x00F8, 
+IBUS_KEY_p, 0x1D7D, 
+IBUS_KEY_r, 0x024D, 
+IBUS_KEY_t, 0x0167, 
+IBUS_KEY_u, 0x0289, 
+IBUS_KEY_y, 0x024F, 
+IBUS_KEY_z, 0x01B6, 
+IBUS_KEY_nobreakspace, 0x0338, 
+IBUS_KEY_Oacute, 0x01FE, 
+IBUS_KEY_oacute, 0x01FF, 
+0x0237, 0x025F, 
+0x0269, 0x1D7C, 
+IBUS_KEY_lessthanequal, 0x2270, 
+IBUS_KEY_greaterthanequal, 0x2271, 
+IBUS_KEY_dead_stroke, 0x002F, 
+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_ALPHA, 0x1F08, 
 IBUS_KEY_Greek_EPSILON, 0x1F18, 
 IBUS_KEY_Greek_ETA, 0x1F28, 
@@ -1209,6 +1217,67 @@ IBUS_KEY_Greek_omicron, 0x1F41,
 IBUS_KEY_Greek_rho, 0x1FE5, 
 IBUS_KEY_Greek_upsilon, 0x1F51, 
 IBUS_KEY_Greek_omega, 0x1F61, 
+IBUS_KEY_bar, 0x2AF0, 
+IBUS_KEY_plus, 0x2A26, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_equal, 0x2A77, 
+IBUS_KEY_space, 0x002C, 
+IBUS_KEY_S, 0x0218, 
+IBUS_KEY_T, 0x021A, 
+IBUS_KEY_s, 0x0219, 
+IBUS_KEY_t, 0x021B, 
+IBUS_KEY_nobreakspace, 0x0326, 
+IBUS_KEY_dead_belowcomma, 0x002C, 
+IBUS_KEY_space, 0x00A4, 
+IBUS_KEY_A, 0x20B3, 
+IBUS_KEY_B, 0x20B1, 
+IBUS_KEY_C, 0x20A1, 
+IBUS_KEY_D, 0x20AF, 
+IBUS_KEY_E, 0x20A0, 
+IBUS_KEY_F, 0x20A3, 
+IBUS_KEY_G, 0x20B2, 
+IBUS_KEY_H, 0x20B4, 
+IBUS_KEY_I, 0x17DB, 
+IBUS_KEY_K, 0x20AD, 
+IBUS_KEY_L, 0x20A4, 
+IBUS_KEY_M, 0x2133, 
+IBUS_KEY_N, 0x20A6, 
+IBUS_KEY_O, 0x0AF1, 
+IBUS_KEY_P, 0x20A7, 
+IBUS_KEY_R, 0x20A8, 
+IBUS_KEY_S, 0x0024, 
+IBUS_KEY_T, 0x20AE, 
+IBUS_KEY_U, 0x5713, 
+IBUS_KEY_W, 0x20A9, 
+IBUS_KEY_Y, 0x5186, 
+IBUS_KEY_a, 0x060B, 
+IBUS_KEY_b, 0x0E3F, 
+IBUS_KEY_c, 0x00A2, 
+IBUS_KEY_d, 0x20AB, 
+IBUS_KEY_e, 0x20AC, 
+IBUS_KEY_f, 0x0192, 
+IBUS_KEY_g, 0x20B2, 
+IBUS_KEY_h, 0x20B4, 
+IBUS_KEY_i, 0xFDFC, 
+IBUS_KEY_k, 0x20AD, 
+IBUS_KEY_l, 0x00A3, 
+IBUS_KEY_m, 0x20A5, 
+IBUS_KEY_n, 0x20A6, 
+IBUS_KEY_o, 0x0BF9, 
+IBUS_KEY_p, 0x20B0, 
+IBUS_KEY_r, 0x20A2, 
+IBUS_KEY_s, 0x20AA, 
+IBUS_KEY_t, 0x09F3, 
+IBUS_KEY_u, 0x5143, 
+IBUS_KEY_w, 0x20A9, 
+IBUS_KEY_y, 0x00A5, 
+IBUS_KEY_nobreakspace, 0x00A4, 
+IBUS_KEY_Ccedilla, 0x20B5, 
+IBUS_KEY_THORN, 0x09F2, 
+IBUS_KEY_ccedilla, 0x20B5, 
+IBUS_KEY_thorn, 0x09F2, 
+IBUS_KEY_dead_currency, 0x00A4, 
+IBUS_KEY_dead_cedilla, IBUS_KEY_C, 0x20B5, 
+IBUS_KEY_dead_cedilla, IBUS_KEY_c, 0x20B5, 
 IBUS_KEY_space, 0x00B5, 
 IBUS_KEY_A, 0x0391, 
 IBUS_KEY_B, 0x0392, 
@@ -1260,7 +1329,6 @@ 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, 
@@ -1268,6 +1336,7 @@ 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_dead_stroke, IBUS_KEY_r, 0x03FC, 
 IBUS_KEY_space, IBUS_KEY_space, 0x00A0, 
 IBUS_KEY_space, IBUS_KEY_apostrophe, 0x0027, 
 IBUS_KEY_space, IBUS_KEY_parenleft, 0x02D8, 
@@ -1292,7 +1361,6 @@ IBUS_KEY_exclam, IBUS_KEY_L, 0x1E36,
 IBUS_KEY_exclam, IBUS_KEY_M, 0x1E42, 
 IBUS_KEY_exclam, IBUS_KEY_N, 0x1E46, 
 IBUS_KEY_exclam, IBUS_KEY_O, 0x1ECC, 
-IBUS_KEY_exclam, IBUS_KEY_P, 0x00B6, 
 IBUS_KEY_exclam, IBUS_KEY_R, 0x1E5A, 
 IBUS_KEY_exclam, IBUS_KEY_S, 0x1E62, 
 IBUS_KEY_exclam, IBUS_KEY_T, 0x1E6C, 
@@ -1313,7 +1381,6 @@ IBUS_KEY_exclam, IBUS_KEY_l, 0x1E37,
 IBUS_KEY_exclam, IBUS_KEY_m, 0x1E43, 
 IBUS_KEY_exclam, IBUS_KEY_n, 0x1E47, 
 IBUS_KEY_exclam, IBUS_KEY_o, 0x1ECD, 
-IBUS_KEY_exclam, IBUS_KEY_p, 0x00B6, 
 IBUS_KEY_exclam, IBUS_KEY_r, 0x1E5B, 
 IBUS_KEY_exclam, IBUS_KEY_s, 0x1E63, 
 IBUS_KEY_exclam, IBUS_KEY_t, 0x1E6D, 
@@ -1509,12 +1576,6 @@ 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, 
-IBUS_KEY_parenleft, IBUS_KEY_A, 0x0102, 
-IBUS_KEY_parenleft, IBUS_KEY_G, 0x011E, 
-IBUS_KEY_parenleft, IBUS_KEY_a, 0x0103, 
-IBUS_KEY_parenleft, IBUS_KEY_c, 0x00A9, 
-IBUS_KEY_parenleft, IBUS_KEY_g, 0x011F, 
-IBUS_KEY_parenleft, IBUS_KEY_r, 0x00AE, 
 IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F09, 
 IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F19, 
 IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F29, 
@@ -1575,6 +1636,7 @@ IBUS_KEY_comma, IBUS_KEY_I, 0x012E,
 IBUS_KEY_comma, IBUS_KEY_K, 0x0136, 
 IBUS_KEY_comma, IBUS_KEY_L, 0x013B, 
 IBUS_KEY_comma, IBUS_KEY_N, 0x0145, 
+IBUS_KEY_comma, IBUS_KEY_O, 0x01EA, 
 IBUS_KEY_comma, IBUS_KEY_R, 0x0156, 
 IBUS_KEY_comma, IBUS_KEY_S, 0x015E, 
 IBUS_KEY_comma, IBUS_KEY_T, 0x0162, 
@@ -1589,6 +1651,7 @@ IBUS_KEY_comma, IBUS_KEY_i, 0x012F,
 IBUS_KEY_comma, IBUS_KEY_k, 0x0137, 
 IBUS_KEY_comma, IBUS_KEY_l, 0x013C, 
 IBUS_KEY_comma, IBUS_KEY_n, 0x0146, 
+IBUS_KEY_comma, IBUS_KEY_o, 0x01EB, 
 IBUS_KEY_comma, IBUS_KEY_r, 0x0157, 
 IBUS_KEY_comma, IBUS_KEY_s, 0x015F, 
 IBUS_KEY_comma, IBUS_KEY_t, 0x0163, 
@@ -1601,13 +1664,12 @@ 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, 
+IBUS_KEY_minus, IBUS_KEY_A, 0x0100, 
 IBUS_KEY_minus, IBUS_KEY_D, 0x0110, 
 IBUS_KEY_minus, IBUS_KEY_E, 0x0112, 
 IBUS_KEY_minus, IBUS_KEY_I, 0x012A, 
 IBUS_KEY_minus, IBUS_KEY_L, 0x00A3, 
-IBUS_KEY_minus, IBUS_KEY_N, 0x00D1, 
-IBUS_KEY_minus, IBUS_KEY_O, 0x00D5, 
+IBUS_KEY_minus, IBUS_KEY_O, 0x014C, 
 IBUS_KEY_minus, IBUS_KEY_U, 0x016A, 
 IBUS_KEY_minus, IBUS_KEY_Y, 0x00A5, 
 IBUS_KEY_minus, IBUS_KEY_backslash, 0x2340, 
@@ -1617,7 +1679,6 @@ IBUS_KEY_minus, IBUS_KEY_d, 0x0111,
 IBUS_KEY_minus, IBUS_KEY_e, 0x0113, 
 IBUS_KEY_minus, IBUS_KEY_i, 0x012B, 
 IBUS_KEY_minus, IBUS_KEY_l, 0x00A3, 
-IBUS_KEY_minus, IBUS_KEY_n, 0x00F1, 
 IBUS_KEY_minus, IBUS_KEY_o, 0x014D, 
 IBUS_KEY_minus, IBUS_KEY_u, 0x016B, 
 IBUS_KEY_minus, IBUS_KEY_y, 0x00A5, 
@@ -1691,7 +1752,6 @@ IBUS_KEY_slash, IBUS_KEY_I, 0x0197,
 IBUS_KEY_slash, IBUS_KEY_L, 0x0141, 
 IBUS_KEY_slash, IBUS_KEY_O, 0x00D8, 
 IBUS_KEY_slash, IBUS_KEY_T, 0x0166, 
-IBUS_KEY_slash, IBUS_KEY_U, 0x00B5, 
 IBUS_KEY_slash, IBUS_KEY_Z, 0x01B5, 
 IBUS_KEY_slash, IBUS_KEY_asciicircum, 0x007C, 
 IBUS_KEY_slash, IBUS_KEY_b, 0x0180, 
@@ -1720,13 +1780,6 @@ 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, 
-IBUS_KEY_0, IBUS_KEY_asciicircum, 0x00B0, 
-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, 
@@ -1736,20 +1789,14 @@ 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, 
 IBUS_KEY_2, IBUS_KEY_3, 0x2154, 
 IBUS_KEY_2, IBUS_KEY_5, 0x2156, 
-IBUS_KEY_2, IBUS_KEY_S, 0x00B2, 
 IBUS_KEY_2, IBUS_KEY_asciicircum, 0x00B2, 
-IBUS_KEY_2, IBUS_KEY_s, 0x00B2, 
 IBUS_KEY_3, IBUS_KEY_4, 0x00BE, 
 IBUS_KEY_3, IBUS_KEY_5, 0x2157, 
 IBUS_KEY_3, IBUS_KEY_8, 0x215C, 
-IBUS_KEY_3, IBUS_KEY_S, 0x00B3, 
 IBUS_KEY_3, IBUS_KEY_asciicircum, 0x00B3, 
-IBUS_KEY_3, IBUS_KEY_s, 0x00B3, 
 IBUS_KEY_4, IBUS_KEY_5, 0x2158, 
 IBUS_KEY_5, IBUS_KEY_6, 0x215A, 
 IBUS_KEY_5, IBUS_KEY_8, 0x215D, 
@@ -1764,12 +1811,16 @@ 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_S, 0x0218, 
+IBUS_KEY_semicolon, IBUS_KEY_T, 0x021A, 
 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, 
 IBUS_KEY_semicolon, IBUS_KEY_o, 0x01EB, 
+IBUS_KEY_semicolon, IBUS_KEY_s, 0x0219, 
+IBUS_KEY_semicolon, IBUS_KEY_t, 0x021B, 
 IBUS_KEY_semicolon, IBUS_KEY_u, 0x0173, 
 IBUS_KEY_less, IBUS_KEY_space, 0x02C7, 
 IBUS_KEY_less, IBUS_KEY_quotedbl, 0x201C, 
@@ -1802,6 +1853,7 @@ 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_greater, 0x21D2, 
 IBUS_KEY_equal, IBUS_KEY_C, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_E, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_L, 0x20A4, 
@@ -1814,7 +1866,6 @@ 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, 
 IBUS_KEY_equal, IBUS_KEY_u, 0x0171, 
 IBUS_KEY_equal, IBUS_KEY_y, 0x00A5, 
@@ -1872,13 +1923,14 @@ IBUS_KEY_A, IBUS_KEY_apostrophe, 0x00C1,
 IBUS_KEY_A, IBUS_KEY_parenleft, 0x0102, 
 IBUS_KEY_A, IBUS_KEY_asterisk, 0x00C5, 
 IBUS_KEY_A, IBUS_KEY_comma, 0x0104, 
-IBUS_KEY_A, IBUS_KEY_minus, 0x00C3, 
+IBUS_KEY_A, IBUS_KEY_minus, 0x0100, 
+IBUS_KEY_A, IBUS_KEY_semicolon, 0x0104, 
 IBUS_KEY_A, IBUS_KEY_greater, 0x00C2, 
 IBUS_KEY_A, IBUS_KEY_A, 0x00C5, 
 IBUS_KEY_A, IBUS_KEY_E, 0x00C6, 
 IBUS_KEY_A, IBUS_KEY_T, 0x0040, 
 IBUS_KEY_A, IBUS_KEY_asciicircum, 0x00C2, 
-IBUS_KEY_A, IBUS_KEY_underscore, 0x00AA, 
+IBUS_KEY_A, IBUS_KEY_underscore, 0x0100, 
 IBUS_KEY_A, IBUS_KEY_grave, 0x00C0, 
 IBUS_KEY_A, IBUS_KEY_asciitilde, 0x00C3, 
 IBUS_KEY_A, IBUS_KEY_diaeresis, 0x00C4, 
@@ -1888,7 +1940,6 @@ IBUS_KEY_C, IBUS_KEY_apostrophe, 0x0106,
 IBUS_KEY_C, IBUS_KEY_comma, 0x00C7, 
 IBUS_KEY_C, IBUS_KEY_period, 0x010A, 
 IBUS_KEY_C, IBUS_KEY_slash, 0x20A1, 
-IBUS_KEY_C, IBUS_KEY_0, 0x00A9, 
 IBUS_KEY_C, IBUS_KEY_less, 0x010C, 
 IBUS_KEY_C, IBUS_KEY_equal, 0x20AC, 
 IBUS_KEY_C, IBUS_KEY_E, 0x20A0, 
@@ -1906,6 +1957,7 @@ IBUS_KEY_E, IBUS_KEY_apostrophe, 0x00C9,
 IBUS_KEY_E, IBUS_KEY_comma, 0x0118, 
 IBUS_KEY_E, IBUS_KEY_minus, 0x0112, 
 IBUS_KEY_E, IBUS_KEY_period, 0x0116, 
+IBUS_KEY_E, IBUS_KEY_semicolon, 0x0118, 
 IBUS_KEY_E, IBUS_KEY_less, 0x011A, 
 IBUS_KEY_E, IBUS_KEY_equal, 0x20AC, 
 IBUS_KEY_E, IBUS_KEY_greater, 0x00CA, 
@@ -1929,6 +1981,7 @@ 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_semicolon, 0x012E, 
 IBUS_KEY_I, IBUS_KEY_greater, 0x00CE, 
 IBUS_KEY_I, IBUS_KEY_J, 0x0132, 
 IBUS_KEY_I, IBUS_KEY_asciicircum, 0x00CE, 
@@ -1944,12 +1997,11 @@ IBUS_KEY_L, IBUS_KEY_comma, 0x013B,
 IBUS_KEY_L, IBUS_KEY_minus, 0x00A3, 
 IBUS_KEY_L, IBUS_KEY_slash, 0x0141, 
 IBUS_KEY_L, IBUS_KEY_less, 0x013D, 
-IBUS_KEY_L, IBUS_KEY_equal, 0x00A3, 
+IBUS_KEY_L, IBUS_KEY_equal, 0x20A4, 
 IBUS_KEY_L, IBUS_KEY_V, 0x007C, 
 IBUS_KEY_M, IBUS_KEY_period, 0x1E40, 
 IBUS_KEY_N, IBUS_KEY_apostrophe, 0x0143, 
 IBUS_KEY_N, IBUS_KEY_comma, 0x0145, 
-IBUS_KEY_N, IBUS_KEY_minus, 0x00D1, 
 IBUS_KEY_N, IBUS_KEY_less, 0x0147, 
 IBUS_KEY_N, IBUS_KEY_equal, 0x20A6, 
 IBUS_KEY_N, IBUS_KEY_G, 0x014A, 
@@ -1958,8 +2010,10 @@ IBUS_KEY_N, IBUS_KEY_o, 0x2116,
 IBUS_KEY_N, IBUS_KEY_asciitilde, 0x00D1, 
 IBUS_KEY_O, IBUS_KEY_quotedbl, 0x00D6, 
 IBUS_KEY_O, IBUS_KEY_apostrophe, 0x00D3, 
-IBUS_KEY_O, IBUS_KEY_minus, 0x00D5, 
+IBUS_KEY_O, IBUS_KEY_comma, 0x01EA, 
+IBUS_KEY_O, IBUS_KEY_minus, 0x014C, 
 IBUS_KEY_O, IBUS_KEY_slash, 0x00D8, 
+IBUS_KEY_O, IBUS_KEY_semicolon, 0x01EA, 
 IBUS_KEY_O, IBUS_KEY_greater, 0x00D4, 
 IBUS_KEY_O, IBUS_KEY_A, 0x24B6, 
 IBUS_KEY_O, IBUS_KEY_C, 0x00A9, 
@@ -1968,7 +2022,7 @@ IBUS_KEY_O, IBUS_KEY_R, 0x00AE,
 IBUS_KEY_O, IBUS_KEY_S, 0x00A7, 
 IBUS_KEY_O, IBUS_KEY_X, 0x00A4, 
 IBUS_KEY_O, IBUS_KEY_asciicircum, 0x00D4, 
-IBUS_KEY_O, IBUS_KEY_underscore, 0x00BA, 
+IBUS_KEY_O, IBUS_KEY_underscore, 0x014C, 
 IBUS_KEY_O, IBUS_KEY_grave, 0x00D2, 
 IBUS_KEY_O, IBUS_KEY_c, 0x00A9, 
 IBUS_KEY_O, IBUS_KEY_r, 0x00AE, 
@@ -1989,20 +2043,17 @@ IBUS_KEY_S, IBUS_KEY_exclam, 0x00A7,
 IBUS_KEY_S, IBUS_KEY_apostrophe, 0x015A, 
 IBUS_KEY_S, IBUS_KEY_comma, 0x015E, 
 IBUS_KEY_S, IBUS_KEY_period, 0x1E60, 
-IBUS_KEY_S, IBUS_KEY_0, 0x00A7, 
-IBUS_KEY_S, IBUS_KEY_1, 0x00B9, 
-IBUS_KEY_S, IBUS_KEY_2, 0x00B2, 
-IBUS_KEY_S, IBUS_KEY_3, 0x00B3, 
+IBUS_KEY_S, IBUS_KEY_semicolon, 0x0218, 
 IBUS_KEY_S, IBUS_KEY_less, 0x0160, 
 IBUS_KEY_S, IBUS_KEY_M, 0x2120, 
 IBUS_KEY_S, IBUS_KEY_O, 0x00A7, 
 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, 
+IBUS_KEY_T, IBUS_KEY_semicolon, 0x021A, 
 IBUS_KEY_T, IBUS_KEY_less, 0x0164, 
 IBUS_KEY_T, IBUS_KEY_H, 0x00DE, 
 IBUS_KEY_T, IBUS_KEY_M, 0x2122, 
@@ -2012,7 +2063,7 @@ IBUS_KEY_U, IBUS_KEY_apostrophe, 0x00DA,
 IBUS_KEY_U, IBUS_KEY_asterisk, 0x016E, 
 IBUS_KEY_U, IBUS_KEY_comma, 0x0172, 
 IBUS_KEY_U, IBUS_KEY_minus, 0x016A, 
-IBUS_KEY_U, IBUS_KEY_slash, 0x00B5, 
+IBUS_KEY_U, IBUS_KEY_semicolon, 0x0172, 
 IBUS_KEY_U, IBUS_KEY_greater, 0x00DB, 
 IBUS_KEY_U, IBUS_KEY_A, 0x0102, 
 IBUS_KEY_U, IBUS_KEY_E, 0x0114, 
@@ -2055,7 +2106,6 @@ IBUS_KEY_U, 0x1EA1, 0x1EB7,
 IBUS_KEY_V, IBUS_KEY_L, 0x007C, 
 IBUS_KEY_W, IBUS_KEY_equal, 0x20A9, 
 IBUS_KEY_W, IBUS_KEY_asciicircum, 0x0174, 
-IBUS_KEY_X, IBUS_KEY_0, 0x00A4, 
 IBUS_KEY_X, IBUS_KEY_O, 0x00A4, 
 IBUS_KEY_X, IBUS_KEY_o, 0x00A4, 
 IBUS_KEY_Y, IBUS_KEY_quotedbl, 0x0178, 
@@ -2104,7 +2154,6 @@ IBUS_KEY_asciicircum, IBUS_KEY_U, 0x00DB,
 IBUS_KEY_asciicircum, IBUS_KEY_W, 0x0174, 
 IBUS_KEY_asciicircum, IBUS_KEY_Y, 0x0176, 
 IBUS_KEY_asciicircum, IBUS_KEY_Z, 0x1E90, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x00AF, 
 IBUS_KEY_asciicircum, IBUS_KEY_a, 0x00E2, 
 IBUS_KEY_asciicircum, IBUS_KEY_c, 0x0109, 
 IBUS_KEY_asciicircum, IBUS_KEY_e, 0x00EA, 
@@ -2325,9 +2374,10 @@ IBUS_KEY_a, IBUS_KEY_parenleft, 0x0103,
 IBUS_KEY_a, IBUS_KEY_asterisk, 0x00E5, 
 IBUS_KEY_a, IBUS_KEY_comma, 0x0105, 
 IBUS_KEY_a, IBUS_KEY_minus, 0x0101, 
+IBUS_KEY_a, IBUS_KEY_semicolon, 0x0105, 
 IBUS_KEY_a, IBUS_KEY_greater, 0x00E2, 
 IBUS_KEY_a, IBUS_KEY_asciicircum, 0x00E2, 
-IBUS_KEY_a, IBUS_KEY_underscore, 0x00AA, 
+IBUS_KEY_a, IBUS_KEY_underscore, 0x0101, 
 IBUS_KEY_a, IBUS_KEY_grave, 0x00E0, 
 IBUS_KEY_a, IBUS_KEY_a, 0x00E5, 
 IBUS_KEY_a, IBUS_KEY_e, 0x00E6, 
@@ -2371,7 +2421,6 @@ IBUS_KEY_c, IBUS_KEY_apostrophe, 0x0107,
 IBUS_KEY_c, IBUS_KEY_comma, 0x00E7, 
 IBUS_KEY_c, IBUS_KEY_period, 0x010B, 
 IBUS_KEY_c, IBUS_KEY_slash, 0x00A2, 
-IBUS_KEY_c, IBUS_KEY_0, 0x00A9, 
 IBUS_KEY_c, IBUS_KEY_less, 0x010D, 
 IBUS_KEY_c, IBUS_KEY_equal, 0x20AC, 
 IBUS_KEY_c, IBUS_KEY_A, 0x01CD, 
@@ -2422,6 +2471,7 @@ IBUS_KEY_e, IBUS_KEY_apostrophe, 0x00E9,
 IBUS_KEY_e, IBUS_KEY_comma, 0x0119, 
 IBUS_KEY_e, IBUS_KEY_minus, 0x0113, 
 IBUS_KEY_e, IBUS_KEY_period, 0x0117, 
+IBUS_KEY_e, IBUS_KEY_semicolon, 0x0119, 
 IBUS_KEY_e, IBUS_KEY_less, 0x011B, 
 IBUS_KEY_e, IBUS_KEY_equal, 0x20AC, 
 IBUS_KEY_e, IBUS_KEY_greater, 0x00EA, 
@@ -2464,21 +2514,21 @@ IBUS_KEY_l, IBUS_KEY_comma, 0x013C,
 IBUS_KEY_l, IBUS_KEY_minus, 0x00A3, 
 IBUS_KEY_l, IBUS_KEY_slash, 0x0142, 
 IBUS_KEY_l, IBUS_KEY_less, 0x013E, 
-IBUS_KEY_l, IBUS_KEY_equal, 0x00A3, 
 IBUS_KEY_l, IBUS_KEY_v, 0x007C, 
 IBUS_KEY_m, IBUS_KEY_period, 0x1E41, 
 IBUS_KEY_m, IBUS_KEY_slash, 0x20A5, 
 IBUS_KEY_m, IBUS_KEY_u, 0x00B5, 
 IBUS_KEY_n, IBUS_KEY_apostrophe, 0x0144, 
 IBUS_KEY_n, IBUS_KEY_comma, 0x0146, 
-IBUS_KEY_n, IBUS_KEY_minus, 0x00F1, 
 IBUS_KEY_n, IBUS_KEY_less, 0x0148, 
 IBUS_KEY_n, IBUS_KEY_g, 0x014B, 
 IBUS_KEY_n, IBUS_KEY_asciitilde, 0x00F1, 
 IBUS_KEY_o, IBUS_KEY_quotedbl, 0x00F6, 
 IBUS_KEY_o, IBUS_KEY_apostrophe, 0x00F3, 
+IBUS_KEY_o, IBUS_KEY_comma, 0x01EB, 
 IBUS_KEY_o, IBUS_KEY_minus, 0x014D, 
 IBUS_KEY_o, IBUS_KEY_slash, 0x00F8, 
+IBUS_KEY_o, IBUS_KEY_semicolon, 0x01EB, 
 IBUS_KEY_o, IBUS_KEY_greater, 0x00F4, 
 IBUS_KEY_o, IBUS_KEY_A, 0x00C5, 
 IBUS_KEY_o, IBUS_KEY_C, 0x00A9, 
@@ -2486,7 +2536,7 @@ IBUS_KEY_o, IBUS_KEY_R, 0x00AE,
 IBUS_KEY_o, IBUS_KEY_U, 0x016E, 
 IBUS_KEY_o, IBUS_KEY_X, 0x00A4, 
 IBUS_KEY_o, IBUS_KEY_asciicircum, 0x00F4, 
-IBUS_KEY_o, IBUS_KEY_underscore, 0x00BA, 
+IBUS_KEY_o, IBUS_KEY_underscore, 0x014D, 
 IBUS_KEY_o, IBUS_KEY_grave, 0x00F2, 
 IBUS_KEY_o, IBUS_KEY_a, 0x00E5, 
 IBUS_KEY_o, IBUS_KEY_c, 0x00A9, 
@@ -2510,10 +2560,7 @@ IBUS_KEY_s, IBUS_KEY_exclam, 0x00A7,
 IBUS_KEY_s, IBUS_KEY_apostrophe, 0x015B, 
 IBUS_KEY_s, IBUS_KEY_comma, 0x015F, 
 IBUS_KEY_s, IBUS_KEY_period, 0x1E61, 
-IBUS_KEY_s, IBUS_KEY_0, 0x00A7, 
-IBUS_KEY_s, IBUS_KEY_1, 0x00B9, 
-IBUS_KEY_s, IBUS_KEY_2, 0x00B2, 
-IBUS_KEY_s, IBUS_KEY_3, 0x00B3, 
+IBUS_KEY_s, IBUS_KEY_semicolon, 0x0219, 
 IBUS_KEY_s, IBUS_KEY_less, 0x0161, 
 IBUS_KEY_s, IBUS_KEY_M, 0x2120, 
 IBUS_KEY_s, IBUS_KEY_m, 0x2120, 
@@ -2524,6 +2571,7 @@ 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, 
+IBUS_KEY_t, IBUS_KEY_semicolon, 0x021B, 
 IBUS_KEY_t, IBUS_KEY_less, 0x0165, 
 IBUS_KEY_t, IBUS_KEY_M, 0x2122, 
 IBUS_KEY_t, IBUS_KEY_h, 0x00FE, 
@@ -2534,10 +2582,14 @@ IBUS_KEY_u, IBUS_KEY_asterisk, 0x016F,
 IBUS_KEY_u, IBUS_KEY_comma, 0x0173, 
 IBUS_KEY_u, IBUS_KEY_minus, 0x016B, 
 IBUS_KEY_u, IBUS_KEY_slash, 0x00B5, 
+IBUS_KEY_u, IBUS_KEY_semicolon, 0x0173, 
 IBUS_KEY_u, IBUS_KEY_greater, 0x00FB, 
+IBUS_KEY_u, IBUS_KEY_A, 0x0102, 
+IBUS_KEY_u, IBUS_KEY_U, 0x016C, 
 IBUS_KEY_u, IBUS_KEY_asciicircum, 0x00FB, 
 IBUS_KEY_u, IBUS_KEY_underscore, 0x016B, 
 IBUS_KEY_u, IBUS_KEY_grave, 0x00F9, 
+IBUS_KEY_u, IBUS_KEY_a, 0x0103, 
 IBUS_KEY_u, IBUS_KEY_u, 0x016D, 
 IBUS_KEY_u, IBUS_KEY_asciitilde, 0x0169, 
 IBUS_KEY_u, IBUS_KEY_diaeresis, 0x00FC, 
@@ -2547,7 +2599,6 @@ IBUS_KEY_v, IBUS_KEY_Z, 0x017D,
 IBUS_KEY_v, IBUS_KEY_l, 0x007C, 
 IBUS_KEY_v, IBUS_KEY_z, 0x017E, 
 IBUS_KEY_w, IBUS_KEY_asciicircum, 0x0175, 
-IBUS_KEY_x, IBUS_KEY_0, 0x00A4, 
 IBUS_KEY_x, IBUS_KEY_O, 0x00A4, 
 IBUS_KEY_x, IBUS_KEY_o, 0x00A4, 
 IBUS_KEY_x, IBUS_KEY_x, 0x00D7, 
@@ -2893,7 +2944,6 @@ IBUS_KEY_Greek_alpha, IBUS_KEY_apostrophe, 0x03AC,
 IBUS_KEY_Greek_epsilon, IBUS_KEY_apostrophe, 0x03AD, 
 IBUS_KEY_Greek_eta, IBUS_KEY_apostrophe, 0x03AE, 
 IBUS_KEY_Greek_iota, IBUS_KEY_quotedbl, 0x03CA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x03AF, 
 IBUS_KEY_Greek_iota, IBUS_KEY_Greek_alphaaccent, 0x1FB4, 
 IBUS_KEY_Greek_iota, IBUS_KEY_Greek_etaaccent, 0x1FC4, 
 IBUS_KEY_Greek_iota, IBUS_KEY_Greek_omegaaccent, 0x1FF4, 
@@ -3427,9 +3477,6 @@ IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EE2,
 IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EF0, 
 IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EE3, 
 IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EF1, 
-IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_space, 0x0385, 
-IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon, 0x03B0, 
 IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_U, 0x1E7A, 
 IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_u, 0x1E7B, 
 IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4E, 
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 300a828a0..db61e3e58 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -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) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2014 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
@@ -66,7 +66,7 @@ struct _IBusEngineSimplePrivate {
  */
 #include "gtkimcontextsimpleseqs.h"
 
-/* From the values below, the value 24 means the number of different first keysyms
+/* From the values below, the value 30 means the number of different first keysyms
  * that exist in the Compose file (from Xorg). When running compose-parse.py without
  * parameters, you get the count that you can put here. Needed when updating the
  * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
@@ -74,7 +74,7 @@ struct _IBusEngineSimplePrivate {
 static const IBusComposeTableCompact ibus_compose_table_compact = {
     gtk_compose_seqs_compact,
     5,
-    25,
+    30,
     6
 };
 

From 86513b1ac9f6c3765df1aca8cd266aebba424388 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 16 Sep 2014 11:44:34 +0900
Subject: [PATCH 270/816] Update translations.

Update as.po ko.po pl.po

Review URL: https://codereview.appspot.com/141980043
---
 po/as.po | 286 ++++++++++++++++++++++++++++++++-----------------------
 po/ko.po | 183 ++++++++++++++++++-----------------
 po/pl.po |  64 +++++++------
 3 files changed, 299 insertions(+), 234 deletions(-)

diff --git a/po/as.po b/po/as.po
index da574d7bd..de363f5b7 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,15 +6,15 @@
 # Translators:
 # Amitakhya Phukan <aphukan@fedoraproject.org>, 2009
 # Amitakhya Phukan <aphukan@redhat.com>, 2010
-# ngoswami <ngoswami@redhat.com>, 2011
-# ngoswami <ngoswami@redhat.com>, 2012-2014
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: ngoswami <ngoswami@redhat.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-08 09:04+0000\n"
+"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgstr "আগৰ ইনপুট পদ্ধতি"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ইনপুট পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় চৰ্টকাট কি' নিৰ্ধাৰণ কৰক"
 
@@ -126,11 +126,11 @@ msgstr "বৈশিষ্ট্য পেনেল দেখুৱাওক:"
 msgid "Language panel position:"
 msgstr "ভাষাৰ পেনেলৰ স্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "চিস্টেম ট্ৰেত আইকন দেখুৱাওক"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ভাষাৰ বাৰত ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
@@ -159,7 +159,8 @@ msgid "General"
 msgstr "সাধাৰণ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "যোগ কৰক (_A)"
 
@@ -219,11 +220,11 @@ msgstr "<small><i>কি'বৰ্ড চৰ্টকাট কি অথবা
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "চিস্টেম কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰক"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব্যৱহাৰ কৰক"
 
@@ -231,7 +232,7 @@ msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কিবৰ্ডৰ বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "সকলো এপ্লিকেচনৰ মাজত একেই ইনপুট পদ্ধতি অংশীদাৰী কৰক"
 
@@ -261,184 +262,219 @@ msgstr "লগিনত ibus আৰম্ভ কৰক"
 msgid "<b>Startup</b>"
 msgstr "<b>আৰম্ভণি</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "বিষয়ে"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "বন্ধ কৰক (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ইঞ্জিনসমূহ আগতে ল'ড কৰক"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus আৰম্ভৰ আগতে ইঞ্জিন ল'ড কৰক"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "ইঞ্জিনসমূহৰ ক্ৰম"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ইনপুট পদ্ধতি তালিকাত সংৰক্ষিত ইঞ্জিন ক্ৰম"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME চুইচাৰ উইন্ডোৰ বাবে মিলিছেকেণ্ডত পপআপ বিলম্ব"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল 400. 0 = উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 &lt; মিলিছেকেণ্ডত বিলম্ব। 0 &gt; উইন্ডো নেদেখুৱাব আৰু পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "সংৰক্ষিত সংস্কৰণ সংখ্যা"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ৰ মাজত পাৰ্থক্য নিৰীক্ষণ কৰিবলৈ ব্যৱহাৰ কৰা হব।"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ASCII নথকা লেটিন বিন্যাসসমূহ"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US বিন্যাসক লেটিন বিন্যাসসমূহলৈ সংযোজন কৰা হয়। অপৰক বাদ দিব পাৰি।"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ব্যৱহাৰ কৰক"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus ইঞ্জিনসমূহ চুইচ কৰোতে যদি .xmodmap অথবা .Xmodmap থাকে xmodmap চলাব।"
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ট্ৰিগাৰৰ চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse ৰ বাবে চৰ্টকাট কি'সমূহ ট্ৰিগাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "চৰ্টকাট কি'সমূহ সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ইনপুট পদ্ধতি খুলিবলে চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "চৰ্টকাট কি'সমূহ অসামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ইনপুট পদ্ধতি বন্ধ কৰিবলে চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "পৰবৰ্তী ইঞ্জিন চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "তালিকাত থকা পৰৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "পূৰ্ববৰ্তী ইঞ্জিনৰ চৰ্টকাট কি'"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "তালিকাত থকা পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলে যাবলে চৰ্টকাট কি'সমূহ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "স্বচালিতভাৱে লুকাওক"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "বৈশিষ্ট্য পেনেলৰ আচৰণ। 0 = নেদেখুৱাব,  1 = স্বচালিতভাৱে লুকুৱাওক, 2 = সদায় দেখুৱাব"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ভাষাৰ পেনেলৰ স্থান"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "পেনেল সদায় দেখুৱা হলে ইনপুট কাৰ্চাৰক অনুকৰণ কৰিব"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "যদি সত্য, পেনেলে ইনপুট কাৰ্চাৰক দেখুৱায় যদি পেনেলক সদায় দেখুৱা হয়। যদি ভুল, পেনেলক এটা নিৰ্দিষ্ট স্থানত দেখুৱা হয়।"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "বৈশিষ্ট্য পেনেল দেখুৱাবলৈ মিলিছেকেণ্ড"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "ফকাচ-ইন আৰু বৈশিষ্ট্যসমূহ পৰিবৰ্তন হোৱাৰ পিছত বৈশিষ্ট্য পেনেল দেখুৱাবলৈ মিলিছেকেণ্ড।"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবুলৰ দিশ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুকআপ টেবুলৰ দিশ। ০ = আনুভূমিক, ১ = উলম্ব"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতিৰ নাম দেখুৱাওক"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB আইকনৰ RGBA মান"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB আইকনে বিন্যাস স্ট্ৰিং দেখুৱায় আৰু স্ট্ৰিং RGBA মানৰ সৈতে ৰেণ্ডাৰ হয়। RGBA মান হব পাৰে 1. X11 ৰ পৰা এটা ৰঙৰ নাম, 2. '#rrggbb' বিন্যাসত এটা হেক্স মান য'ত 'r', 'g' আৰু 'b' হল ৰঙা, সেউজীয়া আৰু নীলাৰ হেক্স ডিজিট, 3. 'rgb(r,g,b)' বিন্যাসত এটা RGB ৰঙ অথবা 4. 'rgba(r,g,b,a)' বিন্যাসত এটা RGBA ৰঙ য'ত  'r', 'g', and 'b' 0 ৰ পৰা 255 বিস্তাৰত পূৰ্ণসংখ্যা অথবা 0% ৰ পৰা 100% বিস্তাৰত শতাংশ মান, আৰু 'a' 0 ৰ পৰা 1 বিস্তাৰত এটা দশমিক মান।"
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "এপ্লিকেচনৰ উইন্ডোত পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "সৰ্বব্যাপী ইনপুট পদ্ধতি ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱে সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf সংৰক্ষিত নাম উপসৰ্গসমূহ"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নাম পৰিবৰ্তন বন্ধ কৰিবলে DConf কি'সমূহৰ উপসৰ্গসমূহ"
 
@@ -452,29 +488,38 @@ msgstr "স্বত্বাধিকাৰ (c) ২০০৭-২০১০ প
 msgid "Other"
 msgstr "অন্য"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কিবৰ্ডৰ বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "লিখক: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "বিৱৰণ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "এটা ইনপুট পদ্ধতি বাছক"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "অধিক"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -483,55 +528,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus পছন্দসমূহ সংহতি কৰক"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "কিবৰ্ডৰ চৰ্টকাটসমূহ"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "কি'ৰ ক'ড:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "পৰিবৰ্তক:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "প্ৰয়োগ কৰক (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "আঁতৰাওক (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "ঠিক আছে (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলৈ চুইচ কৰিবলে shift ৰ সৈতে চৰ্টকাট ব্যৱহাৰ কৰক"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডিমন চলি থকা নাই। আপুনি আৰম্ভ কৰিব বিচাৰে নেকি?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -540,157 +581,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডিমনক %d ছেকেণ্ডত আৰম্ভ কৰিব পৰা নগল"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ৰ কাৰণে কিবৰ্ডৰ চৰ্টকাট বাছক"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতিসমূহ চুইচ কৰা"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "কেৱল ইঞ্জিন নাম তালিকাভুক্ত কৰক"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus লে সংযোগ কৰিব নোৱাৰি।\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "কোনো ইঞ্জিন সংহতি কৰা হোৱা নাই।\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "বিশ্বব্যাপী ইঞ্জিন সংহতি কৰা ব্যৰ্থ হল।\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "বিশ্বব্যাপী ইঞ্জিন প্ৰাপ্ত কৰা ব্যৰ্থ হল।\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ পঢ়ক।"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE পঢ়ক।"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "ৰেজিস্ট্ৰি ক্যাশ বৈধ নহয়।\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ লিখক।"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE লিখক।"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "পুনৰ সংহতি কৰা হৈছে"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "কৰা হল"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "ইঞ্জিন সংহতি কৰক অথবা প্ৰাপ্ত কৰক"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon প্ৰস্থান কৰক"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "উপলব্ধ ইঞ্জিনসমূহ দেখুৱাওক"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(প্ৰণয়ন কৰা হোৱা নাই)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon পুনৰাম্ভ কৰক"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "সংস্কৰণ দেখুৱাওক"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "ৰেজিস্ট্ৰি ক্যাশৰ সমল দেখুৱাওক"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "ৰেজিস্ট্ৰি ক্যাশ সৃষ্টি কৰক"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon ৰ D-Bus ঠিকনা প্ৰিন্ট কৰক"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "সংৰূপৰ মানসমূহ দেখুৱাওক"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "সংৰূপৰ মানসমূহ পুনৰ সংহতি কৰক"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "এই তথ্য দেখুৱাওক"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ব্যৱহাৰ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "কমান্ডসমূহ:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s এটা অজ্ঞাত কমান্ড!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus আপডেইট"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space এতিয়া অবিকল্পিত হটকি।"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "পুনাৰম্ভ"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "প্ৰস্থান"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ko.po b/po/ko.po
index 2bcaec5d0..2cfa62a9d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,13 +9,14 @@
 # eukim <eukim@redhat.com>, 2012
 # Hyunsok Oh <hoh@redhat.com>, 2010
 # Michelle Kim <mkim33@gmail.com>, 2012-2014
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 03:29+0000\n"
-"Last-Translator: Michelle Kim <mkim33@gmail.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-08-02 10:03+0000\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,11 +54,11 @@ msgstr "사용자 정의"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "보여주지 않음"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "자동으로 숨기기"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -77,7 +78,7 @@ msgstr "다음 입력 방식:"
 
 #: ../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:"
@@ -93,7 +94,7 @@ msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "활성화 또는 비활성화:  "
+msgstr "활성화 또는 비활성화:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
@@ -105,15 +106,15 @@ msgstr "비활성화: "
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>단축키</b>  "
+msgstr "<b>단축키</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr "검색 테이블에서 후보 창의 방향 설정  "
+msgstr "검색 테이블에서 후보 창의 방향 설정"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
-msgstr "후보 창의 방향:  "
+msgstr "후보 창의 방향:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
@@ -121,7 +122,7 @@ msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "속성 패널을 표시:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -153,20 +154,21 @@ msgstr "사용자 정의 글꼴 사용:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
-msgstr "<b>글꼴 및 스타일</b> "
+msgstr "<b>글꼴 및 스타일</b>"
 
 #: ../setup/setup.ui.h:34
 msgid "General"
-msgstr "일반  "
+msgstr "일반"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "추가(_A)"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다  "
+msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -206,31 +208,31 @@ msgstr "기본 설정(_P)"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "선택한 입력 방식 설정 보기 "
+msgstr "선택한 입력 방식 설정 보기"
 
 #: ../setup/setup.ui.h:47
 msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i>활성화된 입력 방식 목록에서 키보드 단축키를 누르거나 패널 아이콘을 클릭하여 선택한 활성 입력 방식을 전환할 수 있습니다.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr "입력 방식  "
+msgstr "입력 방식"
 
 #: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
-msgstr "시스템 키보드 레이아웃 사용  "
+msgstr "시스템 키보드 레이아웃 사용"
 
 #: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
-msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
+msgstr "시스템 키보드 (XKB) 레이아웃 사용"
 
 #: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>키보드 레이아웃</b>  "
+msgstr "<b>키보드 레이아웃</b>"
 
 #: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
@@ -242,7 +244,7 @@ msgstr "<b>전역 입력 방식 설정</b>"
 
 #: ../setup/setup.ui.h:54
 msgid "Advanced"
-msgstr "고급  "
+msgstr "고급"
 
 #: ../setup/setup.ui.h:55
 msgid ""
@@ -256,17 +258,17 @@ msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
-msgstr "로그인 시 ibus 시작  "
+msgstr "로그인 시 ibus 시작"
 
 #: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
-msgstr "<b>시작</b>  "
+msgstr "<b>시작</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
-msgstr "정보  "
+msgstr "정보"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "닫기(_C)"
 
@@ -278,7 +280,7 @@ msgstr "엔진 미리로드"
 #. Translators: Tooltip for the button “Preload Engines”
 #: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
-msgstr "ibus 시작 시 엔진 미리 로드  "
+msgstr "ibus 시작 시 엔진 미리 로드"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
@@ -286,11 +288,11 @@ msgstr "엔진 순서"
 
 #: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr "Saved engines order in input method list"
+msgstr "입력 방식 목록에 저장된 엔진 순서"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연 "
+msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
@@ -301,7 +303,7 @@ msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "저장된 버전 번호"
 
 #: ../data/ibus.schemas.in.h:10
 msgid ""
@@ -319,12 +321,12 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "xmodmap 사용"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
+msgstr "ibus 엔진을 전환할때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -332,23 +334,23 @@ msgstr "트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse의 트리거 단축키 "
+msgstr "gtk_accelerator_parse의 트리거 단축키"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
-msgstr "단축키 활성화 "
+msgstr "단축키 활성화"
 
 #: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
-msgstr "입력 방식 전환을 위한 단축키 활성화 "
+msgstr "입력 방식 전환을 위한 단축키 활성화"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
-msgstr "단축키 비활성화 "
+msgstr "단축키 비활성화"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr "입력 방식 전환을 위한 단축키 비활성화 "
+msgstr "입력 방식 전환을 위한 단축키 비활성화"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
@@ -374,7 +376,7 @@ msgstr "자동 숨기기"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "속성 패널 돌작입니다. 0 = 보여주지 않음, 1 = 자동 숨김, 2 = 항상 표시"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -388,31 +390,31 @@ msgstr "언어 패널의 위치. 0 = 왼쪽 위, 1 = 오른쪽 위, 2 = 왼쪽 
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "패널을 항상 표시할 경우 입력 커서를 따라감"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "참이면, 패널을 항상 표시할 때 패널이 입력 커서를 따라갑니다. 거짓이면, 고정된 위치에서 패널이 나타납니다."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "속성 패널을 표시할 밀리세컨드 단위 시간"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "포커스 인 상태 또는 속성 값을 바꾸었을 경우 속성 패널을 표시할 밀리세컨드 단위 시간입니다."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
-msgstr "검색 테이블의 방향  "
+msgstr "검색 테이블의 방향"
 
 #: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
+msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
@@ -420,7 +422,7 @@ msgstr "입력 방식 이름 보여주기"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "XKB 아이콘의 RGBA 값"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -432,11 +434,11 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr ""
+msgstr "XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' 'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0 부터 255까지의 값 또는 0% 부터 100% 까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. 여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
-msgstr "사용자 정의 글꼴 사용  "
+msgstr "사용자 정의 글꼴 사용"
 
 #: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
@@ -472,11 +474,11 @@ msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기
 
 #: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
-msgstr "DConf는 이름 접두사를 보존합니다 "
+msgstr "DConf는 이름 접두사를 보존합니다"
 
 #: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf 키 접두사는 이름 변환을 중지합니다 "
+msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -488,29 +490,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "기타"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "언어: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "키보드 레이아웃: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "저자: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "설명:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr ""
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -519,55 +530,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus 환경 설정"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "단축키"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
-msgstr "키 코드:  "
+msgstr "키 코드:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
-msgstr "수정자:  "
+msgstr "수정자:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "적용(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "취소(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "확인(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:330
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:351
+#: ../setup/main.py:389
 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"
@@ -576,20 +583,20 @@ msgid ""
 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:365
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
-msgstr "입력 방식 전환 중 "
+msgstr "입력 방식 전환 중"
 
 #: ../tools/main.vala:48
 msgid "List engine name only"
@@ -638,11 +645,11 @@ msgstr ""
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr ""
+msgstr "재설정중..."
 
 #: ../tools/main.vala:318
 msgid "Done"
-msgstr ""
+msgstr "완료"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
@@ -654,11 +661,11 @@ msgstr "ibus-daemon 종료"
 
 #: ../tools/main.vala:339
 msgid "Show available engines"
-msgstr ""
+msgstr "존재하는 엔진 표시"
 
 #: ../tools/main.vala:340
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(구현 안함)"
 
 #: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
@@ -670,27 +677,27 @@ msgstr "버전 보기"
 
 #: ../tools/main.vala:343
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "레지스트리 캐시 내용 표시"
 
 #: ../tools/main.vala:344
 msgid "Create registry cache"
-msgstr ""
+msgstr "레지스트리 캐시 만들기"
 
 #: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "ibus-daemon의 D-Bus 주소 출력"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
-msgstr ""
+msgstr "설정 값 표시"
 
 #: ../tools/main.vala:347
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "설정 값 재설정"
 
 #: ../tools/main.vala:348
 msgid "Show this information"
-msgstr ""
+msgstr "이 정보 표시"
 
 #: ../tools/main.vala:354
 #, c-format
@@ -718,7 +725,7 @@ msgstr "Super+space는 이제 기본 단축키입니다."
 
 #: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
+msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다."
 
 #: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
@@ -738,6 +745,6 @@ msgstr "끝내기"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index e15db5340..445964a43 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 12:54+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-07-28 14:08+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,8 @@ msgid "General"
 msgstr "Ogólne"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -258,11 +259,11 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "O programie"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -484,29 +485,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Inne"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "Język: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Układ klawiatury: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "Opis:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "Więcej…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "KBD"
@@ -515,55 +525,51 @@ msgstr "KBD"
 msgid "Set IBus Preferences"
 msgstr "Ustawianie preferencji usługi IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Kod klawisza:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modyfikatory:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "_Zastosuj"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 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:330
+#: ../setup/main.py:368
 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:351
+#: ../setup/main.py:389
 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"
@@ -572,18 +578,18 @@ msgid ""
 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:365
+#: ../setup/main.py:403
 #, 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:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -734,6 +740,6 @@ msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"

From 6c10ce4ee5d3b8a62879d559834d5a4fae242eef Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 16 Sep 2014 11:49:04 +0900
Subject: [PATCH 271/816] Release 1.5.9

Review URL: https://codereview.appspot.com/141950044
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7774be10e..14afa5749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [8])
+m4_define([ibus_micro_version], [9])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From f33e19bec6ab7d1a6133894c86fdeb5a81ce11f1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 1 Oct 2014 16:21:02 +0900
Subject: [PATCH 272/816] Fix to lose a focus when move the focus from the
 delayed focus-in/out.

Some applications likes google-chrome URL entry could have the delayed
focus-in and focus-out events and ibus fails to get the new focus.

BUG=rhbz#919863, rhbz#1136623

Review URL: https://codereview.appspot.com/7725045
---
 bus/inputcontext.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index b7e1ff8fb..d9924a1a8 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -773,6 +773,34 @@ _ic_process_key_event  (BusInputContext       *context,
         }
     }
 
+    /* If I move the focus from the URL entry box of google-chrome
+     * to the text buffer of gnome-terminal,
+     * focus-in/focus-out of google-chrome is caused after
+     * focus-in of gonme-terminal and gnome-terminal loses the focus.
+     * The following focus events are received in ibusimcontext:
+     * 1) (gnome-terminal:445): IBUS-WARNING **: 15:32:36:717  focus_in
+     * 2) (google-chrome:495): IBUS-WARNING **: 15:32:36:866  focus_out
+     * 3) (google-chrome:495): IBUS-WARNING **: 15:32:36:875  focus_in
+     * 4) (google-chrome:495): IBUS-WARNING **: 15:32:36:890  focus_out
+     * In 2), Just return because focused_context is not google-chrome.
+     * In 3), focused_context is changed from gnome-terminal to google-chrome
+     * In 4), focused_context is changed from google-chrome to faked_context.
+     *
+     * It seems google-chrome has a popup window of the prediction of URL
+     * and async focus-in/focus-out.
+     */
+    if (context->has_focus && context->engine == NULL &&
+        context->fake == FALSE) {
+        BusInputContext *focused_context =
+                bus_ibus_impl_get_focused_input_context (BUS_DEFAULT_IBUS);
+
+        if (focused_context != NULL && context != focused_context &&
+            (context->capabilities & IBUS_CAP_FOCUS) != 0) {
+            context->has_focus = FALSE;
+            bus_input_context_focus_in (context);
+        }
+    }
+
     /* ignore key events, if it is a fake input context */
     if (context->has_focus && context->engine && context->fake == FALSE) {
         bus_engine_proxy_process_key_event (context->engine,

From ab0be905a3c007b5ddec11ceada058879eca3b5c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 1 Oct 2014 16:23:54 +0900
Subject: [PATCH 273/816] Updated translations.

Updated gu.po kn.po mr.po ta.po te.po

Review URL: https://codereview.appspot.com/151850043
---
 po/gu.po | 294 +++++++++++++++++++++++++++++++-----------------------
 po/kn.po | 296 ++++++++++++++++++++++++++++++++-----------------------
 po/mr.po | 295 +++++++++++++++++++++++++++++++-----------------------
 po/ta.po | 280 +++++++++++++++++++++++++++++++---------------------
 po/te.po | 291 ++++++++++++++++++++++++++++++++----------------------
 5 files changed, 859 insertions(+), 597 deletions(-)

diff --git a/po/gu.po b/po/gu.po
index 001d39080..3ea30ed62 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,15 +8,15 @@
 # Ankit Patel <ankit@redhat.com>, 2010
 # sweta <swkothar@redhat.com>, 2009-2010
 # sweta <swkothar@redhat.com>, 2011-2013
-# sweta <swkothar@redhat.com>, 2013
+# sweta <swkothar@redhat.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:46+0000\n"
-"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
-"Language-Team: Gujarati (http://www.transifex.com/projects/p/fedora/language/gu/)\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-29 09:30+0000\n"
+"Last-Translator: sweta <swkothar@redhat.com>\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/ibus/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -87,7 +87,7 @@ msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ઇનપુટ પદ્દતિને ફેરબદલી કરવાનું ચાલુ અથવા ા બંધ કરવા માટે ટૂંકાણ કીઓ"
 
@@ -127,11 +127,11 @@ msgstr "ગુણધર્મ પેનલ બતાવો:"
 msgid "Language panel position:"
 msgstr "ભાષા પેનલનું સ્થાન:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતાવો"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ નામને બતાવો"
 
@@ -160,7 +160,8 @@ msgid "General"
 msgstr "સામાન્ય"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "ઉમેરો (_A)"
 
@@ -213,18 +214,18 @@ msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i>કિબોર્ડ ટૂંકાણ કીને દબાવીને અથવા પેનલ ચિહ્ન પર ક્લિક કરીને ઉપરની યાદીમાં પસંદ થયેલ એકમાંથી સક્રિય ઇનપુટ પદ્દતિને બદલી શકાય છે.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ઇનપુટ પદ્દતિ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
 
@@ -232,7 +233,7 @@ msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
 
@@ -262,184 +263,219 @@ msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
 msgid "<b>Startup</b>"
 msgstr "<b>શરૂઆત કરો</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "વિશે"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "બંધ કરો (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "એંજિનોને ફરીથી લોડ કરો"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus શરૂ કરવા દરમ્યાન એંજિનોને ફરીથી લોડ કરો"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "એંજિન ક્રમ"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ઇનપુટ પદ્દતિ યાદીમાં સંગ્રહેલ એંજિન ક્રમ"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME સ્વીચર વિન્ડો માટે પોપઅપનો મિલીસેકંડનો વિલંબ"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = વિન્ડોને તરત જ બતાવો. 0 &lt; મિલિસેકંડમાં વિલંબ. 0 &gt; વિન્ડોને બતાવો નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "સંગ્રહેલ આવૃત્તિ નંબર"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ની એકની આવૃત્તિ વચ્ચે તફાવત ચકાસવા માટે સંગ્રહેલ આવૃત્તિ નંબરને વાપરેલ હશે."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "લેટિન લેઆઉટ કે જેની પાસે ASCII નથી"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US લેઆઉટ એ લેટિન લેઆઉટ સાથે જોડાયેલ છે. ચલને કાઢી શકાય છે."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ને વાપરો"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "xmodmap ને ચલાવો જો .xmodmap અથવા .Xmodmap અસ્તિત્વમાં હોય જ્યારે ibus એંજિન બદલેલ હોય."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ટ્રીગર ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse માટે ટ્રીગર ટૂંકાણ કી"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "ટૂંકાણ કીઓને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ઇનપુટ પદ્દતિને ચાલુ કરવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "ટૂંકાણ કીઓને નિષ્ક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ઇનપુટ પદ્દતિને બંધ કરવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "પછીની એંજિન ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને બદલવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "પહેલાંની એંજિન ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને લાવવા માટે ટૂંકાણ કીઓ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "આપમેળે છુપાવો"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "ગુણધર્મ પેનલનું વર્તન. 0 = બતાવો નહિં, 1 = આપમેળે છુપાડો, 2 = હંમેસા બતાવો"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ભાષા પેનલ સ્થાન"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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 "ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી બાજુનો ખૂણો,  ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "સ્થિતિમાં ઇનપુટ કર્સરને અનૂસરો જે પેનલ હંમેશા બતાવેલ હોય"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "જો true હોય તો, પેનલ હંમેશા બતાવેલ છે તે સ્થિતિમાં ઇનપુટ કર્સરને અનૂસરે છે. જો false હોય તો, પેનલ સુધારેલ સ્થાન પર બતાવેલ છે."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "ગુણધર્મ પેનલને બતાવવા માટે મિલિસેકંડ"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "પ્રકાશિત થાય પછી ગુણધર્મ પેનલને બતાવવા માટે મિલિસેકંડ અથવા ગુણધર્મો બદલેલ છે"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "કોષ્ટકને જોવાની દિશા"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "કોષ્ટકને જોવાની દિશા. 0 = આડુ, 1 = ઊભુ "
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB ચિહ્નની RGBA કિંમત"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB ચિહ્ન એ લેઆઉટ શબ્દમાળાને બતાવે છે અને શબ્દમાળા એ RGBA કિંમત સાથે રેન્ડર થયેલ છે. RGBA કિંમત 1 હોઇ શકે છે. X11 માંથી રંગ નામ, 2. '#rrggbb' માંથી હેક્સ કિંમત જ્યાં 'r', 'g' અને 'b' એ લાલ, લીલો, અને વાદળીનાં હેક્સ આંકડા છે, 3. 'rgb(r,g,b)' રૂપમાં RGB રંગ અથવા 4. 'rgba(r,g,b,a)' રૂપમાં  RGBA રંગ જ્યાં 'r', 'g', અને 'b' એ ક્યાંતો સીમા 0 થી 255 માં પૂર્ણાંકો અથવા સીમા 0% થી 100% સીમામાં ટકાવારી કિંમતો, અને 'a' એ આલ્ફાની સીમા 0 થી 1 માં ફ્લોટીંગ પોઇંટ કિંમત છે."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "વૈવિધ્ય ફોન્ટ"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf નામ ઉપસર્ગને સાચવે છે"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "નામનું રૂપાંતરણને બંધ કરવા માટે DConf કીઓનાં ઉપસર્ગો"
 
@@ -453,29 +489,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "બીજા"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "ભાષા: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "કિબોર્ડ લેઆઉટ: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "લેખક: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "વર્ણન:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "વધારે..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -484,55 +529,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus પસંદગીઓને સુયોજિત કરો"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "કિબોર્ડ ટૂંકાણો"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "કિ કોડ:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "બદલનારો:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "અમલમાં મૂકો (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "રદ કરો (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "બરાબર (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "પહેલાંની ઇનપુટ પદ્દતિને બદલવા shift સાથે ટૂંકાણ વાપરો"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ડિમન ચાલી રહ્યુ નથી. શું તમે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -541,157 +582,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ઇનપુટ પદ્દતિને બદલી રહ્યા છે"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "ફક્ત એંજિન નામની યાદી કરો"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus માં જોડી શકાતુ નથી.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "ભાષા: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "એજિંન સુયોજિત નથી.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "વૈશ્ર્વિક એંજિનને સુયોજિત કરવામાં નિષ્ફળતા.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "વૈશ્ર્વિક એંજિનને મેળવવામાં નિષ્ફળતા.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "સિસ્ટમ રજીસ્ટરી કેશને વાંચો."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "રજીસ્ટરી કેશ FILE ને વાંચો."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "રજીસ્ટરી કેશ અયોગ્ય છે.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "સિસ્ટમ રજીસ્ટરી કેશને લખો."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "રજીસ્ટરી કેશ FILE ને લખો."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "પુન:સુયોજિત કરી રહ્યા છે.."
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "પૂર્ણ"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "એંજિનને સુયોજિત અથવા મેળવો"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon માંથી બહાર નીકળો"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "ઉપલબ્ધ એંજિનને બતાવો"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(અમલીકરણ થયેલ નથી)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ને પુન:શરૂ કરો"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "આવૃત્તિને બતાવો"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "રજીસ્ટરી કેશનાં સમાવિષ્ટને બતાવો"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "રજીસ્ટરી કેશને બનાવો"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon નાં D-Bus સરનામાંને છાપો"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "રૂપરેખાંકન કિંમતોને બતાવો"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "રૂપરેખાંકન કિંમતોને પુન:સુયોજિત કરો"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "આ જાણકારીને બતાવો"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "વપરાશ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "આદેશો:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s એ અજ્ઞાત આદેશ છે!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus સુધારો"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space એ હવે મૂળભૂત હોટકી છે."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "પસંદગીઓ "
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "બહાર નીકળો "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/kn.po b/po/kn.po
index efad3826a..1136e6904 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -4,7 +4,7 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# shanky <prasad.mvs@gmail.com>, 2013
+# shanky <prasad.mvs@gmail.com>, 2013-2014
 # shanky <prasad.mvs@gmail.com>, 2012
 # shankar <svenkate@redhat.com>, 2009-2010,2013
 # shanky <prasad.mvs@gmail.com>, 2011-2013
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-27 19:17+0000\n"
 "Last-Translator: shanky <prasad.mvs@gmail.com>\n"
 "Language-Team: Kannada <trans-kn@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -52,11 +52,11 @@ msgstr "ಇಚ್ಛೆಯ"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "ತೋರಿಸಬೇಡ"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಡಗಿಸು"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -86,7 +86,7 @@ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
 
@@ -120,17 +120,17 @@ msgstr "ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರ
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "ಗುಣದ ಪ್ಯಾನಲ್‌ ಅನ್ನು ತೋರಿಸು:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
@@ -159,7 +159,8 @@ msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "ಸೇರಿಸು (_A)"
 
@@ -212,18 +213,18 @@ msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i>ಸಕ್ರಿಯ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿರುವುದರಿಂದ ಮೇಲಿನ ಪಟ್ಟಿಯಲ್ಲಿನ ಬೇರೆಯೊಂದಕ್ಕೆ ಬದಲಾಯಿಸಲು ಕೀಲಿಮಣೆ ಸಮೀಪಮಾರ್ಗಗಳನ್ನು ಬಳಸಬಹುದು ಅಥವ ಪ್ಯಾನಲ್‌ ಚಿಹ್ನೆಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಬಹುದು.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
@@ -231,7 +232,7 @@ msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
 
@@ -261,184 +262,219 @@ msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭ
 msgid "<b>Startup</b>"
 msgstr "<b>ಆರಂಭ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "ಮುಚ್ಚು (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ಪ್ರಿಲೋಡ್ ಎಂಜಿನ್‌ಗಳು"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್‌ಗಳು"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "ಎಂಜಿನ್‌ಗಳ ಕ್ರಮ"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಪಟ್ಟಿಯಲ್ಲಿನ ಉಳಿಸಲಾದ ಎಂಜಿನ್‌ಗಳು"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪ್ಅಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಲು ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುಟಿಕೆ (ಪಾಪ್ಅಪ್) ವಿಳಂಬವನ್ನು ಹೊಂದಿಸಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400 ಆಗಿರುತ್ತದೆ. 0 = ಕಿಟಕಿಯನ್ನು ತಕ್ಷಣವೆ ತೋರಿಸು. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಹಿಂದಿನ/ಮುಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆ"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ನಡುವಿನ ವ್ಯತ್ಯಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿರುತ್ತದೆ."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ಯಾವುದೆ ASCII ಅನ್ನು ಹೊಂದಿರದ ಲ್ಯಾಟಿನ್ ವಿನ್ಯಾಸಗಳು (ಲೇಔಟ್‌)"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US ವಿನ್ಯಾಸವನ್ನು ಲ್ಯಾಟಿನ್‌ ವಿನ್ಯಾಸಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ವೇರಿಯಂಟ್‌ ಅನ್ನು ಬಿಡಬಹುದು."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ಅನ್ನು ಬಳಸು"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus ಅನ್ನು ಬದಲಾಯಿಸಿದಾಗ, .xmodmap ಅಥವ .Xmodmap ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ xmodmap ಅನ್ನು ಚಲಾಯಿಸಿ."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "ಗುಣದ ಪ್ಯಾನಲ್‌ನ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = ಯಾವಾಗಲೂ ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದರೆ ಇನ್‌ಪುಟ್ ತೆರೆಸೂಚಕವನ್ನು ಅನುಸರಿಸು"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "ಟ್ರೂ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದಲ್ಲಿ, ಇನ್‌ಪುಟ್ ತೆರೆಸೂಚಕವನ್ನು ಪ್ಯಾನಲ್‌ ಅನುಸರಿಸುತ್ತದೆ. ಫಾಲ್ಸ್ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ನಿಶ್ಚಿತ ಸ್ಥಳದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "ಗುಣದ ಪ್ಯಾನಲ್‌ ಅನ್ನು ತೋರಿಸಬೇಕಿರುವ ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳು:"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "ಗಮನವು ಅಥವ ಗುಣಗಳನ್ನು ಬದಲಾಯಿಸಿದ ನಂತರ ಗುಣದ ಪ್ಯಾನಲ್ ಅನ್ನು ತೋರಿಸಬೇಕಿರುವ ಮಿಲಿಸೆಕೆಂಡುಗಳು."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB ಚಿಹ್ನೆಯ RGBA ಮೌಲ್ಯ"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB ಚಿಹ್ನೆಯು ವಿನ್ಯಾಸದ ವಾಕ್ಯಾಂಶವನ್ನು ತೋರಿಸುತ್ತದೆ ಮತ್ತು ವಾಕ್ಯಾಂಶವು RGBA ಮೌಲ್ಯದಿಂದ ರೆಂಡರ್ ಮಾಡಲಾಗುತ್ತದೆ. RGBA ಮೌಲ್ಯವು 1. X11 ಇಂದ ಒಂದು ಬಣ್ಣದ ಮೌಲ್ಯವಾಗಿರಬಹುದು, 2. '#rrggbb' ರೂಪದಲ್ಲಿರುವ  ಒಂದು ಹೆಕ್ಸ್‌ ಮೌಲ್ಯವಾಗಿರಬಹುದು, ಇಲ್ಲಿ 'r', 'g' ಮತ್ತು 'b' ಎನ್ನುವವು ಅನುಕ್ರಮವಾಗಿ ಕೆಂಪು, ಹಸಿರು, ಮತ್ತು ನೀಲಿ ಬಣ್ಣದ ಹೆಕ್ಸ್‌ ಅಂಕಿಯಾಗಿರುತ್ತವೆ, 3. 'rgb(r,g,b)' ರೂಪದಲ್ಲಿರುವ ಒಂದು RGB ಬಣ್ಣವಾಗಿರಬಹುದು, ಅಥವ 4. 'rgba(r,g,b,a)' ರೂಪದಲ್ಲಿರುವ RGBA ಬಣ್ಣವಾಗಿರಬಹುದು, ಇಲ್ಲಿ 'r', 'g', ಮತ್ತು 'b' ಗಳು 0 ಇಂದ 255 ಒಳಗಿನ ಪೂರ್ಣಾಂಕಗಳಾಗಿರುತ್ತದೆ ಅಥವ 0% ಇಂದ 100% ರ ಒಳಗಿನ ಪ್ರತಿಶತ ಮೌಲ್ಯಗಳಾಗಿರುತ್ತದೆ, ಮತ್ತು 'a' ಎನ್ನುವುದು ಆಲ್ಫಾದ 0 ಇಂದ 1 ರ ಒಳಗಿನ ಒಂದು ತೇಲುವ ಬಿಂದುವಾಗಿರುತ್ತದೆ."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf ಹೆಸರುಗಳು ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು ಹಾಗೆಯೆ ಇರಿಸಿಕೊಳ್ಳುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ಹೆಸರಿನ ಪರಿವರ್ತನೆಯನ್ನು ಬದಲಿಸುವ DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
 
@@ -452,29 +488,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "ಭಾಷೆ: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "ಕತೃ: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "ವಿವರಣೆ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "ರದ್ದು ಮಾಡು (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "ಇನ್ನಷ್ಟು..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -483,55 +528,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸು"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "ಕೀಲಿ ಸಂಕೇತ:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "ಮಾರ್ಪಡಕಗಳು:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "ಅನ್ವಯಿಸು (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "ಅಳಿಸು (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "ರದ್ದು ಮಾಡು (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "ಸರಿ (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಸಮೀಪಮಾರ್ಗವನ್ನು ಬಳಸಿ"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -540,157 +581,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಆರಂಭಿಸಲಾಗಿಲ್ಲ"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬದಲಿಸುವಿಕೆ"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus ನೊಂದಿಗೆ ಸಂಪರ್ಕಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "ಭಾಷೆ: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಓದು."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯು ಅಮಾನ್ಯವಾಗಿದೆ.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಬರೆ."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಬರೆ."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "ಮರುಹೊಂದಿಸುವಿಕೆ..."
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "ಮುಗಿಯಿತು"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "ಎಂಜಿನ್  ಅನ್ನು ಹೊಂದಿಸು ಅಥವ ಪಡೆದುಕೊ"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon ಇಂದ ನಿರ್ಗಮಿಸು"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "ಲಭ್ಯವಿರುವ ಎಂಜಿನ್‌ಗಳನ್ನು ತೋರಿಸು"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ಅನ್ನು ಮರಳಿ ಸ್ಥಾಪಿಸು"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯಲ್ಲಿರುವ ವಿಷಯವನ್ನು ತೋರಿಸು"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ರಚಿಸು."
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon ನ D-Bus ವಿಳಾಸವನ್ನು ಮುದ್ರಿಸು"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "ಸಂರಚನೆಯ ಮೌಲ್ಯಗಳನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "ಸಂರಚನಾ ಮೌಲ್ಯಗಳನ್ನು ಮರುಹೊಂದಿಸು"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "ಈ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "ಆದೇಶಗಳು:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ಎನ್ನುವುದು ಗೊತ್ತಿರದ ಆದೇಶ!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus ಅಪ್‌ಡೇಟ್‌"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space ಎನ್ನುವುದು ಈಗ ಪೂರ್ವನಿಯೋಜಿತ ಹಾಟ್‌ಕೀಲ್ ಆಗಿರುತ್ತದೆ."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "ಆದ್ಯತೆಗಳು "
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "ಬಿಟ್ಟು ಬಿಡು "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/mr.po b/po/mr.po
index a1a393575..25be8af73 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,12 +7,13 @@
 # Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009
 # sandeeps <sshedmak@redhat.com>, 2009,2012
 # sandeeps <sshedmak@redhat.com>, 2009,2011-2013
+# sandeeps <sshedmak@redhat.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-22 06:57+0000\n"
 "Last-Translator: sandeeps <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +52,11 @@ msgstr "मनपसंत"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "पुन्हा दाखवू नका"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "स्व छुपे करा"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -85,7 +86,7 @@ msgstr "मागील इंपुट पद्धत:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "इंपुट पद्धत सुरू किंवा बंद करण्यासाठी शार्टकट किज्"
 
@@ -119,17 +120,17 @@ msgstr "भाषा पट्टी कसे दाखवायचे कि
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "गुणधर्म पटल दाखवा:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "भाषा पटलाचे स्थान:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "चिन्ह प्रणाली ट्रेवर दाखवा"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
 
@@ -158,7 +159,8 @@ msgid "General"
 msgstr "सर्वसाधारण"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "समावेष करा (_A)"
 
@@ -211,18 +213,18 @@ msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i> कळफलक शॉर्टकट किज दाबून किंवा पटलावरील चिन्ह क्लिक करून वरील सूचीपासून पसंत केलेल्या सक्रीय इंपुट पद्धतीचा वापर शक्य आहे.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "इंपुट पद्धत"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
 
@@ -230,7 +232,7 @@ msgstr "प्रणाली कळफलक (XKB) मांडणीचा व
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कळफलक मांडणी</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
 
@@ -260,184 +262,219 @@ msgstr "प्रवेशवेळी ibus सुरू करा"
 msgid "<b>Startup</b>"
 msgstr "<b>स्टार्टअप</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "विषयी"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "बंद करा (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "प्रीलोड इंजीन्स्"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus सुरू होतेवेळी इंजीन आधिपासूनच लोड करा"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "इंजिनचे क्रम"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "इंपुट मेथड सूचमध्ये इंजिनचे क्रम साठवे"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME स्वीचर पटलकरिता डिले मिलिसेकंद पॉपअप करा"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. पूर्वनिर्धारित 400. 0 = पटल पटकन दाखवा. 0 &lt; मिलिसेकंदातील विलंब. 0 &gt; पटल दाखवू नका व मागील किंवा पुढील इंजिन्स्चा वापर करू नका."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "आवृत्ती क्रमांक साठवले"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 मधील भेद जाणून घेण्यासाठी केला जाईल."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "लॅटिन मांडणी ज्याकडे ASCII नाही"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "लॅटिन मांडणीमध्ये US मांडणी समावेश केली आहे. वेरिएंट आवश्यक नाही."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmapचा वापर करा"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus इंजिन्सचा वापर करतेवेळी, xmodmap किंवा .Xmodmap अस्तित्वात असल्यास xmodmap चालवा."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "शॉर्टकट किज् ट्रिगर करा"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse करिता शॉर्टकट किज सुरू करा"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "शार्टकट किज् सुरू करा"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "इंपुट पद्धती सुरू करण्यासाठी शार्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "शार्टकट किज् बंद करा"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "इंपुट पद्धती बंद करण्यासाठी शार्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "पुढील इंजीनचे शार्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "सूचीतील पुढील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "मागील इंजीनचे शॉर्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "स्वयं लपवा"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "गुणधर्म पटलाचे वर्तन. 0 = दाखवू नका, 1 = स्व छुपे करा, 2 = नेहमी दाखवा"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "भाषा पटलचे स्थान"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "पटल नेहमी दाखवले जात असल्यास इंपुट कर्सरचे पालन करा"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "खरे असल्यास, पटल नेहमी दाखवले जात असल्यास पटल इंपुट कर्सरचे पालन करते. खोटे असल्यास, पटल ठराविक ठिकाणी दाखविले जाते."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "गुणधर्म पटल दाखवण्याकरिता मिलिसेकंद"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "फोकस-इन किंवा गुणधर्म बदलवण्यानंतर, गुणधर्म पटल दाखवण्याकरिता मिलिसेकंद."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "लुकअप टेबलचे निर्देशन"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "लुकअप टेबलचे निर्देशन. 0 = Horizontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "इंपुट पद्धतीचे नाव दाखवा"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB चिन्हाचे RGBA मूल्य"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB चिन्ह मांडणी स्ट्रिंग दाखवते आणि स्ट्रिंग RGBA मूल्यसह दाखविले जाईल. RGBA मूल्य 1 असू शकते. X11 पासून रंग नाव, 2. फॉर्म '#rrggbb' मधील हेक्स मूल्य जेथे 'r', 'g' आणि 'b' हे रेड, ग्रीन, आणि ब्लुचे हेक्स अंक आहेत, 3. RGB रंग 'rgb(r,g,b)' स्वरूपात किंवा 4. एक RGBA रंग, 'rgba(r,g,b,a)' स्वरूपात जेथे 'r', 'g', आणि 'b' एकतर इंटिजर्स असतात, 0 ते 255 व्याप्तिमध्ये किंवा टक्केवारि मूल्य, 0% ते 100% अशा व्याप्ति अंतर्गत, आणि 'a' फ्लोटिंग पॉइंट मूल्य आहे, अल्फाच्या 0 ते 1 अशा व्याप्तिमध्ये."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "स्वपसंत फॉन्ट वापरा"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "मनपसंत फॉन्ट"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "भाषा पटल करीता स्वपसंत फॉन्ट नाव"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "ग्लोबल इंपुट पद्धत नीवडा"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "पूर्वनितर्धारीतपणे इंपुट पद्धत सुरू करा"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू करा"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf प्रिझर्व्ह नेम प्रिफिक्सेस्"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "नाव रूपांतर थांबवण्याकरीता DConf किज्चे प्रिफिक्सेस्"
 
@@ -451,29 +488,38 @@ msgstr "सर्वहक्काधिकार (c) 2007-2010 पेंग 
 msgid "Other"
 msgstr "इतर"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "भाषा: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "कळफलक मांडणी: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "लेखक: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "वर्णन:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "इंपुट पद्धत नीवडा"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "आणखी…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -482,55 +528,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus पसंती सुरू करा"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "कळफलक शार्टकट"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "कि कोड:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "मॉडिफायर:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "लागू करा (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "नष्ट करा (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "रद्द करा (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "ठिक आहे (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "मागील इंपुट पद्धतीचा वापर करण्यासाठी शिफ्टसह शार्टकटचा वापर करा"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus डिमन सुरू नाही. तुम्हाला ते सुरू करायचे?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -539,157 +581,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s करीता कळफलक शार्टकट नीवडा"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "इंपुट पद्धतींचा वापर करत आहे"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "फक्त इंजिन नाव सूचीत दाखवा"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus शी जोडणी अशक्य.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "भाषा: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "इंजिन ठरवले नाही.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "प्रणाली रेजिस्ट्रि कॅशे वाचा."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "रेजिस्ट्रि कॅशे FILE वाचा."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "रेजिस्ट्रि कॅशे अवैध आहे.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "प्रणाली रेजिस्ट्रि कॅशे लिहा."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "रेजिस्ट्रि कॅशे FILE लिहा."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "पुन्हा सेट करत आहे…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "पूर्ण झाले"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "इंजिन सेट किंवा प्राप्त करा"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon पासून बाहेर पडा"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "उपलब्ध इंजिन्स दाखवा"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(लागू केले नाही)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon पुन्हा सुरू करा"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "आवृत्ती दाखवा"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "रेजिस्ट्रि कॅशेमधील अंतर्भुत माहिती दाखवा"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "रेजिस्ट्रि कॅशे निर्माण करा"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon च्या D-Bus पत्त्याची छपाई करा "
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "संरचना मूल्ये दाखवा"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "संरचना मूल्य मूळस्थितीत आणा"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "ही माहिती दाखवा"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "वापर: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "आदेश:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s अपरिचीत आदेश आहे!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus सुधारणा"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space आत्ता पूर्वनिर्धारित हॉटि आहे."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat.com>, 2009, 2010."
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "आवड निवड"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "पुन्हा चालू करा"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "बाहेर पडा "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ta.po b/po/ta.po
index 9aa8184ab..fdd103ad1 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-17 09:18+0000\n"
 "Last-Translator: shkumar <shkumar@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "முந்தைய உள்ளீடு முறை:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
 
@@ -130,11 +130,11 @@ msgstr "பண்புகள் பலகத்தைக் காட்டு:
 msgid "Language panel position:"
 msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
@@ -163,7 +163,8 @@ msgid "General"
 msgstr "பொது"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "சேர் (_A)"
 
@@ -223,11 +224,11 @@ msgstr "<small><i>மேலே உள்ள பட்டியலில் வ
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
@@ -235,7 +236,7 @@ msgstr "கணினி விசைப்பலகை (XKB) அமைப்ப
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
@@ -265,184 +266,219 @@ msgstr "புகுபதிவில் ibusஐ துவக்கு"
 msgid "<b>Startup</b>"
 msgstr "<b>துவக்கம்</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "பற்றி"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "மூடு (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "முன்ஏற்றல் இயந்திரங்கள்"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus துவங்கும் போது முன்னேற்றப்பட்ட எந்திரங்கள் "
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "எஞ்சின்கள் வரிசை"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "உள்ளீடு முறை பட்டியலில் எஞ்சின்கள் வரிசை சேமிக்கப்பட்டது"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME மாற்ற சாளரத்திற்கான பாப்-அப் தாமத மில்லிசெகன்ட்"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 &lt; தாமத மில்லிசெகன்ட். 0 &gt; சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "சேமிக்கப்பட்ட பதிப்பு எண்"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 இல் ஒன்று ஆகியவற்றுக்கு இடையே உள்ள வேறுபாட்டைக் கண்டறியப் பயன்படும்."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ASCII கொண்டில்லாத இலத்தீன் லேயவுட்டுகள்"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "அமெரிக்க லேயவுட் இலத்தீன் லேயவுட்டுகளுடன் இணைக்கப்படுகிறது. இதன் மாற்று வகையை புறக்கணிக்கலாம்."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ஐப் பயன்படுத்து"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus எஞ்சின்கள் மாற்றப்படும் போது .xmodmap அல்லது .Xmodmap வெளியேறினால் xmodmap ஐ இயக்கு."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "குறுக்குவிசைகளை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse க்கான குறுக்கு விசைகளை இயக்கு"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "குறுக்குவிசைக்களை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "உள்ளீடு முறையை இயக்கும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "குறுக்குவிசைகளை செயல்நீக்கு"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "உள்ளீடு முறையை நிறுத்தும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "அடுத்த இயந்திர குறுக்குவிசை"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "பட்டியலில் அடுத்த உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "முந்தைய இயந்திர குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "முந்தைய உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "தானாக மறை"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "பண்புகள் பலகத்தின் நடத்தை. 0 = காண்பிக்க வேண்டாம், 1 = தானாக மறை, 2 = எப்போதும் காண்பி"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "மொழி பேனல் இடம்"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் சுட்டியைப் பின் தொடரவும்"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "ஆம் என அமைக்கப்பட்டால், பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் சுட்டியைப் பின் தொடரும். இல்லை என்று அமைக்கப்பட்டால் பலகம் ஒரு குறிப்பிட்ட இடத்திலேயே இருக்கும்."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "பண்புகள் பலகத்தை காட்ட வேண்டிய மில்லிசெக்கன்ட்"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "பண்புகள் பலகத்தில் கவனம் செலுத்திய பிறகு அல்லது பண்புகளை மாற்றிய பிறகு பலகத்தைக் காட்ட வேண்டிய மில்லிசெக்கன்ட்."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "காணும் அட்டவணையின் திசை"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB சின்னத்தின் RGBA மதிப்பு"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB சின்னம் லேயவுட் சரத்தைக் காண்பிக்கிறது, அந்தச் சரமானது RGBA மதிப்புட்ன காட்சியாக்கப்படுகிறது. RGBA மதிப்பு 1. X11 இலிருந்து ஒரு நிறத்தின் பெயராகவோ, 2. '#rrggbb' என்ற வடிவத்தில் ஹெக்ஸ் மதிப்பாகவோ (இங்கு 'r', 'g' மற்றும் 'b' ஆகியவை சிவப்பு, பச்சை மற்றும் நீலத்தின் ஹெக்ஸ் மதிபுகள்), 3. 'rgb(r,g,b)' என்ற வடிவத்தில் ஒரு நிறத்தின் RGB நிறமாகவோ அல்லது 4. 'rgba(r,g,b,a)' என்ற வடிவத்தில் (இங்கு 'r', 'g' மற்றும் 'b' ஆகியவை 0 முதல் 255 க்கு இடைப்பட்ட வரம்பிலான முழு எண்கள் அல்லது 0% முதல் 100% க்கு இடைப்பட்ட வரம்பிலான சதவீதங்களாகும், 'a' என்பது 0 முதல் 1 ஆல்ஃபா வரையிலான வரம்பிலமைந்த ஃப்ளோட்டிங் பாயின்ட் எண்ணாகும்) ஒரு RGBA நிறமாகவோ இருக்கலாம்."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "தனிப்பயன் எழுத்துரு"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "மொழி பலகத்துக்கான தனிப்பயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -456,29 +492,38 @@ msgstr "பதிப்புரிமை (c) 2007-2010 Peng Huang\nபதிப
 msgid "Other"
 msgstr "வேறு"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "விசைப்பலகை அமைப்பு: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "ஆசிரியர்: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "விளக்கம்:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "மேலும்…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -487,55 +532,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus முன்னுரிமைகளை அமை"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "விசைப்பலகை குறுக்குவழிகள்"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "விசை குறியீடு:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "மாற்றிகள்;"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "செயல்படுத்து (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "அழி (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "ரத்து (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "சரி (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் பயன்படுத்தவும்"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -544,157 +585,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus உடன் இணைக்க முடியாது.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "கணினி பதிவக தேக்ககத்தை வாசி."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "பதிவக தேக்கக FILE ஐ வாசி."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "பதிவக தேக்ககம் செல்லுபடியாகாதது.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "கணினி பதிவக தேக்ககத்தில் எழுது."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "பதிவக தேக்கக FILE இல் எழுது."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "மீட்டமைக்கிறது…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "முடிந்தது"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "எஞ்சினை அமை அல்லது பெறு"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon இலிருந்து வெளியேறு"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "இருக்கும் எஞ்சின்களைக் காட்டு"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(செயல்படுத்தப்படவில்லை)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ஐ மறுதுவக்கு"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "பதிப்பைக் காட்டு"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "பதிவக தேக்கக உள்ளடக்கத்தைக் காண்பி"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "பதிவக தேக்ககத்தை உருவாக்கு"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon இன் D-Bus முகவரியை அச்சிடு"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "அமைவாக்க மதிப்புகளைக் காண்பி"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "அமைவாக்க மதிப்புகளை மீட்டமை"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "இந்தத் தகவலைக் காட்டு"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "கட்டளைகள் :\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s என்பது தெரியாத கட்டளை!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus புதுப்பிப்பு"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "இப்போது Super+space என்பது முன்னிருப்பு குறுக்குவிசையாகும்."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "முன்னுரிமைகள் "
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "வெளியேறு "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/te.po b/po/te.po
index 4e95b6e5f..e6433564e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,15 +7,16 @@
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2009
 # Krishnababu Krothapalli <krisnababu@gmail.com>, 2012-2013
+# Krishnababu Krothapalli <krisnababu@gmail.com>, 2014
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011,2014
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
-"Last-Translator: ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-09-25 14:22+0000\n"
+"Last-Translator: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
 "Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@ msgstr "మునుపటి ఇన్‌పుట్ పద్ధతి:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ఇన్‌పుట్ పద్ధతిని చేతనించుటకు లేదా అచేతనించుటకు అడ్డదారి మీటలు"
 
@@ -127,11 +128,11 @@ msgstr "ప్రాపర్టీ ప్యానలును చూపిం
 msgid "Language panel position:"
 msgstr "భాషా ప్యానల్ స్థానం:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "వ్యవస్థ పళ్లెము పై ప్రతీకను చూపించు"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
@@ -160,7 +161,8 @@ msgid "General"
 msgstr "సాధారణం"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "జతచేయి (_A)"
 
@@ -213,18 +215,18 @@ msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i>పై జాబితాలోని ఇన్పుట్ పద్దతిని కీబోర్డ్ షార్ట్‌కట్ కీలతో గాని లేదా పానల్ ఐకాన్ నొక్కిగాని ఎంపికచేసి, ఏక్టివ్ ఇన్పుట్ పద్దతిని దానికి మార్చవచ్చు.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ఇన్‌పుట్ పద్ధతి"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
@@ -232,7 +234,7 @@ msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>కీబోర్డు నమూనా</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "అన్ని అనువర్తనాలలోనూ ఇన్పుట్ పద్దతిని పంచుకొను"
 
@@ -262,184 +264,219 @@ msgstr "ప్రవేశించేప్పుడు ఐబస్‌ను 
 msgid "<b>Startup</b>"
 msgstr "<b>ప్రారంభము</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "గురించి"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "మూసివేయి (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ముందుగా లోడైన యంత్రాలు"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ఐబస్ ప్రారంభము నందు యంత్రాలను ముందుగా లోడుచేయి"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "యంత్రాల క్రమం"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ఇన్పుట్ పద్ధతి జాబితా నందు భద్రపరచిన యంత్రాల క్రమం"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME స్విచర్ విండో కొరకు పాపప్ ఆలస్యం మిల్లీసెకన్లలో"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 &lt; ఆలస్యం మిల్లీసెకన్లలో. 0 &gt; విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "భద్రపరచిన రూపాంతరం సంఖ్య"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 "భద్రపరచిన రూపాంతరం సంఖ్య అనునది గతంలో స్థాపించిన ఐబస్ రూపాంతరానికి మరియు ప్రస్తుత ఐబస్ రూపాంతరానికి మధ్యని తేడాను పరిశీలించుటకు ఉపయోగించును."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ASCII లేని లాటిన్ నమూనాలు"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US నమూనా లాటిన్ నమూనాలకు కలుపబడెను. వేరియంట్‌ను విస్మరించవచ్చు."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ఉపయోగించు"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus ఇంజన్లు మార్చినప్పుడు .xmodmap లేదా .Xmodmap ఉంటే గనుక xmodmap నడుపుము."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "అడ్డదారి మీటలను నొక్కండి"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse కొరకు ట్రిగ్గర్ అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "అడ్డదారి మీటలను చేతనించు"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ఇన్‌పుట్ పద్ధతి చేతనించుటకు అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "అడ్డదారి మీటలను అచేతనించు"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ఇన్‌పుట్ పద్ధతి అచేతనించుటకు అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "తరువాతి యంత్రానికి అడ్డదార్లు"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "జాబితాలోని తరువాతి ఇన్పుట్ పద్ధతినకు మారుటకు అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "మునుపటి యంత్ర అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "జాబితాలోని మునుపటి ఇన్‌పుట్ పద్ధతినకు మారుటకు అడ్డదారి మీటలు"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "స్వయంగా దాగు"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "ప్రోపర్టీ పానల్ యొక్క ప్రవర్తన. 0 = చూపవద్దు, 1 = స్వయంచాలకంగా దాచివేయి, 2 = ఎల్లప్పుడూ చూపు"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "భాషా ప్యానల్ స్థానం"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "పానల్ గనుక ఎల్లప్పుడూ చూపబడుతూంటే ఇన్పుప్ కర్సర్‌ను అనుసరించుము"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "true అయితే, పానల్ ఎల్లప్పుడూ చూపబడుతూన్న సందర్బంలో ఇన్పుప్ కర్సర్‌ను అనుసరించును. false అయితే, పానల్ ఒక స్థిరమైన స్థానంలో చూపబడును."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "ప్రోపర్టీ పానల్ చూపుటకు మిల్లీసెకన్లు"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "దృష్టిసారించిన తరువాత లేదా లక్షణాలు మార్చిన తరువాత ప్రోపర్టీ పానల్ చూపుటకు మిల్లీసెకన్లు."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "లుకప్ పట్టిక సర్దుబాటు"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = అడ్డము, 1 = నిలువు"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB ప్రతిమ యొక్క RGBA విలువ"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB ప్రతిమ అనేది నమూనా స్ట్రింగ్ చూపును మరియు ఆ స్ట్రింగ్ RGBA విలువతో రెండర్ అగును. RGBA విలువ ఇలా ఉండగలదు 1. X11 నుండి ఒక రంగు, 2. '#rrggbb' నుండి హెక్స్ విలువ ఇచట 'r', 'g' మరియు 'b' లు ఎరుపు, పచ్చ, మరియు నీలం యొక్క హెక్స్ అంకెలు, 3. RGB రంగు 'rgb(r,g,b)' నుండి లేదా 4. RGBA రంగు 'rgba(r,g,b,a)' రూపంలో ఇచట 'r', 'g', మరియు 'b' లు 0 నుండి 255 వరకు పూర్ణాంకాలు గాని లేదా 0% నుండి 100% విస్తృతిలో శాతపు విలువలు గాని అవుతాయి, మరియు 'a' అనేది అల్ఫా యొక్క 0 నుండి 1 విస్తృతిలో ఫ్లోటింగ్ పాయింట్ విలువ అవుతుంది."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "అనురూపిత ఖతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "భాషా ప్యానల్ కొరకు అనురూపిత ఖతి పేరును ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "అనురూపిత ఖతి"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "భాష ప్యానల్ కొరకు అనురూపించిన ఖతి పేరు"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "అనువర్తన కిటికీ నందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "సార్వత్రిక ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "పేరు మార్పును ఆపుటకు DConf మీటల ప్రిఫిక్సులు"
 
@@ -453,29 +490,38 @@ msgstr "నకలుహక్కు (c) 2007-2010 Peng Huang\nనకలుహక
 msgid "Other"
 msgstr "ఇతర"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "భాష: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "కీబోర్డు నమూనా: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "మూలకర్త: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "వివరణ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "మరిన్ని..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -484,55 +530,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "ఐబస్ ప్రాధాన్యతలను అమర్చు"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "కీబోర్డు అడ్డదార్లు"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "మీట సంకేతం:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "సవరణిలు:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "అనువర్తించు (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "తొలగించు (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "దయచేసి మీటను వత్తండి (లేదా మీటల సమ్మేళనం)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "రద్దుచేయి (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "సరే (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "మునుపటి ఇన్పుట్ పద్దతికి మారుటకు అడ్డదారిని shift తో ఉపయోగించు"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "ఐబస్ డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -541,157 +583,168 @@ msgid ""
 msgstr "ఐబస్ ప్రారంభమైంది! మీరు ఐబస్ ఉపయోగించలేకుంటే, మీ $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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "ఐబస్ డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ఇన్పుట్ పద్దతులు మార్చుట"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "యంత్రం పేరు మాత్రమే జాబితాచేయి"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "ఐబస్‌కు అనుసంధానం కాలేదు.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "భాష: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "ఏ యంత్రము అమర్చలేదు.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "సార్వత్రిక యంత్రం అమర్చుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "సార్వత్రిక యంత్రం పొందుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ చదువు."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "రిజిస్ట్రీ క్యాచీ FILE చదువు."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "రిజిస్ట్రీ క్యాచీ చెల్లనిది.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ వ్రాయి."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "రిజిస్ట్రీ క్యాచీ FILE వ్రాయి."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "తిరిగివుంచుతోంది..."
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "అయినది"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "యంత్రాన్ని అమర్చు లేదా పొందు"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon నిష్క్రమించు"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "అందుబాటులోని యంత్రాలను చూపించు"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(అమలు చేయలేదు)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon పునఃప్రారంభించు"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "రూపాంతరాన్ని చూపించు"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "రిజిస్ట్రీ క్యాచీ యొక్క కాంటెంట్ చూపు"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "రిజిస్ట్రీ క్యాచీ సృష్టించు"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon యొక్క D-Bus చిరునామా ముద్రించు"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "ఆకృతీకరణ విలువలను చూపుము"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "ఆకృతీకరణ విలువలను తిరిగివుంచుము"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "ఈ సమాచారం చూపించు"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "వాడుక: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "ఆదేశాలు:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s తెలియని ఆదేశం!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "ఐబస్ నవీకరణ"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "ఇప్పుడు Super+space అప్రమేయ హాట్‌కీ."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-14."
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు "
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "నిష్క్రమించు "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"

From bb818e438599f080a0cffb0b7573d9a646cf3b1a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 28 Oct 2014 11:28:46 +0900
Subject: [PATCH 274/816] Fix not to SEGV ibus-ui-gtk3 with wrong
 'preload-engines' value.

Fedora internal patch could save engines from the result of
'setxkbmap -query' but they do not exist in simple.xml likes
'xkb:cn::chi' while now the current implementation converts
those engines to 'xkb:us::eng'.

BUG=https://code.google.com/p/ibus/issues/detail?id=1744
TEST=ui/gtk3

Review URL: https://codereview.appspot.com/158640043
---
 ui/gtk3/panel.vala | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 76cea238a..7b99fdf51 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -790,6 +790,15 @@ class Panel : IBus.PanelService {
 
         var engines = m_bus.get_engines_by_names(names);
 
+        /* Fedora internal patch could save engines not in simple.xml
+         * likes 'xkb:cn::chi'.
+         */
+        if (engines.length == 0) {
+            names =  {"xkb:us::eng"};
+            m_settings_general.set_strv("preload-engines", names);
+            engines = m_bus.get_engines_by_names(names);
+	}
+
         if (m_engines.length == 0) {
             m_engines = engines;
             switch_engine(0, true);

From e2507263817926ceb97511da3d617934d4b73443 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Thu, 13 Nov 2014 11:23:38 +0900
Subject: [PATCH 275/816] ibus-setup tries C since en_US.UTF-8 is not installed
 in Debian by default.

BUG=https://code.google.com/p/ibus/issues/detail?id=1747
TEST=setup

Review URL: https://codereview.appspot.com/166420043
Patch from Osamu Aoki <osamu@debian.org>.
---
 setup/enginecombobox.py |  2 +-
 setup/enginedialog.py   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py
index 2a2a6777a..199ed964f 100644
--- a/setup/enginecombobox.py
+++ b/setup/enginecombobox.py
@@ -78,7 +78,7 @@ def set_engines(self, engines):
         keys.sort(key=functools.cmp_to_key(locale.strcoll))
         loc = locale.getlocale()[0]
         # None on C locale
-        if loc == None:
+        if loc == None or loc == 'C':
             loc = 'en_US'
         current_lang = IBus.get_language_name(loc)
         # move current language to the first place
diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index 8a5690122..2b179adcc 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -325,21 +325,26 @@ def set_engines(self, engines):
 
             # Retrieve Untranslated language names.
             backup_locale = locale.setlocale(locale.LC_ALL, None)
-            try:
-                locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+            def __set_untrans_with_locale(en_locale):
+                locale.setlocale(locale.LC_ALL, en_locale)
                 untrans = IBus.get_language_name(e.get_language())
                 if untrans == None:
                     untrans = ''
                 self.__untrans_for_lang[l] = untrans
+            try:
+                __set_untrans_with_locale('en_US.UTF-8')
             except locale.Error:
-                pass
+                try:
+                    __set_untrans_with_locale('C')
+                except locale.Error:
+                    pass
             locale.setlocale(locale.LC_ALL, backup_locale)
 
         keys = list(self.__engines_for_lang.keys())
         keys.sort(key=functools.cmp_to_key(locale.strcoll))
         loc = locale.getlocale()[0]
         # None on C locale
-        if loc == None:
+        if loc == None or loc == 'C':
             loc = 'en_US'
         current_lang = IBus.get_language_name(loc)
         # move current language to the first place

From de3541d2a26c673f27c068559f6d363064e03760 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 13 Nov 2014 11:28:43 +0900
Subject: [PATCH 276/816] Remove "Release" modifiers key on ibus-setup.

BUG=https://code.google.com/p/ibus/issues/detail?id=1748
TEST=setup

Review URL: https://codereview.appspot.com/167570043
---
 setup/keyboardshortcut.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 91595f74e..86463cbd7 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -105,20 +105,16 @@ def __init_ui(self):
                                         Gtk.CheckButton.new_with_mnemonic("_Hyper"),
                                         Gdk.ModifierType.HYPER_MASK))
         # <CapsLock> is not parsed by gtk_accelerator_parse()
-        # FIXME: Need to check if ibus gtk panel can enable <Release>.
-        self.__modifier_buttons.append(("Release",
-                                        Gtk.CheckButton.new_with_mnemonic("_Release"),
-                                        Gdk.ModifierType.RELEASE_MASK))
+        # <Release> is not supported by XIGrabKeycode()
         for name, button, mask in self.__modifier_buttons:
             button.connect("toggled", self.__modifier_button_toggled_cb, name)
 
         table.attach(self.__modifier_buttons[0][1], 0, 1, 0, 1)
         table.attach(self.__modifier_buttons[1][1], 1, 2, 0, 1)
         table.attach(self.__modifier_buttons[2][1], 2, 3, 0, 1)
-        table.attach(self.__modifier_buttons[3][1], 3, 4, 0, 1)
-        table.attach(self.__modifier_buttons[4][1], 0, 1, 1, 2)
-        table.attach(self.__modifier_buttons[5][1], 1, 2, 1, 2)
-        table.attach(self.__modifier_buttons[6][1], 2, 3, 1, 2)
+        table.attach(self.__modifier_buttons[3][1], 0, 1, 1, 2)
+        table.attach(self.__modifier_buttons[4][1], 1, 2, 1, 2)
+        table.attach(self.__modifier_buttons[5][1], 2, 3, 1, 2)
         hbox.pack_start(table, True, True, 4)
         self.pack_start(hbox, False, True, 4)
 

From a7abce698f40e60275c46f05967e8cc369769e4b Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Wed, 19 Nov 2014 18:10:05 +0900
Subject: [PATCH 277/816] Fixes ibus_engine_update_lookup_table_fast method

gnome shell needs the previous page and next page
to correctly show the page up/down arrows,
send three pages instead of one page.

URL: https://bugzilla.gnome.org/show_bug.cgi?id=703020

BUG=

Review URL: https://codereview.appspot.com/164540045
Patch from Peng Wu <alexepico@gmail.com>.
---
 src/ibusengine.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 53d57df11..4758f82f9 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -1422,12 +1422,17 @@ ibus_engine_update_lookup_table_fast (IBusEngine        *engine,
                                       IBusLookupTable   *table,
                                       gboolean           visible)
 {
+    /* Note: gnome shell needs the previous page and next page
+       to correctly show the page up/down arrows,
+       send three pages instead of one page. */
+
     g_return_if_fail (IBUS_IS_ENGINE (engine));
     g_return_if_fail (IBUS_IS_LOOKUP_TABLE (table));
 
     IBusLookupTable *new_table;
     IBusText *text;
     gint page_begin;
+    gint cursor_pos;
     gint i;
 
     if (table->candidates->len < table->page_size << 2) {
@@ -1436,19 +1441,31 @@ ibus_engine_update_lookup_table_fast (IBusEngine        *engine,
     }
 
     page_begin = (table->cursor_pos / table->page_size) * table->page_size;
+    cursor_pos = ibus_lookup_table_get_cursor_in_page (table);
+
+    if (table->cursor_pos >= table->page_size) {
+        /* has previous page, adjust the value. */
+        page_begin -= table->page_size;
+        cursor_pos += table->page_size;
+    }
 
-    new_table = ibus_lookup_table_new (table->page_size, 0, table->cursor_visible, table->round);
+    new_table = ibus_lookup_table_new
+        (table->page_size, 0, table->cursor_visible, table->round);
 
-    for (i = page_begin; i < page_begin + table->page_size && i < table->candidates->len; i++) {
-        ibus_lookup_table_append_candidate (new_table, ibus_lookup_table_get_candidate (table, i));
+    /* '3' means the previous page, current page and next page. */
+    for (i = page_begin; i < page_begin + 3 * table->page_size &&
+             i < table->candidates->len; i++) {
+        ibus_lookup_table_append_candidate
+            (new_table, ibus_lookup_table_get_candidate (table, i));
     }
 
     for (i = 0; (text = ibus_lookup_table_get_label (table, i)) != NULL; i++) {
         ibus_lookup_table_append_label (new_table, text);
     }
 
-    ibus_lookup_table_set_cursor_pos (new_table, ibus_lookup_table_get_cursor_in_page (table));
-    ibus_lookup_table_set_orientation (new_table, ibus_lookup_table_get_orientation (table));
+    ibus_lookup_table_set_cursor_pos (new_table, cursor_pos);
+    ibus_lookup_table_set_orientation
+        (new_table, ibus_lookup_table_get_orientation (table));
 
     ibus_engine_update_lookup_table (engine, new_table, visible);
 

From f69ddc3952971c5599c92aee3dc1de6017d07f3c Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Fri, 5 Dec 2014 11:41:08 +0900
Subject: [PATCH 278/816] Fixes ibus_keyval_name method in c++ binding

Add G_BEGIN_DECLS and G_END_DECLS macros in src/ibuskeys.h

BUG=

Review URL: https://codereview.appspot.com/185850043
Patch from Peng Wu <alexepico@gmail.com>.
---
 src/ibuskeys.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ibuskeys.h b/src/ibuskeys.h
index 6acb0d689..7969929a0 100644
--- a/src/ibuskeys.h
+++ b/src/ibuskeys.h
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
 /**
  * ibus_keyval_name:
  * @keyval: Key symbol.
@@ -73,4 +74,5 @@ guint            ibus_unicode_to_keyval (gunichar        wc);
  **/
 gunichar         ibus_keyval_to_unicode (guint           keyval);
 
+G_END_DECLS
 #endif // __IBUS_KEYS_H_

From 097715746da0f56b8b8c3ddae2da3442032bff0c Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Fri, 5 Dec 2014 20:25:44 +0900
Subject: [PATCH 279/816] Carry current context content type into fake context
 when switching

When focus moves out of a context to the fake context we should keep
the content type properties as they were in the focused out context.

This allows panel implementations to show the proper UI while input
focus moves away temporarily from a text entry.

E.g. a password entry is focused and the user clicks on the panel
UI. At this point ibus switches the currently focused context to the
fake context and emits set-content-type with the fake context
properties which are empty and thus the panel reacts to it. This isn't
the intended behavior though since, from a user POV, the password
entry is still the context that will be getting text input when the
panel UI gets dismissed.

R=shawn.p.huang@gmail.com
BUG=https://bugzilla.gnome.org/show_bug.cgi?id=730628

Review URL: https://codereview.appspot.com/176260043
Patch from Rui Matos <tiagomatos@gmail.com>.
---
 bus/ibusimpl.c     |  6 +++
 bus/inputcontext.c | 91 ++++++++++++++++++++++++++++------------------
 bus/inputcontext.h | 10 +++++
 3 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index dd254e2ed..61f664908 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -620,6 +620,8 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
     }
 
     BusEngineProxy *engine = NULL;
+    guint purpose = 0;
+    guint hints = 0;
 
     if (ibus->focused_context) {
         if (ibus->use_global_engine) {
@@ -634,12 +636,16 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_out (ibus->panel, ibus->focused_context);
 
+        bus_input_context_get_content_type (ibus->focused_context,
+                                            &purpose, &hints);
         g_object_unref (ibus->focused_context);
         ibus->focused_context = NULL;
     }
 
     if (context == NULL && ibus->use_global_engine) {
         context = ibus->fake_context;
+        if (context)
+            bus_input_context_set_content_type (context, purpose, hints);
     }
 
     if (context) {
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index d9924a1a8..ea77102da 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -1151,6 +1151,47 @@ bus_input_context_service_method_call (IBusService            *service,
     g_return_if_reached ();
 }
 
+static void
+_ic_set_content_type (BusInputContext *context,
+                      GVariant        *value)
+{
+    guint purpose = 0;
+    guint hints = 0;
+
+    g_variant_get (value, "(uu)", &purpose, &hints);
+    if (purpose != context->purpose || hints != context->hints) {
+        GError *error;
+        gboolean retval;
+
+        context->purpose = purpose;
+        context->hints = hints;
+
+        if (context->has_focus && context->engine)
+            bus_engine_proxy_set_content_type (context->engine,
+                                               purpose,
+                                               hints);
+
+        if (context->has_focus) {
+            g_signal_emit (context,
+                           context_signals[SET_CONTENT_TYPE],
+                           0,
+                           context->purpose,
+                           context->hints);
+        }
+
+        error = NULL;
+        retval = bus_input_context_property_changed (context,
+                                                     "ContentType",
+                                                     value,
+                                                     &error);
+        if (!retval) {
+            g_warning ("Failed to emit PropertiesChanged signal: %s",
+                       error->message);
+            g_error_free (error);
+        }
+    }
+}
+
 static gboolean
 bus_input_context_service_set_property (IBusService     *service,
                                         GDBusConnection *connection,
@@ -1175,41 +1216,7 @@ bus_input_context_service_set_property (IBusService     *service,
 
     if (g_strcmp0 (property_name, "ContentType") == 0) {
         BusInputContext *context = (BusInputContext *) service;
-        guint purpose = 0;
-        guint hints = 0;
-
-        g_variant_get (value, "(uu)", &purpose, &hints);
-        if (purpose != context->purpose || hints != context->hints) {
-            GError *error;
-            gboolean retval;
-
-            context->purpose = purpose;
-            context->hints = hints;
-
-            if (context->has_focus && context->engine)
-                bus_engine_proxy_set_content_type (context->engine,
-                                                   purpose,
-                                                   hints);
-
-            if (context->has_focus) {
-                g_signal_emit (context,
-                               context_signals[SET_CONTENT_TYPE],
-                               0,
-                               context->purpose,
-                               context->hints);
-            }
-
-            error = NULL;
-            retval = bus_input_context_property_changed (context,
-                                                         "ContentType",
-                                                         value,
-                                                         &error);
-            if (!retval) {
-                g_warning ("Failed to emit PropertiesChanged signal: %s",
-                           error->message);
-                g_error_free (error);
-            }
-        }
+        _ic_set_content_type (context, value);
         return TRUE;
     }
 
@@ -2521,3 +2528,17 @@ bus_input_context_get_content_type (BusInputContext *context,
     *purpose = context->purpose;
     *hints = context->hints;
 }
+
+void
+bus_input_context_set_content_type (BusInputContext *context,
+                                    guint            purpose,
+                                    guint            hints)
+{
+    GVariant *value;
+
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    value = g_variant_ref_sink (g_variant_new ("(uu)", purpose, hints));
+    _ic_set_content_type (context, value);
+    g_variant_unref (value);
+}
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index f282faee2..258f501a5 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -250,5 +250,15 @@ void                 bus_input_context_get_content_type
                                                  guint              *purpose,
                                                  guint              *hints);
 
+/**
+ * bus_input_context_set_content_type:
+ * @purpose: Input purpose.
+ * @hints: Input hints.
+ */
+void                 bus_input_context_set_content_type
+                                                (BusInputContext *context,
+                                                 guint            purpose,
+                                                 guint            hints);
+
 G_END_DECLS
 #endif

From 8f471ce138a9dc10ab5b1e0c716bb48ca36fe12a Mon Sep 17 00:00:00 2001
From: Doug Rintoul <doug_rintoul@sil.org>
Date: Mon, 8 Dec 2014 12:52:00 +0900
Subject: [PATCH 280/816] Show language rather than layout in xkb panel icon

BUG=https://code.google.com/p/ibus/issues/detail?id=1753
TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/184840043
Patch from Doug Rintoul <doug_rintoul@sil.org>.
---
 ui/gtk3/panel.vala    |  8 ++++----
 ui/gtk3/switcher.vala | 42 ++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 7b99fdf51..4e021409c 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1135,16 +1135,16 @@ class Panel : IBus.PanelService {
         if (icon_name[0] == '/')
             m_status_icon.set_from_file(icon_name);
         else {
-            string symbol = null;
+            string language = null;
 
             if (engine != null) {
                 var name = engine.get_name();
                 if (name.length >= 4 && name[0:4] == "xkb:")
-                    symbol = m_switcher.get_xkb_symbol(engine);
+                    language = m_switcher.get_xkb_language(engine);
             }
 
-            if (symbol != null) {
-                Gdk.Pixbuf pixbuf = create_icon_pixbuf_with_string(symbol);
+            if (language != null) {
+                Gdk.Pixbuf pixbuf = create_icon_pixbuf_with_string(language);
                 m_status_icon.set_from_pixbuf(pixbuf);
             } else {
                 var theme = Gtk.IconTheme.get_default();
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 7601d8040..476b159f6 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -21,8 +21,6 @@
  */
 
 class Switcher : Gtk.Window {
-    private const int DESC_LABEL_MAX_LEN = 20;
-
     private class IBusEngineButton : Gtk.Button {
         public IBusEngineButton(IBus.EngineDesc engine, Switcher switcher) {
             GLib.Object();
@@ -38,14 +36,14 @@ class Switcher : Gtk.Window {
                 icon.set_valign(Gtk.Align.CENTER);
                 add(icon);
             } else {
-                var symbol = switcher.get_xkb_symbol(engine);
+                var language = switcher.get_xkb_language(engine);
 
-                Gtk.Label label = new Gtk.Label(symbol);
+                Gtk.Label label = new Gtk.Label(language);
                 label.set_halign(Gtk.Align.CENTER);
                 label.set_valign(Gtk.Align.CENTER);
-                string symbol_font = "Monospace Bold 16";
+                string language_font = "Monospace Bold 16";
                 string markup = "<span font=\"%s\">%s</span>".
-                        printf(symbol_font, symbol);
+                        printf(language_font, language);
 
                 label.set_markup(markup);
 
@@ -89,7 +87,7 @@ class Switcher : Gtk.Window {
     private uint m_popup_delay_time_id = 0;
     private int m_root_x;
     private int m_root_y;
-    private GLib.HashTable<string, string> m_xkb_symbols =
+    private GLib.HashTable<string, string> m_xkb_languages =
             new GLib.HashTable<string, string>(GLib.str_hash,
                                                GLib.str_equal);
 
@@ -268,10 +266,6 @@ class Switcher : Gtk.Window {
                 return true;
             });
 
-            if (longname.length > DESC_LABEL_MAX_LEN) {
-                longname = longname[0:DESC_LABEL_MAX_LEN];
-            }
-
             button.longname = longname;
             m_label.set_label(longname);
 
@@ -429,37 +423,37 @@ class Switcher : Gtk.Window {
         m_popup_delay_time = popup_delay_time;
     }
 
-    public string get_xkb_symbol(IBus.EngineDesc engine) {
+    public string get_xkb_language(IBus.EngineDesc engine) {
         var name = engine.get_name();
 
         assert(name[0:4] == "xkb:");
 
-        var symbol = m_xkb_symbols[name];
+        var language = m_xkb_languages[name];
 
-        if (symbol != null)
-            return symbol;
+        if (language != null)
+            return language;
 
-        var layout = engine.get_layout();
+        language = engine.get_language();
 
         /* Maybe invalid layout */
-        if (layout.length < 2)
-            return layout;
+        if (language.length < 2)
+            return language;
 
-        symbol = layout[0:2].up();
+        language = language[0:2].up();
 
         int index = 0;
 
-        foreach (var saved_symbol in m_xkb_symbols.get_values()) {
-            if (symbol == saved_symbol[0:2])
+        foreach (var saved_language in m_xkb_languages.get_values()) {
+            if (language == saved_language[0:2])
                 index++;
         }
 
         if (index > 0) {
             unichar u = 0x2081 + index;
-            symbol = "%s%s".printf(symbol, u.to_string());
+            language = "%s%s".printf(language, u.to_string());
         }
 
-        m_xkb_symbols.insert(name, symbol);
-        return symbol;
+        m_xkb_languages.insert(name, language);
+        return language;
     }
 }

From 576ebc3633aa1fb3076ffac031255c3da4e2cd09 Mon Sep 17 00:00:00 2001
From: Klemens Baum <klemensbaum@gmail.com>
Date: Thu, 18 Dec 2014 16:27:23 +0900
Subject: [PATCH 281/816] IMdkit: Track window property offsets correctly

The XIM specification requires that XIM tranports over 20 bytes in size
be transferred via window properties. The sender calls XChangeProperty
with PropModeAppend, and instructs the recipient via ClientMessage to
call XGetWindowProperty with delete set to True.

Naive implementations exhibit a race condition because the receiver
could have written more data in the meantime, and XGetWindowProperty
only deletes the property when bytes_after_return is zero. If
bytes_after_return is non-zero, it is necessary to use an offset when
reading from the property again.

To ensure that the property data does not grow indefinitely, Xlib
recycles 21 Atoms in round-robin fashion. Because the XIM specification
does not limit the number of Atom names of the form "_clientXXX" to be
used for data transfer over window properties, an XIM server should be
able to keep of track any number of Atoms, remembering the offset into
each property.

This patch implements correct tracking of property offsets.

Signed-off-by: Klemens Baum <klemensbaum@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

rhbz#1175595
BUG=https://code.google.com/p/ibus/issues/detail?id=1751
TEST=client/x11/ibus-x11

Review URL: https://codereview.appspot.com/176190044
Patch from Klemens Baum <klemensbaum@gmail.com>.
---
 util/IMdkit/Makefile.am       |  5 +-
 util/IMdkit/Xi18n.h           | 23 +++++++--
 util/IMdkit/i18nOffsetCache.c | 89 +++++++++++++++++++++++++++++++++++
 util/IMdkit/i18nUtil.c        |  9 ++--
 util/IMdkit/i18nX.c           | 73 ++++++++++++++--------------
 5 files changed, 154 insertions(+), 45 deletions(-)
 create mode 100644 util/IMdkit/i18nOffsetCache.c

diff --git a/util/IMdkit/Makefile.am b/util/IMdkit/Makefile.am
index e3946d7d2..6cbb90836 100644
--- a/util/IMdkit/Makefile.am
+++ b/util/IMdkit/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2014 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
@@ -29,6 +29,7 @@ libIMdkit_la_SOURCES = \
 	i18nIc.c \
 	i18nIMProto.c \
 	i18nMethod.c \
+	i18nOffsetCache.c \
 	i18nPtHdr.c \
 	i18nUtil.c \
 	i18nX.c \
diff --git a/util/IMdkit/Xi18n.h b/util/IMdkit/Xi18n.h
index 484cc624b..e1d24d593 100644
--- a/util/IMdkit/Xi18n.h
+++ b/util/IMdkit/Xi18n.h
@@ -1,7 +1,9 @@
 /******************************************************************
  
-         Copyright 1994, 1995 by Sun Microsystems, Inc.
-         Copyright 1993, 1994 by Hewlett-Packard Company
+         Copyright (C) 1994-1995 Sun Microsystems, Inc.
+         Copyright (C) 1993-1994 Hewlett-Packard Company
+         Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+         Copyright (C) 2014 Red Hat, Inc.
  
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without fee,
@@ -45,6 +47,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XIM_EXT_MOVE				(0x33)
 #define COMMON_EXTENSIONS_NUM   		3
 
+#include <stddef.h>
 #include <stdlib.h>
 #include "IMdkit.h"
 
@@ -138,6 +141,19 @@ typedef struct
     char	*name;
 } XIMExt;
 
+typedef struct
+{
+    Atom key;
+    unsigned long offset;
+} Xi18nAtomOffsetPair;
+
+typedef struct
+{
+    size_t capacity;
+    size_t size;
+    Xi18nAtomOffsetPair *data;
+} Xi18nOffsetCache;
+
 typedef struct _Xi18nClient
 {
     int		connect_id;
@@ -149,8 +165,7 @@ typedef struct _Xi18nClient
      */
     int		sync;
     XIMPending  *pending;
-    /* property offset to read next data */
-    long        property_offset;
+    Xi18nOffsetCache offset_cache;
     void *trans_rec;		/* contains transport specific data  */
     struct _Xi18nClient *next;
 } Xi18nClient;
diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
new file mode 100644
index 000000000..c952d5b45
--- /dev/null
+++ b/util/IMdkit/i18nOffsetCache.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this
+ * software and its documentation for any purpose is hereby granted
+ * without fee, provided that the above copyright notice appear in
+ * all copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of
+ * the copyright holders not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+ *
+ * Author: Klemens Baum <klemensbaum@gmail.com>
+ */
+
+#include <X11/Xlib.h>
+#include <stddef.h>
+#include "IMdkit.h"
+#include "Xi18n.h"
+
+/*
+ * The XIM specification does not limit the number of window properties
+ * that can be used to transfer data, but Xlib uses the atom strings
+ * _client0 through _client20.
+ *
+ * So use that as a sensible initial size for the offset cache.
+ */
+#define INITIAL_OFFSET_CACHE_CAPACITY 21
+#define OFFSET_CACHE_GROWTH_FACTOR 2
+
+void _Xi18nInitOffsetCache (Xi18nOffsetCache *offset_cache)
+{
+    offset_cache->size = 0;
+    offset_cache->capacity = INITIAL_OFFSET_CACHE_CAPACITY;
+    offset_cache->data = (Xi18nAtomOffsetPair *) malloc (
+        INITIAL_OFFSET_CACHE_CAPACITY * sizeof (Xi18nAtomOffsetPair));
+}
+
+unsigned long _Xi18nLookupPropertyOffset (Xi18nOffsetCache *offset_cache,
+                                          Atom key)
+{
+    Xi18nAtomOffsetPair *data = offset_cache->data;
+    size_t i;
+
+    for (i = 0; i < offset_cache->size; ++i) {
+        if (data[i].key == key) {
+            return data[i].offset;
+        }
+    }
+
+    return 0;
+}
+
+void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
+                              unsigned long offset)
+{
+    Xi18nAtomOffsetPair *data = offset_cache->data;
+    size_t i;
+
+    for (i = 0; i < offset_cache->size; ++i) {
+        if (data[i].key == key) {
+            data[i].offset = offset;
+            return;
+        }
+    }
+
+    if (++offset_cache->size > offset_cache->capacity) {
+        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
+        offset_cache->data = data = (Xi18nAtomOffsetPair *) realloc (data,
+                offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
+    }
+
+    data[i].key = key;
+    data[i].offset = offset;
+}
+
diff --git a/util/IMdkit/i18nUtil.c b/util/IMdkit/i18nUtil.c
index c07de481a..6557bd1a8 100644
--- a/util/IMdkit/i18nUtil.c
+++ b/util/IMdkit/i18nUtil.c
@@ -1,7 +1,9 @@
 /******************************************************************
  
-         Copyright 1994, 1995 by Sun Microsystems, Inc.
-         Copyright 1993, 1994 by Hewlett-Packard Company
+         Copyright (C) 1994-1995 Sun Microsystems, Inc.
+         Copyright (C) 1993-1994 Hewlett-Packard Company
+         Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+         Copyright (C) 2014 Red Hat, Inc.
  
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without fee,
@@ -36,6 +38,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "XimFunc.h"
 
 Xi18nClient *_Xi18nFindClient (Xi18n, CARD16);
+void _Xi18nInitOffsetCache (Xi18nOffsetCache *);
 
 int
 _Xi18nNeedSwap (Xi18n i18n_core, CARD16 connect_id)
@@ -70,7 +73,7 @@ Xi18nClient *_Xi18nNewClient(Xi18n i18n_core)
     client->sync = False;
     client->byte_order = '?'; 	/* initial value */
     memset (&client->pending, 0, sizeof (XIMPending *));
-    client->property_offset = 0;
+    _Xi18nInitOffsetCache (&client->offset_cache);
     client->next = i18n_core->address.clients;
     i18n_core->address.clients = client;
 
diff --git a/util/IMdkit/i18nX.c b/util/IMdkit/i18nX.c
index 0a5405872..8385aba94 100644
--- a/util/IMdkit/i18nX.c
+++ b/util/IMdkit/i18nX.c
@@ -1,7 +1,9 @@
 /******************************************************************
  
-         Copyright 1994, 1995 by Sun Microsystems, Inc.
-         Copyright 1993, 1994 by Hewlett-Packard Company
+         Copyright (C) 1994-1995 Sun Microsystems, Inc.
+         Copyright (C) 1993-1994 Hewlett-Packard Company
+         Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+         Copyright (C) 2014 Red Hat, Inc.
  
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without fee,
@@ -29,6 +31,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
 ******************************************************************/
 
+#include <stddef.h>
 #include <limits.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -38,12 +41,14 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Xi18nX.h"
 #include "XimFunc.h"
 
-extern Xi18nClient *_Xi18nFindClient(Xi18n, CARD16);
-extern Xi18nClient *_Xi18nNewClient(Xi18n);
-extern void _Xi18nDeleteClient(Xi18n, CARD16);
-static Bool WaitXConnectMessage(Display*, Window,
-                                XEvent*, XPointer);
-static Bool WaitXIMProtocol(Display*, Window, XEvent*, XPointer);
+extern Xi18nClient *_Xi18nFindClient (Xi18n, CARD16);
+extern Xi18nClient *_Xi18nNewClient (Xi18n);
+extern void _Xi18nDeleteClient (Xi18n, CARD16);
+extern unsigned long _Xi18nLookupPropertyOffset (Xi18nOffsetCache *, Atom);
+extern void _Xi18nSetPropertyOffset (Xi18nOffsetCache *, Atom, unsigned long);
+static Bool WaitXConnectMessage (Display*, Window,
+                                 XEvent*, XPointer);
+static Bool WaitXIMProtocol (Display*, Window, XEvent*, XPointer);
 
 static XClient *NewXClient (Xi18n i18n_core, Window new_client)
 {
@@ -129,7 +134,6 @@ static unsigned char *ReadXIMMessage (XIMS ims,
     else if (ev->format == 32) {
         /* ClientMessage and WindowProperty */
         unsigned long length = (unsigned long) ev->data.l[0];
-        unsigned long get_length;
         Atom atom = (Atom) ev->data.l[1];
         int return_code;
         Atom actual_type_ret;
@@ -137,21 +141,28 @@ static unsigned char *ReadXIMMessage (XIMS ims,
         unsigned long bytes_after_ret;
         unsigned char *prop;
         unsigned long nitems;
-
-        /* Round up length to next 4 byte value. */
-        get_length = length + 3;
-        if (get_length > LONG_MAX)
-            get_length = LONG_MAX;
-        get_length /= 4;
-        if (get_length == 0) {
-            fprintf(stderr, "%s: invalid length 0\n", __func__);
+        Xi18nOffsetCache *offset_cache = &client->offset_cache;
+        unsigned long offset;
+        unsigned long end;
+        unsigned long long_begin;
+        unsigned long long_end;
+
+        if (length == 0) {
+            fprintf (stderr, "%s: invalid length 0\n", __func__);
             return NULL;
         }
+
+        offset = _Xi18nLookupPropertyOffset (offset_cache, atom);
+        end = offset + length;
+
+        /* The property data is retrieved in 32-bit chunks */
+        long_begin = offset / 4;
+        long_end = (end + 3) / 4;
         return_code = XGetWindowProperty (i18n_core->address.dpy,
                                           x_client->accept_win,
                                           atom,
-                                          client->property_offset / 4,
-                                          get_length,
+                                          long_begin,
+                                          long_end - long_begin,
                                           True,
                                           AnyPropertyType,
                                           &actual_type_ret,
@@ -162,32 +173,22 @@ static unsigned char *ReadXIMMessage (XIMS ims,
         if (return_code != Success || actual_format_ret == 0 || nitems == 0) {
             if (return_code == Success)
                 XFree (prop);
-            client->property_offset = 0;
+            fprintf (stderr,
+                    "(XIM-IMdkit) ERROR: XGetWindowProperty failed.\n"
+                    "Protocol data is likely to be inconsistent.\n");
+            _Xi18nSetPropertyOffset (offset_cache, atom, 0);
             return (unsigned char *) NULL;
         }
         /* Update the offset to read next time as needed */
         if (bytes_after_ret > 0)
-            client->property_offset += length;
+            _Xi18nSetPropertyOffset (offset_cache, atom, offset + length);
         else
-            client->property_offset = 0;
-        switch (actual_format_ret) {
-        case 8:
-        case 16:
-        case 32:
-            length = nitems * actual_format_ret / 8;
-            break;
-        default:
-            fprintf(stderr, "%s: unknown property return format: %d\n",
-                        __func__, actual_format_ret);
-            XFree(prop);
-            client->property_offset = 0;
-            return NULL;
-        }
+            _Xi18nSetPropertyOffset (offset_cache, atom, 0);
         /* if hit, it might be an error */
         if ((p = (unsigned char *) malloc (length)) == NULL)
             return (unsigned char *) NULL;
 
-        memmove (p, prop, length);
+        memcpy (p, prop + (offset % 4), length);
         XFree (prop);
     }
     return (unsigned char *) p;

From 1b668f667eaef08dfbbbdf04a0865ea086f4250a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Jan 2015 11:59:05 +0900
Subject: [PATCH 282/816] Increase dbus timeout to 15 seconds

When log into XFCE session, ibus panel sometimes fails to run the primary
ibus engine due to 5 seconds of the timeout.
It could happen when I open gnome-terminal during launching ibus-daemon.

TEST=bus/ibus-daemon, ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/192940043
---
 bus/global.c    | 2 +-
 bus/ibusimpl.c  | 5 +++--
 bus/main.c      | 2 +-
 src/ibusshare.c | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bus/global.c b/bus/global.c
index 24677b5b1..f147cd6fe 100644
--- a/bus/global.c
+++ b/bus/global.c
@@ -28,4 +28,4 @@ gchar *g_address = "unix:tmpdir=/tmp";
 gchar *g_cache = "auto";
 gboolean g_mempro = FALSE;
 gboolean g_verbose = FALSE;
-gint   g_gdbus_timeout = 5000;
+gint   g_gdbus_timeout = 15000;
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 61f664908..f99307ad5 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -1396,11 +1396,12 @@ _ibus_set_global_engine_ready_cb (BusInputContext       *context,
 
     GError *error = NULL;
     if (!bus_input_context_set_engine_by_desc_finish (context, res, &error)) {
-        g_error_free (error);
         g_dbus_method_invocation_return_error (data->invocation,
                                                G_DBUS_ERROR,
                                                G_DBUS_ERROR_FAILED,
-                                               "Set global engine failed.");
+                                               "Set global engine failed: %s",
+                                               error->message);
+        g_error_free (error);
     }
     else {
         g_dbus_method_invocation_return_value (data->invocation, NULL);
diff --git a/bus/main.c b/bus/main.c
index 056826e46..6ad60179b 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -64,7 +64,7 @@ static const GOptionEntry entries[] =
     { "address",   'a', 0, G_OPTION_ARG_STRING, &g_address,   "specify the address of ibus daemon.", "address" },
     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
     { "cache",     't', 0, G_OPTION_ARG_STRING, &g_cache,   "specify the cache mode. [auto/refresh/none]", NULL },
-    { "timeout",   'o', 0, G_OPTION_ARG_INT,    &g_gdbus_timeout, "gdbus reply timeout in milliseconds. pass -1 to use the default timeout of gdbus.", "timeout [default is 5000]" },
+    { "timeout",   'o', 0, G_OPTION_ARG_INT,    &g_gdbus_timeout, "gdbus reply timeout in milliseconds. pass -1 to use the default timeout of gdbus.", "timeout [default is 15000]" },
     { "mem-profile", 'm', 0, G_OPTION_ARG_NONE,   &g_mempro,   "enable memory profile, send SIGUSR2 to print out the memory profile.", NULL },
     { "restart",     'R', 0, G_OPTION_ARG_NONE,   &restart,    "restart panel and config processes when they die.", NULL },
     { "verbose",   'v', 0, G_OPTION_ARG_NONE,   &g_verbose,   "verbose.", NULL },
diff --git a/src/ibusshare.c b/src/ibusshare.c
index c4a724417..63800a60b 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -158,8 +158,9 @@ ibus_get_socket_path (void)
 gint
 ibus_get_timeout (void)
 {
-    /* 6000 ms is the default timeout on the ibus-daemon side (5 sec) plus 1. */
-    static const gint default_timeout = 6000;
+    /* 16000 ms is the default timeout on the ibus-daemon side
+     * (15 sec) plus 1. */
+    static const gint default_timeout = 16000;
 
     static gint64 timeout = -2;
     if (timeout == -2) {

From 83451e476b5ec98aa38e333038077f9e5b2b087d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Jan 2015 12:03:07 +0900
Subject: [PATCH 283/816] Run ibus_bus_preload_engines_async 30 seconds later
 in ibus-ui-gtk3

Make sure to run the primary ibus engine at first to avoid
the duplicated IO.

TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/187700043
---
 ui/gtk3/panel.vala | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 4e021409c..b9b8e6902 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -65,6 +65,8 @@ class Panel : IBus.PanelService {
             red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
     private XKBLayout m_xkblayout = new XKBLayout();
     private bool inited_engines_order = true;
+    private uint m_preload_engines_id;
+    private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -764,8 +766,21 @@ class Panel : IBus.PanelService {
             return;
         }
 
+        if (m_preload_engines_id != 0) {
+            GLib.Source.remove(m_preload_engines_id);
+            m_preload_engines_id = 0;
+        }
+
         names += engines[index].get_name();
-        m_bus.preload_engines_async.begin(names, -1, null);
+        m_preload_engines_id =
+                Timeout.add(
+                        PRELOAD_ENGINES_DELAY_TIME,
+                        () => {
+                            m_bus.preload_engines_async.begin(names,
+                                                              -1,
+                                                              null);
+                            return false;
+                        });
     }
 
     private void update_engines(string[]? unowned_engine_names,

From 38d3c5ccdfa53cb4028e1e03bb877494035cb5a8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Jan 2015 13:46:14 +0900
Subject: [PATCH 284/816] gtk clients do not lose focus when chrome popup
 window takes the focus

Do not call gtk_im_context_focus_out() in ibus_im_context_focus_in()
for a workaround because chrome popup window does not release the focus.

BUG=rhbz#1136623
TEST=client/gtk2/im-ibus.so

Review URL: https://codereview.appspot.com/187710043
---
 client/gtk2/ibusimcontext.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index eef062c91..a64c89b99 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -857,12 +857,15 @@ ibus_im_context_focus_in (GtkIMContext *context)
         }
     }
 
-    if (_focus_im_context != NULL) {
-        g_assert (_focus_im_context != context);
-        gtk_im_context_focus_out (_focus_im_context);
-        g_assert (_focus_im_context == NULL);
-    }
-    else {
+    /* Do not call gtk_im_context_focus_out() here.
+     * google-chrome's notification popup window (Pushbullet)
+     * takes the focus and the popup window disappears.
+     * So other applications lose the focus because
+     * ibusimcontext->has_focus is FALSE if
+     * gtk_im_context_focus_out() is called here when
+     * _focus_im_context != context.
+     */
+    if (_focus_im_context == NULL) {
         /* focus out fake context */
         if (_fake_context != NULL) {
             ibus_input_context_focus_out (_fake_context);
@@ -903,7 +906,6 @@ ibus_im_context_focus_out (GtkIMContext *context)
         return;
     }
 
-    g_assert (context == _focus_im_context);
     g_object_remove_weak_pointer ((GObject *) context,
                                   (gpointer *) &_focus_im_context);
     _focus_im_context = NULL;

From e6c883269e00e2432109c639d696491034dde5d5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 3 Feb 2015 12:30:56 +0900
Subject: [PATCH 285/816] Release registry observed_paths and components if
 they are broken

Registry caches might be broken in a disk.

BUG=rhbz#1187956
TEST=src/libibus.so

Review URL: https://codereview.appspot.com/200980043
---
 src/ibusregistry.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index 2830a0870..8e9ada947 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -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) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015 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
@@ -374,12 +374,26 @@ ibus_registry_check_modification (IBusRegistry *registry)
     g_assert (IBUS_IS_REGISTRY (registry));
 
     for (p = registry->priv->observed_paths; p != NULL; p = p->next) {
+        if (!IBUS_IS_OBSERVED_PATH (p->data)) {
+            g_warning ("The registry cache of observed_paths might be " \
+                       "broken and have to generate the cache again.");
+            g_list_free_full (registry->priv->observed_paths, g_object_unref);
+            registry->priv->observed_paths = NULL;
+            return TRUE;
+        }
         if (ibus_observed_path_check_modification (
                     (IBusObservedPath *) p->data))
             return TRUE;
     }
 
     for (p = registry->priv->components; p != NULL; p = p->next) {
+        if (!IBUS_IS_COMPONENT (p->data)) {
+            g_warning ("The registry cache of components might be " \
+                       "broken and have to generate the cache again.");
+            g_list_free_full (registry->priv->components, g_object_unref);
+            registry->priv->components = NULL;
+            return TRUE;
+        }
         if (ibus_component_check_modification ((IBusComponent *) p->data))
             return TRUE;
     }

From aab56c25356e3d036db8d3ffcef272a2b69c17d3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 19 Feb 2015 19:37:55 +0900
Subject: [PATCH 286/816] Add ibus panel icon for plasma-desktop in KDE5

plasma-desktop does not provide notification area for GtkStatusIcon
(QSystemTrayIcon too).
KDE5 provides AppIndicator or KStatusNotifierItem.
KStatusNotifierItem uses QT5 code and C++.
AppIndicator is an instance using dbus methods of
KStatusNotifierItem and it supports GTK3.
This implements the dbus method names directly so that activate menu
is supported.

http://blog.martin-graesslin.com/blog/2014/06/where-are-my-systray-icons/
https://lists.fedoraproject.org/pipermail/devel/2014-June/199782.html
http://comments.gmane.org/gmane.comp.kde.devel.core/81971

BUG=https://code.google.com/p/ibus/issues/detail?id=1749
TEST=ui/appindicator/ibus-ui-appindicator

Review URL: https://codereview.appspot.com/189680044
---
 configure.ac                     |  76 +++---
 src/ibusservice.c                |   5 +-
 ui/gtk3/Makefile.am              |  24 +-
 ui/gtk3/indicator.vala           | 422 +++++++++++++++++++++++++++++++
 ui/gtk3/notification-item.xml    |  63 +++++
 ui/gtk3/notification-watcher.xml |  30 +++
 ui/gtk3/panel.vala               | 191 +++++++++++---
 7 files changed, 740 insertions(+), 71 deletions(-)
 create mode 100644 ui/gtk3/indicator.vala
 create mode 100644 ui/gtk3/notification-item.xml
 create mode 100644 ui/gtk3/notification-watcher.xml

diff --git a/configure.ac b/configure.ac
index 14afa5749..61fbb77f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -206,6 +206,15 @@ AC_ARG_ENABLE(wayland,
 )
 AM_CONDITIONAL([ENABLE_WAYLAND], [test x"$enable_wayland" = x"yes"])
 
+# --enable-appindicator option.
+AC_ARG_ENABLE(appindicator,
+    AS_HELP_STRING([--enable-appindicator],
+                   [Build appindicator support]),
+    [enable_appindicator=$enableval],
+    [enable_appindicator=yes]
+)
+AM_CONDITIONAL([ENABLE_APPINDICATOR], [test x"$enable_appindicator" = x"yes"])
+
 if test x"$enable_gtk2" = x"yes" -o x"$enable_xim" = x"yes" ; then
     # check for gtk2
     PKG_CHECK_MODULES(GTK2, [
@@ -261,6 +270,10 @@ else
     enable_wayland="no (disabled, use --enable-wayland to enable)"
 fi
 
+if test x"$enable_appindicator" = x"yes"; then
+    enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
+fi
+
 # GObject introspection
 GOBJECT_INTROSPECTION_CHECK([0.6.8])
 
@@ -612,34 +625,35 @@ tools/Makefile
 AC_OUTPUT
 AC_MSG_RESULT([
 Build options:
-  Version                   $IBUS_VERSION
-  Install prefix            $prefix
-  Build shared libs         $enable_shared
-  Build static libs         $enable_static
-  CFLAGS                    $CFLAGS
-  PYTHON                    $PYTHON
-  PYTHON2                   $PYTHON2
-  Gtk2 immodule dir         $GTK2_IM_MODULEDIR
-  Gtk3 immodule dir         $GTK3_IM_MODULEDIR
-  Build gtk2 immodule       $enable_gtk2
-  Build gtk3 immodule       $enable_gtk3
-  Build XIM agent server    $enable_xim
-  Build wayland support     $enable_wayland
-  Build python library      $enable_python_library
-  Build gconf modules       $enable_gconf
-  Build memconf modules     $enable_memconf
-  Build dconf modules       $enable_dconf
-  Build introspection       $found_introspection
-  IBus-1.0.gir scannerflags "$IBUS_GIR_SCANNERFLAGS"
-  Build vala binding        $enable_vala
-  Build document            $enable_gtk_doc
-  Build UI                  $enable_ui
-  Build engine              $enable_engine
-  Enable key snooper        $enable_key_snooper
-  No snooper regexes        "$NO_SNOOPER_APPS"
-  Panel icon                "$IBUS_ICON_KEYBOARD"
-  Enable surrounding-text   $enable_surrounding_text
-  Enable libnotify          $enable_libnotify
-  Run test cases            $enable_tests
+  Version                       $IBUS_VERSION
+  Install prefix                $prefix
+  Build shared libs             $enable_shared
+  Build static libs             $enable_static
+  CFLAGS                        $CFLAGS
+  PYTHON                        $PYTHON
+  PYTHON2                       $PYTHON2
+  Gtk2 immodule dir             $GTK2_IM_MODULEDIR
+  Gtk3 immodule dir             $GTK3_IM_MODULEDIR
+  Build gtk2 immodule           $enable_gtk2
+  Build gtk3 immodule           $enable_gtk3
+  Build XIM agent server        $enable_xim
+  Build wayland support         $enable_wayland
+  Build appindicator support    $enable_appindicator
+  Build python library          $enable_python_library
+  Build gconf modules           $enable_gconf
+  Build memconf modules         $enable_memconf
+  Build dconf modules           $enable_dconf
+  Build introspection           $found_introspection
+  IBus-1.0.gir scannerflags     "$IBUS_GIR_SCANNERFLAGS"
+  Build vala binding            $enable_vala
+  Build document                $enable_gtk_doc
+  Build UI                      $enable_ui
+  Build engine                  $enable_engine
+  Enable key snooper            $enable_key_snooper
+  No snooper regexes            "$NO_SNOOPER_APPS"
+  Panel icon                    "$IBUS_ICON_KEYBOARD"
+  Enable surrounding-text       $enable_surrounding_text
+  Enable libnotify              $enable_libnotify
+  Run test cases                $enable_tests
 ])
 
diff --git a/src/ibusservice.c b/src/ibusservice.c
index d0ef4e04b..2199d61db 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -502,7 +502,6 @@ ibus_service_register (IBusService     *service,
 {
     g_return_val_if_fail (IBUS_IS_SERVICE (service), FALSE);
     g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), FALSE);
-    g_return_val_if_fail (connection != service->priv->connection || service->priv->constructed == FALSE, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
     GArray *array = NULL;
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 2a4da5e9f..40cce1173 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -94,6 +94,10 @@ AM_VALAFLAGS += \
 	$(NULL)
 endif
 
+if ENABLE_APPINDICATOR
+AM_VALAFLAGS += --define=INDICATOR
+endif
+
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
@@ -102,6 +106,7 @@ ibus_ui_gtk3_SOURCES = \
 	candidatepanel.vala \
 	handle.vala \
 	iconwidget.vala \
+	indicator.vala \
 	keybindingmanager.vala \
 	panel.vala \
 	pango.vala \
@@ -110,18 +115,33 @@ ibus_ui_gtk3_SOURCES = \
 	separator.vala \
 	switcher.vala \
 	xkblayout.vala \
+	gen-notification-item.xml.c \
+	gen-notification-watcher.xml.c \
 	$(NULL)
 
 ibus_ui_gtk3_LDADD = \
 	$(AM_LDADD) \
 	$(NULL)
 
+gen-%.xml.c: %.xml
+	echo "Building $@ from $<"
+	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
+	sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	echo ";" >> $@
+
 CLEANFILES = \
 	gtkpanel.xml \
 	$(NULL)
 
+# References:
+# libappindicator/src/notification-item.xml
+# libappindicator/src/notification-watcher.xml
+# knotifications/src/org.kde.StatusNotifierItem.xml
+# knotifications/src/org.kde.StatusNotifierWatcher.xml
 EXTRA_DIST = \
 	gtkpanel.xml.in \
+	notification-item.xml \
+	notification-watcher.xml \
 	$(NULL)
 
 
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
new file mode 100644
index 000000000..013b1c48b
--- /dev/null
+++ b/ui/gtk3/indicator.vala
@@ -0,0 +1,422 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015 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
+ * 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
+ */
+
+/* This class extends AppIndicator because
+ * AppIndicator misses "Activate" dbus method in the definition
+ * for left click on the indicator.
+ */
+
+public extern string _notification_item;
+public extern string _notification_watcher;
+
+class Indicator : IBus.Service
+{
+    public string id { get; construct; }
+    public string category_s { get; construct; }
+    public string status_s { get; set; }
+    public string icon_name { get; set; }
+    public string icon_desc { get; set; }
+    public string attention_icon_name { get; set; }
+    public string attention_icon_desc { get; set; }
+    public string title { get; set; }
+    public string icon_theme_path { get; set; }
+    public bool   connected { get; set; }
+    public string label_s { get; set; }
+    public string label_guide_s { get; set; }
+    public uint32 ordering_index { get; set; }
+
+    public enum Category {
+        APPLICATION_STATUS,
+        COMMUNICATIONS,
+        SYSTEM_SERVICES,
+        HARDWARE,
+        OTHER;
+
+        public string to_nick() {
+            switch(this) {
+            case APPLICATION_STATUS: return "ApplicationStatus";
+            case COMMUNICATIONS: return "Communications";
+            case SYSTEM_SERVICES: return "SystemServices";
+            case HARDWARE: return "Hardware";
+            case OTHER: return "Other";
+            default: assert_not_reached();
+            }
+        }
+    }
+
+    public enum Status {
+        PASSIVE,
+        ACTIVE,
+        ATTENTION;
+
+        public string to_nick() {
+            switch(this) {
+            case PASSIVE: return "Passive";
+            case ACTIVE: return "Active";
+            case ATTENTION: return "NeedsAttention";
+            default: assert_not_reached();
+            }
+        }
+    }
+
+    private const string DEFAULT_ITEM_PATH = "/org/ayatana/NotificationItem";
+    private const string NOTIFICATION_ITEM_DBUS_IFACE =
+            "org.kde.StatusNotifierItem";
+    private const string NOTIFICATION_WATCHER_DBUS_IFACE =
+            "org.kde.StatusNotifierWatcher";
+    private const string NOTIFICATION_WATCHER_DBUS_ADDR =
+            "org.kde.StatusNotifierWatcher";
+    private const string NOTIFICATION_WATCHER_DBUS_OBJ =
+            "/StatusNotifierWatcher";
+
+    private GLib.DBusNodeInfo m_watcher_node_info;
+    private unowned GLib.DBusInterfaceInfo m_watcher_interface_info;
+    private GLib.DBusProxy m_proxy;
+    private int m_context_menu_x;
+    private int m_context_menu_y;
+    private int m_activate_menu_x;
+    private int m_activate_menu_y;
+
+    public Indicator(string id,
+                     GLib.DBusConnection connection,
+                     Category category = Category.OTHER) {
+        string path = DEFAULT_ITEM_PATH + "/" + id;
+        path = path.delimit("-", '_');
+
+        // AppIndicator.set_category() converts enum value to string internally.
+        GLib.Object(object_path: path,
+                    id: id,
+                    connection: connection,
+                    category_s: category.to_nick());
+        this.status_s = Status.PASSIVE.to_nick();
+        this.icon_name = "";
+        this.icon_desc = "";
+        this.title = "";
+        this.icon_theme_path = "";
+        this.attention_icon_name = "";
+        this.attention_icon_desc = "";
+        this.label_s = "";
+        this.label_guide_s = "";
+        unregister(connection);
+        add_interfaces(_notification_item);
+        try {
+            if (!register(connection))
+                return;
+        } catch (GLib.Error e) {
+            warning("Failed to register the application indicator xml: " +
+                    e.message);
+            return;
+        }
+
+        try {
+            m_watcher_node_info =
+                    new GLib.DBusNodeInfo.for_xml(_notification_watcher);
+        } catch (GLib.Error e) {
+            warning("Failed to create dbus node info: " + e.message);
+            return;
+        }
+        m_watcher_interface_info =
+                m_watcher_node_info.lookup_interface(
+                        NOTIFICATION_WATCHER_DBUS_IFACE);
+        check_connect();
+    }
+
+    private void check_connect() {
+        if (m_proxy == null) {
+            GLib.DBusProxy.new.begin(
+                    connection,
+                    GLib.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES |
+                            GLib.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS,
+                    m_watcher_interface_info,
+                    NOTIFICATION_WATCHER_DBUS_ADDR,
+                    NOTIFICATION_WATCHER_DBUS_OBJ,
+                    NOTIFICATION_WATCHER_DBUS_IFACE,
+                    null,
+                    (obj, res) => {
+                            bus_watcher_ready(obj, res);
+                    });
+        } else {
+            bus_watcher_ready(null, null);
+        }
+    }
+
+    private void bus_watcher_ready(GLib.Object? obj, GLib.AsyncResult? res) {
+        if (res != null) {
+            try {
+                m_proxy = GLib.DBusProxy.new.end(res);
+            } catch (GLib.IOError e) {
+                warning("Failed to call dbus proxy: " + e.message);
+                return;
+            }
+
+            m_proxy.notify["g-name-owner"].connect((obj, pspec) => {
+                    var name = m_proxy.get_name_owner();
+                    if (name != null)
+                        check_connect();
+            });
+        }
+
+        var name = m_proxy.get_name_owner();
+        // KDE panel does not run yet if name == null
+        if (name == null)
+            return;
+
+        m_proxy.call.begin("RegisterStatusNotifierItem",
+                           new GLib.Variant("(s)", this.object_path),
+                           GLib.DBusCallFlags.NONE,
+                           -1,
+                           null,
+                           (p_obj, p_res) => {
+                                   try {
+                                       m_proxy.call.end(p_res);
+                                       registered_status_notifier_item();
+                                   } catch (GLib.Error e) {
+                        warning("Failed to call " +
+                                "RegisterStatusNotifierItem: " +
+                                e.message);
+                                   }
+                           });
+    }
+
+    private void _context_menu_cb(GLib.DBusConnection       connection,
+                                  GLib.Variant              parameters,
+                                  GLib.DBusMethodInvocation invocation) {
+        GLib.Variant var_x = parameters.get_child_value(0);
+        GLib.Variant var_y = parameters.get_child_value(1);
+        m_context_menu_x = var_x.get_int32();
+        m_context_menu_y = var_y.get_int32();
+        context_menu(2, 0);
+    }
+
+    private void _activate_menu_cb(GLib.DBusConnection       connection,
+                                   GLib.Variant              parameters,
+                                   GLib.DBusMethodInvocation invocation) {
+        GLib.Variant var_x = parameters.get_child_value(0);
+        GLib.Variant var_y = parameters.get_child_value(1);
+        m_activate_menu_x = var_x.get_int32();
+        m_activate_menu_y = var_y.get_int32();
+        activate();
+    }
+
+    private GLib.Variant _get_id(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.id);
+    }
+
+    private GLib.Variant _get_category(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.category_s);
+    }
+
+    private GLib.Variant _get_status(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.status_s);
+    }
+
+    private GLib.Variant _get_icon_name(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.icon_name);
+    }
+
+    private GLib.Variant _get_icon_desc(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.icon_desc);
+    }
+
+    private GLib.Variant _get_attention_icon_name(GLib.DBusConnection
+                                                            connection) {
+        return new GLib.Variant.string(this.attention_icon_name);
+    }
+
+    private GLib.Variant _get_attention_icon_desc(GLib.DBusConnection
+                                                            connection) {
+        return new GLib.Variant.string(this.attention_icon_desc);
+    }
+
+    private GLib.Variant _get_title(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.title);
+    }
+
+    private GLib.Variant _get_icon_theme_path(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.icon_theme_path);
+    }
+
+    private GLib.Variant? _get_menu(GLib.DBusConnection connection) {
+        return null;
+    }
+
+    private GLib.Variant _get_xayatana_label(GLib.DBusConnection connection) {
+        return new GLib.Variant.string(this.label_s);
+    }
+
+    private GLib.Variant _get_xayatana_label_guide(GLib.DBusConnection
+                                                             connection) {
+        return new GLib.Variant.string(this.label_guide_s);
+    }
+
+    private GLib.Variant _get_xayatana_ordering_index(GLib.DBusConnection
+                                                             connection) {
+        return new GLib.Variant.uint32(this.ordering_index);
+    }
+
+    public override void service_method_call(GLib.DBusConnection
+                                                                connection,
+                                             string             sender,
+                                             string             object_path,
+                                             string             interface_name,
+                                             string             method_name,
+                                             GLib.Variant       parameters,
+                                             GLib.DBusMethodInvocation
+                                                                invocation) {
+        GLib.return_if_fail (object_path == this.object_path);
+        GLib.return_if_fail (interface_name == NOTIFICATION_ITEM_DBUS_IFACE);
+
+        if (method_name == "Activate") {
+            _activate_menu_cb(connection, parameters, invocation);
+            return;
+        }
+        if (method_name == "ContextMenu") {
+            _context_menu_cb(connection, parameters, invocation);
+            return;
+        }
+
+        warning("service_method_call() does not handle the method: " +
+                method_name);
+    }
+
+    public override GLib.Variant service_get_property(GLib.DBusConnection
+                                                               connection,
+                                                      string   sender,
+                                                      string   object_path,
+                                                      string   interface_name,
+                                                      string   property_name) {
+        GLib.return_val_if_fail (object_path == this.object_path, null);
+        GLib.return_val_if_fail (
+                interface_name == NOTIFICATION_ITEM_DBUS_IFACE,
+                null);
+
+        if (property_name == "Id")
+            return _get_id(connection);
+        if (property_name == "Category")
+            return _get_category(connection);
+        if (property_name == "Status")
+            return _get_status(connection);
+        if (property_name == "IconName")
+            return _get_icon_name(connection);
+        if (property_name == "IconAccessibleDesc")
+            return _get_icon_desc(connection);
+        if (property_name == "AttentionIconName")
+            return _get_attention_icon_name(connection);
+        if (property_name == "AttentionAccessibleDesc")
+            return _get_attention_icon_desc(connection);
+        if (property_name == "Title")
+            return _get_title(connection);
+        if (property_name == "IconThemePath")
+            return _get_icon_theme_path(connection);
+        if (property_name == "Menu")
+            return _get_menu(connection);
+        if (property_name == "XAyatanaLabel")
+            return _get_xayatana_label(connection);
+        if (property_name == "XAyatanaLabelGuide")
+            return _get_xayatana_label_guide(connection);
+        if (property_name == "XAyatanaOrderingIndex")
+            return _get_xayatana_ordering_index(connection);
+
+        warning("service_get_property() does not handle the property: " +
+                property_name);
+
+        return null;
+    }
+
+    public override bool service_set_property(GLib.DBusConnection
+                                                           connection,
+                                              string       sender,
+                                              string       object_path,
+                                              string       interface_name,
+                                              string       property_name,
+                                              GLib.Variant value) {
+        return false;
+    }
+
+    // AppIndicator.set_status() converts enum value to string internally.
+    public void set_status(Status status) {
+        string status_s = status.to_nick();
+        if (this.status_s == status_s)
+            return;
+        this.status_s = status_s;
+        if (this.connection == null)
+            return;
+        try {
+            this.connection.emit_signal(null,
+                                        this.object_path,
+                                        NOTIFICATION_ITEM_DBUS_IFACE,
+                                        "NewStatus",
+                                        new GLib.Variant("(s)", status_s));
+        } catch(GLib.Error e) {
+            warning("Unable to send signal for NewIcon: %s", e.message);
+        }
+    }
+
+    // AppIndicator.set_icon() is deprecated.
+    public void set_icon_full(string icon_name, string? icon_desc) {
+        bool changed = false;
+        if (this.icon_name != icon_name) {
+            this.icon_name = icon_name;
+            changed = true;
+        }
+        if (this.icon_desc != icon_desc) {
+            this.icon_desc = icon_desc;
+            changed = true;
+        }
+        if (!changed)
+            return;
+        if (this.connection == null)
+            return;
+        try {
+            this.connection.emit_signal(null,
+                                        this.object_path,
+                                        NOTIFICATION_ITEM_DBUS_IFACE,
+                                        "NewIcon",
+                                        null);
+        } catch(GLib.Error e) {
+            warning("Unable to send signal for NewIcon: %s", e.message);
+        }
+    }
+
+    public void position_context_menu(Gtk.Menu menu,
+                                      out int  x,
+                                      out int  y,
+                                      out bool push_in) {
+        x = m_context_menu_x;
+        y = m_context_menu_y;
+        push_in = false;
+    }
+
+    public void position_activate_menu(Gtk.Menu menu,
+                                       out int  x,
+                                       out int  y,
+                                       out bool push_in) {
+        x = m_activate_menu_x;
+        y = m_activate_menu_y;
+        push_in = false;
+    }
+
+    public signal void context_menu(uint button, uint activate_time);
+    public signal void activate();
+    public signal void registered_status_notifier_item();
+}
diff --git a/ui/gtk3/notification-item.xml b/ui/gtk3/notification-item.xml
new file mode 100644
index 000000000..aecb8d9bc
--- /dev/null
+++ b/ui/gtk3/notification-item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/StatusNotifierItem">
+        <interface name="org.kde.StatusNotifierItem">
+
+<!-- Properties -->
+                <property name="Id" type="s" access="read" />
+                <property name="Category" type="s" access="read" />
+                <property name="Status" type="s" access="read" />
+                <property name="IconName" type="s" access="read" />
+                <property name="IconAccessibleDesc" type="s" access="read" />
+                <property name="AttentionIconName" type="s" access="read" />
+                <property name="AttentionAccessibleDesc" type="s" access="read" />
+                <property name="Title" type="s" access="read" />
+                <!-- An additional path to add to the theme search path
+                     to find the icons specified above. -->
+                <property name="IconThemePath" type="s" access="read" />
+                <property name="Menu" type="o" access="read" />
+                <property name="XAyatanaLabel" type="s" access="read" />
+                <property name="XAyatanaLabelGuide" type="s" access="read" />
+                <property name="XAyatanaOrderingIndex" type="u" access="read" />
+
+<!-- Methods -->
+                <method name="Scroll">
+                        <arg type="i" name="delta" direction="in" />
+                        <arg type="s" name="orientation" direction="in" />
+                </method>
+                <method name="SecondaryActivate">
+                        <arg type="i" name="x" direction="in" />
+                        <arg type="i" name="y" direction="in" />
+                </method>
+                <method name="XAyatanaSecondaryActivate">
+                        <arg type="u" name="timestamp" direction="in" />
+                </method>
+                <!-- Activate is missed in AppIndicator -->
+                <method name="Activate">
+                        <arg type="i" name="x" direction="in" />
+                        <arg type="i" name="y" direction="in" />
+                </method>
+                <method name="ContextMenu">
+                        <arg type="i" name="x" direction="in"/>
+                        <arg type="i" name="y" direction="in"/>
+                </method>
+
+<!-- Signals -->
+                <signal name="NewIcon">
+                </signal>
+                <signal name="NewIconThemePath">
+                        <arg type="s" name="icon_theme_path" direction="out" />
+                </signal>
+                <signal name="NewAttentionIcon">
+                </signal>
+                <signal name="NewStatus">
+                        <arg type="s" name="status" direction="out" />
+                </signal>
+                <signal name="XAyatanaNewLabel">
+                        <arg type="s" name="label" direction="out" />
+                        <arg type="s" name="guide" direction="out" />
+                </signal>
+                <signal name="NewTitle">
+                </signal>
+
+        </interface>
+</node>
diff --git a/ui/gtk3/notification-watcher.xml b/ui/gtk3/notification-watcher.xml
new file mode 100644
index 000000000..0c28a8f88
--- /dev/null
+++ b/ui/gtk3/notification-watcher.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/StatusNotifierWatcher">
+        <interface name="org.kde.StatusNotifierWatcher">
+
+<!-- Properties -->
+                <property name="ProtocolVersion" type="i" access="read" />
+                <property name="IsStatusNotifierHostRegistered" type="b" access="read" />
+                <property name="RegisteredStatusNotifierItems" type="as" access="read" />
+
+<!-- Methods -->
+                <method name="RegisterStatusNotifierItem">
+                    <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
+                        <arg type="s" name="service" direction="in" />
+                </method>
+                <method name="RegisterStatusNotifierHost">
+                        <arg type="s" name="service" direction="in" />
+                </method>
+
+<!-- Signals -->
+                <signal name="StatusNotifierItemRegistered">
+                        <arg type="s" name="service" direction="out" />
+                </signal>
+                <signal name="StatusNotifierItemUnregistered">
+                        <arg type="s" name="service" direction="out" />
+                </signal>
+                <signal name="StatusNotifierHostRegistered">
+                </signal>
+
+        </interface>
+</node>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index b9b8e6902..137986086 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2015 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,10 +36,20 @@ class Panel : IBus.PanelService {
         public bool reverse { get; set; }
     }
 
+    private enum IconType {
+        STATUS_ICON,
+        INDICATOR,
+    }
+
     private IBus.Bus m_bus;
     private GLib.Settings m_settings_general = null;
     private GLib.Settings m_settings_hotkey = null;
     private GLib.Settings m_settings_panel = null;
+    private IconType m_icon_type = IconType.STATUS_ICON;
+    private Indicator m_indicator;
+#if INDICATOR
+    private GLib.DBusConnection m_session_bus_connection;
+#endif
     private Gtk.StatusIcon m_status_icon;
     private Gtk.Menu m_ime_menu;
     private Gtk.Menu m_sys_menu;
@@ -81,12 +92,15 @@ class Panel : IBus.PanelService {
         init_settings();
 
         // init ui
-        m_status_icon = new Gtk.StatusIcon();
-        m_status_icon.set_name("ibus-ui-gtk");
-        m_status_icon.set_title("IBus Panel");
-        m_status_icon.popup_menu.connect(status_icon_popup_menu_cb);
-        m_status_icon.activate.connect(status_icon_activate_cb);
-        m_status_icon.set_from_icon_name("ibus-keyboard");
+#if INDICATOR
+        if (is_kde()) {
+            init_indicator();
+        } else {
+            init_status_icon();
+        }
+#else
+        init_status_icon();
+#endif
 
         m_candidate_panel = new CandidatePanel();
         m_candidate_panel.page_up.connect((w) => this.page_up());
@@ -190,6 +204,75 @@ class Panel : IBus.PanelService {
         });
     }
 
+#if INDICATOR
+    private bool is_kde() {
+        if (Environment.get_variable("XDG_CURRENT_DESKTOP") == "KDE")
+            return true;
+        warning ("If you launch KDE5 on xterm, " +
+                 "export XDG_CURRENT_DESKTOP=KDE before launch KDE5.");
+        return false;
+    }
+
+    private void init_indicator() {
+        m_icon_type = IconType.INDICATOR;
+        GLib.Bus.get.begin(GLib.BusType.SESSION, null, (obj, res) => {
+            try {
+                m_session_bus_connection = GLib.Bus.get.end(res);
+                m_indicator =
+                        new Indicator("ibus-ui-gtk3",
+                                      m_session_bus_connection,
+                                      Indicator.Category.APPLICATION_STATUS);
+                m_indicator.title = _("IBus Panel");
+                m_indicator.registered_status_notifier_item.connect(() => {
+                    m_indicator.set_status(Indicator.Status.ACTIVE);
+                    state_changed();
+                });
+                m_indicator.context_menu.connect((b, t) => {
+                    Gtk.Menu menu = create_context_menu();
+                    menu.popup(null,
+                               null,
+                               m_indicator.position_context_menu,
+                               0,
+                               Gtk.get_current_event_time());
+                });
+                m_indicator.activate.connect(() => {
+                    Gtk.Menu menu = create_activate_menu();
+                    menu.popup(null,
+                               null,
+                               m_indicator.position_activate_menu,
+                               0,
+                               Gtk.get_current_event_time());
+                });
+            } catch (GLib.IOError e) {
+                warning("Failed to get the session bus: %s", e.message);
+            }
+        });
+    }
+#endif
+
+    private void init_status_icon() {
+        m_status_icon = new Gtk.StatusIcon();
+        m_status_icon.set_name("ibus-ui-gtk");
+        m_status_icon.set_title(_("IBus Panel"));
+        m_status_icon.popup_menu.connect((b, t) => {
+                Gtk.Menu menu = create_context_menu();
+                menu.popup(null,
+                           null,
+                           m_status_icon.position_menu,
+                           0,
+                           Gtk.get_current_event_time());
+        });
+        m_status_icon.activate.connect(() => {
+                Gtk.Menu menu = create_activate_menu();
+                menu.popup(null,
+                           null,
+                           m_status_icon.position_menu,
+                           0,
+                           Gtk.get_current_event_time());
+        });
+        m_status_icon.set_from_icon_name("ibus-keyboard");
+    }
+
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
                                          string?           accelerator) {
         uint switch_keysym = 0;
@@ -503,11 +586,22 @@ class Panel : IBus.PanelService {
     }
 
     private void set_show_icon_on_systray() {
-        if (m_status_icon == null)
-            return;
+        if (m_icon_type == IconType.STATUS_ICON) {
+            if (m_status_icon == null)
+                return;
 
-        m_status_icon.set_visible(
-                m_settings_panel.get_boolean("show-icon-on-systray"));
+            m_status_icon.set_visible(
+                    m_settings_panel.get_boolean("show-icon-on-systray"));
+        } else if (m_icon_type == IconType.INDICATOR) {
+            if (m_indicator == null)
+                return;
+
+            if (m_settings_panel.get_boolean("show-icon-on-systray")) {
+                m_indicator.set_status(Indicator.Status.ACTIVE);
+            } else {
+                m_indicator.set_status(Indicator.Status.PASSIVE);
+            }
+        }
     }
 
     private void set_lookup_table_orientation() {
@@ -558,8 +652,13 @@ class Panel : IBus.PanelService {
         if (m_xkb_icon_pixbufs.size() > 0) {
             m_xkb_icon_pixbufs.remove_all();
 
-            if (m_status_icon != null && m_switcher != null)
-                state_changed();
+            if (m_icon_type == IconType.STATUS_ICON) {
+                if (m_status_icon != null && m_switcher != null)
+                    state_changed();
+            } else if (m_icon_type == IconType.INDICATOR) {
+                if (m_indicator != null && m_switcher != null)
+                    state_changed();
+            }
         }
     }
 
@@ -941,9 +1040,7 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private void status_icon_popup_menu_cb(Gtk.StatusIcon status_icon,
-                                           uint button,
-                                           uint activate_time) {
+    private Gtk.Menu create_context_menu() {
         // Show system menu
         if (m_sys_menu == null) {
             Gtk.MenuItem item;
@@ -970,14 +1067,10 @@ class Panel : IBus.PanelService {
             m_sys_menu.show_all();
         }
 
-        m_sys_menu.popup(null,
-                         null,
-                         m_status_icon.position_menu,
-                         0,
-                         Gtk.get_current_event_time());
+        return m_sys_menu;
     }
 
-    private void status_icon_activate_cb(Gtk.StatusIcon status_icon) {
+    private Gtk.Menu create_activate_menu() {
         m_ime_menu = new Gtk.Menu();
 
         // Show properties and IME switching menu
@@ -1009,11 +1102,8 @@ class Panel : IBus.PanelService {
 
         // Do not take focuse to avoid some focus related issues.
         m_ime_menu.set_take_focus(false);
-        m_ime_menu.popup(null,
-                         null,
-                         m_status_icon.position_menu,
-                         0,
-                         Gtk.get_current_event_time());
+
+        return m_ime_menu;
     }
 
     /* override virtual functions */
@@ -1141,15 +1231,28 @@ class Panel : IBus.PanelService {
         if (m_switcher_is_running)
             return;
 
+        if (m_icon_type == IconType.INDICATOR) {
+            // Wait for the callback of the session bus.
+            if (m_indicator == null)
+                return;
+        }
+
         var icon_name = "ibus-keyboard";
 
         var engine = m_bus.get_global_engine();
         if (engine != null)
             icon_name = engine.get_icon();
 
-        if (icon_name[0] == '/')
-            m_status_icon.set_from_file(icon_name);
-        else {
+        if (icon_name[0] == '/') {
+            if (m_icon_type == IconType.STATUS_ICON) {
+                m_status_icon.set_from_file(icon_name);
+            }
+            else if (m_icon_type == IconType.INDICATOR) {
+                warning("appindicator requires an icon name in a theme " +
+                        "path instead of the full path: %s", icon_name);
+                m_indicator.set_icon_full("ibus-engine", "");
+            }
+        } else {
             string language = null;
 
             if (engine != null) {
@@ -1159,14 +1262,32 @@ class Panel : IBus.PanelService {
             }
 
             if (language != null) {
-                Gdk.Pixbuf pixbuf = create_icon_pixbuf_with_string(language);
-                m_status_icon.set_from_pixbuf(pixbuf);
+                if (m_icon_type == IconType.STATUS_ICON) {
+                    Gdk.Pixbuf pixbuf =
+                            create_icon_pixbuf_with_string(language);
+                    m_status_icon.set_from_pixbuf(pixbuf);
+                }
+                else if (m_icon_type == IconType.INDICATOR) {
+                    /* Appindicator does not support pixbuf. */
+                    m_indicator.set_icon_full(icon_name, "");
+                }
             } else {
                 var theme = Gtk.IconTheme.get_default();
-                if (theme.lookup_icon(icon_name, 48, 0) != null)
-                    m_status_icon.set_from_icon_name(icon_name);
-                else
-                    m_status_icon.set_from_icon_name("ibus-engine");
+                if (theme.lookup_icon(icon_name, 48, 0) != null) {
+                    if (m_icon_type == IconType.STATUS_ICON) {
+                        m_status_icon.set_from_icon_name(icon_name);
+                    }
+                    else if (m_icon_type == IconType.INDICATOR) {
+                        m_indicator.set_icon_full(icon_name, "");
+                    }
+                } else {
+                    if (m_icon_type == IconType.STATUS_ICON) {
+                        m_status_icon.set_from_icon_name("ibus-engine");
+                    }
+                    else if (m_icon_type == IconType.INDICATOR) {
+                        m_indicator.set_icon_full("ibus-engine", "");
+                    }
+                }
             }
         }
 

From 211483eae9cec8c4762dbb6714264084dc774c75 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 25 Feb 2015 12:53:10 +0900
Subject: [PATCH 287/816] Update translations

Update bn_IN.po ca.po es.po ja.po ko.po ml.po nl.po zh_TW.po

Review URL: https://codereview.appspot.com/202150044
---
 po/bn_IN.po | 302 +++++++++++++++++++++++++------------------
 po/ca.po    | 365 ++++++++++++++++++++++++++++++----------------------
 po/es.po    |  85 ++++++------
 po/ja.po    |  45 ++++---
 po/ko.po    |  27 ++--
 po/ml.po    | 288 ++++++++++++++++++++++++-----------------
 po/nl.po    | 245 ++++++++++++++++++++---------------
 po/zh_TW.po |  67 +++++-----
 8 files changed, 817 insertions(+), 607 deletions(-)

diff --git a/po/bn_IN.po b/po/bn_IN.po
index c711a692a..edcfeaf83 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,23 +1,23 @@
 # translation of ibus.pot to Bengali (India)
 # Bengali (India) translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# bnin <sray@redhat.com>, 2013
+# Saibal Ray, 2013
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2009
 # runab <runab@redhat.com>, 2009, 2010
 # runa <runabh@gmail.com>, 2012
 # runab <runab@redhat.com>, 2009-2010
 # runa <runabh@gmail.com>, 2012
-# bnin <sray@redhat.com>, 2013
+# Saibal Ray, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: bnin <sray@redhat.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-11-11 10:28+0000\n"
+"Last-Translator: Saibal Ray\n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +55,11 @@ msgstr "স্বনির্ধারিত"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "দেখাবেন না"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "স্বয়ংক্রিয় ভাবে লুকান"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -89,7 +89,7 @@ msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
@@ -123,17 +123,17 @@ msgstr "ভাষার বার প্রদর্শন ও আড়াল ক
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "বিশিষ্টতা প্যানেল দেখান:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
@@ -162,7 +162,8 @@ msgid "General"
 msgstr "সাধারণ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "যোগ করুন (_A)"
 
@@ -215,18 +216,18 @@ msgid ""
 "<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>"
-msgstr ""
+msgstr "<small><i>কীবোর্ড শর্টকাট কী টিপে বা প্যানেল অাইকনে ক্লিক করে, উপরের তালিকায় নির্বাচিতটি থেকে সক্রিয় ইনপুট পদ্ধতি পাল্টানো যেতে পারে।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
@@ -234,7 +235,7 @@ msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
@@ -264,184 +265,219 @@ msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হ
 msgid "<b>Startup</b>"
 msgstr "<b>প্রারম্ভ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "পরিচিতি"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি পূর্বে লোড করা হবে"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "ইঞ্জিনের অনুক্রম"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ইনপুট পদ্ধতির তালিকায় সংরক্ষিত ইঞ্জিনের অনুক্রম"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME স্যুইচার উইন্ডোর ক্ষেত্রে পপ-অাপ মিলিসেকেন্ড বিলম্ব"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = উইন্ডো সংগে সংগে দেখান। 0 &lt; মিলিসেকেন্ড বিলম্ব। 0 &gt; উইন্ডো দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "সংরক্ষিত সংস্করণ নম্বর"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 এর একটির মধ্যে পার্থক্য যাচাই করতে সংরক্ষিত সংস্করণ নম্বর ব্যবহৃত হবে।"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ল্যাটিন সজ্জা যাতে কোনো ASCII নেই"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US সজ্জা ল্যাটিন সজ্জাতে প্রয়োগ করা হয়। বৈচিত্র্য বাদ দেওয়া হতে পারে।"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ব্যবহার করুন"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "ibus ইঞ্জিনগুলি পাল্টানোর সময়ে, .xmodmap বা .Xmodmap বিদ্যমান থাকলে xmodmap চালান।"
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ট্রিগারের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse এর ক্ষেত্রে শর্টকাট কী ট্রিগার"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "শর্ট-কাট কি সক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ইনপুট পদ্ধতি চালু করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "শর্ট-কাট কি নিষ্ক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ইনপুট পদ্ধতি বন্ধ করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "বিশিষ্টতা প্যানেলের অাচরণ। 0 = দেখাবেন না, 1 = স্বয়ংক্রিয় ভাবে লুকানো, 2 = সর্বদা দেখান"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ভাষার প্যানেলের অবস্থান"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "প্যানেল সর্বদা দেখানো হলে, ইনপুট কার্সার অনুসরণ করুন"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "সত্য হলে, প্যানেল সর্বদা দেখানো হলে প্যানেল ইনপুট কার্সার অনুসরণ করে। মিথ্যা হলে, প্যানেল একটি নির্দিষ্ট অবস্থানে দেখানো হয়।"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "বিশিষ্টতা প্যানেল দেখাতে মিলিসেকেন্ড"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "ফোকাস-ইন বা বিশিষ্টতা পরিবর্তিত হওয়ার পরে, বিশিষ্টতা প্যানেল দেখাতে মিলিসেকেন্ড।"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB অাইকনের RGBA মান"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "XKB অাইকন সজ্জা স্ট্রীং দেখায় এবং স্ট্রীং RGBA মানের সাথে রেন্ডার হয়। RGBA মান হতে পারে 1. X11 থেকে একটি রঙের নাম, 2. '#rrggbb' থেকে একটি হেক্স মান যেখানে 'r', 'g' এবং 'b' হল লাল, সবুজ, এবং নীলের হেক্স ডিজিট 3. একটি RGB রঙ, 'rgb(r,g,b)' ফর্মে অথবা 4. একটি RGBA রঙ, 'rgba(r,g,b,a)' ফর্মে, যেখানে 'r', 'g', এবং 'b' হয় 0 থেকে 255 রেঞ্জে পূর্ণসংখ্যা বা 0% থেকে 100% রেঞ্জে শতাংশ মান, এবং 'a' হল একটি ফ্লোটিং পয়েন্ট মান, অালফার 0 থেকে 1 রেঞ্জে।"
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf দ্বারা নেম প্রেফিক্স সংরক্ষণ করা হবে"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নেম পরিবর্তন প্রতিরোধ করার জন্য DConf-কির প্রেফিক্স"
 
@@ -455,29 +491,38 @@ msgstr "স্বত্বাধিকার (c) ২০০৭-২০০৯ প
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কি-বোর্ড বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "নির্মাতা: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "অারো…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -486,55 +531,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "কি-বোর্ড শর্ট-কাট"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "কি-র কোড:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "প্রয়োগ করুন (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "মুছে ফেলুন (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "ঠিক আছে (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য শিফ্ট সমেত শর্ট-কাট কি ব্যবহার করুন"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডেমন বর্তমানে চলছে না। এটি আরম্ভ করা হবে কি?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -543,157 +584,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডেমনটি %d সেকেন্ডে আরম্ভ করা যায়নি।"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতি পরিবর্তন"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "শুধুমাত্র ইঞ্জিনের নামের তালিকা প্রদর্শন করা হবে"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus-র সাথে সংযোগ করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "কোনো ইঞ্জিন নির্ধারিত হয়নি।\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "গ্লোবাল ইঞ্জিন নির্ধারণ করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "গ্লোবাল ইঞ্জিন প্রাপ্ত করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ পড়ুন।"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "রেজিস্ট্রি ক্যাশ FILE পড়ুন।"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "রেজিস্ট্রি ক্যাশ অবৈধ।\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ লিখুন।"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "রেজিস্ট্রি ক্যাশ FILE লিখুন।"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "পুনঃসেট…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "সম্পন্ন"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "ইঞ্জিন সেট করুন বা পান"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon থেকে প্রস্থান করুন"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "উপলব্ধ ইঞ্জিনগুলি দেখান"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(বাস্তবায়িত নয়)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon বন্ধ করে অাবার চালু করুন"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "সংস্করণ দেখান"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "রেজিস্ট্রি ক্যাশের বিষয়বস্তু দেখান"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "রেজিস্ট্রি ক্যাশ তৈরি করুন"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon এর D-Bus ঠিকানা প্রিন্ট করুন"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "কনফিগারেশন মানগুলি দেখান"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "কনফিগারেশন মানগুলি পুনঃসেট করুন"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "এই তথ্য দেখান"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "কমান্ড:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s একটি অজানা কমান্ড!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus অাপডেট"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space হল এখন ডিফল্ট হট-কী।"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "পুনরারম্ভ"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "প্রস্থান"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ca.po b/po/ca.po
index cb9e5b8a5..7a6305fcf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,19 +1,20 @@
 # translation of ibus.pot to Catalan
 # Catalan translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Bernabé Borrero <bernabeborrero@gmail.com>, 2012
 # Oscar Osta <oostap.listas@gmail.com>, 2011
 # Oscar Osta Pueyo <oostap@gmail.com>, 2009
+# Robert Antoni Buj i Gelonch, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: oostap <oostap.listas@gmail.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-11-13 19:11+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +52,11 @@ msgstr "Personalitzat"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "No mostrar"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Oculta-ho automàticament"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -85,13 +86,13 @@ msgstr "Mètode d'entrada anterior:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "Habilita o inhabilita:"
+msgstr "Habilita o deshabilita:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
@@ -99,7 +100,7 @@ msgstr "Habilita:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "Inhabilita:"
+msgstr "Deshabilita:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -119,17 +120,17 @@ msgstr "Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Mostra el quadre de la propietat:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posició del quadre d'idiomes:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Mostra la icona a la safata del sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
@@ -158,7 +159,8 @@ msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -218,11 +220,11 @@ msgstr ""
 msgid "Input Method"
 msgstr "Mètode d'entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
@@ -230,7 +232,7 @@ msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada en totes les aplicacions"
 
@@ -260,184 +262,219 @@ msgstr "Inicia l'IBus en entrar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Quant a"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Precarrega els motors"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Precarrega els motors durant l'inici de l'IBus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
-msgstr ""
+msgstr "Ordre de motors"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Ordre dels motors desats en la lista de mètodes d'entrada"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "Retard en milisegons de la finestra emergent per a la finestra del commutador IME"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
-msgstr ""
+msgstr "Estableix el retard de la finestra emergent en milisegons per mostrar la finestra del commutador IME. El valor predeterminat és 400. 0 = Mostra la finestra immediatament. 0 &lt; Retard en milisegons. 0 &gt; No mostra la finestra ni els motors anteriors o següents."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "Número de versió desada"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
+msgstr "El número de versió desada s'utilitzarà per comprovar la diferencia entre la versió anterior d'ibus i l'actual."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Les disposicions llatines no tenen ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "La disposició dels EEUU és un annex de les disposicions llatines. Es pot ometre la variant."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Utilitza xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Executa xmodmap sí existeix .xmodmap o .Xmodmap quant es commutin els motors ibus."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Dreceres de teclat de l'activador"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Dreceres de teclat de l'activador per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Habilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Inhabilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Dreceres de teclat del motor següent"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Dreceres de teclat del motor anterior"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Oculta automàticament"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Posició del quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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 posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada inferior dreta, 4 = personalitzat"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Milisegons per mostrar el quadre de la propietat"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Mostra el nom del mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "valor RGBA de la icona XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr "La icona XKB mostra la cadena de text de la disposició, la cadena de text es renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color d'X11, 2. un valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits hexadecimals per al roig, verd i blau, 3. un color RGB amb el format «rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i «b» són nombres enters amb rang de 0 a 255 o valors de percentatge amb rang de 0% a 100%, i «a» té un valor en punt flotant amb rang de 0 a 1 per l'alfa."
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Utilitza un tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Integra el text editat prèviament"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Integra el text editat prèviament en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus d'entrada"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf preserva els prefixes"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -451,29 +488,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Altres"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposició del teclat: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "Descripció: \n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "Més..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -482,214 +528,221 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Estableix les preferències de l'IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Codi de lletra:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificadors:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "_Aplica"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr "Premeu una tecla (o una combinació de tecles).\nEl diàleg es tancarà quan es deixi anar la tecla."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Cancel·la"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "_D'acord"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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 ""
+msgstr "S'ha iniciat IBus! Si no podeu utilitzar IBus, afegiu les línies següents al vostre $HOME/.bashrc; després torneu a entrar a l'escriptori.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "El dimoni IBus no es va poder iniciar en %d segons"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
-msgstr ""
+msgstr "commutació dels mètodes d'entrada"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "No es pot connectar a IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "No s'ha establer cap motor.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "S'ha produït un error en establir el motor global.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "S'ha produït un error en obtenir el motor global.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Llegeix la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Llegeix el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "La memòria cau del registre no és vàlida.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Escriu la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Escriu el FITXER de la memòria cau del registre."
+
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "S'esta restablint..."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "Fet"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
-msgstr ""
+msgstr "Estableix o obté el motor"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Surt del dimoni ibus"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
-msgstr ""
+msgstr "Mostra els motors disponibles"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(No implementat)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Reinicia el dimoni ibus"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
-msgstr ""
+msgstr "Mostra la versió"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Mostra el contingut de la memòria cau del registre"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
-msgstr ""
+msgstr "Crea la memòria cau del registre"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Mostra l'adreça D-Bus del dimoni ibus"
+
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "Mostra els valors de configuració"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "Restableix els valors de configuració"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
-msgstr ""
+msgstr "Mostra aquesta informació"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
+msgstr "Ús: %s COMANDA [OPCIÓ...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
-msgstr ""
+msgstr "Comandes:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s no és una comanda reconeguda!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
-msgstr ""
+msgstr "Actualització d'IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
-msgstr "Oscar Osta Pueyo <oostap@gmail.com>, 2009\nPatricia Rivera Escuder <patysya@gmail.com>, 2009\nXavier Conde Rueda <xavi.conde@gmail.com>\nJoan Duran <jodufi@gmail.com>"
+msgstr "Joan Duran <jodufi@gmail.com>\nOscar Osta Pueyo <oostap@gmail.com>,\nPatricia Rivera Escuder <patysya@gmail.com>,\nRobert Antoni Buj Gelonch <robert.buj@gmail.com>,\nXavier Conde Rueda <xavi.conde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Surt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/es.po b/po/es.po
index 40b93dcfe..7d1629647 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Spanish
 # Spanish translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,15 +10,16 @@
 # beckerde <domingobecker@gmail.com>, 2012-2013
 # beckerde <domingobecker@gmail.com>, 2013-2014
 # Eduardo Villagrán M <gotencool@gmail.com>, 2013
+# Gerardo Rosales <grosale86@gmail.com>, 2014
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 03:29+0000\n"
-"Last-Translator: beckerde <domingobecker@gmail.com>\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-10-28 19:02+0000\n"
+"Last-Translator: Gerardo Rosales <grosale86@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,7 +164,8 @@ msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -265,11 +267,11 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Acerca de"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -314,20 +316,20 @@ msgstr "El número de versión guardada se usará para chequear la diferencia en
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "Disposiciones latinas que no tienen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr ""
+msgstr "Disposición de los Estados Unidos se anexa a los Disposiciones latino. variante puede ser omitida."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "Usar xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
+msgstr "Ejecutar xmodmap si .xmodmap o .Xmodmap existen cuando los motores ibus son cambiados."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -491,29 +493,38 @@ msgstr "Copyright © 2007–2010 Peng Huang\nCopyright © 2007–2010 Red Hat, I
 msgid "Other"
 msgstr "Otro"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Diseño del teclado: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "Descripción:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "Más..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -522,55 +533,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Defina las preferencias de IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Código clave:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "_Aplicar"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 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:330
+#: ../setup/main.py:368
 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:351
+#: ../setup/main.py:389
 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"
@@ -579,18 +586,18 @@ msgid ""
 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:365
+#: ../setup/main.py:403
 #, 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:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "Cambiando métodos de entrada"
 
@@ -641,11 +648,11 @@ msgstr "Escriba al ARCHIVO caché del registro."
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr ""
+msgstr "Restableciendo..."
 
 #: ../tools/main.vala:318
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
@@ -685,11 +692,11 @@ msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Mostrar los valores de la configuración"
 
 #: ../tools/main.vala:347
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Restablecer los valores de la configuración"
 
 #: ../tools/main.vala:348
 msgid "Show this information"
@@ -741,6 +748,6 @@ msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ja.po b/po/ja.po
index 20fae7c2a..74253aa57 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Japanese
 # Japanese translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-07-18 04:14+0000\n"
-"Last-Translator: Hajime Taira <htaira@redhat.com>\n"
+"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"PO-Revision-Date: 2015-02-20 08:40+0000\n"
+"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,7 +164,7 @@ msgstr "一般"
 
 #. add button
 #: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -266,7 +266,8 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
+#: ../ui/gtk3/panel.vala:1053
 msgid "About"
 msgstr "情報"
 
@@ -515,12 +516,12 @@ msgstr "説明:\n"
 msgid "Select an input method"
 msgstr "入力メソッドの選択"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
 #: ../setup/main.py:413
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../setup/enginedialog.py:203
+#: ../setup/enginedialog.py:204
 msgid "More…"
 msgstr "さらに…"
 
@@ -545,26 +546,26 @@ msgid "Modifiers:"
 msgstr "修飾キー:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "適用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
 msgid "_OK"
 msgstr "OK(_O)"
 
@@ -717,31 +718,35 @@ msgstr "コマンド:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+msgid "IBus Panel"
+msgstr "IBus パネル"
+
+#: ../ui/gtk3/panel.vala:712
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1026
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1030
 msgid "translator-credits"
 msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>\nMIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1049
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1059
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1063
 msgid "Quit"
 msgstr "終了"
 
diff --git a/po/ko.po b/po/ko.po
index 2cfa62a9d..2dbd3603e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Korean
 # Korean translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,6 +8,7 @@
 # eukim <eukim@redhat.com>, 2009
 # eukim <eukim@redhat.com>, 2012
 # Hyunsok Oh <hoh@redhat.com>, 2010
+# lego37yoon <lego37yoon@outlook.com>, 2014
 # Michelle Kim <mkim33@gmail.com>, 2012-2014
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
 msgid ""
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-08-02 10:03+0000\n"
-"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"PO-Revision-Date: 2014-12-21 11:47+0000\n"
+"Last-Translator: lego37yoon <lego37yoon@outlook.com>\n"
 "Language-Team: Korean <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -309,15 +310,15 @@ msgstr "저장된 버전 번호"
 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 ""
+msgstr "저장된 버전 번호는 이전에 설치된 Ibus 입력기와의 다른점을 비교하는 데 사용됩니다."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "ASCII가 없는 라틴어 레이아웃"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr ""
+msgstr "US 레이아웃이 라틴어 레인아웃에 추가되었습니다. 변형된 것은 생략될 수 있습니다."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -520,7 +521,7 @@ msgstr "취소(_C)"
 
 #: ../setup/enginedialog.py:203
 msgid "More…"
-msgstr ""
+msgstr "더보기..."
 
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
@@ -625,23 +626,23 @@ msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
 
 #: ../tools/main.vala:210
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "시스템 레지스트리 캐시 읽어들이기"
 
 #: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "레지스트리 캐시 파일 읽어들이기"
 
 #: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "레지스트리 캐시가 잘못되었습니다.\n"
 
 #: ../tools/main.vala:250
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "시스템 레지스트리 캐시 쓰기"
 
 #: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "레지스트리 캐시파일 쓰기"
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
@@ -653,7 +654,7 @@ msgstr "완료"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
-msgstr ""
+msgstr "엔진을 설정하거나 얻기"
 
 #: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
diff --git a/po/ml.po b/po/ml.po
index 7eb7b7515..e88c61845 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,16 +1,16 @@
 # translation of ibus.pot to Malayalam
 # Malayalam translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Ani Peter <apeter@redhat.com>, 2009,2012-2013
+# Ani Peter <apeter@redhat.com>, 2009,2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-11-11 09:36+0000\n"
 "Last-Translator: Ani Peter <apeter@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -49,11 +49,11 @@ msgstr "യഥേഷ്ടം:"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "ഇനി കാണിയ്ക്കരുതു്"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "സ്വയമായി അദൃശ്യമാക്കുക"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,7 +83,7 @@ msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേ
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള്‍ സജ്ജമാക്കുക"
 
@@ -117,17 +117,17 @@ msgstr "ibus ഭാഷയുടെ പാനല്‍ കാണിക്കണ
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "വിശേഷതയ്ക്കുള്ള പാനല്‍ കാണിയ്ക്കുക:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "സിസ്റ്റം ട്രേയില്‍ ചിഹ്നം കാണിക്കുക"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ഭാഷയുടെ പാനലില്‍ ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
@@ -156,7 +156,8 @@ msgid "General"
 msgstr "സാധാരണ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "_ചേര്‍ക്കുക"
 
@@ -216,11 +217,11 @@ msgstr ""
 msgid "Input Method"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ്"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
 
@@ -228,7 +229,7 @@ msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃ
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>കീബോര്‍ഡ് മാതൃക</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "എല്ലാ പ്രയോഗങ്ങളിലും ഒരേ ഇന്‍പുട്ട് രീതി ഉപയോഗിക്കുക"
 
@@ -258,184 +259,219 @@ msgstr "പ്രവേശിക്കുമ്പോള്‍ തന്നെ i
 msgid "<b>Startup</b>"
 msgstr "<b>ആരംഭത്തില്‍</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "സംബന്ധിച്ചു്"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "_അടയ്ക്കുക"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus ആരംഭിക്കുമ്പോള്‍ സംവിധാനങ്ങള്‍ ലഭ്യമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "ഐഎംഇ സ്വിച്ചര്‍ ജാലകത്തിനുള്ള പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr "ഐഎംഇ സ്വിച്ചര്‍ ജാലകം കാണിയ്ക്കുന്നതിനായി പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍ സജ്ജമാക്കുക. സ്വതവേയുള്ളതു് 400. 0 = ജാലകം ഉടന്‍ കാണിയ്ക്കുക. 0 &lt; താമസം മില്ലിസെക്കന്‍ഡുകളില്‍. 0 &gt; ജാലകം കാണിയ്ക്കരുതു്, അടുത്തതു്/മുമ്പുള്ള എഞ്ചിനുകളിലേക്കു് മാറുക."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "സൂക്ഷിച്ച പതിപ്പു്"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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-ന്റെ പതിപ്പും തമ്മിലുള്ള വ്യത്യാസം പരിശോധിയ്ക്കുന്നതിനായി സൂക്ഷിച്ചിട്ടുള്ള പതിപ്പു് ഉപയോഗിയ്ക്കുന്നു."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "ആസ്കീ ഇല്ലാത്ത ലാറ്റിന്‍ ശൈലികള്‍"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "xmodmap ഉപയോഗിയ്ക്കൂ"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "എളുപ്പവഴികള്‍ ട്രിഗര്‍ ചെയ്യുക"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse-നു് കുറുക്കുവഴികള്‍ ഉപയോഗിയ്ക്കുക"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ഇന്‍പുട്ട രീതി ഓണ്‍ ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "കുറുക്കുവഴി കീകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ഇന്‍പുട്ട രീതി ഓഫ് ചെയ്യുന്നതിനുള്ള കുറുക്കുവഴി കീകള്‍"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "പട്ടികയിലുള്ള അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനുള്ള എളുപ്പവഴി"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്‍"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറുന്നതിനുള്ള എളുപ്പവഴി"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "സ്വയം അദൃശ്യമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ഭാഷയുടെ പാനല്‍ സ്ഥാനം"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "വിശേഷതകളുടെ പാനല്‍ കാണിയ്ക്കുന്നതിനുള്ള സമയം (മില്ലിസെക്കന്‍ഡ്)"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ലുക്കപ്പ് പട്ടികയുടെ ക്രമീകരണം. 0 = നേരെയുള്ള, 1 = കുറുകയുള്ള"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ഇന്‍പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB പ്രതിരൂപത്തിന്റെ RGBA മൂല്ല്യം"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്ങള്‍ സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "അക്ഷരസഞ്ചയം യഥേഷ്ടമാക്കുക:"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "ഭാഷയുടെ പാനലിലേക്കുള്ള അക്ഷരസഞ്ചയത്തിനുള്ള പേരു് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "പ്രയോഗത്തിനുള്ള ജാലകത്തില്‍ പ്രീഎഡിറ്റ് ടെക്സ്റ്റ് ചേര്‍ക്കുക"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "ഗ്ലോബല്‍ ഇന്‍പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "പ്രയോഗത്തിലേക്കു് ഇന്‍പുട്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുമ്പോള്‍ സ്വതവേ ഇന്‍പുട്ട് മെഥേഡ് സജ്ജമാക്കുക"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് പട്ടികയില്‍ സൂക്ഷിച്ചിട്ടുള്ള എഞ്ചിന്‍ ക്രമങ്ങള്‍"
 
@@ -449,29 +485,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "മറ്റുള്ളവ"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "ഭാഷ: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "കീബോര്‍ഡ് മാതൃക: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "രചയിതാവു്: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "വിവരണം:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "ഒരു ഇന്‍പുട്ട് മെഥേഡ് തെരഞ്ഞെടുക്കുക"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_റദ്ദാക്കുക"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "കൂടുതല്‍..."
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -480,55 +525,51 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus മുന്‍ഗണനകള്‍ സജ്ജമാക്കുക"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "കീബോര്‍ഡ് എളുപ്പവഴികള്‍"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "കീ കോഡ്:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "മോഡിഫയറുകള്‍:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "_കംപ്യൂട്ടറില്‍ സൂക്ഷിക്കുക"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "_വെട്ടി നീക്കുക"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_റദ്ദാക്കുക"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "_ശരി"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് രീതിയിലേക്കു് പോകുന്നതിനായി shift-നൊപ്പമുള്ള കുറുക്കുവഴി ഉപയോഗിയ്ക്കുക"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ഡെമണ്‍ പ്രവര്‍ത്തനത്തിലില്ല, നിങ്ങള്‍ക്കു് ഇതു് ആരംഭിയ്ക്കണമോ?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:389
 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"
@@ -537,157 +578,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "ഇന്‍പുട്ട് രീതികള്‍ തമ്മില്‍ മാറുക"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "എഞ്ചിന്‍ പേരു് മാത്രം ലഭ്യമാക്കുക"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "IBus-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "ഭാഷ: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "എഞ്ചിന്‍ സജ്ജമല്ല.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ സജ്ജമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "ഗ്ലോബല്‍ എഞ്ചിന്‍ ലഭ്യമാക്കുന്നതു് പരാജയപ്പെട്ടു.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "സിസ്റ്റം രജിസ്ട്രി കാഷ് ലഭ്യമാക്കുക."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "രജിസ്ട്രി ക്യാഷ് ഫയല്‍ ലഭ്യമാക്കുക."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "രജിസ്ട്രി ക്യാഷ് അസാധു.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "സിസ്റ്റം രജിസ്ട്രി ക്യാഷിലേക്കു് സൂക്ഷിയ്ക്കുക."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "രജിസ്ട്രി ക്യാഷ് ഫയലിലേക്കു് സൂക്ഷിയ്ക്കുക."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "വീണ്ടും സജ്ജമാക്കുന്നു..."
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "പൂര്‍ത്തിയായി"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "എഞ്ചിന്‍ സജ്ജമാക്കുക അല്ലെങ്കില്‍ ലഭ്യമാക്കുക"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon-ല്‍ നിന്നും പുറത്തു് കടക്കുക"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "ലഭ്യമായ എഞ്ചിനുകള്‍ കാണിയ്ക്കുക"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(ലഭ്യമാക്കിയിട്ടില്ല)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon വീണ്ടും ആരംഭിയ്ക്കുക"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "പതിപ്പു് കാണിയ്ക്കുക"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "രജിസ്ട്രി ക്യാഷിന്റെ ഉള്ളടക്കം കാണിയ്ക്കുക"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "രജിസ്ട്രി ക്യാഷ് തയ്യാറാക്കുക"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon-ന്റെ ഡി-ബസ് വിലാസം പ്രിന്റ് ചെയ്യുക"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "ക്രമീകരണ മൂല്ല്യങ്ങള്‍ കാണിയ്ക്കുക"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "ക്രമീകരണ മൂല്ല്യങ്ങള്‍ വീണ്ടും സജ്ജമാക്കുക"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "ഈ വിവരം കാണിയ്ക്കുക"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "കമാന്‍ഡുകള്‍:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ഒരു അപചിരിത കമാന്‍ഡാകുന്നു!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus പരിഷ്കരണം"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "ഇപ്പോള്‍ സ്വതവേയുള്ള എളുപ്പവഴി Super+space ആകുന്നു."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "മുന്‍ഗണനകള്‍ "
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "വീണ്ടും ആരംഭിക്കുക"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "പുറത്ത് കടക്കുക"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/nl.po b/po/nl.po
index 1ef6cd4de..00e36d790 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # translation of nl.po to Dutch
 # Dutch translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-02-26 14:33+0900\n"
-"PO-Revision-Date: 2014-02-28 13:30+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-10-22 12:36+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Vorige invoermethode:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
 
@@ -123,11 +123,11 @@ msgstr "Toon eigenschapspaneel"
 msgid "Language panel position:"
 msgstr "Taal panel positie:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Toon icoon op systeemvak"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Toon naam van invoermethode op taalbalk"
 
@@ -156,7 +156,8 @@ msgid "General"
 msgstr "Algemeen"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "_Toevoegen"
 
@@ -216,11 +217,11 @@ msgstr "<small><i>De actieve invoermethode kan omgeschakeld worden tussen de ges
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
@@ -228,7 +229,7 @@ msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
@@ -258,11 +259,11 @@ msgstr "Start ibus bij inloggen"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "Over"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "Sl_uiten"
 
@@ -306,102 +307,119 @@ msgid ""
 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:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Latin indelingen hebben geen ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US indeling is toegevoegd aan de latin indelingen. variant kan weggelaten worden."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Gebruik xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Voer xmodmap uit als .xmodmap of .Xmodmap bestaat als ibus engines worden omgeschakeld."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Trigger sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activeer snelkoppeltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Zet sneltoetsen aan"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "De sneltoetsen om invoermethode aan te zetten"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Zet sneltoetsen uit"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "De sneltoetsen om invoermethode uit te zetten"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Volgende engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:23
 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"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Vorige engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Automatisch verbergen"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch verbergen, 2 = Toon het altijd"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Taal-paneel positie"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Volg de input cursor als het paneel altijd getoond wordt"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "Als dit waar is zal het paneel de input cursor volgen als het panel altijd getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie getoond."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Het aanral milliseconden om het eigenschapspaneel te tonen "
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of eigenschappen veranderd zijn."
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Toon naam van invoermethode"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "RGBA waarde van XKB icoon"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -413,47 +431,47 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr "XKB icoon toont de indelingsstring en deze string wordt van de RGBA waarde afgeleid. De RGBA waarde kan zijn 1. een X11 kleurnaam, 2. een hexadecimale waarde in de vorm '#rrggbb' waarin 'r', 'g' en 'b' hexadecimale getallen zijn voor het rood, groen en blauw, 3. een RGB kleur in de vorm 'rgb(r,g,b)' of 4. een RGBA kleur in de vorm 'rgba(r,g,b,a)' waarin 'r', 'g' en 'b' gehele getallen zijn in de reeks van 0 tot 255 of procentuele waardes in de reeks van 0% tot 100%, en 'a' een waarde met drijvende komma is in de reeks van 0 tot 1 van alfa."
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:45
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:46
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:47
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:52
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -467,29 +485,38 @@ msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc
 msgid "Other"
 msgstr "Andere"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "Taal: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Toetsenbordindeling: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "Beschrijving:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "Selecteer een invoermethode"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "Meer…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Toetsenbord"
@@ -498,55 +525,51 @@ msgstr "Toetsenbord"
 msgid "Set IBus Preferences"
 msgstr "Stel IBus voorkeuren in"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Toetscode:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificatietoetsen:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "Toe_passen"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "_Ok"
 
-#: ../setup/main.py:102 ../setup/main.py:396
+#: ../setup/main.py:113 ../setup/main.py:438
 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:329
+#: ../setup/main.py:368
 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:350
+#: ../setup/main.py:389
 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"
@@ -555,158 +578,168 @@ msgid ""
 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:364
+#: ../setup/main.py:403
 #, 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:376
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:378
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Lees de systeem registry cache."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "Lees het registry cache BESTAND."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "De registry cache is ongeldig.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Schrijf de systeem registry cache."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "Herstellen…"
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "Klaar"
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "Toon de configuratiewaarden"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "Herstel de configuratiewaarden"
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:454
+#: ../ui/gtk3/panel.vala:611
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
+#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:782
+#: ../ui/gtk3/panel.vala:903
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:786
+#: ../ui/gtk3/panel.vala:907
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:807
+#: ../ui/gtk3/panel.vala:928
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:817
+#: ../ui/gtk3/panel.vala:938
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:821
+#: ../ui/gtk3/panel.vala:942
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b0cd13edd..16f0c8a8f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,18 +1,19 @@
 # translation of ibus.pot to Traditional Chinese
 # Traditional Chinese translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012,2014
 # Ding-Yi Chen <dchen@redhat.com>, 2009
+# Ding-Yi Chen <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 14:02+0000\n"
+"POT-Creation-Date: 2014-07-18 13:09+0900\n"
+"PO-Revision-Date: 2014-10-10 06:56+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -158,7 +159,8 @@ msgid "General"
 msgstr "通用"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:128
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -260,11 +262,11 @@ msgstr "在登入時啟動 iBus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -486,29 +488,38 @@ msgstr "版權所有 (c) 2007-2010 黃鵬\n版權所有 (c) 2007-2010 Red Hat, I
 msgid "Other"
 msgstr "其他"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "鍵盤配置: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者：%s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "選取輸入法"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/enginedialog.py:203
+msgid "More…"
+msgstr "其他…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "鍵盤"
@@ -517,55 +528,51 @@ msgstr "鍵盤"
 msgid "Set IBus Preferences"
 msgstr "設置 iBus 偏好設定"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "鍵盤快捷鍵"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "按鍵碼："
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "修飾鍵："
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:134
 msgid "_Apply"
 msgstr "套用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:140
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:256
 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:256
+#: ../setup/keyboardshortcut.py:259
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:330
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:351
+#: ../setup/main.py:389
 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"
@@ -574,18 +581,18 @@ msgid ""
 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:365
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "切換輸入法"
 
@@ -736,6 +743,6 @@ msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"

From db260a6f1f4ed0f6faba72cbb0d59c01799a319c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 25 Feb 2015 12:56:28 +0900
Subject: [PATCH 288/816] Release 1.5.10

Review URL: https://codereview.appspot.com/199620043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 61fbb77f4..39c9cad79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [9])
+m4_define([ibus_micro_version], [10])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 49ee54f83471542447e1121be15c27ff5d86600b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 Feb 2015 11:32:41 +0900
Subject: [PATCH 289/816] dconf: Work around using dbus development builds and
 /etc/machine-id

Recent DBus changed the way it reads /etc/machine-id to be more
strict, and it turns out that this breaks the use of dbus-launch here.

The *correct* fix is to use `dbus-run-session`, but not everyone has
that yet.  This is a quick hack that keeps the build going.

BUG=https://github.com/ibus/ibus/pull/16
TEST=data/dconf/00-upstream-settings

Review URL: https://codereview.appspot.com/209810043
Patch from Colin Walters <walters@verbum.org>.
---
 data/dconf/make-dconf-override-db.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
index 49a6df97c..9c650e973 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -2,6 +2,10 @@
 
 set -e
 
+# gnome-continuous doesn't have a machine-id set, which
+# breaks dbus-launch.  There's dbus-run-session which is
+# better, but not everyone has it yet.
+export DBUS_FATAL_WARNINGS=0
 export TMPDIR=$(mktemp -d --tmpdir="$PWD")
 export XDG_CONFIG_HOME="$TMPDIR/config"
 export XDG_CACHE_HOME="$TMPDIR/cache"

From 0ba6452740ec6e76344afaa2a9887566d0b62a4d Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Mon, 9 Mar 2015 13:36:58 +0900
Subject: [PATCH 290/816] Add ibus_keyval_convert_case and
 ibus_keyval_to_upper/lower methods

In some input method setup dialog, customization of shortcut keys are supported. But in python Gtk+, when grab the shortcut key, the gdk_keyval_to_lower method will be used.

This patch adds ibus_keyval_convert_case and ibus_keyval_to_upper/lower methods, so ibus-libpinyin can drop the Gdk 3.x C++ dependency.

BUG=https://code.google.com/p/ibus/issues/detail?id=1766
TEST=

Review URL: https://codereview.appspot.com/213760043
Patch from Peng Wu <alexepico@gmail.com>.
---
 src/ibuskeynames.c | 147 +++++++++++++++++++++++++++++++++++++++++++++
 src/ibuskeys.h     |  33 ++++++++++
 2 files changed, 180 insertions(+)

diff --git a/src/ibuskeynames.c b/src/ibuskeynames.c
index 2935bcb50..fe7836ee4 100644
--- a/src/ibuskeynames.c
+++ b/src/ibuskeynames.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include "ibuskeysyms.h"
 #include "keyname-table.h"
+#include "ibuskeys.h"
 
 #define IBUS_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
 
@@ -196,3 +197,149 @@ ibus_key_event_from_string (const gchar *string,
     return retval;
 }
 
+guint
+ibus_keyval_to_upper (guint keyval)
+{
+  guint result;
+
+  ibus_keyval_convert_case (keyval, NULL, &result);
+
+  return result;
+}
+
+guint
+ibus_keyval_to_lower (guint keyval)
+{
+  guint result;
+
+  ibus_keyval_convert_case (keyval, &result, NULL);
+
+  return result;
+}
+
+void
+ibus_keyval_convert_case (guint symbol,
+                         guint *lower,
+                         guint *upper)
+{
+  guint xlower, xupper;
+
+  xlower = symbol;
+  xupper = symbol;
+
+  /* Check for directly encoded 24-bit UCS characters: */
+  if ((symbol & 0xff000000) == 0x01000000)
+    {
+      if (lower)
+        *lower = ibus_unicode_to_keyval (g_unichar_tolower (symbol & 0x00ffffff));
+      if (upper)
+        *upper = ibus_unicode_to_keyval (g_unichar_toupper (symbol & 0x00ffffff));
+      return;
+    }
+
+  switch (symbol >> 8)
+    {
+    case 0: /* Latin 1 */
+      if ((symbol >= IBUS_KEY_A) && (symbol <= IBUS_KEY_Z))
+        xlower += (IBUS_KEY_a - IBUS_KEY_A);
+      else if ((symbol >= IBUS_KEY_a) && (symbol <= IBUS_KEY_z))
+        xupper -= (IBUS_KEY_a - IBUS_KEY_A);
+      else if ((symbol >= IBUS_KEY_Agrave) && (symbol <= IBUS_KEY_Odiaeresis))
+        xlower += (IBUS_KEY_agrave - IBUS_KEY_Agrave);
+      else if ((symbol >= IBUS_KEY_agrave) && (symbol <= IBUS_KEY_odiaeresis))
+        xupper -= (IBUS_KEY_agrave - IBUS_KEY_Agrave);
+      else if ((symbol >= IBUS_KEY_Ooblique) && (symbol <= IBUS_KEY_Thorn))
+        xlower += (IBUS_KEY_oslash - IBUS_KEY_Ooblique);
+      else if ((symbol >= IBUS_KEY_oslash) && (symbol <= IBUS_KEY_thorn))
+        xupper -= (IBUS_KEY_oslash - IBUS_KEY_Ooblique);
+      break;
+
+    case 1: /* Latin 2 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (symbol == IBUS_KEY_Aogonek)
+        xlower = IBUS_KEY_aogonek;
+      else if (symbol >= IBUS_KEY_Lstroke && symbol <= IBUS_KEY_Sacute)
+        xlower += (IBUS_KEY_lstroke - IBUS_KEY_Lstroke);
+      else if (symbol >= IBUS_KEY_Scaron && symbol <= IBUS_KEY_Zacute)
+        xlower += (IBUS_KEY_scaron - IBUS_KEY_Scaron);
+      else if (symbol >= IBUS_KEY_Zcaron && symbol <= IBUS_KEY_Zabovedot)
+        xlower += (IBUS_KEY_zcaron - IBUS_KEY_Zcaron);
+      else if (symbol == IBUS_KEY_aogonek)
+        xupper = IBUS_KEY_Aogonek;
+      else if (symbol >= IBUS_KEY_lstroke && symbol <= IBUS_KEY_sacute)
+        xupper -= (IBUS_KEY_lstroke - IBUS_KEY_Lstroke);
+      else if (symbol >= IBUS_KEY_scaron && symbol <= IBUS_KEY_zacute)
+        xupper -= (IBUS_KEY_scaron - IBUS_KEY_Scaron);
+      else if (symbol >= IBUS_KEY_zcaron && symbol <= IBUS_KEY_zabovedot)
+        xupper -= (IBUS_KEY_zcaron - IBUS_KEY_Zcaron);
+      else if (symbol >= IBUS_KEY_Racute && symbol <= IBUS_KEY_Tcedilla)
+        xlower += (IBUS_KEY_racute - IBUS_KEY_Racute);
+      else if (symbol >= IBUS_KEY_racute && symbol <= IBUS_KEY_tcedilla)
+        xupper -= (IBUS_KEY_racute - IBUS_KEY_Racute);
+      break;
+
+    case 2: /* Latin 3 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (symbol >= IBUS_KEY_Hstroke && symbol <= IBUS_KEY_Hcircumflex)
+        xlower += (IBUS_KEY_hstroke - IBUS_KEY_Hstroke);
+      else if (symbol >= IBUS_KEY_Gbreve && symbol <= IBUS_KEY_Jcircumflex)
+        xlower += (IBUS_KEY_gbreve - IBUS_KEY_Gbreve);
+      else if (symbol >= IBUS_KEY_hstroke && symbol <= IBUS_KEY_hcircumflex)
+        xupper -= (IBUS_KEY_hstroke - IBUS_KEY_Hstroke);
+      else if (symbol >= IBUS_KEY_gbreve && symbol <= IBUS_KEY_jcircumflex)
+        xupper -= (IBUS_KEY_gbreve - IBUS_KEY_Gbreve);
+      else if (symbol >= IBUS_KEY_Cabovedot && symbol <= IBUS_KEY_Scircumflex)
+        xlower += (IBUS_KEY_cabovedot - IBUS_KEY_Cabovedot);
+      else if (symbol >= IBUS_KEY_cabovedot && symbol <= IBUS_KEY_scircumflex)
+        xupper -= (IBUS_KEY_cabovedot - IBUS_KEY_Cabovedot);
+      break;
+
+    case 3: /* Latin 4 */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (symbol >= IBUS_KEY_Rcedilla && symbol <= IBUS_KEY_Tslash)
+        xlower += (IBUS_KEY_rcedilla - IBUS_KEY_Rcedilla);
+      else if (symbol >= IBUS_KEY_rcedilla && symbol <= IBUS_KEY_tslash)
+        xupper -= (IBUS_KEY_rcedilla - IBUS_KEY_Rcedilla);
+      else if (symbol == IBUS_KEY_ENG)
+        xlower = IBUS_KEY_eng;
+      else if (symbol == IBUS_KEY_eng)
+        xupper = IBUS_KEY_ENG;
+      else if (symbol >= IBUS_KEY_Amacron && symbol <= IBUS_KEY_Umacron)
+        xlower += (IBUS_KEY_amacron - IBUS_KEY_Amacron);
+      else if (symbol >= IBUS_KEY_amacron && symbol <= IBUS_KEY_umacron)
+        xupper -= (IBUS_KEY_amacron - IBUS_KEY_Amacron);
+      break;
+
+    case 6: /* Cyrillic */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (symbol >= IBUS_KEY_Serbian_DJE && symbol <= IBUS_KEY_Serbian_DZE)
+        xlower -= (IBUS_KEY_Serbian_DJE - IBUS_KEY_Serbian_dje);
+      else if (symbol >= IBUS_KEY_Serbian_dje && symbol <= IBUS_KEY_Serbian_dze)
+        xupper += (IBUS_KEY_Serbian_DJE - IBUS_KEY_Serbian_dje);
+      else if (symbol >= IBUS_KEY_Cyrillic_YU && symbol <= IBUS_KEY_Cyrillic_HARDSIGN)
+        xlower -= (IBUS_KEY_Cyrillic_YU - IBUS_KEY_Cyrillic_yu);
+      else if (symbol >= IBUS_KEY_Cyrillic_yu && symbol <= IBUS_KEY_Cyrillic_hardsign)
+        xupper += (IBUS_KEY_Cyrillic_YU - IBUS_KEY_Cyrillic_yu);
+      break;
+
+    case 7: /* Greek */
+      /* Assume the KeySym is a legal value (ignore discontinuities) */
+      if (symbol >= IBUS_KEY_Greek_ALPHAaccent && symbol <= IBUS_KEY_Greek_OMEGAaccent)
+        xlower += (IBUS_KEY_Greek_alphaaccent - IBUS_KEY_Greek_ALPHAaccent);
+      else if (symbol >= IBUS_KEY_Greek_alphaaccent && symbol <= IBUS_KEY_Greek_omegaaccent &&
+               symbol != IBUS_KEY_Greek_iotaaccentdieresis &&
+               symbol != IBUS_KEY_Greek_upsilonaccentdieresis)
+        xupper -= (IBUS_KEY_Greek_alphaaccent - IBUS_KEY_Greek_ALPHAaccent);
+      else if (symbol >= IBUS_KEY_Greek_ALPHA && symbol <= IBUS_KEY_Greek_OMEGA)
+        xlower += (IBUS_KEY_Greek_alpha - IBUS_KEY_Greek_ALPHA);
+      else if (symbol >= IBUS_KEY_Greek_alpha && symbol <= IBUS_KEY_Greek_omega &&
+               symbol != IBUS_KEY_Greek_finalsmallsigma)
+        xupper -= (IBUS_KEY_Greek_alpha - IBUS_KEY_Greek_ALPHA);
+      break;
+    }
+
+  if (lower)
+    *lower = xlower;
+  if (upper)
+    *upper = xupper;
+}
diff --git a/src/ibuskeys.h b/src/ibuskeys.h
index 7969929a0..6ad0a903e 100644
--- a/src/ibuskeys.h
+++ b/src/ibuskeys.h
@@ -74,5 +74,38 @@ guint            ibus_unicode_to_keyval (gunichar        wc);
  **/
 gunichar         ibus_keyval_to_unicode (guint           keyval);
 
+/**
+ * ibus_keyval_to_upper:
+ * @keyval: a key value.
+ *
+ * Converts a key value to upper case, if applicable.
+ *
+ * Returns: the upper case form of @keyval, or @keyval itself if it is already
+ *   in upper case or it is not subject to case conversion.
+ */
+guint            ibus_keyval_to_upper (guint keyval);
+
+/**
+ * ibus_keyval_to_lower:
+ * @keyval: a key value.
+ *
+ * Converts a key value to lower case, if applicable.
+ *
+ * Returns: the lower case form of @keyval, or @keyval itself if it is already
+ *  in lower case or it is not subject to case conversion.
+ */
+guint            ibus_keyval_to_lower (guint keyval);
+
+/**
+ * ibus_keyval_convert_case:
+ * @symbol: a keyval
+ * @lower: (out): return location for lowercase version of @symbol
+ * @upper: (out): return location for uppercase version of @symbol
+ *
+ * Obtains the upper- and lower-case versions of the keyval @symbol.
+ * Examples of keyvals are #IBUS_KEY_a, #IBUS_KEY_Enter, #IBUS_KEY_F1, etc.
+ */
+void ibus_keyval_convert_case (guint symbol, guint *lower, guint *upper);
+
 G_END_DECLS
 #endif // __IBUS_KEYS_H_

From f32e98fdacf50af70fe1e3198463fc75d9ead727 Mon Sep 17 00:00:00 2001
From: Albert Veli <albert.veli@gmail.com>
Date: Thu, 12 Mar 2015 12:12:22 +0900
Subject: [PATCH 291/816] Add Swedish svdvorak in simple.xml

TEST=engine/simple.xml

Review URL: https://codereview.appspot.com/215730043
Patch from Albert Veli <albert.veli@gmail.com>.
---
 engine/simple.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index c16f86a0e..93de14a45 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -625,6 +625,18 @@
                         <icon>ibus-keyboard</icon>
 			<rank>99</rank>
 		</engine>
+                <engine>
+                        <name>xkb:se:svdvorak:swe</name>
+                        <language>swe</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>se</layout>
+                        <layout_variant>svdvorak</layout_variant>
+                        <longname>Swedish (Svdvorak)</longname>
+                        <description>Swedish (Svdvorak)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>99</rank>
+                </engine>
 		<engine>
 			<name>xkb:ch::ger</name>
 			<language>ger</language>

From 4a4bd5fd0cac63b73464039896df123efd372d4a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 18 Mar 2015 13:47:07 +0900
Subject: [PATCH 292/816] Change ranks for minor keymaps in simple.xml

TEST=engine/simple.xml

Review URL: https://codereview.appspot.com/217900043
---
 engine/simple.xml.in | 50 ++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 93de14a45..5f04f8b20 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -30,7 +30,7 @@
 			<longname>English (US, international with dead keys)</longname>
 			<description>English (US, international with dead keys)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:us:colemak:eng</name>
@@ -42,7 +42,7 @@
 			<longname>English (Colemak)</longname>
 			<description>English (Colemak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:us:dvorak:eng</name>
@@ -54,7 +54,7 @@
 			<longname>English (Dvorak)</longname>
 			<description>English (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:us:altgr-intl:eng</name>
@@ -66,7 +66,7 @@
 			<longname>English (international AltGr dead keys)</longname>
 			<description>English (international AltGr dead keys)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:ara::ara</name>
@@ -88,7 +88,7 @@
 			<longname>Belgian</longname>
 			<description>Belgian</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:be::nld</name>
@@ -110,7 +110,7 @@
 			<longname>Belgian</longname>
 			<description>Belgian</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:br::por</name>
@@ -133,7 +133,7 @@
 			<longname>Portuguese (Brazil, Dvorak)</longname>
 			<description>Portuguese (Brazil, Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:bg::bul</name>
@@ -167,7 +167,7 @@
 			<longname>French (Canada)</longname>
 			<description>French (Canada)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:ca:eng:eng</name>
@@ -179,7 +179,7 @@
 			<longname>English (Canada)</longname>
 			<description>English (Canada)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:hr::scr</name>
@@ -269,7 +269,7 @@
                         <longname>French (alternative)</longname>
                         <description>French (alternative)</description>
                         <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
+                        <rank>1</rank>
                 </engine>
                 <engine>
                         <name>xkb:fr:bepo:fra</name>
@@ -281,7 +281,7 @@
                         <longname>French (Bepo, ergonomic, Dvorak way)</longname>
                         <description>French (Bepo, ergonomic, Dvorak way)</description>
                         <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
+                        <rank>1</rank>
                 </engine>
                 <engine>
                         <name>xkb:fr:dvorak:fra</name>
@@ -316,7 +316,7 @@
 			<longname>German (Dvorak)</longname>
 			<description>German (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:de:neo:ger</name>
@@ -328,7 +328,7 @@
 			<longname>German (Neo 2)</longname>
 			<description>German (Neo 2)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
                 <engine>
                         <name>xkb:de:nodeadkeys:ger</name>
@@ -340,7 +340,7 @@
                         <longname>German (eliminate dead keys)</longname>
                         <description>German (eliminate dead keys)</description>
                         <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
+                        <rank>1</rank>
                 </engine>
 		<engine>
 			<name>xkb:gr::gre</name>
@@ -395,7 +395,7 @@
 			<longname>Japanese</longname>
 			<description>Japanese</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:latam::spa</name>
@@ -406,7 +406,7 @@
 			<longname>Spanish (Latin American)</longname>
 			<description>Spanish (Latin American)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:lt::lit</name>
@@ -452,7 +452,7 @@
 			<longname>Norwegian (Dvorak)</longname>
 			<description>Norwegian (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:pl::pol</name>
@@ -475,7 +475,7 @@
 			<longname>Polish (Dvorak)</longname>
 			<description>Polish (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
                 <engine>
                         <name>xkb:pl:qwertz:pol</name>
@@ -532,7 +532,7 @@
 			<longname>Russian (phonetic)</longname>
 			<description>Russian (phonetic)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:rs::srp</name>
@@ -623,7 +623,7 @@
 			<longname>Swedish (Dvorak)</longname>
 			<description>Swedish (Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
                 <engine>
                         <name>xkb:se:svdvorak:swe</name>
@@ -635,7 +635,7 @@
                         <longname>Swedish (Svdvorak)</longname>
                         <description>Swedish (Svdvorak)</description>
                         <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
+                        <rank>1</rank>
                 </engine>
 		<engine>
 			<name>xkb:ch::ger</name>
@@ -646,7 +646,7 @@
 			<longname>German (Switzerland)</longname>
 			<description>German (Switzerland)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:ch:fr:fra</name>
@@ -658,7 +658,7 @@
 			<longname>French (Switzerland)</longname>
 			<description>French (Switzerland)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:tr::tur</name>
@@ -692,7 +692,7 @@
 			<longname>English (UK, extended WinKeys)</longname>
 			<description>English (UK, extended WinKeys)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 		<engine>
 			<name>xkb:gb:dvorak:eng</name>
@@ -704,7 +704,7 @@
 			<longname>English (UK, Dvorak)</longname>
 			<description>English (UK, Dvorak)</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
+			<rank>1</rank>
 		</engine>
 	</engines>
 </component>

From 8b187598215e3af0481e0f9415fe6a21db682e6b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 25 Mar 2015 13:55:50 +0900
Subject: [PATCH 293/816] I18N for engine longnames on ibus-setup

New API ibus_get_untranslated_language_name().
Call bindtextdomain() for each textdomains.

TEST=setup

Review URL: https://codereview.appspot.com/218760043
---
 setup/enginedialog.py   | 41 +++++++++++++++++------------------
 setup/enginetreeview.py | 16 +++++++++-----
 setup/main.py           | 10 +++++----
 src/ibusutil.c          | 47 ++++++++++++++++++++++++-----------------
 src/ibusutil.h          | 16 ++++++++++----
 ui/gtk2/i18n.py         | 38 +++++++++++++++++++++++++--------
 ui/gtk2/main.py         |  8 +++----
 7 files changed, 109 insertions(+), 67 deletions(-)

diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index 2b179adcc..2c472debd 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -3,9 +3,9 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2013-2014 Red Hat, Inc.
+# Copyright (c) 2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2013-2015 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -29,6 +29,7 @@
 
 import functools
 import gettext
+import i18n
 import locale
 
 from icon import load_icon
@@ -227,10 +228,13 @@ def __back_row_new(self, text):
 
 
     def __engine_row_new(self, engine):
-        row = self.__list_box_row_new(engine.get_longname())
-        row.set_tooltip_text(engine.get_description())
+        longname = i18n.gettext_engine_longname(engine)
+        description = i18n.gettext_engine_description(engine)
+        row = self.__list_box_row_new(longname)
+        row.untrans = engine.get_longname()
+        row.set_tooltip_text(description)
         row.engine = engine
-        widget = self.__padded_label_new(engine.get_longname(),
+        widget = self.__padded_label_new(longname,
                                          engine.get_icon(),
                                          Gtk.Align.START,
                                          ROW_TRAVEL_DIRECTION_NONE)
@@ -257,7 +261,9 @@ def __add_engine_rows_for_lang(self, row):
 
         def cmp_engine(a, b):
             if a.get_rank() == b.get_rank():
-                return locale.strcoll(a.get_longname(), b.get_longname())
+                a_longname = i18n.gettext_engine_longname(a)
+                b_longname = i18n.gettext_engine_longname(b)
+                return locale.strcoll(a_longname, b_longname)
             return int(b.get_rank() - a.get_rank())
 
         self.__engines_for_lang[lang].sort(
@@ -294,6 +300,7 @@ def __show_engines_for_lang(self, row):
         self.__list.add(row)
         self.__add_engine_rows_for_lang(row)
         self.__list.show_all()
+        self.__adjustment.set_value(self.__adjustment.get_lower())
 
 
     def __do_filter(self):
@@ -321,24 +328,14 @@ def set_engines(self, engines):
                 l = ''
             if l not in self.__engines_for_lang:
                 self.__engines_for_lang[l] = []
+            i18n.init_textdomain(e.get_textdomain())
             self.__engines_for_lang[l].append(e)
 
             # Retrieve Untranslated language names.
-            backup_locale = locale.setlocale(locale.LC_ALL, None)
-            def __set_untrans_with_locale(en_locale):
-                locale.setlocale(locale.LC_ALL, en_locale)
-                untrans = IBus.get_language_name(e.get_language())
-                if untrans == None:
-                    untrans = ''
-                self.__untrans_for_lang[l] = untrans
-            try:
-                __set_untrans_with_locale('en_US.UTF-8')
-            except locale.Error:
-                try:
-                    __set_untrans_with_locale('C')
-                except locale.Error:
-                    pass
-            locale.setlocale(locale.LC_ALL, backup_locale)
+            untrans = IBus.get_untranslated_language_name(e.get_language())
+            if untrans == None:
+                untrans = ''
+            self.__untrans_for_lang[l] = untrans
 
         keys = list(self.__engines_for_lang.keys())
         keys.sort(key=functools.cmp_to_key(locale.strcoll))
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 75ff04b30..4de4a516f 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -26,6 +26,8 @@
 from gi.repository import IBus
 from gi.repository import Pango
 
+import i18n
+
 from icon import load_icon
 from i18n import _, N_
 
@@ -106,8 +108,10 @@ def __sort_engines(self, model, a, b, data):
         engine_b = model[b][0]
         language_a = IBus.get_language_name(engine_a.get_language())
         language_b = IBus.get_language_name(engine_b.get_language())
-        label_a = "%s - %s" % (language_a, engine_a.get_longname())
-        label_b = "%s - %s" % (language_b, engine_b.get_longname())
+        longname_a = i18n.gettext_engine_longname(engine_a)
+        longname_b = i18n.gettext_engine_longname(engine_b)
+        label_a = "%s - %s" % (language_a, longname_a)
+        label_b = "%s - %s" % (language_b, longname_b)
         # http://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons
         return (label_a > label_b) - (label_a < label_b)
 
@@ -149,8 +153,9 @@ def __name_cell_data_cb(self, celllayout, renderer, model, it, data):
 
         renderer.set_property("sensitive", True)
         language = IBus.get_language_name(engine.get_language())
+        longname = i18n.gettext_engine_longname(engine)
         renderer.set_property("text",
-                "%s - %s" % (language, engine.get_longname()))
+                "%s - %s" % (language, longname))
         renderer.set_property("weight", Pango.Weight.NORMAL)
 
     def __layout_cell_data_cb(self, celllayout, renderer, model, it, data):
@@ -196,6 +201,7 @@ def set_engines(self, engines):
             if e in self.__engines:
                 continue
             it = self.__model.append(None)
+            i18n.init_textdomain(e.get_textdomain())
             self.__model.set(it, 0, e)
             self.__engines.append(e)
         self.__emit_changed()
diff --git a/setup/main.py b/setup/main.py
index c1d5c55ac..22b6dc77c 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -39,13 +39,14 @@
 from gi.repository import IBus
 from os import path
 
+import i18n
 import keyboardshortcut
 import locale
 from enginecombobox import EngineComboBox
 from enginedialog import EngineDialog
 from enginetreeview import EngineTreeView
 from engineabout import EngineAbout
-from i18n import DOMAINNAME, _, N_, init as i18n_init
+from i18n import DOMAINNAME, _, N_
 
 (
     COLUMN_NAME,
@@ -543,6 +544,7 @@ def run(self):
         print("Using the fallback 'C' locale", file=sys.stderr)
         locale.setlocale(locale.LC_ALL, 'C')
 
-    i18n_init()
+    i18n.init_textdomain(DOMAINNAME)
+    i18n.init_textdomain('xkeyboard-config')
     setup = Setup()
     setup.run()
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 3eddc99cf..b9f3fddee 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2011 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2011 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -98,6 +98,11 @@ _load_lang()
     XMLNode *node;
     struct stat buf;
 
+#ifdef ENABLE_NLS
+    bindtextdomain ("iso_639", GLIB_LOCALE_DIR);
+    bind_textdomain_codeset ("iso_639", "UTF-8");
+#endif
+
     __languages_dict = g_hash_table_new_full (g_str_hash,
             g_str_equal, g_free, g_free);
     filename = g_build_filename (ISOCODES_PREFIX,
@@ -121,37 +126,41 @@ _load_lang()
 }
 
 const gchar *
-ibus_get_language_name(const gchar *_locale) {
+ibus_get_untranslated_language_name (const gchar *_locale)
+{
     const gchar *retval;
     gchar *p = NULL;
     gchar *lang = NULL;
 
-    if (__languages_dict == NULL ) {
+    if (__languages_dict == NULL )
         _load_lang();
-    }
-    if ((p = strchr (_locale, '_')) !=  NULL) {
+    if ((p = strchr (_locale, '_')) !=  NULL)
         p = g_strndup (_locale, p - _locale);
-    } else {
+    else
         p = g_strdup (_locale);
-    }
     lang = g_ascii_strdown (p, -1);
     g_free (p);
     retval = (const gchar *) g_hash_table_lookup (__languages_dict, lang);
     g_free (lang);
-    if (retval != NULL) {
-#ifdef ENABLE_NLS
-        return dgettext("iso_639", retval);
-#else
+    if (retval != NULL)
         return retval;
-#endif
-    }
-    else {
+    else
+        return "Other";
+}
+
+const gchar *
+ibus_get_language_name (const gchar *_locale)
+{
+    const gchar *retval = ibus_get_untranslated_language_name (_locale);
+
 #ifdef ENABLE_NLS
-        return dgettext(GETTEXT_PACKAGE, N_("Other"));
+    if (g_strcmp0 (retval, "Other") == 0)
+        return dgettext (GETTEXT_PACKAGE, N_("Other"));
+    else
+        return dgettext ("iso_639", retval);
 #else
-        return N_("Other");
+    return retval;
 #endif
-    }
 }
 
 void
diff --git a/src/ibusutil.h b/src/ibusutil.h
index d5d593f8b..b9b6415e8 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -36,10 +36,18 @@
  * Utilized functions are available for miscellaneous purposes.
  */
 
+/**
+ * ibus_get_untranslated_language_name:
+ * @_locale: A const locale name.
+ * @returns: untranslated language name
+ */
+const gchar *    ibus_get_untranslated_language_name
+                                                (const gchar    *_locale);
+
 /**
  * ibus_get_language_name:
  * @_locale: A const locale name.
- * @returns: language name
+ * @returns: translated language name
  */
 const gchar *    ibus_get_language_name         (const gchar    *_locale);
 
diff --git a/ui/gtk2/i18n.py b/ui/gtk2/i18n.py
index 5a73eeed8..976d1aee3 100644
--- a/ui/gtk2/i18n.py
+++ b/ui/gtk2/i18n.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright(c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright(c) 2007-2010 Google, Inc.
+# Copyright(c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright(c) 2007-2015 Google, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,15 +29,35 @@
 _ = lambda a: gettext.dgettext(DOMAINNAME, a)
 N_ = lambda a: a
 
-def init():
-    localedir = os.getenv("IBUS_LOCALEDIR")
+LOCALEDIR = os.getenv("IBUS_LOCALEDIR")
+
+def init_textdomain(domainname):
+    if domainname == '':
+        return
     # Python's locale module doesn't provide all methods on some
     # operating systems like FreeBSD
     try:
-        # for non-standard localedir
-        locale.bindtextdomain(DOMAINNAME, localedir)
-        locale.bind_textdomain_codeset(DOMAINNAME, "UTF-8")
+        locale.bindtextdomain(domainname, LOCALEDIR)
+        locale.bind_textdomain_codeset(domainname, 'UTF-8')
     except AttributeError:
         pass
-    gettext.bindtextdomain(DOMAINNAME, localedir)
-    gettext.bind_textdomain_codeset(DOMAINNAME, "UTF-8")
+    gettext.bindtextdomain(domainname, LOCALEDIR)
+    gettext.bind_textdomain_codeset(domainname, 'UTF-8')
+
+def gettext_engine_longname(engine):
+    name = engine.get_name()
+    if (name.startswith('xkb:')):
+        return gettext.dgettext('xkeyboard-config', engine.get_longname())
+    textdomain = engine.get_textdomain()
+    if textdomain == '':
+        return engine.get_longname()
+    return gettext.dgettext(textdomain, engine.get_longname())
+
+def gettext_engine_description(engine):
+    name = engine.get_name()
+    if (name.startswith('xkb:')):
+        return gettext.dgettext('xkeyboard-config', engine.get_description())
+    textdomain = engine.get_textdomain()
+    if textdomain == '':
+        return engine.get_description()
+    return gettext.dgettext(textdomain, engine.get_description())
diff --git a/ui/gtk2/main.py b/ui/gtk2/main.py
index e142670d4..219849833 100644
--- a/ui/gtk2/main.py
+++ b/ui/gtk2/main.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright(c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright(c) 2007-2010 Red Hat, Inc.
+# Copyright(c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright(c) 2007-2015 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
@@ -35,7 +35,7 @@
 import gettext
 import panel
 import pynotify
-from i18n import _, N_
+from i18n import DOMAINNAME, _, N_
 
 class UIApplication:
     def __init__ (self, replace):
@@ -128,5 +128,5 @@ def main():
 
 if __name__ == "__main__":
     import i18n
-    i18n.init()
+    i18n.init_textdomain(DOMAINNAME)
     main()

From 02156038217e41ebd90e3d1ed4bb88b912a15a06 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 30 Mar 2015 11:07:42 +0900
Subject: [PATCH 294/816] I18N for IBus engine about dialog in ibus-setup

TEST=setup

Review URL: https://codereview.appspot.com/219400043
---
 setup/engineabout.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup/engineabout.py b/setup/engineabout.py
index 09e9b5cb7..4e6a5efbf 100644
--- a/setup/engineabout.py
+++ b/setup/engineabout.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -26,6 +26,8 @@
 from gi.repository import Gtk
 from gi.repository import Pango
 
+import i18n
+
 from i18n import _, N_
 
 class EngineAbout(Gtk.Dialog):
@@ -64,7 +66,7 @@ def __fill_text_view(self):
         text_buffer.insert_pixbuf(iter,
                 self.__load_icon(self.__engine_desc.get_icon()))
         text_buffer.insert_with_tags_by_name(iter,
-                "\n%s\n" % self.__engine_desc.get_longname(),
+                "\n%s\n" % i18n.gettext_engine_longname(self.__engine_desc),
                 "heading", "left_margin_16")
         text_buffer.insert_with_tags_by_name(iter,
                 _("Language: %s\n") % IBus.get_language_name(self.__engine_desc.get_language()),
@@ -78,7 +80,7 @@ def __fill_text_view(self):
         text_buffer.insert_with_tags_by_name(iter,
                 _("Description:\n"), "small", "bold", "left_margin_16")
         text_buffer.insert_with_tags_by_name(iter,
-                self.__engine_desc.get_description(),
+                i18n.gettext_engine_description(self.__engine_desc),
                 "wrap_text", "left_margin_32")
 
 

From eb4ffa1d9aeccf31318afd1d24cbcbbefa79337b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 31 Mar 2015 11:56:05 +0900
Subject: [PATCH 295/816] Put PropertyPanel at bottom right when desktop is KDE

Monitor _NET_WORKAREA atom because PropertyPanel runs
before KDE5 panel runs.
Allocate button sizes on PropertyPanel correctly for KDE5.

TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/220500043
---
 ui/gtk3/propertypanel.vala | 168 ++++++++++++++++++++++++++-----------
 1 file changed, 121 insertions(+), 47 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 6c023bf8a..12e85b0f9 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -2,9 +2,9 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2013-2014 Red Hat, Inc.
- * Copyright(c) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2013-2015 Red Hat, Inc.
+ * Copyright(c) 2013-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,8 @@ enum PanelShow {
 }
 
 public class PropertyPanel : Gtk.Box {
+    private unowned Gdk.Window m_root_window;
+    private unowned X.Display m_xdisplay;
     private Gtk.Window m_toplevel;
     private IBus.PropList m_props;
     private IPropToolItem[] m_items;
@@ -38,6 +40,7 @@ public class PropertyPanel : Gtk.Box {
     private uint m_auto_hide_timeout = 10000;
     private uint m_auto_hide_timeout_id = 0;
     private bool m_follow_input_cursor_when_always_shown = false;
+    private const uint MONITOR_NET_WORKAREA_TIMEOUT = 60000;
 
     public PropertyPanel() {
         /* Chain up base class constructor */
@@ -46,6 +49,14 @@ public class PropertyPanel : Gtk.Box {
 
         set_visible(true);
 
+        m_root_window = Gdk.get_default_root_window();
+        unowned Gdk.Display display = m_root_window.get_display();
+#if VALA_0_24
+        m_xdisplay = (display as Gdk.X11.Display).get_xdisplay();
+#else
+        m_xdisplay = Gdk.X11Display.get_xdisplay(display);
+#endif
+
         m_toplevel = new Gtk.Window(Gtk.WindowType.POPUP);
         m_toplevel.add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
 
@@ -64,6 +75,10 @@ public class PropertyPanel : Gtk.Box {
                 m_cursor_location.y = 0;
             }
         });
+
+        // PropertyPanel runs before KDE5 panel runs and
+        // monitor the desktop size.
+        monitor_net_workarea_atom();
     }
 
     public void set_properties(IBus.PropList props) {
@@ -294,9 +309,8 @@ public class PropertyPanel : Gtk.Box {
             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 root_width = m_root_window.get_width();
+        int root_height = m_root_window.get_height();
 
         int x, y;
         if (window_right_bottom.x > root_width)
@@ -312,73 +326,125 @@ public class PropertyPanel : Gtk.Box {
         move(x, y);
     }
 
+    private bool is_bottom_panel() {
+        string desktop = Environment.get_variable("XDG_CURRENT_DESKTOP");
+        // LXDE has not implemented DesktopNames yet.
+        if (desktop == null)
+            desktop = Environment.get_variable("XDG_SESSION_DESKTOP");
+        switch (desktop) {
+            case "KDE":         return true;
+            case "LXDE":        return true;
+            default:            return false;
+        }
+    }
+
     private void set_default_location() {
         Gtk.Allocation allocation;
         m_toplevel.get_allocation(out allocation);
 
-        unowned Gdk.Window root = Gdk.get_default_root_window();
-        int root_width = root.get_width();
+        int root_width = m_root_window.get_width();
+        int root_height = m_root_window.get_height();
         int root_x = 0;
         int root_y = 0;
         int ws_num = 0;
 
-        unowned Gdk.Display display = root.get_display();
 #if VALA_0_24
-        unowned X.Display xdisplay =
-                (display as Gdk.X11.Display).get_xdisplay();
-        X.Window xwindow = (root as Gdk.X11.Window).get_xid();
+        X.Window xwindow = (m_root_window as Gdk.X11.Window).get_xid();
 #else
-        unowned X.Display xdisplay = Gdk.X11Display.get_xdisplay(display);
-        X.Window xwindow = Gdk.X11Window.get_xid(root);
+        X.Window xwindow = Gdk.X11Window.get_xid(m_root_window);
 #endif
         X.Atom _net_current_desktop =
-                xdisplay.intern_atom("_NET_CURRENT_DESKTOP", false);
+                m_xdisplay.intern_atom("_NET_CURRENT_DESKTOP", false);
         X.Atom type = X.None;
         int format;
         ulong nitems = 0;
         ulong bytes_after;
         void *prop;
-        xdisplay.get_window_property(xwindow,
-                                     _net_current_desktop,
-                                     0, 32, false, X.XA_CARDINAL,
-                                     out type, out format,
-                                     out nitems, out bytes_after,
-                                     out prop);
+        m_xdisplay.get_window_property(xwindow,
+                                      _net_current_desktop,
+                                      0, 32, false, X.XA_CARDINAL,
+                                      out type, out format,
+                                      out nitems, out bytes_after,
+                                      out prop);
 
         if (type != X.None && nitems >= 1)
             ws_num = (int) ((ulong *)prop)[0];
 
         X.Atom _net_workarea =
-                xdisplay.intern_atom("_NET_WORKAREA", false);
+                m_xdisplay.intern_atom("_NET_WORKAREA", false);
         type = X.None;
         nitems = 0;
 
-        xdisplay.get_window_property(xwindow,
-                                     _net_workarea,
-                                     0, 32, false, X.XA_CARDINAL,
-                                     out type, out format,
-                                     out nitems, out bytes_after,
-                                     out prop);
-
-        if (type != X.None && nitems >= 2) {
-            root_x = (int) ((ulong *)prop)[ws_num * 4];
-            root_y = (int) ((ulong *)prop)[ws_num * 4 + 1];
+        m_xdisplay.get_window_property(xwindow,
+                                      _net_workarea,
+                                      0, 32, false, X.XA_CARDINAL,
+                                      out type, out format,
+                                      out nitems, out bytes_after,
+                                      out prop);
+
+        if (type != X.None) {
+            if (nitems >= 2) {
+                root_x = (int) ((ulong *)prop)[ws_num * 4];
+                root_y = (int) ((ulong *)prop)[ws_num * 4 + 1];
+            }
+            if (nitems >= 4) {
+                root_width = (int) ((ulong *)prop)[ws_num * 4 + 2];
+                root_height = (int) ((ulong *)prop)[ws_num * 4 + 3];
+            }
         }
 
         int x, y;
-        /* Translators: If your locale is RTL, the msgstr is "default:RTL".
-         * Otherwise the msgstr is "default:LTR". */
-        if (_("default:LTR") != "default:RTL") {
-            x = root_width - allocation.width;
-            y = root_y;
+        if (is_bottom_panel()) {
+            /* Translators: If your locale is RTL, the msgstr is "default:RTL".
+             * Otherwise the msgstr is "default:LTR". */
+            if (_("default:LTR") != "default:RTL") {
+                x = root_width - allocation.width;
+                y = root_height - allocation.height;
+            } else {
+                x = root_x;
+                y = root_height - allocation.height;
+            }
         } else {
-            x = root_x;
-            y = root_y;
+            if (_("default:LTR") != "default:RTL") {
+                x = root_width - allocation.width;
+                y = root_y;
+            } else {
+                x = root_x;
+                y = root_y;
+            }
         }
 
         move(x, y);
     }
 
+    private Gdk.FilterReturn root_window_filter(Gdk.XEvent gdkxevent,
+                                                Gdk.Event  event) {
+        X.Event *xevent = (X.Event*) gdkxevent;
+        if (xevent.type == X.EventType.PropertyNotify) {
+            string aname = m_xdisplay.get_atom_name(xevent.xproperty.atom);
+            if (aname == "_NET_WORKAREA" && xevent.xproperty.state == 0) {
+                set_default_location();
+                return Gdk.FilterReturn.CONTINUE;
+            }
+        }
+        return Gdk.FilterReturn.CONTINUE;
+    }
+
+    private void monitor_net_workarea_atom() {
+        Gdk.EventMask events = m_root_window.get_events();
+        if ((events & Gdk.EventMask.PROPERTY_CHANGE_MASK) == 0)
+            m_root_window.set_events (events |
+                                      Gdk.EventMask.PROPERTY_CHANGE_MASK);
+
+        m_root_window.add_filter(root_window_filter);
+
+        GLib.Timeout.add(MONITOR_NET_WORKAREA_TIMEOUT, () => {
+            m_root_window.remove_filter(root_window_filter);
+            return false;
+        },
+        GLib.Priority.DEFAULT_IDLE);
+    }
+
     private void show_with_auto_hide_timer() {
         if (m_items.length == 0) {
             /* Do not blink the panel with focus-in in case the panel
@@ -568,10 +634,12 @@ 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);
+        /* Chain up base class constructor
+         *
+         * If the constructor sets "label" property, "halign" property
+         * does not work in KDE5 so use sync() for the label.
+         */
+        GLib.Object(halign: Gtk.Align.START);
 
         m_prop = prop;
 
@@ -627,8 +695,11 @@ public class PropToggleToolButton : Gtk.ToggleToolButton, IPropToolItem {
     private IBus.Property m_prop = null;
 
     public PropToggleToolButton(IBus.Property prop) {
-        /* Chain up base class constructor */
-        GLib.Object();
+        /* Chain up base class constructor
+         *
+         * Need to set halign for KDE5
+         */
+        GLib.Object(halign: Gtk.Align.START);
 
         m_prop = prop;
 
@@ -706,8 +777,11 @@ public class PropMenuToolButton : PropToggleToolButton, IPropToolItem {
     private PropMenu m_menu = null;
 
     public PropMenuToolButton(IBus.Property prop) {
-        /* Chain up base class constructor */
-        GLib.Object();
+        /* Chain up base class constructor
+         *
+         * Need to set halign for KDE5
+         */
+        GLib.Object(halign: Gtk.Align.START);
 
         m_menu = new PropMenu(prop);
         m_menu.deactivate.connect((m) =>

From 020bd45eda9e3a3a2836122fbe0437cafb71f163 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 1 Apr 2015 11:42:34 +0900
Subject: [PATCH 296/816] ibus-ui-gtk3: Draw gray color on PropertyPanel handle

Users can move the position of IBus PropertyPanel with the mouse
but currently it is too hard to find the handle on the panel.
Now the handle is drawn by the gray color for the visibility.

TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/219520043
---
 ui/gtk3/handle.vala | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index b9c3bbc06..1edb5373d 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,6 +36,19 @@ class Handle : Gtk.EventBox {
                              Gdk.EventMask.BUTTON1_MOTION_MASK;
         set_events(mask);
         m_move_begined = false;
+
+        // Currently it is too hard to notice this Handle on PropertyPanel
+        // so now this widget is drawn by the gray color for the visibility.
+        Gtk.CssProvider css_provider = new Gtk.CssProvider();
+        try {
+            css_provider.load_from_data(
+                    "GtkEventBox { background-color: gray }", -1);
+        } catch (GLib.Error error) {
+            warning("Parse error in Handle: %s", error.message);
+        }
+        Gtk.StyleContext context = get_style_context();
+        context.add_provider(css_provider,
+                             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
     public override void realize() {

From cc88075ddae038f90039d58147bb3c9d7eb08364 Mon Sep 17 00:00:00 2001
From: Hodong Kim <hodong@cogno.org>
Date: Thu, 2 Apr 2015 11:18:57 +0900
Subject: [PATCH 297/816] Fix compile error in client/x11/Makefile

BUG=https://github.com/ibus/ibus/pull/18
TEST=client/x11/Makefile

Review URL: https://codereview.appspot.com/217590043
Patch from Hodong Kim <hodong@cogno.org>.
---
 client/x11/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 9813ceb56..ba6fe8aec 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -57,7 +57,7 @@ noinst_HEADERS = \
 	locales.h \
 	$(NULL)
 
-$(IMdkit):
+$(libIMdkit):
 	(cd $(top_builddir)/util/IMdkit; make)
 
 $(libibus):

From 35d035bfc48e20eecb3b3b3b14712d73c5fc027b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 2 Apr 2015 11:26:24 +0900
Subject: [PATCH 298/816] ibus-ui-gtk3: Enable absolute path of engine icon in
 KDE5

plasma-workspace 5.2 supports the icon full path.
Now the build checks if qtbase-devel is 5.4 or later since
there is no way to check the version of plasma-workspace.

BUG=https://github.com/ibus/ibus/pull/17
TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/217310044
---
 configure.ac        | 17 +++++++++++++++++
 ui/gtk3/Makefile.am |  8 ++++++--
 ui/gtk3/panel.vala  | 10 ++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 39c9cad79..8eb6168f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,9 +270,25 @@ else
     enable_wayland="no (disabled, use --enable-wayland to enable)"
 fi
 
+enable_appindicator_engine_icon="no"
 if test x"$enable_appindicator" = x"yes"; then
     enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
+
+    # Need qt5-qtbase-devel package
+    # There is no way to check the version of KStatusNotifierItem and
+    # check the version of qtbase here.
+    AC_MSG_CHECKING([for KDE5 appindicator engine icon])
+    PKG_CHECK_EXISTS([Qt5Gui >= 5.4],
+        enable_appindicator_engine_icon="yes"
+    )
+    AC_MSG_RESULT([$enable_appindicator_engine_icon])
+
+fi
+if test x"$enable_appindicator_engine_icon" != x"yes" ; then
+    enable_appindicator_engine_icon="no (disabled, need qtbase-devel 5.4 or later)"
 fi
+AM_CONDITIONAL([ENABLE_APPINDICATOR_ENGINE_ICON],
+               [test x"$enable_appindicator_engine_icon" = x"yes"])
 
 # GObject introspection
 GOBJECT_INTROSPECTION_CHECK([0.6.8])
@@ -639,6 +655,7 @@ Build options:
   Build XIM agent server        $enable_xim
   Build wayland support         $enable_wayland
   Build appindicator support    $enable_appindicator
+  Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library
   Build gconf modules           $enable_gconf
   Build memconf modules         $enable_memconf
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 40cce1173..2de227d64 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -98,6 +98,10 @@ if ENABLE_APPINDICATOR
 AM_VALAFLAGS += --define=INDICATOR
 endif
 
+if ENABLE_APPINDICATOR_ENGINE_ICON
+AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
+endif
+
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
@@ -136,8 +140,8 @@ CLEANFILES = \
 # References:
 # libappindicator/src/notification-item.xml
 # libappindicator/src/notification-watcher.xml
-# knotifications/src/org.kde.StatusNotifierItem.xml
-# knotifications/src/org.kde.StatusNotifierWatcher.xml
+# kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierItem.xml
+# kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierWatcher.xml
 EXTRA_DIST = \
 	gtkpanel.xml.in \
 	notification-item.xml \
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 137986086..c77bd2f73 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1248,9 +1248,15 @@ class Panel : IBus.PanelService {
                 m_status_icon.set_from_file(icon_name);
             }
             else if (m_icon_type == IconType.INDICATOR) {
-                warning("appindicator requires an icon name in a theme " +
-                        "path instead of the full path: %s", icon_name);
+#if INDICATOR_ENGINE_ICON
+                m_indicator.set_icon_full(icon_name, "");
+#else
+                warning("plasma-workspace 5.2 or later is required to " +
+                        "show the absolute path icon %s. Currently check " +
+                        "qtbase 5.4 since there is no way to check " +
+                        "the version of plasma-workspace.", icon_name);
                 m_indicator.set_icon_full("ibus-engine", "");
+#endif
             }
         } else {
             string language = null;

From 90252fa952da2b9a4a33e6f2c33f652d3e9cbbee Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Apr 2015 13:01:15 +0900
Subject: [PATCH 299/816] Update translations.

Update po/ca.po po/es.po po/pl.po po/uk.po

Review URL: https://codereview.appspot.com/217680043
---
 po/ca.po | 218 +++++++++++++++++++++++++++++++++++++------------------
 po/es.po | 175 +++++++++++++++++++++++++++++++-------------
 po/pl.po | 175 +++++++++++++++++++++++++++++++-------------
 po/uk.po | 214 ++++++++++++++++++++++++++++++++++++------------------
 4 files changed, 541 insertions(+), 241 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 7a6305fcf..345d0d525 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,19 +8,21 @@
 # Oscar Osta <oostap.listas@gmail.com>, 2011
 # Oscar Osta Pueyo <oostap@gmail.com>, 2009
 # Robert Antoni Buj i Gelonch, 2014
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-11-13 19:11+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch\n"
+"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"PO-Revision-Date: 2015-03-17 05:52-0400\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.5.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -68,15 +70,17 @@ msgstr "Preferències de l'IBus"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+msgstr ""
+"Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
-msgstr "Mètode d'entrada següent:"
+msgstr "Següent mètode d'entrada:"
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
+msgstr ""
+"Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
@@ -88,7 +92,8 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
+msgstr ""
+"Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -116,11 +121,13 @@ msgstr "Orientació dels candidats:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra d'idiomes"
+msgstr ""
+"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
+"d'idiomes"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr "Mostra el quadre de la propietat:"
+msgstr "Mostra el quadre de propietats:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -136,15 +143,19 @@ msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la casella de selecció"
+msgstr ""
+"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
+"casella de selecció"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "Incrusta el text editat prèviament en la finestra d'aplicació"
+msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr "Incrusta el text editat prèviament del mètode d'entrada en la finestra d'aplicació"
+msgstr ""
+"Incrusta el text pre-editat del mètode d'entrada en la finestra de "
+"l'aplicació"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
@@ -160,13 +171,14 @@ msgstr "General"
 
 #. add button
 #: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Afegeix"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
+msgstr ""
+"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -174,7 +186,8 @@ msgstr "_Suprimeix"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
+msgstr ""
+"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -182,7 +195,8 @@ msgstr "A_munt"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
+msgstr ""
+"Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -190,7 +204,8 @@ msgstr "A_vall"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+msgstr ""
+"Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -214,6 +229,9 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>El mètode d'entrada actiu pot canviar-se amb els seleccionats en "
+"l'anterior llista prement les dreceres de teclat o fent clic a la icona del "
+"quadre.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
@@ -234,7 +252,7 @@ msgstr "<b>Disposició del teclat</b>"
 
 #: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
 msgid "Share the same input method among all applications"
-msgstr "Comparteix el mateix mètode d'entrada en totes les aplicacions"
+msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
 
 #: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
@@ -252,7 +270,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>El bus d'entrada intel·ligent</small>\nLloc web: http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>El bus d'entrada intel·ligent</small>\n"
+"Lloc web: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -262,7 +286,8 @@ msgstr "Inicia l'IBus en entrar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
+#: ../ui/gtk3/panel.vala:1053
 msgid "About"
 msgstr "Quant a"
 
@@ -290,14 +315,20 @@ msgstr "Ordre dels motors desats en la lista de mètodes d'entrada"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "Retard en milisegons de la finestra emergent per a la finestra del commutador IME"
+msgstr ""
+"Retard en mil·lisegons de la finestra emergent per a la finestra del "
+"commutador IME"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "Estableix el retard de la finestra emergent en milisegons per mostrar la finestra del commutador IME. El valor predeterminat és 400. 0 = Mostra la finestra immediatament. 0 &lt; Retard en milisegons. 0 &gt; No mostra la finestra ni els motors anteriors o següents."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"Estableix el retard de la finestra emergent en mil·lisegons per mostrar la "
+"finestra del commutador IME. El valor predeterminat és 400. 0 = Mostra la "
+"finestra immediatament. 0 &lt; Retard en mil·lisegons. 0 &gt; No mostra la "
+"finestra ni els motors anteriors o següents."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -307,7 +338,9 @@ msgstr "Número de versió desada"
 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ó desada s'utilitzarà per comprovar la diferencia entre la versió anterior d'ibus i l'actual."
+msgstr ""
+"El número de versió desada s'utilitzarà per comprovar la diferencia entre la "
+"versió anterior d'ibus i l'actual."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
@@ -315,7 +348,9 @@ msgstr "Les disposicions llatines no tenen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "La disposició dels EEUU és un annex de les disposicions llatines. Es pot ometre la variant."
+msgstr ""
+"La disposició dels EEUU és un annex de les disposicions llatines. Es pot "
+"ometre la variant."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -324,7 +359,9 @@ msgstr "Utilitza xmodmap"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Executa xmodmap sí existeix .xmodmap o .Xmodmap quant es commutin els motors ibus."
+msgstr ""
+"Executa xmodmap sí existeix .xmodmap o .Xmodmap quant es commutin els motors "
+"ibus."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -356,7 +393,8 @@ msgstr "Dreceres de teclat del motor següent"
 
 #: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Les dreceres de teclat per commutar al mètode d'entrada següent de la llista"
+msgstr ""
+"Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -364,7 +402,9 @@ msgstr "Dreceres de teclat del motor anterior"
 
 #: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista"
+msgstr ""
+"Les dreceres de teclat per commutar al mètode d'entrada anterior de la "
+"llista"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -375,6 +415,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"El comportament de la propietat panel. 0 = No es mostra, 1 = S'amaga "
+"automàticament, 2 = Es mostra sempre"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,27 +426,34 @@ msgstr "Posició del quadre d'idiomes"
 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 posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada inferior dreta, 4 = personalitzat"
+msgstr ""
+"La posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = "
+"cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
+"inferior dreta, 4 = personalitzat"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Segueix el cursor d'entrada en el cas que sempre es mostri el quadre"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Si és cert, el quadre segueix el cursor d'entrada en el cas que sempre es "
+"mostri el quadre. Si és fals, el quadre es mostra en una ubicació fixa."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr "Milisegons per mostrar el quadre de la propietat"
+msgstr "Mil·lisegons per mostrar el quadre de propietats"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Els mil·lisegons per mostrar el quadre de propietats després de rebre "
+"l'enfocament o quan se'n canviïn les propietats."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -432,7 +481,15 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "La icona XKB mostra la cadena de text de la disposició, la cadena de text es renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color d'X11, 2. un valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits hexadecimals per al roig, verd i blau, 3. un color RGB amb el format «rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i «b» són nombres enters amb rang de 0 a 255 o valors de percentatge amb rang de 0% a 100%, i «a» té un valor en punt flotant amb rang de 0 a 1 per l'alfa."
+msgstr ""
+"La icona XKB mostra la cadena de text de la disposició, la cadena de text es "
+"renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color d'X11, 2. un "
+"valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits "
+"hexadecimals per al roig, verd i blau, 3. un color RGB amb el format "
+"«rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i "
+"«b» són nombres enters amb rang de 0 a 255 o valors de percentatge amb rang "
+"de 0% a 100%, i «a» té un valor en punt flotant amb rang de 0 a 1 per l'alfa."
+""
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
@@ -452,11 +509,11 @@ msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Embed Preedit Text"
-msgstr "Integra el text editat prèviament"
+msgstr "Incrusta el text pre-editat"
 
 #: ../data/ibus.schemas.in.h:49
 msgid "Embed Preedit Text in Application Window"
-msgstr "Integra el text editat prèviament en la finestra de l'aplicació"
+msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Use global input method"
@@ -468,7 +525,9 @@ msgstr "Habilita els mètodes d'entrada per defecte"
 
 #: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
-msgstr "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus d'entrada"
+msgstr ""
+"Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
+"d'entrada"
 
 #: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
@@ -476,13 +535,15 @@ msgstr "DConf preserva els prefixes"
 
 #: ../data/ibus.schemas.in.h:55
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
 #: ../ibus/_config.py.in:41
 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"
@@ -511,12 +572,12 @@ msgstr "Descripció: \n"
 msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
 #: ../setup/main.py:413
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../setup/enginedialog.py:203
+#: ../setup/enginedialog.py:204
 msgid "More…"
 msgstr "Més..."
 
@@ -541,50 +602,60 @@ msgid "Modifiers:"
 msgstr "Modificadors:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Aplica"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr "Premeu una tecla (o una combinació de tecles).\nEl diàleg es tancarà quan es deixi anar la tecla."
+msgstr ""
+"Premeu una tecla (o una combinació de tecles).\n"
+"El diàleg es tancarà quan es deixi anar la tecla."
 
-#: ../setup/keyboardshortcut.py:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
 msgid "_OK"
 msgstr "_D'acord"
 
 #: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
+"Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
+"l'anterior mètode d'entrada"
 
 #: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
 
 #: ../setup/main.py:389
 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 ""
+"S'ha iniciat IBus! Si no podeu utilitzar IBus, afegiu les línies següents al "
+"vostre $HOME/.bashrc; després torneu a entrar a l'escriptori.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr "S'ha iniciat IBus! Si no podeu utilitzar IBus, afegiu les línies següents al vostre $HOME/.bashrc; després torneu a entrar a l'escriptori.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
 #: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "El dimoni IBus no es va poder iniciar en %d segons"
+msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
 
 #: ../setup/main.py:415
 #, python-format
@@ -598,7 +669,7 @@ msgstr "commutació dels mètodes d'entrada"
 
 #: ../tools/main.vala:48
 msgid "List engine name only"
-msgstr ""
+msgstr "Mostra tan sols els nom del motor"
 
 #: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
@@ -655,7 +726,7 @@ msgstr "Estableix o obté el motor"
 
 #: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
-msgstr "Surt del dimoni ibus"
+msgstr "Surt de l'ibus-daemon"
 
 #: ../tools/main.vala:339
 msgid "Show available engines"
@@ -667,7 +738,7 @@ msgstr "(No implementat)"
 
 #: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
-msgstr "Reinicia el dimoni ibus"
+msgstr "Reinicia l'ibus-daemon"
 
 #: ../tools/main.vala:342
 msgid "Show version"
@@ -683,7 +754,7 @@ msgstr "Crea la memòria cau del registre"
 
 #: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Mostra l'adreça D-Bus del dimoni ibus"
+msgstr "Mostra l'adreça D-Bus de l'ibus-daemon"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
@@ -699,45 +770,54 @@ msgstr "Mostra aquesta informació"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Ús: %s ORDRE [OPCIÓ...]\n"
 "\n"
-msgstr "Ús: %s COMANDA [OPCIÓ...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
-msgstr "Comandes:\n"
+msgstr "Ordres:\n"
 
 #: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s no és una comanda reconeguda!\n"
+msgstr "%s no és una ordre reconeguda!\n"
+
+#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+msgid "IBus Panel"
+msgstr "Quadre de l'IBus"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:712
 msgid "IBus Update"
 msgstr "Actualització d'IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Súper+espai ara és l'accés de teclat per defecte."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1026
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1030
 msgid "translator-credits"
-msgstr "Joan Duran <jodufi@gmail.com>\nOscar Osta Pueyo <oostap@gmail.com>,\nPatricia Rivera Escuder <patysya@gmail.com>,\nRobert Antoni Buj Gelonch <robert.buj@gmail.com>,\nXavier Conde Rueda <xavi.conde@gmail.com>"
+msgstr ""
+"Joan Duran <jodufi@gmail.com>\n"
+"Oscar Osta Pueyo <oostap@gmail.com>,\n"
+"Patricia Rivera Escuder <patysya@gmail.com>,\n"
+"Robert Antoni Buj Gelonch <robert.buj@gmail.com>,\n"
+"Xavier Conde Rueda <xavi.conde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1049
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1059
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1063
 msgid "Quit"
 msgstr "Surt"
 
diff --git a/po/es.po b/po/es.po
index 7d1629647..24947a4a2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,12 +13,13 @@
 # Gerardo Rosales <grosale86@gmail.com>, 2014
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
+# Gerardo Rosales <grosale86@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-10-28 19:02+0000\n"
+"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"PO-Revision-Date: 2015-03-03 12:12-0500\n"
 "Last-Translator: Gerardo Rosales <grosale86@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,6 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.5.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -73,7 +75,8 @@ msgstr "Preferencias de IBus"
 
 #: ../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:"
@@ -81,7 +84,8 @@ msgstr "Siguiente método de entrada:"
 
 #: ../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:"
@@ -121,7 +125,9 @@ msgstr "Orientaciones candidato:"
 
 #: ../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 property panel:"
@@ -141,7 +147,9 @@ msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
 #: ../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"
@@ -149,7 +157,9 @@ msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
 #: ../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:"
@@ -165,13 +175,15 @@ msgstr "General"
 
 #. add button
 #: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Añadir"
 
 #: ../setup/setup.ui.h:36
 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:37
 msgid "_Remove"
@@ -179,7 +191,9 @@ msgstr "_Quitar"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "Eliminar el método de entrada seleccionado de los métodos de entrada habilitados"
+msgstr ""
+"Eliminar el método de entrada seleccionado de los métodos de entrada "
+"habilitados"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -187,7 +201,9 @@ msgstr "_Subir"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -195,7 +211,9 @@ msgstr "_Bajar"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -218,7 +236,10 @@ msgid ""
 "<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>"
-msgstr "<small><i>Puede elegir el método de entrada activo de los seleccionados en la lista anterior, mediante el atajo de teclado o pulsando en el icono del panel.</i></small>"
+msgstr ""
+"<small><i>Puede elegir el método de entrada activo de los seleccionados en "
+"la lista anterior, mediante el atajo de teclado o pulsando en el icono del "
+"panel.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
@@ -257,7 +278,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>El bus de entrada inteligente</small>\nSitio web: http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>El bus de entrada inteligente</small>\n"
+"Sitio web: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -267,7 +294,8 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
+#: ../ui/gtk3/panel.vala:1053
 msgid "About"
 msgstr "Acerca de"
 
@@ -299,10 +327,14 @@ msgstr "Retraso en milisegundos de Popup para ventana del interruptor IME"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Demora en milisegundos. 0 &gt; No muestra la ventana ni los motores siguientes o anteriores."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Demora en milisegundos. 0 &gt; No muestra la ventana "
+"ni los motores siguientes o anteriores."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -312,7 +344,9 @@ msgstr "Número de versión guardada"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -320,7 +354,9 @@ msgstr "Disposiciones latinas que no tienen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "Disposición de los Estados Unidos se anexa a los Disposiciones latino. variante puede ser omitida."
+msgstr ""
+"Disposición de los Estados Unidos se anexa a los Disposiciones latino. "
+"variante puede ser omitida."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -329,7 +365,9 @@ msgstr "Usar xmodmap"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Ejecutar xmodmap si .xmodmap o .Xmodmap existen cuando los motores ibus son cambiados."
+msgstr ""
+"Ejecutar xmodmap si .xmodmap o .Xmodmap existen cuando los motores ibus son "
+"cambiados."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -361,7 +399,9 @@ msgstr "Atajo de teclado para el siguiente motor"
 
 #: ../data/ibus.schemas.in.h:23
 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:24
 msgid "Prev engine shortcut keys"
@@ -369,7 +409,9 @@ msgstr "Atajo de teclado para la máquina previa"
 
 #: ../data/ibus.schemas.in.h:25
 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:26
 msgid "Auto hide"
@@ -379,7 +421,9 @@ msgstr "Auto Ocultar"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "La conducta del panel de propiedad,0= No mostrar, 1 = Auto ocultar, 2 = Mostrar siempre"
+msgstr ""
+"La conducta del panel de propiedad,0= No mostrar, 1 = Auto ocultar, 2 = "
+"Mostrar siempre"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -389,7 +433,10 @@ msgstr "Posición del panel de idioma"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -399,7 +446,9 @@ msgstr "Siga el cursor de entrada en caso de que el panel siempre se muestre"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "Si es verdadero, el panel sigue el cursor de entrada en el caso que siempre se muestre. Si es falso, el panel se muestra en una ubicación fija."
+msgstr ""
+"Si es verdadero, el panel sigue el cursor de entrada en el caso que siempre "
+"se muestre. Si es falso, el panel se muestra en una ubicación fija."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -409,7 +458,9 @@ msgstr "Los milisegundos para mostrar el panel de propiedad"
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "Los milisegundos para mostrar el panel de propiedad después de enfocar o que las propiedades cambien."
+msgstr ""
+"Los milisegundos para mostrar el panel de propiedad después de enfocar o que "
+"las propiedades cambien."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -437,7 +488,14 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "El ícono XKB muestra la cadena de diseño que se renderiza con el valor RGBA. El valor RGBA puede ser 1. un color de X11, 2. un valor hexa en la forma '#rrggbb' donde 'r', 'g' y 'b' son dígitos hexa para el rojo, verde y azul, 3. un color RGB en elformato 'rgb(r,g,b)' o 4. Un color RGBA en el formato 'rgba(r,g,b,a)' donde 'r', 'g', y 'b' son o bien enteros en el rango de 0 a 255 o valores de porcentaje en el rango de 0% a 100%, y  'a' es un valor de punto flotante en el rango de 0 a 1 para el alfa."
+msgstr ""
+"El ícono XKB muestra la cadena de diseño que se renderiza con el valor RGBA. "
+"El valor RGBA puede ser 1. un color de X11, 2. un valor hexa en la forma "
+"'#rrggbb' donde 'r', 'g' y 'b' son dígitos hexa para el rojo, verde y azul, "
+"3. un color RGB en elformato 'rgb(r,g,b)' o 4. Un color RGBA en el formato "
+"'rgba(r,g,b,a)' donde 'r', 'g', y 'b' son o bien enteros en el rango de 0 a "
+"255 o valores de porcentaje en el rango de 0% a 100%, y  'a' es un valor de "
+"punto flotante en el rango de 0 a 1 para el alfa."
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
@@ -473,7 +531,9 @@ msgstr "Habilitar método de entrada en forma predeterminada"
 
 #: ../data/ibus.schemas.in.h:53
 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:54
 msgid "DConf preserve name prefixes"
@@ -487,7 +547,8 @@ msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 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"
@@ -516,12 +577,12 @@ msgstr "Descripción:\n"
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
 #: ../setup/main.py:413
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../setup/enginedialog.py:203
+#: ../setup/enginedialog.py:204
 msgid "More…"
 msgstr "Más..."
 
@@ -546,26 +607,28 @@ msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Aplicar"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -579,11 +642,17 @@ msgstr "El demonio IBus no se está ejecutando. ¿Desea iniciarlo?"
 
 #: ../setup/main.py:389
 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:403
@@ -704,10 +773,10 @@ msgstr "Mostrar esta información"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "USO: %s COMANDO [OPCION...]\n"
 "\n"
-msgstr "USO: %s COMANDO [OPCION...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -718,31 +787,35 @@ msgstr "Comandos:\n"
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+msgid "IBus Panel"
+msgstr "Panel IBus"
+
+#: ../ui/gtk3/panel.vala:712
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1026
 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:907
+#: ../ui/gtk3/panel.vala:1030
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1049
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1059
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1063
 msgid "Quit"
 msgstr "Salir"
 
diff --git a/po/pl.po b/po/pl.po
index 445964a43..936cd99ab 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,19 +5,22 @@
 #
 # Translators:
 # Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
+# Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-07-28 14:08+0000\n"
+"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"PO-Revision-Date: 2015-03-01 12:34-0500\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "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"
+"X-Generator: Zanata 3.5.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -65,7 +68,8 @@ msgstr "Preferencje usługi IBus"
 
 #: ../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 +77,8 @@ msgstr "Następna metoda wprowadzania:"
 
 #: ../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 +138,9 @@ msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
 
 #: ../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 +148,8 @@ msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia"
 
 #: ../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:"
@@ -157,7 +165,7 @@ msgstr "Ogólne"
 
 #. add button
 #: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -171,7 +179,9 @@ msgstr "_Usuń"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -179,7 +189,9 @@ msgstr "W _górę"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -187,7 +199,9 @@ msgstr "W _dół"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -210,7 +224,10 @@ msgid ""
 "<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>"
-msgstr "<small><i>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.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
@@ -249,7 +266,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala wprowadzania</small>\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Inteligentna magistrala wprowadzania</small>\n"
+"Strona domowa: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -259,7 +282,8 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
+#: ../ui/gtk3/panel.vala:1053
 msgid "About"
 msgstr "O programie"
 
@@ -291,10 +315,14 @@ msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na następny/poprzedni mechanizm."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; "
+"milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na "
+"następny/poprzedni mechanizm."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -304,7 +332,9 @@ msgstr "Zapisany numer wersji"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -321,7 +351,9 @@ msgstr "Użycie xmodmap"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Wykonuje xmodmap, jeśli istnieje .xmodmap lub .Xmodmap, kiedy mechanizmy IBus są przełączane."
+msgstr ""
+"Wykonuje xmodmap, jeśli istnieje .xmodmap lub .Xmodmap, kiedy mechanizmy "
+"IBus są przełączane."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -353,7 +385,8 @@ msgstr "Klawisze skrótów następnego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:23
 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:24
 msgid "Prev engine shortcut keys"
@@ -361,7 +394,8 @@ msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
 #: ../data/ibus.schemas.in.h:25
 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:26
 msgid "Auto hide"
@@ -371,7 +405,9 @@ msgstr "Automatyczne ukrywanie"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany"
+msgstr ""
+"Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie "
+"ukrywany, 2 = zawsze wyświetlany"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -381,17 +417,23 @@ msgstr "Pozycja panela języków"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr "Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
+msgstr ""
+"Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to panel jest wyświetlany w stałym położeniu."
+msgstr ""
+"Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, "
+"kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to "
+"panel jest wyświetlany w stałym położeniu."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -401,7 +443,9 @@ msgstr "Milisekundy do wyświetlenia panelu właściwości"
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub właściwości."
+msgstr ""
+"Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub "
+"właściwości."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -429,7 +473,15 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość szesnastkową w formie \"#rrggbb\", gdzie \"r\", \"g\" i \"b\" są cyframi szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB w formie \"rgb(r,g,b)\" lub 4. kolor RGBA w formie \"rgba(r,g,b,a)\", gdzie \"r\", \"g\" i \"b\" są liczbami całkowitymi w zakresie od 0 do 255 lub wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością zmiennoprzecinkową w zakresie od 0 do 1 alfy."
+msgstr ""
+"Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości "
+"RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość "
+"szesnastkową w formie \"#rrggbb\", gdzie \"r\", \"g\" i \"b\" są cyframi "
+"szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB w "
+"formie \"rgb(r,g,b)\" lub 4. kolor RGBA w formie \"rgba(r,g,b,a)\", gdzie "
+"\"r\", \"g\" i \"b\" są liczbami całkowitymi w zakresie od 0 do 255 lub "
+"wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością "
+"zmiennoprzecinkową w zakresie od 0 do 1 alfy."
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
@@ -465,7 +517,9 @@ msgstr "Domyślne włączanie metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:53
 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:54
 msgid "DConf preserve name prefixes"
@@ -479,7 +533,9 @@ msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 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"
@@ -508,12 +564,12 @@ msgstr "Opis:\n"
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
 #: ../setup/main.py:413
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../setup/enginedialog.py:203
+#: ../setup/enginedialog.py:204
 msgid "More…"
 msgstr "Więcej…"
 
@@ -538,32 +594,36 @@ msgid "Modifiers:"
 msgstr "Modyfikatory:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Zastosuj"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
 msgid "_OK"
 msgstr "_OK"
 
 #: ../setup/main.py:113 ../setup/main.py:438
 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:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -571,11 +631,17 @@ msgstr "Usługa IBus nie jest uruchomiona. Uruchomić ją?"
 
 #: ../setup/main.py:389
 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:403
@@ -696,10 +762,10 @@ msgstr "Wyświetla tę informację"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+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:355
 msgid "Commands:\n"
@@ -710,31 +776,36 @@ msgstr "Polecenia:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+msgid "IBus Panel"
+msgstr "Panel IBus"
+
+#: ../ui/gtk3/panel.vala:712
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1026
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
+msgstr ""
+"IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1030
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2014"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1049
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1059
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1063
 msgid "Quit"
 msgstr "Zakończ"
 
diff --git a/po/uk.po b/po/uk.po
index 6dd649294..c2176eaf3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,19 +6,22 @@
 # Translators:
 # Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
 # Yuri Chornoivan <yurchor@ukr.net>, 2013
+# Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 04:11+0000\n"
+"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"PO-Revision-Date: 2015-03-13 07:19-0400\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "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"
+"X-Generator: Zanata 3.5.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -66,7 +69,8 @@ msgstr "Налаштування IBus"
 
 #: ../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 +78,9 @@ msgstr "Наступний спосіб введення:"
 
 #: ../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 +140,8 @@ msgstr "Показувати назву способу введення на м
 
 #: ../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"
@@ -142,7 +149,8 @@ msgstr "Вбудувати попередньо створений текст у
 
 #: ../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:"
@@ -157,13 +165,15 @@ msgid "General"
 msgstr "Загальне"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Додати"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "Додати позначений спосіб введення до списку увімкнених способів введення"
+msgstr ""
+"Додати позначений спосіб введення до списку увімкнених способів введення"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -171,7 +181,8 @@ msgstr "В_илучити"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "Вилучити позначений спосіб введення зі списку увімкнених способів введення"
+msgstr ""
+"Вилучити позначений спосіб введення зі списку увімкнених способів введення"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -179,7 +190,9 @@ msgstr "В_гору"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Пересунути вгору позначений спосіб введення у списку увімкнених способів введення"
+msgstr ""
+"Пересунути вгору позначений спосіб введення у списку увімкнених способів "
+"введення"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -187,7 +200,9 @@ msgstr "В_низ"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "Пересунути нижче позначений спосіб введення у списку увімкнених способів введення"
+msgstr ""
+"Пересунути нижче позначений спосіб введення у списку увімкнених способів "
+"введення"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -210,7 +225,10 @@ msgid ""
 "<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>"
-msgstr "<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище списку натисканням клавіатурного скорочення або піктограми на панелі.</i></small>"
+msgstr ""
+"<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище "
+"списку натисканням клавіатурного скорочення або піктограми на панелі.</i></"
+"small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
@@ -249,7 +267,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Інтелектуальний канал введення</small>\nДомашня сторінка: http://code.google.com/p/ibus\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Інтелектуальний канал введення</small>\n"
+"Домашня сторінка: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -259,11 +283,12 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
+#: ../ui/gtk3/panel.vala:1053
 msgid "About"
 msgstr "Інформація"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -291,10 +316,14 @@ msgstr "Затримка появи контекстного вікна для 
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "Встановити затримку появи контекстного вікна перемикача способів введення у мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 &lt; — затримка у мілісекундах. 0 &gt; — не показувати вікно і перемикатися на попередній або наступний рушій."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"Встановити затримку появи контекстного вікна перемикача способів введення у "
+"мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 &lt; — затримка "
+"у мілісекундах. 0 &gt; — не показувати вікно і перемикатися на попередній "
+"або наступний рушій."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -304,7 +333,9 @@ msgstr "Збережений номер версії"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -312,7 +343,9 @@ msgstr "Розкладки латиниці, у яких немає символ
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "Американська розкладка додається до латинських розкладок, варіант можна пропустити."
+msgstr ""
+"Американська розкладка додається до латинських розкладок, варіант можна "
+"пропустити."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -321,7 +354,9 @@ msgstr "Використовувати xmodmap"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Запускати xmodmap, якщо є .xmodmap або .Xmodmap під час перемикання рушіїв ibus."
+msgstr ""
+"Запускати xmodmap, якщо є .xmodmap або .Xmodmap під час перемикання рушіїв "
+"ibus."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -353,7 +388,8 @@ msgstr "Скорочення для наступного рушія"
 
 #: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
+msgstr ""
+"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -371,7 +407,9 @@ msgstr "Автоматично ховати"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 = завжди показувати"
+msgstr ""
+"Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 ="
+" завжди показувати"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -381,7 +419,10 @@ msgstr "Розташування мовної панелі"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -391,7 +432,10 @@ msgstr "Слідувати за курсором введення, якщо па
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "Якщо має значення «true», панель слідуватиме за курсором введення, якщо панель працює у режимі безумовного показу. Якщо має значення «false», панель буде показано у фіксованій позиції."
+msgstr ""
+"Якщо має значення «true», панель слідуватиме за курсором введення, якщо "
+"панель працює у режимі безумовного показу. Якщо має значення «false», панель "
+"буде показано у фіксованій позиції."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -401,7 +445,9 @@ msgstr "Тривалість показу панелі властивостей
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "Тривалість показу панелі властивостей (у мілісекундах) після фокусування або зміни властивостей."
+msgstr ""
+"Тривалість показу панелі властивостей (у мілісекундах) після фокусування або "
+"зміни властивостей."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -429,7 +475,15 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде використано вказане значення RGBA. Значенням RGBA може бути: 1. назва кольору у X11, 2. шістнадцяткове число у форматі «#ччззсс», де «ч», «з», «с» є цифрами для червоного, зеленого та синього кольорів, 3. колір RGB у форматі «rgb(ч,з,с)» або 4. колір RGBA у форматі «rgba(ч,з,с,п)», де «ч», «з», «с» є або цілими значеннями у діапазоні від 0 до 255, або відсотковими значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для прозорості у діапазоні від 0 до 1."
+msgstr ""
+"На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде "
+"використано вказане значення RGBA. Значенням RGBA може бути: 1. назва "
+"кольору у X11, 2. шістнадцяткове число у форматі «#ччззсс», де «ч», «з», «с» "
+"є цифрами для червоного, зеленого та синього кольорів, 3. колір RGB у "
+"форматі «rgb(ч,з,с)» або 4. колір RGBA у форматі «rgba(ч,з,с,п)», де «ч», "
+"«з», «с» є або цілими значеннями у діапазоні від 0 до 255, або відсотковими "
+"значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для "
+"прозорості у діапазоні від 0 до 1."
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Use custom font"
@@ -465,7 +519,8 @@ msgstr "Типово увімкнути спосіб введення"
 
 #: ../data/ibus.schemas.in.h:53
 msgid "Enable input method by default when the application gets input focus"
-msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
+msgstr ""
+"Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
 #: ../data/ibus.schemas.in.h:54
 msgid "DConf preserve name prefixes"
@@ -479,35 +534,45 @@ msgstr "Префікси ключів DConf для припинення пере
 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"
 msgstr "Інше"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:70
 #, python-format
 msgid "Language: %s\n"
 msgstr "Мова: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:73
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Розкладка клавіатури: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:76
 #, python-format
 msgid "Author: %s\n"
 msgstr "Автор: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:79
 msgid "Description:\n"
 msgstr "Опис:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
 msgid "Select an input method"
 msgstr "Виберіть спосіб введення"
 
+#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
+#: ../setup/main.py:413
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../setup/enginedialog.py:204
+msgid "More…"
+msgstr "Більше…"
+
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
@@ -516,75 +581,82 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Налаштувати IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: ../setup/keyboardshortcut.py:56
 msgid "Keyboard shortcuts"
 msgstr "Клавіатурні скорочення"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Код клавіші:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Модифікатори:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "Заст_осувати"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "В_илучити"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "_Скасувати"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:113 ../setup/main.py:438
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
+msgstr ""
+"Використовувати комбінацію з Shift для перемикання на попередній спосіб "
+"введення"
 
-#: ../setup/main.py:330
+#: ../setup/main.py:368
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:351
+#: ../setup/main.py:389
 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:365
+#: ../setup/main.py:403
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:377
+#: ../setup/main.py:415
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:417
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -691,10 +763,10 @@ msgstr "Показати цю довідкову інформацію"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
-msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -705,36 +777,40 @@ msgstr "Команди:\n"
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+msgid "IBus Panel"
+msgstr "Панель IBus"
+
+#: ../ui/gtk3/panel.vala:712
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1026
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1030
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1049
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1059
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1063
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:371
 msgid "default:LTR"
 msgstr "default:LTR"

From cb93cab84beea2074502b04580d33e51587da83e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 Apr 2015 15:20:56 +0900
Subject: [PATCH 300/816] ibus-ui-gtk3: Support language icon in KDE5.

TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/229740043
---
 ui/gtk3/indicator.vala        | 69 +++++++++++++++++++++++++++++++++++
 ui/gtk3/notification-item.xml |  6 +++
 ui/gtk3/panel.vala            | 53 +++++++++++++++++++++------
 3 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index 013b1c48b..77a84ade2 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -44,6 +44,7 @@ class Indicator : IBus.Service
     public string label_s { get; set; }
     public string label_guide_s { get; set; }
     public uint32 ordering_index { get; set; }
+    public GLib.Variant icon_vector { get; set; }
 
     public enum Category {
         APPLICATION_STATUS,
@@ -234,6 +235,10 @@ class Indicator : IBus.Service
         return new GLib.Variant.string(this.icon_name);
     }
 
+    private GLib.Variant _get_icon_vector(GLib.DBusConnection connection) {
+        return this.icon_vector;
+    }
+
     private GLib.Variant _get_icon_desc(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_desc);
     }
@@ -318,6 +323,8 @@ class Indicator : IBus.Service
             return _get_status(connection);
         if (property_name == "IconName")
             return _get_icon_name(connection);
+        if (property_name == "IconPixmap")
+            return _get_icon_vector(connection);
         if (property_name == "IconAccessibleDesc")
             return _get_icon_desc(connection);
         if (property_name == "AttentionIconName")
@@ -359,6 +366,12 @@ class Indicator : IBus.Service
         if (this.status_s == status_s)
             return;
         this.status_s = status_s;
+
+        /* This API does not require (this.connection != null)
+         * because service_get_property() can be called when
+         * this.connection emits the "NewStatus" signal or
+         * or m_proxy calls the "RegisterStatusNotifierItem" signal.
+         */
         if (this.connection == null)
             return;
         try {
@@ -377,6 +390,7 @@ class Indicator : IBus.Service
         bool changed = false;
         if (this.icon_name != icon_name) {
             this.icon_name = icon_name;
+            this.icon_vector = null;
             changed = true;
         }
         if (this.icon_desc != icon_desc) {
@@ -385,6 +399,61 @@ class Indicator : IBus.Service
         }
         if (!changed)
             return;
+
+        /* This API does not require (this.connection != null)
+         * because service_get_property() can be called when
+         * this.connection emits the "NewIcon" signal or
+         * or m_proxy calls the "RegisterStatusNotifierItem" signal.
+         */
+        if (this.connection == null)
+            return;
+        try {
+            this.connection.emit_signal(null,
+                                        this.object_path,
+                                        NOTIFICATION_ITEM_DBUS_IFACE,
+                                        "NewIcon",
+                                        null);
+        } catch(GLib.Error e) {
+            warning("Unable to send signal for NewIcon: %s", e.message);
+        }
+    }
+
+    public void set_cairo_image_surface_full(Cairo.ImageSurface image,
+                                             string?            icon_desc) {
+        int width = image.get_width();
+        int height = image.get_height();
+        int stride = image.get_stride();
+        unowned uint[] data = (uint[]) image.get_data();
+        int length = stride * height / (int) sizeof(uint);
+        if (GLib.BYTE_ORDER == GLib.ByteOrder.LITTLE_ENDIAN) {
+            for (int i = 0; i < length; i++)
+                data[i] = data[i].to_big_endian();
+        }
+        unowned uint8[] data8 = (uint8[]) data;
+        data8.length = stride * height;
+        GLib.Bytes bytes = new GLib.Bytes(data8);
+        GLib.Variant bs =
+                new GLib.Variant.from_bytes(GLib.VariantType.BYTESTRING,
+                                            bytes,
+                                            true);
+        GLib.VariantBuilder builder = new GLib.VariantBuilder(
+                new GLib.VariantType("a(iiay)"));
+        builder.open(new GLib.VariantType("(iiay)"));
+        builder.add("i", width);
+        builder.add("i", height);
+        builder.add_value(bs);
+        builder.close();
+        this.icon_vector = new GLib.Variant("a(iiay)", builder);
+        this.icon_name = "";
+
+        if (this.icon_desc != icon_desc)
+            this.icon_desc = icon_desc;
+
+        /* This API does not require (this.connection != null)
+         * because service_get_property() can be called when
+         * this.connection emits the "NewIcon" signal or
+         * or m_proxy calls the "RegisterStatusNotifierItem" signal.
+         */
         if (this.connection == null)
             return;
         try {
diff --git a/ui/gtk3/notification-item.xml b/ui/gtk3/notification-item.xml
index aecb8d9bc..6fde3d3e4 100644
--- a/ui/gtk3/notification-item.xml
+++ b/ui/gtk3/notification-item.xml
@@ -7,6 +7,12 @@
                 <property name="Category" type="s" access="read" />
                 <property name="Status" type="s" access="read" />
                 <property name="IconName" type="s" access="read" />
+                <!-- IconPixmap is missed in AppIndicator
+                     struct containing width, height and image data-->
+                <property name="IconPixmap" type="a(iiay)" access="read">
+                        <annotation name="org.qtproject.QtDBus.QtTypeName"
+                                    value="KDbusImageVector" />
+                </property>
                 <property name="IconAccessibleDesc" type="s" access="read" />
                 <property name="AttentionIconName" type="s" access="read" />
                 <property name="AttentionAccessibleDesc" type="s" access="read" />
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index c77bd2f73..748ceb4e6 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -72,6 +72,9 @@ class Panel : IBus.PanelService {
     private GLib.HashTable<string, Gdk.Pixbuf> m_xkb_icon_pixbufs =
             new GLib.HashTable<string, Gdk.Pixbuf>(GLib.str_hash,
                                                    GLib.str_equal);
+    private GLib.HashTable<string, Cairo.ImageSurface> m_xkb_icon_image =
+            new GLib.HashTable<string, Cairo.ImageSurface>(GLib.str_hash,
+                                                           GLib.str_equal);
     private Gdk.RGBA m_xkb_icon_rgba = Gdk.RGBA(){
             red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
     private XKBLayout m_xkblayout = new XKBLayout();
@@ -649,13 +652,17 @@ class Panel : IBus.PanelService {
         } else
             m_xkb_icon_rgba = rgba;
 
-        if (m_xkb_icon_pixbufs.size() > 0) {
-            m_xkb_icon_pixbufs.remove_all();
+        if (m_icon_type == IconType.STATUS_ICON) {
+            if (m_xkb_icon_pixbufs.size() > 0) {
+                m_xkb_icon_pixbufs.remove_all();
 
-            if (m_icon_type == IconType.STATUS_ICON) {
                 if (m_status_icon != null && m_switcher != null)
                     state_changed();
-            } else if (m_icon_type == IconType.INDICATOR) {
+            }
+        } else if (m_icon_type == IconType.INDICATOR) {
+            if (m_xkb_icon_image.size() > 0) {
+                m_xkb_icon_image.remove_all();
+
                 if (m_indicator != null && m_switcher != null)
                     state_changed();
             }
@@ -962,13 +969,18 @@ class Panel : IBus.PanelService {
         Pango.cairo_show_layout(cr, layout);
     }
 
-    private Gdk.Pixbuf create_icon_pixbuf_with_string(string symbol) {
-        Gdk.Pixbuf pixbuf = m_xkb_icon_pixbufs[symbol];
+    private Cairo.ImageSurface
+    create_cairo_image_surface_with_string(string symbol, bool cache) {
+        Cairo.ImageSurface image = null;
 
-        if (pixbuf != null)
-            return pixbuf;
+        if (cache) {
+            image = m_xkb_icon_image[symbol];
 
-        var image = new Cairo.ImageSurface(Cairo.Format.ARGB32, 48, 48);
+            if (image != null)
+                return image;
+        }
+
+        image = new Cairo.ImageSurface(Cairo.Format.ARGB32, 48, 48);
         var cr = new Cairo.Context(image);
         int width = image.get_width();
         int height = image.get_height();
@@ -978,6 +990,23 @@ class Panel : IBus.PanelService {
         cr.paint();
         cr.set_operator(Cairo.Operator.OVER);
         context_render_string(cr, symbol, width, height);
+        image.flush();
+
+        if (cache)
+            m_xkb_icon_image.insert(symbol, image);
+
+        return image;
+    }
+
+    private Gdk.Pixbuf create_icon_pixbuf_with_string(string symbol) {
+        Gdk.Pixbuf pixbuf = m_xkb_icon_pixbufs[symbol];
+
+        if (pixbuf != null)
+            return pixbuf;
+
+        var image = create_cairo_image_surface_with_string(symbol, false);
+        int width = image.get_width();
+        int height = image.get_height();
         pixbuf = Gdk.pixbuf_get_from_surface(image, 0, 0, width, height);
         m_xkb_icon_pixbufs.insert(symbol, pixbuf);
         return pixbuf;
@@ -1274,8 +1303,10 @@ class Panel : IBus.PanelService {
                     m_status_icon.set_from_pixbuf(pixbuf);
                 }
                 else if (m_icon_type == IconType.INDICATOR) {
-                    /* Appindicator does not support pixbuf. */
-                    m_indicator.set_icon_full(icon_name, "");
+                    Cairo.ImageSurface image =
+                            create_cairo_image_surface_with_string(language,
+                                                                   true);
+                    m_indicator.set_cairo_image_surface_full(image, "");
                 }
             } else {
                 var theme = Gtk.IconTheme.get_default();

From 25593ed7248b19ef1d3a0e1d75da8f3d26321bca Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Apr 2015 11:55:05 +0900
Subject: [PATCH 301/816] ibus-ui-gtk3: Do not change buffered CairoSurface
 data twice in KDE5

Indicator.set_cairo_image_surface_full() receives the buffered
CairoImageSurface and the data should not be modified in the API
because the same data could be received twice.

TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/224340043
---
 ui/gtk3/indicator.vala | 12 +++---------
 ui/gtk3/panel.vala     | 10 ++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index 77a84ade2..a83fd63bd 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -423,15 +423,9 @@ class Indicator : IBus.Service
         int width = image.get_width();
         int height = image.get_height();
         int stride = image.get_stride();
-        unowned uint[] data = (uint[]) image.get_data();
-        int length = stride * height / (int) sizeof(uint);
-        if (GLib.BYTE_ORDER == GLib.ByteOrder.LITTLE_ENDIAN) {
-            for (int i = 0; i < length; i++)
-                data[i] = data[i].to_big_endian();
-        }
-        unowned uint8[] data8 = (uint8[]) data;
-        data8.length = stride * height;
-        GLib.Bytes bytes = new GLib.Bytes(data8);
+        unowned uint8[] data = (uint8[]) image.get_data();
+        data.length = stride * height;
+        GLib.Bytes bytes = new GLib.Bytes(data);
         GLib.Variant bs =
                 new GLib.Variant.from_bytes(GLib.VariantType.BYTESTRING,
                                             bytes,
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 748ceb4e6..fc1ae8b53 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -984,6 +984,7 @@ class Panel : IBus.PanelService {
         var cr = new Cairo.Context(image);
         int width = image.get_width();
         int height = image.get_height();
+        int stride = image.get_stride();
 
         cr.set_source_rgba(0.0, 0.0, 0.0, 0.0);
         cr.set_operator(Cairo.Operator.SOURCE);
@@ -992,6 +993,15 @@ class Panel : IBus.PanelService {
         context_render_string(cr, symbol, width, height);
         image.flush();
 
+        if (m_icon_type == IconType.INDICATOR) {
+            if (GLib.BYTE_ORDER == GLib.ByteOrder.LITTLE_ENDIAN) {
+                unowned uint[] data = (uint[]) image.get_data();
+                int length = stride * height / (int) sizeof(uint);
+                for (int i = 0; i < length; i++)
+                    data[i] = data[i].to_big_endian();
+            }
+        }
+
         if (cache)
             m_xkb_icon_image.insert(symbol, image);
 

From 4d49a664b9605690a6d0f7da6a0e21c92fb67028 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Mon, 13 Apr 2015 11:59:26 +0900
Subject: [PATCH 302/816] xim: use gtk3

TEST=client/x11/ibus-x11

Review URL: https://codereview.appspot.com/225990043
Patch from Marc-Antoine Perennou <Marc-Antoine@Perennou.com>.
---
 client/x11/Makefile.am   | 16 ++++++++++++----
 client/x11/gdk-private.c |  8 ++++++--
 client/x11/main.c        | 12 ++++++++----
 configure.ac             | 23 ++++++++++-------------
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index ba6fe8aec..5bd04d336 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -26,6 +26,14 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
 libexec_PROGRAMS = ibus-x11
 
+if ENABLE_GTK3
+GTK_CFLAGS = @GTK3_CFLAGS@
+GTK_LIBS = @GTK3_LIBS@
+else
+GTK_CFLAGS = @GTK2_CFLAGS@
+GTK_LIBS = @GTK2_LIBS@
+endif
+
 ibus_x11_SOURCES = \
 	main.c \
 	gdk-private.c \
@@ -40,12 +48,12 @@ ibus_x11_LDADD = \
 	$(libIMdkit) \
 	$(libibus) \
 	@X11_LIBS@ \
-	@GTK2_LIBS@ \
+	$(GTK_LIBS) \
 	$(NULL)
 
 ibus_x11_CFLAGS = \
 	@X11_CFLAGS@ \
-	@GTK2_CFLAGS@ \
+	$(GTK_CFLAGS) \
 	@DBUS_CFLAGS@ \
 	-I$(top_srcdir)/util/IMdkit \
 	-I$(top_srcdir)/src \
diff --git a/client/x11/gdk-private.c b/client/x11/gdk-private.c
index 941b39f5e..5f23fe609 100644
--- a/client/x11/gdk-private.c
+++ b/client/x11/gdk-private.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus
- * Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 Red Hat, Inc.
  *
  * gdk-private.c: Copied some code from gtk2
  *
@@ -52,7 +52,11 @@ translate_key_event (GdkDisplay *display,
 
   event->key.hardware_keycode = xevent->xkey.keycode;
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+  event->key.keyval = GDK_KEY_VoidSymbol;
+#else
   event->key.keyval = GDK_VoidSymbol;
+#endif
 
   gdk_keymap_translate_keyboard_state (keymap,
 				       event->key.hardware_keycode,
diff --git a/client/x11/main.c b/client/x11/main.c
index c06186fbb..33e68d3fb 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus
- * Copyright (C) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2007-2010 Red Hat, Inc.
+ * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
  *
@@ -1069,9 +1069,13 @@ _xim_init_IMdkit ()
         sizeof (ims_encodings)/sizeof (XIMEncoding) - 1;
     encodings.supported_encodings = ims_encodings;
 
-    _xims = IMOpenIM(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+    _xims = IMOpenIM (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
         IMModifiers, "Xi18n",
-        IMServerWindow, GDK_WINDOW_XWINDOW(win),
+#if GTK_CHECK_VERSION (3, 0, 0)
+        IMServerWindow, GDK_WINDOW_XID (win),
+#else
+        IMServerWindow, GDK_WINDOW_XWINDOW (win),
+#endif
         IMServerName, _server_name != NULL ? _server_name : "ibus",
         IMLocale, _locale != NULL ? _locale : LOCALES_STRING,
         IMServerTransport, "X/",
diff --git a/configure.ac b/configure.ac
index 8eb6168f0..160fe1155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,37 +215,26 @@ AC_ARG_ENABLE(appindicator,
 )
 AM_CONDITIONAL([ENABLE_APPINDICATOR], [test x"$enable_appindicator" = x"yes"])
 
-if test x"$enable_gtk2" = x"yes" -o x"$enable_xim" = x"yes" ; then
+if test x"$enable_gtk2" = x"yes"; then
     # check for gtk2
     PKG_CHECK_MODULES(GTK2, [
         gtk+-2.0
     ])
-fi
 
-if test x"$enable_gtk2" = x"yes"; then
-    # check for gdk2
     gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
     GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules
-
-    PKG_CHECK_MODULES(GDK2, [
-        gdk-2.0
-    ])
 else
     enable_gtk2="no (disabled, use --enable-gtk2 to enable)"
 fi
 
 if test x"$enable_gtk3" = x"yes"; then
-    # check for gtk3, gdk3
+    # check for gtk3
     PKG_CHECK_MODULES(GTK3, [
         gtk+-3.0
     ])
 
     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
-
-    PKG_CHECK_MODULES(GDK3, [
-        gdk-3.0
-    ])
 else
     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
 fi
@@ -256,6 +245,14 @@ if test x"$enable_xim" = x"yes"; then
         x11
     ])
     AC_CHECK_HEADERS([X11/XKBlib.h])
+
+    # if we don't have gtk3 yet, check for gtk2
+    if test x"$enable_gtk3" != x"yes"; then
+        # check for gtk2
+        PKG_CHECK_MODULES(GTK2, [
+            gtk+-2.0
+        ])
+    fi
 else
     enable_xim="no (disabled, use --enable-xim to enable)"
 fi

From c98f15629054cad791a4adb21735ee3797601aa5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 15 Apr 2015 10:22:21 +0900
Subject: [PATCH 303/816] Stop DBus warnings during restarting ibus-daemon

ibus-ui-gtk3 outputs some warnings when restart ibus-daemon
because some dbus metods are sent before dbus is closed.

TEST=src/libibus.so ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/226140043
---
 src/ibusbus.c      | 6 ++++--
 ui/gtk3/panel.vala | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index a843fa754..29e9b1f50 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -1432,6 +1432,8 @@ ibus_bus_exit (IBusBus *bus,
                                  g_variant_new ("(b)", restart),
                                  NULL);
 
+    ibus_bus_close_connection (bus);
+
     if (result) {
         g_variant_unref (result);
         return TRUE;
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index fc1ae8b53..0132fc7b6 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -882,6 +882,8 @@ class Panel : IBus.PanelService {
                 Timeout.add(
                         PRELOAD_ENGINES_DELAY_TIME,
                         () => {
+                            if (!m_bus.is_connected())
+                                return false;
                             m_bus.preload_engines_async.begin(names,
                                                               -1,
                                                               null);

From 5d9109b3c56bca60be441ad286688467c67664c8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 21 Apr 2015 11:26:04 +0900
Subject: [PATCH 304/816] Fix to show keyboard shortcuts in ibus-setup.

BUG=http://code.google.com/p/ibus/issues/detail?id=1771
TEST=setup

Review URL: https://codereview.appspot.com/233720043
---
 setup/keyboardshortcut.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py
index 86463cbd7..39a6d4711 100644
--- a/setup/keyboardshortcut.py
+++ b/setup/keyboardshortcut.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -51,13 +51,13 @@ def __init_ui(self):
         # shortcuts view
         self.__shortcut_view = Gtk.TreeView(
                 model = Gtk.ListStore(GObject.TYPE_STRING))
-        self.__shortcut_view.set_size_request(-1, 100)
         renderer = Gtk.CellRendererText()
         column = Gtk.TreeViewColumn(_("Keyboard shortcuts"), renderer, text = 0)
         self.__shortcut_view.append_column(column)
         self.__shortcut_view.connect("cursor-changed", self.__shortcut_view_cursor_changed_cb)
         scrolledwindow = Gtk.ScrolledWindow()
         scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        scrolledwindow.set_min_content_height(100)
         scrolledwindow.add(self.__shortcut_view)
         scrolledwindow.set_shadow_type(Gtk.ShadowType.IN)
         self.pack_start(scrolledwindow, True, True, 4)
@@ -265,7 +265,9 @@ def __accel_edited_cb(c, path, keyval, state, keycode):
                               GObject.TYPE_UINT,
                               GObject.TYPE_UINT)
         accel_view = Gtk.TreeView(model = model)
+        accel_view.set_headers_visible(False)
         sw.add(accel_view)
+        sw.set_min_content_height(30)
         column = Gtk.TreeViewColumn()
         renderer = Gtk.CellRendererAccel(accel_mode=Gtk.CellRendererAccelMode.OTHER,
                                          editable=True)

From f6ba337abc2bad9f40aea89b6c38564c982031fe Mon Sep 17 00:00:00 2001
From: Hodong Kim <hodong@cogno.org>
Date: Tue, 28 Apr 2015 11:32:56 +0900
Subject: [PATCH 305/816] Fix typo in util/IMdkit/IMdkit.h and Xi18n.h

BUG=https://github.com/ibus/ibus/pull/20
TEST=util/IMdkit/libIMdkit.la

Review URL: https://codereview.appspot.com/232980043
Patch from Hodong Kim <hodong@cogno.org>.
---
 util/IMdkit/IMdkit.h | 2 +-
 util/IMdkit/Xi18n.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/IMdkit/IMdkit.h b/util/IMdkit/IMdkit.h
index 6f8d6730f..b7d27f5a0 100644
--- a/util/IMdkit/IMdkit.h
+++ b/util/IMdkit/IMdkit.h
@@ -60,7 +60,7 @@ extern "C" {
 #define I18N_INPUT_STYLES	0x0010 /* IMInputStyles */
 #define I18N_ON_KEYS		0x0020 /* IMOnKeysList */
 #define I18N_OFF_KEYS		0x0040 /* IMOffKeysList */
-#define I18N_IM_HANDLER		0x0080 /* IMProtocolHander */
+#define I18N_IM_HANDLER		0x0080 /* IMProtocolHandler */
 #define I18N_ENCODINGS		0x0100 /* IMEncodingList */
 #define I18N_FILTERMASK		0x0200 /* IMFilterEventMask */
 #define I18N_PROTO_DEPEND	0x0400 /* IMProtoDepend */
diff --git a/util/IMdkit/Xi18n.h b/util/IMdkit/Xi18n.h
index e1d24d593..79dd9619a 100644
--- a/util/IMdkit/Xi18n.h
+++ b/util/IMdkit/Xi18n.h
@@ -475,7 +475,7 @@ typedef struct _Xi18nAddressRec
     XIMTriggerKeys on_keys;	/* IMOnKeysList */
     XIMTriggerKeys off_keys;	/* IMOffKeysList */
     XIMEncodings encoding_list; /* IMEncodingList */
-    IMProtoHandler improto;	/* IMProtocolHander */
+    IMProtoHandler improto;	/* IMProtocolHandler */
     long	filterevent_mask; /* IMFilterEventMask */
     /* XIM_SERVERS target Atoms */
     Atom	selection;

From ffdcc6cd1368143b77e6f535e90974651575b02e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 30 Apr 2015 11:10:09 +0900
Subject: [PATCH 306/816] Fix to get X11 display name on GTK3 applications in
 GNOME Wayland

gdk_display_get_name() returns "Wayland" in GTK 3.16 but
ibus-daemon uses DISPLAY variable for ibus_get_address() at present.
https://git.gnome.org/browse/gtk+/tree/gdk/wayland/gdkdisplay-wayland.c#n332

BUG=https://code.google.com/p/ibus/issues/detail?id=1774
TEST=client/gtk3/im-ibus.so

Review URL: https://codereview.appspot.com/229140045
---
 client/gtk2/ibusimcontext.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index a64c89b99..5c20592d4 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -579,7 +579,11 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 
     /* init bus object */
     if (_bus == NULL) {
-        ibus_set_display (gdk_display_get_name (gdk_display_get_default ()));
+        const gchar *dname = gdk_display_get_name (gdk_display_get_default ());
+        /* ibus-daemon uses DISPLAY variable. */
+        if (g_strcmp0 (dname, "Wayland") == 0)
+            dname = g_getenv ("DISPLAY");
+        ibus_set_display (dname);
         _bus = ibus_bus_new_async ();
 
         /* init the global fake context */

From 1a45642e4e152516dc863717f13eb031138a3978 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 1 May 2015 11:42:41 +0900
Subject: [PATCH 307/816] Update xinput-ibus to check Qt5 libraries besides Qt4
 ones

Now KDE5 is official and ibus-qt is not required since
ibus-qt is used for Qt4.
NOT_RUN=gnome3 is a variable for imsettings since
gnome-shell runs ibus-daemon directly.

BUG=rhbz#1217410
TEST=xinput-ibus

Review URL: https://codereview.appspot.com/237810043
---
 xinput-ibus | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xinput-ibus b/xinput-ibus
index 052ad30fc..458145392 100644
--- a/xinput-ibus
+++ b/xinput-ibus
@@ -3,13 +3,16 @@ exec_prefix=${prefix}
 
 XIM=ibus
 XIM_PROGRAM="${exec_prefix}/bin/ibus-daemon"
-ICON=ibus
+ICON="ibus"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM="${exec_prefix}/bin/ibus-setup"
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus
+NOT_RUN=gnome3
 
-if test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
+if test -f /usr/lib64/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
    test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so;
 then
     QT_IM_MODULE=ibus

From 55d62a172dc8776593da484399e2bd66d3d9f361 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 12 May 2015 11:19:07 +0900
Subject: [PATCH 308/816] setup: Fix deprecated APIs since GTK 3.14

GtkAlignment and GtkMisc have been no longer available since GTK 3.14
and use gtk_widget_set_margin_*().
gtk_widget_set_margin_[start|end]() are new in GTK 3.12 so still use
gtk_widget_set_margin_[left|right]()

TEST=setup

Review URL: https://codereview.appspot.com/226510043
---
 setup/setup.ui | 1682 +++++++++++++++++++++++-------------------------
 1 file changed, 805 insertions(+), 877 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index d7801eacb..c3894a5ca 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -75,583 +75,565 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkAlignment" id="alignment3">
+              <object class="GtkBox" id="vbox5">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="spacing">18</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
                 <child>
-                  <object class="GtkBox" id="vbox5">
-                    <property name="orientation">vertical</property>
+                  <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">18</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" id="frame3">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="n_rows">5</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">12</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment4">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">12</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys for switching to next input method in the list</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Next input method:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label9">
+                            <property name="no_show_all">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys for switching to previous input method in the list</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Previous input method:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox4">
+                            <property name="orientation">horizontal</property>
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkTable" id="table1">
+                              <object class="GtkEntry" id="entry_trigger">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_rows">5</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">The shortcut keys for switching to next input method in the list</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Next input method:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label9">
-                                    <property name="no_show_all">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">The shortcut keys for switching to previous input method in the list</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Previous input method:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox4">
-                                    <property name="orientation">horizontal</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkEntry" id="entry_trigger">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="editable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_trigger">
-                                        <property name="label" translatable="yes">...</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox5">
-                                    <property name="orientation">horizontal</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkEntry" id="entry_switch_engine">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="editable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_switch_engine">
-                                        <property name="label" translatable="yes">...</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox6">
-                                    <property name="orientation">horizontal</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkEntry" id="entry_prev_engine">
-  >                                     <property name="no_show_all">True</property>
-                                        <property name="sensitive">False</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="editable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_prev_engine">
-                                        <property name="label" translatable="yes">...</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="sensitive">False</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label7">
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">The shortcut keys for turning input method on or off</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Enable or disable:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Enable:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox2">
-                                    <property name="orientation">horizontal</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkEntry" id="entry_enable_unconditional">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="editable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_enable_unconditional">
-                                        <property name="label" translatable="yes">...</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label19">
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Disable:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox3">
-                                    <property name="orientation">horizontal</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkEntry" id="entry_disable_unconditional">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="editable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_disable_unconditional">
-                                        <property name="label" translatable="yes">...</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_trigger">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label12">
+                        <child>
+                          <object class="GtkBox" id="hbox5">
+                            <property name="orientation">horizontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Keyboard Shortcuts&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_switch_engine">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_switch_engine">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox6">
+                            <property name="orientation">horizontal</property>
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_prev_engine">
+  >                                     <property name="no_show_all">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_prev_engine">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label7">
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys for turning input method on or off</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Enable or disable:</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label18">
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Enable:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox2">
+                            <property name="orientation">horizontal</property>
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_enable_unconditional">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_enable_unconditional">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label19">
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Disable:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox3">
+                            <property name="orientation">horizontal</property>
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_disable_unconditional">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_disable_unconditional">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Keyboard Shortcuts&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" id="frame4">
+                      <object class="GtkTable" id="table2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="n_rows">7</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">12</property>
+                        <child>
+                          <object class="GtkLabel" id="label6">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set the orientation of candidates in lookup table</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Candidates orientation:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment5">
+                          <object class="GtkComboBox" id="combobox_lookup_table_orientation">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">12</property>
+                            <property name="model">model_candidates_orientation</property>
                             <child>
-                              <object class="GtkTable" id="table2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_rows">7</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">12</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">Set the orientation of candidates in lookup table</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Candidates orientation:</property>
-                                    <property name="justify">right</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="combobox_lookup_table_orientation">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="model">model_candidates_orientation</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="renderer1"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label10">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes">Set the behavior of ibus how to show or hide language bar</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Show property panel:</property>
-                                    <property name="justify">right</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label16">
-                                    <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Language panel position:</property>
-                                    <property name="justify">right</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="combobox_panel_show">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="model">model_panel_show_mode</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="renderer2"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="combobox_panel_position">
-                                    <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="model">model_panel_position</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="renderer3"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="checkbutton_show_icon_on_systray">
-                                    <property name="label" translatable="yes">Show icon on system tray</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Show icon on system tray</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="checkbutton_show_im_name">
-                                    <property name="label" translatable="yes">Show input method name on language bar</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Show input method's name on language bar when check the checkbox</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="checkbutton_embed_preedit_text">
-                                    <property name="label" translatable="yes">Embed preedit text in application window</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Embed the preedit text of input method in the application window</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">5</property>
-                                    <property name="bottom_attach">6</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="checkbutton_custom_font">
-                                    <property name="label" translatable="yes">Use custom font:</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">6</property>
-                                    <property name="bottom_attach">7</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkFontButton" id="fontbutton_custom_font">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">6</property>
-                                    <property name="bottom_attach">7</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                              </object>
+                              <object class="GtkCellRendererText" id="renderer1"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set the behavior of ibus how to show or hide language bar</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Show property panel:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label16">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Language panel position:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label13">
+                        <child>
+                          <object class="GtkComboBox" id="combobox_panel_show">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Font and Style&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="model">model_panel_show_mode</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer2"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="combobox_panel_position">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="model">model_panel_position</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer3"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_show_icon_on_systray">
+                            <property name="label" translatable="yes">Show icon on system tray</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Show icon on system tray</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_show_im_name">
+                            <property name="label" translatable="yes">Show input method name on language bar</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Show input method's name on language bar when check the checkbox</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_embed_preedit_text">
+                            <property name="label" translatable="yes">Embed preedit text in application window</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Embed the preedit text of input method in the application window</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_custom_font">
+                            <property name="label" translatable="yes">Use custom font:</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFontButton" id="fontbutton_custom_font">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label13">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Font and Style&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -666,206 +648,66 @@
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkBox" id="vbox2">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
                 <child>
-                  <object class="GtkBox" id="vbox2">
-                    <property name="orientation">vertical</property>
+                  <object class="GtkBox" id="hbox1">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkBox" id="hbox1">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="vbox3">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment_engine_combobox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="EngineComboBox" id="combobox_engines">
-                                        <property name="visible">True</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow_engine_treeview">
-                                    <property name="width_request">240</property>
-                                    <property name="height_request">300</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <object class="EngineTreeView" id="treeview_engines">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                      <object class="GtkAlignment" id="alignment6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment2">
+                          <object class="GtkBox" id="vbox3">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkButtonBox" id="vbuttonbox1">
-                                <property name="orientation">vertical</property>
+                              <object class="GtkAlignment" id="alignment_engine_combobox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">5</property>
-                                <property name="layout_style">start</property>
-                                <child>
-                                  <object class="GtkButton" id="button_engine_add">
-                                    <property name="label" translatable="yes">_Add</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Add the selected input method into the enabled input methods</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_engine_remove">
-                                    <property name="label" translatable="yes">_Remove</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Remove the selected input method from the enabled input methods</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_engine_up">
-                                    <property name="label" translatable="yes">_Up</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Move up the selected input method in the enabled input methods list</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_engine_down">
-                                    <property name="label" translatable="yes">_Down</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Move down the selected input method in the enabled input methods</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
                                 <child>
-                                  <object class="GtkButton" id="button_engine_about">
-                                    <property name="label" translatable="yes">_About</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="EngineComboBox" id="combobox_engines">
                                     <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Show information of the selected input method</property>
-                                    <property name="use_action_appearance">False</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">4</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow_engine_treeview">
+                                <property name="width_request">240</property>
+                                <property name="height_request">300</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkButton" id="button_engine_preferences">
-                                    <property name="label" translatable="yes">_Preferences</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="EngineTreeView" id="treeview_engines">
                                     <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Show setup of the selected input method</property>
-                                    <property name="use_action_appearance">False</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">5</property>
-                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -875,46 +717,120 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkAlignment" id="alignment8">
+                      <object class="GtkButtonBox" id="vbuttonbox1">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="top_padding">6</property>
+                        <property name="spacing">5</property>
+                        <property name="layout_style">start</property>
+                        <property name="margin_left">12</property>
                         <child>
-                          <object class="GtkBox" id="hbox8">
-                            <property name="orientation">horizontal</property>
+                          <object class="GtkButton" id="button_engine_add">
+                            <property name="label" translatable="yes">_Add</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkImage" id="image1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="icon-name">dialog-information</property>
-                                <property name="icon-size">2</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="wrap">True</property>
-                                <property name="max_width_chars">74</property>
-                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;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.&lt;/i&gt;&lt;/small&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Add the selected input method into the enabled input methods</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_engine_remove">
+                            <property name="label" translatable="yes">_Remove</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Remove the selected input method from the enabled input methods</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_engine_up">
+                            <property name="label" translatable="yes">_Up</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Move up the selected input method in the enabled input methods list</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_engine_down">
+                            <property name="label" translatable="yes">_Down</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Move down the selected input method in the enabled input methods</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_engine_about">
+                            <property name="label" translatable="yes">_About</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Show information of the selected input method</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_engine_preferences">
+                            <property name="label" translatable="yes">_Preferences</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Show setup of the selected input method</property>
+                            <property name="use_action_appearance">False</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">5</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -924,6 +840,56 @@
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox8">
+                    <property name="orientation">horizontal</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <property name="margin_top">6</property>
+                    <child>
+                      <object class="GtkImage" id="image1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon-name">dialog-information</property>
+                        <property name="icon-size">2</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <!-- xalign is still available in GtkLabel only -->
+                        <property name="xalign">0</property>
+                        <property name="wrap">True</property>
+                        <property name="max_width_chars">74</property>
+                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;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.&lt;/i&gt;&lt;/small&gt;</property>
+                        <property name="use_markup">True</property>
+                        <!-- property name="margin_left">0</property -->
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -942,142 +908,110 @@
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment9">
+              <object class="GtkBox" id="vbox7">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
                 <child>
-                  <object class="GtkBox" id="vbox7">
-                    <property name="orientation">vertical</property>
+                  <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" id="frame2">
+                      <object class="GtkBox" id="vbox8">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">24</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="top_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="vbox8">
-                                    <property name="orientation">vertical</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="checkbutton_use_sys_layout">
-                                        <property name="label" translatable="yes">Use system keyboard layout</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">Use system keyboard (XKB) layout</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label15">
+                          <object class="GtkCheckButton" id="checkbutton_use_sys_layout">
+                            <property name="label" translatable="yes">Use system keyboard layout</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Use system keyboard (XKB) layout</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" id="frame5">
+                      <object class="GtkBox" id="vbox9">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">24</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="top_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="vbox9">
-                                    <property name="orientation">vertical</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="checkbutton_use_global_engine">
-                                        <property name="label" translatable="yes">Share the same input method among all applications</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label17">
+                          <object class="GtkCheckButton" id="checkbutton_use_global_engine">
+                            <property name="label" translatable="yes">Share the same input method among all applications</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Global input method settings&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Global input method settings&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -1130,24 +1064,18 @@ Homepage: http://code.google.com/p/ibus
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment7">
+                      <object class="GtkCheckButton" id="checkbutton_auto_start">
+                        <property name="label" translatable="yes">Start ibus on login</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="checkbutton_auto_start">
-                            <property name="label" translatable="yes">Start ibus on login</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="halign">start</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">12</property>
                       </object>
                     </child>
                     <child type="label">

From 7ae585ac21db4dfac8989887e1a5f97fb863fa17 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 18 May 2015 11:54:38 +0900
Subject: [PATCH 309/816] Load locale compose files dynamically.

$HOME/.XCompose is used for the customization of compose files.
Now the static system locale data is dropped and load
/usr/share/X11/locale/$LOCALE/Compose dynamically besides .XCompose.

BUG=https://code.google.com/p/ibus/issues/detail?id=1728
TEST=src/libibus.so src/tests/ibus-compose  engine/ibus-engine-simple

Review URL: https://codereview.appspot.com/232440044
---
 bindings/vala/ibus-private.vapi               |   22 -
 engine/Makefile.am                            |   29 +-
 engine/main.vala                              |   21 +-
 engine/test-compose.vala                      |  193 -
 src/Makefile.am                               |   23 +-
 src/{gencomposetable.c => ibuscomposetable.c} |  518 +-
 src/ibuscomposetable.h                        | 2084 +----
 src/ibusenginesimple.c                        |   90 +-
 src/ibusenginesimple.h                        |   13 +
 src/keyname-table.h                           | 7620 ++++++++++++-----
 src/tests/Makefile.am                         |   12 +-
 src/tests/ibus-compose.c                      |  245 +
 src/tests/runtest                             |    1 +
 13 files changed, 5841 insertions(+), 5030 deletions(-)
 delete mode 100644 bindings/vala/ibus-private.vapi
 delete mode 100644 engine/test-compose.vala
 rename src/{gencomposetable.c => ibuscomposetable.c} (51%)
 create mode 100644 src/tests/ibus-compose.c

diff --git a/bindings/vala/ibus-private.vapi b/bindings/vala/ibus-private.vapi
deleted file mode 100644
index acf5c4dc5..000000000
--- a/bindings/vala/ibus-private.vapi
+++ /dev/null
@@ -1,22 +0,0 @@
-[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 --git a/engine/Makefile.am b/engine/Makefile.am
index e3e491013..271e92567 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2010-2013, Google Inc. All rights reserved.
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2010-2015, Google Inc. All rights reserved.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -52,6 +52,7 @@ AM_LDADD = \
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--pkg=ibus-1.0 \
+	--pkg=posix \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
@@ -72,30 +73,6 @@ ibus_engine_simple_DEPENDENCIES = \
 	$(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 --git a/engine/main.vala b/engine/main.vala
index d2b2b481e..3fecb0a65 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -2,7 +2,8 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2011-2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -60,13 +61,25 @@ public int main(string[] args) {
          * X11 uses compose by locale:
          * In /usr/share/X11/locale/en_US.UTF-8/Compose ,
          * <Multi_key> <apostrophe> <c> : U0107
-         * At the moment, LC_CTYPE is checked here.
-         * I am not sure if cedilla_compose_seqs is needed for us layout.
-         * FIXME: Need to provide the customization.
          */
         IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
         simple.add_table_by_locale(null);
 
+        string user_file = null;
+
+        var home = GLib.Environment.get_home_dir();
+        if (home != null) {
+            user_file = home + "/.XCompose";
+            if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
+                simple.add_compose_file(user_file);
+        }
+
+        user_file = GLib.Environment.get_variable("XCOMPOSEFILE");
+        if (user_file != null) {
+            if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
+                simple.add_compose_file(user_file);
+        }
+
         return engine;
     });
 
diff --git a/engine/test-compose.vala b/engine/test-compose.vala
deleted file mode 100644
index 082a9ab2a..000000000
--- a/engine/test-compose.vala
+++ /dev/null
@@ -1,193 +0,0 @@
-/* vim:set et sts=4 sw=4:
- *
- * ibus - The Input Bus
- *
- * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
- *
- * 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 <takao.fujiwara1@gmail.com>",
-                "http://code.google.com/p/ibus/",
-                "",
-                "ibus");
-
-        component.add_engine (new IBus.EngineDesc(
-                "xkbtest:us::eng",
-                "XKB Test",
-                "XKB Test",
-                "en",
-                "GPL",
-                "Takao Fujiwara <takao.fujiwara1@gmail.com>",
-                "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 --git a/src/Makefile.am b/src/Makefile.am
index 5679f23ad..101878491 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -102,6 +102,7 @@ ibus_sources =              \
     $(NULL)
 libibus_1_0_la_SOURCES =    \
     ibusmarshalers.c        \
+    ibuscomposetable.c      \
     ibusenumtypes.c         \
     $(ibus_sources)         \
     $(NULL)
@@ -227,24 +228,6 @@ ibusmarshalers.c: ibusmarshalers.h ibusmarshalers.list
 	$(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 --git a/src/gencomposetable.c b/src/ibuscomposetable.c
similarity index 51%
rename from src/gencomposetable.c
rename to src/ibuscomposetable.c
index 793a75e48..e0cf594dc 100644
--- a/src/gencomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,7 @@
  * USA
  */
 
-/* This tool converts COMPOSE_FILES[] to ibuscompose.h .
- * To update ibuscompose.h:
- * # rm ibuscompose.h
- * # make ibuscompose.h
- *
- * If you copy libX11/nls/??/Compose.pre in xorg git HEAD to
+/* If you copy libX11/nls/??/Compose.pre in xorg git HEAD to
  * /usr/share/X11/locale/??/Compose , need to convert:
  * # sed -e 's/^XCOMM/#/' -e 's|X11_LOCALEDATADIR|/usr/share/X11/locale|'
  *   Compose.pre > /usr/share/X11/locale/foo/Compose
@@ -32,135 +27,25 @@
 
 #include <glib.h>
 #include <glib/gprintf.h>
+#include <X11/Xlib.h>
 #include <locale.h>
+#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-
+#include <unistd.h>
 #include "ibuserror.h"
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
+#include "ibuscomposetable.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-2014 Peng Huang <shawn.p.huang@gmail.com>\n"           \
-" * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>\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)
 {
@@ -180,73 +65,20 @@ is_codepoint (const gchar *str)
     return TRUE;
 }
 
-static gint
+static guint32
 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));
+        return (guint32) ibus_keyval_from_name (str + 9);
     if (*str == '0' && *(str + 1) == '\0')
         return 0;
     if (*str == '0' && *(str + 1) == 'x')
-        return (gint) g_ascii_strtoll (str, NULL, 16);
+        return (guint32) 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)
 {
@@ -254,12 +86,19 @@ parse_compose_value (GArray *array, const gchar *val, GError **error)
     gchar *result;
     gunichar uch;
 
-    g_assert (g_strv_length (words) >= 3);
+    if (g_strv_length (words) < 3) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "Need to double-quote the value: %s", val);
+        g_strfreev (words);
+        return FALSE;
+    }
 
     uch = g_utf8_get_char (words[1]);
 
     if (uch == 0) {
-         g_set_error (error,
+        g_set_error (error,
                      IBUS_ERROR,
                      IBUS_ERROR_FAILED,
                      "Invalid value: %s", val);
@@ -280,7 +119,7 @@ parse_compose_value (GArray *array, const gchar *val, GError **error)
             g_assert_not_reached ();
     }
     else if (g_utf8_get_char (g_utf8_next_char (words[1])) > 0) {
-         g_set_error (error,
+        g_set_error (error,
                      IBUS_ERROR,
                      IBUS_ERROR_FAILED,
                      "GTK+ supports to output one char only: %s", val);
@@ -289,7 +128,7 @@ parse_compose_value (GArray *array, const gchar *val, GError **error)
     }
 
 
-    result = g_strdup_printf ("0x%04X", uch);
+    result = g_strdup_printf ("0x%08X", uch);
     g_array_append_val (array, result);
 
     if (uch == '"')
@@ -303,15 +142,22 @@ parse_compose_value (GArray *array, const gchar *val, GError **error)
     return TRUE;
 }
 
-static void
-parse_compose_sequence (GArray *array, const gchar *seq)
+static gboolean
+parse_compose_sequence (GArray *array, const gchar *seq, GError **error)
 {
     gchar **words = g_strsplit (seq, "<", -1);
     gchar *result;
     int i;
     int n = 0;
 
-    g_assert (g_strv_length (words) >= 2);
+    if (g_strv_length (words) < 2) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "key sequence format is <a> <b>...");
+        g_strfreev (words);
+        return FALSE;
+    }
 
     for (i = 1; words[i] != NULL; i++) {
         gchar *start = words[i];
@@ -321,7 +167,14 @@ parse_compose_sequence (GArray *array, const gchar *seq)
         if (words[i][0] == '\0')
              continue;
 
-        g_assert (start != NULL && end != NULL && end > start);
+        if (start == NULL || end == NULL || end <= start) {
+            g_set_error (error,
+                         IBUS_ERROR,
+                         IBUS_ERROR_FAILED,
+                         "key sequence format is <a> <b>...");
+            g_strfreev (words);
+            return FALSE;
+        }
 
         match = g_strndup (start, end - start);
 
@@ -337,10 +190,17 @@ parse_compose_sequence (GArray *array, const gchar *seq)
     }
 
     g_strfreev (words);
-    g_assert (0 < n && n < GTK_MAX_COMPOSE_LEN);
+    if (0 == n || n >= IBUS_MAX_COMPOSE_LEN) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "The max number of sequences is %d", IBUS_MAX_COMPOSE_LEN);
+        return FALSE;
+    }
 
     result = g_strdup ("0");
     g_array_append_val (array, result);
+    return TRUE;
 }
 
 static void
@@ -351,7 +211,7 @@ clear_char_array (gpointer data)
 }
 
 static void
-parse_compose_line (GList **compose_table, const gchar *line)
+parse_compose_line (GList **compose_list, const gchar *line)
 {
     gchar **components = NULL;
     GArray *array;
@@ -374,7 +234,13 @@ parse_compose_line (GList **compose_table, const gchar *line)
     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_sequence (array, g_strstrip (components[0]), &error)) {
+        g_warning ("%s: %s", error->message, line);
+        g_clear_error (&error);
+        g_strfreev (components);
+        g_array_unref (array);
+        return;
+    }
 
     if (!parse_compose_value (array, g_strstrip (components[1]), &error)) {
         g_warning ("%s: %s", error->message, line);
@@ -386,7 +252,7 @@ parse_compose_line (GList **compose_table, const gchar *line)
 
     g_strfreev (components);
 
-    *compose_table = g_list_append (*compose_table, array);
+    *compose_list = g_list_append (*compose_list, array);
 }
 
 static GList *
@@ -396,7 +262,7 @@ parse_compose_file (const gchar *compose_file)
     gchar **lines = NULL;
     gsize length = 0;
     GError *error = NULL;
-    GList *compose_table = NULL;
+    GList *compose_list = NULL;
     int i;
 
     if (!g_file_get_contents (compose_file, &contents, &length, &error)) {
@@ -407,16 +273,16 @@ parse_compose_file (const gchar *compose_file)
     lines = g_strsplit (contents, "\n", -1);
     g_free (contents);
     for (i = 0; lines[i] != NULL; i++)
-        parse_compose_line (&compose_table, lines[i]);
+        parse_compose_line (&compose_list, lines[i]);
     g_strfreev (lines);
 
-    return compose_table;
+    return compose_list;
 }
 
 static int
 compare_seq_index (const void *key, const void *value)
 {
-    const guint *keysyms = key;
+    const guint16 *keysyms = key;
     const guint16 *seq = value;
 
     if (keysyms[0] < seq[0])
@@ -430,7 +296,7 @@ static int
 compare_seq (const void *key, const void *value)
 {
     int i = 0;
-    const guint *keysyms = key;
+    const guint16 *keysyms = key;
     const guint16 *seq = value;
 
     while (keysyms[i]) {
@@ -448,7 +314,7 @@ compare_seq (const void *key, const void *value)
 /* Implement check_compact_table() in ibus/src/ibusenginesimple.c
  */
 static gboolean
-check_compact_table (const guint                   *compose_buffer,
+check_compact_table (const guint16                 *compose_buffer,
                      const IBusComposeTableCompact *table,
                      gint                           n_compose)
 {
@@ -505,7 +371,7 @@ check_compact_table (const guint                   *compose_buffer,
 static gboolean
 check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 {
-    gunichar combination_buffer_temp[GTK_MAX_COMPOSE_LEN];
+    gunichar combination_buffer_temp[IBUS_MAX_COMPOSE_LEN];
     gchar *combination_utf8_temp = NULL;
     gchar *nfc_temp = NULL;
     gint n_combinations;
@@ -524,7 +390,7 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
     }
 
     memcpy (combination_buffer_temp, combination_buffer,
-            GTK_MAX_COMPOSE_LEN * sizeof (gunichar) );
+            IBUS_MAX_COMPOSE_LEN * sizeof (gunichar) );
 
     for (i = 0; i < n_combinations; i++ ) {
         g_unicode_canonical_ordering (combination_buffer_temp, n_compose);
@@ -536,7 +402,7 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
         if (g_utf8_strlen (nfc_temp, -1) == 1) {
             memcpy (combination_buffer,
                     combination_buffer_temp,
-                    GTK_MAX_COMPOSE_LEN * sizeof (gunichar) );
+                    IBUS_MAX_COMPOSE_LEN * sizeof (gunichar) );
 
             g_free (combination_utf8_temp);
             g_free (nfc_temp);
@@ -563,14 +429,14 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 /* Implement check_algorithmically() in ibus/src/ibusenginesimple.c
  */
 static gboolean
-check_algorithmically (const guint *compose_buffer,
-                       gint         n_compose)
+check_algorithmically (const guint16 *compose_buffer,
+                       gint          n_compose)
 {
     int i = 0;
-    gunichar combination_buffer[GTK_MAX_COMPOSE_LEN];
+    gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
     gchar *combination_utf8, *nfc;
 
-    if (n_compose >= GTK_MAX_COMPOSE_LEN)
+    if (n_compose >= IBUS_MAX_COMPOSE_LEN)
         return FALSE;
 
     for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
@@ -579,7 +445,8 @@ check_algorithmically (const guint *compose_buffer,
         return FALSE;
 
     if (i > 0 && i == n_compose - 1) {
-        combination_buffer[0] = ibus_keyval_to_unicode (compose_buffer[i]);
+        combination_buffer[0] =
+                ibus_keyval_to_unicode ((guint) compose_buffer[i]);
         combination_buffer[n_compose] = 0;
         i--;
 
@@ -622,7 +489,7 @@ check_algorithmically (const guint *compose_buffer,
 #undef CASE
             default:
                 combination_buffer[i+1] =
-                        ibus_keyval_to_unicode (compose_buffer[i]);
+                        ibus_keyval_to_unicode ((guint) compose_buffer[i]);
             }
             i--;
         }
@@ -647,31 +514,34 @@ check_algorithmically (const guint *compose_buffer,
 }
 
 static GList *
-check_duplicated_compose (GList *compose_table)
+check_duplicated_compose (GList *compose_list)
 {
-    GList *table;
-    GList *removed_table = NULL;
+    GList *list;
+    GList *removed_list = NULL;
 
-    for (table = compose_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
-        static guint keysyms[GTK_MAX_COMPOSE_LEN + 2];
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
+        static guint16 keysyms[IBUS_MAX_COMPOSE_LEN + 2];
         int i;
         int n_compose = 0;
 
-        for (i = 0; i < GTK_MAX_COMPOSE_LEN + 2; i++) {
+        for (i = 0; i < IBUS_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;
+            guint32 codepoint = get_codepoint (data);
+            keysyms[i] = (guint16) codepoint;
+            if (codepoint == IBUS_KEY_VoidSymbol)
+                g_warning ("Could not get code point of keysym %s", data);
 
             if (codepoint == 0) {
                 data = g_array_index (array, const gchar *, i + 1);
-                codepoint = (guint) get_codepoint (data);
-                keysyms[i + 1] = codepoint;
+                codepoint = get_codepoint (data);
+                keysyms[i + 1] = (guint16) codepoint;
+                if (codepoint == IBUS_KEY_VoidSymbol)
+                    g_warning ("Could not get code point of keysym %s", data);
                 break;
             }
 
@@ -681,72 +551,72 @@ check_duplicated_compose (GList *compose_table)
         if (check_compact_table (keysyms,
                                  &ibus_compose_table_compact,
                                  n_compose))
-            removed_table = g_list_append (removed_table, array);
+            removed_list = g_list_append (removed_list, array);
 
         else if (check_algorithmically (keysyms, n_compose))
-            removed_table = g_list_append (removed_table, array);
+            removed_list = g_list_append (removed_list, array);
     }
 
-    for (table = removed_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
-        compose_table = g_list_remove (compose_table, array);
+    for (list = removed_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
+        compose_list = g_list_remove (compose_list, array);
         g_array_unref (array);
     }
 
-    g_list_free (removed_table);
+    g_list_free (removed_list);
 
-    return compose_table;
+    return compose_list;
 }
 
 static GList *
-check_uint16 (GList *compose_table)
+check_uint16 (GList *compose_list)
 {
-    GList *table;
-    GList *removed_table = NULL;
+    GList *list;
+    GList *removed_list = NULL;
 
-    for (table = compose_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->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);
+            guint32 codepoint = get_codepoint (data);
 
             if (codepoint == 0)
                 break;
 
             if (codepoint > 0xffff) {
-                removed_table = g_list_append (removed_table, array);
+                removed_list = g_list_append (removed_list, array);
                 break;
             }
         }
     }
 
-    for (table = removed_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
-        compose_table = g_list_remove (compose_table, array);
+    for (list = removed_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
+        compose_list = g_list_remove (compose_list, array);
         g_array_unref (array);
     }
 
-    g_list_free (removed_table);
+    g_list_free (removed_list);
 
-    return compose_table;
+    return compose_list;
 }
 
 static GList *
-format_for_gtk (GList *compose_table)
+format_for_gtk (GList *compose_list)
 {
-    GList *table;
-    GList *new_table = NULL;
+    GList *list;
+    GList *new_list = NULL;
     int i;
     int j;
 
-    for (table = compose_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
 
         for (i = 0; i < array->len; i++) {
             const gchar *data = g_array_index (array, const gchar *, i);
-            guint codepoint = (guint) get_codepoint (data);
+            guint32 codepoint = get_codepoint (data);
 
             if (codepoint == 0) {
                 if (MAX_COMPOSE_LEN < i)
@@ -758,11 +628,11 @@ format_for_gtk (GList *compose_table)
 
     N_INDEX_STRIDE = MAX_COMPOSE_LEN + 2;
 
-    for (table = compose_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
         for (i = 0; i < array->len; i++) {
             const gchar *data = g_array_index (array, const gchar *, i);
-            guint codepoint = (guint) get_codepoint (data);
+            guint32 codepoint = get_codepoint (data);
 
             if (codepoint == 0) {
                 gchar *value = g_strdup (g_array_index (array, const gchar *,
@@ -778,7 +648,7 @@ format_for_gtk (GList *compose_table)
                     g_array_append_val (array, result);
                 }
 
-                codepoint = (guint) get_codepoint (value);
+                codepoint = get_codepoint (value);
                 g_free (value);
 
                 if (codepoint > 0xffff) {
@@ -795,13 +665,14 @@ format_for_gtk (GList *compose_table)
                 }
 
                 g_array_append_val (array, comment);
-                new_table = g_list_append (new_table, array);
+                new_list = g_list_append (new_list, array);
                 break;
             }
         }
     }
 
-    return new_table;
+    g_list_free (compose_list);
+    return new_list;
 }
 
 static gint
@@ -813,8 +684,8 @@ compare_array (gpointer a, gpointer b)
     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);
+        guint32 code_a = get_codepoint (data_a);
+        guint32 code_b = get_codepoint (data_b);
 
         if (code_a != code_b)
             return code_a - code_b;
@@ -823,14 +694,14 @@ compare_array (gpointer a, gpointer b)
 }
 
 static void
-print_compose_table (GList *compose_table)
+print_compose_list (GList *compose_list)
 {
-    GList *table;
+    GList *list;
     int i;
     int TOTAL_SIZE = 0;
 
-    for (table = compose_table; table != NULL; table = table->next) {
-        GArray *array = (GArray *) table->data;
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
         const gchar *data;
         const gchar *upper;
         const gchar *lower;
@@ -851,7 +722,7 @@ print_compose_table (GList *compose_table)
         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))
+        if (list == g_list_last (compose_list))
             g_printf ("    %s, %s  /* %s */\n", upper, lower, comment);
         else
             g_printf ("    %s, %s, /* %s */\n", upper, lower, comment);
@@ -863,106 +734,75 @@ print_compose_table (GList *compose_table)
                 TOTAL_SIZE, MAX_COMPOSE_LEN, N_INDEX_STRIDE);
 }
 
-static void
-print_compose_table_locale_list (void) {
+static IBusComposeTable *
+ibus_compose_table_new_with_list (GList *compose_list,
+                                  int    max_compose_len,
+                                  int    n_index_stride)
+{
+    guint length;
+    guint n = 0;
     int i;
+    static guint16 *ibus_compose_seqs = NULL;
+    GList *list;
+    IBusComposeTable *retval = NULL;
 
-#define HEADER_IBUS_COMPOSE_TABLE_LOCLE_LIST \
-  "static const IBusComposeTableLocaleList ibus_compose_table_locale_list[] = {"
+    g_return_val_if_fail (compose_list != NULL, NULL);
 
-    g_printf ("%s\n", HEADER_IBUS_COMPOSE_TABLE_LOCLE_LIST);
+    length = g_list_length (compose_list);
 
-    for (i = 0; COMPOSE_FILES[i] != NULL; i++) {
-        const gchar *compose_file = COMPOSE_FILES[i];
+    ibus_compose_seqs = g_new0 (guint16, length * n_index_stride);
 
-        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 ();
+    for (list = compose_list; list != NULL; list = list->next) {
+        GArray *array = (GArray *) list->data;
+        const gchar *data;
+        for (i = 0; i < n_index_stride; i++) {
+            data = g_array_index (array, const gchar *, i);
+            ibus_compose_seqs[n++] = (guint16) get_codepoint (data);
+        }
     }
 
-    g_printf ("    { NULL, NULL }\n};\n\n");
-};
+    retval = g_new0 (IBusComposeTable, 1);
+    retval->data = ibus_compose_seqs;
+    retval->max_seq_len = max_compose_len;
+    retval->n_seqs = length;
+
+    return retval;
+}
 
-int
-main (int argc, char *argv[])
+IBusComposeTable *
+ibus_compose_table_new_with_file (const gchar *compose_file)
 {
-    int i;
-    const gchar *en_keysym_file;
-    const gchar *compose_file;
-    GList *compose_table = NULL;
+    GList *compose_list = NULL;
+    IBusComposeTable *compose_table;
 
-    setlocale (LC_ALL, "");
+    g_assert (compose_file != NULL);
 
-    en_keysym_file = g_getenv ("IBUS_KEYSYMS");
+    MAX_COMPOSE_LEN = 0;
+    N_INDEX_STRIDE = 0;
 
-    if (en_keysym_file == NULL) {
-        en_keysym_file = "ibuskeysyms.h";
+    compose_list = parse_compose_file (compose_file);
+    if (compose_list == NULL) {
+        g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
+        return NULL;
     }
-
-    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);
+    compose_list = check_duplicated_compose (compose_list);
+    compose_list = check_uint16 (compose_list);
+    compose_list = format_for_gtk (compose_list);
+    compose_list = g_list_sort (compose_list,
+                                 (GCompareFunc) compare_array);
+    if (compose_list == NULL) {
+        g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
+        return NULL;
     }
 
-    print_compose_table_locale_list ();
-
-    g_printf ("%s\n", FOOTER);
+    if (g_getenv ("IBUS_PRINT_COMPOSE_TABLE") != NULL) {
+        print_compose_list (compose_list);
+    }
 
-    g_hash_table_destroy (en_keysym_table);
+    compose_table = ibus_compose_table_new_with_list (compose_list,
+                                                      MAX_COMPOSE_LEN,
+                                                      N_INDEX_STRIDE);
+    g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
 
-    return 0;
+    return compose_table;
 }
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 22aab4811..297b35dd8 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,16 +23,16 @@
 #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
+/* if ibus_compose_seqs[N - 1] is an outputed compose character,
+ * ibus_compose_seqs[N * 2 - 1] is also an outputed compose character.
+ * and ibus_compose_seqs[0] to ibus_compose_seqs[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)
+ * ibus_engine_simple_add_table(engine, ibus_compose_seqs,
+ *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs) / N)
  * The compose sequences are allowed within G_MAXUINT16 */
 
+#define IBUS_MAX_COMPOSE_LEN 7
+
 typedef struct _IBusComposeTable IBusComposeTable;
 struct _IBusComposeTable
 {
@@ -41,2058 +41,32 @@ struct _IBusComposeTable
     gint n_seqs;
 };
 
-typedef struct _IBusComposeTableLocaleList IBusComposeTableLocaleList;
-struct _IBusComposeTableLocaleList
+typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
+struct _IBusComposeTableCompact
 {
-    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
+    const guint16 *data;
+    gint max_seq_len;
+    gint n_index_size;
+    gint n_index_stride;
 };
 
-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 */
-};
+/* This file contains the table of the compose sequences,
+ * static const guint16 ibus_compose_seqs_compact[] = {}
+ * IT is generated from the compose-parse.py script.
+ */
+#include "gtkimcontextsimpleseqs.h"
 
-static const IBusComposeTable ibus_compose_table_el_gr = {
-    ibus_compose_seqs_el_gr,
+/* From the values below, the value 30 means the number of different first keysyms
+ * that exist in the Compose file (from Xorg). When running compose-parse.py without
+ * parameters, you get the count that you can put here. Needed when updating the
+ * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
+ */
+static const IBusComposeTableCompact ibus_compose_table_compact = {
+    gtk_compose_seqs_compact,
     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, /* U00B4  #  ACUTE ACCENT */
-  IBUS_KEY_dead_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0,
-    0, 0x1EC6, /* U1EC6  #  LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
-  IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0,
-    0, 0x00A8, /* U00A8  #  DIAERESIS */
-  IBUS_KEY_dead_abovering, IBUS_KEY_space, 0, 0,
-    0, 0x02DA, /* U02DA  #  RING ABOVE */
-  IBUS_KEY_dead_hook, IBUS_KEY_dead_horn, IBUS_KEY_o, 0,
-    0, 0x1EDD, /* U1EDD  #  LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_D, 0, 0,
-    0, 0x0110, /* U0110  #  LATIN CAPITAL LETTER D WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_G, 0, 0,
-    0, 0x01E4, /* U01E4  #  LATIN CAPITAL LETTER G WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_H, 0, 0,
-    0, 0x0126, /* U0126  #  LATIN CAPITAL LETTER H WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_L, 0, 0,
-    0, 0x0141, /* U0141  #  LATIN CAPITAL LETTER L WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_O, 0, 0,
-    0, 0x00D8, /* U00D8  #  LATIN CAPITAL LETTER O WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_T, 0, 0,
-    0, 0x0166, /* U0166  #  LATIN CAPITAL LETTER T WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_d, 0, 0,
-    0, 0x0111, /* U0111  #  LATIN SMALL LETTER D WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_g, 0, 0,
-    0, 0x01E5, /* U01E5  #  LATIN SMALL LETTER G WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_h, 0, 0,
-    0, 0x0127, /* U0127  #  LATIN SMALL LETTER H WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_l, 0, 0,
-    0, 0x0142, /* U0142  #  LATIN SMALL LETTER L WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_o, 0, 0,
-    0, 0x00F8, /* U00F8  #  LATIN SMALL LETTER O WITH STROKE */
-  IBUS_KEY_dead_stroke, IBUS_KEY_t, 0, 0,
-    0, 0x0167, /* U0167  #  LATIN SMALL LETTER T WITH STROKE */
-  IBUS_KEY_dead_belowcomma, IBUS_KEY_S, 0, 0,
-    0, 0x0218, /* U0218  #  LATIN CAPITAL LETTER S WITH COMMA BELOW */
-  IBUS_KEY_dead_belowcomma, IBUS_KEY_T, 0, 0,
-    0, 0x021A, /* U021A  #  LATIN CAPITAL LETTER T WITH COMMA BELOW */
-  IBUS_KEY_dead_belowcomma, IBUS_KEY_s, 0, 0,
-    0, 0x0219, /* U0219  #  LATIN SMALL LETTER S WITH COMMA BELOW */
-  IBUS_KEY_dead_belowcomma, IBUS_KEY_t, 0, 0,
-    0, 0x021B, /* U021B  #  LATIN SMALL LETTER T WITH COMMA BELOW */
-  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_space, IBUS_KEY_n,
-    0, 0x0149  /* U0149  #  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_acute, IBUS_KEY_C, 0, 0,
-    0, 0x00C7, /* Ccedilla	# LATIN CAPITAL LETTER C WITH CEDILLA */
-  IBUS_KEY_dead_acute, IBUS_KEY_c, 0, 0,
-    0, 0x00E7, /* ccedilla	# LATIN SMALL LETTER C WITH CEDILLA */
-  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_slash, 0,
-    0, 0x301E, /* U301e	# DOUBLE PRIME QUOTATION MARK */
-  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_backslash, 0,
-    0, 0x301D, /* U301d	# REVERSED DOUBLE PRIME QUOTATION MARK */
-  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x03D2, 0,
-    0, 0x03D3, /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
-  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E, 0,
-    0, 0x0228, /* U0228	# LATIN CAPITAL LETTER E WITH CEDILLA */
-  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e, 0,
-    0, 0x0229, /* U0229	# LATIN SMALL LETTER E WITH CEDILLA */
-  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_E,
-    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, 0x1E1D, /* U1E1D	# LATIN SMALL LETTER E WITH CEDILLA AND BREVE */
-  IBUS_KEY_Multi_key, IBUS_KEY_e, IBUS_KEY_e, 0,
-    0, 0x018F, /* U018f */
-  IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x03D2, 0,
-    0, 0x03D3  /* U03D3	# GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
-};
-
-static const IBusComposeTable ibus_compose_table_pt_br = {
-    ibus_compose_seqs_pt_br,
-    4,
-    G_N_ELEMENTS (ibus_compose_seqs_pt_br) / (4 + 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 }
+    30,
+    6
 };
 
+IBusComposeTable* ibus_compose_table_new_with_file (const gchar *compose_file);
 #endif
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index db61e3e58..3158a7e0f 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,6 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -38,18 +39,10 @@
 #include <memory.h>
 #include <stdlib.h>
 
+#define X11_DATADIR "/usr/share/X11/locale"
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
-typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
-struct _IBusComposeTableCompact
-{
-    const guint16 *data;
-    gint max_seq_len;
-    gint n_index_size;
-    gint n_index_stride;
-};
-
 struct _IBusEngineSimplePrivate {
     GSList     *tables;
     guint       compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
@@ -60,24 +53,6 @@ struct _IBusEngineSimplePrivate {
     guint       modifiers_dropped : 1;
 };
 
-/* This file contains the table of the compose sequences,
- * static const guint16 ibus_compose_seqs_compact[] = {}
- * IT is generated from the compose-parse.py script.
- */
-#include "gtkimcontextsimpleseqs.h"
-
-/* From the values below, the value 30 means the number of different first keysyms
- * that exist in the Compose file (from Xorg). When running compose-parse.py without
- * parameters, you get the count that you can put here. Needed when updating the
- * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
- */
-static const IBusComposeTableCompact ibus_compose_table_compact = {
-    gtk_compose_seqs_compact,
-    5,
-    30,
-    6
-};
-
 static const guint16 ibus_compose_ignore[] = {
     IBUS_KEY_Shift_L,
     IBUS_KEY_Shift_R,
@@ -955,35 +930,58 @@ ibus_engine_simple_add_table (IBusEngineSimple *simple,
     table->n_seqs = n_seqs;
 
     priv->tables = g_slist_prepend (priv->tables, table);
-
 }
 
 gboolean
 ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
                                         const gchar      *locale)
 {
-    int i;
+    const gchar * const *langs = NULL;
+    const gchar * const *l = NULL;
+    gchar *path = NULL;
 
     if (locale == NULL) {
-#ifdef HAVE_LOCALE_H
-        locale = setlocale (LC_CTYPE, NULL);
-#endif
-        if (locale == NULL)
-            locale = "C";
+        langs = g_get_language_names ();
+        for (l = langs; *l; l++) {
+            if (g_str_has_prefix (*l, "en_US"))
+                break;
+            if (g_strcmp0 (*l, "C") == 0)
+                break;
+            path = g_build_filename (X11_DATADIR, *l, "Compose", NULL);
+            if (g_file_test (path, G_FILE_TEST_EXISTS))
+                break;
+            g_free (path);
+            path = NULL;
+        }
+    } else {
+        path = g_build_filename (X11_DATADIR, locale, "Compose", NULL);
+        do {
+            if (g_file_test (path, G_FILE_TEST_EXISTS))
+                break;
+            g_free (path);
+            path = NULL;
+        } while (0);
     }
 
-    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 (path == NULL)
+        return FALSE;
 
-        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 ibus_engine_simple_add_compose_file (simple, path);
+}
 
-    return FALSE;
+gboolean
+ibus_engine_simple_add_compose_file (IBusEngineSimple *simple,
+                                     const gchar      *compose_file)
+{
+    IBusEngineSimplePrivate *priv = simple->priv;
+    IBusComposeTable *table;
+
+    g_assert (compose_file != NULL);
+
+    table = ibus_compose_table_new_with_file (compose_file);
+    if (table == NULL)
+        return FALSE;
+
+    priv->tables = g_slist_prepend (priv->tables, table);
+    return TRUE;
 }
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 0c839d48a..f2bb4e19f 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -128,6 +128,19 @@ void             ibus_engine_simple_add_table   (IBusEngineSimple  *simple,
 gboolean         ibus_engine_simple_add_table_by_locale
                                                 (IBusEngineSimple  *simple,
                                                  const gchar       *locale);
+
+/**
+ * ibus_engine_simple_add_compose_file:
+ * @simple: An IBusEngineSimple.
+ * @file: The compose file. If the @file is %NULL,
+ *        the current locale is used.
+ * @returns: %TRUE if the @file is loaded.
+ *
+ * Call ibus_engine_simple_add_table() internally by locale.
+ */
+gboolean         ibus_engine_simple_add_compose_file
+                                                (IBusEngineSimple  *simple,
+                                                 const gchar       *file);
 G_END_DECLS
 
 #endif // __IBUS_ENGINE_SIMPLE_H__
diff --git a/src/keyname-table.h b/src/keyname-table.h
index 115435d31..5d1332263 100644
--- a/src/keyname-table.h
+++ b/src/keyname-table.h
@@ -1,8 +1,8 @@
 /* keyname-table.h: Generated by gen-keyname-table.pl from keynames.txt
  *
- *  Date: Thu Nov  2 17:26:30 2006
+ *  Date: Thu Oct 17 18:16:31 2013
  *
- * Do not edit.
+ * Do not edit.   
  */
 static const char keynames[] =
   "space\0"
@@ -150,8 +150,8 @@ static const char keynames[] =
   "Iacute\0"
   "Icircumflex\0"
   "Idiaeresis\0"
-  "ETH\0"
   "Eth\0"
+  "ETH\0"
   "Ntilde\0"
   "Ograve\0"
   "Oacute\0"
@@ -160,13 +160,14 @@ static const char keynames[] =
   "Odiaeresis\0"
   "multiply\0"
   "Ooblique\0"
+  "Oslash\0"
   "Ugrave\0"
   "Uacute\0"
   "Ucircumflex\0"
   "Udiaeresis\0"
   "Yacute\0"
-  "THORN\0"
   "Thorn\0"
+  "THORN\0"
   "ssharp\0"
   "agrave\0"
   "aacute\0"
@@ -192,6 +193,7 @@ static const char keynames[] =
   "otilde\0"
   "odiaeresis\0"
   "division\0"
+  "ooblique\0"
   "oslash\0"
   "ugrave\0"
   "uacute\0"
@@ -451,6 +453,7 @@ static const char keynames[] =
   "Serbian_nje\0"
   "Serbian_tshe\0"
   "Macedonia_kje\0"
+  "Ukrainian_ghe_with_upturn\0"
   "Byelorussian_shortu\0"
   "Cyrillic_dzhe\0"
   "Serbian_dze\0"
@@ -473,6 +476,7 @@ static const char keynames[] =
   "Serbian_NJE\0"
   "Serbian_TSHE\0"
   "Macedonia_KJE\0"
+  "Ukrainian_GHE_WITH_UPTURN\0"
   "Byelorussian_SHORTU\0"
   "Cyrillic_DZHE\0"
   "Serbian_DZE\0"
@@ -544,8 +548,8 @@ static const char keynames[] =
   "Greek_EPSILONaccent\0"
   "Greek_ETAaccent\0"
   "Greek_IOTAaccent\0"
-  "Greek_IOTAdieresis\0"
   "Greek_IOTAdiaeresis\0"
+  "Greek_IOTAdieresis\0"
   "Greek_OMICRONaccent\0"
   "Greek_UPSILONaccent\0"
   "Greek_UPSILONdieresis\0"
@@ -730,6 +734,7 @@ static const char keynames[] =
   "leftdoublequotemark\0"
   "rightdoublequotemark\0"
   "prescription\0"
+  "permille\0"
   "minutes\0"
   "seconds\0"
   "latincross\0"
@@ -1006,18 +1011,6 @@ static const char keynames[] =
   "OE\0"
   "oe\0"
   "Ydiaeresis\0"
-  "EcuSign\0"
-  "ColonSign\0"
-  "CruzeiroSign\0"
-  "FFrancSign\0"
-  "LiraSign\0"
-  "MillSign\0"
-  "NairaSign\0"
-  "PesetaSign\0"
-  "RupeeSign\0"
-  "WonSign\0"
-  "NewSheqelSign\0"
-  "DongSign\0"
   "EuroSign\0"
   "3270_Duplicate\0"
   "3270_FieldMark\0"
@@ -1064,6 +1057,9 @@ static const char keynames[] =
   "ISO_First_Group_Lock\0"
   "ISO_Last_Group\0"
   "ISO_Last_Group_Lock\0"
+  "ISO_Level5_Shift\0"
+  "ISO_Level5_Latch\0"
+  "ISO_Level5_Lock\0"
   "ISO_Left_Tab\0"
   "ISO_Move_Line_Up\0"
   "ISO_Move_Line_Down\0"
@@ -1088,6 +1084,7 @@ static const char keynames[] =
   "dead_grave\0"
   "dead_acute\0"
   "dead_circumflex\0"
+  "dead_perispomeni\0"
   "dead_tilde\0"
   "dead_macron\0"
   "dead_breve\0"
@@ -1104,6 +1101,21 @@ static const char keynames[] =
   "dead_belowdot\0"
   "dead_hook\0"
   "dead_horn\0"
+  "dead_stroke\0"
+  "dead_abovecomma\0"
+  "dead_psili\0"
+  "dead_abovereversedcomma\0"
+  "dead_dasia\0"
+  "dead_doublegrave\0"
+  "dead_belowring\0"
+  "dead_belowmacron\0"
+  "dead_belowcircumflex\0"
+  "dead_belowtilde\0"
+  "dead_belowbreve\0"
+  "dead_belowdiaeresis\0"
+  "dead_invertedbreve\0"
+  "dead_belowcomma\0"
+  "dead_currency\0"
   "AccessX_Enable\0"
   "AccessX_Feedback_Enable\0"
   "RepeatKeys_Enable\0"
@@ -1115,6 +1127,25 @@ static const char keynames[] =
   "Overlay1_Enable\0"
   "Overlay2_Enable\0"
   "AudibleBell_Enable\0"
+  "dead_a\0"
+  "dead_A\0"
+  "dead_e\0"
+  "dead_E\0"
+  "dead_i\0"
+  "dead_I\0"
+  "dead_o\0"
+  "dead_O\0"
+  "dead_u\0"
+  "dead_U\0"
+  "dead_small_schwa\0"
+  "dead_capital_schwa\0"
+  "dead_greek\0"
+  "ch\0"
+  "Ch\0"
+  "CH\0"
+  "c_h\0"
+  "C_h\0"
+  "C_H\0"
   "First_Virtual_Screen\0"
   "Prev_Virtual_Screen\0"
   "Next_Virtual_Screen\0"
@@ -1184,12 +1215,19 @@ static const char keynames[] =
   "Hangul_Jamo\0"
   "Hangul_Romaja\0"
   "Codeinput\0"
+  "Hangul_Codeinput\0"
+  "Kanji_Bangou\0"
   "Hangul_Jeonja\0"
   "Hangul_Banja\0"
   "Hangul_PreHanja\0"
   "Hangul_PostHanja\0"
+  "Hangul_SingleCandidate\0"
   "SingleCandidate\0"
+  "Hangul_MultipleCandidate\0"
   "MultipleCandidate\0"
+  "Zen_Koho\0"
+  "Hangul_PreviousCandidate\0"
+  "Mae_Koho\0"
   "PreviousCandidate\0"
   "Hangul_Special\0"
   "Home\0"
@@ -1219,8 +1257,8 @@ static const char keynames[] =
   "Hangul_switch\0"
   "Hebrew_switch\0"
   "ISO_Group_Shift\0"
-  "Mode_switch\0"
   "kana_switch\0"
+  "Mode_switch\0"
   "script_switch\0"
   "Num_Lock\0"
   "KP_Space\0"
@@ -1237,8 +1275,8 @@ static const char keynames[] =
   "KP_Down\0"
   "KP_Page_Up\0"
   "KP_Prior\0"
-  "KP_Page_Down\0"
   "KP_Next\0"
+  "KP_Page_Down\0"
   "KP_End\0"
   "KP_Begin\0"
   "KP_Insert\0"
@@ -1271,30 +1309,55 @@ static const char keynames[] =
   "F9\0"
   "F10\0"
   "F11\0"
+  "L1\0"
   "F12\0"
+  "L2\0"
   "F13\0"
+  "L3\0"
   "F14\0"
+  "L4\0"
   "F15\0"
+  "L5\0"
   "F16\0"
+  "L6\0"
   "F17\0"
+  "L7\0"
   "F18\0"
+  "L8\0"
   "F19\0"
+  "L9\0"
   "F20\0"
+  "L10\0"
   "F21\0"
+  "R1\0"
   "F22\0"
+  "R2\0"
   "F23\0"
+  "R3\0"
   "F24\0"
+  "R4\0"
   "F25\0"
+  "R5\0"
   "F26\0"
+  "R6\0"
   "F27\0"
+  "R7\0"
   "F28\0"
+  "R8\0"
   "F29\0"
+  "R9\0"
   "F30\0"
+  "R10\0"
   "F31\0"
+  "R11\0"
   "F32\0"
+  "R12\0"
   "F33\0"
+  "R13\0"
   "F34\0"
+  "R14\0"
   "F35\0"
+  "R15\0"
   "Shift_L\0"
   "Shift_R\0"
   "Control_L\0"
@@ -1309,7 +1372,908 @@ static const char keynames[] =
   "Super_R\0"
   "Hyper_L\0"
   "Hyper_R\0"
+  "braille_dot_1\0"
+  "braille_dot_2\0"
+  "braille_dot_3\0"
+  "braille_dot_4\0"
+  "braille_dot_5\0"
+  "braille_dot_6\0"
+  "braille_dot_7\0"
+  "braille_dot_8\0"
+  "braille_dot_9\0"
+  "braille_dot_10\0"
   "Delete\0"
+  "Ibreve\0"
+  "ibreve\0"
+  "Wcircumflex\0"
+  "wcircumflex\0"
+  "Ycircumflex\0"
+  "ycircumflex\0"
+  "SCHWA\0"
+  "Obarred\0"
+  "Ohorn\0"
+  "ohorn\0"
+  "Uhorn\0"
+  "uhorn\0"
+  "Zstroke\0"
+  "zstroke\0"
+  "EZH\0"
+  "Ocaron\0"
+  "ocaron\0"
+  "Gcaron\0"
+  "gcaron\0"
+  "schwa\0"
+  "obarred\0"
+  "ezh\0"
+  "Cyrillic_GHE_bar\0"
+  "Cyrillic_ghe_bar\0"
+  "Cyrillic_ZHE_descender\0"
+  "Cyrillic_zhe_descender\0"
+  "Cyrillic_KA_descender\0"
+  "Cyrillic_ka_descender\0"
+  "Cyrillic_KA_vertstroke\0"
+  "Cyrillic_ka_vertstroke\0"
+  "Cyrillic_EN_descender\0"
+  "Cyrillic_en_descender\0"
+  "Cyrillic_U_straight\0"
+  "Cyrillic_u_straight\0"
+  "Cyrillic_U_straight_bar\0"
+  "Cyrillic_u_straight_bar\0"
+  "Cyrillic_HA_descender\0"
+  "Cyrillic_ha_descender\0"
+  "Cyrillic_CHE_descender\0"
+  "Cyrillic_che_descender\0"
+  "Cyrillic_CHE_vertstroke\0"
+  "Cyrillic_che_vertstroke\0"
+  "Cyrillic_SHHA\0"
+  "Cyrillic_shha\0"
+  "Cyrillic_SCHWA\0"
+  "Cyrillic_schwa\0"
+  "Cyrillic_I_macron\0"
+  "Cyrillic_i_macron\0"
+  "Cyrillic_O_bar\0"
+  "Cyrillic_o_bar\0"
+  "Cyrillic_U_macron\0"
+  "Cyrillic_u_macron\0"
+  "Armenian_AYB\0"
+  "Armenian_BEN\0"
+  "Armenian_GIM\0"
+  "Armenian_DA\0"
+  "Armenian_YECH\0"
+  "Armenian_ZA\0"
+  "Armenian_E\0"
+  "Armenian_AT\0"
+  "Armenian_TO\0"
+  "Armenian_ZHE\0"
+  "Armenian_INI\0"
+  "Armenian_LYUN\0"
+  "Armenian_KHE\0"
+  "Armenian_TSA\0"
+  "Armenian_KEN\0"
+  "Armenian_HO\0"
+  "Armenian_DZA\0"
+  "Armenian_GHAT\0"
+  "Armenian_TCHE\0"
+  "Armenian_MEN\0"
+  "Armenian_HI\0"
+  "Armenian_NU\0"
+  "Armenian_SHA\0"
+  "Armenian_VO\0"
+  "Armenian_CHA\0"
+  "Armenian_PE\0"
+  "Armenian_JE\0"
+  "Armenian_RA\0"
+  "Armenian_SE\0"
+  "Armenian_VEV\0"
+  "Armenian_TYUN\0"
+  "Armenian_RE\0"
+  "Armenian_TSO\0"
+  "Armenian_VYUN\0"
+  "Armenian_PYUR\0"
+  "Armenian_KE\0"
+  "Armenian_O\0"
+  "Armenian_FE\0"
+  "Armenian_apostrophe\0"
+  "Armenian_accent\0"
+  "Armenian_shesht\0"
+  "Armenian_amanak\0"
+  "Armenian_exclam\0"
+  "Armenian_but\0"
+  "Armenian_separation_mark\0"
+  "Armenian_paruyk\0"
+  "Armenian_question\0"
+  "Armenian_ayb\0"
+  "Armenian_ben\0"
+  "Armenian_gim\0"
+  "Armenian_da\0"
+  "Armenian_yech\0"
+  "Armenian_za\0"
+  "Armenian_e\0"
+  "Armenian_at\0"
+  "Armenian_to\0"
+  "Armenian_zhe\0"
+  "Armenian_ini\0"
+  "Armenian_lyun\0"
+  "Armenian_khe\0"
+  "Armenian_tsa\0"
+  "Armenian_ken\0"
+  "Armenian_ho\0"
+  "Armenian_dza\0"
+  "Armenian_ghat\0"
+  "Armenian_tche\0"
+  "Armenian_men\0"
+  "Armenian_hi\0"
+  "Armenian_nu\0"
+  "Armenian_sha\0"
+  "Armenian_vo\0"
+  "Armenian_cha\0"
+  "Armenian_pe\0"
+  "Armenian_je\0"
+  "Armenian_ra\0"
+  "Armenian_se\0"
+  "Armenian_vev\0"
+  "Armenian_tyun\0"
+  "Armenian_re\0"
+  "Armenian_tso\0"
+  "Armenian_vyun\0"
+  "Armenian_pyur\0"
+  "Armenian_ke\0"
+  "Armenian_o\0"
+  "Armenian_fe\0"
+  "Armenian_ligature_ew\0"
+  "Armenian_full_stop\0"
+  "Armenian_verjaket\0"
+  "Armenian_hyphen\0"
+  "Armenian_yentamna\0"
+  "Arabic_madda_above\0"
+  "Arabic_hamza_above\0"
+  "Arabic_hamza_below\0"
+  "Arabic_0\0"
+  "Arabic_1\0"
+  "Arabic_2\0"
+  "Arabic_3\0"
+  "Arabic_4\0"
+  "Arabic_5\0"
+  "Arabic_6\0"
+  "Arabic_7\0"
+  "Arabic_8\0"
+  "Arabic_9\0"
+  "Arabic_percent\0"
+  "Arabic_superscript_alef\0"
+  "Arabic_tteh\0"
+  "Arabic_peh\0"
+  "Arabic_tcheh\0"
+  "Arabic_ddal\0"
+  "Arabic_rreh\0"
+  "Arabic_jeh\0"
+  "Arabic_veh\0"
+  "Arabic_keheh\0"
+  "Arabic_gaf\0"
+  "Arabic_noon_ghunna\0"
+  "Arabic_heh_doachashmee\0"
+  "Arabic_heh_goal\0"
+  "Arabic_farsi_yeh\0"
+  "Farsi_yeh\0"
+  "Arabic_yeh_baree\0"
+  "Arabic_fullstop\0"
+  "Farsi_0\0"
+  "Farsi_1\0"
+  "Farsi_2\0"
+  "Farsi_3\0"
+  "Farsi_4\0"
+  "Farsi_5\0"
+  "Farsi_6\0"
+  "Farsi_7\0"
+  "Farsi_8\0"
+  "Farsi_9\0"
+  "Sinh_ng\0"
+  "Sinh_h2\0"
+  "Sinh_a\0"
+  "Sinh_aa\0"
+  "Sinh_ae\0"
+  "Sinh_aee\0"
+  "Sinh_i\0"
+  "Sinh_ii\0"
+  "Sinh_u\0"
+  "Sinh_uu\0"
+  "Sinh_ri\0"
+  "Sinh_rii\0"
+  "Sinh_lu\0"
+  "Sinh_luu\0"
+  "Sinh_e\0"
+  "Sinh_ee\0"
+  "Sinh_ai\0"
+  "Sinh_o\0"
+  "Sinh_oo\0"
+  "Sinh_au\0"
+  "Sinh_ka\0"
+  "Sinh_kha\0"
+  "Sinh_ga\0"
+  "Sinh_gha\0"
+  "Sinh_ng2\0"
+  "Sinh_nga\0"
+  "Sinh_ca\0"
+  "Sinh_cha\0"
+  "Sinh_ja\0"
+  "Sinh_jha\0"
+  "Sinh_nya\0"
+  "Sinh_jnya\0"
+  "Sinh_nja\0"
+  "Sinh_tta\0"
+  "Sinh_ttha\0"
+  "Sinh_dda\0"
+  "Sinh_ddha\0"
+  "Sinh_nna\0"
+  "Sinh_ndda\0"
+  "Sinh_tha\0"
+  "Sinh_thha\0"
+  "Sinh_dha\0"
+  "Sinh_dhha\0"
+  "Sinh_na\0"
+  "Sinh_ndha\0"
+  "Sinh_pa\0"
+  "Sinh_pha\0"
+  "Sinh_ba\0"
+  "Sinh_bha\0"
+  "Sinh_ma\0"
+  "Sinh_mba\0"
+  "Sinh_ya\0"
+  "Sinh_ra\0"
+  "Sinh_la\0"
+  "Sinh_va\0"
+  "Sinh_sha\0"
+  "Sinh_ssha\0"
+  "Sinh_sa\0"
+  "Sinh_ha\0"
+  "Sinh_lla\0"
+  "Sinh_fa\0"
+  "Sinh_al\0"
+  "Sinh_aa2\0"
+  "Sinh_ae2\0"
+  "Sinh_aee2\0"
+  "Sinh_i2\0"
+  "Sinh_ii2\0"
+  "Sinh_u2\0"
+  "Sinh_uu2\0"
+  "Sinh_ru2\0"
+  "Sinh_e2\0"
+  "Sinh_ee2\0"
+  "Sinh_ai2\0"
+  "Sinh_o2\0"
+  "Sinh_oo2\0"
+  "Sinh_au2\0"
+  "Sinh_lu2\0"
+  "Sinh_ruu2\0"
+  "Sinh_luu2\0"
+  "Sinh_kunddaliya\0"
+  "Georgian_an\0"
+  "Georgian_ban\0"
+  "Georgian_gan\0"
+  "Georgian_don\0"
+  "Georgian_en\0"
+  "Georgian_vin\0"
+  "Georgian_zen\0"
+  "Georgian_tan\0"
+  "Georgian_in\0"
+  "Georgian_kan\0"
+  "Georgian_las\0"
+  "Georgian_man\0"
+  "Georgian_nar\0"
+  "Georgian_on\0"
+  "Georgian_par\0"
+  "Georgian_zhar\0"
+  "Georgian_rae\0"
+  "Georgian_san\0"
+  "Georgian_tar\0"
+  "Georgian_un\0"
+  "Georgian_phar\0"
+  "Georgian_khar\0"
+  "Georgian_ghan\0"
+  "Georgian_qar\0"
+  "Georgian_shin\0"
+  "Georgian_chin\0"
+  "Georgian_can\0"
+  "Georgian_jil\0"
+  "Georgian_cil\0"
+  "Georgian_char\0"
+  "Georgian_xan\0"
+  "Georgian_jhan\0"
+  "Georgian_hae\0"
+  "Georgian_he\0"
+  "Georgian_hie\0"
+  "Georgian_we\0"
+  "Georgian_har\0"
+  "Georgian_hoe\0"
+  "Georgian_fi\0"
+  "Babovedot\0"
+  "babovedot\0"
+  "Dabovedot\0"
+  "dabovedot\0"
+  "Fabovedot\0"
+  "fabovedot\0"
+  "Lbelowdot\0"
+  "lbelowdot\0"
+  "Mabovedot\0"
+  "mabovedot\0"
+  "Pabovedot\0"
+  "pabovedot\0"
+  "Sabovedot\0"
+  "sabovedot\0"
+  "Tabovedot\0"
+  "tabovedot\0"
+  "Wgrave\0"
+  "wgrave\0"
+  "Wacute\0"
+  "wacute\0"
+  "Wdiaeresis\0"
+  "wdiaeresis\0"
+  "Xabovedot\0"
+  "xabovedot\0"
+  "Abelowdot\0"
+  "abelowdot\0"
+  "Ahook\0"
+  "ahook\0"
+  "Acircumflexacute\0"
+  "acircumflexacute\0"
+  "Acircumflexgrave\0"
+  "acircumflexgrave\0"
+  "Acircumflexhook\0"
+  "acircumflexhook\0"
+  "Acircumflextilde\0"
+  "acircumflextilde\0"
+  "Acircumflexbelowdot\0"
+  "acircumflexbelowdot\0"
+  "Abreveacute\0"
+  "abreveacute\0"
+  "Abrevegrave\0"
+  "abrevegrave\0"
+  "Abrevehook\0"
+  "abrevehook\0"
+  "Abrevetilde\0"
+  "abrevetilde\0"
+  "Abrevebelowdot\0"
+  "abrevebelowdot\0"
+  "Ebelowdot\0"
+  "ebelowdot\0"
+  "Ehook\0"
+  "ehook\0"
+  "Etilde\0"
+  "etilde\0"
+  "Ecircumflexacute\0"
+  "ecircumflexacute\0"
+  "Ecircumflexgrave\0"
+  "ecircumflexgrave\0"
+  "Ecircumflexhook\0"
+  "ecircumflexhook\0"
+  "Ecircumflextilde\0"
+  "ecircumflextilde\0"
+  "Ecircumflexbelowdot\0"
+  "ecircumflexbelowdot\0"
+  "Ihook\0"
+  "ihook\0"
+  "Ibelowdot\0"
+  "ibelowdot\0"
+  "Obelowdot\0"
+  "obelowdot\0"
+  "Ohook\0"
+  "ohook\0"
+  "Ocircumflexacute\0"
+  "ocircumflexacute\0"
+  "Ocircumflexgrave\0"
+  "ocircumflexgrave\0"
+  "Ocircumflexhook\0"
+  "ocircumflexhook\0"
+  "Ocircumflextilde\0"
+  "ocircumflextilde\0"
+  "Ocircumflexbelowdot\0"
+  "ocircumflexbelowdot\0"
+  "Ohornacute\0"
+  "ohornacute\0"
+  "Ohorngrave\0"
+  "ohorngrave\0"
+  "Ohornhook\0"
+  "ohornhook\0"
+  "Ohorntilde\0"
+  "ohorntilde\0"
+  "Ohornbelowdot\0"
+  "ohornbelowdot\0"
+  "Ubelowdot\0"
+  "ubelowdot\0"
+  "Uhook\0"
+  "uhook\0"
+  "Uhornacute\0"
+  "uhornacute\0"
+  "Uhorngrave\0"
+  "uhorngrave\0"
+  "Uhornhook\0"
+  "uhornhook\0"
+  "Uhorntilde\0"
+  "uhorntilde\0"
+  "Uhornbelowdot\0"
+  "uhornbelowdot\0"
+  "Ygrave\0"
+  "ygrave\0"
+  "Ybelowdot\0"
+  "ybelowdot\0"
+  "Yhook\0"
+  "yhook\0"
+  "Ytilde\0"
+  "ytilde\0"
+  "zerosuperior\0"
+  "foursuperior\0"
+  "fivesuperior\0"
+  "sixsuperior\0"
+  "sevensuperior\0"
+  "eightsuperior\0"
+  "ninesuperior\0"
+  "zerosubscript\0"
+  "onesubscript\0"
+  "twosubscript\0"
+  "threesubscript\0"
+  "foursubscript\0"
+  "fivesubscript\0"
+  "sixsubscript\0"
+  "sevensubscript\0"
+  "eightsubscript\0"
+  "ninesubscript\0"
+  "EcuSign\0"
+  "ColonSign\0"
+  "CruzeiroSign\0"
+  "FFrancSign\0"
+  "LiraSign\0"
+  "MillSign\0"
+  "NairaSign\0"
+  "PesetaSign\0"
+  "RupeeSign\0"
+  "WonSign\0"
+  "NewSheqelSign\0"
+  "DongSign\0"
+  "partdifferential\0"
+  "emptyset\0"
+  "elementof\0"
+  "notelementof\0"
+  "containsas\0"
+  "squareroot\0"
+  "cuberoot\0"
+  "fourthroot\0"
+  "dintegral\0"
+  "tintegral\0"
+  "because\0"
+  "notapproxeq\0"
+  "approxeq\0"
+  "notidentical\0"
+  "stricteq\0"
+  "braille_blank\0"
+  "braille_dots_1\0"
+  "braille_dots_2\0"
+  "braille_dots_12\0"
+  "braille_dots_3\0"
+  "braille_dots_13\0"
+  "braille_dots_23\0"
+  "braille_dots_123\0"
+  "braille_dots_4\0"
+  "braille_dots_14\0"
+  "braille_dots_24\0"
+  "braille_dots_124\0"
+  "braille_dots_34\0"
+  "braille_dots_134\0"
+  "braille_dots_234\0"
+  "braille_dots_1234\0"
+  "braille_dots_5\0"
+  "braille_dots_15\0"
+  "braille_dots_25\0"
+  "braille_dots_125\0"
+  "braille_dots_35\0"
+  "braille_dots_135\0"
+  "braille_dots_235\0"
+  "braille_dots_1235\0"
+  "braille_dots_45\0"
+  "braille_dots_145\0"
+  "braille_dots_245\0"
+  "braille_dots_1245\0"
+  "braille_dots_345\0"
+  "braille_dots_1345\0"
+  "braille_dots_2345\0"
+  "braille_dots_12345\0"
+  "braille_dots_6\0"
+  "braille_dots_16\0"
+  "braille_dots_26\0"
+  "braille_dots_126\0"
+  "braille_dots_36\0"
+  "braille_dots_136\0"
+  "braille_dots_236\0"
+  "braille_dots_1236\0"
+  "braille_dots_46\0"
+  "braille_dots_146\0"
+  "braille_dots_246\0"
+  "braille_dots_1246\0"
+  "braille_dots_346\0"
+  "braille_dots_1346\0"
+  "braille_dots_2346\0"
+  "braille_dots_12346\0"
+  "braille_dots_56\0"
+  "braille_dots_156\0"
+  "braille_dots_256\0"
+  "braille_dots_1256\0"
+  "braille_dots_356\0"
+  "braille_dots_1356\0"
+  "braille_dots_2356\0"
+  "braille_dots_12356\0"
+  "braille_dots_456\0"
+  "braille_dots_1456\0"
+  "braille_dots_2456\0"
+  "braille_dots_12456\0"
+  "braille_dots_3456\0"
+  "braille_dots_13456\0"
+  "braille_dots_23456\0"
+  "braille_dots_123456\0"
+  "braille_dots_7\0"
+  "braille_dots_17\0"
+  "braille_dots_27\0"
+  "braille_dots_127\0"
+  "braille_dots_37\0"
+  "braille_dots_137\0"
+  "braille_dots_237\0"
+  "braille_dots_1237\0"
+  "braille_dots_47\0"
+  "braille_dots_147\0"
+  "braille_dots_247\0"
+  "braille_dots_1247\0"
+  "braille_dots_347\0"
+  "braille_dots_1347\0"
+  "braille_dots_2347\0"
+  "braille_dots_12347\0"
+  "braille_dots_57\0"
+  "braille_dots_157\0"
+  "braille_dots_257\0"
+  "braille_dots_1257\0"
+  "braille_dots_357\0"
+  "braille_dots_1357\0"
+  "braille_dots_2357\0"
+  "braille_dots_12357\0"
+  "braille_dots_457\0"
+  "braille_dots_1457\0"
+  "braille_dots_2457\0"
+  "braille_dots_12457\0"
+  "braille_dots_3457\0"
+  "braille_dots_13457\0"
+  "braille_dots_23457\0"
+  "braille_dots_123457\0"
+  "braille_dots_67\0"
+  "braille_dots_167\0"
+  "braille_dots_267\0"
+  "braille_dots_1267\0"
+  "braille_dots_367\0"
+  "braille_dots_1367\0"
+  "braille_dots_2367\0"
+  "braille_dots_12367\0"
+  "braille_dots_467\0"
+  "braille_dots_1467\0"
+  "braille_dots_2467\0"
+  "braille_dots_12467\0"
+  "braille_dots_3467\0"
+  "braille_dots_13467\0"
+  "braille_dots_23467\0"
+  "braille_dots_123467\0"
+  "braille_dots_567\0"
+  "braille_dots_1567\0"
+  "braille_dots_2567\0"
+  "braille_dots_12567\0"
+  "braille_dots_3567\0"
+  "braille_dots_13567\0"
+  "braille_dots_23567\0"
+  "braille_dots_123567\0"
+  "braille_dots_4567\0"
+  "braille_dots_14567\0"
+  "braille_dots_24567\0"
+  "braille_dots_124567\0"
+  "braille_dots_34567\0"
+  "braille_dots_134567\0"
+  "braille_dots_234567\0"
+  "braille_dots_1234567\0"
+  "braille_dots_8\0"
+  "braille_dots_18\0"
+  "braille_dots_28\0"
+  "braille_dots_128\0"
+  "braille_dots_38\0"
+  "braille_dots_138\0"
+  "braille_dots_238\0"
+  "braille_dots_1238\0"
+  "braille_dots_48\0"
+  "braille_dots_148\0"
+  "braille_dots_248\0"
+  "braille_dots_1248\0"
+  "braille_dots_348\0"
+  "braille_dots_1348\0"
+  "braille_dots_2348\0"
+  "braille_dots_12348\0"
+  "braille_dots_58\0"
+  "braille_dots_158\0"
+  "braille_dots_258\0"
+  "braille_dots_1258\0"
+  "braille_dots_358\0"
+  "braille_dots_1358\0"
+  "braille_dots_2358\0"
+  "braille_dots_12358\0"
+  "braille_dots_458\0"
+  "braille_dots_1458\0"
+  "braille_dots_2458\0"
+  "braille_dots_12458\0"
+  "braille_dots_3458\0"
+  "braille_dots_13458\0"
+  "braille_dots_23458\0"
+  "braille_dots_123458\0"
+  "braille_dots_68\0"
+  "braille_dots_168\0"
+  "braille_dots_268\0"
+  "braille_dots_1268\0"
+  "braille_dots_368\0"
+  "braille_dots_1368\0"
+  "braille_dots_2368\0"
+  "braille_dots_12368\0"
+  "braille_dots_468\0"
+  "braille_dots_1468\0"
+  "braille_dots_2468\0"
+  "braille_dots_12468\0"
+  "braille_dots_3468\0"
+  "braille_dots_13468\0"
+  "braille_dots_23468\0"
+  "braille_dots_123468\0"
+  "braille_dots_568\0"
+  "braille_dots_1568\0"
+  "braille_dots_2568\0"
+  "braille_dots_12568\0"
+  "braille_dots_3568\0"
+  "braille_dots_13568\0"
+  "braille_dots_23568\0"
+  "braille_dots_123568\0"
+  "braille_dots_4568\0"
+  "braille_dots_14568\0"
+  "braille_dots_24568\0"
+  "braille_dots_124568\0"
+  "braille_dots_34568\0"
+  "braille_dots_134568\0"
+  "braille_dots_234568\0"
+  "braille_dots_1234568\0"
+  "braille_dots_78\0"
+  "braille_dots_178\0"
+  "braille_dots_278\0"
+  "braille_dots_1278\0"
+  "braille_dots_378\0"
+  "braille_dots_1378\0"
+  "braille_dots_2378\0"
+  "braille_dots_12378\0"
+  "braille_dots_478\0"
+  "braille_dots_1478\0"
+  "braille_dots_2478\0"
+  "braille_dots_12478\0"
+  "braille_dots_3478\0"
+  "braille_dots_13478\0"
+  "braille_dots_23478\0"
+  "braille_dots_123478\0"
+  "braille_dots_578\0"
+  "braille_dots_1578\0"
+  "braille_dots_2578\0"
+  "braille_dots_12578\0"
+  "braille_dots_3578\0"
+  "braille_dots_13578\0"
+  "braille_dots_23578\0"
+  "braille_dots_123578\0"
+  "braille_dots_4578\0"
+  "braille_dots_14578\0"
+  "braille_dots_24578\0"
+  "braille_dots_124578\0"
+  "braille_dots_34578\0"
+  "braille_dots_134578\0"
+  "braille_dots_234578\0"
+  "braille_dots_1234578\0"
+  "braille_dots_678\0"
+  "braille_dots_1678\0"
+  "braille_dots_2678\0"
+  "braille_dots_12678\0"
+  "braille_dots_3678\0"
+  "braille_dots_13678\0"
+  "braille_dots_23678\0"
+  "braille_dots_123678\0"
+  "braille_dots_4678\0"
+  "braille_dots_14678\0"
+  "braille_dots_24678\0"
+  "braille_dots_124678\0"
+  "braille_dots_34678\0"
+  "braille_dots_134678\0"
+  "braille_dots_234678\0"
+  "braille_dots_1234678\0"
+  "braille_dots_5678\0"
+  "braille_dots_15678\0"
+  "braille_dots_25678\0"
+  "braille_dots_125678\0"
+  "braille_dots_35678\0"
+  "braille_dots_135678\0"
+  "braille_dots_235678\0"
+  "braille_dots_1235678\0"
+  "braille_dots_45678\0"
+  "braille_dots_145678\0"
+  "braille_dots_245678\0"
+  "braille_dots_1245678\0"
+  "braille_dots_345678\0"
+  "braille_dots_1345678\0"
+  "braille_dots_2345678\0"
+  "braille_dots_12345678\0"
+  "Switch_VT_1\0"
+  "Switch_VT_2\0"
+  "Switch_VT_3\0"
+  "Switch_VT_4\0"
+  "Switch_VT_5\0"
+  "Switch_VT_6\0"
+  "Switch_VT_7\0"
+  "Switch_VT_8\0"
+  "Switch_VT_9\0"
+  "Switch_VT_10\0"
+  "Switch_VT_11\0"
+  "Switch_VT_12\0"
+  "Ungrab\0"
+  "ClearGrab\0"
+  "Next_VMode\0"
+  "Prev_VMode\0"
+  "LogWindowTree\0"
+  "LogGrabInfo\0"
+  "ModeLock\0"
+  "MonBrightnessUp\0"
+  "MonBrightnessDown\0"
+  "KbdLightOnOff\0"
+  "KbdBrightnessUp\0"
+  "KbdBrightnessDown\0"
+  "Standby\0"
+  "AudioLowerVolume\0"
+  "AudioMute\0"
+  "AudioRaiseVolume\0"
+  "AudioPlay\0"
+  "AudioStop\0"
+  "AudioPrev\0"
+  "AudioNext\0"
+  "HomePage\0"
+  "Mail\0"
+  "Start\0"
+  "Search\0"
+  "AudioRecord\0"
+  "Calculator\0"
+  "Memo\0"
+  "ToDoList\0"
+  "Calendar\0"
+  "PowerDown\0"
+  "ContrastAdjust\0"
+  "RockerUp\0"
+  "RockerDown\0"
+  "RockerEnter\0"
+  "Back\0"
+  "Forward\0"
+  "Stop\0"
+  "Refresh\0"
+  "PowerOff\0"
+  "WakeUp\0"
+  "Eject\0"
+  "ScreenSaver\0"
+  "WWW\0"
+  "Sleep\0"
+  "Favorites\0"
+  "AudioPause\0"
+  "AudioMedia\0"
+  "MyComputer\0"
+  "VendorHome\0"
+  "LightBulb\0"
+  "Shop\0"
+  "History\0"
+  "OpenURL\0"
+  "AddFavorite\0"
+  "HotLinks\0"
+  "BrightnessAdjust\0"
+  "Finance\0"
+  "Community\0"
+  "AudioRewind\0"
+  "BackForward\0"
+  "Launch0\0"
+  "Launch1\0"
+  "Launch2\0"
+  "Launch3\0"
+  "Launch4\0"
+  "Launch5\0"
+  "Launch6\0"
+  "Launch7\0"
+  "Launch8\0"
+  "Launch9\0"
+  "LaunchA\0"
+  "LaunchB\0"
+  "LaunchC\0"
+  "LaunchD\0"
+  "LaunchE\0"
+  "LaunchF\0"
+  "ApplicationLeft\0"
+  "ApplicationRight\0"
+  "Book\0"
+  "CD\0"
+  "WindowClear\0"
+  "Close\0"
+  "Copy\0"
+  "Cut\0"
+  "Display\0"
+  "DOS\0"
+  "Documents\0"
+  "Excel\0"
+  "Explorer\0"
+  "Game\0"
+  "Go\0"
+  "iTouch\0"
+  "LogOff\0"
+  "Market\0"
+  "Meeting\0"
+  "MenuKB\0"
+  "MenuPB\0"
+  "MySites\0"
+  "New\0"
+  "News\0"
+  "OfficeHome\0"
+  "Open\0"
+  "Option\0"
+  "Paste\0"
+  "Phone\0"
+  "Reply\0"
+  "Reload\0"
+  "RotateWindows\0"
+  "RotationPB\0"
+  "RotationKB\0"
+  "Save\0"
+  "ScrollUp\0"
+  "ScrollDown\0"
+  "ScrollClick\0"
+  "Send\0"
+  "Spell\0"
+  "SplitScreen\0"
+  "Support\0"
+  "TaskPane\0"
+  "Terminal\0"
+  "Tools\0"
+  "Travel\0"
+  "UserPB\0"
+  "User1KB\0"
+  "User2KB\0"
+  "Video\0"
+  "WheelButton\0"
+  "Word\0"
+  "Xfer\0"
+  "ZoomIn\0"
+  "ZoomOut\0"
+  "Away\0"
+  "Messenger\0"
+  "WebCam\0"
+  "MailForward\0"
+  "Pictures\0"
+  "Music\0"
+  "Battery\0"
+  "Bluetooth\0"
+  "WLAN\0"
+  "UWB\0"
+  "AudioForward\0"
+  "AudioRepeat\0"
+  "AudioRandomPlay\0"
+  "Subtitle\0"
+  "AudioCycleTrack\0"
+  "CycleAngle\0"
+  "FrameBack\0"
+  "FrameForward\0"
+  "Time\0"
+  "SelectButton\0"
+  "View\0"
+  "TopMenu\0"
+  "Red\0"
+  "Green\0"
+  "Yellow\0"
+  "Blue\0"
+  "Suspend\0"
+  "Hibernate\0"
+  "TouchpadToggle\0"
+  "TouchpadOn\0"
+  "TouchpadOff\0"
+  "AudioMicMute\0"
   "VoidSymbol\0";
 
 typedef struct {
@@ -1473,1157 +2437,2121 @@ static const gdk_key gdk_keys_by_keyval[] = {
   { 0x0000d6, 921 },
   { 0x0000d7, 932 },
   { 0x0000d8, 941 },
-  { 0x0000d9, 950 },
-  { 0x0000da, 957 },
-  { 0x0000db, 964 },
-  { 0x0000dc, 976 },
-  { 0x0000dd, 987 },
-  { 0x0000de, 994 },
-  { 0x0000de, 1000 },
-  { 0x0000df, 1006 },
-  { 0x0000e0, 1013 },
-  { 0x0000e1, 1020 },
-  { 0x0000e2, 1027 },
-  { 0x0000e3, 1039 },
-  { 0x0000e4, 1046 },
-  { 0x0000e5, 1057 },
-  { 0x0000e6, 1063 },
-  { 0x0000e7, 1066 },
-  { 0x0000e8, 1075 },
-  { 0x0000e9, 1082 },
-  { 0x0000ea, 1089 },
-  { 0x0000eb, 1101 },
-  { 0x0000ec, 1112 },
-  { 0x0000ed, 1119 },
-  { 0x0000ee, 1126 },
-  { 0x0000ef, 1138 },
-  { 0x0000f0, 1149 },
-  { 0x0000f1, 1153 },
-  { 0x0000f2, 1160 },
-  { 0x0000f3, 1167 },
-  { 0x0000f4, 1174 },
-  { 0x0000f5, 1186 },
-  { 0x0000f6, 1193 },
-  { 0x0000f7, 1204 },
-  { 0x0000f8, 1213 },
-  { 0x0000f9, 1220 },
-  { 0x0000fa, 1227 },
-  { 0x0000fb, 1234 },
-  { 0x0000fc, 1246 },
-  { 0x0000fd, 1257 },
-  { 0x0000fe, 1264 },
-  { 0x0000ff, 1270 },
-  { 0x0001a1, 1281 },
-  { 0x0001a2, 1289 },
-  { 0x0001a3, 1295 },
-  { 0x0001a5, 1303 },
-  { 0x0001a6, 1310 },
-  { 0x0001a9, 1317 },
-  { 0x0001aa, 1324 },
-  { 0x0001ab, 1333 },
-  { 0x0001ac, 1340 },
-  { 0x0001ae, 1347 },
-  { 0x0001af, 1354 },
-  { 0x0001b1, 1364 },
-  { 0x0001b2, 1372 },
-  { 0x0001b3, 1379 },
-  { 0x0001b5, 1387 },
-  { 0x0001b6, 1394 },
-  { 0x0001b7, 1401 },
-  { 0x0001b9, 1407 },
-  { 0x0001ba, 1414 },
-  { 0x0001bb, 1423 },
-  { 0x0001bc, 1430 },
-  { 0x0001bd, 1437 },
-  { 0x0001be, 1449 },
-  { 0x0001bf, 1456 },
-  { 0x0001c0, 1466 },
-  { 0x0001c3, 1473 },
-  { 0x0001c5, 1480 },
-  { 0x0001c6, 1487 },
-  { 0x0001c8, 1494 },
-  { 0x0001ca, 1501 },
-  { 0x0001cc, 1509 },
-  { 0x0001cf, 1516 },
-  { 0x0001d0, 1523 },
-  { 0x0001d1, 1531 },
-  { 0x0001d2, 1538 },
-  { 0x0001d5, 1545 },
-  { 0x0001d8, 1558 },
-  { 0x0001d9, 1565 },
-  { 0x0001db, 1571 },
-  { 0x0001de, 1584 },
-  { 0x0001e0, 1593 },
-  { 0x0001e3, 1600 },
-  { 0x0001e5, 1607 },
-  { 0x0001e6, 1614 },
-  { 0x0001e8, 1621 },
-  { 0x0001ea, 1628 },
-  { 0x0001ec, 1636 },
-  { 0x0001ef, 1643 },
-  { 0x0001f0, 1650 },
-  { 0x0001f1, 1658 },
-  { 0x0001f2, 1665 },
-  { 0x0001f5, 1672 },
-  { 0x0001f8, 1685 },
-  { 0x0001f9, 1692 },
-  { 0x0001fb, 1698 },
-  { 0x0001fe, 1711 },
-  { 0x0001ff, 1720 },
-  { 0x0002a1, 1729 },
-  { 0x0002a6, 1737 },
-  { 0x0002a9, 1749 },
-  { 0x0002ab, 1759 },
-  { 0x0002ac, 1766 },
-  { 0x0002b1, 1778 },
-  { 0x0002b6, 1786 },
-  { 0x0002b9, 1798 },
-  { 0x0002bb, 1807 },
-  { 0x0002bc, 1814 },
-  { 0x0002c5, 1826 },
-  { 0x0002c6, 1836 },
-  { 0x0002d5, 1848 },
-  { 0x0002d8, 1858 },
-  { 0x0002dd, 1870 },
-  { 0x0002de, 1877 },
-  { 0x0002e5, 1889 },
-  { 0x0002e6, 1899 },
-  { 0x0002f5, 1911 },
-  { 0x0002f8, 1921 },
-  { 0x0002fd, 1933 },
-  { 0x0002fe, 1940 },
-  { 0x0003a2, 1952 },
-  { 0x0003a2, 1958 },
-  { 0x0003a3, 1962 },
-  { 0x0003a5, 1971 },
-  { 0x0003a6, 1978 },
-  { 0x0003aa, 1987 },
-  { 0x0003ab, 1995 },
-  { 0x0003ac, 2004 },
-  { 0x0003b3, 2011 },
-  { 0x0003b5, 2020 },
-  { 0x0003b6, 2027 },
-  { 0x0003ba, 2036 },
-  { 0x0003bb, 2044 },
-  { 0x0003bc, 2053 },
-  { 0x0003bd, 2060 },
-  { 0x0003bf, 2064 },
-  { 0x0003c0, 2068 },
-  { 0x0003c7, 2076 },
-  { 0x0003cc, 2084 },
-  { 0x0003cf, 2094 },
-  { 0x0003d1, 2102 },
-  { 0x0003d2, 2111 },
-  { 0x0003d3, 2119 },
-  { 0x0003d9, 2128 },
-  { 0x0003dd, 2136 },
-  { 0x0003de, 2143 },
-  { 0x0003e0, 2151 },
-  { 0x0003e7, 2159 },
-  { 0x0003ec, 2167 },
-  { 0x0003ef, 2177 },
-  { 0x0003f1, 2185 },
-  { 0x0003f2, 2194 },
-  { 0x0003f3, 2202 },
-  { 0x0003f9, 2211 },
-  { 0x0003fd, 2219 },
-  { 0x0003fe, 2226 },
-  { 0x00047e, 2234 },
-  { 0x0004a1, 2243 },
-  { 0x0004a2, 2257 },
-  { 0x0004a3, 2277 },
-  { 0x0004a4, 2297 },
-  { 0x0004a5, 2308 },
-  { 0x0004a5, 2325 },
-  { 0x0004a6, 2340 },
-  { 0x0004a7, 2348 },
-  { 0x0004a8, 2355 },
-  { 0x0004a9, 2362 },
-  { 0x0004aa, 2369 },
-  { 0x0004ab, 2376 },
-  { 0x0004ac, 2383 },
-  { 0x0004ad, 2391 },
-  { 0x0004ae, 2399 },
-  { 0x0004af, 2407 },
-  { 0x0004af, 2416 },
-  { 0x0004b0, 2424 },
-  { 0x0004b1, 2439 },
-  { 0x0004b2, 2446 },
-  { 0x0004b3, 2453 },
-  { 0x0004b4, 2460 },
-  { 0x0004b5, 2467 },
-  { 0x0004b6, 2474 },
-  { 0x0004b7, 2482 },
-  { 0x0004b8, 2490 },
-  { 0x0004b9, 2498 },
-  { 0x0004ba, 2506 },
-  { 0x0004bb, 2514 },
-  { 0x0004bc, 2522 },
-  { 0x0004bd, 2531 },
-  { 0x0004be, 2539 },
-  { 0x0004bf, 2547 },
-  { 0x0004c0, 2555 },
-  { 0x0004c1, 2563 },
-  { 0x0004c1, 2572 },
-  { 0x0004c2, 2580 },
-  { 0x0004c2, 2589 },
-  { 0x0004c3, 2597 },
-  { 0x0004c4, 2605 },
-  { 0x0004c5, 2613 },
-  { 0x0004c6, 2621 },
-  { 0x0004c7, 2629 },
-  { 0x0004c8, 2637 },
-  { 0x0004c9, 2645 },
-  { 0x0004ca, 2653 },
-  { 0x0004cb, 2661 },
-  { 0x0004cc, 2669 },
-  { 0x0004cc, 2677 },
-  { 0x0004cd, 2685 },
-  { 0x0004ce, 2693 },
-  { 0x0004cf, 2701 },
-  { 0x0004d0, 2709 },
-  { 0x0004d1, 2717 },
-  { 0x0004d2, 2725 },
-  { 0x0004d3, 2733 },
-  { 0x0004d4, 2741 },
-  { 0x0004d5, 2749 },
-  { 0x0004d6, 2757 },
-  { 0x0004d7, 2765 },
-  { 0x0004d8, 2773 },
-  { 0x0004d9, 2781 },
-  { 0x0004da, 2789 },
-  { 0x0004db, 2797 },
-  { 0x0004dc, 2805 },
-  { 0x0004dd, 2813 },
-  { 0x0004de, 2820 },
-  { 0x0004df, 2832 },
-  { 0x0005ac, 2848 },
-  { 0x0005bb, 2861 },
-  { 0x0005bf, 2878 },
-  { 0x0005c1, 2899 },
-  { 0x0005c2, 2912 },
-  { 0x0005c3, 2931 },
-  { 0x0005c4, 2950 },
-  { 0x0005c5, 2968 },
-  { 0x0005c6, 2990 },
-  { 0x0005c7, 3008 },
-  { 0x0005c8, 3020 },
-  { 0x0005c9, 3031 },
-  { 0x0005ca, 3049 },
-  { 0x0005cb, 3060 },
-  { 0x0005cc, 3072 },
-  { 0x0005cd, 3084 },
-  { 0x0005ce, 3095 },
-  { 0x0005cf, 3107 },
-  { 0x0005d0, 3118 },
-  { 0x0005d1, 3130 },
-  { 0x0005d2, 3140 },
-  { 0x0005d3, 3152 },
-  { 0x0005d4, 3164 },
-  { 0x0005d5, 3177 },
-  { 0x0005d6, 3188 },
-  { 0x0005d7, 3199 },
-  { 0x0005d8, 3210 },
-  { 0x0005d9, 3221 },
-  { 0x0005da, 3232 },
-  { 0x0005e0, 3245 },
-  { 0x0005e1, 3260 },
-  { 0x0005e2, 3271 },
-  { 0x0005e3, 3282 },
-  { 0x0005e4, 3293 },
-  { 0x0005e5, 3304 },
-  { 0x0005e6, 3316 },
-  { 0x0005e7, 3328 },
-  { 0x0005e7, 3338 },
-  { 0x0005e8, 3349 },
-  { 0x0005e9, 3360 },
-  { 0x0005ea, 3379 },
-  { 0x0005eb, 3390 },
-  { 0x0005ec, 3406 },
-  { 0x0005ed, 3422 },
-  { 0x0005ee, 3438 },
-  { 0x0005ef, 3451 },
-  { 0x0005f0, 3464 },
-  { 0x0005f1, 3477 },
-  { 0x0005f2, 3491 },
-  { 0x0006a1, 3504 },
-  { 0x0006a2, 3516 },
-  { 0x0006a3, 3530 },
-  { 0x0006a4, 3542 },
-  { 0x0006a4, 3555 },
-  { 0x0006a5, 3567 },
-  { 0x0006a6, 3581 },
-  { 0x0006a6, 3593 },
-  { 0x0006a7, 3604 },
-  { 0x0006a7, 3617 },
-  { 0x0006a8, 3629 },
-  { 0x0006a8, 3641 },
-  { 0x0006a9, 3652 },
-  { 0x0006a9, 3665 },
-  { 0x0006aa, 3677 },
-  { 0x0006aa, 3690 },
-  { 0x0006ab, 3702 },
-  { 0x0006ac, 3715 },
-  { 0x0006ae, 3729 },
-  { 0x0006af, 3749 },
-  { 0x0006af, 3763 },
-  { 0x0006b0, 3775 },
-  { 0x0006b1, 3786 },
-  { 0x0006b2, 3798 },
-  { 0x0006b3, 3812 },
-  { 0x0006b4, 3824 },
-  { 0x0006b4, 3837 },
-  { 0x0006b5, 3849 },
-  { 0x0006b6, 3863 },
-  { 0x0006b6, 3875 },
-  { 0x0006b7, 3886 },
-  { 0x0006b7, 3899 },
-  { 0x0006b8, 3911 },
-  { 0x0006b8, 3923 },
-  { 0x0006b9, 3934 },
-  { 0x0006b9, 3947 },
-  { 0x0006ba, 3959 },
-  { 0x0006ba, 3972 },
-  { 0x0006bb, 3984 },
-  { 0x0006bc, 3997 },
-  { 0x0006be, 4011 },
-  { 0x0006bf, 4031 },
-  { 0x0006bf, 4045 },
-  { 0x0006c0, 4057 },
-  { 0x0006c1, 4069 },
-  { 0x0006c2, 4080 },
-  { 0x0006c3, 4092 },
-  { 0x0006c4, 4105 },
-  { 0x0006c5, 4117 },
-  { 0x0006c6, 4129 },
-  { 0x0006c7, 4141 },
-  { 0x0006c8, 4154 },
-  { 0x0006c9, 4166 },
-  { 0x0006ca, 4177 },
-  { 0x0006cb, 4193 },
-  { 0x0006cc, 4205 },
-  { 0x0006cd, 4217 },
-  { 0x0006ce, 4229 },
-  { 0x0006cf, 4241 },
-  { 0x0006d0, 4252 },
-  { 0x0006d1, 4264 },
-  { 0x0006d2, 4276 },
-  { 0x0006d3, 4288 },
-  { 0x0006d4, 4300 },
-  { 0x0006d5, 4312 },
-  { 0x0006d6, 4323 },
-  { 0x0006d7, 4336 },
-  { 0x0006d8, 4348 },
-  { 0x0006d9, 4366 },
-  { 0x0006da, 4380 },
-  { 0x0006db, 4392 },
-  { 0x0006dc, 4405 },
-  { 0x0006dd, 4416 },
-  { 0x0006de, 4431 },
-  { 0x0006df, 4444 },
-  { 0x0006e0, 4462 },
-  { 0x0006e1, 4474 },
-  { 0x0006e2, 4485 },
-  { 0x0006e3, 4497 },
-  { 0x0006e4, 4510 },
-  { 0x0006e5, 4522 },
-  { 0x0006e6, 4534 },
-  { 0x0006e7, 4546 },
-  { 0x0006e8, 4559 },
-  { 0x0006e9, 4571 },
-  { 0x0006ea, 4582 },
-  { 0x0006eb, 4598 },
-  { 0x0006ec, 4610 },
-  { 0x0006ed, 4622 },
-  { 0x0006ee, 4634 },
-  { 0x0006ef, 4646 },
-  { 0x0006f0, 4657 },
-  { 0x0006f1, 4669 },
-  { 0x0006f2, 4681 },
-  { 0x0006f3, 4693 },
-  { 0x0006f4, 4705 },
-  { 0x0006f5, 4717 },
-  { 0x0006f6, 4728 },
-  { 0x0006f7, 4741 },
-  { 0x0006f8, 4753 },
-  { 0x0006f9, 4771 },
-  { 0x0006fa, 4785 },
-  { 0x0006fb, 4797 },
-  { 0x0006fc, 4810 },
-  { 0x0006fd, 4821 },
-  { 0x0006fe, 4836 },
-  { 0x0006ff, 4849 },
-  { 0x0007a1, 4867 },
-  { 0x0007a2, 4885 },
-  { 0x0007a3, 4905 },
-  { 0x0007a4, 4921 },
-  { 0x0007a5, 4938 },
-  { 0x0007a5, 4957 },
-  { 0x0007a7, 4977 },
-  { 0x0007a8, 4997 },
-  { 0x0007a9, 5017 },
-  { 0x0007ab, 5039 },
-  { 0x0007ae, 5057 },
-  { 0x0007af, 5078 },
-  { 0x0007b1, 5093 },
-  { 0x0007b2, 5111 },
-  { 0x0007b3, 5131 },
-  { 0x0007b4, 5147 },
-  { 0x0007b5, 5164 },
-  { 0x0007b6, 5183 },
-  { 0x0007b7, 5208 },
-  { 0x0007b8, 5228 },
-  { 0x0007b9, 5248 },
-  { 0x0007ba, 5270 },
-  { 0x0007bb, 5298 },
-  { 0x0007c1, 5316 },
-  { 0x0007c2, 5328 },
-  { 0x0007c3, 5339 },
-  { 0x0007c4, 5351 },
-  { 0x0007c5, 5363 },
-  { 0x0007c6, 5377 },
-  { 0x0007c7, 5388 },
-  { 0x0007c8, 5398 },
-  { 0x0007c9, 5410 },
-  { 0x0007ca, 5421 },
-  { 0x0007cb, 5433 },
-  { 0x0007cb, 5446 },
-  { 0x0007cc, 5458 },
-  { 0x0007cd, 5467 },
-  { 0x0007ce, 5476 },
-  { 0x0007cf, 5485 },
-  { 0x0007d0, 5499 },
-  { 0x0007d1, 5508 },
-  { 0x0007d2, 5518 },
-  { 0x0007d4, 5530 },
-  { 0x0007d5, 5540 },
-  { 0x0007d6, 5554 },
-  { 0x0007d7, 5564 },
-  { 0x0007d8, 5574 },
-  { 0x0007d9, 5584 },
-  { 0x0007e1, 5596 },
-  { 0x0007e2, 5608 },
-  { 0x0007e3, 5619 },
-  { 0x0007e4, 5631 },
-  { 0x0007e5, 5643 },
-  { 0x0007e6, 5657 },
-  { 0x0007e7, 5668 },
-  { 0x0007e8, 5678 },
-  { 0x0007e9, 5690 },
-  { 0x0007ea, 5701 },
-  { 0x0007eb, 5713 },
-  { 0x0007eb, 5726 },
-  { 0x0007ec, 5738 },
-  { 0x0007ed, 5747 },
-  { 0x0007ee, 5756 },
-  { 0x0007ef, 5765 },
-  { 0x0007f0, 5779 },
-  { 0x0007f1, 5788 },
-  { 0x0007f2, 5798 },
-  { 0x0007f3, 5810 },
-  { 0x0007f4, 5832 },
-  { 0x0007f5, 5842 },
-  { 0x0007f6, 5856 },
-  { 0x0007f7, 5866 },
-  { 0x0007f8, 5876 },
-  { 0x0007f9, 5886 },
-  { 0x0008a1, 5898 },
-  { 0x0008a2, 5910 },
-  { 0x0008a3, 5925 },
-  { 0x0008a4, 5940 },
-  { 0x0008a5, 5952 },
-  { 0x0008a6, 5964 },
-  { 0x0008a7, 5978 },
-  { 0x0008a8, 5995 },
-  { 0x0008a9, 6012 },
-  { 0x0008aa, 6030 },
-  { 0x0008ab, 6048 },
-  { 0x0008ac, 6062 },
-  { 0x0008ad, 6076 },
-  { 0x0008ae, 6091 },
-  { 0x0008af, 6106 },
-  { 0x0008b0, 6127 },
-  { 0x0008b1, 6149 },
-  { 0x0008b2, 6166 },
-  { 0x0008b3, 6183 },
-  { 0x0008b4, 6209 },
-  { 0x0008b5, 6235 },
-  { 0x0008b6, 6253 },
-  { 0x0008b7, 6271 },
-  { 0x0008bc, 6292 },
-  { 0x0008bd, 6306 },
-  { 0x0008be, 6315 },
-  { 0x0008bf, 6332 },
-  { 0x0008c0, 6341 },
-  { 0x0008c1, 6351 },
-  { 0x0008c2, 6361 },
-  { 0x0008c5, 6370 },
-  { 0x0008c8, 6376 },
-  { 0x0008c9, 6388 },
-  { 0x0008cd, 6401 },
-  { 0x0008ce, 6410 },
-  { 0x0008cf, 6418 },
-  { 0x0008d6, 6428 },
-  { 0x0008da, 6436 },
-  { 0x0008db, 6447 },
-  { 0x0008dc, 6456 },
-  { 0x0008dd, 6469 },
-  { 0x0008de, 6475 },
-  { 0x0008df, 6486 },
-  { 0x0008ef, 6496 },
-  { 0x0008f6, 6514 },
-  { 0x0008fb, 6523 },
-  { 0x0008fc, 6533 },
-  { 0x0008fd, 6541 },
-  { 0x0008fe, 6552 },
-  { 0x0009df, 6562 },
-  { 0x0009e0, 6568 },
-  { 0x0009e1, 6581 },
-  { 0x0009e2, 6594 },
-  { 0x0009e3, 6597 },
-  { 0x0009e4, 6600 },
-  { 0x0009e5, 6603 },
-  { 0x0009e8, 6606 },
-  { 0x0009e9, 6609 },
-  { 0x0009ea, 6612 },
-  { 0x0009eb, 6627 },
-  { 0x0009ec, 6641 },
-  { 0x0009ed, 6654 },
-  { 0x0009ee, 6668 },
-  { 0x0009ef, 6682 },
-  { 0x0009f0, 6697 },
-  { 0x0009f1, 6712 },
-  { 0x0009f2, 6727 },
-  { 0x0009f3, 6742 },
-  { 0x0009f4, 6757 },
-  { 0x0009f5, 6763 },
-  { 0x0009f6, 6770 },
-  { 0x0009f7, 6775 },
-  { 0x0009f8, 6780 },
-  { 0x000aa1, 6788 },
-  { 0x000aa2, 6796 },
-  { 0x000aa3, 6804 },
-  { 0x000aa4, 6813 },
-  { 0x000aa5, 6822 },
-  { 0x000aa6, 6833 },
-  { 0x000aa7, 6844 },
-  { 0x000aa8, 6854 },
-  { 0x000aa9, 6864 },
-  { 0x000aaa, 6871 },
-  { 0x000aac, 6878 },
-  { 0x000aae, 6890 },
-  { 0x000aaf, 6899 },
-  { 0x000ab0, 6915 },
-  { 0x000ab1, 6924 },
-  { 0x000ab2, 6934 },
-  { 0x000ab3, 6943 },
-  { 0x000ab4, 6953 },
-  { 0x000ab5, 6965 },
-  { 0x000ab6, 6976 },
-  { 0x000ab7, 6985 },
-  { 0x000ab8, 6996 },
-  { 0x000abb, 7003 },
-  { 0x000abc, 7011 },
-  { 0x000abd, 7028 },
-  { 0x000abe, 7041 },
-  { 0x000abf, 7059 },
-  { 0x000ac3, 7066 },
-  { 0x000ac4, 7076 },
-  { 0x000ac5, 7089 },
-  { 0x000ac6, 7101 },
-  { 0x000ac9, 7114 },
-  { 0x000aca, 7124 },
-  { 0x000acb, 7138 },
-  { 0x000acc, 7156 },
-  { 0x000acd, 7173 },
-  { 0x000ace, 7191 },
-  { 0x000acf, 7204 },
-  { 0x000ad0, 7220 },
-  { 0x000ad1, 7240 },
-  { 0x000ad2, 7261 },
-  { 0x000ad3, 7281 },
-  { 0x000ad4, 7302 },
-  { 0x000ad6, 7315 },
-  { 0x000ad7, 7323 },
-  { 0x000ad9, 7331 },
-  { 0x000ada, 7342 },
-  { 0x000adb, 7351 },
-  { 0x000adc, 7368 },
-  { 0x000add, 7388 },
-  { 0x000ade, 7409 },
-  { 0x000adf, 7424 },
-  { 0x000ae0, 7437 },
-  { 0x000ae1, 7454 },
-  { 0x000ae2, 7473 },
-  { 0x000ae3, 7488 },
-  { 0x000ae4, 7504 },
-  { 0x000ae5, 7522 },
-  { 0x000ae6, 7531 },
-  { 0x000ae7, 7550 },
-  { 0x000ae8, 7567 },
-  { 0x000ae9, 7585 },
-  { 0x000aea, 7605 },
-  { 0x000aeb, 7617 },
-  { 0x000aec, 7630 },
-  { 0x000aed, 7635 },
-  { 0x000aee, 7643 },
-  { 0x000af0, 7649 },
-  { 0x000af1, 7662 },
-  { 0x000af2, 7669 },
-  { 0x000af3, 7682 },
-  { 0x000af4, 7692 },
-  { 0x000af5, 7704 },
-  { 0x000af6, 7717 },
-  { 0x000af7, 7729 },
-  { 0x000af8, 7740 },
-  { 0x000af9, 7753 },
-  { 0x000afa, 7763 },
-  { 0x000afb, 7781 },
-  { 0x000afc, 7801 },
-  { 0x000afd, 7807 },
-  { 0x000afe, 7826 },
-  { 0x000aff, 7845 },
-  { 0x000ba3, 7852 },
-  { 0x000ba6, 7862 },
-  { 0x000ba8, 7873 },
-  { 0x000ba9, 7883 },
-  { 0x000bc0, 7891 },
-  { 0x000bc2, 7899 },
-  { 0x000bc3, 7908 },
-  { 0x000bc4, 7915 },
-  { 0x000bc6, 7925 },
-  { 0x000bca, 7934 },
-  { 0x000bcc, 7938 },
-  { 0x000bce, 7943 },
-  { 0x000bcf, 7950 },
-  { 0x000bd3, 7957 },
-  { 0x000bd6, 7965 },
-  { 0x000bd8, 7974 },
-  { 0x000bda, 7984 },
-  { 0x000bdc, 7993 },
-  { 0x000bfc, 8002 },
-  { 0x000cdf, 8012 },
-  { 0x000ce0, 8033 },
-  { 0x000ce1, 8046 },
-  { 0x000ce1, 8057 },
-  { 0x000ce2, 8069 },
-  { 0x000ce2, 8082 },
-  { 0x000ce3, 8096 },
-  { 0x000ce3, 8109 },
-  { 0x000ce4, 8123 },
-  { 0x000ce5, 8133 },
-  { 0x000ce6, 8144 },
-  { 0x000ce6, 8156 },
-  { 0x000ce7, 8169 },
-  { 0x000ce7, 8181 },
-  { 0x000ce8, 8192 },
-  { 0x000ce8, 8203 },
-  { 0x000ce9, 8215 },
-  { 0x000cea, 8226 },
-  { 0x000ceb, 8243 },
-  { 0x000cec, 8255 },
-  { 0x000ced, 8268 },
-  { 0x000cee, 8284 },
-  { 0x000cef, 8295 },
-  { 0x000cf0, 8311 },
-  { 0x000cf1, 8322 },
-  { 0x000cf1, 8336 },
-  { 0x000cf2, 8350 },
-  { 0x000cf3, 8362 },
-  { 0x000cf4, 8377 },
-  { 0x000cf5, 8387 },
-  { 0x000cf5, 8404 },
-  { 0x000cf6, 8421 },
-  { 0x000cf6, 8433 },
-  { 0x000cf7, 8445 },
-  { 0x000cf7, 8456 },
-  { 0x000cf8, 8468 },
-  { 0x000cf9, 8480 },
-  { 0x000cfa, 8492 },
-  { 0x000cfa, 8503 },
-  { 0x000da1, 8514 },
-  { 0x000da2, 8525 },
-  { 0x000da3, 8538 },
-  { 0x000da4, 8552 },
-  { 0x000da5, 8566 },
-  { 0x000da6, 8579 },
-  { 0x000da7, 8595 },
-  { 0x000da8, 8607 },
-  { 0x000da9, 8620 },
-  { 0x000daa, 8634 },
-  { 0x000dab, 8648 },
-  { 0x000dac, 8658 },
-  { 0x000dad, 8671 },
-  { 0x000dae, 8683 },
-  { 0x000daf, 8696 },
-  { 0x000db0, 8709 },
-  { 0x000db1, 8722 },
-  { 0x000db2, 8741 },
-  { 0x000db3, 8757 },
-  { 0x000db4, 8768 },
-  { 0x000db5, 8779 },
-  { 0x000db6, 8790 },
-  { 0x000db7, 8804 },
-  { 0x000db8, 8819 },
-  { 0x000db9, 8833 },
-  { 0x000dba, 8843 },
-  { 0x000dbb, 8857 },
-  { 0x000dbc, 8868 },
-  { 0x000dbd, 8882 },
-  { 0x000dbe, 8892 },
-  { 0x000dbf, 8905 },
-  { 0x000dc0, 8916 },
-  { 0x000dc1, 8932 },
-  { 0x000dc2, 8942 },
-  { 0x000dc3, 8953 },
-  { 0x000dc4, 8964 },
-  { 0x000dc5, 8972 },
-  { 0x000dc6, 8984 },
-  { 0x000dc7, 8992 },
-  { 0x000dc8, 9004 },
-  { 0x000dc9, 9016 },
-  { 0x000dca, 9028 },
-  { 0x000dcb, 9039 },
-  { 0x000dcc, 9050 },
-  { 0x000dcd, 9063 },
-  { 0x000dce, 9073 },
-  { 0x000dcf, 9087 },
-  { 0x000dd0, 9102 },
-  { 0x000dd1, 9113 },
-  { 0x000dd2, 9129 },
-  { 0x000dd3, 9141 },
-  { 0x000dd4, 9153 },
-  { 0x000dd5, 9164 },
-  { 0x000dd6, 9176 },
-  { 0x000dd7, 9188 },
-  { 0x000dd8, 9201 },
-  { 0x000dd9, 9212 },
-  { 0x000dda, 9224 },
-  { 0x000dde, 9237 },
-  { 0x000ddf, 9260 },
-  { 0x000de0, 9270 },
-  { 0x000de1, 9281 },
-  { 0x000de2, 9293 },
-  { 0x000de3, 9304 },
-  { 0x000de4, 9323 },
-  { 0x000de5, 9343 },
-  { 0x000de6, 9360 },
-  { 0x000de7, 9374 },
-  { 0x000de8, 9389 },
-  { 0x000de9, 9400 },
-  { 0x000dea, 9412 },
-  { 0x000deb, 9424 },
-  { 0x000dec, 9441 },
-  { 0x000ded, 9458 },
-  { 0x000df0, 9472 },
-  { 0x000df1, 9484 },
-  { 0x000df2, 9497 },
-  { 0x000df3, 9510 },
-  { 0x000df4, 9522 },
-  { 0x000df5, 9533 },
-  { 0x000df6, 9544 },
-  { 0x000df7, 9556 },
-  { 0x000df8, 9569 },
-  { 0x000df9, 9582 },
-  { 0x000ea1, 9594 },
-  { 0x000ea2, 9608 },
-  { 0x000ea3, 9627 },
-  { 0x000ea4, 9645 },
-  { 0x000ea5, 9658 },
-  { 0x000ea6, 9676 },
-  { 0x000ea7, 9694 },
-  { 0x000ea8, 9708 },
-  { 0x000ea9, 9727 },
-  { 0x000eaa, 9740 },
-  { 0x000eab, 9759 },
-  { 0x000eac, 9777 },
-  { 0x000ead, 9795 },
-  { 0x000eae, 9812 },
-  { 0x000eaf, 9830 },
-  { 0x000eb0, 9849 },
-  { 0x000eb1, 9867 },
-  { 0x000eb2, 9880 },
-  { 0x000eb3, 9893 },
-  { 0x000eb4, 9911 },
-  { 0x000eb5, 9928 },
-  { 0x000eb6, 9940 },
-  { 0x000eb7, 9957 },
-  { 0x000eb8, 9970 },
-  { 0x000eb9, 9983 },
-  { 0x000eba, 10001 },
-  { 0x000ebb, 10014 },
-  { 0x000ebc, 10028 },
-  { 0x000ebd, 10041 },
-  { 0x000ebe, 10055 },
-  { 0x000ebf, 10068 },
-  { 0x000ec0, 10077 },
-  { 0x000ec1, 10087 },
-  { 0x000ec2, 10097 },
-  { 0x000ec3, 10108 },
-  { 0x000ec4, 10118 },
-  { 0x000ec5, 10127 },
-  { 0x000ec6, 10138 },
-  { 0x000ec7, 10148 },
-  { 0x000ec8, 10157 },
-  { 0x000ec9, 10167 },
-  { 0x000eca, 10178 },
-  { 0x000ecb, 10188 },
-  { 0x000ecc, 10198 },
-  { 0x000ecd, 10207 },
-  { 0x000ece, 10218 },
-  { 0x000ecf, 10228 },
-  { 0x000ed0, 10238 },
-  { 0x000ed1, 10248 },
-  { 0x000ed2, 10258 },
-  { 0x000ed3, 10268 },
-  { 0x000ed4, 10277 },
-  { 0x000ed5, 10293 },
-  { 0x000ed6, 10314 },
-  { 0x000ed7, 10334 },
-  { 0x000ed8, 10349 },
-  { 0x000ed9, 10369 },
-  { 0x000eda, 10389 },
-  { 0x000edb, 10405 },
-  { 0x000edc, 10420 },
-  { 0x000edd, 10441 },
-  { 0x000ede, 10461 },
-  { 0x000edf, 10481 },
-  { 0x000ee0, 10500 },
-  { 0x000ee1, 10520 },
-  { 0x000ee2, 10541 },
-  { 0x000ee3, 10561 },
-  { 0x000ee4, 10576 },
-  { 0x000ee5, 10591 },
-  { 0x000ee6, 10610 },
-  { 0x000ee7, 10624 },
-  { 0x000ee8, 10643 },
-  { 0x000ee9, 10658 },
-  { 0x000eea, 10673 },
-  { 0x000eeb, 10688 },
-  { 0x000eec, 10704 },
-  { 0x000eed, 10719 },
-  { 0x000eee, 10735 },
-  { 0x000eef, 10750 },
-  { 0x000ef0, 10774 },
-  { 0x000ef1, 10799 },
-  { 0x000ef2, 10824 },
-  { 0x000ef3, 10839 },
-  { 0x000ef4, 10864 },
-  { 0x000ef5, 10890 },
-  { 0x000ef6, 10909 },
-  { 0x000ef7, 10922 },
-  { 0x000ef8, 10936 },
-  { 0x000ef9, 10953 },
-  { 0x000efa, 10980 },
-  { 0x000eff, 11001 },
-  { 0x0013bc, 11012 },
-  { 0x0013bd, 11015 },
-  { 0x0013be, 11018 },
-  { 0x0020a0, 11029 },
-  { 0x0020a1, 11037 },
-  { 0x0020a2, 11047 },
-  { 0x0020a3, 11060 },
-  { 0x0020a4, 11071 },
-  { 0x0020a5, 11080 },
-  { 0x0020a6, 11089 },
-  { 0x0020a7, 11099 },
-  { 0x0020a8, 11110 },
-  { 0x0020a9, 11120 },
-  { 0x0020aa, 11128 },
-  { 0x0020ab, 11142 },
-  { 0x0020ac, 11151 },
-  { 0x00fd01, 11160 },
-  { 0x00fd02, 11175 },
-  { 0x00fd03, 11190 },
-  { 0x00fd04, 11202 },
-  { 0x00fd05, 11213 },
-  { 0x00fd06, 11226 },
-  { 0x00fd07, 11240 },
-  { 0x00fd08, 11256 },
-  { 0x00fd09, 11267 },
-  { 0x00fd0a, 11277 },
-  { 0x00fd0b, 11286 },
-  { 0x00fd0c, 11295 },
-  { 0x00fd0d, 11304 },
-  { 0x00fd0e, 11314 },
-  { 0x00fd0f, 11324 },
-  { 0x00fd10, 11341 },
-  { 0x00fd11, 11356 },
-  { 0x00fd12, 11370 },
-  { 0x00fd13, 11380 },
-  { 0x00fd14, 11391 },
-  { 0x00fd15, 11401 },
-  { 0x00fd16, 11411 },
-  { 0x00fd17, 11421 },
-  { 0x00fd18, 11432 },
-  { 0x00fd19, 11444 },
-  { 0x00fd1a, 11462 },
-  { 0x00fd1b, 11478 },
-  { 0x00fd1c, 11492 },
-  { 0x00fd1d, 11510 },
-  { 0x00fd1e, 11527 },
-  { 0x00fe01, 11538 },
-  { 0x00fe02, 11547 },
-  { 0x00fe03, 11564 },
-  { 0x00fe04, 11581 },
-  { 0x00fe05, 11598 },
-  { 0x00fe06, 11614 },
-  { 0x00fe07, 11630 },
-  { 0x00fe08, 11645 },
-  { 0x00fe09, 11660 },
-  { 0x00fe0a, 11680 },
-  { 0x00fe0b, 11695 },
-  { 0x00fe0c, 11715 },
-  { 0x00fe0d, 11731 },
-  { 0x00fe0e, 11752 },
-  { 0x00fe0f, 11767 },
-  { 0x00fe20, 11787 },
-  { 0x00fe21, 11800 },
-  { 0x00fe22, 11817 },
-  { 0x00fe23, 11836 },
-  { 0x00fe24, 11856 },
-  { 0x00fe25, 11878 },
-  { 0x00fe26, 11901 },
-  { 0x00fe27, 11925 },
-  { 0x00fe28, 11945 },
-  { 0x00fe29, 11966 },
-  { 0x00fe2a, 11990 },
-  { 0x00fe2b, 12015 },
-  { 0x00fe2c, 12040 },
-  { 0x00fe2d, 12061 },
-  { 0x00fe2e, 12083 },
-  { 0x00fe2f, 12102 },
-  { 0x00fe30, 12123 },
-  { 0x00fe31, 12148 },
-  { 0x00fe32, 12176 },
-  { 0x00fe33, 12190 },
-  { 0x00fe34, 12208 },
-  { 0x00fe50, 12218 },
-  { 0x00fe51, 12229 },
-  { 0x00fe52, 12240 },
-  { 0x00fe53, 12256 },
-  { 0x00fe54, 12267 },
-  { 0x00fe55, 12279 },
-  { 0x00fe56, 12290 },
-  { 0x00fe57, 12304 },
-  { 0x00fe58, 12319 },
-  { 0x00fe59, 12334 },
-  { 0x00fe5a, 12351 },
-  { 0x00fe5b, 12362 },
-  { 0x00fe5c, 12375 },
-  { 0x00fe5d, 12387 },
-  { 0x00fe5e, 12397 },
-  { 0x00fe5f, 12415 },
-  { 0x00fe60, 12437 },
-  { 0x00fe61, 12451 },
-  { 0x00fe62, 12461 },
-  { 0x00fe70, 12471 },
-  { 0x00fe71, 12486 },
-  { 0x00fe72, 12510 },
-  { 0x00fe73, 12528 },
-  { 0x00fe74, 12544 },
-  { 0x00fe75, 12562 },
-  { 0x00fe76, 12580 },
-  { 0x00fe77, 12597 },
-  { 0x00fe78, 12620 },
-  { 0x00fe79, 12636 },
-  { 0x00fe7a, 12652 },
-  { 0x00fed0, 12671 },
-  { 0x00fed1, 12692 },
-  { 0x00fed2, 12712 },
-  { 0x00fed4, 12732 },
-  { 0x00fed5, 12752 },
-  { 0x00fee0, 12769 },
-  { 0x00fee1, 12782 },
-  { 0x00fee2, 12796 },
-  { 0x00fee3, 12807 },
-  { 0x00fee4, 12820 },
-  { 0x00fee5, 12835 },
-  { 0x00fee6, 12851 },
-  { 0x00fee7, 12868 },
-  { 0x00fee8, 12886 },
-  { 0x00fee9, 12906 },
-  { 0x00feea, 12922 },
-  { 0x00feeb, 12938 },
-  { 0x00feec, 12954 },
-  { 0x00feed, 12970 },
-  { 0x00feee, 12986 },
-  { 0x00feef, 13008 },
-  { 0x00fef0, 13026 },
-  { 0x00fef1, 13044 },
-  { 0x00fef2, 13062 },
-  { 0x00fef3, 13080 },
-  { 0x00fef4, 13098 },
-  { 0x00fef5, 13116 },
-  { 0x00fef6, 13130 },
-  { 0x00fef7, 13144 },
-  { 0x00fef8, 13158 },
-  { 0x00fef9, 13172 },
-  { 0x00fefa, 13191 },
-  { 0x00fefb, 13210 },
-  { 0x00fefc, 13230 },
-  { 0x00fefd, 13250 },
-  { 0x00ff08, 13264 },
-  { 0x00ff09, 13274 },
-  { 0x00ff0a, 13278 },
-  { 0x00ff0b, 13287 },
-  { 0x00ff0d, 13293 },
-  { 0x00ff13, 13300 },
-  { 0x00ff14, 13306 },
-  { 0x00ff15, 13318 },
-  { 0x00ff1b, 13326 },
-  { 0x00ff20, 13333 },
-  { 0x00ff21, 13343 },
-  { 0x00ff22, 13349 },
-  { 0x00ff23, 13358 },
-  { 0x00ff23, 13365 },
-  { 0x00ff24, 13377 },
-  { 0x00ff25, 13384 },
-  { 0x00ff26, 13393 },
-  { 0x00ff27, 13402 },
-  { 0x00ff28, 13420 },
-  { 0x00ff29, 13428 },
-  { 0x00ff2a, 13436 },
-  { 0x00ff2b, 13452 },
-  { 0x00ff2c, 13460 },
-  { 0x00ff2d, 13467 },
-  { 0x00ff2e, 13477 },
-  { 0x00ff2f, 13488 },
-  { 0x00ff30, 13499 },
-  { 0x00ff31, 13511 },
-  { 0x00ff32, 13518 },
-  { 0x00ff33, 13531 },
-  { 0x00ff34, 13542 },
-  { 0x00ff35, 13555 },
-  { 0x00ff36, 13567 },
-  { 0x00ff37, 13581 },
-  { 0x00ff38, 13591 },
-  { 0x00ff39, 13605 },
-  { 0x00ff3a, 13618 },
-  { 0x00ff3b, 13634 },
-  { 0x00ff3c, 13651 },
-  { 0x00ff3d, 13667 },
-  { 0x00ff3e, 13685 },
-  { 0x00ff3f, 13703 },
-  { 0x00ff50, 13718 },
-  { 0x00ff51, 13723 },
-  { 0x00ff52, 13728 },
-  { 0x00ff53, 13731 },
-  { 0x00ff54, 13737 },
-  { 0x00ff55, 13742 },
-  { 0x00ff55, 13750 },
-  { 0x00ff56, 13756 },
-  { 0x00ff56, 13766 },
-  { 0x00ff57, 13771 },
-  { 0x00ff58, 13775 },
-  { 0x00ff60, 13781 },
-  { 0x00ff61, 13788 },
-  { 0x00ff62, 13794 },
-  { 0x00ff63, 13802 },
-  { 0x00ff65, 13809 },
-  { 0x00ff66, 13814 },
-  { 0x00ff67, 13819 },
-  { 0x00ff68, 13824 },
-  { 0x00ff69, 13829 },
-  { 0x00ff6a, 13836 },
-  { 0x00ff6b, 13841 },
-  { 0x00ff7e, 13847 },
-  { 0x00ff7e, 13861 },
-  { 0x00ff7e, 13874 },
-  { 0x00ff7e, 13888 },
-  { 0x00ff7e, 13902 },
-  { 0x00ff7e, 13918 },
-  { 0x00ff7e, 13930 },
-  { 0x00ff7e, 13942 },
-  { 0x00ff7f, 13956 },
-  { 0x00ff80, 13965 },
-  { 0x00ff89, 13974 },
-  { 0x00ff8d, 13981 },
-  { 0x00ff91, 13990 },
-  { 0x00ff92, 13996 },
-  { 0x00ff93, 14002 },
-  { 0x00ff94, 14008 },
-  { 0x00ff95, 14014 },
-  { 0x00ff96, 14022 },
-  { 0x00ff97, 14030 },
-  { 0x00ff98, 14036 },
-  { 0x00ff99, 14045 },
-  { 0x00ff9a, 14053 },
-  { 0x00ff9a, 14064 },
-  { 0x00ff9b, 14073 },
-  { 0x00ff9b, 14086 },
-  { 0x00ff9c, 14094 },
-  { 0x00ff9d, 14101 },
-  { 0x00ff9e, 14110 },
-  { 0x00ff9f, 14120 },
-  { 0x00ffaa, 14130 },
-  { 0x00ffab, 14142 },
-  { 0x00ffac, 14149 },
-  { 0x00ffad, 14162 },
-  { 0x00ffae, 14174 },
-  { 0x00ffaf, 14185 },
-  { 0x00ffb0, 14195 },
-  { 0x00ffb1, 14200 },
-  { 0x00ffb2, 14205 },
-  { 0x00ffb3, 14210 },
-  { 0x00ffb4, 14215 },
-  { 0x00ffb5, 14220 },
-  { 0x00ffb6, 14225 },
-  { 0x00ffb7, 14230 },
-  { 0x00ffb8, 14235 },
-  { 0x00ffb9, 14240 },
-  { 0x00ffbd, 14245 },
-  { 0x00ffbe, 14254 },
-  { 0x00ffbf, 14257 },
-  { 0x00ffc0, 14260 },
-  { 0x00ffc1, 14263 },
-  { 0x00ffc2, 14266 },
-  { 0x00ffc3, 14269 },
-  { 0x00ffc4, 14272 },
-  { 0x00ffc5, 14275 },
-  { 0x00ffc6, 14278 },
-  { 0x00ffc7, 14281 },
-  { 0x00ffc8, 14285 },
-  { 0x00ffc9, 14289 },
-  { 0x00ffca, 14293 },
-  { 0x00ffcb, 14297 },
-  { 0x00ffcc, 14301 },
-  { 0x00ffcd, 14305 },
-  { 0x00ffce, 14309 },
-  { 0x00ffcf, 14313 },
-  { 0x00ffd0, 14317 },
-  { 0x00ffd1, 14321 },
-  { 0x00ffd2, 14325 },
-  { 0x00ffd3, 14329 },
-  { 0x00ffd4, 14333 },
-  { 0x00ffd5, 14337 },
-  { 0x00ffd6, 14341 },
-  { 0x00ffd7, 14345 },
-  { 0x00ffd8, 14349 },
-  { 0x00ffd9, 14353 },
-  { 0x00ffda, 14357 },
-  { 0x00ffdb, 14361 },
-  { 0x00ffdc, 14365 },
-  { 0x00ffdd, 14369 },
-  { 0x00ffde, 14373 },
-  { 0x00ffdf, 14377 },
-  { 0x00ffe0, 14381 },
-  { 0x00ffe1, 14385 },
-  { 0x00ffe2, 14393 },
-  { 0x00ffe3, 14401 },
-  { 0x00ffe4, 14411 },
-  { 0x00ffe5, 14421 },
-  { 0x00ffe6, 14431 },
-  { 0x00ffe7, 14442 },
-  { 0x00ffe8, 14449 },
-  { 0x00ffe9, 14456 },
-  { 0x00ffea, 14462 },
-  { 0x00ffeb, 14468 },
-  { 0x00ffec, 14476 },
-  { 0x00ffed, 14484 },
-  { 0x00ffee, 14492 },
-  { 0x00ffff, 14500 },
-  { 0xffffff, 14507 }
+  { 0x0000d8, 950 },
+  { 0x0000d9, 957 },
+  { 0x0000da, 964 },
+  { 0x0000db, 971 },
+  { 0x0000dc, 983 },
+  { 0x0000dd, 994 },
+  { 0x0000de, 1001 },
+  { 0x0000de, 1007 },
+  { 0x0000df, 1013 },
+  { 0x0000e0, 1020 },
+  { 0x0000e1, 1027 },
+  { 0x0000e2, 1034 },
+  { 0x0000e3, 1046 },
+  { 0x0000e4, 1053 },
+  { 0x0000e5, 1064 },
+  { 0x0000e6, 1070 },
+  { 0x0000e7, 1073 },
+  { 0x0000e8, 1082 },
+  { 0x0000e9, 1089 },
+  { 0x0000ea, 1096 },
+  { 0x0000eb, 1108 },
+  { 0x0000ec, 1119 },
+  { 0x0000ed, 1126 },
+  { 0x0000ee, 1133 },
+  { 0x0000ef, 1145 },
+  { 0x0000f0, 1156 },
+  { 0x0000f1, 1160 },
+  { 0x0000f2, 1167 },
+  { 0x0000f3, 1174 },
+  { 0x0000f4, 1181 },
+  { 0x0000f5, 1193 },
+  { 0x0000f6, 1200 },
+  { 0x0000f7, 1211 },
+  { 0x0000f8, 1220 },
+  { 0x0000f8, 1229 },
+  { 0x0000f9, 1236 },
+  { 0x0000fa, 1243 },
+  { 0x0000fb, 1250 },
+  { 0x0000fc, 1262 },
+  { 0x0000fd, 1273 },
+  { 0x0000fe, 1280 },
+  { 0x0000ff, 1286 },
+  { 0x0001a1, 1297 },
+  { 0x0001a2, 1305 },
+  { 0x0001a3, 1311 },
+  { 0x0001a5, 1319 },
+  { 0x0001a6, 1326 },
+  { 0x0001a9, 1333 },
+  { 0x0001aa, 1340 },
+  { 0x0001ab, 1349 },
+  { 0x0001ac, 1356 },
+  { 0x0001ae, 1363 },
+  { 0x0001af, 1370 },
+  { 0x0001b1, 1380 },
+  { 0x0001b2, 1388 },
+  { 0x0001b3, 1395 },
+  { 0x0001b5, 1403 },
+  { 0x0001b6, 1410 },
+  { 0x0001b7, 1417 },
+  { 0x0001b9, 1423 },
+  { 0x0001ba, 1430 },
+  { 0x0001bb, 1439 },
+  { 0x0001bc, 1446 },
+  { 0x0001bd, 1453 },
+  { 0x0001be, 1465 },
+  { 0x0001bf, 1472 },
+  { 0x0001c0, 1482 },
+  { 0x0001c3, 1489 },
+  { 0x0001c5, 1496 },
+  { 0x0001c6, 1503 },
+  { 0x0001c8, 1510 },
+  { 0x0001ca, 1517 },
+  { 0x0001cc, 1525 },
+  { 0x0001cf, 1532 },
+  { 0x0001d0, 1539 },
+  { 0x0001d1, 1547 },
+  { 0x0001d2, 1554 },
+  { 0x0001d5, 1561 },
+  { 0x0001d8, 1574 },
+  { 0x0001d9, 1581 },
+  { 0x0001db, 1587 },
+  { 0x0001de, 1600 },
+  { 0x0001e0, 1609 },
+  { 0x0001e3, 1616 },
+  { 0x0001e5, 1623 },
+  { 0x0001e6, 1630 },
+  { 0x0001e8, 1637 },
+  { 0x0001ea, 1644 },
+  { 0x0001ec, 1652 },
+  { 0x0001ef, 1659 },
+  { 0x0001f0, 1666 },
+  { 0x0001f1, 1674 },
+  { 0x0001f2, 1681 },
+  { 0x0001f5, 1688 },
+  { 0x0001f8, 1701 },
+  { 0x0001f9, 1708 },
+  { 0x0001fb, 1714 },
+  { 0x0001fe, 1727 },
+  { 0x0001ff, 1736 },
+  { 0x0002a1, 1745 },
+  { 0x0002a6, 1753 },
+  { 0x0002a9, 1765 },
+  { 0x0002ab, 1775 },
+  { 0x0002ac, 1782 },
+  { 0x0002b1, 1794 },
+  { 0x0002b6, 1802 },
+  { 0x0002b9, 1814 },
+  { 0x0002bb, 1823 },
+  { 0x0002bc, 1830 },
+  { 0x0002c5, 1842 },
+  { 0x0002c6, 1852 },
+  { 0x0002d5, 1864 },
+  { 0x0002d8, 1874 },
+  { 0x0002dd, 1886 },
+  { 0x0002de, 1893 },
+  { 0x0002e5, 1905 },
+  { 0x0002e6, 1915 },
+  { 0x0002f5, 1927 },
+  { 0x0002f8, 1937 },
+  { 0x0002fd, 1949 },
+  { 0x0002fe, 1956 },
+  { 0x0003a2, 1968 },
+  { 0x0003a2, 1974 },
+  { 0x0003a3, 1978 },
+  { 0x0003a5, 1987 },
+  { 0x0003a6, 1994 },
+  { 0x0003aa, 2003 },
+  { 0x0003ab, 2011 },
+  { 0x0003ac, 2020 },
+  { 0x0003b3, 2027 },
+  { 0x0003b5, 2036 },
+  { 0x0003b6, 2043 },
+  { 0x0003ba, 2052 },
+  { 0x0003bb, 2060 },
+  { 0x0003bc, 2069 },
+  { 0x0003bd, 2076 },
+  { 0x0003bf, 2080 },
+  { 0x0003c0, 2084 },
+  { 0x0003c7, 2092 },
+  { 0x0003cc, 2100 },
+  { 0x0003cf, 2110 },
+  { 0x0003d1, 2118 },
+  { 0x0003d2, 2127 },
+  { 0x0003d3, 2135 },
+  { 0x0003d9, 2144 },
+  { 0x0003dd, 2152 },
+  { 0x0003de, 2159 },
+  { 0x0003e0, 2167 },
+  { 0x0003e7, 2175 },
+  { 0x0003ec, 2183 },
+  { 0x0003ef, 2193 },
+  { 0x0003f1, 2201 },
+  { 0x0003f2, 2210 },
+  { 0x0003f3, 2218 },
+  { 0x0003f9, 2227 },
+  { 0x0003fd, 2235 },
+  { 0x0003fe, 2242 },
+  { 0x00047e, 2250 },
+  { 0x0004a1, 2259 },
+  { 0x0004a2, 2273 },
+  { 0x0004a3, 2293 },
+  { 0x0004a4, 2313 },
+  { 0x0004a5, 2324 },
+  { 0x0004a5, 2341 },
+  { 0x0004a6, 2356 },
+  { 0x0004a7, 2364 },
+  { 0x0004a8, 2371 },
+  { 0x0004a9, 2378 },
+  { 0x0004aa, 2385 },
+  { 0x0004ab, 2392 },
+  { 0x0004ac, 2399 },
+  { 0x0004ad, 2407 },
+  { 0x0004ae, 2415 },
+  { 0x0004af, 2423 },
+  { 0x0004af, 2432 },
+  { 0x0004b0, 2440 },
+  { 0x0004b1, 2455 },
+  { 0x0004b2, 2462 },
+  { 0x0004b3, 2469 },
+  { 0x0004b4, 2476 },
+  { 0x0004b5, 2483 },
+  { 0x0004b6, 2490 },
+  { 0x0004b7, 2498 },
+  { 0x0004b8, 2506 },
+  { 0x0004b9, 2514 },
+  { 0x0004ba, 2522 },
+  { 0x0004bb, 2530 },
+  { 0x0004bc, 2538 },
+  { 0x0004bd, 2547 },
+  { 0x0004be, 2555 },
+  { 0x0004bf, 2563 },
+  { 0x0004c0, 2571 },
+  { 0x0004c1, 2579 },
+  { 0x0004c1, 2588 },
+  { 0x0004c2, 2596 },
+  { 0x0004c2, 2605 },
+  { 0x0004c3, 2613 },
+  { 0x0004c4, 2621 },
+  { 0x0004c5, 2629 },
+  { 0x0004c6, 2637 },
+  { 0x0004c7, 2645 },
+  { 0x0004c8, 2653 },
+  { 0x0004c9, 2661 },
+  { 0x0004ca, 2669 },
+  { 0x0004cb, 2677 },
+  { 0x0004cc, 2685 },
+  { 0x0004cc, 2693 },
+  { 0x0004cd, 2701 },
+  { 0x0004ce, 2709 },
+  { 0x0004cf, 2717 },
+  { 0x0004d0, 2725 },
+  { 0x0004d1, 2733 },
+  { 0x0004d2, 2741 },
+  { 0x0004d3, 2749 },
+  { 0x0004d4, 2757 },
+  { 0x0004d5, 2765 },
+  { 0x0004d6, 2773 },
+  { 0x0004d7, 2781 },
+  { 0x0004d8, 2789 },
+  { 0x0004d9, 2797 },
+  { 0x0004da, 2805 },
+  { 0x0004db, 2813 },
+  { 0x0004dc, 2821 },
+  { 0x0004dd, 2829 },
+  { 0x0004de, 2836 },
+  { 0x0004df, 2848 },
+  { 0x0005ac, 2864 },
+  { 0x0005bb, 2877 },
+  { 0x0005bf, 2894 },
+  { 0x0005c1, 2915 },
+  { 0x0005c2, 2928 },
+  { 0x0005c3, 2947 },
+  { 0x0005c4, 2966 },
+  { 0x0005c5, 2984 },
+  { 0x0005c6, 3006 },
+  { 0x0005c7, 3024 },
+  { 0x0005c8, 3036 },
+  { 0x0005c9, 3047 },
+  { 0x0005ca, 3065 },
+  { 0x0005cb, 3076 },
+  { 0x0005cc, 3088 },
+  { 0x0005cd, 3100 },
+  { 0x0005ce, 3111 },
+  { 0x0005cf, 3123 },
+  { 0x0005d0, 3134 },
+  { 0x0005d1, 3146 },
+  { 0x0005d2, 3156 },
+  { 0x0005d3, 3168 },
+  { 0x0005d4, 3180 },
+  { 0x0005d5, 3193 },
+  { 0x0005d6, 3204 },
+  { 0x0005d7, 3215 },
+  { 0x0005d8, 3226 },
+  { 0x0005d9, 3237 },
+  { 0x0005da, 3248 },
+  { 0x0005e0, 3261 },
+  { 0x0005e1, 3276 },
+  { 0x0005e2, 3287 },
+  { 0x0005e3, 3298 },
+  { 0x0005e4, 3309 },
+  { 0x0005e5, 3320 },
+  { 0x0005e6, 3332 },
+  { 0x0005e7, 3344 },
+  { 0x0005e7, 3354 },
+  { 0x0005e8, 3365 },
+  { 0x0005e9, 3376 },
+  { 0x0005ea, 3395 },
+  { 0x0005eb, 3406 },
+  { 0x0005ec, 3422 },
+  { 0x0005ed, 3438 },
+  { 0x0005ee, 3454 },
+  { 0x0005ef, 3467 },
+  { 0x0005f0, 3480 },
+  { 0x0005f1, 3493 },
+  { 0x0005f2, 3507 },
+  { 0x0006a1, 3520 },
+  { 0x0006a2, 3532 },
+  { 0x0006a3, 3546 },
+  { 0x0006a4, 3558 },
+  { 0x0006a4, 3571 },
+  { 0x0006a5, 3583 },
+  { 0x0006a6, 3597 },
+  { 0x0006a6, 3609 },
+  { 0x0006a7, 3620 },
+  { 0x0006a7, 3633 },
+  { 0x0006a8, 3645 },
+  { 0x0006a8, 3657 },
+  { 0x0006a9, 3668 },
+  { 0x0006a9, 3681 },
+  { 0x0006aa, 3693 },
+  { 0x0006aa, 3706 },
+  { 0x0006ab, 3718 },
+  { 0x0006ac, 3731 },
+  { 0x0006ad, 3745 },
+  { 0x0006ae, 3771 },
+  { 0x0006af, 3791 },
+  { 0x0006af, 3805 },
+  { 0x0006b0, 3817 },
+  { 0x0006b1, 3828 },
+  { 0x0006b2, 3840 },
+  { 0x0006b3, 3854 },
+  { 0x0006b4, 3866 },
+  { 0x0006b4, 3879 },
+  { 0x0006b5, 3891 },
+  { 0x0006b6, 3905 },
+  { 0x0006b6, 3917 },
+  { 0x0006b7, 3928 },
+  { 0x0006b7, 3941 },
+  { 0x0006b8, 3953 },
+  { 0x0006b8, 3965 },
+  { 0x0006b9, 3976 },
+  { 0x0006b9, 3989 },
+  { 0x0006ba, 4001 },
+  { 0x0006ba, 4014 },
+  { 0x0006bb, 4026 },
+  { 0x0006bc, 4039 },
+  { 0x0006bd, 4053 },
+  { 0x0006be, 4079 },
+  { 0x0006bf, 4099 },
+  { 0x0006bf, 4113 },
+  { 0x0006c0, 4125 },
+  { 0x0006c1, 4137 },
+  { 0x0006c2, 4148 },
+  { 0x0006c3, 4160 },
+  { 0x0006c4, 4173 },
+  { 0x0006c5, 4185 },
+  { 0x0006c6, 4197 },
+  { 0x0006c7, 4209 },
+  { 0x0006c8, 4222 },
+  { 0x0006c9, 4234 },
+  { 0x0006ca, 4245 },
+  { 0x0006cb, 4261 },
+  { 0x0006cc, 4273 },
+  { 0x0006cd, 4285 },
+  { 0x0006ce, 4297 },
+  { 0x0006cf, 4309 },
+  { 0x0006d0, 4320 },
+  { 0x0006d1, 4332 },
+  { 0x0006d2, 4344 },
+  { 0x0006d3, 4356 },
+  { 0x0006d4, 4368 },
+  { 0x0006d5, 4380 },
+  { 0x0006d6, 4391 },
+  { 0x0006d7, 4404 },
+  { 0x0006d8, 4416 },
+  { 0x0006d9, 4434 },
+  { 0x0006da, 4448 },
+  { 0x0006db, 4460 },
+  { 0x0006dc, 4473 },
+  { 0x0006dd, 4484 },
+  { 0x0006de, 4499 },
+  { 0x0006df, 4512 },
+  { 0x0006e0, 4530 },
+  { 0x0006e1, 4542 },
+  { 0x0006e2, 4553 },
+  { 0x0006e3, 4565 },
+  { 0x0006e4, 4578 },
+  { 0x0006e5, 4590 },
+  { 0x0006e6, 4602 },
+  { 0x0006e7, 4614 },
+  { 0x0006e8, 4627 },
+  { 0x0006e9, 4639 },
+  { 0x0006ea, 4650 },
+  { 0x0006eb, 4666 },
+  { 0x0006ec, 4678 },
+  { 0x0006ed, 4690 },
+  { 0x0006ee, 4702 },
+  { 0x0006ef, 4714 },
+  { 0x0006f0, 4725 },
+  { 0x0006f1, 4737 },
+  { 0x0006f2, 4749 },
+  { 0x0006f3, 4761 },
+  { 0x0006f4, 4773 },
+  { 0x0006f5, 4785 },
+  { 0x0006f6, 4796 },
+  { 0x0006f7, 4809 },
+  { 0x0006f8, 4821 },
+  { 0x0006f9, 4839 },
+  { 0x0006fa, 4853 },
+  { 0x0006fb, 4865 },
+  { 0x0006fc, 4878 },
+  { 0x0006fd, 4889 },
+  { 0x0006fe, 4904 },
+  { 0x0006ff, 4917 },
+  { 0x0007a1, 4935 },
+  { 0x0007a2, 4953 },
+  { 0x0007a3, 4973 },
+  { 0x0007a4, 4989 },
+  { 0x0007a5, 5006 },
+  { 0x0007a5, 5026 },
+  { 0x0007a7, 5045 },
+  { 0x0007a8, 5065 },
+  { 0x0007a9, 5085 },
+  { 0x0007ab, 5107 },
+  { 0x0007ae, 5125 },
+  { 0x0007af, 5146 },
+  { 0x0007b1, 5161 },
+  { 0x0007b2, 5179 },
+  { 0x0007b3, 5199 },
+  { 0x0007b4, 5215 },
+  { 0x0007b5, 5232 },
+  { 0x0007b6, 5251 },
+  { 0x0007b7, 5276 },
+  { 0x0007b8, 5296 },
+  { 0x0007b9, 5316 },
+  { 0x0007ba, 5338 },
+  { 0x0007bb, 5366 },
+  { 0x0007c1, 5384 },
+  { 0x0007c2, 5396 },
+  { 0x0007c3, 5407 },
+  { 0x0007c4, 5419 },
+  { 0x0007c5, 5431 },
+  { 0x0007c6, 5445 },
+  { 0x0007c7, 5456 },
+  { 0x0007c8, 5466 },
+  { 0x0007c9, 5478 },
+  { 0x0007ca, 5489 },
+  { 0x0007cb, 5501 },
+  { 0x0007cb, 5514 },
+  { 0x0007cc, 5526 },
+  { 0x0007cd, 5535 },
+  { 0x0007ce, 5544 },
+  { 0x0007cf, 5553 },
+  { 0x0007d0, 5567 },
+  { 0x0007d1, 5576 },
+  { 0x0007d2, 5586 },
+  { 0x0007d4, 5598 },
+  { 0x0007d5, 5608 },
+  { 0x0007d6, 5622 },
+  { 0x0007d7, 5632 },
+  { 0x0007d8, 5642 },
+  { 0x0007d9, 5652 },
+  { 0x0007e1, 5664 },
+  { 0x0007e2, 5676 },
+  { 0x0007e3, 5687 },
+  { 0x0007e4, 5699 },
+  { 0x0007e5, 5711 },
+  { 0x0007e6, 5725 },
+  { 0x0007e7, 5736 },
+  { 0x0007e8, 5746 },
+  { 0x0007e9, 5758 },
+  { 0x0007ea, 5769 },
+  { 0x0007eb, 5781 },
+  { 0x0007eb, 5794 },
+  { 0x0007ec, 5806 },
+  { 0x0007ed, 5815 },
+  { 0x0007ee, 5824 },
+  { 0x0007ef, 5833 },
+  { 0x0007f0, 5847 },
+  { 0x0007f1, 5856 },
+  { 0x0007f2, 5866 },
+  { 0x0007f3, 5878 },
+  { 0x0007f4, 5900 },
+  { 0x0007f5, 5910 },
+  { 0x0007f6, 5924 },
+  { 0x0007f7, 5934 },
+  { 0x0007f8, 5944 },
+  { 0x0007f9, 5954 },
+  { 0x0008a1, 5966 },
+  { 0x0008a2, 5978 },
+  { 0x0008a3, 5993 },
+  { 0x0008a4, 6008 },
+  { 0x0008a5, 6020 },
+  { 0x0008a6, 6032 },
+  { 0x0008a7, 6046 },
+  { 0x0008a8, 6063 },
+  { 0x0008a9, 6080 },
+  { 0x0008aa, 6098 },
+  { 0x0008ab, 6116 },
+  { 0x0008ac, 6130 },
+  { 0x0008ad, 6144 },
+  { 0x0008ae, 6159 },
+  { 0x0008af, 6174 },
+  { 0x0008b0, 6195 },
+  { 0x0008b1, 6217 },
+  { 0x0008b2, 6234 },
+  { 0x0008b3, 6251 },
+  { 0x0008b4, 6277 },
+  { 0x0008b5, 6303 },
+  { 0x0008b6, 6321 },
+  { 0x0008b7, 6339 },
+  { 0x0008bc, 6360 },
+  { 0x0008bd, 6374 },
+  { 0x0008be, 6383 },
+  { 0x0008bf, 6400 },
+  { 0x0008c0, 6409 },
+  { 0x0008c1, 6419 },
+  { 0x0008c2, 6429 },
+  { 0x0008c5, 6438 },
+  { 0x0008c8, 6444 },
+  { 0x0008c9, 6456 },
+  { 0x0008cd, 6469 },
+  { 0x0008ce, 6478 },
+  { 0x0008cf, 6486 },
+  { 0x0008d6, 6496 },
+  { 0x0008da, 6504 },
+  { 0x0008db, 6515 },
+  { 0x0008dc, 6524 },
+  { 0x0008dd, 6537 },
+  { 0x0008de, 6543 },
+  { 0x0008df, 6554 },
+  { 0x0008ef, 6564 },
+  { 0x0008f6, 6582 },
+  { 0x0008fb, 6591 },
+  { 0x0008fc, 6601 },
+  { 0x0008fd, 6609 },
+  { 0x0008fe, 6620 },
+  { 0x0009df, 6630 },
+  { 0x0009e0, 6636 },
+  { 0x0009e1, 6649 },
+  { 0x0009e2, 6662 },
+  { 0x0009e3, 6665 },
+  { 0x0009e4, 6668 },
+  { 0x0009e5, 6671 },
+  { 0x0009e8, 6674 },
+  { 0x0009e9, 6677 },
+  { 0x0009ea, 6680 },
+  { 0x0009eb, 6695 },
+  { 0x0009ec, 6709 },
+  { 0x0009ed, 6722 },
+  { 0x0009ee, 6736 },
+  { 0x0009ef, 6750 },
+  { 0x0009f0, 6765 },
+  { 0x0009f1, 6780 },
+  { 0x0009f2, 6795 },
+  { 0x0009f3, 6810 },
+  { 0x0009f4, 6825 },
+  { 0x0009f5, 6831 },
+  { 0x0009f6, 6838 },
+  { 0x0009f7, 6843 },
+  { 0x0009f8, 6848 },
+  { 0x000aa1, 6856 },
+  { 0x000aa2, 6864 },
+  { 0x000aa3, 6872 },
+  { 0x000aa4, 6881 },
+  { 0x000aa5, 6890 },
+  { 0x000aa6, 6901 },
+  { 0x000aa7, 6912 },
+  { 0x000aa8, 6922 },
+  { 0x000aa9, 6932 },
+  { 0x000aaa, 6939 },
+  { 0x000aac, 6946 },
+  { 0x000aae, 6958 },
+  { 0x000aaf, 6967 },
+  { 0x000ab0, 6983 },
+  { 0x000ab1, 6992 },
+  { 0x000ab2, 7002 },
+  { 0x000ab3, 7011 },
+  { 0x000ab4, 7021 },
+  { 0x000ab5, 7033 },
+  { 0x000ab6, 7044 },
+  { 0x000ab7, 7053 },
+  { 0x000ab8, 7064 },
+  { 0x000abb, 7071 },
+  { 0x000abc, 7079 },
+  { 0x000abd, 7096 },
+  { 0x000abe, 7109 },
+  { 0x000abf, 7127 },
+  { 0x000ac3, 7134 },
+  { 0x000ac4, 7144 },
+  { 0x000ac5, 7157 },
+  { 0x000ac6, 7169 },
+  { 0x000ac9, 7182 },
+  { 0x000aca, 7192 },
+  { 0x000acb, 7206 },
+  { 0x000acc, 7224 },
+  { 0x000acd, 7241 },
+  { 0x000ace, 7259 },
+  { 0x000acf, 7272 },
+  { 0x000ad0, 7288 },
+  { 0x000ad1, 7308 },
+  { 0x000ad2, 7329 },
+  { 0x000ad3, 7349 },
+  { 0x000ad4, 7370 },
+  { 0x000ad5, 7383 },
+  { 0x000ad6, 7392 },
+  { 0x000ad7, 7400 },
+  { 0x000ad9, 7408 },
+  { 0x000ada, 7419 },
+  { 0x000adb, 7428 },
+  { 0x000adc, 7445 },
+  { 0x000add, 7465 },
+  { 0x000ade, 7486 },
+  { 0x000adf, 7501 },
+  { 0x000ae0, 7514 },
+  { 0x000ae1, 7531 },
+  { 0x000ae2, 7550 },
+  { 0x000ae3, 7565 },
+  { 0x000ae4, 7581 },
+  { 0x000ae5, 7599 },
+  { 0x000ae6, 7608 },
+  { 0x000ae7, 7627 },
+  { 0x000ae8, 7644 },
+  { 0x000ae9, 7662 },
+  { 0x000aea, 7682 },
+  { 0x000aeb, 7694 },
+  { 0x000aec, 7707 },
+  { 0x000aed, 7712 },
+  { 0x000aee, 7720 },
+  { 0x000af0, 7726 },
+  { 0x000af1, 7739 },
+  { 0x000af2, 7746 },
+  { 0x000af3, 7759 },
+  { 0x000af4, 7769 },
+  { 0x000af5, 7781 },
+  { 0x000af6, 7794 },
+  { 0x000af7, 7806 },
+  { 0x000af8, 7817 },
+  { 0x000af9, 7830 },
+  { 0x000afa, 7840 },
+  { 0x000afb, 7858 },
+  { 0x000afc, 7878 },
+  { 0x000afd, 7884 },
+  { 0x000afe, 7903 },
+  { 0x000aff, 7922 },
+  { 0x000ba3, 7929 },
+  { 0x000ba6, 7939 },
+  { 0x000ba8, 7950 },
+  { 0x000ba9, 7960 },
+  { 0x000bc0, 7968 },
+  { 0x000bc2, 7976 },
+  { 0x000bc3, 7985 },
+  { 0x000bc4, 7992 },
+  { 0x000bc6, 8002 },
+  { 0x000bca, 8011 },
+  { 0x000bcc, 8015 },
+  { 0x000bce, 8020 },
+  { 0x000bcf, 8027 },
+  { 0x000bd3, 8034 },
+  { 0x000bd6, 8042 },
+  { 0x000bd8, 8051 },
+  { 0x000bda, 8061 },
+  { 0x000bdc, 8070 },
+  { 0x000bfc, 8079 },
+  { 0x000cdf, 8089 },
+  { 0x000ce0, 8110 },
+  { 0x000ce1, 8123 },
+  { 0x000ce1, 8134 },
+  { 0x000ce2, 8146 },
+  { 0x000ce2, 8159 },
+  { 0x000ce3, 8173 },
+  { 0x000ce3, 8186 },
+  { 0x000ce4, 8200 },
+  { 0x000ce5, 8210 },
+  { 0x000ce6, 8221 },
+  { 0x000ce6, 8233 },
+  { 0x000ce7, 8246 },
+  { 0x000ce7, 8258 },
+  { 0x000ce8, 8269 },
+  { 0x000ce8, 8280 },
+  { 0x000ce9, 8292 },
+  { 0x000cea, 8303 },
+  { 0x000ceb, 8320 },
+  { 0x000cec, 8332 },
+  { 0x000ced, 8345 },
+  { 0x000cee, 8361 },
+  { 0x000cef, 8372 },
+  { 0x000cf0, 8388 },
+  { 0x000cf1, 8399 },
+  { 0x000cf1, 8413 },
+  { 0x000cf2, 8427 },
+  { 0x000cf3, 8439 },
+  { 0x000cf4, 8454 },
+  { 0x000cf5, 8464 },
+  { 0x000cf5, 8481 },
+  { 0x000cf6, 8498 },
+  { 0x000cf6, 8510 },
+  { 0x000cf7, 8522 },
+  { 0x000cf7, 8533 },
+  { 0x000cf8, 8545 },
+  { 0x000cf9, 8557 },
+  { 0x000cfa, 8569 },
+  { 0x000cfa, 8580 },
+  { 0x000da1, 8591 },
+  { 0x000da2, 8602 },
+  { 0x000da3, 8615 },
+  { 0x000da4, 8629 },
+  { 0x000da5, 8643 },
+  { 0x000da6, 8656 },
+  { 0x000da7, 8672 },
+  { 0x000da8, 8684 },
+  { 0x000da9, 8697 },
+  { 0x000daa, 8711 },
+  { 0x000dab, 8725 },
+  { 0x000dac, 8735 },
+  { 0x000dad, 8748 },
+  { 0x000dae, 8760 },
+  { 0x000daf, 8773 },
+  { 0x000db0, 8786 },
+  { 0x000db1, 8799 },
+  { 0x000db2, 8818 },
+  { 0x000db3, 8834 },
+  { 0x000db4, 8845 },
+  { 0x000db5, 8856 },
+  { 0x000db6, 8867 },
+  { 0x000db7, 8881 },
+  { 0x000db8, 8896 },
+  { 0x000db9, 8910 },
+  { 0x000dba, 8920 },
+  { 0x000dbb, 8934 },
+  { 0x000dbc, 8945 },
+  { 0x000dbd, 8959 },
+  { 0x000dbe, 8969 },
+  { 0x000dbf, 8982 },
+  { 0x000dc0, 8993 },
+  { 0x000dc1, 9009 },
+  { 0x000dc2, 9019 },
+  { 0x000dc3, 9030 },
+  { 0x000dc4, 9041 },
+  { 0x000dc5, 9049 },
+  { 0x000dc6, 9061 },
+  { 0x000dc7, 9069 },
+  { 0x000dc8, 9081 },
+  { 0x000dc9, 9093 },
+  { 0x000dca, 9105 },
+  { 0x000dcb, 9116 },
+  { 0x000dcc, 9127 },
+  { 0x000dcd, 9140 },
+  { 0x000dce, 9150 },
+  { 0x000dcf, 9164 },
+  { 0x000dd0, 9179 },
+  { 0x000dd1, 9190 },
+  { 0x000dd2, 9206 },
+  { 0x000dd3, 9218 },
+  { 0x000dd4, 9230 },
+  { 0x000dd5, 9241 },
+  { 0x000dd6, 9253 },
+  { 0x000dd7, 9265 },
+  { 0x000dd8, 9278 },
+  { 0x000dd9, 9289 },
+  { 0x000dda, 9301 },
+  { 0x000dde, 9314 },
+  { 0x000ddf, 9337 },
+  { 0x000de0, 9347 },
+  { 0x000de1, 9358 },
+  { 0x000de2, 9370 },
+  { 0x000de3, 9381 },
+  { 0x000de4, 9400 },
+  { 0x000de5, 9420 },
+  { 0x000de6, 9437 },
+  { 0x000de7, 9451 },
+  { 0x000de8, 9466 },
+  { 0x000de9, 9477 },
+  { 0x000dea, 9489 },
+  { 0x000deb, 9501 },
+  { 0x000dec, 9518 },
+  { 0x000ded, 9535 },
+  { 0x000df0, 9549 },
+  { 0x000df1, 9561 },
+  { 0x000df2, 9574 },
+  { 0x000df3, 9587 },
+  { 0x000df4, 9599 },
+  { 0x000df5, 9610 },
+  { 0x000df6, 9621 },
+  { 0x000df7, 9633 },
+  { 0x000df8, 9646 },
+  { 0x000df9, 9659 },
+  { 0x000ea1, 9671 },
+  { 0x000ea2, 9685 },
+  { 0x000ea3, 9704 },
+  { 0x000ea4, 9722 },
+  { 0x000ea5, 9735 },
+  { 0x000ea6, 9753 },
+  { 0x000ea7, 9771 },
+  { 0x000ea8, 9785 },
+  { 0x000ea9, 9804 },
+  { 0x000eaa, 9817 },
+  { 0x000eab, 9836 },
+  { 0x000eac, 9854 },
+  { 0x000ead, 9872 },
+  { 0x000eae, 9889 },
+  { 0x000eaf, 9907 },
+  { 0x000eb0, 9926 },
+  { 0x000eb1, 9944 },
+  { 0x000eb2, 9957 },
+  { 0x000eb3, 9970 },
+  { 0x000eb4, 9988 },
+  { 0x000eb5, 10005 },
+  { 0x000eb6, 10017 },
+  { 0x000eb7, 10034 },
+  { 0x000eb8, 10047 },
+  { 0x000eb9, 10060 },
+  { 0x000eba, 10078 },
+  { 0x000ebb, 10091 },
+  { 0x000ebc, 10105 },
+  { 0x000ebd, 10118 },
+  { 0x000ebe, 10132 },
+  { 0x000ebf, 10145 },
+  { 0x000ec0, 10154 },
+  { 0x000ec1, 10164 },
+  { 0x000ec2, 10174 },
+  { 0x000ec3, 10185 },
+  { 0x000ec4, 10195 },
+  { 0x000ec5, 10204 },
+  { 0x000ec6, 10215 },
+  { 0x000ec7, 10225 },
+  { 0x000ec8, 10234 },
+  { 0x000ec9, 10244 },
+  { 0x000eca, 10255 },
+  { 0x000ecb, 10265 },
+  { 0x000ecc, 10275 },
+  { 0x000ecd, 10284 },
+  { 0x000ece, 10295 },
+  { 0x000ecf, 10305 },
+  { 0x000ed0, 10315 },
+  { 0x000ed1, 10325 },
+  { 0x000ed2, 10335 },
+  { 0x000ed3, 10345 },
+  { 0x000ed4, 10354 },
+  { 0x000ed5, 10370 },
+  { 0x000ed6, 10391 },
+  { 0x000ed7, 10411 },
+  { 0x000ed8, 10426 },
+  { 0x000ed9, 10446 },
+  { 0x000eda, 10466 },
+  { 0x000edb, 10482 },
+  { 0x000edc, 10497 },
+  { 0x000edd, 10518 },
+  { 0x000ede, 10538 },
+  { 0x000edf, 10558 },
+  { 0x000ee0, 10577 },
+  { 0x000ee1, 10597 },
+  { 0x000ee2, 10618 },
+  { 0x000ee3, 10638 },
+  { 0x000ee4, 10653 },
+  { 0x000ee5, 10668 },
+  { 0x000ee6, 10687 },
+  { 0x000ee7, 10701 },
+  { 0x000ee8, 10720 },
+  { 0x000ee9, 10735 },
+  { 0x000eea, 10750 },
+  { 0x000eeb, 10765 },
+  { 0x000eec, 10781 },
+  { 0x000eed, 10796 },
+  { 0x000eee, 10812 },
+  { 0x000eef, 10827 },
+  { 0x000ef0, 10851 },
+  { 0x000ef1, 10876 },
+  { 0x000ef2, 10901 },
+  { 0x000ef3, 10916 },
+  { 0x000ef4, 10941 },
+  { 0x000ef5, 10967 },
+  { 0x000ef6, 10986 },
+  { 0x000ef7, 10999 },
+  { 0x000ef8, 11013 },
+  { 0x000ef9, 11030 },
+  { 0x000efa, 11057 },
+  { 0x000eff, 11078 },
+  { 0x0013bc, 11089 },
+  { 0x0013bd, 11092 },
+  { 0x0013be, 11095 },
+  { 0x0020ac, 11106 },
+  { 0x00fd01, 11115 },
+  { 0x00fd02, 11130 },
+  { 0x00fd03, 11145 },
+  { 0x00fd04, 11157 },
+  { 0x00fd05, 11168 },
+  { 0x00fd06, 11181 },
+  { 0x00fd07, 11195 },
+  { 0x00fd08, 11211 },
+  { 0x00fd09, 11222 },
+  { 0x00fd0a, 11232 },
+  { 0x00fd0b, 11241 },
+  { 0x00fd0c, 11250 },
+  { 0x00fd0d, 11259 },
+  { 0x00fd0e, 11269 },
+  { 0x00fd0f, 11279 },
+  { 0x00fd10, 11296 },
+  { 0x00fd11, 11311 },
+  { 0x00fd12, 11325 },
+  { 0x00fd13, 11335 },
+  { 0x00fd14, 11346 },
+  { 0x00fd15, 11356 },
+  { 0x00fd16, 11366 },
+  { 0x00fd17, 11376 },
+  { 0x00fd18, 11387 },
+  { 0x00fd19, 11399 },
+  { 0x00fd1a, 11417 },
+  { 0x00fd1b, 11433 },
+  { 0x00fd1c, 11447 },
+  { 0x00fd1d, 11465 },
+  { 0x00fd1e, 11482 },
+  { 0x00fe01, 11493 },
+  { 0x00fe02, 11502 },
+  { 0x00fe03, 11519 },
+  { 0x00fe04, 11536 },
+  { 0x00fe05, 11553 },
+  { 0x00fe06, 11569 },
+  { 0x00fe07, 11585 },
+  { 0x00fe08, 11600 },
+  { 0x00fe09, 11615 },
+  { 0x00fe0a, 11635 },
+  { 0x00fe0b, 11650 },
+  { 0x00fe0c, 11670 },
+  { 0x00fe0d, 11686 },
+  { 0x00fe0e, 11707 },
+  { 0x00fe0f, 11722 },
+  { 0x00fe11, 11742 },
+  { 0x00fe12, 11759 },
+  { 0x00fe13, 11776 },
+  { 0x00fe20, 11792 },
+  { 0x00fe21, 11805 },
+  { 0x00fe22, 11822 },
+  { 0x00fe23, 11841 },
+  { 0x00fe24, 11861 },
+  { 0x00fe25, 11883 },
+  { 0x00fe26, 11906 },
+  { 0x00fe27, 11930 },
+  { 0x00fe28, 11950 },
+  { 0x00fe29, 11971 },
+  { 0x00fe2a, 11995 },
+  { 0x00fe2b, 12020 },
+  { 0x00fe2c, 12045 },
+  { 0x00fe2d, 12066 },
+  { 0x00fe2e, 12088 },
+  { 0x00fe2f, 12107 },
+  { 0x00fe30, 12128 },
+  { 0x00fe31, 12153 },
+  { 0x00fe32, 12181 },
+  { 0x00fe33, 12195 },
+  { 0x00fe34, 12213 },
+  { 0x00fe50, 12223 },
+  { 0x00fe51, 12234 },
+  { 0x00fe52, 12245 },
+  { 0x00fe53, 12261 },
+  { 0x00fe53, 12278 },
+  { 0x00fe54, 12289 },
+  { 0x00fe55, 12301 },
+  { 0x00fe56, 12312 },
+  { 0x00fe57, 12326 },
+  { 0x00fe58, 12341 },
+  { 0x00fe59, 12356 },
+  { 0x00fe5a, 12373 },
+  { 0x00fe5b, 12384 },
+  { 0x00fe5c, 12397 },
+  { 0x00fe5d, 12409 },
+  { 0x00fe5e, 12419 },
+  { 0x00fe5f, 12437 },
+  { 0x00fe60, 12459 },
+  { 0x00fe61, 12473 },
+  { 0x00fe62, 12483 },
+  { 0x00fe63, 12493 },
+  { 0x00fe64, 12505 },
+  { 0x00fe64, 12521 },
+  { 0x00fe65, 12532 },
+  { 0x00fe65, 12556 },
+  { 0x00fe66, 12567 },
+  { 0x00fe67, 12584 },
+  { 0x00fe68, 12599 },
+  { 0x00fe69, 12616 },
+  { 0x00fe6a, 12637 },
+  { 0x00fe6b, 12653 },
+  { 0x00fe6c, 12669 },
+  { 0x00fe6d, 12689 },
+  { 0x00fe6e, 12708 },
+  { 0x00fe6f, 12724 },
+  { 0x00fe70, 12738 },
+  { 0x00fe71, 12753 },
+  { 0x00fe72, 12777 },
+  { 0x00fe73, 12795 },
+  { 0x00fe74, 12811 },
+  { 0x00fe75, 12829 },
+  { 0x00fe76, 12847 },
+  { 0x00fe77, 12864 },
+  { 0x00fe78, 12887 },
+  { 0x00fe79, 12903 },
+  { 0x00fe7a, 12919 },
+  { 0x00fe80, 12938 },
+  { 0x00fe81, 12945 },
+  { 0x00fe82, 12952 },
+  { 0x00fe83, 12959 },
+  { 0x00fe84, 12966 },
+  { 0x00fe85, 12973 },
+  { 0x00fe86, 12980 },
+  { 0x00fe87, 12987 },
+  { 0x00fe88, 12994 },
+  { 0x00fe89, 13001 },
+  { 0x00fe8a, 13008 },
+  { 0x00fe8b, 13025 },
+  { 0x00fe8c, 13044 },
+  { 0x00fea0, 13055 },
+  { 0x00fea1, 13058 },
+  { 0x00fea2, 13061 },
+  { 0x00fea3, 13064 },
+  { 0x00fea4, 13068 },
+  { 0x00fea5, 13072 },
+  { 0x00fed0, 13076 },
+  { 0x00fed1, 13097 },
+  { 0x00fed2, 13117 },
+  { 0x00fed4, 13137 },
+  { 0x00fed5, 13157 },
+  { 0x00fee0, 13174 },
+  { 0x00fee1, 13187 },
+  { 0x00fee2, 13201 },
+  { 0x00fee3, 13212 },
+  { 0x00fee4, 13225 },
+  { 0x00fee5, 13240 },
+  { 0x00fee6, 13256 },
+  { 0x00fee7, 13273 },
+  { 0x00fee8, 13291 },
+  { 0x00fee9, 13311 },
+  { 0x00feea, 13327 },
+  { 0x00feeb, 13343 },
+  { 0x00feec, 13359 },
+  { 0x00feed, 13375 },
+  { 0x00feee, 13391 },
+  { 0x00feef, 13413 },
+  { 0x00fef0, 13431 },
+  { 0x00fef1, 13449 },
+  { 0x00fef2, 13467 },
+  { 0x00fef3, 13485 },
+  { 0x00fef4, 13503 },
+  { 0x00fef5, 13521 },
+  { 0x00fef6, 13535 },
+  { 0x00fef7, 13549 },
+  { 0x00fef8, 13563 },
+  { 0x00fef9, 13577 },
+  { 0x00fefa, 13596 },
+  { 0x00fefb, 13615 },
+  { 0x00fefc, 13635 },
+  { 0x00fefd, 13655 },
+  { 0x00ff08, 13669 },
+  { 0x00ff09, 13679 },
+  { 0x00ff0a, 13683 },
+  { 0x00ff0b, 13692 },
+  { 0x00ff0d, 13698 },
+  { 0x00ff13, 13705 },
+  { 0x00ff14, 13711 },
+  { 0x00ff15, 13723 },
+  { 0x00ff1b, 13731 },
+  { 0x00ff20, 13738 },
+  { 0x00ff21, 13748 },
+  { 0x00ff22, 13754 },
+  { 0x00ff23, 13763 },
+  { 0x00ff23, 13770 },
+  { 0x00ff24, 13782 },
+  { 0x00ff25, 13789 },
+  { 0x00ff26, 13798 },
+  { 0x00ff27, 13807 },
+  { 0x00ff28, 13825 },
+  { 0x00ff29, 13833 },
+  { 0x00ff2a, 13841 },
+  { 0x00ff2b, 13857 },
+  { 0x00ff2c, 13865 },
+  { 0x00ff2d, 13872 },
+  { 0x00ff2e, 13882 },
+  { 0x00ff2f, 13893 },
+  { 0x00ff30, 13904 },
+  { 0x00ff31, 13916 },
+  { 0x00ff32, 13923 },
+  { 0x00ff33, 13936 },
+  { 0x00ff34, 13947 },
+  { 0x00ff35, 13960 },
+  { 0x00ff36, 13972 },
+  { 0x00ff37, 13986 },
+  { 0x00ff37, 13996 },
+  { 0x00ff37, 14013 },
+  { 0x00ff38, 14026 },
+  { 0x00ff39, 14040 },
+  { 0x00ff3a, 14053 },
+  { 0x00ff3b, 14069 },
+  { 0x00ff3c, 14086 },
+  { 0x00ff3c, 14109 },
+  { 0x00ff3d, 14125 },
+  { 0x00ff3d, 14150 },
+  { 0x00ff3d, 14168 },
+  { 0x00ff3e, 14177 },
+  { 0x00ff3e, 14202 },
+  { 0x00ff3e, 14211 },
+  { 0x00ff3f, 14229 },
+  { 0x00ff50, 14244 },
+  { 0x00ff51, 14249 },
+  { 0x00ff52, 14254 },
+  { 0x00ff53, 14257 },
+  { 0x00ff54, 14263 },
+  { 0x00ff55, 14268 },
+  { 0x00ff55, 14276 },
+  { 0x00ff56, 14282 },
+  { 0x00ff56, 14292 },
+  { 0x00ff57, 14297 },
+  { 0x00ff58, 14301 },
+  { 0x00ff60, 14307 },
+  { 0x00ff61, 14314 },
+  { 0x00ff62, 14320 },
+  { 0x00ff63, 14328 },
+  { 0x00ff65, 14335 },
+  { 0x00ff66, 14340 },
+  { 0x00ff67, 14345 },
+  { 0x00ff68, 14350 },
+  { 0x00ff69, 14355 },
+  { 0x00ff6a, 14362 },
+  { 0x00ff6b, 14367 },
+  { 0x00ff7e, 14373 },
+  { 0x00ff7e, 14387 },
+  { 0x00ff7e, 14400 },
+  { 0x00ff7e, 14414 },
+  { 0x00ff7e, 14428 },
+  { 0x00ff7e, 14444 },
+  { 0x00ff7e, 14456 },
+  { 0x00ff7e, 14468 },
+  { 0x00ff7f, 14482 },
+  { 0x00ff80, 14491 },
+  { 0x00ff89, 14500 },
+  { 0x00ff8d, 14507 },
+  { 0x00ff91, 14516 },
+  { 0x00ff92, 14522 },
+  { 0x00ff93, 14528 },
+  { 0x00ff94, 14534 },
+  { 0x00ff95, 14540 },
+  { 0x00ff96, 14548 },
+  { 0x00ff97, 14556 },
+  { 0x00ff98, 14562 },
+  { 0x00ff99, 14571 },
+  { 0x00ff9a, 14579 },
+  { 0x00ff9a, 14590 },
+  { 0x00ff9b, 14599 },
+  { 0x00ff9b, 14607 },
+  { 0x00ff9c, 14620 },
+  { 0x00ff9d, 14627 },
+  { 0x00ff9e, 14636 },
+  { 0x00ff9f, 14646 },
+  { 0x00ffaa, 14656 },
+  { 0x00ffab, 14668 },
+  { 0x00ffac, 14675 },
+  { 0x00ffad, 14688 },
+  { 0x00ffae, 14700 },
+  { 0x00ffaf, 14711 },
+  { 0x00ffb0, 14721 },
+  { 0x00ffb1, 14726 },
+  { 0x00ffb2, 14731 },
+  { 0x00ffb3, 14736 },
+  { 0x00ffb4, 14741 },
+  { 0x00ffb5, 14746 },
+  { 0x00ffb6, 14751 },
+  { 0x00ffb7, 14756 },
+  { 0x00ffb8, 14761 },
+  { 0x00ffb9, 14766 },
+  { 0x00ffbd, 14771 },
+  { 0x00ffbe, 14780 },
+  { 0x00ffbf, 14783 },
+  { 0x00ffc0, 14786 },
+  { 0x00ffc1, 14789 },
+  { 0x00ffc2, 14792 },
+  { 0x00ffc3, 14795 },
+  { 0x00ffc4, 14798 },
+  { 0x00ffc5, 14801 },
+  { 0x00ffc6, 14804 },
+  { 0x00ffc7, 14807 },
+  { 0x00ffc8, 14811 },
+  { 0x00ffc8, 14815 },
+  { 0x00ffc9, 14818 },
+  { 0x00ffc9, 14822 },
+  { 0x00ffca, 14825 },
+  { 0x00ffca, 14829 },
+  { 0x00ffcb, 14832 },
+  { 0x00ffcb, 14836 },
+  { 0x00ffcc, 14839 },
+  { 0x00ffcc, 14843 },
+  { 0x00ffcd, 14846 },
+  { 0x00ffcd, 14850 },
+  { 0x00ffce, 14853 },
+  { 0x00ffce, 14857 },
+  { 0x00ffcf, 14860 },
+  { 0x00ffcf, 14864 },
+  { 0x00ffd0, 14867 },
+  { 0x00ffd0, 14871 },
+  { 0x00ffd1, 14874 },
+  { 0x00ffd1, 14878 },
+  { 0x00ffd2, 14882 },
+  { 0x00ffd2, 14886 },
+  { 0x00ffd3, 14889 },
+  { 0x00ffd3, 14893 },
+  { 0x00ffd4, 14896 },
+  { 0x00ffd4, 14900 },
+  { 0x00ffd5, 14903 },
+  { 0x00ffd5, 14907 },
+  { 0x00ffd6, 14910 },
+  { 0x00ffd6, 14914 },
+  { 0x00ffd7, 14917 },
+  { 0x00ffd7, 14921 },
+  { 0x00ffd8, 14924 },
+  { 0x00ffd8, 14928 },
+  { 0x00ffd9, 14931 },
+  { 0x00ffd9, 14935 },
+  { 0x00ffda, 14938 },
+  { 0x00ffda, 14942 },
+  { 0x00ffdb, 14945 },
+  { 0x00ffdb, 14949 },
+  { 0x00ffdc, 14953 },
+  { 0x00ffdc, 14957 },
+  { 0x00ffdd, 14961 },
+  { 0x00ffdd, 14965 },
+  { 0x00ffde, 14969 },
+  { 0x00ffde, 14973 },
+  { 0x00ffdf, 14977 },
+  { 0x00ffdf, 14981 },
+  { 0x00ffe0, 14985 },
+  { 0x00ffe0, 14989 },
+  { 0x00ffe1, 14993 },
+  { 0x00ffe2, 15001 },
+  { 0x00ffe3, 15009 },
+  { 0x00ffe4, 15019 },
+  { 0x00ffe5, 15029 },
+  { 0x00ffe6, 15039 },
+  { 0x00ffe7, 15050 },
+  { 0x00ffe8, 15057 },
+  { 0x00ffe9, 15064 },
+  { 0x00ffea, 15070 },
+  { 0x00ffeb, 15076 },
+  { 0x00ffec, 15084 },
+  { 0x00ffed, 15092 },
+  { 0x00ffee, 15100 },
+  { 0x00fff1, 15108 },
+  { 0x00fff2, 15122 },
+  { 0x00fff3, 15136 },
+  { 0x00fff4, 15150 },
+  { 0x00fff5, 15164 },
+  { 0x00fff6, 15178 },
+  { 0x00fff7, 15192 },
+  { 0x00fff8, 15206 },
+  { 0x00fff9, 15220 },
+  { 0x00fffa, 15234 },
+  { 0x00ffff, 15249 },
+  { 0x100012c, 15256 },
+  { 0x100012d, 15263 },
+  { 0x1000174, 15270 },
+  { 0x1000175, 15282 },
+  { 0x1000176, 15294 },
+  { 0x1000177, 15306 },
+  { 0x100018f, 15318 },
+  { 0x100019f, 15324 },
+  { 0x10001a0, 15332 },
+  { 0x10001a1, 15338 },
+  { 0x10001af, 15344 },
+  { 0x10001b0, 15350 },
+  { 0x10001b5, 15356 },
+  { 0x10001b6, 15364 },
+  { 0x10001b7, 15372 },
+  { 0x10001d1, 15376 },
+  { 0x10001d2, 15383 },
+  { 0x10001e6, 15390 },
+  { 0x10001e7, 15397 },
+  { 0x1000259, 15404 },
+  { 0x1000275, 15410 },
+  { 0x1000292, 15418 },
+  { 0x1000492, 15422 },
+  { 0x1000493, 15439 },
+  { 0x1000496, 15456 },
+  { 0x1000497, 15479 },
+  { 0x100049a, 15502 },
+  { 0x100049b, 15524 },
+  { 0x100049c, 15546 },
+  { 0x100049d, 15569 },
+  { 0x10004a2, 15592 },
+  { 0x10004a3, 15614 },
+  { 0x10004ae, 15636 },
+  { 0x10004af, 15656 },
+  { 0x10004b0, 15676 },
+  { 0x10004b1, 15700 },
+  { 0x10004b2, 15724 },
+  { 0x10004b3, 15746 },
+  { 0x10004b6, 15768 },
+  { 0x10004b7, 15791 },
+  { 0x10004b8, 15814 },
+  { 0x10004b9, 15838 },
+  { 0x10004ba, 15862 },
+  { 0x10004bb, 15876 },
+  { 0x10004d8, 15890 },
+  { 0x10004d9, 15905 },
+  { 0x10004e2, 15920 },
+  { 0x10004e3, 15938 },
+  { 0x10004e8, 15956 },
+  { 0x10004e9, 15971 },
+  { 0x10004ee, 15986 },
+  { 0x10004ef, 16004 },
+  { 0x1000531, 16022 },
+  { 0x1000532, 16035 },
+  { 0x1000533, 16048 },
+  { 0x1000534, 16061 },
+  { 0x1000535, 16073 },
+  { 0x1000536, 16087 },
+  { 0x1000537, 16099 },
+  { 0x1000538, 16110 },
+  { 0x1000539, 16122 },
+  { 0x100053a, 16134 },
+  { 0x100053b, 16147 },
+  { 0x100053c, 16160 },
+  { 0x100053d, 16174 },
+  { 0x100053e, 16187 },
+  { 0x100053f, 16200 },
+  { 0x1000540, 16213 },
+  { 0x1000541, 16225 },
+  { 0x1000542, 16238 },
+  { 0x1000543, 16252 },
+  { 0x1000544, 16266 },
+  { 0x1000545, 16279 },
+  { 0x1000546, 16291 },
+  { 0x1000547, 16303 },
+  { 0x1000548, 16316 },
+  { 0x1000549, 16328 },
+  { 0x100054a, 16341 },
+  { 0x100054b, 16353 },
+  { 0x100054c, 16365 },
+  { 0x100054d, 16377 },
+  { 0x100054e, 16389 },
+  { 0x100054f, 16402 },
+  { 0x1000550, 16416 },
+  { 0x1000551, 16428 },
+  { 0x1000552, 16441 },
+  { 0x1000553, 16455 },
+  { 0x1000554, 16469 },
+  { 0x1000555, 16481 },
+  { 0x1000556, 16492 },
+  { 0x100055a, 16504 },
+  { 0x100055b, 16524 },
+  { 0x100055b, 16540 },
+  { 0x100055c, 16556 },
+  { 0x100055c, 16572 },
+  { 0x100055d, 16588 },
+  { 0x100055d, 16601 },
+  { 0x100055e, 16626 },
+  { 0x100055e, 16642 },
+  { 0x1000561, 16660 },
+  { 0x1000562, 16673 },
+  { 0x1000563, 16686 },
+  { 0x1000564, 16699 },
+  { 0x1000565, 16711 },
+  { 0x1000566, 16725 },
+  { 0x1000567, 16737 },
+  { 0x1000568, 16748 },
+  { 0x1000569, 16760 },
+  { 0x100056a, 16772 },
+  { 0x100056b, 16785 },
+  { 0x100056c, 16798 },
+  { 0x100056d, 16812 },
+  { 0x100056e, 16825 },
+  { 0x100056f, 16838 },
+  { 0x1000570, 16851 },
+  { 0x1000571, 16863 },
+  { 0x1000572, 16876 },
+  { 0x1000573, 16890 },
+  { 0x1000574, 16904 },
+  { 0x1000575, 16917 },
+  { 0x1000576, 16929 },
+  { 0x1000577, 16941 },
+  { 0x1000578, 16954 },
+  { 0x1000579, 16966 },
+  { 0x100057a, 16979 },
+  { 0x100057b, 16991 },
+  { 0x100057c, 17003 },
+  { 0x100057d, 17015 },
+  { 0x100057e, 17027 },
+  { 0x100057f, 17040 },
+  { 0x1000580, 17054 },
+  { 0x1000581, 17066 },
+  { 0x1000582, 17079 },
+  { 0x1000583, 17093 },
+  { 0x1000584, 17107 },
+  { 0x1000585, 17119 },
+  { 0x1000586, 17130 },
+  { 0x1000587, 17142 },
+  { 0x1000589, 17163 },
+  { 0x1000589, 17182 },
+  { 0x100058a, 17200 },
+  { 0x100058a, 17216 },
+  { 0x1000653, 17234 },
+  { 0x1000654, 17253 },
+  { 0x1000655, 17272 },
+  { 0x1000660, 17291 },
+  { 0x1000661, 17300 },
+  { 0x1000662, 17309 },
+  { 0x1000663, 17318 },
+  { 0x1000664, 17327 },
+  { 0x1000665, 17336 },
+  { 0x1000666, 17345 },
+  { 0x1000667, 17354 },
+  { 0x1000668, 17363 },
+  { 0x1000669, 17372 },
+  { 0x100066a, 17381 },
+  { 0x1000670, 17396 },
+  { 0x1000679, 17420 },
+  { 0x100067e, 17432 },
+  { 0x1000686, 17443 },
+  { 0x1000688, 17456 },
+  { 0x1000691, 17468 },
+  { 0x1000698, 17480 },
+  { 0x10006a4, 17491 },
+  { 0x10006a9, 17502 },
+  { 0x10006af, 17515 },
+  { 0x10006ba, 17526 },
+  { 0x10006be, 17545 },
+  { 0x10006c1, 17568 },
+  { 0x10006cc, 17584 },
+  { 0x10006cc, 17601 },
+  { 0x10006d2, 17611 },
+  { 0x10006d4, 17628 },
+  { 0x10006f0, 17644 },
+  { 0x10006f1, 17652 },
+  { 0x10006f2, 17660 },
+  { 0x10006f3, 17668 },
+  { 0x10006f4, 17676 },
+  { 0x10006f5, 17684 },
+  { 0x10006f6, 17692 },
+  { 0x10006f7, 17700 },
+  { 0x10006f8, 17708 },
+  { 0x10006f9, 17716 },
+  { 0x1000d82, 17724 },
+  { 0x1000d83, 17732 },
+  { 0x1000d85, 17740 },
+  { 0x1000d86, 17747 },
+  { 0x1000d87, 17755 },
+  { 0x1000d88, 17763 },
+  { 0x1000d89, 17772 },
+  { 0x1000d8a, 17779 },
+  { 0x1000d8b, 17787 },
+  { 0x1000d8c, 17794 },
+  { 0x1000d8d, 17802 },
+  { 0x1000d8e, 17810 },
+  { 0x1000d8f, 17819 },
+  { 0x1000d90, 17827 },
+  { 0x1000d91, 17836 },
+  { 0x1000d92, 17843 },
+  { 0x1000d93, 17851 },
+  { 0x1000d94, 17859 },
+  { 0x1000d95, 17866 },
+  { 0x1000d96, 17874 },
+  { 0x1000d9a, 17882 },
+  { 0x1000d9b, 17890 },
+  { 0x1000d9c, 17899 },
+  { 0x1000d9d, 17907 },
+  { 0x1000d9e, 17916 },
+  { 0x1000d9f, 17925 },
+  { 0x1000da0, 17934 },
+  { 0x1000da1, 17942 },
+  { 0x1000da2, 17951 },
+  { 0x1000da3, 17959 },
+  { 0x1000da4, 17968 },
+  { 0x1000da5, 17977 },
+  { 0x1000da6, 17987 },
+  { 0x1000da7, 17996 },
+  { 0x1000da8, 18005 },
+  { 0x1000da9, 18015 },
+  { 0x1000daa, 18024 },
+  { 0x1000dab, 18034 },
+  { 0x1000dac, 18043 },
+  { 0x1000dad, 18053 },
+  { 0x1000dae, 18062 },
+  { 0x1000daf, 18072 },
+  { 0x1000db0, 18081 },
+  { 0x1000db1, 18091 },
+  { 0x1000db3, 18099 },
+  { 0x1000db4, 18109 },
+  { 0x1000db5, 18117 },
+  { 0x1000db6, 18126 },
+  { 0x1000db7, 18134 },
+  { 0x1000db8, 18143 },
+  { 0x1000db9, 18151 },
+  { 0x1000dba, 18160 },
+  { 0x1000dbb, 18168 },
+  { 0x1000dbd, 18176 },
+  { 0x1000dc0, 18184 },
+  { 0x1000dc1, 18192 },
+  { 0x1000dc2, 18201 },
+  { 0x1000dc3, 18211 },
+  { 0x1000dc4, 18219 },
+  { 0x1000dc5, 18227 },
+  { 0x1000dc6, 18236 },
+  { 0x1000dca, 18244 },
+  { 0x1000dcf, 18252 },
+  { 0x1000dd0, 18261 },
+  { 0x1000dd1, 18270 },
+  { 0x1000dd2, 18280 },
+  { 0x1000dd3, 18288 },
+  { 0x1000dd4, 18297 },
+  { 0x1000dd6, 18305 },
+  { 0x1000dd8, 18314 },
+  { 0x1000dd9, 18323 },
+  { 0x1000dda, 18331 },
+  { 0x1000ddb, 18340 },
+  { 0x1000ddc, 18349 },
+  { 0x1000ddd, 18357 },
+  { 0x1000dde, 18366 },
+  { 0x1000ddf, 18375 },
+  { 0x1000df2, 18384 },
+  { 0x1000df3, 18394 },
+  { 0x1000df4, 18404 },
+  { 0x10010d0, 18420 },
+  { 0x10010d1, 18432 },
+  { 0x10010d2, 18445 },
+  { 0x10010d3, 18458 },
+  { 0x10010d4, 18471 },
+  { 0x10010d5, 18483 },
+  { 0x10010d6, 18496 },
+  { 0x10010d7, 18509 },
+  { 0x10010d8, 18522 },
+  { 0x10010d9, 18534 },
+  { 0x10010da, 18547 },
+  { 0x10010db, 18560 },
+  { 0x10010dc, 18573 },
+  { 0x10010dd, 18586 },
+  { 0x10010de, 18598 },
+  { 0x10010df, 18611 },
+  { 0x10010e0, 18625 },
+  { 0x10010e1, 18638 },
+  { 0x10010e2, 18651 },
+  { 0x10010e3, 18664 },
+  { 0x10010e4, 18676 },
+  { 0x10010e5, 18690 },
+  { 0x10010e6, 18704 },
+  { 0x10010e7, 18718 },
+  { 0x10010e8, 18731 },
+  { 0x10010e9, 18745 },
+  { 0x10010ea, 18759 },
+  { 0x10010eb, 18772 },
+  { 0x10010ec, 18785 },
+  { 0x10010ed, 18798 },
+  { 0x10010ee, 18812 },
+  { 0x10010ef, 18825 },
+  { 0x10010f0, 18839 },
+  { 0x10010f1, 18852 },
+  { 0x10010f2, 18864 },
+  { 0x10010f3, 18877 },
+  { 0x10010f4, 18889 },
+  { 0x10010f5, 18902 },
+  { 0x10010f6, 18915 },
+  { 0x1001e02, 18927 },
+  { 0x1001e03, 18937 },
+  { 0x1001e0a, 18947 },
+  { 0x1001e0b, 18957 },
+  { 0x1001e1e, 18967 },
+  { 0x1001e1f, 18977 },
+  { 0x1001e36, 18987 },
+  { 0x1001e37, 18997 },
+  { 0x1001e40, 19007 },
+  { 0x1001e41, 19017 },
+  { 0x1001e56, 19027 },
+  { 0x1001e57, 19037 },
+  { 0x1001e60, 19047 },
+  { 0x1001e61, 19057 },
+  { 0x1001e6a, 19067 },
+  { 0x1001e6b, 19077 },
+  { 0x1001e80, 19087 },
+  { 0x1001e81, 19094 },
+  { 0x1001e82, 19101 },
+  { 0x1001e83, 19108 },
+  { 0x1001e84, 19115 },
+  { 0x1001e85, 19126 },
+  { 0x1001e8a, 19137 },
+  { 0x1001e8b, 19147 },
+  { 0x1001ea0, 19157 },
+  { 0x1001ea1, 19167 },
+  { 0x1001ea2, 19177 },
+  { 0x1001ea3, 19183 },
+  { 0x1001ea4, 19189 },
+  { 0x1001ea5, 19206 },
+  { 0x1001ea6, 19223 },
+  { 0x1001ea7, 19240 },
+  { 0x1001ea8, 19257 },
+  { 0x1001ea9, 19273 },
+  { 0x1001eaa, 19289 },
+  { 0x1001eab, 19306 },
+  { 0x1001eac, 19323 },
+  { 0x1001ead, 19343 },
+  { 0x1001eae, 19363 },
+  { 0x1001eaf, 19375 },
+  { 0x1001eb0, 19387 },
+  { 0x1001eb1, 19399 },
+  { 0x1001eb2, 19411 },
+  { 0x1001eb3, 19422 },
+  { 0x1001eb4, 19433 },
+  { 0x1001eb5, 19445 },
+  { 0x1001eb6, 19457 },
+  { 0x1001eb7, 19472 },
+  { 0x1001eb8, 19487 },
+  { 0x1001eb9, 19497 },
+  { 0x1001eba, 19507 },
+  { 0x1001ebb, 19513 },
+  { 0x1001ebc, 19519 },
+  { 0x1001ebd, 19526 },
+  { 0x1001ebe, 19533 },
+  { 0x1001ebf, 19550 },
+  { 0x1001ec0, 19567 },
+  { 0x1001ec1, 19584 },
+  { 0x1001ec2, 19601 },
+  { 0x1001ec3, 19617 },
+  { 0x1001ec4, 19633 },
+  { 0x1001ec5, 19650 },
+  { 0x1001ec6, 19667 },
+  { 0x1001ec7, 19687 },
+  { 0x1001ec8, 19707 },
+  { 0x1001ec9, 19713 },
+  { 0x1001eca, 19719 },
+  { 0x1001ecb, 19729 },
+  { 0x1001ecc, 19739 },
+  { 0x1001ecd, 19749 },
+  { 0x1001ece, 19759 },
+  { 0x1001ecf, 19765 },
+  { 0x1001ed0, 19771 },
+  { 0x1001ed1, 19788 },
+  { 0x1001ed2, 19805 },
+  { 0x1001ed3, 19822 },
+  { 0x1001ed4, 19839 },
+  { 0x1001ed5, 19855 },
+  { 0x1001ed6, 19871 },
+  { 0x1001ed7, 19888 },
+  { 0x1001ed8, 19905 },
+  { 0x1001ed9, 19925 },
+  { 0x1001eda, 19945 },
+  { 0x1001edb, 19956 },
+  { 0x1001edc, 19967 },
+  { 0x1001edd, 19978 },
+  { 0x1001ede, 19989 },
+  { 0x1001edf, 19999 },
+  { 0x1001ee0, 20009 },
+  { 0x1001ee1, 20020 },
+  { 0x1001ee2, 20031 },
+  { 0x1001ee3, 20045 },
+  { 0x1001ee4, 20059 },
+  { 0x1001ee5, 20069 },
+  { 0x1001ee6, 20079 },
+  { 0x1001ee7, 20085 },
+  { 0x1001ee8, 20091 },
+  { 0x1001ee9, 20102 },
+  { 0x1001eea, 20113 },
+  { 0x1001eeb, 20124 },
+  { 0x1001eec, 20135 },
+  { 0x1001eed, 20145 },
+  { 0x1001eee, 20155 },
+  { 0x1001eef, 20166 },
+  { 0x1001ef0, 20177 },
+  { 0x1001ef1, 20191 },
+  { 0x1001ef2, 20205 },
+  { 0x1001ef3, 20212 },
+  { 0x1001ef4, 20219 },
+  { 0x1001ef5, 20229 },
+  { 0x1001ef6, 20239 },
+  { 0x1001ef7, 20245 },
+  { 0x1001ef8, 20251 },
+  { 0x1001ef9, 20258 },
+  { 0x1002070, 20265 },
+  { 0x1002074, 20278 },
+  { 0x1002075, 20291 },
+  { 0x1002076, 20304 },
+  { 0x1002077, 20316 },
+  { 0x1002078, 20330 },
+  { 0x1002079, 20344 },
+  { 0x1002080, 20357 },
+  { 0x1002081, 20371 },
+  { 0x1002082, 20384 },
+  { 0x1002083, 20397 },
+  { 0x1002084, 20412 },
+  { 0x1002085, 20426 },
+  { 0x1002086, 20440 },
+  { 0x1002087, 20453 },
+  { 0x1002088, 20468 },
+  { 0x1002089, 20483 },
+  { 0x10020a0, 20497 },
+  { 0x10020a1, 20505 },
+  { 0x10020a2, 20515 },
+  { 0x10020a3, 20528 },
+  { 0x10020a4, 20539 },
+  { 0x10020a5, 20548 },
+  { 0x10020a6, 20557 },
+  { 0x10020a7, 20567 },
+  { 0x10020a8, 20578 },
+  { 0x10020a9, 20588 },
+  { 0x10020aa, 20596 },
+  { 0x10020ab, 20610 },
+  { 0x1002202, 20619 },
+  { 0x1002205, 20636 },
+  { 0x1002208, 20645 },
+  { 0x1002209, 20655 },
+  { 0x100220b, 20668 },
+  { 0x100221a, 20679 },
+  { 0x100221b, 20690 },
+  { 0x100221c, 20699 },
+  { 0x100222c, 20710 },
+  { 0x100222d, 20720 },
+  { 0x1002235, 20730 },
+  { 0x1002247, 20738 },
+  { 0x1002248, 20750 },
+  { 0x1002262, 20759 },
+  { 0x1002263, 20772 },
+  { 0x1002800, 20781 },
+  { 0x1002801, 20795 },
+  { 0x1002802, 20810 },
+  { 0x1002803, 20825 },
+  { 0x1002804, 20841 },
+  { 0x1002805, 20856 },
+  { 0x1002806, 20872 },
+  { 0x1002807, 20888 },
+  { 0x1002808, 20905 },
+  { 0x1002809, 20920 },
+  { 0x100280a, 20936 },
+  { 0x100280b, 20952 },
+  { 0x100280c, 20969 },
+  { 0x100280d, 20985 },
+  { 0x100280e, 21002 },
+  { 0x100280f, 21019 },
+  { 0x1002810, 21037 },
+  { 0x1002811, 21052 },
+  { 0x1002812, 21068 },
+  { 0x1002813, 21084 },
+  { 0x1002814, 21101 },
+  { 0x1002815, 21117 },
+  { 0x1002816, 21134 },
+  { 0x1002817, 21151 },
+  { 0x1002818, 21169 },
+  { 0x1002819, 21185 },
+  { 0x100281a, 21202 },
+  { 0x100281b, 21219 },
+  { 0x100281c, 21237 },
+  { 0x100281d, 21254 },
+  { 0x100281e, 21272 },
+  { 0x100281f, 21290 },
+  { 0x1002820, 21309 },
+  { 0x1002821, 21324 },
+  { 0x1002822, 21340 },
+  { 0x1002823, 21356 },
+  { 0x1002824, 21373 },
+  { 0x1002825, 21389 },
+  { 0x1002826, 21406 },
+  { 0x1002827, 21423 },
+  { 0x1002828, 21441 },
+  { 0x1002829, 21457 },
+  { 0x100282a, 21474 },
+  { 0x100282b, 21491 },
+  { 0x100282c, 21509 },
+  { 0x100282d, 21526 },
+  { 0x100282e, 21544 },
+  { 0x100282f, 21562 },
+  { 0x1002830, 21581 },
+  { 0x1002831, 21597 },
+  { 0x1002832, 21614 },
+  { 0x1002833, 21631 },
+  { 0x1002834, 21649 },
+  { 0x1002835, 21666 },
+  { 0x1002836, 21684 },
+  { 0x1002837, 21702 },
+  { 0x1002838, 21721 },
+  { 0x1002839, 21738 },
+  { 0x100283a, 21756 },
+  { 0x100283b, 21774 },
+  { 0x100283c, 21793 },
+  { 0x100283d, 21811 },
+  { 0x100283e, 21830 },
+  { 0x100283f, 21849 },
+  { 0x1002840, 21869 },
+  { 0x1002841, 21884 },
+  { 0x1002842, 21900 },
+  { 0x1002843, 21916 },
+  { 0x1002844, 21933 },
+  { 0x1002845, 21949 },
+  { 0x1002846, 21966 },
+  { 0x1002847, 21983 },
+  { 0x1002848, 22001 },
+  { 0x1002849, 22017 },
+  { 0x100284a, 22034 },
+  { 0x100284b, 22051 },
+  { 0x100284c, 22069 },
+  { 0x100284d, 22086 },
+  { 0x100284e, 22104 },
+  { 0x100284f, 22122 },
+  { 0x1002850, 22141 },
+  { 0x1002851, 22157 },
+  { 0x1002852, 22174 },
+  { 0x1002853, 22191 },
+  { 0x1002854, 22209 },
+  { 0x1002855, 22226 },
+  { 0x1002856, 22244 },
+  { 0x1002857, 22262 },
+  { 0x1002858, 22281 },
+  { 0x1002859, 22298 },
+  { 0x100285a, 22316 },
+  { 0x100285b, 22334 },
+  { 0x100285c, 22353 },
+  { 0x100285d, 22371 },
+  { 0x100285e, 22390 },
+  { 0x100285f, 22409 },
+  { 0x1002860, 22429 },
+  { 0x1002861, 22445 },
+  { 0x1002862, 22462 },
+  { 0x1002863, 22479 },
+  { 0x1002864, 22497 },
+  { 0x1002865, 22514 },
+  { 0x1002866, 22532 },
+  { 0x1002867, 22550 },
+  { 0x1002868, 22569 },
+  { 0x1002869, 22586 },
+  { 0x100286a, 22604 },
+  { 0x100286b, 22622 },
+  { 0x100286c, 22641 },
+  { 0x100286d, 22659 },
+  { 0x100286e, 22678 },
+  { 0x100286f, 22697 },
+  { 0x1002870, 22717 },
+  { 0x1002871, 22734 },
+  { 0x1002872, 22752 },
+  { 0x1002873, 22770 },
+  { 0x1002874, 22789 },
+  { 0x1002875, 22807 },
+  { 0x1002876, 22826 },
+  { 0x1002877, 22845 },
+  { 0x1002878, 22865 },
+  { 0x1002879, 22883 },
+  { 0x100287a, 22902 },
+  { 0x100287b, 22921 },
+  { 0x100287c, 22941 },
+  { 0x100287d, 22960 },
+  { 0x100287e, 22980 },
+  { 0x100287f, 23000 },
+  { 0x1002880, 23021 },
+  { 0x1002881, 23036 },
+  { 0x1002882, 23052 },
+  { 0x1002883, 23068 },
+  { 0x1002884, 23085 },
+  { 0x1002885, 23101 },
+  { 0x1002886, 23118 },
+  { 0x1002887, 23135 },
+  { 0x1002888, 23153 },
+  { 0x1002889, 23169 },
+  { 0x100288a, 23186 },
+  { 0x100288b, 23203 },
+  { 0x100288c, 23221 },
+  { 0x100288d, 23238 },
+  { 0x100288e, 23256 },
+  { 0x100288f, 23274 },
+  { 0x1002890, 23293 },
+  { 0x1002891, 23309 },
+  { 0x1002892, 23326 },
+  { 0x1002893, 23343 },
+  { 0x1002894, 23361 },
+  { 0x1002895, 23378 },
+  { 0x1002896, 23396 },
+  { 0x1002897, 23414 },
+  { 0x1002898, 23433 },
+  { 0x1002899, 23450 },
+  { 0x100289a, 23468 },
+  { 0x100289b, 23486 },
+  { 0x100289c, 23505 },
+  { 0x100289d, 23523 },
+  { 0x100289e, 23542 },
+  { 0x100289f, 23561 },
+  { 0x10028a0, 23581 },
+  { 0x10028a1, 23597 },
+  { 0x10028a2, 23614 },
+  { 0x10028a3, 23631 },
+  { 0x10028a4, 23649 },
+  { 0x10028a5, 23666 },
+  { 0x10028a6, 23684 },
+  { 0x10028a7, 23702 },
+  { 0x10028a8, 23721 },
+  { 0x10028a9, 23738 },
+  { 0x10028aa, 23756 },
+  { 0x10028ab, 23774 },
+  { 0x10028ac, 23793 },
+  { 0x10028ad, 23811 },
+  { 0x10028ae, 23830 },
+  { 0x10028af, 23849 },
+  { 0x10028b0, 23869 },
+  { 0x10028b1, 23886 },
+  { 0x10028b2, 23904 },
+  { 0x10028b3, 23922 },
+  { 0x10028b4, 23941 },
+  { 0x10028b5, 23959 },
+  { 0x10028b6, 23978 },
+  { 0x10028b7, 23997 },
+  { 0x10028b8, 24017 },
+  { 0x10028b9, 24035 },
+  { 0x10028ba, 24054 },
+  { 0x10028bb, 24073 },
+  { 0x10028bc, 24093 },
+  { 0x10028bd, 24112 },
+  { 0x10028be, 24132 },
+  { 0x10028bf, 24152 },
+  { 0x10028c0, 24173 },
+  { 0x10028c1, 24189 },
+  { 0x10028c2, 24206 },
+  { 0x10028c3, 24223 },
+  { 0x10028c4, 24241 },
+  { 0x10028c5, 24258 },
+  { 0x10028c6, 24276 },
+  { 0x10028c7, 24294 },
+  { 0x10028c8, 24313 },
+  { 0x10028c9, 24330 },
+  { 0x10028ca, 24348 },
+  { 0x10028cb, 24366 },
+  { 0x10028cc, 24385 },
+  { 0x10028cd, 24403 },
+  { 0x10028ce, 24422 },
+  { 0x10028cf, 24441 },
+  { 0x10028d0, 24461 },
+  { 0x10028d1, 24478 },
+  { 0x10028d2, 24496 },
+  { 0x10028d3, 24514 },
+  { 0x10028d4, 24533 },
+  { 0x10028d5, 24551 },
+  { 0x10028d6, 24570 },
+  { 0x10028d7, 24589 },
+  { 0x10028d8, 24609 },
+  { 0x10028d9, 24627 },
+  { 0x10028da, 24646 },
+  { 0x10028db, 24665 },
+  { 0x10028dc, 24685 },
+  { 0x10028dd, 24704 },
+  { 0x10028de, 24724 },
+  { 0x10028df, 24744 },
+  { 0x10028e0, 24765 },
+  { 0x10028e1, 24782 },
+  { 0x10028e2, 24800 },
+  { 0x10028e3, 24818 },
+  { 0x10028e4, 24837 },
+  { 0x10028e5, 24855 },
+  { 0x10028e6, 24874 },
+  { 0x10028e7, 24893 },
+  { 0x10028e8, 24913 },
+  { 0x10028e9, 24931 },
+  { 0x10028ea, 24950 },
+  { 0x10028eb, 24969 },
+  { 0x10028ec, 24989 },
+  { 0x10028ed, 25008 },
+  { 0x10028ee, 25028 },
+  { 0x10028ef, 25048 },
+  { 0x10028f0, 25069 },
+  { 0x10028f1, 25087 },
+  { 0x10028f2, 25106 },
+  { 0x10028f3, 25125 },
+  { 0x10028f4, 25145 },
+  { 0x10028f5, 25164 },
+  { 0x10028f6, 25184 },
+  { 0x10028f7, 25204 },
+  { 0x10028f8, 25225 },
+  { 0x10028f9, 25244 },
+  { 0x10028fa, 25264 },
+  { 0x10028fb, 25284 },
+  { 0x10028fc, 25305 },
+  { 0x10028fd, 25325 },
+  { 0x10028fe, 25346 },
+  { 0x10028ff, 25367 },
+  { 0x1008fe01, 25389 },
+  { 0x1008fe02, 25401 },
+  { 0x1008fe03, 25413 },
+  { 0x1008fe04, 25425 },
+  { 0x1008fe05, 25437 },
+  { 0x1008fe06, 25449 },
+  { 0x1008fe07, 25461 },
+  { 0x1008fe08, 25473 },
+  { 0x1008fe09, 25485 },
+  { 0x1008fe0a, 25497 },
+  { 0x1008fe0b, 25510 },
+  { 0x1008fe0c, 25523 },
+  { 0x1008fe20, 25536 },
+  { 0x1008fe21, 25543 },
+  { 0x1008fe22, 25553 },
+  { 0x1008fe23, 25564 },
+  { 0x1008fe24, 25575 },
+  { 0x1008fe25, 25589 },
+  { 0x1008ff01, 25601 },
+  { 0x1008ff02, 25610 },
+  { 0x1008ff03, 25626 },
+  { 0x1008ff04, 25644 },
+  { 0x1008ff05, 25658 },
+  { 0x1008ff06, 25674 },
+  { 0x1008ff10, 25692 },
+  { 0x1008ff11, 25700 },
+  { 0x1008ff12, 25717 },
+  { 0x1008ff13, 25727 },
+  { 0x1008ff14, 25744 },
+  { 0x1008ff15, 25754 },
+  { 0x1008ff16, 25764 },
+  { 0x1008ff17, 25774 },
+  { 0x1008ff18, 25784 },
+  { 0x1008ff19, 25793 },
+  { 0x1008ff1a, 25798 },
+  { 0x1008ff1b, 25804 },
+  { 0x1008ff1c, 25811 },
+  { 0x1008ff1d, 25823 },
+  { 0x1008ff1e, 25834 },
+  { 0x1008ff1f, 25839 },
+  { 0x1008ff20, 25848 },
+  { 0x1008ff21, 25857 },
+  { 0x1008ff22, 25867 },
+  { 0x1008ff23, 25882 },
+  { 0x1008ff24, 25891 },
+  { 0x1008ff25, 25902 },
+  { 0x1008ff26, 25914 },
+  { 0x1008ff27, 25919 },
+  { 0x1008ff28, 25927 },
+  { 0x1008ff29, 25932 },
+  { 0x1008ff2a, 25940 },
+  { 0x1008ff2b, 25949 },
+  { 0x1008ff2c, 25956 },
+  { 0x1008ff2d, 25962 },
+  { 0x1008ff2e, 25974 },
+  { 0x1008ff2f, 25978 },
+  { 0x1008ff30, 25984 },
+  { 0x1008ff31, 25994 },
+  { 0x1008ff32, 26005 },
+  { 0x1008ff33, 26016 },
+  { 0x1008ff34, 26027 },
+  { 0x1008ff35, 26038 },
+  { 0x1008ff36, 26048 },
+  { 0x1008ff37, 26053 },
+  { 0x1008ff38, 26061 },
+  { 0x1008ff39, 26069 },
+  { 0x1008ff3a, 26081 },
+  { 0x1008ff3b, 26090 },
+  { 0x1008ff3c, 26107 },
+  { 0x1008ff3d, 26115 },
+  { 0x1008ff3e, 26125 },
+  { 0x1008ff3f, 26137 },
+  { 0x1008ff40, 26149 },
+  { 0x1008ff41, 26157 },
+  { 0x1008ff42, 26165 },
+  { 0x1008ff43, 26173 },
+  { 0x1008ff44, 26181 },
+  { 0x1008ff45, 26189 },
+  { 0x1008ff46, 26197 },
+  { 0x1008ff47, 26205 },
+  { 0x1008ff48, 26213 },
+  { 0x1008ff49, 26221 },
+  { 0x1008ff4a, 26229 },
+  { 0x1008ff4b, 26237 },
+  { 0x1008ff4c, 26245 },
+  { 0x1008ff4d, 26253 },
+  { 0x1008ff4e, 26261 },
+  { 0x1008ff4f, 26269 },
+  { 0x1008ff50, 26277 },
+  { 0x1008ff51, 26293 },
+  { 0x1008ff52, 26310 },
+  { 0x1008ff53, 26315 },
+  { 0x1008ff55, 26318 },
+  { 0x1008ff56, 26330 },
+  { 0x1008ff57, 26336 },
+  { 0x1008ff58, 26341 },
+  { 0x1008ff59, 26345 },
+  { 0x1008ff5a, 26353 },
+  { 0x1008ff5b, 26357 },
+  { 0x1008ff5c, 26367 },
+  { 0x1008ff5d, 26373 },
+  { 0x1008ff5e, 26382 },
+  { 0x1008ff5f, 26387 },
+  { 0x1008ff60, 26390 },
+  { 0x1008ff61, 26397 },
+  { 0x1008ff62, 26404 },
+  { 0x1008ff63, 26411 },
+  { 0x1008ff65, 26419 },
+  { 0x1008ff66, 26426 },
+  { 0x1008ff67, 26433 },
+  { 0x1008ff68, 26441 },
+  { 0x1008ff69, 26445 },
+  { 0x1008ff6a, 26450 },
+  { 0x1008ff6b, 26461 },
+  { 0x1008ff6c, 26466 },
+  { 0x1008ff6d, 26473 },
+  { 0x1008ff6e, 26479 },
+  { 0x1008ff72, 26485 },
+  { 0x1008ff73, 26491 },
+  { 0x1008ff74, 26498 },
+  { 0x1008ff75, 26512 },
+  { 0x1008ff76, 26523 },
+  { 0x1008ff77, 26534 },
+  { 0x1008ff78, 26539 },
+  { 0x1008ff79, 26548 },
+  { 0x1008ff7a, 26559 },
+  { 0x1008ff7b, 26571 },
+  { 0x1008ff7c, 26576 },
+  { 0x1008ff7d, 26582 },
+  { 0x1008ff7e, 26594 },
+  { 0x1008ff7f, 26602 },
+  { 0x1008ff80, 26611 },
+  { 0x1008ff81, 26620 },
+  { 0x1008ff82, 26626 },
+  { 0x1008ff84, 26633 },
+  { 0x1008ff85, 26640 },
+  { 0x1008ff86, 26648 },
+  { 0x1008ff87, 26656 },
+  { 0x1008ff88, 26662 },
+  { 0x1008ff89, 26674 },
+  { 0x1008ff8a, 26679 },
+  { 0x1008ff8b, 26684 },
+  { 0x1008ff8c, 26691 },
+  { 0x1008ff8d, 26699 },
+  { 0x1008ff8e, 26704 },
+  { 0x1008ff8f, 26714 },
+  { 0x1008ff90, 26721 },
+  { 0x1008ff91, 26733 },
+  { 0x1008ff92, 26742 },
+  { 0x1008ff93, 26748 },
+  { 0x1008ff94, 26756 },
+  { 0x1008ff95, 26766 },
+  { 0x1008ff96, 26771 },
+  { 0x1008ff97, 26775 },
+  { 0x1008ff98, 26788 },
+  { 0x1008ff99, 26800 },
+  { 0x1008ff9a, 26816 },
+  { 0x1008ff9b, 26825 },
+  { 0x1008ff9c, 26841 },
+  { 0x1008ff9d, 26852 },
+  { 0x1008ff9e, 26862 },
+  { 0x1008ff9f, 26875 },
+  { 0x1008ffa0, 26880 },
+  { 0x1008ffa1, 26893 },
+  { 0x1008ffa2, 26898 },
+  { 0x1008ffa3, 26906 },
+  { 0x1008ffa4, 26910 },
+  { 0x1008ffa5, 26916 },
+  { 0x1008ffa6, 26923 },
+  { 0x1008ffa7, 26928 },
+  { 0x1008ffa8, 26936 },
+  { 0x1008ffa9, 26946 },
+  { 0x1008ffb0, 26961 },
+  { 0x1008ffb1, 26972 },
+  { 0x1008ffb2, 26984 },
+  { 0xffffff, 26997 }
 };
 
 static const gdk_key gdk_keys_by_name[] = {
@@ -2631,36 +4559,36 @@ static const gdk_key gdk_keys_by_name[] = {
   { 0x000031, 142 },
   { 0x000032, 144 },
   { 0x000033, 146 },
-  { 0x00fd10, 11341 },
-  { 0x00fd0e, 11314 },
-  { 0x00fd05, 11213 },
-  { 0x00fd19, 11444 },
-  { 0x00fd15, 11401 },
-  { 0x00fd0f, 11324 },
-  { 0x00fd1c, 11492 },
-  { 0x00fd1a, 11462 },
-  { 0x00fd01, 11160 },
-  { 0x00fd1e, 11527 },
-  { 0x00fd06, 11226 },
-  { 0x00fd07, 11240 },
-  { 0x00fd1b, 11478 },
-  { 0x00fd02, 11175 },
-  { 0x00fd13, 11380 },
-  { 0x00fd12, 11370 },
-  { 0x00fd11, 11356 },
-  { 0x00fd04, 11202 },
-  { 0x00fd0a, 11277 },
-  { 0x00fd0b, 11286 },
-  { 0x00fd0c, 11295 },
-  { 0x00fd16, 11411 },
-  { 0x00fd1d, 11510 },
-  { 0x00fd09, 11267 },
-  { 0x00fd18, 11432 },
-  { 0x00fd08, 11256 },
-  { 0x00fd03, 11190 },
-  { 0x00fd14, 11391 },
-  { 0x00fd17, 11421 },
-  { 0x00fd0d, 11304 },
+  { 0x00fd10, 11296 },
+  { 0x00fd0e, 11269 },
+  { 0x00fd05, 11168 },
+  { 0x00fd19, 11399 },
+  { 0x00fd15, 11356 },
+  { 0x00fd0f, 11279 },
+  { 0x00fd1c, 11447 },
+  { 0x00fd1a, 11417 },
+  { 0x00fd01, 11115 },
+  { 0x00fd1e, 11482 },
+  { 0x00fd06, 11181 },
+  { 0x00fd07, 11195 },
+  { 0x00fd1b, 11433 },
+  { 0x00fd02, 11130 },
+  { 0x00fd13, 11335 },
+  { 0x00fd12, 11325 },
+  { 0x00fd11, 11311 },
+  { 0x00fd04, 11157 },
+  { 0x00fd0a, 11232 },
+  { 0x00fd0b, 11241 },
+  { 0x00fd0c, 11250 },
+  { 0x00fd16, 11366 },
+  { 0x00fd1d, 11465 },
+  { 0x00fd09, 11222 },
+  { 0x00fd18, 11387 },
+  { 0x00fd08, 11211 },
+  { 0x00fd03, 11145 },
+  { 0x00fd14, 11346 },
+  { 0x00fd17, 11376 },
+  { 0x00fd0d, 11259 },
   { 0x000034, 148 },
   { 0x000035, 150 },
   { 0x000036, 152 },
@@ -2670,1268 +4598,2314 @@ static const gdk_key gdk_keys_by_name[] = {
   { 0x000041, 207 },
   { 0x0000c6, 787 },
   { 0x0000c1, 744 },
-  { 0x0001c3, 1473 },
-  { 0x00fe70, 12471 },
-  { 0x00fe71, 12486 },
+  { 0x1001ea0, 19157 },
+  { 0x0001c3, 1489 },
+  { 0x1001eae, 19363 },
+  { 0x1001eb6, 19457 },
+  { 0x1001eb0, 19387 },
+  { 0x1001eb2, 19411 },
+  { 0x1001eb4, 19433 },
+  { 0x00fe70, 12738 },
+  { 0x00fe71, 12753 },
   { 0x0000c2, 751 },
+  { 0x1001ea4, 19189 },
+  { 0x1001eac, 19323 },
+  { 0x1001ea6, 19223 },
+  { 0x1001ea8, 19257 },
+  { 0x1001eaa, 19289 },
+  { 0x1008ff39, 26069 },
   { 0x0000c4, 770 },
   { 0x0000c0, 737 },
-  { 0x00ffe9, 14456 },
-  { 0x00ffea, 14462 },
-  { 0x0003c0, 2068 },
-  { 0x0001a1, 1281 },
-  { 0x0005d9, 3221 },
-  { 0x0005c7, 3008 },
-  { 0x0005e9, 3360 },
-  { 0x0005c8, 3020 },
-  { 0x0005ac, 2848 },
-  { 0x0005d6, 3188 },
-  { 0x0005cf, 3107 },
-  { 0x0005ef, 3451 },
-  { 0x0005ec, 3406 },
-  { 0x0005ee, 3438 },
-  { 0x0005eb, 3390 },
-  { 0x0005e1, 3260 },
-  { 0x0005da, 3232 },
-  { 0x0005e7, 3328 },
-  { 0x0005cd, 3084 },
-  { 0x0005c1, 2899 },
-  { 0x0005c3, 2931 },
-  { 0x0005c4, 2950 },
-  { 0x0005c6, 2990 },
-  { 0x0005c5, 2968 },
-  { 0x0005e7, 3338 },
-  { 0x0005cc, 3072 },
-  { 0x0005e3, 3282 },
-  { 0x0005f0, 3464 },
-  { 0x0005ed, 3422 },
-  { 0x0005ce, 3095 },
-  { 0x0005e4, 3293 },
-  { 0x0005c2, 2912 },
-  { 0x0005e5, 3304 },
-  { 0x0005e6, 3316 },
-  { 0x0005e2, 3271 },
-  { 0x0005bf, 2878 },
-  { 0x0005d1, 3130 },
-  { 0x0005d5, 3177 },
-  { 0x0005d3, 3152 },
-  { 0x0005bb, 2861 },
-  { 0x0005f1, 3477 },
-  { 0x0005d4, 3164 },
-  { 0x0005f2, 3491 },
-  { 0x00ff7e, 13847 },
-  { 0x0005d7, 3199 },
-  { 0x0005e0, 3245 },
-  { 0x0005ca, 3049 },
-  { 0x0005c9, 3031 },
-  { 0x0005d0, 3118 },
-  { 0x0005cb, 3060 },
-  { 0x0005e8, 3349 },
-  { 0x0005ea, 3379 },
-  { 0x0005d8, 3210 },
-  { 0x0005d2, 3140 },
+  { 0x1001ea2, 19177 },
+  { 0x00ffe9, 15064 },
+  { 0x00ffea, 15070 },
+  { 0x0003c0, 2084 },
+  { 0x0001a1, 1297 },
+  { 0x1008ff50, 26277 },
+  { 0x1008ff51, 26293 },
+  { 0x1000660, 17291 },
+  { 0x1000661, 17300 },
+  { 0x1000662, 17309 },
+  { 0x1000663, 17318 },
+  { 0x1000664, 17327 },
+  { 0x1000665, 17336 },
+  { 0x1000666, 17345 },
+  { 0x1000667, 17354 },
+  { 0x1000668, 17363 },
+  { 0x1000669, 17372 },
+  { 0x0005d9, 3237 },
+  { 0x0005c7, 3024 },
+  { 0x0005e9, 3376 },
+  { 0x0005c8, 3036 },
+  { 0x0005ac, 2864 },
+  { 0x0005d6, 3204 },
+  { 0x0005cf, 3123 },
+  { 0x0005ef, 3467 },
+  { 0x0005ec, 3422 },
+  { 0x1000688, 17456 },
+  { 0x10006cc, 17584 },
+  { 0x0005ee, 3454 },
+  { 0x0005eb, 3406 },
+  { 0x0005e1, 3276 },
+  { 0x10006d4, 17628 },
+  { 0x10006af, 17515 },
+  { 0x0005da, 3248 },
+  { 0x0005e7, 3344 },
+  { 0x0005cd, 3100 },
+  { 0x0005c1, 2915 },
+  { 0x1000654, 17253 },
+  { 0x1000655, 17272 },
+  { 0x0005c3, 2947 },
+  { 0x0005c4, 2966 },
+  { 0x0005c6, 3006 },
+  { 0x0005c5, 2984 },
+  { 0x0005e7, 3354 },
+  { 0x10006be, 17545 },
+  { 0x10006c1, 17568 },
+  { 0x0005cc, 3088 },
+  { 0x1000698, 17480 },
+  { 0x0005e3, 3298 },
+  { 0x0005f0, 3480 },
+  { 0x0005ed, 3438 },
+  { 0x10006a9, 17502 },
+  { 0x0005ce, 3111 },
+  { 0x0005e4, 3309 },
+  { 0x1000653, 17234 },
+  { 0x0005c2, 2928 },
+  { 0x0005e5, 3320 },
+  { 0x0005e6, 3332 },
+  { 0x10006ba, 17526 },
+  { 0x100067e, 17432 },
+  { 0x100066a, 17381 },
+  { 0x0005e2, 3287 },
+  { 0x0005bf, 2894 },
+  { 0x0005d1, 3146 },
+  { 0x1000691, 17468 },
+  { 0x0005d5, 3193 },
+  { 0x0005d3, 3168 },
+  { 0x0005bb, 2877 },
+  { 0x0005f1, 3493 },
+  { 0x0005d4, 3180 },
+  { 0x0005f2, 3507 },
+  { 0x1000670, 17396 },
+  { 0x00ff7e, 14373 },
+  { 0x0005d7, 3215 },
+  { 0x0005e0, 3261 },
+  { 0x1000686, 17443 },
+  { 0x0005ca, 3065 },
+  { 0x0005c9, 3047 },
+  { 0x0005d0, 3134 },
+  { 0x0005cb, 3076 },
+  { 0x1000679, 17420 },
+  { 0x10006a4, 17491 },
+  { 0x0005e8, 3365 },
+  { 0x0005ea, 3395 },
+  { 0x10006d2, 17611 },
+  { 0x0005d8, 3226 },
+  { 0x0005d2, 3156 },
   { 0x0000c5, 781 },
+  { 0x1000538, 16110 },
+  { 0x1000531, 16022 },
+  { 0x1000532, 16035 },
+  { 0x1000549, 16328 },
+  { 0x1000534, 16061 },
+  { 0x1000541, 16225 },
+  { 0x1000537, 16099 },
+  { 0x1000556, 16492 },
+  { 0x1000542, 16238 },
+  { 0x1000533, 16048 },
+  { 0x1000545, 16279 },
+  { 0x1000540, 16213 },
+  { 0x100053b, 16147 },
+  { 0x100054b, 16353 },
+  { 0x1000554, 16469 },
+  { 0x100053f, 16200 },
+  { 0x100053d, 16174 },
+  { 0x100053c, 16160 },
+  { 0x1000544, 16266 },
+  { 0x1000546, 16291 },
+  { 0x1000555, 16481 },
+  { 0x100054a, 16341 },
+  { 0x1000553, 16455 },
+  { 0x100054c, 16365 },
+  { 0x1000550, 16416 },
+  { 0x100054d, 16377 },
+  { 0x1000547, 16303 },
+  { 0x1000543, 16252 },
+  { 0x1000539, 16122 },
+  { 0x100053e, 16187 },
+  { 0x1000551, 16428 },
+  { 0x100054f, 16402 },
+  { 0x100054e, 16389 },
+  { 0x1000548, 16316 },
+  { 0x1000552, 16441 },
+  { 0x1000535, 16073 },
+  { 0x1000536, 16087 },
+  { 0x100053a, 16134 },
+  { 0x100055b, 16524 },
+  { 0x100055c, 16556 },
+  { 0x100055a, 16504 },
+  { 0x1000568, 16748 },
+  { 0x1000561, 16660 },
+  { 0x1000562, 16673 },
+  { 0x100055d, 16588 },
+  { 0x1000579, 16966 },
+  { 0x1000564, 16699 },
+  { 0x1000571, 16863 },
+  { 0x1000567, 16737 },
+  { 0x100055c, 16572 },
+  { 0x1000586, 17130 },
+  { 0x1000589, 17163 },
+  { 0x1000572, 16876 },
+  { 0x1000563, 16686 },
+  { 0x1000575, 16917 },
+  { 0x1000570, 16851 },
+  { 0x100058a, 17200 },
+  { 0x100056b, 16785 },
+  { 0x100057b, 16991 },
+  { 0x1000584, 17107 },
+  { 0x100056f, 16838 },
+  { 0x100056d, 16812 },
+  { 0x1000587, 17142 },
+  { 0x100056c, 16798 },
+  { 0x1000574, 16904 },
+  { 0x1000576, 16929 },
+  { 0x1000585, 17119 },
+  { 0x100055e, 16626 },
+  { 0x100057a, 16979 },
+  { 0x1000583, 17093 },
+  { 0x100055e, 16642 },
+  { 0x100057c, 17003 },
+  { 0x1000580, 17054 },
+  { 0x100057d, 17015 },
+  { 0x100055d, 16601 },
+  { 0x1000577, 16941 },
+  { 0x100055b, 16540 },
+  { 0x1000573, 16890 },
+  { 0x1000569, 16760 },
+  { 0x100056e, 16825 },
+  { 0x1000581, 17066 },
+  { 0x100057f, 17040 },
+  { 0x1000589, 17182 },
+  { 0x100057e, 17027 },
+  { 0x1000578, 16954 },
+  { 0x1000582, 17079 },
+  { 0x1000565, 16711 },
+  { 0x100058a, 17216 },
+  { 0x1000566, 16725 },
+  { 0x100056a, 16772 },
   { 0x0000c3, 763 },
-  { 0x00fe7a, 12652 },
+  { 0x00fe7a, 12919 },
+  { 0x1008ff9b, 26825 },
+  { 0x1008ff97, 26775 },
+  { 0x1008ff11, 25700 },
+  { 0x1008ff32, 26005 },
+  { 0x1008ffb2, 26984 },
+  { 0x1008ff12, 25717 },
+  { 0x1008ff17, 25774 },
+  { 0x1008ff31, 25994 },
+  { 0x1008ff14, 25744 },
+  { 0x1008ff16, 25764 },
+  { 0x1008ff13, 25727 },
+  { 0x1008ff99, 26800 },
+  { 0x1008ff1c, 25811 },
+  { 0x1008ff98, 26788 },
+  { 0x1008ff3e, 26125 },
+  { 0x1008ff15, 25754 },
+  { 0x1008ff8d, 26699 },
   { 0x000042, 209 },
-  { 0x00ff08, 13264 },
-  { 0x00ff58, 13775 },
-  { 0x00fe74, 12544 },
-  { 0x00ff6b, 13841 },
-  { 0x0006be, 4011 },
-  { 0x0006ae, 3729 },
+  { 0x1001e02, 18927 },
+  { 0x1008ff26, 25914 },
+  { 0x1008ff3f, 26137 },
+  { 0x00ff08, 13669 },
+  { 0x1008ff93, 26748 },
+  { 0x00ff58, 14301 },
+  { 0x1008ffa6, 26923 },
+  { 0x1008ff94, 26756 },
+  { 0x1008ff52, 26310 },
+  { 0x00fe74, 12811 },
+  { 0x00ff6b, 14367 },
+  { 0x1008ff3b, 26090 },
+  { 0x0006be, 4079 },
+  { 0x0006ae, 3771 },
   { 0x000043, 211 },
-  { 0x0002c5, 1826 },
-  { 0x0001c6, 1487 },
-  { 0x00ff69, 13829 },
-  { 0x00ffe5, 14421 },
-  { 0x0001c8, 1494 },
+  { 0x1008ff53, 26315 },
+  { 0x00fea2, 13061 },
+  { 0x00fea5, 13072 },
+  { 0x00fea4, 13068 },
+  { 0x0002c5, 1842 },
+  { 0x0001c6, 1503 },
+  { 0x1008ff1d, 25823 },
+  { 0x1008ff20, 25848 },
+  { 0x00ff69, 14355 },
+  { 0x00ffe5, 15029 },
+  { 0x0001c8, 1510 },
   { 0x0000c7, 790 },
-  { 0x0002c6, 1836 },
-  { 0x00ff0b, 13287 },
-  { 0x00ff37, 13581 },
-  { 0x0020a1, 11037 },
-  { 0x00ffe3, 14401 },
-  { 0x00ffe4, 14411 },
-  { 0x0020a2, 11047 },
-  { 0x0006e1, 4474 },
-  { 0x0006e2, 4485 },
-  { 0x0006fe, 4836 },
-  { 0x0006e4, 4510 },
-  { 0x0006bf, 4031 },
-  { 0x0006fc, 4810 },
-  { 0x0006e6, 4534 },
-  { 0x0006ec, 4610 },
-  { 0x0006ed, 4622 },
-  { 0x0006ee, 4634 },
-  { 0x0006f2, 4681 },
-  { 0x0006f3, 4693 },
-  { 0x0006e7, 4546 },
-  { 0x0006e8, 4559 },
-  { 0x0006ff, 4849 },
-  { 0x0006e9, 4571 },
-  { 0x0006e5, 4522 },
-  { 0x0006b3, 3812 },
-  { 0x0006b8, 3911 },
-  { 0x0006eb, 4598 },
-  { 0x0006b9, 3934 },
-  { 0x0006ba, 3959 },
-  { 0x0006ef, 4646 },
-  { 0x0006f0, 4657 },
-  { 0x0006fb, 4797 },
-  { 0x0006fd, 4821 },
-  { 0x0006ea, 4582 },
-  { 0x0006f8, 4753 },
-  { 0x0006f4, 4705 },
-  { 0x0006e3, 4497 },
-  { 0x0006f5, 4717 },
-  { 0x0006f7, 4741 },
-  { 0x0006f1, 4669 },
-  { 0x0006f9, 4771 },
-  { 0x0006e0, 4462 },
-  { 0x0006fa, 4785 },
-  { 0x0006f6, 4728 },
-  { 0x0006c1, 4069 },
-  { 0x0006c2, 4080 },
-  { 0x0006de, 4431 },
-  { 0x0006c4, 4105 },
-  { 0x0006af, 3749 },
-  { 0x0006dc, 4405 },
-  { 0x0006c6, 4129 },
-  { 0x0006cc, 4205 },
-  { 0x0006cd, 4217 },
-  { 0x0006ce, 4229 },
-  { 0x0006d2, 4276 },
-  { 0x0006d3, 4288 },
-  { 0x0006c7, 4141 },
-  { 0x0006c8, 4154 },
-  { 0x0006df, 4444 },
-  { 0x0006c9, 4166 },
-  { 0x0006c5, 4117 },
-  { 0x0006a3, 3530 },
-  { 0x0006a8, 3629 },
-  { 0x0006cb, 4193 },
-  { 0x0006a9, 3652 },
-  { 0x0006aa, 3677 },
-  { 0x0006cf, 4241 },
-  { 0x0006d0, 4252 },
-  { 0x0006db, 4392 },
-  { 0x0006dd, 4416 },
-  { 0x0006ca, 4177 },
-  { 0x0006d8, 4348 },
-  { 0x0006d4, 4300 },
-  { 0x0006c3, 4092 },
-  { 0x0006d5, 4312 },
-  { 0x0006d7, 4336 },
-  { 0x0006d1, 4264 },
-  { 0x0006d9, 4366 },
-  { 0x0006c0, 4057 },
-  { 0x0006da, 4380 },
-  { 0x0006d6, 4323 },
+  { 0x0002c6, 1852 },
+  { 0x00fea1, 13058 },
+  { 0x00ff0b, 13692 },
+  { 0x1008fe21, 25543 },
+  { 0x1008ff56, 26330 },
+  { 0x00ff37, 13986 },
+  { 0x10020a1, 20505 },
+  { 0x1008ff3d, 26115 },
+  { 0x1008ff22, 25867 },
+  { 0x00ffe3, 15009 },
+  { 0x00ffe4, 15019 },
+  { 0x1008ff57, 26336 },
+  { 0x10020a2, 20515 },
+  { 0x1008ff58, 26341 },
+  { 0x1008ff9c, 26841 },
+  { 0x0006e1, 4542 },
+  { 0x0006e2, 4553 },
+  { 0x0006fe, 4904 },
+  { 0x10004b6, 15768 },
+  { 0x10004b8, 15814 },
+  { 0x0006e4, 4578 },
+  { 0x0006bf, 4099 },
+  { 0x0006fc, 4878 },
+  { 0x0006e6, 4602 },
+  { 0x0006ec, 4678 },
+  { 0x0006ed, 4690 },
+  { 0x0006ee, 4702 },
+  { 0x10004a2, 15592 },
+  { 0x0006f2, 4749 },
+  { 0x0006f3, 4761 },
+  { 0x0006e7, 4614 },
+  { 0x1000492, 15422 },
+  { 0x0006e8, 4627 },
+  { 0x0006ff, 4917 },
+  { 0x10004b2, 15724 },
+  { 0x0006e9, 4639 },
+  { 0x0006e5, 4590 },
+  { 0x0006b3, 3854 },
+  { 0x10004e2, 15920 },
+  { 0x0006b8, 3953 },
+  { 0x0006eb, 4666 },
+  { 0x100049a, 15502 },
+  { 0x100049c, 15546 },
+  { 0x0006b9, 3976 },
+  { 0x0006ba, 4001 },
+  { 0x0006ef, 4714 },
+  { 0x10004e8, 15956 },
+  { 0x0006f0, 4725 },
+  { 0x10004d8, 15890 },
+  { 0x0006fb, 4865 },
+  { 0x0006fd, 4889 },
+  { 0x10004ba, 15862 },
+  { 0x0006ea, 4650 },
+  { 0x0006f8, 4821 },
+  { 0x0006f4, 4773 },
+  { 0x0006e3, 4565 },
+  { 0x0006f5, 4785 },
+  { 0x10004ee, 15986 },
+  { 0x10004ae, 15636 },
+  { 0x10004b0, 15676 },
+  { 0x0006f7, 4809 },
+  { 0x0006f1, 4737 },
+  { 0x0006f9, 4839 },
+  { 0x0006e0, 4530 },
+  { 0x0006fa, 4853 },
+  { 0x0006f6, 4796 },
+  { 0x1000496, 15456 },
+  { 0x0006c1, 4137 },
+  { 0x0006c2, 4148 },
+  { 0x0006de, 4499 },
+  { 0x10004b7, 15791 },
+  { 0x10004b9, 15838 },
+  { 0x0006c4, 4173 },
+  { 0x0006af, 3791 },
+  { 0x0006dc, 4473 },
+  { 0x0006c6, 4197 },
+  { 0x0006cc, 4273 },
+  { 0x0006cd, 4285 },
+  { 0x0006ce, 4297 },
+  { 0x10004a3, 15614 },
+  { 0x0006d2, 4344 },
+  { 0x0006d3, 4356 },
+  { 0x0006c7, 4209 },
+  { 0x1000493, 15439 },
+  { 0x0006c8, 4222 },
+  { 0x10004b3, 15746 },
+  { 0x0006df, 4512 },
+  { 0x0006c9, 4234 },
+  { 0x10004e3, 15938 },
+  { 0x0006c5, 4185 },
+  { 0x0006a3, 3546 },
+  { 0x0006a8, 3645 },
+  { 0x0006cb, 4261 },
+  { 0x100049b, 15524 },
+  { 0x100049d, 15569 },
+  { 0x0006a9, 3668 },
+  { 0x0006aa, 3693 },
+  { 0x0006cf, 4309 },
+  { 0x10004e9, 15971 },
+  { 0x0006d0, 4320 },
+  { 0x10004d9, 15905 },
+  { 0x0006db, 4460 },
+  { 0x0006dd, 4484 },
+  { 0x10004bb, 15876 },
+  { 0x0006ca, 4245 },
+  { 0x0006d8, 4416 },
+  { 0x0006d4, 4368 },
+  { 0x0006c3, 4160 },
+  { 0x0006d5, 4380 },
+  { 0x10004ef, 16004 },
+  { 0x10004af, 15656 },
+  { 0x10004b1, 15700 },
+  { 0x0006d7, 4404 },
+  { 0x0006d1, 4332 },
+  { 0x0006d9, 4434 },
+  { 0x0006c0, 4125 },
+  { 0x0006da, 4448 },
+  { 0x0006d6, 4391 },
+  { 0x1000497, 15479 },
   { 0x000044, 213 },
-  { 0x0001cf, 1516 },
-  { 0x00ffff, 14500 },
-  { 0x0020ab, 11142 },
-  { 0x00ff54, 13737 },
-  { 0x0001d0, 1523 },
+  { 0x1008ff5a, 26353 },
+  { 0x1001e0a, 18947 },
+  { 0x0001cf, 1532 },
+  { 0x00ffff, 15249 },
+  { 0x1008ff59, 26345 },
+  { 0x1008ff5b, 26357 },
+  { 0x10020ab, 20610 },
+  { 0x00ff54, 14263 },
+  { 0x0001d0, 1539 },
   { 0x000045, 215 },
-  { 0x0003bd, 2060 },
-  { 0x0000d0, 873 },
-  { 0x0003cc, 2084 },
+  { 0x0003bd, 2076 },
+  { 0x0000d0, 877 },
+  { 0x10001b7, 15372 },
+  { 0x0003cc, 2100 },
   { 0x0000c9, 806 },
-  { 0x0001cc, 1509 },
+  { 0x1001eb8, 19487 },
+  { 0x0001cc, 1525 },
   { 0x0000ca, 813 },
-  { 0x0020a0, 11029 },
+  { 0x1001ebe, 19533 },
+  { 0x1001ec6, 19667 },
+  { 0x1001ec0, 19567 },
+  { 0x1001ec2, 19601 },
+  { 0x1001ec4, 19633 },
+  { 0x10020a0, 20497 },
   { 0x0000cb, 825 },
   { 0x0000c8, 799 },
-  { 0x00ff2f, 13488 },
-  { 0x00ff30, 13499 },
-  { 0x0003aa, 1987 },
-  { 0x00ff57, 13771 },
-  { 0x0001ca, 1501 },
-  { 0x00ff1b, 13326 },
-  { 0x0000d0, 877 },
-  { 0x0020ac, 11151 },
-  { 0x00ff62, 13794 },
+  { 0x1001eba, 19507 },
+  { 0x00ff2f, 13893 },
+  { 0x00ff30, 13904 },
+  { 0x1008ff2c, 25956 },
+  { 0x0003aa, 2003 },
+  { 0x00ff57, 14297 },
+  { 0x0001ca, 1517 },
+  { 0x00ff1b, 13731 },
+  { 0x0000d0, 873 },
+  { 0x1001ebc, 19519 },
+  { 0x0020ac, 11106 },
+  { 0x1008ff5c, 26367 },
+  { 0x00ff62, 14320 },
+  { 0x1008ff5d, 26373 },
   { 0x000046, 217 },
-  { 0x00ffbe, 14254 },
-  { 0x00ffc7, 14281 },
-  { 0x00ffc8, 14285 },
-  { 0x00ffc9, 14289 },
-  { 0x00ffca, 14293 },
-  { 0x00ffcb, 14297 },
-  { 0x00ffcc, 14301 },
-  { 0x00ffcd, 14305 },
-  { 0x00ffce, 14309 },
-  { 0x00ffcf, 14313 },
-  { 0x00ffd0, 14317 },
-  { 0x00ffbf, 14257 },
-  { 0x00ffd1, 14321 },
-  { 0x00ffd2, 14325 },
-  { 0x00ffd3, 14329 },
-  { 0x00ffd4, 14333 },
-  { 0x00ffd5, 14337 },
-  { 0x00ffd6, 14341 },
-  { 0x00ffd7, 14345 },
-  { 0x00ffd8, 14349 },
-  { 0x00ffd9, 14353 },
-  { 0x00ffda, 14357 },
-  { 0x00ffc0, 14260 },
-  { 0x00ffdb, 14361 },
-  { 0x00ffdc, 14365 },
-  { 0x00ffdd, 14369 },
-  { 0x00ffde, 14373 },
-  { 0x00ffdf, 14377 },
-  { 0x00ffe0, 14381 },
-  { 0x00ffc1, 14263 },
-  { 0x00ffc2, 14266 },
-  { 0x00ffc3, 14269 },
-  { 0x00ffc4, 14272 },
-  { 0x00ffc5, 14275 },
-  { 0x00ffc6, 14278 },
-  { 0x0020a3, 11060 },
-  { 0x00ff68, 13824 },
-  { 0x00fed0, 12671 },
+  { 0x00ffbe, 14780 },
+  { 0x00ffc7, 14807 },
+  { 0x00ffc8, 14811 },
+  { 0x00ffc9, 14818 },
+  { 0x00ffca, 14825 },
+  { 0x00ffcb, 14832 },
+  { 0x00ffcc, 14839 },
+  { 0x00ffcd, 14846 },
+  { 0x00ffce, 14853 },
+  { 0x00ffcf, 14860 },
+  { 0x00ffd0, 14867 },
+  { 0x00ffbf, 14783 },
+  { 0x00ffd1, 14874 },
+  { 0x00ffd2, 14882 },
+  { 0x00ffd3, 14889 },
+  { 0x00ffd4, 14896 },
+  { 0x00ffd5, 14903 },
+  { 0x00ffd6, 14910 },
+  { 0x00ffd7, 14917 },
+  { 0x00ffd8, 14924 },
+  { 0x00ffd9, 14931 },
+  { 0x00ffda, 14938 },
+  { 0x00ffc0, 14786 },
+  { 0x00ffdb, 14945 },
+  { 0x00ffdc, 14953 },
+  { 0x00ffdd, 14961 },
+  { 0x00ffde, 14969 },
+  { 0x00ffdf, 14977 },
+  { 0x00ffe0, 14985 },
+  { 0x00ffc1, 14789 },
+  { 0x00ffc2, 14792 },
+  { 0x00ffc3, 14795 },
+  { 0x00ffc4, 14798 },
+  { 0x00ffc5, 14801 },
+  { 0x00ffc6, 14804 },
+  { 0x10020a3, 20528 },
+  { 0x1001e1e, 18967 },
+  { 0x10006f0, 17644 },
+  { 0x10006f1, 17652 },
+  { 0x10006f2, 17660 },
+  { 0x10006f3, 17668 },
+  { 0x10006f4, 17676 },
+  { 0x10006f5, 17684 },
+  { 0x10006f6, 17692 },
+  { 0x10006f7, 17700 },
+  { 0x10006f8, 17708 },
+  { 0x10006f9, 17716 },
+  { 0x10006cc, 17601 },
+  { 0x1008ff30, 25984 },
+  { 0x1008ff3c, 26107 },
+  { 0x00ff68, 14350 },
+  { 0x00fed0, 13076 },
+  { 0x1008ff27, 25919 },
+  { 0x1008ff9d, 26852 },
+  { 0x1008ff9e, 26862 },
   { 0x000047, 219 },
-  { 0x0002d5, 1848 },
-  { 0x0002ab, 1759 },
-  { 0x0003ab, 1995 },
-  { 0x0002d8, 1858 },
-  { 0x0007c1, 5316 },
-  { 0x0007a1, 4867 },
-  { 0x0007c2, 5328 },
-  { 0x0007d7, 5564 },
-  { 0x0007c4, 5351 },
-  { 0x0007c5, 5363 },
-  { 0x0007a2, 4885 },
-  { 0x0007c7, 5388 },
-  { 0x0007a3, 4905 },
-  { 0x0007c3, 5339 },
-  { 0x0007c9, 5410 },
-  { 0x0007a4, 4921 },
-  { 0x0007a5, 4957 },
-  { 0x0007a5, 4938 },
-  { 0x0007ca, 5421 },
-  { 0x0007cb, 5433 },
-  { 0x0007cb, 5446 },
-  { 0x0007cc, 5458 },
-  { 0x0007cd, 5467 },
-  { 0x0007d9, 5584 },
-  { 0x0007ab, 5039 },
-  { 0x0007cf, 5485 },
-  { 0x0007a7, 4977 },
-  { 0x0007d6, 5554 },
-  { 0x0007d0, 5499 },
-  { 0x0007d8, 5574 },
-  { 0x0007d1, 5508 },
-  { 0x0007d2, 5518 },
-  { 0x0007d4, 5530 },
-  { 0x0007c8, 5398 },
-  { 0x0007d5, 5540 },
-  { 0x0007a8, 4997 },
-  { 0x0007a9, 5017 },
-  { 0x0007ce, 5476 },
-  { 0x0007c6, 5377 },
-  { 0x0007ae, 5057 },
-  { 0x0007e1, 5596 },
-  { 0x0007b1, 5093 },
-  { 0x0007e2, 5608 },
-  { 0x0007f7, 5866 },
-  { 0x0007e4, 5631 },
-  { 0x0007e5, 5643 },
-  { 0x0007b2, 5111 },
-  { 0x0007e7, 5668 },
-  { 0x0007b3, 5131 },
-  { 0x0007f3, 5810 },
-  { 0x0007e3, 5619 },
-  { 0x0007af, 5078 },
-  { 0x0007e9, 5690 },
-  { 0x0007b4, 5147 },
-  { 0x0007b6, 5183 },
-  { 0x0007b5, 5164 },
-  { 0x0007ea, 5701 },
-  { 0x0007eb, 5713 },
-  { 0x0007eb, 5726 },
-  { 0x0007ec, 5738 },
-  { 0x0007ed, 5747 },
-  { 0x0007f9, 5886 },
-  { 0x0007bb, 5298 },
-  { 0x0007ef, 5765 },
-  { 0x0007b7, 5208 },
-  { 0x0007f6, 5856 },
-  { 0x0007f0, 5779 },
-  { 0x0007f8, 5876 },
-  { 0x0007f1, 5788 },
-  { 0x0007f2, 5798 },
-  { 0x00ff7e, 13861 },
-  { 0x0007f4, 5832 },
-  { 0x0007e8, 5678 },
-  { 0x0007f5, 5842 },
-  { 0x0007b8, 5228 },
-  { 0x0007ba, 5270 },
-  { 0x0007b9, 5248 },
-  { 0x0007ee, 5756 },
-  { 0x0007e6, 5657 },
+  { 0x0002d5, 1864 },
+  { 0x1008ff5e, 26382 },
+  { 0x0002ab, 1775 },
+  { 0x10001e6, 15390 },
+  { 0x0003ab, 2011 },
+  { 0x0002d8, 1874 },
+  { 0x10010d0, 18420 },
+  { 0x10010d1, 18432 },
+  { 0x10010ea, 18759 },
+  { 0x10010ed, 18798 },
+  { 0x10010e9, 18745 },
+  { 0x10010ec, 18785 },
+  { 0x10010d3, 18458 },
+  { 0x10010d4, 18471 },
+  { 0x10010f6, 18915 },
+  { 0x10010d2, 18445 },
+  { 0x10010e6, 18704 },
+  { 0x10010f0, 18839 },
+  { 0x10010f4, 18889 },
+  { 0x10010f1, 18852 },
+  { 0x10010f2, 18864 },
+  { 0x10010f5, 18902 },
+  { 0x10010d8, 18522 },
+  { 0x10010ef, 18825 },
+  { 0x10010eb, 18772 },
+  { 0x10010d9, 18534 },
+  { 0x10010e5, 18690 },
+  { 0x10010da, 18547 },
+  { 0x10010db, 18560 },
+  { 0x10010dc, 18573 },
+  { 0x10010dd, 18586 },
+  { 0x10010de, 18598 },
+  { 0x10010e4, 18676 },
+  { 0x10010e7, 18718 },
+  { 0x10010e0, 18625 },
+  { 0x10010e1, 18638 },
+  { 0x10010e8, 18731 },
+  { 0x10010d7, 18509 },
+  { 0x10010e2, 18651 },
+  { 0x10010e3, 18664 },
+  { 0x10010d5, 18483 },
+  { 0x10010f3, 18877 },
+  { 0x10010ee, 18812 },
+  { 0x10010d6, 18496 },
+  { 0x10010df, 18611 },
+  { 0x1008ff5f, 26387 },
+  { 0x0007c1, 5384 },
+  { 0x0007a1, 4935 },
+  { 0x0007c2, 5396 },
+  { 0x0007d7, 5632 },
+  { 0x0007c4, 5419 },
+  { 0x0007c5, 5431 },
+  { 0x0007a2, 4953 },
+  { 0x0007c7, 5456 },
+  { 0x0007a3, 4973 },
+  { 0x0007c3, 5407 },
+  { 0x0007c9, 5478 },
+  { 0x0007a4, 4989 },
+  { 0x0007a5, 5006 },
+  { 0x0007a5, 5026 },
+  { 0x0007ca, 5489 },
+  { 0x0007cb, 5501 },
+  { 0x0007cb, 5514 },
+  { 0x0007cc, 5526 },
+  { 0x0007cd, 5535 },
+  { 0x0007d9, 5652 },
+  { 0x0007ab, 5107 },
+  { 0x0007cf, 5553 },
+  { 0x0007a7, 5045 },
+  { 0x0007d6, 5622 },
+  { 0x0007d0, 5567 },
+  { 0x0007d8, 5642 },
+  { 0x0007d1, 5576 },
+  { 0x0007d2, 5586 },
+  { 0x0007d4, 5598 },
+  { 0x0007c8, 5466 },
+  { 0x0007d5, 5608 },
+  { 0x0007a8, 5065 },
+  { 0x0007a9, 5085 },
+  { 0x0007ce, 5544 },
+  { 0x0007c6, 5445 },
+  { 0x0007ae, 5125 },
+  { 0x0007e1, 5664 },
+  { 0x0007b1, 5161 },
+  { 0x0007e2, 5676 },
+  { 0x0007f7, 5934 },
+  { 0x0007e4, 5699 },
+  { 0x0007e5, 5711 },
+  { 0x0007b2, 5179 },
+  { 0x0007e7, 5736 },
+  { 0x0007b3, 5199 },
+  { 0x0007f3, 5878 },
+  { 0x0007e3, 5687 },
+  { 0x0007af, 5146 },
+  { 0x0007e9, 5758 },
+  { 0x0007b4, 5215 },
+  { 0x0007b6, 5251 },
+  { 0x0007b5, 5232 },
+  { 0x0007ea, 5769 },
+  { 0x0007eb, 5781 },
+  { 0x0007eb, 5794 },
+  { 0x0007ec, 5806 },
+  { 0x0007ed, 5815 },
+  { 0x0007f9, 5954 },
+  { 0x0007bb, 5366 },
+  { 0x0007ef, 5833 },
+  { 0x0007b7, 5276 },
+  { 0x0007f6, 5924 },
+  { 0x0007f0, 5847 },
+  { 0x0007f8, 5944 },
+  { 0x0007f1, 5856 },
+  { 0x0007f2, 5866 },
+  { 0x00ff7e, 14387 },
+  { 0x0007f4, 5900 },
+  { 0x0007e8, 5746 },
+  { 0x0007f5, 5910 },
+  { 0x0007b8, 5296 },
+  { 0x0007ba, 5338 },
+  { 0x0007b9, 5316 },
+  { 0x0007ee, 5824 },
+  { 0x0007e6, 5725 },
+  { 0x1008ffa4, 26910 },
   { 0x000048, 221 },
-  { 0x00ff31, 13511 },
-  { 0x000ebf, 10068 },
-  { 0x000ec0, 10077 },
-  { 0x000ef6, 10909 },
-  { 0x000ef7, 10922 },
-  { 0x00ff39, 13605 },
-  { 0x000eba, 10001 },
-  { 0x000ea7, 9694 },
-  { 0x000ec4, 10118 },
-  { 0x000ec3, 10108 },
-  { 0x000ed1, 10248 },
-  { 0x00ff33, 13531 },
-  { 0x00ff34, 13542 },
-  { 0x000ebe, 10055 },
-  { 0x000ed3, 10268 },
-  { 0x000eb7, 9957 },
-  { 0x000eea, 10673 },
-  { 0x000eda, 10389 },
-  { 0x000eee, 10735 },
-  { 0x000ee8, 10643 },
-  { 0x000ee9, 10658 },
-  { 0x000eeb, 10688 },
-  { 0x000ed4, 10277 },
-  { 0x000ed6, 10314 },
-  { 0x000ef9, 10953 },
-  { 0x000ee3, 10561 },
-  { 0x000ed7, 10334 },
-  { 0x000ed9, 10369 },
-  { 0x000ed8, 10349 },
-  { 0x000ef8, 10936 },
-  { 0x000eed, 10719 },
-  { 0x000ee4, 10576 },
-  { 0x000ee5, 10591 },
-  { 0x000edb, 10405 },
-  { 0x000ee2, 10541 },
-  { 0x000edc, 10420 },
-  { 0x000edd, 10441 },
-  { 0x000ee1, 10520 },
-  { 0x000ede, 10461 },
-  { 0x000edf, 10481 },
-  { 0x000ee0, 10500 },
-  { 0x000ee6, 10610 },
-  { 0x000ed5, 10293 },
-  { 0x000ee7, 10624 },
-  { 0x000eec, 10704 },
-  { 0x000efa, 10980 },
-  { 0x00ff35, 13555 },
-  { 0x00ff38, 13591 },
-  { 0x000eb8, 9970 },
-  { 0x000ebb, 10014 },
-  { 0x000ea1, 9594 },
-  { 0x000ea3, 9627 },
-  { 0x000ef3, 10839 },
-  { 0x000eb1, 9867 },
-  { 0x000ea4, 9645 },
-  { 0x000ea6, 9676 },
-  { 0x000ea5, 9658 },
-  { 0x000ec7, 10148 },
-  { 0x000eca, 10178 },
-  { 0x000ef2, 10824 },
-  { 0x000ebd, 10041 },
-  { 0x000eb2, 9880 },
-  { 0x000eb4, 9911 },
-  { 0x00ff3b, 13634 },
-  { 0x00ff3a, 13618 },
-  { 0x000ea9, 9727 },
-  { 0x000eb0, 9849 },
-  { 0x000eaa, 9740 },
-  { 0x000eab, 9759 },
-  { 0x000eaf, 9830 },
-  { 0x000eac, 9777 },
-  { 0x000ead, 9795 },
-  { 0x000eae, 9812 },
-  { 0x000eef, 10750 },
-  { 0x00ff36, 13567 },
-  { 0x000eb5, 9928 },
-  { 0x00ff3f, 13703 },
-  { 0x000ea8, 9708 },
-  { 0x000eb9, 9983 },
-  { 0x000ea2, 9608 },
-  { 0x000eb3, 9893 },
-  { 0x000eb6, 9940 },
-  { 0x00ff32, 13518 },
-  { 0x000ef0, 10774 },
-  { 0x000ef4, 10864 },
-  { 0x000ef1, 10799 },
-  { 0x000ebc, 10028 },
-  { 0x000ecc, 10198 },
-  { 0x000ec8, 10157 },
-  { 0x000ec9, 10167 },
-  { 0x000ece, 10218 },
-  { 0x000ecd, 10207 },
-  { 0x000ecf, 10228 },
-  { 0x000ec1, 10087 },
-  { 0x000ec2, 10097 },
-  { 0x000ec6, 10138 },
-  { 0x000ec5, 10127 },
-  { 0x000ed2, 10258 },
-  { 0x000ecb, 10188 },
-  { 0x000ed0, 10238 },
-  { 0x000ef5, 10890 },
-  { 0x00ff7e, 13874 },
-  { 0x00ff29, 13428 },
-  { 0x0002a6, 1737 },
-  { 0x00ff7e, 13888 },
-  { 0x00ff6a, 13836 },
-  { 0x00ff23, 13358 },
-  { 0x00ff23, 13365 },
-  { 0x00ff25, 13384 },
-  { 0x00ff27, 13402 },
-  { 0x00ff50, 13718 },
-  { 0x0002a1, 1729 },
-  { 0x00ffed, 14484 },
-  { 0x00ffee, 14492 },
+  { 0x00ff31, 13916 },
+  { 0x000ebf, 10145 },
+  { 0x000ec0, 10154 },
+  { 0x000ef6, 10986 },
+  { 0x000ef7, 10999 },
+  { 0x00ff39, 14040 },
+  { 0x000eba, 10078 },
+  { 0x00ff37, 13996 },
+  { 0x000ea7, 9771 },
+  { 0x000ec4, 10195 },
+  { 0x000ec3, 10185 },
+  { 0x000ed1, 10325 },
+  { 0x00ff33, 13936 },
+  { 0x00ff34, 13947 },
+  { 0x000ebe, 10132 },
+  { 0x000ed3, 10345 },
+  { 0x000eb7, 10034 },
+  { 0x000eea, 10750 },
+  { 0x000eda, 10466 },
+  { 0x000eee, 10812 },
+  { 0x000ee8, 10720 },
+  { 0x000ee9, 10735 },
+  { 0x000eeb, 10765 },
+  { 0x000ed4, 10354 },
+  { 0x000ed6, 10391 },
+  { 0x000ef9, 11030 },
+  { 0x000ee3, 10638 },
+  { 0x000ed7, 10411 },
+  { 0x000ed9, 10446 },
+  { 0x000ed8, 10426 },
+  { 0x000ef8, 11013 },
+  { 0x000eed, 10796 },
+  { 0x000ee4, 10653 },
+  { 0x000ee5, 10668 },
+  { 0x000edb, 10482 },
+  { 0x000ee2, 10618 },
+  { 0x000edc, 10497 },
+  { 0x000edd, 10518 },
+  { 0x000ee1, 10597 },
+  { 0x000ede, 10538 },
+  { 0x000edf, 10558 },
+  { 0x000ee0, 10577 },
+  { 0x000ee6, 10687 },
+  { 0x000ed5, 10370 },
+  { 0x000ee7, 10701 },
+  { 0x000eec, 10781 },
+  { 0x000efa, 11057 },
+  { 0x00ff35, 13960 },
+  { 0x00ff38, 14026 },
+  { 0x000eb8, 10047 },
+  { 0x000ebb, 10091 },
+  { 0x000ea1, 9671 },
+  { 0x000ea3, 9704 },
+  { 0x000ef3, 10916 },
+  { 0x000eb1, 9944 },
+  { 0x00ff3d, 14125 },
+  { 0x000ea4, 9722 },
+  { 0x000ea6, 9753 },
+  { 0x000ea5, 9735 },
+  { 0x000ec7, 10225 },
+  { 0x000eca, 10255 },
+  { 0x000ef2, 10901 },
+  { 0x000ebd, 10118 },
+  { 0x000eb2, 9957 },
+  { 0x000eb4, 9988 },
+  { 0x00ff3b, 14069 },
+  { 0x00ff3a, 14053 },
+  { 0x00ff3e, 14177 },
+  { 0x000ea9, 9804 },
+  { 0x000eb0, 9926 },
+  { 0x000eaa, 9817 },
+  { 0x000eab, 9836 },
+  { 0x000eaf, 9907 },
+  { 0x000eac, 9854 },
+  { 0x000ead, 9872 },
+  { 0x000eae, 9889 },
+  { 0x000eef, 10827 },
+  { 0x00ff36, 13972 },
+  { 0x00ff3c, 14086 },
+  { 0x000eb5, 10005 },
+  { 0x00ff3f, 14229 },
+  { 0x000ea8, 9785 },
+  { 0x000eb9, 10060 },
+  { 0x000ea2, 9685 },
+  { 0x000eb3, 9970 },
+  { 0x000eb6, 10017 },
+  { 0x00ff32, 13923 },
+  { 0x000ef0, 10851 },
+  { 0x000ef4, 10941 },
+  { 0x000ef1, 10876 },
+  { 0x000ebc, 10105 },
+  { 0x000ecc, 10275 },
+  { 0x000ec8, 10234 },
+  { 0x000ec9, 10244 },
+  { 0x000ece, 10295 },
+  { 0x000ecd, 10284 },
+  { 0x000ecf, 10305 },
+  { 0x000ec1, 10164 },
+  { 0x000ec2, 10174 },
+  { 0x000ec6, 10215 },
+  { 0x000ec5, 10204 },
+  { 0x000ed2, 10335 },
+  { 0x000ecb, 10265 },
+  { 0x000ed0, 10315 },
+  { 0x000ef5, 10967 },
+  { 0x00ff7e, 14400 },
+  { 0x00ff29, 13833 },
+  { 0x0002a6, 1753 },
+  { 0x00ff7e, 14414 },
+  { 0x00ff6a, 14362 },
+  { 0x00ff23, 13763 },
+  { 0x00ff23, 13770 },
+  { 0x1008ffa8, 26936 },
+  { 0x00ff25, 13789 },
+  { 0x00ff27, 13807 },
+  { 0x1008ff37, 26053 },
+  { 0x00ff50, 14244 },
+  { 0x1008ff18, 25784 },
+  { 0x1008ff3a, 26081 },
+  { 0x0002a1, 1745 },
+  { 0x00ffed, 15092 },
+  { 0x00ffee, 15100 },
   { 0x000049, 223 },
-  { 0x00fe33, 12190 },
-  { 0x00fe30, 12123 },
-  { 0x00fe31, 12148 },
-  { 0x00fe32, 12176 },
-  { 0x00fe34, 12208 },
-  { 0x00fe2f, 12102 },
-  { 0x00fe2c, 12040 },
-  { 0x00fe2d, 12061 },
-  { 0x00fe2e, 12083 },
-  { 0x00fe0c, 11715 },
-  { 0x00fe0d, 11731 },
-  { 0x00fe06, 11614 },
-  { 0x00fe07, 11630 },
-  { 0x00ff7e, 13902 },
-  { 0x00fe0e, 11752 },
-  { 0x00fe0f, 11767 },
-  { 0x00fe20, 11787 },
-  { 0x00fe02, 11547 },
-  { 0x00fe04, 11581 },
-  { 0x00fe05, 11598 },
-  { 0x00fe03, 11564 },
-  { 0x00fe01, 11538 },
-  { 0x00fe22, 11817 },
-  { 0x00fe21, 11800 },
-  { 0x00fe08, 11645 },
-  { 0x00fe09, 11660 },
-  { 0x00fe24, 11856 },
-  { 0x00fe23, 11836 },
-  { 0x00fe25, 11878 },
-  { 0x00fe26, 11901 },
-  { 0x00fe0a, 11680 },
-  { 0x00fe0b, 11695 },
-  { 0x00fe2b, 12015 },
-  { 0x00fe29, 11966 },
-  { 0x00fe2a, 11990 },
-  { 0x00fe27, 11925 },
-  { 0x00fe28, 11945 },
-  { 0x0002a9, 1749 },
+  { 0x00fe33, 12195 },
+  { 0x00fe30, 12128 },
+  { 0x00fe31, 12153 },
+  { 0x00fe32, 12181 },
+  { 0x00fe34, 12213 },
+  { 0x00fe2f, 12107 },
+  { 0x00fe2c, 12045 },
+  { 0x00fe2d, 12066 },
+  { 0x00fe2e, 12088 },
+  { 0x00fe0c, 11670 },
+  { 0x00fe0d, 11686 },
+  { 0x00fe06, 11569 },
+  { 0x00fe07, 11585 },
+  { 0x00ff7e, 14428 },
+  { 0x00fe0e, 11707 },
+  { 0x00fe0f, 11722 },
+  { 0x00fe20, 11792 },
+  { 0x00fe02, 11502 },
+  { 0x00fe04, 11536 },
+  { 0x00fe05, 11553 },
+  { 0x00fe03, 11519 },
+  { 0x00fe12, 11759 },
+  { 0x00fe13, 11776 },
+  { 0x00fe11, 11742 },
+  { 0x00fe01, 11493 },
+  { 0x00fe22, 11822 },
+  { 0x00fe21, 11805 },
+  { 0x00fe08, 11600 },
+  { 0x00fe09, 11615 },
+  { 0x00fe24, 11861 },
+  { 0x00fe23, 11841 },
+  { 0x00fe25, 11883 },
+  { 0x00fe26, 11906 },
+  { 0x00fe0a, 11635 },
+  { 0x00fe0b, 11650 },
+  { 0x00fe2b, 12020 },
+  { 0x00fe29, 11971 },
+  { 0x00fe2a, 11995 },
+  { 0x00fe27, 11930 },
+  { 0x00fe28, 11950 },
+  { 0x0002a9, 1765 },
   { 0x0000cd, 843 },
+  { 0x1001eca, 19719 },
+  { 0x100012c, 15256 },
   { 0x0000ce, 850 },
   { 0x0000cf, 862 },
   { 0x0000cc, 836 },
-  { 0x0003cf, 2094 },
-  { 0x00ff63, 13802 },
-  { 0x0003c7, 2076 },
-  { 0x0003a5, 1971 },
+  { 0x1001ec8, 19707 },
+  { 0x0003cf, 2110 },
+  { 0x00ff63, 14328 },
+  { 0x0003c7, 2092 },
+  { 0x0003a5, 1987 },
   { 0x00004a, 225 },
-  { 0x0002ac, 1766 },
+  { 0x0002ac, 1782 },
   { 0x00004b, 227 },
-  { 0x00ffb0, 14195 },
-  { 0x00ffb1, 14200 },
-  { 0x00ffb2, 14205 },
-  { 0x00ffb3, 14210 },
-  { 0x00ffb4, 14215 },
-  { 0x00ffb5, 14220 },
-  { 0x00ffb6, 14225 },
-  { 0x00ffb7, 14230 },
-  { 0x00ffb8, 14235 },
-  { 0x00ffb9, 14240 },
-  { 0x00ffab, 14142 },
-  { 0x00ff9d, 14101 },
-  { 0x00ffae, 14174 },
-  { 0x00ff9f, 14120 },
-  { 0x00ffaf, 14185 },
-  { 0x00ff99, 14045 },
-  { 0x00ff9c, 14094 },
-  { 0x00ff8d, 13981 },
-  { 0x00ffbd, 14245 },
-  { 0x00ff91, 13990 },
-  { 0x00ff92, 13996 },
-  { 0x00ff93, 14002 },
-  { 0x00ff94, 14008 },
-  { 0x00ff95, 14014 },
-  { 0x00ff9e, 14110 },
-  { 0x00ff96, 14022 },
-  { 0x00ffaa, 14130 },
-  { 0x00ff9b, 14086 },
-  { 0x00ff9b, 14073 },
-  { 0x00ff9a, 14053 },
-  { 0x00ff9a, 14064 },
-  { 0x00ff98, 14036 },
-  { 0x00ffac, 14149 },
-  { 0x00ff80, 13965 },
-  { 0x00ffad, 14162 },
-  { 0x00ff89, 13974 },
-  { 0x00ff97, 14030 },
-  { 0x00ff2d, 13467 },
-  { 0x00ff2e, 13477 },
-  { 0x00ff21, 13343 },
-  { 0x00ff26, 13393 },
-  { 0x0003d3, 2119 },
-  { 0x000eff, 11001 },
+  { 0x00ffb0, 14721 },
+  { 0x00ffb1, 14726 },
+  { 0x00ffb2, 14731 },
+  { 0x00ffb3, 14736 },
+  { 0x00ffb4, 14741 },
+  { 0x00ffb5, 14746 },
+  { 0x00ffb6, 14751 },
+  { 0x00ffb7, 14756 },
+  { 0x00ffb8, 14761 },
+  { 0x00ffb9, 14766 },
+  { 0x00ffab, 14668 },
+  { 0x00ff9d, 14627 },
+  { 0x00ffae, 14700 },
+  { 0x00ff9f, 14646 },
+  { 0x00ffaf, 14711 },
+  { 0x00ff99, 14571 },
+  { 0x00ff9c, 14620 },
+  { 0x00ff8d, 14507 },
+  { 0x00ffbd, 14771 },
+  { 0x00ff91, 14516 },
+  { 0x00ff92, 14522 },
+  { 0x00ff93, 14528 },
+  { 0x00ff94, 14534 },
+  { 0x00ff95, 14540 },
+  { 0x00ff9e, 14636 },
+  { 0x00ff96, 14548 },
+  { 0x00ffaa, 14656 },
+  { 0x00ff9b, 14599 },
+  { 0x00ff9b, 14607 },
+  { 0x00ff9a, 14579 },
+  { 0x00ff9a, 14590 },
+  { 0x00ff98, 14562 },
+  { 0x00ffac, 14675 },
+  { 0x00ff80, 14491 },
+  { 0x00ffad, 14688 },
+  { 0x00ff89, 14500 },
+  { 0x00ff97, 14556 },
+  { 0x00ff2d, 13872 },
+  { 0x00ff2e, 13882 },
+  { 0x00ff21, 13748 },
+  { 0x00ff37, 14013 },
+  { 0x00ff26, 13798 },
+  { 0x1008ff06, 25674 },
+  { 0x1008ff05, 25658 },
+  { 0x1008ff04, 25644 },
+  { 0x0003d3, 2135 },
+  { 0x000eff, 11078 },
   { 0x00004c, 229 },
-  { 0x0001c5, 1480 },
-  { 0x00fed4, 12732 },
-  { 0x0001a5, 1303 },
-  { 0x0003a6, 1978 },
-  { 0x00ff51, 13723 },
-  { 0x00ff0a, 13278 },
-  { 0x0020a4, 11071 },
-  { 0x0001a3, 1295 },
+  { 0x00ffc8, 14815 },
+  { 0x00ffd1, 14878 },
+  { 0x00ffc9, 14822 },
+  { 0x00ffca, 14829 },
+  { 0x00ffcb, 14836 },
+  { 0x00ffcc, 14843 },
+  { 0x00ffcd, 14850 },
+  { 0x00ffce, 14857 },
+  { 0x00ffcf, 14864 },
+  { 0x00ffd0, 14871 },
+  { 0x0001c5, 1496 },
+  { 0x00fed4, 13137 },
+  { 0x1008ff40, 26149 },
+  { 0x1008ff41, 26157 },
+  { 0x1008ff42, 26165 },
+  { 0x1008ff43, 26173 },
+  { 0x1008ff44, 26181 },
+  { 0x1008ff45, 26189 },
+  { 0x1008ff46, 26197 },
+  { 0x1008ff47, 26205 },
+  { 0x1008ff48, 26213 },
+  { 0x1008ff49, 26221 },
+  { 0x1008ff4a, 26229 },
+  { 0x1008ff4b, 26237 },
+  { 0x1008ff4c, 26245 },
+  { 0x1008ff4d, 26253 },
+  { 0x1008ff4e, 26261 },
+  { 0x1008ff4f, 26269 },
+  { 0x1001e36, 18987 },
+  { 0x0001a5, 1319 },
+  { 0x0003a6, 1994 },
+  { 0x00ff51, 14249 },
+  { 0x1008ff35, 26038 },
+  { 0x00ff0a, 13683 },
+  { 0x10020a4, 20539 },
+  { 0x1008fe25, 25589 },
+  { 0x1008ff61, 26397 },
+  { 0x1008fe24, 25575 },
+  { 0x0001a3, 1311 },
   { 0x00004d, 231 },
-  { 0x0006b5, 3849 },
-  { 0x0006b2, 3798 },
-  { 0x0006bc, 3997 },
-  { 0x0006a5, 3567 },
-  { 0x0006a2, 3516 },
-  { 0x0006ac, 3715 },
-  { 0x00ff2c, 13460 },
-  { 0x00ff67, 13819 },
-  { 0x00ffe7, 14442 },
-  { 0x00ffe8, 14449 },
-  { 0x0020a5, 11080 },
-  { 0x00ff7e, 13918 },
-  { 0x00fe77, 12597 },
-  { 0x00fe76, 12580 },
-  { 0x00ff22, 13349 },
-  { 0x00ff20, 13333 },
-  { 0x00ff3d, 13667 },
+  { 0x1001e40, 19007 },
+  { 0x0006b5, 3891 },
+  { 0x0006b2, 3840 },
+  { 0x0006bc, 4039 },
+  { 0x0006a5, 3583 },
+  { 0x0006a2, 3532 },
+  { 0x0006ac, 3731 },
+  { 0x00ff3e, 14202 },
+  { 0x1008ff19, 25793 },
+  { 0x1008ff90, 26721 },
+  { 0x1008ff62, 26404 },
+  { 0x00ff2c, 13865 },
+  { 0x1008ff63, 26411 },
+  { 0x1008ff1e, 25834 },
+  { 0x00ff67, 14345 },
+  { 0x1008ff65, 26419 },
+  { 0x1008ff66, 26426 },
+  { 0x1008ff8e, 26704 },
+  { 0x00ffe7, 15050 },
+  { 0x00ffe8, 15057 },
+  { 0x10020a5, 20548 },
+  { 0x1008ff01, 25601 },
+  { 0x00ff7e, 14456 },
+  { 0x1008ff03, 25626 },
+  { 0x1008ff02, 25610 },
+  { 0x00fe77, 12864 },
+  { 0x00fe76, 12847 },
+  { 0x00ff22, 13754 },
+  { 0x00ff20, 13738 },
+  { 0x00ff3d, 14150 },
+  { 0x1008ff92, 26742 },
+  { 0x1008ff33, 26016 },
+  { 0x1008ff67, 26433 },
   { 0x00004e, 233 },
-  { 0x0001d1, 1531 },
-  { 0x0020a6, 11089 },
-  { 0x0001d2, 1538 },
-  { 0x0003d1, 2102 },
-  { 0x0020aa, 11128 },
-  { 0x00ff56, 13766 },
-  { 0x00fed2, 12712 },
+  { 0x0001d1, 1547 },
+  { 0x10020a6, 20557 },
+  { 0x0001d2, 1554 },
+  { 0x0003d1, 2118 },
+  { 0x1008ff68, 26441 },
+  { 0x10020aa, 20596 },
+  { 0x1008ff69, 26445 },
+  { 0x00ff56, 14292 },
+  { 0x1008fe22, 25553 },
+  { 0x00fed2, 13117 },
   { 0x0000d1, 881 },
-  { 0x00ff7f, 13956 },
+  { 0x00ff7f, 14482 },
   { 0x00004f, 235 },
-  { 0x0013bc, 11012 },
+  { 0x0013bc, 11089 },
   { 0x0000d3, 895 },
+  { 0x100019f, 15324 },
+  { 0x1001ecc, 19739 },
+  { 0x10001d1, 15376 },
   { 0x0000d4, 902 },
+  { 0x1001ed0, 19771 },
+  { 0x1001ed8, 19905 },
+  { 0x1001ed2, 19805 },
+  { 0x1001ed4, 19839 },
+  { 0x1001ed6, 19871 },
   { 0x0000d6, 921 },
-  { 0x0001d5, 1545 },
+  { 0x0001d5, 1561 },
+  { 0x1008ff6a, 26450 },
   { 0x0000d2, 888 },
-  { 0x0003d2, 2111 },
+  { 0x1001ece, 19759 },
+  { 0x10001a0, 15332 },
+  { 0x1001eda, 19945 },
+  { 0x1001ee2, 20031 },
+  { 0x1001edc, 19967 },
+  { 0x1001ede, 19989 },
+  { 0x1001ee0, 20009 },
+  { 0x0003d2, 2127 },
   { 0x0000d8, 941 },
+  { 0x1008ff6b, 26461 },
+  { 0x1008ff38, 26061 },
+  { 0x1008ff6c, 26466 },
+  { 0x0000d8, 950 },
   { 0x0000d5, 914 },
-  { 0x00fe78, 12620 },
-  { 0x00fe79, 12636 },
+  { 0x00fe78, 12887 },
+  { 0x00fe79, 12903 },
   { 0x000050, 237 },
-  { 0x00ff56, 13756 },
-  { 0x00ff55, 13742 },
-  { 0x00ff13, 13300 },
-  { 0x0020a7, 11099 },
-  { 0x00fefa, 13191 },
-  { 0x00fee9, 12906 },
-  { 0x00feea, 12922 },
-  { 0x00feeb, 12938 },
-  { 0x00feec, 12954 },
-  { 0x00feed, 12970 },
-  { 0x00fee8, 12886 },
-  { 0x00feef, 13008 },
-  { 0x00fef0, 13026 },
-  { 0x00fef1, 13044 },
-  { 0x00fef2, 13062 },
-  { 0x00fef3, 13080 },
-  { 0x00feee, 12986 },
-  { 0x00fefb, 13210 },
-  { 0x00fefc, 13230 },
-  { 0x00fee3, 12807 },
-  { 0x00fee6, 12851 },
-  { 0x00fee7, 12868 },
-  { 0x00fef5, 13116 },
-  { 0x00fef6, 13130 },
-  { 0x00fef7, 13144 },
-  { 0x00fef8, 13158 },
-  { 0x00fefd, 13250 },
-  { 0x00fef4, 13098 },
-  { 0x00fef9, 13172 },
-  { 0x00fee0, 12769 },
-  { 0x00fee1, 12782 },
-  { 0x00fee2, 12796 },
-  { 0x00fee4, 12820 },
-  { 0x00fee5, 12835 },
-  { 0x00fed1, 12692 },
-  { 0x00ff3e, 13685 },
-  { 0x00ff61, 13788 },
-  { 0x00ff55, 13750 },
+  { 0x1001e56, 19027 },
+  { 0x00ff56, 14282 },
+  { 0x00ff55, 14268 },
+  { 0x1008ff6d, 26473 },
+  { 0x00ff13, 13705 },
+  { 0x10020a7, 20567 },
+  { 0x1008ff6e, 26479 },
+  { 0x1008ff91, 26733 },
+  { 0x00fefa, 13596 },
+  { 0x00fee9, 13311 },
+  { 0x00feea, 13327 },
+  { 0x00feeb, 13343 },
+  { 0x00feec, 13359 },
+  { 0x00feed, 13375 },
+  { 0x00fee8, 13291 },
+  { 0x00feef, 13413 },
+  { 0x00fef0, 13431 },
+  { 0x00fef1, 13449 },
+  { 0x00fef2, 13467 },
+  { 0x00fef3, 13485 },
+  { 0x00feee, 13391 },
+  { 0x00fefb, 13615 },
+  { 0x00fefc, 13635 },
+  { 0x00fee3, 13212 },
+  { 0x00fee6, 13256 },
+  { 0x00fee7, 13273 },
+  { 0x00fef5, 13521 },
+  { 0x00fef6, 13535 },
+  { 0x00fef7, 13549 },
+  { 0x00fef8, 13563 },
+  { 0x00fefd, 13655 },
+  { 0x00fef4, 13503 },
+  { 0x00fef9, 13577 },
+  { 0x00fee0, 13174 },
+  { 0x00fee1, 13187 },
+  { 0x00fee2, 13201 },
+  { 0x00fee4, 13225 },
+  { 0x00fee5, 13240 },
+  { 0x1008ff21, 25857 },
+  { 0x1008ff2a, 25940 },
+  { 0x1008fe23, 25564 },
+  { 0x00fed1, 13097 },
+  { 0x00ff3e, 14211 },
+  { 0x00ff61, 14314 },
+  { 0x00ff55, 14276 },
   { 0x000051, 239 },
   { 0x000052, 241 },
-  { 0x0001c0, 1466 },
-  { 0x0001d8, 1558 },
-  { 0x0003a3, 1962 },
-  { 0x00ff66, 13814 },
-  { 0x00fe72, 12510 },
-  { 0x00ff0d, 13293 },
-  { 0x00ff53, 13731 },
-  { 0x00ff24, 13377 },
-  { 0x0020a8, 11110 },
+  { 0x00ffd2, 14886 },
+  { 0x00ffdb, 14949 },
+  { 0x00ffdc, 14957 },
+  { 0x00ffdd, 14965 },
+  { 0x00ffde, 14973 },
+  { 0x00ffdf, 14981 },
+  { 0x00ffe0, 14989 },
+  { 0x00ffd3, 14893 },
+  { 0x00ffd4, 14900 },
+  { 0x00ffd5, 14907 },
+  { 0x00ffd6, 14914 },
+  { 0x00ffd7, 14921 },
+  { 0x00ffd8, 14928 },
+  { 0x00ffd9, 14935 },
+  { 0x00ffda, 14942 },
+  { 0x0001c0, 1482 },
+  { 0x0001d8, 1574 },
+  { 0x0003a3, 1978 },
+  { 0x1008ffa3, 26906 },
+  { 0x00ff66, 14340 },
+  { 0x1008ff29, 25932 },
+  { 0x1008ff73, 26491 },
+  { 0x00fe72, 12777 },
+  { 0x1008ff72, 26485 },
+  { 0x00ff0d, 13698 },
+  { 0x00ff53, 14257 },
+  { 0x1008ff24, 25891 },
+  { 0x1008ff25, 25902 },
+  { 0x1008ff23, 25882 },
+  { 0x00ff24, 13782 },
+  { 0x1008ff74, 26498 },
+  { 0x1008ff76, 26523 },
+  { 0x1008ff75, 26512 },
+  { 0x10020a8, 20578 },
   { 0x000053, 243 },
-  { 0x0001a6, 1310 },
-  { 0x0001a9, 1317 },
-  { 0x0001aa, 1324 },
-  { 0x0002de, 1877 },
-  { 0x00ff14, 13306 },
-  { 0x00ff60, 13781 },
-  { 0x0006b1, 3786 },
-  { 0x0006bf, 4045 },
-  { 0x0006b8, 3923 },
-  { 0x0006b9, 3947 },
-  { 0x0006ba, 3972 },
-  { 0x0006bb, 3984 },
-  { 0x0006a1, 3504 },
-  { 0x0006af, 3763 },
-  { 0x0006a8, 3641 },
-  { 0x0006a9, 3665 },
-  { 0x0006aa, 3690 },
-  { 0x0006ab, 3702 },
-  { 0x00ffe1, 14385 },
-  { 0x00ffe6, 14431 },
-  { 0x00ffe2, 14393 },
-  { 0x00ff3c, 13651 },
-  { 0x00fe73, 12528 },
-  { 0x00fe75, 12562 },
-  { 0x00ffeb, 14468 },
-  { 0x00ffec, 14476 },
-  { 0x00ff15, 13318 },
+  { 0x100018f, 15318 },
+  { 0x1001e60, 19047 },
+  { 0x0001a6, 1326 },
+  { 0x1008ff77, 26534 },
+  { 0x0001a9, 1333 },
+  { 0x0001aa, 1340 },
+  { 0x0002de, 1893 },
+  { 0x1008ff2d, 25962 },
+  { 0x1008ff7a, 26559 },
+  { 0x1008ff79, 26548 },
+  { 0x1008ff78, 26539 },
+  { 0x00ff14, 13711 },
+  { 0x1008ff1b, 25804 },
+  { 0x00ff60, 14307 },
+  { 0x1008ffa0, 26880 },
+  { 0x1008ff7b, 26571 },
+  { 0x0006b1, 3828 },
+  { 0x0006bf, 4113 },
+  { 0x0006b8, 3965 },
+  { 0x0006b9, 3989 },
+  { 0x0006ba, 4014 },
+  { 0x0006bb, 4026 },
+  { 0x0006a1, 3520 },
+  { 0x0006af, 3805 },
+  { 0x0006a8, 3657 },
+  { 0x0006a9, 3681 },
+  { 0x0006aa, 3706 },
+  { 0x0006ab, 3718 },
+  { 0x00ffe1, 14993 },
+  { 0x00ffe6, 15039 },
+  { 0x00ffe2, 15001 },
+  { 0x1008ff36, 26048 },
+  { 0x00ff3c, 14109 },
+  { 0x1000d85, 17740 },
+  { 0x1000d86, 17747 },
+  { 0x1000dcf, 18252 },
+  { 0x1000d87, 17755 },
+  { 0x1000dd0, 18261 },
+  { 0x1000d88, 17763 },
+  { 0x1000dd1, 18270 },
+  { 0x1000d93, 17851 },
+  { 0x1000ddb, 18340 },
+  { 0x1000dca, 18244 },
+  { 0x1000d96, 17874 },
+  { 0x1000dde, 18366 },
+  { 0x1000db6, 18126 },
+  { 0x1000db7, 18134 },
+  { 0x1000da0, 17934 },
+  { 0x1000da1, 17942 },
+  { 0x1000da9, 18015 },
+  { 0x1000daa, 18024 },
+  { 0x1000daf, 18072 },
+  { 0x1000db0, 18081 },
+  { 0x1000d91, 17836 },
+  { 0x1000dd9, 18323 },
+  { 0x1000d92, 17843 },
+  { 0x1000dda, 18331 },
+  { 0x1000dc6, 18236 },
+  { 0x1000d9c, 17899 },
+  { 0x1000d9d, 17907 },
+  { 0x1000d83, 17732 },
+  { 0x1000dc4, 18219 },
+  { 0x1000d89, 17772 },
+  { 0x1000dd2, 18280 },
+  { 0x1000d8a, 17779 },
+  { 0x1000dd3, 18288 },
+  { 0x1000da2, 17951 },
+  { 0x1000da3, 17959 },
+  { 0x1000da5, 17977 },
+  { 0x1000d9a, 17882 },
+  { 0x1000d9b, 17890 },
+  { 0x1000df4, 18404 },
+  { 0x1000dbd, 18176 },
+  { 0x1000dc5, 18227 },
+  { 0x1000d8f, 17819 },
+  { 0x1000ddf, 18375 },
+  { 0x1000d90, 17827 },
+  { 0x1000df3, 18394 },
+  { 0x1000db8, 18143 },
+  { 0x1000db9, 18151 },
+  { 0x1000db1, 18091 },
+  { 0x1000dac, 18043 },
+  { 0x1000db3, 18099 },
+  { 0x1000d82, 17724 },
+  { 0x1000d9e, 17916 },
+  { 0x1000d9f, 17925 },
+  { 0x1000da6, 17987 },
+  { 0x1000dab, 18034 },
+  { 0x1000da4, 17968 },
+  { 0x1000d94, 17859 },
+  { 0x1000ddc, 18349 },
+  { 0x1000d95, 17866 },
+  { 0x1000ddd, 18357 },
+  { 0x1000db4, 18109 },
+  { 0x1000db5, 18117 },
+  { 0x1000dbb, 18168 },
+  { 0x1000d8d, 17802 },
+  { 0x1000d8e, 17810 },
+  { 0x1000dd8, 18314 },
+  { 0x1000df2, 18384 },
+  { 0x1000dc3, 18211 },
+  { 0x1000dc1, 18192 },
+  { 0x1000dc2, 18201 },
+  { 0x1000dad, 18053 },
+  { 0x1000dae, 18062 },
+  { 0x1000da7, 17996 },
+  { 0x1000da8, 18005 },
+  { 0x1000d8b, 17787 },
+  { 0x1000dd4, 18297 },
+  { 0x1000d8c, 17794 },
+  { 0x1000dd6, 18305 },
+  { 0x1000dc0, 18184 },
+  { 0x1000dba, 18160 },
+  { 0x1008ff2f, 25978 },
+  { 0x00fe73, 12795 },
+  { 0x1008ff7c, 26576 },
+  { 0x1008ff7d, 26582 },
+  { 0x1008ff10, 25692 },
+  { 0x1008ff1a, 25798 },
+  { 0x00fe75, 12829 },
+  { 0x1008ff28, 25927 },
+  { 0x1008ff9a, 26816 },
+  { 0x00ffeb, 15076 },
+  { 0x00ffec, 15084 },
+  { 0x1008ff7e, 26594 },
+  { 0x1008ffa7, 26928 },
+  { 0x1008fe01, 25389 },
+  { 0x1008fe0a, 25497 },
+  { 0x1008fe0b, 25510 },
+  { 0x1008fe0c, 25523 },
+  { 0x1008fe02, 25401 },
+  { 0x1008fe03, 25413 },
+  { 0x1008fe04, 25425 },
+  { 0x1008fe05, 25437 },
+  { 0x1008fe06, 25449 },
+  { 0x1008fe07, 25461 },
+  { 0x1008fe08, 25473 },
+  { 0x1008fe09, 25485 },
+  { 0x00ff15, 13723 },
   { 0x000054, 245 },
-  { 0x0000de, 994 },
-  { 0x00ff09, 13274 },
-  { 0x0001ab, 1333 },
-  { 0x0001de, 1584 },
-  { 0x00fed5, 12752 },
-  { 0x000ddf, 9260 },
-  { 0x000dba, 8843 },
-  { 0x000da8, 8607 },
-  { 0x000daa, 8634 },
-  { 0x000da9, 8620 },
-  { 0x000dac, 8658 },
-  { 0x000dae, 8683 },
-  { 0x000db4, 8768 },
-  { 0x000dbd, 8882 },
-  { 0x000dbf, 8905 },
-  { 0x000dcb, 9039 },
-  { 0x000dce, 9073 },
-  { 0x000da2, 8525 },
-  { 0x000da5, 8566 },
-  { 0x000da3, 8538 },
-  { 0x000da4, 8552 },
-  { 0x000da6, 8579 },
-  { 0x000da1, 8514 },
-  { 0x000de5, 9343 },
-  { 0x000df7, 9556 },
-  { 0x000df5, 9533 },
-  { 0x000df6, 9544 },
-  { 0x000df9, 9582 },
-  { 0x000df1, 9484 },
-  { 0x000df8, 9569 },
-  { 0x000df3, 9510 },
-  { 0x000df4, 9522 },
-  { 0x000df2, 9497 },
-  { 0x000df0, 9472 },
-  { 0x000dcc, 9050 },
-  { 0x000dc5, 8972 },
-  { 0x000dc6, 8984 },
-  { 0x000deb, 9424 },
-  { 0x000de8, 9389 },
-  { 0x000dd1, 9113 },
-  { 0x000dde, 9237 },
-  { 0x000de7, 9374 },
-  { 0x000de9, 9400 },
-  { 0x000dea, 9412 },
-  { 0x000de6, 9360 },
-  { 0x000dc1, 8932 },
-  { 0x000da7, 8595 },
-  { 0x000ded, 9458 },
-  { 0x000db3, 8757 },
-  { 0x000db9, 8833 },
-  { 0x000dcd, 9063 },
-  { 0x000dcf, 9087 },
-  { 0x000dda, 9224 },
-  { 0x000dbe, 8892 },
-  { 0x000dbc, 8868 },
-  { 0x000dc0, 8916 },
-  { 0x000dbb, 8857 },
-  { 0x000dc3, 8953 },
-  { 0x000dc4, 8964 },
-  { 0x000dd0, 9102 },
-  { 0x000dd2, 9129 },
-  { 0x000de1, 9281 },
-  { 0x000de4, 9323 },
-  { 0x000de3, 9304 },
-  { 0x000dd3, 9141 },
-  { 0x000de0, 9270 },
-  { 0x000dd4, 9153 },
-  { 0x000dd5, 9164 },
-  { 0x000de2, 9293 },
-  { 0x000dd8, 9201 },
-  { 0x000dd6, 9176 },
-  { 0x000dd7, 9188 },
-  { 0x000dd9, 9212 },
-  { 0x000dc9, 9016 },
-  { 0x000dc8, 9004 },
-  { 0x000dab, 8648 },
-  { 0x000dca, 9028 },
-  { 0x000dec, 9441 },
-  { 0x000db1, 8722 },
-  { 0x000db2, 8741 },
-  { 0x000db7, 8804 },
-  { 0x000db0, 8709 },
-  { 0x000db8, 8819 },
-  { 0x000db6, 8790 },
-  { 0x000daf, 8696 },
-  { 0x000db5, 8779 },
-  { 0x000dc7, 8992 },
-  { 0x000dc2, 8942 },
-  { 0x000dad, 8671 },
-  { 0x0000de, 1000 },
-  { 0x00ff2b, 13452 },
-  { 0x0003ac, 2004 },
+  { 0x0000de, 1007 },
+  { 0x00ff09, 13679 },
+  { 0x1001e6a, 19067 },
+  { 0x1008ff7f, 26602 },
+  { 0x0001ab, 1349 },
+  { 0x0001de, 1600 },
+  { 0x1008ff80, 26611 },
+  { 0x00fed5, 13157 },
+  { 0x000ddf, 9337 },
+  { 0x000dba, 8920 },
+  { 0x000da8, 8684 },
+  { 0x000daa, 8711 },
+  { 0x000da9, 8697 },
+  { 0x000dac, 8735 },
+  { 0x000dae, 8760 },
+  { 0x000db4, 8845 },
+  { 0x000dbd, 8959 },
+  { 0x000dbf, 8982 },
+  { 0x000dcb, 9116 },
+  { 0x000dce, 9150 },
+  { 0x000da2, 8602 },
+  { 0x000da5, 8643 },
+  { 0x000da3, 8615 },
+  { 0x000da4, 8629 },
+  { 0x000da6, 8656 },
+  { 0x000da1, 8591 },
+  { 0x000de5, 9420 },
+  { 0x000df7, 9633 },
+  { 0x000df5, 9610 },
+  { 0x000df6, 9621 },
+  { 0x000df9, 9659 },
+  { 0x000df1, 9561 },
+  { 0x000df8, 9646 },
+  { 0x000df3, 9587 },
+  { 0x000df4, 9599 },
+  { 0x000df2, 9574 },
+  { 0x000df0, 9549 },
+  { 0x000dcc, 9127 },
+  { 0x000dc5, 9049 },
+  { 0x000dc6, 9061 },
+  { 0x000deb, 9501 },
+  { 0x000de8, 9466 },
+  { 0x000dd1, 9190 },
+  { 0x000dde, 9314 },
+  { 0x000de7, 9451 },
+  { 0x000de9, 9477 },
+  { 0x000dea, 9489 },
+  { 0x000de6, 9437 },
+  { 0x000dc1, 9009 },
+  { 0x000da7, 8672 },
+  { 0x000ded, 9535 },
+  { 0x000db3, 8834 },
+  { 0x000db9, 8910 },
+  { 0x000dcd, 9140 },
+  { 0x000dcf, 9164 },
+  { 0x000dda, 9301 },
+  { 0x000dbe, 8969 },
+  { 0x000dbc, 8945 },
+  { 0x000dc0, 8993 },
+  { 0x000dbb, 8934 },
+  { 0x000dc3, 9030 },
+  { 0x000dc4, 9041 },
+  { 0x000dd0, 9179 },
+  { 0x000dd2, 9206 },
+  { 0x000de1, 9358 },
+  { 0x000de4, 9400 },
+  { 0x000de3, 9381 },
+  { 0x000dd3, 9218 },
+  { 0x000de0, 9347 },
+  { 0x000dd4, 9230 },
+  { 0x000dd5, 9241 },
+  { 0x000de2, 9370 },
+  { 0x000dd8, 9278 },
+  { 0x000dd6, 9253 },
+  { 0x000dd7, 9265 },
+  { 0x000dd9, 9289 },
+  { 0x000dc9, 9093 },
+  { 0x000dc8, 9081 },
+  { 0x000dab, 8725 },
+  { 0x000dca, 9105 },
+  { 0x000dec, 9518 },
+  { 0x000db1, 8799 },
+  { 0x000db2, 8818 },
+  { 0x000db7, 8881 },
+  { 0x000db0, 8786 },
+  { 0x000db8, 8896 },
+  { 0x000db6, 8867 },
+  { 0x000daf, 8773 },
+  { 0x000db5, 8856 },
+  { 0x000dc7, 9069 },
+  { 0x000dc2, 9019 },
+  { 0x000dad, 8748 },
+  { 0x0000de, 1001 },
+  { 0x1008ff9f, 26875 },
+  { 0x1008ff1f, 25839 },
+  { 0x1008ff81, 26620 },
+  { 0x1008ffa2, 26898 },
+  { 0x1008ffb1, 26972 },
+  { 0x1008ffb0, 26961 },
+  { 0x1008ffa9, 26946 },
+  { 0x00ff2b, 13857 },
+  { 0x1008ff82, 26626 },
+  { 0x0003ac, 2020 },
   { 0x000055, 247 },
-  { 0x0000da, 957 },
-  { 0x0002dd, 1870 },
-  { 0x0000db, 964 },
-  { 0x0000dc, 976 },
-  { 0x0001db, 1571 },
-  { 0x0000d9, 950 },
-  { 0x0006b6, 3863 },
-  { 0x0006b4, 3824 },
-  { 0x0006b7, 3886 },
-  { 0x0006a6, 3581 },
-  { 0x0006a4, 3542 },
-  { 0x0006a7, 3604 },
-  { 0x0006b6, 3875 },
-  { 0x0006b4, 3837 },
-  { 0x0006b7, 3899 },
-  { 0x0006a6, 3593 },
-  { 0x0006a4, 3555 },
-  { 0x0006a7, 3617 },
-  { 0x0003de, 2143 },
-  { 0x00ff65, 13809 },
-  { 0x0003d9, 2128 },
-  { 0x00ff52, 13728 },
-  { 0x0001d9, 1565 },
-  { 0x0003dd, 2136 },
+  { 0x1008ff96, 26771 },
+  { 0x0000da, 964 },
+  { 0x1001ee4, 20059 },
+  { 0x0002dd, 1886 },
+  { 0x0000db, 971 },
+  { 0x0000dc, 983 },
+  { 0x0001db, 1587 },
+  { 0x0000d9, 957 },
+  { 0x1001ee6, 20079 },
+  { 0x10001af, 15344 },
+  { 0x1001ee8, 20091 },
+  { 0x1001ef0, 20177 },
+  { 0x1001eea, 20113 },
+  { 0x1001eec, 20135 },
+  { 0x1001eee, 20155 },
+  { 0x0006bd, 4053 },
+  { 0x0006b6, 3905 },
+  { 0x0006b4, 3866 },
+  { 0x0006b7, 3928 },
+  { 0x0006ad, 3745 },
+  { 0x0006a6, 3597 },
+  { 0x0006a4, 3558 },
+  { 0x0006a7, 3620 },
+  { 0x0006b6, 3917 },
+  { 0x0006b4, 3879 },
+  { 0x0006b7, 3941 },
+  { 0x0006a6, 3609 },
+  { 0x0006a4, 3571 },
+  { 0x0006a7, 3633 },
+  { 0x0003de, 2159 },
+  { 0x00ff65, 14335 },
+  { 0x1008fe20, 25536 },
+  { 0x0003d9, 2144 },
+  { 0x00ff52, 14254 },
+  { 0x0001d9, 1581 },
+  { 0x1008ff85, 26640 },
+  { 0x1008ff86, 26648 },
+  { 0x1008ff84, 26633 },
+  { 0x0003dd, 2152 },
   { 0x000056, 249 },
-  { 0xffffff, 14507 },
+  { 0x1008ff34, 26027 },
+  { 0x1008ff87, 26656 },
+  { 0x1008ffa1, 26893 },
+  { 0xffffff, 26997 },
   { 0x000057, 251 },
-  { 0x0020a9, 11120 },
+  { 0x1008ff95, 26766 },
+  { 0x1008ff2e, 25974 },
+  { 0x1001e82, 19101 },
+  { 0x1008ff2b, 25949 },
+  { 0x1000174, 15270 },
+  { 0x1001e84, 19115 },
+  { 0x1008ff8f, 26714 },
+  { 0x1001e80, 19087 },
+  { 0x1008ff88, 26662 },
+  { 0x1008ff55, 26318 },
+  { 0x10020a9, 20588 },
+  { 0x1008ff89, 26674 },
   { 0x000058, 253 },
+  { 0x1001e8a, 19137 },
+  { 0x1008ff8a, 26679 },
   { 0x000059, 255 },
-  { 0x0000dd, 987 },
-  { 0x0013be, 11018 },
+  { 0x0000dd, 994 },
+  { 0x1001ef4, 20219 },
+  { 0x1000176, 15294 },
+  { 0x0013be, 11095 },
+  { 0x1008ffa5, 26916 },
+  { 0x1001ef2, 20205 },
+  { 0x1001ef6, 20239 },
+  { 0x1001ef8, 20251 },
   { 0x00005a, 257 },
-  { 0x0001af, 1354 },
-  { 0x0001ac, 1340 },
-  { 0x0001ae, 1347 },
-  { 0x00ff28, 13420 },
-  { 0x00ff2a, 13436 },
+  { 0x0001af, 1370 },
+  { 0x0001ac, 1356 },
+  { 0x0001ae, 1363 },
+  { 0x00ff3d, 14168 },
+  { 0x00ff28, 13825 },
+  { 0x00ff2a, 13841 },
+  { 0x1008ff8b, 26684 },
+  { 0x1008ff8c, 26691 },
+  { 0x10001b5, 15356 },
   { 0x000061, 333 },
-  { 0x0000e1, 1020 },
-  { 0x0001ff, 1720 },
-  { 0x0001e3, 1600 },
-  { 0x0000e2, 1027 },
+  { 0x0000e1, 1027 },
+  { 0x1001ea1, 19167 },
+  { 0x0001ff, 1736 },
+  { 0x0001e3, 1616 },
+  { 0x1001eaf, 19375 },
+  { 0x1001eb7, 19472 },
+  { 0x1001eb1, 19399 },
+  { 0x1001eb3, 19422 },
+  { 0x1001eb5, 19445 },
+  { 0x0000e2, 1034 },
+  { 0x1001ea5, 19206 },
+  { 0x1001ead, 19343 },
+  { 0x1001ea7, 19240 },
+  { 0x1001ea9, 19273 },
+  { 0x1001eab, 19306 },
   { 0x0000b4, 612 },
-  { 0x0000e4, 1046 },
-  { 0x0000e6, 1063 },
-  { 0x0000e0, 1013 },
-  { 0x0003e0, 2151 },
+  { 0x0000e4, 1053 },
+  { 0x0000e6, 1070 },
+  { 0x0000e0, 1020 },
+  { 0x1001ea3, 19183 },
+  { 0x0003e0, 2167 },
   { 0x000026, 48 },
-  { 0x0001b1, 1364 },
+  { 0x0001b1, 1380 },
   { 0x000027, 58 },
-  { 0x0008c8, 6376 },
-  { 0x0000e5, 1057 },
+  { 0x1002248, 20750 },
+  { 0x0008c8, 6444 },
+  { 0x0000e5, 1064 },
   { 0x00005e, 294 },
   { 0x00007e, 410 },
   { 0x00002a, 101 },
   { 0x000040, 204 },
-  { 0x0000e3, 1039 },
+  { 0x0000e3, 1046 },
   { 0x000062, 335 },
+  { 0x1001e03, 18937 },
   { 0x00005c, 271 },
-  { 0x000af4, 7692 },
+  { 0x000af4, 7769 },
   { 0x00007c, 395 },
-  { 0x0009df, 6562 },
-  { 0x0008a5, 5952 },
-  { 0x0008ac, 6062 },
-  { 0x0008a8, 5995 },
-  { 0x0008b2, 6166 },
-  { 0x0008ae, 6091 },
-  { 0x0008aa, 6030 },
-  { 0x0008b6, 6253 },
-  { 0x0009f6, 6770 },
-  { 0x0008b4, 6209 },
+  { 0x1002235, 20730 },
+  { 0x0009df, 6630 },
+  { 0x0008a5, 6020 },
+  { 0x0008ac, 6130 },
+  { 0x0008a8, 6063 },
+  { 0x0008b2, 6234 },
+  { 0x0008ae, 6159 },
+  { 0x0008aa, 6098 },
+  { 0x0008b6, 6321 },
+  { 0x0009f6, 6838 },
+  { 0x0008b4, 6277 },
   { 0x00007b, 385 },
   { 0x00007d, 399 },
   { 0x00005b, 259 },
   { 0x00005d, 281 },
-  { 0x0001a2, 1289 },
+  { 0x1002800, 20781 },
+  { 0x00fff1, 15108 },
+  { 0x00fffa, 15234 },
+  { 0x00fff2, 15122 },
+  { 0x00fff3, 15136 },
+  { 0x00fff4, 15150 },
+  { 0x00fff5, 15164 },
+  { 0x00fff6, 15178 },
+  { 0x00fff7, 15192 },
+  { 0x00fff8, 15206 },
+  { 0x00fff9, 15220 },
+  { 0x1002801, 20795 },
+  { 0x1002803, 20825 },
+  { 0x1002807, 20888 },
+  { 0x100280f, 21019 },
+  { 0x100281f, 21290 },
+  { 0x100283f, 21849 },
+  { 0x100287f, 23000 },
+  { 0x10028ff, 25367 },
+  { 0x10028bf, 24152 },
+  { 0x100285f, 22409 },
+  { 0x10028df, 24744 },
+  { 0x100289f, 23561 },
+  { 0x100282f, 21562 },
+  { 0x100286f, 22697 },
+  { 0x10028ef, 25048 },
+  { 0x10028af, 23849 },
+  { 0x100284f, 22122 },
+  { 0x10028cf, 24441 },
+  { 0x100288f, 23274 },
+  { 0x1002817, 21151 },
+  { 0x1002837, 21702 },
+  { 0x1002877, 22845 },
+  { 0x10028f7, 25204 },
+  { 0x10028b7, 23997 },
+  { 0x1002857, 22262 },
+  { 0x10028d7, 24589 },
+  { 0x1002897, 23414 },
+  { 0x1002827, 21423 },
+  { 0x1002867, 22550 },
+  { 0x10028e7, 24893 },
+  { 0x10028a7, 23702 },
+  { 0x1002847, 21983 },
+  { 0x10028c7, 24294 },
+  { 0x1002887, 23135 },
+  { 0x100280b, 20952 },
+  { 0x100281b, 21219 },
+  { 0x100283b, 21774 },
+  { 0x100287b, 22921 },
+  { 0x10028fb, 25284 },
+  { 0x10028bb, 24073 },
+  { 0x100285b, 22334 },
+  { 0x10028db, 24665 },
+  { 0x100289b, 23486 },
+  { 0x100282b, 21491 },
+  { 0x100286b, 22622 },
+  { 0x10028eb, 24969 },
+  { 0x10028ab, 23774 },
+  { 0x100284b, 22051 },
+  { 0x10028cb, 24366 },
+  { 0x100288b, 23203 },
+  { 0x1002813, 21084 },
+  { 0x1002833, 21631 },
+  { 0x1002873, 22770 },
+  { 0x10028f3, 25125 },
+  { 0x10028b3, 23922 },
+  { 0x1002853, 22191 },
+  { 0x10028d3, 24514 },
+  { 0x1002893, 23343 },
+  { 0x1002823, 21356 },
+  { 0x1002863, 22479 },
+  { 0x10028e3, 24818 },
+  { 0x10028a3, 23631 },
+  { 0x1002843, 21916 },
+  { 0x10028c3, 24223 },
+  { 0x1002883, 23068 },
+  { 0x1002805, 20856 },
+  { 0x100280d, 20985 },
+  { 0x100281d, 21254 },
+  { 0x100283d, 21811 },
+  { 0x100287d, 22960 },
+  { 0x10028fd, 25325 },
+  { 0x10028bd, 24112 },
+  { 0x100285d, 22371 },
+  { 0x10028dd, 24704 },
+  { 0x100289d, 23523 },
+  { 0x100282d, 21526 },
+  { 0x100286d, 22659 },
+  { 0x10028ed, 25008 },
+  { 0x10028ad, 23811 },
+  { 0x100284d, 22086 },
+  { 0x10028cd, 24403 },
+  { 0x100288d, 23238 },
+  { 0x1002815, 21117 },
+  { 0x1002835, 21666 },
+  { 0x1002875, 22807 },
+  { 0x10028f5, 25164 },
+  { 0x10028b5, 23959 },
+  { 0x1002855, 22226 },
+  { 0x10028d5, 24551 },
+  { 0x1002895, 23378 },
+  { 0x1002825, 21389 },
+  { 0x1002865, 22514 },
+  { 0x10028e5, 24855 },
+  { 0x10028a5, 23666 },
+  { 0x1002845, 21949 },
+  { 0x10028c5, 24258 },
+  { 0x1002885, 23101 },
+  { 0x1002809, 20920 },
+  { 0x1002819, 21185 },
+  { 0x1002839, 21738 },
+  { 0x1002879, 22883 },
+  { 0x10028f9, 25244 },
+  { 0x10028b9, 24035 },
+  { 0x1002859, 22298 },
+  { 0x10028d9, 24627 },
+  { 0x1002899, 23450 },
+  { 0x1002829, 21457 },
+  { 0x1002869, 22586 },
+  { 0x10028e9, 24931 },
+  { 0x10028a9, 23738 },
+  { 0x1002849, 22017 },
+  { 0x10028c9, 24330 },
+  { 0x1002889, 23169 },
+  { 0x1002811, 21052 },
+  { 0x1002831, 21597 },
+  { 0x1002871, 22734 },
+  { 0x10028f1, 25087 },
+  { 0x10028b1, 23886 },
+  { 0x1002851, 22157 },
+  { 0x10028d1, 24478 },
+  { 0x1002891, 23309 },
+  { 0x1002821, 21324 },
+  { 0x1002861, 22445 },
+  { 0x10028e1, 24782 },
+  { 0x10028a1, 23597 },
+  { 0x1002841, 21884 },
+  { 0x10028c1, 24189 },
+  { 0x1002881, 23036 },
+  { 0x1002802, 20810 },
+  { 0x1002806, 20872 },
+  { 0x100280e, 21002 },
+  { 0x100281e, 21272 },
+  { 0x100283e, 21830 },
+  { 0x100287e, 22980 },
+  { 0x10028fe, 25346 },
+  { 0x10028be, 24132 },
+  { 0x100285e, 22390 },
+  { 0x10028de, 24724 },
+  { 0x100289e, 23542 },
+  { 0x100282e, 21544 },
+  { 0x100286e, 22678 },
+  { 0x10028ee, 25028 },
+  { 0x10028ae, 23830 },
+  { 0x100284e, 22104 },
+  { 0x10028ce, 24422 },
+  { 0x100288e, 23256 },
+  { 0x1002816, 21134 },
+  { 0x1002836, 21684 },
+  { 0x1002876, 22826 },
+  { 0x10028f6, 25184 },
+  { 0x10028b6, 23978 },
+  { 0x1002856, 22244 },
+  { 0x10028d6, 24570 },
+  { 0x1002896, 23396 },
+  { 0x1002826, 21406 },
+  { 0x1002866, 22532 },
+  { 0x10028e6, 24874 },
+  { 0x10028a6, 23684 },
+  { 0x1002846, 21966 },
+  { 0x10028c6, 24276 },
+  { 0x1002886, 23118 },
+  { 0x100280a, 20936 },
+  { 0x100281a, 21202 },
+  { 0x100283a, 21756 },
+  { 0x100287a, 22902 },
+  { 0x10028fa, 25264 },
+  { 0x10028ba, 24054 },
+  { 0x100285a, 22316 },
+  { 0x10028da, 24646 },
+  { 0x100289a, 23468 },
+  { 0x100282a, 21474 },
+  { 0x100286a, 22604 },
+  { 0x10028ea, 24950 },
+  { 0x10028aa, 23756 },
+  { 0x100284a, 22034 },
+  { 0x10028ca, 24348 },
+  { 0x100288a, 23186 },
+  { 0x1002812, 21068 },
+  { 0x1002832, 21614 },
+  { 0x1002872, 22752 },
+  { 0x10028f2, 25106 },
+  { 0x10028b2, 23904 },
+  { 0x1002852, 22174 },
+  { 0x10028d2, 24496 },
+  { 0x1002892, 23326 },
+  { 0x1002822, 21340 },
+  { 0x1002862, 22462 },
+  { 0x10028e2, 24800 },
+  { 0x10028a2, 23614 },
+  { 0x1002842, 21900 },
+  { 0x10028c2, 24206 },
+  { 0x1002882, 23052 },
+  { 0x1002804, 20841 },
+  { 0x100280c, 20969 },
+  { 0x100281c, 21237 },
+  { 0x100283c, 21793 },
+  { 0x100287c, 22941 },
+  { 0x10028fc, 25305 },
+  { 0x10028bc, 24093 },
+  { 0x100285c, 22353 },
+  { 0x10028dc, 24685 },
+  { 0x100289c, 23505 },
+  { 0x100282c, 21509 },
+  { 0x100286c, 22641 },
+  { 0x10028ec, 24989 },
+  { 0x10028ac, 23793 },
+  { 0x100284c, 22069 },
+  { 0x10028cc, 24385 },
+  { 0x100288c, 23221 },
+  { 0x1002814, 21101 },
+  { 0x1002834, 21649 },
+  { 0x1002874, 22789 },
+  { 0x10028f4, 25145 },
+  { 0x10028b4, 23941 },
+  { 0x1002854, 22209 },
+  { 0x10028d4, 24533 },
+  { 0x1002894, 23361 },
+  { 0x1002824, 21373 },
+  { 0x1002864, 22497 },
+  { 0x10028e4, 24837 },
+  { 0x10028a4, 23649 },
+  { 0x1002844, 21933 },
+  { 0x10028c4, 24241 },
+  { 0x1002884, 23085 },
+  { 0x1002808, 20905 },
+  { 0x1002818, 21169 },
+  { 0x1002838, 21721 },
+  { 0x1002878, 22865 },
+  { 0x10028f8, 25225 },
+  { 0x10028b8, 24017 },
+  { 0x1002858, 22281 },
+  { 0x10028d8, 24609 },
+  { 0x1002898, 23433 },
+  { 0x1002828, 21441 },
+  { 0x1002868, 22569 },
+  { 0x10028e8, 24913 },
+  { 0x10028a8, 23721 },
+  { 0x1002848, 22001 },
+  { 0x10028c8, 24313 },
+  { 0x1002888, 23153 },
+  { 0x1002810, 21037 },
+  { 0x1002830, 21581 },
+  { 0x1002870, 22717 },
+  { 0x10028f0, 25069 },
+  { 0x10028b0, 23869 },
+  { 0x1002850, 22141 },
+  { 0x10028d0, 24461 },
+  { 0x1002890, 23293 },
+  { 0x1002820, 21309 },
+  { 0x1002860, 22429 },
+  { 0x10028e0, 24765 },
+  { 0x10028a0, 23581 },
+  { 0x1002840, 21869 },
+  { 0x10028c0, 24173 },
+  { 0x1002880, 23021 },
+  { 0x0001a2, 1305 },
   { 0x0000a6, 472 },
   { 0x000063, 337 },
-  { 0x0002e5, 1889 },
-  { 0x0001e6, 1614 },
-  { 0x000ab8, 6996 },
-  { 0x000afc, 7801 },
-  { 0x0001b7, 1401 },
-  { 0x0001e8, 1621 },
-  { 0x0000e7, 1066 },
-  { 0x0002e6, 1899 },
+  { 0x00fea3, 13064 },
+  { 0x0002e5, 1905 },
+  { 0x0001e6, 1630 },
+  { 0x000ab8, 7064 },
+  { 0x000afc, 7878 },
+  { 0x0001b7, 1417 },
+  { 0x0001e8, 1637 },
+  { 0x0000e7, 1073 },
+  { 0x0002e6, 1915 },
   { 0x0000b8, 646 },
   { 0x0000a2, 445 },
-  { 0x0009e1, 6581 },
-  { 0x000af3, 7682 },
-  { 0x000bcf, 7950 },
-  { 0x000aec, 7630 },
+  { 0x00fea0, 13055 },
+  { 0x0009e1, 6649 },
+  { 0x000af3, 7759 },
+  { 0x000bcf, 8027 },
+  { 0x000aec, 7707 },
   { 0x00003a, 160 },
   { 0x00002c, 115 },
+  { 0x100220b, 20668 },
   { 0x0000a9, 500 },
-  { 0x0009e4, 6600 },
-  { 0x0009ee, 6668 },
+  { 0x0009e4, 6668 },
+  { 0x0009ee, 6736 },
+  { 0x100221b, 20690 },
   { 0x0000a4, 459 },
-  { 0x000aff, 7845 },
+  { 0x000aff, 7922 },
   { 0x000064, 339 },
-  { 0x000af1, 7662 },
-  { 0x0001ef, 1643 },
-  { 0x00fe56, 12290 },
-  { 0x00fe58, 12319 },
-  { 0x00fe51, 12229 },
-  { 0x00fe60, 12437 },
-  { 0x00fe55, 12279 },
-  { 0x00fe5a, 12351 },
-  { 0x00fe5b, 12362 },
-  { 0x00fe52, 12240 },
-  { 0x00fe57, 12304 },
-  { 0x00fe59, 12334 },
-  { 0x00fe50, 12218 },
-  { 0x00fe61, 12451 },
-  { 0x00fe62, 12461 },
-  { 0x00fe5d, 12387 },
-  { 0x00fe54, 12267 },
-  { 0x00fe5c, 12375 },
-  { 0x00fe5f, 12415 },
-  { 0x00fe53, 12256 },
-  { 0x00fe5e, 12397 },
-  { 0x000abd, 7028 },
+  { 0x1001e0b, 18957 },
+  { 0x000af1, 7739 },
+  { 0x0001ef, 1659 },
+  { 0x00fe81, 12945 },
+  { 0x00fe83, 12959 },
+  { 0x00fe85, 12973 },
+  { 0x00fe87, 12987 },
+  { 0x00fe89, 13001 },
+  { 0x00fe80, 12938 },
+  { 0x00fe64, 12505 },
+  { 0x00fe56, 12312 },
+  { 0x00fe65, 12532 },
+  { 0x00fe58, 12341 },
+  { 0x00fe51, 12234 },
+  { 0x00fe6b, 12653 },
+  { 0x00fe69, 12616 },
+  { 0x00fe6e, 12708 },
+  { 0x00fe6c, 12669 },
+  { 0x00fe60, 12459 },
+  { 0x00fe68, 12599 },
+  { 0x00fe67, 12584 },
+  { 0x00fe6a, 12637 },
+  { 0x00fe55, 12301 },
+  { 0x00fe8b, 13025 },
+  { 0x00fe5a, 12373 },
+  { 0x00fe5b, 12384 },
+  { 0x00fe52, 12245 },
+  { 0x00fe6f, 12724 },
+  { 0x00fe65, 12556 },
+  { 0x00fe57, 12326 },
+  { 0x00fe59, 12356 },
+  { 0x00fe66, 12567 },
+  { 0x00fe82, 12952 },
+  { 0x00fe50, 12223 },
+  { 0x00fe8c, 13044 },
+  { 0x00fe61, 12473 },
+  { 0x00fe62, 12483 },
+  { 0x00fe84, 12966 },
+  { 0x00fe6d, 12689 },
+  { 0x00fe5d, 12409 },
+  { 0x00fe54, 12289 },
+  { 0x00fe86, 12980 },
+  { 0x00fe5c, 12397 },
+  { 0x00fe53, 12261 },
+  { 0x00fe64, 12521 },
+  { 0x00fe5f, 12437 },
+  { 0x00fe8a, 13008 },
+  { 0x00fe63, 12493 },
+  { 0x00fe53, 12278 },
+  { 0x00fe88, 12994 },
+  { 0x00fe5e, 12419 },
+  { 0x000abd, 7096 },
   { 0x0000b0, 569 },
   { 0x0000a8, 490 },
-  { 0x000aed, 7635 },
-  { 0x000aa5, 6822 },
-  { 0x0000f7, 1204 },
+  { 0x000aed, 7712 },
+  { 0x000aa5, 6890 },
+  { 0x100222c, 20710 },
+  { 0x0000f7, 1211 },
   { 0x000024, 33 },
-  { 0x000aaf, 6899 },
-  { 0x0001bd, 1437 },
-  { 0x000af2, 7669 },
-  { 0x000afe, 7826 },
-  { 0x0008fe, 6552 },
-  { 0x000ba8, 7873 },
-  { 0x000bd6, 7965 },
-  { 0x000bc4, 7915 },
-  { 0x000bc2, 7899 },
-  { 0x0001f0, 1650 },
+  { 0x000aaf, 6967 },
+  { 0x0001bd, 1453 },
+  { 0x000af2, 7746 },
+  { 0x000afe, 7903 },
+  { 0x0008fe, 6620 },
+  { 0x000ba8, 7950 },
+  { 0x000bd6, 8042 },
+  { 0x000bc4, 7992 },
+  { 0x000bc2, 7976 },
+  { 0x0001f0, 1666 },
   { 0x000065, 341 },
-  { 0x0003ec, 2167 },
-  { 0x0000e9, 1082 },
-  { 0x0001ec, 1636 },
-  { 0x0000ea, 1089 },
-  { 0x0000eb, 1101 },
-  { 0x0000e8, 1075 },
-  { 0x000aae, 6890 },
-  { 0x000aa3, 6804 },
-  { 0x000aa4, 6813 },
-  { 0x0003ba, 2036 },
-  { 0x000aa9, 6864 },
-  { 0x000ade, 7409 },
-  { 0x000adf, 7424 },
-  { 0x000ace, 7191 },
-  { 0x000acf, 7204 },
-  { 0x000aa1, 6788 },
-  { 0x000aaa, 6871 },
-  { 0x000ae6, 7531 },
-  { 0x000ae7, 7550 },
-  { 0x0003bf, 2064 },
-  { 0x000ae0, 7437 },
-  { 0x000ae1, 7454 },
-  { 0x000aa2, 6796 },
-  { 0x0001ea, 1628 },
+  { 0x0003ec, 2183 },
+  { 0x0000e9, 1089 },
+  { 0x1001eb9, 19497 },
+  { 0x0001ec, 1652 },
+  { 0x0000ea, 1096 },
+  { 0x1001ebf, 19550 },
+  { 0x1001ec7, 19687 },
+  { 0x1001ec1, 19584 },
+  { 0x1001ec3, 19617 },
+  { 0x1001ec5, 19650 },
+  { 0x0000eb, 1108 },
+  { 0x0000e8, 1082 },
+  { 0x1001ebb, 19513 },
+  { 0x1002088, 20468 },
+  { 0x1002078, 20330 },
+  { 0x1002208, 20645 },
+  { 0x000aae, 6958 },
+  { 0x000aa3, 6872 },
+  { 0x000aa4, 6881 },
+  { 0x0003ba, 2052 },
+  { 0x000aa9, 6932 },
+  { 0x000ade, 7486 },
+  { 0x000adf, 7501 },
+  { 0x000ace, 7259 },
+  { 0x000acf, 7272 },
+  { 0x1002205, 20636 },
+  { 0x000aa1, 6856 },
+  { 0x000aaa, 6939 },
+  { 0x000ae6, 7608 },
+  { 0x000ae7, 7627 },
+  { 0x0003bf, 2080 },
+  { 0x000ae0, 7514 },
+  { 0x000ae1, 7531 },
+  { 0x000aa2, 6864 },
+  { 0x0001ea, 1644 },
   { 0x00003d, 181 },
-  { 0x0000f0, 1149 },
+  { 0x0000f0, 1156 },
+  { 0x1001ebd, 19526 },
   { 0x000021, 6 },
   { 0x0000a1, 434 },
+  { 0x1000292, 15418 },
   { 0x000066, 343 },
-  { 0x000af8, 7740 },
-  { 0x0009e3, 6597 },
-  { 0x000abb, 7003 },
-  { 0x000adc, 7368 },
-  { 0x000adb, 7351 },
-  { 0x000add, 7388 },
-  { 0x000ae9, 7585 },
-  { 0x000ae8, 7567 },
-  { 0x000ac5, 7089 },
-  { 0x000ab7, 6985 },
-  { 0x000ab5, 6965 },
-  { 0x0008f6, 6514 },
+  { 0x1001e1f, 18977 },
+  { 0x000af8, 7817 },
+  { 0x0009e3, 6665 },
+  { 0x000abb, 7071 },
+  { 0x000adc, 7445 },
+  { 0x000adb, 7428 },
+  { 0x000add, 7465 },
+  { 0x000ae9, 7662 },
+  { 0x000ae8, 7644 },
+  { 0x000ac5, 7157 },
+  { 0x000ab7, 7053 },
+  { 0x1002085, 20426 },
+  { 0x1002075, 20291 },
+  { 0x000ab5, 7033 },
+  { 0x1002084, 20412 },
+  { 0x1002074, 20278 },
+  { 0x100221c, 20699 },
+  { 0x0008f6, 6582 },
   { 0x000067, 345 },
-  { 0x0002f5, 1911 },
-  { 0x0002bb, 1807 },
-  { 0x0003bb, 2044 },
-  { 0x0002f8, 1921 },
+  { 0x0002f5, 1927 },
+  { 0x0002bb, 1823 },
+  { 0x10001e7, 15397 },
+  { 0x0003bb, 2060 },
+  { 0x0002f8, 1937 },
   { 0x000060, 317 },
   { 0x00003e, 187 },
-  { 0x0008be, 6315 },
+  { 0x0008be, 6383 },
   { 0x0000ab, 522 },
   { 0x0000bb, 676 },
   { 0x000068, 347 },
-  { 0x000aa8, 6854 },
-  { 0x0002b6, 1786 },
-  { 0x000aee, 7643 },
-  { 0x000ce0, 8033 },
-  { 0x000cf2, 8350 },
-  { 0x000ce1, 8046 },
-  { 0x000ce1, 8057 },
-  { 0x000ce7, 8169 },
-  { 0x000ce3, 8096 },
-  { 0x000ce3, 8109 },
-  { 0x000cdf, 8012 },
-  { 0x000cea, 8226 },
-  { 0x000ced, 8268 },
-  { 0x000cef, 8295 },
-  { 0x000cf3, 8362 },
-  { 0x000cf5, 8387 },
-  { 0x000cf5, 8404 },
-  { 0x000ce2, 8069 },
-  { 0x000ce2, 8082 },
-  { 0x000ce4, 8123 },
-  { 0x000ce7, 8181 },
-  { 0x000ceb, 8243 },
-  { 0x000cf7, 8445 },
-  { 0x000cec, 8255 },
-  { 0x000cee, 8284 },
-  { 0x000cf0, 8311 },
-  { 0x000cf4, 8377 },
-  { 0x000cf7, 8456 },
-  { 0x000cf8, 8468 },
-  { 0x000cf1, 8322 },
-  { 0x000cf1, 8336 },
-  { 0x000cf9, 8480 },
-  { 0x000cfa, 8492 },
-  { 0x000cfa, 8503 },
-  { 0x000ce8, 8192 },
-  { 0x000ce8, 8203 },
-  { 0x000ce5, 8133 },
-  { 0x000ce9, 8215 },
-  { 0x000cf6, 8421 },
-  { 0x000cf6, 8433 },
-  { 0x000ce6, 8144 },
-  { 0x000ce6, 8156 },
-  { 0x000ada, 7342 },
-  { 0x0008a3, 5925 },
-  { 0x0009ef, 6682 },
-  { 0x0009f0, 6697 },
-  { 0x0009f1, 6712 },
-  { 0x0009f2, 6727 },
-  { 0x0009f3, 6742 },
-  { 0x0002b1, 1778 },
-  { 0x0009e2, 6594 },
+  { 0x000aa8, 6922 },
+  { 0x0002b6, 1802 },
+  { 0x000aee, 7720 },
+  { 0x000ce0, 8110 },
+  { 0x000cf2, 8427 },
+  { 0x000ce1, 8123 },
+  { 0x000ce1, 8134 },
+  { 0x000ce7, 8246 },
+  { 0x000ce3, 8173 },
+  { 0x000ce3, 8186 },
+  { 0x000cdf, 8089 },
+  { 0x000cea, 8303 },
+  { 0x000ced, 8345 },
+  { 0x000cef, 8372 },
+  { 0x000cf3, 8439 },
+  { 0x000cf5, 8464 },
+  { 0x000cf5, 8481 },
+  { 0x000ce2, 8146 },
+  { 0x000ce2, 8159 },
+  { 0x000ce4, 8200 },
+  { 0x000ce7, 8258 },
+  { 0x000ceb, 8320 },
+  { 0x000cf7, 8522 },
+  { 0x000cec, 8332 },
+  { 0x000cee, 8361 },
+  { 0x000cf0, 8388 },
+  { 0x000cf4, 8454 },
+  { 0x000cf7, 8533 },
+  { 0x000cf8, 8545 },
+  { 0x000cf1, 8399 },
+  { 0x000cf1, 8413 },
+  { 0x000cf9, 8557 },
+  { 0x000cfa, 8569 },
+  { 0x000cfa, 8580 },
+  { 0x000ce8, 8269 },
+  { 0x000ce8, 8280 },
+  { 0x000ce5, 8210 },
+  { 0x000ce9, 8292 },
+  { 0x000cf6, 8498 },
+  { 0x000cf6, 8510 },
+  { 0x000ce6, 8221 },
+  { 0x000ce6, 8233 },
+  { 0x000ada, 7419 },
+  { 0x0008a3, 5993 },
+  { 0x0009ef, 6750 },
+  { 0x0009f0, 6765 },
+  { 0x0009f1, 6780 },
+  { 0x0009f2, 6795 },
+  { 0x0009f3, 6810 },
+  { 0x0002b1, 1794 },
+  { 0x0009e2, 6662 },
   { 0x0000ad, 544 },
   { 0x000069, 349 },
-  { 0x0000ed, 1119 },
-  { 0x0000ee, 1126 },
-  { 0x0008cf, 6418 },
-  { 0x0000ef, 1138 },
-  { 0x0002b9, 1798 },
-  { 0x0008cd, 6401 },
-  { 0x0000ec, 1112 },
-  { 0x0003ef, 2177 },
-  { 0x0008ce, 6410 },
-  { 0x0008da, 6436 },
-  { 0x0008db, 6447 },
-  { 0x0008c2, 6361 },
-  { 0x0008bf, 6332 },
-  { 0x0008dc, 6456 },
-  { 0x0003e7, 2159 },
-  { 0x0003b5, 2020 },
+  { 0x1008ff60, 26390 },
+  { 0x0000ed, 1126 },
+  { 0x1001ecb, 19729 },
+  { 0x100012d, 15263 },
+  { 0x0000ee, 1133 },
+  { 0x0008cf, 6486 },
+  { 0x0000ef, 1145 },
+  { 0x0002b9, 1814 },
+  { 0x0008cd, 6469 },
+  { 0x0000ec, 1119 },
+  { 0x1001ec9, 19713 },
+  { 0x0003ef, 2193 },
+  { 0x0008ce, 6478 },
+  { 0x0008da, 6504 },
+  { 0x0008db, 6515 },
+  { 0x0008c2, 6429 },
+  { 0x0008bf, 6400 },
+  { 0x0008dc, 6524 },
+  { 0x0003e7, 2175 },
+  { 0x0003b5, 2036 },
   { 0x00006a, 351 },
-  { 0x0002bc, 1814 },
-  { 0x000bca, 7934 },
+  { 0x0002bc, 1830 },
+  { 0x000bca, 8011 },
   { 0x00006b, 353 },
-  { 0x0004b1, 2439 },
-  { 0x0004c1, 2563 },
-  { 0x0004b4, 2460 },
-  { 0x0004cc, 2669 },
-  { 0x0004ca, 2653 },
-  { 0x0004cd, 2685 },
-  { 0x0004cb, 2661 },
-  { 0x0004ce, 2693 },
-  { 0x0004cc, 2677 },
-  { 0x0004b2, 2446 },
-  { 0x0004b6, 2474 },
-  { 0x0004b9, 2498 },
-  { 0x0004b7, 2482 },
-  { 0x0004ba, 2506 },
-  { 0x0004b8, 2490 },
-  { 0x0004cf, 2701 },
-  { 0x0004d2, 2725 },
-  { 0x0004d0, 2709 },
-  { 0x0004d3, 2733 },
-  { 0x0004d1, 2717 },
-  { 0x0004dd, 2813 },
-  { 0x0004c5, 2613 },
-  { 0x0004c8, 2637 },
-  { 0x0004c6, 2621 },
-  { 0x0004c9, 2645 },
-  { 0x0004c7, 2629 },
-  { 0x0004b5, 2467 },
-  { 0x0004d7, 2765 },
-  { 0x0004da, 2789 },
-  { 0x0004d8, 2773 },
-  { 0x0004db, 2797 },
-  { 0x0004d9, 2781 },
-  { 0x0004bb, 2514 },
-  { 0x0004be, 2539 },
-  { 0x0004bc, 2522 },
-  { 0x0004bf, 2547 },
-  { 0x0004bd, 2531 },
-  { 0x0004c0, 2555 },
-  { 0x0004c3, 2597 },
-  { 0x0004c1, 2572 },
-  { 0x0004c4, 2605 },
-  { 0x0004c2, 2580 },
-  { 0x0004c2, 2589 },
-  { 0x0004b3, 2453 },
-  { 0x0004dc, 2805 },
-  { 0x0004a6, 2340 },
-  { 0x0004d4, 2741 },
-  { 0x0004d6, 2757 },
-  { 0x0004d5, 2749 },
-  { 0x0004a7, 2348 },
-  { 0x0004a3, 2277 },
-  { 0x0004a4, 2297 },
-  { 0x0004a5, 2308 },
-  { 0x0004aa, 2369 },
-  { 0x0004a1, 2243 },
-  { 0x0004a8, 2355 },
-  { 0x0004a5, 2325 },
-  { 0x0004ab, 2376 },
-  { 0x0004a2, 2257 },
-  { 0x00ff7e, 13930 },
-  { 0x0004af, 2407 },
-  { 0x0004af, 2416 },
-  { 0x0004a9, 2362 },
-  { 0x0004ac, 2383 },
-  { 0x0004ae, 2399 },
-  { 0x0004ad, 2391 },
-  { 0x0003a2, 1952 },
-  { 0x0003f3, 2202 },
-  { 0x0003a2, 1958 },
+  { 0x0004b1, 2455 },
+  { 0x0004c1, 2579 },
+  { 0x0004b4, 2476 },
+  { 0x0004cc, 2685 },
+  { 0x0004ca, 2669 },
+  { 0x0004cd, 2701 },
+  { 0x0004cb, 2677 },
+  { 0x0004ce, 2709 },
+  { 0x0004cc, 2693 },
+  { 0x0004b2, 2462 },
+  { 0x0004b6, 2490 },
+  { 0x0004b9, 2514 },
+  { 0x0004b7, 2498 },
+  { 0x0004ba, 2522 },
+  { 0x0004b8, 2506 },
+  { 0x0004cf, 2717 },
+  { 0x0004d2, 2741 },
+  { 0x0004d0, 2725 },
+  { 0x0004d3, 2749 },
+  { 0x0004d1, 2733 },
+  { 0x0004dd, 2829 },
+  { 0x0004c5, 2629 },
+  { 0x0004c8, 2653 },
+  { 0x0004c6, 2637 },
+  { 0x0004c9, 2661 },
+  { 0x0004c7, 2645 },
+  { 0x0004b5, 2483 },
+  { 0x0004d7, 2781 },
+  { 0x0004da, 2805 },
+  { 0x0004d8, 2789 },
+  { 0x0004db, 2813 },
+  { 0x0004d9, 2797 },
+  { 0x0004bb, 2530 },
+  { 0x0004be, 2555 },
+  { 0x0004bc, 2538 },
+  { 0x0004bf, 2563 },
+  { 0x0004bd, 2547 },
+  { 0x0004c0, 2571 },
+  { 0x0004c3, 2613 },
+  { 0x0004c1, 2588 },
+  { 0x0004c4, 2621 },
+  { 0x0004c2, 2596 },
+  { 0x0004c2, 2605 },
+  { 0x0004b3, 2469 },
+  { 0x0004dc, 2821 },
+  { 0x0004a6, 2356 },
+  { 0x0004d4, 2757 },
+  { 0x0004d6, 2773 },
+  { 0x0004d5, 2765 },
+  { 0x0004a7, 2364 },
+  { 0x0004a3, 2293 },
+  { 0x0004a4, 2313 },
+  { 0x0004a5, 2324 },
+  { 0x0004aa, 2385 },
+  { 0x0004a1, 2259 },
+  { 0x0004a8, 2371 },
+  { 0x0004a5, 2341 },
+  { 0x0004ab, 2392 },
+  { 0x0004a2, 2273 },
+  { 0x00ff7e, 14444 },
+  { 0x0004af, 2423 },
+  { 0x0004af, 2432 },
+  { 0x0004a9, 2378 },
+  { 0x0004ac, 2399 },
+  { 0x0004ae, 2415 },
+  { 0x0004ad, 2407 },
+  { 0x0003a2, 1968 },
+  { 0x0003f3, 2218 },
+  { 0x0003a2, 1974 },
   { 0x00006c, 355 },
-  { 0x0001e5, 1607 },
-  { 0x000ad9, 7331 },
-  { 0x0001b5, 1387 },
-  { 0x0003b6, 2027 },
-  { 0x000abc, 7011 },
-  { 0x0008fb, 6523 },
-  { 0x000ba3, 7852 },
-  { 0x000ad2, 7261 },
-  { 0x0008af, 6106 },
-  { 0x000acc, 7156 },
-  { 0x000aea, 7605 },
-  { 0x0008a1, 5898 },
-  { 0x000bda, 7984 },
-  { 0x000ad0, 7220 },
-  { 0x0009f4, 6757 },
-  { 0x000bdc, 7993 },
+  { 0x0001e5, 1623 },
+  { 0x000ad9, 7408 },
+  { 0x1001e37, 18997 },
+  { 0x0001b5, 1403 },
+  { 0x0003b6, 2043 },
+  { 0x000abc, 7079 },
+  { 0x0008fb, 6591 },
+  { 0x000ba3, 7929 },
+  { 0x000ad2, 7329 },
+  { 0x0008af, 6174 },
+  { 0x000acc, 7224 },
+  { 0x000aea, 7682 },
+  { 0x0008a1, 5966 },
+  { 0x000bda, 8061 },
+  { 0x000ad0, 7288 },
+  { 0x0009f4, 6825 },
+  { 0x000bdc, 8070 },
   { 0x00003c, 176 },
-  { 0x0008bc, 6292 },
-  { 0x0009e5, 6603 },
-  { 0x0008de, 6475 },
-  { 0x0008df, 6486 },
-  { 0x0009ed, 6654 },
-  { 0x0009ea, 6612 },
-  { 0x0001b3, 1379 },
+  { 0x0008bc, 6360 },
+  { 0x0009e5, 6671 },
+  { 0x0008de, 6543 },
+  { 0x0008df, 6554 },
+  { 0x0009ed, 6722 },
+  { 0x0009ea, 6680 },
+  { 0x0001b3, 1395 },
   { 0x00006d, 357 },
+  { 0x1001e41, 19017 },
   { 0x0000af, 562 },
-  { 0x000af7, 7729 },
-  { 0x000af0, 7649 },
-  { 0x000abf, 7059 },
+  { 0x000af7, 7806 },
+  { 0x000af0, 7726 },
+  { 0x000abf, 7127 },
   { 0x0000ba, 666 },
   { 0x00002d, 121 },
-  { 0x000ad6, 7315 },
+  { 0x000ad6, 7392 },
   { 0x0000b5, 618 },
   { 0x0000d7, 932 },
-  { 0x000af6, 7717 },
-  { 0x000af5, 7704 },
+  { 0x000af6, 7794 },
+  { 0x000af5, 7781 },
   { 0x00006e, 359 },
-  { 0x0008c5, 6370 },
-  { 0x0001f1, 1658 },
-  { 0x0001f2, 1665 },
-  { 0x0003f1, 2185 },
-  { 0x0009e8, 6606 },
+  { 0x0008c5, 6438 },
+  { 0x0001f1, 1674 },
+  { 0x0001f2, 1681 },
+  { 0x0003f1, 2201 },
+  { 0x1002089, 20483 },
+  { 0x1002079, 20344 },
+  { 0x0009e8, 6674 },
   { 0x0000a0, 421 },
-  { 0x0008bd, 6306 },
+  { 0x1002247, 20738 },
+  { 0x1002209, 20655 },
+  { 0x0008bd, 6374 },
+  { 0x1002262, 20759 },
   { 0x0000ac, 536 },
-  { 0x0000f1, 1153 },
+  { 0x0000f1, 1160 },
   { 0x000023, 22 },
-  { 0x0006b0, 3775 },
+  { 0x0006b0, 3817 },
   { 0x00006f, 361 },
-  { 0x0000f3, 1167 },
-  { 0x0000f4, 1174 },
-  { 0x0000f6, 1193 },
-  { 0x0001f5, 1672 },
-  { 0x0013bd, 11015 },
-  { 0x0001b2, 1372 },
-  { 0x0000f2, 1160 },
-  { 0x0003f2, 2194 },
-  { 0x000ac3, 7066 },
-  { 0x000ab2, 6934 },
+  { 0x0000f3, 1174 },
+  { 0x1000275, 15410 },
+  { 0x1001ecd, 19749 },
+  { 0x10001d2, 15383 },
+  { 0x0000f4, 1181 },
+  { 0x1001ed1, 19788 },
+  { 0x1001ed9, 19925 },
+  { 0x1001ed3, 19822 },
+  { 0x1001ed5, 19855 },
+  { 0x1001ed7, 19888 },
+  { 0x0000f6, 1200 },
+  { 0x0001f5, 1688 },
+  { 0x0013bd, 11092 },
+  { 0x0001b2, 1388 },
+  { 0x0000f2, 1167 },
+  { 0x1001ecf, 19765 },
+  { 0x10001a1, 15338 },
+  { 0x1001edb, 19956 },
+  { 0x1001ee3, 20045 },
+  { 0x1001edd, 19978 },
+  { 0x1001edf, 19999 },
+  { 0x1001ee1, 20020 },
+  { 0x0003f2, 2210 },
+  { 0x000ac3, 7134 },
+  { 0x000ab2, 7002 },
   { 0x0000bd, 702 },
   { 0x0000bc, 691 },
-  { 0x000ab6, 6976 },
+  { 0x000ab6, 7044 },
+  { 0x1002081, 20371 },
   { 0x0000b9, 654 },
-  { 0x000ab0, 6915 },
-  { 0x000ae2, 7473 },
-  { 0x000ae5, 7522 },
-  { 0x000ae4, 7504 },
-  { 0x000ae3, 7488 },
+  { 0x000ab0, 6983 },
+  { 0x0000f8, 1220 },
+  { 0x000ae2, 7550 },
+  { 0x000ae5, 7599 },
+  { 0x000ae4, 7581 },
+  { 0x000ae3, 7565 },
   { 0x0000aa, 510 },
-  { 0x0000f8, 1213 },
-  { 0x0000f5, 1186 },
-  { 0x000bc0, 7891 },
-  { 0x00047e, 2234 },
+  { 0x0000f8, 1229 },
+  { 0x0000f5, 1193 },
+  { 0x000bc0, 7968 },
+  { 0x00047e, 2250 },
   { 0x000070, 363 },
+  { 0x1001e57, 19037 },
   { 0x0000b6, 621 },
   { 0x000028, 80 },
   { 0x000029, 90 },
-  { 0x0008ef, 6496 },
+  { 0x1002202, 20619 },
+  { 0x0008ef, 6564 },
   { 0x000025, 40 },
   { 0x00002e, 127 },
   { 0x0000b7, 631 },
-  { 0x000afb, 7781 },
+  { 0x000ad5, 7383 },
+  { 0x000afb, 7858 },
   { 0x00002b, 110 },
   { 0x0000b1, 576 },
-  { 0x000ad4, 7302 },
-  { 0x0004b0, 2424 },
-  { 0x000aa6, 6833 },
+  { 0x000ad4, 7370 },
+  { 0x0004b0, 2440 },
+  { 0x000aa6, 6901 },
   { 0x000071, 365 },
-  { 0x000bcc, 7938 },
+  { 0x000bcc, 8015 },
   { 0x00003f, 195 },
   { 0x0000bf, 724 },
   { 0x000022, 13 },
   { 0x000060, 323 },
   { 0x000027, 69 },
   { 0x000072, 367 },
-  { 0x0001e0, 1593 },
-  { 0x0008d6, 6428 },
-  { 0x0001f8, 1685 },
-  { 0x0003b3, 2011 },
+  { 0x0001e0, 1609 },
+  { 0x0008d6, 6496 },
+  { 0x0001f8, 1701 },
+  { 0x0003b3, 2027 },
   { 0x0000ae, 551 },
-  { 0x000abe, 7041 },
-  { 0x0008fd, 6541 },
-  { 0x000ba6, 7862 },
-  { 0x000ad3, 7281 },
-  { 0x0008b0, 6127 },
-  { 0x0008b7, 6271 },
-  { 0x000acd, 7173 },
-  { 0x000aeb, 7617 },
-  { 0x000bd8, 7974 },
-  { 0x000ad1, 7240 },
-  { 0x0009f5, 6763 },
-  { 0x000bfc, 8002 },
+  { 0x000abe, 7109 },
+  { 0x0008fd, 6609 },
+  { 0x000ba6, 7939 },
+  { 0x000ad3, 7349 },
+  { 0x0008b0, 6195 },
+  { 0x0008b7, 6339 },
+  { 0x000acd, 7241 },
+  { 0x000aeb, 7694 },
+  { 0x000bd8, 8051 },
+  { 0x000ad1, 7308 },
+  { 0x0009f5, 6831 },
+  { 0x000bfc, 8079 },
   { 0x000073, 369 },
-  { 0x0001b6, 1394 },
-  { 0x0001b9, 1407 },
-  { 0x0001ba, 1414 },
-  { 0x0002fe, 1940 },
-  { 0x00ff7e, 13942 },
-  { 0x000ad7, 7323 },
+  { 0x1001e61, 19057 },
+  { 0x0001b6, 1410 },
+  { 0x0001b9, 1423 },
+  { 0x0001ba, 1430 },
+  { 0x1000259, 15404 },
+  { 0x0002fe, 1956 },
+  { 0x00ff7e, 14468 },
+  { 0x000ad7, 7400 },
   { 0x0000a7, 482 },
   { 0x00003b, 166 },
-  { 0x0004df, 2832 },
-  { 0x000ac6, 7101 },
-  { 0x000aca, 7124 },
-  { 0x000aac, 6878 },
-  { 0x0008c9, 6388 },
-  { 0x000afd, 7807 },
+  { 0x0004df, 2848 },
+  { 0x000ac6, 7169 },
+  { 0x1002087, 20453 },
+  { 0x1002077, 20316 },
+  { 0x000aca, 7192 },
+  { 0x000aac, 6946 },
+  { 0x0008c9, 6456 },
+  { 0x000afd, 7884 },
+  { 0x1002086, 20440 },
+  { 0x1002076, 20304 },
   { 0x00002f, 134 },
-  { 0x0009e0, 6568 },
+  { 0x0009e0, 6636 },
   { 0x000020, 0 },
-  { 0x0000df, 1006 },
+  { 0x100221a, 20679 },
+  { 0x0000df, 1013 },
   { 0x0000a3, 450 },
+  { 0x1002263, 20772 },
   { 0x000074, 371 },
-  { 0x0001bb, 1423 },
-  { 0x0001fe, 1711 },
-  { 0x000af9, 7753 },
-  { 0x000afa, 7763 },
-  { 0x0008c0, 6341 },
-  { 0x000aa7, 6844 },
-  { 0x0000fe, 1264 },
-  { 0x000ac4, 7076 },
-  { 0x000ab4, 6953 },
+  { 0x1001e6b, 19077 },
+  { 0x0001bb, 1439 },
+  { 0x0001fe, 1727 },
+  { 0x000af9, 7830 },
+  { 0x000afa, 7840 },
+  { 0x0008c0, 6409 },
+  { 0x000aa7, 6912 },
+  { 0x0000fe, 1280 },
+  { 0x000ac4, 7144 },
+  { 0x000ab4, 7021 },
   { 0x0000be, 710 },
+  { 0x1002083, 20397 },
   { 0x0000b3, 598 },
-  { 0x0008a4, 5940 },
-  { 0x0008ab, 6048 },
-  { 0x0008a2, 5910 },
-  { 0x0008a7, 5978 },
-  { 0x0008b1, 6149 },
-  { 0x0008ad, 6076 },
-  { 0x0008a9, 6012 },
-  { 0x0008b5, 6235 },
-  { 0x0009f7, 6775 },
-  { 0x0008b3, 6183 },
-  { 0x000ac9, 7114 },
-  { 0x000acb, 7138 },
-  { 0x0003bc, 2053 },
-  { 0x000ab3, 6943 },
+  { 0x100222d, 20720 },
+  { 0x0008a4, 6008 },
+  { 0x0008ab, 6116 },
+  { 0x0008a2, 5978 },
+  { 0x0008a7, 6046 },
+  { 0x0008b1, 6217 },
+  { 0x0008ad, 6144 },
+  { 0x0008a9, 6080 },
+  { 0x0008b5, 6303 },
+  { 0x0009f7, 6843 },
+  { 0x0008b3, 6251 },
+  { 0x000ac9, 7182 },
+  { 0x000acb, 7206 },
+  { 0x0003bc, 2069 },
+  { 0x000ab3, 7011 },
+  { 0x1002082, 20384 },
   { 0x0000b2, 586 },
-  { 0x000ab1, 6924 },
+  { 0x000ab1, 6992 },
   { 0x000075, 373 },
-  { 0x0000fa, 1227 },
-  { 0x0002fd, 1933 },
-  { 0x0000fb, 1234 },
-  { 0x0000fc, 1246 },
-  { 0x0001fb, 1698 },
-  { 0x0000f9, 1220 },
-  { 0x0003fe, 2226 },
-  { 0x000bc6, 7925 },
+  { 0x0000fa, 1243 },
+  { 0x1001ee5, 20069 },
+  { 0x0002fd, 1949 },
+  { 0x0000fb, 1250 },
+  { 0x0000fc, 1262 },
+  { 0x0001fb, 1714 },
+  { 0x0000f9, 1236 },
+  { 0x1001ee7, 20085 },
+  { 0x10001b0, 15350 },
+  { 0x1001ee9, 20102 },
+  { 0x1001ef1, 20191 },
+  { 0x1001eeb, 20124 },
+  { 0x1001eed, 20145 },
+  { 0x1001eef, 20166 },
+  { 0x0003fe, 2242 },
+  { 0x000bc6, 8002 },
   { 0x00005f, 306 },
-  { 0x0008dd, 6469 },
-  { 0x0003f9, 2211 },
-  { 0x0008fc, 6533 },
-  { 0x000ba9, 7883 },
-  { 0x0009ec, 6641 },
-  { 0x0009eb, 6627 },
-  { 0x000bc3, 7908 },
-  { 0x000bd3, 7957 },
-  { 0x000bce, 7943 },
-  { 0x0001f9, 1692 },
-  { 0x0003fd, 2219 },
+  { 0x0008dd, 6537 },
+  { 0x0003f9, 2227 },
+  { 0x0008fc, 6601 },
+  { 0x000ba9, 7960 },
+  { 0x0009ec, 6709 },
+  { 0x0009eb, 6695 },
+  { 0x000bc3, 7985 },
+  { 0x000bd3, 8034 },
+  { 0x000bce, 8020 },
+  { 0x0001f9, 1708 },
+  { 0x0003fd, 2235 },
   { 0x000076, 375 },
-  { 0x0008c1, 6351 },
-  { 0x0009f8, 6780 },
-  { 0x0008a6, 5964 },
-  { 0x0004de, 2820 },
-  { 0x0009e9, 6609 },
+  { 0x0008c1, 6419 },
+  { 0x0009f8, 6848 },
+  { 0x0008a6, 6032 },
+  { 0x0004de, 2836 },
+  { 0x0009e9, 6677 },
   { 0x000077, 377 },
+  { 0x1001e83, 19108 },
+  { 0x1000175, 15282 },
+  { 0x1001e85, 19126 },
+  { 0x1001e81, 19094 },
   { 0x000078, 379 },
+  { 0x1001e8b, 19147 },
   { 0x000079, 381 },
-  { 0x0000fd, 1257 },
-  { 0x0000ff, 1270 },
+  { 0x0000fd, 1273 },
+  { 0x1001ef5, 20229 },
+  { 0x1000177, 15306 },
+  { 0x0000ff, 1286 },
   { 0x0000a5, 468 },
+  { 0x1001ef3, 20212 },
+  { 0x1001ef7, 20245 },
+  { 0x1001ef9, 20258 },
   { 0x00007a, 383 },
-  { 0x0001bf, 1456 },
-  { 0x0001bc, 1430 },
-  { 0x0001be, 1449 }};
+  { 0x0001bf, 1472 },
+  { 0x0001bc, 1446 },
+  { 0x0001be, 1465 },
+  { 0x1002080, 20357 },
+  { 0x1002070, 20265 },
+  { 0x10001b6, 15364 }};
+
 
+#if 0
+
+/*
+ * Translators, the strings in the “keyboard label” context are
+ * display names for keyboard keys. Some of them have prefixes like
+ * XF86 or ISO_ - these should be removed in the translation. Similarly,
+ * underscores should be replaced by spaces. The prefix “KP_” stands
+ * for “key pad” and you may want to include that in your translation.
+ * Here are some examples of English translations:
+ * XF86AudioMute - Audio mute
+ * Scroll_lock   - Scroll lock
+ * KP_Space      - Space (keypad)
+ */
+NC_("keyboard label", "BackSpace")
+NC_("keyboard label", "Tab")
+NC_("keyboard label", "Return")
+NC_("keyboard label", "Pause")
+NC_("keyboard label", "Scroll_Lock")
+NC_("keyboard label", "Sys_Req")
+NC_("keyboard label", "Escape")
+NC_("keyboard label", "Multi_key")
+NC_("keyboard label", "Home")
+NC_("keyboard label", "Left")
+NC_("keyboard label", "Up")
+NC_("keyboard label", "Right")
+NC_("keyboard label", "Down")
+NC_("keyboard label", "Page_Up")
+NC_("keyboard label", "Page_Down")
+NC_("keyboard label", "End")
+NC_("keyboard label", "Begin")
+NC_("keyboard label", "Print")
+NC_("keyboard label", "Insert")
+NC_("keyboard label", "Num_Lock")
+/* Translators: KP_ means 'key pad' here */
+NC_("keyboard label", "KP_Space")
+NC_("keyboard label", "KP_Tab")
+NC_("keyboard label", "KP_Enter")
+NC_("keyboard label", "KP_Home")
+NC_("keyboard label", "KP_Left")
+NC_("keyboard label", "KP_Up")
+NC_("keyboard label", "KP_Right")
+NC_("keyboard label", "KP_Down")
+NC_("keyboard label", "KP_Page_Up")
+NC_("keyboard label", "KP_Prior")
+NC_("keyboard label", "KP_Page_Down")
+NC_("keyboard label", "KP_Next")
+NC_("keyboard label", "KP_End")
+NC_("keyboard label", "KP_Begin")
+NC_("keyboard label", "KP_Insert")
+NC_("keyboard label", "KP_Delete")
+NC_("keyboard label", "Delete")
+NC_("keyboard label", "MonBrightnessUp")
+NC_("keyboard label", "MonBrightnessDown")
+NC_("keyboard label", "KbdBrightnessUp")
+NC_("keyboard label", "KbdBrightnessDown")
+NC_("keyboard label", "AudioMute")
+NC_("keyboard label", "AudioMicMute")
+NC_("keyboard label", "AudioLowerVolume")
+NC_("keyboard label", "AudioRaiseVolume")
+NC_("keyboard label", "AudioPlay")
+NC_("keyboard label", "AudioStop")
+NC_("keyboard label", "AudioNext")
+NC_("keyboard label", "AudioPrev")
+NC_("keyboard label", "AudioRecord")
+NC_("keyboard label", "AudioPause")
+NC_("keyboard label", "AudioRewind")
+NC_("keyboard label", "AudioMedia")
+NC_("keyboard label", "ScreenSaver")
+NC_("keyboard label", "Battery")
+NC_("keyboard label", "Launch1")
+NC_("keyboard label", "Forward")
+NC_("keyboard label", "Back")
+NC_("keyboard label", "Sleep")
+NC_("keyboard label", "Hibernate")
+NC_("keyboard label", "WLAN")
+NC_("keyboard label", "WebCam")
+NC_("keyboard label", "Display")
+NC_("keyboard label", "TouchpadToggle")
+NC_("keyboard label", "WakeUp")
+NC_("keyboard label", "Suspend")
 
+#endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4a764a1a6..125be3fc5 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -58,6 +58,10 @@ if ENABLE_ENGINE
 TESTS += ibus-engine-switch
 endif
 
+if ENABLE_GTK3
+TESTS += ibus-compose
+endif
+
 TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir) \
@@ -71,6 +75,10 @@ EXTRA_DIST = runtest
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
 
+ibus_compose_SOURCES = ibus-compose.c
+ibus_compose_CFLAGS = @GTK3_CFLAGS@
+ibus_compose_LDADD = $(prog_ldadd) @GTK3_LIBS@
+
 ibus_config_SOURCES = ibus-config.c
 ibus_config_LDADD = $(prog_ldadd)
 
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
new file mode 100644
index 000000000..6c30648ee
--- /dev/null
+++ b/src/tests/ibus-compose.c
@@ -0,0 +1,245 @@
+#include <gtk/gtk.h>
+#include "ibus.h"
+#include "ibuscomposetable.h"
+
+IBusBus *m_bus;
+IBusComposeTable *m_compose_table;
+IBusEngine *m_engine;
+int m_retval;
+
+static gboolean window_focus_in_event_cb (GtkWidget     *entry,
+                                          GdkEventFocus *event,
+                                          gpointer       data);
+
+static IBusEngine *
+create_engine_cb (IBusFactory *factory, const gchar *name, gpointer data)
+{
+    static int i = 1;
+    gchar *engine_path =
+            g_strdup_printf ("/org/freedesktop/IBus/engine/simpletest/%d",
+                             i++);
+    gchar *compose_path = NULL;
+    const gchar * const *langs;
+    const gchar * const *l;
+
+    m_engine = ibus_engine_new_with_type (IBUS_TYPE_ENGINE_SIMPLE,
+                                          name,
+                                          engine_path,
+                                          ibus_bus_get_connection (m_bus));
+    g_free (engine_path);
+    langs = g_get_language_names ();
+    for (l = langs; *l; l++) {
+        if (g_str_has_prefix (*l, "en_US"))
+            break;
+        if (g_strcmp0 (*l, "C") == 0)
+            break;
+        compose_path = g_build_filename ("/usr/share/X11/locale",
+                                         *l,
+                                         "Compose",
+                                         NULL);
+        if (g_file_test (compose_path, G_FILE_TEST_EXISTS))
+            break;
+        g_free (compose_path);
+        compose_path = NULL;
+    }
+    if (compose_path != NULL) {
+        m_compose_table = ibus_compose_table_new_with_file (compose_path);
+        if (m_compose_table == NULL)
+            g_warning ("Your locale uses en_US compose table.");
+        else
+            ibus_engine_simple_add_table (IBUS_ENGINE_SIMPLE (m_engine),
+                                          m_compose_table->data,
+                                          m_compose_table->max_seq_len,
+                                          m_compose_table->n_seqs);
+    } else {
+        g_warning ("Your locale uses en_US compose file.");
+    }
+    return m_engine;
+}
+
+static gboolean
+register_ibus_engine ()
+{
+    IBusFactory *factory;
+    IBusComponent *component;
+    IBusEngineDesc *desc;
+
+    m_bus = ibus_bus_new ();
+    if (!ibus_bus_is_connected (m_bus)) {
+        g_critical ("ibus-daemon is not running.");
+        return FALSE;
+    }
+    factory = ibus_factory_new (ibus_bus_get_connection (m_bus));
+    g_signal_connect (factory, "create-engine",
+                      G_CALLBACK (create_engine_cb), NULL);
+
+    component = ibus_component_new (
+            "org.freedesktop.IBus.SimpleTest",
+            "Simple Engine Test",
+            "0.0.1",
+            "GPL",
+            "Takao Fujiwara <takao.fujiwara1@gmail.com>",
+            "http://code.google.com/p/ibus/",
+            "",
+            "ibus");
+    desc = ibus_engine_desc_new (
+            "xkbtest:us::eng",
+            "XKB Test",
+            "XKB Test",
+            "en",
+            "GPL",
+            "Takao Fujiwara <takao.fujiwara1@gmail.com>",
+            "ibus-engine",
+            "us");
+    ibus_component_add_engine (component, desc);
+    ibus_bus_register_component (m_bus, component);
+
+    return TRUE;
+}
+
+static gboolean
+finit (gpointer data)
+{
+    m_retval = -1;
+    g_warning ("time out");
+    gtk_main_quit ();
+    return FALSE;
+}
+
+static void
+set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
+{
+    IBusBus *bus = IBUS_BUS (object);
+    GtkWidget *entry = GTK_WIDGET (data);
+    GError *error = NULL;
+    int i, j;
+    int index_stride;
+
+    if (!ibus_bus_set_global_engine_async_finish (bus, res, &error)) {
+        g_warning ("set engine failed: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+
+    if (m_compose_table == NULL) {
+        gtk_main_quit ();
+        return;
+    }
+
+    index_stride = m_compose_table->max_seq_len + 2;
+    for (i = 0;
+         i < (m_compose_table->n_seqs * index_stride);
+         i += index_stride) {
+        for (j = i; j < i + (index_stride - 1); j++) {
+            guint keyval = m_compose_table->data[j];
+            guint keycode = 0;
+            guint modifiers = 0;
+            gboolean retval;
+
+            if (keyval == 0)
+                break;
+            g_signal_emit_by_name (m_engine, "process-key-event",
+                                   keyval, keycode, modifiers, &retval);
+            modifiers |= IBUS_RELEASE_MASK;
+            g_signal_emit_by_name (m_engine, "process-key-event",
+                                   keyval, keycode, modifiers, &retval);
+        }
+    }
+
+    g_signal_handlers_disconnect_by_func (entry, 
+                                          G_CALLBACK (window_focus_in_event_cb),
+                                          NULL);
+    g_timeout_add_seconds (10, finit, NULL);
+}
+
+static gboolean
+window_focus_in_event_cb (GtkWidget *entry, GdkEventFocus *event, gpointer data)
+{
+    g_assert (m_bus != NULL);
+    ibus_bus_set_global_engine_async (m_bus,
+                                      "xkbtest:us::eng",
+                                      -1,
+                                      NULL,
+                                      set_engine_cb,
+                                      entry);
+    return FALSE;
+}
+
+static void
+window_inserted_text_cb (GtkEntryBuffer *buffer,
+                         guint           position,
+                         const gchar    *chars,
+                         guint           nchars,
+                         gpointer        data)
+{
+    static int n_loop = 0;
+    static guint stride = 0;
+    guint i;
+    int seq;
+    gunichar code = g_utf8_get_char (chars);
+    const gchar *test;
+    GtkEntry *entry = GTK_ENTRY (data);
+
+    g_assert (m_compose_table != NULL);
+
+    if (n_loop % 2 == 1) {
+        n_loop = 0;
+        return;
+    }
+    i = stride + (m_compose_table->max_seq_len + 2) - 1;
+    seq = (i + 1) / (m_compose_table->max_seq_len + 2);
+    if (m_compose_table->data[i] == code) {
+        test = "OK";
+    } else {
+        test = "NG";
+        m_retval = -1;
+    }
+    g_print ("%05d/%05d %s expected: %04X typed: %04X\n",
+             seq,
+             m_compose_table->n_seqs,
+             test,
+             m_compose_table->data[i],
+             code);
+
+    if (seq == m_compose_table->n_seqs) {
+        gtk_main_quit ();
+        return;
+    }
+
+    stride += m_compose_table->max_seq_len + 2;
+    n_loop++;
+    gtk_entry_set_text (entry, "");
+}
+
+static void
+create_window ()
+{
+    GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    GtkWidget *entry = gtk_entry_new ();
+    GtkEntryBuffer *buffer;
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_main_quit), NULL);
+    g_signal_connect (entry, "focus-in-event",
+                      G_CALLBACK (window_focus_in_event_cb), NULL);
+    buffer = gtk_entry_get_buffer (GTK_ENTRY (entry));
+    g_signal_connect (buffer, "inserted-text",
+                      G_CALLBACK (window_inserted_text_cb), entry);
+    gtk_container_add (GTK_CONTAINER (window), entry);
+    gtk_widget_show_all (window);
+}
+
+int
+main (int argc, char *argv[])
+{
+    ibus_init ();
+    gtk_init (&argc, &argv);
+
+    if (!register_ibus_engine ())
+        return -1;
+
+    create_window ();
+    gtk_main ();
+
+    return m_retval;
+}
diff --git a/src/tests/runtest b/src/tests/runtest
index a600f6b0f..662028102 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -26,6 +26,7 @@ ibus-factory
 ibus-inputcontext
 ibus-inputcontext-create
 ibus-engine-switch
+ibus-compose
 "
 
 # Portable replacement of basename.

From 85f5433c223118fa8f7e4f4bceafa372d8f1e880 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 21 May 2015 11:00:20 +0900
Subject: [PATCH 310/816] Use GLib.Idle.add() when ibus-engine-simple loads
 compose tables

TEST=engine/ibus-engine-simple

Review URL: https://codereview.appspot.com/240820043
---
 engine/Makefile.am     |  1 -
 engine/main.vala       | 59 +++++++++++++++++++++++-------------------
 src/ibuscomposetable.c |  4 +--
 src/ibusenginesimple.h |  4 +--
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/engine/Makefile.am b/engine/Makefile.am
index 271e92567..19fb6b0a8 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -52,7 +52,6 @@ AM_LDADD = \
 AM_VALAFLAGS = \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--pkg=ibus-1.0 \
-	--pkg=posix \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
diff --git a/engine/main.vala b/engine/main.vala
index 3fecb0a65..2077277db 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -52,33 +52,38 @@ public int main(string[] args) {
             typeof(IBus.EngineSimple), name,
             path.printf(++id), bus.get_connection());
 
-        /* I think "c" + "'" is c with acute U+0107 and
-         * "c" + "," is c with cedilla U+00E7 and they are
-         * visually comprehensible. But pt-br people need
-         * "c" + "'" is c with cedilla and I think the
-         * cedilla_compose_seqs is needed for the specific keyboards
-         * or regions.
-         * X11 uses compose by locale:
-         * In /usr/share/X11/locale/en_US.UTF-8/Compose ,
-         * <Multi_key> <apostrophe> <c> : U0107
-         */
-        IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
-        simple.add_table_by_locale(null);
-
-        string user_file = null;
-
-        var home = GLib.Environment.get_home_dir();
-        if (home != null) {
-            user_file = home + "/.XCompose";
-            if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
-                simple.add_compose_file(user_file);
-        }
-
-        user_file = GLib.Environment.get_variable("XCOMPOSEFILE");
-        if (user_file != null) {
-            if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
-                simple.add_compose_file(user_file);
-        }
+        /* Use Idle.add() to reduce the lag caused by file io */
+        GLib.Idle.add(() => {
+            /* I think "c" + "'" is c with acute U+0107 and
+             * "c" + "," is c with cedilla U+00E7 and they are
+             * visually comprehensible. But pt-br people need
+             * "c" + "'" is c with cedilla and I think the
+             * cedilla_compose_seqs is needed for the specific keyboards
+             * or regions.
+             * X11 uses compose by locale:
+             * In /usr/share/X11/locale/en_US.UTF-8/Compose ,
+             * <Multi_key> <apostrophe> <c> : U0107
+             */
+            IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
+            simple.add_table_by_locale(null);
+
+            string user_file = null;
+
+            var home = GLib.Environment.get_home_dir();
+            if (home != null) {
+                user_file = home + "/.XCompose";
+                if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
+                    simple.add_compose_file(user_file);
+            }
+
+            user_file = GLib.Environment.get_variable("XCOMPOSEFILE");
+            if (user_file != null) {
+                if (GLib.FileUtils.test(user_file, GLib.FileTest.EXISTS))
+                    simple.add_compose_file(user_file);
+            }
+
+            return false;
+        });
 
         return engine;
     });
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index e0cf594dc..4701ac288 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -27,13 +27,11 @@
 
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <X11/Xlib.h>
 #include <locale.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <unistd.h>
+
 #include "ibuserror.h"
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index f2bb4e19f..76d46f4b2 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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

From 0f9ea3d82a95f557acbe0e538a12dfd2f4ecd9c1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 21 May 2015 11:06:02 +0900
Subject: [PATCH 311/816] Fix SEGV of ibus-x11 on wayland

In case that ibus-x11 is built with gtk3, GdkDisplay can be
GdkWaylandDisplay but not GdkX11Display so GDK_DISPLAY_XDISPLAY()
and GDK_WINDOW_XID() does not work in wayland.

TEST=client/x11/ibus-x11

Review URL: https://codereview.appspot.com/234590043
---
 client/x11/main.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/x11/main.c b/client/x11/main.c
index 33e68d3fb..4fde122e7 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -1137,6 +1137,13 @@ main (int argc, char **argv)
     gint option_index = 0;
     gint c;
 
+    /* GDK_DISPLAY_XDISPLAY() and GDK_WINDOW_XID() does not work
+     * with GdkWaylandDisplay.
+     */
+#if GTK_CHECK_VERSION (3, 10, 0)
+    gdk_set_allowed_backends ("x11");
+#endif
+
     gtk_init (&argc, &argv);
     XSetErrorHandler (_xerror_handler);
 

From 7ecbccc7164e1ad1c1d46f51d29f7be9cbec5d13 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 21 May 2015 14:12:22 +0900
Subject: [PATCH 312/816] Enable null return in gobject-introspection

TEST=src/IBus.gir bindings/vala/ibus.vapi

Review URL: https://codereview.appspot.com/236410043
---
 engine/main.vala       |  3 +++
 src/ibusfactory.c      |  6 +++---
 src/ibusservice.h      | 47 ++++++++++++++++++++++++++++++++++++++++--
 ui/gtk3/indicator.vala | 46 ++++++++++++++++++++---------------------
 4 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/engine/main.vala b/engine/main.vala
index 2077277db..4a915b757 100644
--- a/engine/main.vala
+++ b/engine/main.vala
@@ -46,6 +46,9 @@ public int main(string[] args) {
     int id = 0;
 
     factory.create_engine.connect((factory, name) => {
+        if (!name.has_prefix("xkb:"))
+            return null;
+
         const string path = "/org/freedesktop/IBus/engine/simple/%d";
 
         IBus.Engine engine = new IBus.Engine.with_type(
diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index 2903d7e9a..e915c9311 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -164,7 +164,7 @@ ibus_factory_class_init (IBusFactoryClass *class)
      * IBusFactory::create-engine:
      * @factory: the factory which received the signal
      * @engine_name: the engine_name which received the signal
-     * @returns: (transfer full): An IBusEngine
+     * @returns: (nullable) (transfer full): An IBusEngine
      *
      * The ::create-engine signal is a signal to create IBusEngine
      * with @engine_name, which gets emitted when IBusFactory
diff --git a/src/ibusservice.h b/src/ibusservice.h
index 2d37c746d..829f5735e 100644
--- a/src/ibusservice.h
+++ b/src/ibusservice.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -79,6 +79,20 @@ struct _IBusServiceClass {
 
     /*< public >*/
     /* virtual functions */
+    /**
+     * IBusServiceClass::service_method_call:
+     * @service: An #IBusService.
+     * @connection: A dbus connection.
+     * @sender: A sender.
+     * @object_path: An object path.
+     * @interface_name: An interface name.
+     * @method_name: A method name.
+     * @parameters: A parameters.
+     * @invocation: A dbus method invocation.
+     *
+     * The ::service_method_call class method is to connect
+     * GDBusInterfaceMethodCallFunc().
+     */
     void        (* service_method_call)
                                     (IBusService        *service,
                                      GDBusConnection    *connection,
@@ -89,6 +103,20 @@ struct _IBusServiceClass {
                                      GVariant           *parameters,
                                      GDBusMethodInvocation
                                                         *invocation);
+    /**
+     * IBusServiceClass::service_get_property:
+     * @service: An #IBusService.
+     * @connection: A dbus connection.
+     * @sender: A sender.
+     * @object_path: An object path.
+     * @interface_name: An interface name.
+     * @property_name: A property name.
+     * @error: Return location for error or %NULL.
+     * @returns: (nullable) (transfer full): A variant.
+     *
+     * The ::service_get_property class method is to connect
+     * GDBusInterfaceGetPropertyFunc().
+     */
     GVariant *  (* service_get_property)
                                     (IBusService        *service,
                                      GDBusConnection    *connection,
@@ -97,6 +125,21 @@ struct _IBusServiceClass {
                                      const gchar        *interface_name,
                                      const gchar        *property_name,
                                      GError            **error);
+    /**
+     * IBusServiceClass::service_set_property:
+     * @service: An #IBusService.
+     * @connection: A dbus connection.
+     * @sender: A sender.
+     * @object_path: An object path.
+     * @interface_name: An interface name.
+     * @property_name: An property name.
+     * @value: An property value.
+     * @error: Return location for error or %NULL.
+     * @returns: %TRUE if set the value else %FALSE.
+     *
+     * The ::service_set_property class method is to connect
+     * GDBusInterfaceSetPropertyFunc().
+     */
     gboolean    (* service_set_property)
                                     (IBusService        *service,
                                      GDBusConnection    *connection,
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index a83fd63bd..dac72b49f 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -219,45 +219,45 @@ class Indicator : IBus.Service
         activate();
     }
 
-    private GLib.Variant _get_id(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_id(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.id);
     }
 
-    private GLib.Variant _get_category(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_category(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.category_s);
     }
 
-    private GLib.Variant _get_status(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_status(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.status_s);
     }
 
-    private GLib.Variant _get_icon_name(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_icon_name(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_name);
     }
 
-    private GLib.Variant _get_icon_vector(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_icon_vector(GLib.DBusConnection connection) {
         return this.icon_vector;
     }
 
-    private GLib.Variant _get_icon_desc(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_icon_desc(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_desc);
     }
 
-    private GLib.Variant _get_attention_icon_name(GLib.DBusConnection
-                                                            connection) {
+    private GLib.Variant? _get_attention_icon_name(GLib.DBusConnection
+                                                             connection) {
         return new GLib.Variant.string(this.attention_icon_name);
     }
 
-    private GLib.Variant _get_attention_icon_desc(GLib.DBusConnection
-                                                            connection) {
+    private GLib.Variant? _get_attention_icon_desc(GLib.DBusConnection
+                                                             connection) {
         return new GLib.Variant.string(this.attention_icon_desc);
     }
 
-    private GLib.Variant _get_title(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_title(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.title);
     }
 
-    private GLib.Variant _get_icon_theme_path(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_icon_theme_path(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_theme_path);
     }
 
@@ -265,17 +265,17 @@ class Indicator : IBus.Service
         return null;
     }
 
-    private GLib.Variant _get_xayatana_label(GLib.DBusConnection connection) {
+    private GLib.Variant? _get_xayatana_label(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.label_s);
     }
 
-    private GLib.Variant _get_xayatana_label_guide(GLib.DBusConnection
-                                                             connection) {
+    private GLib.Variant? _get_xayatana_label_guide(GLib.DBusConnection
+                                                              connection) {
         return new GLib.Variant.string(this.label_guide_s);
     }
 
-    private GLib.Variant _get_xayatana_ordering_index(GLib.DBusConnection
-                                                             connection) {
+    private GLib.Variant? _get_xayatana_ordering_index(GLib.DBusConnection
+                                                              connection) {
         return new GLib.Variant.uint32(this.ordering_index);
     }
 
@@ -304,12 +304,12 @@ class Indicator : IBus.Service
                 method_name);
     }
 
-    public override GLib.Variant service_get_property(GLib.DBusConnection
-                                                               connection,
-                                                      string   sender,
-                                                      string   object_path,
-                                                      string   interface_name,
-                                                      string   property_name) {
+    public override GLib.Variant? service_get_property(GLib.DBusConnection
+                                                                connection,
+                                                       string   sender,
+                                                       string   object_path,
+                                                       string   interface_name,
+                                                       string   property_name) {
         GLib.return_val_if_fail (object_path == this.object_path, null);
         GLib.return_val_if_fail (
                 interface_name == NOTIFICATION_ITEM_DBUS_IFACE,

From b58351ec2f7c057dcfe0aff883064039702a56d7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 22 May 2015 11:37:11 +0900
Subject: [PATCH 313/816] Set sync process_key_event in ibus-x11

If X11 client application spend time during XNextEvent(), e.g. sleep(1),
under async process_key_event(), X11 does not keep the event order.
I don't know why the event order is broken but now set the sync mode.

BUG=https://code.google.com/p/ibus/issues/detail?id=1697
TEST=client/x11/ibus-x11

Review URL: https://codereview.appspot.com/240860043
---
 client/x11/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 4fde122e7..54a8b2bf3 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -116,7 +116,7 @@ static gint     g_debug_level = 0;
 
 static IBusBus *_bus = NULL;
 
-static gboolean _use_sync_mode = FALSE;
+static gboolean _use_sync_mode = TRUE;
 
 static void
 _xim_preedit_start (XIMS xims, const X11IC *x11ic)
@@ -1015,7 +1015,8 @@ _init_ibus (void)
     g_signal_connect (_bus, "disconnected",
                         G_CALLBACK (_bus_disconnected_cb), NULL);
 
-    _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
+    /* https://code.google.com/p/ibus/issues/detail?id=1697 */
+    _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", TRUE);
 }
 
 static void

From 64b8609b5f0f7e62e4730769b52eefd881a8cc8b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 25 May 2015 11:00:57 +0900
Subject: [PATCH 314/816] ibus-ui-gtk3: radio and check menu items work with
 GTK 3.16

GTK 3.16 has cleared the radio buttons' state in
gtk_radio_menu_item_set_group():
https://git.gnome.org/browse/gtk+/commit/?id=955aed9227

BUG=https://code.google.com/p/ibus/issues/detail?id=1784
TEST=ui/gtk3/ibus-ui-gtk3

Review URL: https://codereview.appspot.com/240100043
---
 ui/gtk3/property.vala | 45 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/property.vala b/ui/gtk3/property.vala
index aef880f10..419f2bf13 100644
--- a/ui/gtk3/property.vala
+++ b/ui/gtk3/property.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -133,7 +133,7 @@ public class PropImageMenuItem : Gtk.MenuItem, IPropItem {
     }
 }
 
-public class PropCheckMenuItem : Gtk.RadioMenuItem, IPropItem {
+public class PropCheckMenuItem : Gtk.CheckMenuItem, IPropItem {
     private IBus.Property m_property;
     public PropCheckMenuItem(IBus.Property property) {
         assert(property != null);
@@ -173,13 +173,50 @@ public class PropCheckMenuItem : Gtk.RadioMenuItem, IPropItem {
     }
 }
 
-public class PropRadioMenuItem : PropCheckMenuItem {
+public class PropRadioMenuItem : Gtk.RadioMenuItem, IPropItem {
+    private IBus.Property m_property;
     public PropRadioMenuItem(IBus.Property property,
         PropRadioMenuItem ?group_source) {
-        base(property);
+        assert(property != null);
+
+        m_property = property;
+        set_no_show_all(true);
 
         if (group_source != null)
             set_group(group_source.get_group());
+
+        /* Call sync() after call set_group() because
+         * gtk_radio_menu_item_set_group() sets active = 0. */
+        sync();
+    }
+
+    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());
+        m_property.set_sensitive(property.get_sensitive());
+        m_property.set_tooltip(property.get_tooltip());
+        m_property.set_state(property.get_state());
+        sync();
+    }
+
+    private void sync() {
+        set_label(m_property.get_label().get_text());
+        set_visible(m_property.get_visible());
+        set_sensitive(m_property.get_sensitive());
+        set_active(m_property.get_state() == IBus.PropState.CHECKED);
+    }
+
+    public override void toggled() {
+        IBus.PropState new_state =
+            get_active() ? IBus.PropState.CHECKED : IBus.PropState.UNCHECKED;
+        if (m_property.get_state() != new_state) {
+            m_property.set_state(new_state);
+            property_activate(m_property.get_key(), m_property.get_state());
+        }
     }
 }
 

From 7c865d0d396a207e34f834a503410fca80911794 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 3 Jun 2015 16:44:47 +0900
Subject: [PATCH 315/816] Delete gnome-do from NO_SNOOPER_APPS

BUG=https://code.google.com/p/ibus/issues/detail?id=1433
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/243820043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 160fe1155..b080afd40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,7 +511,7 @@ AC_ARG_WITH(no-snooper-apps,
     AS_HELP_STRING([--with-no-snooper-apps[=regex1,regex2]],
         [Does not enable keyboard snooper in those applications (like: .*chrome.*,firefox.*)]),
     NO_SNOOPER_APPS=$with_no_snooper_apps,
-    NO_SNOOPER_APPS=[.*chrome.*,.*chromium.*,firefox.*,Do.*]
+    NO_SNOOPER_APPS=[firefox.*,.*chrome.*,.*chromium.*]
 )
 AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS",
     [Does not enbale keyboard snooper in those applications])

From b0f2536b58dff885fa887230909718a69b571053 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 5 Jun 2015 15:21:44 +0900
Subject: [PATCH 316/816] s/code.google.com/github.com/ in docs

Review URL: https://codereview.appspot.com/241190043
---
 README                                | 2 +-
 docs/reference/ibus/ibus-docs.sgml.in | 2 +-
 setup/ibus-setup.1.in                 | 6 +++---
 setup/setup.ui                        | 2 +-
 ui/gtk3/panel.vala                    | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 7df9cf718..2a85f10d8 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ It is ibus daemon.
 hotkeys:
 Super + Space: Change input method.
 
-For more detail please refer to http://code.google.com/p/ibus/wiki/ReadMe .
+For more detail please refer to https://github.com/ibus/ibus/wiki/ReadMe .
 
 
 Peng Huang <shawn.p.huang@gmail.com>
diff --git a/docs/reference/ibus/ibus-docs.sgml.in b/docs/reference/ibus/ibus-docs.sgml.in
index ca158c225..5eea0a749 100644
--- a/docs/reference/ibus/ibus-docs.sgml.in
+++ b/docs/reference/ibus/ibus-docs.sgml.in
@@ -7,7 +7,7 @@
     <releaseinfo>
       Intelligent Input Bus (IBus) @VERSION@ reference manual.
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://code.google.com/p/ibus">http://code.google.com/p/ibus</ulink>.
+      <ulink role="online-location" url="https://github.com/ibus/ibus/wiki">https://github.com/ibus/ibus/wiki</ulink>.
     </releaseinfo>
   </bookinfo>
 
diff --git a/setup/ibus-setup.1.in b/setup/ibus-setup.1.in
index 3daafe437..01d72226c 100644
--- a/setup/ibus-setup.1.in
+++ b/setup/ibus-setup.1.in
@@ -1,7 +1,7 @@
 .\" This file is distributed under the same license as the ibus
 .\" package.
 .\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
-.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013-2015.
 .\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
 .\"
 .TH "IBUS-SETUP" 1 "November 2008" "@VERSION@" "User Commands"
@@ -24,10 +24,10 @@ interface.  It also may help developers to develop input method easily.
 is the configuration program for IBus.
 
 .PP
-Homepage: http://code.google.com/p/ibus/
+Homepage: https://github.com/ibus/ibus/wiki
 
 .SH BUGS
-If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
+If you find a bug, please report it at https://github.com/ibus/ibus/wiki/BugReport
 
 .SH "SEE ALSO"
 .BR ibus (1)
diff --git a/setup/setup.ui b/setup/setup.ui
index c3894a5ca..7bd50f3a2 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1043,7 +1043,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;IBus&lt;/b&gt;&lt;/big&gt;
 &lt;small&gt;The intelligent input bus&lt;/small&gt;
-Homepage: http://code.google.com/p/ibus
+Homepage: https://github.com/ibus/ibus/wiki
 
 
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 0132fc7b6..7fc6f0b40 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1059,13 +1059,13 @@ class Panel : IBus.PanelService {
             m_about_dialog.set_version(Config.PACKAGE_VERSION);
 
             string copyright =
-                "Copyright © 2007-2014 Peng Huang\n" +
-                "Copyright © 2007-2014 Red Hat, Inc.\n";
+                "Copyright © 2007-2015 Peng Huang\n" +
+                "Copyright © 2007-2015 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);
             m_about_dialog.set_license("LGPL");
             m_about_dialog.set_comments(_("IBus is an intelligent input bus for Linux/Unix."));
-            m_about_dialog.set_website("http://code.google.com/p/ibus");
+            m_about_dialog.set_website("https://github.com/ibus/ibus/wiki");
             m_about_dialog.set_authors({"Peng Huang <shawn.p.huang@gmail.com>"});
             m_about_dialog.set_documenters({"Peng Huang <shawn.p.huang@gmail.com>"});
             m_about_dialog.set_translator_credits(_("translator-credits"));

From bd7673e73c2a8c54d2a827603a960d76dab7be1b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Jun 2015 11:43:56 +0900
Subject: [PATCH 317/816] Do not put lookup window at the minus position

tweetdeck.twitter.com seems has hidden GdkWindow and does not provide
the positive cursor position.

BUG=https://github.com/ibus/ibus/issues/1801

Review URL: https://codereview.appspot.com/246010043
---
 ui/gtk3/candidatepanel.vala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 1b7bec7ce..c32604460 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -301,11 +301,15 @@ public class CandidatePanel : Gtk.Box{
             x = root_width - allocation.width;
         else
             x = cursor_right_bottom.x;
+        if (x < 0)
+            x = 0;
 
         if (window_right_bottom.y > root_height)
             y = m_cursor_location.y - allocation.height;
         else
             y = cursor_right_bottom.y;
+        if (y < 0)
+            y = 0;
 
         move(x, y);
     }

From 7fd6077f19a5a39cdcd9c7fde0d9c8234ae5592e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 Jun 2015 11:19:28 +0900
Subject: [PATCH 318/816] Support vertical writing with
 IBUS_INPUT_HINT_VERTICAL_WRITING

GTK_INPUT_HINT_VERTICAL_WRITING has been supported in gtk 3.18
Put the vertical lookup table at the left top of the cursor position
in case of the vertical mode.
Also the gtk client tries to get the character width not to overlap
the character when the client window is moved to the screen left.

BUG=https://code.google.com/p/ibus/issues/detail?id=1780

Review URL: https://codereview.appspot.com/242140043
---
 src/ibustypes.h             |  6 ++-
 ui/gtk3/candidatearea.vala  |  7 ++-
 ui/gtk3/candidatepanel.vala | 89 ++++++++++++++++++++++++++++++++++---
 ui/gtk3/panel.vala          |  4 ++
 4 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/src/ibustypes.h b/src/ibustypes.h
index 86fc2ccbd..06370a277 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 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
@@ -280,6 +280,7 @@ typedef enum
  *     first word of each sentence
  * @IBUS_INPUT_HINT_INHIBIT_OSK: Suggest to not show an onscreen keyboard
  *     (e.g for a calculator that already has all the keys).
+ * @IBUS_INPUT_HINT_VERTICAL_WRITING: The text is vertical.
  *
  * Describes hints that might be taken into account by engines.  Note
  * that engines may already tailor their behaviour according to the
@@ -295,7 +296,8 @@ typedef enum
   IBUS_INPUT_HINT_UPPERCASE_CHARS     = 1 << 4,
   IBUS_INPUT_HINT_UPPERCASE_WORDS     = 1 << 5,
   IBUS_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
-  IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7
+  IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7,
+  IBUS_INPUT_HINT_VERTICAL_WRITING    = 1 << 8
 } IBusInputHints;
 
 #endif
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index f3f60edbf..c969312f5 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -2,7 +2,8 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -56,6 +57,10 @@ class CandidateArea : Gtk.Box {
         set_vertical(vertical, true);
     }
 
+    public bool get_vertical() {
+        return m_vertical;
+    }
+
     public void set_vertical(bool vertical, bool force = false) {
         if (!force && m_vertical == vertical)
             return;
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index c32604460..823c54af2 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -2,7 +2,8 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +22,8 @@
  */
 
 public class CandidatePanel : Gtk.Box{
-    private bool m_vertical = true;
+    private bool m_vertical_panel_system = true;
+    private bool m_vertical_writing;
     private Gtk.Window m_toplevel;
     private Gtk.Box m_vbox;
 
@@ -53,7 +55,7 @@ public class CandidatePanel : Gtk.Box{
         m_toplevel.button_press_event.connect((w, e) => {
             if (e.button != 1 || (e.state & Gdk.ModifierType.CONTROL_MASK) == 0)
                 return false;
-            set_vertical(!m_vertical);
+            set_vertical(!m_vertical_panel_system);
             return true;
         });
         m_toplevel.size_allocate.connect((w, a) => {
@@ -74,9 +76,9 @@ public class CandidatePanel : Gtk.Box{
     }
 
     public void set_vertical(bool vertical) {
-        if (m_vertical == vertical)
+        if (m_vertical_panel_system == vertical)
             return;
-        m_vertical = vertical;
+        m_vertical_panel_system = vertical;
         m_candidate_area.set_vertical(vertical);
     }
 
@@ -89,7 +91,7 @@ public class CandidatePanel : Gtk.Box{
             m_candidate_area.set_vertical(false);
             break;
         case IBus.Orientation.SYSTEM:
-            m_candidate_area.set_vertical(m_vertical);
+            m_candidate_area.set_vertical(m_vertical_panel_system);
             break;
         }
     }
@@ -204,6 +206,11 @@ public class CandidatePanel : Gtk.Box{
         update();
     }
 
+    public void set_content_type(uint purpose, uint hints) {
+        m_vertical_writing =
+                ((hints & IBus.InputHints.VERTICAL_WRITING) != 0);
+    }
+
     private void update() {
         if (m_candidate_area.get_visible() ||
             m_preedit_label.get_visible() ||
@@ -246,7 +253,7 @@ public class CandidatePanel : Gtk.Box{
         m_aux_label.set_padding(8, 0);
         m_aux_label.set_no_show_all(true);
 
-        m_candidate_area = new CandidateArea(m_vertical);
+        m_candidate_area = new CandidateArea(m_vertical_panel_system);
         m_candidate_area.candidate_clicked.connect(
                 (w, i, b, s) => candidate_clicked(i, b, s));
         m_candidate_area.page_up.connect((c) => page_up());
@@ -280,6 +287,13 @@ public class CandidatePanel : Gtk.Box{
     }
 
     private void adjust_window_position() {
+        if (!m_vertical_writing)
+            adjust_window_position_horizontal();
+        else
+            adjust_window_position_vertical();
+    }
+
+    private void adjust_window_position_horizontal() {
         Gdk.Point cursor_right_bottom = {
                 m_cursor_location.x + m_cursor_location.width,
                 m_cursor_location.y + m_cursor_location.height
@@ -313,4 +327,65 @@ public class CandidatePanel : Gtk.Box{
 
         move(x, y);
     }
+
+    private void adjust_window_position_vertical() {
+        /* Not sure in which top or left cursor appears
+         * in the vertical writing mode.
+         * Max (m_cursor_location.width, m_cursor_location.height)
+         * can be considered as a char size.
+         */
+        int char_size = int.max(m_cursor_location.width,
+                                m_cursor_location.height);
+        Gdk.Point cursor_right_bottom = {
+                m_cursor_location.x + char_size,
+                m_cursor_location.y + char_size
+        };
+
+        Gtk.Allocation allocation;
+        m_toplevel.get_allocation(out allocation);
+        Gdk.Point hwindow_right_bottom = {
+            m_cursor_location.x + allocation.width,
+            cursor_right_bottom.y + allocation.height
+        };
+        Gdk.Point vwindow_left_bottom = {
+            m_cursor_location.x - allocation.width,
+            m_cursor_location.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 (!m_candidate_area.get_vertical()) {
+            if (hwindow_right_bottom.x > root_width)
+                x = root_width - allocation.width;
+            else
+                x = m_cursor_location.x;
+
+            if (hwindow_right_bottom.y > root_height)
+                y = m_cursor_location.y - allocation.height;
+            else
+                y = cursor_right_bottom.y;
+        } else {
+            if (vwindow_left_bottom.x > root_width)
+                x = root_width - allocation.width;
+            else if (vwindow_left_bottom.x < 0)
+                x = cursor_right_bottom.x;
+            else
+                x = vwindow_left_bottom.x;
+
+            if (vwindow_left_bottom.y > root_height)
+                y = root_height - allocation.height;
+            else
+                y = m_cursor_location.y;
+        }
+
+        if (x < 0)
+            x = 0;
+        if (y < 0)
+            y = 0;
+
+        move(x, y);
+    }
 }
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 7fc6f0b40..e2bd99d78 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1267,6 +1267,10 @@ class Panel : IBus.PanelService {
         m_candidate_panel.set_lookup_table(null);
     }
 
+    public override void set_content_type(uint purpose, uint hints) {
+        m_candidate_panel.set_content_type(purpose, hints);
+    }
+
     public override void state_changed() {
         /* Do not change the order of m_engines during running switcher. */
         if (m_switcher_is_running)

From 23c45b970b195008a54884a1a9d810e7f8b22c5c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 19 Jun 2015 13:57:35 +0900
Subject: [PATCH 319/816] Enable to show a property on ibus panel icon

If an engine sets the value of icon-prop-key of IBusEngineDesc to
a property name of IBusProperty.key, the panel will show the engine
property in the icon with a delayed time.
This way can show both the engine icon and the engine mode in one icon.

Review URL: https://codereview.appspot.com/248950043
---
 data/ibus.schemas.in | 16 ++++++++++
 src/ibusenginedesc.c | 38 ++++++++++++++++++++--
 src/ibusenginedesc.h | 16 ++++++++--
 ui/gtk3/panel.vala   | 75 +++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 140 insertions(+), 5 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 1fc64f94c..b034133fa 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -304,6 +304,22 @@
                   of the alpha.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/property-icon-delay-time</key>
+      <applyto>/desktop/ibus/panel/property-icon-delay-time</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>500</default>
+      <locale name="C">
+        <short>The milliseconds to show the panel icon for a property</short>
+          <long>The milliseconds to show the panel icon from the
+                engine icon to a property icon whenever engines are
+                switched if the property is specified by the value of
+                icon-prop-key in IBusEngineDesc.
+                If the value is 0, no delay time and the property icon
+                is shown immediately.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/use_system_keyboard_layout</key>
       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index f1a04a097..22622865f 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -46,6 +46,7 @@ enum {
     PROP_SETUP,
     PROP_VERSION,
     PROP_TEXTDOMAIN,
+    PROP_ICON_PROP_KEY
 };
 
 
@@ -67,6 +68,7 @@ struct _IBusEngineDescPrivate {
     gchar      *setup;
     gchar      *version;
     gchar      *textdomain;
+    gchar      *icon_prop_key;
 };
 
 #define IBUS_ENGINE_DESC_GET_PRIVATE(o)  \
@@ -323,6 +325,19 @@ ibus_engine_desc_class_init (IBusEngineDescClass *class)
                         "The textdomain of engine description",
                         "",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEngineDesc:icon-prop-key:
+     *
+     * The key of IBusProperty to change panel icon dynamically.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_ICON_PROP_KEY,
+                    g_param_spec_string ("icon-prop-key",
+                        "icon property key",
+                        "The key of IBusProperty for the dynamic panel icon",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -346,6 +361,7 @@ ibus_engine_desc_init (IBusEngineDesc *desc)
     desc->priv->setup = NULL;
     desc->priv->version = NULL;
     desc->priv->textdomain = NULL;
+    desc->priv->icon_prop_key = NULL;
 }
 
 static void
@@ -366,6 +382,7 @@ ibus_engine_desc_destroy (IBusEngineDesc *desc)
     g_free (desc->priv->setup);
     g_free (desc->priv->version);
     g_free (desc->priv->textdomain);
+    g_free (desc->priv->icon_prop_key);
 
     IBUS_OBJECT_CLASS (ibus_engine_desc_parent_class)->destroy (IBUS_OBJECT (desc));
 }
@@ -440,6 +457,10 @@ ibus_engine_desc_set_property (IBusEngineDesc *desc,
         g_assert (desc->priv->textdomain == NULL);
         desc->priv->textdomain = g_value_dup_string (value);
         break;
+    case PROP_ICON_PROP_KEY:
+        g_assert (desc->priv->icon_prop_key == NULL);
+        desc->priv->icon_prop_key = g_value_dup_string (value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -500,6 +521,9 @@ ibus_engine_desc_get_property (IBusEngineDesc *desc,
     case PROP_TEXTDOMAIN:
         g_value_set_string (value, ibus_engine_desc_get_textdomain (desc));
         break;
+    case PROP_ICON_PROP_KEY:
+        g_value_set_string (value, ibus_engine_desc_get_icon_prop_key (desc));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (desc, prop_id, pspec);
     }
@@ -537,6 +561,7 @@ ibus_engine_desc_serialize (IBusEngineDesc  *desc,
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->layout_option));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->version));
     g_variant_builder_add (builder, "s", NOTNULL (desc->priv->textdomain));
+    g_variant_builder_add (builder, "s", NOTNULL (desc->priv->icon_prop_key));
 #undef NOTNULL
 
     return TRUE;
@@ -593,6 +618,10 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
         return retval;
     ibus_g_variant_get_child_string (variant, retval++,
                                      &desc->priv->textdomain);
+    if (g_variant_n_children (variant) < retval + 1)
+        return retval;
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &desc->priv->icon_prop_key);
 
     return retval;
 }
@@ -623,6 +652,7 @@ ibus_engine_desc_copy (IBusEngineDesc       *dest,
     dest->priv->setup            = g_strdup (src->priv->setup);
     dest->priv->version          = g_strdup (src->priv->version);
     dest->priv->textdomain       = g_strdup (src->priv->textdomain);
+    dest->priv->icon_prop_key    = g_strdup (src->priv->icon_prop_key);
     return TRUE;
 }
 
@@ -666,6 +696,7 @@ ibus_engine_desc_output (IBusEngineDesc *desc,
     OUTPUT_ENTRY_1(setup);
     OUTPUT_ENTRY_1(version);
     OUTPUT_ENTRY_1(textdomain);
+    OUTPUT_ENTRY_1(icon_prop_key);
     g_string_append_indent (output, indent + 1);
     g_string_append_printf (output, "<rank>%u</rank>\n", desc->priv->rank);
 #undef OUTPUT_ENTRY
@@ -705,6 +736,7 @@ ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc,
         PARSE_ENTRY_1(setup);
         PARSE_ENTRY_1(version);
         PARSE_ENTRY_1(textdomain);
+        PARSE_ENTRY_1(icon_prop_key);
 #undef PARSE_ENTRY
 #undef PARSE_ENTRY_1
         if (g_strcmp0 (sub_node->name , "rank") == 0) {
@@ -739,6 +771,7 @@ IBUS_ENGINE_DESC_GET_PROPERTY (symbol, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (setup, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (version, const gchar *)
 IBUS_ENGINE_DESC_GET_PROPERTY (textdomain, const gchar *)
+IBUS_ENGINE_DESC_GET_PROPERTY (icon_prop_key, const gchar *)
 #undef IBUS_ENGINE_DESC_GET_PROPERTY
 
 IBusEngineDesc *
@@ -792,6 +825,7 @@ ibus_engine_desc_new_varargs (const gchar *first_property_name, ...)
     g_assert (desc->priv->setup);
     g_assert (desc->priv->version);
     g_assert (desc->priv->textdomain);
+    g_assert (desc->priv->icon_prop_key);
 
     return desc;
 }
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index 63eb99e7c..cafc4cae1 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -95,6 +95,7 @@ typedef struct _IBusEngineDescClass IBusEngineDescClass;
  * setup: Exec lists of the engine setup command.
  * version: Version number of the input method engine.
  * textdomain: Domain name for dgettext()
+ * icon_prop_key: Key of IBusProperty to change panel icon dynamically.
  */
 struct _IBusEngineDesc {
     IBusSerializable parent;
@@ -310,6 +311,17 @@ const gchar     *ibus_engine_desc_get_version   (IBusEngineDesc *info);
 const gchar     *ibus_engine_desc_get_textdomain
                                                 (IBusEngineDesc *info);
 
+/**
+ * ibus_engine_desc_get_icon_prop_key:
+ * @info: An IBusEngineDesc
+ * @returns: IBusProperty.key for dynamic panel icon in IBusEngineDesc
+ *
+ * Return the key of IBusProperty to load the panel icon dynamically
+   in IBusEngineDesc. It should not be freed.
+ */
+const gchar     *ibus_engine_desc_get_icon_prop_key
+                                                (IBusEngineDesc *info);
+
 /**
  * ibus_engine_desc_output:
  * @info: An IBusEngineDesc
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index e2bd99d78..af98e40bb 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -81,6 +81,9 @@ class Panel : IBus.PanelService {
     private bool inited_engines_order = true;
     private uint m_preload_engines_id;
     private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
+    private string m_icon_prop_key = "";
+    private int m_property_icon_delay_time = 500;
+    private uint m_property_icon_delay_time_id;
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -205,6 +208,10 @@ class Panel : IBus.PanelService {
         m_settings_panel.changed["xkb-icon-rgba"].connect((key) => {
                 set_xkb_icon_rgba();
         });
+
+        m_settings_panel.changed["property-icon-delay-time"].connect((key) => {
+                set_property_icon_delay_time();
+        });
     }
 
 #if INDICATOR
@@ -669,6 +676,11 @@ class Panel : IBus.PanelService {
         }
     }
 
+    private void set_property_icon_delay_time() {
+        m_property_icon_delay_time =
+                m_settings_panel.get_int("property-icon-delay-time");
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -780,6 +792,7 @@ class Panel : IBus.PanelService {
         set_timeout_property_panel();
         set_follow_input_cursor_when_always_shown_property_panel();
         set_xkb_icon_rgba();
+        set_property_icon_delay_time();
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {
@@ -805,6 +818,11 @@ class Panel : IBus.PanelService {
             m_xkblayout.set_layout(engine);
 
         engine_contexts_insert(engine);
+
+        if (m_property_icon_delay_time_id > 0) {
+            GLib.Source.remove(m_property_icon_delay_time_id);
+            m_property_icon_delay_time_id = 0;
+        }
     }
 
     private void switch_engine(int i, bool force = false) {
@@ -1147,6 +1165,55 @@ class Panel : IBus.PanelService {
         return m_ime_menu;
     }
 
+    private void set_properties(IBus.PropList props) {
+        int i = 0;
+        while (true) {
+            IBus.Property prop = props.get(i);
+            if (prop == null)
+                break;
+            set_property(props.get(i), true);
+            i++;
+        }
+    }
+
+    private new void set_property(IBus.Property prop, bool all_update) {
+        string symbol = prop.get_symbol().get_text();
+
+        if (m_icon_prop_key != "" && prop.get_key() == m_icon_prop_key
+            && symbol != "")
+            animate_icon(symbol, all_update);
+    }
+
+    private void animate_icon(string symbol, bool all_update) {
+        if (m_property_icon_delay_time < 0)
+            return;
+
+        uint timeout = 0;
+        if (all_update)
+            timeout = (uint) m_property_icon_delay_time;
+
+        if (m_property_icon_delay_time_id > 0) {
+            GLib.Source.remove(m_property_icon_delay_time_id);
+            m_property_icon_delay_time_id = 0;
+        }
+
+        m_property_icon_delay_time_id = GLib.Timeout.add(timeout, () => {
+            m_property_icon_delay_time_id = 0;
+
+            if (m_icon_type == IconType.STATUS_ICON) {
+                Gdk.Pixbuf pixbuf = create_icon_pixbuf_with_string(symbol);
+                m_status_icon.set_from_pixbuf(pixbuf);
+            }
+            else if (m_icon_type == IconType.INDICATOR) {
+                Cairo.ImageSurface image =
+                        create_cairo_image_surface_with_string(symbol, true);
+                m_indicator.set_cairo_image_surface_full(image, "");
+            }
+
+            return false;
+        });
+    }
+
     /* override virtual functions */
     public override void set_cursor_location(int x, int y,
                                              int width, int height) {
@@ -1224,11 +1291,13 @@ class Panel : IBus.PanelService {
     public override void register_properties(IBus.PropList props) {
         m_property_manager.set_properties(props);
         m_property_panel.set_properties(props);
+        set_properties(props);
     }
 
     public override void update_property(IBus.Property prop) {
         m_property_manager.update_property(prop);
         m_property_panel.update_property(prop);
+        set_property(prop, false);
     }
 
     public override void update_preedit_text(IBus.Text text,
@@ -1285,8 +1354,12 @@ class Panel : IBus.PanelService {
         var icon_name = "ibus-keyboard";
 
         var engine = m_bus.get_global_engine();
-        if (engine != null)
+        if (engine != null) {
             icon_name = engine.get_icon();
+            m_icon_prop_key = engine.get_icon_prop_key();
+        } else {
+            m_icon_prop_key = "";
+        }
 
         if (icon_name[0] == '/') {
             if (m_icon_type == IconType.STATUS_ICON) {

From 70a3b80b39850c289c4e45f702bfc6c3743d6afc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 22 Jun 2015 11:34:32 +0900
Subject: [PATCH 320/816] Add maintainers

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/249800043
---
 AUTHORS            | 4 ++++
 ui/gtk3/panel.vala | 1 +
 2 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 0951c2edb..f177cf26e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,10 @@
 
 Peng Huang <shawn.p.huang@gmail.com>
 
+Maintainers:
+-----------
+Takao Fujiwara <takao.fujiwara1@gmail.com>
+
 Translators:
 -----------
 ar.po:
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index af98e40bb..2ca3a5ef8 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1078,6 +1078,7 @@ class Panel : IBus.PanelService {
 
             string copyright =
                 "Copyright © 2007-2015 Peng Huang\n" +
+                "Copyright © 2015 Takao Fujiwara\n" +
                 "Copyright © 2007-2015 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);

From 845528b91bbccd691d75c931b1dffa304424831b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 29 Jun 2015 11:54:17 +0900
Subject: [PATCH 321/816] Replace code.google.com with github.com

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/252740043
---
 bus/ibus-daemon.1.in        | 2 +-
 client/x11/main.c           | 2 +-
 conf/dconf/dconf.xml.in     | 2 +-
 conf/gconf/gconf.xml.in     | 2 +-
 conf/memconf/memconf.xml.in | 2 +-
 engine/simple.xml.in        | 2 +-
 ibus.spec.in                | 4 ++--
 setup/ibus-setup.1.in       | 2 +-
 src/ibuscomponent.h         | 6 +++---
 src/tests/ibus-compose.c    | 2 +-
 tools/ibus.1.in             | 4 ++--
 ui/gtk3/gtkpanel.xml.in     | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bus/ibus-daemon.1.in b/bus/ibus-daemon.1.in
index fe06e2b49..2dc982b27 100644
--- a/bus/ibus-daemon.1.in
+++ b/bus/ibus-daemon.1.in
@@ -72,7 +72,7 @@ enable memory profile, send SIGUSR2 to print out the memory profile.
 verbose.
 
 .SH BUGS
-If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
+If you find a bug, please report it at https://github.com/ibus/ibus/issues
 
 .SH "SEE ALSO"
 .BR ibus (1)
diff --git a/client/x11/main.c b/client/x11/main.c
index 54a8b2bf3..3289c105e 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -1015,7 +1015,7 @@ _init_ibus (void)
     g_signal_connect (_bus, "disconnected",
                         G_CALLBACK (_bus_disconnected_cb), NULL);
 
-    /* https://code.google.com/p/ibus/issues/detail?id=1697 */
+    /* https://github.com/ibus/ibus/issues/1713 */
     _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", TRUE);
 }
 
diff --git a/conf/dconf/dconf.xml.in b/conf/dconf/dconf.xml.in
index 4e546a970..4205cb00b 100644
--- a/conf/dconf/dconf.xml.in
+++ b/conf/dconf/dconf.xml.in
@@ -7,6 +7,6 @@
 	<version>@VERSION@</version>
 	<author>Daiki Ueno &lt;ueno@unixuser.org&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
 	<textdomain>ibus</textdomain>
 </component>
diff --git a/conf/gconf/gconf.xml.in b/conf/gconf/gconf.xml.in
index 96d12f390..6438d7597 100644
--- a/conf/gconf/gconf.xml.in
+++ b/conf/gconf/gconf.xml.in
@@ -7,6 +7,6 @@
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
 	<textdomain>ibus</textdomain>
 </component>
diff --git a/conf/memconf/memconf.xml.in b/conf/memconf/memconf.xml.in
index b6fdacf30..d6ea6906d 100644
--- a/conf/memconf/memconf.xml.in
+++ b/conf/memconf/memconf.xml.in
@@ -6,6 +6,6 @@
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;, modified by the Chromium OS Authors</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
 	<textdomain>ibus</textdomain>
 </component>
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 5f04f8b20..c0a7a10bb 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -6,7 +6,7 @@
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
 	<textdomain>ibus</textdomain>
 	<engines>
 		<engine>
diff --git a/ibus.spec.in b/ibus.spec.in
index 334f37ec9..7fdaccb24 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -17,8 +17,8 @@ Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
-URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+URL:        https://github.com/ibus/ibus/wiki
+Source0:    https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 # Patch0:     ibus-HEAD.patch
 
diff --git a/setup/ibus-setup.1.in b/setup/ibus-setup.1.in
index 01d72226c..dab032e56 100644
--- a/setup/ibus-setup.1.in
+++ b/setup/ibus-setup.1.in
@@ -27,7 +27,7 @@ is the configuration program for IBus.
 Homepage: https://github.com/ibus/ibus/wiki
 
 .SH BUGS
-If you find a bug, please report it at https://github.com/ibus/ibus/wiki/BugReport
+If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
 
 .SH "SEE ALSO"
 .BR ibus (1)
diff --git a/src/ibuscomponent.h b/src/ibuscomponent.h
index be36d029e..ef83407c0 100644
--- a/src/ibuscomponent.h
+++ b/src/ibuscomponent.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -42,7 +42,7 @@
  * load the XML file by ibus_component_new_from_file().
  *
  * 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>
+ * <ulink url="https://github.com/ibus/ibus/wiki/DevXML">https://github.com/ibus/ibus/wiki/DevXML</ulink>
  */
 
 #include "ibusserializable.h"
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index 6c30648ee..eb7b9f191 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -79,7 +79,7 @@ register_ibus_engine ()
             "0.0.1",
             "GPL",
             "Takao Fujiwara <takao.fujiwara1@gmail.com>",
-            "http://code.google.com/p/ibus/",
+            "https://github.com/ibus/ibus/wiki",
             "",
             "ibus");
     desc = ibus_engine_desc_new (
diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index 6ac92ff2c..a420567b3 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -25,7 +25,7 @@ is a command line utility which can restart or exit ibus-daemon,
 get or set the current ibus engine or list the ibus engines.
 
 .PP
-Homepage: http://code.google.com/p/ibus/
+Homepage: https://github.com/ibus/ibus/wiki
 
 .SH "COMMAND"
 .TP
@@ -97,4 +97,4 @@ Under construction.
 .TP
 
 .SH BUGS
-If you find a bug, please report it at http://code.google.com/p/ibus/issues/list.
+If you find a bug, please report it at https://github.com/ibus/ibus/issues
diff --git a/ui/gtk3/gtkpanel.xml.in b/ui/gtk3/gtkpanel.xml.in
index a68d05484..b61f40090 100644
--- a/ui/gtk3/gtkpanel.xml.in
+++ b/ui/gtk3/gtkpanel.xml.in
@@ -7,6 +7,6 @@
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
 	<textdomain>ibus</textdomain>
 </component>

From 3397fcabe28f6cbf19b698954f5260fed11261c6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Jul 2015 11:24:26 +0900
Subject: [PATCH 322/816] Use LC_CTYPE in IBusEngineSimple until
 g_get_language_names() is fixed

Review URL: https://codereview.appspot.com/249490043
---
 src/ibusenginesimple.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 3158a7e0f..8413d32f4 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -32,10 +32,6 @@
 
 #include "ibuscomposetable.h"
 
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
 #include <memory.h>
 #include <stdlib.h>
 
@@ -936,12 +932,21 @@ gboolean
 ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
                                         const gchar      *locale)
 {
-    const gchar * const *langs = NULL;
-    const gchar * const *l = NULL;
+    const gchar *_locale = locale;
+    gchar **langs = NULL;
+    gchar **l = NULL;
     gchar *path = NULL;
 
-    if (locale == NULL) {
-        langs = g_get_language_names ();
+    if (_locale == NULL) {
+        _locale = g_getenv ("LC_CTYPE");
+        if (_locale == NULL) {
+            _locale = g_getenv ("LANG");
+        }
+        if (_locale == NULL) {
+            _locale = "C";
+        }
+        /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=751826 */
+        langs = g_get_locale_variants (_locale);
         for (l = langs; *l; l++) {
             if (g_str_has_prefix (*l, "en_US"))
                 break;
@@ -953,6 +958,7 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             g_free (path);
             path = NULL;
         }
+        g_strfreev (langs);
     } else {
         path = g_build_filename (X11_DATADIR, locale, "Compose", NULL);
         do {

From 91bb4a074772835c2c61c0152c13886fb3f91369 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Jul 2015 17:58:30 +0900
Subject: [PATCH 323/816] Fix doc builds

Generate:
html/IBusEngineSimple.html

Fix:
ibuscomponent.h:137: Warning: IBus: "@Varargs" parameter is deprecated,
please use "@..." instead:
 * @Varargs: the NULL-terminated arguments of the properties and values.

ibuscomponent.h:83: Warning: IBus: GTK-Doc tag "Description:" has been
deprecated:
 * description: Detailed description of component.

../../../src/ibusenumtypes.h:13: warning: Section ibusenumtypes is not
defined in the ibus-sections.txt file.

../../../src/ibusenginesimple.h:39: warning: Section ibussimpleengine is
not defined in the ibus-sections.txt file.

../../../src/ibusinternal.h:35: warning: Section ibusinternal is not
defined in the ibus-sections.txt file.

../../../src/ibusattribute.h:138: warning: Parameter description for
ibus_attribute_new::returns is not used from source code comment block.

../../../src/ibusattribute.h:161: warning: Parameter description for
ibus_attribute_get_value::attr is missing in source code comment block.

../../../src/ibuscomponent.h:145: warning: Parameter description for
ibus_component_new_varargs::... is missing in source code comment block.

../../../src/ibusconfig.h:95: warning: Parameter description for
ibus_config_new::cancellable is missing in source code comment block.

html/IBusBus.html:3540: warning: no link for:
'ibus-bus-get-property-async' ->
(<code class="function">ibus_bus_get_property_async()</code>).

html/api-index-full.html:2989: warning: no link for:
'ibus-ibuscomposetable' -> (ibuscomposetable).

html/IBusAttribute.html:500: warning: no link for: 'FIXME:CAPS'
-> (<code class="literal">FIXME</code>).

html/ibus-ibuskeys.html:286: warning: no link for: 'IBUS-KEY-Enter'
-> (<span class="type">IBUS_KEY_Enter</span>).

html/IBusPanelService.html:574: warning: no link for:
'cursor-down-lookup-table' ->
(<code class="function">cursor_down_lookup_table()</code>).

html/IBusEngine.html:1190: warning: no link for: 'cancel-hand-writing'
-> (<code class="function">cancel_hand_writing()</code>).

Review URL: https://codereview.appspot.com/247680043
---
 docs/reference/ibus/Makefile.am |  24 +++-
 docs/reference/ibus/ibus.types  |   1 +
 src/ibusattribute.h             |  46 +++++---
 src/ibusattrlist.h              |  16 ++-
 src/ibusbus.h                   | 195 ++++++++++++++++++++------------
 src/ibuscomponent.h             | 125 ++++++++++----------
 src/ibusconfig.h                |  39 +++++--
 src/ibusconfigservice.h         |  12 +-
 src/ibusdebug.h                 |   2 +-
 src/ibusengine.c                |  71 +++++++-----
 src/ibusengine.h                |  17 +--
 src/ibusenginedesc.h            | 124 ++++++++++----------
 src/ibusenginesimple.h          |   9 +-
 src/ibusenumtypes.h.template    |   8 --
 src/ibusfactory.h               |  15 ++-
 src/ibushotkey.h                |  37 +++---
 src/ibusinputcontext.h          |  84 ++++++++------
 src/ibusinternal.h              |   9 --
 src/ibuskeymap.h                |  15 ++-
 src/ibuskeys.h                  |  18 +--
 src/ibuslookuptable.h           |  73 +++++++-----
 src/ibusobject.h                |  14 ++-
 src/ibusobservedpath.h          |  22 ++--
 src/ibuspanelservice.c          | 123 ++++++++++++--------
 src/ibuspanelservice.h          |   5 +-
 src/ibusproperty.h              |  58 +++++-----
 src/ibusproplist.h              |  33 +++++-
 src/ibusproxy.h                 |  13 ++-
 src/ibusregistry.h              |  38 ++++---
 src/ibusserializable.h          |  26 +++--
 src/ibusservice.h               |  33 ++++--
 src/ibusshare.h                 |  31 +++--
 src/ibustext.h                  |  57 ++++++----
 src/ibusutil.h                  |   6 +-
 src/ibusxml.h                   |   6 +-
 35 files changed, 852 insertions(+), 553 deletions(-)

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index e39ab7584..1ece234c1 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -1,4 +1,25 @@
-## Process this file with automake to produce Makefile.in
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+#
+# 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
 
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
@@ -48,6 +69,7 @@ CFILE_GLOB=$(top_srcdir)/src/*.c
 # Header files to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES= \
+	ibuscomposetable.h \
 	ibusconfigprivate.h \
 	ibusinternal.h \
 	keyname-table.h \
diff --git a/docs/reference/ibus/ibus.types b/docs/reference/ibus/ibus.types
index 8055cae50..632e9990d 100644
--- a/docs/reference/ibus/ibus.types
+++ b/docs/reference/ibus/ibus.types
@@ -28,3 +28,4 @@ ibus_prop_list_get_type
 ibus_input_context_get_type
 ibus_observed_path_get_type
 ibus_registry_get_type
+ibus_engine_simple_get_type
diff --git a/src/ibusattribute.h b/src/ibusattribute.h
index 7f287bac3..fe4cab455 100644
--- a/src/ibusattribute.h
+++ b/src/ibusattribute.h
@@ -78,7 +78,7 @@ typedef enum {
  * @IBUS_ATTR_UNDERLINE_NONE: No underline.
  * @IBUS_ATTR_UNDERLINE_SINGLE: Single underline.
  * @IBUS_ATTR_UNDERLINE_DOUBLE: Double underline.
- * @IBUS_ATTR_UNDERLINE_LOW: Low underline ? %FIXME
+ * @IBUS_ATTR_UNDERLINE_LOW: Low underline ? FIXME
  * @IBUS_ATTR_UNDERLINE_ERROR: Error underline
  *
  * Type of IBusText attribute.
@@ -132,9 +132,10 @@ GType                ibus_attribute_get_type    ();
  * @value: Value of the attribute.
  * @start_index: Where attribute starts.
  * @end_index: Where attribute ends.
- * @returns: (transfer none): A newly allocated IBusAttribute.
  *
- * New an IBusAttribute.
+ * Creates a new IBusAttribute.
+ *
+ * Returns: (transfer none): A newly allocated IBusAttribute.
  */
 IBusAttribute       *ibus_attribute_new         (guint           type,
                                                  guint           value,
@@ -143,38 +144,46 @@ IBusAttribute       *ibus_attribute_new         (guint           type,
 
 /**
  * ibus_attribute_get_attr_type:
- * @returns: An enum of #IBusAttrType.
+ * @attr: An #IBusAttribute
+ *
+ * Gets an enum of #IBusAttrType.
  *
- * Returns an enum of #IBusAttrType.
+ * Returns: An enum of #IBusAttrType.
  */
 guint                ibus_attribute_get_attr_type
                                                 (IBusAttribute *attr);
 
 /**
  * ibus_attribute_get_value:
- * @returns: An unsigned int value relative with #IBusAttrType.
+ * @attr: An #IBusAttribute
  *
- * Returns an unsigned int value relative with #IBusAttrType.
+ * Gets 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.
+ *
+ * Returns: An unsigned int value relative with #IBusAttrType.
  */
 guint                ibus_attribute_get_value   (IBusAttribute *attr);
 
 /**
  * ibus_attribute_get_start_index:
- * @returns: A start unsigned index
+ * @attr: An #IBusAttribute
+ *
+ * Gets a start unsigned index
  *
- * Returns a start unsigned index
+ * Returns: A start unsigned index
  */
 guint                ibus_attribute_get_start_index
                                                 (IBusAttribute *attr);
 
 /**
  * ibus_attribute_get_end_index:
- * @returns: A end unsigned index
+ * @attr: An #IBusAttribute
  *
- * Returns a end unsigned index
+ * Gets an end unsigned index
+ *
+ * Returns: A end unsigned index
  */
 guint                ibus_attribute_get_end_index
                                                 (IBusAttribute *attr);
@@ -184,9 +193,10 @@ guint                ibus_attribute_get_end_index
  * @underline_type: Type of underline.
  * @start_index: Where attribute starts.
  * @end_index: Where attribute ends.
- * @returns: (transfer none): A newly allocated #IBusAttribute.
  *
- * New an underline #IBusAttribute.
+ * Creates a new underline #IBusAttribute.
+ *
+ * Returns: (transfer none): A newly allocated #IBusAttribute.
  */
 IBusAttribute       *ibus_attr_underline_new    (guint           underline_type,
                                                  guint           start_index,
@@ -196,9 +206,10 @@ IBusAttribute       *ibus_attr_underline_new    (guint           underline_type,
  * @color: Color in RGB.
  * @start_index: Where attribute starts.
  * @end_index: Where attribute ends.
- * @returns: (transfer none): A newly allocated #IBusAttribute.
  *
- * New an foreground #IBusAttribute.
+ * Creates a new foreground #IBusAttribute.
+ *
+ * Returns: (transfer none): A newly allocated #IBusAttribute.
  */
 IBusAttribute       *ibus_attr_foreground_new   (guint           color,
                                                  guint           start_index,
@@ -208,9 +219,10 @@ IBusAttribute       *ibus_attr_foreground_new   (guint           color,
  * @color: Color in RGB.
  * @start_index: Where attribute starts.
  * @end_index: Where attribute ends.
- * @returns: (transfer none): A newly allocated #IBusAttribute.
  *
- * New an background #IBusAttribute.
+ * Creates a new background #IBusAttribute.
+ *
+ * Returns: (transfer none): A newly allocated #IBusAttribute.
  */
 IBusAttribute       *ibus_attr_background_new   (guint           color,
                                                  guint           start_index,
diff --git a/src/ibusattrlist.h b/src/ibusattrlist.h
index cd8788f83..41433dfd7 100644
--- a/src/ibusattrlist.h
+++ b/src/ibusattrlist.h
@@ -80,17 +80,19 @@ struct _IBusAttrListClass {
 
 /**
  * ibus_attr_list_get_type:
- * @returns: GType of IBusAttrList.
  *
- * Returns GType of IBusAttrList.
+ * Returns GType of #IBusAttrList.
+ *
+ * Returns: GType of #IBusAttrList.
  */
 GType                ibus_attr_list_get_type    ();
 
 /**
  * ibus_attr_list_new:
- * @returns: A newly allocated IBusAttrList.
  *
- * New an IBusAttrList.
+ * Creates an new #IBusAttrList.
+ *
+ * Returns: A newly allocated #IBusAttrList.
  */
 IBusAttrList        *ibus_attr_list_new         ();
 
@@ -107,9 +109,11 @@ void                 ibus_attr_list_append      (IBusAttrList   *attr_list,
  * ibus_attr_list_get:
  * @attr_list: An IBusAttrList instance.
  * @index: Index of the @attr_list.
- * @returns: (transfer none): IBusAttribute at given index, NULL if no such IBusAttribute.
  *
- * Returns IBusAttribute at given index. Borrowed reference.
+ * Returns #IBusAttribute at given index. Borrowed reference.
+ *
+ * Returns: (transfer none): #IBusAttribute at given index, %NULL if no such
+ *        #IBusAttribute.
  */
 IBusAttribute       *ibus_attr_list_get         (IBusAttrList   *attr_list,
                                                  guint           index);
diff --git a/src/ibusbus.h b/src/ibusbus.h
index fc37b2585..1e0f3cc95 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -86,18 +86,22 @@ GType        ibus_bus_get_type          (void);
 
 /**
  * ibus_bus_new:
- * @returns: A newly allocated #IBusBus instance, and the instance is not floating.
  *
- * New an #IBusBus instance.
+ * Creates a new #IBusBus instance.
+ *
+ * Returns: A newly allocated #IBusBus instance, and the instance is not
+ * floating.
  */
 IBusBus     *ibus_bus_new               (void);
 
 /**
  * ibus_bus_new_async:
- * @returns: A newly allocated #IBusBus instance, and the instance is not floating.
  *
- * New an #IBusBus instance. The instance will asynchronously connect to the IBus
- * daemon.
+ * Creates a new #IBusBus instance. The instance will asynchronously connect
+ * to the IBus daemon.
+ *
+ * Returns: A newly allocated #IBusBus instance, and the instance is not
+ * floating.
  */
 IBusBus     *ibus_bus_new_async         (void);
 
@@ -105,18 +109,20 @@ IBusBus     *ibus_bus_new_async         (void);
 /**
  * ibus_bus_is_connected:
  * @bus: An #IBusBus.
- * @returns: %TRUE if @bus is connected, %FALSE otherwise.
  *
  * Return %TRUE if @bus is connected to IBus daemon.
+ *
+ * Returns: %TRUE if @bus is connected, %FALSE otherwise.
  */
 gboolean     ibus_bus_is_connected      (IBusBus        *bus);
 
 /**
  * ibus_bus_get_connection:
  * @bus: An #IBusBus.
- * @returns: (transfer none): A #GDBusConnection of an #IBusBus instance.
  *
- * Return #GDBusConnection of an #IBusBus instance.
+ * Gets a #GDBusConnection of an #IBusBus instance.
+ *
+ * Returns: (transfer none): A #GDBusConnection of an #IBusBus instance.
  */
 GDBusConnection *
              ibus_bus_get_connection    (IBusBus        *bus);
@@ -124,10 +130,11 @@ GDBusConnection *
 /**
  * ibus_bus_hello:
  * @bus: An #IBusBus.
- * @returns: The unique name of IBus process in DBus.
  *
  * This function sends a "HELLO" message to DBus daemon,
  * which replies the unique name of current IBus process.
+ *
+ * Returns: The unique name of IBus process in DBus.
  */
 const gchar *ibus_bus_hello             (IBusBus        *bus);
 
@@ -136,9 +143,10 @@ const gchar *ibus_bus_hello             (IBusBus        *bus);
  * @bus: the IBusBus instance to be processed.
  * @name: Name to be requested.
  * @flags: IBusBusNameFlag.
- * @returns: 0 if failed; IBusBusRequestNameReply otherwise.
  *
  * Request a name from IBus daemon synchronously.
+ *
+ * Returns: 0 if failed; IBusBusRequestNameReply otherwise.
  */
 guint32      ibus_bus_request_name      (IBusBus        *bus,
                                          const gchar    *name,
@@ -172,9 +180,10 @@ void        ibus_bus_request_name_async (IBusBus        *bus,
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_request_name_async().
  * @error: Return location for error or %NULL.
- * @returns: 0 if failed; positive number otherwise.
  *
  * Finishes an operation started with ibus_bus_request_name_async().
+ *
+ * Returns: 0 if failed; positive number otherwise.
  */
 guint       ibus_bus_request_name_async_finish
                                         (IBusBus        *bus,
@@ -185,9 +194,10 @@ guint       ibus_bus_request_name_async_finish
  * ibus_bus_release_name:
  * @bus: An #IBusBus.
  * @name: Name to be released.
- * @returns: 0 if failed; positive number otherwise.
  *
  * Release a name to IBus daemon synchronously.
+ *
+ * Returns: 0 if failed; positive number otherwise.
  */
 guint        ibus_bus_release_name      (IBusBus        *bus,
                                          const gchar    *name);
@@ -219,9 +229,10 @@ void         ibus_bus_release_name_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_release_name_async().
  * @error: Return location for error or %NULL.
- * @returns: 0 if failed; positive number otherwise.
  *
  * Finishes an operation started with ibus_bus_release_name_async().
+ *
+ * Returns: 0 if failed; positive number otherwise.
  */
 guint        ibus_bus_release_name_async_finish
                                         (IBusBus        *bus,
@@ -232,12 +243,12 @@ guint        ibus_bus_release_name_async_finish
  * ibus_bus_list_queued_owners:
  * @bus: An IBusBus.
  * @name: Name to be queried.
- * @returns: (transfer full) (element-type utf8):
- *           The unique bus names of connections currently queued for @name.
  *
  * Lists the unique bus names of connections currently queued for a bus name.
- *
  * FIXME add an asynchronous version.
+ *
+ * Returns: (transfer full) (element-type utf8):
+ *           The unique bus names of connections currently queued for @name.
  */
 GList *      ibus_bus_list_queued_owners
                                         (IBusBus      *bus,
@@ -247,9 +258,10 @@ GList *      ibus_bus_list_queued_owners
  * ibus_bus_name_has_owner:
  * @bus: An #IBusBus.
  * @name: Name to be checked.
- * @returns: %TRUE if the name has owner, %FALSE otherwise.
  *
  * Checks whether the name has owner synchronously.
+ *
+ * Returns: %TRUE if the name has owner, %FALSE otherwise.
  */
 gboolean     ibus_bus_name_has_owner    (IBusBus        *bus,
                                          const gchar    *name);
@@ -281,9 +293,10 @@ void         ibus_bus_name_has_owner_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_name_has_owner_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the name has owner, %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_name_has_owner_async().
+ *
+ * Returns: %TRUE if the name has owner, %FALSE otherwise.
  */
 gboolean     ibus_bus_name_has_owner_async_finish
                                         (IBusBus        *bus,
@@ -293,11 +306,12 @@ gboolean     ibus_bus_name_has_owner_async_finish
 /**
  * ibus_bus_list_names:
  * @bus: An #IBusBus.
- * @returns: (transfer full) (element-type utf8): 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] Not implemented yet, only return %NULL.</para></note>
  * <note><para>[FixMe] Add async version.</para></note>
+ *
+ * Returns: (transfer full) (element-type utf8): Lists that attached to @bus.
  */
 GList       *ibus_bus_list_names        (IBusBus        *bus);
 
@@ -305,9 +319,10 @@ GList       *ibus_bus_list_names        (IBusBus        *bus);
  * ibus_bus_add_match:
  * @bus: An #IBusBus.
  * @rule: Match rule.
- * @returns: %TRUE if the rule is added. %FALSE otherwise.
  *
  * Add a match rule to an #IBusBus synchronously.
+ *
+ * Returns: %TRUE if the rule is added. %FALSE otherwise.
  */
 gboolean     ibus_bus_add_match         (IBusBus        *bus,
                                          const gchar    *rule);
@@ -338,9 +353,10 @@ void         ibus_bus_add_match_async   (IBusBus        *bus,
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_add_match_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the rule is added. %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_add_match_async().
+ *
+ * Returns: %TRUE if the rule is added. %FALSE otherwise.
  */
 gboolean     ibus_bus_add_match_async_finish
                                         (IBusBus        *bus,
@@ -351,9 +367,10 @@ gboolean     ibus_bus_add_match_async_finish
  * ibus_bus_remove_match:
  * @bus: An #IBusBus.
  * @rule: Match rule.
- * @returns: %TRUE if the rule is removed. %FALSE otherwise.
  *
  * Remove a match rule to an #IBusBus synchronously.
+ *
+ * Returns: %TRUE if the rule is removed. %FALSE otherwise.
  */
 gboolean     ibus_bus_remove_match      (IBusBus        *bus,
                                          const gchar    *rule);
@@ -385,9 +402,10 @@ void         ibus_bus_remove_match_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_remove_match_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the rule is removed. %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_remove_match_async().
+ *
+ * Returns: %TRUE if the rule is removed. %FALSE otherwise.
  */
 gboolean     ibus_bus_remove_match_async_finish
                                         (IBusBus        *bus,
@@ -398,9 +416,10 @@ gboolean     ibus_bus_remove_match_async_finish
  * ibus_bus_get_name_owner:
  * @bus: An #IBusBus.
  * @name: Name.
- * @returns: Owner of the name. The returned value must be freed with g_free().
  *
  * Return the name owner synchronously.
+ *
+ * Returns: Owner of the name. The returned value must be freed with g_free().
  */
 gchar       *ibus_bus_get_name_owner    (IBusBus        *bus,
                                          const gchar    *name);
@@ -432,9 +451,10 @@ void         ibus_bus_get_name_owner_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_get_name_owner_async().
  * @error: Return location for error or %NULL.
- * @returns: Owner of the name. The returned value must be freed with g_free().
  *
  * Finishes an operation started with ibus_bus_get_name_owner_async().
+ *
+ * Returns: Owner of the name. The returned value must be freed with g_free().
  */
 gchar       *ibus_bus_get_name_owner_async_finish
                                         (IBusBus        *bus,
@@ -446,9 +466,10 @@ gchar       *ibus_bus_get_name_owner_async_finish
  * ibus_bus_exit:
  * @bus: An #IBusBus.
  * @restart: Whether restarting the ibus.
- * @returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
  *
  * Exit or restart ibus-daemon synchronously.
+ *
+ * Returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
  */
 gboolean     ibus_bus_exit              (IBusBus        *bus,
                                          gboolean        restart);
@@ -479,9 +500,10 @@ void        ibus_bus_exit_async         (IBusBus        *bus,
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_exit_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_exit_async().
+ *
+ * Returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
  */
 gboolean    ibus_bus_exit_async_finish  (IBusBus        *bus,
                                          GAsyncResult   *res,
@@ -491,10 +513,11 @@ gboolean    ibus_bus_exit_async_finish  (IBusBus        *bus,
  * ibus_bus_create_input_context:
  * @bus: An #IBusBus.
  * @client_name: Name of client.
- * @returns: (transfer full): An newly allocated #IBusInputContext if the
  *      "CreateInputContext" call is suceeded, %NULL otherwise.
  *
  * Create an input context for client synchronously.
+ *
+ * Returns: (transfer full): An newly allocated #IBusInputContext if the
  */
 IBusInputContext *
             ibus_bus_create_input_context
@@ -528,10 +551,11 @@ void        ibus_bus_create_input_context_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_create_input_context_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer full): An newly allocated #IBusInputContext if the
- *      "CreateInputContext" call is suceeded, %NULL otherwise.
  *
  * Finishes an operation started with ibus_bus_create_input_context_async().
+ *
+ * Returns: (transfer full): An newly allocated #IBusInputContext if the
+ *      "CreateInputContext" call is suceeded, %NULL otherwise.
  */
 IBusInputContext *
              ibus_bus_create_input_context_async_finish
@@ -542,11 +566,12 @@ IBusInputContext *
 /**
  * ibus_bus_current_input_context:
  * @bus: An #IBusBus.
- * @returns: The named of currently focued #IBusInputContext if the
- *            "CurrentInputContext" call suceeded, %NULL otherwise. The return
- *            value must be freed with g_free().
  *
  * Get the current focused input context synchronously.
+ *
+ * Returns: The named of currently focued #IBusInputContext if the
+ *          "CurrentInputContext" call suceeded, %NULL otherwise. The return
+ *          value must be freed with g_free().
  */
 gchar       *ibus_bus_current_input_context
                                         (IBusBus        *bus);
@@ -576,11 +601,12 @@ void         ibus_bus_current_input_context_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_current_input_context_async().
  * @error: Return location for error or %NULL.
- * @returns: The named of currently focued IBusInputContext if the
- *            "CurrentInputContext" call suceeded, %NULL otherwise. The return
- *            value must be freed with g_free().
  *
  * Finishes an operation started with ibus_bus_current_input_context_async().
+ *
+ * Returns: The named of currently focued IBusInputContext if the
+ *          "CurrentInputContext" call suceeded, %NULL otherwise. The return
+ *          value must be freed with g_free().
  */
 gchar       *ibus_bus_current_input_context_async_finish
                                         (IBusBus        *bus,
@@ -591,9 +617,10 @@ gchar       *ibus_bus_current_input_context_async_finish
  * ibus_bus_register_component:
  * @bus: An #IBusBus.
  * @component: A input engine component.
- * @returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
  *
  * Register a componet to an #IBusBus synchronously.
+ *
+ * Returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
  */
 gboolean     ibus_bus_register_component
                                         (IBusBus        *bus,
@@ -626,9 +653,10 @@ void         ibus_bus_register_component_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_register_component_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_register_component_async().
+ *
+ * Returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
  */
 gboolean     ibus_bus_register_component_async_finish
                                         (IBusBus        *bus,
@@ -638,9 +666,11 @@ gboolean     ibus_bus_register_component_async_finish
 /**
  * ibus_bus_list_engines:
  * @bus: An #IBusBus.
- * @returns: (transfer container) (element-type IBusEngineDesc): A List of engines.
  *
  * List engines synchronously.
+ *
+ * Returns: (transfer container) (element-type IBusEngineDesc):
+ *         A List of engines.
  */
 GList       *ibus_bus_list_engines      (IBusBus        *bus);
 
@@ -669,9 +699,11 @@ void         ibus_bus_list_engines_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_list_engines_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer container) (element-type IBusEngineDesc): A List of engines.
  *
  * Finishes an operation started with ibus_bus_list_engines_async().
+ *
+ * Returns: (transfer container) (element-type IBusEngineDesc):
+ *         A List of engines.
  */
 GList       *ibus_bus_list_engines_async_finish
                                         (IBusBus        *bus,
@@ -682,10 +714,12 @@ GList       *ibus_bus_list_engines_async_finish
 /**
  * ibus_bus_list_active_engines:
  * @bus: An #IBusBus.
- * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
  *
  * List active engines synchronously.
  *
+ * Returns: (transfer container) (element-type IBusEngineDesc):
+ *        A List of active engines.
+ *
  * Deprecated: 1.5.3: Read dconf value
  * /desktop/ibus/general/preload-engines instead.
  */
@@ -722,10 +756,12 @@ void         ibus_bus_list_active_engines_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_list_active_engines_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer container) (element-type IBusEngineDesc): A List of active engines.
  *
  * Finishes an operation started with ibus_bus_list_active_engines_async().
  *
+ * Returns: (transfer container) (element-type IBusEngineDesc):
+ *         A List of active engines.
+ *
  * Deprecated: 1.5.3: Read dconf value
  * /desktop/ibus/general/preload-engines instead.
  */
@@ -740,11 +776,13 @@ GList       *ibus_bus_list_active_engines_async_finish
  * ibus_bus_get_engines_by_names:
  * @bus: An #IBusBus.
  * @names: (array zero-terminated=1): A %NULL-terminated array of names.
- * @returns: (array zero-terminated=1) (transfer full): A %NULL-terminated array of engines.
  *
- * Get engines by given names synchronously. If some engine names do not exist, this function
- * will simply ignore them, and return rest of engines.
+ * Get engines by given names synchronously. If some engine names do not exist,
+ * this function will simply ignore them, and return rest of engines.
  * TODO(penghuang): add asynchronous version
+ *
+ * Returns: (array zero-terminated=1) (transfer full):
+ *         A %NULL-terminated array of engines.
  */
 IBusEngineDesc **
              ibus_bus_get_engines_by_names
@@ -754,10 +792,11 @@ IBusEngineDesc **
 /**
  * ibus_bus_get_use_sys_layout:
  * @bus: An #IBusBus.
- * @returns: %TRUE if "use_sys_layout" option is enabled.
  *
  * Check if the bus's "use_sys_layout" option is enabled or not synchronously.
  *
+ * Returns: %TRUE if "use_sys_layout" option is enabled.
+ *
  * Deprecated: 1.5.3: Read dconf value
  * /desktop/ibus/general/use_system_keyboard_layout instead.
  */
@@ -794,10 +833,11 @@ void         ibus_bus_get_use_sys_layout_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_get_use_sys_layout_async().
  * @error: Return location for error or %NULL.
- * @returns: TRUE if "use_sys_layout" option is enabled.
  *
  * Finishes an operation started with ibus_bus_get_use_sys_layout_async().
  *
+ * Returns: TRUE if "use_sys_layout" option is enabled.
+ *
  * Deprecated: 1.5.3: Read dconf value
  * /desktop/ibus/general/use_system_keyboard_layout instead.
  */
@@ -810,9 +850,11 @@ gboolean     ibus_bus_get_use_sys_layout_async_finish
 /**
  * ibus_bus_get_use_global_engine:
  * @bus: An #IBusBus.
- * @returns: TRUE if "use_global_engine" option is enabled.
  *
- * 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.
+ *
+ * Returns: TRUE if "use_global_engine" option is enabled.
  *
  * Deprecated: 1.5.3: Currently global engine is always used.
  */
@@ -848,10 +890,11 @@ void         ibus_bus_get_use_global_engine_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_get_use_global_engine_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if "use_global_engine" option is enabled.
  *
  * Finishes an operation started with ibus_bus_get_use_global_engine_async().
  *
+ * Returns: %TRUE if "use_global_engine" option is enabled.
+ *
  * Deprecated: 1.5.3: Currently global engine is always used.
  */
 IBUS_DEPRECATED
@@ -863,10 +906,11 @@ gboolean     ibus_bus_get_use_global_engine_async_finish
 /**
  * ibus_bus_is_global_engine_enabled:
  * @bus: An #IBusBus.
- * @returns: %TRUE if the current global engine is enabled.
  *
  * Check if the current global engine is enabled or not synchronously.
  *
+ * Returns: %TRUE if the current global engine is enabled.
+ *
  * Deprecated: 1.5.3: 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.
@@ -909,10 +953,11 @@ void         ibus_bus_is_global_engine_enabled_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_is_global_engine_enabled_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if the current global engine is enabled.
  *
  * Finishes an operation started with ibus_bus_is_global_engine_enabled_async().
  *
+ * Returns: %TRUE if the current global engine is enabled.
+ *
  * Deprecated: 1.5.3: 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.
@@ -929,10 +974,11 @@ gboolean     ibus_bus_is_global_engine_enabled_async_finish
 /**
  * ibus_bus_get_global_engine:
  * @bus: An #IBusBus.
- * @returns: (transfer none): The description of current global engine,
- * or %NULL if there is no global engine.
  *
  * Get the description of current global engine synchronously.
+ *
+ * Returns: (transfer none): The description of current global engine,
+ * or %NULL if there is no global engine.
  */
 IBusEngineDesc *
              ibus_bus_get_global_engine (IBusBus        *bus);
@@ -962,10 +1008,11 @@ void         ibus_bus_get_global_engine_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_get_global_engine_async_finish().
  * @error: Return location for error or %NULL.
- * @returns: (transfer none): The description of current global engine,
- * or %NULL if there is no global engine.
  *
  * Finishes an operation started with ibus_bus_get_global_engine_async_finish().
+ *
+ * Returns: (transfer none): The description of current global engine,
+ * or %NULL if there is no global engine.
  */
 IBusEngineDesc *
              ibus_bus_get_global_engine_async_finish
@@ -977,9 +1024,10 @@ IBusEngineDesc *
  * ibus_bus_set_global_engine:
  * @bus: An #IBusBus.
  * @global_engine: A new engine name.
- * @returns: %TRUE if the global engine was set successfully.
  *
  * Set current global engine synchronously.
+ *
+ * Returns: %TRUE if the global engine was set successfully.
  */
 gboolean     ibus_bus_set_global_engine (IBusBus        *bus,
                                          const gchar    *global_engine);
@@ -1011,9 +1059,10 @@ void         ibus_bus_set_global_engine_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_set_global_engine_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if no IPC errros. %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_set_global_engine_async().
+ *
+ * Returns: %TRUE if no IPC errros. %FALSE otherwise.
  */
 gboolean     ibus_bus_set_global_engine_async_finish
                                         (IBusBus        *bus,
@@ -1048,10 +1097,11 @@ void         ibus_bus_set_watch_ibus_signal
 /**
  * ibus_bus_get_config:
  * @bus: An #IBusBus.
- * @returns: (transfer none): An #IBusConfig object which is configurable with
- * @bus.
  *
  * Get the config instance from #IBusBus.
+ *
+ * Returns: (transfer none): An #IBusConfig object which is configurable with
+ * @bus.
  */
 IBusConfig  *ibus_bus_get_config        (IBusBus        *bus);
 
@@ -1059,9 +1109,10 @@ IBusConfig  *ibus_bus_get_config        (IBusBus        *bus);
  * ibus_bus_preload_engines:
  * @bus: An #IBusBus.
  * @names: (array zero-terminated=1): A %NULL-terminated array of engine names.
- * @returns: %TRUE if components start. %FALSE otherwise.
  *
  * Start bus components by engine names synchronously.
+ *
+ * Returns: %TRUE if components start. %FALSE otherwise.
  */
 gboolean     ibus_bus_preload_engines   (IBusBus        *bus,
                                          const gchar * const *names);
@@ -1094,9 +1145,10 @@ void         ibus_bus_preload_engines_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_bus_preload_engines_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if component starts. %FALSE otherwise.
  *
  * Finishes an operation started with ibus_bus_preload_engines_async().
+ *
+ * Returns: %TRUE if component starts. %FALSE otherwise.
  */
 gboolean     ibus_bus_preload_engines_async_finish
                                         (IBusBus        *bus,
@@ -1107,10 +1159,11 @@ gboolean     ibus_bus_preload_engines_async_finish
  * ibus_bus_get_ibus_property:
  * @bus: An #IBusBus.
  * @property_name: property name in org.freedesktop.DBus.Properties.Get
- * @returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
- *           The returned value must be freed with g_variant_unref().
  *
  * Get org.freedesktop.DBus.Properties.
+ *
+ * Returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
+ *           The returned value must be freed with g_variant_unref().
  */
 GVariant *   ibus_bus_get_ibus_property (IBusBus        *bus,
                                          const gchar    *property_name);
@@ -1140,12 +1193,13 @@ void         ibus_bus_get_ibus_property_async
  * ibus_bus_get_ibus_property_async_finish:
  * @bus: An #IBusBus.
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
- *   ibus_bus_get_property_async().
+ *   ibus_bus_get_ibus_property_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
- *           The returned value must be freed with g_variant_unref().
  *
  * Finishes an operation started with ibus_bus_get_ibus_property_async().
+ *
+ * Returns: (transfer full): The value in org.freedesktop.DBus.Properties.Get
+ *           The returned value must be freed with g_variant_unref().
  */
 GVariant *   ibus_bus_get_ibus_property_async_finish
                                         (IBusBus        *bus,
@@ -1191,11 +1245,12 @@ void         ibus_bus_set_ibus_property_async
  * ibus_bus_set_ibus_property_async_finish:
  * @bus: An #IBusBus.
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
- *   ibus_bus_set_property_async().
+ *   ibus_bus_set_ibus_property_async().
  * @error: Return location for error or %NULL.
- * @returns: %TRUE if property is set with async. %FALSE failed.
  *
  * Finishes an operation started with ibus_bus_set_ibus_property_async().
+ *
+ * Returns: %TRUE if property is set with async. %FALSE failed.
  */
 gboolean     ibus_bus_set_ibus_property_async_finish
                                         (IBusBus        *bus,
diff --git a/src/ibuscomponent.h b/src/ibuscomponent.h
index ef83407c0..3e51caa3c 100644
--- a/src/ibuscomponent.h
+++ b/src/ibuscomponent.h
@@ -79,14 +79,6 @@ typedef struct _IBusComponentPrivate IBusComponentPrivate;
  *
  * An IBusComponent stores component information.
  * You can get extended values with g_object_get_properties.
- * name: Name of the component.
- * description: Detailed description of component.
- * version: Component version.
- * license: Distribution license of this component.
- * author: Author(s) of the component.
- * homepage: Homepage of the component.
- * command_line: path to component executable.
- * textdomain: Domain name for dgettext()
  */
 struct _IBusComponent {
     /*< private >*/
@@ -96,6 +88,7 @@ struct _IBusComponent {
 
     /*< public >*/
 
+    /*< private >*/
     /* padding */
     gpointer pdummy[7];  // We can add 7 pointers without breaking the ABI.
 };
@@ -118,9 +111,10 @@ GType            ibus_component_get_type        (void);
  * @homepage: Homepage of the component.
  * @command_line: path to component executable.
  * @textdomain: Domain name for dgettext()
- * @returns: A newly allocated IBusComponent.
  *
- * New an IBusComponent.
+ * Creates a new #IBusComponent.
+ *
+ * Returns: A newly allocated #IBusComponent.
  */
 IBusComponent   *ibus_component_new             (const gchar    *name,
                                                  const gchar    *description,
@@ -134,14 +128,16 @@ IBusComponent   *ibus_component_new             (const gchar    *name,
 /**
  * ibus_component_new_varargs:
  * @first_property_name: Name of the first property.
- * @Varargs: the NULL-terminated arguments of the properties and values.
+ * @...: the NULL-terminated arguments of the properties and values.
  *
- * New an IBusComponent.
+ * Creates a new #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",
  *                                                        "command_line", "/usr/libexec/ibus-engine-foo --ibus",
  *                                                     NULL)
+ *
+ * Returns: A newly allocated #IBusComponent.
  */
 IBusComponent   *ibus_component_new_varargs     (const gchar    *first_property_name,
                                                  ...);
@@ -149,9 +145,10 @@ IBusComponent   *ibus_component_new_varargs     (const gchar    *first_property_
 /**
  * ibus_component_new_from_xml_node:
  * @node: Root node of component XML tree.
- * @returns: A newly allocated IBusComponent.
  *
- * New an IBusComponent from an XML tree.
+ * Creates a new #IBusComponent from an XML tree.
+ *
+ * Returns: A newly allocated #IBusComponent.
  */
 IBusComponent   *ibus_component_new_from_xml_node
                                                 (XMLNode        *node);
@@ -159,94 +156,103 @@ IBusComponent   *ibus_component_new_from_xml_node
 /**
  * ibus_component_new_from_file:
  * @filename: An XML file that contains component information.
- * @returns: A newly allocated IBusComponent.
  *
- * New an IBusComponent from an XML file.
+ * Creates a new #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.
+ *
+ * Returns: A newly allocated #IBusComponent.
  */
 IBusComponent   *ibus_component_new_from_file   (const gchar    *filename);
 
 /**
  * ibus_component_get_name:
- * @component: An IBusComponent
- * @returns: name property in IBusComponent
+ * @component: An #IBusComponent
  *
- * Return the name property in IBusComponent. It should not be freed.
+ * Gets the name property in #IBusComponent. It should not be freed.
+ *
+ * Returns: name property in #IBusComponent
  */
 const gchar     *ibus_component_get_name        (IBusComponent  *component);
 
 /**
  * ibus_component_get_description:
- * @component: An IBusComponent
- * @returns: description property in IBusComponent
+ * @component: An #IBusComponent
+ *
+ * Gets the description property in #IBusComponent. It should not be freed.
  *
- * Return the description property in IBusComponent. It should not be freed.
+ * Returns: description property in #IBusComponent
  */
 const gchar     *ibus_component_get_description (IBusComponent  *component);
 
 /**
  * ibus_component_get_version:
- * @component: An IBusComponent
- * @returns: version property in IBusComponent
+ * @component: An #IBusComponent
  *
- * Return the version property in IBusComponent. It should not be freed.
+ * Gets the version property in #IBusComponent. It should not be freed.
+ *
+ * Returns: version property in #IBusComponent
  */
 const gchar     *ibus_component_get_version     (IBusComponent  *component);
 
 /**
  * ibus_component_get_license:
- * @component: An IBusComponent
- * @returns: license property in IBusComponent
+ * @component: An #IBusComponent
+ *
+ * Gets the license property in #IBusComponent. It should not be freed.
  *
- * Return the license property in IBusComponent. It should not be freed.
+ * Returns: license property in #IBusComponent
  */
 const gchar     *ibus_component_get_license     (IBusComponent  *component);
 
 /**
  * ibus_component_get_author:
- * @component: An IBusComponent
- * @returns: author property in IBusComponent
+ * @component: An #IBusComponent
  *
- * Return the author property in IBusComponent. It should not be freed.
+ * Gets the author property in #IBusComponent. It should not be freed.
+ *
+ * Returns: author property in #IBusComponent
  */
 const gchar     *ibus_component_get_author      (IBusComponent  *component);
 
 /**
  * ibus_component_get_homepage:
- * @component: An IBusComponent
- * @returns: homepage property in IBusComponent
+ * @component: An #IBusComponent
+ *
+ * Gets the homepage property in #IBusComponent. It should not be freed.
  *
- * Return the homepage property in IBusComponent. It should not be freed.
+ * Returns: homepage property in #IBusComponent
  */
 const gchar     *ibus_component_get_homepage    (IBusComponent  *component);
 
 /**
  * ibus_component_get_exec:
- * @component: An IBusComponent
- * @returns: exec property in IBusComponent
+ * @component: An #IBusComponent
+ *
+ * Gets the exec property in #IBusComponent. It should not be freed.
  *
- * Return the exec property in IBusComponent. It should not be freed.
+ * Returns: exec property in #IBusComponent
  */
 const gchar     *ibus_component_get_exec        (IBusComponent  *component);
 
 /**
  * ibus_component_get_textdomain:
- * @component: An IBusComponent
- * @returns: textdomain property in IBusComponent
+ * @component: An #IBusComponent
  *
- * Return the textdomain property in IBusComponent. It should not be freed.
+ * Gets the textdomain property in #IBusComponent. It should not be freed.
+ *
+ * Returns: textdomain property in #IBusComponent
  */
 const gchar     *ibus_component_get_textdomain  (IBusComponent  *component);
 
 /**
  * ibus_component_add_observed_path:
- * @component: An IBusComponent
+ * @component: An #IBusComponent
  * @path: Observed path to be added.
- * @access_fs: TRUE for filling the file status; FALSE otherwise.
+ * @access_fs: %TRUE for filling the file status; %FALSE otherwise.
  *
- * Add an observed path to IBusComponent.
+ * Add an observed path to #IBusComponent.
  */
 void             ibus_component_add_observed_path
                                                 (IBusComponent  *component,
@@ -255,30 +261,32 @@ void             ibus_component_add_observed_path
 
 /**
  * ibus_component_add_engine:
- * @component: An IBusComponent
+ * @component: An #IBusComponent
  * @engine: A description of an engine.
  *
- * Add an engine to IBusComponent according to the description in @engine.
+ * Add an engine to #IBusComponent according to the description in @engine.
  */
 void             ibus_component_add_engine      (IBusComponent  *component,
                                                  IBusEngineDesc *engine);
 
 /**
  * ibus_component_get_engines:
- * @component: An IBusComponent.
- * @returns: (transfer container) (element-type IBusEngineDesc): A newly allocated GList that contains engines.
+ * @component: An #IBusComponent.
+ *
+ * Gets the engines of this component.
  *
- * Get the engines of this component.
+ * Returns: (transfer container) (element-type IBusEngineDesc):
+ * A newly allocated GList that contains engines.
  */
 GList           *ibus_component_get_engines     (IBusComponent  *component);
 
 /**
  * ibus_component_output:
- * @component: An IBusComponent.
+ * @component: An #IBusComponent.
  * @output: GString that holds the result.
  * @indent: level of indent.
  *
- * 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.
  */
 void             ibus_component_output          (IBusComponent  *component,
@@ -287,7 +295,7 @@ void             ibus_component_output          (IBusComponent  *component,
 
 /**
  * ibus_component_output_engines:
- * @component: An IBusComponent.
+ * @component: An #IBusComponent.
  * @output: GString that holds the result.
  * @indent: level of indent.
  *
@@ -300,21 +308,24 @@ void             ibus_component_output_engines  (IBusComponent  *component,
 
 /**
  * ibus_component_check_modification:
- * @component: An IBusComponent.
- * @returns: TRUE if at least one of the observed paths is modified; FALSE otherwise.
+ * @component: An #IBusComponent.
  *
  * Check whether the observed paths of component is modified.
+ *
+ * Returns: %TRUE if at least one of the observed paths is modified;
+ * %FALSE otherwise.
  */
 gboolean         ibus_component_check_modification
                                                 (IBusComponent  *component);
 
 /**
  * ibus_component_get_observed_paths:
- * @component: An IBusComponent.
- * @returns: (transfer container) (element-type IBusObservedPath): A
- * newly allocated GList that contains observed paths.
+ * @component: An #IBusComponent.
  *
- * Get the observed paths of this component.
+ * Gets the observed paths of this component.
+ *
+ * Returns: (transfer container) (element-type IBusObservedPath): A
+ * newly allocated GList that contains observed paths.
  */
 GList           *ibus_component_get_observed_paths
                                                 (IBusComponent *component);
diff --git a/src/ibusconfig.h b/src/ibusconfig.h
index 4bde4bd93..d7e853065 100644
--- a/src/ibusconfig.h
+++ b/src/ibusconfig.h
@@ -89,9 +89,12 @@ GType            ibus_config_get_type       (void);
 /**
  * ibus_config_new:
  * @connection: A #GDBusConnection.
- * @returns: An newly allocated #IBusConfig corresponding to @connection.
+ * @cancellable: A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
  *
- * New an #IBusConfig from existing #GDBusConnection.
+ * Create a new #IBusConfig from existing #GDBusConnection.
+ *
+ * Returns: A newly allocated #IBusConfig corresponding to @connection.
  */
 IBusConfig      *ibus_config_new            (GDBusConnection    *connection,
                                              GCancellable       *cancellable,
@@ -117,9 +120,10 @@ void             ibus_config_new_async      (GDBusConnection    *connection,
  * @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().
+ *
+ * Returns: A newly allocated #IBusConfig.
  */
 IBusConfig      *ibus_config_new_async_finish
                                             (GAsyncResult       *res,
@@ -130,7 +134,6 @@ IBusConfig      *ibus_config_new_async_finish
  * @config: An #IBusConfig
  * @section: Section name of the configuration option.
  * @name: Name of the configure option.
- * @returns: A #GVariant or %NULL. Free with g_variant_unref().
  *
  * Get the value of a configuration option synchronously.
  *
@@ -142,6 +145,8 @@ IBusConfig      *ibus_config_new_async_finish
  * ibus-chewing, for example, stores its setting in /desktop/ibus/engine/Chewing,
  * so the section name for it is "engine/Chewing".
  * See also: ibus_config_set_value().
+ *
+ * Returns: A #GVariant or %NULL. Free with g_variant_unref().
  */
 GVariant        *ibus_config_get_value      (IBusConfig         *config,
                                              const gchar        *section,
@@ -174,10 +179,11 @@ void             ibus_config_get_value_async (IBusConfig         *config,
  * @config: A #IBusConfig.
  * @result: A #GAsyncResult.
  * @error: Return location for error or %NULL.
- * @returns: A #GVariant or %NULL if error is set. Free with g_variant_unref().
  * 
  * Finish get value of a configuration option.
  *
+ * Returns: A #GVariant or %NULL if error is set. Free with g_variant_unref().
+ *
  * See also: ibus_config_get_value_async().
  */
 GVariant        *ibus_config_get_value_async_finish
@@ -189,10 +195,11 @@ GVariant        *ibus_config_get_value_async_finish
  * ibus_config_get_values:
  * @config: An #IBusConfig
  * @section: Section name of the configuration option.
- * @returns: A #GVariant or %NULL. Free with g_variant_unref().
  *
  * Get all values in a section synchronously.
  *
+ * Returns: A #GVariant or %NULL. Free with g_variant_unref().
+ *
  * See also: ibus_config_set_value().
  */
 GVariant        *ibus_config_get_values     (IBusConfig         *config,
@@ -223,10 +230,11 @@ void             ibus_config_get_values_async(IBusConfig         *config,
  * @config: A #IBusConfig.
  * @result: A #GAsyncResult.
  * @error: Return location for error or %NULL.
- * @returns: A #GVariant or %NULL if error is set. Free with g_variant_unref().
  * 
  * Finish get values in a section.
  *
+ * Returns: A #GVariant or %NULL if error is set. Free with g_variant_unref().
+ *
  * See also: ibus_config_get_values_async().
  */
 GVariant        *ibus_config_get_values_async_finish
@@ -241,9 +249,11 @@ GVariant        *ibus_config_get_values_async_finish
  * @name: Name of the configure option its self.
  * @value: A #GVariant that holds the value. If the value is floating, the
  * function takes ownership of it.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * Set the value of a configuration option synchronously.
+ *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
+ *
  * See also: ibus_config_get_value().
  */
 gboolean         ibus_config_set_value      (IBusConfig         *config,
@@ -281,10 +291,11 @@ void             ibus_config_set_value_async (IBusConfig         *config,
  * @config: A #IBusConfig.
  * @result: A #GAsyncResult.
  * @error: Return location for error or %NULL.
- * @returns: %TRUE or %FALSE if error is set.
  * 
  * Finish set value of a configuration option.
  *
+ * Returns: %TRUE or %FALSE if error is set.
+ *
  * See also: ibus_config_set_value_async().
  */
 gboolean         ibus_config_set_value_async_finish
@@ -297,9 +308,11 @@ gboolean         ibus_config_set_value_async_finish
  * @config: An #IBusConfig
  * @section: Section name of the configuration option.
  * @name: Name of the configure option its self.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * Remove an entry of a configuration option.
+ *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
+ *
  * See also: ibus_config_get_value().
  */
 gboolean         ibus_config_unset      (IBusConfig         *config,
@@ -313,7 +326,6 @@ gboolean         ibus_config_unset      (IBusConfig         *config,
  * @config: An #IBusConfig
  * @section: (allow-none): Section name of the configuration option.
  * @name: (allow-none): Name of the configure option its self.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * Subscribe to the configuration option change notification.
  *
@@ -322,6 +334,8 @@ gboolean         ibus_config_unset      (IBusConfig         *config,
  * call ibus_config_watch() with the sections they are interested in,
  * to reduce the number of D-Bus messages.
  *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
+ *
  * See also: ibus_config_unwatch().
  */
 gboolean         ibus_config_watch      (IBusConfig         *config,
@@ -335,10 +349,11 @@ gboolean         ibus_config_watch      (IBusConfig         *config,
  * @config: An #IBusConfig
  * @section: (allow-none): Section name of the configuration option.
  * @name: (allow-none): Name of the configure option its self.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * Unsubscribe from the configuration option change notification.
  *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
+ *
  * See also: ibus_config_watch.
  */
 gboolean         ibus_config_unwatch    (IBusConfig         *config,
diff --git a/src/ibusconfigservice.h b/src/ibusconfigservice.h
index 343af97a9..3f74f0845 100644
--- a/src/ibusconfigservice.h
+++ b/src/ibusconfigservice.h
@@ -186,11 +186,12 @@ struct _IBusConfigServiceClass {
                                  GError              **error);
     /**
      * get_value:
-     * @config: An IBusConfig.
+     * @config: An #IBusConfig.
      * @section: section name
      * @name: value name
-     * @returns: (transfer full): The value in config associated with section and name.
      *
+     * Returns: (transfer full): The value in config associated with section
+     *         and name.
      */
     GVariant *  (* get_value)   (IBusConfigService    *config,
                                  const gchar          *section,
@@ -213,10 +214,11 @@ GType                ibus_config_service_get_type   (void);
 
 /**
  * ibus_config_service_new:
- * @connection: An GDBusConnection.
- * @returns: A newly allocated IBusConfigServices.
+ * @connection: An #GDBusConnection.
  *
- * New an IBusConfigService from an GDBusConnection.
+ * Creates an new #IBusConfigService from an #GDBusConnection.
+ *
+ * Returns: A newly allocated #IBusConfigServices.
  */
 IBusConfigService   *ibus_config_service_new        (GDBusConnection     *connection);
 
diff --git a/src/ibusdebug.h b/src/ibusdebug.h
index fdd40fcbf..3ce72bd6f 100644
--- a/src/ibusdebug.h
+++ b/src/ibusdebug.h
@@ -38,7 +38,7 @@
 /**
  * ibus_warning:
  * @msg: A printf formatted message to be print.
- * @args...: Necessary arguments for @msg.
+ * @...: Necessary arguments for @msg.
  *
  * A convenient wrapper for g_warning.
  * The output format will be
diff --git a/src/ibusengine.c b/src/ibusengine.c
index 4758f82f9..b2a8022aa 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -331,12 +331,13 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @state: Key modifier flags.
      *
      * Emitted when a key event is received.
-     * Implement the member function process_key_event() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::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.
      *
-     * Returns: TRUE for successfully process the key; FALSE otherwise.
+     * Returns: %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>
@@ -359,7 +360,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the client application get the focus.
-     * Implement the member function focus_in() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::focus_in
+     * in extended class to receive this signal.
      *
      * See also: ibus_input_context_focus_in()
      * <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -379,7 +381,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the client application  lost the focus.
-     * Implement the member function focus_out() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::focus_out
+     * in extended class to receive this signal.
      *
      * See also: ibus_input_context_focus_out()
      * <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -399,7 +402,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the IME is reset.
-     * Implement the member function reset() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::reset
+     * in extended class to receive this signal.
      *
      * See also:  ibus_input_context_reset().
      * <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -419,9 +423,10 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the IME is enabled.
-     * Implement the member function set_enable() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::enable
+     * in extended class to receive this signal.
      *
-     * See also:  ibus_input_context_enable().
+     * See also:  ibus_bus_set_global_engine().
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
     engine_signals[ENABLE] =
@@ -439,9 +444,10 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the IME is disabled.
-     * Implement the member function set_disable() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::disable
+     * in extended class to receive this signal.
      *
-     * See also:  ibus_input_context_disable().
+     * See also:  ibus_bus_set_global_engine().
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
     engine_signals[DISABLE] =
@@ -463,7 +469,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @h: Height of the cursor.
      *
      * Emitted when the location of IME is set.
-     * Implement the member function set_cursor_location() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::set_cursor_location
+     * in extended class to receive this signal.
      *
      * See also:  ibus_input_context_set_cursor_location().
      * <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -488,7 +495,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @caps: Capabilities flags of IBusEngine, see #IBusCapabilite
      *
      * Emitted when the client application capabilities is set.
-     * Implement the member function set_capabilities() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::set_capabilities
+     * in extended class to receive this signal.
      *
      * See also:  ibus_input_context_set_capabilities().
      * <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -509,7 +517,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the page-up button is pressed.
-     * Implement the member function page_up() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::page_up
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -528,7 +537,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the page-down button is pressed.
-     * Implement the member function page_down() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::page_down
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -547,7 +557,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the up cursor button is pressed.
-     * Implement the member function cursor_up() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::cursor_up
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -566,7 +577,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @engine: An IBusEngine.
      *
      * Emitted when the down cursor button is pressed.
-     * Implement the member function cursor_down() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::cursor_down
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -588,7 +600,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @state:  Keyboard state.
      *
      * Emitted when candidate on lookup table is clicked.
-     * Implement the member function candidate_clicked() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::candidate_clicked
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -612,7 +625,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @state:  Property state.
      *
      * Emitted when a property is activated or change changed.
-     * Implement the member function property_activate() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::property_activate
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -634,7 +648,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @name:   Property name.
      *
      * Emitted when a property is shown.
-     * Implement the member function property_side() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::property_side
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -655,7 +670,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @name:   Property name.
      *
      * Emitted when a property is hidden.
-     * Implement the member function property_hide() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::property_hide
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -677,7 +693,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @coordinates_len: The number of elements in the array.
      *
      * Emitted when a hand writing operation is cancelled.
-     * Implement the member function cancel_hand_writing() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::cancel_hand_writing
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -699,7 +716,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @n_strokes: The number of strokes to be removed. 0 means "remove all".
      *
      * Emitted when a hand writing operation is cancelled.
-     * Implement the member function cancel_hand_writing() in extended class to receive this signal.
+     * Implement the member function IBusEngineClass::cancel_hand_writing
+     * in extended class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -722,9 +740,10 @@ ibus_engine_class_init (IBusEngineClass *class)
      * @anchor_pos: The anchor position on selection area.
      *
      * 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".
+     * Implement the member function IBusEngineClass::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".
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
@@ -750,8 +769,8 @@ ibus_engine_class_init (IBusEngineClass *class)
      * 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
-     * signal.
+     * function IBusEngineClass::set_content_type
+     * in extended class to receive this signal.
      *
      * For example, if the client application wants to restrict input
      * to numbers, this signal will be emitted with @purpose set to
diff --git a/src/ibusengine.h b/src/ibusengine.h
index e77fdb27c..b6461ce99 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -74,8 +74,6 @@ typedef struct _IBusEnginePrivate IBusEnginePrivate;
  * @has_focus: Whether the engine has focus.
  * @cursor_area: Area of cursor.
  * @client_capabilities: IBusCapabilite (client capabilities) flags.
- * @client_purpose: IBusInputPurpose (client input purpose).
- * @client_hints: IBusInputHints (client input hints) flags.
  *
  * IBusEngine properties.
  */
@@ -168,9 +166,10 @@ GType        ibus_engine_get_type       (void);
  * @engine_name: Name of the IBusObject.
  * @object_path: Path for IBusService.
  * @connection: An opened GDBusConnection.
- * @returns: A newly allocated IBusEngine.
  *
- * New an IBusEngine.
+ * Create a new #IBusEngine.
+ *
+ * Returns: A newly allocated IBusEngine.
  */
 IBusEngine  *ibus_engine_new            (const gchar        *engine_name,
                                          const gchar        *object_path,
@@ -181,9 +180,10 @@ IBusEngine  *ibus_engine_new            (const gchar        *engine_name,
  * @engine_name: Name of the IBusObject.
  * @object_path: Path for IBusService.
  * @connection: An opened GDBusConnection.
- * @returns: A newly allocated IBusEngine.
  *
- * New an IBusEngine.
+ * Create a new #IBusEngine.
+ *
+ * Returns: A newly allocated IBusEngine.
  */
 IBusEngine  *ibus_engine_new_with_type  (GType               engine_type,
                                          const gchar        *engine_name,
@@ -456,9 +456,10 @@ void ibus_engine_get_content_type       (IBusEngine         *engine,
 /**
  * ibus_engine_get_name:
  * @engine: An IBusEngine.
- * @returns: Name of IBusEngine.
  *
- * Return the name of IBusEngine.
+ * Return the name of #IBusEngine.
+ *
+ * Returns: Name of #IBusEngine.
  */
 const gchar *ibus_engine_get_name       (IBusEngine         *engine);
 
diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index cafc4cae1..45ec06bff 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -78,24 +78,6 @@ typedef struct _IBusEngineDescClass IBusEngineDescClass;
  *
  * Input method engine description data.
  * You can get extended values with g_object_get_properties.
- * name: Name of the engine.
- * longname: Long name of the input method engine.
- * description: Input method engine description.
- * language: Language (e.g. zh, jp) supported by this input method engine.
- * license: License of the input method engine.
- * author: Author of the input method engine.
- * icon: Icon file of this engine.
- * layout: Keyboard layout
- * layout_variant: Keyboard variant
- * layout_option: Keyboard option
- * rank: Preference rank among engines, the highest ranked IME will put in
- * the front.
- * hotkeys: One or more hotkeys for switching to this engine, separated by
- *  semi-colon.
- * setup: Exec lists of the engine setup command.
- * version: Version number of the input method engine.
- * textdomain: Domain name for dgettext()
- * icon_prop_key: Key of IBusProperty to change panel icon dynamically.
  */
 struct _IBusEngineDesc {
     IBusSerializable parent;
@@ -123,9 +105,10 @@ GType            ibus_engine_desc_get_type      (void);
  * @author: Author of the input method engine.
  * @icon: Icon file of this engine.
  * @layout: Keyboard layout
- * @returns: A newly allocated IBusEngineDesc.
  *
- * New a IBusEngineDesc.
+ * Creates a new #IBusEngineDesc.
+ *
+ * Returns: A newly allocated IBusEngineDesc.
  */
 IBusEngineDesc  *ibus_engine_desc_new           (const gchar    *name,
                                                  const gchar    *longname,
@@ -139,12 +122,14 @@ IBusEngineDesc  *ibus_engine_desc_new           (const gchar    *name,
 /**
  * ibus_engine_desc_new_varargs:
  * @first_property_name: Name of the first property.
- * @Varargs: the NULL-terminated arguments of the properties and values.
+ * @...: the NULL-terminated arguments of the properties and values.
  *
- * New a IBusEngineDesc.
+ * Creates a new #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)
+ *
+ * Returns: A newly allocated IBusEngineDesc.
  */
 IBusEngineDesc  *ibus_engine_desc_new_varargs   (const gchar *first_property_name,
                                                  ...);
@@ -153,40 +138,44 @@ IBusEngineDesc  *ibus_engine_desc_new_varargs   (const gchar *first_property_nam
 /**
  * ibus_engine_desc_new_from_xml_node:
  * @node: An XML node
- * @returns: A newly allocated IBusEngineDesc that contains description from
- * @node.
  *
- * New a IBusEngineDesc from an XML node.
+ * Creates a new 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>
+ *
+ * Returns: A newly allocated IBusEngineDesc that contains description from
+ * @node.
  */
 IBusEngineDesc  *ibus_engine_desc_new_from_xml_node
                                                 (XMLNode        *node);
 /**
  * ibus_engine_desc_get_name:
  * @info: An IBusEngineDesc
- * @returns: name property in IBusEngineDesc
  *
- * Return the name property in IBusEngineDesc. It should not be freed.
+ * Gets the name property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: name property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_name      (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_longname:
  * @info: An IBusEngineDesc
- * @returns: longname property in IBusEngineDesc
  *
- * Return the longname property in IBusEngineDesc. It should not be freed.
+ * Gets the longname property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: longname property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_longname  (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_description:
  * @info: An IBusEngineDesc
- * @returns: description property in IBusEngineDesc
  *
- * Return the description property in IBusEngineDesc. It should not be freed.
+ * Gets the description property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: description property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_description
                                                 (IBusEngineDesc *info);
@@ -194,54 +183,61 @@ const gchar     *ibus_engine_desc_get_description
 /**
  * ibus_engine_desc_get_language:
  * @info: An IBusEngineDesc
- * @returns: language property in IBusEngineDesc
  *
- * Return the language property in IBusEngineDesc. It should not be freed.
+ * Gets the language property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: language property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_language  (IBusEngineDesc *info);
 
+
 /**
  * ibus_engine_desc_get_license:
  * @info: An IBusEngineDesc
- * @returns: license property in IBusEngineDesc
  *
- * Return the license property in IBusEngineDesc. It should not be freed.
+ * Gets the license property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: license property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_license   (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_author:
  * @info: An IBusEngineDesc
- * @returns: author property in IBusEngineDesc
  *
- * Return the author property in IBusEngineDesc. It should not be freed.
+ * Gets the author property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: author property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_author    (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_icon:
  * @info: An IBusEngineDesc
- * @returns: icon property in IBusEngineDesc
  *
- * Return the icon property in IBusEngineDesc. It should not be freed.
+ * Gets the icon property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: icon property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_icon      (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_layout:
  * @info: An IBusEngineDesc
- * @returns: layout property in IBusEngineDesc
  *
- * Return the layout property in IBusEngineDesc. It should not be freed.
+ * Gets the layout property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: layout property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_layout    (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_layout_variant:
  * @info: An IBusEngineDesc
- * @returns: keyboard variant property in IBusEngineDesc
  *
- * Return the keyboard variant property in IBusEngineDesc. It should not be freed.
+ * Gets the keyboard variant property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: keyboard variant property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_layout_variant
                                                 (IBusEngineDesc *info);
@@ -249,9 +245,10 @@ const gchar     *ibus_engine_desc_get_layout_variant
 /**
  * ibus_engine_desc_get_layout_option:
  * @info: An IBusEngineDesc
- * @returns: keyboard option property in IBusEngineDesc
  *
- * Return the keyboard option property in IBusEngineDesc. It should not be freed.
+ * Gets the keyboard option property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: keyboard option property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_layout_option
                                                 (IBusEngineDesc *info);
@@ -259,54 +256,60 @@ const gchar     *ibus_engine_desc_get_layout_option
 /**
  * ibus_engine_desc_get_rank:
  * @info: An IBusEngineDesc
- * @returns: rank property in IBusEngineDesc
  *
- * Return the rank property in IBusEngineDesc.
+ * Gets the rank property in IBusEngineDesc.
+ *
+ * Returns: rank property in IBusEngineDesc
  */
 guint            ibus_engine_desc_get_rank      (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_hotkeys:
  * @info: An IBusEngineDesc
- * @returns: hotkeys property in IBusEngineDesc
  *
- * Return the hotkeys property in IBusEngineDesc. It should not be freed.
+ * Gets the hotkeys property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: hotkeys property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_hotkeys   (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_symbol:
  * @info: An IBusEngineDesc
- * @returns: symbol property in IBusEngineDesc
  *
- * Return the symbol property in IBusEngineDesc. It should not be freed.
+ * Gets the symbol property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: symbol property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_symbol    (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_setup:
  * @info: An IBusEngineDesc
- * @returns: setup property in IBusEngineDesc
  *
- * Return the setup property in IBusEngineDesc. It should not be freed.
+ * Gets the setup property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: setup property in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_setup     (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_version:
  * @info: An IBusEngineDesc
- * @returns: version in IBusEngineDesc
  *
- * Return the version property in IBusEngineDesc. It should not be freed.
+ * Gets the version property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: version in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_version   (IBusEngineDesc *info);
 
 /**
  * ibus_engine_desc_get_textdomain:
  * @info: An IBusEngineDesc
- * @returns: textdomain in IBusEngineDesc
  *
- * Return the textdomain property in IBusEngineDesc. It should not be freed.
+ * Gets the textdomain property in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: textdomain in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_textdomain
                                                 (IBusEngineDesc *info);
@@ -314,10 +317,11 @@ const gchar     *ibus_engine_desc_get_textdomain
 /**
  * ibus_engine_desc_get_icon_prop_key:
  * @info: An IBusEngineDesc
- * @returns: IBusProperty.key for dynamic panel icon in IBusEngineDesc
  *
- * Return the key of IBusProperty to load the panel icon dynamically
-   in IBusEngineDesc. It should not be freed.
+ * Gets the key of IBusProperty to load the panel icon dynamically
+ * in IBusEngineDesc. It should not be freed.
+ *
+ * Returns: IBusProperty.key for dynamic panel icon in IBusEngineDesc
  */
 const gchar     *ibus_engine_desc_get_icon_prop_key
                                                 (IBusEngineDesc *info);
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 76d46f4b2..c74928ae0 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -28,7 +28,7 @@
 #define __IBUS_ENGINE_SIMPLE_H__
 
 /**
- * SECTION: ibussimpleengine
+ * SECTION: ibusenginesimple
  * @short_description: Input method engine supporting table-based input method
  * @title: IBusEngineSimple
  * @stability: Stable
@@ -102,6 +102,7 @@ GType   ibus_engine_simple_get_type       (void);
  *      during the whole life of the simple engine.
  * @max_seq_len: Maximum length of a swquence in the table (cannot be greater
  *      than %IBUS_MAX_COMPOSE_LEN)
+ * @n_seqs: number of sequences in 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
@@ -121,9 +122,10 @@ void             ibus_engine_simple_add_table   (IBusEngineSimple  *simple,
  * @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.
+ *
+ * Returns: %TRUE if the @locale is matched to the table.
  */
 gboolean         ibus_engine_simple_add_table_by_locale
                                                 (IBusEngineSimple  *simple,
@@ -134,9 +136,10 @@ gboolean         ibus_engine_simple_add_table_by_locale
  * @simple: An IBusEngineSimple.
  * @file: The compose file. If the @file is %NULL,
  *        the current locale is used.
- * @returns: %TRUE if the @file is loaded.
  *
  * Call ibus_engine_simple_add_table() internally by locale.
+ *
+ * Returns: %TRUE if the @file is loaded.
  */
 gboolean         ibus_engine_simple_add_compose_file
                                                 (IBusEngineSimple  *simple,
diff --git a/src/ibusenumtypes.h.template b/src/ibusenumtypes.h.template
index 3ad389800..6a754b661 100644
--- a/src/ibusenumtypes.h.template
+++ b/src/ibusenumtypes.h.template
@@ -2,14 +2,6 @@
 #ifndef __IBUS_ENUM_TYPES_H__
 #define __IBUS_ENUM_TYPES_H__
 
-/**
- * SECTION: ibusenumtypes
- * @short_description: Enumeration definition in IBus.
- * @stability: Stable
- *
- * IBusEnumTypes lists IBus enumeration types.
- */
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/ibusfactory.h b/src/ibusfactory.h
index 806918336..912f5d5e1 100644
--- a/src/ibusfactory.h
+++ b/src/ibusfactory.h
@@ -142,18 +142,20 @@ struct _IBusFactoryClass {
 
 /**
  * ibus_factory_info_get_type:
- * @returns: GType of IBus factory information.
  *
- * Return GType of IBus factory information.
+ * Gets GType of IBus factory information.
+ *
+ * Returns: GType of IBus factory information.
  */
 GType            ibus_factory_get_type          (void);
 
 /**
  * ibus_factory_new:
  * @connection: An GDBusConnection.
- * @returns: A newly allocated IBusFactory.
  *
- * New an IBusFactory.
+ * Creates a new #IBusFactory.
+ *
+ * Returns: A newly allocated #IBusFactory.
  */
 IBusFactory     *ibus_factory_new               (GDBusConnection *connection);
 
@@ -173,9 +175,10 @@ void             ibus_factory_add_engine        (IBusFactory    *factory,
  * ibus_factory_create_engine:
  * @factory: An #IBusFactory.
  * @engine_name: Name of an engine.
- * @returns: (transfer full): #IBusEngine with @engine_name.
  *
- * Create an #IBusEngine with @engine_name.
+ * Creates an #IBusEngine with @engine_name.
+ *
+ * Returns: (transfer full): #IBusEngine with @engine_name.
  */
 IBusEngine      *ibus_factory_create_engine     (IBusFactory    *factory,
                                                  const gchar    *engine_name);
diff --git a/src/ibushotkey.h b/src/ibushotkey.h
index 9f985eb72..8153036fa 100644
--- a/src/ibushotkey.h
+++ b/src/ibushotkey.h
@@ -82,9 +82,10 @@ struct _IBusHotkeyProfileClass {
 GType            ibus_hotkey_profile_get_type   (void);
 /**
  * ibus_hotkey_profile_new:
- * @returns: A newly allocated IBusHotkeyProfile.
  *
- * New an IBusHotkeyProfile.
+ * Creates a new #IBusHotkeyProfile.
+ *
+ * Returns: A newly allocated #IBusHotkeyProfile.
  */
 IBusHotkeyProfile
                 *ibus_hotkey_profile_new        (void);
@@ -95,9 +96,10 @@ IBusHotkeyProfile
  * @keyval: Keycode of the hotkey.
  * @modifiers: Modifiers of the hotkey.
  * @event: The event to be associated.
- * @returns: Always TRUE.
  *
- * Add a hotkey and its associated event to an IBusHotkeyProfile.
+ * Adds a hotkey and its associated event to an #IBusHotkeyProfile.
+ *
+ * Returns: Always %TRUE.
  */
 gboolean         ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile  *profile,
                                                  guint               keyval,
@@ -109,10 +111,12 @@ gboolean         ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile  *profile,
  * @profile: An IBusHotkeyProfile.
  * @str: Key in string representation.  '+' is the separator.
  * @event: The event to be associated.
- * @returns: FALSE if @str contains invalid symbol; TRUE otherwise.
  *
- * Add a hotkey and its associated event to an IBusHotkeyProfile.
- * The hotkey is in string format, such like <constant>Control+Shift+A</constant>.
+ * Adds a hotkey and its associated event to an #IBusHotkeyProfile.
+ * The hotkey is in string format, such like
+ * <constant>Control+Shift+A</constant>.
+ *
+ * Returns: FALSE if @str contains invalid symbol; TRUE otherwise.
  */
 gboolean         ibus_hotkey_profile_add_hotkey_from_string
                                                 (IBusHotkeyProfile  *profile,
@@ -124,9 +128,10 @@ gboolean         ibus_hotkey_profile_add_hotkey_from_string
  * @profile: An IBusHotkeyProfile.
  * @keyval: Keycode of the hotkey.
  * @modifiers: Modifiers of the hotkey.
- * @returns: FALSE if the key is not in @profile, TRUE otherwise.
  *
- * Remove the hotkey for an IBusHotkeyProfile.
+ * Removes the hotkey for an #IBusHotkeyProfile.
+ *
+ * Returns: %FALSE if the key is not in @profile, %TRUE otherwise.
  */
 gboolean         ibus_hotkey_profile_remove_hotkey
                                                 (IBusHotkeyProfile  *profile,
@@ -137,9 +142,10 @@ gboolean         ibus_hotkey_profile_remove_hotkey
  * ibus_hotkey_profile_remove_hotkey_by_event:
  * @profile: An IBusHotkeyProfile.
  * @event: The associated event.
- * @returns: FALSE if no such event in @profile, TRUE otherwise.
  *
- * Remove the hotkey for an IBusHotkeyProfile by event.
+ * Removes the hotkey for an #IBusHotkeyProfile by event.
+ *
+ * Returns: %FALSE if no such event in @profile, %TRUE otherwise.
  */
 gboolean         ibus_hotkey_profile_remove_hotkey_by_event
                                                 (IBusHotkeyProfile  *profile,
@@ -153,9 +159,11 @@ gboolean         ibus_hotkey_profile_remove_hotkey_by_event
  * @prev_keyval: Keycode of the hotkey.
  * @prev_modifiers: Modifiers of the hotkey.
  * @user_data: user data for signal "trigger".
- * @returns: 0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise.
  *
- * Emit a <constant>::trigger</constant> signal when a hotkey is in a profile.
+ * Emits a <constant>::trigger</constant> signal when a hotkey is in a profile.
+ *
+ * Returns: 0 if releasing a hotkey and the hotkey is not in the profile;
+ * an associated event otherwise.
  *
  * See also: ::trigger
  */
@@ -172,7 +180,8 @@ GQuark           ibus_hotkey_profile_filter_key_event
  * @profile: An IBusHotkeyProfile.
  * @keyval: Keycode of the hotkey.
  * @modifiers: Modifiers of the hotkey.
- * @returns: The event associated to the hotkey or 0 if the hotkey is not in the
+ *
+ * Returns: The event associated to the hotkey or 0 if the hotkey is not in the
  * profile.
  */
 GQuark           ibus_hotkey_profile_lookup_hotkey
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index 0fd6ef88f..5c6372f67 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -90,12 +90,13 @@ GType        ibus_input_context_get_type    (void);
 /**
  * ibus_input_context_new:
  * @path: The path to the object that emitting the signal.
- * @connection: An #GDBusConnection.
+ * @connection: A #GDBusConnection.
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
- * @returns: A newly allocated IBusInputContext.
  *
- * New an IBusInputContext.
+ * Creates a new #IBusInputContext.
+ *
+ * Returns: A newly allocated #IBusInputContext.
  */
 IBusInputContext *
              ibus_input_context_new         (const gchar        *path,
@@ -105,13 +106,13 @@ IBusInputContext *
 /**
  * ibus_input_context_new_async:
  * @path: The path to the object that emitting the signal.
- * @connection: An #GDBusConnection.
+ * @connection: A #GDBusConnection.
  * @cancellable: A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  *      The callback should not be %NULL.
  * @user_data: The data to pass to callback.
  *
- * New an #IBusInputContext asynchronously.
+ * Creates a new #IBusInputContext asynchronously.
  */
 void         ibus_input_context_new_async   (const gchar        *path,
                                              GDBusConnection    *connection,
@@ -124,9 +125,10 @@ void         ibus_input_context_new_async   (const gchar        *path,
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
  *      ibus_input_context_new_async().
  * @error: Return location for error or %NULL.
- * @returns: A newly allocated #IBusInputContext.
  *
  * Finishes an operation started with ibus_input_context_new_async().
+ *
+ * Returns: A newly allocated #IBusInputContext.
  */
 IBusInputContext *
              ibus_input_context_new_async_finish
@@ -135,10 +137,11 @@ IBusInputContext *
 /**
  * ibus_input_context_get_input_context:
  * @path: The path to the object that emitting the signal.
- * @connection: An #GDBusConnection.
- * @returns: (transfer none): An existing #IBusInputContext.
+ * @connection: A GDBusConnection.
  *
  * Gets an existing IBusInputContext.
+ *
+ * Returns: (transfer none): An existing #IBusInputContext.
  */
 IBusInputContext *
              ibus_input_context_get_input_context
@@ -147,13 +150,13 @@ IBusInputContext *
 /**
  * ibus_input_context_get_input_context_async:
  * @path: The path to the object that emitting the signal.
- * @connection: An #GDBusConnection.
+ * @connection: A #GDBusConnection.
  * @cancellable: A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  *      The callback should not be %NULL.
  * @user_data: The data to pass to callback.
  *
- * Get an existing #IBusInputContext asynchronously.
+ * Gets an existing #IBusInputContext asynchronously.
  */
 void         ibus_input_context_get_input_context_async
                                             (const gchar        *path,
@@ -167,9 +170,11 @@ void         ibus_input_context_get_input_context_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
  *      ibus_input_context_get_input_context_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer none): An existing #IBusInputContext.
  *
- * Finishes an operation started with ibus_input_contex_get_input_context_async().
+ * Finishes an operation started with
+ * ibus_input_context_get_input_context_async().
+ *
+ * Returns: (transfer none): An existing #IBusInputContext.
  */
 IBusInputContext *
              ibus_input_context_get_input_context_async_finish
@@ -256,14 +261,16 @@ void        ibus_input_context_process_key_event_async
 
 /**
  * ibus_input_context_process_key_event_async_finish:
- * @context: An IBusInputContext.
- * @res: A GAsyncResult obtained from the GAsyncReadyCallback passed to
+ * @context: An #IBusInputContext.
+ * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *      ibus_input_context_process_key_event_async().
- * @error: Return location for error or NULL.
- * @returns: %TRUE if the key event is processed;
- *      %FALSE otherwise or some errors happen and the @error will be set.
+ * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with ibus_input_context_process_key_event_async().
+ * Finishes an operation started with
+ *      ibus_input_context_process_key_event_async().
+ *
+ * Returns: %TRUE if the key event is processed;
+ *      %FALSE otherwise or some errors happen and the @error will be set.
  */
 gboolean     ibus_input_context_process_key_event_async_finish
                                             (IBusInputContext   *context,
@@ -272,13 +279,15 @@ gboolean     ibus_input_context_process_key_event_async_finish
 
 /**
  * ibus_input_context_process_key_event:
- * @context: An IBusInputContext.
+ * @context: An #IBusInputContext.
  * @keyval: Key symbol of a key event.
  * @keycode: Keycode of a key event.
  * @state: Key modifier flags.
- * @returns: TRUE for successfully process the key; FALSE otherwise.
  *
- * 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).
+ *
+ * Returns: %TRUE for successfully process the key; %FALSE otherwise.
  *
  * See also: ibus_input_context_process_key_event_async()
  */
@@ -324,7 +333,7 @@ void         ibus_input_context_set_capabilities
 
 /**
  * ibus_input_context_property_activate:
- * @context: An IBusInputContext.
+ * @context: An #IBusInputContext.
  * @prop_name: A property name (e.g. "InputMode.WideLatin")
  * @state: A status of the property (e.g. PROP_STATE_CHECKED)
  *
@@ -339,9 +348,10 @@ void         ibus_input_context_property_activate
 
 /**
  * ibus_input_context_focus_in:
- * @context: An IBusInputContext.
+ * @context: 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_in.
  */
@@ -349,7 +359,7 @@ void         ibus_input_context_focus_in    (IBusInputContext   *context);
 
 /**
  * ibus_input_context_focus_out:
- * @context: An IBusInputContext.
+ * @context: An #IBusInputContext.
  *
  * Invoked when the client application get focus. An asynchronous IPC will be performed.
  *
@@ -360,7 +370,7 @@ void         ibus_input_context_focus_out   (IBusInputContext   *context);
 
 /**
  * ibus_input_context_reset:
- * @context: An IBusInputContext.
+ * @context: An #IBusInputContext.
  *
  * Invoked when the IME is reset. An asynchronous IPC will be performed.
  *
@@ -373,8 +383,8 @@ void         ibus_input_context_reset       (IBusInputContext   *context);
  * @context: An #IBusInputContext.
  * @timeout_msec: The timeout in milliseconds or -1 to use the default timeout.
  * @cancellable: A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL
- *      if you don't care about the result of the method invocation.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or
+ *     %NULL if you don't care about the result of the method invocation.
  * @user_data: The data to pass to callback.
  *
  * An asynchronous IPC will be performed.
@@ -392,9 +402,11 @@ void         ibus_input_context_get_engine_async
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
  *   ibus_input_context_get_engine_async().
  * @error: Return location for error or %NULL.
- * @returns: (transfer none): An IME engine description for the context, or %NULL.
  *
  * Finishes an operation started with ibus_input_context_get_engine_async().
+ *
+ * Returns: (transfer none): An IME engine description for the context, or
+ *     %NULL.
  */
 IBusEngineDesc *
              ibus_input_context_get_engine_async_finish
@@ -404,18 +416,19 @@ IBusEngineDesc *
 
 /**
  * ibus_input_context_get_engine:
- * @context: An IBusInputContext.
- * @returns: (transfer none): An IME engine description for the context, or NULL.
+ * @context: An #IBusInputContext.
  *
- * Returns an IME engine description for the context.
+ * Gets an IME engine description for the context.
  * A synchronous IPC will be performed.
+ *
+ * Returns: (transfer none): An IME engine description for the context, or NULL.
  */
 IBusEngineDesc *
              ibus_input_context_get_engine  (IBusInputContext   *context);
 
 /**
  * ibus_input_context_set_engine:
- * @context: An IBusInputContext.
+ * @context: An #IBusInputContext.
  * @name: A name of the engine.
  *
  * Invoked when the IME engine is changed.
@@ -440,10 +453,11 @@ void         ibus_input_context_set_surrounding_text
 /**
  * ibus_input_context_needs_surrounding_text:
  * @context: An #IBusInputContext.
- * @returns: %TRUE if surrounding-text is needed by the current engine;
- * %FALSE otherwise.
  *
  * Check whether the current engine requires surrounding-text.
+ *
+ * Returns: %TRUE if surrounding-text is needed by the current engine;
+ * %FALSE otherwise.
  */
 gboolean     ibus_input_context_needs_surrounding_text
                                             (IBusInputContext   *context);
diff --git a/src/ibusinternal.h b/src/ibusinternal.h
index 49dc5646e..c2637ab53 100644
--- a/src/ibusinternal.h
+++ b/src/ibusinternal.h
@@ -24,15 +24,6 @@
 #error "Only <ibus.h> can be included directly"
 #endif
 
-/**
- * SECTION: ibusinternal
- * @short_description: IBus internal.
- * @title: IBusInternal
- * @stability: Stable
- *
- * This section contain several IBus house keeping functions.
- *
- */
 #ifndef __IBUS_INTERNEL_H_
 #define __IBUS_INTERNEL_H_
 
diff --git a/src/ibuskeymap.h b/src/ibuskeymap.h
index 2f6627314..7f079ef93 100644
--- a/src/ibuskeymap.h
+++ b/src/ibuskeymap.h
@@ -113,13 +113,14 @@ GType            ibus_keymap_get_type               (void);
 /**
  * ibus_keymap_new:
  * @name: The keymap file to be loaded, such as 'us', 'jp'.
- * @returns: An IBusKeymap associated with the giving name; or NULL if failed.
  *
- * 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.
  *
+ * Returns: An #IBusKeymap associated with the giving name; or %NULL if failed.
+ *
  * Deprecated: This function has been deprecated and should
  * not be used in newly written code. Please use ibus_keymap_get().
  */
@@ -129,13 +130,14 @@ IBusKeymap        *ibus_keymap_new                  (const gchar        *name)
 /**
  * ibus_keymap_get:
  * @name: The keymap file to be loaded, such as 'us', 'jp'.
- * @returns: (transfer full): An IBusKeymap associated with the giving name;
- * or %NULL if failed.
  *
  * Get an IBusKeymap associated with the giving name.
  *
  * This function loads the keymap file specified in @name
  * in the IBUS_DATA_DIR/keymaps directory.
+ *
+ * Returns: (transfer full): An #IBusKeymap associated with the giving name;
+ * or %NULL if failed.
  */
 IBusKeymap        *ibus_keymap_get                  (const gchar        *name);
 
@@ -144,9 +146,10 @@ IBusKeymap        *ibus_keymap_get                  (const gchar        *name);
  * @keymap: An IBusKeymap.
  * @keycode: A scancode to be converted.
  * @state: Modifier flags(such as Ctrl, Shift).
- * @returns: Corresponding keysym.
  *
- * Convert the scancode to keysym, given the keymap.
+ * Converts the scancode to keysym, given the keymap.
+ *
+ * Returns: Corresponding keysym.
  */
 guint              ibus_keymap_lookup_keysym        (IBusKeymap         *keymap,
                                                      guint16             keycode,
diff --git a/src/ibuskeys.h b/src/ibuskeys.h
index 6ad0a903e..74c23a68a 100644
--- a/src/ibuskeys.h
+++ b/src/ibuskeys.h
@@ -33,20 +33,22 @@ G_BEGIN_DECLS
 /**
  * ibus_keyval_name:
  * @keyval: Key symbol.
- * @returns: Corresponding key name. %NULL if no such key symbol.
  *
  * Return the name of a key symbol.
  *
  * Note that the returned string is used internally, so don't free it.
+ *
+ * Returns: Corresponding key name. %NULL if no such key symbol.
  */
 const gchar     *ibus_keyval_name       (guint           keyval);
 
 /**
  * ibus_keyval_from_name:
  * @keyval_name: Key name in #gdk_keys_by_name.
- * @returns: Corresponding key symbol.
  *
  * Return the key symbol that associate with the key name.
+ *
+ * Returns: Corresponding key symbol.
  */
 guint            ibus_keyval_from_name  (const gchar    *keyval_name);
 
@@ -56,9 +58,9 @@ guint            ibus_keyval_from_name  (const gchar    *keyval_name);
  * 
  * 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
+ * Returns: the corresponding IBus key symbol, if one exists.
+ *          or, if there is no corresponding symbol,
+ *          wc | 0x01000000
  **/
 guint            ibus_unicode_to_keyval (gunichar        wc);
 
@@ -69,8 +71,8 @@ guint            ibus_unicode_to_keyval (gunichar        wc);
  * 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.
+ * Returns: the corresponding unicode character, or 0 if there
+ *          is no corresponding character.
  **/
 gunichar         ibus_keyval_to_unicode (guint           keyval);
 
@@ -103,7 +105,7 @@ guint            ibus_keyval_to_lower (guint keyval);
  * @upper: (out): return location for uppercase version of @symbol
  *
  * Obtains the upper- and lower-case versions of the keyval @symbol.
- * Examples of keyvals are #IBUS_KEY_a, #IBUS_KEY_Enter, #IBUS_KEY_F1, etc.
+ * Examples of keyvals are #IBUS_KEY_a, #IBUS_KEY_Return, #IBUS_KEY_F1, etc.
  */
 void ibus_keyval_convert_case (guint symbol, guint *lower, guint *upper);
 
diff --git a/src/ibuslookuptable.h b/src/ibuslookuptable.h
index 77124360a..843e2e21b 100644
--- a/src/ibuslookuptable.h
+++ b/src/ibuslookuptable.h
@@ -111,9 +111,10 @@ GType                ibus_lookup_table_get_type (void);
  * @cursor_pos: position index of cursor.
  * @cursor_visible: whether the cursor is visible.
  * @round: TRUE for lookup table wrap around.
- * @returns: A newly allocated IBusLookupTable.
  *
- * New a IBusLookupTable.
+ * Craetes a new #IBusLookupTable.
+ *
+ * Returns: A newly allocated #IBusLookupTable.
  */
 IBusLookupTable     *ibus_lookup_table_new      (guint               page_size,
                                                  guint               cursor_pos,
@@ -134,9 +135,10 @@ void                 ibus_lookup_table_append_candidate
 /**
  * ibus_lookup_table_get_number_of_candidates:
  * @table: An IBusLookupTable.
- * @returns: The number of candidates in the table
  *
  * Return the number of candidate in the table.
+ *
+ * Returns: The number of candidates in the table
  */
 guint               ibus_lookup_table_get_number_of_candidates
                                                 (IBusLookupTable    *table);
@@ -145,9 +147,11 @@ guint               ibus_lookup_table_get_number_of_candidates
  * ibus_lookup_table_get_candidate:
  * @table: An IBusLookupTable.
  * @index: Index in the Lookup table.
- * @returns: (transfer none): IBusText at the given index; NULL if no such IBusText.
  *
- * Return IBusText at the given index. Borrowed reference.
+ * Return #IBusText at the given index. Borrowed reference.
+ *
+ * Returns: (transfer none): IBusText at the given index; NULL if no such
+ *         #IBusText.
  */
 IBusText            *ibus_lookup_table_get_candidate
                                                 (IBusLookupTable    *table,
@@ -185,9 +189,11 @@ void                 ibus_lookup_table_set_label
  * ibus_lookup_table_get_label:
  * @table: An IBusLookupTable.
  * @index: Index in the Lookup table.
- * @returns: (transfer none): IBusText at the given index; NULL if no such IBusText.
  *
- * Return IBusText at the given index. Borrowed reference.
+ * Return #IBusText at the given index. Borrowed reference.
+ *
+ * Returns: (transfer none): #IBusText at the given index; %NULL if no such
+ *         #IBusText.
  */
 IBusText            *ibus_lookup_table_get_label
                                                 (IBusLookupTable    *table,
@@ -208,9 +214,10 @@ void                 ibus_lookup_table_set_cursor_pos
 /**
  * ibus_lookup_table_get_cursor_pos:
  * @table: An IBusLookupTable.
- * @returns: The position of cursor.
  *
- * Get the cursor position of IBusLookupTable.
+ * Gets the cursor position of #IBusLookupTable.
+ *
+ * Returns: The position of cursor.
  */
 guint                ibus_lookup_table_get_cursor_pos
                                                 (IBusLookupTable    *table);
@@ -228,10 +235,11 @@ void                 ibus_lookup_table_set_cursor_visible
 
 /**
  * ibus_lookup_table_is_cursor_visible:
- * @table: An IBusLookupTable.
- * @returns: Whether the cursor of @table is visible.
+ * @table: An #IBusLookupTable.
  *
- * Returns whether the cursor of an IBusLookupTable is visible.
+ * Returns whether the cursor of an #IBusLookupTable is visible.
+ *
+ * Returns: Whether the cursor of @table is visible.
  */
 gboolean             ibus_lookup_table_is_cursor_visible
                                                 (IBusLookupTable    *table);
@@ -239,9 +247,10 @@ gboolean             ibus_lookup_table_is_cursor_visible
 /**
  * ibus_lookup_table_get_cursor_in_page:
  * @table: An IBusLookupTable.
- * @returns: The position of cursor in current page.
  *
- * Get the cursor position in current page of IBusLookupTable.
+ * Gets the cursor position in current page of #IBusLookupTable.
+ *
+ * Returns: The position of cursor in current page.
  */
 guint                ibus_lookup_table_get_cursor_in_page
                                                 (IBusLookupTable    *table);
@@ -259,9 +268,11 @@ void                 ibus_lookup_table_set_page_size
 /**
  * ibus_lookup_table_get_page_size:
  * @table: An IBusLookupTable.
- * @returns: Page size, i.e., number of candidate shown per page.
  *
- * Get the number of candidate shown per page.
+ * Gets the number of candidate shown per page.
+ *
+ * Returns: Page size, i.e., number of candidate shown per page.
+dd
  */
 guint                ibus_lookup_table_get_page_size
                                                 (IBusLookupTable    *table);
@@ -279,9 +290,10 @@ void                 ibus_lookup_table_set_round
 /**
  * ibus_lookup_table_is_round:
  * @table: An IBusLookupTable.
- * @returns: Whether the @table is round.
  *
- * Returns whether the IBusLookupTable is round.
+ * Returns whether the #IBusLookupTable is round.
+ *
+ * Returns: Whether the @table is round.
  */
 gboolean             ibus_lookup_table_is_round (IBusLookupTable    *table);
 
@@ -299,9 +311,10 @@ void                 ibus_lookup_table_set_orientation
 /**
  * ibus_lookup_table_get_orientation:
  * @table: An IBusLookupTable.
- * @returns: The orientation of the @table.
  *
- * Returns the orientation of the IBusLookupTable.
+ * Returns the orientation of the #IBusLookupTable.
+ *
+ * Returns: The orientation of the @table.
  */
 gint                 ibus_lookup_table_get_orientation
                                                 (IBusLookupTable    *table);
@@ -318,52 +331,56 @@ void                 ibus_lookup_table_clear    (IBusLookupTable    *table);
 /**
  * ibus_lookup_table_page_up:
  * @table: An IBusLookupTable.
- * @returns: TRUE if succeed.
  *
- * 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.
+ *
+ * Returns: %TRUE if succeed.
  */
 gboolean             ibus_lookup_table_page_up  (IBusLookupTable    *table);
 
 /**
  * ibus_lookup_table_page_down:
  * @table: An IBusLookupTable.
- * @returns: TRUE if succeed.
  *
- * 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.
+ *
+ * Returns: %TRUE if succeed.
  */
 gboolean             ibus_lookup_table_page_down(IBusLookupTable    *table);
 
 /**
  * ibus_lookup_table_cursor_up:
  * @table: An IBusLookupTable.
- * @returns: TRUE if succeed.
  *
- * 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.
+ *
+ * Returns: %TRUE if succeed.
  */
 gboolean             ibus_lookup_table_cursor_up(IBusLookupTable    *table);
 
 /**
  * ibus_lookup_table_cursor_down:
  * @table: An IBusLookupTable.
- * @returns: TRUE if succeed.
  *
- * 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.
+ *
+ * Returns: %TRUE if succeed.
  */
 gboolean             ibus_lookup_table_cursor_down
                                                 (IBusLookupTable    *table);
diff --git a/src/ibusobject.h b/src/ibusobject.h
index cfc27b1f6..a8b21a8a9 100644
--- a/src/ibusobject.h
+++ b/src/ibusobject.h
@@ -58,6 +58,15 @@
 #define IBUS_OBJECT_GET_CLASS(obj)   \
     (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_OBJECT, IBusObjectClass))
 
+/**
+ * IBusObjectFlags:
+ * @IBUS_IN_DESTRUCTION: Used in GObjectClass::dispose
+ * @IBUS_DESTROYED: Used during emitting IBusObject::destroy signal.
+ * @IBUS_RESERVED_1: Reserved.
+ * @IBUS_RESERVED_2: Reserved.
+ *
+ * The flags are used internally.
+ */
 typedef enum {
     IBUS_IN_DESTRUCTION = (1 << 0),
     IBUS_DESTROYED      = (1 << 1),
@@ -108,9 +117,10 @@ GType           ibus_object_get_type            (void);
 
 /**
  * ibus_object_new:
- * @returns: A newly allocated IBusObject
  *
- * New an IBusObject.
+ * Creates  a new #IBusObject.
+ *
+ * Returns: A newly allocated #IBusObject
  */
 IBusObject     *ibus_object_new                 (void);
 
diff --git a/src/ibusobservedpath.h b/src/ibusobservedpath.h
index 8c8d18c38..3715380b6 100644
--- a/src/ibusobservedpath.h
+++ b/src/ibusobservedpath.h
@@ -95,9 +95,10 @@ GType                ibus_observed_path_get_type            (void);
  * ibus_observed_path_new_from_xml_node:
  * @node: An XML node that contain path.
  * @fill_stat: Auto-fill the path status.
- * @returns: A newly allocated IBusObservedPath.
  *
- * New an IBusObservedPath from an XML node.
+ * Creates an new #IBusObservedPath from an XML node.
+ *
+ * Returns: A newly allocated #IBusObservedPath.
  */
 IBusObservedPath    *ibus_observed_path_new_from_xml_node   (XMLNode            *node,
                                                              gboolean            fill_stat);
@@ -106,9 +107,10 @@ IBusObservedPath    *ibus_observed_path_new_from_xml_node   (XMLNode
  * ibus_observed_path_new:
  * @path: The path string.
  * @fill_stat: Auto-fill the path status.
- * @returns: A newly allocated IBusObservedPath.
  *
- * New an IBusObservedPath from an XML node.
+ * Creates a new #IBusObservedPath from an XML node.
+ *
+ * Returns: A newly allocated #IBusObservedPath.
  */
 IBusObservedPath    *ibus_observed_path_new                 (const gchar        *path,
                                                              gboolean            fill_stat);
@@ -117,12 +119,13 @@ IBusObservedPath    *ibus_observed_path_new                 (const gchar
  * ibus_observed_path_traverse:
  * @path: An IBusObservedPath.
  * @dir_only: Only looks for subdirs, not files
- * @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
  * GLists, if the @path is a directory. Otherwise returns NULL.
+ *
+ * Returns: (transfer full) (element-type IBusObservedPath): A newly allocate
+ * GList which holds content in path; NULL if @path is not directory.
  */
 GList               *ibus_observed_path_traverse            (IBusObservedPath   *path,
                                                              gboolean            dir_only);
@@ -130,10 +133,11 @@ GList               *ibus_observed_path_traverse            (IBusObservedPath
 /**
  * ibus_observed_path_check_modification:
  * @path: An IBusObservedPath.
- * @returns: TRUE if mtime is changed; FALSE otherwise.
  *
- * 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.
+ * 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.
  */
 gboolean             ibus_observed_path_check_modification  (IBusObservedPath   *path);
 
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 3a8040320..27b765587 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -281,8 +281,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @cursor_pos: The cursor position of the text.
      * @visible: Whether the update is visible.
      *
-     * Emitted when the client application get the update-preedit-text.
-     * Implement the member function update_preedit_text() in extended class
+     * Emitted when the client application get the ::update-preedit-text.
+     * Implement the member function
+     * IBusPanelServiceClass::update_preedit_text in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -307,8 +308,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @text: A preedit text to be updated.
      * @visible: Whether the update is visible.
      *
-     * Emitted when the client application get the update-auxiliary-text.
-     * Implement the member function update_auxiliary_text() in extended class
+     * Emitted when the client application get the ::update-auxiliary-text.
+     * Implement the member function
+     * IBusPanelServiceClass::update_auxiliary_text in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -332,8 +334,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @lookup_table: A lookup table to be updated.
      * @visible: Whether the update is visible.
      *
-     * Emitted when the client application get the update-lookup-table.
-     * Implement the member function update_lookup_table() in extended class
+     * Emitted when the client application get the ::update-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::update_lookup_table in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -356,8 +359,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
-     * Emitted when the client application get the focus-in.
-     * Implement the member function focus_in() in extended class to receive
+     * Emitted when the client application get the ::focus-in.
+     * Implement the member function
+     * IBusPanelServiceClass::focus_in in extended class to receive
      * this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -379,8 +383,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
-     * Emitted when the client application get the focus-out.
-     * Implement the member function focus_out() in extended class to receive
+     * Emitted when the client application get the ::focus-out.
+     * Implement the member function
+     * IBusPanelServiceClass::focus_out in extended class to receive
      * this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -402,8 +407,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @panel: An #IBusPanelService
      * @prop_list: An IBusPropList that contains properties.
      *
-     * Emitted when the client application get the register-properties.
-     * Implement the member function register_properties() in extended class
+     * Emitted when the client application get the ::register-properties.
+     * Implement the member function
+     * IBusPanelServiceClass::register_properties in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -425,8 +431,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @panel: An #IBusPanelService
      * @prop: The IBusProperty to be updated.
      *
-     * Emitted when the client application get the update-property.
-     * Implement the member function update_property() in extended class to
+     * Emitted when the client application get the ::update-property.
+     * Implement the member function
+     * IBusPanelServiceClass::update_property in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -451,8 +458,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @w: Width of the cursor.
      * @h: Height of the cursor.
      *
-     * Emitted when the client application get the set-cursor-location.
-     * Implement the member function set_cursor_location() in extended class
+     * Emitted when the client application get the ::set-cursor-location.
+     * Implement the member function
+     * IBusPanelServiceClass::set_cursor_location in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -476,8 +484,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::cursor-up-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::cursor_up_lookup_table in extended
      * class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -496,8 +505,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::cursor-down-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::cursor_down_lookup_table in extended
      * class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -516,8 +526,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::hide-auxiliary-text.
+     * Implement the member function
+     * IBusPanelServiceClass::hide_auxiliary_text in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -536,8 +547,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::hide-language-bar.
+     * Implement the member function
+     * IBusPanelServiceClass::hide_language_bar in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -556,8 +568,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::hide-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::hide_lookup_table in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -576,8 +589,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::hide-preedit-text.
+     * Implement the member function
+     * IBusPanelServiceClass::hide_preedit_text in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -596,8 +610,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::page-up-lookup-table.
+     * Implement the member function 
+     * IBusPanelServiceClass::page_up_lookup_table in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -616,8 +631,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::page-down-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::page_down_lookup_table in extended
      * class to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -636,8 +652,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * IBusPanelService::reset:
      * @panel: An #IBusPanelService
      *
-     * Emitted when the client application get the reset.
-     * Implement the member function reset() in extended class to receive this
+     * Emitted when the client application get the ::reset.
+     * Implement the member function
+     * IBusPanelServiceClass::reset in extended class to receive this
      * signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -656,8 +673,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::show-auxiliary-text.
+     * Implement the member function
+     * IBusPanelServiceClass::show_auxiliary_text in extended class
      * to receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -676,8 +694,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::show-language-bar.
+     * Implement the member function
+     * IBusPanelServiceClass::show_language_bar in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -696,8 +715,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::show-lookup-table.
+     * Implement the member function
+     * IBusPanelServiceClass::show_lookup_table in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -716,8 +736,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::show-preedit-text.
+     * Implement the member function
+     * IBusPanelServiceClass::show_preedit_text in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -736,8 +757,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::start-setup.
+     * Implement the member function
+     * IBusPanelServiceClass::start_setup in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -756,8 +778,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * 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
+     * Emitted when the client application get the ::state-changed.
+     * Implement the member function
+     * IBusPanelServiceClass::state_changed in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -778,7 +801,8 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application destroys.
-     * Implement the member function destroy_context() in extended class to
+     * Implement the member function
+     * IBusPanelServiceClass::destroy_context in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
@@ -801,8 +825,9 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
      * @purpose: Input purpose.
      * @hints: Input hints.
      *
-     * Emitted when the client application get the set-content-type.
-     * Implement the member function set_content_type() in extended class to
+     * Emitted when the client application get the ::set-content-type.
+     * Implement the member function
+     * IBusPanelServiceClass::set_content_type in extended class to
      * receive this signal.
      *
      * <note><para>Argument @user_data is ignored in this function.</para>
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index 0399a2f3f..c3f1833ca 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -132,9 +132,10 @@ GType            ibus_panel_service_get_type  (void);
 /**
  * ibus_panel_service_new:
  * @connection: An GDBusConnection.
- * @returns: A newly allocated IBusPanelService.
  *
- * New an IBusPanelService from an GDBusConnection.
+ * Creates a new #IBusPanelService from an #GDBusConnection.
+ *
+ * Returns: A newly allocated #IBusPanelService.
  */
 IBusPanelService *ibus_panel_service_new (GDBusConnection    *connection);
 
diff --git a/src/ibusproperty.h b/src/ibusproperty.h
index 0dee88040..45bab1087 100644
--- a/src/ibusproperty.h
+++ b/src/ibusproperty.h
@@ -124,18 +124,6 @@ typedef struct _IBusPropListClass IBusPropListClass;
 
 /**
  * IBusProperty:
- * key: Unique Identity for the IBusProperty.
- * icon: Icon file for the IBusProperty.
- * label: Text shown in UI.
- * symbol: A symbol char showned on a button or status icon for IBusProperty.
- * tooltip: Message shown if mouse hovered the  IBusProperty.
- * sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
- * visible: Whether the IBusProperty is visible.
- * type: IBusPropType of IBusProperty.
- * state: IBusPropState of IBusProperty.
- * sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
- * shown as sub menu item.
- *
  * UI component for input method engine property.
  */
 struct _IBusProperty {
@@ -163,9 +151,10 @@ GType            ibus_property_get_type     ();
  * @visible: Whether the #IBusProperty is visible.
  * @state: IBusPropState of #IBusProperty.
  * @prop_list: (allow-none): #IBusPropList that contains sub IBusProperties.
- * @returns: A newly allocated #IBusProperty.
  *
- * New a #IBusProperty.
+ * Creates a new #IBusProperty.
+ *
+ * Returns: A newly allocated #IBusProperty.
  */
 IBusProperty    *ibus_property_new          (const gchar    *key,
                                              IBusPropType    type,
@@ -180,12 +169,14 @@ IBusProperty    *ibus_property_new          (const gchar    *key,
 /**
  * ibus_property_new_varargs:
  * @first_property_name: Name of the first property.
- * @Varargs: the NULL-terminated arguments of the properties and values.
+ * @...: the NULL-terminated arguments of the properties and values.
  *
- * New a #IBusProperty.
+ * Creates a new #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)
+ *
+ * Returns: A newly allocated #IBusProperty.
  */
 IBusProperty    *ibus_property_new_varargs  (const gchar    *first_property_name,
                                                              ...);
@@ -193,18 +184,20 @@ IBusProperty    *ibus_property_new_varargs  (const gchar    *first_property_name
 /**
  * ibus_property_get_key:
  * @prop: An #IBusProperty.
- * @returns: the key of #IBusProperty. Should not be freed.
  *
  * Get the key of #IBusProperty.
+ *
+ * Returns: the key of #IBusProperty. Should not be freed.
  */
 const gchar *    ibus_property_get_key      (IBusProperty   *prop);
 
 /**
  * ibus_property_get_label:
  * @prop: An #IBusProperty.
- * @returns: (transfer none): the label of #IBusProperty. Should not be freed.
  *
  * Get the label of #IBusProperty.
+ *
+ * Returns: (transfer none): the label of #IBusProperty. Should not be freed.
  */
 IBusText *       ibus_property_get_label    (IBusProperty   *prop);
 
@@ -221,9 +214,10 @@ void             ibus_property_set_label    (IBusProperty   *prop,
 /**
  * ibus_property_get_symbol:
  * @prop: An #IBusProperty.
- * @returns: (transfer none): the symbol of #IBusProperty. Should not be freed.
  *
  * Get the symbol of #IBusProperty.
+ *
+ * Returns: (transfer none): the symbol of #IBusProperty. Should not be freed.
  */
 IBusText *       ibus_property_get_symbol   (IBusProperty   *prop);
 
@@ -240,9 +234,10 @@ void             ibus_property_set_symbol   (IBusProperty   *prop,
 /**
  * ibus_property_get_icon:
  * @prop: An #IBusProperty.
- * @returns: the icon of #IBusProperty. Should not be freed.
  *
  * Get the icon of #IBusProperty.
+ *
+ * Returns: the icon of #IBusProperty. Should not be freed.
  */
 const gchar *    ibus_property_get_icon     (IBusProperty   *prop);
 
@@ -259,9 +254,10 @@ void             ibus_property_set_icon     (IBusProperty   *prop,
 /**
  * ibus_property_get_tooltip:
  * @prop: An #IBusProperty.
- * @returns: (transfer none): the tooltip of #IBusProperty. Should not be freed.
  *
  * Get the tooltip of #IBusProperty.
+ *
+ * Returns: (transfer none): the tooltip of #IBusProperty. Should not be freed.
  */
 IBusText *       ibus_property_get_tooltip  (IBusProperty   *prop);
 
@@ -278,9 +274,10 @@ void             ibus_property_set_tooltip  (IBusProperty   *prop,
 /**
  * ibus_property_get_sensitive:
  * @prop: An #IBusProperty.
- * @returns: the sensitive of #IBusProperty.
  *
  * Get the sensitive of #IBusProperty.
+ *
+ * Returns: the sensitive of #IBusProperty.
  */
 gboolean         ibus_property_get_sensitive(IBusProperty   *prop);
 
@@ -297,9 +294,10 @@ void             ibus_property_set_sensitive(IBusProperty   *prop,
 /**
  * ibus_property_get_visible:
  * @prop: An #IBusProperty.
- * @returns: the visible of #IBusProperty.
  *
  * Get the visible of #IBusProperty.
+ *
+ * Returns: the visible of #IBusProperty.
  */
 gboolean         ibus_property_get_visible  (IBusProperty   *prop);
 
@@ -316,18 +314,20 @@ void             ibus_property_set_visible  (IBusProperty   *prop,
 /**
  * ibus_property_get_property_type:
  * @prop: An #IBusProperty.
- * @returns: the type of #IBusProperty.
  *
  * Get the type of #IBusProperty.
+ *
+ * Returns: the type of #IBusProperty.
  */
 IBusPropType     ibus_property_get_prop_type(IBusProperty   *prop);
 
 /**
  * ibus_property_get_state:
  * @prop: An #IBusProperty.
- * @returns: the state of #IBusProperty.
  *
  * Get the state of #IBusProperty.
+ *
+ * Returns: the state of #IBusProperty.
  */
 IBusPropState    ibus_property_get_state    (IBusProperty   *prop);
 
@@ -344,10 +344,11 @@ void             ibus_property_set_state    (IBusProperty   *prop,
 /**
  * ibus_property_get_sub_props:
  * @prop: An #IBusProperty.
- * @returns: (transfer none): the IBusPropList of #IBusProperty.
- *     Should not be freed.
  *
  * Get the IBusPropList of #IBusProperty.
+ *
+ * Returns: (transfer none): the IBusPropList of #IBusProperty.
+ *     Should not be freed.
  */
 IBusPropList *   ibus_property_get_sub_props(IBusProperty   *prop);
 
@@ -365,11 +366,12 @@ void             ibus_property_set_sub_props(IBusProperty   *prop,
  * ibus_property_update:
  * @prop: An #IBusProperty.
  * @prop_update: #IBusPropList that contains sub IBusProperties.
- * @returns: TRUE for update suceeded; FALSE otherwise.
  *
  * Update the content of an #IBusProperty.
  * #IBusProperty @prop_update can either be sub-property of @prop,
  * or holds new values for @prop.
+ *
+ * Returns: TRUE for update suceeded; FALSE otherwise.
  */
 
 gboolean         ibus_property_update       (IBusProperty   *prop,
diff --git a/src/ibusproplist.h b/src/ibusproplist.h
index a8dbda231..dce60879f 100644
--- a/src/ibusproplist.h
+++ b/src/ibusproplist.h
@@ -59,6 +59,19 @@ G_BEGIN_DECLS
 #define IBUS_PROP_LIST_GET_CLASS(obj)   \
     (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_PROP_LIST, IBusPropListClass))
 
+/* FIXME: https://mail.gnome.org/archives/gtk-doc-list/2015-July/msg00004.html
+ * If ibusproperty.h and ibusproplist.h includes each other,
+ * gtk-doc build outputs several warnings:
+ *
+ * # cd html && gtkdoc-mkhtml ibus ../ibus-docs.sgml
+ * ../ibus-docs.sgml:4: element refentry: validity error : ID IBusPropList
+ * already defined
+ * ../ibus-docs.sgml:172: element refsect2: validity error : ID
+ * IBusPropListClass already defined
+ * Warning: multiple "IDs" for constraint linkend: IBusPropList.
+ * Warning: multiple "IDs" for constraint linkend: IBusPropList.
+ * Warning: multiple "IDs" for constraint linkend: IBusPropListClass.
+ */
 #ifndef __PROPLIST_DEFINED
 #define __PROPLIST_DEFINED
 typedef struct _IBusPropList IBusPropList;
@@ -78,6 +91,12 @@ struct _IBusPropList {
     GArray *properties;
 };
 
+/**
+ * IBusPropListClass:
+ * @parent: The parent class.
+ *
+ * Class structure for #IBusPropList.
+ */
 struct _IBusPropListClass {
     IBusSerializableClass parent;
 };
@@ -86,9 +105,10 @@ GType            ibus_prop_list_get_type    ();
 
 /**
  * ibus_prop_list_new:
- * @returns: A newly allocated IBusPropList.
  *
- * New a IBusPropList.
+ * Create a new #IBusPropList.
+ *
+ * Returns: A newly allocated #IBusPropList.
  */
 IBusPropList    *ibus_prop_list_new         ();
 
@@ -106,9 +126,11 @@ void             ibus_prop_list_append      (IBusPropList   *prop_list,
  * ibus_prop_list_get:
  * @prop_list: An IBusPropList.
  * @index: Index of an IBusPropList.
- * @returns: (transfer none): IBusProperty at given index, NULL if no such IBusProperty.
  *
- * Returns IBusProperty at given index. Borrowed reference.
+ * Gets #IBusProperty at given index. Borrowed reference.
+ *
+ * Returns: (transfer none): #IBusProperty at given index, %NULL if no such
+ *     #IBusProperty.
  */
 IBusProperty    *ibus_prop_list_get         (IBusPropList   *prop_list,
                                              guint           index);
@@ -117,9 +139,10 @@ IBusProperty    *ibus_prop_list_get         (IBusPropList   *prop_list,
  * ibus_prop_list_update_property:
  * @prop_list: An IBusPropList.
  * @prop: IBusProperty to be update.
- * @returns: TRUE if succeeded, FALSE otherwise.
  *
  * Update an IBusProperty in IBusPropList.
+ *
+ * Returns: %TRUE if succeeded, %FALSE otherwise.
  */
 gboolean         ibus_prop_list_update_property
                                             (IBusPropList   *prop_list,
diff --git a/src/ibusproxy.h b/src/ibusproxy.h
index a2b52f56c..7365863bb 100644
--- a/src/ibusproxy.h
+++ b/src/ibusproxy.h
@@ -99,12 +99,15 @@ GType   ibus_proxy_get_type (void);
 
 /**
  * ibus_proxy_destroy:
+ * @proxy: An #IBusProxy
  *
- * 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
- * destroy signal, you might have to call something like 'g_object_unref(the_proxy);'.
+ * 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 destroy signal, you might have to call something
+ * like 'g_object_unref(the_proxy);'.
  */
 void    ibus_proxy_destroy  (IBusProxy      *proxy);
 
diff --git a/src/ibusregistry.h b/src/ibusregistry.h
index 9522f1a86..6a540cc4d 100644
--- a/src/ibusregistry.h
+++ b/src/ibusregistry.h
@@ -88,9 +88,10 @@ GType            ibus_registry_get_type         (void);
 
 /**
  * ibus_registry_new:
- * @returns: A newly allocated #IBusRegistry.
  *
- * New a #IBusRegistry
+ * Creates a new #IBusRegistry
+ *
+ * Returns: A newly allocated #IBusRegistry.
  */
 IBusRegistry    *ibus_registry_new              (void);
 
@@ -122,10 +123,11 @@ void             ibus_registry_load_in_dir      (IBusRegistry   *registry,
  * ibus_registry_load_cache:
  * @registry: An #IBusRegistry.
  * @is_user: %TRUE if the registry cache is loaded in the user directory.
- * @returns: %TRUE if the cache exists and is loaded successfully,
- *           %FALSE otherwise.
  *
  * Load the user or system registry cache.
+ *
+ * Returns: %TRUE if the cache exists and is loaded successfully,
+ *           %FALSE otherwise.
  */
 gboolean         ibus_registry_load_cache       (IBusRegistry   *registry,
                                                  gboolean        is_user);
@@ -134,10 +136,11 @@ gboolean         ibus_registry_load_cache       (IBusRegistry   *registry,
  * ibus_registry_load_cache_file:
  * @registry: An #IBusRegistry.
  * @filename: The file path of the registry cache
- * @returns: %TRUE if the cache exists and is loaded successfully,
- *           %FALSE otherwise.
  *
  * Load the registry cache @filename.
+ *
+ * Returns: %TRUE if the cache exists and is loaded successfully,
+ *           %FALSE otherwise.
  */
 gboolean         ibus_registry_load_cache_file  (IBusRegistry   *registry,
                                                  const gchar    *filename);
@@ -146,9 +149,10 @@ gboolean         ibus_registry_load_cache_file  (IBusRegistry   *registry,
  * ibus_registry_save_cache:
  * @registry: An #IBusRegistry.
  * @is_user: %TRUE if the registry cache is saved in the user directory.
- * @returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
  *
  * Save the registry in a user directory or system directory.
+ *
+ * Returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
  */
 gboolean         ibus_registry_save_cache       (IBusRegistry   *registry,
                                                  gboolean        is_user);
@@ -157,9 +161,10 @@ gboolean         ibus_registry_save_cache       (IBusRegistry   *registry,
  * ibus_registry_save_cache_file:
  * @registry: An #IBusRegistry.
  * @filename: The file path of the registry cache
- * @returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
  *
  * Save the registry cache @filename.
+ *
+ * Returns: %TRUE if the cache is saved successfully, %FALSE otherwise.
  */
 gboolean         ibus_registry_save_cache_file  (IBusRegistry   *registry,
                                                  const gchar    *filename);
@@ -180,9 +185,10 @@ void             ibus_registry_output           (IBusRegistry   *registry,
 /**
  * ibus_registry_check_modification:
  * @registry: An #IBusRegistry.
- * @returns: %TRUE if mtime is changed; %FALSE otherwise.
  *
  * Check if the registry is updated.
+ *
+ * Returns: %TRUE if mtime is changed; %FALSE otherwise.
  */
 gboolean         ibus_registry_check_modification
                                                 (IBusRegistry   *registry);
@@ -190,22 +196,24 @@ gboolean         ibus_registry_check_modification
 /**
  * ibus_registry_get_components:
  * @registry: An #IBusRegistry.
- * @returns: (transfer container) (element-type IBusComponent):
- * a list of #IBusComponent objects.
- * The caller has to call g_list_free() for the returned list.
  *
  * List components.
+ *
+ * Returns: (transfer container) (element-type IBusComponent):
+ * a list of #IBusComponent objects.
+ * The caller has to call g_list_free() for the returned list.
  */
 GList           *ibus_registry_get_components   (IBusRegistry   *registry);
 
 /**
  * ibus_registry_get_observed_paths:
  * @registry: An #IBusRegistry.
- * @returns: (transfer container) (element-type IBusObservedPath):
- * a list of #IBusObservedPath objects.
- * The caller has to call g_list_free() for the returned list.
  *
  * List observed paths.
+ *
+ * Returns: (transfer container) (element-type IBusObservedPath):
+ * a list of #IBusObservedPath objects.
+ * The caller has to call g_list_free() for the returned list.
  */
 GList           *ibus_registry_get_observed_paths
                                                 (IBusRegistry   *registry);
diff --git a/src/ibusserializable.h b/src/ibusserializable.h
index d12c47be1..4327eaeef 100644
--- a/src/ibusserializable.h
+++ b/src/ibusserializable.h
@@ -129,12 +129,13 @@ struct _IBusSerializable {
  * IBusSerializableSerializeFunc:
  * @serializable: An #IBusSerializable.
  * @builder: A #GVariantBuilder.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * 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.
+ *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
  */
 typedef gboolean    (* IBusSerializableSerializeFunc)   (IBusSerializable       *serializable,
                                                          GVariantBuilder        *builder);
@@ -143,12 +144,13 @@ typedef gboolean    (* IBusSerializableSerializeFunc)   (IBusSerializable
  * IBusSerializableDeserializeFunc:
  * @serializable: An #IBusSerializable.
  * @variant: A #GVariant contains a tuple.
- * @returns: The number of values in the variant(tuple) are consumed.
  *
  * 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.
+ *
+ * Returns: The number of values in the variant(tuple) are consumed.
  */
 typedef gint        (* IBusSerializableDeserializeFunc) (IBusSerializable       *serializable,
                                                          GVariant               *variant);
@@ -157,11 +159,12 @@ typedef gint        (* IBusSerializableDeserializeFunc) (IBusSerializable
  * IBusSerializableCopyFunc:
  * @dest: The destination #IBusSerializable.
  * @src: A source #IBusSerializable.
- * @returns: %TRUE if succeed; %FALSE otherwise.
  *
  * 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.
+ *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
  */
 typedef gboolean    (* IBusSerializableCopyFunc)        (IBusSerializable       *dest,
                                                          const IBusSerializable *src);
@@ -211,9 +214,11 @@ void                 ibus_serializable_set_qattachment  (IBusSerializable   *ser
  * ibus_serializable_get_qattachment:
  * @serializable: An #IBusSerializable.
  * @key: String formatted key for indexing value.
- * @returns: The attached value; or %NULL if fail to retrieve the value.
  *
- * Get a value from attachment of an #IBusSerializable.
+ * Gets a value from attachment of an #IBusSerializable.
+ *
+ * Returns: The attached value; or %NULL if fail to retrieve the value.
+ *
  * See also: ibus_serializable_set_attachment().
  */
 GVariant            *ibus_serializable_get_qattachment  (IBusSerializable   *serializable,
@@ -234,12 +239,13 @@ void                 ibus_serializable_remove_qattachment
 /**
  * ibus_serializable_copy:
  * @serializable: An #IBusSerializable.
- * @returns: (transfer none): A newly allocated clone object; or %NULL
- *     if @object is not serializable.
  *
  * Clone an #IBusSerializable.
  * The copy method should be implemented in extended class.
  *
+ * Returns: (transfer none): A newly allocated clone object; or %NULL
+ *     if @object is not serializable.
+ *
  * See also: IBusSerializableCopyFunc().
  */
 IBusSerializable    *ibus_serializable_copy             (IBusSerializable   *serializable);
@@ -247,11 +253,12 @@ IBusSerializable    *ibus_serializable_copy             (IBusSerializable   *ser
 /**
  * ibus_serializable_serialize:
  * @serializable: An #IBusSerializable.
- * @returns: A #GVariant.
  *
  * Serialize an #IBusSerializable to a #GVariant.
  * The serialize method should be implemented in extended class.
  *
+ * Returns: A #GVariant.
+ *
  * See also: IBusSerializableCopyFunc().
  */
 GVariant            *ibus_serializable_serialize        (IBusSerializable   *serializable);
@@ -259,11 +266,12 @@ GVariant            *ibus_serializable_serialize        (IBusSerializable   *ser
 /**
  * ibus_serializable_deserialize:
  * @variant: A #GVariant.
- * @returns: (transfer none): The deserialized #IBusSerializable.
  *
  * Deserialize a #GVariant to an #IBusSerializable/
  * The deserialize method should be implemented in extended class.
  *
+ * Returns: (transfer none): The deserialized #IBusSerializable.
+ *
  * See also: IBusSerializableCopyFunc().
  */
 IBusSerializable    *ibus_serializable_deserialize      (GVariant           *variant);
diff --git a/src/ibusservice.h b/src/ibusservice.h
index 829f5735e..d3723a97d 100644
--- a/src/ibusservice.h
+++ b/src/ibusservice.h
@@ -112,10 +112,11 @@ struct _IBusServiceClass {
      * @interface_name: An interface name.
      * @property_name: A property name.
      * @error: Return location for error or %NULL.
-     * @returns: (nullable) (transfer full): A variant.
      *
      * The ::service_get_property class method is to connect
      * GDBusInterfaceGetPropertyFunc().
+     *
+     * Returns: (nullable) (transfer full): A variant.
      */
     GVariant *  (* service_get_property)
                                     (IBusService        *service,
@@ -135,10 +136,11 @@ struct _IBusServiceClass {
      * @property_name: An property name.
      * @value: An property value.
      * @error: Return location for error or %NULL.
-     * @returns: %TRUE if set the value else %FALSE.
      *
      * The ::service_set_property class method is to connect
      * GDBusInterfaceSetPropertyFunc().
+     *
+     * Returns: %TRUE if set the value else %FALSE.
      */
     gboolean    (* service_set_property)
                                     (IBusService        *service,
@@ -161,28 +163,32 @@ GType            ibus_service_get_type          (void);
 
 /**
  * ibus_service_new:
+ * @connection: A GDBusConnection.
  * @path: Object path.
- * @returns: A newly allocated IBusService
  *
- * New an IBusService.
+ * Creantes a new #IBusService.
+ *
+ * Returns: A newly allocated #IBusService
  */
 IBusService     *ibus_service_new               (GDBusConnection    *connection,
                                                  const gchar        *path);
 /**
  * ibus_service_get_object_path:
  * @service: An IBusService.
- * @returns: The object path of @service
  *
- * Returns the object path of an IBusService.
+ * Gets the object path of an IBusService.
+ *
+ * Returns: The object path of @service
  */
 const gchar     *ibus_service_get_object_path   (IBusService        *service);
 
 /**
  * ibus_service_get_connection:
  * @service: An IBusService.
- * @returns: (transfer none): A #GDBusConnection of an #IBusService instance.
  *
- * Returns a connections.
+ * Gets a connections.
+ *
+ * Returns: (transfer none): A #GDBusConnection of an #IBusService instance.
  */
 GDBusConnection *ibus_service_get_connection    (IBusService        *service);
 
@@ -191,9 +197,10 @@ GDBusConnection *ibus_service_get_connection    (IBusService        *service);
  * @service: An IBusService.
  * @connection: A GDBusConnection the service will be registered to.
  * @error: Return location for error or NULL.
- * @returns: TRUE if the service was registered, FALSE otherwise.
  *
  * Registers service to a connection.
+ *
+ * Returns: %TRUE if the service was registered, %FALSE otherwise.
  */
 gboolean         ibus_service_register          (IBusService        *service,
                                                  GDBusConnection    *connection,
@@ -217,9 +224,10 @@ void             ibus_service_unregister        (IBusService        *service,
  * @name: Name of the signal.
  * @first_arg_type: Type of first argument.
  * @...: Rest of arguments, NULL to mark the end.
- * @returns: TRUE if succeed; FALSE otherwise.
  *
- * Send signal to all the IBusConnections of an IBusService.
+ * Sends signal to all the #IBusConnections of an #IBusService.
+ *
+ * Returns: %TRUE if succeed; %FALSE otherwise.
  *
  * see_also: g_dbus_connection_emit_signal()
  */
@@ -235,6 +243,9 @@ gboolean         ibus_service_emit_signal       (IBusService        *service,
  * @xml_data: The introspection xml data.
  *
  * Set the interface introspection information with the service class.
+ *
+ * Returns: %TRUE if @xml_data is valid and succeeded to be added;
+ *          %FALSE otherwise.
  */
 gboolean         ibus_service_class_add_interfaces
                                                 (IBusServiceClass   *klass,
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 744bab883..bca477c0f 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -168,9 +168,10 @@ G_BEGIN_DECLS
 
 /**
  * ibus_get_local_machine_id:
- * @returns: A newly allocated string that shows the UUID of the machine.
  *
  * Obtains the machine UUID of the machine this process is running on.
+ *
+ * Returns: A newly allocated string that shows the UUID of the machine.
  */
 const gchar     *ibus_get_local_machine_id
                                         (void);
@@ -185,7 +186,6 @@ void             ibus_set_display       (const gchar    *display);
 
 /**
  * ibus_get_address:
- * @returns: D-Bus address of IBus. %NULL for not found.
  *
  * Return the D-Bus address of IBus.
  * It will find the address from following source:
@@ -194,6 +194,8 @@ void             ibus_set_display       (const gchar    *display);
  *    <listitem><para>Socket file under ~/.config/ibus/bus/</para></listitem>
  * </orderedlist>
  *
+ * Returns: D-Bus address of IBus. %NULL for not found.
+ *
  * See also: ibus_write_address().
  */
 const gchar     *ibus_get_address       (void);
@@ -210,7 +212,6 @@ void             ibus_write_address     (const gchar    *address);
 
 /**
  * ibus_get_user_name:
- * @returns: A newly allocated string that stores current user name.
  *
  * Get the current user name.
  * It is determined by:
@@ -223,15 +224,18 @@ void             ibus_write_address     (const gchar    *address);
  *    <listitem><para>Environment variable USER</para></listitem>
  *    <listitem><para>Environment variable LNAME</para></listitem>
  * </orderedlist>
+ *
+ * Returns: A newly allocated string that stores current user name.
  */
 const gchar     *ibus_get_user_name     (void);
 
 /**
  * ibus_get_daemon_uid:
- * @returns: UID of ibus-daemon; or 0 if UID is not available.
  *
  * Get UID of ibus-daemon.
  *
+ * Returns: UID of ibus-daemon; or 0 if UID is not available.
+ *
  * Deprecated: This function has been deprecated and should
  * not be used in newly written code.
  */
@@ -239,18 +243,23 @@ glong            ibus_get_daemon_uid    (void) G_GNUC_DEPRECATED;
 
 /**
  * ibus_get_socket_path:
- * @returns: A newly allocated string that stores the path of socket file.
  *
  * Get the path of socket file.
+ *
+ * Returns: A newly allocated string that stores the path of socket file.
  */
 const gchar     *ibus_get_socket_path   (void);
 
 /**
  * ibus_get_timeout:
- * @returns: A GDBus timeout in milliseconds. -1 when default timeout for GDBus should be used.
  *
- * 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.
+ * 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.
+ *
+ * Returns: A GDBus timeout in milliseconds. -1 when default timeout for
+ *     GDBus should be used.
  */
 gint             ibus_get_timeout       (void);
 
@@ -269,12 +278,13 @@ void             ibus_free_strv         (gchar          **strv)
  * ibus_key_event_to_string:
  * @keyval: Key symbol.
  * @modifiers: Modifiers such as Ctrl or Shift.
- * @returns: The name of a key symbol and modifier.
  *
  * Return the name of a key symbol and modifiers.
  *
  * For example, if press ctrl, shift, and enter, then this function returns:
  * Shift+Control+enter.
+ *
+ * Returns: The name of a key symbol and modifier.
  */
 const gchar     *ibus_key_event_to_string
                                         (guint           keyval,
@@ -285,9 +295,10 @@ const gchar     *ibus_key_event_to_string
  * @string: Key event string.
  * @keyval: Variable that hold key symbol result.
  * @modifiers: Variable that hold modifiers result.
- * @returns: TRUE for succeed; FALSE if failed.
  *
  * Parse key event string and return key symbol and modifiers.
+ *
+ * Returns: %TRUE for succeed; %FALSE if failed.
  */
 gboolean         ibus_key_event_from_string
                                         (const gchar    *string,
diff --git a/src/ibustext.h b/src/ibustext.h
index 021160725..e5e3c4a91 100644
--- a/src/ibustext.h
+++ b/src/ibustext.h
@@ -91,34 +91,37 @@ GType            ibus_text_get_type                 (void);
 /**
  * ibus_text_new_from_string:
  * @str: An text string to be set.
- * @returns: A newly allocated IBusText.
  *
- * New an IBusText from a string.
+ * Creates a new #IBusText from a string.
+ * @str will be duplicated in #IBusText, so feel free to free @str after this
+ * function.
  *
- * @str will be duplicated in IBusText, so feel free to free @str after this function.
+ * Returns: A newly allocated #IBusText.
  */
 IBusText        *ibus_text_new_from_string          (const gchar    *str);
 
 /**
  * ibus_text_new_from_ucs4:
  * @str: An text string to be set.
- * @returns: A newly allocated IBusText.
  *
- * New an IBusText from an UCS-4 encoded string.
+ * Creates a new #IBusText from an UCS-4 encoded string.
+ * @str will be duplicated in IBusText, so feel free to free @str after this
+ * function.
  *
- * @str will be duplicated in IBusText, so feel free to free @str after this function.
+ * Returns: A newly allocated #IBusText.
  */
 IBusText        *ibus_text_new_from_ucs4            (const gunichar *str);
 
 /**
  * ibus_text_new_from_static_string: (skip)
  * @str: An text string to be set.
- * @returns: A newly allocated IBusText.
  *
- * New an IBusText from a static string.
+ * Creates a new #IBusText from a static string.
  *
  * Since @str is a static string which won't be freed.
  * This function will NOT duplicate @str.
+ *
+ * Returns: A newly allocated #IBusText.
  */
 IBusText        *ibus_text_new_from_static_string   (const gchar    *str);
 
@@ -126,11 +129,12 @@ IBusText        *ibus_text_new_from_static_string   (const gchar    *str);
  * ibus_text_new_from_printf:
  * @fmt: printf format string.
  * @...: arguments for @fmt.
- * @returns: A newly allocated IBusText.
  *
- * New an IBusText from a printf expression.
+ * Creates a new #IBusText from a printf expression.
  *
  * The result of printf expression is stored in the new IBusText instance.
+ *
+ * Returns: A newly allocated #IBusText.
  */
 IBusText        *ibus_text_new_from_printf          (const gchar    *fmt,
                                                      ...) G_GNUC_PRINTF (1, 2);
@@ -138,9 +142,10 @@ IBusText        *ibus_text_new_from_printf          (const gchar    *fmt,
 /**
  * ibus_text_new_from_unichar:
  * @c: A single UCS4-encoded character.
- * @returns: A newly allocated IBusText.
  *
- * New an IBusText from a single UCS4-encoded character.
+ * Creates a new #IBusText from a single UCS4-encoded character.
+ *
+ * Returns: A newly allocated #IBusText.
  */
 IBusText        *ibus_text_new_from_unichar         (gunichar        c);
 
@@ -161,39 +166,43 @@ void             ibus_text_append_attribute         (IBusText       *text,
                                                      gint            end_index);
 /**
  * ibus_text_get_length:
- * @text: An IBusText.
- * @returns: Number of character in @text, not counted by bytes.
+ * @text: 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.
+ *
+ * Returns: Number of character in @text, not counted by bytes.
  */
 guint            ibus_text_get_length               (IBusText       *text);
 
 /**
  * ibus_text_get_is_static: (skip)
- * @text: An IBusText.
- * @returns: the is_static in @text.
+ * @text: An #IBusText.
  *
- * Return the is_static in an IBusText.
+ * Return the is_static in an #IBusText.
+ *
+ * Returns: the is_static in @text.
  */
 gboolean         ibus_text_get_is_static            (IBusText       *text);
 
 /**
  * ibus_text_get_text:
- * @text: An IBusText.
- * @returns: the text in @text.
+ * @text: An #IBusText.
+ *
+ * Return the text in an #IBusText. Should not be freed.
  *
- * Return the text in an IBusText. Should not be freed.
+ * Returns: the text in @text.
  */
 const gchar *    ibus_text_get_text                 (IBusText       *text);
 
 /**
  * ibus_text_get_attributes:
- * @text: An IBusText.
- * @returns: (transfer none): the attrs in @text.
+ * @text: An #IBusText.
+ *
+ * Return the attributes in an #IBusText. Should not be freed.
  *
- * Return the attributes in an IBusText. Should not be freed.
+ * Returns: (transfer none): the attrs in @text.
  */
 IBusAttrList *   ibus_text_get_attributes           (IBusText       *text);
 
diff --git a/src/ibusutil.h b/src/ibusutil.h
index b9b6415e8..2c1360c7c 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -39,7 +39,8 @@
 /**
  * ibus_get_untranslated_language_name:
  * @_locale: A const locale name.
- * @returns: untranslated language name
+ *
+ * Returns: untranslated language name
  */
 const gchar *    ibus_get_untranslated_language_name
                                                 (const gchar    *_locale);
@@ -47,7 +48,8 @@ const gchar *    ibus_get_untranslated_language_name
 /**
  * ibus_get_language_name:
  * @_locale: A const locale name.
- * @returns: translated language name
+ *
+ * Returns: translated language name
  */
 const gchar *    ibus_get_language_name         (const gchar    *_locale);
 
diff --git a/src/ibusxml.h b/src/ibusxml.h
index 826c9abe1..1bbc6fcde 100644
--- a/src/ibusxml.h
+++ b/src/ibusxml.h
@@ -56,19 +56,21 @@ typedef struct {
 /**
  * ibus_xml_parse_file:
  * @name: File name to be parsed.
- * @returns: Root node of parsed XML tree.
  *
  * Parse an XML file and return a corresponding XML tree.
+ *
+ * Returns: Root node of parsed XML tree.
  */
 XMLNode *ibus_xml_parse_file    (const gchar    *name);
 
 /**
  * ibus_xml_parse_buffer:
  * @buffer: Buffer to be parsed.
- * @returns: Root node of parsed XML tree.
  *
  * Parse a string buffer which contains an XML-formatted string,
  * and return a corresponding XML tree.
+ *
+ * Returns: Root node of parsed XML tree.
  */
 XMLNode *ibus_xml_parse_buffer  (const gchar    *buffer);
 

From 05f112adaa743cda35265a79622fc373d2331428 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 16 Jul 2015 13:33:17 +0900
Subject: [PATCH 324/816] Fix GIR warnings about XMLNode with g-ir-scanner

Fix:
ibusxml.h:62: Warning: IBus: ibus_xml_parse_file: return value:
Unresolved type: 'XMLNode*'

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/255210043
---
 src/ibusxml.c | 23 +++++++++++++++++++++--
 src/ibusxml.h | 35 ++++++++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/ibusxml.c b/src/ibusxml.c
index fb444476b..5cacc5af3 100644
--- a/src/ibusxml.c
+++ b/src/ibusxml.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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,25 @@
 
 static GMarkupParser parser;
 
+G_DEFINE_BOXED_TYPE (IBusXML, ibus_xml,
+                     ibus_xml_copy,
+                     ibus_xml_free);
+
+XMLNode*
+ibus_xml_copy (const XMLNode *node)
+{
+    XMLNode *ret;
+
+    if (node == NULL)
+        return NULL;
+
+    ret = g_slice_new (XMLNode);
+
+    *ret = *node;
+
+    return ret;
+}
+
 void
 ibus_xml_free (XMLNode *node)
 {
diff --git a/src/ibusxml.h b/src/ibusxml.h
index 1bbc6fcde..a241a6c8b 100644
--- a/src/ibusxml.h
+++ b/src/ibusxml.h
@@ -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-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -36,22 +36,46 @@
  */
 
 #include <glib.h>
+#include <glib-object.h>
+
+#define IBUS_TYPE_XML (ibus_xml_get_type ())
+
+G_BEGIN_DECLS
 
 /**
- * XMLNode:
+ * IBusXML:
  * @name: Name of XML tag.
  * @text: Text enclosed by XML start tag and end tag. i.e. <tag>text</tag>.
  * @attributes: Attributes of the XML node.
  * @sub_nodes: Children node of this XML node.
  *
- * A data type representing an XML nod.
+ * A data type representing an XML node.
  */
 typedef struct {
     gchar  *name;
     gchar  *text;
     gchar  **attributes;
     GList *sub_nodes;
-} XMLNode;
+} IBusXML;
+
+#define XMLNode IBusXML
+
+GType    ibus_xml_get_type      (void) G_GNUC_CONST;
+
+/**
+ * ibus_xml_copy:
+ * @node: Root node of an XML tree.
+ *
+ * Creates a copy of @node, which should be freed with
+ * ibus_xml_free(). Primarily used by language bindings,
+ * not that useful otherwise (since @node can just be copied
+ * by assignment in C).
+ *
+ * Returns: the newly allocated #IBusXML, which should
+ *          be freed with ibus_xml_free(), or %NULL
+ *          if @node was %NULL.
+ **/
+XMLNode *ibus_xml_copy          (const XMLNode  *node);
 
 /**
  * ibus_xml_parse_file:
@@ -91,4 +115,5 @@ void     ibus_xml_free          (XMLNode        *node);
  */
 void     ibus_xml_output        (const XMLNode  *node,
                                  GString        *output);
+G_END_DECLS
 #endif

From e00cb92df5f14dc8e6cc11056ebc4d7dbff91250 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 16 Jul 2015 13:50:55 +0900
Subject: [PATCH 325/816] Update translations

Update po/ar.po po/as.po po/bg.po po/bn.po po/bn_IN.po po/ca.po po/da.po
       po/de.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fr.po
       po/gu.po po/he.po po/hi.po po/hu.po po/ia.po po/it.po po/ja.po
       po/kn.po po/ko.po po/lv.po po/ml.po po/mr.po po/nb.po po/nl.po
       po/or.po po/pa.po po/pl.po po/pt_BR.po po/ru.po po/sr.po
       po/sr@latin.po po/ta.po po/te.po po/tg.po po/uk.po po/ur.po
       po/vi.po po/zh_CN.po po/zh_HK.po po/zh_TW.po

Review URL: https://codereview.appspot.com/241700043
---
 po/ar.po       |   8 +-
 po/as.po       |   8 +-
 po/bg.po       |   8 +-
 po/bn.po       |   8 +-
 po/bn_IN.po    |   6 +-
 po/ca.po       |  32 +++---
 po/da.po       |   8 +-
 po/de.po       |   8 +-
 po/en_GB.po    |   8 +-
 po/es.po       |   6 +-
 po/et.po       |   6 +-
 po/eu.po       |   6 +-
 po/fa.po       |   6 +-
 po/fr.po       | 294 ++++++++++++++++++++++++++++++++-----------------
 po/gu.po       |   8 +-
 po/he.po       |   6 +-
 po/hi.po       |   8 +-
 po/hu.po       |   8 +-
 po/ia.po       |   8 +-
 po/it.po       |   8 +-
 po/ja.po       | 183 ++++++++++++++++++------------
 po/kn.po       |   8 +-
 po/ko.po       |   6 +-
 po/lv.po       |   8 +-
 po/ml.po       |   6 +-
 po/mr.po       |   8 +-
 po/nb.po       |   6 +-
 po/nl.po       |   6 +-
 po/or.po       |   8 +-
 po/pa.po       |   8 +-
 po/pl.po       | 127 ++++++++++++---------
 po/pt_BR.po    |   8 +-
 po/ru.po       |   8 +-
 po/sr.po       |   8 +-
 po/sr@latin.po |   8 +-
 po/ta.po       |   8 +-
 po/te.po       |   8 +-
 po/tg.po       |   6 +-
 po/uk.po       | 127 ++++++++++++---------
 po/ur.po       |   6 +-
 po/vi.po       |   8 +-
 po/zh_CN.po    |   8 +-
 po/zh_HK.po    |   8 +-
 po/zh_TW.po    |   6 +-
 44 files changed, 611 insertions(+), 438 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 1a49f4cff..1eb17c8e3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Arabic
 # Arabic translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Muayyad Alsadi <alsadi@ojuba.org>\n"
@@ -244,11 +244,11 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ناقل الإدخال الذكي</small>\nالموقع: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>ناقل الإدخال الذكي</small>\nالموقع: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/as.po b/po/as.po
index de363f5b7..8026e391c 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Assamese
 # Assamese translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-08 09:04+0000\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
@@ -248,11 +248,11 @@ msgstr "উন্নত"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিমান ইনপুট bus</small>\nঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিমান ইনপুট bus</small>\nঘৰৰ পৃষ্ঠা: htthttps://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/bg.po b/po/bg.po
index 05a73277a..0322903d1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Bulgarian
 # Bulgarian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Valentin Laskov <laskov@festa.bg>\n"
@@ -244,11 +244,11 @@ msgstr "Допълнителни"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Интелигентен организатор на методите за писане</small>\nСтраница на проекта: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интелигентен организатор на методите за писане</small>\nСтраница на проекта: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/bn.po b/po/bn.po
index a91c118cd..92f4a875e 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Bengali
 # Bengali translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Ayesha Akhtar <ayesha@ankur.org.bd>\n"
@@ -251,11 +251,11 @@ msgstr "উন্নত"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: us\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index edcfeaf83..406f511a2 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-11-11 10:28+0000\n"
 "Last-Translator: Saibal Ray\n"
@@ -251,11 +251,11 @@ msgstr "উন্নত"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ca.po b/po/ca.po
index 345d0d525..ccdde90d7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,17 +12,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2015-02-20 17:16+0900\n"
-"PO-Revision-Date: 2015-03-17 05:52-0400\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
-"Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-05-09 04:16-0400\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
+"Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -266,14 +266,14 @@ msgstr "Avançat"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
 "<big><b>IBus</b></big>\n"
 "<small>El bus d'entrada intel·ligent</small>\n"
-"Lloc web: http://code.google.com/p/ibus\n"
+"Lloc web: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
@@ -311,7 +311,7 @@ msgstr "Ordre de motors"
 
 #: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr "Ordre dels motors desats en la lista de mètodes d'entrada"
+msgstr "Ordre dels motors desats en la llista dels mètodes d'entrada"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
@@ -339,8 +339,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ó desada s'utilitzarà per comprovar la diferencia entre la "
-"versió anterior d'ibus i l'actual."
+"El número desat de la versió s'utilitzarà per comprovar la diferència entre "
+"la versió anterior i l'actual de l'ibus."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
@@ -349,7 +349,7 @@ msgstr "Les disposicions llatines no tenen ASCII"
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
-"La disposició dels EEUU és un annex de les disposicions llatines. Es pot "
+"La disposició dels EUA és un annex de les disposicions llatines. Es pot "
 "ometre la variant."
 
 #: ../data/ibus.schemas.in.h:13
@@ -360,8 +360,8 @@ msgstr "Utilitza xmodmap"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Executa xmodmap sí existeix .xmodmap o .Xmodmap quant es commutin els motors "
-"ibus."
+"Executa xmodmap sí existeix .xmodmap o .Xmodmap quan es commutin els motors "
+"de l'ibus."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -483,8 +483,8 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "La icona XKB mostra la cadena de text de la disposició, la cadena de text es "
-"renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color d'X11, 2. un "
-"valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits "
+"renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color de X11, 2. "
+"un valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits "
 "hexadecimals per al roig, verd i blau, 3. un color RGB amb el format "
 "«rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i "
 "«b» són nombres enters amb rang de 0 a 255 o valors de percentatge amb rang "
@@ -714,7 +714,7 @@ msgstr "Escriu el FITXER de la memòria cau del registre."
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr "S'esta restablint..."
+msgstr "S'està restablint..."
 
 #: ../tools/main.vala:318
 msgid "Done"
diff --git a/po/da.po b/po/da.po
index d28048d83..3fb0419cd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Danish
 # Danish translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: kristho <lakristho@gmail.com>\n"
@@ -244,11 +244,11 @@ msgstr "Avanceret"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Den intelligente inddatabus</small>\nNetsted: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Den intelligente inddatabus</small>\nNetsted: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/de.po b/po/de.po
index cadcd50da..818c02d40 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to German
 # German translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:45+0000\n"
 "Last-Translator: Rainer <rgromans@redhat.com>\n"
@@ -251,11 +251,11 @@ msgstr "Erweitert"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Der intelligente Eingabe-Bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Der intelligente Eingabe-Bus</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0a6abd696..00f6256eb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to English (United Kingdom)
 # English (United Kingdom) translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Steven Panek (Espreon) <Majora700@gmail.com>\n"
@@ -244,11 +244,11 @@ msgstr "Advanced"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/es.po b/po/es.po
index 24947a4a2..c5cbfb656 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2015-02-20 17:16+0900\n"
 "PO-Revision-Date: 2015-03-03 12:12-0500\n"
 "Last-Translator: Gerardo Rosales <grosale86@gmail.com>\n"
@@ -274,14 +274,14 @@ msgstr "Avanzado"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
 "<big><b>IBus</b></big>\n"
 "<small>El bus de entrada inteligente</small>\n"
-"Sitio web: http://code.google.com/p/ibus\n"
+"Sitio web: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/et.po b/po/et.po
index f7e42af1e..b44ccd28d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Estonian
 # Estonian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: mihkel <turakas@gmail.com>\n"
@@ -245,7 +245,7 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/eu.po b/po/eu.po
index 32fa6a246..8b7c1ecce 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Basque
 # Basque translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Asier Iturralde Sarasola <asier.iturralde@gmail.com>\n"
@@ -244,7 +244,7 @@ msgstr "Aurreratua"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/fa.po b/po/fa.po
index 5b8f2ed79..1f0436c89 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Persian
 # Persian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: danialyousefi <da.yousefi@gmail.com>\n"
@@ -245,7 +245,7 @@ msgstr "پیشرفته"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index bc905a30d..163dd1003 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,27 +1,28 @@
 # translation of ibus.pot to French
 # French translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
-# dominique bribanick <chepioq@gmail.com>, 2011,2014
-# Jérôme Fenal <jfenal@gmail.com>, 2012-2013
-# Julien Humbert <julroy67@gmail.com>, 2009-2014
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
+# Jérôme Fenal <jfenal@gmail.com>, 2012-2013
+# dominique bribanick <chepioq@gmail.com>, 2011,2014
+# Julien Humbert <julroy67@gmail.com>, 2009-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 03:29+0000\n"
-"Last-Translator: dominique bribanick <chepioq@gmail.com>\n"
-"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-07-10 09:29-0400\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Zanata 3.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -69,7 +70,8 @@ msgstr "Préférences de IBus"
 
 #: ../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:"
@@ -77,7 +79,8 @@ msgstr "Méthode d'entrée suivante :"
 
 #: ../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:"
@@ -89,7 +92,9 @@ msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 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:"
@@ -97,11 +102,11 @@ msgstr "Activer / désactiver :"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "Activer :"
+msgstr "Activer :"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "Désactiver :"
+msgstr "Désactiver :"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -121,7 +126,7 @@ msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr "Afficher le panneau de propriété :"
+msgstr "Afficher le panneau de propriété :"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -137,7 +142,9 @@ 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"
@@ -145,7 +152,9 @@ msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
 #: ../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:"
@@ -160,13 +169,15 @@ msgid "General"
 msgstr "Général"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "A_jouter"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
+msgstr ""
+"Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -174,7 +185,8 @@ msgstr "_Enlever"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -182,7 +194,9 @@ msgstr "_Monter"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -190,7 +204,9 @@ msgstr "_Descendre"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -213,18 +229,21 @@ msgid ""
 "<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>"
-msgstr "<small><i>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.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
@@ -232,7 +251,7 @@ msgstr "Utiliser la disposition clavier système (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Partager la même méthode d'entrée pour toutes les applications"
 
@@ -248,11 +267,17 @@ msgstr "Avancé"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Page d'accueil : https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -262,11 +287,12 @@ msgstr "Démarrer IBus lors de la connexion"
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "À propos"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -290,14 +316,20 @@ msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
 
 #: ../data/ibus.schemas.in.h:7
 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:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; ne pas afficher la fenêtre et permuter avec le moteur précédent ou suivant."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; délai en millisecondes. 0 &gt; ne pas "
+"afficher la fenêtre et permuter avec le moteur précédent ou suivant."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -307,24 +339,30 @@ msgstr "Numéro de version enregistré"
 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:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "Dispositions latines ne disposant pas d'ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
+"La disposition US est ajoutée aux dispositions latines. Les variantes "
+"peuvent être omises."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "Utiliser xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"Lancer xmodmap si le fichier .xmodmap ou .Xmodmap existe lors d'un "
+"basculement de moteur ibus"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -356,7 +394,8 @@ msgstr "Raccourci clavier pour passer au moteur suivant"
 
 #: ../data/ibus.schemas.in.h:23
 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:24
 msgid "Prev engine shortcut keys"
@@ -374,7 +413,9 @@ msgstr "Masquage automatique"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher automatiquement, 2 = Toujours afficher"
+msgstr ""
+"Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher "
+"automatiquement, 2 = Toujours afficher"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,7 +425,10 @@ msgstr "Position de la barre"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -394,7 +438,9 @@ msgstr "Suivre le curseur d'insertion lorsque le panneau est toujours affiché"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "Si activé, le panneau suit le curseur d'insertion lorsque le panneau est toujours affiché. Sinon, le panneau est affiché à une position fixe."
+msgstr ""
+"Si activé, le panneau suit le curseur d'insertion lorsque le panneau est "
+"toujours affiché. Sinon, le panneau est affiché à une position fixe."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -404,7 +450,9 @@ msgstr "Millisecondes pour afficher le panneau de propriété"
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "Millisecondes pour afficher le panneau de propriété après prise du focus ou changement des propriétés."
+msgstr ""
+"Millisecondes pour afficher le panneau de propriété après prise du focus ou "
+"changement des propriétés."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -433,48 +481,71 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"L'icône XKB affiche la chaîne de caractère de la disposition et cette chaîne "
+"de caractère est affichée par sa valeur RGBA. Cette valeur RGBA peut être 1. "
+"le nom d'une couleur X11, 2. une valeur héxadécimale sous la forme '#rrggbb' "
+"où 'r', 'g', et 'b' sont des chiffres héxadécimaux correspondant "
+"respectivement au rouge, vert et bleu, 3. une couleur RGB sous la forme "
+"'rgb(r,g,b)' ou 4. une couleur RGBA sous la forme 'rgba(r,g,b,a)' où 'r', "
+"'g' et 'b' sont soit des entiers compris entre 0 et 255, soit un pourcentage "
+"compris entre 0 et 100 %, et 'a', la valeur alpha, étant un nombre à virgule "
+"flottante compris entre 0 et 1."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langue"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour le panneau de langue"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d'édition"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 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:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 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:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -482,36 +553,47 @@ msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Autre"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Langue : %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposition du clavier : %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur : %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Description :\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d'entrée"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "A_nnuler"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -523,71 +605,77 @@ msgstr "Définir les préférences de IBus"
 msgid "Keyboard shortcuts"
 msgstr "Raccourci clavier"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Touche :"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificateurs :"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "A_ppliquer"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "A_nnuler"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:114 ../setup/main.py:439
 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:330
+#: ../setup/main.py:369
 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:351
+#: ../setup/main.py:390
 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:365
+#: ../setup/main.py:404
 #, 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:377
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Raccourci clavier pour %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "Changer de méthodes d'entrée"
 
@@ -638,11 +726,11 @@ msgstr "Enregistrer le fichier FILE du cache du registre."
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr ""
+msgstr "Réinitialisation…"
 
 #: ../tools/main.vala:318
 msgid "Done"
-msgstr ""
+msgstr "Effectuée"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
@@ -658,7 +746,7 @@ msgstr "Afficher les moteurs disponibles"
 
 #: ../tools/main.vala:340
 msgid "(Not implemented)"
-msgstr "(Non développé)"
+msgstr "(Non implémenté)"
 
 #: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
@@ -682,11 +770,11 @@ msgstr "Afficher l'adresse D-Bus de ibus-daemon"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Afficher les valeurs de configuration"
 
 #: ../tools/main.vala:347
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Réinitialiser les valeurs de configuration"
 
 #: ../tools/main.vala:348
 msgid "Show this information"
@@ -694,10 +782,10 @@ msgstr "Afficher cette information"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
-msgstr "Utilisation : %s COMMANDE [OPTION…]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -708,36 +796,40 @@ msgstr "Commandes :\n"
 msgid "%s is unknown command!\n"
 msgstr "%s n'est pas une commande connue !\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Quitter"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/gu.po b/po/gu.po
index 3ea30ed62..d84f4f8ae 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Gujarati
 # Gujarati translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-29 09:30+0000\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
@@ -249,11 +249,11 @@ msgstr "ઉન્નત"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>હોશિયાર ઇનપુટ બસ</small>\nઘરપાનું: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>હોશિયાર ઇનપુટ બસ</small>\nઘરપાનું: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/he.po b/po/he.po
index 03d8ea6f9..8fd9fa96b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,13 +1,13 @@
 # translation of ibus.pot to Hebrew
 # Hebrew translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-17 12:25+0900\n"
 "PO-Revision-Date: 2014-02-17 05:02+0000\n"
 "Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
@@ -242,7 +242,7 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/hi.po b/po/hi.po
index 46d3096c5..b7a405579 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Hindi
 # Hindi translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:46+0000\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
@@ -246,11 +246,11 @@ msgstr "उन्नत"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>तेज-तर्रार इनपुट बस</small>\nहोमपेज: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>तेज-तर्रार इनपुट बस</small>\nहोमपेज: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/hu.po b/po/hu.po
index 57be5731c..845a077c4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Hungarian
 # Hungarian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Zoltan Hoppár <hopparz@gmail.com>\n"
@@ -247,11 +247,11 @@ msgstr "Speciális"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Az intelligens beviteli busz</small>\nHonlap: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Az intelligens beviteli busz</small>\nHonlap: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ia.po b/po/ia.po
index e1ed35673..e5ee6c7ad 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Interlingua
 # Interlingua translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Nik Kalach <nik.kalach@inbox.ru>\n"
@@ -245,11 +245,11 @@ msgstr "Avantiate"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Le bus de ingresso intelligente</small>\nPagina del projecto: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Le bus de ingresso intelligente</small>\nPagina del projecto: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/it.po b/po/it.po
index 2cb116622..4a59f95e0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Italian
 # Italian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: fvalen <fvalen@redhat.com>\n"
@@ -251,11 +251,11 @@ msgstr "Avanzate"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Il bus di input intelligente</small>\nSito web: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Il bus di input intelligente</small>\nSito web: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ja.po b/po/ja.po
index 74253aa57..d62cb38d1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,16 +15,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2015-02-20 17:16+0900\n"
-"PO-Revision-Date: 2015-02-20 08:40+0000\n"
-"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
-"Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-02-20 03:40-0500\n"
+"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
+"Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -163,7 +164,7 @@ msgid "General"
 msgstr "一般"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "追加(_A)"
@@ -217,18 +218,20 @@ msgid ""
 "<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>"
-msgstr "<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</i></small>"
+msgstr ""
+"<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</"
+"i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "入力メソッド"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
@@ -236,7 +239,7 @@ msgstr "システムのキーボード (XKB) レイアウトを使用する"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
@@ -252,11 +255,17 @@ msgstr "詳細"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>インテリジェントなインプットバス</small>\n"
+"ホームページ: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>インテリジェントなインプットバス</small>\nホームページ: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -266,12 +275,12 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
-#: ../ui/gtk3/panel.vala:1053
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "情報"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -299,10 +308,13 @@ msgstr "IME 切り替えウィンドウのポップアップ遅延時間 (ミリ
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デフォルトは 400 ミリ秒です。「0 =」ならウィンドウが直ちに表示されます。「0 &lt;」にすると指定したミリ秒数遅延します。「0 &gt;」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デフォルトは 400 ミリ秒です。「0 ="
+"」ならウィンドウが直ちに表示されます。「0 &lt;」にすると指定したミリ秒数遅延します。「0 "
+"&gt;」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -312,7 +324,8 @@ msgstr "保存されているバージョン番号"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -437,49 +450,70 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 からの色彩名、2. 書式 '#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、3. 書式 'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラーで、その 'r', 'g', 'b' は 0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 までの範囲内の浮動小数値のこと。"
+msgstr ""
+"XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 "
+"からの色彩名、2. 書式 '#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、3. 書式 "
+"'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラーで、その 'r', 'g', 'b' は "
+"0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 "
+"までの範囲内の浮動小数値のこと。"
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "プロパティー用にパネルアイコンを表示する遅延時間 (ミリ秒単位)"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"あるプロパティーが IBusEngineDesc の icon-prop-key の値に指定されている場合、"
+"エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にその"
+"プロパティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が 0 の"
+"場合、遅延無くプロパティーアイコンが即時に表示される。"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -487,45 +521,47 @@ msgstr "名前の変換を阻止する DConf キーのプレフィックスで
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "その他"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "キーボードレイアウト: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "説明:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "入力メソッドの選択"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../setup/enginedialog.py:204
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "さらに…"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -533,7 +569,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus を設定します"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
@@ -559,45 +595,52 @@ msgstr "削除(_D)"
 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:255
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:390
 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:403
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
@@ -704,10 +747,10 @@ msgstr "この情報を表示する"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "使い方: %s コマンド [オプション...]\n"
 "\n"
-msgstr "使い方: %s コマンド [オプション...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -718,40 +761,44 @@ msgstr "コマンド:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ../ui/gtk3/panel.vala:712
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:1026
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:1030
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\nIWAI, Masaharu <iwai@alib.jp>\n日向原 龍一 <hyu_gabaru@yahoo.co.jp>\nMIZUMOTO, Noriko <noriko@fedoraproject.org>"
+msgstr ""
+"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
+"IWAI, Masaharu <iwai@alib.jp>\n"
+"日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
+"MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1049
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1059
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1063
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/kn.po b/po/kn.po
index 1136e6904..57055d231 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Kannada
 # Kannada translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-27 19:17+0000\n"
 "Last-Translator: shanky <prasad.mvs@gmail.com>\n"
@@ -248,11 +248,11 @@ msgstr "ಸುಧಾರಿತ"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ko.po b/po/ko.po
index 2dbd3603e..101536881 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-12-21 11:47+0000\n"
 "Last-Translator: lego37yoon <lego37yoon@outlook.com>\n"
@@ -251,11 +251,11 @@ msgstr "고급"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페이지: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페이지: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/lv.po b/po/lv.po
index 6fa9126a1..9cac9b5bc 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Latvian
 # Latvian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:47+0000\n"
 "Last-Translator: Tranzistors <rudolfs.mazurs@gmail.com>\n"
@@ -246,11 +246,11 @@ msgstr "Paplašināti"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Inteliģentā ievades kopne</small>\nMājas lapa: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Inteliģentā ievades kopne</small>\nMājas lapa: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ml.po b/po/ml.po
index e88c61845..b82a90bfc 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-11-11 09:36+0000\n"
 "Last-Translator: Ani Peter <apeter@redhat.com>\n"
@@ -245,11 +245,11 @@ msgstr "മെച്ചപ്പെട്ടവ"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\nപ്രധാന താള്‍: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്</small>\nപ്രധാന താള്‍: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/mr.po b/po/mr.po
index 25be8af73..015c3ec8d 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,6 +1,6 @@
 # translation of mr.po to Marathi
 # Marathi translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-22 06:57+0000\n"
 "Last-Translator: sandeeps <sshedmak@redhat.com>\n"
@@ -248,11 +248,11 @@ msgstr "प्रगत"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>हुशार इनपुट बस</small>\nमुख्यपान: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>हुशार इनपुट बस</small>\nमुख्यपान: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/nb.po b/po/nb.po
index c0a5f04db..58491e9a7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Norwegian Bokmål
 # Norwegian Bokmål translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -244,7 +244,7 @@ msgstr "Avansert"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/nl.po b/po/nl.po
index 00e36d790..a106cb459 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-10-22 12:36+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
@@ -245,11 +245,11 @@ msgstr "Geavanceerd"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\nHomepagina: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\nHomepagina: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/or.po b/po/or.po
index 238d32ee3..aec683041 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Oriya
 # Oriya translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
@@ -245,11 +245,11 @@ msgstr "ଉନ୍ନତ"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\nମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\nମୂଖ୍ୟ ପୃଷ୍ଠା: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/pa.po b/po/pa.po
index b1d58a4d4..fce19094c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Panjabi
 # Panjabi translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:48+0000\n"
 "Last-Translator: asaini <asaini@redhat.com>\n"
@@ -251,11 +251,11 @@ msgstr "ਤਕਨੀਕੀ"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\nਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\nਮੁੱਖ ਸਫ਼ਾ: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/pl.po b/po/pl.po
index 936cd99ab..af39bb2d3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # translation of pl.po to Polish
 # Polish translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,18 +9,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2015-02-20 17:16+0900\n"
-"PO-Revision-Date: 2015-03-01 12:34-0500\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-07-13 01:25-0400\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -164,7 +164,7 @@ msgid "General"
 msgstr "Ogólne"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Dodaj"
@@ -230,15 +230,15 @@ msgstr ""
 "panelu.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Użycie systemowego układu klawiatury (XKB)"
 
@@ -246,7 +246,7 @@ msgstr "Użycie systemowego układu klawiatury (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
@@ -262,14 +262,14 @@ msgstr "Zaawansowane"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
 "<big><b>IBus</b></big>\n"
 "<small>Inteligentna magistrala wprowadzania</small>\n"
-"Strona domowa: http://code.google.com/p/ibus\n"
+"Strona domowa: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
@@ -282,12 +282,12 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchomienie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
-#: ../ui/gtk3/panel.vala:1053
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "O programie"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -483,49 +483,66 @@ msgstr ""
 "wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością "
 "zmiennoprzecinkową w zakresie od 0 do 1 alfy."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Milisekundy do wyświetlenia ikony panelu dla właściwości"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Milisekundy do wyświetlenia ikony panelu z ikony mechanizmu do ikony "
+"właściwości, kiedy mechanizmy są przełączane, jeśli właściwość została "
+"podana za pomocą wartości \"icon-prop-key\" w IBusEngineDesc. Jeśli wartość "
+"wynosi 0, to nie będzie żadnego opóźnienia i ikona zostanie wyświetlona od "
+"razu."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Użycie własnej czcionki"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Własna czcionka"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Nazwa własnej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Użycie globalnej metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
 "wprowadzania"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -537,43 +554,43 @@ 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Inne"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Język: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Układ klawiatury: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Opis:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Wybór metodę wprowadzania"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../setup/enginedialog.py:204
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "Więcej…"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "KBD"
 
@@ -581,7 +598,7 @@ msgstr "KBD"
 msgid "Set IBus Preferences"
 msgstr "Ustawianie preferencji usługi IBus"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
@@ -615,21 +632,21 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 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:368
+#: ../setup/main.py:369
 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:389
+#: ../setup/main.py:390
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -644,18 +661,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:403
+#: ../setup/main.py:404
 #, 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:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -776,41 +793,41 @@ msgstr "Polecenia:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:712
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:1026
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:1030
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2014"
 
-#: ../ui/gtk3/panel.vala:1049
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1059
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1063
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 565029eb5..15deb6413 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Portuguese (Brazil)
 # Portuguese (Brazil) translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-08 12:15+0900\n"
 "PO-Revision-Date: 2014-07-08 03:29+0000\n"
 "Last-Translator: jonataszv <jonatas.zv@openmailbox.org>\n"
@@ -248,11 +248,11 @@ msgstr "Avançado"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ru.po b/po/ru.po
index aacda15eb..b89b502b8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Russian
 # Russian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Yulia <yulia.poyarkova@redhat.com>\n"
@@ -247,11 +247,11 @@ msgstr "Дополнительно"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Интеллектуальная система ввода</small>\nДомашняя страница: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интеллектуальная система ввода</small>\nДомашняя страница: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/sr.po b/po/sr.po
index ba16bf684..1ec952ecb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Serbian
 # Serbian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
@@ -244,11 +244,11 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Интелигентна магистрала уноса</small>\nМатична страница: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Интелигентна магистрала уноса</small>\nМатична страница: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index efca35200..9ffeeb4c7 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Serbian (Latin)
 # Serbian (Latin) translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
@@ -244,11 +244,11 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala unosa</small>\nMatična stranica: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Inteligentna magistrala unosa</small>\nMatična stranica: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/ta.po b/po/ta.po
index fdd103ad1..0ad6593af 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Tamil
 # Tamil translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-17 09:18+0000\n"
 "Last-Translator: shkumar <shkumar@redhat.com>\n"
@@ -252,11 +252,11 @@ msgstr "கூடுதல்"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nமுதன்மை பக்கம்: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nமுதன்மை பக்கம்: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/te.po b/po/te.po
index e6433564e..68e7ab34d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Telugu
 # Telugu translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-09-25 14:22+0000\n"
 "Last-Translator: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
@@ -250,11 +250,11 @@ msgstr "అధునాతనం"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>ఐబస్</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>ఐబస్</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/tg.po b/po/tg.po
index 0656d68ca..2fc4655bf 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Tajik
 # Tajik translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: tajikfedora <victor.ibragimov@gmail.com>\n"
@@ -245,7 +245,7 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/uk.po b/po/uk.po
index c2176eaf3..3415fc6fa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Ukrainian
 # Ukrainian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,18 +10,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2015-02-20 17:16+0900\n"
-"PO-Revision-Date: 2015-03-13 07:19-0400\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-07-13 09:20-0400\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -165,7 +165,7 @@ msgid "General"
 msgstr "Загальне"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Додати"
@@ -231,15 +231,15 @@ msgstr ""
 "small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
@@ -247,7 +247,7 @@ msgstr "Використовувати розкладку клавіатури 
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
@@ -263,14 +263,14 @@ msgstr "Додатково"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
 "<big><b>IBus</b></big>\n"
 "<small>Інтелектуальний канал введення</small>\n"
-"Домашня сторінка: http://code.google.com/p/ibus\n"
+"Домашня сторінка: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
@@ -283,12 +283,12 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
-#: ../ui/gtk3/panel.vala:1053
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "Інформація"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -485,48 +485,65 @@ msgstr ""
 "значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для "
 "прозорості у діапазоні від 0 до 1."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+"Час у мілісекундах для приготування показу піктограми панелі для властивості"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Час у мілісекундах, протягом якого слід показувати перехід піктограми панелі "
+"з піктограми рушія на піктограму властивості після зміни рушія, якщо "
+"властивість задається значенням icon-prop-key у IBusEngineDesc. Якщо вказано "
+"значення 0, затримки не буде і піктограму властивості буде показано негайно."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -537,43 +554,43 @@ msgid ""
 msgstr "© Peng Huang, 2007–2010\n"
 "© Red Hat, Inc., 2007–2010"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Інше"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Мова: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Розкладка клавіатури: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Автор: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Опис:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Виберіть спосіб введення"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../setup/enginedialog.py:204
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "Більше…"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -581,7 +598,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Налаштувати IBus"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Клавіатурні скорочення"
 
@@ -615,21 +632,21 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Використовувати комбінацію з Shift для перемикання на попередній спосіб "
 "введення"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:390
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -645,18 +662,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:403
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -777,40 +794,40 @@ msgstr "Команди:\n"
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ../ui/gtk3/panel.vala:712
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:1026
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1030
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:1049
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1059
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1063
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ur.po b/po/ur.po
index 15b180ab5..7b0320388 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -1,13 +1,13 @@
 # translation of ibus.pot to Urdu
 # Urdu translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 # 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-12 15:12+0900\n"
 "PO-Revision-Date: 2014-02-12 07:40+0000\n"
 "Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
@@ -218,7 +218,7 @@ msgstr ""
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
diff --git a/po/vi.po b/po/vi.po
index bf586489b..7020fdba4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Vietnamese
 # Vietnamese translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:49+0000\n"
 "Last-Translator: Lê Quốc Tuấn <mr.lequoctuan@gmail.com>\n"
@@ -244,11 +244,11 @@ msgstr "Nâng cao"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Bộ gõ thông minh</small>\nTrang chủ: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>Bộ gõ thông minh</small>\nTrang chủ: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a47918a94..9037ace68 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-26 14:33+0900\n"
 "PO-Revision-Date: 2014-03-19 06:43+0000\n"
 "Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
@@ -250,11 +250,11 @@ msgstr "高级"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页：http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页：https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4c2b440b8..85583b1c0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,6 +1,6 @@
 # translation of zh_TW.po to Traditional Chinese
 # Traditional Chinese translation for ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2014-02-18 05:50+0000\n"
 "Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
@@ -247,11 +247,11 @@ msgstr "進階"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>IBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 16f0c8a8f..0e100f4ed 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-07-18 13:09+0900\n"
 "PO-Revision-Date: 2014-10-10 06:56+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
@@ -248,11 +248,11 @@ msgstr "進階"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: http://code.google.com/p/ibus\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>iBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: http://code.google.com/p/ibus\n\n\n\n"
+msgstr "<big><b>iBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: https://github.com/ibus/ibus/wiki\n\n\n\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"

From 8d5640669a72a551f2b47521c9b945c0a3ae9057 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 16 Jul 2015 14:12:52 +0900
Subject: [PATCH 326/816] Release 1.5.11

Review URL: https://codereview.appspot.com/242580043
---
 bindings/vala/Makefile.am | 5 ++---
 configure.ac              | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 29cc1eb24..5a354238a 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2015 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
@@ -49,7 +49,6 @@ EXTRA_DIST = \
 	IBus-1.0.metadata \
 	IBus-1.0-custom.vala \
 	ibus-1.0.deps \
-	ibus-private.vapi \
 	config.vapi \
 	xi.vapi \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index b080afd40..0f47adce0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [10])
+m4_define([ibus_micro_version], [11])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])
@@ -39,7 +39,7 @@ m4_define([ibus_api_version], [ibus_major_version.0])
 
 AC_PREFEQ([2.62])
 AC_INIT([ibus], [ibus_version],
-        [http://code.google.com/p/ibus/issues/entry],
+        [https://github.com/ibus/ibus/issues],
         [ibus])
 
 AC_CONFIG_HEADERS([config.h])

From 8954a6f5ae4dd73e8189f5d52a7a378e8698c988 Mon Sep 17 00:00:00 2001
From: Hodong Kim <hodong@cogno.org>
Date: Tue, 21 Jul 2015 11:39:25 +0900
Subject: [PATCH 327/816] client/x11: Remove an unused variable

BUG=https://github.com/ibus/ibus/pull/1808
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/256010044

Patch from Hodong Kim <hodong@cogno.org>.
---
 client/x11/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 3289c105e..a717a2c8e 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -273,7 +273,6 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data)
     XICAttribute *sts_attr = call_data->status_attr;
 
     gint i;
-    guint32 attrs = 1;
 
     g_return_val_if_fail (x11ic != NULL, 0);
     for (i = 0; i < (int)call_data->ic_attr_num; ++i, ++ic_attr) {
@@ -306,7 +305,7 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data)
         LOG (1, "Unknown status attribute: %s", sts_attr->name);
     }
 
-    return attrs;
+    return 1;
 }
 
 

From 173af53099633fa18713ac45f9f64b50607f83ff Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 14 Aug 2015 11:24:15 +0900
Subject: [PATCH 328/816] Add terminator in NO_SNOOPER_APPS

terminator connects "key-press-event" signal in VTE and receives the
KeyPress events and copies the events to the multiple terminals.
If IBus uses snooper and IBusIMContext returns true,
terminator cannot receive the IME events because VTE does not export
IME "commit" signal.
After move terminator in NO_SNOOPER_APPS, terminator can receive the
KeyPress events from "key-press-event" signal before IBusIMContext
key_press_event() class method receives the events.

BUG=https://github.com/ibus/ibus/issues/1802
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/260120043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0f47adce0..bd39e7ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,7 +511,7 @@ AC_ARG_WITH(no-snooper-apps,
     AS_HELP_STRING([--with-no-snooper-apps[=regex1,regex2]],
         [Does not enable keyboard snooper in those applications (like: .*chrome.*,firefox.*)]),
     NO_SNOOPER_APPS=$with_no_snooper_apps,
-    NO_SNOOPER_APPS=[firefox.*,.*chrome.*,.*chromium.*]
+    NO_SNOOPER_APPS=[firefox.*,.*chrome.*,.*chromium.*,terminator]
 )
 AC_DEFINE_UNQUOTED(NO_SNOOPER_APPS, "$NO_SNOOPER_APPS",
     [Does not enbale keyboard snooper in those applications])

From c0ced65ea1298e860c571cd9151d81e620834132 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Tue, 1 Sep 2015 11:20:16 +0900
Subject: [PATCH 329/816] check for x11 for the ui too

if built with --enable-ui --disable-xim it currently fails because
X11_LIBS is empty

BUG=https://github.com/ibus/ibus/pull/1812
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/264020043

Patch from Marc-Antoine Perennou <Marc-Antoine@Perennou.com>.
---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index bd39e7ef7..4600dbaec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,6 +555,10 @@ AC_ARG_ENABLE(ui,
 )
 AM_CONDITIONAL([ENABLE_UI], [test x"$enable_ui" = x"yes"])
 if test x"$enable_ui" = x"yes"; then
+    # Check for x11
+    PKG_CHECK_MODULES(X11, [
+        x11
+    ])
     enable_ui="yes (enabled, use --disable-ui to disable)"
 fi
 

From 1d678673e18e132ed53df32502b779b0a56314d5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 Sep 2015 13:01:37 +0900
Subject: [PATCH 330/816] ibus-daemon update user cache when user observed path
 is updated

After the system registry cache is generated by root,
the cache remembers the observed path exists in /root == '~'
but if a user updates the user observed path, the observed path
exists in '~' and ibus-daemon cannot get the updated mtime
because the cache refers the root directory but not the user directory.
The patch tries to save '~' instead of the actual home dir
in the cache.

BUG=https://github.com/ibus/ibus/issues/1815
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/261040043
---
 configure.ac           |  4 ++--
 src/ibusobservedpath.c | 36 +++++++++++++++++++++---------------
 src/ibusregistry.c     |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4600dbaec..ac8243d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,12 +51,12 @@ m4_define([ibus_binary_version],
           [ibus_major_version.ibus_abi_current_minus_age.ibus_abi_age.ibus_abi_revision])
 
 # Required versions of other packages.
-m4_define([glib_required_version], [2.32.0])
+m4_define([glib_required_version], [2.36.0])
 
 # VALA_TARGET_GLIB_VERSION is used by valac --ccode --target-glib .
 # VALA_TARGET_GLIB_VERSION and glib_required_version will be different
 # in the future.
-VALA_TARGET_GLIB_VERSION=2.32
+VALA_TARGET_GLIB_VERSION=2.36
 AC_SUBST(VALA_TARGET_GLIB_VERSION)
 
 # Init automake.
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index 684cd77cc..9d45d40ff 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -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 <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2008-2015 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
@@ -88,7 +88,8 @@ ibus_observed_path_serialize (IBusObservedPath *path,
 {
     gboolean retval;
 
-    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->serialize ((IBusSerializable *)path, builder);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->
+            serialize ((IBusSerializable *)path, builder);
     g_return_val_if_fail (retval, FALSE);
 
     g_variant_builder_add (builder, "s", path->path);
@@ -103,7 +104,8 @@ ibus_observed_path_deserialize (IBusObservedPath *path,
 {
     gint retval;
 
-    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->deserialize ((IBusSerializable *)path, variant);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->
+            deserialize ((IBusSerializable *)path, variant);
     g_return_val_if_fail (retval, 0);
 
     ibus_g_variant_get_child_string (variant, retval++, &path->path);
@@ -152,13 +154,25 @@ ibus_observed_path_output (IBusObservedPath *path,
 gboolean
 ibus_observed_path_check_modification (IBusObservedPath *path)
 {
-    g_assert (IBUS_IS_OBSERVED_PATH (path));
+    gchar *real_path = NULL;
     struct stat buf;
 
-    if (g_stat (path->path, &buf) != 0) {
+    g_assert (IBUS_IS_OBSERVED_PATH (path));
+
+    if (path->path[0] == '~') {
+        const gchar *homedir = g_get_home_dir ();
+        real_path = g_build_filename (homedir, path->path + 2, NULL);
+    }
+    else {
+        real_path = g_strdup (path->path);
+    }
+
+    if (g_stat (real_path, &buf) != 0) {
         buf.st_mtime = 0;
     }
 
+    g_free (real_path);
+
     if (path->mtime == buf.st_mtime)
         return FALSE;
     return TRUE;
@@ -237,15 +251,7 @@ ibus_observed_path_parse_xml_node (IBusObservedPath *path,
         return FALSE;
     }
 
-    if (node->text[0] == '~') {
-        const gchar *homedir = g_getenv ("HOME");
-        if (homedir == NULL)
-            homedir = g_get_home_dir ();
-        path->path = g_build_filename (homedir, node->text + 2, NULL);
-    }
-    else {
-        path->path = g_strdup (node->text);
-    }
+    path->path = g_strdup (node->text);
 
     gchar **attr;
     for (attr = node->attributes; attr[0]; attr += 2) {
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index 8e9ada947..dfda2af33 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -29,7 +29,7 @@
 #include "ibusregistry.h"
 
 #define IBUS_CACHE_MAGIC 0x49425553 /* "IBUS" */
-#define IBUS_CACHE_VERSION 0x00010502
+#define IBUS_CACHE_VERSION 0x00010512
 
 enum {
     CHANGED,

From 4a8024b0a3e5670dc5ad88a26b90b0a9801efcca Mon Sep 17 00:00:00 2001
From: Alexey Kotlyarov <a@koterpillar.com>
Date: Wed, 4 Nov 2015 11:18:50 +0900
Subject: [PATCH 331/816] panel: Constrain the candidate area to the current
 monitor bounds

If the second monitor has the different size, lookup window on
the second monitor could not get the right size.

BUG=https://github.com/ibus/ibus/issues/1594

Review URL: https://codereview.appspot.com/267710043

Patch from Alexey Kotlyarov <a@koterpillar.com>.
---
 ui/gtk2/candidatepanel.py   | 15 ++++++++----
 ui/gtk3/candidatepanel.vala | 46 ++++++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/ui/gtk2/candidatepanel.py b/ui/gtk2/candidatepanel.py
index 374f96493..a105faa99 100644
--- a/ui/gtk2/candidatepanel.py
+++ b/ui/gtk2/candidatepanel.py
@@ -487,15 +487,20 @@ def __check_position(self):
         window_right = cursor_right + self.__toplevel.allocation.width
         window_bottom = cursor_bottom + self.__toplevel.allocation.height
 
-        root_window = gdk.get_default_root_window()
-        sx, sy = root_window.get_size()
+        screen = gdk.screen_get_default()
+        monitor_num = screen.get_monitor_at_point(cursor_location[0],
+                                                  cursor_location[1])
+        monitor_area = screen.get_monitor_geometry(monitor_num)
 
-        if window_right > sx:
-            x = sx - self.__toplevel.allocation.width
+        monitor_right = monitor_area.x + monitor_area.width
+        monitor_bottom = monitor_area.y + monitor_area.height
+
+        if window_right > monitor_right:
+            x = monitor_right - self.__toplevel.allocation.width
         else:
             x = cursor_right
 
-        if window_bottom > sy:
+        if window_bottom > monitor_bottom:
             # move the window just above the cursor so the window and a preedit string do not overlap.
             y = cursor_location[1] - self.__toplevel.allocation.height
         else:
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 823c54af2..06ed0c9d2 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -306,19 +306,26 @@ public class CandidatePanel : Gtk.Box{
             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();
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
+                                                      m_cursor_location.y);
+        // Use get_monitor_geometry() instead of get_monitor_area().
+        // get_monitor_area() excludes docks, but the lookup window should be
+        // shown over them.
+        Gdk.Rectangle monitor_area;
+        screen.get_monitor_geometry(monitor_num, out monitor_area);
+        int monitor_right = monitor_area.x + monitor_area.width;
+        int monitor_bottom = monitor_area.y + monitor_area.height;
 
         int x, y;
-        if (window_right_bottom.x > root_width)
-            x = root_width - allocation.width;
+        if (window_right_bottom.x > monitor_right)
+            x = monitor_right - allocation.width;
         else
             x = cursor_right_bottom.x;
         if (x < 0)
             x = 0;
 
-        if (window_right_bottom.y > root_height)
+        if (window_right_bottom.y > monitor_bottom)
             y = m_cursor_location.y - allocation.height;
         else
             y = cursor_right_bottom.y;
@@ -352,31 +359,38 @@ public class CandidatePanel : Gtk.Box{
             m_cursor_location.y + allocation.height
         };
 
-        Gdk.Window root = Gdk.get_default_root_window();
-        int root_width = root.get_width();
-        int root_height = root.get_height();
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
+                                                      m_cursor_location.y);
+        // Use get_monitor_geometry() instead of get_monitor_area().
+        // get_monitor_area() excludes docks, but the lookup window should be
+        // shown over them.
+        Gdk.Rectangle monitor_area;
+        screen.get_monitor_geometry(monitor_num, out monitor_area);
+        int monitor_right = monitor_area.x + monitor_area.width;
+        int monitor_bottom = monitor_area.y + monitor_area.height;
 
         int x, y;
         if (!m_candidate_area.get_vertical()) {
-            if (hwindow_right_bottom.x > root_width)
-                x = root_width - allocation.width;
+            if (hwindow_right_bottom.x > monitor_right)
+                x = monitor_right - allocation.width;
             else
                 x = m_cursor_location.x;
 
-            if (hwindow_right_bottom.y > root_height)
+            if (hwindow_right_bottom.y > monitor_bottom)
                 y = m_cursor_location.y - allocation.height;
             else
                 y = cursor_right_bottom.y;
         } else {
-            if (vwindow_left_bottom.x > root_width)
-                x = root_width - allocation.width;
+            if (vwindow_left_bottom.x > monitor_right)
+                x = monitor_right - allocation.width;
             else if (vwindow_left_bottom.x < 0)
                 x = cursor_right_bottom.x;
             else
                 x = vwindow_left_bottom.x;
 
-            if (vwindow_left_bottom.y > root_height)
-                y = root_height - allocation.height;
+            if (vwindow_left_bottom.y > monitor_bottom)
+                y = monitor_bottom - allocation.height;
             else
                 y = m_cursor_location.y;
         }

From 3ebeb6540ddfc75aeafdf87ccd6e4ae986e3e78d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 4 Nov 2015 11:21:46 +0900
Subject: [PATCH 332/816] panel: Fix the default position of property panel
 with dual monitors

"_NET_WORKAREA" Atom returns a big screen size including every monitors.
Use Gdk.Screen.get_monitor_workarea() instead.

Review URL: https://codereview.appspot.com/277760043
---
 ui/gtk3/propertypanel.vala | 71 +++++++-------------------------------
 1 file changed, 12 insertions(+), 59 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 12e85b0f9..6d5fd81ef 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -342,75 +342,28 @@ public class PropertyPanel : Gtk.Box {
         Gtk.Allocation allocation;
         m_toplevel.get_allocation(out allocation);
 
-        int root_width = m_root_window.get_width();
-        int root_height = m_root_window.get_height();
-        int root_x = 0;
-        int root_y = 0;
-        int ws_num = 0;
-
-#if VALA_0_24
-        X.Window xwindow = (m_root_window as Gdk.X11.Window).get_xid();
-#else
-        X.Window xwindow = Gdk.X11Window.get_xid(m_root_window);
-#endif
-        X.Atom _net_current_desktop =
-                m_xdisplay.intern_atom("_NET_CURRENT_DESKTOP", false);
-        X.Atom type = X.None;
-        int format;
-        ulong nitems = 0;
-        ulong bytes_after;
-        void *prop;
-        m_xdisplay.get_window_property(xwindow,
-                                      _net_current_desktop,
-                                      0, 32, false, X.XA_CARDINAL,
-                                      out type, out format,
-                                      out nitems, out bytes_after,
-                                      out prop);
-
-        if (type != X.None && nitems >= 1)
-            ws_num = (int) ((ulong *)prop)[0];
-
-        X.Atom _net_workarea =
-                m_xdisplay.intern_atom("_NET_WORKAREA", false);
-        type = X.None;
-        nitems = 0;
-
-        m_xdisplay.get_window_property(xwindow,
-                                      _net_workarea,
-                                      0, 32, false, X.XA_CARDINAL,
-                                      out type, out format,
-                                      out nitems, out bytes_after,
-                                      out prop);
-
-        if (type != X.None) {
-            if (nitems >= 2) {
-                root_x = (int) ((ulong *)prop)[ws_num * 4];
-                root_y = (int) ((ulong *)prop)[ws_num * 4 + 1];
-            }
-            if (nitems >= 4) {
-                root_width = (int) ((ulong *)prop)[ws_num * 4 + 2];
-                root_height = (int) ((ulong *)prop)[ws_num * 4 + 3];
-            }
-        }
-
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        Gdk.Rectangle monitor_area = screen.get_monitor_workarea(0);
+        int monitor_right = monitor_area.x + monitor_area.width;
+        int monitor_bottom = monitor_area.y + monitor_area.height;
         int x, y;
         if (is_bottom_panel()) {
             /* Translators: If your locale is RTL, the msgstr is "default:RTL".
              * Otherwise the msgstr is "default:LTR". */
             if (_("default:LTR") != "default:RTL") {
-                x = root_width - allocation.width;
-                y = root_height - allocation.height;
+                x = monitor_right - allocation.width;
+                y = monitor_bottom - allocation.height;
             } else {
-                x = root_x;
-                y = root_height - allocation.height;
+                x = monitor_area.x;
+                y = monitor_bottom - allocation.height;
             }
         } else {
             if (_("default:LTR") != "default:RTL") {
-                x = root_width - allocation.width;
-                y = root_y;
+                x = monitor_right - allocation.width;
+                y = monitor_area.y;
             } else {
-                x = root_x;
-                y = root_y;
+                x = monitor_area.x;
+                y = monitor_area.y;
             }
         }
 

From 49f3a73bd658c39311afcbf2dcc0acf9faa59ea9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 Jan 2016 11:36:37 +0900
Subject: [PATCH 333/816] setup: Fix PyGIWarning: GdkX11 was imported without
 specifying a version

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/285830043
---
 setup/main.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 22b6dc77c..26c2b0f3f 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -28,6 +28,13 @@
 import sys
 import time
 
+from gi import require_version as gi_require_version
+gi_require_version('GLib', '2.0')
+gi_require_version('GdkX11', '3.0')
+gi_require_version('Gio', '2.0')
+gi_require_version('Gtk', '3.0')
+gi_require_version('IBus', '1.0')
+
 from gi.repository import GLib
 # set_prgname before importing other modules to show the name in warning
 # messages when import modules are failed.

From 3af58fae1710ed3baf800c59da1ab918089c2a9b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 15 Jan 2016 11:23:56 +0900
Subject: [PATCH 334/816] engine: Change language code from ISO 639-2 to ISO
 639-1 in simple.xml

BUG=https://github.com/ibus/ibus/issues/1834

Review URL: https://codereview.appspot.com/283040043
---
 engine/Makefile.am        |   5 +-
 engine/iso639converter.py | 197 ++++++++++++++++++++++++++++++++++++++
 engine/simple.xml.in      | 122 +++++++++++------------
 ui/gtk3/switcher.vala     |   9 +-
 4 files changed, 266 insertions(+), 67 deletions(-)
 create mode 100755 engine/iso639converter.py

diff --git a/engine/Makefile.am b/engine/Makefile.am
index 19fb6b0a8..86f0e2b86 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2010-2015, Google Inc. All rights reserved.
-# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2010-2016, Google Inc. All rights reserved.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -83,6 +83,7 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
+	iso639converter.py \
 	simple.xml.in \
 	$(NULL)
 
diff --git a/engine/iso639converter.py b/engine/iso639converter.py
new file mode 100755
index 000000000..e1e1a917e
--- /dev/null
+++ b/engine/iso639converter.py
@@ -0,0 +1,197 @@
+#!/usr/bin/python
+# vim:set fileencoding=utf-8 et sts=4 sw=4:
+#
+# ibus - Intelligent Input Bus for Linux / Unix OS
+#
+# Copyright © 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+
+# This script converts ISO 639-2 of three characters to ISO 639-1 of two
+# characters in simple.xml.
+# E.g. "eng" to "en"
+
+
+from xml.sax import make_parser as sax_make_parser
+from xml.sax.handler import feature_namespaces as sax_feature_namespaces
+from xml.sax.saxutils import XMLFilterBase, XMLGenerator
+from xml.sax._exceptions import SAXParseException
+
+import codecs
+import getopt
+import io
+import os
+import sys
+
+INSTALLED_SIMPLE_XML = '/usr/share/ibus/component/simple.xml'
+PY3K = sys.version_info >= (3, 0)
+
+if PY3K:
+    from io import StringIO
+else:
+    # io.StringIO does not work with XMLGenerator
+    from cStringIO import StringIO
+    # iso_639.xml includes UTF-8
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
+
+
+def usage(prgname):
+    print('''\
+Usage:
+  %s [OPTION...]
+
+Options:
+  -h, --help                         Show this message
+  -i, --input=SIMPLE_XML             Load SIMPLE_XML file (default is:
+                                         %s)
+  -o, --output=FILE                  Output FILE (default is stdout)
+''' % (prgname, INSTALLED_SIMPLE_XML))
+
+
+class ISO639XML(XMLFilterBase):
+    def __init__(self, parser=None):
+        self.__code2to1 = {}
+        self.__codetoname = {}
+        XMLFilterBase.__init__(self, parser)
+    def startElement(self, name, attrs):
+        if name != 'iso_639_entry':
+            return
+        n = attrs.get('name')
+        iso639_1 = attrs.get('iso_639_1_code')
+        iso639_2b = attrs.get('iso_639_2B_code')
+        iso639_2t = attrs.get('iso_639_2T_code')
+        if iso639_1 != None:
+            self.__codetoname[iso639_1] = n
+            if iso639_2b != None:
+                self.__code2to1[iso639_2b] = iso639_1
+                self.__codetoname[iso639_2b] = n
+            if iso639_2t != None and iso639_2b != iso639_2t:
+                self.__code2to1[iso639_2t] = iso639_1
+                self.__codetoname[iso639_2t] = n
+    def code2to1(self, iso639_2):
+        try:
+            return self.__code2to1[iso639_2]
+        except KeyError:
+            return None
+
+
+class IBusComponentXML(XMLFilterBase):
+    def __init__(self, parser=None, downstream=None, iso639=None):
+        XMLFilterBase.__init__(self, parser)
+        self.__downstream = downstream
+        self.__iso639 = iso639
+        self.__is_language = False
+    def startDocument(self):
+        if self.__downstream:
+            self.__downstream.startDocument()
+    def endDocument(self):
+        if self.__downstream:
+            self.__downstream.endDocument()
+    def startElement(self, name, attrs):
+        if name == 'language':
+            self.__is_language = True
+        if self.__downstream:
+            self.__downstream.startElement(name, attrs)
+    def endElement(self, name):
+        if name == 'language':
+            self.__is_language = False
+        if self.__downstream:
+            self.__downstream.endElement(name)
+    def characters(self, text):
+        if self.__is_language:
+            if self.__iso639:
+                iso639_1 = self.__iso639.code2to1(text)
+                if iso639_1 != None:
+                    text = iso639_1
+        if self.__downstream:
+            self.__downstream.characters(text)
+
+
+class ConvertEngineXML():
+    def __init__(self, path, iso639=None):
+        self.__path = path
+        self.__iso639 = iso639
+
+        self.__result = StringIO()
+        downstream = XMLGenerator(self.__result, 'utf-8')
+        self.__load(downstream)
+
+    def __load(self, downstream=None):
+        parser = sax_make_parser()
+        parser.setFeature(sax_feature_namespaces, 0)
+        self.__handler = IBusComponentXML(parser, downstream, self.__iso639)
+        parser.setContentHandler(self.__handler)
+        f = codecs.open(self.__path, 'r', encoding='utf-8')
+        try:
+            parser.parse(f)
+        except SAXParseException:
+            print('Error: Invalid file format: %s' % path)
+        finally:
+            f.close()
+    def write(self, output=None):
+        if output != None:
+            od = codecs.open(output, 'w', encoding='utf-8')
+        else:
+            if PY3K:
+                od = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
+            else:
+                od = codecs.getwriter('utf-8')(sys.stdout)
+        contents = self.__result.getvalue()
+        od.write(contents)
+
+
+def parse_iso639(path):
+    f = codecs.open(path, 'r', encoding='utf-8')
+    parser = sax_make_parser()
+    parser.setFeature(sax_feature_namespaces, 0)
+    handler = ISO639XML(parser)
+    parser.setContentHandler(handler)
+    try:
+        parser.parse(f)
+    except SAXParseException:
+        print('Error: Invalid file format: %s' % path)
+    finally:
+        f.close()
+    return handler
+
+
+if __name__ == '__main__':
+    prgname = os.path.basename(sys.argv[0])
+    try:
+        opts, args = getopt.getopt(sys.argv[1:],
+                                   'hi:o:',
+                                   ['help', 'input=', 'output='])
+    except getopt.GetoptError as err:
+        print(err)
+        usage(prgname)
+        sys.exit(2)
+    if len(args) > 0:
+        usage(prgname)
+        sys.exit(2)
+    input = INSTALLED_SIMPLE_XML
+    output = None
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            usage(prgname)
+            sys.exit()
+        elif opt in ('-i', '--input'):
+            input = arg
+        elif opt in ('-o', '--output'):
+            output = arg
+
+    iso639 = parse_iso639('/usr/share/xml/iso-codes/iso_639.xml')
+    xml = ConvertEngineXML(input, iso639)
+    xml.write(output)
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index c0a7a10bb..b3996807d 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -11,7 +11,7 @@
 	<engines>
 		<engine>
 			<name>xkb:us::eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>us</layout>
@@ -22,7 +22,7 @@
 		</engine>
 		<engine>
 			<name>xkb:us:intl:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>us</layout>
@@ -34,7 +34,7 @@
 		</engine>
 		<engine>
 			<name>xkb:us:colemak:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>us</layout>
@@ -46,7 +46,7 @@
 		</engine>
 		<engine>
 			<name>xkb:us:dvorak:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>us</layout>
@@ -58,7 +58,7 @@
 		</engine>
 		<engine>
 			<name>xkb:us:altgr-intl:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>us</layout>
@@ -70,7 +70,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ara::ara</name>
-			<language>ara</language>
+			<language>ar</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ara</layout>
@@ -81,7 +81,7 @@
 		</engine>
 		<engine>
 			<name>xkb:be::ger</name>
-			<language>ger</language>
+			<language>de</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>be</layout>
@@ -92,7 +92,7 @@
 		</engine>
 		<engine>
 			<name>xkb:be::nld</name>
-			<language>nld</language>
+			<language>nl</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>be</layout>
@@ -103,7 +103,7 @@
 		</engine>
 		<engine>
 			<name>xkb:be::fra</name>
-			<language>fra</language>
+			<language>fr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>be</layout>
@@ -114,7 +114,7 @@
 		</engine>
 		<engine>
 			<name>xkb:br::por</name>
-			<language>por</language>
+			<language>pt</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>br</layout>
@@ -125,7 +125,7 @@
 		</engine>
 		<engine>
 			<name>xkb:br:dvorak:por</name>
-			<language>por</language>
+			<language>pt</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>br</layout>
@@ -137,7 +137,7 @@
 		</engine>
 		<engine>
 			<name>xkb:bg::bul</name>
-			<language>bul</language>
+			<language>bg</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>bg</layout>
@@ -148,7 +148,7 @@
 		</engine>
 		<engine>
 			<name>xkb:bg:phonetic:bul</name>
-			<language>bul</language>
+			<language>bg</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>bg</layout>
@@ -160,7 +160,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ca::fra</name>
-			<language>fra</language>
+			<language>fr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ca</layout>
@@ -171,7 +171,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ca:eng:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ca</layout>
@@ -194,7 +194,7 @@
 		</engine>
 		<engine>
 			<name>xkb:cz::cze</name>
-			<language>cze</language>
+			<language>cs</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>cz</layout>
@@ -205,7 +205,7 @@
 		</engine>
                 <engine>
                         <name>xkb:cz:qwerty:cze</name>
-                        <language>cze</language>
+                        <language>cs</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>cz</layout>
@@ -217,7 +217,7 @@
                 </engine>
 		<engine>
 			<name>xkb:dk::dan</name>
-			<language>dan</language>
+			<language>da</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>dk</layout>
@@ -228,7 +228,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ee::est</name>
-			<language>est</language>
+			<language>et</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ee</layout>
@@ -239,7 +239,7 @@
 		</engine>
 		<engine>
 			<name>xkb:fi::fin</name>
-			<language>fin</language>
+			<language>fi</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>fi</layout>
@@ -250,7 +250,7 @@
 		</engine>
                 <engine>
                         <name>xkb:fr::fra</name>
-                        <language>fra</language>
+                        <language>fr</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>fr</layout>
@@ -261,7 +261,7 @@
                 </engine>
                 <engine>
                         <name>xkb:fr:oss:fra</name>
-                        <language>fra</language>
+                        <language>fr</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>fr</layout>
@@ -273,7 +273,7 @@
                 </engine>
                 <engine>
                         <name>xkb:fr:bepo:fra</name>
-                        <language>fra</language>
+                        <language>fr</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>fr</layout>
@@ -285,7 +285,7 @@
                 </engine>
                 <engine>
                         <name>xkb:fr:dvorak:fra</name>
-                        <language>fra</language>
+                        <language>fr</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>fr</layout>
@@ -297,7 +297,7 @@
                 </engine>
 		<engine>
 			<name>xkb:de::ger</name>
-			<language>ger</language>
+			<language>de</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>de</layout>
@@ -308,7 +308,7 @@
 		</engine>
 		<engine>
 			<name>xkb:de:dvorak:ger</name>
-			<language>ger</language>
+			<language>de</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>de</layout>
@@ -320,7 +320,7 @@
 		</engine>
 		<engine>
 			<name>xkb:de:neo:ger</name>
-			<language>ger</language>
+			<language>de</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>de</layout>
@@ -332,7 +332,7 @@
 		</engine>
                 <engine>
                         <name>xkb:de:nodeadkeys:ger</name>
-                        <language>ger</language>
+                        <language>de</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>de</layout>
@@ -344,7 +344,7 @@
                 </engine>
 		<engine>
 			<name>xkb:gr::gre</name>
-			<language>gre</language>
+			<language>el</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>gr</layout>
@@ -355,7 +355,7 @@
 		</engine>
 		<engine>
 			<name>xkb:hu::hun</name>
-			<language>hun</language>
+			<language>hu</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>hu</layout>
@@ -366,7 +366,7 @@
 		</engine>
 		<engine>
 			<name>xkb:il::heb</name>
-			<language>heb</language>
+			<language>he</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>il</layout>
@@ -377,7 +377,7 @@
 		</engine>
 		<engine>
 			<name>xkb:it::ita</name>
-			<language>ita</language>
+			<language>it</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>it</layout>
@@ -388,7 +388,7 @@
 		</engine>
 		<engine>
 			<name>xkb:jp::jpn</name>
-			<language>jpn</language>
+			<language>ja</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>jp</layout>
@@ -399,7 +399,7 @@
 		</engine>
 		<engine>
 			<name>xkb:latam::spa</name>
-			<language>spa</language>
+			<language>es</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>latam</layout>
@@ -410,7 +410,7 @@
 		</engine>
 		<engine>
 			<name>xkb:lt::lit</name>
-			<language>lit</language>
+			<language>lt</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>lt</layout>
@@ -421,7 +421,7 @@
 		</engine>
 		<engine>
 			<name>xkb:lv:apostrophe:lav</name>
-			<language>lav</language>
+			<language>lv</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>lv</layout>
@@ -433,7 +433,7 @@
 		</engine>
 		<engine>
 			<name>xkb:no::nor</name>
-			<language>nor</language>
+			<language>no</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>no</layout>
@@ -444,7 +444,7 @@
 		</engine>
 		<engine>
 			<name>xkb:no:dvorak:nor</name>
-			<language>nor</language>
+			<language>no</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>no</layout>
@@ -456,7 +456,7 @@
 		</engine>
 		<engine>
 			<name>xkb:pl::pol</name>
-			<language>pol</language>
+			<language>pl</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>pl</layout>
@@ -467,7 +467,7 @@
 		</engine>
 		<engine>
 			<name>xkb:pl:dvorak:pol</name>
-			<language>pol</language>
+			<language>pl</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>pl</layout>
@@ -479,7 +479,7 @@
 		</engine>
                 <engine>
                         <name>xkb:pl:qwertz:pol</name>
-                        <language>pol</language>
+                        <language>pl</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>pl</layout>
@@ -491,7 +491,7 @@
                 </engine>
 		<engine>
 			<name>xkb:pt::por</name>
-			<language>por</language>
+			<language>pt</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>pt</layout>
@@ -502,7 +502,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ro::rum</name>
-			<language>rum</language>
+			<language>ro</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ro</layout>
@@ -513,7 +513,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ru::rus</name>
-			<language>rus</language>
+			<language>ru</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ru</layout>
@@ -524,7 +524,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ru:phonetic:rus</name>
-			<language>rus</language>
+			<language>ru</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ru</layout>
@@ -536,7 +536,7 @@
 		</engine>
 		<engine>
 			<name>xkb:rs::srp</name>
-			<language>srp</language>
+			<language>sr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>rs</layout>
@@ -547,7 +547,7 @@
 		</engine>
 		<engine>
 			<name>xkb:si::slv</name>
-			<language>slv</language>
+			<language>sl</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>si</layout>
@@ -558,7 +558,7 @@
 		</engine>
 		<engine>
 			<name>xkb:sk::slo</name>
-			<language>slo</language>
+			<language>sk</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>sk</layout>
@@ -569,7 +569,7 @@
 		</engine>
                 <engine>
                         <name>xkb:sk:qwerty:slo</name>
-                        <language>slo</language>
+                        <language>sk</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>sk</layout>
@@ -581,7 +581,7 @@
                 </engine>
 		<engine>
 			<name>xkb:es::spa</name>
-			<language>spa</language>
+			<language>es</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>es</layout>
@@ -592,7 +592,7 @@
 		</engine>
 		<engine>
 			<name>xkb:es:cat:cat</name>
-			<language>cat</language>
+			<language>ca</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>es</layout>
@@ -604,7 +604,7 @@
 		</engine>
 		<engine>
 			<name>xkb:se::swe</name>
-			<language>swe</language>
+			<language>sv</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>se</layout>
@@ -615,7 +615,7 @@
 		</engine>
 		<engine>
 			<name>xkb:se:dvorak:swe</name>
-			<language>swe</language>
+			<language>sv</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>se</layout>
@@ -627,7 +627,7 @@
 		</engine>
                 <engine>
                         <name>xkb:se:svdvorak:swe</name>
-                        <language>swe</language>
+                        <language>sv</language>
                         <license>GPL</license>
                         <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
                         <layout>se</layout>
@@ -639,7 +639,7 @@
                 </engine>
 		<engine>
 			<name>xkb:ch::ger</name>
-			<language>ger</language>
+			<language>de</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ch</layout>
@@ -650,7 +650,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ch:fr:fra</name>
-			<language>fra</language>
+			<language>fr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ch</layout>
@@ -662,7 +662,7 @@
 		</engine>
 		<engine>
 			<name>xkb:tr::tur</name>
-			<language>tur</language>
+			<language>tr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>tr</layout>
@@ -673,7 +673,7 @@
 		</engine>
 		<engine>
 			<name>xkb:ua::ukr</name>
-			<language>ukr</language>
+			<language>uk</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>ua</layout>
@@ -684,7 +684,7 @@
 		</engine>
 		<engine>
 			<name>xkb:gb:extd:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>gb</layout>
@@ -696,7 +696,7 @@
 		</engine>
 		<engine>
 			<name>xkb:gb:dvorak:eng</name>
-			<language>eng</language>
+			<language>en</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>gb</layout>
@@ -707,4 +707,4 @@
 			<rank>1</rank>
 		</engine>
 	</engines>
-</component>
+</component>
\ No newline at end of file
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 476b159f6..666a5a9ae 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2016 Peng Huang <shawn.p.huang@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -434,17 +434,18 @@ class Switcher : Gtk.Window {
             return language;
 
         language = engine.get_language();
+        int length = language.length;
 
         /* Maybe invalid layout */
-        if (language.length < 2)
+        if (length < 2)
             return language;
 
-        language = language[0:2].up();
+        language = language.up();
 
         int index = 0;
 
         foreach (var saved_language in m_xkb_languages.get_values()) {
-            if (language == saved_language[0:2])
+            if (language == saved_language[0:length])
                 index++;
         }
 

From 8bc47907c3292c1f4ec6b8f101ea936c928c877a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 19 Jan 2016 13:15:37 +0900
Subject: [PATCH 335/816] Update translations

Update bn.po ca.po zh_CN.po zh_HK.po

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/272450043
---
 po/bn.po    | 366 +++++++++++++++++++++++++---------------
 po/ca.po    | 136 ++++++++-------
 po/zh_CN.po | 316 +++++++++++++++++++++--------------
 po/zh_HK.po | 468 +++++++++++++++++++++++++++++++---------------------
 4 files changed, 778 insertions(+), 508 deletions(-)

diff --git a/po/bn.po b/po/bn.po
index 92f4a875e..8d4129133 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -16,15 +16,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"PO-Revision-Date: 2014-02-18 12:45-0500\n"
 "Last-Translator: Ayesha Akhtar <ayesha@ankur.org.bd>\n"
 "Language-Team: Bengali <trans-bn@lists.fedoraproject.org>\n"
+"Language: bn\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"
+"X-Generator: Zanata 3.7.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -72,7 +73,8 @@ msgstr "IBus সংক্রান্ত পছন্দ"
 
 #: ../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:"
@@ -80,7 +82,9 @@ msgstr "পরবর্তী ইনপুট পদ্ধতি:"
 
 #: ../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:"
@@ -90,9 +94,10 @@ msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+msgstr ""
+"ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -130,17 +135,18 @@ msgstr ""
 msgid "Language panel position:"
 msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 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 "চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+msgstr ""
+"চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -148,7 +154,8 @@ msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ
 
 #: ../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:"
@@ -163,7 +170,8 @@ msgid "General"
 msgstr "সাধারণ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "যোগ করুন (_A)"
 
@@ -177,7 +185,8 @@ msgstr "অপসারণ (_R)"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
+msgstr ""
+"সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -185,7 +194,9 @@ msgstr "উপরে (_U)"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
+msgstr ""
+"নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা "
+"হবে"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -193,7 +204,9 @@ msgstr "নীচে (_D)"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
+msgstr ""
+"নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা "
+"হবে"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -219,15 +232,15 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
@@ -235,7 +248,7 @@ msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
@@ -251,11 +264,11 @@ msgstr "উন্নত"
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Homepage: us\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -265,184 +278,239 @@ msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হ
 msgid "<b>Startup</b>"
 msgstr "<b>প্রারম্ভ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "পরিচিতি"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "বন্ধ (_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি পূর্বে লোড করা হবে"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ট্রিগারের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "শর্টকাট কী সক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ইনপুট পদ্ধতি চালু করার জন্য শর্টকাট কী"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "শর্টকাট কী নিষ্ক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ইনপুট পদ্ধতি বন্ধ করার জন্য শর্টকাট কী"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+msgstr ""
+"তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+msgstr ""
+"তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট "
+"কি"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ভাষার প্যানেলের অবস্থান"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
-msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
+msgstr ""
+"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট "
+"পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -450,36 +518,47 @@ msgstr ""
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কি-বোর্ড বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "নির্মাতা: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -491,210 +570,223 @@ msgstr "IBus সংক্রান্ত পছন্দ নির্ধার
 msgid "Keyboard shortcuts"
 msgstr "কি-বোর্ড শর্ট-কাট"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "কি-র কোড:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "প্রয়োগ করুন (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "মুছে ফেলুন (_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "ঠিক আছে (_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:329
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: ../setup/main.py:350
+#: ../setup/main.py:390
 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 ""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:376
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr ""
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr ""
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr ""
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr ""
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr ""
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "পছন্দসমূহ"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "পুনরারম্ভ"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "প্রস্থান"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ca.po b/po/ca.po
index ccdde90d7..2875769b2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,16 +13,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-02-20 17:16+0900\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-05-09 04:16-0400\n"
+"PO-Revision-Date: 2015-10-13 02:53-0400\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Zanata 3.7.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -58,7 +58,7 @@ msgstr "No mostrar"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr "Oculta-ho automàticament"
+msgstr "Ocultar automàticament"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -170,7 +170,7 @@ msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Afegeix"
@@ -230,19 +230,19 @@ msgid ""
 "the panel icon.</i></small>"
 msgstr ""
 "<small><i>El mètode d'entrada actiu pot canviar-se amb els seleccionats en "
-"l'anterior llista prement les dreceres de teclat o fent clic a la icona del "
-"quadre.</i></small>"
+"l'anterior llista prement les dreceres de teclat o en fer clic a la icona "
+"del quadre.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Mètode d'entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
@@ -250,7 +250,7 @@ msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
 
@@ -286,12 +286,12 @@ msgstr "Inicia l'IBus en entrar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
-#: ../ui/gtk3/panel.vala:1053
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "Quant a"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -360,7 +360,7 @@ msgstr "Utilitza xmodmap"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Executa xmodmap sí existeix .xmodmap o .Xmodmap quan es commutin els motors "
+"Executa xmodmap si existeix .xmodmap o .Xmodmap quan es commutin els motors "
 "de l'ibus."
 
 #: ../data/ibus.schemas.in.h:15
@@ -487,53 +487,69 @@ msgstr ""
 "un valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits "
 "hexadecimals per al roig, verd i blau, 3. un color RGB amb el format "
 "«rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i "
-"«b» són nombres enters amb rang de 0 a 255 o valors de percentatge amb rang "
-"de 0% a 100%, i «a» té un valor en punt flotant amb rang de 0 a 1 per l'alfa."
-""
+"«b» són nombres enters en l'interval de 0 a 255 o valors de percentatge en "
+"l'interval de 0% a 100%, i «a» té un valor en punt flotant en l'interval de "
+"0 a 1 per l'alfa."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Els mil·lisegons per mostrar el quadre d'icona amb una propietat"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Els mil·lisegons per mostrar el quadre d'icona des de la icona del motor, en "
+"una icona de propietat, sempre que s'activin els motors, si la propietat "
+"s'especifica amb el valor icon-prop-key a IBusEngineDesc. Si el valor és 0, "
+"no hi ha retard i la icona de propietat es mostra automàticament."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Utilitza un tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Incrusta el text pre-editat"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
 "d'entrada"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva els prefixes"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
@@ -545,43 +561,43 @@ 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Altres"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposició del teclat: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
-msgstr "Descripció: \n"
+msgstr "Descripció:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../setup/enginedialog.py:204
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "Més..."
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -589,7 +605,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Estableix les preferències de l'IBus"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
@@ -623,21 +639,21 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_D'acord"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
 "l'anterior mètode d'entrada"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:390
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -652,24 +668,24 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:403
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "commutació dels mètodes d'entrada"
 
 #: ../tools/main.vala:48
 msgid "List engine name only"
-msgstr "Mostra tan sols els nom del motor"
+msgstr "Mostra tan sols el nom del motor"
 
 #: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
@@ -682,7 +698,7 @@ msgstr "idioma: %s\n"
 
 #: ../tools/main.vala:158
 msgid "No engine is set.\n"
-msgstr "No s'ha establer cap motor.\n"
+msgstr "No s'ha establert cap motor.\n"
 
 #: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
@@ -784,45 +800,45 @@ msgstr "Ordres:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s no és una ordre reconeguda!\n"
 
-#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
 msgstr "Quadre de l'IBus"
 
-#: ../ui/gtk3/panel.vala:712
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "Actualització d'IBus"
 
-#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Súper+espai ara és l'accés de teclat per defecte."
 
-#: ../ui/gtk3/panel.vala:1026
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1030
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr ""
 "Joan Duran <jodufi@gmail.com>\n"
 "Oscar Osta Pueyo <oostap@gmail.com>,\n"
 "Patricia Rivera Escuder <patysya@gmail.com>,\n"
-"Robert Antoni Buj Gelonch <robert.buj@gmail.com>,\n"
+"Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>,\n"
 "Xavier Conde Rueda <xavi.conde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1049
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:1059
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:1063
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Surt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9037ace68..2c4920bd3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,15 +15,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-26 14:33+0900\n"
-"PO-Revision-Date: 2014-03-19 06:43+0000\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"PO-Revision-Date: 2014-03-19 02:43-0400\n"
 "Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
+"Language: zh-CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.7.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -89,7 +90,7 @@ msgstr "上一输入法："
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:12
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
@@ -129,11 +130,11 @@ msgstr "显示属性栏："
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
@@ -162,7 +163,8 @@ msgid "General"
 msgstr "常规"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -218,15 +220,15 @@ msgid ""
 msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:39
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
@@ -234,7 +236,7 @@ msgstr "使用系统键盘（XKB）布局"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
@@ -254,7 +256,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>智能输入平台</small>\n主页：https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>智能输入平台</small>\n"
+"主页：https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -264,11 +272,12 @@ msgstr "登录时运行 IBus"
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:811
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "关于"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -296,10 +305,12 @@ msgstr "输入法切换窗口弹出延时微秒数"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/下一个输入法引擎时不显示窗口。"
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/"
+"下一个输入法引擎时不显示窗口。"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -312,102 +323,119 @@ msgid ""
 msgstr "已保存的版本号将被用作检查之前安装的 ibus 版本和当前版本间的区别。"
 
 #: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "触发快捷键"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "为 gtk_accelerator_parse 触发快捷键"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "应用快捷键"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "开启输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "禁用快捷键"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "关闭输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "切换到列表中下一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "上一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "切换到列表中上一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "自动隐藏"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "属性面板的行为。 0 = 不再显示，1 = 自动隐藏，2 = 始终显示"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:29
 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:26
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "在始终显示的情况下面板跟随输入光标"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "若为真，当面板设为始终显示时面板将跟随输入光标。若为假，面板将在固定位置显示。"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "显示输入法名称"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "XKB 图标的 RGBA 值"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -417,49 +445,65 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜色名；2. '#rrggbb' 形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. 'rgba(r,g,b,a)' 形式的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
+msgstr ""
+"XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜色名；2. '#rrggbb' "
+"形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. "
+"'rgba(r,g,b,a)' 形式的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 "
+"100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -467,36 +511,46 @@ msgstr "用来停止名称转换的 DConf 键前缀"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "其他"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "语言：%s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "键盘布局：%s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者：%s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "选择输入法"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -508,211 +562,229 @@ msgstr "设定 IBus 首选项"
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "按键："
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "修饰符："
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "应用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:396
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:390
 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:364
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
 #. Translators: Title of the window
-#: ../setup/main.py:378
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "切换输入法"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "读取系统注册缓存。"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "读取注册缓存 FILE。"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "注册缓存无效。\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "写入系统注册缓存。"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "写入注册缓存 FILE。"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "设定或获取引擎"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "退出 ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "显示可用引擎"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(暂不可用)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "重启 ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "显示版本号"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "显示注册缓存内容。"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "创建注册缓存"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "显示本信息"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s 命令 [选项...]\n"
 "\n"
-msgstr "用法：%s 命令 [选项...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/panel.vala:454
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:455 ../ui/gtk3/panel.vala:466
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space 是目前默认的快捷键。"
 
-#: ../ui/gtk3/panel.vala:782
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:786
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "黄鹏 <shawn.p.huang@gmail.com>\nFedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
+msgstr ""
+"黄鹏 <shawn.p.huang@gmail.com>\n"
+"Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:807
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:817
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:821
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "退出"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 85583b1c0..1dc2b26e8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,26 +1,27 @@
-# translation of zh_TW.po to Traditional Chinese
-# Traditional Chinese translation for ibus.
+# translation of ibus.pot to Traditional Chinese (Hong Kong)
+# Traditional Chinese (Hong Kong) translation for ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010
 # Peng Huang <shawn.p.huang@gmail.com>, 2008
-# Peng Huang <shawn.p.huang@gmail.com>, 2008
-# Terry Chuang <tchuang@redhat.com>, 2010
+# Terry Chuang <tchuang@redhat.com>, 2014
+# tomoe_musashi <hkg.musashi@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:50+0000\n"
-"Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
-"Language-Team: Traditional Chinese <zh@li.org>\n"
+"POT-Creation-Date: 2015-11-09 13:46+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_HK\n"
+"PO-Revision-Date: 2015-11-09 12:50-0500\n"
+"Last-Translator: tomoe_musashi <hkg.musashi@gmail.com>\n"
+"Language-Team: Traditional Chinese <zh@li.org>\n"
+"Language: zh-HK\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
+"X-Generator: Zanata 3.7.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -52,11 +53,11 @@ msgstr "自訂"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "不要顯示"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "自動隱藏"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -86,7 +87,7 @@ msgstr "上一個輸入法："
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "用來開啟或關閉輸入法的快捷鍵"
 
@@ -96,11 +97,11 @@ msgstr "啟用或停用："
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "啟用："
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "停用："
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -108,7 +109,7 @@ msgstr "<b>鍵盤快捷鍵</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr "設置查詢表單內候選字詞的排列方向"
+msgstr "設定查詢表單內候選字詞的排列方向"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
@@ -116,21 +117,21 @@ msgstr "候選詞排列方向："
 
 #: ../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 property panel:"
-msgstr ""
+msgstr "顯示屬性面板："
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "語言面板位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系統匣內顯示圖示"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "在語言列上顯示輸入法名稱"
 
@@ -159,13 +160,14 @@ msgid "General"
 msgstr "通用"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
-msgstr "加入(_A)"
+msgstr "新增(_A)"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "加入選取的輸入法到已啟用的輸入法內"
+msgstr "新增選取的輸入法到已啟用的輸入法內"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -205,7 +207,7 @@ msgstr "偏好設定(_P)"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr ""
+msgstr "顯示所選輸入法的設置"
 
 #: ../setup/setup.ui.h:47
 msgid ""
@@ -213,17 +215,18 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>你可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
@@ -231,7 +234,7 @@ msgstr "使用系統鍵盤 (XKB) 配置"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "在所有的應用程式中共享同一個輸入法"
 
@@ -251,7 +254,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>智慧型輸入框架</small>\n"
+"首頁: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -261,436 +270,517 @@ msgstr "在登入時啟動 ibus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "預先載入引擎"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "當 ibus 啟動時預先載入引擎"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
-msgstr ""
+msgstr "引擎順序"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "輸入法清單中儲存的引擎順序"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "IME 切換器視窗彈出延遲的毫秒數"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
 msgstr ""
+"設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接向前/"
+"向後切換引擎。"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "儲存的版本號碼"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
-
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
-msgstr "觸發用快捷鍵"
+msgstr "儲存的版本號碼可以用來查看上次安裝的 ibus 版本與目前安裝的 ibus 版本之間的差異。"
 
 #: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Latin layouts which have no ASCII"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
+msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
+msgid "Use xmodmap"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr "觸發用快捷鍵"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse 的觸發用快捷鍵"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr "啟用快捷鍵"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr "開啟輸入法的快捷鍵"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr "停用快捷鍵"
+
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr ""
+msgstr "關閉輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "「下一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "「上一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "自動隱藏"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr ""
+msgstr "屬性面板的行為。0 = 不要顯示，1 = 自動隱藏，2 = 總是顯示"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "語言面板位置"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "在面板總是顯示的情況下跟隨輸入游標"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr ""
+msgstr "若為真，面板會在總是顯示的情況下跟隨輸入游標。若為假，面板則會顯示在固定位置上。"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "顯示屬性面板的毫秒數"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "當焦點落在屬性面板內，或屬性變更時屬性面板的顯示毫秒數。"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
-msgstr ""
+msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "DConf 用來停止名稱轉換的鍵其前綴"
 
 #: ../ibus/_config.py.in:41
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
-msgstr "其它"
+msgstr "其他"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "鍵盤配置: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者：%s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "選取輸入法"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "鍵盤"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr ""
+msgstr "設定 IBus 偏好設定"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "鍵盤快捷鍵"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "按鍵碼："
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "組合按鍵："
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "套用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
+msgstr "使用含 Shift 鍵之快捷鍵來切換至上一個輸入法"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "鍵盤輸入法 (IBus 背景程式) 並未執行。是否啟動？"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:390
 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"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus 背景程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:418
 msgid "switching input methods"
-msgstr ""
+msgstr "切換輸入法"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
-msgstr ""
+msgstr "只列出引擎名稱"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "無法連接至 IBus。\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "語言：%s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
+msgstr "寫入註冊快取 FILE。"
+
+#: ../tools/main.vala:304
+msgid "Resetting…"
 msgstr ""
 
-#: ../tools/main.vala:293
-msgid "Set or get engine"
+#: ../tools/main.vala:318
+msgid "Done"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:337
+msgid "Set or get engine"
+msgstr "設定或取得引擎"
+
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
-msgstr ""
+msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(尚未實作)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
-msgstr ""
+msgstr "顯示版本"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
-msgstr ""
+msgstr "建立註冊快取"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
+msgstr "列印 ibus-daemon 的 D-Bus 位址"
+
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:302
-msgid "Show this information"
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:348
+msgid "Show this information"
+msgstr "顯示此資訊"
+
+#: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
-msgstr ""
+msgstr "指令：\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
+msgstr "%s 為未知指令！\n"
+
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
-msgstr ""
+msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010"
+msgstr ""
+"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010\n"
+"Terry Chuang <tchuang@redhat.com>, 2014\n"
+"tomoe_musashi <hkg.musashi@gmail.com>, 2015"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"

From 350140e2db5af88c05a4de8a13ce0589c057424e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 19 Jan 2016 13:24:51 +0900
Subject: [PATCH 336/816] Release 1.5.12

Review URL: https://codereview.appspot.com/285130043
---
 Makefile.am  | 12 ++++++++++--
 configure.ac |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 54cdb0182..cc628bb63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -95,11 +95,19 @@ DISTCHECK_CONFIGURE_FLAGS = \
 dist-hook:
 	if test -d .git ; then \
 		git log --name-status --date=iso > $(distdir)/ChangeLog ; \
+		IBUS_PREV_MICRO_VERSION=`expr $(IBUS_MICRO_VERSION) - 1`; \
+		IBUS_PREV_VERSION=\
+"$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \
+		echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \
+		echo "" >> $(distdir)/NEWS; \
+		git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \
+		        --pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \
 	fi
 
 distclean-local:
 	if test "x$(srcdir)" = "x."; then :; else \
 		rm -f ChangeLog; \
+		echo > NEWS; \
 	fi
 
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index ac8243d32..59ca9347a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [11])
+m4_define([ibus_micro_version], [12])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 4b87be94e4e515c0437ec3f6a7f0dc93f2e5a3fc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 20 Jan 2016 13:30:07 +0900
Subject: [PATCH 337/816] Release 1.5.12 (#2)

Fix a build failure with make check.

Review URL: https://codereview.appspot.com/285910043
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index cc628bb63..3c4702c15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,7 +107,7 @@ dist-hook:
 distclean-local:
 	if test "x$(srcdir)" = "x."; then :; else \
 		rm -f ChangeLog; \
-		echo > NEWS; \
+		rm -f NEWS; \
 	fi
 
 MAINTAINERCLEANFILES = \

From 7241f66b05344b0b7caf2f83a23aa248233a955a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Jan 2016 11:54:42 +0900
Subject: [PATCH 338/816] src: Unify duplicated check_compact_table() and
 check_algorithmically()

Clean up the duplicated APIs, check_compact_table() and
check_algorithmically(), in ibuscomposetable.c and ibusenginesimple.c

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/286930043
---
 src/Makefile.am               |  14 +-
 src/ibuscomposetable.c        | 344 +++++++---------------------------
 src/ibuscomposetable.h        |  29 +--
 src/ibusenginesimple.c        | 116 ++++++++----
 src/ibusenginesimple.h        |   6 +-
 src/ibusenginesimpleprivate.h |  44 +++++
 6 files changed, 205 insertions(+), 348 deletions(-)
 create mode 100644 src/ibusenginesimpleprivate.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 101878491..1c161a842 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -159,11 +160,12 @@ ibus_public_headers =       \
 ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
     $(NULL)
-ibus_private_headers =       \
-    ibuscomposetable.h       \
-    ibusinternal.h           \
-    keyname-table.h          \
-    gtkimcontextsimpleseqs.h \
+ibus_private_headers =          \
+    ibuscomposetable.h          \
+    ibusenginesimpleprivate.h   \
+    ibusinternal.h              \
+    keyname-table.h             \
+    gtkimcontextsimpleseqs.h    \
     $(NULL)
 noinst_HEADERS =            \
     $(ibus_private_headers) \
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 4701ac288..28538fbc8 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,17 +32,14 @@
 #include <string.h>
 #include <strings.h>
 
+#include "ibuscomposetable.h"
 #include "ibuserror.h"
+#include "ibusenginesimple.h"
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
-#include "ibuscomposetable.h"
 #include "ibustypes.h"
 
-#define IS_DEAD_KEY(k) \
-    ((k) >= IBUS_KEY_dead_grave && (k) <= (IBUS_KEY_dead_dasia + 1))
-
-int MAX_COMPOSE_LEN = 0;
-int N_INDEX_STRIDE = 0;
+#include "ibusenginesimpleprivate.h"
 
 static gboolean
 is_codepoint (const gchar *str)
@@ -254,7 +251,7 @@ parse_compose_line (GList **compose_list, const gchar *line)
 }
 
 static GList *
-parse_compose_file (const gchar *compose_file)
+ibus_compose_list_parse_file (const gchar *compose_file)
 {
     gchar *contents = NULL;
     gchar **lines = NULL;
@@ -266,6 +263,7 @@ parse_compose_file (const gchar *compose_file)
     if (!g_file_get_contents (compose_file, &contents, &length, &error)) {
         g_error ("%s", error->message);
         g_error_free (error);
+        return NULL;
     }
 
     lines = g_strsplit (contents, "\n", -1);
@@ -277,242 +275,8 @@ parse_compose_file (const gchar *compose_file)
     return compose_list;
 }
 
-static int
-compare_seq_index (const void *key, const void *value)
-{
-    const guint16 *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 guint16 *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 guint16                 *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[IBUS_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,
-            IBUS_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,
-                    IBUS_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 guint16 *compose_buffer,
-                       gint          n_compose)
-{
-    int i = 0;
-    gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
-    gchar *combination_utf8, *nfc;
-
-    if (n_compose >= IBUS_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 ((guint) 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 ((guint) 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_list)
+ibus_compose_list_check_duplicated (GList *compose_list)
 {
     GList *list;
     GList *removed_list = NULL;
@@ -522,6 +286,8 @@ check_duplicated_compose (GList *compose_list)
         static guint16 keysyms[IBUS_MAX_COMPOSE_LEN + 2];
         int i;
         int n_compose = 0;
+        gboolean compose_finish;
+        gunichar output_char;
 
         for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 2; i++) {
             keysyms[i] = 0;
@@ -546,13 +312,20 @@ check_duplicated_compose (GList *compose_list)
             n_compose++;
         }
 
-        if (check_compact_table (keysyms,
-                                 &ibus_compose_table_compact,
-                                 n_compose))
-            removed_list = g_list_append (removed_list, array);
+        if (ibus_check_compact_table (&ibus_compose_table_compact,
+                                      keysyms,
+                                      n_compose,
+                                      &compose_finish,
+                                      &output_char) && compose_finish) {
+            if (keysyms[n_compose + 1] == output_char)
+                removed_list = g_list_append (removed_list, array);
 
-        else if (check_algorithmically (keysyms, n_compose))
-            removed_list = g_list_append (removed_list, array);
+        } else if (ibus_check_algorithmically (keysyms,
+                                               n_compose,
+                                               &output_char)) {
+            if (keysyms[n_compose + 1] == output_char)
+                removed_list = g_list_append (removed_list, array);
+        }
     }
 
     for (list = removed_list; list != NULL; list = list->next) {
@@ -567,7 +340,7 @@ check_duplicated_compose (GList *compose_list)
 }
 
 static GList *
-check_uint16 (GList *compose_list)
+ibus_compose_list_check_uint16 (GList *compose_list)
 {
     GList *list;
     GList *removed_list = NULL;
@@ -602,12 +375,15 @@ check_uint16 (GList *compose_list)
 }
 
 static GList *
-format_for_gtk (GList *compose_list)
+ibus_compose_list_format_for_gtk (GList *compose_list,
+                                  int   *p_max_compose_len,
+                                  int   *p_n_index_stride)
 {
     GList *list;
     GList *new_list = NULL;
     int i;
     int j;
+    int max_compose_len = 0;
 
     for (list = compose_list; list != NULL; list = list->next) {
         GArray *array = (GArray *) list->data;
@@ -617,14 +393,17 @@ format_for_gtk (GList *compose_list)
             guint32 codepoint = get_codepoint (data);
 
             if (codepoint == 0) {
-                if (MAX_COMPOSE_LEN < i)
-                    MAX_COMPOSE_LEN = i;
+                if (max_compose_len < i)
+                    max_compose_len = i;
                 break;
             }
         }
     }
 
-    N_INDEX_STRIDE = MAX_COMPOSE_LEN + 2;
+    if (p_max_compose_len)
+        *p_max_compose_len = max_compose_len;
+    if (p_n_index_stride)
+        *p_n_index_stride = max_compose_len + 2;
 
     for (list = compose_list; list != NULL; list = list->next) {
         GArray *array = (GArray *) list->data;
@@ -641,7 +420,7 @@ format_for_gtk (GList *compose_list)
 
                 g_array_remove_range (array, i, array->len - i);
 
-                for (j = i; j < MAX_COMPOSE_LEN; j++) {
+                for (j = i; j < max_compose_len; j++) {
                     result = g_strdup ("0");
                     g_array_append_val (array, result);
                 }
@@ -674,12 +453,15 @@ format_for_gtk (GList *compose_list)
 }
 
 static gint
-compare_array (gpointer a, gpointer b)
+ibus_compose_data_compare (gpointer a,
+                           gpointer b,
+                           gpointer data)
 {
     GArray *array_a = (GArray *) a;
     GArray *array_b = (GArray *) b;
+    int max_compose_len = GPOINTER_TO_INT (data);
     int i;
-    for (i = 0; i < MAX_COMPOSE_LEN; 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);
         guint32 code_a = get_codepoint (data_a);
@@ -692,11 +474,13 @@ compare_array (gpointer a, gpointer b)
 }
 
 static void
-print_compose_list (GList *compose_list)
+ibus_compose_list_print (GList *compose_list,
+                         int    max_compose_len,
+                         int    n_index_stride)
 {
     GList *list;
     int i;
-    int TOTAL_SIZE = 0;
+    int total_size = 0;
 
     for (list = compose_list; list != NULL; list = list->next) {
         GArray *array = (GArray *) list->data;
@@ -705,13 +489,13 @@ print_compose_list (GList *compose_list)
         const gchar *lower;
         const gchar *comment;
 
-        g_assert (array->len >= MAX_COMPOSE_LEN + 2);
+        g_assert (array->len >= max_compose_len + 2);
 
         g_printf ("  ");
-        for (i = 0; i < MAX_COMPOSE_LEN; i++) {
+        for (i = 0; i < max_compose_len; i++) {
             data = g_array_index (array, const gchar *, i);
 
-            if (i == MAX_COMPOSE_LEN -1)
+            if (i == max_compose_len - 1)
                 g_printf ("%s,\n", data);
             else
                 g_printf ("%s, ", data);
@@ -725,11 +509,11 @@ print_compose_list (GList *compose_list)
         else
             g_printf ("    %s, %s, /* %s */\n", upper, lower, comment);
 
-        TOTAL_SIZE += N_INDEX_STRIDE;
+        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);
+                total_size, max_compose_len, n_index_stride);
 }
 
 static IBusComposeTable *
@@ -771,35 +555,39 @@ IBusComposeTable *
 ibus_compose_table_new_with_file (const gchar *compose_file)
 {
     GList *compose_list = NULL;
+    int max_compose_len = 0;
+    int n_index_stride = 0;
     IBusComposeTable *compose_table;
 
     g_assert (compose_file != NULL);
 
-    MAX_COMPOSE_LEN = 0;
-    N_INDEX_STRIDE = 0;
-
-    compose_list = parse_compose_file (compose_file);
+    compose_list = ibus_compose_list_parse_file (compose_file);
     if (compose_list == NULL) {
         g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
         return NULL;
     }
-    compose_list = check_duplicated_compose (compose_list);
-    compose_list = check_uint16 (compose_list);
-    compose_list = format_for_gtk (compose_list);
-    compose_list = g_list_sort (compose_list,
-                                 (GCompareFunc) compare_array);
+    compose_list = ibus_compose_list_check_duplicated (compose_list);
+    compose_list = ibus_compose_list_check_uint16 (compose_list);
+    compose_list = ibus_compose_list_format_for_gtk (compose_list,
+                                                     &max_compose_len,
+                                                     &n_index_stride);
+    compose_list = g_list_sort_with_data (
+            compose_list,
+            (GCompareDataFunc) ibus_compose_data_compare,
+            GINT_TO_POINTER (max_compose_len));
     if (compose_list == NULL) {
         g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
         return NULL;
     }
 
-    if (g_getenv ("IBUS_PRINT_COMPOSE_TABLE") != NULL) {
-        print_compose_list (compose_list);
+    if (g_getenv ("IBUS_COMPOSE_TABLE_PRINT") != NULL) {
+        ibus_compose_list_print (compose_list, max_compose_len, n_index_stride);
     }
 
-    compose_table = ibus_compose_table_new_with_list (compose_list,
-                                                      MAX_COMPOSE_LEN,
-                                                      N_INDEX_STRIDE);
+    compose_table = ibus_compose_table_new_with_list (
+            compose_list,
+            max_compose_len,
+            n_index_stride);
     g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
 
     return compose_table;
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 297b35dd8..3172d74f9 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * 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,8 @@
 #ifndef __IBUS_COMPOSETABLE_H_
 #define __IBUS_COMPOSETABLE_H_
 
+#include <glib.h>
+
 /* if ibus_compose_seqs[N - 1] is an outputed compose character,
  * ibus_compose_seqs[N * 2 - 1] is also an outputed compose character.
  * and ibus_compose_seqs[0] to ibus_compose_seqs[0 + N - 3] are the
@@ -31,9 +33,11 @@
  *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs) / N)
  * The compose sequences are allowed within G_MAXUINT16 */
 
-#define IBUS_MAX_COMPOSE_LEN 7
+G_BEGIN_DECLS
 
 typedef struct _IBusComposeTable IBusComposeTable;
+typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
+
 struct _IBusComposeTable
 {
     const guint16 *data;
@@ -41,7 +45,6 @@ struct _IBusComposeTable
     gint n_seqs;
 };
 
-typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
 struct _IBusComposeTableCompact
 {
     const guint16 *data;
@@ -50,23 +53,7 @@ struct _IBusComposeTableCompact
     gint n_index_stride;
 };
 
-/* This file contains the table of the compose sequences,
- * static const guint16 ibus_compose_seqs_compact[] = {}
- * IT is generated from the compose-parse.py script.
- */
-#include "gtkimcontextsimpleseqs.h"
-
-/* From the values below, the value 30 means the number of different first keysyms
- * that exist in the Compose file (from Xorg). When running compose-parse.py without
- * parameters, you get the count that you can put here. Needed when updating the
- * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
- */
-static const IBusComposeTableCompact ibus_compose_table_compact = {
-    gtk_compose_seqs_compact,
-    5,
-    30,
-    6
-};
+IBusComposeTable *ibus_compose_table_new_with_file (const gchar *compose_file);
 
-IBusComposeTable* ibus_compose_table_new_with_file (const gchar *compose_file);
+G_BEGIN_DECLS
 #endif
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 8413d32f4..2f949fa04 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -25,12 +25,18 @@
 #  include "config.h"
 #endif
 
+#include "ibuscomposetable.h"
 #include "ibusenginesimple.h"
+#include "ibusenginesimpleprivate.h"
 
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
 
-#include "ibuscomposetable.h"
+/* This file contains the table of the compose sequences,
+ * static const guint16 gtk_compose_seqs_compact[] = {}
+ * It is generated from the compose-parse.py script.
+ */
+#include "gtkimcontextsimpleseqs.h"
 
 #include <memory.h>
 #include <stdlib.h>
@@ -49,6 +55,18 @@ struct _IBusEngineSimplePrivate {
     guint       modifiers_dropped : 1;
 };
 
+/* From the values below, the value 30 means the number of different first keysyms
+ * that exist in the Compose file (from Xorg). When running compose-parse.py without
+ * parameters, you get the count that you can put here. Needed when updating the
+ * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
+ */
+const IBusComposeTableCompact ibus_compose_table_compact = {
+    gtk_compose_seqs_compact,
+    5,
+    30,
+    6
+};
+
 static const guint16 ibus_compose_ignore[] = {
     IBUS_KEY_Shift_L,
     IBUS_KEY_Shift_R,
@@ -360,18 +378,23 @@ check_table (IBusEngineSimple *simple,
     return TRUE;
 }
 
-static gboolean
-check_compact_table (IBusEngineSimple              *simple,
-                     const IBusComposeTableCompact *table,
-                     gint                           n_compose)
+gboolean
+ibus_check_compact_table (const IBusComposeTableCompact *table,
+                          guint                         *compose_buffer,
+                          gint                           n_compose,
+                          gboolean                      *compose_finish,
+                          gunichar                      *output_char)
 {
-    IBusEngineSimplePrivate *priv = simple->priv;
-
     gint row_stride;
     guint16 *seq_index;
     guint16 *seq;
     gint i;
 
+    if (compose_finish)
+        *compose_finish = FALSE;
+    if (output_char)
+        *output_char = 0;
+
     /* Will never match, if the sequence in the compose buffer is longer
      * than the sequences in the table.  Further, compare_seq (key, val)
      * will overrun val if key is longer than val. */
@@ -380,12 +403,12 @@ check_compact_table (IBusEngineSimple              *simple,
 
     // g_debug ("check_compact_table(n_compose=%d) [%04x, %04x, %04x, %04x]",
     //          n_compose,
-    //          priv->compose_buffer[0],
-    //          priv->compose_buffer[1],
-    //          priv->compose_buffer[2],
-    //          priv->compose_buffer[3]);
+    //          compose_buffer[0],
+    //          compose_buffer[1],
+    //          compose_buffer[2],
+    //          compose_buffer[3]);
 
-    seq_index = bsearch (priv->compose_buffer,
+    seq_index = bsearch (compose_buffer,
                          table->data,
                          table->n_index_size,
                          sizeof (guint16) *  table->n_index_stride,
@@ -408,7 +431,7 @@ check_compact_table (IBusEngineSimple              *simple,
         row_stride = i + 1;
 
         if (seq_index[i + 1] - seq_index[i] > 0) {
-            seq = bsearch (priv->compose_buffer + 1,
+            seq = bsearch (compose_buffer + 1,
                            table->data + seq_index[i],
                            (seq_index[i + 1] - seq_index[i]) / row_stride,
                            sizeof (guint16) * row_stride,
@@ -418,11 +441,8 @@ check_compact_table (IBusEngineSimple              *simple,
             if (seq) {
                 if (i == n_compose - 1)
                     break;
-                else {
-                    ibus_engine_simple_update_preedit_text (simple);
-                    // g_debug ("yes\n");
+                else
                     return TRUE;
-                }
             }
         }
     }
@@ -432,11 +452,10 @@ check_compact_table (IBusEngineSimple              *simple,
         return FALSE;
     }
     else {
-        gunichar value;
-
-        value = seq[row_stride - 1];
-        ibus_engine_simple_commit_char (simple, value);
-        priv->compose_buffer[0] = 0;
+        if (compose_finish)
+            *compose_finish = TRUE;
+        if (output_char)
+            *output_char = seq[row_stride - 1];
 
         // g_debug ("U+%04X\n", value);
         return TRUE;
@@ -520,31 +539,33 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
     return FALSE;
 }
 
-static gboolean
-check_algorithmically (IBusEngineSimple *simple,
-                       gint                n_compose)
+gboolean
+ibus_check_algorithmically (const guint *compose_buffer,
+                            gint         n_compose,
+                            gunichar    *output_char)
 
 {
-    IBusEngineSimplePrivate *priv = simple->priv;
-
     gint i;
     gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
     gchar *combination_utf8, *nfc;
 
+    if (output_char)
+        *output_char = 0;
+
     if (n_compose >= IBUS_MAX_COMPOSE_LEN)
         return FALSE;
 
-    for (i = 0; i < n_compose && IS_DEAD_KEY (priv->compose_buffer[i]); i++)
+    for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
         ;
     if (i == n_compose)
         return TRUE;
 
     if (i > 0 && i == n_compose - 1) {
-        combination_buffer[0] = ibus_keyval_to_unicode (priv->compose_buffer[i]);
+        combination_buffer[0] = ibus_keyval_to_unicode (compose_buffer[i]);
         combination_buffer[n_compose] = 0;
         i--;
         while (i >= 0) {
-        switch (priv->compose_buffer[i]) {
+        switch (compose_buffer[i]) {
 #define CASE(keysym, unicode) \
         case IBUS_KEY_dead_##keysym: \
             combination_buffer[i+1] = unicode; \
@@ -581,7 +602,7 @@ check_algorithmically (IBusEngineSimple *simple,
         /* CASE (psili, 0x343); */
 #undef CASE
         default:
-            combination_buffer[i+1] = ibus_keyval_to_unicode (priv->compose_buffer[i]);
+            combination_buffer[i+1] = ibus_keyval_to_unicode (compose_buffer[i]);
         }
         i--;
     }
@@ -591,13 +612,11 @@ check_algorithmically (IBusEngineSimple *simple,
          * and return TRUE.
          */
         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);
-            ibus_engine_simple_commit_char (simple, value);
-            priv->compose_buffer[0] = 0;
+            if (output_char)
+                *output_char = g_utf8_get_char (nfc);
 
             g_free (combination_utf8);
             g_free (nfc);
@@ -687,6 +706,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     gboolean is_escape;
     guint hex_keyval;
     gint i;
+    gboolean compose_finish;
+    gunichar output_char;
 
     while (priv->compose_buffer[n_compose] != 0)
         n_compose++;
@@ -894,14 +915,29 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             list = list->next;
         }
 
-        if (check_compact_table (simple,
-                                 &ibus_compose_table_compact,
-                                 n_compose)) {
+        if (ibus_check_compact_table (&ibus_compose_table_compact,
+                                      priv->compose_buffer,
+                                      n_compose,
+                                      &compose_finish,
+                                      &output_char)) {
+            if (compose_finish) {
+                ibus_engine_simple_commit_char (simple, output_char);
+                priv->compose_buffer[0] = 0;
+            } else {
+                ibus_engine_simple_update_preedit_text (simple);
+            }
             return TRUE;
         }
 
-        if (check_algorithmically (simple, n_compose))
+        if (ibus_check_algorithmically (priv->compose_buffer,
+                                        n_compose,
+                                        &output_char)) {
+            if (output_char) {
+                ibus_engine_simple_commit_char (simple, output_char);
+                priv->compose_buffer[0] = 0;
+            }
             return TRUE;
+        }
     }
 
     /* The current compose_buffer doesn't match anything */
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index c74928ae0..8712659c3 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -134,8 +135,7 @@ gboolean         ibus_engine_simple_add_table_by_locale
 /**
  * ibus_engine_simple_add_compose_file:
  * @simple: An IBusEngineSimple.
- * @file: The compose file. If the @file is %NULL,
- *        the current locale is used.
+ * @file: The compose file.
  *
  * Call ibus_engine_simple_add_table() internally by locale.
  *
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
new file mode 100644
index 000000000..ee6affc0d
--- /dev/null
+++ b/src/ibusenginesimpleprivate.h
@@ -0,0 +1,44 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __IBUS_ENGINE_SIMPLE_PRIVATE_H__
+#define __IBUS_ENGINE_SIMPLE_PRIVATE_H__
+
+#include <glib.h>
+
+
+G_BEGIN_DECLS
+
+extern const IBusComposeTableCompact ibus_compose_table_compact;
+
+gboolean ibus_check_algorithmically (const guint                *compose_buffer,
+                                     gint                        n_compose,
+                                     gunichar                   *output);
+gboolean ibus_check_compact_table   (const IBusComposeTableCompact
+                                                                *table,
+                                     guint                      *compose_buffer,
+                                     gint                        n_compose,
+                                     gboolean                   *compose_finish,
+                                     gunichar                   *output_char);
+
+G_END_DECLS
+
+
+#endif /* __IBUS_IM_CONTEXT_SIMPLE_PRIVATE_H__ */

From d5bf50cbaf8901c4d32c212c5fea31419e1b4fb7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Jan 2016 12:44:49 +0900
Subject: [PATCH 339/816] src: Change guint to guint16 in ibusenginesimple.c

IBusComposeTable and IBusComposeTableCompact use guint16 for the data.

BUG=https://bugzilla.gnome.org/show_bug.cgi?id=721120
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/282390043
---
 src/ibusenginesimple.c        | 14 +++++++-------
 src/ibusenginesimpleprivate.h |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 2f949fa04..b8190c643 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -47,7 +47,7 @@
 
 struct _IBusEngineSimplePrivate {
     GSList     *tables;
-    guint       compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
+    guint16     compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
     gunichar    tentative_match;
     gint        tentative_match_len;
 
@@ -284,7 +284,7 @@ check_hex (IBusEngineSimple *simple,
 static int
 compare_seq_index (const void *key, const void *value)
 {
-    const guint *keysyms = key;
+    const guint16 *keysyms = key;
     const guint16 *seq = value;
 
     if (keysyms[0] < seq[0])
@@ -298,7 +298,7 @@ static int
 compare_seq (const void *key, const void *value)
 {
     int i = 0;
-    const guint *keysyms = key;
+    const guint16 *keysyms = key;
     const guint16 *seq = value;
 
     while (keysyms[i]) {
@@ -380,7 +380,7 @@ check_table (IBusEngineSimple *simple,
 
 gboolean
 ibus_check_compact_table (const IBusComposeTableCompact *table,
-                          guint                         *compose_buffer,
+                          guint16                       *compose_buffer,
                           gint                           n_compose,
                           gboolean                      *compose_finish,
                           gunichar                      *output_char)
@@ -540,9 +540,9 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 }
 
 gboolean
-ibus_check_algorithmically (const guint *compose_buffer,
-                            gint         n_compose,
-                            gunichar    *output_char)
+ibus_check_algorithmically (const guint16 *compose_buffer,
+                            gint           n_compose,
+                            gunichar      *output_char)
 
 {
     gint i;
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index ee6affc0d..cac404b11 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -28,12 +28,12 @@ G_BEGIN_DECLS
 
 extern const IBusComposeTableCompact ibus_compose_table_compact;
 
-gboolean ibus_check_algorithmically (const guint                *compose_buffer,
+gboolean ibus_check_algorithmically (const guint16              *compose_buffer,
                                      gint                        n_compose,
                                      gunichar                   *output);
 gboolean ibus_check_compact_table   (const IBusComposeTableCompact
                                                                 *table,
-                                     guint                      *compose_buffer,
+                                     guint16                    *compose_buffer,
                                      gint                        n_compose,
                                      gboolean                   *compose_finish,
                                      gunichar                   *output_char);

From 706ba01504a0c48391360a236d7c7aa8e0057753 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 1 Feb 2016 11:26:23 +0900
Subject: [PATCH 340/816] src: Refactor ibuscomposetable.c

Save raw integers of Unicode instead of code strings.
Use g_warning() instead of g_set_error().

BUG=https://bugzilla.gnome.org/show_bug.cgi?id=721120
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/282390044
---
 src/ibuscomposetable.c | 403 +++++++++++++++++++----------------------
 1 file changed, 182 insertions(+), 221 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 28538fbc8..17da93b82 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -26,11 +26,10 @@
  */
 
 #include <glib.h>
-#include <glib/gprintf.h>
+#include <glib/gstdio.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "ibuscomposetable.h"
 #include "ibuserror.h"
@@ -41,64 +40,62 @@
 
 #include "ibusenginesimpleprivate.h"
 
+typedef struct {
+  gunichar     *sequence;
+  gunichar      value[2];
+  gchar        *comment;
+} IBusComposeData;
+
+static void
+ibus_compose_data_free (IBusComposeData *compose_data)
+{
+    g_free (compose_data->sequence);
+    g_free (compose_data->comment);
+    g_slice_free (IBusComposeData, compose_data);
+}
+
+static void
+ibus_compose_list_element_free (IBusComposeData *compose_data,
+                                gpointer         data)
+{
+    ibus_compose_data_free (compose_data);
+}
+
 static gboolean
 is_codepoint (const gchar *str)
 {
-    gboolean retval = (strlen (str) > 1 && *str == 'U');
     int i;
 
-    if (!retval)
+    /* 'U' is not code point but 'U00C0' is code point */
+    if (str[0] == '\0' || str[0] != 'U' || str[1] == '\0')
         return FALSE;
 
     for (i = 1; str[i] != '\0'; i++) {
-        if (g_ascii_isxdigit (str[i]))
-            continue;
-        else
+        if (!g_ascii_isxdigit (str[i]))
             return FALSE;
     }
 
     return TRUE;
 }
 
-static guint32
-get_codepoint (const gchar *str)
-{
-    if (g_str_has_prefix (str, "IBUS_KEY_"))
-        return (guint32) ibus_keyval_from_name (str + 9);
-    if (*str == '0' && *(str + 1) == '\0')
-        return 0;
-    if (*str == '0' && *(str + 1) == 'x')
-        return (guint32) g_ascii_strtoll (str, NULL, 16);
-
-    g_assert_not_reached ();
-    return 0;
-}
-
 static gboolean
-parse_compose_value (GArray *array, const gchar *val, GError **error)
+parse_compose_value (IBusComposeData  *compose_data,
+                     const gchar      *val,
+                     const gchar      *line)
 {
     gchar **words = g_strsplit (val, "\"", 3);
-    gchar *result;
     gunichar uch;
 
     if (g_strv_length (words) < 3) {
-        g_set_error (error,
-                     IBUS_ERROR,
-                     IBUS_ERROR_FAILED,
-                     "Need to double-quote the value: %s", val);
-        g_strfreev (words);
-        return FALSE;
+        g_warning ("Need to double-quote the value: %s: %s", val, line);
+        goto fail;
     }
 
     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;
+        g_warning ("Invalid value: %s: %s", val, line);
+        goto fail;
     }
     else if (uch == '\\') {
         uch = words[1][1];
@@ -108,109 +105,105 @@ parse_compose_value (GArray *array, const gchar *val, GError **error)
             uch = '"';
         /* The escaped octal */
         else if (uch >= '0' && uch <= '8')
-            uch = g_ascii_strtoll(words[1] + 1, 0, 8);
+            uch = g_ascii_strtoll(words[1] + 1, NULL, 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;
-    }
 
+    if (g_utf8_get_char (g_utf8_next_char (words[1])) > 0) {
+        g_warning ("GTK+ supports to output one char only: %s: %s", val, line);
+        goto fail;
+    }
 
-    result = g_strdup_printf ("0x%08X", uch);
-    g_array_append_val (array, result);
+    compose_data->value[1] = uch;
 
     if (uch == '"')
-        result = g_strdup (g_strstrip (words[2] + 1));
+        compose_data->comment = g_strdup (g_strstrip (words[2] + 1));
     else
-        result = g_strdup (g_strstrip (words[2]));
+        compose_data->comment = g_strdup (g_strstrip (words[2]));
 
-    g_array_append_val (array, result);
     g_strfreev (words);
 
     return TRUE;
+
+fail:
+    g_strfreev (words);
+    return FALSE;
 }
 
 static gboolean
-parse_compose_sequence (GArray *array, const gchar *seq, GError **error)
+parse_compose_sequence (IBusComposeData *compose_data,
+                        const gchar     *seq,
+                        const gchar     *line)
 {
     gchar **words = g_strsplit (seq, "<", -1);
-    gchar *result;
     int i;
     int n = 0;
 
     if (g_strv_length (words) < 2) {
-        g_set_error (error,
-                     IBUS_ERROR,
-                     IBUS_ERROR_FAILED,
-                     "key sequence format is <a> <b>...");
-        g_strfreev (words);
-        return FALSE;
+        g_warning ("key sequence format is <a> <b>...: %s", line);
+        goto fail;
     }
 
     for (i = 1; words[i] != NULL; i++) {
         gchar *start = words[i];
         gchar *end = index (words[i], '>');
         gchar *match;
+        gunichar codepoint;
 
         if (words[i][0] == '\0')
              continue;
 
         if (start == NULL || end == NULL || end <= start) {
-            g_set_error (error,
-                         IBUS_ERROR,
-                         IBUS_ERROR_FAILED,
-                         "key sequence format is <a> <b>...");
-            g_strfreev (words);
-            return FALSE;
+            g_warning ("key sequence format is <a> <b>...: %s", line);
+            goto fail;
         }
 
         match = g_strndup (start, end - start);
 
+        if (compose_data->sequence == NULL)
+            compose_data->sequence = g_malloc (sizeof (gunichar) * 2);
+        else
+            compose_data->sequence = g_realloc (compose_data->sequence,
+                                                sizeof (gunichar) * (n + 2));
+
         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);
+            codepoint = (gunichar) g_ascii_strtoll (match + 1, NULL, 16);
+            compose_data->sequence[n] = codepoint;
+            compose_data->sequence[n + 1] = 0;
+        } else {
+            codepoint = (gunichar) ibus_keyval_from_name (match);
+            compose_data->sequence[n] = codepoint;
+            compose_data->sequence[n + 1] = 0;
+        }
 
+        if (codepoint == IBUS_KEY_VoidSymbol)
+            g_warning ("Could not get code point of keysym %s", match);
         g_free (match);
-        g_array_append_val (array, result);
         n++;
     }
 
     g_strfreev (words);
     if (0 == n || n >= IBUS_MAX_COMPOSE_LEN) {
-        g_set_error (error,
-                     IBUS_ERROR,
-                     IBUS_ERROR_FAILED,
-                     "The max number of sequences is %d", IBUS_MAX_COMPOSE_LEN);
+        g_warning ("The max number of sequences is %d: %s",
+                   IBUS_MAX_COMPOSE_LEN, line);
         return FALSE;
     }
 
-    result = g_strdup ("0");
-    g_array_append_val (array, result);
     return TRUE;
-}
 
-static void
-clear_char_array (gpointer data)
-{
-    gchar **array = data;
-    g_free (*array);
+fail:
+    g_strfreev (words);
+    return FALSE;
 }
 
 static void
-parse_compose_line (GList **compose_list, const gchar *line)
+parse_compose_line (GList       **compose_list,
+                    const gchar  *line)
 {
     gchar **components = NULL;
-    GArray *array;
-    GError *error = NULL;
+    IBusComposeData *compose_data = NULL;
 
     if (line[0] == '\0' || line[0] == '#')
         return;
@@ -222,32 +215,30 @@ parse_compose_line (GList **compose_list, const gchar *line)
 
     if (components[1] == NULL) {
         g_warning ("No delimiter ':': %s", line);
-        g_strfreev (components);
-        return;
+        goto fail;
     }
 
-    array = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    g_array_set_clear_func (array, clear_char_array);
+    compose_data = g_slice_new0 (IBusComposeData);
 
-    if (!parse_compose_sequence (array, g_strstrip (components[0]), &error)) {
-        g_warning ("%s: %s", error->message, line);
-        g_clear_error (&error);
-        g_strfreev (components);
-        g_array_unref (array);
-        return;
+    if (!parse_compose_sequence (compose_data,
+                                 g_strstrip (components[0]),
+                                 line)) {
+        goto fail;
     }
 
-    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;
-    }
+    if (!parse_compose_value (compose_data, g_strstrip (components[1]), line))
+        goto fail;
 
     g_strfreev (components);
 
-    *compose_list = g_list_append (*compose_list, array);
+    *compose_list = g_list_append (*compose_list, compose_data);
+
+    return;
+
+fail:
+    g_strfreev (components);
+    if (compose_data)
+        ibus_compose_data_free (compose_data);
 }
 
 static GList *
@@ -280,34 +271,26 @@ ibus_compose_list_check_duplicated (GList *compose_list)
 {
     GList *list;
     GList *removed_list = NULL;
+    IBusComposeData *compose_data;
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        static guint16 keysyms[IBUS_MAX_COMPOSE_LEN + 2];
+        static guint16 keysyms[IBUS_MAX_COMPOSE_LEN + 1];
         int i;
         int n_compose = 0;
         gboolean compose_finish;
         gunichar output_char;
 
-        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 2; i++) {
+        compose_data = list->data;
+
+        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++)
             keysyms[i] = 0;
-        }
 
-        for (i = 0; i < array->len; i++) {
-            const gchar *data = g_array_index (array, const gchar *, i);
-            guint32 codepoint = get_codepoint (data);
+        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++) {
+            gunichar codepoint = compose_data->sequence[i];
             keysyms[i] = (guint16) codepoint;
-            if (codepoint == IBUS_KEY_VoidSymbol)
-                g_warning ("Could not get code point of keysym %s", data);
 
-            if (codepoint == 0) {
-                data = g_array_index (array, const gchar *, i + 1);
-                codepoint = get_codepoint (data);
-                keysyms[i + 1] = (guint16) codepoint;
-                if (codepoint == IBUS_KEY_VoidSymbol)
-                    g_warning ("Could not get code point of keysym %s", data);
+            if (codepoint == 0)
                 break;
-            }
 
             n_compose++;
         }
@@ -317,21 +300,21 @@ ibus_compose_list_check_duplicated (GList *compose_list)
                                       n_compose,
                                       &compose_finish,
                                       &output_char) && compose_finish) {
-            if (keysyms[n_compose + 1] == output_char)
-                removed_list = g_list_append (removed_list, array);
+            if (compose_data->value[1] == output_char)
+                removed_list = g_list_append (removed_list, compose_data);
 
         } else if (ibus_check_algorithmically (keysyms,
                                                n_compose,
                                                &output_char)) {
-            if (keysyms[n_compose + 1] == output_char)
-                removed_list = g_list_append (removed_list, array);
+            if (compose_data->value[1] == output_char)
+                removed_list = g_list_append (removed_list, compose_data);
         }
     }
 
     for (list = removed_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        compose_list = g_list_remove (compose_list, array);
-        g_array_unref (array);
+        compose_data = list->data;
+        compose_list = g_list_remove (compose_list, compose_data);
+        ibus_compose_data_free (compose_data);
     }
 
     g_list_free (removed_list);
@@ -344,29 +327,29 @@ ibus_compose_list_check_uint16 (GList *compose_list)
 {
     GList *list;
     GList *removed_list = NULL;
+    IBusComposeData *compose_data;
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
         int i;
 
-        for (i = 0; i < array->len; i++) {
-            const gchar *data = g_array_index (array, const gchar *, i);
-            guint32 codepoint = get_codepoint (data);
+        compose_data = list->data;
+        for (i = 0; i < IBUS_MAX_COMPOSE_LEN; i++) {
+            gunichar codepoint = compose_data->sequence[i];
 
             if (codepoint == 0)
                 break;
 
             if (codepoint > 0xffff) {
-                removed_list = g_list_append (removed_list, array);
+                removed_list = g_list_append (removed_list, compose_data);
                 break;
             }
         }
     }
 
     for (list = removed_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        compose_list = g_list_remove (compose_list, array);
-        g_array_unref (array);
+        compose_data = list->data;
+        compose_list = g_list_remove (compose_list, compose_data);
+        ibus_compose_data_free (compose_data);
     }
 
     g_list_free (removed_list);
@@ -380,18 +363,16 @@ ibus_compose_list_format_for_gtk (GList *compose_list,
                                   int   *p_n_index_stride)
 {
     GList *list;
-    GList *new_list = NULL;
-    int i;
-    int j;
+    IBusComposeData *compose_data;
     int max_compose_len = 0;
+    int i;
+    gunichar codepoint;
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-
-        for (i = 0; i < array->len; i++) {
-            const gchar *data = g_array_index (array, const gchar *, i);
-            guint32 codepoint = get_codepoint (data);
+        compose_data = list->data;
 
+        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++) {
+            codepoint = compose_data->sequence[i];
             if (codepoint == 0) {
                 if (max_compose_len < i)
                     max_compose_len = i;
@@ -406,50 +387,15 @@ ibus_compose_list_format_for_gtk (GList *compose_list,
         *p_n_index_stride = max_compose_len + 2;
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        for (i = 0; i < array->len; i++) {
-            const gchar *data = g_array_index (array, const gchar *, i);
-            guint32 codepoint = 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 = 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_list = g_list_append (new_list, array);
-                break;
-            }
+        compose_data = list->data;
+        codepoint = compose_data->value[1];
+        if (codepoint > 0xffff) {
+            compose_data->value[0] = codepoint / 0x10000;
+            compose_data->value[1] = codepoint - codepoint / 0x10000 * 0x10000;
         }
     }
 
-    g_list_free (compose_list);
-    return new_list;
+    return compose_list;
 }
 
 static gint
@@ -457,15 +403,13 @@ ibus_compose_data_compare (gpointer a,
                            gpointer b,
                            gpointer data)
 {
-    GArray *array_a = (GArray *) a;
-    GArray *array_b = (GArray *) b;
+    IBusComposeData *compose_data_a = a;
+    IBusComposeData *compose_data_b = b;
     int max_compose_len = GPOINTER_TO_INT (data);
     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);
-        guint32 code_a = get_codepoint (data_a);
-        guint32 code_b = get_codepoint (data_b);
+        gunichar code_a = compose_data_a->sequence[i];
+        gunichar code_b = compose_data_b->sequence[i];
 
         if (code_a != code_b)
             return code_a - code_b;
@@ -479,35 +423,44 @@ ibus_compose_list_print (GList *compose_list,
                          int    n_index_stride)
 {
     GList *list;
-    int i;
+    int i, j;
+    IBusComposeData *compose_data;
     int total_size = 0;
+    gunichar upper;
+    gunichar lower;
+    const gchar *comment;
+    const gchar *keyval;
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        const gchar *data;
-        const gchar *upper;
-        const gchar *lower;
-        const gchar *comment;
-
-        g_assert (array->len >= max_compose_len + 2);
-
+        compose_data = list->data;
         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);
+            if (compose_data->sequence[i] == 0) {
+                for (j = i; j < max_compose_len; j++) {
+                    if (i == max_compose_len -1)
+                        g_printf ("0,\n");
+                    else
+                        g_printf ("0, ");
+                }
+                break;
+            }
+
+            keyval = ibus_keyval_name (compose_data->sequence[i]);
+            if (i == max_compose_len -1)
+                g_printf ("%s,\n", keyval ? keyval : "(null)");
             else
-                g_printf ("%s, ", data);
+                g_printf ("%s, ", keyval ? keyval : "(null)");
         }
-        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);
+        upper = compose_data->value[0];
+        lower = compose_data->value[1];
+        comment = compose_data->comment;
 
         if (list == g_list_last (compose_list))
-            g_printf ("    %s, %s  /* %s */\n", upper, lower, comment);
+            g_printf ("    %#06X, %#06X  /* %s */\n", upper, lower, comment);
         else
-            g_printf ("    %s, %s, /* %s */\n", upper, lower, comment);
+            g_printf ("    %#06X, %#06X, /* %s */\n", upper, lower, comment);
 
         total_size += n_index_stride;
     }
@@ -517,15 +470,16 @@ ibus_compose_list_print (GList *compose_list,
 }
 
 static IBusComposeTable *
-ibus_compose_table_new_with_list (GList *compose_list,
-                                  int    max_compose_len,
-                                  int    n_index_stride)
+ibus_compose_table_new_with_list (GList   *compose_list,
+                                  int      max_compose_len,
+                                  int      n_index_stride)
 {
     guint length;
     guint n = 0;
-    int i;
-    static guint16 *ibus_compose_seqs = NULL;
+    int i, j;
+    guint16 *ibus_compose_seqs = NULL;
     GList *list;
+    IBusComposeData *compose_data;
     IBusComposeTable *retval = NULL;
 
     g_return_val_if_fail (compose_list != NULL, NULL);
@@ -535,12 +489,17 @@ ibus_compose_table_new_with_list (GList *compose_list,
     ibus_compose_seqs = g_new0 (guint16, length * n_index_stride);
 
     for (list = compose_list; list != NULL; list = list->next) {
-        GArray *array = (GArray *) list->data;
-        const gchar *data;
-        for (i = 0; i < n_index_stride; i++) {
-            data = g_array_index (array, const gchar *, i);
-            ibus_compose_seqs[n++] = (guint16) get_codepoint (data);
+        compose_data = list->data;
+        for (i = 0; i < max_compose_len; i++) {
+            if (compose_data->sequence[i] == 0) {
+                for (j = i; j < max_compose_len; j++)
+                    ibus_compose_seqs[n++] = 0;
+                break;
+            }
+            ibus_compose_seqs[n++] = (guint16) compose_data->sequence[i];
         }
+        ibus_compose_seqs[n++] = (guint16) compose_data->value[0];
+        ibus_compose_seqs[n++] = (guint16) compose_data->value[1];
     }
 
     retval = g_new0 (IBusComposeTable, 1);
@@ -555,17 +514,15 @@ IBusComposeTable *
 ibus_compose_table_new_with_file (const gchar *compose_file)
 {
     GList *compose_list = NULL;
+    IBusComposeTable *compose_table;
     int max_compose_len = 0;
     int n_index_stride = 0;
-    IBusComposeTable *compose_table;
 
     g_assert (compose_file != NULL);
 
     compose_list = ibus_compose_list_parse_file (compose_file);
-    if (compose_list == NULL) {
-        g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
+    if (compose_list == NULL)
         return NULL;
-    }
     compose_list = ibus_compose_list_check_duplicated (compose_list);
     compose_list = ibus_compose_list_check_uint16 (compose_list);
     compose_list = ibus_compose_list_format_for_gtk (compose_list,
@@ -575,8 +532,10 @@ ibus_compose_table_new_with_file (const gchar *compose_file)
             compose_list,
             (GCompareDataFunc) ibus_compose_data_compare,
             GINT_TO_POINTER (max_compose_len));
+
     if (compose_list == NULL) {
-        g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
+        g_warning ("compose file %s does not include any keys besides keys "
+                   "in en-us compose file", compose_file);
         return NULL;
     }
 
@@ -588,7 +547,9 @@ ibus_compose_table_new_with_file (const gchar *compose_file)
             compose_list,
             max_compose_len,
             n_index_stride);
-    g_list_free_full (compose_list, (GDestroyNotify) g_array_unref);
+
+    g_list_free_full (compose_list,
+                      (GDestroyNotify) ibus_compose_list_element_free);
 
     return compose_table;
 }

From 97e28cc04b4601295b22a0aa8e9e21ed4e0758a1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 10 Feb 2016 11:41:34 +0900
Subject: [PATCH 341/816] src: Use cache file for compose table for launching
 time

Save the cache files of compose files under $HOME/.cache/ibus/compose
for the performance.

Load a compose file with the following order:
1. $HOME/.config/ibus/Compose
2. $HOME/.config/gtk-3.0/Compose
3. $HOME/.XCompose
4. /usr/share/X11/locale/$locale/Compose

Check the system compose files of "el_GR", "fi_FI", "pt_BR" only for the
performance because other compose files just load "en_US" compose file.

BUG=https://bugzilla.gnome.org/show_bug.cgi?id=721120
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/286040043
---
 configure.ac           |  10 ++
 src/Makefile.am        |   1 +
 src/ibuscomposetable.c | 361 ++++++++++++++++++++++++++++++++++++++++-
 src/ibuscomposetable.h |  20 ++-
 src/ibusenginesimple.c | 133 +++++++++------
 5 files changed, 463 insertions(+), 62 deletions(-)

diff --git a/configure.ac b/configure.ac
index 59ca9347a..57cf16ecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2016 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -257,6 +258,15 @@ else
     enable_xim="no (disabled, use --enable-xim to enable)"
 fi
 
+if $PKG_CONFIG --exists x11; then
+    X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
+elif test x"$prefix" != xNONE; then
+    X11_PREFIX="$prefix"
+else
+    X11_PREFIX="$ac_default_prefix"
+fi
+AC_SUBST(X11_PREFIX)
+
 if test x"$enable_wayland" = x"yes"; then
     # Check for wayland
     PKG_CHECK_MODULES(WAYLAND, [
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c161a842..adaebe983 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,7 @@ AM_CPPFLAGS =                                           \
     -DIBUS_DISABLE_DEPRECATION_WARNINGS                 \
     -DIBUS_COMPILATION                                  \
     -DISOCODES_PREFIX=\"$(ISOCODES_PREFIX)\"            \
+    -DX11_DATA_PREFIX=\"$(X11_PREFIX)\"                 \
     $(NULL)
 
 # ibus library
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 17da93b82..86c9314cf 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -19,12 +19,6 @@
  * USA
  */
 
-/* If you copy libX11/nls/??/Compose.pre in xorg git HEAD to
- * /usr/share/X11/locale/??/Compose , need to convert:
- * # sed -e 's/^XCOMM/#/' -e 's|X11_LOCALEDATADIR|/usr/share/X11/locale|'
- *   Compose.pre > /usr/share/X11/locale/foo/Compose
- */
-
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <locale.h>
@@ -40,6 +34,9 @@
 
 #include "ibusenginesimpleprivate.h"
 
+#define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
+#define IBUS_COMPOSE_TABLE_VERSION (2)
+
 typedef struct {
   gunichar     *sequence;
   gunichar      value[2];
@@ -469,10 +466,282 @@ ibus_compose_list_print (GList *compose_list,
                 total_size, max_compose_len, n_index_stride);
 }
 
+/* Implemented from g_str_hash() */
+static guint32
+ibus_compose_table_data_hash (gconstpointer v,
+                              int           length)
+{
+    const guint16 *p, *head;
+    unsigned char c;
+    guint32 h = 5381;
+
+    for (p = v, head = v; (p - head) < length; p++) {
+        c = 0x00ff & (*p >> 8);
+        h = (h << 5) + h + c;
+        c = 0x00ff & *p;
+        h = (h << 5) + h + c;
+    }
+
+    return h;
+}
+
+static gchar *
+ibus_compose_hash_get_cache_path (guint32 hash)
+{
+    gchar *basename = NULL;
+    gchar *dir = NULL;
+    gchar *path = NULL;
+
+    basename = g_strdup_printf ("%08x.cache", hash);
+
+    dir = g_build_filename (g_get_user_cache_dir (),
+                            "ibus", "compose", NULL);
+    path = g_build_filename (dir, basename, NULL);
+    if (g_mkdir_with_parents (dir, 0755) != 0) {
+        g_warning ("Failed to mkdir %s", dir);
+        g_free (path);
+        path = NULL;
+    }
+
+    g_free (dir);
+    g_free (basename);
+
+    return path;
+}
+
+static GVariant *
+ibus_compose_table_serialize (IBusComposeTable *compose_table)
+{
+    const gchar *header = IBUS_COMPOSE_TABLE_MAGIC;
+    const guint16 version = IBUS_COMPOSE_TABLE_VERSION;
+    guint16 max_seq_len;
+    guint16 index_stride;
+    guint16 n_seqs;
+    GVariant *variant_data;
+    GVariant *variant_table;
+
+    g_return_val_if_fail (compose_table != NULL, NULL);
+    g_return_val_if_fail (compose_table->data != NULL, NULL);
+
+    max_seq_len = compose_table->max_seq_len;
+    index_stride = max_seq_len + 2;
+    n_seqs = compose_table->n_seqs;
+
+    g_return_val_if_fail (max_seq_len > 0, NULL);
+    g_return_val_if_fail (n_seqs > 0, NULL);
+
+    variant_data = g_variant_new_fixed_array (G_VARIANT_TYPE_UINT16,
+                                              compose_table->data,
+                                              index_stride * n_seqs,
+                                              sizeof (guint16));
+    if (variant_data == NULL) {
+        g_warning ("Could not change compose data to GVariant.");
+        return NULL;
+    }
+    variant_table = g_variant_new ("(sqqqv)",
+                                   header,
+                                   version,
+                                   max_seq_len,
+                                   n_seqs,
+                                   variant_data);
+    return g_variant_ref_sink (variant_table);
+}
+
+static gint
+ibus_compose_table_find (gconstpointer data1,
+                         gconstpointer data2)
+{
+    const IBusComposeTable *compose_table = (const IBusComposeTable *) data1;
+    guint32 hash = (guint32) GPOINTER_TO_INT (data2);
+    return compose_table->id != hash;
+}
+
+static IBusComposeTable *
+ibus_compose_table_deserialize (const gchar *contents,
+                                gsize        length)
+{
+    IBusComposeTable *retval = NULL;
+    GVariantType *type;
+    GVariant *variant_data = NULL;
+    GVariant *variant_table = NULL;
+    const gchar *header = NULL;
+    guint16 version = 0;
+    guint16 max_seq_len = 0;
+    guint16 n_seqs = 0;
+    guint16 index_stride;
+    gconstpointer data = NULL;
+    gsize data_length = 0;
+
+    g_return_val_if_fail (contents != NULL, NULL);
+    g_return_val_if_fail (length > 0, NULL);
+
+    /* Check the cache version at first before load whole the file content. */
+    type = g_variant_type_new ("(sq)");
+    variant_table = g_variant_new_from_data (type,
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+    g_variant_type_free (type);
+
+    if (variant_table == NULL) {
+        g_warning ("cache is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_ref_sink (variant_table);
+    g_variant_get (variant_table, "(&sq)", &header, &version);
+
+    if (g_strcmp0 (header, IBUS_COMPOSE_TABLE_MAGIC) != 0) {
+        g_warning ("cache is not IBusComposeTable.");
+        goto out_load_cache;
+    }
+
+    if (version != IBUS_COMPOSE_TABLE_VERSION) {
+        g_warning ("cache version is different: %u != %u",
+                   version, IBUS_COMPOSE_TABLE_VERSION);
+        goto out_load_cache;
+    }
+
+    version = 0;
+    header = NULL;
+    g_variant_unref (variant_table);
+    variant_table = NULL;
+
+    type = g_variant_type_new ("(sqqqv)");
+    variant_table = g_variant_new_from_data (type,
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+    g_variant_type_free (type);
+
+    if (variant_table == NULL) {
+        g_warning ("cache is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_ref_sink (variant_table);
+    g_variant_get (variant_table, "(&sqqqv)",
+                   NULL,
+                   NULL,
+                   &max_seq_len,
+                   &n_seqs,
+                   &variant_data);
+
+    if (max_seq_len == 0 || n_seqs == 0) {
+        g_warning ("cache size is not correct %d %d", max_seq_len, n_seqs);
+        goto out_load_cache;
+    }
+
+    data = g_variant_get_fixed_array (variant_data,
+                                      &data_length,
+                                      sizeof (guint16));
+    index_stride = max_seq_len + 2;
+
+    if (data == NULL) {
+        g_warning ("cache data is null.");
+        goto out_load_cache;
+    }
+    if (data_length != (gsize) index_stride * n_seqs) {
+        g_warning ("cache size is not correct %d %d %lu",
+                   max_seq_len, n_seqs, data_length);
+        goto out_load_cache;
+    }
+
+    retval = g_new0 (IBusComposeTable, 1);
+    retval->data = g_new (guint16, data_length);
+    memcpy (retval->data, data, data_length * sizeof (guint16));
+    retval->max_seq_len = max_seq_len;
+    retval->n_seqs = n_seqs;
+
+
+out_load_cache:
+    if (variant_data)
+        g_variant_unref (variant_data);
+    if (variant_table)
+        g_variant_unref (variant_table);
+    return retval;
+}
+
+static IBusComposeTable *
+ibus_compose_table_load_cache (const gchar *compose_file)
+{
+    IBusComposeTable *retval = NULL;
+    guint32 hash;
+    gchar *path = NULL;
+    gchar *contents = NULL;
+    GStatBuf original_buf;
+    GStatBuf cache_buf;
+    gsize length = 0;
+    GError *error = NULL;
+
+    hash = g_str_hash (compose_file);
+    if ((path = ibus_compose_hash_get_cache_path (hash)) == NULL)
+        return NULL;
+    if (!g_file_test (path, G_FILE_TEST_EXISTS))
+        goto out_load_cache;
+
+    g_stat (compose_file, &original_buf);
+    g_stat (path, &cache_buf);
+    if (original_buf.st_mtime > cache_buf.st_mtime)
+        goto out_load_cache;
+    if (!g_file_get_contents (path, &contents, &length, &error)) {
+        g_warning ("Failed to get cache content %s: %s", path, error->message);
+        g_error_free (error);
+        goto out_load_cache;
+    }
+
+    retval = ibus_compose_table_deserialize (contents, length);
+    if (retval == NULL)
+        g_warning ("Failed to load the cache file: %s", path);
+    else
+        retval->id = hash;
+
+
+out_load_cache:
+    g_free (contents);
+    g_free (path);
+    return retval;
+}
+
+static void
+ibus_compose_table_save_cache (IBusComposeTable *compose_table)
+{
+    gchar *path = NULL;
+    GVariant *variant_table = NULL;
+    const gchar *contents = NULL;
+    GError *error = NULL;
+    gsize length = 0;
+
+    if ((path = ibus_compose_hash_get_cache_path (compose_table->id)) == NULL)
+      return;
+
+    variant_table = ibus_compose_table_serialize (compose_table);
+    if (variant_table == NULL) {
+        g_warning ("Failed to serialize compose table %s", path);
+        goto out_save_cache;
+    }
+    contents = g_variant_get_data (variant_table);
+    length = g_variant_get_size (variant_table);
+    if (!g_file_set_contents (path, contents, length, &error)) {
+        g_warning ("Failed to save compose table %s: %s", path, error->message);
+        g_error_free (error);
+        goto out_save_cache;
+    }
+
+out_save_cache:
+    g_variant_unref (variant_table);
+    g_free (path);
+}
+
 static IBusComposeTable *
 ibus_compose_table_new_with_list (GList   *compose_list,
                                   int      max_compose_len,
-                                  int      n_index_stride)
+                                  int      n_index_stride,
+                                  guint32  hash)
 {
     guint length;
     guint n = 0;
@@ -506,6 +775,7 @@ ibus_compose_table_new_with_list (GList   *compose_list,
     retval->data = ibus_compose_seqs;
     retval->max_seq_len = max_compose_len;
     retval->n_seqs = length;
+    retval->id = hash;
 
     return retval;
 }
@@ -546,10 +816,85 @@ ibus_compose_table_new_with_file (const gchar *compose_file)
     compose_table = ibus_compose_table_new_with_list (
             compose_list,
             max_compose_len,
-            n_index_stride);
+            n_index_stride,
+            g_str_hash (compose_file));
 
     g_list_free_full (compose_list,
                       (GDestroyNotify) ibus_compose_list_element_free);
 
     return compose_table;
 }
+
+/* if ibus_compose_seqs[N - 1] is an outputed compose character,
+ * ibus_compose_seqs[N * 2 - 1] is also an outputed compose character.
+ * and ibus_compose_seqs[0] to ibus_compose_seqs[0 + N - 3] are the
+ * sequences and call ibus_engine_simple_add_table:
+ * ibus_engine_simple_add_table(engine, ibus_compose_seqs,
+ *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs) / N)
+ * The compose sequences are allowed within G_MAXUINT16
+ */
+GSList *
+ibus_compose_table_list_add_array (GSList        *compose_tables,
+                                   const guint16 *data,
+                                   gint           max_seq_len,
+                                   gint           n_seqs)
+{
+    guint32 hash;
+    IBusComposeTable *compose_table;
+    int n_index_stride = max_seq_len + 2;
+    int length = n_index_stride * n_seqs;
+    int i;
+    guint16 *ibus_compose_seqs = NULL;
+
+    g_return_val_if_fail (data != NULL, compose_tables);
+    g_return_val_if_fail (max_seq_len <= IBUS_MAX_COMPOSE_LEN, compose_tables);
+
+    hash = ibus_compose_table_data_hash (data, length);
+
+    if (g_slist_find_custom (compose_tables,
+                             GINT_TO_POINTER (hash),
+                             ibus_compose_table_find) != NULL) {
+        return compose_tables;
+    }
+
+    ibus_compose_seqs = g_new0 (guint16, length);
+    for (i = 0; i < length; i++)
+        ibus_compose_seqs[i] = data[i];
+
+    compose_table = g_new (IBusComposeTable, 1);
+    compose_table->data = ibus_compose_seqs;
+    compose_table->max_seq_len = max_seq_len;
+    compose_table->n_seqs = n_seqs;
+    compose_table->id = hash;
+
+    return g_slist_prepend (compose_tables, compose_table);
+}
+
+GSList *
+ibus_compose_table_list_add_file (GSList      *compose_tables,
+                                  const gchar *compose_file)
+{
+    guint32 hash;
+    IBusComposeTable *compose_table;
+
+    g_return_val_if_fail (compose_file != NULL, compose_tables);
+
+    hash = g_str_hash (compose_file);
+    if (g_slist_find_custom (compose_tables,
+                             GINT_TO_POINTER (hash),
+                             ibus_compose_table_find) != NULL) {
+        return compose_tables;
+    }
+
+    compose_table = ibus_compose_table_load_cache (compose_file);
+    if (compose_table != NULL)
+        return g_slist_prepend (compose_tables, compose_table);
+
+   if ((compose_table = ibus_compose_table_new_with_file (compose_file))
+           == NULL) {
+       return compose_tables;
+   }
+
+    ibus_compose_table_save_cache (compose_table);
+    return g_slist_prepend (compose_tables, compose_table);
+}
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 3172d74f9..8346df6d2 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -25,13 +25,6 @@
 
 #include <glib.h>
 
-/* if ibus_compose_seqs[N - 1] is an outputed compose character,
- * ibus_compose_seqs[N * 2 - 1] is also an outputed compose character.
- * and ibus_compose_seqs[0] to ibus_compose_seqs[0 + N - 3] are the
- * sequences and call ibus_engine_simple_add_table:
- * ibus_engine_simple_add_table(engine, ibus_compose_seqs,
- *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs) / N)
- * The compose sequences are allowed within G_MAXUINT16 */
 
 G_BEGIN_DECLS
 
@@ -40,9 +33,10 @@ typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
 
 struct _IBusComposeTable
 {
-    const guint16 *data;
+    guint16 *data;
     gint max_seq_len;
     gint n_seqs;
+    guint32 id;
 };
 
 struct _IBusComposeTableCompact
@@ -54,6 +48,16 @@ struct _IBusComposeTableCompact
 };
 
 IBusComposeTable *ibus_compose_table_new_with_file (const gchar *compose_file);
+GSList           *ibus_compose_table_list_add_array
+                                                   (GSList
+                                                                *compose_tables,
+                                                    const guint16
+                                                                *data,
+                                                    gint         max_seq_len,
+                                                    gint         n_seqs);
+GSList           *ibus_compose_table_list_add_file (GSList
+                                                                *compose_tables,
+                                                    const gchar *compose_file);
 
 G_BEGIN_DECLS
 #endif
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index b8190c643..1b688b09c 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -41,12 +41,11 @@
 #include <memory.h>
 #include <stdlib.h>
 
-#define X11_DATADIR "/usr/share/X11/locale"
+#define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
 struct _IBusEngineSimplePrivate {
-    GSList     *tables;
     guint16     compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
     gunichar    tentative_match;
     gint        tentative_match_len;
@@ -67,6 +66,8 @@ const IBusComposeTableCompact ibus_compose_table_compact = {
     6
 };
 
+static GSList *global_tables;
+
 static const guint16 ibus_compose_ignore[] = {
     IBUS_KEY_Shift_L,
     IBUS_KEY_Shift_R,
@@ -127,11 +128,6 @@ ibus_engine_simple_init (IBusEngineSimple *simple)
 static void
 ibus_engine_simple_destroy (IBusEngineSimple *simple)
 {
-    IBusEngineSimplePrivate *priv = simple->priv;
-
-    g_slist_free_full (priv->tables, g_free);
-    priv->tables = NULL;
-
     IBUS_OBJECT_CLASS(ibus_engine_simple_parent_class)->destroy (
         IBUS_OBJECT (simple));
 }
@@ -315,9 +311,9 @@ compare_seq (const void *key, const void *value)
 
 
 static gboolean
-check_table (IBusEngineSimple *simple,
-             IBusComposeTable *table,
-             gint              n_compose)
+check_table (IBusEngineSimple       *simple,
+             const IBusComposeTable *table,
+             gint                    n_compose)
 {
     // g_debug("check_table");
     IBusEngineSimplePrivate *priv = simple->priv;
@@ -904,7 +900,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         }
     }
     else {
-        GSList *list = priv->tables;
+        GSList *list = global_tables;
         while (list) {
             if (check_table (simple,
                              (IBusComposeTable *)list->data,
@@ -950,51 +946,102 @@ ibus_engine_simple_add_table (IBusEngineSimple *simple,
                               gint              max_seq_len,
                               gint              n_seqs)
 {
-    IBusEngineSimplePrivate *priv = simple->priv;
-
     g_return_if_fail (IBUS_IS_ENGINE_SIMPLE (simple));
-    g_return_if_fail (data != NULL);
-    g_return_if_fail (max_seq_len <= IBUS_MAX_COMPOSE_LEN);
-
-    IBusComposeTable *table = g_new (IBusComposeTable, 1);
-    table->data = data;
-    table->max_seq_len = max_seq_len;
-    table->n_seqs = n_seqs;
 
-    priv->tables = g_slist_prepend (priv->tables, table);
+    global_tables = ibus_compose_table_list_add_array (global_tables,
+                                                       data,
+                                                       max_seq_len,
+                                                       n_seqs);
 }
 
 gboolean
 ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
                                         const gchar      *locale)
 {
-    const gchar *_locale = locale;
-    gchar **langs = NULL;
-    gchar **l = NULL;
+    /* Now ibus_engine_simple_add_compose_file() always returns TRUE. */
+    gboolean retval = TRUE;
     gchar *path = NULL;
+    const gchar *home;
+    const gchar *_locale;
+    gchar **langs = NULL;
+    gchar **lang = NULL;
+    gchar * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL };
+    gchar * const *sys_lang = NULL;
+
+    if (locale == NULL) {
+        path = g_build_filename (g_get_user_config_dir (),
+                                 "ibus", "Compose", NULL);
+        if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+            ibus_engine_simple_add_compose_file (simple, path);
+            g_free (path);
+            return retval;
+        }
+        g_free (path);
+        path = NULL;
+
+        path = g_build_filename (g_get_user_config_dir (),
+                                 "gtk-3.0", "Compose", NULL);
+        if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+            ibus_engine_simple_add_compose_file (simple, path);
+            g_free (path);
+            return retval;
+        }
+        g_free (path);
+        path = NULL;
+
+        home = g_get_home_dir ();
+        if (home == NULL)
+            return retval;
+
+        path = g_build_filename (home, ".XCompose", NULL);
+        if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+            ibus_engine_simple_add_compose_file (simple, path);
+            g_free (path);
+            return retval;
+        }
+        g_free (path);
+        path = NULL;
 
-    if (_locale == NULL) {
         _locale = g_getenv ("LC_CTYPE");
-        if (_locale == NULL) {
+        if (_locale == NULL)
             _locale = g_getenv ("LANG");
-        }
-        if (_locale == NULL) {
+        if (_locale == NULL)
             _locale = "C";
-        }
+
         /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=751826 */
         langs = g_get_locale_variants (_locale);
-        for (l = langs; *l; l++) {
-            if (g_str_has_prefix (*l, "en_US"))
+
+        for (lang = langs; *lang; lang++) {
+            if (g_str_has_prefix (*lang, "en_US"))
                 break;
-            if (g_strcmp0 (*l, "C") == 0)
+            if (**lang == 'C')
                 break;
-            path = g_build_filename (X11_DATADIR, *l, "Compose", NULL);
+
+            /* Other languages just include en_us compose table. */
+            for (sys_lang = sys_langs; *sys_lang; sys_lang++) {
+                if (g_ascii_strncasecmp (*lang, *sys_lang,
+                                         strlen (*sys_lang)) == 0) {
+                    path = g_build_filename (X11_DATADIR,
+                                             *lang, "Compose", NULL);
+                    break;
+                }
+            }
+
+            if (path == NULL)
+                continue;
+
             if (g_file_test (path, G_FILE_TEST_EXISTS))
                 break;
             g_free (path);
             path = NULL;
         }
+
         g_strfreev (langs);
+
+        if (path != NULL)
+            ibus_engine_simple_add_compose_file (simple, path);
+        g_free (path);
+        path = NULL;
     } else {
         path = g_build_filename (X11_DATADIR, locale, "Compose", NULL);
         do {
@@ -1003,27 +1050,21 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             g_free (path);
             path = NULL;
         } while (0);
+        if (path == NULL)
+            return retval;
+        ibus_engine_simple_add_compose_file (simple, path);
     }
 
-    if (path == NULL)
-        return FALSE;
-
-    return ibus_engine_simple_add_compose_file (simple, path);
+    return retval;
 }
 
 gboolean
 ibus_engine_simple_add_compose_file (IBusEngineSimple *simple,
                                      const gchar      *compose_file)
 {
-    IBusEngineSimplePrivate *priv = simple->priv;
-    IBusComposeTable *table;
-
-    g_assert (compose_file != NULL);
-
-    table = ibus_compose_table_new_with_file (compose_file);
-    if (table == NULL)
-        return FALSE;
+    g_return_val_if_fail (IBUS_IS_ENGINE_SIMPLE (simple), TRUE);
 
-    priv->tables = g_slist_prepend (priv->tables, table);
+    global_tables = ibus_compose_table_list_add_file (global_tables,
+                                                      compose_file);
     return TRUE;
 }

From b51c6200686d5494f317f8675763bad5cdd442b2 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 17 Feb 2016 16:29:03 +0900
Subject: [PATCH 342/816] Add SetCursorLocationRelative D-Bus method

We have SetCursorLocation D-Bus method which takes the absolute
coordinates of the screen, while on Wayland the coordinates are relative
to the current input window and there is no way to calculate the
absolute coordinates.  That makes it impossible for the panel to
position the lookup table correctly.

This patch adds a new D-Bus method, SetCursorLocationRelative, which
takes the relative coordinates, so that the panel
implementation (typically the same process of Wayland compositor) can
use that information.  The counterpart of this changes is at:
https://bugzilla.gnome.org/show_bug.cgi?id=753476

Unlike SetCursorLocation, SetCursorLocationRelative is not delivered to
engines, since it is not very useful for the engines without knowing the
current input window (which is also not accessible from a different
process on Wayland).

Co-authored-by: Rui Matos <tiagomatos@gmail.com>

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/290780043 .
---
 bus/inputcontext.c          | 54 ++++++++++++++++++++++++++++++++
 bus/panelproxy.c            | 32 +++++++++++++++++++
 bus/panelproxy.h            |  6 ++++
 client/gtk2/ibusimcontext.c | 28 +++++++++++++++++
 src/ibusinputcontext.c      | 20 ++++++++++++
 src/ibusinputcontext.h      | 16 ++++++++++
 src/ibuspanelservice.c      | 62 +++++++++++++++++++++++++++++++++++++
 src/ibuspanelservice.h      |  8 ++++-
 8 files changed, 225 insertions(+), 1 deletion(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index ea77102da..789bba26f 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -105,6 +105,7 @@ struct _BusInputContextClass {
 enum {
     PROCESS_KEY_EVENT,
     SET_CURSOR_LOCATION,
+    SET_CURSOR_LOCATION_RELATIVE,
     FOCUS_IN,
     FOCUS_OUT,
     UPDATE_PREEDIT_TEXT,
@@ -230,6 +231,12 @@ static const gchar introspection_xml[] =
     "      <arg direction='in' type='i' name='w' />"
     "      <arg direction='in' type='i' name='h' />"
     "    </method>"
+    "    <method name='SetCursorLocationRelative'>"
+    "      <arg direction='in' type='i' name='x' />"
+    "      <arg direction='in' type='i' name='y' />"
+    "      <arg direction='in' type='i' name='w' />"
+    "      <arg direction='in' type='i' name='h' />"
+    "    </method>"
     "    <method name='ProcessHandWritingEvent'>"
     "      <arg direction='in' type='ad' name='coordinates' />"
     "    </method>"
@@ -373,6 +380,20 @@ bus_input_context_class_init (BusInputContextClass *class)
             G_TYPE_INT,
             G_TYPE_INT);
 
+    context_signals[SET_CURSOR_LOCATION_RELATIVE] =
+        g_signal_new (I_("set-cursor-location-relative"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__INT_INT_INT_INT,
+            G_TYPE_NONE,
+            4,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT);
+
     context_signals[FOCUS_IN] =
         g_signal_new (I_("focus-in"),
             G_TYPE_FROM_CLASS (class),
@@ -846,6 +867,38 @@ _ic_set_cursor_location (BusInputContext       *context,
     }
 }
 
+/**
+ * _ic_set_cursor_location_relative:
+ *
+ * Implement the "SetCursorLocationRelative" method call of the
+ * org.freedesktop.IBus.InputContext interface.
+ *
+ * Unlike _ic_set_cursor_location, this doesn't deliver the location
+ * to the engine proxy, since the relative coordinates are not very
+ * useful for engines.
+ */
+static void
+_ic_set_cursor_location_relative (BusInputContext       *context,
+                                  GVariant              *parameters,
+                                  GDBusMethodInvocation *invocation)
+{
+    gint x, y, w, h;
+
+    g_dbus_method_invocation_return_value (invocation, NULL);
+
+    g_variant_get (parameters, "(iiii)", &x, &y, &w, &h);
+
+    if (context->capabilities & IBUS_CAP_FOCUS) {
+        g_signal_emit (context,
+                       context_signals[SET_CURSOR_LOCATION_RELATIVE],
+                       0,
+                       x,
+                       y,
+                       w,
+                       h);
+    }
+}
+
 static void
 _ic_process_hand_writing_event (BusInputContext       *context,
                                 GVariant              *parameters,
@@ -1127,6 +1180,7 @@ bus_input_context_service_method_call (IBusService            *service,
     } methods [] =  {
         { "ProcessKeyEvent",   _ic_process_key_event },
         { "SetCursorLocation", _ic_set_cursor_location },
+        { "SetCursorLocationRelative", _ic_set_cursor_location_relative },
         { "ProcessHandWritingEvent",
                                _ic_process_hand_writing_event },
         { "CancelHandWriting", _ic_cancel_hand_writing },
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 9d47b1365..4ff5d89af 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -319,6 +319,21 @@ bus_panel_proxy_set_cursor_location (BusPanelProxy *panel,
                        -1, NULL, NULL, NULL);
 }
 
+void
+bus_panel_proxy_set_cursor_location_relative (BusPanelProxy *panel,
+                                              gint           x,
+                                              gint           y,
+                                              gint           w,
+                                              gint           h)
+{
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "SetCursorLocationRelative",
+                       g_variant_new ("(iiii)", x, y, w, h),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
+
 void
 bus_panel_proxy_update_preedit_text (BusPanelProxy  *panel,
                                      IBusText       *text,
@@ -498,6 +513,22 @@ _context_set_cursor_location_cb (BusInputContext *context,
     bus_panel_proxy_set_cursor_location (panel, x, y, w, h);
 }
 
+static void
+_context_set_cursor_location_relative_cb (BusInputContext *context,
+                                          gint             x,
+                                          gint             y,
+                                          gint             w,
+                                          gint             h,
+                                          BusPanelProxy   *panel)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+
+    g_return_if_fail (panel->focused_context == context);
+
+    bus_panel_proxy_set_cursor_location_relative (panel, x, y, w, h);
+}
+
 static void
 _context_update_preedit_text_cb (BusInputContext *context,
                                  IBusText        *text,
@@ -634,6 +665,7 @@ static const struct {
     GCallback callback;
 } input_context_signals[] = {
     { "set-cursor-location",        G_CALLBACK (_context_set_cursor_location_cb) },
+    { "set-cursor-location-relative", G_CALLBACK (_context_set_cursor_location_relative_cb) },
 
     { "update-preedit-text",        G_CALLBACK (_context_update_preedit_text_cb) },
     { "show-preedit-text",          G_CALLBACK (_context_show_preedit_text_cb) },
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index 57cf9db31..5002f86d0 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -70,6 +70,12 @@ void             bus_panel_proxy_set_cursor_location
                                                 gint32             y,
                                                 gint32             w,
                                                 gint32             h);
+void             bus_panel_proxy_set_cursor_location_relative
+                                               (BusPanelProxy     *panel,
+                                                gint32             x,
+                                                gint32             y,
+                                                gint32             w,
+                                                gint32             h);
 void             bus_panel_proxy_update_preedit_text
                                                (BusPanelProxy     *panel,
                                                 IBusText          *text,
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 5c20592d4..9d927e63b 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -30,6 +30,10 @@
 #include <ibus.h>
 #include "ibusimcontext.h"
 
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
+
 #if !GTK_CHECK_VERSION (2, 91, 0)
 #  define DEPRECATED_GDK_KEYSYMS 1
 #endif
@@ -1011,6 +1015,30 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
     }
 
     area = ibusimcontext->cursor_area;
+
+#ifdef GDK_WINDOWING_WAYLAND
+    if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) {
+        gdouble px, py;
+        GdkWindow *parent;
+        GdkWindow *window = ibusimcontext->client_window;
+
+        while ((parent = gdk_window_get_effective_parent (window)) != NULL) {
+            gdk_window_coords_to_parent (window, area.x, area.y, &px, &py);
+            area.x = px;
+            area.y = py;
+            window = parent;
+        }
+
+        ibus_input_context_set_cursor_location_relative (
+            ibusimcontext->ibuscontext,
+            area.x,
+            area.y,
+            area.width,
+            area.height);
+        return FALSE;
+    }
+#endif
+
     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
 #if GTK_CHECK_VERSION (2, 91, 0)
         area.x = 0;
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 908011fa7..9a50acc0f 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -943,6 +943,26 @@ ibus_input_context_set_cursor_location (IBusInputContext *context,
                        );
 }
 
+void
+ibus_input_context_set_cursor_location_relative (IBusInputContext *context,
+                                                 gint32            x,
+                                                 gint32            y,
+                                                 gint32            w,
+                                                 gint32            h)
+{
+    g_assert (IBUS_IS_INPUT_CONTEXT (context));
+
+    g_dbus_proxy_call ((GDBusProxy *) context,
+                       "SetCursorLocationRelative",         /* method_name */
+                       g_variant_new ("(iiii)", x, y, w, h),/* parameters */
+                       G_DBUS_CALL_FLAGS_NONE,              /* flags */
+                       -1,                                  /* timeout */
+                       NULL,                                /* cancellable */
+                       NULL,                                /* callback */
+                       NULL                                 /* user_data */
+                       );
+}
+
 void
 ibus_input_context_set_capabilities (IBusInputContext   *context,
                                      guint32             capabilites)
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index 5c6372f67..a77cf92f3 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -316,6 +316,22 @@ void         ibus_input_context_set_cursor_location
                                              gint32              y,
                                              gint32              w,
                                              gint32              h);
+/**
+ * ibus_input_context_set_cursor_location_relative:
+ * @context: An IBusInputContext.
+ * @x: X coordinate of the cursor.
+ * @y: Y coordinate of the cursor.
+ * @w: Width of the cursor.
+ * @h: Height of the cursor.
+ *
+ * Set the relative cursor location of IBus input context asynchronously.
+ */
+void         ibus_input_context_set_cursor_location_relative
+                                            (IBusInputContext   *context,
+                                             gint32              x,
+                                             gint32              y,
+                                             gint32              w,
+                                             gint32              h);
 /**
  * ibus_input_context_set_capabilities:
  * @context: An IBusInputContext.
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 27b765587..b95f54a92 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -33,6 +33,7 @@ enum {
     REGISTER_PROPERTIES,
     UPDATE_PROPERTY,
     SET_CURSOR_LOCATION,
+    SET_CURSOR_LOCATION_RELATIVE,
     CURSOR_UP_LOOKUP_TABLE,
     CURSOR_DOWN_LOOKUP_TABLE,
     HIDE_AUXILIARY_TEXT,
@@ -118,6 +119,12 @@ static void      ibus_panel_service_set_cursor_location
                                     gint                    y,
                                     gint                    w,
                                     gint                    h);
+static void      ibus_panel_service_set_cursor_location_relative
+                                   (IBusPanelService       *panel,
+                                    gint                    x,
+                                    gint                    y,
+                                    gint                    w,
+                                    gint                    h);
 static void      ibus_panel_service_update_auxiliary_text
                                    (IBusPanelService       *panel,
                                     IBusText               *text,
@@ -189,6 +196,12 @@ static const gchar introspection_xml[] =
     "      <arg direction='in' type='i' name='w' />"
     "      <arg direction='in' type='i' name='h' />"
     "    </method>"
+    "    <method name='SetCursorLocationRelative'>"
+    "      <arg direction='in' type='i' name='x' />"
+    "      <arg direction='in' type='i' name='y' />"
+    "      <arg direction='in' type='i' name='w' />"
+    "      <arg direction='in' type='i' name='h' />"
+    "    </method>"
     "    <method name='Reset' />"
     "    <method name='StartSetup' />"
     "    <method name='StateChanged' />"
@@ -251,6 +264,7 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
     class->destroy_context       = ibus_panel_service_destroy_context;
     class->register_properties   = ibus_panel_service_register_properties;
     class->set_cursor_location   = ibus_panel_service_set_cursor_location;
+    class->set_cursor_location_relative = ibus_panel_service_set_cursor_location_relative;
     class->update_lookup_table   = ibus_panel_service_update_lookup_table;
     class->update_auxiliary_text = ibus_panel_service_update_auxiliary_text;
     class->update_preedit_text   = ibus_panel_service_update_preedit_text;
@@ -480,6 +494,35 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             G_TYPE_INT,
             G_TYPE_INT);
 
+    /**
+     * IBusPanelService::set-cursor-location-relative:
+     * @panel: An #IBusPanelService
+     * @x: X coordinate of the cursor.
+     * @y: Y coordinate of the cursor.
+     * @w: Width of the cursor.
+     * @h: Height of the cursor.
+     *
+     * Emitted when the client application get the set-cursor-location-relative.
+     * Implement the member function set_cursor_location_relative() in
+     * extended class to receive this signal.
+     *
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
+     */
+    panel_signals[SET_CURSOR_LOCATION_RELATIVE] =
+        g_signal_new (I_("set-cursor-location-relative"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, set_cursor_location_relative),
+            NULL, NULL,
+            _ibus_marshal_VOID__INT_INT_INT_INT,
+            G_TYPE_NONE,
+            4,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT);
+
     /**
      * IBusPanelService::cursor-up-lookup-table:
      * @panel: An #IBusPanelService
@@ -1011,6 +1054,15 @@ ibus_panel_service_service_method_call (IBusService           *service,
         return;
     }
 
+    if (g_strcmp0 (method_name, "SetCursorLocationRelative") == 0) {
+        gint x, y, w, h;
+        g_variant_get (parameters, "(iiii)", &x, &y, &w, &h);
+        g_signal_emit (panel, panel_signals[SET_CURSOR_LOCATION_RELATIVE],
+                       0, x, y, w, h);
+        g_dbus_method_invocation_return_value (invocation, NULL);
+        return;
+    }
+
     if (g_strcmp0 (method_name, "ContentType") == 0) {
         guint purpose, hints;
         g_variant_get (parameters, "(uu)", &purpose, &hints);
@@ -1141,6 +1193,16 @@ ibus_panel_service_set_cursor_location (IBusPanelService *panel,
     ibus_panel_service_not_implemented(panel);
 }
 
+static void
+ibus_panel_service_set_cursor_location_relative (IBusPanelService *panel,
+                                                 gint              x,
+                                                 gint              y,
+                                                 gint              w,
+                                                 gint              h)
+{
+    ibus_panel_service_not_implemented(panel);
+}
+
 static void
 ibus_panel_service_update_auxiliary_text (IBusPanelService *panel,
                                           IBusText         *text,
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index c3f1833ca..07b56296f 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -121,10 +121,16 @@ struct _IBusPanelServiceClass {
     void     (* set_content_type)          (IBusPanelService       *panel,
                                             guint                   purpose,
                                             guint                   hints);
+    void     (* set_cursor_location_relative)
+                                           (IBusPanelService       *panel,
+                                            gint                    x,
+                                            gint                    y,
+                                            gint                    w,
+                                            gint                    h);
 
     /*< private >*/
     /* padding */
-    gpointer pdummy[6];  // We can add 8 pointers without breaking the ABI.
+    gpointer pdummy[5];  // We can add 8 pointers without breaking the ABI.
 };
 
 GType            ibus_panel_service_get_type  (void);

From 0229c57773144f6f78ed568a0afc1999679c7d51 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 22 Feb 2016 17:38:30 +0900
Subject: [PATCH 343/816] Release 1.5.13

Review URL: https://codereview.appspot.com/290840043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 57cf16ecf..23d01d936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [12])
+m4_define([ibus_micro_version], [13])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 0432aa66b8728bc266da3c2cca84587bc44b3557 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 8 Mar 2016 11:16:24 +0900
Subject: [PATCH 344/816] Don't warn if DISPLAY is not set

This is normal under Wayland, and not worth warning about.
The warnings disrupt unit tests in GNOME continuous, which
treat warnings as fatal.

BUG=https://github.com/ibus/ibus/pull/1844
R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/289430043

Patch from Matthias Clasen <mclasen@redhat.com>.
---
 src/ibusshare.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index 63800a60b..b793a962f 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -113,10 +113,7 @@ ibus_get_socket_path (void)
             display = g_strdup (_display);
         }
 
-        if (display == NULL) {
-            g_warning ("DISPLAY is empty! We use default DISPLAY (:0.0)");
-        }
-        else {
+        if (display) {
             p = display;
             hostname = display;
             for (; *p != ':' && *p != '\0'; p++);

From 84c18f1d382548c52138822a11473d2dac79e485 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Wed, 25 May 2016 11:21:09 +0900
Subject: [PATCH 345/816] Install a DBus service file

With the transition to user scoped DBus sessions (vs. login sessions)
there's a need to start ibus-daemon via DBus activation so that the
process gets properly tracked and disposed of when the login session
ends. Otherwise the ibus-daemon process lingers on and keeps the whole
login session up.

We already connect and own a well known name on DBus. The remaining
missing piece is the DBus service file which we introduce here.

BUG=https://github.com/ibus/ibus/pull/1853
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/295340043

Patch from Rui Matos <tiagomatos@gmail.com>.
---
 bus/Makefile.am                     | 11 +++++++++++
 bus/org.freedesktop.IBus.service.in |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 bus/org.freedesktop.IBus.service.in

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 26cb2f881..4dabacf54 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -174,4 +174,15 @@ man_onedir = $(mandir)/man1
 %.1.gz: %.1
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
+
+dbusservice_in_files = org.freedesktop.IBus.service.in
+dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+dbusservicedir=${datadir}/dbus-1/services
+
+org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
+
+EXTRA_DIST += $(dbusservice_in_files)
+CLEANFILES += $(dbusservice_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/bus/org.freedesktop.IBus.service.in b/bus/org.freedesktop.IBus.service.in
new file mode 100644
index 000000000..cc8883423
--- /dev/null
+++ b/bus/org.freedesktop.IBus.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.IBus
+Exec=@bindir@/ibus-daemon --replace --xim --panel disable

From b210c0d8c601f4b458b4f06937303e9479466fec Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 26 May 2016 12:17:50 +0900
Subject: [PATCH 346/816] configure: don't hardcode pkg-config

BUG=https://github.com/ibus/ibus/pull/1860
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/299150043

Patch from Marc-Antoine Perennou <Marc-Antoine@Perennou.com>.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 23d01d936..1e1f5dd37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,7 +603,7 @@ fi
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
 ])
-ISOCODES_PREFIX=`pkg-config iso-codes --variable=prefix`
+ISOCODES_PREFIX=`$PKG_CONFIG iso-codes --variable=prefix`
 AC_SUBST(ISOCODES_PREFIX)
 
 # OUTPUT files

From a186059edc48b22e4adfc1878bb5fd0ee60d4fe0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 26 May 2016 12:22:53 +0900
Subject: [PATCH 347/816] conf/gconf: Fix SEGV in ibus_config_gconf_get_values

BUG=https://github.com/ibus/ibus/issues/1858
R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/300810043
---
 conf/gconf/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/gconf/config.c b/conf/gconf/config.c
index 6c294649b..6a4bd5bdd 100644
--- a/conf/gconf/config.c
+++ b/conf/gconf/config.c
@@ -304,7 +304,7 @@ ibus_config_gconf_get_values (IBusConfigService      *config,
     g_free (dir);
 
     GSList *p;
-    GVariantBuilder *builder;
+    GVariantBuilder builder;
 
     g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
     for (p = entries; p != NULL; p = p->next) {

From 3ef21fef0135f7b4fe9611d201f15611734f6c51 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Jun 2016 11:52:29 +0900
Subject: [PATCH 348/816] client/gtk2: Fix SEGV with Wayland display

Delete gdk_display_get_name() in GTK clients because ibus-daemon
does not use gdk_display_get_name().
GdkX11Dislay and GdkX11Window does not work with Wayland.

BUG=https://github.com/ibus/ibus/issues/1859
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/301760043
---
 client/gtk2/ibusimcontext.c | 5 -----
 setup/main.py               | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 9d927e63b..0df006204 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -583,11 +583,6 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 
     /* init bus object */
     if (_bus == NULL) {
-        const gchar *dname = gdk_display_get_name (gdk_display_get_default ());
-        /* ibus-daemon uses DISPLAY variable. */
-        if (g_strcmp0 (dname, "Wayland") == 0)
-            dname = g_getenv ("DISPLAY");
-        ibus_set_display (dname);
         _bus = ibus_bus_new_async ();
 
         /* init the global fake context */
diff --git a/setup/main.py b/setup/main.py
index 26c2b0f3f..e1f7a9d61 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -275,8 +275,11 @@ def __init_ui(self):
         self.__init_general()
 
     def __gdk_window_set_cb(self, object, pspec):
-        str = '%u' % GdkX11.X11Window.get_xid(object.get_window())
-        GLib.setenv('IBUS_SETUP_XID', str, True)
+        window = object.get_window()
+        if type(window) != GdkX11.X11Window:
+            return
+        s = '%u' % GdkX11.X11Window.get_xid(window)
+        GLib.setenv('IBUS_SETUP_XID', s, True)
 
     def __combobox_notify_active_engine_cb(self, combobox, property):
         engine = self.__combobox.get_active_engine()

From a598ae29223d1ca25e76bf7d7de9703f63ea337e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Jun 2016 19:44:11 +0900
Subject: [PATCH 349/816] ui/gtk3: Fix panel CSS format for GTK 3.20

CSS node names have been changed since GTK 3.20 and the font size and
widget color no longer work with the previous node names.

BUG=https://github.com/ibus/ibus/issues/1856

Review URL: https://codereview.appspot.com/297380043
---
 ui/gtk3/candidatearea.vala | 16 +++++++++++++---
 ui/gtk3/handle.vala        | 10 ++++++++--
 ui/gtk3/panel.vala         |  9 +++++++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index c969312f5..3848f0d86 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,6 +31,10 @@ class CandidateArea : Gtk.Box {
     private uint m_focus_candidate;
     private bool m_show_cursor;
 
+    private bool m_use_latest_css_format =
+            ((Gtk.MAJOR_VERSION > 3) ||
+             (Gtk.MAJOR_VERSION == 3) && (Gtk.MINOR_VERSION >= 20));
+
     private const string LABELS[] = {
         "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
         "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
@@ -103,7 +107,8 @@ class CandidateArea : Gtk.Box {
                 Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(candidates[i]);
                 if (i == focus_candidate && show_cursor) {
                     Gtk.StyleContext context = m_candidates[i].get_style_context();
-                    Gdk.RGBA color = context.get_color(Gtk.StateFlags.SELECTED);
+                    Gdk.RGBA *color = null;
+                    context.get(Gtk.StateFlags.SELECTED, "color", out color);
                     Pango.Attribute pango_attr = Pango.attr_foreground_new(
                             (uint16)(color.red * uint16.MAX),
                             (uint16)(color.green * uint16.MAX),
@@ -112,7 +117,12 @@ class CandidateArea : Gtk.Box {
                     pango_attr.end_index = candidates[i].get_text().length;
                     attrs.insert((owned)pango_attr);
 
-                    color = context.get_background_color(Gtk.StateFlags.SELECTED);
+                    color = null;
+                    string bg_prop =
+                            m_use_latest_css_format
+                            ? "-gtk-secondary-caret-color"
+                            : "background-color";
+                    context.get(Gtk.StateFlags.SELECTED, bg_prop, out color);
                     pango_attr = Pango.attr_background_new(
                             (uint16)(color.red * uint16.MAX),
                             (uint16)(color.green * uint16.MAX),
diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index 1edb5373d..bef5e8ba7 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -2,7 +2,8 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2011-2016 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,6 +30,11 @@ class Handle : Gtk.EventBox {
     public signal void move_end();
 
     public Handle() {
+        // Call base class constructor
+        GLib.Object(
+            name : "IBusHandle"
+        );
+
         set_size_request(6, -1);
         Gdk.EventMask mask = Gdk.EventMask.EXPOSURE_MASK |
                              Gdk.EventMask.BUTTON_PRESS_MASK |
@@ -42,7 +48,7 @@ class Handle : Gtk.EventBox {
         Gtk.CssProvider css_provider = new Gtk.CssProvider();
         try {
             css_provider.load_from_data(
-                    "GtkEventBox { background-color: gray }", -1);
+                    "#IBusHandle { background-color: gray }", -1);
         } catch (GLib.Error error) {
             warning("Parse error in Handle: %s", error.message);
         }
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 2ca3a5ef8..cc19350b6 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2016 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -543,7 +543,12 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        string data_format = "GtkLabel { font: %s; }";
+        string data_format = "label { font: %s; }";
+        if (Gtk.MAJOR_VERSION < 3 ||
+            (Gtk.MAJOR_VERSION == 3 && Gtk.MINOR_VERSION < 20)) {
+            data_format = "GtkLabel { font: %s; }";
+        }
+
         string data = data_format.printf(font_name);
         m_css_provider = new Gtk.CssProvider();
 

From 160d3c975af91eea6b8271b757be769b8ceef98d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 21 Jun 2016 18:10:21 +0900
Subject: [PATCH 350/816] engine: Implement Emoji typing with XKB engines

Now Ctrl+Shift+e can convert an Emoji annotation to the Emoji characters
likes Ctrl+Shift+u.
The annotations are described as "Keywords" in the Unicode Emoji Data:
http://www.unicode.org/emoji/charts/emoji-list.html
'emoji-parser' compiles 'emoji-list.html' and generates 'emoji.dict'

Review URL: https://codereview.appspot.com/295610043
---
 configure.ac           |  16 ++
 src/Makefile.am        |  31 +++
 src/emoji-parser.c     | 217 ++++++++++++++++++++
 src/ibusenginesimple.c | 443 +++++++++++++++++++++++++++++++++++++----
 src/ibusutil.c         | 193 +++++++++++++++++-
 src/ibusutil.h         |  31 ++-
 6 files changed, 890 insertions(+), 41 deletions(-)
 create mode 100644 src/emoji-parser.c

diff --git a/configure.ac b/configure.ac
index 1e1f5dd37..3128ef987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -599,6 +599,21 @@ if test x"$enable_libnotify" = x"yes"; then
     enable_libnotify="yes (enabled, use --disable-libnotify to disable)"
 fi
 
+# --disable-emoji-dict option.
+AC_ARG_ENABLE(emoji-dict,
+    AS_HELP_STRING([--disable-emoji-dict],
+                   [Do not build Emoji dict files]),
+    [enable_emoji_dict=$enableval],
+    [enable_emoji_dict=yes]
+)
+AM_CONDITIONAL([ENABLE_EMOJI_DICT], [test x"$enable_emoji_dict" = x"yes"])
+if test x"$enable_emoji_dict" = x"yes"; then
+    PKG_CHECK_MODULES(LIBXML2, [
+        libxml-2.0
+    ])
+    enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
+fi
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -682,6 +697,7 @@ Build options:
   Panel icon                    "$IBUS_ICON_KEYBOARD"
   Enable surrounding-text       $enable_surrounding_text
   Enable libnotify              $enable_libnotify
+  Enable Emoji dict             $enable_emoji_dict
   Run test cases                $enable_tests
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index adaebe983..a33b67ddf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -231,7 +231,38 @@ ibusmarshalers.c: ibusmarshalers.h ibusmarshalers.list
 	$(GLIB_GENMARSHAL) --prefix=_ibus_marshal $(srcdir)/ibusmarshalers.list --body --internal) > $@.tmp && \
 	mv $@.tmp $@
 
+if ENABLE_EMOJI_DICT
+AM_CPPFLAGS += -DENABLE_EMOJI_DICT
+
+dictdir = $(pkgdatadir)/dicts
+dict_DATA = emoji.dict
+
+noinst_PROGRAMS = emoji-parser
+
+emoji.dict: emoji-parser emoji-list.html
+	$(builddir)/emoji-parser emoji-list.html $@
+
+emoji_parser_SOURCES =          \
+    emoji-parser.c              \
+    $(NULL)
+emoji_parser_CFLAGS =           \
+    $(GLIB2_CFLAGS)             \
+    $(LIBXML2_CFLAGS)           \
+    $(NULL)
+emoji_parser_LDADD =            \
+    $(GLIB2_LIBS)               \
+    $(LIBXML2_LIBS)             \
+    $(libibus)                  \
+    $(NULL)
+
+CLEANFILES +=                   \
+    $(dict_DATA)                \
+    $(NULL)
+endif
+
 EXTRA_DIST =                    \
+    emoji-list.html             \
+    emoji-parser.c              \
     ibusversion.h.in            \
     ibusmarshalers.list         \
     ibusenumtypes.h.template    \
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
new file mode 100644
index 000000000..cf92feea5
--- /dev/null
+++ b/src/emoji-parser.c
@@ -0,0 +1,217 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016 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
+ * 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
+ */
+
+/* Convert http://www.unicode.org/emoji/charts/emoji-list.html
+ * to the dictionary file which look up the Emoji from the annotation.
+ */
+
+#include <glib.h>
+#include <libxml/HTMLparser.h>
+#include <libgen.h>
+
+#include "ibusutil.h"
+
+typedef struct _EmojiData EmojiData;
+struct _EmojiData {
+    gchar      *class;
+    gchar      *emoji;
+    GSList     *annotates;
+    GSList     *prev_annotates;
+    GHashTable *dict;
+};
+
+const gchar *progname;
+
+static gboolean         parse_node             (xmlNode     *node,
+                                                gboolean     is_child,
+                                                const gchar *prop_name,
+                                                EmojiData   *data);
+
+static void
+usage (void)
+{
+    g_print ("%s emoji-list.html emoji.dict\n", progname);
+}
+
+static void
+reset_emoji_element (EmojiData *data)
+{
+    g_clear_pointer (&data->class, g_free);
+    g_clear_pointer (&data->emoji, g_free);
+    if (data->annotates) {
+        g_slist_free_full (data->prev_annotates, g_free);
+        data->prev_annotates = data->annotates;
+        data->annotates = NULL;
+    }
+}
+
+static void
+free_dict_words (gpointer list)
+{
+    g_slist_free_full (list, g_free);
+}
+
+static gboolean
+parse_attr (xmlAttr   *attr,
+            EmojiData *data)
+{
+    if (g_strcmp0 ((const gchar *) attr->name, "class") == 0 && attr->children)
+        parse_node (attr->children, TRUE, (const gchar *) attr->name, data);
+    if (g_strcmp0 ((const gchar *) attr->name, "target") == 0 && attr->children)
+        parse_node (attr->children, TRUE, (const gchar *) attr->name, data);
+    if (attr->next)
+        parse_attr (attr->next, data);
+    return TRUE;
+}
+
+static gboolean
+parse_node (xmlNode     *node,
+            gboolean     is_child,
+            const gchar *prop_name,
+            EmojiData   *data)
+{
+    if (g_strcmp0 ((const gchar *) node->name, "tr") == 0) {
+        GSList *annotates = data->annotates;
+        while (annotates) {
+            GSList *emojis = g_hash_table_lookup (data->dict, annotates->data);
+            if (emojis) {
+                emojis = g_slist_copy_deep (emojis, (GCopyFunc) g_strdup, NULL);
+            }
+            emojis = g_slist_append (emojis, g_strdup (data->emoji));
+            g_hash_table_replace (data->dict,
+                                  g_strdup (annotates->data),
+                                  emojis);
+            annotates = annotates->next;
+        }
+        reset_emoji_element (data);
+    }
+    /* if node->name is "text" and is_child is FALSE,
+     * it's '\n' or Space between <td> and <td>.
+     */
+    if (g_strcmp0 ((const gchar *) node->name, "text") == 0 && is_child) {
+        /* Get "chars" in <td class="chars"> */
+        if (g_strcmp0 (prop_name, "class") == 0) {
+            if (g_strcmp0 (data->class, (const gchar *) node->content) != 0) {
+                g_clear_pointer (&data->class, g_free);
+                data->class = g_strdup ((const gchar *) node->content);
+            }
+        }
+        /* Get "annotate" in <td class="name"><a target="annotate"> */
+        if (g_strcmp0 (prop_name, "target") == 0 &&
+            g_strcmp0 (data->class, "name") == 0) {
+            g_clear_pointer (&data->class, g_free);
+            data->class = g_strdup ((const gchar *) node->content);
+        }
+        /* Get "emoji" in <td class="chars">emoji</td> */
+        if (g_strcmp0 (prop_name, "td") == 0 &&
+            g_strcmp0 (data->class, "chars") == 0) {
+            data->emoji = g_strdup ((const gchar *) node->content);
+        }
+        /* We ignore "NAME" for <td class="name">NAME</td> but
+         * takes "ANNOTATE" for
+         * <td class="name"><a target="annotate">ANNOTATE</a></td>
+         */
+        if (g_strcmp0 (prop_name, "td") == 0 &&
+            g_strcmp0 (data->class, "name") == 0) {
+            g_slist_free_full (data->annotates, g_free);
+            data->annotates = NULL;
+        }
+        /* Get "ANNOTATE" in
+         * <td class="name"><a target="annotate">ANNOTATE</a></td>
+         */
+        if (g_strcmp0 (prop_name, "a") == 0 &&
+            g_strcmp0 (data->class, "annotate") == 0) {
+            data->annotates =
+                    g_slist_append (data->annotates,
+                                    g_strdup ((const gchar *) node->content));
+        }
+    }
+    /* Get "foo" in <td class="foo"> */
+    if (g_strcmp0 ((const gchar *) node->name, "td") == 0 &&
+        node->properties != NULL) {
+        parse_attr (node->properties, data);
+    }
+    /* Get "foo" in <a target="foo"> */
+    if (g_strcmp0 ((const gchar *) node->name, "a") == 0 &&
+        node->properties != NULL) {
+        parse_attr (node->properties, data);
+    }
+    if (node->children) {
+        parse_node (node->children, TRUE, (const gchar *) node->name, data);
+    } else {
+        /* If annotate is NULL likes <td class="name"></td>,
+         * the previous emoji cell has the same annotate.
+         */
+        if (g_strcmp0 ((const gchar *) node->name, "td") == 0 &&
+            g_strcmp0 (data->class, "name") == 0) {
+            data->annotates = g_slist_copy_deep (data->prev_annotates,
+                                                 (GCopyFunc) g_strdup,
+                                                 NULL);
+        }
+    }
+    if (node->next)
+        parse_node (node->next, FALSE, (const gchar *) node->name, data);
+
+    return TRUE;
+}
+
+static GHashTable *
+parse_html (const gchar *filename)
+{
+    xmlDoc *doc = htmlParseFile (filename, "utf-8");
+    EmojiData data = { 0, };
+
+    if (doc == NULL || doc->children == NULL) {
+        g_warning ("Parse Error in document type: %x",
+                   doc ? doc->type : 0);
+        return FALSE;
+    }
+
+    data.dict = g_hash_table_new_full (g_str_hash,
+                                       g_str_equal,
+                                       g_free,
+                                       free_dict_words);
+    parse_node (doc->children, TRUE, (const gchar *) doc->name, &data);
+
+    reset_emoji_element (&data);
+    g_slist_free_full (data.prev_annotates, g_free);
+
+    return data.dict;
+}
+
+int
+main (int argc, char *argv[])
+{
+    GHashTable *dict;
+    progname = basename (argv[0]);
+
+    if (argc < 3) {
+        usage ();
+        return -1;
+    }
+
+    dict = parse_html (argv[1]);
+    ibus_emoji_dict_save (argv[2], dict);
+    g_hash_table_destroy (dict);
+
+    return 0;
+}
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 1b688b09c..8efe5a92e 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -3,7 +3,7 @@
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
  * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2016 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
@@ -31,6 +31,7 @@
 
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
+#include "ibusutil.h"
 
 /* This file contains the table of the compose sequences,
  * static const guint16 gtk_compose_seqs_compact[] = {}
@@ -42,16 +43,27 @@
 #include <stdlib.h>
 
 #define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
+#define EMOJI_SOURCE_LEN 100
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
-struct _IBusEngineSimplePrivate {
-    guint16     compose_buffer[IBUS_MAX_COMPOSE_LEN + 1];
-    gunichar    tentative_match;
-    gint        tentative_match_len;
+typedef struct {
+    GHashTable *dict;
+    int         max_seq_len;
+} IBusEngineDict;
 
-    guint       in_hex_sequence : 1;
-    guint       modifiers_dropped : 1;
+struct _IBusEngineSimplePrivate {
+    guint16             compose_buffer[EMOJI_SOURCE_LEN];
+    gunichar            tentative_match;
+    gchar              *tentative_emoji;
+    gint                tentative_match_len;
+
+    guint               in_hex_sequence : 1;
+    guint               in_emoji_sequence : 1;
+    guint               modifiers_dropped : 1;
+    IBusEngineDict     *emoji_dict;
+    IBusLookupTable    *lookup_table;
+    gboolean            lookup_table_visible;
 };
 
 /* From the values below, the value 30 means the number of different first keysyms
@@ -97,6 +109,8 @@ static gboolean ibus_engine_simple_process_key_event
                                                  guint               modifiers);
 static void     ibus_engine_simple_commit_char (IBusEngineSimple    *simple,
                                                 gunichar             ch);
+static void     ibus_engine_simple_commit_str  (IBusEngineSimple    *simple,
+                                                const gchar         *str);
 static void     ibus_engine_simple_update_preedit_text
                                                (IBusEngineSimple    *simple);
 
@@ -128,6 +142,18 @@ ibus_engine_simple_init (IBusEngineSimple *simple)
 static void
 ibus_engine_simple_destroy (IBusEngineSimple *simple)
 {
+    IBusEngineSimplePrivate *priv = simple->priv;
+
+    if (priv->emoji_dict) {
+        if (priv->emoji_dict->dict)
+            g_clear_pointer (&priv->emoji_dict->dict, g_hash_table_destroy);
+        g_slice_free (IBusEngineDict, priv->emoji_dict);
+        priv->emoji_dict = NULL;
+    }
+
+    g_clear_pointer (&priv->lookup_table, g_object_unref);
+    g_clear_pointer (&priv->tentative_emoji, g_free);
+
     IBUS_OBJECT_CLASS(ibus_engine_simple_parent_class)->destroy (
         IBUS_OBJECT (simple));
 }
@@ -146,6 +172,11 @@ ibus_engine_simple_reset (IBusEngine *engine)
         priv->tentative_match_len = 0;
         ibus_engine_hide_preedit_text ((IBusEngine *)simple);
     }
+    if (priv->tentative_emoji || priv->in_emoji_sequence) {
+        priv->in_emoji_sequence = FALSE;
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+        ibus_engine_hide_preedit_text ((IBusEngine *)simple);
+    }
 }
 
 static void
@@ -162,23 +193,60 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
         priv->tentative_match_len = 0;
         ibus_engine_simple_update_preedit_text (simple);
     }
+    if (priv->tentative_emoji || priv->in_emoji_sequence) {
+        priv->in_emoji_sequence = FALSE;
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+        ibus_engine_simple_update_preedit_text (simple);
+    }
 
     ibus_engine_commit_text ((IBusEngine *)simple,
             ibus_text_new_from_unichar (ch));
 }
 
+static void
+ibus_engine_simple_commit_str (IBusEngineSimple *simple,
+                               const gchar      *str)
+{
+    IBusEngineSimplePrivate *priv = simple->priv;
+    gchar *backup_str;
+
+    g_return_if_fail (str && *str);
+
+    backup_str = g_strdup (str);
+
+    if (priv->tentative_match || priv->in_hex_sequence) {
+        priv->in_hex_sequence = FALSE;
+        priv->tentative_match = 0;
+        priv->tentative_match_len = 0;
+        ibus_engine_simple_update_preedit_text (simple);
+    }
+    if (priv->tentative_emoji || priv->in_emoji_sequence) {
+        priv->in_emoji_sequence = FALSE;
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+        ibus_engine_simple_update_preedit_text (simple);
+    }
+
+    ibus_engine_commit_text ((IBusEngine *)simple,
+            ibus_text_new_from_string (backup_str));
+    g_free (backup_str);
+}
+
 static void
 ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
 
-    gunichar outbuf[IBUS_MAX_COMPOSE_LEN + 2];
+    gunichar outbuf[EMOJI_SOURCE_LEN + 1];
     int len = 0;
 
-    if (priv->in_hex_sequence) {
+    if (priv->in_hex_sequence || priv->in_emoji_sequence) {
         int hexchars = 0;
 
-        outbuf[0] = L'u';
+        if (priv->in_hex_sequence)
+            outbuf[0] = L'u';
+        else
+            outbuf[0] = L'@';
+
         len = 1;
 
         while (priv->compose_buffer[hexchars] != 0) {
@@ -187,10 +255,22 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
             ++len;
             ++hexchars;
         }
-        g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
+
+        if (priv->in_hex_sequence)
+            g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
+        else
+            g_assert (len <= EMOJI_SOURCE_LEN + 1);
     }
-    else if (priv->tentative_match)
+    else if (priv->tentative_match) {
         outbuf[len++] = priv->tentative_match;
+    } else if (priv->tentative_emoji && *priv->tentative_emoji) {
+        IBusText *text = ibus_text_new_from_string (priv->tentative_emoji);
+        len = strlen (priv->tentative_emoji);
+        ibus_text_append_attribute (text,
+                IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
+        ibus_engine_update_preedit_text ((IBusEngine *)simple, text, len, TRUE);
+        return;
+    }
 
     outbuf[len] = L'\0';
     if (len == 0) {
@@ -277,6 +357,104 @@ check_hex (IBusEngineSimple *simple,
     return TRUE;
 }
 
+static IBusEngineDict *
+load_emoji_dict ()
+{
+    IBusEngineDict *emoji_dict;
+    GList *keys;
+    int max_length = 0;
+
+    emoji_dict = g_slice_new0 (IBusEngineDict);
+    emoji_dict->dict = ibus_emoji_dict_load (IBUS_DATA_DIR "/dicts/emoji.dict");
+    if (!emoji_dict->dict)
+        return emoji_dict;
+
+    keys = g_hash_table_get_keys (emoji_dict->dict);
+    for (; keys; keys = keys->next) {
+        int length = strlen (keys->data);
+        if (max_length < length)
+            max_length = length;
+    }
+    emoji_dict->max_seq_len = max_length;
+
+    return emoji_dict;
+}
+
+static gboolean
+check_emoji_table (IBusEngineSimple       *simple,
+                   gint                    n_compose,
+                   gint                    index)
+{
+    IBusEngineSimplePrivate *priv = simple->priv;
+    IBusEngineDict *emoji_dict = priv->emoji_dict;
+    GString *str = NULL;
+    gint i;
+    gchar buf[7];
+    GSList *words = NULL;
+
+    g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
+
+    if (priv->lookup_table == NULL) {
+        priv->lookup_table = ibus_lookup_table_new (10, 0, TRUE, TRUE);
+        g_object_ref_sink (priv->lookup_table);
+    }
+    if (emoji_dict == NULL)
+        emoji_dict = priv->emoji_dict = load_emoji_dict (simple);
+
+    if (emoji_dict == NULL || emoji_dict->dict == NULL)
+        return FALSE;
+
+    if (n_compose > emoji_dict->max_seq_len)
+        return FALSE;
+
+    str = g_string_new (NULL);
+    priv->lookup_table_visible = FALSE;
+
+    i = 0;
+    while (i < n_compose) {
+        gunichar ch;
+
+        ch = ibus_keyval_to_unicode (priv->compose_buffer[i]);
+
+        if (ch == 0)
+            return FALSE;
+
+        if (!g_unichar_isprint (ch))
+            return FALSE;
+
+        buf[g_unichar_to_utf8 (ch, buf)] = '\0';
+
+        g_string_append (str, buf);
+
+        ++i;
+    }
+
+    if (str->str) {
+        words = g_hash_table_lookup (emoji_dict->dict, str->str);
+    }
+    g_string_free (str, TRUE);
+
+    if (words != NULL) {
+        int i = 0;
+        ibus_lookup_table_clear (priv->lookup_table);
+        priv->lookup_table_visible = TRUE;
+
+        while (words) {
+            if (i == index) {
+                g_clear_pointer (&priv->tentative_emoji, g_free);
+                priv->tentative_emoji = g_strdup (words->data);
+            }
+            IBusText *text = ibus_text_new_from_string (words->data);
+            ibus_lookup_table_append_candidate (priv->lookup_table, text);
+            words = words->next;
+            i++;
+        }
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static int
 compare_seq_index (const void *key, const void *value)
 {
@@ -626,10 +804,10 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
 
 static gboolean
 no_sequence_matches (IBusEngineSimple *simple,
-                     gint                 n_compose,
-                     guint                keyval,
-                     guint                keycode,
-                     guint                modifiers)
+                     gint              n_compose,
+                     guint             keyval,
+                     guint             keycode,
+                     guint             modifiers)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
 
@@ -642,8 +820,7 @@ no_sequence_matches (IBusEngineSimple *simple,
         gint len = priv->tentative_match_len;
         int i;
 
-        ibus_engine_simple_commit_char (simple,
-                                            priv->tentative_match);
+        ibus_engine_simple_commit_char (simple, priv->tentative_match);
         priv->compose_buffer[0] = 0;
 
         for (i=0; i < n_compose - len - 1; i++) {
@@ -655,8 +832,11 @@ no_sequence_matches (IBusEngineSimple *simple,
 
         return ibus_engine_simple_process_key_event (
                 (IBusEngine *)simple, keyval, keycode, modifiers);
-    }
-    else {
+    } else if (priv->tentative_emoji && *priv->tentative_emoji) {
+        ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+        priv->compose_buffer[0] = 0;
+    } else {
         priv->compose_buffer[0] = 0;
         if (n_compose > 1) {
             /* Invalid sequence */
@@ -676,6 +856,7 @@ no_sequence_matches (IBusEngineSimple *simple,
         else
             return FALSE;
     }
+    return FALSE;
 }
 
 static gboolean
@@ -686,6 +867,39 @@ is_hex_keyval (guint keyval)
   return g_unichar_isxdigit (ch);
 }
 
+static gboolean
+is_graph_keyval (guint keyval)
+{
+  gunichar ch = ibus_keyval_to_unicode (keyval);
+
+  return g_unichar_isgraph (ch);
+}
+
+static void
+ibus_engine_simple_update_lookup_and_aux_table (IBusEngineSimple *simple)
+{
+    IBusEngineSimplePrivate *priv;
+    guint index, candidates;
+    gchar *aux_label = NULL;
+    IBusText *text = NULL;
+
+    g_return_if_fail (IBUS_IS_ENGINE_SIMPLE (simple));
+
+    priv = simple->priv;
+    index = ibus_lookup_table_get_cursor_pos (priv->lookup_table) + 1;
+    candidates = ibus_lookup_table_get_number_of_candidates(priv->lookup_table);
+    aux_label = g_strdup_printf ("(%u / %u)", index, candidates);
+    text = ibus_text_new_from_string (aux_label);
+    g_free (aux_label);
+
+    ibus_engine_update_auxiliary_text (IBUS_ENGINE (simple),
+                                       text,
+                                       priv->lookup_table_visible);
+    ibus_engine_update_lookup_table (IBUS_ENGINE (simple),
+                                     priv->lookup_table,
+                                     priv->lookup_table_visible);
+}
+
 static gboolean
 ibus_engine_simple_process_key_event (IBusEngine *engine,
                                       guint       keyval,
@@ -697,10 +911,13 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     gint n_compose = 0;
     gboolean have_hex_mods;
     gboolean is_hex_start;
+    gboolean is_emoji_start = FALSE;
     gboolean is_hex_end;
+    gboolean is_space;
     gboolean is_backspace;
     gboolean is_escape;
     guint hex_keyval;
+    guint printable_keyval;
     gint i;
     gboolean compose_finish;
     gunichar output_char;
@@ -714,17 +931,16 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
              keyval == IBUS_KEY_Shift_L || keyval == IBUS_KEY_Shift_R)) {
             if (priv->tentative_match &&
                 g_unichar_validate (priv->tentative_match)) {
-                ibus_engine_simple_commit_char (simple,
-                                                    priv->tentative_match);
-            }
-            else if (n_compose == 0) {
+                ibus_engine_simple_commit_char (simple, priv->tentative_match);
+            } else if (n_compose == 0) {
                 priv->modifiers_dropped = TRUE;
-            }
-            else {
+            } else {
                 /* invalid hex sequence */
                 /* FIXME beep_window (event->window); */
                 priv->tentative_match = 0;
+                g_clear_pointer (&priv->tentative_emoji, g_free);
                 priv->in_hex_sequence = FALSE;
+                priv->in_emoji_sequence = FALSE;
                 priv->compose_buffer[0] = 0;
 
                 ibus_engine_simple_update_preedit_text (simple);
@@ -732,6 +948,26 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
             return TRUE;
         }
+        /* Handle Shift + Space */
+        else if (priv->in_emoji_sequence &&
+            (keyval == IBUS_KEY_Control_L || keyval == IBUS_KEY_Control_R)) {
+            if (priv->tentative_emoji && *priv->tentative_emoji) {
+                ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
+                g_clear_pointer (&priv->tentative_emoji, g_free);
+            } else if (n_compose == 0) {
+                priv->modifiers_dropped = TRUE;
+            } else {
+                /* invalid hex sequence */
+                /* FIXME beep_window (event->window); */
+                priv->tentative_match = 0;
+                g_clear_pointer (&priv->tentative_emoji, g_free);
+                priv->in_hex_sequence = FALSE;
+                priv->in_emoji_sequence = FALSE;
+                priv->compose_buffer[0] = 0;
+
+                ibus_engine_simple_update_preedit_text (simple);
+            }
+        }
         else
             return FALSE;
     }
@@ -741,25 +977,33 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         if (keyval == ibus_compose_ignore[i])
             return FALSE;
 
-    if (priv->in_hex_sequence && priv->modifiers_dropped)
+    if ((priv->in_hex_sequence || priv->in_emoji_sequence)
+        && priv->modifiers_dropped) {
         have_hex_mods = TRUE;
-    else
+    } else {
         have_hex_mods = (modifiers & (HEX_MOD_MASK)) == HEX_MOD_MASK;
+    }
 
     is_hex_start = keyval == IBUS_KEY_U;
+#ifdef ENABLE_EMOJI_DICT
+    is_emoji_start = keyval == IBUS_KEY_E;
+#endif
     is_hex_end = (keyval == IBUS_KEY_space ||
                   keyval == IBUS_KEY_KP_Space ||
                   keyval == IBUS_KEY_Return ||
                   keyval == IBUS_KEY_ISO_Enter ||
                   keyval == IBUS_KEY_KP_Enter);
+    is_space = (keyval == IBUS_KEY_space || keyval == IBUS_KEY_KP_Space);
     is_backspace = keyval == IBUS_KEY_BackSpace;
     is_escape = keyval == IBUS_KEY_Escape;
     hex_keyval = is_hex_keyval (keyval) ? keyval : 0;
+    printable_keyval = is_graph_keyval (keyval) ? keyval : 0;
 
     /* gtkimcontextsimple causes a buffer overflow in priv->compose_buffer.
      * Add the check code here.
      */
-    if (n_compose >= IBUS_MAX_COMPOSE_LEN) {
+    if ((n_compose >= IBUS_MAX_COMPOSE_LEN && priv->in_hex_sequence) ||
+        (n_compose >= EMOJI_SOURCE_LEN && priv->in_emoji_sequence)) {
         if (is_backspace) {
             priv->compose_buffer[--n_compose] = 0;
         }
@@ -767,7 +1011,9 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             /* invalid hex sequence */
             // beep_window (event->window);
             priv->tentative_match = 0;
+            g_clear_pointer (&priv->tentative_emoji, g_free);
             priv->in_hex_sequence = FALSE;
+            priv->in_emoji_sequence = FALSE;
             priv->compose_buffer[0] = 0;
         }
         else if (is_escape) {
@@ -789,12 +1035,16 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
      * ISO_Level3_Switch.
      */
     if (!have_hex_mods ||
-        (n_compose > 0 && !priv->in_hex_sequence) ||
-        (n_compose == 0 && !priv->in_hex_sequence && !is_hex_start) ||
+        (n_compose > 0 && !priv->in_hex_sequence && !priv->in_emoji_sequence) ||
+        (n_compose == 0 && !priv->in_hex_sequence && !is_hex_start &&
+         !priv->in_emoji_sequence && !is_emoji_start) ||
         (priv->in_hex_sequence && !hex_keyval &&
-         !is_hex_start && !is_hex_end && !is_escape && !is_backspace)) {
+         !is_hex_start && !is_hex_end && !is_escape && !is_backspace) ||
+        (priv->in_emoji_sequence && !printable_keyval &&
+         !is_emoji_start && !is_hex_end && !is_escape && !is_backspace)) {
         if (modifiers & (IBUS_MOD1_MASK | IBUS_CONTROL_MASK) ||
-            (priv->in_hex_sequence && priv->modifiers_dropped &&
+            ((priv->in_hex_sequence || priv->in_emoji_sequence) &&
+             priv->modifiers_dropped &&
              (keyval == IBUS_KEY_Return ||
               keyval == IBUS_KEY_ISO_Enter ||
               keyval == IBUS_KEY_KP_Enter))) {
@@ -816,6 +1066,20 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
         return TRUE;
     }
+    if (priv->in_emoji_sequence && have_hex_mods && is_backspace) {
+        if (n_compose > 0) {
+            n_compose--;
+            priv->compose_buffer[n_compose] = 0;
+            check_emoji_table (simple, n_compose, -1);
+            ibus_engine_simple_update_lookup_and_aux_table (simple);
+        } else {
+            priv->in_emoji_sequence = FALSE;
+        }
+
+        ibus_engine_simple_update_preedit_text (simple);
+
+        return TRUE;
+    }
 
     /* Check for hex sequence restart */
     if (priv->in_hex_sequence && have_hex_mods && is_hex_start) {
@@ -833,13 +1097,41 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             }
         }
     }
+    if (priv->in_emoji_sequence && have_hex_mods && is_emoji_start) {
+        if (priv->tentative_emoji && *priv->tentative_emoji) {
+            ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
+            g_clear_pointer (&priv->tentative_emoji, g_free);
+        }
+        else {
+            if (n_compose > 0) {
+                g_clear_pointer (&priv->tentative_emoji, g_free);
+                priv->in_emoji_sequence = FALSE;
+                priv->compose_buffer[0] = 0;
+            }
+        }
+    }
 
     /* Check for hex sequence start */
     if (!priv->in_hex_sequence && have_hex_mods && is_hex_start) {
         priv->compose_buffer[0] = 0;
         priv->in_hex_sequence = TRUE;
+        priv->in_emoji_sequence = FALSE;
         priv->modifiers_dropped = FALSE;
         priv->tentative_match = 0;
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+
+        // g_debug ("Start HEX MODE");
+
+        ibus_engine_simple_update_preedit_text (simple);
+
+        return TRUE;
+    } else if (!priv->in_emoji_sequence && have_hex_mods && is_emoji_start) {
+        priv->compose_buffer[0] = 0;
+        priv->in_hex_sequence = FALSE;
+        priv->in_emoji_sequence = TRUE;
+        priv->modifiers_dropped = FALSE;
+        priv->tentative_match = 0;
+        g_clear_pointer (&priv->tentative_emoji, g_free);
 
         // g_debug ("Start HEX MODE");
 
@@ -864,9 +1156,20 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             // beep_window (event->window);
             return TRUE;
         }
-    }
-    else
+    } else if (priv->in_emoji_sequence) {
+        if (printable_keyval) {
+            priv->compose_buffer[n_compose++] = printable_keyval;
+        }
+        else if (is_space && (modifiers & IBUS_SHIFT_MASK)) {
+            priv->compose_buffer[n_compose++] = IBUS_KEY_space;
+        }
+        else if (is_escape) {
+            ibus_engine_simple_reset (engine);
+            return TRUE;
+        }
+    } else {
         priv->compose_buffer[n_compose++] = keyval;
+    }
 
     priv->compose_buffer[n_compose] = 0;
 
@@ -880,8 +1183,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                     ibus_engine_simple_commit_char (simple,
                             priv->tentative_match);
                     priv->compose_buffer[0] = 0;
-                }
-                else {
+                } else {
                     // FIXME
                     /* invalid hex sequence */
                     // beep_window (event->window);
@@ -899,6 +1201,73 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             return TRUE;
         }
     }
+    else if (priv->in_emoji_sequence) {
+        if (have_hex_mods && n_compose > 0) {
+            gboolean update_lookup_table = FALSE;
+
+            if (priv->lookup_table_visible) {
+                switch (keyval) {
+                case IBUS_KEY_space:
+                case IBUS_KEY_KP_Space:
+                    if ((modifiers & IBUS_SHIFT_MASK) == 0) {
+                        ibus_lookup_table_cursor_down (priv->lookup_table);
+                        update_lookup_table = TRUE;
+                    }
+                    break;
+                case IBUS_KEY_Down:
+                    ibus_lookup_table_cursor_down (priv->lookup_table);
+                    update_lookup_table = TRUE;
+                    break;
+                case IBUS_KEY_Up:
+                    ibus_lookup_table_cursor_up (priv->lookup_table);
+                    update_lookup_table = TRUE;
+                    break;
+                case IBUS_KEY_Page_Down:
+                    ibus_lookup_table_page_down (priv->lookup_table);
+                    update_lookup_table = TRUE;
+                    break;
+                case IBUS_KEY_Page_Up:
+                    ibus_lookup_table_page_up (priv->lookup_table);
+                    update_lookup_table = TRUE;
+                    break;
+                default:;
+                }
+            }
+
+            if (!update_lookup_table) {
+                if (is_hex_end && !is_space) {
+                    if (priv->lookup_table) {
+                        int index = (int) ibus_lookup_table_get_cursor_pos (
+                                priv->lookup_table);
+                        check_emoji_table (simple, n_compose, index);
+                        priv->lookup_table_visible = FALSE;
+                        update_lookup_table = TRUE;
+                    }
+                }
+                else if (check_emoji_table (simple, n_compose, -1)) {
+                    update_lookup_table = TRUE;
+                }
+            }
+
+            if (update_lookup_table)
+                ibus_engine_simple_update_lookup_and_aux_table (simple);
+            if (is_hex_end && !is_space) {
+                if (priv->tentative_emoji && *priv->tentative_emoji) {
+                    ibus_engine_simple_commit_str (simple,
+                            priv->tentative_emoji);
+                    priv->compose_buffer[0] = 0;
+                } else {
+                    g_clear_pointer (&priv->tentative_emoji, g_free);
+                    priv->in_emoji_sequence = FALSE;
+                    priv->compose_buffer[0] = 0;
+                }
+            }
+
+            ibus_engine_simple_update_preedit_text (simple);
+
+            return TRUE;
+        }
+    }
     else {
         GSList *list = global_tables;
         while (list) {
diff --git a/src/ibusutil.c b/src/ibusutil.c
index b9f3fddee..bfaa4f4b6 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -34,6 +34,9 @@
 #include <libintl.h>
 #endif
 
+#define IBUS_DICT_MAGIC "IBusDict"
+#define IBUS_DICT_VERSION (1)
+
 /* gettext macro */
 #define N_(t) t
 
@@ -125,6 +128,74 @@ _load_lang()
     ibus_xml_free (node);
 }
 
+static void
+free_dict_words (gpointer list)
+{
+    g_slist_free_full (list, g_free);
+}
+
+static void
+variant_foreach_add_emoji (gchar           *annotation,
+                           GSList          *emojis,
+                           GVariantBuilder *builder)
+{
+    int i;
+    int length = (int) g_slist_length (emojis);
+    gchar **buff = g_new0 (gchar *, length);
+    GSList *l = emojis;
+
+    for (i = 0; i < length; i++, l = l->next)
+        buff[i] = (gchar *) l->data;
+
+    g_variant_builder_add (builder,
+                           "{sv}",
+                           annotation,
+                           g_variant_new_strv ((const gchar * const  *) buff,
+                                               length));
+    g_free (buff);
+}
+
+static GVariant *
+ibus_emoji_dict_serialize (GHashTable *dict)
+{
+    GVariantBuilder builder;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+    g_hash_table_foreach (dict,  (GHFunc) variant_foreach_add_emoji, &builder);
+    return g_variant_builder_end (&builder);
+}
+
+static GHashTable *
+ibus_emoji_dict_deserialize (GVariant *variant)
+{
+    GHashTable *dict = NULL;
+    GVariantIter iter;
+    gchar *annotate = NULL;
+    GVariant *emojis_variant = NULL;
+
+    dict = g_hash_table_new_full (g_str_hash,
+                                  g_str_equal,
+                                  g_free,
+                                  free_dict_words);
+
+    g_variant_iter_init (&iter, variant);
+    while (g_variant_iter_loop (&iter, "{sv}", &annotate, &emojis_variant)) {
+        gsize i;
+        gsize length = 0;
+        const gchar **array = g_variant_get_strv (emojis_variant, &length);
+        GSList *emojis = NULL;
+
+        for (i = 0; i < length; i++) {
+            emojis = g_slist_append (emojis, g_strdup (array[i]));
+        }
+        g_hash_table_insert (dict, annotate, emojis);
+        annotate = NULL;
+        g_clear_pointer (&emojis_variant, g_variant_unref);
+    }
+
+    return dict;
+}
+
 const gchar *
 ibus_get_untranslated_language_name (const gchar *_locale)
 {
@@ -171,3 +242,121 @@ ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str)
     g_free (*str);
     g_variant_get_child (variant, index, "s", str);
 }
+
+void
+ibus_emoji_dict_save (const gchar *path, GHashTable *dict)
+{
+    GVariant *variant;
+    const gchar *header = IBUS_DICT_MAGIC;
+    const guint16 version = IBUS_DICT_VERSION;
+    const gchar *contents;
+    gsize length;
+    GError *error = NULL;
+
+    variant = g_variant_new ("(sqv)",
+                             header,
+                             version,
+                             ibus_emoji_dict_serialize (dict));
+
+    contents =  g_variant_get_data (variant);
+    length =  g_variant_get_size (variant);
+
+    if (!g_file_set_contents (path, contents, length, &error)) {
+        g_warning ("Failed to save emoji dict %s: %s", path, error->message);
+        g_error_free (error);
+    }
+
+    g_variant_unref (variant);
+}
+
+GHashTable *
+ibus_emoji_dict_load (const gchar *path)
+{
+    gchar *contents = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    GVariant *variant_table = NULL;
+    GVariant *variant = NULL;
+    const gchar *header = NULL;
+    guint16 version = 0;
+    GHashTable *retval = NULL;
+
+    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+        g_warning ("Emoji dict does not exist: %s", path);
+        goto out_load_cache;
+    }
+
+    if (!g_file_get_contents (path, &contents, &length, &error)) {
+        g_warning ("Failed to get dict content %s: %s", path, error->message);
+        g_error_free (error);
+        goto out_load_cache;
+    }
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sq)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sq)", &header, &version);
+
+    if (g_strcmp0 (header, IBUS_DICT_MAGIC) != 0) {
+        g_warning ("cache is not IBusDict.");
+        goto out_load_cache;
+    }
+
+    if (version != IBUS_DICT_VERSION) {
+        g_warning ("cache version is different: %u != %u",
+                   version, IBUS_DICT_VERSION);
+        goto out_load_cache;
+    }
+
+    version = 0;
+    header = NULL;
+    g_variant_unref (variant_table);
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sqv)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sqv)",
+                   NULL,
+                   NULL,
+                   &variant);
+
+    if (variant == NULL) {
+        g_warning ("cache dict is broken.");
+        goto out_load_cache;
+    }
+
+    retval = ibus_emoji_dict_deserialize (variant);
+
+out_load_cache:
+    if (variant)
+        g_variant_unref (variant);
+    if (variant_table)
+        g_variant_unref (variant_table);
+
+    return retval;
+}
+
+GSList *
+ibus_emoji_dict_lookup (GHashTable  *dict,
+                        const gchar *annotation)
+{
+    return (GSList *) g_hash_table_lookup (dict, annotation);
+}
diff --git a/src/ibusutil.h b/src/ibusutil.h
index 2c1360c7c..e619b678a 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -53,4 +53,31 @@ const gchar *    ibus_get_untranslated_language_name
  */
 const gchar *    ibus_get_language_name         (const gchar    *_locale);
 
+/**
+ * ibus_emoji_dict_save:
+ * @path: A path of the saved dictionary file.
+ * @dict: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
+ *
+ * Save the Emoji dictionary to the cache file.
+ */
+void             ibus_emoji_dict_save           (const gchar    *path,
+                                                 GHashTable     *dict);
+/**
+ * ibus_emoji_dict_load:
+ * @path: A path of the saved dictionary file.
+ *
+ * Returns: (element-type utf8 gpointer) (transfer none): An Emoji dictionary file loaded from the saved cache file.
+ */
+GHashTable *     ibus_emoji_dict_load           (const gchar    *path);
+
+/**
+ * ibus_emoji_dict_lookup:
+ * @dict: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
+ * @annotation: Annotation for Emoji characters
+ *
+ * Returns: (element-type utf8) (transfer none): List of Emoji characters
+ * This API is for gobject-introspection.
+ */
+GSList *         ibus_emoji_dict_lookup         (GHashTable     *dict,
+                                                 const gchar    *annotation);
 #endif

From 0ed644cd2b6c1d15bdba0d1c6d45d162b9b34806 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 23 Jun 2016 11:52:48 +0900
Subject: [PATCH 351/816] engine: Add emoji-list.html

Now we copied http://unicode.org/emoji/charts/emoji-list.html to
http://ibus.github.io/files/ibus/emoji-list.html
and download the file in the build time.
We don't save emoji-list.html in the tarball because the file size is
more than 5MB.
We always don't get the latest emoji-list.html to avoid the build error.

BUG=https://github.com/ibus/ibus/pull/1864
R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/298580043
---
 src/Makefile.am | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a33b67ddf..22e031fbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,15 @@ endif
 
 SUBDIRS = . $(TESTS_DIR)
 
+IBUS_V_wget = $(ibus__v_wget_@AM_V@)
+ibus__v_wget_ = $(ibus__v_wget_@AM_DEFAULT_V@)
+ibus__v_wget_0 = -nv
+ibus__v_wget_1 =
+IBUS_V_diff = $(ibus__v_diff_@AM_V@)
+ibus__v_diff_ = $(ibus__v_diff_@AM_DEFAULT_V@)
+ibus__v_diff_0 = -q
+ibus__v_diff_1 =
+
 # libibus = libibus-@IBUS_API_VERSION@.la
 libibus = libibus-1.0.la
 
@@ -239,6 +248,18 @@ dict_DATA = emoji.dict
 
 noinst_PROGRAMS = emoji-parser
 
+emoji-list.html:
+	$(AM_V_at)wget $(IBUS_V_wget) \
+                http://ibus.github.io/files/ibus/emoji-list.html
+	$(AM_V_at)wget $(IBUS_V_wget) \
+                http://unicode.org/emoji/charts/emoji-list.html \
+	        -O latest-emoji-list.html
+	$(AM_V_at)diff $(IBUS_V_diff) emoji-list.html latest-emoji-list.html; \
+	if test $$? -ne 0; then \
+	    echo "#### WARNING: emoji-list.html is old." >&2; \
+	fi; \
+	rm latest-emoji-list.html;
+
 emoji.dict: emoji-parser emoji-list.html
 	$(builddir)/emoji-parser emoji-list.html $@
 
@@ -257,11 +278,11 @@ emoji_parser_LDADD =            \
 
 CLEANFILES +=                   \
     $(dict_DATA)                \
+    emoji-list.html             \
     $(NULL)
 endif
 
 EXTRA_DIST =                    \
-    emoji-list.html             \
     emoji-parser.c              \
     ibusversion.h.in            \
     ibusmarshalers.list         \

From 0ee1896a2b3e75494f8f9fd9d04c27436f0877b8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 7 Jul 2016 12:47:34 +0900
Subject: [PATCH 352/816] engine: Use annotations/en.xml from unocode.org but
 not emoji-list.html

Downloading emoji-list would cause a different build by build site.
Now save annotations/en.xml from unicode.org and get emoji.json from
Emoji One.
en.xml is used for Unicode annotations and emoji.json is used for
aliases_ascii, e.g. ":)", and category, e.g. "people".

BUG=https://github.com/ibus/ibus/issues/1865
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/299530044
---
 COPYING.unicode              |   52 ++
 Makefile.am                  |    1 +
 configure.ac                 |   14 +-
 data/Makefile.am             |    5 +-
 data/annotations/Makefile.am |   27 +
 data/annotations/en.xml      | 1042 ++++++++++++++++++++++++++++++++++
 ibus.spec.in                 |   14 +
 src/Makefile.am              |   31 +-
 src/emoji-parser.c           |  605 +++++++++++++++-----
 9 files changed, 1634 insertions(+), 157 deletions(-)
 create mode 100644 COPYING.unicode
 create mode 100644 data/annotations/Makefile.am
 create mode 100644 data/annotations/en.xml

diff --git a/COPYING.unicode b/COPYING.unicode
new file mode 100644
index 000000000..28d30606b
--- /dev/null
+++ b/COPYING.unicode
@@ -0,0 +1,52 @@
+(Apply to data/annotations/en.xml)
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+    Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
+online code charts under the directory http://www.unicode.org/Public/.
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
+
+    NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
+("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
+AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF
+YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA
+FILES OR SOFTWARE.
+
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under
+the Terms of Use in http://www.unicode.org/copyright.html.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Unicode data files and any associated documentation (the "Data
+Files") or Unicode software and any associated documentation (the "Software")
+to deal in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute, and/or
+sell copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that (a) the above
+copyright notice(s) and this permission notice appear with all copies of the
+Data Files or Software, (b) both the above copyright notice(s) and this
+permission notice appear in associated documentation, and (c) there is clear
+notice in each modified Data File or in the Software as well as in the
+documentation associated with the Data File(s) or Software that the data or
+software has been modified.
+
+    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
+DATA FILES OR SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written authorization
+of the copyright holder.
diff --git a/Makefile.am b/Makefile.am
index 3c4702c15..425d1ec2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ pkgconfig_DATA = ibus-@IBUS_API_VERSION@.pc
 
 ibus_pc_in = ibus-@IBUS_API_VERSION@.pc.in
 EXTRA_DIST = \
+	COPYING.unicode \
 	autogen.sh \
 	$(ibus_pc_in) \
 	ibus.spec.in \
diff --git a/configure.ac b/configure.ac
index 3128ef987..f7898197f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -608,12 +608,20 @@ AC_ARG_ENABLE(emoji-dict,
 )
 AM_CONDITIONAL([ENABLE_EMOJI_DICT], [test x"$enable_emoji_dict" = x"yes"])
 if test x"$enable_emoji_dict" = x"yes"; then
-    PKG_CHECK_MODULES(LIBXML2, [
-        libxml-2.0
+    PKG_CHECK_MODULES(JSON_GLIB1, [
+        json-glib-1.0
     ])
     enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
 fi
 
+AC_ARG_WITH(emoji-json-file,
+    AS_HELP_STRING([--with-emoji-json-file[=DIR/emoji.json]],
+        [Set emoji.json. (default: "/usr/lib/node_modules/emojione/emoji.json")]),
+    EMOJI_JSON_FILE=$with_emoji_json_file,
+    EMOJI_JSON_FILE="/usr/lib/node_modules/emojione/emoji.json"
+)
+AC_SUBST(EMOJI_JSON_FILE)
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -639,6 +647,7 @@ engine/Makefile
 util/Makefile
 util/IMdkit/Makefile
 data/Makefile
+data/annotations/Makefile.am
 data/icons/Makefile
 data/keymaps/Makefile
 data/dconf/Makefile
@@ -698,6 +707,7 @@ Build options:
   Enable surrounding-text       $enable_surrounding_text
   Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
+  emoji.json path               $EMOJI_JSON_FILE
   Run test cases                $enable_tests
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index e41c9a260..d9d613fe5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -21,6 +21,7 @@
 # USA
 
 SUBDIRS = \
+	annotations \
 	icons \
 	keymaps \
 	$(NULL)
diff --git a/data/annotations/Makefile.am b/data/annotations/Makefile.am
new file mode 100644
index 000000000..d87b933c1
--- /dev/null
+++ b/data/annotations/Makefile.am
@@ -0,0 +1,27 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2016 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
+# 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
+
+EXTRA_DIST = \
+	en.xml \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/annotations/en.xml b/data/annotations/en.xml
new file mode 100644
index 000000000..ff7aa8906
--- /dev/null
+++ b/data/annotations/en.xml
@@ -0,0 +1,1042 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE ldml SYSTEM '../../common/dtd/ldml.dtd'>
+<!--	© 1991-2015 Unicode, Inc.
+	Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+	For terms of use, see http://www.unicode.org/copyright.html
+	CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+	DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
+ -->
+<ldml>
+	<identity>
+		<version number="$Revision: 12320 $"/>
+		<language type='en'/>
+	</identity>
+	<annotations>
+		<annotation cp='[😀]' tts='grinning face'>face; grin</annotation>
+		<annotation cp='[😁]' tts='grinning face with smiling eyes'>eye; face; grin; smile</annotation>
+		<annotation cp='[😂]' tts='face with tears of joy'>face; joy; laugh; tear</annotation>
+		<annotation cp='[😃]' tts='smiling face with open mouth'>face; mouth; open; smile</annotation>
+		<annotation cp='[😄]' tts='smiling face with open mouth and smiling eyes'>eye; face; mouth; open; smile</annotation>
+		<annotation cp='[😅]' tts='smiling face with open mouth and cold sweat'>cold; face; open; smile; sweat</annotation>
+		<annotation cp='[😆]' tts='smiling face with open mouth and tightly-closed eyes'>face; laugh; mouth; open; satisfied; smile</annotation>
+		<annotation cp='[😉]' tts='winking face'>face; wink</annotation>
+		<annotation cp='[😊]' tts='smiling face with smiling eyes'>blush; eye; face; smile</annotation>
+		<annotation cp='[😋]' tts='face savouring delicious food'>delicious; face; savouring; smile; um; yum</annotation>
+		<annotation cp='[😎]' tts='smiling face with sunglasses'>bright; cool; eye; eyewear; face; glasses; smile; sun; sunglasses; weather</annotation>
+		<annotation cp='[😍]' tts='smiling face with heart-shaped eyes'>eye; face; heart; love; smile</annotation>
+		<annotation cp='[😘]' tts='face throwing a kiss'>face; heart; kiss</annotation>
+		<annotation cp='[😗]' tts='kissing face'>face; kiss</annotation>
+		<annotation cp='[😙]' tts='kissing face with smiling eyes'>eye; face; kiss; smile</annotation>
+		<annotation cp='[😚]' tts='kissing face with closed eyes'>closed; eye; face; kiss</annotation>
+		<annotation cp='[☺]' tts='smiling face'>face; outlined; relaxed; smile</annotation>
+		<annotation cp='[🙂]' tts='slightly smiling face'>face; smile</annotation>
+		<annotation cp='[🤗]' tts='hugging face'>face; hug; hugging</annotation>
+		<annotation cp='[😇]' tts='smiling face with halo'>angel; face; fairy tale; fantasy; halo; innocent; smile</annotation>
+		<annotation cp='[🤔]' tts='thinking face'>face; thinking</annotation>
+		<annotation cp='[😐]' tts='neutral face'>deadpan; face; neutral</annotation>
+		<annotation cp='[😑]' tts='expressionless face'>expressionless; face; inexpressive; unexpressive</annotation>
+		<annotation cp='[😶]' tts='face without mouth'>face; mouth; quiet; silent</annotation>
+		<annotation cp='[🙄]' tts='face with rolling eyes'>eyes; face; rolling</annotation>
+		<annotation cp='[😏]' tts='smirking face'>face; smirk</annotation>
+		<annotation cp='[😣]' tts='persevering face'>face; persevere</annotation>
+		<annotation cp='[😥]' tts='disappointed but relieved face'>disappointed; face; relieved; whew</annotation>
+		<annotation cp='[😮]' tts='face with open mouth'>face; mouth; open; sympathy</annotation>
+		<annotation cp='[🤐]' tts='zipper-mouth face'>face; mouth; zipper</annotation>
+		<annotation cp='[😯]' tts='hushed face'>face; hushed; stunned; surprised</annotation>
+		<annotation cp='[😪]' tts='sleepy face'>face; sleep</annotation>
+		<annotation cp='[😫]' tts='tired face'>face; tired</annotation>
+		<annotation cp='[😴]' tts='sleeping face'>face; sleep; zzz</annotation>
+		<annotation cp='[😌]' tts='relieved face'>face; relieved</annotation>
+		<annotation cp='[🤓]' tts='nerd face'>face; geek; nerd</annotation>
+		<annotation cp='[😛]' tts='face with stuck-out tongue'>face; tongue</annotation>
+		<annotation cp='[😜]' tts='face with stuck-out tongue and winking eye'>eye; face; joke; tongue; wink</annotation>
+		<annotation cp='[😝]' tts='face with stuck-out tongue and tightly-closed eyes'>eye; face; horrible; taste; tongue</annotation>
+		<annotation cp='[☹]' tts='frowning face'>face; frown</annotation>
+		<annotation cp='[🙁]' tts='slightly frowning face'>face; frown</annotation>
+		<annotation cp='[😒]' tts='unamused face'>face; unamused; unhappy</annotation>
+		<annotation cp='[😓]' tts='face with cold sweat'>cold; face; sweat</annotation>
+		<annotation cp='[😔]' tts='pensive face'>dejected; face; pensive</annotation>
+		<annotation cp='[😕]' tts='confused face'>confused; face</annotation>
+		<annotation cp='[😖]' tts='confounded face'>confounded; face</annotation>
+		<annotation cp='[🙃]' tts='upside-down face'>face; upside-down</annotation>
+		<annotation cp='[😷]' tts='face with medical mask'>cold; doctor; face; mask; medicine; sick</annotation>
+		<annotation cp='[🤒]' tts='face with thermometer'>face; ill; sick; thermometer</annotation>
+		<annotation cp='[🤕]' tts='face with head-bandage'>bandage; face; hurt; injury</annotation>
+		<annotation cp='[🤑]' tts='money-mouth face'>face; money; mouth</annotation>
+		<annotation cp='[😲]' tts='astonished face'>astonished; face; shocked; totally</annotation>
+		<annotation cp='[😞]' tts='disappointed face'>disappointed; face</annotation>
+		<annotation cp='[😟]' tts='worried face'>face; worried</annotation>
+		<annotation cp='[😤]' tts='face with steam from nose'>face; triumph; won</annotation>
+		<annotation cp='[😢]' tts='crying face'>cry; face; sad; tear</annotation>
+		<annotation cp='[😭]' tts='loudly crying face'>cry; face; sad; sob; tear</annotation>
+		<annotation cp='[😦]' tts='frowning face with open mouth'>face; frown; mouth; open</annotation>
+		<annotation cp='[😧]' tts='anguished face'>anguished; face</annotation>
+		<annotation cp='[😨]' tts='fearful face'>face; fear; fearful; scared</annotation>
+		<annotation cp='[😩]' tts='weary face'>face; tired; weary</annotation>
+		<annotation cp='[😬]' tts='grimacing face'>face; grimace</annotation>
+		<annotation cp='[😰]' tts='face with open mouth and cold sweat'>blue; cold; face; mouth; open; rushed; sweat</annotation>
+		<annotation cp='[😱]' tts='face screaming in fear'>face; fear; fearful; munch; scared; scream</annotation>
+		<annotation cp='[😳]' tts='flushed face'>dazed; face; flushed</annotation>
+		<annotation cp='[😵]' tts='dizzy face'>dizzy; face</annotation>
+		<annotation cp='[😡]' tts='pouting face'>angry; face; mad; pouting; rage; red</annotation>
+		<annotation cp='[😠]' tts='angry face'>angry; face; mad</annotation>
+		<annotation cp='[😈]' tts='smiling face with horns'>face; fairy tale; fantasy; horns; smile</annotation>
+		<annotation cp='[👿]' tts='imp'>demon; devil; face; fairy tale; fantasy</annotation>
+		<annotation cp='[👹]' tts='ogre'>creature; face; fairy tale; fantasy; japanese; monster</annotation>
+		<annotation cp='[👺]' tts='goblin'>creature; face; fairy tale; fantasy; japanese; monster</annotation>
+		<annotation cp='[💀]' tts='skull'>body; death; face; fairy tale; monster</annotation>
+		<annotation cp='[☠]' tts='skull and crossbones'>body; crossbones; death; face; monster; skull</annotation>
+		<annotation cp='[👻]' tts='ghost'>creature; face; fairy tale; fantasy; monster</annotation>
+		<annotation cp='[👽]' tts='alien'>creature; extraterrestrial; face; fairy tale; fantasy; monster; space; ufo</annotation>
+		<annotation cp='[👾]' tts='alien monster'>alien; creature; extraterrestrial; face; fairy tale; fantasy; monster; space; ufo</annotation>
+		<annotation cp='[🤖]' tts='robot face'>face; monster; robot</annotation>
+		<annotation cp='[💩]' tts='pile of poo'>comic; dung; face; monster; poo; poop</annotation>
+		<annotation cp='[😺]' tts='smiling cat face with open mouth'>cat; face; mouth; open; smile</annotation>
+		<annotation cp='[😸]' tts='grinning cat face with smiling eyes'>cat; eye; face; grin; smile</annotation>
+		<annotation cp='[😹]' tts='cat face with tears of joy'>cat; face; joy; tear</annotation>
+		<annotation cp='[😻]' tts='smiling cat face with heart-shaped eyes'>cat; eye; face; heart; love; smile</annotation>
+		<annotation cp='[😼]' tts='cat face with wry smile'>cat; face; ironic; smile; wry</annotation>
+		<annotation cp='[😽]' tts='kissing cat face with closed eyes'>cat; eye; face; kiss</annotation>
+		<annotation cp='[🙀]' tts='weary cat face'>cat; face; oh; surprised; weary</annotation>
+		<annotation cp='[😿]' tts='crying cat face'>cat; cry; face; sad; tear</annotation>
+		<annotation cp='[😾]' tts='pouting cat face'>cat; face; pouting</annotation>
+		<annotation cp='[🙈]' tts='see-no-evil'>evil; face; forbidden; gesture; monkey; no; not; prohibited; see</annotation>
+		<annotation cp='[🙉]' tts='hear-no-evil'>evil; face; forbidden; gesture; hear; monkey; no; not; prohibited</annotation>
+		<annotation cp='[🙊]' tts='speak-no-evil'>evil; face; forbidden; gesture; monkey; no; not; prohibited; speak</annotation>
+		<annotation cp='[👦]' tts='boy'>boy</annotation>
+		<annotation cp='[👧]' tts='girl'>maiden; virgin; virgo; zodiac</annotation>
+		<annotation cp='[👨]' tts='man'>man</annotation>
+		<annotation cp='[👩]' tts='woman'>woman</annotation>
+		<annotation cp='[👴]' tts='old man'>man; old</annotation>
+		<annotation cp='[👵]' tts='old woman'>old; woman</annotation>
+		<annotation cp='[👶]' tts='baby'>baby</annotation>
+		<annotation cp='[👱]' tts='person with blond hair'>blond</annotation>
+		<annotation cp='[👮]' tts='police officer'>cop; officer; police</annotation>
+		<annotation cp='[👲]' tts='man with chinese cap'>gua pi mao; hat; man</annotation>
+		<annotation cp='[👳]' tts='man with turban'>man; turban</annotation>
+		<annotation cp='[👷]' tts='construction worker'>construction; hat; worker</annotation>
+		<annotation cp='[⛑]' tts='helmet with white cross'>aid; cross; face; hat; helmet</annotation>
+		<annotation cp='[👸]' tts='princess'>fairy tale; fantasy</annotation>
+		<annotation cp='[💂]' tts='guardsman'>guard</annotation>
+		<annotation cp='[🕵]' tts='detective'>sleuth; spy</annotation>
+		<annotation cp='[🎅]' tts='santa claus'>celebration; christmas; fairy tale; fantasy; father; santa</annotation>
+		<annotation cp='[👼]' tts='baby angel'>angel; baby; face; fairy tale; fantasy</annotation>
+		<annotation cp='[💆]' tts='face massage'>massage; salon</annotation>
+		<annotation cp='[💇]' tts='haircut'>barber; beauty; parlor</annotation>
+		<annotation cp='[👰]' tts='bride with veil'>bride; veil; wedding</annotation>
+		<annotation cp='[🙍]' tts='person frowning'>frown; gesture</annotation>
+		<annotation cp='[🙎]' tts='person pouting'>gesture; pouting</annotation>
+		<annotation cp='[🙅]' tts='gesturing no'>forbidden; gesture; hand; no; not; prohibited</annotation>
+		<annotation cp='[🙆]' tts='gesturing ok'>gesture; hand; ok</annotation>
+		<annotation cp='[💁]' tts='information desk person'>hand; help; information; sassy</annotation>
+		<annotation cp='[🙋]' tts='happy person raising hand'>gesture; hand; happy; raised</annotation>
+		<annotation cp='[🙇]' tts='person bowing'>apology; bow; gesture; sorry</annotation>
+		<annotation cp='[🙌]' tts='person raising hands'>body; celebration; gesture; hand; hooray; raised</annotation>
+		<annotation cp='[🙏]' tts='folded hands'>ask; body; bow; folded; gesture; hand; please; pray; thanks</annotation>
+		<annotation cp='[🗣]' tts='speaking head'>face; head; silhouette; speak; speaking</annotation>
+		<annotation cp='[👤]' tts='bust in silhouette'>bust; silhouette</annotation>
+		<annotation cp='[👥]' tts='busts in silhouette'>bust; silhouette</annotation>
+		<annotation cp='[🚶]' tts='pedestrian'>hike; walk; walking</annotation>
+		<annotation cp='[🏃]' tts='runner'>marathon; running</annotation>
+		<annotation cp='[👯]' tts='women partying'>bunny; dancer; ear; girl; woman</annotation>
+		<annotation cp='[💃]' tts='dancer'>dancer</annotation>
+		<annotation cp='[🕴]' tts='man in business suit levitating'>business; man; suit</annotation>
+		<annotation cp='[💏]' tts='kiss'>couple; romance</annotation>
+		<annotation cp='[💑]' tts='couple with heart'>couple; heart; love; romance</annotation>
+		<annotation cp='[👪]' tts='family'>child; father; mother</annotation>
+		<annotation cp='[👫]' tts='man and woman holding hands'>couple; hand; hold; man; woman</annotation>
+		<annotation cp='[👬]' tts='two men holding hands'>couple; gemini; hand; hold; man; twins; zodiac</annotation>
+		<annotation cp='[👭]' tts='two women holding hands'>couple; hand; hold; woman</annotation>
+		<annotation cp='[🏻]' tts='skin type-1-2'>emoji modifier; fitzpatrick; skin; tone</annotation>
+		<annotation cp='[🏼]' tts='skin type-3'>emoji modifier; fitzpatrick; skin; tone</annotation>
+		<annotation cp='[🏽]' tts='skin type-4'>emoji modifier; fitzpatrick; skin; tone</annotation>
+		<annotation cp='[🏾]' tts='skin type-5'>emoji modifier; fitzpatrick; skin; tone</annotation>
+		<annotation cp='[🏿]' tts='skin type-6'>emoji modifier; fitzpatrick; skin; tone</annotation>
+		<annotation cp='[💪]' tts='flexed biceps'>biceps; body; comic; flex; muscle</annotation>
+		<annotation cp='[👈]' tts='backhand index pointing left'>backhand; body; finger; hand; index; point</annotation>
+		<annotation cp='[👉]' tts='backhand index pointing right'>backhand; body; finger; hand; index; point</annotation>
+		<annotation cp='[☝]' tts='index pointing up'>body; finger; hand; index; point; up</annotation>
+		<annotation cp='[👆]' tts='backhand index pointing up'>backhand; body; finger; hand; index; point; up</annotation>
+		<annotation cp='[🖕]' tts='middle finger'>body; finger; hand</annotation>
+		<annotation cp='[👇]' tts='backhand index pointing down'>backhand; body; down; finger; hand; index; point</annotation>
+		<annotation cp='[✌]' tts='victory hand'>body; hand; v; victory</annotation>
+		<annotation cp='[🖖]' tts='vulcan salute'>body; finger; hand; spock; vulcan</annotation>
+		<annotation cp='[🤘]' tts='sign of the horns'>body; finger; hand; horns; rock-on</annotation>
+		<annotation cp='[🖐]' tts='raised hand with fingers splayed'>body; finger; hand; splayed</annotation>
+		<annotation cp='[✋]' tts='raised hand'>body; hand</annotation>
+		<annotation cp='[👌]' tts='ok hand'>body; hand; ok</annotation>
+		<annotation cp='[👍]' tts='thumbs up'>+1; body; hand; thumb; up</annotation>
+		<annotation cp='[👎]' tts='thumbs down'>-1; body; down; hand; thumb</annotation>
+		<annotation cp='[✊]' tts='raised fist'>body; clenched; fist; hand; punch</annotation>
+		<annotation cp='[👊]' tts='oncoming fist'>body; clenched; fist; hand; punch</annotation>
+		<annotation cp='[👋]' tts='waving hand'>body; hand; wave; waving</annotation>
+		<annotation cp='[👏]' tts='clapping hands'>body; clap; hand</annotation>
+		<annotation cp='[👐]' tts='open hands'>body; hand; open</annotation>
+		<annotation cp='[✍]' tts='writing hand'>body; hand; write</annotation>
+		<annotation cp='[💅]' tts='nail polish'>body; care; cosmetics; manicure; nail; polish</annotation>
+		<annotation cp='[👂]' tts='ear'>body</annotation>
+		<annotation cp='[👃]' tts='nose'>body</annotation>
+		<annotation cp='[👣]' tts='footprints'>body; clothing; footprint; print</annotation>
+		<annotation cp='[👀]' tts='eyes'>body; eye; face</annotation>
+		<annotation cp='[👁]' tts='eye'>body</annotation>
+		<annotation cp='[👅]' tts='tongue'>body</annotation>
+		<annotation cp='[👄]' tts='mouth'>body; lips</annotation>
+		<annotation cp='[💋]' tts='kiss mark'>heart; kiss; lips; mark; romance</annotation>
+		<annotation cp='[💘]' tts='heart with arrow'>arrow; cupid; heart; romance</annotation>
+		<annotation cp='[❤]' tts='red heart'>heart</annotation>
+		<annotation cp='[💓]' tts='beating heart'>beating; heart; heartbeat; pulsating</annotation>
+		<annotation cp='[💔]' tts='broken heart'>break; broken; heart</annotation>
+		<annotation cp='[💕]' tts='two hearts'>heart; love</annotation>
+		<annotation cp='[💖]' tts='sparkling heart'>excited; heart; sparkle</annotation>
+		<annotation cp='[💗]' tts='growing heart'>excited; growing; heart; heartpulse; nervous</annotation>
+		<annotation cp='[💙]' tts='blue heart'>blue; heart</annotation>
+		<annotation cp='[💚]' tts='green heart'>green; heart</annotation>
+		<annotation cp='[💛]' tts='yellow heart'>heart; yellow</annotation>
+		<annotation cp='[💜]' tts='purple heart'>heart; purple</annotation>
+		<annotation cp='[💝]' tts='heart with ribbon'>heart; ribbon; valentine</annotation>
+		<annotation cp='[💞]' tts='revolving hearts'>heart; revolving</annotation>
+		<annotation cp='[💟]' tts='heart decoration'>heart</annotation>
+		<annotation cp='[❣]' tts='heavy heart exclamation mark ornament'>exclamation; heart; mark; punctuation</annotation>
+		<annotation cp='[💌]' tts='love letter'>heart; letter; love; mail; romance</annotation>
+		<annotation cp='[💤]' tts='zzz'>comic; sleep</annotation>
+		<annotation cp='[💢]' tts='anger symbol'>angry; comic; mad</annotation>
+		<annotation cp='[💣]' tts='bomb'>comic</annotation>
+		<annotation cp='[💥]' tts='collision'>boom; comic</annotation>
+		<annotation cp='[💦]' tts='sweat droplets'>comic; splashing; sweat</annotation>
+		<annotation cp='[💨]' tts='dashing'>comic; dash; running</annotation>
+		<annotation cp='[💫]' tts='dizzy'>comic; star</annotation>
+		<annotation cp='[💬]' tts='speech balloon'>balloon; bubble; comic; dialog; speech</annotation>
+		<annotation cp='[🗨]' tts='left speech bubble'>dialog; speech</annotation>
+		<annotation cp='[🗯]' tts='right anger bubble'>angry; balloon; bubble; mad</annotation>
+		<annotation cp='[💭]' tts='thought balloon'>balloon; bubble; comic; thought</annotation>
+		<annotation cp='[🕳]' tts='hole'>hole</annotation>
+		<annotation cp='[👓]' tts='glasses'>clothing; eye; eyeglasses; eyewear</annotation>
+		<annotation cp='[🕶]' tts='sunglasses'>dark; eye; eyewear; glasses</annotation>
+		<annotation cp='[👔]' tts='necktie'>clothing</annotation>
+		<annotation cp='[👕]' tts='t-shirt'>clothing; shirt; tshirt</annotation>
+		<annotation cp='[👖]' tts='jeans'>clothing; pants; trousers</annotation>
+		<annotation cp='[👗]' tts='dress'>clothing</annotation>
+		<annotation cp='[👘]' tts='kimono'>clothing</annotation>
+		<annotation cp='[👙]' tts='bikini'>clothing; swim</annotation>
+		<annotation cp='[👚]' tts='woman’s clothes'>clothing; woman</annotation>
+		<annotation cp='[👛]' tts='purse'>clothing; coin</annotation>
+		<annotation cp='[👜]' tts='handbag'>bag; clothing</annotation>
+		<annotation cp='[👝]' tts='pouch'>bag; clothing</annotation>
+		<annotation cp='[🛍]' tts='shopping bags'>bag; hotel; shopping</annotation>
+		<annotation cp='[🎒]' tts='school backpack'>bag; satchel; school</annotation>
+		<annotation cp='[👞]' tts='man’s shoe'>clothing; man; shoe</annotation>
+		<annotation cp='[👟]' tts='running shoe'>athletic; clothing; shoe; sneaker</annotation>
+		<annotation cp='[👠]' tts='high-heeled shoe'>clothing; heel; shoe; woman</annotation>
+		<annotation cp='[👡]' tts='woman’s sandal'>clothing; sandal; shoe; woman</annotation>
+		<annotation cp='[👢]' tts='woman’s boot'>boot; clothing; shoe; woman</annotation>
+		<annotation cp='[👑]' tts='crown'>clothing; king; queen</annotation>
+		<annotation cp='[👒]' tts='woman’s hat'>clothing; hat; woman</annotation>
+		<annotation cp='[🎩]' tts='top hat'>clothing; hat; top; tophat</annotation>
+		<annotation cp='[🎓]' tts='graduation cap'>cap; celebration; clothing; graduation; hat</annotation>
+		<annotation cp='[📿]' tts='prayer beads'>beads; clothing; necklace; prayer; religion</annotation>
+		<annotation cp='[💄]' tts='lipstick'>cosmetics; makeup</annotation>
+		<annotation cp='[💍]' tts='ring'>diamond; romance</annotation>
+		<annotation cp='[💎]' tts='gem stone'>diamond; gem; jewel; romance</annotation>
+		<annotation cp='[🐵]' tts='monkey face'>face; monkey</annotation>
+		<annotation cp='[🐒]' tts='monkey'>monkey</annotation>
+		<annotation cp='[🐶]' tts='dog face'>dog; face; pet</annotation>
+		<annotation cp='[🐕]' tts='dog'>pet</annotation>
+		<annotation cp='[🐩]' tts='poodle'>dog</annotation>
+		<annotation cp='[🐺]' tts='wolf face'>face; wolf</annotation>
+		<annotation cp='[🐱]' tts='cat face'>cat; face; pet</annotation>
+		<annotation cp='[🐈]' tts='cat'>pet</annotation>
+		<annotation cp='[🦁]' tts='lion face'>face; leo; lion; zodiac</annotation>
+		<annotation cp='[🐯]' tts='tiger face'>face; tiger</annotation>
+		<annotation cp='[🐅]' tts='tiger'>tiger</annotation>
+		<annotation cp='[🐆]' tts='leopard'>leopard</annotation>
+		<annotation cp='[🐴]' tts='horse face'>face; horse</annotation>
+		<annotation cp='[🐎]' tts='horse'>racehorse; racing</annotation>
+		<annotation cp='[🦄]' tts='unicorn face'>face; unicorn</annotation>
+		<annotation cp='[🐮]' tts='cow face'>cow; face</annotation>
+		<annotation cp='[🐂]' tts='ox'>bull; taurus; zodiac</annotation>
+		<annotation cp='[🐃]' tts='water buffalo'>buffalo; water</annotation>
+		<annotation cp='[🐄]' tts='cow'>cow</annotation>
+		<annotation cp='[🐷]' tts='pig face'>face; pig</annotation>
+		<annotation cp='[🐖]' tts='pig'>sow</annotation>
+		<annotation cp='[🐗]' tts='boar'>pig</annotation>
+		<annotation cp='[🐽]' tts='pig nose'>face; nose; pig</annotation>
+		<annotation cp='[🐏]' tts='ram'>aries; sheep; zodiac</annotation>
+		<annotation cp='[🐑]' tts='sheep'>ewe</annotation>
+		<annotation cp='[🐐]' tts='goat'>capricorn; zodiac</annotation>
+		<annotation cp='[🐪]' tts='camel'>dromedary; hump</annotation>
+		<annotation cp='[🐫]' tts='two-hump camel'>bactrian; camel; hump</annotation>
+		<annotation cp='[🐘]' tts='elephant'>elephant</annotation>
+		<annotation cp='[🐭]' tts='mouse face'>face; mouse</annotation>
+		<annotation cp='[🐁]' tts='mouse'>mouse</annotation>
+		<annotation cp='[🐀]' tts='rat'>rat</annotation>
+		<annotation cp='[🐹]' tts='hamster face'>face; hamster; pet</annotation>
+		<annotation cp='[🐰]' tts='rabbit face'>bunny; face; pet; rabbit</annotation>
+		<annotation cp='[🐇]' tts='rabbit'>bunny; pet</annotation>
+		<annotation cp='[🐿]' tts='chipmunk'>chipmunk</annotation>
+		<annotation cp='[🐻]' tts='bear face'>bear; face</annotation>
+		<annotation cp='[🐨]' tts='koala'>bear</annotation>
+		<annotation cp='[🐼]' tts='panda face'>face; panda</annotation>
+		<annotation cp='[🐾]' tts='paw prints'>feet; paw; print</annotation>
+		<annotation cp='[🦃]' tts='turkey'>turkey</annotation>
+		<annotation cp='[🐔]' tts='chicken'>chicken</annotation>
+		<annotation cp='[🐓]' tts='rooster'>rooster</annotation>
+		<annotation cp='[🐣]' tts='hatching chick'>baby; chick; hatching</annotation>
+		<annotation cp='[🐤]' tts='baby chick'>baby; chick</annotation>
+		<annotation cp='[🐥]' tts='front-facing baby chick'>baby; chick</annotation>
+		<annotation cp='[🐦]' tts='bird'>bird</annotation>
+		<annotation cp='[🐧]' tts='penguin'>penguin</annotation>
+		<annotation cp='[🕊]' tts='dove'>bird; fly; peace</annotation>
+		<annotation cp='[🐸]' tts='frog face'>face; frog</annotation>
+		<annotation cp='[🐊]' tts='crocodile'>crocodile</annotation>
+		<annotation cp='[🐢]' tts='turtle'>turtle</annotation>
+		<annotation cp='[🐍]' tts='snake'>bearer; ophiuchus; serpent; zodiac</annotation>
+		<annotation cp='[🐲]' tts='dragon face'>dragon; face; fairy tale</annotation>
+		<annotation cp='[🐉]' tts='dragon'>fairy tale</annotation>
+		<annotation cp='[🐳]' tts='spouting whale'>face; spouting; whale</annotation>
+		<annotation cp='[🐋]' tts='whale'>whale</annotation>
+		<annotation cp='[🐬]' tts='dolphin'>flipper</annotation>
+		<annotation cp='[🐟]' tts='fish'>pisces; zodiac</annotation>
+		<annotation cp='[🐠]' tts='tropical fish'>fish; tropical</annotation>
+		<annotation cp='[🐡]' tts='blowfish'>fish</annotation>
+		<annotation cp='[🐙]' tts='octopus'>octopus</annotation>
+		<annotation cp='[🐚]' tts='spiral shell'>shell; spiral</annotation>
+		<annotation cp='[🦀]' tts='crab'>cancer; zodiac</annotation>
+		<annotation cp='[🐌]' tts='snail'>snail</annotation>
+		<annotation cp='[🐛]' tts='bug'>insect</annotation>
+		<annotation cp='[🐜]' tts='ant'>insect</annotation>
+		<annotation cp='[🐝]' tts='honeybee'>bee; insect</annotation>
+		<annotation cp='[🐞]' tts='lady beetle'>beetle; insect; ladybird; ladybug</annotation>
+		<annotation cp='[🕷]' tts='spider'>insect</annotation>
+		<annotation cp='[🕸]' tts='spider web'>spider; web</annotation>
+		<annotation cp='[🦂]' tts='scorpion'>scorpio; scorpius; zodiac</annotation>
+		<annotation cp='[💐]' tts='bouquet'>flower; plant; romance</annotation>
+		<annotation cp='[🌸]' tts='cherry blossom'>blossom; cherry; flower; plant</annotation>
+		<annotation cp='[💮]' tts='white flower'>flower</annotation>
+		<annotation cp='[🏵]' tts='rosette'>plant</annotation>
+		<annotation cp='[🌹]' tts='rose'>flower; plant</annotation>
+		<annotation cp='[🌺]' tts='hibiscus'>flower; plant</annotation>
+		<annotation cp='[🌻]' tts='sunflower'>flower; plant; sun</annotation>
+		<annotation cp='[🌼]' tts='blossom'>flower; plant</annotation>
+		<annotation cp='[🌷]' tts='tulip'>flower; plant</annotation>
+		<annotation cp='[🌱]' tts='seedling'>plant; young</annotation>
+		<annotation cp='[🌲]' tts='evergreen'>plant; tree</annotation>
+		<annotation cp='[🌳]' tts='deciduous tree'>deciduous; plant; shedding; tree</annotation>
+		<annotation cp='[🌴]' tts='palm tree'>palm; plant; tree</annotation>
+		<annotation cp='[🌵]' tts='cactus'>plant</annotation>
+		<annotation cp='[🌾]' tts='sheaf of rice'>ear; plant; rice</annotation>
+		<annotation cp='[🌿]' tts='herb'>leaf; plant</annotation>
+		<annotation cp='[☘]' tts='shamrock'>plant</annotation>
+		<annotation cp='[🍀]' tts='four leaf clover'>4; clover; four; leaf; plant</annotation>
+		<annotation cp='[🍁]' tts='maple leaf'>falling; leaf; maple; plant</annotation>
+		<annotation cp='[🍂]' tts='fallen leaf'>falling; leaf; plant</annotation>
+		<annotation cp='[🍃]' tts='leaf fluttering in wind'>blow; flutter; leaf; plant; wind</annotation>
+		<annotation cp='[🍇]' tts='grapes'>fruit; grape; plant</annotation>
+		<annotation cp='[🍈]' tts='melon'>fruit; plant</annotation>
+		<annotation cp='[🍉]' tts='watermelon'>fruit; plant</annotation>
+		<annotation cp='[🍊]' tts='tangerine'>fruit; orange; plant</annotation>
+		<annotation cp='[🍋]' tts='lemon'>citrus; fruit; plant</annotation>
+		<annotation cp='[🍌]' tts='banana'>fruit; plant</annotation>
+		<annotation cp='[🍍]' tts='pineapple'>fruit; plant</annotation>
+		<annotation cp='[🍎]' tts='red apple'>apple; fruit; plant; red</annotation>
+		<annotation cp='[🍏]' tts='green apple'>apple; fruit; green; plant</annotation>
+		<annotation cp='[🍐]' tts='pear'>fruit; plant</annotation>
+		<annotation cp='[🍑]' tts='peach'>fruit; plant</annotation>
+		<annotation cp='[🍒]' tts='cherries'>cherry; fruit; plant</annotation>
+		<annotation cp='[🍓]' tts='strawberry'>berry; fruit; plant</annotation>
+		<annotation cp='[🍅]' tts='tomato'>plant; vegetable</annotation>
+		<annotation cp='[🍆]' tts='eggplant'>aubergine; plant; vegetable</annotation>
+		<annotation cp='[🌽]' tts='ear of corn'>corn; ear; maize; maze; plant</annotation>
+		<annotation cp='[🌶]' tts='hot pepper'>hot; pepper; plant</annotation>
+		<annotation cp='[🍄]' tts='mushroom'>plant</annotation>
+		<annotation cp='[🌰]' tts='chestnut'>plant</annotation>
+		<annotation cp='[🍞]' tts='bread'>loaf</annotation>
+		<annotation cp='[🧀]' tts='cheese wedge'>cheese</annotation>
+		<annotation cp='[🍖]' tts='meat on bone'>bone; meat</annotation>
+		<annotation cp='[🍗]' tts='poultry leg'>bone; chicken; leg; poultry</annotation>
+		<annotation cp='[🍔]' tts='hamburger'>burger</annotation>
+		<annotation cp='[🍟]' tts='french fries'>french; fries</annotation>
+		<annotation cp='[🍕]' tts='pizza'>cheese; slice</annotation>
+		<annotation cp='[🌭]' tts='hot dog'>frankfurter; hotdog; sausage</annotation>
+		<annotation cp='[🌮]' tts='taco'>mexican</annotation>
+		<annotation cp='[🌯]' tts='burrito'>mexican</annotation>
+		<annotation cp='[🍿]' tts='popcorn'>popcorn</annotation>
+		<annotation cp='[🍲]' tts='pot of food'>pot; stew</annotation>
+		<annotation cp='[🍱]' tts='bento box'>bento; box</annotation>
+		<annotation cp='[🍘]' tts='rice cracker'>cracker; rice</annotation>
+		<annotation cp='[🍙]' tts='rice ball'>ball; japanese; rice</annotation>
+		<annotation cp='[🍚]' tts='cooked rice'>cooked; rice</annotation>
+		<annotation cp='[🍛]' tts='curry rice'>curry; rice</annotation>
+		<annotation cp='[🍜]' tts='steaming bowl'>bowl; noodle; ramen; steaming</annotation>
+		<annotation cp='[🍝]' tts='spaghetti'>pasta</annotation>
+		<annotation cp='[🍠]' tts='roasted sweet potato'>potato; roasted; sweet</annotation>
+		<annotation cp='[🍢]' tts='oden'>kebab; seafood; skewer; stick</annotation>
+		<annotation cp='[🍣]' tts='sushi'>sushi</annotation>
+		<annotation cp='[🍤]' tts='fried shrimp'>fried; prawn; shrimp; tempura</annotation>
+		<annotation cp='[🍥]' tts='fish cake with swirl'>cake; fish; pastry; swirl</annotation>
+		<annotation cp='[🍡]' tts='dango'>dessert; japanese; skewer; stick; sweet</annotation>
+		<annotation cp='[🍦]' tts='soft ice cream'>cream; dessert; ice; icecream; soft; sweet</annotation>
+		<annotation cp='[🍧]' tts='shaved ice'>dessert; ice; shaved; sweet</annotation>
+		<annotation cp='[🍨]' tts='ice cream'>cream; dessert; ice; sweet</annotation>
+		<annotation cp='[🍩]' tts='doughnut'>dessert; donut; sweet</annotation>
+		<annotation cp='[🍪]' tts='cookie'>dessert; sweet</annotation>
+		<annotation cp='[🎂]' tts='birthday cake'>birthday; cake; celebration; dessert; pastry; sweet</annotation>
+		<annotation cp='[🍰]' tts='shortcake'>cake; dessert; pastry; slice; sweet</annotation>
+		<annotation cp='[🍫]' tts='chocolate bar'>bar; chocolate; dessert; sweet</annotation>
+		<annotation cp='[🍬]' tts='candy'>dessert; sweet</annotation>
+		<annotation cp='[🍭]' tts='lollipop'>candy; dessert; sweet</annotation>
+		<annotation cp='[🍮]' tts='custard'>dessert; pudding; sweet</annotation>
+		<annotation cp='[🍯]' tts='honey pot'>honey; honeypot; pot; sweet</annotation>
+		<annotation cp='[🍼]' tts='baby bottle'>baby; bottle; drink; milk</annotation>
+		<annotation cp='[☕]' tts='hot beverage'>beverage; coffee; drink; hot; steaming; tea</annotation>
+		<annotation cp='[🍵]' tts='teacup without handle'>beverage; cup; drink; tea; teacup</annotation>
+		<annotation cp='[🍶]' tts='sake'>bar; beverage; bottle; cup; drink</annotation>
+		<annotation cp='[🍾]' tts='bottle with popping cork'>bar; bottle; cork; drink; popping</annotation>
+		<annotation cp='[🍷]' tts='wine glass'>bar; beverage; drink; glass; wine</annotation>
+		<annotation cp='[🍸]' tts='cocktail glass'>bar; cocktail; drink; glass</annotation>
+		<annotation cp='[🍹]' tts='tropical drink'>bar; drink; tropical</annotation>
+		<annotation cp='[🍺]' tts='beer mug'>bar; beer; drink; mug</annotation>
+		<annotation cp='[🍻]' tts='clinking beer mugs'>bar; beer; clink; drink; mug</annotation>
+		<annotation cp='[🍽]' tts='fork and knife with plate'>cooking; fork; knife; plate</annotation>
+		<annotation cp='[🍴]' tts='fork and knife'>cooking; fork; knife</annotation>
+		<annotation cp='[🍳]' tts='cooking'>egg; frying; pan</annotation>
+		<annotation cp='[🏺]' tts='amphora'>aquarius; cooking; drink; jug; tool; weapon; zodiac</annotation>
+		<annotation cp='[🌍]' tts='globe showing europe-africa'>africa; earth; europe; globe; world</annotation>
+		<annotation cp='[🌎]' tts='globe showing americas'>americas; earth; globe; world</annotation>
+		<annotation cp='[🌏]' tts='globe showing asia-australia'>asia; australia; earth; globe; world</annotation>
+		<annotation cp='[🌐]' tts='globe with meridians'>earth; globe; meridians; world</annotation>
+		<annotation cp='[🗺]' tts='world map'>map; world</annotation>
+		<annotation cp='[🏔]' tts='snow-capped mountain'>cold; mountain; snow</annotation>
+		<annotation cp='[⛰]' tts='mountain'>mountain</annotation>
+		<annotation cp='[🌋]' tts='volcano'>eruption; mountain; weather</annotation>
+		<annotation cp='[🗻]' tts='mount fuji'>fuji; mountain</annotation>
+		<annotation cp='[🏕]' tts='camping'>camping</annotation>
+		<annotation cp='[🏖]' tts='beach with umbrella'>beach; umbrella</annotation>
+		<annotation cp='[🏜]' tts='desert'>desert</annotation>
+		<annotation cp='[🏝]' tts='desert island'>desert; island</annotation>
+		<annotation cp='[🏞]' tts='national park'>park</annotation>
+		<annotation cp='[🏟]' tts='stadium'>stadium</annotation>
+		<annotation cp='[🏛]' tts='classical building'>building; classical</annotation>
+		<annotation cp='[🏗]' tts='building construction'>building; construction</annotation>
+		<annotation cp='[🏘]' tts='house buildings'>building; house</annotation>
+		<annotation cp='[🏙]' tts='cityscape'>building; city</annotation>
+		<annotation cp='[🏚]' tts='derelict house building'>building; derelict; house</annotation>
+		<annotation cp='[🏠]' tts='house building'>building; home; house</annotation>
+		<annotation cp='[🏡]' tts='house with garden'>building; garden; home; house</annotation>
+		<annotation cp='[⛪]' tts='church'>building; christian; cross; religion</annotation>
+		<annotation cp='[🕋]' tts='kaaba'>islam; muslim; religion</annotation>
+		<annotation cp='[🕌]' tts='mosque'>islam; muslim; religion</annotation>
+		<annotation cp='[🕍]' tts='synagogue'>jew; jewish; religion; temple</annotation>
+		<annotation cp='[⛩]' tts='shinto shrine'>religion; shinto; shrine</annotation>
+		<annotation cp='[🏢]' tts='office building'>building</annotation>
+		<annotation cp='[🏣]' tts='japanese post office'>building; japanese; post</annotation>
+		<annotation cp='[🏤]' tts='post office'>building; european; post</annotation>
+		<annotation cp='[🏥]' tts='hospital'>building; doctor; medicine</annotation>
+		<annotation cp='[🏦]' tts='bank'>building</annotation>
+		<annotation cp='[🏨]' tts='hotel'>building</annotation>
+		<annotation cp='[🏩]' tts='love hotel'>building; hotel; love</annotation>
+		<annotation cp='[🏪]' tts='convenience store'>building; convenience; store</annotation>
+		<annotation cp='[🏫]' tts='school'>building</annotation>
+		<annotation cp='[🏬]' tts='department store'>building; department; store</annotation>
+		<annotation cp='[🏭]' tts='factory'>building</annotation>
+		<annotation cp='[🏯]' tts='japanese castle'>building; castle; japanese</annotation>
+		<annotation cp='[🏰]' tts='castle'>building; european</annotation>
+		<annotation cp='[💒]' tts='wedding'>chapel; romance</annotation>
+		<annotation cp='[🗼]' tts='tokyo tower'>tokyo; tower</annotation>
+		<annotation cp='[🗽]' tts='statue of liberty'>liberty; statue</annotation>
+		<annotation cp='[🗾]' tts='map of japan'>japan; map</annotation>
+		<annotation cp='[⛲]' tts='fountain'>fountain</annotation>
+		<annotation cp='[⛺]' tts='tent'>camping</annotation>
+		<annotation cp='[🌁]' tts='foggy'>fog; weather</annotation>
+		<annotation cp='[🌃]' tts='night with stars'>night; star; weather</annotation>
+		<annotation cp='[🌄]' tts='sunrise over mountains'>morning; mountain; sun; sunrise; weather</annotation>
+		<annotation cp='[🌅]' tts='sunrise'>morning; sun; weather</annotation>
+		<annotation cp='[🌆]' tts='cityscape at dusk'>building; city; dusk; evening; landscape; sun; sunset; weather</annotation>
+		<annotation cp='[🌇]' tts='sunset'>building; dusk; sun; weather</annotation>
+		<annotation cp='[🌉]' tts='bridge at night'>bridge; night; weather</annotation>
+		<annotation cp='[♨]' tts='hot springs'>hot; hotsprings; springs; steaming</annotation>
+		<annotation cp='[🌌]' tts='milky way'>space; weather</annotation>
+		<annotation cp='[🎠]' tts='carousel horse'>carousel; horse</annotation>
+		<annotation cp='[🎡]' tts='ferris wheel'>amusement park; ferris; wheel</annotation>
+		<annotation cp='[🎢]' tts='roller coaster'>amusement park; coaster; roller</annotation>
+		<annotation cp='[💈]' tts='barber pole'>barber; haircut; pole</annotation>
+		<annotation cp='[🎪]' tts='circus tent'>circus; tent</annotation>
+		<annotation cp='[🎭]' tts='performing arts'>art; mask; performing; theater; theatre</annotation>
+		<annotation cp='[🖼]' tts='frame with picture'>art; frame; museum; painting; picture</annotation>
+		<annotation cp='[🎨]' tts='artist palette'>art; museum; painting; palette</annotation>
+		<annotation cp='[🎰]' tts='slot machine'>game; slot</annotation>
+		<annotation cp='[🚂]' tts='locomotive'>engine; railway; steam; train; vehicle</annotation>
+		<annotation cp='[🚃]' tts='railway car'>car; electric; railway; train; tram; trolleybus; vehicle</annotation>
+		<annotation cp='[🚄]' tts='high-speed train'>railway; shinkansen; speed; train; vehicle</annotation>
+		<annotation cp='[🚅]' tts='high-speed train with bullet nose'>bullet; railway; shinkansen; speed; train; vehicle</annotation>
+		<annotation cp='[🚆]' tts='train'>railway; vehicle</annotation>
+		<annotation cp='[🚇]' tts='metro'>subway; vehicle</annotation>
+		<annotation cp='[🚈]' tts='light rail'>railway; vehicle</annotation>
+		<annotation cp='[🚉]' tts='station'>railway; train; vehicle</annotation>
+		<annotation cp='[🚊]' tts='tram'>trolleybus; vehicle</annotation>
+		<annotation cp='[🚝]' tts='monorail'>vehicle</annotation>
+		<annotation cp='[🚞]' tts='mountain railway'>car; mountain; railway; vehicle</annotation>
+		<annotation cp='[🚋]' tts='tram car'>car; tram; trolleybus; vehicle</annotation>
+		<annotation cp='[🚌]' tts='bus'>vehicle</annotation>
+		<annotation cp='[🚍]' tts='oncoming bus'>bus; oncoming; vehicle</annotation>
+		<annotation cp='[🚎]' tts='trolleybus'>bus; tram; trolley; vehicle</annotation>
+		<annotation cp='[🚏]' tts='bus stop'>bus; busstop; stop</annotation>
+		<annotation cp='[🚐]' tts='minibus'>bus; vehicle</annotation>
+		<annotation cp='[🚑]' tts='ambulance'>vehicle</annotation>
+		<annotation cp='[🚒]' tts='fire engine'>engine; fire; truck; vehicle</annotation>
+		<annotation cp='[🚓]' tts='police car'>car; patrol; police; vehicle</annotation>
+		<annotation cp='[🚔]' tts='oncoming police car'>car; oncoming; police; vehicle</annotation>
+		<annotation cp='[🚕]' tts='taxi'>vehicle</annotation>
+		<annotation cp='[🚖]' tts='oncoming taxi'>oncoming; taxi; vehicle</annotation>
+		<annotation cp='[🚗]' tts='automobile'>car; vehicle</annotation>
+		<annotation cp='[🚘]' tts='oncoming automobile'>automobile; car; oncoming; vehicle</annotation>
+		<annotation cp='[🚙]' tts='recreational vehicle'>recreational; rv; vehicle</annotation>
+		<annotation cp='[🚚]' tts='delivery truck'>delivery; truck; vehicle</annotation>
+		<annotation cp='[🚛]' tts='articulated lorry'>lorry; semi; truck; vehicle</annotation>
+		<annotation cp='[🚜]' tts='tractor'>vehicle</annotation>
+		<annotation cp='[🚲]' tts='bicycle'>bike; vehicle</annotation>
+		<annotation cp='[⛽]' tts='fuel pump'>fuel; fuelpump; gas; pump; station</annotation>
+		<annotation cp='[🛣]' tts='motorway'>highway; road</annotation>
+		<annotation cp='[🛤]' tts='railway track'>railway; train</annotation>
+		<annotation cp='[🚨]' tts='police car’s light'>beacon; car; light; police; revolving; vehicle</annotation>
+		<annotation cp='[🚥]' tts='horizontal traffic light'>light; signal; traffic</annotation>
+		<annotation cp='[🚦]' tts='vertical traffic light'>light; signal; traffic</annotation>
+		<annotation cp='[🚧]' tts='construction'>barrier</annotation>
+		<annotation cp='[⚓]' tts='anchor'>ship; tool</annotation>
+		<annotation cp='[⛵]' tts='sailboat'>boat; resort; sea; vehicle; yacht</annotation>
+		<annotation cp='[🚣]' tts='rowboat'>boat; vehicle</annotation>
+		<annotation cp='[🚤]' tts='speedboat'>boat; vehicle</annotation>
+		<annotation cp='[🛳]' tts='passenger ship'>passenger; ship; vehicle</annotation>
+		<annotation cp='[⛴]' tts='ferry'>boat</annotation>
+		<annotation cp='[🛥]' tts='motor boat'>boat; motorboat; vehicle</annotation>
+		<annotation cp='[🚢]' tts='ship'>vehicle</annotation>
+		<annotation cp='[✈]' tts='airplane'>vehicle</annotation>
+		<annotation cp='[🛩]' tts='small airplane'>airplane; vehicle</annotation>
+		<annotation cp='[🛫]' tts='airplane departure'>airplane; check-in; departure; departures; vehicle</annotation>
+		<annotation cp='[🛬]' tts='airplane arrival'>airplane; arrivals; arriving; landing; vehicle</annotation>
+		<annotation cp='[💺]' tts='seat'>chair</annotation>
+		<annotation cp='[🚁]' tts='helicopter'>vehicle</annotation>
+		<annotation cp='[🚟]' tts='suspension railway'>railway; suspension; vehicle</annotation>
+		<annotation cp='[🚠]' tts='mountain cableway'>cable; gondola; mountain; vehicle</annotation>
+		<annotation cp='[🚡]' tts='aerial tramway'>aerial; cable; car; gondola; ropeway; tramway; vehicle</annotation>
+		<annotation cp='[🚀]' tts='rocket'>space; vehicle</annotation>
+		<annotation cp='[🛰]' tts='satellite'>space; vehicle</annotation>
+		<annotation cp='[🛎]' tts='bellhop bell'>bell; bellhop; hotel</annotation>
+		<annotation cp='[🚪]' tts='door'>door</annotation>
+		<annotation cp='[🛌]' tts='person in bed'>hotel; sleep</annotation>
+		<annotation cp='[🛏]' tts='bed'>hotel; sleep</annotation>
+		<annotation cp='[🛋]' tts='couch and lamp'>couch; hotel; lamp</annotation>
+		<annotation cp='[🚽]' tts='toilet'>toilet</annotation>
+		<annotation cp='[🚿]' tts='shower'>water</annotation>
+		<annotation cp='[🛀]' tts='person taking bath'>bathtub; bath</annotation>
+		<annotation cp='[🛁]' tts='bathtub'>bath</annotation>
+		<annotation cp='[⌛]' tts='hourglass'>sand; timer</annotation>
+		<annotation cp='[⏳]' tts='hourglass with flowing sand'>hourglass; sand; timer</annotation>
+		<annotation cp='[⌚]' tts='watch'>clock</annotation>
+		<annotation cp='[⏰]' tts='alarm clock'>alarm; clock</annotation>
+		<annotation cp='[⏱]' tts='stopwatch'>clock</annotation>
+		<annotation cp='[⏲]' tts='timer clock'>clock; timer</annotation>
+		<annotation cp='[🕰]' tts='mantelpiece clock'>clock</annotation>
+		<annotation cp='[🕛]' tts='twelve o’clock'>00; 12; 12:00; clock; o’clock; twelve</annotation>
+		<annotation cp='[🕧]' tts='twelve-thirty'>12; 12:30; 30; clock; thirty; twelve</annotation>
+		<annotation cp='[🕐]' tts='one o’clock'>00; 1; 1:00; clock; o’clock; one</annotation>
+		<annotation cp='[🕜]' tts='one-thirty'>1; 1:30; 30; clock; one; thirty</annotation>
+		<annotation cp='[🕑]' tts='two o’clock'>00; 2; 2:00; clock; o’clock; two</annotation>
+		<annotation cp='[🕝]' tts='two-thirty'>2; 2:30; 30; clock; thirty; two</annotation>
+		<annotation cp='[🕒]' tts='three o’clock'>00; 3; 3:00; clock; o’clock; three</annotation>
+		<annotation cp='[🕞]' tts='three-thirty'>3; 3:30; 30; clock; thirty; three</annotation>
+		<annotation cp='[🕓]' tts='four o’clock'>00; 4; 4:00; clock; four; o’clock</annotation>
+		<annotation cp='[🕟]' tts='four-thirty'>30; 4; 4:30; clock; four; thirty</annotation>
+		<annotation cp='[🕔]' tts='five o’clock'>00; 5; 5:00; clock; five; o’clock</annotation>
+		<annotation cp='[🕠]' tts='five-thirty'>30; 5; 5:30; clock; five; thirty</annotation>
+		<annotation cp='[🕕]' tts='six o’clock'>00; 6; 6:00; clock; o’clock; six</annotation>
+		<annotation cp='[🕡]' tts='six-thirty'>30; 6; 6:30; clock; six; thirty</annotation>
+		<annotation cp='[🕖]' tts='seven o’clock'>00; 7; 7:00; clock; o’clock; seven</annotation>
+		<annotation cp='[🕢]' tts='seven-thirty'>30; 7; 7:30; clock; seven; thirty</annotation>
+		<annotation cp='[🕗]' tts='eight o’clock'>00; 8; 8:00; clock; eight; o’clock</annotation>
+		<annotation cp='[🕣]' tts='eight-thirty'>30; 8; 8:30; clock; eight; thirty</annotation>
+		<annotation cp='[🕘]' tts='nine o’clock'>00; 9; 9:00; clock; nine; o’clock</annotation>
+		<annotation cp='[🕤]' tts='nine-thirty'>30; 9; 9:30; clock; nine; thirty</annotation>
+		<annotation cp='[🕙]' tts='ten o’clock'>00; 10; 10:00; clock; o’clock; ten</annotation>
+		<annotation cp='[🕥]' tts='ten-thirty'>10; 10:30; 30; clock; ten; thirty</annotation>
+		<annotation cp='[🕚]' tts='eleven o’clock'>00; 11; 11:00; clock; eleven; o’clock</annotation>
+		<annotation cp='[🕦]' tts='eleven-thirty'>11; 11:30; 30; clock; eleven; thirty</annotation>
+		<annotation cp='[🌑]' tts='new moon'>dark; moon; space; weather</annotation>
+		<annotation cp='[🌒]' tts='waxing crescent moon'>crescent; moon; space; waxing; weather</annotation>
+		<annotation cp='[🌓]' tts='first quarter moon'>moon; quarter; space; weather</annotation>
+		<annotation cp='[🌔]' tts='waxing gibbous moon'>gibbous; moon; space; waxing; weather</annotation>
+		<annotation cp='[🌕]' tts='full moon'>full; moon; space; weather</annotation>
+		<annotation cp='[🌖]' tts='waning gibbous moon'>gibbous; moon; space; waning; weather</annotation>
+		<annotation cp='[🌗]' tts='last quarter moon'>moon; quarter; space; weather</annotation>
+		<annotation cp='[🌘]' tts='waning crescent moon'>crescent; moon; space; waning; weather</annotation>
+		<annotation cp='[🌙]' tts='crescent moon'>crescent; moon; space; weather</annotation>
+		<annotation cp='[🌚]' tts='new moon face'>face; moon; space; weather</annotation>
+		<annotation cp='[🌛]' tts='first quarter moon with face'>face; moon; quarter; space; weather</annotation>
+		<annotation cp='[🌜]' tts='last quarter moon with face'>face; moon; quarter; space; weather</annotation>
+		<annotation cp='[🌡]' tts='thermometer'>weather</annotation>
+		<annotation cp='[☀]' tts='sun'>bright; rays; space; sunny; weather</annotation>
+		<annotation cp='[🌝]' tts='full moon with face'>bright; face; full; moon; space; weather</annotation>
+		<annotation cp='[🌞]' tts='sun with face'>bright; face; space; sun; weather</annotation>
+		<annotation cp='[⭐]' tts='white medium star'>star</annotation>
+		<annotation cp='[🌟]' tts='glowing star'>glittery; glow; shining; sparkle; star</annotation>
+		<annotation cp='[🌠]' tts='shooting star'>falling; shooting; space; star</annotation>
+		<annotation cp='[☁]' tts='cloud'>weather</annotation>
+		<annotation cp='[⛅]' tts='sun behind cloud'>cloud; sun; weather</annotation>
+		<annotation cp='[⛈]' tts='cloud with lightning and rain'>cloud; rain; thunder; weather</annotation>
+		<annotation cp='[🌤]' tts='sun behind small cloud'>cloud; sun; weather</annotation>
+		<annotation cp='[🌥]' tts='sun behind large cloud'>cloud; sun; weather</annotation>
+		<annotation cp='[🌦]' tts='sun behind cloud with rain'>cloud; rain; sun; weather</annotation>
+		<annotation cp='[🌧]' tts='cloud with rain'>cloud; rain; weather</annotation>
+		<annotation cp='[🌨]' tts='cloud with snow'>cloud; cold; snow; weather</annotation>
+		<annotation cp='[🌩]' tts='cloud with lightning'>cloud; lightning; weather</annotation>
+		<annotation cp='[🌪]' tts='tornado'>cloud; weather; whirlwind</annotation>
+		<annotation cp='[🌫]' tts='fog'>cloud; weather</annotation>
+		<annotation cp='[🌬]' tts='wind face'>blow; cloud; face; weather; wind</annotation>
+		<annotation cp='[🌀]' tts='cyclone'>dizzy; twister; typhoon; weather</annotation>
+		<annotation cp='[🌈]' tts='rainbow'>rain; weather</annotation>
+		<annotation cp='[🌂]' tts='closed umbrella'>clothing; rain; umbrella; weather</annotation>
+		<annotation cp='[☂]' tts='umbrella'>clothing; rain; weather</annotation>
+		<annotation cp='[☔]' tts='umbrella with rain drops'>clothing; drop; rain; umbrella; weather</annotation>
+		<annotation cp='[⛱]' tts='umbrella on ground'>rain; sun; umbrella; weather</annotation>
+		<annotation cp='[⚡]' tts='high voltage'>danger; electric; electricity; lightning; voltage; zap</annotation>
+		<annotation cp='[❄]' tts='snowflake'>cold; snow; weather</annotation>
+		<annotation cp='[☃]' tts='snowman'>cold; snow; weather</annotation>
+		<annotation cp='[⛄]' tts='snowman without snow'>cold; snow; snowman; weather</annotation>
+		<annotation cp='[☄]' tts='comet'>space</annotation>
+		<annotation cp='[🔥]' tts='fire'>flame; tool</annotation>
+		<annotation cp='[💧]' tts='droplet'>cold; comic; drop; sweat; weather</annotation>
+		<annotation cp='[🌊]' tts='water wave'>ocean; water; wave; weather</annotation>
+		<annotation cp='[🎃]' tts='jack-o-lantern'>celebration; halloween; jack; lantern</annotation>
+		<annotation cp='[🎄]' tts='christmas tree'>celebration; christmas; tree</annotation>
+		<annotation cp='[🎆]' tts='fireworks'>celebration</annotation>
+		<annotation cp='[🎇]' tts='sparkler'>celebration; fireworks; sparkle</annotation>
+		<annotation cp='[✨]' tts='sparkles'>sparkle; star</annotation>
+		<annotation cp='[🎈]' tts='balloon'>celebration</annotation>
+		<annotation cp='[🎉]' tts='party popper'>celebration; party; popper; tada</annotation>
+		<annotation cp='[🎊]' tts='confetti ball'>ball; celebration; confetti</annotation>
+		<annotation cp='[🎋]' tts='tanabata tree'>banner; celebration; japanese; tree</annotation>
+		<annotation cp='[🎌]' tts='crossed flags'>celebration; cross; crossed; japanese</annotation>
+		<annotation cp='[🎍]' tts='pine decoration'>bamboo; celebration; japanese; pine; plant</annotation>
+		<annotation cp='[🎎]' tts='japanese dolls'>celebration; doll; festival; japanese</annotation>
+		<annotation cp='[🎏]' tts='carp streamer'>carp; celebration; streamer</annotation>
+		<annotation cp='[🎐]' tts='wind chime'>bell; celebration; chime; wind</annotation>
+		<annotation cp='[🎑]' tts='moon ceremony'>celebration; ceremony; moon</annotation>
+		<annotation cp='[🎀]' tts='ribbon'>celebration</annotation>
+		<annotation cp='[🎁]' tts='wrapped present'>box; celebration; gift; present; wrapped</annotation>
+		<annotation cp='[🎖]' tts='military medal'>celebration; medal; military</annotation>
+		<annotation cp='[🎗]' tts='reminder ribbon'>celebration; reminder; ribbon</annotation>
+		<annotation cp='[🎞]' tts='film frames'>cinema; film; frames; movie</annotation>
+		<annotation cp='[🎟]' tts='admission tickets'>admission; ticket</annotation>
+		<annotation cp='[🎫]' tts='ticket'>admission</annotation>
+		<annotation cp='[🏷]' tts='label'>label</annotation>
+		<annotation cp='[⚽]' tts='soccer ball'>ball; soccer</annotation>
+		<annotation cp='[⚾]' tts='baseball'>ball</annotation>
+		<annotation cp='[🏀]' tts='basketball'>ball; hoop</annotation>
+		<annotation cp='[🏈]' tts='american football'>american; ball; football</annotation>
+		<annotation cp='[🏉]' tts='rugby football'>ball; football; rugby</annotation>
+		<annotation cp='[🎾]' tts='tennis'>ball; racquet</annotation>
+		<annotation cp='[🎱]' tts='billiards'>8; 8 ball; ball; billiard; eight; game</annotation>
+		<annotation cp='[🎳]' tts='bowling'>ball; game</annotation>
+		<annotation cp='[⛳]' tts='flag in hole'>golf; hole</annotation>
+		<annotation cp='[🏌]' tts='golfer'>ball; golf</annotation>
+		<annotation cp='[⛸]' tts='ice skate'>ice; skate</annotation>
+		<annotation cp='[🎣]' tts='fishing pole'>fish; pole</annotation>
+		<annotation cp='[🎽]' tts='running shirt'>running; sash; shirt</annotation>
+		<annotation cp='[🎿]' tts='skis'>ski; snow</annotation>
+		<annotation cp='[⛷]' tts='skier'>ski; snow</annotation>
+		<annotation cp='[🏂]' tts='snowboarder'>ski; snow; snowboard</annotation>
+		<annotation cp='[🏄]' tts='surfer'>surfing</annotation>
+		<annotation cp='[🏇]' tts='horse racing'>horse; jockey; racehorse; racing</annotation>
+		<annotation cp='[🏊]' tts='swimmer'>swim</annotation>
+		<annotation cp='[⛹]' tts='person with ball'>ball</annotation>
+		<annotation cp='[🏋]' tts='weight lifter'>lifter; weight</annotation>
+		<annotation cp='[🚴]' tts='bicyclist'>bicycle; bike; cyclist</annotation>
+		<annotation cp='[🚵]' tts='mountain biker'>bicycle; bicyclist; bike; cyclist; mountain</annotation>
+		<annotation cp='[🏎]' tts='racing car'>car; racing</annotation>
+		<annotation cp='[🏍]' tts='motorcycle'>racing</annotation>
+		<annotation cp='[🏅]' tts='sports medal'>medal</annotation>
+		<annotation cp='[🏆]' tts='trophy'>prize</annotation>
+		<annotation cp='[🏏]' tts='cricket'>ball; bat; game</annotation>
+		<annotation cp='[🏐]' tts='volleyball'>ball; game</annotation>
+		<annotation cp='[🏑]' tts='field hockey'>ball; field; game; hockey; stick</annotation>
+		<annotation cp='[🏒]' tts='ice hockey stick and puck'>game; hockey; ice; puck; stick</annotation>
+		<annotation cp='[🏓]' tts='ping pong'>ball; bat; game; paddle; table tennis</annotation>
+		<annotation cp='[🏸]' tts='badminton'>birdie; game; racquet; shuttlecock</annotation>
+		<annotation cp='[🎯]' tts='direct hit'>bull; bullseye; dart; eye; game; hit; target</annotation>
+		<annotation cp='[🎮]' tts='video game'>controller; game</annotation>
+		<annotation cp='[🕹]' tts='joystick'>game; video game</annotation>
+		<annotation cp='[🎲]' tts='game die'>dice; die; game</annotation>
+		<annotation cp='[♠]' tts='spade suit'>card; game; spade; suit</annotation>
+		<annotation cp='[♥]' tts='heart suit'>card; game; heart; hearts; suit</annotation>
+		<annotation cp='[♦]' tts='diamond suit'>card; diamond; diamonds; game; suit</annotation>
+		<annotation cp='[♣]' tts='club suit'>card; club; clubs; game; suit</annotation>
+		<annotation cp='[🃏]' tts='joker'>card; game; playing</annotation>
+		<annotation cp='[🀄]' tts='mahjong red dragon'>game; mahjong; red</annotation>
+		<annotation cp='[🎴]' tts='flower playing cards'>card; flower; game; japanese; playing</annotation>
+		<annotation cp='[🔇]' tts='speaker off'>mute; quiet; silent; speaker; volume</annotation>
+		<annotation cp='[🔈]' tts='speaker'>volume</annotation>
+		<annotation cp='[🔉]' tts='speaker on'>low; speaker; volume; wave</annotation>
+		<annotation cp='[🔊]' tts='speaker loud'>3; high; loud; speaker; three; volume</annotation>
+		<annotation cp='[📢]' tts='loudspeaker'>loud; public address</annotation>
+		<annotation cp='[📣]' tts='megaphone'>cheering</annotation>
+		<annotation cp='[📯]' tts='postal horn'>horn; post; postal</annotation>
+		<annotation cp='[🔔]' tts='bell'>bell</annotation>
+		<annotation cp='[🔕]' tts='bell with slash'>bell; forbidden; mute; no; not; prohibited; quiet; silent</annotation>
+		<annotation cp='[🎼]' tts='musical score'>music; score</annotation>
+		<annotation cp='[🎵]' tts='musical note'>music; note</annotation>
+		<annotation cp='[🎶]' tts='musical notes'>music; note; notes</annotation>
+		<annotation cp='[🎙]' tts='studio microphone'>mic; microphone; music; studio</annotation>
+		<annotation cp='[🎚]' tts='level slider'>level; music; slider</annotation>
+		<annotation cp='[🎛]' tts='control knobs'>control; knobs; music</annotation>
+		<annotation cp='[🎤]' tts='microphone'>karaoke; mic</annotation>
+		<annotation cp='[🎧]' tts='headphone'>earbud</annotation>
+		<annotation cp='[🎷]' tts='saxophone'>instrument; music; sax</annotation>
+		<annotation cp='[🎸]' tts='guitar'>instrument; music</annotation>
+		<annotation cp='[🎹]' tts='musical keyboard'>instrument; keyboard; music; piano</annotation>
+		<annotation cp='[🎺]' tts='trumpet'>instrument; music</annotation>
+		<annotation cp='[🎻]' tts='violin'>instrument; music</annotation>
+		<annotation cp='[📻]' tts='radio'>video</annotation>
+		<annotation cp='[📱]' tts='mobile phone'>cell; mobile; phone; telephone</annotation>
+		<annotation cp='[📲]' tts='mobile phone with arrow'>arrow; call; cell; mobile; phone; receive; telephone</annotation>
+		<annotation cp='[☎]' tts='telephone'>phone</annotation>
+		<annotation cp='[📞]' tts='telephone receiver'>phone; receiver; telephone</annotation>
+		<annotation cp='[📟]' tts='pager'>pager</annotation>
+		<annotation cp='[📠]' tts='fax machine'>fax</annotation>
+		<annotation cp='[🔋]' tts='battery'>battery</annotation>
+		<annotation cp='[🔌]' tts='electric plug'>electric; electricity; plug</annotation>
+		<annotation cp='[💻]' tts='laptop computer'>computer; pc; personal</annotation>
+		<annotation cp='[🖥]' tts='desktop computer'>computer; desktop</annotation>
+		<annotation cp='[🖨]' tts='printer'>computer</annotation>
+		<annotation cp='[⌨]' tts='keyboard'>computer</annotation>
+		<annotation cp='[🖱]' tts='computer mouse'>3; button; computer; mouse; three</annotation>
+		<annotation cp='[🖲]' tts='trackball'>computer</annotation>
+		<annotation cp='[💽]' tts='minidisc'>computer; disk; minidisk; optical</annotation>
+		<annotation cp='[💾]' tts='floppy disk'>computer; disk; floppy</annotation>
+		<annotation cp='[💿]' tts='optical disc'>dvd; blu-ray; cd; computer; disk; optical</annotation>
+		<annotation cp='[📀]' tts='dvd'>blu-ray; cd; computer; disk; optical</annotation>
+		<annotation cp='[🎥]' tts='movie camera'>camera; cinema; movie</annotation>
+		<annotation cp='[🎬]' tts='clapper board'>clapper; movie</annotation>
+		<annotation cp='[📽]' tts='film projector'>cinema; film; movie; projector; video</annotation>
+		<annotation cp='[📺]' tts='television'>tv; video</annotation>
+		<annotation cp='[📷]' tts='camera'>video</annotation>
+		<annotation cp='[📸]' tts='camera with flash'>camera; flash; video</annotation>
+		<annotation cp='[📹]' tts='video camera'>camera; video</annotation>
+		<annotation cp='[📼]' tts='videocassette'>tape; vhs; video</annotation>
+		<annotation cp='[🔍]' tts='left-pointing magnifying glass'>glass; magnifying; search; tool</annotation>
+		<annotation cp='[🔎]' tts='right-pointing magnifying glass'>glass; magnifying; search; tool</annotation>
+		<annotation cp='[🔬]' tts='microscope'>tool</annotation>
+		<annotation cp='[🔭]' tts='telescope'>tool</annotation>
+		<annotation cp='[📡]' tts='satellite antenna'>antenna; dish; satellite</annotation>
+		<annotation cp='[🕯]' tts='candle'>light</annotation>
+		<annotation cp='[💡]' tts='light bulb'>bulb; comic; electric; idea; light</annotation>
+		<annotation cp='[🔦]' tts='flashlight'>electric; light; tool; torch</annotation>
+		<annotation cp='[🏮]' tts='red paper lantern'>bar; japanese; lantern; light; red</annotation>
+		<annotation cp='[📔]' tts='notebook with decorative cover'>book; cover; decorated; notebook</annotation>
+		<annotation cp='[📕]' tts='closed book'>book; closed</annotation>
+		<annotation cp='[📖]' tts='open book'>book; open</annotation>
+		<annotation cp='[📗]' tts='green book'>book; green</annotation>
+		<annotation cp='[📘]' tts='blue book'>blue; book</annotation>
+		<annotation cp='[📙]' tts='orange book'>book; orange</annotation>
+		<annotation cp='[📚]' tts='books'>book</annotation>
+		<annotation cp='[📓]' tts='notebook'>notebook</annotation>
+		<annotation cp='[📒]' tts='ledger'>notebook</annotation>
+		<annotation cp='[📃]' tts='page with curl'>curl; document; page</annotation>
+		<annotation cp='[📜]' tts='scroll'>paper</annotation>
+		<annotation cp='[📄]' tts='page facing up'>document; page</annotation>
+		<annotation cp='[📰]' tts='newspaper'>news; paper</annotation>
+		<annotation cp='[🗞]' tts='rolled-up newspaper'>news; newspaper; paper; rolled</annotation>
+		<annotation cp='[📑]' tts='bookmark tabs'>bookmark; mark; marker; tabs</annotation>
+		<annotation cp='[🔖]' tts='bookmark'>mark</annotation>
+		<annotation cp='[💰]' tts='money bag'>bag; dollar; money; moneybag</annotation>
+		<annotation cp='[💴]' tts='yen banknote'>bank; banknote; bill; currency; money; note; yen</annotation>
+		<annotation cp='[💵]' tts='dollar banknote'>bank; banknote; bill; currency; dollar; money; note</annotation>
+		<annotation cp='[💶]' tts='euro banknote'>bank; banknote; bill; currency; euro; money; note</annotation>
+		<annotation cp='[💷]' tts='pound banknote'>bank; banknote; bill; currency; money; note; pound</annotation>
+		<annotation cp='[💸]' tts='money with wings'>bank; banknote; bill; dollar; fly; money; note; wings</annotation>
+		<annotation cp='[💳]' tts='credit card'>bank; card; credit; money</annotation>
+		<annotation cp='[💹]' tts='chart increasing with yen'>bank; chart; currency; graph; growth; market; money; rise; trend; upward; yen</annotation>
+		<annotation cp='[✉]' tts='envelope'>e-mail; email</annotation>
+		<annotation cp='[📧]' tts='e-mail'>email; letter; mail</annotation>
+		<annotation cp='[📨]' tts='incoming envelope'>e-mail; email; envelope; incoming; letter; mail; receive</annotation>
+		<annotation cp='[📩]' tts='envelope with arrow'>arrow; down; e-mail; email; envelope; letter; mail; outgoing; sent</annotation>
+		<annotation cp='[📤]' tts='outbox tray'>box; letter; mail; outbox; sent; tray</annotation>
+		<annotation cp='[📥]' tts='inbox tray'>box; inbox; letter; mail; receive; tray</annotation>
+		<annotation cp='[📦]' tts='package'>box; parcel</annotation>
+		<annotation cp='[📫]' tts='closed mailbox with raised flag'>closed; mail; mailbox; postbox</annotation>
+		<annotation cp='[📪]' tts='closed mailbox with lowered flag'>closed; lowered; mail; mailbox; postbox</annotation>
+		<annotation cp='[📬]' tts='open mailbox with raised flag'>mail; mailbox; open; postbox</annotation>
+		<annotation cp='[📭]' tts='open mailbox with lowered flag'>lowered; mail; mailbox; open; postbox</annotation>
+		<annotation cp='[📮]' tts='postbox'>mail; mailbox</annotation>
+		<annotation cp='[🗳]' tts='ballot box with ballot'>ballot; box</annotation>
+		<annotation cp='[✏]' tts='pencil'>pencil</annotation>
+		<annotation cp='[✒]' tts='black nib'>nib; pen</annotation>
+		<annotation cp='[🖋]' tts='fountain pen'>fountain; pen</annotation>
+		<annotation cp='[🖊]' tts='pen'>ballpoint</annotation>
+		<annotation cp='[🖌]' tts='paintbrush'>painting</annotation>
+		<annotation cp='[🖍]' tts='crayon'>crayon</annotation>
+		<annotation cp='[📝]' tts='memo'>pencil</annotation>
+		<annotation cp='[💼]' tts='briefcase'>briefcase</annotation>
+		<annotation cp='[📁]' tts='file folder'>file; folder</annotation>
+		<annotation cp='[📂]' tts='open file folder'>file; folder; open</annotation>
+		<annotation cp='[🗂]' tts='card index dividers'>card; dividers; index</annotation>
+		<annotation cp='[📅]' tts='calendar'>date</annotation>
+		<annotation cp='[📆]' tts='tear-off calendar'>calendar</annotation>
+		<annotation cp='[🗒]' tts='spiral notepad'>note; pad; spiral</annotation>
+		<annotation cp='[🗓]' tts='spiral calendar'>calendar; pad; spiral</annotation>
+		<annotation cp='[📇]' tts='card index'>card; index; rolodex</annotation>
+		<annotation cp='[📈]' tts='chart increasing'>chart; graph; growth; trend; upward</annotation>
+		<annotation cp='[📉]' tts='chart decreasing'>chart; down; graph; trend</annotation>
+		<annotation cp='[📊]' tts='bar chart'>bar; chart; graph</annotation>
+		<annotation cp='[📋]' tts='clipboard'>clipboard</annotation>
+		<annotation cp='[📌]' tts='pushpin'>pin</annotation>
+		<annotation cp='[📍]' tts='round pushpin'>pin; pushpin</annotation>
+		<annotation cp='[📎]' tts='paperclip'>paperclip</annotation>
+		<annotation cp='[🖇]' tts='linked paperclips'>link; paperclip</annotation>
+		<annotation cp='[📏]' tts='straight ruler'>ruler; straight edge</annotation>
+		<annotation cp='[📐]' tts='triangular ruler'>ruler; set; triangle</annotation>
+		<annotation cp='[✂]' tts='scissors'>tool</annotation>
+		<annotation cp='[🗃]' tts='card file box'>box; card; file</annotation>
+		<annotation cp='[🗄]' tts='file cabinet'>cabinet; file</annotation>
+		<annotation cp='[🗑]' tts='wastebasket'>wastebasket</annotation>
+		<annotation cp='[🔒]' tts='lock'>closed</annotation>
+		<annotation cp='[🔓]' tts='open lock'>lock; open; unlock</annotation>
+		<annotation cp='[🔏]' tts='lock with pen'>ink; lock; nib; pen; privacy</annotation>
+		<annotation cp='[🔐]' tts='closed lock with key'>closed; key; lock; secure</annotation>
+		<annotation cp='[🔑]' tts='key'>lock; password</annotation>
+		<annotation cp='[🗝]' tts='old key'>clue; key; lock; old</annotation>
+		<annotation cp='[🔨]' tts='hammer'>tool</annotation>
+		<annotation cp='[⛏]' tts='pick'>mining; tool</annotation>
+		<annotation cp='[⚒]' tts='hammer and pick'>hammer; pick; tool</annotation>
+		<annotation cp='[🛠]' tts='hammer and wrench'>hammer; tool; wrench</annotation>
+		<annotation cp='[🔧]' tts='wrench'>tool</annotation>
+		<annotation cp='[🔩]' tts='nut and bolt'>bolt; nut; tool</annotation>
+		<annotation cp='[⚙]' tts='gear'>tool</annotation>
+		<annotation cp='[🗜]' tts='compression'>tool; vice</annotation>
+		<annotation cp='[⚗]' tts='alembic'>chemistry; tool</annotation>
+		<annotation cp='[⚖]' tts='balance scale'>balance; justice; libra; scales; tool; weight; zodiac</annotation>
+		<annotation cp='[🔗]' tts='link'>link</annotation>
+		<annotation cp='[⛓]' tts='chains'>chain</annotation>
+		<annotation cp='[💉]' tts='syringe'>doctor; medicine; needle; shot; sick; tool</annotation>
+		<annotation cp='[💊]' tts='pill'>doctor; medicine; sick</annotation>
+		<annotation cp='[🗡]' tts='dagger'>knife; weapon</annotation>
+		<annotation cp='[🔪]' tts='kitchen knife'>cooking; hocho; knife; tool; weapon</annotation>
+		<annotation cp='[⚔]' tts='crossed swords'>crossed; swords; weapon</annotation>
+		<annotation cp='[🔫]' tts='pistol'>gun; handgun; revolver; tool; weapon</annotation>
+		<annotation cp='[🛡]' tts='shield'>weapon</annotation>
+		<annotation cp='[🏹]' tts='bow and arrow'>archer; arrow; bow; sagittarius; tool; weapon; zodiac</annotation>
+		<annotation cp='[🏁]' tts='chequered flag'>checkered; chequered; racing</annotation>
+		<annotation cp='[🏳]' tts='waving white flag'>waving</annotation>
+		<annotation cp='[🏴]' tts='waving black flag'>waving</annotation>
+		<annotation cp='[🚩]' tts='triangular flag'>post</annotation>
+		<annotation cp='[🚬]' tts='smoking'>smoking</annotation>
+		<annotation cp='[⚰]' tts='coffin'>death</annotation>
+		<annotation cp='[⚱]' tts='funeral urn'>death; funeral; urn</annotation>
+		<annotation cp='[🗿]' tts='moai'>face; moyai; statue</annotation>
+		<annotation cp='[🛢]' tts='oil drum'>drum; oil</annotation>
+		<annotation cp='[🔮]' tts='crystal ball'>ball; crystal; fairy tale; fantasy; fortune; tool</annotation>
+		<annotation cp='[🏧]' tts='ATM sign'>atm; automated; bank; teller</annotation>
+		<annotation cp='[🚮]' tts='litter in bin sign'>litter; litterbox</annotation>
+		<annotation cp='[🚰]' tts='potable water'>drink; potable; water</annotation>
+		<annotation cp='[♿]' tts='wheelchair'>access</annotation>
+		<annotation cp='[🚹]' tts='men’s room'>lavatory; man; restroom; wc</annotation>
+		<annotation cp='[🚺]' tts='women’s room'>lavatory; restroom; wc; woman</annotation>
+		<annotation cp='[🚻]' tts='restroom'>lavatory; wc</annotation>
+		<annotation cp='[🚼]' tts='baby symbol'>baby; changing</annotation>
+		<annotation cp='[🚾]' tts='water closet'>closet; lavatory; restroom; water; wc</annotation>
+		<annotation cp='[🛂]' tts='passport control'>control; passport</annotation>
+		<annotation cp='[🛃]' tts='customs'>customs</annotation>
+		<annotation cp='[🛄]' tts='baggage claim'>baggage; claim</annotation>
+		<annotation cp='[🛅]' tts='left luggage'>baggage; locker; luggage</annotation>
+		<annotation cp='[⚠]' tts='warning'>warning</annotation>
+		<annotation cp='[🚸]' tts='children crossing'>child; crossing; pedestrian; traffic</annotation>
+		<annotation cp='[⛔]' tts='no entry'>entry; forbidden; no; not; prohibited; traffic</annotation>
+		<annotation cp='[🚫]' tts='prohibited'>entry; forbidden; no; not</annotation>
+		<annotation cp='[🚳]' tts='no bicycles'>bicycle; bike; forbidden; no; not; prohibited; vehicle</annotation>
+		<annotation cp='[🚭]' tts='no smoking'>forbidden; no; not; prohibited; smoking</annotation>
+		<annotation cp='[🚯]' tts='no littering'>forbidden; litter; no; not; prohibited</annotation>
+		<annotation cp='[🚱]' tts='non-potable water'>drink; forbidden; no; not; potable; prohibited; water</annotation>
+		<annotation cp='[🚷]' tts='no pedestrians'>forbidden; no; not; pedestrian; prohibited</annotation>
+		<annotation cp='[☢]' tts='radioactive'>radioactive</annotation>
+		<annotation cp='[☣]' tts='biohazard'>biohazard</annotation>
+		<annotation cp='[⬆]' tts='up arrow'>arrow; cardinal; direction; north</annotation>
+		<annotation cp='[↗]' tts='up-right arrow'>arrow; direction; intercardinal; northeast</annotation>
+		<annotation cp='[➡]' tts='right arrow'>arrow; cardinal; direction; east</annotation>
+		<annotation cp='[↘]' tts='down-right arrow'>arrow; direction; intercardinal; southeast</annotation>
+		<annotation cp='[⬇]' tts='down arrow'>arrow; cardinal; direction; down; south</annotation>
+		<annotation cp='[↙]' tts='down-left arrow'>arrow; direction; intercardinal; southwest</annotation>
+		<annotation cp='[⬅]' tts='left arrow'>arrow; cardinal; direction; west</annotation>
+		<annotation cp='[↖]' tts='up-left arrow'>arrow; direction; intercardinal; northwest</annotation>
+		<annotation cp='[↕]' tts='up-down arrow'>arrow</annotation>
+		<annotation cp='[↔]' tts='left-right arrow'>arrow</annotation>
+		<annotation cp='[↩]' tts='right arrow curving left'>arrow</annotation>
+		<annotation cp='[↪]' tts='left arrow curving right'>arrow</annotation>
+		<annotation cp='[⤴]' tts='right arrow curving up'>arrow</annotation>
+		<annotation cp='[⤵]' tts='right arrow curving down'>arrow; down</annotation>
+		<annotation cp='[🔃]' tts='clockwise vertical arrows'>arrow; clockwise; reload</annotation>
+		<annotation cp='[🔄]' tts='anticlockwise arrows button'>anticlockwise; arrow; counterclockwise; withershins</annotation>
+		<annotation cp='[🔙]' tts='back arrow'>arrow; back</annotation>
+		<annotation cp='[🔚]' tts='end arrow'>arrow; end</annotation>
+		<annotation cp='[🔛]' tts='on! arrow'>arrow; mark; on</annotation>
+		<annotation cp='[🔜]' tts='soon arrow'>arrow; soon</annotation>
+		<annotation cp='[🔝]' tts='top arrow'>arrow; top; up</annotation>
+		<annotation cp='[🛐]' tts='place of worship'>religion; worship</annotation>
+		<annotation cp='[⚛]' tts='atom symbol'>atheist; atom</annotation>
+		<annotation cp='[🕉]' tts='om'>hindu; religion</annotation>
+		<annotation cp='[✡]' tts='star of david'>david; jew; jewish; religion; star</annotation>
+		<annotation cp='[☸]' tts='wheel of dharma'>buddhist; dharma; religion; wheel</annotation>
+		<annotation cp='[☯]' tts='yin yang'>religion; tao; taoist; yang; yin</annotation>
+		<annotation cp='[✝]' tts='latin cross'>christian; cross; religion</annotation>
+		<annotation cp='[☦]' tts='orthodox cross'>christian; cross; religion</annotation>
+		<annotation cp='[☪]' tts='star and crescent'>islam; muslim; religion</annotation>
+		<annotation cp='[☮]' tts='peace symbol'>peace</annotation>
+		<annotation cp='[🕎]' tts='menorah'>candelabrum; candlestick; religion</annotation>
+		<annotation cp='[🔯]' tts='dotted six-pointed star'>fortune; star</annotation>
+		<annotation cp='[♻]' tts='recycling symbol'>recycle</annotation>
+		<annotation cp='[📛]' tts='name badge'>badge; name</annotation>
+		<annotation cp='[⚜]' tts='fleur-de-lis'>fleur-de-lis</annotation>
+		<annotation cp='[🔰]' tts='japanese symbol for beginner'>beginner; chevron; green; japanese; leaf; tool; yellow</annotation>
+		<annotation cp='[🔱]' tts='trident emblem'>anchor; emblem; ship; tool; trident</annotation>
+		<annotation cp='[⭕]' tts='heavy large circle'>circle; o</annotation>
+		<annotation cp='[✅]' tts='white heavy check mark'>check; mark</annotation>
+		<annotation cp='[☑]' tts='ballot box with check'>ballot; box; check</annotation>
+		<annotation cp='[✔]' tts='heavy check mark'>check; mark</annotation>
+		<annotation cp='[✖]' tts='heavy multiplication x'>cancel; multiplication; multiply; x</annotation>
+		<annotation cp='[❌]' tts='cross mark'>cancel; mark; multiplication; multiply; x</annotation>
+		<annotation cp='[❎]' tts='cross mark button'>mark; square</annotation>
+		<annotation cp='[➕]' tts='heavy plus sign'>math; plus</annotation>
+		<annotation cp='[➖]' tts='heavy minus sign'>math; minus</annotation>
+		<annotation cp='[➗]' tts='heavy division sign'>division; math</annotation>
+		<annotation cp='[➰]' tts='curly loop'>curl; loop</annotation>
+		<annotation cp='[➿]' tts='double curly loop'>curl; double; loop</annotation>
+		<annotation cp='[〽]' tts='part alternation mark'>mark; part</annotation>
+		<annotation cp='[✳]' tts='eight-spoked asterisk'>asterisk</annotation>
+		<annotation cp='[✴]' tts='eight-pointed star'>star</annotation>
+		<annotation cp='[❇]' tts='sparkle'>sparkle</annotation>
+		<annotation cp='[💱]' tts='currency exchange'>bank; currency; exchange; money</annotation>
+		<annotation cp='[💲]' tts='heavy dollar sign'>currency; dollar; money</annotation>
+		<annotation cp='[‼]' tts='double exclamation mark'>bangbang; exclamation; mark; punctuation</annotation>
+		<annotation cp='[⁉]' tts='exclamation question mark'>exclamation; interrobang; mark; punctuation; question</annotation>
+		<annotation cp='[❓]' tts='question mark'>mark; punctuation; question</annotation>
+		<annotation cp='[❔]' tts='white question mark'>mark; outlined; punctuation; question</annotation>
+		<annotation cp='[❕]' tts='white exclamation mark'>exclamation; mark; outlined; punctuation</annotation>
+		<annotation cp='[❗]' tts='exclamation mark'>exclamation; mark; punctuation</annotation>
+		<annotation cp='[〰]' tts='wavy dash'>dash; punctuation; wavy</annotation>
+		<annotation cp='[©]' tts='copyright'>copyright</annotation>
+		<annotation cp='[®]' tts='registered'>registered</annotation>
+		<annotation cp='[™]' tts='trade mark'>mark; tm; trademark</annotation>
+		<annotation cp='[♈]' tts='aries'>ram; zodiac</annotation>
+		<annotation cp='[♉]' tts='taurus'>bull; ox; zodiac</annotation>
+		<annotation cp='[♊]' tts='gemini'>twins; zodiac</annotation>
+		<annotation cp='[♋]' tts='cancer'>crab; zodiac</annotation>
+		<annotation cp='[♌]' tts='leo'>lion; zodiac</annotation>
+		<annotation cp='[♍]' tts='virgo'>maiden; virgin; zodiac</annotation>
+		<annotation cp='[♎]' tts='libra'>balance; justice; scales; zodiac</annotation>
+		<annotation cp='[♏]' tts='scorpius'>scorpio; scorpion; zodiac</annotation>
+		<annotation cp='[♐]' tts='sagittarius'>archer; zodiac</annotation>
+		<annotation cp='[♑]' tts='capricorn'>goat; zodiac</annotation>
+		<annotation cp='[♒]' tts='aquarius'>bearer; water; zodiac</annotation>
+		<annotation cp='[♓]' tts='pisces'>fish; zodiac</annotation>
+		<annotation cp='[⛎]' tts='ophiuchus'>bearer; serpent; snake; zodiac</annotation>
+		<annotation cp='[🔀]' tts='shuffle tracks button'>arrow; crossed</annotation>
+		<annotation cp='[🔁]' tts='repeat button'>arrow; clockwise; repeat</annotation>
+		<annotation cp='[🔂]' tts='repeat single button'>arrow; clockwise; once</annotation>
+		<annotation cp='[▶]' tts='play button'>arrow; play; right; triangle</annotation>
+		<annotation cp='[⏩]' tts='fast-forword button'>arrow; double; fast; forward</annotation>
+		<annotation cp='[⏭]' tts='next track button'>arrow; next scene; next track; triangle</annotation>
+		<annotation cp='[⏯]' tts='play or pause button'>arrow; pause; play; right; triangle</annotation>
+		<annotation cp='[◀]' tts='reverse button'>arrow; left; reverse; triangle</annotation>
+		<annotation cp='[⏪]' tts='fast reverse button'>arrow; double; rewind</annotation>
+		<annotation cp='[⏮]' tts='last track button'>arrow; previous scene; previous track; triangle</annotation>
+		<annotation cp='[🔼]' tts='up button'>arrow; button; red</annotation>
+		<annotation cp='[⏫]' tts='fast up button'>arrow; double</annotation>
+		<annotation cp='[🔽]' tts='down button'>arrow; button; down; red</annotation>
+		<annotation cp='[⏬]' tts='fast down button'>arrow; double; down</annotation>
+		<annotation cp='[⏸]' tts='pause button'>bar; double; pause; vertical</annotation>
+		<annotation cp='[⏹]' tts='stop button'>square; stop</annotation>
+		<annotation cp='[⏺]' tts='record button'>circle; record</annotation>
+		<annotation cp='[⏏]' tts='eject button'>eject</annotation>
+		<annotation cp='[🎦]' tts='cinema'>camera; film; movie</annotation>
+		<annotation cp='[🔅]' tts='dim button'>brightness; dim; low</annotation>
+		<annotation cp='[🔆]' tts='bright button'>bright; brightness</annotation>
+		<annotation cp='[📶]' tts='antenna bars'>antenna; bar; cell; mobile; phone; signal; telephone</annotation>
+		<annotation cp='[📵]' tts='no mobile phones'>cell; forbidden; mobile; no; not; phone; prohibited; telephone</annotation>
+		<annotation cp='[📳]' tts='vibration mode'>cell; mobile; mode; phone; telephone; vibration</annotation>
+		<annotation cp='[📴]' tts='mobile phone off'>cell; mobile; off; phone; telephone</annotation>
+		<annotation cp='[{#⃣}]' tts='keycap number'>hash; keycap; pound</annotation>
+		<annotation cp='[{*⃣}]' tts='keycap asterisk'>asterisk; keycap; star</annotation>
+		<annotation cp='[{0⃣}]' tts='keycap digit zero'>0; keycap; zero</annotation>
+		<annotation cp='[{1⃣}]' tts='keycap digit one'>1; keycap; one</annotation>
+		<annotation cp='[{2⃣}]' tts='keycap digit two'>2; keycap; two</annotation>
+		<annotation cp='[{3⃣}]' tts='keycap digit three'>3; keycap; three</annotation>
+		<annotation cp='[{4⃣}]' tts='keycap digit four'>4; four; keycap</annotation>
+		<annotation cp='[{5⃣}]' tts='keycap digit five'>5; five; keycap</annotation>
+		<annotation cp='[{6⃣}]' tts='keycap digit six'>6; keycap; six</annotation>
+		<annotation cp='[{7⃣}]' tts='keycap digit seven'>7; keycap; seven</annotation>
+		<annotation cp='[{8⃣}]' tts='keycap digit eight'>8; eight; keycap</annotation>
+		<annotation cp='[{9⃣}]' tts='keycap digit nine'>9; keycap; nine</annotation>
+		<annotation cp='[🔟]' tts='keycap ten'>10; keycap; ten</annotation>
+		<annotation cp='[💯]' tts='hundred points'>100; full; hundred; score</annotation>
+		<annotation cp='[🔞]' tts='no one under eighteen'>18; age restriction; eighteen; forbidden; no; not; prohibited; underage</annotation>
+		<annotation cp='[🔠]' tts='input latin uppercase'>input; latin; letters; uppercase</annotation>
+		<annotation cp='[🔡]' tts='input latin lowercase'>abcd; input; latin; letters; lowercase</annotation>
+		<annotation cp='[🔢]' tts='input numbers'>1234; input; numbers</annotation>
+		<annotation cp='[🔣]' tts='input symbols'>input</annotation>
+		<annotation cp='[🔤]' tts='input latin letters'>abc; alphabet; input; latin; letters</annotation>
+		<annotation cp='[🅰]' tts='a button'>a; blood</annotation>
+		<annotation cp='[🆎]' tts='ab button'>ab; blood</annotation>
+		<annotation cp='[🅱]' tts='b button'>b; blood</annotation>
+		<annotation cp='[🆑]' tts='squared cl'>cl</annotation>
+		<annotation cp='[🆒]' tts='squared cool'>cool</annotation>
+		<annotation cp='[🆓]' tts='squared free'>free</annotation>
+		<annotation cp='[ℹ]' tts='information source'>i; information</annotation>
+		<annotation cp='[🆔]' tts='squared id'>id; identity</annotation>
+		<annotation cp='[Ⓜ]' tts='circled letter m'>circle; m</annotation>
+		<annotation cp='[🆕]' tts='squared new'>new</annotation>
+		<annotation cp='[🆖]' tts='squared ng'>ng</annotation>
+		<annotation cp='[🅾]' tts='o button'>blood; o</annotation>
+		<annotation cp='[🆗]' tts='squared ok'>ok</annotation>
+		<annotation cp='[🅿]' tts='p button'>parking</annotation>
+		<annotation cp='[🆘]' tts='squared sos'>help; sos</annotation>
+		<annotation cp='[🆙]' tts='up! button'>mark; up</annotation>
+		<annotation cp='[🆚]' tts='squared vs'>versus; vs</annotation>
+		<annotation cp='[🈁]' tts='squared katakana koko'>japanese</annotation>
+		<annotation cp='[🈂]' tts='squared katakana sa'>japanese</annotation>
+		<annotation cp='[🈷]' tts='squared moon ideograph'>japanese</annotation>
+		<annotation cp='[🈶]' tts='squared exist ideograph'>japanese</annotation>
+		<annotation cp='[🈯]' tts='squared finger ideograph'>japanese</annotation>
+		<annotation cp='[🉐]' tts='circled advantage ideograph'>japanese</annotation>
+		<annotation cp='[🈹]' tts='squared divide ideograph'>japanese</annotation>
+		<annotation cp='[🈚]' tts='squared negation ideograph'>japanese</annotation>
+		<annotation cp='[🈲]' tts='squared prohibit ideograph'>japanese</annotation>
+		<annotation cp='[🉑]' tts='circled accept ideograph'>chinese</annotation>
+		<annotation cp='[🈸]' tts='squared apply ideograph'>chinese</annotation>
+		<annotation cp='[🈴]' tts='squared together ideograph'>chinese</annotation>
+		<annotation cp='[🈳]' tts='squared empty ideograph'>chinese</annotation>
+		<annotation cp='[㊗]' tts='circled congratulate ideograph'>chinese; congratulation; congratulations; ideograph</annotation>
+		<annotation cp='[㊙]' tts='circled secret ideograph'>chinese; ideograph; secret</annotation>
+		<annotation cp='[🈺]' tts='squared operating ideograph'>chinese</annotation>
+		<annotation cp='[🈵]' tts='squared fullness ideograph'>chinese</annotation>
+		<annotation cp='[▪]' tts='black small square'>geometric; square</annotation>
+		<annotation cp='[▫]' tts='white small square'>geometric; square</annotation>
+		<annotation cp='[◻]' tts='white medium square'>geometric; square</annotation>
+		<annotation cp='[◼]' tts='black medium square'>geometric; square</annotation>
+		<annotation cp='[◽]' tts='white medium-small square'>geometric; square</annotation>
+		<annotation cp='[◾]' tts='black medium-small square'>geometric; square</annotation>
+		<annotation cp='[⬛]' tts='black large square'>geometric; square</annotation>
+		<annotation cp='[⬜]' tts='white large square'>geometric; square</annotation>
+		<annotation cp='[🔶]' tts='large orange diamond'>diamond; geometric; orange</annotation>
+		<annotation cp='[🔷]' tts='large blue diamond'>blue; diamond; geometric</annotation>
+		<annotation cp='[🔸]' tts='small orange diamond'>diamond; geometric; orange</annotation>
+		<annotation cp='[🔹]' tts='small blue diamond'>blue; diamond; geometric</annotation>
+		<annotation cp='[🔺]' tts='red triangle pointed up'>geometric; red</annotation>
+		<annotation cp='[🔻]' tts='red triangle pointed down'>down; geometric; red</annotation>
+		<annotation cp='[💠]' tts='diamond with a dot'>comic; diamond; geometric; inside</annotation>
+		<annotation cp='[🔘]' tts='radio button'>button; geometric; radio</annotation>
+		<annotation cp='[🔲]' tts='black square button'>button; geometric; square</annotation>
+		<annotation cp='[🔳]' tts='white square button'>button; geometric; outlined; square</annotation>
+		<annotation cp='[⚪]' tts='white circle'>circle; geometric</annotation>
+		<annotation cp='[⚫]' tts='black circle'>circle; geometric</annotation>
+		<annotation cp='[🔴]' tts='red circle'>circle; geometric; red</annotation>
+		<annotation cp='[🔵]' tts='blue circle'>blue; circle; geometric</annotation>
+	</annotations>
+</ldml>
\ No newline at end of file
diff --git a/ibus.spec.in b/ibus.spec.in
index 7fdaccb24..40aead167 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -5,6 +5,7 @@
 
 # Build flags
 %define build_python_library 0
+%define build_emoji_dictionary 1
 
 %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 @@ BuildRequires:  dconf-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
+%if %build_emoji_dictionary
+BuildRequires:  nodejs-emojione
+BuildRequires:  json-glib
+%endif
 
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   %{name}-gtk2 = %{version}-%{release}
@@ -151,6 +156,12 @@ OPTIONS="$OPTIONS --enable-python-library"
 %else
 OPTIONS="$OPTIONS --disable-python-library"
 %endif
+%if %build_emoji_dictionary
+OPTIONS="$OPTIONS --enable-emoji-dict"
+%else
+OPTIONS="$OPTIONS --disable-emoji-dict"
+%endif
+
 
 %configure $OPTIONS
 
@@ -258,6 +269,9 @@ dconf update &> /dev/null || :
 %{_bindir}/ibus-setup
 %{_datadir}/ibus/component/gtkpanel.xml
 %{_datadir}/ibus/component/simple.xml
+%if %build_emoji_dictionary
+%{_datadir}/ibus/dicts
+%endif
 %{_datadir}/ibus/keymaps/*
 %{_datadir}/ibus/setup/*
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 22e031fbc..b58ab951b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,15 +29,6 @@ endif
 
 SUBDIRS = . $(TESTS_DIR)
 
-IBUS_V_wget = $(ibus__v_wget_@AM_V@)
-ibus__v_wget_ = $(ibus__v_wget_@AM_DEFAULT_V@)
-ibus__v_wget_0 = -nv
-ibus__v_wget_1 =
-IBUS_V_diff = $(ibus__v_diff_@AM_V@)
-ibus__v_diff_ = $(ibus__v_diff_@AM_DEFAULT_V@)
-ibus__v_diff_0 = -q
-ibus__v_diff_1 =
-
 # libibus = libibus-@IBUS_API_VERSION@.la
 libibus = libibus-1.0.la
 
@@ -248,37 +239,25 @@ dict_DATA = emoji.dict
 
 noinst_PROGRAMS = emoji-parser
 
-emoji-list.html:
-	$(AM_V_at)wget $(IBUS_V_wget) \
-                http://ibus.github.io/files/ibus/emoji-list.html
-	$(AM_V_at)wget $(IBUS_V_wget) \
-                http://unicode.org/emoji/charts/emoji-list.html \
-	        -O latest-emoji-list.html
-	$(AM_V_at)diff $(IBUS_V_diff) emoji-list.html latest-emoji-list.html; \
-	if test $$? -ne 0; then \
-	    echo "#### WARNING: emoji-list.html is old." >&2; \
-	fi; \
-	rm latest-emoji-list.html;
-
-emoji.dict: emoji-parser emoji-list.html
-	$(builddir)/emoji-parser emoji-list.html $@
+emoji.dict: emoji-parser
+	$(builddir)/emoji-parser --xml $(srcdir)/../data/annotations/en.xml \
+	--json $(EMOJI_JSON_FILE) --out $@
 
 emoji_parser_SOURCES =          \
     emoji-parser.c              \
     $(NULL)
 emoji_parser_CFLAGS =           \
     $(GLIB2_CFLAGS)             \
-    $(LIBXML2_CFLAGS)           \
+    $(JSON_GLIB1_CFLAGS)        \
     $(NULL)
 emoji_parser_LDADD =            \
     $(GLIB2_LIBS)               \
-    $(LIBXML2_LIBS)             \
+    $(JSON_GLIB1_LIBS)          \
     $(libibus)                  \
     $(NULL)
 
 CLEANFILES +=                   \
     $(dict_DATA)                \
-    emoji-list.html             \
     $(NULL)
 endif
 
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index cf92feea5..e97f2660d 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -20,47 +20,59 @@
  * USA
  */
 
-/* Convert http://www.unicode.org/emoji/charts/emoji-list.html
+/* Convert ../data/annotations/en.xml and
+ * /usr/lib/node_modules/emojione/emoji.json
  * to the dictionary file which look up the Emoji from the annotation.
+ * Get emoji.json with 'npm install -g emojione'.
+ * en.xml is used for the Unicode annotations and emoji.json is used
+ * for the aliases_ascii, e.g. ":)", and category, e.g. "people".
  */
 
 #include <glib.h>
-#include <libxml/HTMLparser.h>
-#include <libgen.h>
+#include <json-glib/json-glib.h>
+
+#include <string.h>
 
 #include "ibusutil.h"
 
 typedef struct _EmojiData EmojiData;
 struct _EmojiData {
-    gchar      *class;
     gchar      *emoji;
-    GSList     *annotates;
-    GSList     *prev_annotates;
+    GSList     *annotations;
+    gboolean    is_annotation;
     GHashTable *dict;
 };
 
-const gchar *progname;
-
-static gboolean         parse_node             (xmlNode     *node,
-                                                gboolean     is_child,
-                                                const gchar *prop_name,
-                                                EmojiData   *data);
-
 static void
-usage (void)
+reset_emoji_element (EmojiData *data)
 {
-    g_print ("%s emoji-list.html emoji.dict\n", progname);
+    g_assert (data != NULL);
+
+    g_clear_pointer (&data->emoji, g_free);
+    g_slist_free_full (data->annotations, g_free);
+    data->annotations = NULL;
 }
 
 static void
-reset_emoji_element (EmojiData *data)
+update_emoji_dict (EmojiData *data)
 {
-    g_clear_pointer (&data->class, g_free);
-    g_clear_pointer (&data->emoji, g_free);
-    if (data->annotates) {
-        g_slist_free_full (data->prev_annotates, g_free);
-        data->prev_annotates = data->annotates;
-        data->annotates = NULL;
+    GSList *annotations = data->annotations;
+    while (annotations) {
+        const gchar *annotation = (const gchar *) annotations->data;
+        GSList *emojis = g_hash_table_lookup (data->dict, annotation);
+        if (emojis) {
+            GSList *duplicated = g_slist_find_custom (emojis,
+                                                      data->emoji,
+                                                      (GCompareFunc) g_strcmp0);
+            if (duplicated != NULL)
+                 continue;
+            emojis = g_slist_copy_deep (emojis, (GCopyFunc) g_strdup, NULL);
+        }
+        emojis = g_slist_append (emojis, g_strdup (data->emoji));
+        g_hash_table_replace (data->dict,
+                              g_strdup (annotation),
+                              emojis);
+        annotations = annotations->next;
     }
 }
 
@@ -70,147 +82,486 @@ free_dict_words (gpointer list)
     g_slist_free_full (list, g_free);
 }
 
-static gboolean
-parse_attr (xmlAttr   *attr,
-            EmojiData *data)
-{
-    if (g_strcmp0 ((const gchar *) attr->name, "class") == 0 && attr->children)
-        parse_node (attr->children, TRUE, (const gchar *) attr->name, data);
-    if (g_strcmp0 ((const gchar *) attr->name, "target") == 0 && attr->children)
-        parse_node (attr->children, TRUE, (const gchar *) attr->name, data);
-    if (attr->next)
-        parse_attr (attr->next, data);
-    return TRUE;
-}
+static void
+unicode_annotations_start_element_cb (GMarkupParseContext *context,
+                                      const gchar         *element_name,
+                                      const gchar        **attribute_names,
+                                      const gchar        **attribute_values,
+                                      gpointer             user_data,
+                                      GError             **error)
+{
+    EmojiData *data = (EmojiData *) user_data;
+    int i;
+    const gchar *attribute;
+    const gchar *value;
 
-static gboolean
-parse_node (xmlNode     *node,
-            gboolean     is_child,
-            const gchar *prop_name,
-            EmojiData   *data)
-{
-    if (g_strcmp0 ((const gchar *) node->name, "tr") == 0) {
-        GSList *annotates = data->annotates;
-        while (annotates) {
-            GSList *emojis = g_hash_table_lookup (data->dict, annotates->data);
-            if (emojis) {
-                emojis = g_slist_copy_deep (emojis, (GCopyFunc) g_strdup, NULL);
+    g_assert (data != NULL);
+
+    if (g_strcmp0 (element_name, "annotation") != 0)
+        return;
+
+    reset_emoji_element (data);
+
+    for (i = 0; (attribute = attribute_names[i]) != NULL; i++) {
+        value = attribute_values[i];
+
+        if (g_strcmp0 (attribute, "cp") == 0) {
+            if (value == NULL || *value == '\0') {
+                g_warning ("cp='' in unicode.org annotations file");
+                return;
+            } else if (value[0] != '[' || value[strlen(value) - 1] != ']') {
+                g_warning ("cp!='[emoji]' in unicode.org annotations file");
+                return;
             }
-            emojis = g_slist_append (emojis, g_strdup (data->emoji));
-            g_hash_table_replace (data->dict,
-                                  g_strdup (annotates->data),
-                                  emojis);
-            annotates = annotates->next;
+            data->emoji = g_strndup (value + 1, strlen(value) - 2);
         }
-        reset_emoji_element (data);
-    }
-    /* if node->name is "text" and is_child is FALSE,
-     * it's '\n' or Space between <td> and <td>.
-     */
-    if (g_strcmp0 ((const gchar *) node->name, "text") == 0 && is_child) {
-        /* Get "chars" in <td class="chars"> */
-        if (g_strcmp0 (prop_name, "class") == 0) {
-            if (g_strcmp0 (data->class, (const gchar *) node->content) != 0) {
-                g_clear_pointer (&data->class, g_free);
-                data->class = g_strdup ((const gchar *) node->content);
+        else if (g_strcmp0 (attribute, "tts") == 0) {
+            GSList *duplicated = g_slist_find_custom (data->annotations,
+                                                      value,
+                                                      (GCompareFunc) g_strcmp0);
+            if (duplicated == NULL) {
+                data->annotations = g_slist_prepend (data->annotations,
+                                                     g_strdup (value));
             }
         }
-        /* Get "annotate" in <td class="name"><a target="annotate"> */
-        if (g_strcmp0 (prop_name, "target") == 0 &&
-            g_strcmp0 (data->class, "name") == 0) {
-            g_clear_pointer (&data->class, g_free);
-            data->class = g_strdup ((const gchar *) node->content);
-        }
-        /* Get "emoji" in <td class="chars">emoji</td> */
-        if (g_strcmp0 (prop_name, "td") == 0 &&
-            g_strcmp0 (data->class, "chars") == 0) {
-            data->emoji = g_strdup ((const gchar *) node->content);
-        }
-        /* We ignore "NAME" for <td class="name">NAME</td> but
-         * takes "ANNOTATE" for
-         * <td class="name"><a target="annotate">ANNOTATE</a></td>
-         */
-        if (g_strcmp0 (prop_name, "td") == 0 &&
-            g_strcmp0 (data->class, "name") == 0) {
-            g_slist_free_full (data->annotates, g_free);
-            data->annotates = NULL;
+    }
+
+    data->is_annotation = TRUE;
+}
+
+static void
+unicode_annotations_end_element_cb (GMarkupParseContext *context,
+                                    const gchar         *element_name,
+                                    gpointer             user_data,
+                                    GError             **error)
+{
+    EmojiData *data = (EmojiData *) user_data;
+
+    g_assert (data != NULL);
+    if (!data->is_annotation)
+        return;
+
+    update_emoji_dict (data);
+    data->is_annotation = FALSE;
+}
+
+void
+unicode_annotations_text_cb (GMarkupParseContext *context,
+                             const gchar         *text,
+                             gsize                text_len,
+                             gpointer             user_data,
+                             GError             **error)
+{
+    EmojiData *data = (EmojiData *) user_data;
+    gchar **annotations = NULL;
+    const gchar *annotation;
+    int i;
+
+    g_assert (data != NULL);
+    if (!data->is_annotation)
+        return;
+    annotations = g_strsplit (text, "; ", -1);
+    for (i = 0; (annotation = annotations[i]) != NULL; i++) {
+        GSList *duplicated = g_slist_find_custom (data->annotations,
+                                                  annotation,
+                                                  (GCompareFunc) g_strcmp0);
+        if (duplicated == NULL) {
+            data->annotations = g_slist_prepend (data->annotations,
+                                                 g_strdup (annotation));
         }
-        /* Get "ANNOTATE" in
-         * <td class="name"><a target="annotate">ANNOTATE</a></td>
-         */
-        if (g_strcmp0 (prop_name, "a") == 0 &&
-            g_strcmp0 (data->class, "annotate") == 0) {
-            data->annotates =
-                    g_slist_append (data->annotates,
-                                    g_strdup ((const gchar *) node->content));
+    }
+    g_strfreev (annotations);
+}
+
+static gboolean
+unicode_annotations_parse_xml_file (const gchar *filename,
+                                    GHashTable  *dict)
+{
+    gchar *content = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    const static GMarkupParser parser = {
+        unicode_annotations_start_element_cb,
+        unicode_annotations_end_element_cb,
+        unicode_annotations_text_cb,
+        NULL,
+        NULL
+    };
+    GMarkupParseContext *context = NULL;
+    EmojiData data = { 0, };
+
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (dict != NULL, FALSE);
+
+    if (!g_file_get_contents (filename, &content, &length, &error)) {
+        g_warning ("Failed to load %s: %s", filename, error->message);
+        goto failed_to_parse_unicode_annotations;
+    }
+
+    data.dict = dict;
+
+    context = g_markup_parse_context_new (&parser, 0, &data, NULL);
+    if (!g_markup_parse_context_parse (context, content, length, &error)) {
+        g_warning ("Failed to parse %s: %s", filename, error->message);
+        goto failed_to_parse_unicode_annotations;
+    }
+
+    reset_emoji_element (&data);
+    g_markup_parse_context_free (context);
+    g_free (content);
+    return TRUE;
+
+failed_to_parse_unicode_annotations:
+    if (error)
+        g_error_free (error);
+    if (data.dict)
+        g_hash_table_destroy (data.dict);
+    if (context)
+        g_markup_parse_context_free (context);
+    g_free (content);
+    return FALSE;
+}
+
+static gboolean
+parse_emojione_unicode (JsonNode  *node,
+                        EmojiData *data)
+{
+    const gchar *str, *unicode;
+    gchar *endptr = NULL;
+    guint32 uch;
+    static gchar outbuf[8] = { 0, };
+    GString *emoji;
+
+    if (json_node_get_node_type (node) != JSON_NODE_VALUE) {
+        g_warning ("'unicode' element is not string");
+        return FALSE;
+    }
+
+    emoji = g_string_new (NULL);
+    str = unicode = json_node_get_string (node);
+    while (str && *str) {
+        uch = g_ascii_strtoull (str, &endptr, 16);
+        outbuf[g_unichar_to_utf8 (uch, outbuf)] = '\0';
+        g_string_append (emoji, outbuf);
+        if (*endptr == '\0') {
+            break;
+        } else {
+            switch (*endptr) {
+            case '-':
+                endptr++;
+                break;
+            default:
+                g_warning ("Failed to parse unicode %s", unicode);
+            }
         }
+        str = endptr;
+        endptr = NULL;
+    }
+
+    data->emoji = g_string_free (emoji, FALSE);
+
+    return TRUE;
+}
+
+static gboolean
+parse_emojione_shortname (JsonNode  *node,
+                          EmojiData *data)
+{
+#if 0
+    const gchar *shortname;
+    gchar *head, *s;
+    int length;
+    GSList *duplicated;
+
+    if (json_node_get_node_type (node) != JSON_NODE_VALUE) {
+        g_warning ("'shortname' element is not string");
+        return FALSE;
     }
-    /* Get "foo" in <td class="foo"> */
-    if (g_strcmp0 ((const gchar *) node->name, "td") == 0 &&
-        node->properties != NULL) {
-        parse_attr (node->properties, data);
+
+    /* The format is ':short_name:' */
+    shortname = json_node_get_string (node);
+    if (shortname == 0 || *shortname == '\0')
+        return TRUE;
+    if (*shortname != ':') {
+        g_warning ("'shortname' format is different: %s", shortname);
+        return FALSE;
     }
-    /* Get "foo" in <a target="foo"> */
-    if (g_strcmp0 ((const gchar *) node->name, "a") == 0 &&
-        node->properties != NULL) {
-        parse_attr (node->properties, data);
+
+    length = strlen (shortname);
+    head  = g_new0 (gchar, length);
+    strcpy (head, shortname + 1);
+    for (s = head; *s; s++) {
+        if (*s == ':') {
+            *s = '\0';
+            break;
+        } else if (*s == '_') {
+            *s = ' ';
+        }
     }
-    if (node->children) {
-        parse_node (node->children, TRUE, (const gchar *) node->name, data);
+
+    if (head == NULL || *head == '\0') {
+        g_warning ("'shortname' format is different: %s", shortname);
+        g_free (head);
+        return FALSE;
+    }
+
+    duplicated = g_slist_find_custom (data->annotations,
+                                      head,
+                                      (GCompareFunc) g_strcmp0);
+    if (duplicated == NULL) {
+        data->annotations = g_slist_prepend (data->annotations,
+                                             head);
     } else {
-        /* If annotate is NULL likes <td class="name"></td>,
-         * the previous emoji cell has the same annotate.
-         */
-        if (g_strcmp0 ((const gchar *) node->name, "td") == 0 &&
-            g_strcmp0 (data->class, "name") == 0) {
-            data->annotates = g_slist_copy_deep (data->prev_annotates,
-                                                 (GCopyFunc) g_strdup,
-                                                 NULL);
+       g_free (head);
+    }
+
+#endif
+    return TRUE;
+}
+
+static gboolean
+parse_emojione_category (JsonNode  *node,
+                         EmojiData *data)
+{
+    const gchar *category;
+    GSList *duplicated;
+
+    if (json_node_get_node_type (node) != JSON_NODE_VALUE) {
+        g_warning ("'category' element is not string");
+        return FALSE;
+    }
+
+    category = json_node_get_string (node);
+
+    if (category == NULL || *category == '\0')
+        return TRUE;
+
+    duplicated = g_slist_find_custom (data->annotations,
+                                      category,
+                                      (GCompareFunc) g_strcmp0);
+    if (duplicated == NULL) {
+        data->annotations = g_slist_prepend (data->annotations,
+                                             g_strdup (category));
+    }
+
+    return TRUE;
+}
+
+static gboolean
+parse_emojione_aliases_ascii (JsonNode  *node,
+                              EmojiData *data)
+{
+    JsonArray *aliases_ascii;
+    guint i, length;
+
+    if (json_node_get_node_type (node) != JSON_NODE_ARRAY) {
+        g_warning ("'aliases_ascii' element is not array");
+        return FALSE;
+    }
+
+    aliases_ascii = json_node_get_array (node);
+    length = json_array_get_length (aliases_ascii);
+    for (i = 0; i < length; i++) {
+        const gchar *alias = json_array_get_string_element (aliases_ascii, i);
+        GSList *duplicated = g_slist_find_custom (data->annotations,
+                                                  alias,
+                                                  (GCompareFunc) g_strcmp0);
+        if (duplicated == NULL) {
+            data->annotations = g_slist_prepend (data->annotations,
+                                                 g_strdup (alias));
         }
     }
-    if (node->next)
-        parse_node (node->next, FALSE, (const gchar *) node->name, data);
 
     return TRUE;
 }
 
-static GHashTable *
-parse_html (const gchar *filename)
+static gboolean
+parse_emojione_keywords (JsonNode  *node,
+                         EmojiData *data)
 {
-    xmlDoc *doc = htmlParseFile (filename, "utf-8");
-    EmojiData data = { 0, };
+#if 0
+    JsonArray *keywords;
+    guint i, length;
 
-    if (doc == NULL || doc->children == NULL) {
-        g_warning ("Parse Error in document type: %x",
-                   doc ? doc->type : 0);
+    if (json_node_get_node_type (node) != JSON_NODE_ARRAY) {
+        g_warning ("'keywords' element is not array");
         return FALSE;
     }
 
-    data.dict = g_hash_table_new_full (g_str_hash,
-                                       g_str_equal,
-                                       g_free,
-                                       free_dict_words);
-    parse_node (doc->children, TRUE, (const gchar *) doc->name, &data);
+    keywords = json_node_get_array (node);
+    length = json_array_get_length (keywords);
+    for (i = 0; i < length; i++) {
+        const gchar *keyword = json_array_get_string_element (keywords, i);
+        GSList *duplicated = g_slist_find_custom (data->annotations,
+                                                  keyword,
+                                                  (GCompareFunc) g_strcmp0);
+        if (duplicated == NULL) {
+            data->annotations = g_slist_prepend (data->annotations,
+                                                 g_strdup (keyword));
+        }
+    }
 
+#endif
+    return TRUE;
+}
+
+static gboolean
+parse_emojione_emoji_data (JsonNode    *node,
+                           const gchar *member,
+                           EmojiData   *data)
+{
+    if (g_strcmp0 (member, "unicode") == 0)
+        return parse_emojione_unicode (node, data);
+    else if (g_strcmp0 (member, "shortname") == 0)
+        return parse_emojione_shortname (node, data);
+    else if (g_strcmp0 (member, "category") == 0)
+        return parse_emojione_category (node, data);
+    else if (g_strcmp0 (member, "aliases_ascii") == 0)
+        return parse_emojione_aliases_ascii (node, data);
+    else if (g_strcmp0 (member, "keywords") == 0)
+        return parse_emojione_keywords (node, data);
+    return TRUE;
+}
+
+static gboolean
+parse_emojione_element (JsonNode  *node,
+                        EmojiData *data)
+{
+    JsonObject *object;
+    GList *members, *m;
+
+    if (json_node_get_node_type (node) != JSON_NODE_OBJECT) {
+            return FALSE;
+    }
+
+    reset_emoji_element (data);
+
+    object = json_node_get_object (node);
+    m = members = json_object_get_members (object);
+    while (m) {
+       const gchar *member = (const gchar *) m->data;
+       if (!parse_emojione_emoji_data (json_object_get_member (object, member),
+                                       member,
+                                       data)) {
+           g_list_free (members);
+           return FALSE;
+       }
+       m = m->next;
+    }
+    g_list_free (members);
+
+    update_emoji_dict (data);
+
+    return TRUE;
+}
+
+static gboolean
+emojione_parse_json_file (const gchar *filename,
+                          GHashTable  *dict)
+{
+    JsonParser *parser = json_parser_new ();
+    JsonNode *node;
+    JsonObject *object;
+    GList *members, *m;
+    GError *error = NULL;
+    EmojiData data = { 0, };
+
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (dict != NULL, FALSE);
+
+    if (!json_parser_load_from_file (parser, filename, &error)) {
+        g_error ("%s", error->message);
+        g_error_free (error);
+        goto fail_to_json_file;
+    }
+
+    node = json_parser_get_root (parser);
+    if (json_node_get_node_type (node) != JSON_NODE_OBJECT) {
+        g_warning ("Json file does not have Json object %s", filename);
+        goto fail_to_json_file;
+    }
+
+    object = json_node_get_object (node);
+    members = json_object_get_members (object);
+    data.dict = dict;
+
+    m = members;
+    while (m) {
+       const gchar *member = (const gchar *) m->data;
+       if (!parse_emojione_element (json_object_get_member (object, member),
+                                    &data)) {
+           g_warning ("Failed to parse member '%s' in %s", member, filename);
+       }
+       m = m->next;
+    }
+
+    g_list_free (members);
     reset_emoji_element (&data);
-    g_slist_free_full (data.prev_annotates, g_free);
+    g_object_unref (parser);
+
+    return TRUE;
 
-    return data.dict;
+fail_to_json_file:
+    g_object_unref (parser);
+    return FALSE;
 }
 
 int
 main (int argc, char *argv[])
 {
+    gchar *prgname;
+    gchar *json_file = NULL;
+    gchar *xml_file = NULL;
+    gchar *output = NULL;
+    GOptionEntry     entries[] = {
+        { "json", 'j', 0, G_OPTION_ARG_STRING, &json_file,
+          "Parse Emoji One JSON file",
+          "JSON"
+        },
+        { "out", 'o', 0, G_OPTION_ARG_STRING, &output,
+          "Save the emoji dictionary as FILE",
+          "FILE"
+        },
+        { "xml", 'x', 0, G_OPTION_ARG_STRING, &xml_file,
+          "Parse Unocode.org ANNOTATIONS file",
+          "ANNOTATIONS"
+        },
+        { NULL }
+    };
+    GOptionContext *context;
+    GError *error = NULL;
     GHashTable *dict;
-    progname = basename (argv[0]);
+
+    prgname = g_path_get_basename (argv[0]);
+    g_set_prgname (prgname);
+    g_free (prgname);
+
+    context = g_option_context_new (NULL);
+    g_option_context_add_main_entries (context, entries, NULL);
 
     if (argc < 3) {
-        usage ();
+        g_print ("%s", g_option_context_get_help (context, TRUE, NULL));
+        g_option_context_free (context);
+        return -1;
+    }
+
+    if (!g_option_context_parse (context, &argc, &argv, &error)) {
+        g_warning ("Failed options: %s", error->message);
+        g_error_free (error);
         return -1;
     }
+    g_option_context_free (context);
 
-    dict = parse_html (argv[1]);
-    ibus_emoji_dict_save (argv[2], dict);
+    dict = g_hash_table_new_full (g_str_hash,
+                                  g_str_equal,
+                                  g_free,
+                                  free_dict_words);
+    if (xml_file)
+        unicode_annotations_parse_xml_file (xml_file, dict);
+    if (json_file)
+        emojione_parse_json_file (json_file, dict);
+    if (g_hash_table_size (dict) > 0 && output)
+        ibus_emoji_dict_save (output, dict);
     g_hash_table_destroy (dict);
 
     return 0;

From f88c48750538eaaf7c7b182ba3763b45c2745074 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 20 Jul 2016 11:43:49 +0900
Subject: [PATCH 353/816] Fix typo in configure.ac

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/303110043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f7898197f..76897f035 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,7 +647,7 @@ engine/Makefile
 util/Makefile
 util/IMdkit/Makefile
 data/Makefile
-data/annotations/Makefile.am
+data/annotations/Makefile
 data/icons/Makefile
 data/keymaps/Makefile
 data/dconf/Makefile

From 20068d9d0731b580d6d8218b97c482c0558149dd Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 25 Jul 2016 11:42:37 +0900
Subject: [PATCH 354/816] tests/ibus-engine-switch: Don't try to remove
 non-existing GSource

ibus-engine-switch schedules an idle doing an engine switch, and
also schedules a timeout after 1 microsecond which exits the main
loop. Both of these callbacks will return FALSE, which detaches
the associated GSource from the mainloop and destroys it.

As the only way to exit the mainloop is when the timeout callback runs,
we should not try to run g_source_remove(timeout_id) as it will already
be gone, and this causes a warning.

This commit reorders a bit to make the ordering between the idle and
timeout more obvious, and it gets rid of the calls to g_source_remove()
as they are needed.

BUG=https://github.com/ibus/ibus/issues/1868

Review URL: https://codereview.appspot.com/103100044
---
 bus/Makefile.am                |  8 ++++++++
 src/tests/ibus-engine-switch.c | 24 +++++++++++++++++-------
 src/tests/runtest              |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 4dabacf54..f032367ca 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -113,6 +113,14 @@ TESTS = \
 	$(NULL)
 endif
 
+TESTS_ENVIRONMENT = \
+    top_builddir=$(top_builddir) \
+    top_srcdir=$(top_srcdir) \
+    builddir=$(builddir) \
+    $(NULL)
+
+LOG_COMPILER = $(top_srcdir)/src/tests/runtest
+
 noinst_PROGRAMS = $(TESTS)
 
 test_matchrule_DEPENDENCIES = \
diff --git a/src/tests/ibus-engine-switch.c b/src/tests/ibus-engine-switch.c
index 4c99b79c6..5c2bd5167 100644
--- a/src/tests/ibus-engine-switch.c
+++ b/src/tests/ibus-engine-switch.c
@@ -44,26 +44,34 @@ change_context_engine (IBusInputContext *context)
 
 typedef struct {
     gint count;
+    guint timeout_id;
+    guint idle_id;
 } GlobalEngineChangedData;
 
 static void
 global_engine_changed_cb (IBusBus *bus, gchar *name, gpointer user_data)
 {
     GlobalEngineChangedData *data = (GlobalEngineChangedData *) user_data;
-    data->count++;
+    if (data->count++ == 0)
+        ibus_quit ();
 }
 
 static gboolean
 timeout_cb (gpointer user_data)
 {
-    ibus_quit ();
+    GlobalEngineChangedData *data = (GlobalEngineChangedData *) user_data;
+    if (data->count == 0)
+        ibus_quit ();
+    data->timeout_id = 0;
     return FALSE;
 }
 
 static gboolean
 change_global_engine_cb (gpointer user_data)
 {
+    GlobalEngineChangedData *data = (GlobalEngineChangedData *) user_data;
     change_global_engine ();
+    data->idle_id = 0;
     return FALSE;
 }
 
@@ -71,7 +79,7 @@ static void
 test_global_engine (void)
 {
     GlobalEngineChangedData data;
-    guint handler_id, timeout_id, idle_id;
+    guint handler_id;
 
     if (!ibus_bus_get_use_global_engine (bus))
         return;
@@ -82,15 +90,17 @@ test_global_engine (void)
                                    "global-engine-changed",
                                    G_CALLBACK (global_engine_changed_cb),
                                    &data);
-    timeout_id = g_timeout_add_seconds (1, timeout_cb, &data);
-    idle_id = g_idle_add ((GSourceFunc) change_global_engine_cb, NULL);
+    data.timeout_id = g_timeout_add_seconds (1, timeout_cb, &data);
+    data.idle_id = g_idle_add ((GSourceFunc) change_global_engine_cb, &data);
 
     ibus_main ();
 
     g_assert_cmpint (data.count, ==, G_N_ELEMENTS (engine_names));
 
-    g_source_remove (idle_id);
-    g_source_remove (timeout_id);
+    if (data.idle_id > 0)
+        g_source_remove (data.idle_id);
+    if (data.timeout_id > 0)
+        g_source_remove (data.timeout_id);
     g_signal_handler_disconnect (bus, handler_id);
 }
 
diff --git a/src/tests/runtest b/src/tests/runtest
index 662028102..81dc62d1a 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -27,6 +27,7 @@ ibus-inputcontext
 ibus-inputcontext-create
 ibus-engine-switch
 ibus-compose
+test-stress
 "
 
 # Portable replacement of basename.

From eee7a132d686cb8d9c36c632523649745487b503 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 27 Jul 2016 11:25:32 +0900
Subject: [PATCH 355/816] Fix make dist

'make dist' has different directories between builddir and srcdir.

src/tests/runtest gets the builddir of ibus-memconf from the
srcdir of memconf.xml and the builddir of ibus-engine-simple
from the srcdir of simple.xml.

bindings/pygobject/test-override-ibus.py runs IBus.Keymap.new()
and gets the path of keymaps from IBUS_KEYMAP_PATH variable.

bindings/vala/ibus-1.0.vapi needs to be cleaned by 'make distclean'.

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/305950043
---
 Makefile.am                    | 1 -
 bindings/pygobject/Makefile.am | 4 +++-
 bindings/vala/Makefile.am      | 6 ++++--
 src/ibuskeymap.c               | 6 +++++-
 src/tests/runtest              | 5 ++++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 425d1ec2f..38515c677 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,6 @@ install-data-hook:
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--disable-schemas-install \
-	--disable-introspection \
 	$(NULL)
 
 dist-hook:
diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index 53b36ef3e..238a537af 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
-# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -39,10 +39,12 @@ if ENABLE_TESTS
 TESTS += test-override-ibus.py
 endif
 
+# IBus.Keymap() accesses keymap files
 TESTS_ENVIRONMENT = \
 	PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
 	GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
+	IBUS_KEYMAP_PATH=$(top_srcdir)/data/keymaps \
 	$(NULL)
 
 LOG_COMPILER = $(PYTHON) -B
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 5a354238a..f3eb0d40d 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 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
@@ -43,6 +43,8 @@ vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
+# for make distclean
+CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
 
 EXTRA_DIST = \
 	$(VAPIGEN_VAPIS) \
diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
index 79550332d..d7428c5da 100644
--- a/src/ibuskeymap.c
+++ b/src/ibuskeymap.c
@@ -159,13 +159,17 @@ static gboolean
 ibus_keymap_load (const gchar *name,
                   KEYMAP       keymap)
 {
+    const gchar *envstr;
     gchar *fname;
     FILE *pf;
     gchar buf[256];
     gint lineno;
 
 
-    fname = g_build_filename (IBUS_DATA_DIR, "keymaps", name, NULL);
+    if ((envstr = g_getenv ("IBUS_KEYMAP_PATH")) != NULL)
+        fname = g_build_filename (envstr, name, NULL);
+    else
+        fname = g_build_filename (IBUS_DATA_DIR, "keymaps", name, NULL);
 
     if (fname == NULL) {
         return FALSE;
diff --git a/src/tests/runtest b/src/tests/runtest
index 81dc62d1a..91c4e95f1 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -66,9 +66,12 @@ func_cleanup () {
 func_copy_component () {
   file=$1
   base=`func_basename $file`
+  libexecdir=`func_dirname $file`
+  # top_srcdir != top_builddir in make dist
+  libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
   if test -f $file.in; then
     mkdir -p components
-    sed 's|@libexecdir@|'`func_dirname $file`'|g' < $file.in > components/$base
+    sed "s|@libexecdir@|$libexecdir|g" < $file.in > components/$base
   fi
 }
 

From 028624f0bb100ab2689ef059b3afd45ed89ca3f1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 2 Aug 2016 11:54:07 +0900
Subject: [PATCH 356/816] Fix Croatian language code in simple.xml

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/302320044
---
 engine/simple.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index b3996807d..c08000f00 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -182,8 +182,8 @@
 			<rank>1</rank>
 		</engine>
 		<engine>
-			<name>xkb:hr::scr</name>
-			<language>scr</language>
+			<name>xkb:hr::hr</name>
+			<language>hr</language>
 			<license>GPL</license>
 			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 			<layout>hr</layout>
@@ -707,4 +707,4 @@
 			<rank>1</rank>
 		</engine>
 	</engines>
-</component>
\ No newline at end of file
+</component>

From 239d3630abcaf624e3bacc2c5d1075a77a24a4b1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 4 Aug 2016 11:28:32 +0900
Subject: [PATCH 357/816] Replace deprecated GSimpleAsyncResult with GTask
 since GLib 2.46

Review URL: https://codereview.appspot.com/304310043
---
 bus/engineproxy.c  |  88 +++++-----
 bus/inputcontext.c |  65 +++----
 src/ibusbus.c      | 414 +++++++++++++++++++++++++++------------------
 3 files changed, 334 insertions(+), 233 deletions(-)

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index efd95867c..cd4d54fd1 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -662,7 +663,7 @@ bus_engine_proxy_new_internal (const gchar     *path,
 }
 
 typedef struct {
-    GSimpleAsyncResult *simple;
+    GTask           *task;
     IBusEngineDesc  *desc;
     BusComponent    *component;
     BusFactoryProxy *factory;
@@ -676,8 +677,8 @@ typedef struct {
 static void
 engine_proxy_new_data_free (EngineProxyNewData *data)
 {
-    if (data->simple != NULL) {
-        g_object_unref (data->simple);
+    if (data->task != NULL) {
+        g_object_unref (data->task);
     }
 
     if (data->desc != NULL) {
@@ -721,15 +722,14 @@ create_engine_ready_cb (BusFactoryProxy    *factory,
                         GAsyncResult       *res,
                         EngineProxyNewData *data)
 {
-    g_return_if_fail (data->simple != NULL);
+    g_return_if_fail (data->task != NULL);
 
     GError *error = NULL;
     gchar *path = bus_factory_proxy_create_engine_finish (factory,
                                                           res,
                                                           &error);
     if (path == NULL) {
-        g_simple_async_result_set_from_error (data->simple, error);
-        g_simple_async_result_complete_in_idle (data->simple);
+        g_task_return_error (data->task, error);
         engine_proxy_new_data_free (data);
         return;
     }
@@ -741,8 +741,7 @@ create_engine_ready_cb (BusFactoryProxy    *factory,
     g_free (path);
 
     /* FIXME: set destroy callback ? */
-    g_simple_async_result_set_op_res_gpointer (data->simple, engine, NULL);
-    g_simple_async_result_complete_in_idle (data->simple);
+    g_task_return_pointer (data->task, engine, NULL);
 
     engine_proxy_new_data_free (data);
 }
@@ -776,10 +775,7 @@ notify_factory_cb (BusComponent       *component,
         /* We *have to* disconnect the cancelled_cb here, since g_dbus_proxy_call
          * calls create_engine_ready_cb even if the proxy call is cancelled, and
          * in this case, create_engine_ready_cb itself will return error using
-         * g_simple_async_result_set_from_error and g_simple_async_result_complete.
-         * Otherwise, g_simple_async_result_complete might be called twice for a
-         * single data->simple twice (first in cancelled_cb and later in
-         * create_engine_ready_cb). */
+         * g_task_return_error(). */
         if (data->cancellable && data->cancelled_handler_id != 0) {
             g_cancellable_disconnect (data->cancellable, data->cancelled_handler_id);
             data->cancelled_handler_id = 0;
@@ -806,12 +802,10 @@ notify_factory_cb (BusComponent       *component,
 static gboolean
 timeout_cb (EngineProxyNewData *data)
 {
-    g_simple_async_result_set_error (data->simple,
-                                     G_DBUS_ERROR,
-                                     G_DBUS_ERROR_FAILED,
-                                     "Timeout was reached");
-    g_simple_async_result_complete_in_idle (data->simple);
-
+    g_task_return_new_error (data->task,
+                             G_DBUS_ERROR,
+                             G_DBUS_ERROR_FAILED,
+                             "Timeout was reached");
     engine_proxy_new_data_free (data);
 
     return FALSE;
@@ -827,11 +821,10 @@ timeout_cb (EngineProxyNewData *data)
 static gboolean
 cancelled_idle_cb (EngineProxyNewData *data)
 {
-    g_simple_async_result_set_error (data->simple,
-                                     G_DBUS_ERROR,
-                                     G_DBUS_ERROR_FAILED,
-                                     "Operation was cancelled");
-    g_simple_async_result_complete_in_idle (data->simple);
+    g_task_return_new_error (data->task,
+                             G_DBUS_ERROR,
+                             G_DBUS_ERROR_FAILED,
+                             "Operation was cancelled");
 
     engine_proxy_new_data_free (data);
 
@@ -857,23 +850,21 @@ bus_engine_proxy_new (IBusEngineDesc      *desc,
                       GAsyncReadyCallback  callback,
                       gpointer             user_data)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_ENGINE_DESC (desc));
     g_assert (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
     g_assert (callback);
 
-    GSimpleAsyncResult *simple =
-        g_simple_async_result_new (NULL,
-                                   callback,
-                                   user_data,
-                                   bus_engine_proxy_new);
+    task = g_task_new (NULL, cancellable, callback, user_data);
+    g_task_set_source_tag (task, bus_engine_proxy_new);
 
     if (g_cancellable_is_cancelled (cancellable)) {
-        g_simple_async_result_set_error (simple,
-                                         G_DBUS_ERROR,
-                                         G_DBUS_ERROR_FAILED,
-                                         "Operation was cancelled");
-        g_simple_async_result_complete_in_idle (simple);
-        g_object_unref (simple);
+        g_task_return_new_error (task,
+                                 G_DBUS_ERROR,
+                                 G_DBUS_ERROR_FAILED,
+                                 "Operation was cancelled");
+        g_object_unref (task);
         return;
     }
 
@@ -881,7 +872,7 @@ bus_engine_proxy_new (IBusEngineDesc      *desc,
     data->desc = g_object_ref (desc);
     data->component = bus_component_from_engine_desc (desc);
     g_object_ref (data->component);
-    data->simple = simple;
+    data->task = task;
     data->timeout = timeout;
 
     data->factory = bus_component_get_factory (data->component);
@@ -913,7 +904,7 @@ bus_engine_proxy_new (IBusEngineDesc      *desc,
         /* We don't have to connect to cancelled_cb here, since g_dbus_proxy_call
          * calls create_engine_ready_cb even if the proxy call is cancelled, and
          * in this case, create_engine_ready_cb itself can return error using
-         * g_simple_async_result_set_from_error and g_simple_async_result_complete. */
+         * g_task_return_error(). */
         bus_factory_proxy_create_engine (data->factory,
                                          data->desc,
                                          timeout,
@@ -927,15 +918,28 @@ BusEngineProxy *
 bus_engine_proxy_new_finish (GAsyncResult   *res,
                              GError       **error)
 {
-    GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+    GTask *task;
+    gboolean had_error;
+    BusEngineProxy *retval = NULL;
 
     g_assert (error == NULL || *error == NULL);
-    g_assert (g_simple_async_result_get_source_tag (simple) == bus_engine_proxy_new);
-
-    if (g_simple_async_result_propagate_error (simple, error))
+    g_assert (g_task_is_valid (res, NULL));
+
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) == bus_engine_proxy_new);
+
+    /* g_task_propagate_error() is not a public API and
+     * g_task_had_error() needs to be called before
+     * g_task_propagate_pointer() clears task->error.
+     */
+    had_error = g_task_had_error (task);
+    retval = g_task_propagate_pointer (task, error);
+    if (had_error) {
+        g_assert (retval == NULL);
         return NULL;
+    }
 
-    return (BusEngineProxy *) g_simple_async_result_get_op_res_gpointer(simple);
+    return retval;
 }
 
 void
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 789bba26f..6c82e20be 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2014 Red Hat, Inc.
+ * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -34,7 +35,7 @@ struct _SetEngineByDescData {
     /* context related to the data */
     BusInputContext *context;
     /* set engine by desc result, cancellable */
-    GSimpleAsyncResult *simple;
+    GTask *task;
     /* a object to cancel bus_engine_proxy_new call */
     GCancellable *cancellable;
     /* a object being passed to the bus_input_context_set_engine_by_desc function. if origin_cancellable is cancelled by someone,
@@ -2314,8 +2315,8 @@ static void set_engine_by_desc_data_free (SetEngineByDescData *data)
         g_object_unref (data->context);
     }
 
-    if (data->simple != NULL) {
-        g_object_unref (data->simple);
+    if (data->task != NULL) {
+        g_object_unref (data->task);
     }
 
     if (data->cancellable != NULL)
@@ -2345,17 +2346,16 @@ new_engine_cb (GObject             *obj,
     BusEngineProxy *engine = bus_engine_proxy_new_finish (res, &error);
 
     if (engine == NULL) {
-        g_simple_async_result_set_from_error (data->simple, error);
-        g_error_free (error);
+        g_task_return_error (data->task, error);
     }
     else {
         if (data->context->data != data) {
             /* Request has been overriden or cancelled */
             g_object_unref (engine);
-            g_simple_async_result_set_error (data->simple,
-                                             G_IO_ERROR,
-                                             G_IO_ERROR_CANCELLED,
-                                             "Opertation was cancelled");
+            g_task_return_new_error (data->task,
+                                     G_IO_ERROR,
+                                     G_IO_ERROR_CANCELLED,
+                                     "Opertation was cancelled");
         }
         else {
             /* Let BusEngineProxy call a Disable signal. */
@@ -2363,13 +2363,10 @@ new_engine_cb (GObject             *obj,
             bus_input_context_set_engine (data->context, engine);
             g_object_unref (engine);
             bus_input_context_enable (data->context);
-            g_simple_async_result_set_op_res_gboolean (data->simple, TRUE);
+            g_task_return_boolean (data->task, TRUE);
         }
     }
 
-    /* Call the callback function for bus_input_context_set_engine_by_desc(). */
-    g_simple_async_result_complete_in_idle (data->simple);
-
     set_engine_by_desc_data_free (data);
 }
 
@@ -2437,6 +2434,9 @@ bus_input_context_set_engine_by_desc (BusInputContext    *context,
                                       GAsyncReadyCallback callback,
                                       gpointer            user_data)
 {
+    GTask *task;
+    SetEngineByDescData *data;
+
     g_assert (BUS_IS_INPUT_CONTEXT (context));
     g_assert (IBUS_IS_ENGINE_DESC (desc));
     g_assert (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
@@ -2452,27 +2452,23 @@ bus_input_context_set_engine_by_desc (BusInputContext    *context,
     if (callback == NULL)
         callback = (GAsyncReadyCallback) set_engine_by_desc_ready_cb;
 
-    GSimpleAsyncResult *simple =
-            g_simple_async_result_new ((GObject *) context,
-                                       callback,
-                                       user_data,
-                                       bus_input_context_set_engine_by_desc);
+    task = g_task_new (context, cancellable, callback, user_data);
+    g_task_set_source_tag (task, bus_input_context_set_engine_by_desc);
 
     if (g_cancellable_is_cancelled (cancellable)) {
-        g_simple_async_result_set_error (simple,
-                                         G_IO_ERROR,
-                                         G_IO_ERROR_CANCELLED,
-                                         "Operation was cancelled");
-        g_simple_async_result_complete_in_idle (simple);
-        g_object_unref (simple);
+        g_task_return_new_error (task,
+                                 G_IO_ERROR,
+                                 G_IO_ERROR_CANCELLED,
+                                 "Operation was cancelled");
+        g_object_unref (task);
         return;
     }
 
-    SetEngineByDescData *data = g_slice_new0 (SetEngineByDescData);
+    data = g_slice_new0 (SetEngineByDescData);
     context->data = data;
     data->context = context;
     g_object_ref (context);
-    data->simple = simple;
+    data->task = task;
 
     if (cancellable != NULL) {
         data->origin_cancellable = cancellable;
@@ -2499,13 +2495,22 @@ bus_input_context_set_engine_by_desc_finish (BusInputContext  *context,
                                              GAsyncResult     *res,
                                              GError          **error)
 {
-    GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+    GTask *task;
+    gboolean had_error;
 
     g_assert (BUS_IS_INPUT_CONTEXT (context));
-    g_assert (g_simple_async_result_get_source_tag (simple) ==
+    g_assert (g_task_is_valid (res, context));
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) ==
                 bus_input_context_set_engine_by_desc);
 
-    if (g_simple_async_result_propagate_error (simple, error))
+    /* g_task_propagate_error() is not a public API and
+     * g_task_had_error() needs to be called before
+     * g_task_propagate_pointer() clears task->error.
+     */
+    had_error = g_task_had_error (task);
+    g_task_propagate_pointer (task, error);
+    if (had_error)
         return FALSE;
     return TRUE;
 }
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 29e9b1f50..75406a370 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2016 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
@@ -564,26 +565,34 @@ ibus_bus_destroy (IBusObject *object)
 }
 
 static gboolean
-_async_finish_void (GAsyncResult *res,
-                    GError      **error)
+_async_finish_void (GTask   *task,
+                    GError **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    /* g_task_propagate_error() is not a public API and 
+     * g_task_had_error() needs to be called before
+     * g_task_propagate_pointer() clears task->error.
+     */
+    gboolean had_error = g_task_had_error (task);
+    g_task_propagate_pointer (task, error);
+    if (had_error)
         return FALSE;
     return TRUE;
 }
 
 static gchar *
-_async_finish_object_path (GAsyncResult *res,
-                           GError      **error)
+_async_finish_object_path (GTask   *task,
+                           GError **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
-        return NULL;
-    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    gboolean had_error = g_task_had_error (task);
+    GVariant *result = g_task_propagate_pointer (task, error);
     GVariant *variant = NULL;
-    g_return_val_if_fail (result != NULL, NULL);
     gchar *path = NULL;
+
+    if (had_error) {
+        g_assert (result == NULL);
+        return NULL;
+    }
+    g_return_val_if_fail (result != NULL, NULL);
     g_variant_get (result, "(v)", &variant);
     path = g_variant_dup_string (variant, NULL);
     g_variant_unref (variant);
@@ -591,45 +600,53 @@ _async_finish_object_path (GAsyncResult *res,
 }
 
 static gchar *
-_async_finish_string (GAsyncResult *res,
-                      GError      **error)
+_async_finish_string (GTask   *task,
+                      GError **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    gboolean had_error = g_task_had_error (task);
+    GVariant *variant = g_task_propagate_pointer (task, error);
+    gchar *s = NULL;
+
+    if (had_error) {
+        g_assert (variant == NULL);
         return NULL;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_return_val_if_fail (variant != NULL, NULL);
-    gchar *s = NULL;
     g_variant_get (variant, "(&s)", &s);
     return s;
 }
 
 static gboolean
-_async_finish_gboolean (GAsyncResult *res,
-                        GError      **error)
+_async_finish_gboolean (GTask   *task,
+                        GError **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    gboolean had_error = g_task_had_error (task);
+    GVariant *variant = g_task_propagate_pointer (task, error);
+    gboolean retval = FALSE;
+
+    if (had_error) {
+        g_assert (variant == NULL);
         return FALSE;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_return_val_if_fail (variant != NULL, FALSE);
-    gboolean retval = FALSE;
     g_variant_get (variant, "(b)", &retval);
     return retval;
 }
 
 static guint
-_async_finish_guint (GAsyncResult *res,
-                     GError      **error)
+_async_finish_guint (GTask   *task,
+                     GError **error)
 {
+    gboolean had_error = g_task_had_error (task);
+    GVariant *variant = g_task_propagate_pointer (task, error);
     static const guint bad_id = 0;
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    guint id = 0;
+
+    if (had_error) {
+        g_assert (variant == NULL);
         return bad_id;
-    GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_return_val_if_fail (variant != NULL, bad_id);
-
-    guint id = 0;
     g_variant_get (variant, "(u)", &id);
     return id;
 }
@@ -698,37 +715,34 @@ ibus_bus_create_input_context (IBusBus      *bus,
 }
 
 static void
-_create_input_context_async_step_two_done (GObject            *source_object,
-                                           GAsyncResult       *res,
-                                           GSimpleAsyncResult *simple)
+_create_input_context_async_step_two_done (GObject      *source_object,
+                                           GAsyncResult *res,
+                                           GTask        *task)
 {
     GError *error = NULL;
     IBusInputContext *context =
             ibus_input_context_new_async_finish (res, &error);
-    if (context == NULL) {
-        g_simple_async_result_set_from_error (simple, error);
-        g_error_free (error);
-    }
-    else {
-        g_simple_async_result_set_op_res_gpointer (simple, context, NULL);
-    }
-    g_simple_async_result_complete_in_idle (simple);
-    g_object_unref (simple);
+    if (context == NULL)
+        g_task_return_error (task, error);
+    else
+        g_task_return_pointer (task, context, NULL);
+    g_object_unref (task);
 }
 
 static void
-_create_input_context_async_step_one_done (GDBusConnection    *connection,
-                                           GAsyncResult       *res,
-                                           GSimpleAsyncResult *simple)
+_create_input_context_async_step_one_done (GDBusConnection *connection,
+                                           GAsyncResult    *res,
+                                           GTask           *task)
 {
     GError *error = NULL;
     GVariant *variant = g_dbus_connection_call_finish (connection, res, &error);
+    const gchar *path = NULL;
+    IBusBus *bus;
+    GCancellable *cancellable;
 
     if (variant == NULL) {
-        g_simple_async_result_set_from_error (simple, error);
-        g_error_free (error);
-        g_simple_async_result_complete_in_idle (simple);
-        g_object_unref (simple);
+        g_task_return_error (task, error);
+        g_object_unref (task);
         return;
     }
 
@@ -738,32 +752,24 @@ _create_input_context_async_step_one_done (GDBusConnection    *connection,
          * the asynchronous request with error.
          */
         g_variant_unref(variant);
-        g_simple_async_result_set_error (simple,
+        g_task_return_new_error (task,
                 G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Connection is closed.");
-        g_simple_async_result_complete_in_idle (simple);
         return;
     }
 
-    const gchar *path = NULL;
     g_variant_get (variant, "(&o)", &path);
     g_variant_unref(variant);
 
-
-    IBusBus *bus = (IBusBus *)g_async_result_get_source_object (
-            (GAsyncResult *)simple);
+    bus = (IBusBus *)g_task_get_source_object (task);
     g_assert (IBUS_IS_BUS (bus));
 
-    GCancellable *cancellable =
-            (GCancellable *)g_object_get_data ((GObject *)simple,
-                                               "cancellable");
+    cancellable = g_task_get_cancellable (task);
 
     ibus_input_context_new_async (path,
             bus->priv->connection,
             cancellable,
             (GAsyncReadyCallback)_create_input_context_async_step_two_done,
-            simple);
-    /* release the reference from g_async_result_get_source_object() */
-    g_object_unref (bus);
+            task);
 }
 
 void
@@ -774,19 +780,14 @@ ibus_bus_create_input_context_async (IBusBus            *bus,
                                      GAsyncReadyCallback callback,
                                      gpointer            user_data)
 {
+    GTask *task;
+
     g_return_if_fail (IBUS_IS_BUS (bus));
     g_return_if_fail (client_name != NULL);
     g_return_if_fail (callback != NULL);
 
-    GSimpleAsyncResult *simple = g_simple_async_result_new ((GObject *)bus,
-            callback, user_data, ibus_bus_create_input_context_async);
-
-    if (cancellable != NULL) {
-        g_object_set_data_full ((GObject *)simple,
-                                "cancellable",
-                                g_object_ref (cancellable),
-                                (GDestroyNotify)g_object_unref);
-    }
+    task = g_task_new (bus, cancellable, callback, user_data);
+    g_task_set_source_tag (task, ibus_bus_create_input_context_async);
 
     /* do not use ibus_bus_call_async, instread use g_dbus_connection_call
      * directly, because we need two async steps for create an IBusInputContext.
@@ -804,7 +805,7 @@ ibus_bus_create_input_context_async (IBusBus            *bus,
             timeout_msec,
             cancellable,
             (GAsyncReadyCallback)_create_input_context_async_step_one_done,
-            simple);
+            task);
 }
 
 IBusInputContext *
@@ -812,15 +813,22 @@ ibus_bus_create_input_context_async_finish (IBusBus      *bus,
                                             GAsyncResult *res,
                                             GError      **error)
 {
-    g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_create_input_context_async));
+    GTask *task;
+    gboolean had_error;
+    IBusInputContext *context = NULL;
 
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    g_assert (IBUS_IS_BUS (bus));
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) == 
+                      ibus_bus_create_input_context_async);
+    had_error = g_task_had_error (task);
+    context = g_task_propagate_pointer (task, error);
+    if (had_error) {
+        g_assert (context == NULL);
         return NULL;
-    IBusInputContext *context =
-            g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_assert (IBUS_IS_INPUT_CONTEXT (context));
     return context;
 }
@@ -883,10 +891,15 @@ ibus_bus_current_input_context_async_finish (IBusBus      *bus,
                                              GAsyncResult *res,
                                              GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_current_input_context_async));
-    return _async_finish_object_path (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) ==
+                     ibus_bus_current_input_context_async);
+    return _async_finish_object_path (task, error);
 }
 
 static void
@@ -1060,10 +1073,14 @@ ibus_bus_request_name_async_finish (IBusBus      *bus,
                                     GAsyncResult *res,
                                     GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_request_name_async));
-    return _async_finish_guint (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_request_name_async);
+    return _async_finish_guint (task, error);
 }
 
 guint
@@ -1121,10 +1138,14 @@ ibus_bus_release_name_async_finish (IBusBus      *bus,
                                     GAsyncResult *res,
                                     GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_release_name_async));
-    return _async_finish_guint (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_release_name_async);
+    return _async_finish_guint (task, error);
 }
 
 GList *
@@ -1217,10 +1238,14 @@ ibus_bus_name_has_owner_async_finish (IBusBus      *bus,
                                       GAsyncResult *res,
                                       GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_name_has_owner_async));
-    return _async_finish_gboolean (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_name_has_owner_async);
+    return _async_finish_gboolean (task, error);
 }
 
 GList *
@@ -1283,10 +1308,14 @@ ibus_bus_add_match_async_finish (IBusBus      *bus,
                                  GAsyncResult *res,
                                  GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_add_match_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_add_match_async);
+    return _async_finish_void (task, error);
 }
 
 gboolean
@@ -1342,10 +1371,14 @@ ibus_bus_remove_match_async_finish (IBusBus      *bus,
                                     GAsyncResult *res,
                                     GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_remove_match_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_remove_match_async);
+    return _async_finish_void (task, error);
 }
 
 gchar *
@@ -1403,10 +1436,14 @@ ibus_bus_get_name_owner_async_finish (IBusBus      *bus,
                                       GAsyncResult *res,
                                       GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_get_name_owner_async));
-    return g_strdup (_async_finish_string (res, error));
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_get_name_owner_async);
+    return g_strdup (_async_finish_string (task, error));
 }
 
 GDBusConnection *
@@ -1470,10 +1507,14 @@ ibus_bus_exit_async_finish (IBusBus      *bus,
                             GAsyncResult *res,
                             GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_exit_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) == ibus_bus_exit_async);
+    return _async_finish_void (task, error);
 }
 
 gboolean
@@ -1529,10 +1570,15 @@ ibus_bus_register_component_async_finish (IBusBus      *bus,
                                           GAsyncResult *res,
                                           GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_register_component_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert (
+            g_task_get_source_tag (task) == ibus_bus_register_component_async);
+    return _async_finish_void (task, error);
 }
 
 static GList *
@@ -1610,18 +1656,27 @@ ibus_bus_list_engines_async_finish (IBusBus      *bus,
                                     GAsyncResult *res,
                                     GError      **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
-        return NULL;
-    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
-    g_return_val_if_fail (result != NULL, NULL);
-
+    GTask *task;
+    gboolean had_error;
+    GVariant *result = NULL;
     GVariant *variant = NULL;
     GList *retval = NULL;
     GVariantIter *iter = NULL;
+    GVariant *var;
+
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    had_error = g_task_had_error (task);
+    result = g_task_propagate_pointer (task, error);
+    if (had_error) {
+        g_assert (result == NULL);
+        return NULL;
+    }
+    g_return_val_if_fail (result != NULL, NULL);
+
     g_variant_get (result, "(v)", &variant);
     iter = g_variant_iter_new (variant);
-    GVariant *var;
     while (g_variant_iter_loop (iter, "v", &var)) {
         IBusSerializable *serializable = ibus_serializable_deserialize (var);
         g_object_ref_sink (serializable);
@@ -1789,11 +1844,14 @@ ibus_bus_get_use_sys_layout_async_finish (IBusBus      *bus,
                                           GAsyncResult *res,
                                           GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (
-                      res, (GObject *) bus,
-                      ibus_bus_get_use_sys_layout_async));
-    return _async_finish_gboolean (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) == ibus_bus_get_use_sys_layout_async);
+    return _async_finish_gboolean (task, error);
 }
 
 gboolean
@@ -1847,11 +1905,15 @@ ibus_bus_get_use_global_engine_async_finish (IBusBus      *bus,
                                              GAsyncResult *res,
                                              GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (
-                      res, (GObject *) bus,
-                      ibus_bus_get_use_global_engine_async));
-    return _async_finish_gboolean (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) ==
+                     ibus_bus_get_use_global_engine_async);
+    return _async_finish_gboolean (task, error);
 }
 
 gboolean
@@ -1903,11 +1965,15 @@ gboolean ibus_bus_is_global_engine_enabled_async_finish (IBusBus      *bus,
                                                          GAsyncResult *res,
                                                          GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (
-                      res, (GObject *) bus,
-                      ibus_bus_is_global_engine_enabled_async));
-    return _async_finish_gboolean (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert(g_task_get_source_tag (task) ==
+                     ibus_bus_is_global_engine_enabled_async);
+    return _async_finish_gboolean (task, error);
 }
 #endif /* IBUS_DISABLE_DEPRECATED */
 
@@ -1973,10 +2039,19 @@ ibus_bus_get_global_engine_async_finish (IBusBus      *bus,
                                          GAsyncResult *res,
                                          GError      **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    GTask *task;
+    gboolean had_error;
+    GVariant *result = NULL;
+
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    had_error = g_task_had_error (task);
+    result = g_task_propagate_pointer (task, error);
+    if (had_error) {
+        g_assert (result == NULL);
         return NULL;
-    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_return_val_if_fail (result != NULL, NULL);
     GVariant *variant = NULL;
     g_variant_get (result, "(v)", &variant);
@@ -2044,10 +2119,14 @@ ibus_bus_set_global_engine_async_finish (IBusBus      *bus,
                                          GAsyncResult *res,
                                          GError      **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (res, (GObject *) bus,
-                                              ibus_bus_set_global_engine_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) == ibus_bus_set_global_engine_async);
+    return _async_finish_void (task, error);
 }
 
 gboolean
@@ -2116,11 +2195,14 @@ ibus_bus_preload_engines_async_finish (IBusBus       *bus,
                                        GAsyncResult  *res,
                                        GError       **error)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (
-            res, (GObject *) bus,
-            ibus_bus_preload_engines_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_assert (g_task_get_source_tag (task) == ibus_bus_preload_engines_async);
+    return _async_finish_void (task, error);
 }
 
 GVariant *
@@ -2183,10 +2265,19 @@ ibus_bus_get_ibus_property_async_finish (IBusBus      *bus,
                                          GAsyncResult *res,
                                          GError      **error)
 {
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) res;
-    if (g_simple_async_result_propagate_error (simple, error))
+    GTask *task;
+    gboolean had_error;
+    GVariant *result = NULL;
+
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    had_error = g_task_had_error (task);
+    result = g_task_propagate_pointer (task, error);
+    if (had_error) {
+        g_assert (result == NULL);
         return NULL;
-    GVariant *result = g_simple_async_result_get_op_res_gpointer (simple);
+    }
     g_return_val_if_fail (result != NULL, NULL);
     GVariant *retval = NULL;
     g_variant_get (result, "(v)", &retval);
@@ -2254,11 +2345,15 @@ ibus_bus_set_ibus_property_async_finish (IBusBus       *bus,
                                          GAsyncResult  *res,
                                          GError       **error)
 {
+    GTask *task;
     g_assert (IBUS_IS_BUS (bus));
-    g_assert (g_simple_async_result_is_valid (
-            res, (GObject *) bus,
-            ibus_bus_set_ibus_property_async));
-    return _async_finish_void (res, error);
+    g_assert (g_task_is_valid (res, bus));
+
+    task = G_TASK (res);
+    g_return_val_if_fail (
+            g_task_get_source_tag (task) == ibus_bus_set_ibus_property_async,
+            FALSE);
+    return _async_finish_void (task, error);
 }
 
 static GVariant *
@@ -2302,23 +2397,20 @@ ibus_bus_call_async_done (GDBusConnection *connection,
                           GAsyncResult    *res,
                           gpointer         user_data)
 {
+    GTask *task;
+    GError *error = NULL;
+    GVariant *variant;
+
     g_assert (G_IS_DBUS_CONNECTION (connection));
 
-    GSimpleAsyncResult *simple = (GSimpleAsyncResult *) user_data;
-    GError *error = NULL;
-    GVariant *variant = g_dbus_connection_call_finish (connection, res, &error);
+    task = (GTask* ) user_data;
+    variant = g_dbus_connection_call_finish (connection, res, &error);
 
-    if (variant == NULL) {
-        /* Replace with g_simple_async_result_take_error in glib 2.28 */
-        g_simple_async_result_set_from_error (simple, error);
-        g_error_free (error);
-    }
-    else {
-        g_simple_async_result_set_op_res_gpointer (simple, variant,
-                                                   (GDestroyNotify) g_variant_unref);
-    }
-    g_simple_async_result_complete (simple);
-    g_object_unref (simple);
+    if (variant == NULL)
+        g_task_return_error (task, error);
+    else
+        g_task_return_pointer (task, variant, (GDestroyNotify) g_variant_unref);
+    g_object_unref (task);
 }
 
 static void
@@ -2335,14 +2427,14 @@ ibus_bus_call_async (IBusBus            *bus,
                      GAsyncReadyCallback callback,
                      gpointer            user_data)
 {
+    GTask *task;
+
     g_assert (IBUS_IS_BUS (bus));
     g_assert (member != NULL);
     g_return_if_fail (ibus_bus_is_connected (bus));
 
-    GSimpleAsyncResult *simple = g_simple_async_result_new ((GObject*) bus,
-                                                            callback,
-                                                            user_data,
-                                                            source_tag);
+    task = g_task_new (bus, cancellable, callback, user_data);
+    g_task_set_source_tag (task, source_tag);
 
     g_dbus_connection_call (bus->priv->connection,
                             bus_name,
@@ -2355,5 +2447,5 @@ ibus_bus_call_async (IBusBus            *bus,
                             timeout_msec,
                             cancellable,
                             (GAsyncReadyCallback) ibus_bus_call_async_done,
-                            simple);
+                            task);
 }

From c3ceed40f644f9fb0517a27592b6fd022d518e34 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 5 Aug 2016 12:36:16 +0900
Subject: [PATCH 358/816] Release 1.5.14

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/306860043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 76897f035..8ff79166c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [13])
+m4_define([ibus_micro_version], [14])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 997e5cb1b100c6af267b8121445db1db7e580d5f Mon Sep 17 00:00:00 2001
From: "Eric R. Schulz" <eric@ers35.com>
Date: Thu, 18 Aug 2016 11:17:11 +0900
Subject: [PATCH 359/816] Fix GVariant leaks

The expectation is that g_dbus_message_set_body() takes ownership of the
GVariant, but this does not happen if the BusInputContext connection is NULL.
Call g_variant_unref() in that case to free the memory. Alternatively, a
GVariantBuilder could be used.

BUG=https://github.com/ibus/ibus/pull/1872
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/307050043

Patch from Eric R. Schulz <eric@ers35.com>.
---
 bus/inputcontext.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 6c82e20be..0612fac71 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -673,8 +673,10 @@ bus_input_context_send_signal (BusInputContext *context,
                                GVariant        *parameters,
                                GError         **error)
 {
-    if (context->connection == NULL)
+    if (context->connection == NULL) {
+        g_variant_unref (parameters);
         return TRUE;
+    }
 
     GDBusMessage *message = g_dbus_message_new_signal (ibus_service_get_object_path ((IBusService *)context),
                                                        interface_name,
@@ -704,8 +706,10 @@ bus_input_context_emit_signal (BusInputContext *context,
                                GVariant        *parameters,
                                GError         **error)
 {
-    if (context->connection == NULL)
+    if (context->connection == NULL) {
+        g_variant_unref (parameters);
         return TRUE;
+    }
 
     return bus_input_context_send_signal (context,
                                           "org.freedesktop.IBus.InputContext",

From ceb6a9b47deaa898d8151606831669a7446ad382 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Sep 2016 13:05:35 +0900
Subject: [PATCH 360/816] ui/gtk3: Fix radio buttons on Property Panel

Use gtk_container_remove() instead g_object_unref() because
if an widget has a parent, it's not destroyed and the signal is not
sent to the parent since the parent was destroyed.

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/302650043
---
 ui/gtk3/propertypanel.vala | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 6d5fd81ef..ea960b81e 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -2,9 +2,9 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2013-2015 Red Hat, Inc.
+ * Copyright(c) 2013-2016 Red Hat, Inc.
  * Copyright(c) 2013-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2013-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -85,7 +85,7 @@ public class PropertyPanel : Gtk.Box {
         debug("set_properties()\n");
 
         foreach (var item in m_items)
-            (item as Gtk.Widget).destroy();
+            remove((item as Gtk.Widget));
         m_items = {};
 
         m_props = props;
@@ -481,6 +481,8 @@ public class PropMenu : Gtk.Menu, IPropToolItem {
 
     public override void destroy() {
         m_parent_button = null;
+        foreach (var item in m_items)
+            remove((item as Gtk.Widget));
         m_items = {};
         base.destroy();
     }
@@ -739,7 +741,7 @@ public class PropMenuToolButton : PropToggleToolButton, IPropToolItem {
         m_menu = new PropMenu(prop);
         m_menu.deactivate.connect((m) =>
                                   set_active(false));
-        m_menu.property_activate.connect((w, k, s) =>
+        m_menu.property_activate.connect((k, s) =>
                                          property_activate(k, s));
 
         base.set_property(prop);

From 708e5e51da696f42f34d2921c83455f1824ea40f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 9 Sep 2016 17:48:20 +0900
Subject: [PATCH 361/816] Update translations

Update po/LINGUAS po/de.po po/es.po po/fr.po po/mn.po po/pl.po
       po/zh_HK.po po/zh_TW.po

R=shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/302610043
---
 po/LINGUAS  |   2 +
 po/cs.po    | 814 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/de.po    | 409 ++++++++++++++++----------
 po/es.po    | 169 ++++++-----
 po/fr.po    |  76 ++---
 po/mn.po    | 764 ++++++++++++++++++++++++++++++++++++++++++++++++
 po/pl.po    | 105 +++----
 po/pt_BR.po | 312 +++++++++++++-------
 po/zh_HK.po |  50 ++--
 po/zh_TW.po | 181 +++++++-----
 10 files changed, 2375 insertions(+), 507 deletions(-)
 create mode 100644 po/cs.po
 create mode 100644 po/mn.po

diff --git a/po/LINGUAS b/po/LINGUAS
index d57590798..b2c09c86c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -4,6 +4,7 @@ bg
 bn
 bn_IN
 ca
+cs
 da
 de
 en_GB
@@ -23,6 +24,7 @@ kn
 ko
 lv
 ml
+mn
 mr
 nb
 nl
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 000000000..fbb1253d4
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,814 @@
+# Czech translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Marek Suchánek <m.suchanek.2@gmail.com>, 2016. #zanata
+# Zdenek <chmelarz@gmail.com>, 2016. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-09-08 10:02-0400\n"
+"Last-Translator: Marek Suchánek <m.suchanek.2@gmail.com>\n"
+"Language-Team: Czech\n"
+"Language: cs\n"
+"X-Generator: Zanata 3.9.5\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Vodorovně"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Svisle"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Levý horní roh"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Pravý horní roh"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Levý dolní roh"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Pravý dolní roh"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Vlastní"
+
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr "Neukazovat"
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr "Automaticky schovávat"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Vždy"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Předvolby IBusu"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Klávesové zkratky pro přepnutí na další vstupní metodu v řadě"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Další vstupní metoda:"
+
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Klávesové zkratky pro přepnutí na předchozí vstupní metodu v řadě"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Předchozí vstupní metoda:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Klávesové zkratky pro zapnutí a vypnutí vstupní metody"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Povolit či zakázat:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Povolit:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Zakázat:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Klávesové zkratky</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Nastavení orientace kandidátů ve vyhledávací tabulce"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientace kandidátů:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Nastavit chování ibusu, co se týče schovávání jazykového panelu"
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr "Zobrazit panel vlastností:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Umístění jazykového panelu:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+msgid "Show icon on system tray"
+msgstr "Zobrazit ikonu v oznamovací oblasti"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+msgid "Show input method name on language bar"
+msgstr "Zobrazit v jazykovém panelu vstupní metodu"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Pokud je zaškrtnuto, zobrazovat v jazykovém panelu název vstupní metody"
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Vkládat předupravený text v okně aplikace"
+
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Vkládat předupravený text metody vstupu v okně aplikace"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Použít vlastní písmo:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Písmo a styl</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Obecné"
+
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
+msgid "_Add"
+msgstr "_Přidat"
+
+#: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Přidat vybranou vstupní metodu mezi povolené vstupní metody"
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Odebrat"
+
+#: ../setup/setup.ui.h:38
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Odebrat vybranou vstupní metodu z povolených vstupních metod"
+
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Výše"
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu výše"
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Níže"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu níže"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "O _metodě"
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr "Ukázat podrobnosti o vybrané vstupní metodě"
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Nastavení"
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr "Ukázat nastavení vybrané vstupní metody"
+
+#: ../setup/setup.ui.h:47
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Aktivní metodu vstupu lze přepínat z výše uvedeného seznamu výběru "
+"za pomoci klávesové zkratky nebo kliknutím na ikonu panelu.</i></small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+msgid "Input Method"
+msgstr "Vstupní metoda"
+
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+msgid "Use system keyboard layout"
+msgstr "Použít systémové rozložení klávesnice"
+
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+msgid "Use system keyboard (XKB) layout"
+msgstr "Použít systémové rozložení klávesnice (XKB)"
+
+#: ../setup/setup.ui.h:51
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Rozložení klávesnice</b>"
+
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+msgid "Share the same input method among all applications"
+msgstr "Používat stejnou vstupní metodu pro všechny aplikace"
+
+#: ../setup/setup.ui.h:53
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globální nastavení vstupní metody</b>"
+
+#: ../setup/setup.ui.h:54
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Inteligentní vstupní metoda</small>\n"
+"Domovská stránka: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:62
+msgid "Start ibus on login"
+msgstr "Spustit ibus při přihlášení"
+
+#: ../setup/setup.ui.h:63
+msgid "<b>Startup</b>"
+msgstr "<b>Spouštění</b>"
+
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
+msgid "About"
+msgstr "O programu"
+
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+msgid "_Close"
+msgstr "_Zavřít"
+
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines"
+msgstr "Přednačtené enginy"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
+msgid "Preload engines during ibus starts up"
+msgstr "Přednačtené enginy v průběhu startu IBus"
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Engines order"
+msgstr "Pořadí enginů"
+
+#: ../data/ibus.schemas.in.h:6
+msgid "Saved engines order in input method list"
+msgstr "Uložené pořadí enginů v seznamu vstupní metody"
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+"Počet milisekund pro zpoždění automaticky otevřeného okna IME přepínače"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"Nastavit počet milisekund pro zpoždění automaticky otevřeného okna "
+"zobrazujícího IME přepínač. Výchozí hodnota je 400. 0 = Zobrazit okno "
+"okamžitě. 0 & lt; Milisekundové zpoždění. 0 & gt; Nezobrazit okno a přejít k "
+"předchozímu / dalšímu enginu."
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Saved version number"
+msgstr "Uložené číslo verze"
+
+#: ../data/ibus.schemas.in.h: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 ""
+"Uložené číslo verze bude použito ke kontrole rozdílu mezi předchozí verzí "
+"nainstalovaného IBusu a verzí aktuálního IBusu."
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Rozložení latinky, které nemá ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+"Americké rozvržení je připojeno k latinskému. Varianta může být vynechána."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Použít xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+"Spustit xmodmap, pokud .xmodmap nebo .Xmodmap existuje, jsou-li enginy ibus "
+"zapnuty."
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr "Spouštěcí klávesové zkratky"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Spouštěcí klávesové zkratky pro gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr "Povolit klávesové zkratky"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr "Klávesové zkratky pro zapnutí vstupní metody"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr "Zakázat klávesové zkratky"
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr "Klávesové zkratky pro vypnutí vstupní metody"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Next engine shortcut keys"
+msgstr "Klávesové zkratky dalšího enginu"
+
+#: ../data/ibus.schemas.in.h:23
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Klávesové zkratky pro přechod na další metodu vstupu v seznamu"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Prev engine shortcut keys"
+msgstr "Klávesové zkratky předchozího enginu"
+
+#: ../data/ibus.schemas.in.h:25
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Klávesové zkratky pro přechod na předchozí metodu vstupu"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Auto hide"
+msgstr "Automaticky skrýt"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"Chování panelu vlastností. 0 = Nezobrazovat, 1 = Automaticky skrýt, 2 = Vždy "
+"zobrazovat"
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Language panel position"
+msgstr "Umístění jazykového panelu"
+
+#: ../data/ibus.schemas.in.h:29
+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 ""
+"Umístění jazykového panelu. 0 = Levý horní roh, 1 = Pravý horní roh, 2 = "
+"Levý dolní roh, 3 = Pravý dolní roh, 4 = Vlastní"
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "Následovat vstupní kurzor v případě, že je panel vždy zobrazen"
+
+#: ../data/ibus.schemas.in.h:31
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+"Pokud je to pravda, panel následuje vstupní kurzor v případě, že je panel "
+"vždy zobrazen. Pokud to neplatí, je panel zobrazen na pevném místě."
+
+#: ../data/ibus.schemas.in.h:32
+msgid "The milliseconds to show property panel"
+msgstr "Počet milisekund pro zobrazení panelu vlastností"
+
+#: ../data/ibus.schemas.in.h:33
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+"Počet milisekund pro zobrazení panelu vlastností poté, co je změněno "
+"zaměření nebo vlastnosti."
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Orientation of lookup table"
+msgstr "Orientace vyhledávací tabulky"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientace vyhledávací tabulky. 0 = Horizontální, 1 = Vertikální"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Show input method name"
+msgstr "Zobrazit název vstupní metody"
+
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "Hodnota RGBA ikony XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+"Ikona XKB zobrazuje řetězec rozložení a řetězec je vykreslen hodnotou RGBA. "
+"Hodnota RGBA může být 1. jméno barvy z X11, 2. hexadecimální hodnota ve "
+"tvaru \"#rrggbb\" kde \"r\", \"g\" a \"b\" jsou hexadecimální číslice pro "
+"červenou, zelenou a modrou, 3. RGB barva ve formě \"rgb (r, g, b)\" nebo 4. "
+"RGBA barva ve formě \"rgba(r,g,b,a)\", kde \"r\", \"g\" a \"b\" jsou buď "
+"celá čísla v rozsahu od 0 do 255 nebo procentuální hodnoty v rozsahu od 0% "
+"do 100% a \"a\" je plovoucí bodová hodnota v rozsahu 0 až 1 z alfa."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Počet milisekund pro zobrazení ikony panelu pro vlastnost"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Počet milisekund pro zobrazení ikony panelu z ikony enginu na ikonu "
+"vlastnosti, kdykoli jsou enginy zapnuté, pokud je vlastnost určená hodnotou "
+"icon-prop-key v IBusEngineDesc. Pokud je hodnota 0, není žádná časová "
+"prodleva a ikona vlastnosti je zobrazena okamžitě."
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Use custom font"
+msgstr "Použít vlastní font"
+
+#: ../data/ibus.schemas.in.h:47
+msgid "Use custom font name for language panel"
+msgstr "Použít vlastní název fontu pro panel jazyku"
+
+#: ../data/ibus.schemas.in.h:48
+msgid "Custom font"
+msgstr "Vlastní font"
+
+#: ../data/ibus.schemas.in.h:49
+msgid "Custom font name for language panel"
+msgstr "Vlastní název fontu pro panel jazyku"
+
+#: ../data/ibus.schemas.in.h:50
+msgid "Embed Preedit Text"
+msgstr "Vložený přededitovaný text"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "Embed Preedit Text in Application Window"
+msgstr "Vložený přededitovaný text v okně aplikace"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Use global input method"
+msgstr "Použít globální vstupní metodu"
+
+#: ../data/ibus.schemas.in.h:54
+msgid "Enable input method by default"
+msgstr "Povolit metodu vstupu ve výchozím nastavení"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Povolit metodu vstupu ve výchozím nastavení, pokud aplikace dostane vstupní "
+"fokus"
+
+#: ../data/ibus.schemas.in.h:56
+msgid "DConf preserve name prefixes"
+msgstr "Zachovat jméno prefixu DConf "
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefix kláves DConf pro zastavení konverze jména"
+
+#: ../ibus/_config.py.in:41
+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."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+msgid "Other"
+msgstr "Ostatní"
+
+#: ../setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr " Jazyk: %s\n"
+
+#: ../setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Rozvržení klávesnice: %s\n"
+
+#: ../setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: ../setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Popis:\n"
+
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Vybrat metodu vstupu"
+
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Více…"
+
+#: ../setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Nastavit předvolby IBusu"
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Klávesové zkratky"
+
+#: ../setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Klávesa:"
+
+#: ../setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modifikátory:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Použít"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "O_dstranit"
+
+#: ../setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Stiskněte prosím klávesu (či kombinaci kláves).\n"
+"Dialog se zavře, až klávesy uvolníte."
+
+#: ../setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Stiskněte prosím klávesu (či kombinaci kláves)."
+
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:114 ../setup/main.py:439
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Použít klávesovou zkratku s posunem k přepnutí na předchozí vstupní metodu"
+
+#: ../setup/main.py:369
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Démon IBus neběží. Přejete si jej spustit?"
+
+#: ../setup/main.py:390
+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 byl spuštěn! Pokud nemůžete použít IBus, přidejte následující řádky do "
+"souboru $HOME/.bashrc. Poté se přihlaste na váš počítač.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: ../setup/main.py:404
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Démon IBus nemohl být spuštěn během %d sekund"
+
+#: ../setup/main.py:416
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Vybrat klávesovou zkratku pro %s"
+
+#. Translators: Title of the window
+#: ../setup/main.py:418
+msgid "switching input methods"
+msgstr "přepínání vstupní metody"
+
+#: ../tools/main.vala:48
+msgid "List engine name only"
+msgstr "Vypsat pouze název enginu"
+
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+msgid "Can't connect to IBus.\n"
+msgstr "Nelze se připojit k IBusu.\n"
+
+#: ../tools/main.vala:90
+#, c-format
+msgid "language: %s\n"
+msgstr "jazyk: %s\n"
+
+#: ../tools/main.vala:158
+msgid "No engine is set.\n"
+msgstr "Engine není nastaven.\n"
+
+#: ../tools/main.vala:166
+msgid "Set global engine failed.\n"
+msgstr "Nepodařilo se nastavit globální engine.\n"
+
+#: ../tools/main.vala:171
+msgid "Get global engine failed.\n"
+msgstr "Nepodařilo se získat globální engine.\n"
+
+#: ../tools/main.vala:210
+msgid "Read the system registry cache."
+msgstr "Číst mezipaměť systémového registru."
+
+#: ../tools/main.vala:212
+msgid "Read the registry cache FILE."
+msgstr "Číst mezipaměť souboru registru."
+
+#: ../tools/main.vala:230 ../tools/main.vala:235
+msgid "The registry cache is invalid.\n"
+msgstr "Neplatná mezipaměť registru.\n"
+
+#: ../tools/main.vala:250
+msgid "Write the system registry cache."
+msgstr "Zapsat mezipaměť systémového registru."
+
+#: ../tools/main.vala:252
+msgid "Write the registry cache FILE."
+msgstr "Zapsat mezipaměť souboru registru."
+
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr "Obnovení..."
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr "Hotovo"
+
+#: ../tools/main.vala:337
+msgid "Set or get engine"
+msgstr "Nastavit nebo získat engine"
+
+#: ../tools/main.vala:338
+msgid "Exit ibus-daemon"
+msgstr "Ukončit démona IBusu"
+
+#: ../tools/main.vala:339
+msgid "Show available engines"
+msgstr "Zobrazit dostupné enginy"
+
+#: ../tools/main.vala:340
+msgid "(Not implemented)"
+msgstr "(Není implementováno)"
+
+#: ../tools/main.vala:341
+msgid "Restart ibus-daemon"
+msgstr "Restartovat démona IBusu"
+
+#: ../tools/main.vala:342
+msgid "Show version"
+msgstr "Zobrazit verzi"
+
+#: ../tools/main.vala:343
+msgid "Show the content of registry cache"
+msgstr "Zobrazit obsah mezipaměti registru"
+
+#: ../tools/main.vala:344
+msgid "Create registry cache"
+msgstr "Vytvořit mezipaměti registru"
+
+#: ../tools/main.vala:345
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Vypsat adresu D-Bus démona IBusu"
+
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr "Zobrazit konfigurační hodnoty"
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr "Obnovit konfigurační hodnoty"
+
+#: ../tools/main.vala:348
+msgid "Show this information"
+msgstr "Zobrazit tuto informaci"
+
+#: ../tools/main.vala:354
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Použití: %s PŘÍKAZ [VOLBY...]\n"
+"\n"
+
+#: ../tools/main.vala:355
+msgid "Commands:\n"
+msgstr "Příkazy:\n"
+
+#: ../tools/main.vala:384
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s je neznámý příkaz!\n"
+
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr "Panel IBus"
+
+#: ../ui/gtk3/panel.vala:731
+msgid "IBus Update"
+msgstr "Aktualizace IBus"
+
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+msgid "Super+space is now the default hotkey."
+msgstr "Klávesa super+mezerník je nyní výchozí klávesovou zkratkou."
+
+#: ../ui/gtk3/panel.vala:1086
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus je inteligentní vstupní sběrnice pro Linux / Unix."
+
+#: ../ui/gtk3/panel.vala:1090
+msgid "translator-credits"
+msgstr "Kredit-překladatelům"
+
+#: ../ui/gtk3/panel.vala:1109
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: ../ui/gtk3/panel.vala:1119
+msgid "Restart"
+msgstr "Restartovat"
+
+#: ../ui/gtk3/panel.vala:1123
+msgid "Quit"
+msgstr "Ukončit"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+msgid "default:LTR"
+msgstr "implicitně:LTR"
diff --git a/po/de.po b/po/de.po
index 818c02d40..2d5b288ac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to German
 # German translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,19 +12,21 @@
 # Rainer <rgromans@redhat.com>, 2013
 # Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
+# FloH. <postfuerflo@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: Rainer <rgromans@redhat.com>\n"
-"Language-Team: German <trans-de@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-08-25 03:54-0400\n"
+"Last-Translator: FloH. <postfuerflo@gmail.com>\n"
+"Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -60,7 +62,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Automatisch ausblenden"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -72,7 +74,8 @@ msgstr "IBus-Einstellungen"
 
 #: ../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:"
@@ -80,7 +83,8 @@ msgstr "Nächste Eingabemethode:"
 
 #: ../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:"
@@ -90,7 +94,7 @@ msgstr "Vorherige Eingabemethode:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
@@ -120,7 +124,9 @@ msgstr "Ausrichtung der Kandidaten:"
 
 #: ../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 property panel:"
@@ -130,17 +136,19 @@ msgstr ""
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
 #: ../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"
@@ -163,13 +171,16 @@ msgid "General"
 msgstr "Allgemein"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Hinzufügen"
 
 #: ../setup/setup.ui.h:36
 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:37
 msgid "_Remove"
@@ -177,7 +188,9 @@ msgstr "_Entfernen"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -185,7 +198,9 @@ msgstr "_Hoch"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -193,7 +208,9 @@ msgstr "_Runter"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -219,15 +236,15 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
@@ -235,7 +252,7 @@ msgstr "System-Tastatur (XKB) Belegung verwenden"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
@@ -255,7 +272,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Der intelligente Eingabe-Bus</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Der intelligente Eingabe-Bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -265,184 +288,244 @@ msgstr "IBus bei der Anmeldung starten"
 msgid "<b>Startup</b>"
 msgstr "<b>Starten</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "Info"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Engines vorladen"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Engines vorladen, während IBus startet"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Engine-Reihenfolge"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Gespeicherte Engine-Reihenfolge in der Eingabemethoden-Liste"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Popup-Verzögerung für IME-Wechsel-Fenster in Millisekunden"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Verzögerung in Millisekunden. 0 &gt; Fenster nicht anzeigen und zur vorhergehenden/ nachfolgenden Engine wechseln."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Verzögerung in "
+"Millisekunden. 0 &gt; Fenster nicht anzeigen und zur vorhergehenden/ "
+"nachfolgenden Engine wechseln."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Gespeicherte Versions-Numnner"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Auslöser-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Tastenkombinationen auslösen für gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Tastenkürzel aktivieren"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Tastenkürzel deaktivieren"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Nächste Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Vorherige Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Automatisch verstecken"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Position des Sprach-Panels"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Name der Eingabemethode anzeigen"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:55
 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:45
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -450,36 +533,47 @@ msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturbelegung: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Beschreibung:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -491,210 +585,235 @@ msgstr "IBus-Einstellungen konfigurieren"
 msgid "Keyboard shortcuts"
 msgstr "Tastenkombinationen"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Tasten-Code:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Hilfstasten:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "An_wenden"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:114 ../setup/main.py:439
 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:329
+#: ../setup/main.py:369
 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:350
+#: ../setup/main.py:390
 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:364
+#: ../setup/main.py:404
 #, 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:376
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "Eingabemethoden wechseln"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:48
 msgid "List engine name only"
 msgstr "Nur Engine-Name auflisten"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
 msgstr "Keine Verbindung zu IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:158
 msgid "No engine is set.\n"
-msgstr "Keine Engine gesetzt.\n\n"
+msgstr "Keine Engine gesetzt.\n"
+"\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:166
 msgid "Set global engine failed.\n"
 msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:171
 msgid "Get global engine failed.\n"
 msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:210
 msgid "Read the system registry cache."
 msgstr "Lesen Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
 msgstr "Lesen Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
 msgstr "Der Registry-Cache ist ungültig.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:250
 msgid "Write the system registry cache."
 msgstr "Schreiben Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
 msgstr "Schreiben Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
 msgid "Set or get engine"
 msgstr "Setzen oder erhalten Modul"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
 msgstr "Beenden ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:339
 msgid "Show available engines"
 msgstr "Anzeigen verfügbare Module"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:340
 msgid "(Not implemented)"
 msgstr "(Nicht implementiert)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:341
 msgid "Restart ibus-daemon"
 msgstr "Neustart ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:342
 msgid "Show version"
 msgstr "Anzeigen Version"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:343
 msgid "Show the content of registry cache"
 msgstr "Anzeigen Inhalt des Registry-Cache."
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:344
 msgid "Create registry cache"
 msgstr "Erstellen Registry-Cache"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
 msgid "Show this information"
 msgstr "Anzeige dieser Information"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Anwendung: %s BEFEHL [OPTION...]\n"
 "\n"
-msgstr "Anwendung: %s BEFEHL [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:355
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:384
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "IBus Aktualisierung"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1086
 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:711
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "Fabian Affolter <fab@fedoraproject.org>, 2009.\nHedda Peters <hpeters@redhat.com>, 2009."
+msgstr ""
+"Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
+"Hedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Beenden"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/es.po b/po/es.po
index c5cbfb656..5cb3d21e3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Spanish
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,21 +13,24 @@
 # Gerardo Rosales <grosale86@gmail.com>, 2014
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
-# Gerardo Rosales <grosale86@gmail.com>, 2015. #zanata
+# Alberto Castillo <acastillogordon@gmail.com>, 2016. #zanata
+# Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2016. #zanata
+# Omar Berroterán S. <omarberroteranlkf@gmail.com>, 2016. #zanata
+# Waldo Luis Ribeiro <waldoribeiro@sapo.pt>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-02-20 17:16+0900\n"
-"PO-Revision-Date: 2015-03-03 12:12-0500\n"
-"Last-Translator: Gerardo Rosales <grosale86@gmail.com>\n"
-"Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-09-04 04:29-0400\n"
+"Last-Translator: Omar Berroterán S. <omarberroteranlkf@gmail.com>\n"
+"Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.9.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -93,7 +96,7 @@ msgstr "Método de entrada anterior:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
-msgstr "…"
+msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
@@ -117,11 +120,11 @@ msgstr "<b>Atajos de teclado</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Poner la orientación de la tabla de búsqueda de candidatos"
+msgstr "Establecer la orientación de los candidatos en la tabla de búsqueda"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
-msgstr "Orientaciones candidato:"
+msgstr "Orientación de los candidatos:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
@@ -139,7 +142,7 @@ msgstr "Posición del panel de idioma:"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
-msgstr "Mostrar un ícono en el área de notificación"
+msgstr "Mostrar un ícono en la bandeja del sistema"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
@@ -174,7 +177,7 @@ msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Añadir"
@@ -225,7 +228,7 @@ msgstr "Mostrar información sobre el método de entrada seleccionado"
 
 #: ../setup/setup.ui.h:45
 msgid "_Preferences"
-msgstr "Prefere_ncias"
+msgstr "_Preferencias"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
@@ -242,23 +245,23 @@ msgstr ""
 "panel.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
-msgstr "Usar el diseño del teclado del sistema"
+msgstr "Usar la distribución del teclado del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
-msgstr "Usar el diseño del teclado del sistema (XKB)"
+msgstr "Usar la distribución del teclado del sistema (XKB)"
 
 #: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Diseño del Teclado</b>"
+msgstr "<b>Distribución del teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
@@ -294,12 +297,12 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35
-#: ../ui/gtk3/panel.vala:1053
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "Acerca de"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -387,11 +390,11 @@ msgstr "Los atajos de teclado para habilitar el método de entrada"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
-msgstr "Inhabilitar atajos de teclado"
+msgstr "Deshabilitar atajos de teclado"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr "Los atajos de teclado para  inhabilitar el método de entrada"
+msgstr "Los atajos de teclado para deshabilitar el método de entrada"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
@@ -434,9 +437,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 ""
-"La posicion el panel de idioma. 0 = esquina superior izquierda, 1 = esquina "
+"La posición del panel de idioma. 0 = esquina superior izquierda, 1 = esquina "
 "superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior "
-"derecha, 4 = personalizado"
+"derecha, 4 = personalizada"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -497,49 +500,66 @@ msgstr ""
 "255 o valores de porcentaje en el rango de 0% a 100%, y  'a' es un valor de "
 "punto flotante en el rango de 0 a 1 para el alfa."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Los milisegundos para mostrar el icono del panel para una propiedad"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Los milisegundos para mostrar el icono del panel desde el icono del motor a "
+"un icono de la propiedad cada vez que los motores se encienden si la "
+"propiedad se especifica por el valor de icono-prop-clave en IBusEngineDesc. "
+"Si el valor es 0, no hay tiempo de retardo y el icono de la propiedad se "
+"muestra inmediatamente."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
-msgstr "Usar nombre de fuente personalizada para el panel de idioma"
+msgstr "Usar nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
-msgstr "Habilitar método de entrada en forma predeterminada"
+msgstr "Habilitar método de entrada por defecto"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 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"
+"Habilitar método de entrada por defecto cuando la aplicación consigue el "
+"foco de entrada"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -547,46 +567,47 @@ msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007–2010 Peng Huang\n"
-"Copyright © 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Otro"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "Diseño del teclado: %s\n"
+msgstr "Distribución del teclado: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Descripción:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:337
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../setup/enginedialog.py:204
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "Más..."
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -594,7 +615,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "Defina las preferencias de IBus"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
@@ -628,19 +649,19 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 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:368
+#: ../setup/main.py:369
 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:389
+#: ../setup/main.py:390
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -655,20 +676,20 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:403
+#: ../setup/main.py:404
 #, 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:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
-msgstr "Cambiando métodos de entrada"
+msgstr "cambiando métodos de entrada"
 
 #: ../tools/main.vala:48
 msgid "List engine name only"
@@ -787,40 +808,40 @@ msgstr "Comandos:\n"
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:225 ../ui/gtk3/panel.vala:256
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:712
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:713 ../ui/gtk3/panel.vala:724
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:1026
+#: ../ui/gtk3/panel.vala:1086
 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:1030
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
+msgstr "Créditos de Traducción"
 
-#: ../ui/gtk3/panel.vala:1049
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1059
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1063
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/fr.po b/po/fr.po
index 163dd1003..bce7c70f6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,14 +1,17 @@
-# translation of ibus.pot to French
 # French translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
-# Sam Friedmann <sam.friedmann@redhat.com>, 2010
-# Jérôme Fenal <jfenal@gmail.com>, 2012-2013
 # dominique bribanick <chepioq@gmail.com>, 2011,2014
+# Jérôme Fenal <jfenal@gmail.com>, 2012-2013
+# Julien Humbert <julroy67@gmail.com>, 2009-2014
+# Sam Friedmann <sam.friedmann@redhat.com>, 2010
 # Julien Humbert <julroy67@gmail.com>, 2009-2015
+# Jibec <jean-baptiste@holcroft.fr>, 2016. #zanata
+# José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
@@ -17,12 +20,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-07-10 09:29-0400\n"
-"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"PO-Revision-Date: 2016-08-30 01:49-0400\n"
+"Last-Translator: Jibec <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -92,9 +95,7 @@ msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 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 "Raccourcis claviers pour activer ou désactiver les méthodes d'entrées"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -122,15 +123,15 @@ msgstr "Orientation de la liste des candidats :"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Permet de choisir l'affichage de la barre de langue d'ibus"
+msgstr "Permet de choisir l'affichage de la barre de langues d'ibus"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr "Afficher le panneau de propriété :"
+msgstr "Afficher le panneau de propriétés :"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
-msgstr "Afficher la barre de langue :"
+msgstr "Afficher la barre de langues :"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
@@ -138,7 +139,7 @@ msgstr "Afficher l'icône dans la boîte à miniatures"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
-msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
+msgstr "Afficher le nom de la méthode d'entrée sur la barre de langues"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
@@ -386,7 +387,7 @@ msgstr "Désactiver les raccourcis clavier"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr "Les raccourcis clavier pour la méthode d'entrée sont désactivés"
+msgstr "Les raccourcis clavier pour désactiver  la méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
@@ -414,12 +415,12 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"Comportement du panneau de propriété. 0 = Ne pas afficher, 1 = Cacher "
+"Comportement du panneau de propriétés. 0 = Ne pas afficher, 1 = Cacher "
 "automatiquement, 2 = Toujours afficher"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
-msgstr "Position de la barre"
+msgstr "Position de la barre de langues"
 
 #: ../data/ibus.schemas.in.h:29
 msgid ""
@@ -444,15 +445,15 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr "Millisecondes pour afficher le panneau de propriété"
+msgstr "Temps en millisecondes pour afficher le panneau de propriétés"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
-"Millisecondes pour afficher le panneau de propriété après prise du focus ou "
-"changement des propriétés."
+"Temps en millisecondes pour afficher le panneau de propriétés après prise du "
+"focus ou changement des propriétés."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -481,19 +482,20 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
-"L'icône XKB affiche la chaîne de caractère de la disposition et cette chaîne "
-"de caractère est affichée par sa valeur RGBA. Cette valeur RGBA peut être 1. "
-"le nom d'une couleur X11, 2. une valeur héxadécimale sous la forme '#rrggbb' "
-"où 'r', 'g', et 'b' sont des chiffres héxadécimaux correspondant "
-"respectivement au rouge, vert et bleu, 3. une couleur RGB sous la forme "
-"'rgb(r,g,b)' ou 4. une couleur RGBA sous la forme 'rgba(r,g,b,a)' où 'r', "
-"'g' et 'b' sont soit des entiers compris entre 0 et 255, soit un pourcentage "
-"compris entre 0 et 100 %, et 'a', la valeur alpha, étant un nombre à virgule "
-"flottante compris entre 0 et 1."
+"L'icône XKB affiche la chaîne de caractères de la disposition et cette "
+"chaîne de caractères est affichée avec sa valeur RGBA. Cette valeur RGBA "
+"peut être 1. le nom d'une couleur X11, 2. une valeur hexadécimale sous la "
+"forme '#rrggbb' où 'r', 'g', et 'b' sont des chiffres hexadécimaux "
+"correspondant respectivement au rouge, vert et bleu, 3. une couleur RGB sous "
+"la forme 'rgb(r,g,b)' ou 4. une couleur RGBA sous la forme 'rgba(r,g,b,a)' "
+"où 'r', 'g' et 'b' sont soit des entiers compris entre 0 et 255, soit un "
+"pourcentage compris entre 0 et 100 %, et 'a', la valeur alpha, est un nombre "
+"à virgule flottante compris entre 0 et 1."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
+"Temps en millisecondes pour afficher l'icône de panneau d'une propriété"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -502,6 +504,10 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"Millisecondes d’affichage de l’icône du panneau d’une propriété lorsqu’un "
+"moteur est chargé si la propriété est renseignée par a valeur de icon-prop-"
+"key dans IBusEngineDesc. Si la valeur est 0, sans délai et l’icône de "
+"propriété est montrée immédiatement."
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
@@ -509,7 +515,7 @@ msgstr "Utiliser une police personnalisée :"
 
 #: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
-msgstr "Utiliser une police personnalisée pour la barre de langue"
+msgstr "Utiliser une police personnalisée pour la barre de langues"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
@@ -517,7 +523,7 @@ msgstr "Police personnalisée"
 
 #: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
-msgstr "Police personnalisée pour le panneau de langue"
+msgstr "Police personnalisée pour la barre de langues"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
@@ -591,7 +597,7 @@ msgstr "A_nnuler"
 
 #: ../setup/enginedialog.py:205
 msgid "More…"
-msgstr ""
+msgstr "Plus..."
 
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
@@ -672,12 +678,12 @@ msgstr "Le démon IBus n'a pas pu être démarré en %d secondes"
 #: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "Raccourci clavier pour %s"
+msgstr "Sélection du raccourci clavier pour %s"
 
 #. Translators: Title of the window
 #: ../setup/main.py:418
 msgid "switching input methods"
-msgstr "Changer de méthodes d'entrée"
+msgstr "Changement de méthode d'entrée"
 
 #: ../tools/main.vala:48
 msgid "List engine name only"
@@ -685,7 +691,7 @@ msgstr "Ne lister que les noms des moteurs"
 
 #: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
-msgstr "Connexion impossible à IBus.\n"
+msgstr "Connexion à IBus impossible.\n"
 
 #: ../tools/main.vala:90
 #, c-format
@@ -798,7 +804,7 @@ msgstr "%s n'est pas une commande connue !\n"
 
 #: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
-msgstr ""
+msgstr "Panneau IBUS"
 
 #: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
diff --git a/po/mn.po b/po/mn.po
new file mode 100644
index 000000000..7acdd0521
--- /dev/null
+++ b/po/mn.po
@@ -0,0 +1,764 @@
+# Mongolian translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# bayanmunkh <sageson.m@gmail.com>, 2016. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-01-29 12:31-0500\n"
+"Last-Translator: bayanmunkh <sageson.m@gmail.com>\n"
+"Language-Team: Mongolian\n"
+"Language: mn\n"
+"X-Generator: Zanata 3.9.3\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 "Do not show"
+msgstr "Битгий харуул"
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+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:16
+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 "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Гарын товчлолууд</b>"
+
+#: ../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 "Хэлний цэсийг нуух болон харуулах эсэхийг тохируулах"
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr "Шинжүүдийн самбарыг харах:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Хэлний самбарын байрлал:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+msgid "Show icon on system tray"
+msgstr "Системийн хавтан дахь харах тэмдэг"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+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 "<b>Font and Style</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Ерөнхий"
+
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
+msgid "_Add"
+msgstr "_Нэмэх"
+
+#: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Арилгах"
+
+#: ../setup/setup.ui.h:38
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr ""
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr ""
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr ""
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:47
+msgid ""
+"<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>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+msgid "Input Method"
+msgstr ""
+
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:62
+msgid "Start ibus on login"
+msgstr ""
+
+#: ../setup/setup.ui.h:63
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
+msgid "About"
+msgstr ""
+
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+msgid "_Close"
+msgstr ""
+
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Engines order"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:6
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Saved version number"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h: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 ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:23
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Auto hide"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:29
+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 ""
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:33
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:47
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:48
+msgid "Custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:49
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:50
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+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 ""
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+msgid "Other"
+msgstr ""
+
+#: ../setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:81
+msgid "Description:\n"
+msgstr ""
+
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr ""
+
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr ""
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr ""
+
+#. apply button
+#: ../setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr ""
+
+#. delete button
+#: ../setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
+msgid "_OK"
+msgstr ""
+
+#: ../setup/main.py:114 ../setup/main.py:439
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:369
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: ../setup/main.py:390
+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:404
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:416
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: ../setup/main.py:418
+msgid "switching input methods"
+msgstr ""
+
+#: ../tools/main.vala:48
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:90
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:158
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:166
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:171
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:210
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:212
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:230 ../tools/main.vala:235
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:250
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:252
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:304
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:318
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:337
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:338
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:339
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:340
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:341
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:342
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:343
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:344
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:345
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:346
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:347
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:348
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:354
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:355
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:384
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:731
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1086
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1090
+msgid "translator-credits"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1109
+msgid "Preferences"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1119
+msgid "Restart"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1123
+msgid "Quit"
+msgstr ""
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+msgid "default:LTR"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index af39bb2d3..a0368512d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,11 +1,12 @@
-# translation of pl.po to Polish
 # Polish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
 # Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
@@ -14,13 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-07-13 01:25-0400\n"
+"PO-Revision-Date: 2016-08-31 10:43-0400\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Zanata 3.9.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -86,7 +87,7 @@ msgstr "Poprzednia metoda wprowadzania:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
-msgstr "..."
+msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
@@ -110,7 +111,7 @@ msgstr "<b>Skróty klawiszowe</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
+msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
@@ -130,34 +131,34 @@ msgstr "Pozycja panelu języków:"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
-msgstr "Wyświetlanie ikony w obszarze powiadamiania"
+msgstr "Ikona w obszarze powiadamiania"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
-msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
+msgstr "Nazwa metody wprowadzania na panelu języków"
 
 #: ../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"
+"Nazwa metody wprowadzania na panelu języków podczas zaznaczania pola wyboru"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania"
 
 #: ../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"
+"Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania w oknie "
+"aplikacji"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "Użycie własnej czcionki:"
+msgstr "Własna czcionka:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
-msgstr "<b>Czcionka i styl</b>"
+msgstr "<b>Czcionka i styl</b>"
 
 #: ../setup/setup.ui.h:34
 msgid "General"
@@ -185,31 +186,31 @@ msgstr ""
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
-msgstr "W _górę"
+msgstr "W _górę"
 
 #: ../setup/setup.ui.h:40
 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 "
+"Przeniesienie w górę zaznaczonej metody wprowadzania we włączonych metodach "
 "wprowadzania"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
-msgstr "W _dół"
+msgstr "W _dół"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
-"Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach "
+"Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach "
 "wprowadzania"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
-msgstr "_O programie"
+msgstr "_O programie"
 
 #: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
-msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
+msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
 
 #: ../setup/setup.ui.h:45
 msgid "_Preferences"
@@ -225,7 +226,7 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>Aktywna metoda wprowadzania może być przełączana z wybranych metod "
+"<small><i>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.</i></small>"
 
@@ -285,7 +286,7 @@ msgstr "<b>Uruchomienie</b>"
 #: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
 #: ../ui/gtk3/panel.vala:1113
 msgid "About"
-msgstr "O programie"
+msgstr "O programie"
 
 #: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
@@ -311,7 +312,7 @@ msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
+msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
@@ -319,9 +320,9 @@ msgid ""
 " 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
 "show the window and switch prev/next engines."
 msgstr ""
-"Ustawia opóźnienie wyświetlenia okna przełącznika IME w milisekundach. "
+"Ustawia opóźnienie wyświetlenia okna przełącznika IME w milisekundach. "
 "Domyślnie wynosi 400. 0 = natychmiastowe wyświetlanie okna. 0 &lt; "
-"milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na "
+"milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na "
 "następny/poprzedni mechanizm."
 
 #: ../data/ibus.schemas.in.h:9
@@ -334,15 +335,16 @@ msgid ""
 "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."
+"poprzednio zainstalowanego IBus a obecnego."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr "Układy łacińskie nie posiadające ASCII"
+msgstr "Układy łacińskie nieposiadające ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "Układ US jest dołączany do układów łacińskich. Można pominąć variant."
+msgstr ""
+"Układ US jest dołączany do układów łacińskich. Można pominąć „variant”."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -361,7 +363,7 @@ msgstr "Klawisze skrótów przełącznika"
 
 #: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Klawisz skrótu dla gtk_accelerator_parse"
+msgstr "Klawisz skrótu dla „gtk_accelerator_parse”"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
@@ -431,9 +433,9 @@ msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"Jeśli jest ustawione na \"true\", to panel podążą za kursorem wprowadzania, "
-"kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na \"false\", to "
-"panel jest wyświetlany w stałym położeniu."
+"Jeśli jest ustawione na wartość „true”, to panel podążą za kursorem "
+"wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na "
+"wartość „false”, to panel jest wyświetlany w stałym położeniu."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -475,13 +477,13 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości "
-"RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość "
-"szesnastkową w formie \"#rrggbb\", gdzie \"r\", \"g\" i \"b\" są cyframi "
-"szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB w "
-"formie \"rgb(r,g,b)\" lub 4. kolor RGBA w formie \"rgba(r,g,b,a)\", gdzie "
-"\"r\", \"g\" i \"b\" są liczbami całkowitymi w zakresie od 0 do 255 lub "
-"wartościami procentowymi w zakresie od 0% do 100%, a \"a\" jest wartością "
-"zmiennoprzecinkową w zakresie od 0 do 1 alfy."
+"RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość "
+"szesnastkową w formie „#rrggbb”, gdzie „r”, „g” i „b” są cyframi "
+"szesnastkowymi koloru czerwonego, zielonego i niebieskiego, 3. kolor RGB "
+"w formie „rgb(r,g,b)” lub 4. kolor RGBA w formie „rgba(r,g,b,a)”, gdzie „r”, "
+"„g” i „b” są liczbami całkowitymi w zakresie od 0 do 255 lub wartościami "
+"procentowymi w zakresie od 0% do 100%, a „a” jest wartością "
+"zmiennoprzecinkową w zakresie od 0 do 1 alfy."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
@@ -494,10 +496,10 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"Milisekundy do wyświetlenia ikony panelu z ikony mechanizmu do ikony "
+"Milisekundy do wyświetlenia ikony panelu z ikony mechanizmu do ikony "
 "właściwości, kiedy mechanizmy są przełączane, jeśli właściwość została "
-"podana za pomocą wartości \"icon-prop-key\" w IBusEngineDesc. Jeśli wartość "
-"wynosi 0, to nie będzie żadnego opóźnienia i ikona zostanie wyświetlona od "
+"podana za pomocą wartości „icon-prop-key” w IBusEngineDesc. Jeśli wartość "
+"wynosi 0, to nie będzie żadnego opóźnienia i ikona zostanie wyświetlona od "
 "razu."
 
 #: ../data/ibus.schemas.in.h:46
@@ -506,7 +508,7 @@ msgstr "Użycie własnej czcionki"
 
 #: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
-msgstr "Nazwa własnej czcionki użytej w panelu języków"
+msgstr "Nazwa własnej czcionki użytej w panelu języków"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
@@ -522,7 +524,7 @@ msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
@@ -550,9 +552,8 @@ msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 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 © 2007-2010 Peng Huang\n"
+"Copyright © 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
@@ -639,7 +640,7 @@ msgstr "_OK"
 #: ../setup/main.py:114 ../setup/main.py:439
 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 "
+"Użycie skrótu z klawiszem Shift do przełączania do poprzedniej metody "
 "wprowadzania"
 
 #: ../setup/main.py:369
@@ -655,7 +656,7 @@ msgid ""
 "  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"
+"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"
@@ -664,7 +665,7 @@ msgstr ""
 #: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "Nie można uruchomić usługi IBus od %d sekund"
+msgstr "Nie można uruchomić usługi IBus od %d s"
 
 #: ../setup/main.py:416
 #, python-format
@@ -682,7 +683,7 @@ msgstr "Wyświetla tylko nazwę mechanizmu"
 
 #: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
 msgid "Can't connect to IBus.\n"
-msgstr "Nie można połączyć z IBus.\n"
+msgstr "Nie można połączyć z IBus.\n"
 
 #: ../tools/main.vala:90
 #, c-format
@@ -781,7 +782,7 @@ msgstr "Wyświetla tę informację"
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Użycie: %s POLECENIE [OPCJA...]\n"
+msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
 #: ../tools/main.vala:355
@@ -812,7 +813,7 @@ msgstr ""
 
 #: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2014"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2016"
 
 #: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 15deb6413..299b26197 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Portuguese (Brazil)
 # Portuguese (Brazil) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,19 +9,21 @@
 # Glaucia Freitas <gcintra@redhat.com>, 2013
 # jonataszv <jonatas.zv@openmailbox.org>, 2014
 # Taylon Silmer <taylon@taylon.eti.br>, 2011
+# Daniel Lara <danniel@fedoraproject.org>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-08 12:15+0900\n"
-"PO-Revision-Date: 2014-07-08 03:29+0000\n"
-"Last-Translator: jonataszv <jonatas.zv@openmailbox.org>\n"
-"Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
+"PO-Revision-Date: 2016-09-06 09:16-0400\n"
+"Last-Translator: Emerson Santos <em3rson@linuxmail.org>\n"
+"Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
+"Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Zanata 3.9.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -33,19 +35,19 @@ msgstr "Vertical"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
-msgstr "Canto esquerdo superior"
+msgstr "Canto superior esquerdo"
 
 #: ../setup/setup.ui.h:4
 msgid "Top right corner"
-msgstr "Canto direito superior"
+msgstr "Canto superior direito"
 
 #: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
-msgstr "Canto esquerdo inferior"
+msgstr "Canto inferior esquerdo"
 
 #: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
-msgstr "Canto direito superior"
+msgstr "Canto inferior direito"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
@@ -69,7 +71,8 @@ msgstr "Preferências do IBus"
 
 #: ../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:"
@@ -77,7 +80,8 @@ msgstr "Próximo método de entrada:"
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Teclas de atalho para alteração ao método de entrada anterior da lista"
+msgstr ""
+"Teclas de atalho para alteração ao método de entrada anterior da lista"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
@@ -117,7 +121,9 @@ msgstr "Orientação dos candidatos:"
 
 #: ../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 property panel:"
@@ -137,7 +143,9 @@ msgstr "Apresenta o nome do método de entrada na barra de linguagem"
 
 #: ../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"
@@ -145,7 +153,8 @@ msgstr "Embutir texto de pré-edição na janela do aplicativo "
 
 #: ../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,13 +169,15 @@ msgid "General"
 msgstr "Geral"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Adicionar"
 
 #: ../setup/setup.ui.h:36
 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:37
 msgid "_Remove"
@@ -174,7 +185,9 @@ msgstr "_Remover"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -182,7 +195,9 @@ msgstr "A_cima"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -190,7 +205,9 @@ msgstr "A_baixo"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -214,17 +231,20 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>O método de entrada ativo pode ser alternado com os selecionados "
+"na lista acima pressionando as teclas de atalho do teclado ou clicando no "
+"ícone do painel.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
@@ -232,7 +252,7 @@ msgstr "Usa o desenho do teclado do sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
@@ -252,7 +272,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -262,11 +288,12 @@ msgstr "Inicie o ibus na conexão "
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "Sobre"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -294,10 +321,13 @@ msgstr "Popup atrasou milisegundos para a janela de alterador IME"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Atrasa milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Atrasa "
+"milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -308,23 +338,28 @@ 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 ""
+"O número da versão armazenada será utilizado para checar a diferença entre a "
+"versão do ibus instalado anteriormente e o da versão atual do ibus."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "Leiautes latinos nos quais não contém ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
+"Leiaute US é anexado aos leiautes latinos. variantes podem ser omitidas."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "Usar xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"Executar xmodmap se .xmodmap ou .Xmodmap existir quando os motorres do ibus "
+"forem trocados."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -356,7 +391,8 @@ msgstr "Próximo mecanismo de teclas de atalho"
 
 #: ../data/ibus.schemas.in.h:23
 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:24
 msgid "Prev engine shortcut keys"
@@ -374,7 +410,9 @@ msgstr "Ocultar Automaticamente"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "Comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar automaticamente,  2 = Sempre mostrar"
+msgstr ""
+"Comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar "
+"automaticamente,  2 = Sempre mostrar"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,27 +422,34 @@ msgstr "Posição do Painel de Linguagem"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Siga o cursor de entrada no caso do painel estar sendo sempre exibido"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Se verdadeiro, o painel seguirá o cursor de entrada no caso do painel estar "
+"sendo sempre exibido. Se falso, o painel é exibido em uma localização fixa."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Os milissegundos para exibir as propriedades do painel"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Os milissegundos para exibir as propriedades do painel após obter foco ou as "
+"propriedades foram alteradas."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -420,7 +465,7 @@ msgstr "Apresenta o nome do método de entrada"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "Valor RGBA de um ícone XKB"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -433,48 +478,75 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"O ícone XKB exibe a cadeia de caracteres de leiaute e a cadeira de "
+"caracteres é apresentada pelo valor RGBA. O valor RGBA pode ser 1. um nome "
+"de cor do X11, 2. um valor hexa no formato '#rrggbb' aonde 'r', 'g' e 'b' "
+"são dígitos hexa para o red (vermelho), green (verde), e blue (azul), 3. uma "
+"cor RGB no formato 'rgb(r,g,b)' ou 4. Uma cor RGBA no formato "
+"'rgba(r,g,b,a)' aonde 'r', 'g', e 'b' são ou inteiros entre 0 e 255 ou "
+"valores em porcentagem entre 0% e 100%, e 'a' é um valor em ponto flutuante "
+"entre 0 e 1 do alfa."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Os milissegundos para exibir o ícone do painel para uma propriedade"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Os milissegundos para exibir o ícone do painel através do ícone do motor "
+"para um ícone de propriedade sempre que motores são alternados se a "
+"propriedade está especificada pelo valor de icon-prop-key em IBusEngineDesc. "
+"Se o valor é 0, não há tempo de espera e o ícone da propriedade será exibido "
+"imediatamente."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Usa o nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Fonte padrão"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Nome da fonte padrão para o painel de linguagem"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 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:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -482,36 +554,47 @@ msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Outros"
 
-#: ../setup/engineabout.py:68
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Linguagem: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Desenho do teclado: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Descrição:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Selecione um método de entrada"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mais…"
+
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -523,71 +606,78 @@ msgstr "Definir Preferências do IBus"
 msgid "Keyboard shortcuts"
 msgstr "Atalhos do teclado"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Código de tecla:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Aplicar"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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 teclas).\n"
+"O diálogo será encerrado quando a tecla for liberada."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)"
+msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:375
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:376
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/main.py:102 ../setup/main.py:398
+#: ../setup/main.py:114 ../setup/main.py:439
 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:330
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:351
+#: ../setup/main.py:390
 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:365
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:377
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:379
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "mudando métodos de entrada"
 
@@ -618,43 +708,43 @@ msgstr "Obter motor global falhour.\n"
 
 #: ../tools/main.vala:210
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Ler o cache do registro do sistema."
 
 #: ../tools/main.vala:212
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Ler o ARQUIVO de cache do registro."
 
 #: ../tools/main.vala:230 ../tools/main.vala:235
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "O cache do registro é inválido.\n"
 
 #: ../tools/main.vala:250
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Escrever o cache de registro do sistema."
 
 #: ../tools/main.vala:252
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Escrever o ARQUIVO de cache do registro."
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr ""
+msgstr "Redefinindo…"
 
 #: ../tools/main.vala:318
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
-msgstr ""
+msgstr "Definir ou obter motor"
 
 #: ../tools/main.vala:338
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Sair do ibus-daemon"
 
 #: ../tools/main.vala:339
 msgid "Show available engines"
-msgstr ""
+msgstr "Exibir motores disponíveis"
 
 #: ../tools/main.vala:340
 msgid "(Not implemented)"
@@ -674,19 +764,19 @@ msgstr "Mostrar conteúdo de cachê do registro"
 
 #: ../tools/main.vala:344
 msgid "Create registry cache"
-msgstr ""
+msgstr "Criar registro de cache"
 
 #: ../tools/main.vala:345
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Imprimir o endereço D-Bus do ibus-daemon"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Mostrar valores de configuração"
 
 #: ../tools/main.vala:347
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Redefinir os valores de configuração"
 
 #: ../tools/main.vala:348
 msgid "Show this information"
@@ -694,10 +784,10 @@ msgstr "Mostrar essa informação"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Uso: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Uso: %s COMMAND [OPTION...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -708,36 +798,40 @@ msgstr "Comandos:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr "Painel IBus"
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
-msgstr ""
+msgstr "Atualização IBus"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Super + espaço agora são as teclas de atalho padrão."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "Sair"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:366
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
-msgstr "default:LTR"
+msgstr "padrão:LTR"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1dc2b26e8..2b134bcdd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,27 +1,29 @@
-# translation of ibus.pot to Traditional Chinese (Hong Kong)
-# Traditional Chinese (Hong Kong) translation for ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Traditional Chinese (Hong Kong) translation of ibus.
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010
 # Peng Huang <shawn.p.huang@gmail.com>, 2008
+# Terry Chuang <tchuang@redhat.com>, 2010
 # Terry Chuang <tchuang@redhat.com>, 2014
 # tomoe_musashi <hkg.musashi@gmail.com>, 2015
+# tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-11-09 13:46+0900\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-11-09 12:50-0500\n"
-"Last-Translator: tomoe_musashi <hkg.musashi@gmail.com>\n"
+"PO-Revision-Date: 2016-03-10 11:57-0500\n"
+"Last-Translator: tomoe musashi <hkg.musashi@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
 "Language: zh-HK\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -224,15 +226,15 @@ msgstr "輸入法"
 
 #: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
-msgstr "使用系統鍵盤配置"
+msgstr "使用系統鍵盤佈局"
 
 #: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
-msgstr "使用系統鍵盤 (XKB) 配置"
+msgstr "使用系統鍵盤 (XKB) 佈局"
 
 #: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>鍵盤配置</b>"
+msgstr "<b>鍵盤佈局</b>"
 
 #: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
@@ -322,20 +324,20 @@ msgstr "儲存的版本號碼可以用來查看上次安裝的 ibus 版本與目
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "無 ASCII 的拉丁鍵盤佈局"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr ""
+msgstr "US 鍵盤佈局附加到拉丁鍵盤佈局。variant 可被省略。"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "使用 xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
+msgstr "當 ibus 引擎切換時，若 .xmodmap 或 .Xmodmap 存在，則執行 xmodmap。 "
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -431,7 +433,7 @@ msgstr "顯示輸入法名稱"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "XKB 圖示的 RGBA 值"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -444,6 +446,10 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"XKB 圖示會顯示鍵盤佈局的字串，而且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2."
+"「#rrggbb」格式的十六進制值，其中 r、g、b 分別是紅色、綠色和藍色，3. 「rgb(r,g,b,)」格式的 RGB 顏色，4."
+"「rgba(r,g,b,a)」格式的 RGBA 顏色，其中 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a "
+"則是 0 至 1 之間的浮點 alpha 值。"
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
@@ -520,7 +526,7 @@ msgstr "語言：%s\n"
 #: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "鍵盤配置: %s\n"
+msgstr "鍵盤佈局：%s\n"
 
 #: ../setup/engineabout.py:78
 #, python-format
@@ -542,7 +548,7 @@ msgstr "取消(_C)"
 
 #: ../setup/enginedialog.py:205
 msgid "More…"
-msgstr ""
+msgstr "更多…"
 
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
@@ -673,11 +679,11 @@ msgstr "寫入註冊快取 FILE。"
 
 #: ../tools/main.vala:304
 msgid "Resetting…"
-msgstr ""
+msgstr "重設中…"
 
 #: ../tools/main.vala:318
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #: ../tools/main.vala:337
 msgid "Set or get engine"
@@ -717,11 +723,11 @@ msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
 #: ../tools/main.vala:346
 msgid "Show the configuration values"
-msgstr ""
+msgstr "顯示組態值"
 
 #: ../tools/main.vala:347
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "重設組態值"
 
 #: ../tools/main.vala:348
 msgid "Show this information"
@@ -745,7 +751,7 @@ msgstr "%s 為未知指令！\n"
 
 #: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
 msgid "IBus Panel"
-msgstr ""
+msgstr "IBus 面板"
 
 #: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0e100f4ed..011643c18 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Traditional Chinese
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,21 @@
 # Ding-Yi Chen <dchen@redhat.com>, 2009
 # Ding-Yi Chen <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
+# tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-10-10 06:56+0000\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2015-07-13 19:48+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2016-02-18 05:44-0500\n"
+"Last-Translator: tomoe musashi <hkg.musashi@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
+"Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -159,8 +161,8 @@ msgid "General"
 msgstr "通用"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -213,18 +215,19 @@ msgid ""
 "<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>"
-msgstr "<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
+msgstr ""
+"<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
@@ -232,7 +235,7 @@ msgstr "使用系統鍵盤 (XKB) 配置"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
@@ -252,7 +255,13 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>iBus</b></big>\n<small>智慧型輸入框架</small>\n首頁: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>iBus</b></big>\n"
+"<small>智慧型輸入框架</small>\n"
+"首頁: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -262,11 +271,12 @@ msgstr "在登入時啟動 iBus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
+#: ../ui/gtk3/panel.vala:1113
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -294,10 +304,12 @@ msgstr "IME 切換器視窗彈出延遲的毫秒數"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接往前/往後切換引擎。"
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接往前/"
+"往後切換引擎。"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -432,49 +444,65 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2.「#rrggbb」格式的十六進位值，其中 r、g、b 分別是紅色、綠色與藍色，3. 「rgb(r,g,b)」格式的 RGB 色彩，4.「rgba(r,g,b,a)」格式的 RGBA 採，其中的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a 則是 0 至 1 之間的浮點 alpha 值。"
+msgstr ""
+"XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2."
+"「#rrggbb」格式的十六進位值，其中 r、g、b 分別是紅色、綠色與藍色，3. 「rgb(r,g,b)」格式的 RGB 色彩，4."
+"「rgba(r,g,b,a)」格式的 RGBA 採，其中的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a "
+"則是 0 至 1 之間的浮點 alpha 值。"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -482,45 +510,46 @@ msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "其他"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "鍵盤配置: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "作者：%s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "描述：\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "選取輸入法"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
+#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
+#: ../setup/main.py:414
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../setup/enginedialog.py:203
+#: ../setup/enginedialog.py:205
 msgid "More…"
 msgstr "其他…"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "鍵盤"
 
@@ -528,7 +557,7 @@ msgstr "鍵盤"
 msgid "Set IBus Preferences"
 msgstr "設置 iBus 偏好設定"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "鍵盤快捷鍵"
 
@@ -541,58 +570,64 @@ msgid "Modifiers:"
 msgstr "修飾鍵："
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "套用(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:114 ../setup/main.py:439
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:369
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:390
 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:403
+#: ../setup/main.py:404
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:416
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:418
 msgid "switching input methods"
 msgstr "切換輸入法"
 
@@ -699,10 +734,10 @@ msgstr "顯示此資訊"
 
 #: ../tools/main.vala:354
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
-msgstr "用法：%s COMMAND [OPTION...]\n\n"
 
 #: ../tools/main.vala:355
 msgid "Commands:\n"
@@ -713,36 +748,42 @@ msgstr "指令：\n"
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+msgid "IBus Panel"
+msgstr "IBus 面板"
+
+#: ../ui/gtk3/panel.vala:731
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1086
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1090
 msgid "translator-credits"
-msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\nCheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
+msgstr ""
+"Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1109
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1119
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1123
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
 msgid "default:LTR"
 msgstr "default:LTR"

From af66ace771fc16a23e7a5841d2f0bd79789e009d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 14 Sep 2016 13:34:44 +0900
Subject: [PATCH 362/816] Fix warning messages during panel resizes

Move gtk_window_resize().
Seems calling gtk_window_resize() is not good during
gtk_widget_get_preferred_width/height() is called.

Review URL: https://codereview.appspot.com/308320043
---
 ui/gtk3/candidatepanel.vala | 21 ++++++++++-----------
 ui/gtk3/propertypanel.vala  | 21 +++++++++------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 06ed0c9d2..0e5e3bc2b 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -212,6 +212,15 @@ public class CandidatePanel : Gtk.Box{
     }
 
     private void update() {
+        /* Do not call gtk_window_resize() in
+         * GtkWidgetClass->get_preferred_width()
+         * because the following warning is shown in GTK 3.20:
+         * "Allocating size to GtkWindow %x without calling
+         * gtk_widget_get_preferred_width/height(). How does the code
+         * know the size to allocate?"
+         * in gtk_widget_size_allocate_with_baseline() */
+        m_toplevel.resize(1, 1);
+
         if (m_candidate_area.get_visible() ||
             m_preedit_label.get_visible() ||
             m_aux_label.get_visible())
@@ -226,16 +235,6 @@ public class CandidatePanel : Gtk.Box{
             m_hseparator.hide();
     }
 
-    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_ui() {
         m_preedit_label = new Gtk.Label(null);
         m_preedit_label.set_size_request(20, -1);
diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index ea960b81e..dd4342ec2 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -244,18 +244,6 @@ public class PropertyPanel : Gtk.Box {
         m_follow_input_cursor_when_always_shown = is_follow;
     }
 
-    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) {
@@ -399,6 +387,15 @@ public class PropertyPanel : Gtk.Box {
     }
 
     private void show_with_auto_hide_timer() {
+        /* Do not call gtk_window_resize() in
+         * GtkWidgetClass->get_preferred_width()
+         * because the following warning is shown in GTK 3.20:
+         * "Allocating size to GtkWindow %x without calling
+         * gtk_widget_get_preferred_width/height(). How does the code
+         * know the size to allocate?"
+         * in gtk_widget_size_allocate_with_baseline() */
+        m_toplevel.resize(1, 1);
+
         if (m_items.length == 0) {
             /* Do not blink the panel with focus-in in case the panel
              * is always shown. */

From e795eda1a3b054e6fdc921bfe04c83733761905f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Oct 2016 15:28:24 +0900
Subject: [PATCH 363/816] src: Hide lookup table if emoji annotation does not
 hit

If emoji annotation hits "aaa" but not "aaab", hide the lookup
window with "aaab".
Also hide the lookup window with Escape key.

BUG=rhbz#1380675

Review URL: https://codereview.appspot.com/307400043
---
 src/ibusenginesimple.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 8efe5a92e..b22b06f66 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -1018,6 +1018,10 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         }
         else if (is_escape) {
             ibus_engine_simple_reset (engine);
+            if (priv->lookup_table != NULL && priv->lookup_table_visible) {
+                priv->lookup_table_visible = FALSE;
+                ibus_engine_simple_update_lookup_and_aux_table (simple);
+            }
             return TRUE;
         }
 
@@ -1165,6 +1169,10 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         }
         else if (is_escape) {
             ibus_engine_simple_reset (engine);
+            if (priv->lookup_table != NULL && priv->lookup_table_visible) {
+                priv->lookup_table_visible = FALSE;
+                ibus_engine_simple_update_lookup_and_aux_table (simple);
+            }
             return TRUE;
         }
     } else {
@@ -1243,8 +1251,10 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                         priv->lookup_table_visible = FALSE;
                         update_lookup_table = TRUE;
                     }
-                }
-                else if (check_emoji_table (simple, n_compose, -1)) {
+                } else if (check_emoji_table (simple, n_compose, -1)) {
+                    update_lookup_table = TRUE;
+                } else {
+                    priv->lookup_table_visible = FALSE;
                     update_lookup_table = TRUE;
                 }
             }

From 4d86e59d0245df6d3a6aa1a32cdf7702b6dc7f0d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Oct 2016 15:35:03 +0900
Subject: [PATCH 364/816] src: Enable to type digit to commit emoji on lookup
 window

Enables to commit an emoji on the lookup window by a digit key.
Before this patch, Ctrl-Shift-U, "11" shows emojis of 11 clock.
After this patch, Ctrl-Shift-U, "11" commits an emoji of 1 clock.
Probably Ctrl-Shift-U, "clock" can be a workaround.

BUG=rhbz#1380690
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/309640043
---
 src/ibusenginesimple.c | 80 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index b22b06f66..23e1c9d84 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -900,6 +900,66 @@ ibus_engine_simple_update_lookup_and_aux_table (IBusEngineSimple *simple)
                                      priv->lookup_table_visible);
 }
 
+static gboolean
+ibus_engine_simple_if_in_range_of_lookup_table (IBusEngineSimple *simple,
+                                                guint             keyval)
+{
+    IBusEngineSimplePrivate *priv;
+    int index, candidates, cursor_pos, cursor_in_page, page_size;
+
+    priv = simple->priv;
+
+    if (priv->lookup_table == NULL || !priv->lookup_table_visible)
+        return FALSE;
+    if (keyval < IBUS_KEY_0 || keyval > IBUS_KEY_9)
+        return FALSE;
+    if (keyval == IBUS_KEY_0)
+        keyval = IBUS_KEY_9 + 1;
+    index = keyval - IBUS_KEY_1;
+    candidates =
+            ibus_lookup_table_get_number_of_candidates (priv->lookup_table);
+    cursor_pos = ibus_lookup_table_get_cursor_pos (priv->lookup_table);
+    cursor_in_page = ibus_lookup_table_get_cursor_in_page (priv->lookup_table);
+    page_size = ibus_lookup_table_get_page_size (priv->lookup_table);
+    if (index > ((candidates - (cursor_pos - cursor_in_page)) % page_size))
+        return FALSE;
+    return TRUE;
+}
+
+static void
+ibus_engine_simple_set_number_on_lookup_table (IBusEngineSimple *simple,
+                                               guint             keyval,
+                                               int               n_compose)
+{
+    IBusEngineSimplePrivate *priv;
+    int index, cursor_pos, cursor_in_page, real_index;
+
+    priv = simple->priv;
+
+    if (keyval == IBUS_KEY_0)
+        keyval = IBUS_KEY_9 + 1;
+    index = keyval - IBUS_KEY_1;
+    cursor_pos = ibus_lookup_table_get_cursor_pos (priv->lookup_table);
+    cursor_in_page = ibus_lookup_table_get_cursor_in_page (priv->lookup_table);
+    real_index = cursor_pos - cursor_in_page + index;
+
+    ibus_lookup_table_set_cursor_pos (priv->lookup_table, real_index);
+    check_emoji_table (simple, n_compose, real_index);
+    priv->lookup_table_visible = FALSE;
+    ibus_engine_simple_update_lookup_and_aux_table (simple);
+
+    if (priv->tentative_emoji && *priv->tentative_emoji) {
+        ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
+        priv->compose_buffer[0] = 0;
+    } else {
+        g_clear_pointer (&priv->tentative_emoji, g_free);
+        priv->in_emoji_sequence = FALSE;
+        priv->compose_buffer[0] = 0;
+    }
+
+    ibus_engine_simple_update_preedit_text (simple);
+}
+
 static gboolean
 ibus_engine_simple_process_key_event (IBusEngine *engine,
                                       guint       keyval,
@@ -1162,7 +1222,15 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         }
     } else if (priv->in_emoji_sequence) {
         if (printable_keyval) {
-            priv->compose_buffer[n_compose++] = printable_keyval;
+            if (!ibus_engine_simple_if_in_range_of_lookup_table (simple,
+                        printable_keyval)) {
+                /* digit keyval can be an index on the current lookup table
+                 * but it also can be a part of an emoji annotation.
+                 * E.g. "1" and "2" are  indexes of emoji "1".
+                 * "100" is an annotation of the emoji "100".
+                 */
+                priv->compose_buffer[n_compose++] = printable_keyval;
+            }
         }
         else if (is_space && (modifiers & IBUS_SHIFT_MASK)) {
             priv->compose_buffer[n_compose++] = IBUS_KEY_space;
@@ -1243,7 +1311,15 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             }
 
             if (!update_lookup_table) {
-                if (is_hex_end && !is_space) {
+                if (ibus_engine_simple_if_in_range_of_lookup_table (simple,
+                            keyval)) {
+                        ibus_engine_simple_set_number_on_lookup_table (
+                                simple,
+                                keyval,
+                                n_compose);
+                        return TRUE;
+                }
+                else if (is_hex_end && !is_space) {
                     if (priv->lookup_table) {
                         int index = (int) ibus_lookup_table_get_cursor_pos (
                                 priv->lookup_table);

From faf5e3c56d746d2f171618d552cff9149bb1d952 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Oct 2016 15:37:25 +0900
Subject: [PATCH 365/816] src: Enable PageUp, PageDown, CandidateClick buttons
 with emoji lookup

BUG=rhbz#1380691

Review URL: https://codereview.appspot.com/312760043
---
 src/ibusenginesimple.c | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 23e1c9d84..65c33a0b9 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -107,6 +107,13 @@ static gboolean ibus_engine_simple_process_key_event
                                                  guint               keyval,
                                                  guint               keycode,
                                                  guint               modifiers);
+static void     ibus_engine_simple_page_down   (IBusEngine          *engine);
+static void     ibus_engine_simple_page_up     (IBusEngine          *engine);
+static void     ibus_engine_simple_candidate_clicked
+                                               (IBusEngine          *engine,
+                                                guint                index,
+                                                guint                button,
+                                                guint                state);
 static void     ibus_engine_simple_commit_char (IBusEngineSimple    *simple,
                                                 gunichar             ch);
 static void     ibus_engine_simple_commit_str  (IBusEngineSimple    *simple,
@@ -128,6 +135,10 @@ ibus_engine_simple_class_init (IBusEngineSimpleClass *class)
     engine_class->reset     = ibus_engine_simple_reset;
     engine_class->process_key_event
                             = ibus_engine_simple_process_key_event;
+    engine_class->page_down = ibus_engine_simple_page_down;
+    engine_class->page_up   = ibus_engine_simple_page_up;
+    engine_class->candidate_clicked
+                            = ibus_engine_simple_candidate_clicked;
 
     g_type_class_add_private (class, sizeof (IBusEngineSimplePrivate));
 }
@@ -1395,6 +1406,50 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     return no_sequence_matches (simple, n_compose, keyval, keycode, modifiers);
 }
 
+static void
+ibus_engine_simple_page_down (IBusEngine *engine)
+{
+    IBusEngineSimple *simple = (IBusEngineSimple *)engine;
+    IBusEngineSimplePrivate *priv = simple->priv;
+    if (priv->lookup_table == NULL)
+        return;
+    ibus_lookup_table_page_down (priv->lookup_table);
+    ibus_engine_simple_update_lookup_and_aux_table (simple);
+}
+
+static void
+ibus_engine_simple_page_up (IBusEngine *engine)
+{
+    IBusEngineSimple *simple = (IBusEngineSimple *)engine;
+    IBusEngineSimplePrivate *priv = simple->priv;
+    if (priv->lookup_table == NULL)
+        return;
+    ibus_lookup_table_page_up (priv->lookup_table);
+    ibus_engine_simple_update_lookup_and_aux_table (simple);
+}
+
+static void
+ibus_engine_simple_candidate_clicked (IBusEngine *engine,
+                                      guint       index,
+                                      guint       button,
+                                      guint       state)
+{
+    IBusEngineSimple *simple = (IBusEngineSimple *)engine;
+    IBusEngineSimplePrivate *priv = simple->priv;
+    guint keyval;
+    gint n_compose = 0;
+
+    if (priv->lookup_table == NULL || !priv->lookup_table_visible)
+        return;
+    if (index == 9)
+        keyval = IBUS_KEY_0;
+    else
+        keyval = IBUS_KEY_1 + index;
+    while (priv->compose_buffer[n_compose] != 0)
+        n_compose++;
+    ibus_engine_simple_set_number_on_lookup_table (simple, keyval, n_compose);
+}
+
 void
 ibus_engine_simple_add_table (IBusEngineSimple *simple,
                               const guint16    *data,

From 52b7272d97a881a8a6c872e28c1970ec47cb4337 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Wed, 12 Oct 2016 15:17:24 +0900
Subject: [PATCH 366/816] ui/gtk3: support scroll event in candidates panel

When press scroll button of mouse on candidates,
automatically cursor up/cursor down.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/302700043

Patch from Peng Wu <alexepico@gmail.com>.
---
 ui/gtk3/candidatearea.vala | 33 +++++++++++++++++++++++++++++----
 ui/gtk3/panel.vala         |  2 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 3848f0d86..88db268e1 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -61,6 +61,18 @@ class CandidateArea : Gtk.Box {
         set_vertical(vertical, true);
     }
 
+    public bool candidate_scrolled(Gdk.EventScroll event) {
+        switch (event.direction) {
+        case Gdk.ScrollDirection.UP:
+            cursor_up();
+            break;
+        case Gdk.ScrollDirection.DOWN:
+            cursor_down();
+            break;
+        }
+        return true;
+    }
+
     public bool get_vertical() {
         return m_vertical;
     }
@@ -167,9 +179,17 @@ class CandidateArea : Gtk.Box {
         next_button.set_relief(Gtk.ReliefStyle.NONE);
 
         if (m_vertical) {
+            Gtk.EventBox container_ebox = new Gtk.EventBox();
+            container_ebox.add_events(Gdk.EventMask.SCROLL_MASK);
+            container_ebox.scroll_event.connect(candidate_scrolled);
+            add(container_ebox);
+
+            Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            container_ebox.add(vbox);
+
             // Add Candidates
             Gtk.Box candidates_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-            pack_start(candidates_hbox, false, false, 0);
+            vbox.pack_start(candidates_hbox, false, false, 0);
             Gtk.Box labels_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
             labels_vbox.set_homogeneous(true);
             Gtk.Box candidates_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
@@ -179,7 +199,7 @@ class CandidateArea : Gtk.Box {
             candidates_hbox.pack_start(candidates_vbox, true, true, 4);
 
             // Add HSeparator
-            pack_start(new HSeparator(), false, false, 0);
+            vbox.pack_start(new HSeparator(), false, false, 0);
 
             // Add buttons
             Gtk.Box buttons_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
@@ -188,7 +208,7 @@ class CandidateArea : Gtk.Box {
             buttons_hbox.pack_start(state_label, true, true, 0);
             buttons_hbox.pack_start(prev_button, false, false, 0);
             buttons_hbox.pack_start(next_button, false, false, 0);
-            pack_start(buttons_hbox, false, false, 0);
+            vbox.pack_start(buttons_hbox, false, false, 0);
 
             m_labels = {};
             m_candidates = {};
@@ -234,8 +254,13 @@ class CandidateArea : Gtk.Box {
                 m_widgets += candidate_ebox;
             }
         } else {
+            Gtk.EventBox container_ebox = new Gtk.EventBox();
+            container_ebox.add_events(Gdk.EventMask.SCROLL_MASK);
+            container_ebox.scroll_event.connect(candidate_scrolled);
+            add(container_ebox);
+
             Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-            add(hbox);
+            container_ebox.add(hbox);
 
             m_labels = {};
             m_candidates = {};
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index cc19350b6..ee08c5944 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -111,6 +111,8 @@ class Panel : IBus.PanelService {
         m_candidate_panel = new CandidatePanel();
         m_candidate_panel.page_up.connect((w) => this.page_up());
         m_candidate_panel.page_down.connect((w) => this.page_down());
+        m_candidate_panel.cursor_up.connect((w) => this.cursor_up());
+        m_candidate_panel.cursor_down.connect((w) => this.cursor_down());
         m_candidate_panel.candidate_clicked.connect(
                 (w, i, b, s) => this.candidate_clicked(i, b, s));
 

From f80dcc978fdc9a3d7853434e86f4ee02c2a92b33 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 11 Jan 2017 12:11:22 +0900
Subject: [PATCH 367/816] src: Avoid emoji typing during Unicode typing

If 'sk' layout is used, digit keys need Shift key and
Unicode typing of U+1AE requires Shift key after Ctrl-Shift-u.
This patch does not enable the emoji typing with Ctrl-Shift-e
during Unicode typing.

BUG=rhbz#1403985

Review URL: https://codereview.appspot.com/311510043
---
 src/ibusenginesimple.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 65c33a0b9..2a98d58e1 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2014-2016 Red Hat, Inc.
+ * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2014-2017 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
@@ -1187,7 +1187,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     }
 
     /* Check for hex sequence start */
-    if (!priv->in_hex_sequence && have_hex_mods && is_hex_start) {
+    if (!priv->in_hex_sequence && !priv->in_emoji_sequence &&
+        have_hex_mods && is_hex_start) {
         priv->compose_buffer[0] = 0;
         priv->in_hex_sequence = TRUE;
         priv->in_emoji_sequence = FALSE;
@@ -1200,7 +1201,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         ibus_engine_simple_update_preedit_text (simple);
 
         return TRUE;
-    } else if (!priv->in_emoji_sequence && have_hex_mods && is_emoji_start) {
+    } else if (!priv->in_hex_sequence && !priv->in_emoji_sequence &&
+               have_hex_mods && is_emoji_start) {
         priv->compose_buffer[0] = 0;
         priv->in_hex_sequence = FALSE;
         priv->in_emoji_sequence = TRUE;

From aacf5adbba9b9b34a1ec07005e670d209513fb5b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 11 Jan 2017 12:16:59 +0900
Subject: [PATCH 368/816] ui/gtk3: Fix panel CSS format for GTK 3.22

GtkCssProvider no longer works with the Pango format in GTK 3.22 and
need to use the CSS format.

BUG=https://github.com/ibus/ibus/issues/1879

Review URL: https://codereview.appspot.com/319960043
---
 ui/gtk3/panel.vala | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index ee08c5944..4fb755572 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2016 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -538,26 +538,33 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        string font_name = m_settings_panel.get_string("custom-font");
+        string custom_font = m_settings_panel.get_string("custom-font");
 
-        if (font_name == null) {
+        if (custom_font == null) {
             warning("No config panel:custom-font.");
             return;
         }
 
-        string data_format = "label { font: %s; }";
+        Pango.FontDescription font_desc =
+                Pango.FontDescription.from_string(custom_font);
+        string font_family = font_desc.get_family();
+        int font_size = font_desc.get_size() / Pango.SCALE;
+        string data;
+
         if (Gtk.MAJOR_VERSION < 3 ||
             (Gtk.MAJOR_VERSION == 3 && Gtk.MINOR_VERSION < 20)) {
-            data_format = "GtkLabel { font: %s; }";
+            data = "GtkLabel { font: %s; }".printf(custom_font);
+        } else {
+            data = "label { font-family: %s; font-size: %dpt; }"
+                           .printf(font_family, font_size);
         }
 
-        string data = data_format.printf(font_name);
         m_css_provider = new Gtk.CssProvider();
 
         try {
             m_css_provider.load_from_data(data, -1);
         } catch (GLib.Error e) {
-            warning("Failed css_provider_from_data: %s: %s", font_name,
+            warning("Failed css_provider_from_data: %s: %s", custom_font,
                                                              e.message);
             return;
         }

From 371535b981e5f99deeab9437e49eb7209b1a561a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Jan 2017 18:51:42 +0900
Subject: [PATCH 369/816] util/IMdkit: Fix the range of memset() in i18nIc.c

BUG=https://github.com/ibus/ibus/issues/1891

Review URL: https://codereview.appspot.com/320010043
---
 util/IMdkit/i18nIc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/IMdkit/i18nIc.c b/util/IMdkit/i18nIc.c
index 61b576f99..874459868 100644
--- a/util/IMdkit/i18nIc.c
+++ b/util/IMdkit/i18nIc.c
@@ -478,7 +478,7 @@ static XICAttribute *CreateNestedList (CARD16 attr_id,
     if (nest_list->value == NULL)
         return NULL;
     /*endif*/
-    memset (nest_list->value, 0, sizeof (value_length));
+    memset (nest_list->value, 0, value_length);
 
     nest_list->attribute_id = attr_id;
     nest_list->value_length = value_length;

From bdc83bcbe3c9f07a267499c297db12c68af82fa2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 27 Jan 2017 14:42:33 +0900
Subject: [PATCH 370/816] ui/gtk3: Refactor color of a selected candidate on
 lookup window

Recenly 'background-color' CSS property does not indicate the actual
background color in GTK 3.22 and IBus uses '-gtk-secondary-caret-color'
CSS property instead.
But I found every themes do not have '-gtk-secondary-caret-color'
CSS property even if the latest GTK is used. Some themes, e.g.
distro themes or third party themes,  uses 'background-color' CSS
property for the background color of the selected text.

This patch compares the colors of the normal 'background-color' and
the selected 'background-color' and in case they are different,
uses the selected 'background-color', otherwise the selected
'-gtk-secondary-caret-color'.
Also now IBus checks the colors of a dummy GtkTextView rather than
ones of GtkLabel on the lookup window because some themes
do not configure the selected bacground color in GtkLabel.

BUG=https://github.com/ibus/ibus/issues/1871

Review URL: https://codereview.appspot.com/314280043
---
 ui/gtk3/candidatearea.vala | 96 ++++++++++++++++++++++++++++++--------
 1 file changed, 76 insertions(+), 20 deletions(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 88db268e1..3815c1aa1 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,10 +30,9 @@ class CandidateArea : Gtk.Box {
     private IBus.Text[] m_ibus_candidates;
     private uint m_focus_candidate;
     private bool m_show_cursor;
-
-    private bool m_use_latest_css_format =
-            ((Gtk.MAJOR_VERSION > 3) ||
-             (Gtk.MAJOR_VERSION == 3) && (Gtk.MINOR_VERSION >= 20));
+    Gtk.StyleContext m_style_context;
+    private Gdk.RGBA *m_selected_fg_color = null;
+    private Gdk.RGBA *m_selected_bg_color = null;
 
     private const string LABELS[] = {
         "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
@@ -59,6 +58,38 @@ class CandidateArea : Gtk.Box {
     public CandidateArea(bool vertical) {
         GLib.Object();
         set_vertical(vertical, true);
+
+        /* Use the color of Gtk.TextView instead of Gtk.Label
+         * because the selected label "color" is not configured
+         * in "Adwaita" theme and the selected label "background-color"
+         * is not configured in "Maia" theme.
+         * https://github.com/ibus/ibus/issues/1871
+         */
+        Gtk.WidgetPath widget_path = new Gtk.WidgetPath();
+        widget_path.append_type(typeof(Gtk.TextView));
+        m_style_context = new Gtk.StyleContext();
+        m_style_context.set_path(widget_path);
+        m_style_context.add_class(Gtk.STYLE_CLASS_VIEW);
+
+        /* "-gtk-secondary-caret-color" value is different
+         * if the parent widget is set in "Menta" theme.
+         */
+        m_style_context.set_parent(get_style_context());
+
+        get_selected_color();
+
+        m_style_context.changed.connect(() => { get_selected_color(); });
+    }
+
+    ~CandidateArea() {
+        if (m_selected_bg_color != null) {
+            m_selected_bg_color.free();
+            m_selected_bg_color = null;
+        }
+        if (m_selected_bg_color != null) {
+            m_selected_bg_color.free();
+            m_selected_bg_color = null;
+        }
     }
 
     public bool candidate_scrolled(Gdk.EventScroll event) {
@@ -118,27 +149,18 @@ class CandidateArea : Gtk.Box {
             if (i < candidates.length) {
                 Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(candidates[i]);
                 if (i == focus_candidate && show_cursor) {
-                    Gtk.StyleContext context = m_candidates[i].get_style_context();
-                    Gdk.RGBA *color = null;
-                    context.get(Gtk.StateFlags.SELECTED, "color", out color);
                     Pango.Attribute pango_attr = Pango.attr_foreground_new(
-                            (uint16)(color.red * uint16.MAX),
-                            (uint16)(color.green * uint16.MAX),
-                            (uint16)(color.blue * uint16.MAX));
+                            (uint16)(m_selected_fg_color.red * uint16.MAX),
+                            (uint16)(m_selected_fg_color.green * uint16.MAX),
+                            (uint16)(m_selected_fg_color.blue * uint16.MAX));
                     pango_attr.start_index = 0;
                     pango_attr.end_index = candidates[i].get_text().length;
                     attrs.insert((owned)pango_attr);
 
-                    color = null;
-                    string bg_prop =
-                            m_use_latest_css_format
-                            ? "-gtk-secondary-caret-color"
-                            : "background-color";
-                    context.get(Gtk.StateFlags.SELECTED, bg_prop, out color);
                     pango_attr = Pango.attr_background_new(
-                            (uint16)(color.red * uint16.MAX),
-                            (uint16)(color.green * uint16.MAX),
-                            (uint16)(color.blue * uint16.MAX));
+                            (uint16)(m_selected_bg_color.red * uint16.MAX),
+                            (uint16)(m_selected_bg_color.green * uint16.MAX),
+                            (uint16)(m_selected_bg_color.blue * uint16.MAX));
                     pango_attr.start_index = 0;
                     pango_attr.end_index = candidates[i].get_text().length;
                     attrs.insert((owned)pango_attr);
@@ -159,6 +181,40 @@ class CandidateArea : Gtk.Box {
         }
     }
 
+    private void get_selected_color() {
+        if (m_selected_fg_color != null) {
+            m_selected_fg_color.free();
+            m_selected_fg_color = null;
+        }
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            "color",
+                            out m_selected_fg_color);
+
+        string bg_prop = "background-color";
+        Gdk.RGBA *normal_color = null;
+        if (m_selected_bg_color != null) {
+            m_selected_bg_color.free();
+            m_selected_bg_color = null;
+        }
+        m_style_context.get(Gtk.StateFlags.NORMAL,
+                            bg_prop,
+                            out normal_color);
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            bg_prop,
+                            out m_selected_bg_color);
+        if (normal_color.red   == m_selected_bg_color.red &&
+            normal_color.green == m_selected_bg_color.green &&
+            normal_color.blue  == m_selected_bg_color.blue &&
+            normal_color.alpha == m_selected_bg_color.alpha) {
+            m_selected_bg_color.free();
+            m_selected_bg_color = null;
+            bg_prop = "-gtk-secondary-caret-color";
+            m_style_context.get(Gtk.StateFlags.SELECTED,
+                                bg_prop,
+                                out m_selected_bg_color);
+        }
+    }
+
     private void recreate_ui() {
         foreach (Gtk.Widget w in get_children()) {
             w.destroy();

From b8f55532704e256832b50e96efa5821b960a20a1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Feb 2017 13:36:50 +0900
Subject: [PATCH 371/816] ui/gtk3: Free normal_color in CandidateArea

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/314410043
---
 ui/gtk3/candidatearea.vala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 3815c1aa1..a095e76bf 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -213,6 +213,7 @@ class CandidateArea : Gtk.Box {
                                 bg_prop,
                                 out m_selected_bg_color);
         }
+        normal_color.free();
     }
 
     private void recreate_ui() {

From b498ff571049bec2b3f3bf6f1747f0af18ff4764 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Feb 2017 12:19:45 +0900
Subject: [PATCH 372/816] ui/gtk3: Refactor to set panel icon

Fix panel icon with icon_prop_key when use_global_engine is false.
Also enhance to set engines when type Super+space quickly.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/314450043
---
 ui/gtk3/panel.vala    | 107 ++++++++++++++++++++++++++++++------------
 ui/gtk3/switcher.vala |  42 ++++++++++++++---
 2 files changed, 114 insertions(+), 35 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 4fb755572..fc7f8916d 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -58,10 +58,11 @@ class Panel : IBus.PanelService {
             new GLib.HashTable<string, IBus.EngineDesc>(GLib.str_hash,
                                                         GLib.str_equal);
     private string m_current_context_path = "";
+    private string m_real_current_context_path = "";
     private bool m_use_global_engine = true;
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
-    private bool m_switcher_is_running = false;
+    private uint m_switcher_focus_set_engine_id;
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
     private GLib.Pid m_setup_pid = 0;
@@ -822,21 +823,27 @@ class Panel : IBus.PanelService {
     }
 
     private void set_engine(IBus.EngineDesc engine) {
+        if (m_property_icon_delay_time_id > 0) {
+            GLib.Source.remove(m_property_icon_delay_time_id);
+            m_property_icon_delay_time_id = 0;
+        }
+
         if (!m_bus.set_global_engine(engine.get_name())) {
             warning("Switch engine to %s failed.", engine.get_name());
             return;
         }
+        /* Engine.update_property() will be called with a time lag
+         * by another engine because of DBus delay so need to
+         * clear m_icon_prop_key here to avoid wrong panel icon in
+         * disabled m_use_global_engine.
+         */
+        m_icon_prop_key = "";
 
         // set xkb layout
         if (!m_use_system_keyboard_layout)
             m_xkblayout.set_layout(engine);
 
         engine_contexts_insert(engine);
-
-        if (m_property_icon_delay_time_id > 0) {
-            GLib.Source.remove(m_property_icon_delay_time_id);
-            m_property_icon_delay_time_id = 0;
-        }
     }
 
     private void switch_engine(int i, bool force = false) {
@@ -872,24 +879,24 @@ class Panel : IBus.PanelService {
         if (pressed && m_switcher_delay_time >= 0) {
             int i = revert ? m_engines.length - 1 : 1;
 
-            /* The flag of m_switcher_is_running avoids the following problem:
+            /* The flag of m_switcher.is_running avoids the following problem:
              *
              * When an IME is chosen on m_switcher, focus_in() is called
-             * for the root window. If an engine is set in focus_in()
+             * for the fake input context. If an engine is set in focus_in()
              * during running m_switcher when m_use_global_engine is false,
              * state_changed() is also called and m_engines[] is modified
              * in state_changed() and m_switcher.run() returns the index
              * for m_engines[] but m_engines[] was modified by state_changed()
              * and the index is not correct. */
-            m_switcher_is_running = true;
-            i = m_switcher.run(keyval, modifiers, event, m_engines, i);
-            m_switcher_is_running = false;
+            i = m_switcher.run(keyval, modifiers, event, m_engines, i,
+                               m_real_current_context_path);
 
             if (i < 0) {
                 debug("switch cancelled");
+            } else if (i == 0) {
+                debug("do not have to switch");
             } else {
-                GLib.assert(i < m_engines.length);
-                switch_engine(i);
+                this.switcher_focus_set_engine();
             }
         } else {
             int i = revert ? m_engines.length - 1 : 1;
@@ -1236,19 +1243,68 @@ class Panel : IBus.PanelService {
         m_property_panel.set_cursor_location(x, y, width, height);
     }
 
-    public override void focus_in(string input_context_path) {
-        m_property_panel.focus_in();
+    private bool switcher_focus_set_engine_real() {
+        IBus.EngineDesc? selected_engine = m_switcher.get_selected_engine();
+        string? prev_context_path = m_switcher.get_input_context_path();
+        if (selected_engine != null &&
+            prev_context_path != "" &&
+            prev_context_path == m_current_context_path) {
+            set_engine(selected_engine);
+            m_switcher.reset();
+            return true;
+        }
 
-        if (m_use_global_engine)
-            return;
+        return false;
+    }
 
-        /* Do not change the order of m_engines during running switcher. */
-        if (m_switcher_is_running)
-            return;
+    private void switcher_focus_set_engine() {
+        IBus.EngineDesc? selected_engine = m_switcher.get_selected_engine();
+        string? prev_context_path = m_switcher.get_input_context_path();
+        if (selected_engine == null &&
+            prev_context_path != "" &&
+            m_switcher.is_running()) {
+            if (m_switcher_focus_set_engine_id > 0) {
+                GLib.Source.remove(m_switcher_focus_set_engine_id);
+            }
+            m_switcher_focus_set_engine_id = GLib.Timeout.add(100, () => {
+                // focus_in is comming before switcher returns
+                switcher_focus_set_engine_real();
+                if (m_switcher_focus_set_engine_id > 0) {
+                    GLib.Source.remove(m_switcher_focus_set_engine_id);
+                    m_switcher_focus_set_engine_id = -1;
+                }
+                return false;
+            });
+        } else {
+            if (switcher_focus_set_engine_real()) {
+                if (m_switcher_focus_set_engine_id > 0) {
+                    GLib.Source.remove(m_switcher_focus_set_engine_id);
+                    m_switcher_focus_set_engine_id = -1;
+                }
+            }
+        }
+    }
 
+    public override void focus_in(string input_context_path) {
         m_current_context_path = input_context_path;
 
-        var engine = m_engine_contexts[m_current_context_path];
+        /* 'fake' input context is named as 
+         * '/org/freedesktop/IBus/InputContext_1' and always send in
+         * focus-out events by ibus-daemon for the global engine mode.
+         * Now ibus-daemon assumes to always use the global engine.
+         * But this event should not be used for modal dialogs
+         * such as Switcher.
+         */
+        if (!input_context_path.has_suffix("InputContext_1")) {
+            m_real_current_context_path = m_current_context_path;
+            m_property_panel.focus_in();
+            this.switcher_focus_set_engine();
+        }
+
+        if (m_use_global_engine)
+            return;
+
+        var engine = m_engine_contexts[input_context_path];
 
         if (engine == null) {
             /* If engine == null, need to call set_engine(m_engines[0])
@@ -1286,13 +1342,6 @@ class Panel : IBus.PanelService {
     }
 
     public override void focus_out(string input_context_path) {
-        if (m_use_global_engine)
-            return;
-
-        /* Do not change the order of m_engines during running switcher. */
-        if (m_switcher_is_running)
-            return;
-
         m_current_context_path = "";
     }
 
@@ -1357,7 +1406,7 @@ class Panel : IBus.PanelService {
 
     public override void state_changed() {
         /* Do not change the order of m_engines during running switcher. */
-        if (m_switcher_is_running)
+        if (m_switcher.is_running())
             return;
 
         if (m_icon_type == IconType.INDICATOR) {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 666a5a9ae..2b5b60c76 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2016 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -81,8 +82,11 @@ class Switcher : Gtk.Window {
     private uint m_keyval;
     private uint m_modifiers;
     private Gdk.ModifierType m_primary_modifier;
+    private bool m_is_running = false;
+    private string m_input_context_path = "";
     private GLib.MainLoop m_loop;
-    private int m_result;
+    private int m_result = -1;
+    private IBus.EngineDesc? m_result_engine = null;
     private uint m_popup_delay_time = 0;
     private uint m_popup_delay_time_id = 0;
     private int m_root_x;
@@ -124,25 +128,29 @@ class Switcher : Gtk.Window {
         grab_focus();
     }
 
-    public int run(uint keyval,
-                   uint state,
-                   Gdk.Event event,
+    public int run(uint              keyval,
+                   uint              state,
+                   Gdk.Event         event,
                    IBus.EngineDesc[] engines,
-                   int index) {
+                   int               index,
+                   string            input_context_path) {
         assert (m_loop == null);
         assert (index < engines.length);
 
+        m_is_running = true;
         m_keyval = keyval;
         m_modifiers = state;
         m_primary_modifier =
             KeybindingManager.get_primary_modifier(
                 state & KeybindingManager.MODIFIER_FILTER);
+        m_selected_engine = m_result = index;
+        m_input_context_path = input_context_path;
+        m_result_engine = null;
 
         update_engines(engines);
         /* Let gtk recalculate the window size. */
         resize(1, 1);
 
-        m_selected_engine = index;
         m_label.set_text(m_buttons[index].longname);
         m_buttons[index].grab_focus();
 
@@ -227,6 +235,10 @@ class Switcher : Gtk.Window {
         while (Gtk.events_pending())
             Gtk.main_iteration ();
 
+        GLib.assert(m_result < m_engines.length);
+        m_result_engine = m_engines[m_result];
+        m_is_running = false;
+
         return m_result;
     }
 
@@ -457,4 +469,22 @@ class Switcher : Gtk.Window {
         m_xkb_languages.insert(name, language);
         return language;
     }
+
+    public bool is_running() {
+        return m_is_running;
+    }
+
+    public string? get_input_context_path() {
+        return m_input_context_path;
+    }
+
+    public IBus.EngineDesc? get_selected_engine() {
+        return m_result_engine;
+    }
+
+    public void reset() {
+        m_input_context_path = "";
+        m_result = -1;
+        m_result_engine = null;
+    }
 }

From fcb90f7a96d7b1b6be5b7e274a0ebe3058207b50 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 20 Feb 2017 12:00:14 +0900
Subject: [PATCH 373/816] ui/gtk3: Fix typo in
 switcher.get_input_context_path()

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/318590043
---
 ui/gtk3/panel.vala    | 6 +++---
 ui/gtk3/switcher.vala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index fc7f8916d..315e30f58 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -832,7 +832,7 @@ class Panel : IBus.PanelService {
             warning("Switch engine to %s failed.", engine.get_name());
             return;
         }
-        /* Engine.update_property() will be called with a time lag
+        /* Panel.update_property() will be called with a time lag
          * by another engine because of DBus delay so need to
          * clear m_icon_prop_key here to avoid wrong panel icon in
          * disabled m_use_global_engine.
@@ -1245,7 +1245,7 @@ class Panel : IBus.PanelService {
 
     private bool switcher_focus_set_engine_real() {
         IBus.EngineDesc? selected_engine = m_switcher.get_selected_engine();
-        string? prev_context_path = m_switcher.get_input_context_path();
+        string prev_context_path = m_switcher.get_input_context_path();
         if (selected_engine != null &&
             prev_context_path != "" &&
             prev_context_path == m_current_context_path) {
@@ -1259,7 +1259,7 @@ class Panel : IBus.PanelService {
 
     private void switcher_focus_set_engine() {
         IBus.EngineDesc? selected_engine = m_switcher.get_selected_engine();
-        string? prev_context_path = m_switcher.get_input_context_path();
+        string prev_context_path = m_switcher.get_input_context_path();
         if (selected_engine == null &&
             prev_context_path != "" &&
             m_switcher.is_running()) {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 2b5b60c76..cf1875556 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -474,7 +474,7 @@ class Switcher : Gtk.Window {
         return m_is_running;
     }
 
-    public string? get_input_context_path() {
+    public string get_input_context_path() {
         return m_input_context_path;
     }
 

From 993289f4667bed50e8d552870df6f05f1eaf5e35 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Mon, 27 Feb 2017 14:29:48 +0900
Subject: [PATCH 374/816] bus: fix service file when --disable-xim is specified

BUG=https://github.com/ibus/ibus/pull/1897
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/319390043

Patch from Marc-Antoine Perennou <Marc-Antoine@Perennou.com>.
---
 bus/Makefile.am                     | 2 +-
 bus/org.freedesktop.IBus.service.in | 2 +-
 configure.ac                        | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index f032367ca..864ba9237 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -188,7 +188,7 @@ dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 dbusservicedir=${datadir}/dbus-1/services
 
 org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" -e "s|\@xim_cli_arg\@|$(XIM_CLI_ARG)|" $< > $@.tmp && mv $@.tmp $@
 
 EXTRA_DIST += $(dbusservice_in_files)
 CLEANFILES += $(dbusservice_DATA)
diff --git a/bus/org.freedesktop.IBus.service.in b/bus/org.freedesktop.IBus.service.in
index cc8883423..9e322ce85 100644
--- a/bus/org.freedesktop.IBus.service.in
+++ b/bus/org.freedesktop.IBus.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.IBus
-Exec=@bindir@/ibus-daemon --replace --xim --panel disable
+Exec=@bindir@/ibus-daemon --replace --panel disable @xim_cli_arg@
diff --git a/configure.ac b/configure.ac
index 8ff79166c..23e093ea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,6 +198,10 @@ AC_ARG_ENABLE(xim,
 )
 AM_CONDITIONAL([ENABLE_XIM], [test x"$enable_xim" = x"yes"])
 
+if test x"$enable_xim" = x"yes"; then
+    AC_SUBST([XIM_CLI_ARG], [--xim])
+fi
+
 # --enable-wayland option.
 AC_ARG_ENABLE(wayland,
     AS_HELP_STRING([--enable-wayland],

From 0a244817338c943ffe03cd5b6ecf094ffd156f80 Mon Sep 17 00:00:00 2001
From: "Eric R. Schulz" <eric@ers35.com>
Date: Wed, 1 Mar 2017 13:25:56 +0900
Subject: [PATCH 375/816] Fix memory leak in IBus.Bus.get_global_engine()

Fix the memory leak by setting the transfer mode annotation to full.

BUG=https://github.com/ibus/ibus/pull/1899
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/312520043

Patch from Eric R. Schulz <eric@ers35.com>.
---
 src/ibusbus.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusbus.h b/src/ibusbus.h
index 1e0f3cc95..9f65d36ac 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -977,7 +977,7 @@ gboolean     ibus_bus_is_global_engine_enabled_async_finish
  *
  * Get the description of current global engine synchronously.
  *
- * Returns: (transfer none): The description of current global engine,
+ * Returns: (transfer full): The description of current global engine,
  * or %NULL if there is no global engine.
  */
 IBusEngineDesc *

From 02d99aa00cb4a26a2cfb6098ea27e763e9bb2daa Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 5 Mar 2017 18:11:28 +0900
Subject: [PATCH 376/816] Move emoji implementation from IBusEngineSimple to
 IBusPanel

Currently emoji shortcut key is not customizable and there is
no menu item to access emoji typing without shortcut key.
Once implementation is moved to IBusPanel, the emoji typing is
now avaible for every engine without modifying its codes.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/317370043
---
 bus/inputcontext.c             |   37 +-
 bus/inputcontext.h             |    9 +
 bus/panelproxy.c               |   60 +-
 configure.ac                   |   11 +
 data/ibus.schemas.in           |   36 ++
 po/POTFILES.in                 |    1 +
 po/POTFILES.skip               |    1 +
 setup/main.py                  |   27 +-
 setup/setup.ui                 |   94 ++-
 src/Makefile.am                |  170 +++--
 src/emoji-parser.c             |  161 +++--
 src/ibus.h                     |    1 +
 src/ibusemoji.c                |  585 +++++++++++++++++
 src/ibusemoji.h                |  207 ++++++
 src/ibusenginesimple.c         |    7 +-
 src/ibuspanelservice.c         |   24 +
 src/ibuspanelservice.h         |   11 +
 src/ibusutil.c                 |  191 +-----
 src/ibusutil.h                 |   29 +-
 ui/gtk3/Makefile.am            |    6 +
 ui/gtk3/emojier.vala           | 1112 ++++++++++++++++++++++++++++++++
 ui/gtk3/keybindingmanager.vala |    7 +-
 ui/gtk3/panel.vala             |  160 ++++-
 23 files changed, 2561 insertions(+), 386 deletions(-)
 create mode 100644 src/ibusemoji.c
 create mode 100644 src/ibusemoji.h
 create mode 100644 ui/gtk3/emojier.vala

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 0612fac71..d8be9e3ff 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -161,9 +161,6 @@ static gboolean bus_input_context_service_set_property
                                     GError               **error);
 static void     bus_input_context_unset_engine
                                    (BusInputContext       *context);
-static void     bus_input_context_commit_text
-                                   (BusInputContext       *context,
-                                    IBusText              *text);
 static void     bus_input_context_update_preedit_text
                                    (BusInputContext       *context,
                                     IBusText              *text,
@@ -1434,22 +1431,6 @@ bus_input_context_property_activate (BusInputContext *context,
     }
 }
 
-static void
-bus_input_context_commit_text (BusInputContext *context,
-                               IBusText        *text)
-{
-    g_assert (BUS_IS_INPUT_CONTEXT (context));
-
-    if (text == text_empty || text == NULL)
-        return;
-
-    GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)text);
-    bus_input_context_emit_signal (context,
-                                   "CommitText",
-                                   g_variant_new ("(v)", variant),
-                                   NULL);
-}
-
 /**
  * bus_input_context_update_preedit_text:
  *
@@ -2605,3 +2586,19 @@ bus_input_context_set_content_type (BusInputContext *context,
     _ic_set_content_type (context, value);
     g_variant_unref (value);
 }
+
+void
+bus_input_context_commit_text (BusInputContext *context,
+                               IBusText        *text)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    if (text == text_empty || text == NULL)
+        return;
+
+    GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)text);
+    bus_input_context_emit_signal (context,
+                                   "CommitText",
+                                   g_variant_new ("(v)", variant),
+                                   NULL);
+}
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index 258f501a5..7674abd8f 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -2,6 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -260,5 +261,13 @@ void                 bus_input_context_set_content_type
                                                  guint            purpose,
                                                  guint            hints);
 
+/**
+ * bus_input_context_commit_text:
+ * @text: a commited text.
+ */
+void                 bus_input_context_commit_text
+                                                (BusInputContext *context,
+                                                 IBusText        *text);
+
 G_END_DECLS
 #endif
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 4ff5d89af..8381d7dc1 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -2,6 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -49,6 +50,7 @@ enum {
     PROPERTY_ACTIVATE,
     PROPERTY_SHOW,
     PROPERTY_HIDE,
+    COMMIT_TEXT,
     LAST_SIGNAL,
 };
 
@@ -75,6 +77,8 @@ struct _BusPanelProxyClass {
     void (* property_activate)  (BusPanelProxy   *panel,
                                  const gchar     *prop_name,
                                  gint             prop_state);
+    void (* commit_text)        (BusPanelProxy   *panel,
+                                 IBusText        *text);
 };
 
 static guint    panel_signals[LAST_SIGNAL] = { 0 };
@@ -99,6 +103,9 @@ static void     bus_panel_proxy_property_activate
                                                 (BusPanelProxy          *panel,
                                                  const gchar            *prop_name,
                                                  gint                    prop_state);
+static void     bus_panel_proxy_commit_text
+                                                (BusPanelProxy          *panel,
+                                                 IBusText               *text);
 
 G_DEFINE_TYPE(BusPanelProxy, bus_panel_proxy, IBUS_TYPE_PROXY)
 
@@ -133,6 +140,7 @@ bus_panel_proxy_class_init (BusPanelProxyClass *class)
     class->cursor_down = bus_panel_proxy_cursor_down;
     class->candidate_clicked = bus_panel_proxy_candidate_clicked;
     class->property_activate = bus_panel_proxy_property_activate;
+    class->commit_text = bus_panel_proxy_commit_text;
 
     /* install signals */
     panel_signals[PAGE_UP] =
@@ -214,6 +222,22 @@ bus_panel_proxy_class_init (BusPanelProxyClass *class)
             G_TYPE_NONE, 1,
             G_TYPE_STRING);
 
+    panel_signals[COMMIT_TEXT] =
+        g_signal_new (I_("commit-text"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET(BusPanelProxyClass, commit_text),
+            NULL, NULL,
+            bus_marshal_VOID__OBJECT,
+            G_TYPE_NONE, 1,
+            IBUS_TYPE_TEXT);
+}
+
+static void
+_g_object_unref_if_floating (gpointer instance)
+{
+    if (g_object_is_floating (instance))
+        g_object_unref (instance);
 }
 
 static void
@@ -232,7 +256,8 @@ bus_panel_proxy_real_destroy (IBusProxy *proxy)
         panel->focused_context = NULL;
     }
 
-    IBUS_PROXY_CLASS(bus_panel_proxy_parent_class)->destroy ((IBusProxy *)panel);
+    IBUS_PROXY_CLASS(bus_panel_proxy_parent_class)->
+            destroy ((IBusProxy *)panel);
 }
 
 /**
@@ -299,6 +324,19 @@ bus_panel_proxy_g_signal (GDBusProxy  *proxy,
         return;
     }
 
+    if (g_strcmp0 ("CommitText", signal_name) == 0) {
+        GVariant *arg0 = NULL;
+        g_variant_get (parameters, "(v)", &arg0);
+        g_return_if_fail (arg0 != NULL);
+
+        IBusText *text = IBUS_TEXT (ibus_serializable_deserialize (arg0));
+        g_variant_unref (arg0);
+        g_return_if_fail (text != NULL);
+        g_signal_emit (panel, panel_signals[COMMIT_TEXT], 0, text);
+        _g_object_unref_if_floating (text);
+        return;
+    }
+
     /* shound not be reached */
     g_return_if_reached ();
 }
@@ -472,6 +510,18 @@ bus_panel_proxy_property_activate (BusPanelProxy *panel,
     }
 }
 
+static void
+bus_panel_proxy_commit_text (BusPanelProxy *panel,
+                             IBusText      *text)
+{
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    g_assert (text != NULL);
+
+    if (panel->focused_context) {
+        bus_input_context_commit_text (panel->focused_context, text);
+    }
+}
+
 #define DEFINE_FUNCTION(Name, name)                     \
     void bus_panel_proxy_##name (BusPanelProxy *panel)  \
     {                                                   \
@@ -697,6 +747,10 @@ void
 bus_panel_proxy_focus_in (BusPanelProxy     *panel,
                           BusInputContext   *context)
 {
+    const gchar *path;
+    guint purpose, hints;
+    gint i;
+
     g_assert (BUS_IS_PANEL_PROXY (panel));
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
@@ -709,7 +763,7 @@ bus_panel_proxy_focus_in (BusPanelProxy     *panel,
     g_object_ref_sink (context);
     panel->focused_context = context;
 
-    const gchar *path = ibus_service_get_object_path ((IBusService *)context);
+    path = ibus_service_get_object_path ((IBusService *)context);
 
     g_dbus_proxy_call ((GDBusProxy *)panel,
                        "FocusIn",
@@ -718,7 +772,6 @@ bus_panel_proxy_focus_in (BusPanelProxy     *panel,
                        -1, NULL, NULL, NULL);
 
     /* install signal handlers */
-    gint i;
     for (i = 0; i < G_N_ELEMENTS (input_context_signals); i++) {
         g_signal_connect (context,
                           input_context_signals[i].name,
@@ -726,7 +779,6 @@ bus_panel_proxy_focus_in (BusPanelProxy     *panel,
                           panel);
     }
 
-    guint purpose, hints;
     bus_input_context_get_content_type (context, &purpose, &hints);
     bus_panel_proxy_set_content_type (panel, purpose, hints);
 }
diff --git a/configure.ac b/configure.ac
index 23e093ea6..6b23ce6eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,6 +626,16 @@ AC_ARG_WITH(emoji-json-file,
 )
 AC_SUBST(EMOJI_JSON_FILE)
 
+AC_ARG_WITH(emoji-annotation-dir,
+    AS_HELP_STRING([--with-emoji-annotation-dir[=DIR]],
+        [Set the directory of CLDR annotation files.
+         (default: "/usr/share/unicode/cldr/common/annotations")
+         You can get https://github.com/fujiwarat/cldr-emoji-annotation]),
+    EMOJI_ANNOTATION_DIR=$with_emoji_annotation_dir,
+    EMOJI_ANNOTATION_DIR="/usr/share/unicode/cldr/common/annotations"
+)
+AC_SUBST(EMOJI_ANNOTATION_DIR)
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -712,6 +722,7 @@ Build options:
   Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
   emoji.json path               $EMOJI_JSON_FILE
+  CLDR annotation dir           $EMOJI_ANNOTATION_DIR
   Run test cases                $enable_tests
 ])
 
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index b034133fa..218d223a2 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -105,6 +105,18 @@
           <long>The shortcut keys for turning input method on or off</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/general/hotkey/emoji</key>
+      <applyto>/desktop/ibus/general/hotkey/emoji</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[&lt;Control&gt;&lt;Shift&gt;e]</default>
+      <locale name="C">
+        <short>Emoji shortcut keys for gtk_accelerator_parse</short>
+          <long>The shortcut keys for turning emoji typing on or off</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/enable_unconditional</key>
       <applyto>/desktop/ibus/general/hotkey/enable_unconditional</applyto>
@@ -353,6 +365,30 @@
 	    <long>Custom font name for language panel</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji_font</key>
+      <applyto>/desktop/ibus/panel/emoji_font</applyto>
+      <owner>ibus</owner>
+      <type>string</type>
+      <default>Monospace 16</default>
+      <locale name="C">
+        <short>Custom font</short>
+	    <long>Custom font name for emoji chracters on emoji dialog</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji_favorites</key>
+      <applyto>/desktop/ibus/panel/emoji_favorites</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <default>[]</default>
+      <list_type>string</list_type>
+      <locale name="C">
+        <short>favorite emoji list on emoji dialog</short>
+	    <long>You can show the favorite emojis on emoji list
+                  if this list has any characters.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/embed_preedit_text</key>
       <applyto>/desktop/ibus/general/embed_preedit_text</applyto>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d760cf5c3..469f90bcf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -55,6 +55,7 @@ tools/main.vala
 ui/gtk3/application.vala
 ui/gtk3/candidatearea.vala
 ui/gtk3/candidatepanel.vala
+ui/gtk3/emojier.vala
 ui/gtk3/handle.vala
 ui/gtk3/iconwidget.vala
 ui/gtk3/keybindingmanager.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1d1229340..a818c485d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -11,6 +11,7 @@ ui/gtk2/panel.py
 ui/gtk3/application.c
 ui/gtk3/candidatearea.c
 ui/gtk3/candidatepanel.c
+ui/gtk3/emojier.c
 ui/gtk3/handle.c
 ui/gtk3/iconwidget.c
 ui/gtk3/keybindingmanager.c
diff --git a/setup/main.py b/setup/main.py
index e1f7a9d61..cac57f0aa 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -3,6 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2016 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -109,16 +110,24 @@ def __init__(self):
         self.__builder.add_from_file(gtk_builder_file);
         self.__init_ui()
 
-    def __init_hotkey(self):
+    def __init_hotkeys(self):
         name = 'triggers'
         label = 'switch_engine'
+        comment = \
+            _("Use shortcut with shift to switch to the previous input method") 
+        self.__init_hotkey(name, label, comment)
+        name = 'emoji'
+        label = 'emoji_dialog'
+        self.__init_hotkey(name, label)
+
+    def __init_hotkey(self, name, label, comment=None):
         shortcuts = self.__settings_hotkey.get_strv(name)
         button = self.__builder.get_object("button_%s" % label)
         entry = self.__builder.get_object("entry_%s" % label)
         entry.set_text("; ".join(shortcuts))
         tooltip = "\n".join(shortcuts)
-        tooltip += "\n" + \
-            _("Use shortcut with shift to switch to the previous input method") 
+        if comment != None:
+            tooltip += "\n" + comment
         entry.set_tooltip_text(tooltip)
         button.connect("clicked", self.__shortcut_button_clicked_cb,
                 name, "general/hotkey", label, entry)
@@ -159,14 +168,24 @@ def __init_panel(self):
 
         self.__fontbutton_custom_font = self.__builder.get_object(
                 "fontbutton_custom_font")
+        self.__fontbutton_emoji_font = self.__builder.get_object(
+                "fontbutton_emoji_font")
         self.__settings_panel.bind('custom-font',
                                     self.__fontbutton_custom_font,
                                    'font-name',
                                    Gio.SettingsBindFlags.DEFAULT)
+        self.__settings_panel.bind('emoji-font',
+                                    self.__fontbutton_emoji_font,
+                                   'font-name',
+                                   Gio.SettingsBindFlags.DEFAULT)
         self.__settings_panel.bind('use-custom-font',
                                     self.__fontbutton_custom_font,
                                    'sensitive',
                                    Gio.SettingsBindFlags.GET)
+        self.__settings_panel.bind('use-custom-font',
+                                    self.__fontbutton_emoji_font,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.GET)
 
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(
@@ -270,7 +289,7 @@ def __init_ui(self):
         self.__checkbutton_auto_start.connect("toggled",
                 self.__checkbutton_auto_start_toggled_cb)
 
-        self.__init_hotkey()
+        self.__init_hotkeys()
         self.__init_panel()
         self.__init_general()
 
diff --git a/setup/setup.ui b/setup/setup.ui
index 7bd50f3a2..d5ee39273 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -131,6 +131,21 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="emoji_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys for showing emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji dialog:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkBox" id="hbox4">
                             <property name="orientation">horizontal</property>
@@ -260,6 +275,49 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkBox" id="emoji_hbox">
+                            <property name="orientation">horizontal</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_emoji_dialog">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_emoji_dialog">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="no_show_all">True</property>
@@ -603,12 +661,38 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFontButton" id="fontbutton_custom_font">
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkBox" id="fontbutton_box">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkFontButton" id="fontbutton_custom_font">
+                              <property name="use_action_appearance">False</property>
+                              <property name="visible">True</property>
+                              <property name="can_focus">True</property>
+                              <property name="receives_default">True</property>
+                              <property name="use_action_appearance">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFontButton" id="fontbutton_emoji_font">
+                              <property name="use_action_appearance">False</property>
+                              <property name="visible">True</property>
+                              <property name="can_focus">True</property>
+                              <property name="receives_default">True</property>
+                              <property name="use_action_appearance">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index b58ab951b..0d403e8b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -71,86 +71,88 @@ libibus_1_0_la_LDFLAGS =            \
     $(NULL)
 
 ibus_sources =              \
-    ibusshare.c             \
-    ibusobject.c            \
-    ibusserializable.c      \
-    ibusproxy.c             \
-    ibusservice.c           \
-    ibusfactory.c           \
-    ibusengine.c            \
-    ibuserror.c             \
-    ibustext.c              \
-    ibuskeymap.c            \
     ibusattribute.c         \
     ibusattrlist.c          \
-    ibusproperty.c          \
-    ibusproplist.c          \
-    ibuslookuptable.c       \
-    ibusinputcontext.c      \
+    ibusbus.c               \
+    ibuscomponent.c         \
     ibusconfig.c            \
     ibusconfigservice.c     \
-    ibuspanelservice.c      \
-    ibusbus.c               \
+    ibusemoji.c             \
+    ibusengine.c            \
+    ibusenginedesc.c        \
+    ibusenginesimple.c      \
+    ibuserror.c             \
+    ibusfactory.c           \
+    ibushotkey.c            \
+    ibusinputcontext.c      \
+    ibuskeymap.c            \
     ibuskeynames.c          \
     ibuskeyuni.c            \
-    ibushotkey.c            \
-    ibusxml.c               \
-    ibusenginedesc.c        \
+    ibuslookuptable.c       \
+    ibusobject.c            \
     ibusobservedpath.c      \
-    ibuscomponent.c         \
-    ibusutil.c              \
-    ibusenginesimple.c      \
+    ibuspanelservice.c      \
+    ibusproperty.c          \
+    ibusproplist.c          \
+    ibusproxy.c             \
     ibusregistry.c          \
+    ibusserializable.c      \
+    ibusservice.c           \
+    ibusshare.c             \
+    ibustext.c              \
+    ibusutil.c              \
+    ibusxml.c               \
     $(NULL)
 libibus_1_0_la_SOURCES =    \
-    ibusmarshalers.c        \
     ibuscomposetable.c      \
     ibusenumtypes.c         \
+    ibusmarshalers.c        \
     $(ibus_sources)         \
     $(NULL)
 ibus_marshalers_sources =   \
-    ibusmarshalers.h        \
     ibusmarshalers.c        \
+    ibusmarshalers.h        \
     $(NULL)
 ibus_enumtypes_sources =    \
-    ibusenumtypes.h         \
     ibusenumtypes.c         \
+    ibusenumtypes.h         \
     $(NULL)
 ibus_headers =              \
     ibus.h                  \
-    ibusshare.h             \
+    ibusattribute.h         \
+    ibusattrlist.h          \
+    ibusbus.h               \
+    ibuscomponent.h         \
+    ibusconfig.h            \
+    ibusconfigservice.h     \
     ibusdebug.h             \
-    ibusobject.h            \
-    ibusserializable.h      \
-    ibusproxy.h             \
-    ibusservice.h           \
-    ibusfactory.h           \
+    ibusemoji.h             \
     ibusengine.h            \
+    ibusenginedesc.h        \
+    ibusenginesimple.h      \
     ibuserror.h             \
-    ibustext.h              \
+    ibusfactory.h           \
+    ibushotkey.h            \
+    ibusinputcontext.h      \
     ibuskeymap.h            \
-    ibusattribute.h         \
-    ibusattrlist.h          \
-    ibusproperty.h          \
-    ibusproplist.h          \
+    ibuskeys.h              \
+    ibuskeysyms-compat.h    \
+    ibuskeysyms.h           \
     ibuslookuptable.h       \
-    ibusinputcontext.h      \
-    ibusconfig.h            \
-    ibusconfigservice.h     \
+    ibusobject.h            \
+    ibusobservedpath.h      \
     ibuspanelservice.h      \
-    ibuskeysyms.h           \
-    ibuskeysyms-compat.h    \
-    ibuskeys.h              \
+    ibusproperty.h          \
+    ibusproplist.h          \
+    ibusproxy.h             \
+    ibusregistry.h          \
+    ibusserializable.h      \
+    ibusservice.h           \
+    ibusshare.h             \
+    ibustext.h              \
     ibustypes.h             \
-    ibusbus.h               \
-    ibushotkey.h            \
-    ibusxml.h               \
-    ibusenginedesc.h        \
-    ibusobservedpath.h      \
-    ibuscomponent.h         \
     ibusutil.h              \
-    ibusenginesimple.h      \
-    ibusregistry.h          \
+    ibusxml.h               \
     $(NULL)
 ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
 ibus_public_headers =       \
@@ -162,11 +164,11 @@ ibusinclude_HEADERS =       \
     $(ibus_public_headers)  \
     $(NULL)
 ibus_private_headers =          \
+    gtkimcontextsimpleseqs.h    \
     ibuscomposetable.h          \
     ibusenginesimpleprivate.h   \
     ibusinternal.h              \
     keyname-table.h             \
-    gtkimcontextsimpleseqs.h    \
     $(NULL)
 noinst_HEADERS =            \
     $(ibus_private_headers) \
@@ -235,13 +237,61 @@ if ENABLE_EMOJI_DICT
 AM_CPPFLAGS += -DENABLE_EMOJI_DICT
 
 dictdir = $(pkgdatadir)/dicts
-dict_DATA = emoji.dict
+dict_DATA = dicts/emoji-en.dict
+LANG_FILES = $(basename $(notdir $(wildcard $(EMOJI_ANNOTATION_DIR)/*.xml)))
 
 noinst_PROGRAMS = emoji-parser
 
-emoji.dict: emoji-parser
-	$(builddir)/emoji-parser --xml $(srcdir)/../data/annotations/en.xml \
-	--json $(EMOJI_JSON_FILE) --out $@
+dicts/emoji-en.dict: emoji-parser
+	$(AM_V_at)for f in $(LANG_FILES) ; do \
+	    if test x"$$f" = xen ; then \
+	        $(builddir)/emoji-parser \
+	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
+	            --json $(EMOJI_JSON_FILE) \
+	            --out $@; \
+	    else \
+	        $(builddir)/emoji-parser \
+	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
+	            --out dicts/emoji-$$f.dict; \
+	    fi; \
+	    echo "Generated dicts/emoji-$$f.dict"; \
+	done
+
+install-data-hook: $(dict_DATA)
+	@$(NORMAL_INSTALL)
+	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \
+        test -n "$(dictdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dictdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dictdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | \
+	while read files; do \
+	  if [ x$(AM_DEFAULT_VERBOSITY) = x1 ] ; then \
+	      echo "$(INSTALL_DATA) $$files '$(DESTDIR)$(dictdir)'"; \
+	  else \
+	      echo "Installing $$files"; \
+	  fi; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dictdir)" || exit $$?; \
+	done
+
+dict__uninstall_files_from_dir = { \
+    test -z "$$files" \
+        || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+        || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+             cd "$$dir" && rm -f $$files; }; \
+    }
+
+# for make dist
+uninstall-hook:
+	@$(NORMAL_UNINSTALL)
+	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \
+	test -n "$(dictdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(dictdir)'; $(dict__uninstall_files_from_dir)
 
 emoji_parser_SOURCES =          \
     emoji-parser.c              \
@@ -256,9 +306,9 @@ emoji_parser_LDADD =            \
     $(libibus)                  \
     $(NULL)
 
-CLEANFILES +=                   \
-    $(dict_DATA)                \
-    $(NULL)
+clean-local:
+	-rm -rf dicts
+	$(NULL)
 endif
 
 EXTRA_DIST =                    \
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index e97f2660d..c5af42c68 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -33,14 +33,16 @@
 
 #include <string.h>
 
-#include "ibusutil.h"
+#include "ibusemoji.h"
 
 typedef struct _EmojiData EmojiData;
 struct _EmojiData {
     gchar      *emoji;
     GSList     *annotations;
     gboolean    is_annotation;
-    GHashTable *dict;
+    gchar      *description;
+    gchar      *category;
+    GSList     *list;
 };
 
 static void
@@ -51,35 +53,63 @@ reset_emoji_element (EmojiData *data)
     g_clear_pointer (&data->emoji, g_free);
     g_slist_free_full (data->annotations, g_free);
     data->annotations = NULL;
+    g_clear_pointer (&data->description, g_free);
+    g_clear_pointer (&data->category, g_free);
 }
 
-static void
-update_emoji_dict (EmojiData *data)
+gint
+find_emoji_data_list (IBusEmojiData *a,
+                      const gchar   *b)
 {
-    GSList *annotations = data->annotations;
-    while (annotations) {
-        const gchar *annotation = (const gchar *) annotations->data;
-        GSList *emojis = g_hash_table_lookup (data->dict, annotation);
-        if (emojis) {
-            GSList *duplicated = g_slist_find_custom (emojis,
-                                                      data->emoji,
-                                                      (GCompareFunc) g_strcmp0);
-            if (duplicated != NULL)
-                 continue;
-            emojis = g_slist_copy_deep (emojis, (GCopyFunc) g_strdup, NULL);
-        }
-        emojis = g_slist_append (emojis, g_strdup (data->emoji));
-        g_hash_table_replace (data->dict,
-                              g_strdup (annotation),
-                              emojis);
-        annotations = annotations->next;
-    }
+   g_return_val_if_fail (IBUS_IS_EMOJI_DATA (a), 0);
+   return g_strcmp0 (ibus_emoji_data_get_emoji (a), b);
 }
 
 static void
-free_dict_words (gpointer list)
+update_emoji_list (EmojiData *data)
 {
-    g_slist_free_full (list, g_free);
+    GSList *list = g_slist_find_custom (
+            data->list,
+            data->emoji,
+            (GCompareFunc) find_emoji_data_list);
+    if (list) {
+        IBusEmojiData *emoji = list->data;
+        GSList *src_annotations = data->annotations;
+        GSList *dest_annotations = ibus_emoji_data_get_annotations (emoji);
+        GSList *l;
+        gboolean updated_annotations = FALSE;
+        for (l = src_annotations; l; l = l->next) {
+            GSList *duplicated = g_slist_find_custom (dest_annotations,
+                                                      l->data,
+                                                      (GCompareFunc) g_strcmp0);
+            if (duplicated == NULL) {
+                dest_annotations = g_slist_append (dest_annotations,
+                                                   g_strdup (l->data));
+                updated_annotations = TRUE;
+            }
+        }
+        if (updated_annotations) {
+            ibus_emoji_data_set_annotations (
+                    emoji,
+                    g_slist_copy_deep (dest_annotations,
+                                       (GCopyFunc) g_strdup,
+                                       NULL));
+        }
+    } else {
+        IBusEmojiData *emoji =
+                ibus_emoji_data_new ("emoji",
+                                     data->emoji,
+                                     "annotations",
+                                     data->annotations,
+                                     "description",
+                                     data->description ? data->description
+                                             : g_strdup (""),
+                                     "category",
+                                     data->category ? data->category
+                                             : g_strdup (""),
+                                     NULL);
+        data->list = g_slist_append (data->list, emoji);
+    }
 }
 
 static void
@@ -109,11 +139,13 @@ unicode_annotations_start_element_cb (GMarkupParseContext *context,
             if (value == NULL || *value == '\0') {
                 g_warning ("cp='' in unicode.org annotations file");
                 return;
-            } else if (value[0] != '[' || value[strlen(value) - 1] != ']') {
-                g_warning ("cp!='[emoji]' in unicode.org annotations file");
-                return;
+            } else if (value[0] == '[' && value[strlen(value) - 1] == ']') {
+                g_warning ("cp!='[emoji]' is an old format in unicode.org"
+                           " annotations file");
+                data->emoji = g_strndup (value + 1, strlen(value) - 2);
+            } else {
+                data->emoji = g_strdup (value);
             }
-            data->emoji = g_strndup (value + 1, strlen(value) - 2);
         }
         else if (g_strcmp0 (attribute, "tts") == 0) {
             GSList *duplicated = g_slist_find_custom (data->annotations,
@@ -141,7 +173,7 @@ unicode_annotations_end_element_cb (GMarkupParseContext *context,
     if (!data->is_annotation)
         return;
 
-    update_emoji_dict (data);
+    update_emoji_list (data);
     data->is_annotation = FALSE;
 }
 
@@ -160,7 +192,7 @@ unicode_annotations_text_cb (GMarkupParseContext *context,
     g_assert (data != NULL);
     if (!data->is_annotation)
         return;
-    annotations = g_strsplit (text, "; ", -1);
+    annotations = g_strsplit (text, " | ", -1);
     for (i = 0; (annotation = annotations[i]) != NULL; i++) {
         GSList *duplicated = g_slist_find_custom (data->annotations,
                                                   annotation,
@@ -174,8 +206,8 @@ unicode_annotations_text_cb (GMarkupParseContext *context,
 }
 
 static gboolean
-unicode_annotations_parse_xml_file (const gchar *filename,
-                                    GHashTable  *dict)
+unicode_annotations_parse_xml_file (const gchar  *filename,
+                                    GSList      **list)
 {
     gchar *content = NULL;
     gsize length = 0;
@@ -191,14 +223,14 @@ unicode_annotations_parse_xml_file (const gchar *filename,
     EmojiData data = { 0, };
 
     g_return_val_if_fail (filename != NULL, FALSE);
-    g_return_val_if_fail (dict != NULL, FALSE);
+    g_return_val_if_fail (list != NULL, FALSE);
 
     if (!g_file_get_contents (filename, &content, &length, &error)) {
         g_warning ("Failed to load %s: %s", filename, error->message);
         goto failed_to_parse_unicode_annotations;
     }
 
-    data.dict = dict;
+    data.list = *list;
 
     context = g_markup_parse_context_new (&parser, 0, &data, NULL);
     if (!g_markup_parse_context_parse (context, content, length, &error)) {
@@ -209,13 +241,14 @@ unicode_annotations_parse_xml_file (const gchar *filename,
     reset_emoji_element (&data);
     g_markup_parse_context_free (context);
     g_free (content);
+    *list = data.list;
     return TRUE;
 
 failed_to_parse_unicode_annotations:
     if (error)
         g_error_free (error);
-    if (data.dict)
-        g_hash_table_destroy (data.dict);
+    if (data.list)
+        g_slist_free (data.list);
     if (context)
         g_markup_parse_context_free (context);
     g_free (content);
@@ -319,6 +352,27 @@ parse_emojione_shortname (JsonNode  *node,
     return TRUE;
 }
 
+static gboolean
+parse_emojione_name (JsonNode  *node,
+                     EmojiData *data)
+{
+    const gchar *name;
+
+    if (json_node_get_node_type (node) != JSON_NODE_VALUE) {
+        g_warning ("'name' element is not string");
+        return FALSE;
+    }
+
+    name = json_node_get_string (node);
+
+    if (name == NULL || *name == '\0')
+        return TRUE;
+
+    data->description = g_strdup (name);
+
+    return TRUE;
+}
+
 static gboolean
 parse_emojione_category (JsonNode  *node,
                          EmojiData *data)
@@ -336,6 +390,7 @@ parse_emojione_category (JsonNode  *node,
     if (category == NULL || *category == '\0')
         return TRUE;
 
+    data->category = g_strdup (category);
     duplicated = g_slist_find_custom (data->annotations,
                                       category,
                                       (GCompareFunc) g_strcmp0);
@@ -414,6 +469,8 @@ parse_emojione_emoji_data (JsonNode    *node,
         return parse_emojione_unicode (node, data);
     else if (g_strcmp0 (member, "shortname") == 0)
         return parse_emojione_shortname (node, data);
+    else if (g_strcmp0 (member, "name") == 0)
+        return parse_emojione_name (node, data);
     else if (g_strcmp0 (member, "category") == 0)
         return parse_emojione_category (node, data);
     else if (g_strcmp0 (member, "aliases_ascii") == 0)
@@ -450,14 +507,14 @@ parse_emojione_element (JsonNode  *node,
     }
     g_list_free (members);
 
-    update_emoji_dict (data);
+    update_emoji_list (data);
 
     return TRUE;
 }
 
 static gboolean
-emojione_parse_json_file (const gchar *filename,
-                          GHashTable  *dict)
+emojione_parse_json_file (const gchar  *filename,
+                          GSList      **list)
 {
     JsonParser *parser = json_parser_new ();
     JsonNode *node;
@@ -467,7 +524,7 @@ emojione_parse_json_file (const gchar *filename,
     EmojiData data = { 0, };
 
     g_return_val_if_fail (filename != NULL, FALSE);
-    g_return_val_if_fail (dict != NULL, FALSE);
+    g_return_val_if_fail (list != NULL, FALSE);
 
     if (!json_parser_load_from_file (parser, filename, &error)) {
         g_error ("%s", error->message);
@@ -483,7 +540,7 @@ emojione_parse_json_file (const gchar *filename,
 
     object = json_node_get_object (node);
     members = json_object_get_members (object);
-    data.dict = dict;
+    data.list = *list;
 
     m = members;
     while (m) {
@@ -498,6 +555,7 @@ emojione_parse_json_file (const gchar *filename,
     g_list_free (members);
     reset_emoji_element (&data);
     g_object_unref (parser);
+    *list = data.list;
 
     return TRUE;
 
@@ -519,7 +577,7 @@ main (int argc, char *argv[])
           "JSON"
         },
         { "out", 'o', 0, G_OPTION_ARG_STRING, &output,
-          "Save the emoji dictionary as FILE",
+          "Save the emoji data as FILE",
           "FILE"
         },
         { "xml", 'x', 0, G_OPTION_ARG_STRING, &xml_file,
@@ -530,7 +588,7 @@ main (int argc, char *argv[])
     };
     GOptionContext *context;
     GError *error = NULL;
-    GHashTable *dict;
+    GSList *list = NULL;
 
     prgname = g_path_get_basename (argv[0]);
     g_set_prgname (prgname);
@@ -552,17 +610,14 @@ main (int argc, char *argv[])
     }
     g_option_context_free (context);
 
-    dict = g_hash_table_new_full (g_str_hash,
-                                  g_str_equal,
-                                  g_free,
-                                  free_dict_words);
-    if (xml_file)
-        unicode_annotations_parse_xml_file (xml_file, dict);
     if (json_file)
-        emojione_parse_json_file (json_file, dict);
-    if (g_hash_table_size (dict) > 0 && output)
-        ibus_emoji_dict_save (output, dict);
-    g_hash_table_destroy (dict);
+        emojione_parse_json_file (json_file, &list);
+    if (xml_file)
+        unicode_annotations_parse_xml_file (xml_file, &list);
+    if (list != NULL && output)
+        ibus_emoji_data_save (output, list);
+    if (list)
+        g_slist_free (list);
 
     return 0;
 }
diff --git a/src/ibus.h b/src/ibus.h
index d8e226ed4..c6cf58cf5 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -56,6 +56,7 @@
 #include <ibuspanelservice.h>
 #include <ibusutil.h>
 #include <ibusregistry.h>
+#include <ibusemoji.h>
 
 #ifndef IBUS_DISABLE_DEPRECATED
 #include <ibuskeysyms-compat.h>
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
new file mode 100644
index 000000000..8d8870489
--- /dev/null
+++ b/src/ibusemoji.c
@@ -0,0 +1,585 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017 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
+ * 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
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gstdio.h>
+#include "ibusemoji.h"
+#include "ibusinternal.h"
+
+#define IBUS_EMOJI_DATA_MAGIC "IBusEmojiData"
+#define IBUS_EMOJI_DATA_VERSION (1)
+
+enum {
+    PROP_0 = 0,
+    PROP_EMOJI,
+    PROP_ANNOTATIONS,
+    PROP_DESCRIPTION,
+    PROP_CATEGORY
+};
+
+struct _IBusEmojiDataPrivate {
+    gchar      *emoji;
+    GSList     *annotations;
+    gchar      *description;
+    gchar      *category;
+};
+
+#define IBUS_EMOJI_DATA_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+    IBUS_TYPE_EMOJI_DATA, \
+    IBusEmojiDataPrivate))
+
+/* functions prototype */
+static void      ibus_emoji_data_set_property  (IBusEmojiData       *emoji,
+                                                guint                prop_id,
+                                                const GValue        *value,
+                                                GParamSpec          *pspec);
+static void      ibus_emoji_data_get_property  (IBusEmojiData       *emoji,
+                                                guint                prop_id,
+                                                GValue              *value,
+                                                GParamSpec          *pspec);
+static void      ibus_emoji_data_destroy       (IBusEmojiData       *emoji);
+static gboolean  ibus_emoji_data_serialize     (IBusEmojiData       *emoji,
+                                                GVariantBuilder     *builder);
+static gint      ibus_emoji_data_deserialize   (IBusEmojiData       *emoji,
+                                                GVariant            *variant);
+static gboolean  ibus_emoji_data_copy          (IBusEmojiData       *emoji,
+                                                const IBusEmojiData *src);
+
+G_DEFINE_TYPE (IBusEmojiData, ibus_emoji_data, IBUS_TYPE_SERIALIZABLE)
+
+static void
+ibus_emoji_data_class_init (IBusEmojiDataClass *class)
+{
+    IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
+
+    object_class->destroy = (IBusObjectDestroyFunc) ibus_emoji_data_destroy;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_emoji_data_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_emoji_data_get_property;
+    serializable_class->serialize   =
+            (IBusSerializableSerializeFunc) ibus_emoji_data_serialize;
+    serializable_class->deserialize =
+            (IBusSerializableDeserializeFunc) ibus_emoji_data_deserialize;
+    serializable_class->copy        =
+            (IBusSerializableCopyFunc) ibus_emoji_data_copy;
+
+    g_type_class_add_private (class, sizeof (IBusEmojiDataPrivate));
+
+    /* install properties */
+    /**
+     * IBusEmojiData:emoji:
+     *
+     * The emoji character
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_EMOJI,
+                    g_param_spec_string ("emoji",
+                        "emoji character",
+                        "The emoji character UTF-8",
+                        NULL,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEmojiData:annotations:
+     *
+     * The emoji annotations
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_ANNOTATIONS,
+                    g_param_spec_pointer ("annotations",
+                        "emoji annotations",
+                        "The emoji annotation list",
+                        G_PARAM_READWRITE));
+
+    /**
+     * IBusEmojiData:description:
+     *
+     * The emoji description
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_DESCRIPTION,
+                    g_param_spec_string ("description",
+                        "emoji description",
+                        "The emoji description",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEmojiData:category:
+     *
+     * The emoji category
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_CATEGORY,
+                    g_param_spec_string ("category",
+                        "emoji category",
+                        "The emoji category",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+ibus_emoji_data_init (IBusEmojiData *emoji)
+{
+    emoji->priv = IBUS_EMOJI_DATA_GET_PRIVATE (emoji);
+}
+
+static void
+free_dict_words (gpointer list)
+{
+    g_slist_free_full (list, g_free);
+}
+
+static void
+ibus_emoji_data_destroy (IBusEmojiData *emoji)
+{
+    g_clear_pointer (&emoji->priv->emoji, g_free);
+    g_clear_pointer (&emoji->priv->annotations, free_dict_words);
+    g_clear_pointer (&emoji->priv->description, g_free);
+    g_clear_pointer (&emoji->priv->category, g_free);
+
+    IBUS_OBJECT_CLASS (ibus_emoji_data_parent_class)->
+            destroy (IBUS_OBJECT (emoji));
+}
+
+static void
+ibus_emoji_data_set_property (IBusEmojiData *emoji,
+                              guint          prop_id,
+                              const GValue  *value,
+                              GParamSpec    *pspec)
+{
+    switch (prop_id) {
+    case PROP_EMOJI:
+        g_assert (emoji->priv->emoji == NULL);
+        emoji->priv->emoji = g_value_dup_string (value);
+        break;
+    case PROP_ANNOTATIONS:
+        g_assert (emoji->priv->annotations == NULL);
+        emoji->priv->annotations =
+                g_slist_copy_deep (g_value_get_pointer (value),
+                                   (GCopyFunc) g_strdup, NULL);
+        break;
+    case PROP_DESCRIPTION:
+        g_assert (emoji->priv->description == NULL);
+        emoji->priv->description = g_value_dup_string (value);
+        break;
+    case PROP_CATEGORY:
+        g_assert (emoji->priv->category == NULL);
+        emoji->priv->category = g_value_dup_string (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
+    }
+}
+
+static void
+ibus_emoji_data_get_property (IBusEmojiData *emoji,
+                              guint          prop_id,
+                              GValue        *value,
+                              GParamSpec    *pspec)
+{
+    switch (prop_id) {
+    case PROP_EMOJI:
+        g_value_set_string (value, ibus_emoji_data_get_emoji (emoji));
+        break;
+    case PROP_ANNOTATIONS:
+        g_value_set_pointer (
+                value,
+                g_slist_copy_deep (ibus_emoji_data_get_annotations (emoji),
+                                   (GCopyFunc) g_strdup, NULL));
+        break;
+    case PROP_DESCRIPTION:
+        g_value_set_string (value, ibus_emoji_data_get_description (emoji));
+        break;
+    case PROP_CATEGORY:
+        g_value_set_string (value, ibus_emoji_data_get_category (emoji));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_emoji_data_serialize (IBusEmojiData   *emoji,
+                           GVariantBuilder *builder)
+{
+    GSList *l;
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_emoji_data_parent_class)->
+            serialize ((IBusSerializable *)emoji, builder);
+    g_return_val_if_fail (retval, FALSE);
+
+#define NOTNULL(s) ((s) != NULL ? (s) : "")
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->emoji));
+    g_variant_builder_add (builder, "u",
+                           g_slist_length (emoji->priv->annotations));
+    for (l = emoji->priv->annotations; l != NULL; l = l->next) {
+        g_variant_builder_add (builder, "s", NOTNULL (l->data));
+    }
+    g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->description));
+    g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->category));
+    return TRUE;
+}
+
+static gint
+ibus_emoji_data_deserialize (IBusEmojiData *emoji,
+                             GVariant      *variant)
+{
+    guint length, i;
+    GSList *annotations = NULL;
+    gint retval = IBUS_SERIALIZABLE_CLASS (ibus_emoji_data_parent_class)->
+            deserialize ((IBusSerializable *)emoji, variant);
+    g_return_val_if_fail (retval, 0);
+
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &emoji->priv->emoji);
+    g_variant_get_child (variant, retval++, "u", &length);
+    for (i = 0; i < length; i++) {
+        gchar *s = NULL;
+        g_variant_get_child (variant, retval++, "s", &s);
+        annotations = g_slist_append (annotations, s);
+    }
+    emoji->priv->annotations = annotations;
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &emoji->priv->description);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &emoji->priv->category);
+    return retval;
+}
+
+static gboolean
+ibus_emoji_data_copy (IBusEmojiData       *dest,
+                      const IBusEmojiData *src)
+{
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_emoji_data_parent_class)->
+            copy ((IBusSerializable *)dest,
+                  (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest->priv->emoji            = g_strdup (src->priv->emoji);
+    dest->priv->annotations      = g_slist_copy_deep (src->priv->annotations,
+                                                      (GCopyFunc) g_strdup,
+                                                      NULL);
+    dest->priv->description      = g_strdup (src->priv->description);
+    dest->priv->category         = g_strdup (src->priv->category);
+    return TRUE;
+}
+
+IBusEmojiData *
+ibus_emoji_data_new (const gchar *first_property_name, ...)
+{
+    va_list var_args;
+    IBusEmojiData *emoji;
+
+    g_assert (first_property_name != NULL);
+    va_start (var_args, first_property_name);
+    emoji = (IBusEmojiData *) g_object_new_valist (IBUS_TYPE_EMOJI_DATA,
+                                                   first_property_name,
+                                                   var_args);
+    va_end (var_args);
+    /* emoji is required. Other properties are set in class_init by default. */
+    g_assert (emoji->priv->emoji != NULL);
+    g_assert (emoji->priv->description != NULL);
+    g_assert (emoji->priv->category != NULL);
+    return emoji;
+}
+
+const gchar *
+ibus_emoji_data_get_emoji (IBusEmojiData *emoji)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
+
+    return emoji->priv->emoji;
+}
+
+GSList *
+ibus_emoji_data_get_annotations (IBusEmojiData *emoji)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
+
+    return emoji->priv->annotations;
+}
+
+void
+ibus_emoji_data_set_annotations (IBusEmojiData *emoji,
+                                 GSList        *annotations)
+{
+    g_return_if_fail (IBUS_IS_EMOJI_DATA (emoji));
+
+    if (emoji->priv->annotations)
+        g_slist_free_full (emoji->priv->annotations, g_free);
+    emoji->priv->annotations = annotations;
+}
+
+const gchar *
+ibus_emoji_data_get_description (IBusEmojiData *emoji)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
+
+    return emoji->priv->description;
+}
+
+const gchar *
+ibus_emoji_data_get_category (IBusEmojiData *emoji)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
+
+    return emoji->priv->category;
+}
+
+
+static void
+variant_foreach_add_emoji (IBusEmojiData   *emoji,
+                           GVariantBuilder *builder)
+{
+    g_variant_builder_add (
+            builder, "v",
+            ibus_serializable_serialize (IBUS_SERIALIZABLE (emoji)));
+}
+
+static GVariant *
+ibus_emoji_data_list_serialize (GSList *list)
+{
+    GVariantBuilder builder;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
+    g_slist_foreach (list,  (GFunc) variant_foreach_add_emoji, &builder);
+    return g_variant_builder_end (&builder);
+}
+
+static GSList *
+ibus_emoji_data_list_deserialize (GVariant           *variant)
+{
+    GSList *list = NULL;
+    GVariantIter iter;
+    GVariant *emoji_variant = NULL;
+
+    g_variant_iter_init (&iter, variant);
+    while (g_variant_iter_loop (&iter, "v", &emoji_variant)) {
+        IBusEmojiData *data =
+                IBUS_EMOJI_DATA (ibus_serializable_deserialize (emoji_variant));
+        list = g_slist_append (list, data);
+        g_clear_pointer (&emoji_variant, g_variant_unref);
+    }
+
+    return list;
+}
+
+void
+ibus_emoji_dict_save (const gchar *path,
+                      GHashTable  *dict)
+{
+    GList *values, *v;
+    GSList *list_for_save = NULL;
+
+    g_return_if_fail (path != NULL);
+    g_return_if_fail (dict != NULL);
+
+    values = g_hash_table_get_values (dict);
+    for (v = values; v; v = v->next) {
+        IBusEmojiData *data = v->data;
+        if (!IBUS_IS_EMOJI_DATA (data)) {
+            g_warning ("Your dict format of { annotation char, emoji GSList "
+                       "} is no longer supported.\n"
+                       "{ emoji char, IBusEmojiData GSList } is expected.");
+            return;
+        }
+        list_for_save = g_slist_append (list_for_save, data);
+    }
+
+    ibus_emoji_data_save (path, list_for_save);
+}
+
+GHashTable *
+ibus_emoji_dict_load (const gchar *path)
+{
+    GSList *list = ibus_emoji_data_load (path);
+    GSList *l;
+    GHashTable *dict = g_hash_table_new_full (g_str_hash,
+                                              g_str_equal,
+                                              g_free,
+                                              free_dict_words);
+
+    for (l = list; l; l = l->next) {
+        IBusEmojiData *data = list->data;
+        if (!IBUS_IS_EMOJI_DATA (data)) {
+            g_warning ("Your dict format is no longer supported.\n"
+                       "Need to create the dictionaries again.");
+            return NULL;
+        }
+        g_hash_table_insert (dict,
+                             g_strdup (ibus_emoji_data_get_emoji (data)),
+                             data);
+    }
+
+    g_slist_free (list);
+
+    return dict;
+}
+
+
+IBusEmojiData *
+ibus_emoji_dict_lookup (GHashTable  *dict,
+                        const gchar *emoji)
+{
+    return (IBusEmojiData *) g_hash_table_lookup (dict, emoji);
+}
+
+void
+ibus_emoji_data_save (const gchar *path,
+                      GSList      *list)
+{
+    GVariant *variant;
+    const gchar *header = IBUS_EMOJI_DATA_MAGIC;
+    const guint16 version = IBUS_EMOJI_DATA_VERSION;
+    const gchar *contents;
+    gsize length;
+    gchar *dir;
+    GStatBuf buf = { 0, };
+    GError *error = NULL;
+
+    g_return_if_fail (path != NULL);
+    g_return_if_fail (list != NULL);
+    if (list->data == NULL) {
+        g_warning ("Failed to save IBus emoji data: Need a list data.");
+        return;
+    }
+
+    variant = g_variant_new ("(sqv)",
+                             header,
+                             version,
+                             ibus_emoji_data_list_serialize (list));
+
+    contents =  g_variant_get_data (variant);
+    length =  g_variant_get_size (variant);
+
+    dir = g_path_get_dirname (path);
+    if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
+        g_mkdir_with_parents (dir, 0777);
+    }
+    g_free (dir);
+    if (!g_file_set_contents (path, contents, length, &error)) {
+        g_warning ("Failed to save emoji dict %s: %s", path, error->message);
+        g_error_free (error);
+    }
+
+    g_variant_unref (variant);
+}
+
+GSList *
+ibus_emoji_data_load (const gchar *path)
+{
+    gchar *contents = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    GVariant *variant_table = NULL;
+    GVariant *variant = NULL;
+    const gchar *header = NULL;
+    guint16 version = 0;
+    GSList *retval = NULL;
+
+    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+        g_warning ("Emoji dict does not exist: %s", path);
+        goto out_load_cache;
+    }
+
+    if (!g_file_get_contents (path, &contents, &length, &error)) {
+        g_warning ("Failed to get dict content %s: %s", path, error->message);
+        g_error_free (error);
+        goto out_load_cache;
+    }
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sq)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sq)", &header, &version);
+
+    if (g_strcmp0 (header, IBUS_EMOJI_DATA_MAGIC) != 0) {
+        g_warning ("cache is not IBusEmojiData.");
+        goto out_load_cache;
+    }
+
+    if (version != IBUS_EMOJI_DATA_VERSION) {
+        g_warning ("cache version is different: %u != %u",
+                   version, IBUS_EMOJI_DATA_VERSION);
+        goto out_load_cache;
+    }
+
+    version = 0;
+    header = NULL;
+    g_variant_unref (variant_table);
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sqv)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sqv)",
+                   NULL,
+                   NULL,
+                   &variant);
+
+    if (variant == NULL) {
+        g_warning ("cache dict is broken.");
+        goto out_load_cache;
+    }
+
+    retval = ibus_emoji_data_list_deserialize (variant);
+
+out_load_cache:
+    if (variant)
+        g_variant_unref (variant);
+    if (variant_table)
+        g_variant_unref (variant_table);
+
+    return retval;
+}
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
new file mode 100644
index 000000000..3fd09a94c
--- /dev/null
+++ b/src/ibusemoji.h
@@ -0,0 +1,207 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017 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
+ * 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
+ */
+
+#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
+#error "Only <ibus.h> can be included directly"
+#endif
+
+#ifndef __IBUS_EMOJI_H_
+#define __IBUS_EMOJI_H_
+
+/**
+ * SECTION: ibusemoji
+ * @short_description: emoji utility.
+ * @stability: Unstable
+ *
+ * miscellaneous emoji APIs.
+ */
+
+#include "ibusserializable.h"
+
+/*
+ * Type macros.
+ */
+/* define GOBJECT macros */
+#define IBUS_TYPE_EMOJI_DATA         (ibus_emoji_data_get_type ())
+#define IBUS_EMOJI_DATA(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                      IBUS_TYPE_EMOJI_DATA, IBusEmojiData))
+#define IBUS_EMOJI_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                      IBUS_TYPE_EMOJI_DATA, IBusEmojiDataClass))
+#define IBUS_IS_EMOJI_DATA(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                      IBUS_TYPE_EMOJI_DATA))
+
+
+G_BEGIN_DECLS
+
+typedef struct _IBusEmojiData IBusEmojiData;
+typedef struct _IBusEmojiDataPrivate IBusEmojiDataPrivate;
+typedef struct _IBusEmojiDataClass IBusEmojiDataClass;
+
+/**
+ * IBusEmojiData:
+ *
+ * Emoji data likes emoji unicode, annotations, description, category.
+ * You can get extended values with g_object_get_properties.
+ */
+struct _IBusEmojiData {
+    IBusSerializable parent;
+    /* instance members */
+
+    /*< public >*/
+    /*< private >*/
+    IBusEmojiDataPrivate *priv;
+};
+
+struct _IBusEmojiDataClass {
+    IBusSerializableClass parent;
+    /* class members */
+};
+
+GType           ibus_emoji_data_get_type     (void);
+
+/**
+ * ibus_emoji_data_new:
+ * @first_property_name: Name of the first property.
+ * @...: the NULL-terminated arguments of the properties and values.
+ *
+ * Creates a new #IBusEmojiData.
+ * emoji property is required. e.g.
+ * ibus_emoji_data_new ("emoji", "😁", NULL)
+ *
+ * Returns: A newly allocated #IBusEmojiData.
+ */
+IBusEmojiData * ibus_emoji_data_new          (const gchar *first_property_name,
+                                               ...);
+
+/**
+ * ibus_emoji_data_get_emoji:
+ * @emoji : An #IBusEmojiData
+ *
+ * Gets the emoji character in #IBusEmojiData. It should not be freed.
+ *
+ * Returns: emoji property in #IBusEmojiData
+ */
+const gchar *   ibus_emoji_data_get_emoji       (IBusEmojiData *emoji);
+
+/**
+ * ibus_emoji_data_get_annotations:
+ * @emoji : An #IBusEmojiData
+ *
+ * Gets the annotation list in #IBusEmojiData. It should not be freed.
+ *
+ * Returns: (transfer none) (element-type utf8):
+ *          annotation list property in #IBusEmojiData
+ */
+GSList *        ibus_emoji_data_get_annotations (IBusEmojiData *emoji);
+
+/**
+ * ibus_emoji_data_set_annotations:
+ * @emoji : An #IBusEmojiData
+ * @annotations: (transfer full) (element-type utf8): List of emoji annotations
+ *
+ * Sets the annotation list in #IBusEmojiData.
+ */
+void            ibus_emoji_data_set_annotations (IBusEmojiData *emoji,
+                                                 GSList        *annotations);
+
+/**
+ * ibus_emoji_data_get_description:
+ * @emoji : An #IBusEmojiData
+ *
+ * Gets the emoji description in #IBusEmojiData. It should not be freed.
+ *
+ * Returns: description property in #IBusEmojiData
+ */
+const gchar *   ibus_emoji_data_get_description (IBusEmojiData *emoji);
+
+/**
+ * ibus_emoji_data_get_category:
+ * @emoji : An #IBusEmojiData
+ *
+ * Gets the emoji category in #IBusEmojiData. It should not be freed.
+ *
+ * Returns: category property in #IBusEmojiData
+ */
+const gchar *   ibus_emoji_data_get_category    (IBusEmojiData *emoji);
+
+
+/**
+ * ibus_emoji_dict_save:
+ * @path: A path of the saved dictionary file.
+ * @dict: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
+ *
+ * Saves the Emoji dictionary to the cache file.
+ * Recommend to use ibus_emoji_data_save() instead becase GSList in
+ * GHashTable does not work with Gir and Vala.
+ * Calls ibus_emoji_data_save() internally. The format of the hash table
+ * changed and now is { emoji character, #IBusEmojiData object }.
+ */
+void            ibus_emoji_dict_save            (const gchar    *path,
+                                                 GHashTable     *dict);
+/**
+ * ibus_emoji_dict_load:
+ * @path: A path of the saved dictionary file.
+ *
+ * Returns: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
+ * file loaded from the saved cache file.
+ *
+ * A hash table of { emoji character, #IBusEmojiData object } is loaded
+ * from the saved cache file.
+ * Recommend to use ibus_emoji_data_load() instead becase GSList in
+ * GHashTable does not work with Gir and Vala.
+ * Calls ibus_emoji_data_load() internally.
+ */
+GHashTable *    ibus_emoji_dict_load            (const gchar    *path);
+
+/**
+ * ibus_emoji_dict_lookup:
+ * @dict: (element-type utf8 IBusEmojiData) (transfer full): An Emoji dictionary
+ * @emoji: an emoji character
+ *
+ * Returns: An #IBusEmojiData of @emoji.
+ * This API was prepared for the old dict foramat with Gir and Vala
+ * but no longer needed.
+ * Use ibus_emoji_data_load() instead.
+ */
+IBusEmojiData * ibus_emoji_dict_lookup          (GHashTable     *dict,
+                                                 const gchar    *emoji);
+/**
+ * ibus_emoji_data_save:
+ * @path: A path of the saved emoji data.
+ * @list: (element-type IBusEmojiData) (transfer none): A list of emoji data.
+ *
+ * Save the list of #IBusEmojiData to the cache file.
+ */
+void            ibus_emoji_data_save            (const gchar    *path,
+                                                 GSList         *list);
+
+/**
+ * ibus_emoji_data_load:
+ * @path: A path of the saved dictionary file.
+ *
+ * Returns: (element-type IBusEmojiData) (transfer container):
+ * An #IBusEmojiData list loaded from the saved cache file.
+ */
+GSList *        ibus_emoji_data_load            (const gchar    *path);
+
+G_END_DECLS
+#endif
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 2a98d58e1..cddd932c5 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "ibuscomposetable.h"
+#include "ibusemoji.h"
 #include "ibusenginesimple.h"
 #include "ibusenginesimpleprivate.h"
 
@@ -981,7 +982,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     IBusEngineSimplePrivate *priv = simple->priv;
     gint n_compose = 0;
     gboolean have_hex_mods;
-    gboolean is_hex_start;
+    gboolean is_hex_start = FALSE;
     gboolean is_emoji_start = FALSE;
     gboolean is_hex_end;
     gboolean is_space;
@@ -1055,10 +1056,6 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         have_hex_mods = (modifiers & (HEX_MOD_MASK)) == HEX_MOD_MASK;
     }
 
-    is_hex_start = keyval == IBUS_KEY_U;
-#ifdef ENABLE_EMOJI_DICT
-    is_emoji_start = keyval == IBUS_KEY_E;
-#endif
     is_hex_end = (keyval == IBUS_KEY_space ||
                   keyval == IBUS_KEY_KP_Space ||
                   keyval == IBUS_KEY_Return ||
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index b95f54a92..468aa324d 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -3,6 +3,7 @@
 /* ibus - The Input Bus
  * Copyright (c) 2009-2014 Google Inc. All rights reserved.
  * Copyright (C) 2010-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -231,6 +232,9 @@ static const gchar introspection_xml[] =
     "      <arg type='u' name='button' />"
     "      <arg type='u' name='state' />"
     "    </signal>"
+    "    <signal name='CommitText'>"
+    "      <arg type='v' name='text' />"
+    "    </signal>"
     "  </interface>"
     "</node>";
 
@@ -1311,6 +1315,26 @@ ibus_panel_service_property_hide (IBusPanelService *panel,
                               NULL);
 }
 
+void
+ibus_panel_service_commit_text (IBusPanelService *panel,
+                                IBusText         *text)
+{
+    g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
+    g_return_if_fail (IBUS_IS_TEXT (text));
+
+    GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)text);
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "CommitText",
+                              g_variant_new ("(v)", variant),
+                              NULL);
+
+    if (g_object_is_floating (text)) {
+        g_object_unref (text);
+    }
+}
+
 #define DEFINE_FUNC(name, Name)                             \
     void                                                    \
     ibus_panel_service_##name (IBusPanelService *panel)     \
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index 07b56296f..a5b13c732 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -2,6 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (c) 2009-2014 Google Inc. All rights reserved.
+ * Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -230,6 +231,16 @@ void ibus_panel_service_property_show     (IBusPanelService *panel,
 void ibus_panel_service_property_hide     (IBusPanelService *panel,
                                            const gchar      *prop_name);
 
+/**
+ * ibus_panel_service_commit_text:
+ * @panel: An #IBusPanelService
+ * @text: An #IBusText
+ *
+ * Notify that a text is sent
+ * by sending a "CommitText" message to IBus service.
+ */
+void ibus_panel_service_commit_text       (IBusPanelService *panel,
+                                           IBusText         *text);
 
 G_END_DECLS
 #endif
diff --git a/src/ibusutil.c b/src/ibusutil.c
index bfaa4f4b6..3c6f92477 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -34,9 +34,6 @@
 #include <libintl.h>
 #endif
 
-#define IBUS_DICT_MAGIC "IBusDict"
-#define IBUS_DICT_VERSION (1)
-
 /* gettext macro */
 #define N_(t) t
 
@@ -128,74 +125,6 @@ _load_lang()
     ibus_xml_free (node);
 }
 
-static void
-free_dict_words (gpointer list)
-{
-    g_slist_free_full (list, g_free);
-}
-
-static void
-variant_foreach_add_emoji (gchar           *annotation,
-                           GSList          *emojis,
-                           GVariantBuilder *builder)
-{
-    int i;
-    int length = (int) g_slist_length (emojis);
-    gchar **buff = g_new0 (gchar *, length);
-    GSList *l = emojis;
-
-    for (i = 0; i < length; i++, l = l->next)
-        buff[i] = (gchar *) l->data;
-
-    g_variant_builder_add (builder,
-                           "{sv}",
-                           annotation,
-                           g_variant_new_strv ((const gchar * const  *) buff,
-                                               length));
-    g_free (buff);
-}
-
-static GVariant *
-ibus_emoji_dict_serialize (GHashTable *dict)
-{
-    GVariantBuilder builder;
-
-    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-    g_hash_table_foreach (dict,  (GHFunc) variant_foreach_add_emoji, &builder);
-    return g_variant_builder_end (&builder);
-}
-
-static GHashTable *
-ibus_emoji_dict_deserialize (GVariant *variant)
-{
-    GHashTable *dict = NULL;
-    GVariantIter iter;
-    gchar *annotate = NULL;
-    GVariant *emojis_variant = NULL;
-
-    dict = g_hash_table_new_full (g_str_hash,
-                                  g_str_equal,
-                                  g_free,
-                                  free_dict_words);
-
-    g_variant_iter_init (&iter, variant);
-    while (g_variant_iter_loop (&iter, "{sv}", &annotate, &emojis_variant)) {
-        gsize i;
-        gsize length = 0;
-        const gchar **array = g_variant_get_strv (emojis_variant, &length);
-        GSList *emojis = NULL;
-
-        for (i = 0; i < length; i++) {
-            emojis = g_slist_append (emojis, g_strdup (array[i]));
-        }
-        g_hash_table_insert (dict, annotate, emojis);
-        annotate = NULL;
-        g_clear_pointer (&emojis_variant, g_variant_unref);
-    }
-
-    return dict;
-}
-
 const gchar *
 ibus_get_untranslated_language_name (const gchar *_locale)
 {
@@ -242,121 +171,3 @@ ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str)
     g_free (*str);
     g_variant_get_child (variant, index, "s", str);
 }
-
-void
-ibus_emoji_dict_save (const gchar *path, GHashTable *dict)
-{
-    GVariant *variant;
-    const gchar *header = IBUS_DICT_MAGIC;
-    const guint16 version = IBUS_DICT_VERSION;
-    const gchar *contents;
-    gsize length;
-    GError *error = NULL;
-
-    variant = g_variant_new ("(sqv)",
-                             header,
-                             version,
-                             ibus_emoji_dict_serialize (dict));
-
-    contents =  g_variant_get_data (variant);
-    length =  g_variant_get_size (variant);
-
-    if (!g_file_set_contents (path, contents, length, &error)) {
-        g_warning ("Failed to save emoji dict %s: %s", path, error->message);
-        g_error_free (error);
-    }
-
-    g_variant_unref (variant);
-}
-
-GHashTable *
-ibus_emoji_dict_load (const gchar *path)
-{
-    gchar *contents = NULL;
-    gsize length = 0;
-    GError *error = NULL;
-    GVariant *variant_table = NULL;
-    GVariant *variant = NULL;
-    const gchar *header = NULL;
-    guint16 version = 0;
-    GHashTable *retval = NULL;
-
-    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
-        g_warning ("Emoji dict does not exist: %s", path);
-        goto out_load_cache;
-    }
-
-    if (!g_file_get_contents (path, &contents, &length, &error)) {
-        g_warning ("Failed to get dict content %s: %s", path, error->message);
-        g_error_free (error);
-        goto out_load_cache;
-    }
-
-    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sq)"),
-                                             contents,
-                                             length,
-                                             FALSE,
-                                             NULL,
-                                             NULL);
-
-    if (variant_table == NULL) {
-        g_warning ("cache table is broken.");
-        goto out_load_cache;
-    }
-
-    g_variant_get (variant_table, "(&sq)", &header, &version);
-
-    if (g_strcmp0 (header, IBUS_DICT_MAGIC) != 0) {
-        g_warning ("cache is not IBusDict.");
-        goto out_load_cache;
-    }
-
-    if (version != IBUS_DICT_VERSION) {
-        g_warning ("cache version is different: %u != %u",
-                   version, IBUS_DICT_VERSION);
-        goto out_load_cache;
-    }
-
-    version = 0;
-    header = NULL;
-    g_variant_unref (variant_table);
-
-    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sqv)"),
-                                             contents,
-                                             length,
-                                             FALSE,
-                                             NULL,
-                                             NULL);
-
-    if (variant_table == NULL) {
-        g_warning ("cache table is broken.");
-        goto out_load_cache;
-    }
-
-    g_variant_get (variant_table, "(&sqv)",
-                   NULL,
-                   NULL,
-                   &variant);
-
-    if (variant == NULL) {
-        g_warning ("cache dict is broken.");
-        goto out_load_cache;
-    }
-
-    retval = ibus_emoji_dict_deserialize (variant);
-
-out_load_cache:
-    if (variant)
-        g_variant_unref (variant);
-    if (variant_table)
-        g_variant_unref (variant_table);
-
-    return retval;
-}
-
-GSList *
-ibus_emoji_dict_lookup (GHashTable  *dict,
-                        const gchar *annotation)
-{
-    return (GSList *) g_hash_table_lookup (dict, annotation);
-}
diff --git a/src/ibusutil.h b/src/ibusutil.h
index e619b678a..226dd7a88 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -53,31 +53,4 @@ const gchar *    ibus_get_untranslated_language_name
  */
 const gchar *    ibus_get_language_name         (const gchar    *_locale);
 
-/**
- * ibus_emoji_dict_save:
- * @path: A path of the saved dictionary file.
- * @dict: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
- *
- * Save the Emoji dictionary to the cache file.
- */
-void             ibus_emoji_dict_save           (const gchar    *path,
-                                                 GHashTable     *dict);
-/**
- * ibus_emoji_dict_load:
- * @path: A path of the saved dictionary file.
- *
- * Returns: (element-type utf8 gpointer) (transfer none): An Emoji dictionary file loaded from the saved cache file.
- */
-GHashTable *     ibus_emoji_dict_load           (const gchar    *path);
-
-/**
- * ibus_emoji_dict_lookup:
- * @dict: (element-type utf8 gpointer) (transfer none): An Emoji dictionary
- * @annotation: Annotation for Emoji characters
- *
- * Returns: (element-type utf8) (transfer none): List of Emoji characters
- * This API is for gobject-introspection.
- */
-GSList *         ibus_emoji_dict_lookup         (GHashTable     *dict,
-                                                 const gchar    *annotation);
 #endif
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 2de227d64..7be11a5aa 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -50,6 +50,7 @@ AM_CFLAGS = \
 	@X11_CFLAGS@ \
 	-DG_LOG_DOMAIN=\"IBUS\" \
 	-DBINDIR=\"$(bindir)\" \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DIBUS_DISABLE_DEPRECATED \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
@@ -102,12 +103,17 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
 AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
 endif
 
+if ENABLE_EMOJI_DICT
+AM_VALAFLAGS += --define=EMOJI_DICT
+endif
+
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
 	application.vala \
 	candidatearea.vala \
 	candidatepanel.vala \
+	emojier.vala \
 	handle.vala \
 	iconwidget.vala \
 	indicator.vala \
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
new file mode 100644
index 000000000..3bfae8823
--- /dev/null
+++ b/ui/gtk3/emojier.vala
@@ -0,0 +1,1112 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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
+ */
+
+class Emojier : Gtk.Window {
+    private class EEntry : Gtk.SearchEntry {
+        public EEntry() {
+            GLib.Object(
+                name : "IBusEmojierEntry",
+                margin_start : 6,
+                margin_end : 6,
+                margin_top : 6,
+                margin_bottom : 6
+            );
+        }
+    }
+    private class EListBox : Gtk.ListBox {
+        public EListBox() {
+            GLib.Object(
+                vexpand : true,
+                halign : Gtk.Align.FILL,
+                valign : Gtk.Align.FILL
+            );
+        }
+    }
+    private class EBoxRow : Gtk.ListBoxRow {
+        public EBoxRow(string text,
+                       string id="") {
+            this.text = text;
+            this.id = id;
+        }
+
+        public string text { get; set; }
+        public string id { get; set; }
+    }
+    private class EScrolledWindow : Gtk.ScrolledWindow {
+        public EScrolledWindow(Gtk.Adjustment? hadjustment=null,
+                               Gtk.Adjustment? vadjustment=null) {
+            GLib.Object(
+                hscrollbar_policy : Gtk.PolicyType.NEVER,
+                vscrollbar_policy : Gtk.PolicyType.NEVER,
+                shadow_type : Gtk.ShadowType.IN,
+                margin_start : 6,
+                margin_end : 6,
+                margin_top : 6,
+                margin_bottom : 6
+            );
+            if (hadjustment != null)
+                set_hadjustment(hadjustment);
+            if (vadjustment != null)
+                set_hadjustment(vadjustment);
+        }
+    }
+    private class EGrid : Gtk.Grid {
+        public EGrid() {
+            GLib.Object(
+                vexpand : true,
+                halign : Gtk.Align.FILL,
+                valign : Gtk.Align.FILL
+            );
+        }
+    }
+    private class EPaddedLabel : Gtk.Box {
+        public EPaddedLabel(string          text,
+                            Gtk.Align       align,
+                            TravelDirection direction=TravelDirection.NONE) {
+            GLib.Object(
+                name : "IBusEmojierPaddedLabel",
+                orientation : Gtk.Orientation.HORIZONTAL,
+                spacing : 0
+            );
+            if (direction == TravelDirection.BACKWARD) {
+                IconWidget icon;
+                if (Gtk.Widget.get_default_direction() ==
+                    Gtk.TextDirection.RTL) {
+                    icon = new IconWidget("go-previous-rtl-symbolic",
+                                          Gtk.IconSize.MENU);
+                } else {
+                    icon = new IconWidget("go-previous-symbolic",
+                                          Gtk.IconSize.MENU);
+                }
+                pack_start(icon, false, true, 0);
+            }
+            Gtk.Label label = new Gtk.Label(text);
+            label.set_halign(align);
+            label.set_valign(Gtk.Align.CENTER);
+            label.set_margin_start(20);
+            label.set_margin_end(20);
+            label.set_margin_top(6);
+            label.set_margin_bottom(6);
+            pack_start(label, true, true, 0);
+        }
+    }
+    private class ETitleLabel : Gtk.Box {
+        private Gtk.Button m_close_button;
+        private ulong m_close_handler;
+
+        public ETitleLabel(string    text,
+                           Gtk.Align align) {
+            GLib.Object(
+                name : "IBusEmojierTitleLabel",
+                orientation : Gtk.Orientation.HORIZONTAL,
+                spacing : 0
+            );
+            Gtk.Label label = new Gtk.Label(text);
+            label.set_halign(align);
+            label.set_valign(align);
+            label.set_margin_start(20);
+            label.set_margin_end(20);
+            label.set_margin_top(6);
+            label.set_margin_bottom(6);
+            pack_start(label, true, true, 0);
+            IconWidget icon = new IconWidget("window-close", Gtk.IconSize.MENU);
+            m_close_button = new Gtk.Button();
+            m_close_button.add(icon);
+            pack_end(m_close_button, false, true, 0);
+        }
+        public void set_loop(GLib.MainLoop? loop) {
+            if (m_close_handler > 0)
+                GLib.SignalHandler.disconnect(m_close_button, m_close_handler);
+            m_close_handler = m_close_button.button_press_event.connect((e) => {
+                if (loop != null && loop.is_running())
+                    loop.quit();
+                return true;
+            });
+        }
+        public void unset_loop() {
+            if (m_close_handler > 0) {
+                GLib.SignalHandler.disconnect(m_close_button, m_close_handler);
+                m_close_handler = 0;
+            }
+        }
+    }
+
+    private enum TravelDirection {
+        NONE,
+        BACKWARD,
+    }
+
+    private enum CategoryType {
+        EMOJI,
+        LANG,
+    }
+
+    private const uint EMOJI_GRID_PAGE = 10;
+    private Gtk.Box m_vbox;
+    private ETitleLabel m_title;
+    private EEntry m_entry;
+    private string? m_backward;
+    private EScrolledWindow? m_scrolled_window = null;
+    private EListBox m_list_box;
+    private CategoryType m_current_category_type = CategoryType.EMOJI;
+    private bool m_is_running = false;
+    private string m_input_context_path = "";
+    private GLib.StringBuilder m_buffer_string;
+    private GLib.MainLoop? m_loop;
+    private string? m_result;
+    private GLib.SList<string> m_lang_list;
+    private string m_current_lang = "en";
+    private string? m_unicode_point = null;
+    private bool m_candidate_panel_is_visible;
+    private GLib.HashTable<string, GLib.SList> m_annotation_to_emojis_dict;
+    private GLib.HashTable<string, IBus.EmojiData> m_emoji_to_data_dict;
+    private GLib.HashTable<string, GLib.SList> m_category_to_emojis_dict;
+    int m_category_active_index;
+    private int m_emoji_max_seq_len = 0;
+    private IBus.LookupTable m_lookup_table;
+    private Gtk.Label[] m_candidates;
+    private string m_emoji_font = "Monospace 16";
+    private string[] m_favorites = {};
+    // TODO: Get the selected color from CandidateArea
+    private Gdk.RGBA m_selected_fg_color = Gdk.RGBA(){
+            red = 1.0, green = 1.0, blue = 1.0, alpha = 1.0 };
+    private Gdk.RGBA m_selected_bg_color = Gdk.RGBA(){
+            red = 0.300, green = 0.565, blue = 0.851, alpha = 1.0 };
+
+    public signal void candidate_clicked(uint index, uint button, uint state);
+
+    public Emojier() {
+        GLib.Object(
+            type : Gtk.WindowType.POPUP,
+            events : Gdk.EventMask.KEY_PRESS_MASK |
+                     Gdk.EventMask.KEY_RELEASE_MASK |
+                     Gdk.EventMask.BUTTON_PRESS_MASK,
+            window_position : Gtk.WindowPosition.CENTER,
+            accept_focus : true,
+            decorated : false,
+            modal : true,
+            resizable : true,
+            focus_visible : true
+        );
+
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Screen screen = (display != null) ?
+                display.get_default_screen() : null;
+
+        if (screen == null) {
+            warning("Could not open display.");
+            return;
+        }
+        string data = "grid { background-color: #ffffff; }";
+        Gtk.CssProvider css_provider = new Gtk.CssProvider();
+        try {
+            css_provider.load_from_data(data, -1);
+        } catch (GLib.Error e) {
+            warning("Failed css_provider_from_data: %s", e.message);
+            return;
+        }
+
+        Gtk.StyleContext.add_provider_for_screen(
+                screen,
+                css_provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+        m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        add(m_vbox);
+
+        m_title = new ETitleLabel(_("Emoji Dialog"),
+                                  Gtk.Align.CENTER);
+        m_vbox.add(m_title);
+        m_entry = new EEntry();
+        m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
+        m_vbox.add(m_entry);
+        m_entry.changed.connect(() => {
+            m_buffer_string.assign(m_entry.get_text());
+            update_cadidate_window();
+        });
+        m_entry.icon_release.connect((icon_pos, event) => {
+            m_buffer_string.erase();
+            hide_candidate_panel();
+        });
+
+        /* Set the accessible role of the label to a status bar so it
+         * will emit name changed events that can be used by screen
+         * readers.
+         */
+        Atk.Object obj = m_entry.get_accessible();
+        obj.set_role (Atk.Role.STATUSBAR);
+
+        m_buffer_string = new StringBuilder();
+        grab_focus();
+
+        // The constructor of IBus.LookupTable does not support more than
+        // 16 pages.
+        m_lookup_table = new IBus.LookupTable(1, 0, true, true);
+        m_lookup_table.set_page_size(EMOJI_GRID_PAGE * EMOJI_GRID_PAGE);
+
+        hide.connect(() => {
+            if (m_loop != null && m_loop.is_running())
+                m_loop.quit();
+        });
+
+        candidate_clicked.connect((i, b, s) => {
+            IBus.Text candidate = m_lookup_table.get_candidate(i);
+            m_result = candidate.text;
+            m_loop.quit();
+            hide_candidate_panel();
+        });
+
+        GLib.Idle.add(() => {
+            m_lang_list = read_lang_list();
+            reload_emoji_dict();
+            return false;
+        });
+    }
+
+    private GLib.SList<string> read_lang_list() {
+        GLib.SList<string> lang_list = new GLib.SList<string>();
+        const string dict_path = Config.PKGDATADIR + "/dicts";
+        GLib.Dir dir = null;
+        try {
+            dir = GLib.Dir.open(dict_path);
+        } catch (GLib.FileError e) {
+            warning("Error loading %s: %s", dict_path, e.message);
+            return lang_list;
+        }
+        string name;
+        while ((name = dir.read_name()) != null) {
+            const string dict_suffix = ".dict";
+            const string dict_prefix = "emoji-";
+            if (name.has_suffix(dict_suffix)) {
+                name = name[0:name.length - dict_suffix.length];
+                if (name.has_prefix(dict_prefix)) {
+                    name = name[dict_prefix.length:name.length];
+                    lang_list.append(name);
+                } else {
+                    warning("Need %s prefix in the filename: %s/%s%s",
+                            dict_prefix, dict_path, name, dict_suffix);
+                }
+            } else {
+                warning("Need %s extention in the filename: %s/%s",
+                        dict_suffix, dict_path, name);
+            }
+        }
+        lang_list.sort((a, b) => {
+            string a_lang = IBus.get_language_name(a);
+            string b_lang = IBus.get_language_name(b);
+            return GLib.strcmp(a_lang, b_lang);
+        });
+        return lang_list;
+    }
+
+    private void reload_emoji_dict() {
+        init_emoji_dict();
+        make_emoji_dict("en");
+        if (m_current_lang != "en")
+            make_emoji_dict(m_current_lang);
+    }
+
+    private void init_emoji_dict() {
+        m_annotation_to_emojis_dict =
+                new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
+                                                       GLib.str_equal);
+        m_emoji_to_data_dict =
+                new GLib.HashTable<string, IBus.EmojiData>(GLib.str_hash,
+                                                           GLib.str_equal);
+        m_category_to_emojis_dict =
+                new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
+                                                       GLib.str_equal);
+    }
+
+    private void make_emoji_dict(string lang) {
+        GLib.SList<IBus.EmojiData> emoji_list = IBus.EmojiData.load(
+                    Config.PKGDATADIR + "/dicts/emoji-" + lang + ".dict");
+        if (emoji_list == null)
+            return;
+        foreach (IBus.EmojiData data in emoji_list) {
+            update_annotation_to_emojis_dict(data);
+            update_emoji_to_data_dict(data, lang);
+            update_category_to_emojis_dict(data, lang);
+        }
+        GLib.List<unowned string> annotations =
+                m_annotation_to_emojis_dict.get_keys();
+        foreach (unowned string annotation in annotations) {
+            if (m_emoji_max_seq_len < annotation.length)
+                m_emoji_max_seq_len = annotation.length;
+        }
+    }
+
+    private void update_annotation_to_emojis_dict (IBus.EmojiData data) {
+        string emoji = data.get_emoji();
+        unowned GLib.SList<string> annotations = data.get_annotations();
+        foreach (string annotation in annotations) {
+            bool has_emoji = false;
+            unowned GLib.SList<string> hits =
+                    m_annotation_to_emojis_dict.lookup(annotation);
+            foreach (string hit_emoji in hits) {
+                if (hit_emoji == emoji) {
+                    has_emoji = true;
+                    break;
+                }
+            }
+            if (!has_emoji) {
+                hits.append(emoji);
+                m_annotation_to_emojis_dict.replace(annotation, hits.copy());
+            }
+        }
+    }
+
+    private void update_emoji_to_data_dict (IBus.EmojiData data,
+                                            string         lang) {
+        string emoji = data.get_emoji();
+        if (lang == "en") {
+            m_emoji_to_data_dict.replace(emoji, data);
+        } else {
+            unowned IBus.EmojiData? en_data =
+                    m_emoji_to_data_dict.lookup(emoji);
+            if (en_data == null) {
+                warning("No IBusEmojiData for English: %s".printf(emoji));
+                m_emoji_to_data_dict.insert(emoji, data);
+                return;
+            }
+            unowned GLib.SList<string> annotations = data.get_annotations();
+            unowned GLib.SList<string> en_annotations
+                = en_data.get_annotations();
+            foreach (string annotation in en_annotations) {
+                if (annotations.find_custom(annotation, GLib.strcmp) == null)
+                    annotations.append(annotation.dup());
+            }
+            en_data.set_annotations(annotations.copy_deep(GLib.strdup));
+        }
+    }
+
+    private void update_category_to_emojis_dict (IBus.EmojiData data,
+                                                 string         lang) {
+        string emoji = data.get_emoji();
+        string category = data.get_category();
+        if (lang == "en" && category != "") {
+            bool has_emoji = false;
+            unowned GLib.SList<string> hits =
+                    m_category_to_emojis_dict.lookup(category);
+            foreach (string hit_emoji in hits) {
+                if (hit_emoji == emoji) {
+                    has_emoji = true;
+                    break;
+                }
+            }
+            if (!has_emoji) {
+                hits.append(emoji);
+                m_category_to_emojis_dict.replace(category, hits.copy());
+            }
+        }
+    }
+
+    private void set_fixed_size() {
+        if (!m_candidate_panel_is_visible &&
+            m_current_category_type == CategoryType.LANG) {
+            Gtk.PolicyType vpolicy;
+            m_scrolled_window.get_policy(null, out vpolicy);
+            if (vpolicy == Gtk.PolicyType.AUTOMATIC)
+                return;
+            int width, height;
+            get_size(out width, out height);
+            set_size_request(width, height);
+            if (m_scrolled_window != null) {
+                m_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
+                                             Gtk.PolicyType.AUTOMATIC);
+            }
+        } else {
+            resize(20, 1);
+            if (m_scrolled_window != null) {
+                m_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
+                                             Gtk.PolicyType.NEVER);
+            }
+        }
+    }
+
+    private void remove_all_children() {
+        foreach (Gtk.Widget w in m_vbox.get_children()) {
+            if (w.name == "IBusEmojierEntry" ||
+                w.name == "IBusEmojierTitleLabel") {
+                continue;
+            }
+            w.destroy();
+        }
+    }
+
+    private void show_category_list() {
+        remove_all_children();
+        m_scrolled_window = new EScrolledWindow();
+        set_fixed_size();
+        string language = IBus.get_language_name(m_current_lang);
+        EPaddedLabel label = new EPaddedLabel(language, Gtk.Align.CENTER);
+        Gtk.Button button = new Gtk.Button();
+        button.add(label);
+        m_vbox.add(button);
+        button.show_all();
+        button.button_press_event.connect((e) => {
+            m_category_active_index = 0;
+            m_current_category_type = CategoryType.LANG;
+            show_category_list();
+            return true;
+        });
+
+        m_vbox.add(m_scrolled_window);
+        Gtk.Viewport viewport = new Gtk.Viewport(null, null);
+        m_scrolled_window.add(viewport);
+
+        m_list_box = new EListBox();
+        viewport.add(m_list_box);
+        Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
+        m_list_box.set_adjustment(adjustment);
+        if (m_current_category_type == CategoryType.EMOJI) {
+            m_list_box.row_activated.connect((box, gtkrow) => {
+                m_category_active_index = 0;
+                EBoxRow row = gtkrow as EBoxRow;
+                show_emoji_for_category(row);
+            });
+
+            uint n = 1;
+            if (m_favorites.length > 0) {
+                EBoxRow row = new EBoxRow("@favorites");
+                EPaddedLabel widget =
+                        new EPaddedLabel(_("Favorites"), Gtk.Align.CENTER);
+                row.add(widget);
+                m_list_box.add(row);
+                if (n++ == m_category_active_index)
+                    m_list_box.select_row(row);
+            }
+            GLib.List<unowned string> categories =
+                    m_category_to_emojis_dict.get_keys();
+            foreach (unowned string category in categories) {
+                EBoxRow row = new EBoxRow(category);
+                string locale_category = _(category);
+                StringBuilder capital_category = new StringBuilder();
+                for (int i = 0; i < locale_category.char_count(); i++) {
+                    unichar ch = locale_category.get_char(i);
+                    if (i == 0)
+                        capital_category.append_unichar(ch.toupper());
+                    else
+                        capital_category.append_unichar(ch);
+                }
+                EPaddedLabel widget =
+                        new EPaddedLabel(capital_category.str,
+                                         Gtk.Align.CENTER);
+                row.add(widget);
+                m_list_box.add(row);
+                if (n++ == m_category_active_index)
+                    m_list_box.select_row(row);
+            }
+        } else if (m_current_category_type == CategoryType.LANG) {
+            m_list_box.row_activated.connect((box, gtkrow) => {
+                m_category_active_index = 0;
+                EBoxRow row = gtkrow as EBoxRow;
+                if (m_current_lang != row.id) {
+                    m_current_lang = row.id;
+                    reload_emoji_dict();
+                }
+                m_current_category_type = CategoryType.EMOJI;
+                show_category_list();
+            });
+            uint n = 1;
+            foreach (unowned string id in m_lang_list) {
+                string selected_language = IBus.get_language_name(id);
+                EBoxRow row = new EBoxRow("", id);
+                EPaddedLabel widget =
+                        new EPaddedLabel(selected_language, Gtk.Align.CENTER);
+                row.add(widget);
+                m_list_box.add(row);
+                if (n++ == m_category_active_index)
+                    m_list_box.select_row(row);
+            }
+        }
+
+        m_scrolled_window.show_all();
+        if (m_category_active_index == 0)
+            m_list_box.unselect_all();
+        m_list_box.invalidate_filter();
+        m_list_box.set_selection_mode(Gtk.SelectionMode.SINGLE);
+    }
+
+    private void show_emoji_for_category(EBoxRow row) {
+        if (row.text == "@favorites") {
+            m_lookup_table.clear();
+            foreach (unowned string favorate in m_favorites) {
+                IBus.Text text = new IBus.Text.from_string(favorate);
+                m_lookup_table.append_candidate(text);
+            }
+            m_backward = _("Favorites");
+        } else {
+            unowned GLib.SList<unowned string> emojis =
+                    m_category_to_emojis_dict.lookup(row.text);
+            m_lookup_table.clear();
+            foreach (unowned string emoji in emojis) {
+                IBus.Text text = new IBus.Text.from_string(emoji);
+                m_lookup_table.append_candidate(text);
+            }
+            m_backward = row.text;
+        }
+        show_candidate_panel();
+    }
+
+    private void label_set_active_color(Gtk.Label label) {
+        unowned string text = label.get_text();
+        Pango.AttrList attrs = new Pango.AttrList();
+        Pango.Attribute pango_attr = Pango.attr_foreground_new(
+                (uint16)(m_selected_fg_color.red * uint16.MAX),
+                (uint16)(m_selected_fg_color.green * uint16.MAX),
+                (uint16)(m_selected_fg_color.blue * uint16.MAX));
+        pango_attr.start_index = 0;
+        pango_attr.end_index = text.char_count();
+        attrs.insert((owned)pango_attr);
+
+        pango_attr = Pango.attr_background_new(
+                (uint16)(m_selected_bg_color.red * uint16.MAX),
+                (uint16)(m_selected_bg_color.green * uint16.MAX),
+                (uint16)(m_selected_bg_color.blue * uint16.MAX));
+        pango_attr.start_index = 0;
+        pango_attr.end_index = text.char_count();
+        attrs.insert((owned)pango_attr);
+        label.set_attributes(attrs);
+    }
+
+    private void show_arrow_buttons() {
+        Gtk.Button next_button = new Gtk.Button();
+        next_button.clicked.connect(() => {
+            m_lookup_table.page_down();
+            show_candidate_panel();
+        });
+        next_button.set_image(new Gtk.Image.from_icon_name(
+                              "go-down",
+                              Gtk.IconSize.MENU));
+        next_button.set_relief(Gtk.ReliefStyle.NONE);
+        next_button.set_tooltip_text(_("Page Down"));
+
+        Gtk.Button prev_button = new Gtk.Button();
+        prev_button.clicked.connect(() => {
+            m_lookup_table.page_up();
+            show_candidate_panel();
+        });
+        prev_button.set_image(new Gtk.Image.from_icon_name(
+                              "go-up",
+                              Gtk.IconSize.MENU));
+        prev_button.set_relief(Gtk.ReliefStyle.NONE);
+        prev_button.set_tooltip_text(_("Page Up"));
+
+        Gtk.Box buttons_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+        Gtk.Label state_label = new Gtk.Label(null);
+        state_label.set_size_request(10, -1);
+        state_label.set_halign(Gtk.Align.CENTER);
+        state_label.set_valign(Gtk.Align.CENTER);
+        buttons_hbox.pack_start(state_label, false, true, 0);
+        buttons_hbox.pack_start(prev_button, false, false, 0);
+        buttons_hbox.pack_start(next_button, false, false, 0);
+        m_vbox.pack_start(buttons_hbox, false, false, 0);
+        buttons_hbox.show_all();
+    }
+
+    private bool check_unicode_point(bool check_xdigit_only) {
+        m_unicode_point = null;
+        GLib.StringBuilder buff = new GLib.StringBuilder();
+        for (int i = 0; i < m_buffer_string.str.char_count(); i++) {
+            unichar ch = m_buffer_string.str.get_char(i);
+            if (ch == 0)
+                return false;
+            if (!ch.isxdigit())
+                return false;
+            buff.append_unichar(ch);
+        }
+        unichar code = (unichar)buff.str.to_ulong(null, 16);
+        if (!code.validate())
+            return false;
+        if (check_xdigit_only)
+            return true;
+        m_unicode_point = code.to_string();
+        if (m_unicode_point == null)
+            return true;
+        IBus.Text text = new IBus.Text.from_string(m_unicode_point);
+        m_lookup_table.append_candidate(text);
+        return true;
+    }
+
+    public void update_cadidate_window() {
+        string annotation = m_entry.get_text();
+        if (annotation.length == 0) {
+            hide_candidate_panel();
+            m_backward = null;
+            return;
+        }
+        if (annotation.length > m_emoji_max_seq_len) {
+            hide_candidate_panel();
+            return;
+        }
+        // Call check_unicode_point() to get m_unicode_point
+        check_unicode_point(false);
+        unowned GLib.SList<string>? emojis =
+            m_annotation_to_emojis_dict.lookup(annotation);
+        if (emojis == null && m_unicode_point == null) {
+            hide_candidate_panel();
+            return;
+        }
+        m_lookup_table.clear();
+        // Call check_unicode_point() to update m_lookup_table
+        check_unicode_point(false);
+        foreach (unowned string emoji in emojis) {
+            IBus.Text text = new IBus.Text.from_string(emoji);
+            m_lookup_table.append_candidate(text);
+        }
+        show_candidate_panel();
+    }
+
+    private void show_candidate_panel() {
+        remove_all_children();
+        set_fixed_size();
+        uint page_size = m_lookup_table.get_page_size();
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        uint cursor = m_lookup_table.get_cursor_pos();
+
+        uint page_start_pos = cursor / page_size * page_size;
+        uint page_end_pos = uint.min(page_start_pos + page_size, ncandidates);
+        if (m_backward != null) {
+            string backward_desc =
+                    "%s (%u / %u)".printf(m_backward,
+                                          cursor / page_size + 1,
+                                          ncandidates / page_size + 1);
+            EPaddedLabel label = new EPaddedLabel(backward_desc,
+                                                  Gtk.Align.CENTER,
+                                                  TravelDirection.BACKWARD);
+            Gtk.Button button = new Gtk.Button();
+            button.add(label);
+            m_vbox.add(button);
+            button.show_all();
+            button.button_press_event.connect((w, e) => {
+                hide_candidate_panel();
+                return true;
+            });
+        }
+        EGrid grid = new EGrid();
+        int n = 0;
+        for (uint i = page_start_pos; i < page_end_pos; i++) {
+            IBus.Text candidate = m_lookup_table.get_candidate(i);
+            Gtk.Label label = new Gtk.Label(candidate.text);
+            string emoji_font = m_emoji_font;
+            if (candidate.text.char_count() > 2) {
+                Pango.FontDescription font_desc =
+                        Pango.FontDescription.from_string(emoji_font);
+                string font_family = font_desc.get_family();
+                int font_size = font_desc.get_size() / Pango.SCALE;
+                emoji_font = "%s %d".printf(font_family, font_size -2);
+            }
+            string markup = "<span font=\"%s\">%s</span>".
+                    printf(emoji_font, candidate.get_text());
+            label.set_markup(markup);
+            label.set_halign(Gtk.Align.FILL);
+            label.set_valign(Gtk.Align.FILL);
+            if (i == cursor) {
+                label_set_active_color(label);
+            }
+            Gtk.EventBox candidate_ebox = new Gtk.EventBox();
+            candidate_ebox.add(label);
+            // Make a copy of i to workaround a bug in vala.
+            // https://bugzilla.gnome.org/show_bug.cgi?id=628336
+            uint index = i;
+            candidate_ebox.button_press_event.connect((w, e) => {
+                candidate_clicked(index, e.button, e.state);
+                return true;
+            });
+            grid.attach(candidate_ebox,
+                        n % (int)EMOJI_GRID_PAGE, n / (int)EMOJI_GRID_PAGE,
+                        1, 1);
+            n++;
+
+            m_candidates += label;
+        }
+        if (n > 0) {
+            m_candidate_panel_is_visible = true;
+            show_arrow_buttons();
+            m_vbox.add(grid);
+            grid.show_all();
+            IBus.Text candidate = m_lookup_table.get_candidate(cursor);
+            if (cursor == 0 && candidate.text == m_unicode_point) {
+                EPaddedLabel widget = new EPaddedLabel(
+                        _("Description: Unicode point U+%04X").printf(
+                                m_unicode_point.get_char(0)),
+                        Gtk.Align.START);
+                m_vbox.add(widget);
+                widget.show_all();
+                return;
+            }
+            unowned IBus.EmojiData data =
+                    m_emoji_to_data_dict.lookup(candidate.text);
+            unowned string description = data.get_description();
+            if (description != "") {
+                EPaddedLabel widget = new EPaddedLabel(
+                        _("Description: %s").printf(description),
+                        Gtk.Align.START);
+                m_vbox.add(widget);
+                widget.show_all();
+            }
+            unowned GLib.SList<unowned string>? annotations =
+                    data.get_annotations();
+            GLib.StringBuilder buff = new GLib.StringBuilder();
+            int i = 0;
+            foreach (unowned string annotation in annotations) {
+                if (i++ == 0)
+                    buff.append_printf(_("Annotations: %s"), annotation);
+                else
+                    buff.append_printf(" | %s", annotation);
+                if (buff.str.char_count() > 30) {
+                    EPaddedLabel widget = new EPaddedLabel(buff.str,
+                                                           Gtk.Align.START);
+                    m_vbox.add(widget);
+                    widget.show_all();
+                    buff.erase();
+                }
+            }
+            if (buff.str != "") {
+                EPaddedLabel widget = new EPaddedLabel(buff.str,
+                                                       Gtk.Align.START);
+                m_vbox.add(widget);
+                widget.show_all();
+            }
+        }
+    }
+
+    private void hide_candidate_panel() {
+        m_candidate_panel_is_visible = false;
+        if (m_loop.is_running())
+            show_category_list();
+    }
+
+    private bool if_in_range_of_lookup(uint keyval) {
+        if (!m_candidate_panel_is_visible)
+            return false;
+        string backup_annotation = m_buffer_string.str.dup();
+        unichar ch = IBus.keyval_to_unicode (keyval);
+        m_buffer_string.append_unichar(ch);
+        if (check_unicode_point(true)) {
+            m_buffer_string.assign(backup_annotation);
+            return false;
+        }
+        m_buffer_string.assign(backup_annotation);
+        if (keyval < Gdk.Key.@0 || keyval > Gdk.Key.@9)
+            return false;
+        if (keyval == Gdk.Key.@0)
+            keyval = Gdk.Key.@9 + 1;
+        uint index = keyval - Gdk.Key.@1 + 1;
+        uint candidates = m_lookup_table.get_number_of_candidates();
+        uint cursor_pos = m_lookup_table.get_cursor_pos();
+        uint page_size = m_lookup_table.get_page_size();
+        if (index > uint.min(candidates - (cursor_pos / page_size) * page_size,
+                             page_size)) {
+            return false;
+        }
+        return true;
+    }
+
+    private void set_number_on_lookup(uint keyval) {
+        if (keyval == Gdk.Key.@0)
+            keyval = Gdk.Key.@9 + 1;
+        uint index = keyval - Gdk.Key.@1;
+        uint cursor_pos = m_lookup_table.get_cursor_pos();
+        uint cursor_in_page= m_lookup_table.get_cursor_in_page();
+        uint real_index = cursor_pos - cursor_in_page + index;
+        m_lookup_table.set_cursor_pos(real_index);
+        IBus.Text text = m_lookup_table.get_candidate(real_index);
+        m_result = text.text;
+    }
+
+    private void candidate_panel_cursor_down() {
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        uint cursor = m_lookup_table.get_cursor_pos();
+        if ((cursor + EMOJI_GRID_PAGE) < ncandidates) {
+            m_lookup_table.set_cursor_pos(cursor + EMOJI_GRID_PAGE);
+        } else if (cursor % EMOJI_GRID_PAGE < ncandidates) {
+                m_lookup_table.set_cursor_pos(cursor % EMOJI_GRID_PAGE);
+        } else {
+            m_lookup_table.set_cursor_pos(0);
+        }
+        show_candidate_panel();
+    }
+
+    private void candidate_panel_cursor_up() {
+        int ncandidates = (int)m_lookup_table.get_number_of_candidates();
+        int cursor = (int)m_lookup_table.get_cursor_pos();
+        int highest_pos =
+            (ncandidates / (int)EMOJI_GRID_PAGE * (int)EMOJI_GRID_PAGE)
+            + (cursor % (int)EMOJI_GRID_PAGE);
+        if ((cursor - (int)EMOJI_GRID_PAGE) >= 0) {
+            m_lookup_table.set_cursor_pos(cursor - (int)EMOJI_GRID_PAGE);
+        } else if (highest_pos < ncandidates) {
+            m_lookup_table.set_cursor_pos(highest_pos);
+        } else {
+            m_lookup_table.set_cursor_pos(0);
+        }
+        show_candidate_panel();
+    }
+
+    private void category_list_cursor_move(uint keyval) {
+        GLib.List<weak Gtk.Widget> list = m_list_box.get_children();
+        if (keyval == Gdk.Key.Down) {
+            m_category_active_index =
+                    ++m_category_active_index % ((int)list.length() + 1);
+        } else if (keyval == Gdk.Key.Up) {
+            if (--m_category_active_index < 0)
+                    m_category_active_index = (int)list.length();
+        }
+        Gtk.Adjustment adjustment = m_list_box.get_adjustment();
+        m_scrolled_window.set_vadjustment(adjustment);
+        show_category_list();
+    }
+
+    public string run(Gdk.Event event,
+                      string    input_context_path) {
+        assert (m_loop == null);
+
+        m_is_running = true;
+        m_input_context_path = input_context_path;
+        m_candidate_panel_is_visible = false;
+        m_result = null;
+
+        /* Let gtk recalculate the window size. */
+        resize(1, 1);
+
+        m_entry.set_text("");
+        m_buffer_string.erase();
+
+        Gdk.Device device = event.get_device();
+        if (device == null) {
+            var display = get_display();
+            var device_manager = display.get_device_manager();
+            device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+        }
+
+        Gdk.Device keyboard;
+        Gdk.Device pointer;
+        if (device.get_source() == Gdk.InputSource.KEYBOARD) {
+            keyboard = device;
+            pointer = device.get_associated_device();
+        } else {
+            pointer = device;
+            keyboard = device.get_associated_device();
+        }
+
+        m_current_category_type = CategoryType.EMOJI;
+        show_category_list();
+        m_entry.set_activates_default(true);
+        show_all();
+
+        Gdk.GrabStatus status;
+        // Grab all keyboard events
+        status = keyboard.grab(get_window(),
+                               Gdk.GrabOwnership.NONE,
+                               true,
+                               Gdk.EventMask.KEY_PRESS_MASK |
+                               Gdk.EventMask.KEY_RELEASE_MASK,
+                               null,
+                               Gdk.CURRENT_TIME);
+        if (status != Gdk.GrabStatus.SUCCESS)
+            warning("Grab keyboard failed! status = %d", status);
+        // Grab all pointer events
+        status = pointer.grab(get_window(),
+                              Gdk.GrabOwnership.NONE,
+                              true,
+                              Gdk.EventMask.BUTTON_PRESS_MASK |
+                              Gdk.EventMask.BUTTON_RELEASE_MASK,
+                              null,
+                              Gdk.CURRENT_TIME);
+        if (status != Gdk.GrabStatus.SUCCESS)
+            warning("Grab pointer failed! status = %d", status);
+
+        m_loop = new GLib.MainLoop();
+        m_title.set_loop(m_loop);
+        m_loop.run();
+        m_title.unset_loop();
+        m_loop = null;
+
+        keyboard.ungrab(Gdk.CURRENT_TIME);
+        pointer.ungrab(Gdk.CURRENT_TIME);
+
+        // Need focus-out on Gtk.Entry to send the emoji to applications.
+        Gdk.Event fevent = new Gdk.Event(Gdk.EventType.FOCUS_CHANGE);
+        fevent.focus_change.in = 0;
+        fevent.focus_change.window  = get_window();
+        m_entry.send_focus_change(fevent);
+
+        hide();
+        // Make sure the switcher is hidden before returning from this function.
+        while (Gtk.events_pending())
+            Gtk.main_iteration ();
+        m_is_running = false;
+
+        return m_result;
+    }
+
+    /* override virtual functions */
+    public override void show() {
+        base.show();
+        set_focus_visible(true);
+    }
+
+    public override bool key_press_event(Gdk.EventKey event) {
+        uint keyval = event.keyval;
+        uint modifiers = event.state;
+
+        /* Need to handle events in key_press_event() instead of
+         * key_release_event() so that this can know if the event
+         * was handled by IME.
+         */
+        if (if_in_range_of_lookup(keyval)) {
+            set_number_on_lookup(keyval);
+            m_loop.quit();
+            return true;
+        }
+        switch (keyval) {
+        case Gdk.Key.Escape:
+            if (m_candidate_panel_is_visible) {
+                hide_candidate_panel();
+                return true;
+            } else if (m_current_category_type == CategoryType.LANG) {
+                m_current_category_type = CategoryType.EMOJI;
+                show_candidate_panel();
+                return true;
+            } else if (m_buffer_string.str.length == 0) {
+                m_loop.quit();
+                hide_candidate_panel();
+                return true;
+            }
+            m_buffer_string.erase();
+            break;
+        case Gdk.Key.Return:
+            if (m_candidate_panel_is_visible) {
+                uint index = m_lookup_table.get_cursor_pos();
+                IBus.Text text = m_lookup_table.get_candidate(index);
+                m_result = text.text;
+                m_loop.quit();
+                hide_candidate_panel();
+            } else if (m_category_active_index > 0) {
+                Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
+                EBoxRow row = gtkrow as EBoxRow;
+                show_emoji_for_category(row);
+            }
+            return true;
+        case Gdk.Key.BackSpace:
+            if (m_buffer_string.len > 0)
+                m_buffer_string.erase(m_buffer_string.len - 1);
+            break;
+        case Gdk.Key.space:
+        case Gdk.Key.KP_Space:
+            if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                unichar ch = IBus.keyval_to_unicode (keyval);
+                m_buffer_string.append_unichar(ch);
+                break;
+            }
+            if (m_candidate_panel_is_visible) {
+                m_lookup_table.cursor_down();
+                show_candidate_panel();
+            }
+            else {
+                category_list_cursor_move(Gdk.Key.Down);
+            }
+            return true;
+        case Gdk.Key.Right:
+            if (m_candidate_panel_is_visible) {
+                m_lookup_table.cursor_down();
+                show_candidate_panel();
+                return true;
+            }
+            break;
+        case Gdk.Key.Left:
+            if (m_candidate_panel_is_visible) {
+                m_lookup_table.cursor_up();
+                show_candidate_panel();
+                return true;
+            }
+            break;
+        case Gdk.Key.Down:
+            if (m_candidate_panel_is_visible)
+                candidate_panel_cursor_down();
+            else
+                category_list_cursor_move(Gdk.Key.Down);
+            return true;
+        case Gdk.Key.Up:
+            if (m_candidate_panel_is_visible)
+                candidate_panel_cursor_up();
+            else
+                category_list_cursor_move(Gdk.Key.Up);
+            return true;
+        case Gdk.Key.Page_Down:
+            if (m_candidate_panel_is_visible) {
+                m_lookup_table.page_down();
+                show_candidate_panel();
+                return true;
+            }
+            break;
+        case Gdk.Key.Page_Up:
+            if (m_candidate_panel_is_visible) {
+                m_lookup_table.page_up();
+                show_candidate_panel();
+                return true;
+            }
+            break;
+        default:
+            unichar ch = IBus.keyval_to_unicode (keyval);
+            if (!ch.isgraph())
+                return true;
+            m_buffer_string.append_unichar(ch);
+            break;
+        }
+
+        string annotation = m_buffer_string.str;
+        m_entry.set_text(annotation);
+
+        return true;
+    }
+
+    public bool is_running() {
+        return m_is_running;
+    }
+
+    public string get_input_context_path() {
+        return m_input_context_path;
+    }
+
+    public string get_selected_string() {
+        return m_result;
+    }
+
+    public void reset() {
+        m_input_context_path = "";
+        m_result = null;
+    }
+
+    public void set_emoji_font(string emoji_font) {
+        m_emoji_font = emoji_font;
+    }
+
+    public void set_favorites (string[]? unowned_favorites) {
+        m_favorites = {};
+        foreach (string favorite in unowned_favorites) {
+            m_favorites += favorite;
+        }
+    }
+}
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index c5eccc867..49013b8dd 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -200,8 +200,13 @@ public class KeybindingManager : GLib.Object {
 
             if (event.type == Gdk.EventType.KEY_PRESS) {
                 uint modifiers = event.key.state & MODIFIER_FILTER;
+                uint keyval = event.key.keyval;
+                if (keyval >= IBus.KEY_A && keyval <= IBus.KEY_Z &&
+                    (modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                    keyval = keyval - IBus.KEY_A + IBus.KEY_a;
+                }
                 foreach (var binding in m_bindings) {
-                    if (event.key.keyval != binding.keysym ||
+                    if (keyval != binding.keysym ||
                         modifiers != binding.modifiers)
                         continue;
                     binding.handler(event);
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 315e30f58..d6836b320 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -25,15 +25,18 @@ class Panel : IBus.PanelService {
     private class Keybinding {
         public Keybinding(uint keysym,
                           Gdk.ModifierType modifiers,
-                          bool reverse) {
+                          bool reverse,
+                          KeyEventFuncType ftype) {
             this.keysym = keysym;
             this.modifiers = modifiers;
             this.reverse = reverse;
+            this.ftype = ftype;
         }
 
         public uint keysym { get; set; }
         public Gdk.ModifierType modifiers { get; set; }
         public bool reverse { get; set; }
+        public KeyEventFuncType ftype { get; set; }
     }
 
     private enum IconType {
@@ -41,6 +44,12 @@ class Panel : IBus.PanelService {
         INDICATOR,
     }
 
+    private enum KeyEventFuncType {
+        ANY,
+        IME_SWITCHER,
+        EMOJI_TYPING,
+    }
+
     private IBus.Bus m_bus;
     private GLib.Settings m_settings_general = null;
     private GLib.Settings m_settings_hotkey = null;
@@ -63,6 +72,8 @@ class Panel : IBus.PanelService {
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
     private uint m_switcher_focus_set_engine_id;
+    private Emojier m_emojier;
+    private uint m_emojier_focus_commit_text_id;
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
     private GLib.Pid m_setup_pid = 0;
@@ -125,6 +136,9 @@ class Panel : IBus.PanelService {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
 
+        m_emojier = new Emojier();
+        bind_emoji_shortcut();
+
         m_property_manager = new PropertyManager();
         m_property_manager.property_activate.connect((w, k, s) => {
             property_activate(k, s);
@@ -139,7 +153,7 @@ class Panel : IBus.PanelService {
     }
 
     ~Panel() {
-        unbind_switch_shortcut();
+        unbind_switch_shortcut(KeyEventFuncType.ANY);
     }
 
     private void init_settings() {
@@ -175,14 +189,23 @@ class Panel : IBus.PanelService {
         });
 
         m_settings_hotkey.changed["triggers"].connect((key) => {
-                unbind_switch_shortcut();
+                unbind_switch_shortcut(KeyEventFuncType.IME_SWITCHER);
                 bind_switch_shortcut();
         });
 
+        m_settings_hotkey.changed["emoji"].connect((key) => {
+                unbind_switch_shortcut(KeyEventFuncType.EMOJI_TYPING);
+                bind_emoji_shortcut();
+        });
+
         m_settings_panel.changed["custom-font"].connect((key) => {
                 set_custom_font();
         });
 
+        m_settings_panel.changed["emoji-font"].connect((key) => {
+                set_custom_font();
+        });
+
         m_settings_panel.changed["use-custom-font"].connect((key) => {
                 set_custom_font();
         });
@@ -215,6 +238,10 @@ class Panel : IBus.PanelService {
         m_settings_panel.changed["property-icon-delay-time"].connect((key) => {
                 set_property_icon_delay_time();
         });
+
+        m_settings_panel.changed["emoji-favorites"].connect((key) => {
+                set_emoji_favorites();
+        });
     }
 
 #if INDICATOR
@@ -287,7 +314,8 @@ class Panel : IBus.PanelService {
     }
 
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
-                                         string?           accelerator) {
+                                         string?           accelerator,
+                                         KeyEventFuncType  ftype) {
         uint switch_keysym = 0;
         Gdk.ModifierType switch_modifiers = 0;
         Gdk.ModifierType reverse_modifier = Gdk.ModifierType.SHIFT_MASK;
@@ -323,11 +351,19 @@ class Panel : IBus.PanelService {
 
         keybinding = new Keybinding(switch_keysym,
                                     switch_modifiers,
-                                    false);
+                                    false,
+                                    ftype);
         m_keybindings.append(keybinding);
 
-        keybinding_manager.bind(switch_keysym, switch_modifiers,
-                (e) => handle_engine_switch(e, false));
+        /* Workaround not to free the pointer of handle_engine_switch() */
+        if (ftype == KeyEventFuncType.IME_SWITCHER) {
+            keybinding_manager.bind(switch_keysym, switch_modifiers,
+                    (e) => handle_engine_switch(e, false));
+        } else if (ftype == KeyEventFuncType.EMOJI_TYPING) {
+            keybinding_manager.bind(switch_keysym, switch_modifiers,
+                    (e) => handle_emoji_typing(e));
+            return;
+        }
 
         // accelerator already has Shift mask
         if ((switch_modifiers & reverse_modifier) != 0) {
@@ -338,11 +374,14 @@ class Panel : IBus.PanelService {
 
         keybinding = new Keybinding(switch_keysym,
                                     switch_modifiers,
-                                    true);
+                                    true,
+                                    ftype);
         m_keybindings.append(keybinding);
 
-        keybinding_manager.bind(switch_keysym, switch_modifiers,
-                (e) => handle_engine_switch(e, true));
+        if (ftype == KeyEventFuncType.IME_SWITCHER) {
+            keybinding_manager.bind(switch_keysym, switch_modifiers,
+                    (e) => handle_engine_switch(e, true));
+        }
     }
 
     private void bind_switch_shortcut() {
@@ -351,11 +390,27 @@ class Panel : IBus.PanelService {
         var keybinding_manager = KeybindingManager.get_instance();
 
         foreach (var accelerator in accelerators) {
-            keybinding_manager_bind(keybinding_manager, accelerator);
+            keybinding_manager_bind(keybinding_manager,
+                                    accelerator,
+                                    KeyEventFuncType.IME_SWITCHER);
+        }
+    }
+
+    private void bind_emoji_shortcut() {
+#if EMOJI_DICT
+        string[] accelerators = m_settings_hotkey.get_strv("emoji");
+
+        var keybinding_manager = KeybindingManager.get_instance();
+
+        foreach (var accelerator in accelerators) {
+            keybinding_manager_bind(keybinding_manager,
+                                    accelerator,
+                                    KeyEventFuncType.EMOJI_TYPING);
         }
+#endif
     }
 
-    private void unbind_switch_shortcut() {
+    private void unbind_switch_shortcut(KeyEventFuncType ftype) {
         var keybinding_manager = KeybindingManager.get_instance();
 
         unowned GLib.List<Keybinding> keybindings = m_keybindings;
@@ -363,8 +418,10 @@ class Panel : IBus.PanelService {
         while (keybindings != null) {
             Keybinding keybinding = keybindings.data;
 
-            keybinding_manager.unbind(keybinding.keysym,
-                                      keybinding.modifiers);
+            if (ftype == KeyEventFuncType.ANY || ftype == keybinding.ftype) {
+                keybinding_manager.unbind(keybinding.keysym,
+                                          keybinding.modifiers);
+            }
             keybindings = keybindings.next;
         }
 
@@ -540,12 +597,18 @@ class Panel : IBus.PanelService {
         }
 
         string custom_font = m_settings_panel.get_string("custom-font");
-
         if (custom_font == null) {
             warning("No config panel:custom-font.");
             return;
         }
 
+        string emoji_font = m_settings_panel.get_string("emoji-font");
+        if (emoji_font == null) {
+            warning("No config panel:emoji-font.");
+            return;
+        }
+        m_emojier.set_emoji_font(emoji_font);
+
         Pango.FontDescription font_desc =
                 Pango.FontDescription.from_string(custom_font);
         string font_family = font_desc.get_family();
@@ -696,6 +759,10 @@ class Panel : IBus.PanelService {
                 m_settings_panel.get_int("property-icon-delay-time");
     }
 
+    private void set_emoji_favorites() {
+        m_emojier.set_favorites(m_settings_panel.get_strv("emoji-favorites"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -796,8 +863,9 @@ class Panel : IBus.PanelService {
         set_use_xmodmap();
         update_engines(m_settings_general.get_strv("preload-engines"),
                        m_settings_general.get_strv("engines-order"));
-        unbind_switch_shortcut();
+        unbind_switch_shortcut(KeyEventFuncType.ANY);
         bind_switch_shortcut();
+        bind_emoji_shortcut();
         set_switcher_delay_time();
         set_embed_preedit_text();
         set_custom_font();
@@ -808,6 +876,7 @@ class Panel : IBus.PanelService {
         set_follow_input_cursor_when_always_shown_property_panel();
         set_xkb_icon_rgba();
         set_property_icon_delay_time();
+        set_emoji_favorites();
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {
@@ -904,6 +973,15 @@ class Panel : IBus.PanelService {
         }
     }
 
+    private void handle_emoji_typing(Gdk.Event event) {
+        if (m_emojier.is_running())
+            return;
+        string emoji = m_emojier.run(event, m_real_current_context_path);
+        if (emoji == null)
+            return;
+        this.emojier_focus_commit();
+    }
+
     private void run_preload_engines(IBus.EngineDesc[] engines, int index) {
         string[] names = {};
 
@@ -1131,6 +1209,15 @@ class Panel : IBus.PanelService {
             item.activate.connect((i) => show_setup_dialog());
             m_sys_menu.append(item);
 
+#if EMOJI_DICT
+            item = new Gtk.MenuItem.with_label(_("Emoji Dialog"));
+            item.activate.connect((i) => {
+                Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+                handle_emoji_typing(event);
+            });
+            m_sys_menu.append(item);
+#endif
+
             item = new Gtk.MenuItem.with_label(_("About"));
             item.activate.connect((i) => show_about_dialog());
             m_sys_menu.append(item);
@@ -1285,6 +1372,46 @@ class Panel : IBus.PanelService {
         }
     }
 
+    private bool emojier_focus_commit_real() {
+        string selected_string = m_emojier.get_selected_string();
+        string prev_context_path = m_emojier.get_input_context_path();
+        if (selected_string != null &&
+            prev_context_path != "" &&
+            prev_context_path == m_current_context_path) {
+            IBus.Text text = new IBus.Text.from_string(selected_string);
+            commit_text(text);
+            m_emojier.reset();
+            return true;
+        }
+
+        return false;
+    }
+
+    private void emojier_focus_commit() {
+        string selected_string = m_emojier.get_selected_string();
+        string prev_context_path = m_emojier.get_input_context_path();
+        if (selected_string == null &&
+            prev_context_path != "" &&
+            m_emojier.is_running()) {
+            if (m_emojier_focus_commit_text_id > 0) {
+                GLib.Source.remove(m_emojier_focus_commit_text_id);
+            }
+            m_emojier_focus_commit_text_id = GLib.Timeout.add(100, () => {
+                // focus_in is comming before switcher returns
+                emojier_focus_commit_real();
+                m_emojier_focus_commit_text_id = -1;
+                return false;
+            });
+        } else {
+            if (emojier_focus_commit_real()) {
+                if (m_emojier_focus_commit_text_id > 0) {
+                    GLib.Source.remove(m_emojier_focus_commit_text_id);
+                    m_emojier_focus_commit_text_id = -1;
+                }
+            }
+        }
+    }
+
     public override void focus_in(string input_context_path) {
         m_current_context_path = input_context_path;
 
@@ -1299,6 +1426,7 @@ class Panel : IBus.PanelService {
             m_real_current_context_path = m_current_context_path;
             m_property_panel.focus_in();
             this.switcher_focus_set_engine();
+            this.emojier_focus_commit();
         }
 
         if (m_use_global_engine)

From 13bf5037c43c6762c29de2038b6abe28d27c5103 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Mar 2017 14:05:24 +0900
Subject: [PATCH 377/816] setup: Set emoji preview text on font setting

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/317400043
---
 setup/main.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index cac57f0aa..09b0ebdf0 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -1,4 +1,5 @@
 # vim:set et sts=4 sw=4:
+# -*- coding: utf-8 -*-
 #
 # ibus - The Input Bus
 #
@@ -170,6 +171,7 @@ def __init_panel(self):
                 "fontbutton_custom_font")
         self.__fontbutton_emoji_font = self.__builder.get_object(
                 "fontbutton_emoji_font")
+        self.__fontbutton_emoji_font.set_preview_text("🙂🍎🚃💓📧⚽🐳");
         self.__settings_panel.bind('custom-font',
                                     self.__fontbutton_custom_font,
                                    'font-name',
@@ -182,10 +184,6 @@ def __init_panel(self):
                                     self.__fontbutton_custom_font,
                                    'sensitive',
                                    Gio.SettingsBindFlags.GET)
-        self.__settings_panel.bind('use-custom-font',
-                                    self.__fontbutton_emoji_font,
-                                   'sensitive',
-                                   Gio.SettingsBindFlags.GET)
 
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(

From c37989acffed8dc66a95deb8b113ac7a1d84e6ee Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Mar 2017 18:14:26 +0900
Subject: [PATCH 378/816] Add 'ibus emoji' command for no ibus panel desktops

This utility can be used on GNOME desktop which shows
a gnome-shell icon instead of running ibus-ui-gtk3.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/318640043
---
 Makefile.am                          |   5 +-
 tools/Makefile.am                    |  25 ++++-
 tools/main.vala                      |  41 +++++++
 ui/gtk3/IBusEmojiDialog-1.0.metadata |   1 +
 ui/gtk3/Makefile.am                  | 114 +++++++++++++++++---
 ui/gtk3/emojier.vala                 |  40 ++++---
 ui/gtk3/ibus-emoji-dialog-1.0.deps   |   2 +
 ui/gtk3/ibusemojidialog.h            | 153 +++++++++++++++++++++++++++
 ui/gtk3/panel.vala                   |  18 ++--
 9 files changed, 361 insertions(+), 38 deletions(-)
 create mode 100644 ui/gtk3/IBusEmojiDialog-1.0.metadata
 create mode 100644 ui/gtk3/ibus-emoji-dialog-1.0.deps
 create mode 100644 ui/gtk3/ibusemojidialog.h

diff --git a/Makefile.am b/Makefile.am
index 38515c677..f703d4c6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -50,13 +51,13 @@ SUBDIRS = \
 	util \
 	conf \
 	client \
-	tools \
 	data \
 	m4 \
 	po \
 	docs \
 	$(ENGINE_DIR) \
 	$(UI_DIR) \
+	tools \
 	$(DAEMON_DIR) \
 	$(PYTHON_LIB_DIRS) \
 	$(SETUP_DIR) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 53c209a2c..8cea01021 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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 +24,8 @@
 NULL =
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+libibus_emoji_dialog = \
+    $(top_builddir)/ui/gtk3/libibus-emoji-dialog-@IBUS_API_VERSION@.la
 
 # force include config.h before gi18n.h.
 AM_CPPFLAGS = \
@@ -95,4 +98,24 @@ CLEANFILES = \
 	$(man_one_files) \
 	$(NULL)
 
+if ENABLE_UI
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/ui/gtk3 \
+	-I$(top_builddir)/ui/gtk3 \
+	$(NULL)
+AM_CFLAGS += \
+	@GTK3_CFLAGS@ \
+	$(NULL)
+AM_LDADD += \
+	@GTK3_LIBS@ \
+	$(libibus_emoji_dialog) \
+	$(NULL)
+AM_VALAFLAGS += \
+	--vapidir=$(top_builddir)/ui/gtk3 \
+	--vapidir=$(top_srcdir)/ui/gtk3 \
+	--pkg=ibus-emoji-dialog-1.0 \
+	--pkg=gtk+-3.0 \
+	$(NULL)
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/tools/main.vala b/tools/main.vala
index ecce80ade..592231866 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -320,6 +321,45 @@ int reset_config(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+private void run_dialog(IBus.Emojier emojier) {
+    Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+    var display = Gdk.Display.get_default();
+    var device_manager = display.get_device_manager();
+    var device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+    event.set_device(device);
+    string emoji = emojier.run(event, "");
+    if (emoji == null) {
+        emojier.reset();
+        print("%s\n", _("Canceled to choose an emoji."));
+        return;
+    }
+    Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
+    clipboard.set_text(emoji, -1);
+    clipboard.store();
+    emojier.reset();
+    print("%s\n", _("Copied an emoji to your clipboard."));
+}
+
+int emoji_dialog(string[] argv) {
+    Gtk.init(ref argv);
+    GLib.Settings settings_panel =
+            new GLib.Settings("org.freedesktop.ibus.panel");
+    string emoji_font = settings_panel.get_string("emoji-font");
+    IBus.Emojier emojier = new IBus.Emojier();
+    emojier.set_emoji_font(emoji_font);
+    if (emojier.has_loaded_emoji_dict()) {
+        run_dialog(emojier);
+    } else {
+        GLib.MainLoop loop = new GLib.MainLoop();
+        emojier.loaded_emoji_dict.connect(() => {
+            run_dialog(emojier);
+            loop.quit();
+        });
+        loop.run();
+    }
+    return Posix.EXIT_SUCCESS;
+}
+
 int print_help(string[] argv) {
     print_usage(stdout);
     return Posix.EXIT_SUCCESS;
@@ -345,6 +385,7 @@ static const CommandEntry commands[]  = {
     { "address", N_("Print the D-Bus address of ibus-daemon"), print_address },
     { "read-config", N_("Show the configuration values"), read_config },
     { "reset-config", N_("Reset the configuration values"), reset_config },
+    { "emoji", N_("Save emoji on dialog to clipboard "), emoji_dialog },
     { "help", N_("Show this information"), print_help }
 };
 
diff --git a/ui/gtk3/IBusEmojiDialog-1.0.metadata b/ui/gtk3/IBusEmojiDialog-1.0.metadata
new file mode 100644
index 000000000..cd5c5b219
--- /dev/null
+++ b/ui/gtk3/IBusEmojiDialog-1.0.metadata
@@ -0,0 +1 @@
+IBusEmojiDialog cheader_filename="ibusemojidialog.h"
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 7be11a5aa..d5ddc4205 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujwiara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -103,10 +104,6 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
 AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
 endif
 
-if ENABLE_EMOJI_DICT
-AM_VALAFLAGS += --define=EMOJI_DICT
-endif
-
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
@@ -139,20 +136,111 @@ gen-%.xml.c: %.xml
 	sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	echo ";" >> $@
 
-CLEANFILES = \
-	gtkpanel.xml \
-	$(NULL)
+CLEANFILES =            \
+    gtkpanel.xml        \
+    $(NULL)
+
+emoji_headers =         \
+    ibusemojidialog.h   \
+    $(NULL)
 
 # References:
 # libappindicator/src/notification-item.xml
 # libappindicator/src/notification-watcher.xml
 # kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierItem.xml
 # kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierWatcher.xml
-EXTRA_DIST = \
-	gtkpanel.xml.in \
-	notification-item.xml \
-	notification-watcher.xml \
-	$(NULL)
+EXTRA_DIST =                            \
+    $(emoji_headers)                    \
+    IBusEmojiDialog-1.0.metadata        \
+    gtkpanel.xml.in                     \
+    ibus-emoji-dialog-1.0.deps          \
+    notification-item.xml               \
+    notification-watcher.xml            \
+    $(NULL)
 
+if ENABLE_EMOJI_DICT
+AM_VALAFLAGS += --define=EMOJI_DICT
+
+libibus_emoji_dialog = libibus-emoji-dialog-1.0.la
+
+lib_LTLIBRARIES = $(libibus_emoji_dialog)
+
+libibus_emoji_dialog_1_0_la_CFLAGS = $(AM_CFLAGS)
+libibus_emoji_dialog_1_0_la_LDFLAGS =   \
+    -no-undefined                       \
+    -export-symbols-regex "ibus_.*"     \
+    -version-info @LT_VERSION_INFO@     \
+    $(NULL)
+libibus_emoji_dialog_1_0_la_SOURCES =   \
+    emojier.c                           \
+    iconwidget.c                        \
+    $(NULL)
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_SCANNER_ARGS =
+INTROSPECTION_COMPILER_ARGS =      \
+    --includedir=$(srcdir)         \
+    --includedir=.                 \
+    --includedir=$(top_srcdir)/src \
+    $(NULL)
+
+if HAVE_INTROSPECTION
+ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
+ibusinclude_HEADERS =                  \
+    $(emoji_headers)                   \
+    $(NULL)
+introspection_sources =                \
+    $(emoji_headers)                   \
+    $(NULL)
+IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
+IBusEmojiDialog_1_0_gir_SCANNERFLAGS = \
+    --pkg-export=ibus-1.0              \
+    --pkg=gtk+-3.0                     \
+    $(IBUS_GIR_SCANNERFLAGS)           \
+    $(NULL)
+IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
+IBusEmojiDialog_1_0_gir_INCLUDES = Gtk-3.0 GLib-2.0 GObject-2.0 Gio-2.0
+IBusEmojiDialog_1_0_gir_LIBS = $(libibus) $(libibus_emoji_dialog)
+IBusEmojiDialog_1_0_gir_FILES =                      \
+    $(addprefix $(srcdir)/,$(introspection_sources)) \
+    $(NULL)
+IBusEmojiDialog_1_0_gir_CFLAGS =       \
+    -DIBUS_COMPILATION                 \
+    -I$(srcdir)                        \
+    -I$(builddir)                      \
+    -I$(top_srcdir)/src                \
+    $(NULL)
+INTROSPECTION_GIRS = IBusEmojiDialog-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
+
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+ibus-emoji-dialog-1.0.vapi: $(INTROSPECTION_GIRS) IBusEmojiDialog-1.0.metadata
+
+VAPIGEN_VAPIS = ibus-emoji-dialog-1.0.vapi
+
+ibus_emoji_dialog_1_0_vapi_DEPS = gtk+-3.0 gio-2.0
+ibus_emoji_dialog_1_0_vapi_METADATADIRS = $(srcdir)
+ibus_emoji_dialog_1_0_vapi_FILES = $(INTROSPECTION_GIRS)
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
+# for make distclean
+CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
+EXTRA_DIST += $(VAPIGEN_VAPIS)
+
+endif
+endif
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 3bfae8823..5496c4ea1 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -20,7 +20,7 @@
  * USA
  */
 
-class Emojier : Gtk.Window {
+class IBusEmojier : Gtk.Window {
     private class EEntry : Gtk.SearchEntry {
         public EEntry() {
             GLib.Object(
@@ -177,9 +177,12 @@ class Emojier : Gtk.Window {
     private string m_current_lang = "en";
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
-    private GLib.HashTable<string, GLib.SList> m_annotation_to_emojis_dict;
-    private GLib.HashTable<string, IBus.EmojiData> m_emoji_to_data_dict;
-    private GLib.HashTable<string, GLib.SList> m_category_to_emojis_dict;
+    private GLib.HashTable<string, GLib.SList>?
+            m_annotation_to_emojis_dict = null;
+    private GLib.HashTable<string, IBus.EmojiData>?
+            m_emoji_to_data_dict = null;
+    private GLib.HashTable<string, GLib.SList>?
+            m_category_to_emojis_dict = null;
     int m_category_active_index;
     private int m_emoji_max_seq_len = 0;
     private IBus.LookupTable m_lookup_table;
@@ -193,8 +196,9 @@ class Emojier : Gtk.Window {
             red = 0.300, green = 0.565, blue = 0.851, alpha = 1.0 };
 
     public signal void candidate_clicked(uint index, uint button, uint state);
+    public signal void loaded_emoji_dict();
 
-    public Emojier() {
+    public IBusEmojier() {
         GLib.Object(
             type : Gtk.WindowType.POPUP,
             events : Gdk.EventMask.KEY_PRESS_MASK |
@@ -323,6 +327,7 @@ class Emojier : Gtk.Window {
         make_emoji_dict("en");
         if (m_current_lang != "en")
             make_emoji_dict(m_current_lang);
+        loaded_emoji_dict();
     }
 
     private void init_emoji_dict() {
@@ -355,7 +360,7 @@ class Emojier : Gtk.Window {
         }
     }
 
-    private void update_annotation_to_emojis_dict (IBus.EmojiData data) {
+    private void update_annotation_to_emojis_dict(IBus.EmojiData data) {
         string emoji = data.get_emoji();
         unowned GLib.SList<string> annotations = data.get_annotations();
         foreach (string annotation in annotations) {
@@ -375,8 +380,8 @@ class Emojier : Gtk.Window {
         }
     }
 
-    private void update_emoji_to_data_dict (IBus.EmojiData data,
-                                            string         lang) {
+    private void update_emoji_to_data_dict(IBus.EmojiData data,
+                                           string         lang) {
         string emoji = data.get_emoji();
         if (lang == "en") {
             m_emoji_to_data_dict.replace(emoji, data);
@@ -399,8 +404,8 @@ class Emojier : Gtk.Window {
         }
     }
 
-    private void update_category_to_emojis_dict (IBus.EmojiData data,
-                                                 string         lang) {
+    private void update_category_to_emojis_dict(IBus.EmojiData data,
+                                                string         lang) {
         string emoji = data.get_emoji();
         string category = data.get_category();
         if (lang == "en" && category != "") {
@@ -955,7 +960,7 @@ class Emojier : Gtk.Window {
         hide();
         // Make sure the switcher is hidden before returning from this function.
         while (Gtk.events_pending())
-            Gtk.main_iteration ();
+            Gtk.main_iteration();
         m_is_running = false;
 
         return m_result;
@@ -1069,7 +1074,7 @@ class Emojier : Gtk.Window {
             }
             break;
         default:
-            unichar ch = IBus.keyval_to_unicode (keyval);
+            unichar ch = IBus.keyval_to_unicode(keyval);
             if (!ch.isgraph())
                 return true;
             m_buffer_string.append_unichar(ch);
@@ -1103,10 +1108,19 @@ class Emojier : Gtk.Window {
         m_emoji_font = emoji_font;
     }
 
-    public void set_favorites (string[]? unowned_favorites) {
+    public void set_favorites(string[]? unowned_favorites) {
         m_favorites = {};
         foreach (string favorite in unowned_favorites) {
             m_favorites += favorite;
         }
     }
+
+    public bool has_loaded_emoji_dict() {
+        if (m_emoji_to_data_dict == null)
+            return false;
+        GLib.List keys = m_emoji_to_data_dict.get_keys();
+        if (keys.length() == 0)
+            return false;
+        return true;
+    }
 }
diff --git a/ui/gtk3/ibus-emoji-dialog-1.0.deps b/ui/gtk3/ibus-emoji-dialog-1.0.deps
new file mode 100644
index 000000000..5049a1ad2
--- /dev/null
+++ b/ui/gtk3/ibus-emoji-dialog-1.0.deps
@@ -0,0 +1,2 @@
+gtk+-3.0
+gio-2.0
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
new file mode 100644
index 000000000..c36060c12
--- /dev/null
+++ b/ui/gtk3/ibusemojidialog.h
@@ -0,0 +1,153 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017 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
+ * 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_EMOJI_DIALOG_H_
+#define __IBUS_EMOJI_DIALOG_H_
+
+#include <gtk/gtk.h>
+
+/**
+ * SECTION: ibusemojidialog
+ * @short_description: emoji dialog utility.
+ * @stability: Unstable
+ *
+ * miscellaneous emoji dialg APIs.
+ */
+
+G_BEGIN_DECLS
+
+typedef struct _IBusEmojier IBusEmojier;
+typedef struct _IBusEmojierPrivate IBusEmojierPrivate;
+typedef struct _IBusEmojierClass IBusEmojierClass;
+
+struct _IBusEmojier {
+    /*< private >*/
+    GtkWindow parent_instance;
+    IBusEmojierPrivate * priv;
+    /* instance members */
+    /*< public >*/
+};
+
+struct _IBusEmojierClass {
+    /*< private >*/
+    GtkWindowClass parent_class;
+    /* class members */
+    /*< public >*/
+    /* signals */
+};
+
+GType           ibus_emojier_get_type        (void);
+
+/**
+ * ibus_emojier_new:
+ *
+ * Creates a new #IBusEmojier.
+ *
+ * Returns: A newly allocated #IBusEmojiier.
+ */
+IBusEmojier * ibus_emojier_new                    (void);
+
+/**
+ * ibus_emojier_run:
+ * @self: An #IBusEmojier
+ * @event: An #GdkEvent
+ * @input_context_path: An input context path of #IBusInputContext
+ *                      of the focused application.
+ *
+ * Runs emoji dialog to select emoji.
+ *
+ * Returns: A selected emoji character.
+ */
+gchar *       ibus_emojier_run                    (IBusEmojier* self,
+                                                   GdkEvent*    event,
+                                                   const gchar*
+                                                           input_context_path);
+
+/**
+ * ibus_emojier_is_running:
+ * @self: An #IBusEmojier
+ *
+ * Returns: boolean if the emoji dialog is running
+ */
+gboolean      ibus_emojier_is_running             (IBusEmojier* self);
+
+/**
+ * ibus_emojier_get_input_context_path:
+ * @self: An #IBusEmojier
+ *
+ * Returns: an input context path of #IBusInputContext
+ * which is saved in ibus_emojier_run().
+ */
+gchar *       ibus_emojier_get_input_context_path (IBusEmojier* self);
+
+/**
+ * ibus_emojier_get_selected_string:
+ * @self: An #IBusEmojier
+ *
+ * Returns: an selected emoji character on the emoji dialog.
+ */
+gchar *       ibus_emojier_get_selected_string    (IBusEmojier* self);
+
+/**
+ * ibus_emojier_reset:
+ * @self: An #IBusEmojier
+ *
+ * Reset the selected string and input context path.
+ */
+void          ibus_emojier_reset                  (IBusEmojier* self);
+
+/**
+ * ibus_emojier_set_emoji_font:
+ * @self: An #IBusEmojier
+ * @emoji_font: font name for emoji characters
+ *
+ * Set emoji font on the emoji dialog
+ */
+void          ibus_emojier_set_emoji_font         (IBusEmojier* self,
+                                                   const gchar* emoji_font);
+
+#if 0
+/* TODO: set customized annotations */
+/**
+ * ibus_emojier_set_favorites:
+ * @self: An #IBusEmojier
+ * @favorites: (array length=favorites_length): A custom emoji list.
+ * @favorites_length: A length of @favorites
+ *
+ * Set emoji font on the emoji dialog
+ */
+void          ibus_emojier_set_favorites          (IBusEmojier* self,
+                                                   gchar**      favorites,
+                                                   int
+                                                             favorites_length);
+#endif
+
+/**
+ * ibus_emojier_has_loaded_emoji_dict:
+ * @self: An #IBusEmojier
+ *
+ * Returns: %TRUE if the emoji dict is loaded, otherwise %FALSE.
+ */
+gboolean      ibus_emojier_has_loaded_emoji_dict  (IBusEmojier* self);
+
+G_END_DECLS
+#endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index d6836b320..098213425 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -72,7 +72,7 @@ class Panel : IBus.PanelService {
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
     private uint m_switcher_focus_set_engine_id;
-    private Emojier m_emojier;
+    private IBusEmojier m_emojier;
     private uint m_emojier_focus_commit_text_id;
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
@@ -136,7 +136,7 @@ class Panel : IBus.PanelService {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
 
-        m_emojier = new Emojier();
+        m_emojier = new IBusEmojier();
         bind_emoji_shortcut();
 
         m_property_manager = new PropertyManager();
@@ -584,6 +584,13 @@ class Panel : IBus.PanelService {
             return;
         }
 
+        string emoji_font = m_settings_panel.get_string("emoji-font");
+        if (emoji_font == null) {
+            warning("No config panel:emoji-font.");
+            return;
+        }
+        m_emojier.set_emoji_font(emoji_font);
+
         bool use_custom_font = m_settings_panel.get_boolean("use-custom-font");
 
         if (m_css_provider != null) {
@@ -602,13 +609,6 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        string emoji_font = m_settings_panel.get_string("emoji-font");
-        if (emoji_font == null) {
-            warning("No config panel:emoji-font.");
-            return;
-        }
-        m_emojier.set_emoji_font(emoji_font);
-
         Pango.FontDescription font_desc =
                 Pango.FontDescription.from_string(custom_font);
         string font_family = font_desc.get_family();

From f7f3bc82e480b0bd03ac42ac63baa8748053a819 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Mar 2017 18:31:08 +0900
Subject: [PATCH 379/816] Release 1.5.15

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/319420043
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b23ce6eb..027c02739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [14])
+m4_define([ibus_micro_version], [15])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 641c3cb5dac87fef392e926b35e1b660c0d34c15 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 7 Mar 2017 00:56:19 +0900
Subject: [PATCH 380/816] Fix a build failure with --disable-emoji-dict

BUG=https://github.com/ibus/ibus/issues/1908

Review URL: https://codereview.appspot.com/313690043
---
 tools/Makefile.am | 3 +++
 tools/main.vala   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8cea01021..bd655af81 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -98,6 +98,7 @@ CLEANFILES = \
 	$(man_one_files) \
 	$(NULL)
 
+if ENABLE_EMOJI_DICT
 if ENABLE_UI
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/ui/gtk3 \
@@ -111,11 +112,13 @@ AM_LDADD += \
 	$(libibus_emoji_dialog) \
 	$(NULL)
 AM_VALAFLAGS += \
+	--define=EMOJI_DICT \
 	--vapidir=$(top_builddir)/ui/gtk3 \
 	--vapidir=$(top_srcdir)/ui/gtk3 \
 	--pkg=ibus-emoji-dialog-1.0 \
 	--pkg=gtk+-3.0 \
 	$(NULL)
 endif
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tools/main.vala b/tools/main.vala
index 592231866..73c6f5752 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -321,6 +321,7 @@ int reset_config(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+#if EMOJI_DICT
 private void run_dialog(IBus.Emojier emojier) {
     Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
     var display = Gdk.Display.get_default();
@@ -359,6 +360,7 @@ int emoji_dialog(string[] argv) {
     }
     return Posix.EXIT_SUCCESS;
 }
+#endif
 
 int print_help(string[] argv) {
     print_usage(stdout);
@@ -385,7 +387,9 @@ static const CommandEntry commands[]  = {
     { "address", N_("Print the D-Bus address of ibus-daemon"), print_address },
     { "read-config", N_("Show the configuration values"), read_config },
     { "reset-config", N_("Reset the configuration values"), reset_config },
+#if EMOJI_DICT
     { "emoji", N_("Save emoji on dialog to clipboard "), emoji_dialog },
+#endif
     { "help", N_("Show this information"), print_help }
 };
 

From 4e02857ccb41e8e42310e2b1372cdc9248da667c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 8 Mar 2017 11:57:27 +0900
Subject: [PATCH 381/816] bus: Add error messages for g_dbus_server_new_sync

BUG=https://github.com/ibus/ibus/issues/1901

Review URL: https://codereview.appspot.com/319460043
---
 bus/server.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bus/server.c b/bus/server.c
index a86e12e54..ff3ea093b 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -96,6 +96,8 @@ bus_new_connection_cb (GDBusServer     *server,
 void
 bus_server_init (void)
 {
+    GError *error = NULL;
+
     dbus = bus_dbus_impl_get_default ();
     ibus = bus_ibus_impl_get_default ();
     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
@@ -103,12 +105,21 @@ bus_server_init (void)
     /* init server */
     GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
     gchar *guid = g_dbus_generate_guid ();
+    if (!g_str_has_prefix (g_address, "unix:tmpdir=")) {
+        g_error ("Your socket address does not have the format unix:tmpdir=$DIR; %s",
+                 g_address);
+    }
     server =  g_dbus_server_new_sync (
                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
                     flags, guid,
                     NULL /* observer */,
                     NULL /* cancellable */,
-                    NULL /* error */);
+                    &error);
+    if (server == NULL) {
+        g_error ("g_dbus_server_new_sync() is failed with address %s "
+                 "and guid %s: %s",
+                 g_address, guid, error->message);
+    }
     g_free (guid);
 
     g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL);

From 7e477d5e0ffe19b6c52558c5b37fdd9cb82c097a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 Mar 2017 11:31:21 +0900
Subject: [PATCH 382/816] tools: Fix `ibus emoji` SEGV when language is
 changed.

BUG=rhbz#1430290

Review URL: https://codereview.appspot.com/317410043
---
 tools/main.vala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/main.vala b/tools/main.vala
index 73c6f5752..fd9fd0e09 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -353,6 +353,9 @@ int emoji_dialog(string[] argv) {
     } else {
         GLib.MainLoop loop = new GLib.MainLoop();
         emojier.loaded_emoji_dict.connect(() => {
+            // The signal is called when the language is changed.
+            if (emojier.is_running())
+                return;
             run_dialog(emojier);
             loop.quit();
         });

From 9dbea347050ae2ad79d1b53f2ad62a7a2cafadc6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 Mar 2017 12:45:20 +0900
Subject: [PATCH 383/816] ui/gtk3: Get emoji colors from the theme

Get selected and normal text color from the theme.
Implement to activate an emoji with mouse motion.
Create back button on emoji language chooser dialog.
Set row_homogeneous on emoji table.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/319470043
---
 ui/gtk3/Makefile.am        |   3 +
 ui/gtk3/candidatearea.vala | 186 ++++++++++++++++++++---------------
 ui/gtk3/emojier.vala       | 192 ++++++++++++++++++++++++++-----------
 3 files changed, 251 insertions(+), 130 deletions(-)

diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index d5ddc4205..4e7fd1b87 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -172,8 +172,11 @@ libibus_emoji_dialog_1_0_la_LDFLAGS =   \
     -version-info @LT_VERSION_INFO@     \
     $(NULL)
 libibus_emoji_dialog_1_0_la_SOURCES =   \
+    candidatearea.c                     \
     emojier.c                           \
     iconwidget.c                        \
+    pango.c                             \
+    separator.c                         \
     $(NULL)
 
 -include $(INTROSPECTION_MAKEFILE)
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index a095e76bf..e162a960e 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -21,6 +21,108 @@
  * USA
  */
 
+class ThemedRGBA {
+    public Gdk.RGBA *normal_fg { get; set; }
+    public Gdk.RGBA *normal_bg { get; set; }
+    public Gdk.RGBA *selected_fg { get; set; }
+    public Gdk.RGBA *selected_bg { get; set; }
+
+    private Gtk.StyleContext m_style_context;
+
+    public ThemedRGBA(Gtk.Widget widget) {
+        this.normal_fg = null;
+        this.normal_bg = null;
+        this.selected_fg = null;
+        this.selected_bg = null;
+
+        /* Use the color of Gtk.TextView instead of Gtk.Label
+         * because the selected label "color" is not configured
+         * in "Adwaita" theme and the selected label "background-color"
+         * is not configured in "Maia" theme.
+         * https://github.com/ibus/ibus/issues/1871
+         */
+        Gtk.WidgetPath widget_path = new Gtk.WidgetPath();
+        widget_path.append_type(typeof(Gtk.TextView));
+        m_style_context = new Gtk.StyleContext();
+        m_style_context.set_path(widget_path);
+        m_style_context.add_class(Gtk.STYLE_CLASS_VIEW);
+
+        /* "-gtk-secondary-caret-color" value is different
+         * if the parent widget is set in "Menta" theme.
+         */
+        m_style_context.set_parent(widget.get_style_context());
+
+        get_rgba();
+
+        m_style_context.changed.connect(() => { get_rgba(); });
+    }
+
+    ~ThemedRGBA() {
+        reset_rgba();
+    }
+
+    private void reset_rgba() {
+        if (this.normal_fg != null) {
+            this.normal_fg.free();
+            this.normal_fg = null;
+        }
+        if (this.normal_bg != null) {
+            this.normal_bg.free();
+            this.normal_bg = null;
+        }
+        if (this.selected_fg != null) {
+            this.selected_fg.free();
+            this.selected_fg = null;
+        }
+        if (this.selected_bg != null) {
+            this.selected_bg.free();
+            this.selected_bg = null;
+        }
+    }
+
+    private void get_rgba() {
+        reset_rgba();
+        Gdk.RGBA *normal_fg = null;
+        Gdk.RGBA *normal_bg = null;
+        Gdk.RGBA *selected_fg = null;
+        Gdk.RGBA *selected_bg = null;
+        m_style_context.get(Gtk.StateFlags.NORMAL,
+                            "color",
+                            out normal_fg);
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            "color",
+                            out selected_fg);
+
+        string bg_prop = "background-color";
+        m_style_context.get(Gtk.StateFlags.NORMAL,
+                            bg_prop,
+                            out normal_bg);
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            bg_prop,
+                            out selected_bg);
+        if (normal_bg.red   == selected_bg.red &&
+            normal_bg.green == selected_bg.green &&
+            normal_bg.blue  == selected_bg.blue &&
+            normal_bg.alpha == selected_bg.alpha) {
+            normal_bg.free();
+            normal_bg = null;
+            normal_bg.free();
+            normal_bg = null;
+            bg_prop = "-gtk-secondary-caret-color";
+            m_style_context.get(Gtk.StateFlags.NORMAL,
+                                bg_prop,
+                                out normal_bg);
+            m_style_context.get(Gtk.StateFlags.SELECTED,
+                                bg_prop,
+                                out selected_bg);
+        }
+        this.normal_fg   = normal_fg;
+        this.normal_bg   = normal_bg;
+        this.selected_fg = selected_fg;
+        this.selected_bg = selected_bg;
+    }
+}
+
 class CandidateArea : Gtk.Box {
     private bool m_vertical;
     private Gtk.Label[] m_labels;
@@ -30,9 +132,7 @@ class CandidateArea : Gtk.Box {
     private IBus.Text[] m_ibus_candidates;
     private uint m_focus_candidate;
     private bool m_show_cursor;
-    Gtk.StyleContext m_style_context;
-    private Gdk.RGBA *m_selected_fg_color = null;
-    private Gdk.RGBA *m_selected_bg_color = null;
+    private ThemedRGBA m_rgba;
 
     private const string LABELS[] = {
         "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
@@ -58,38 +158,7 @@ class CandidateArea : Gtk.Box {
     public CandidateArea(bool vertical) {
         GLib.Object();
         set_vertical(vertical, true);
-
-        /* Use the color of Gtk.TextView instead of Gtk.Label
-         * because the selected label "color" is not configured
-         * in "Adwaita" theme and the selected label "background-color"
-         * is not configured in "Maia" theme.
-         * https://github.com/ibus/ibus/issues/1871
-         */
-        Gtk.WidgetPath widget_path = new Gtk.WidgetPath();
-        widget_path.append_type(typeof(Gtk.TextView));
-        m_style_context = new Gtk.StyleContext();
-        m_style_context.set_path(widget_path);
-        m_style_context.add_class(Gtk.STYLE_CLASS_VIEW);
-
-        /* "-gtk-secondary-caret-color" value is different
-         * if the parent widget is set in "Menta" theme.
-         */
-        m_style_context.set_parent(get_style_context());
-
-        get_selected_color();
-
-        m_style_context.changed.connect(() => { get_selected_color(); });
-    }
-
-    ~CandidateArea() {
-        if (m_selected_bg_color != null) {
-            m_selected_bg_color.free();
-            m_selected_bg_color = null;
-        }
-        if (m_selected_bg_color != null) {
-            m_selected_bg_color.free();
-            m_selected_bg_color = null;
-        }
+        m_rgba = new ThemedRGBA(this);
     }
 
     public bool candidate_scrolled(Gdk.EventScroll event) {
@@ -150,17 +219,17 @@ class CandidateArea : Gtk.Box {
                 Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(candidates[i]);
                 if (i == focus_candidate && show_cursor) {
                     Pango.Attribute pango_attr = Pango.attr_foreground_new(
-                            (uint16)(m_selected_fg_color.red * uint16.MAX),
-                            (uint16)(m_selected_fg_color.green * uint16.MAX),
-                            (uint16)(m_selected_fg_color.blue * uint16.MAX));
+                            (uint16)(m_rgba.selected_fg.red * uint16.MAX),
+                            (uint16)(m_rgba.selected_fg.green * uint16.MAX),
+                            (uint16)(m_rgba.selected_fg.blue * uint16.MAX));
                     pango_attr.start_index = 0;
                     pango_attr.end_index = candidates[i].get_text().length;
                     attrs.insert((owned)pango_attr);
 
                     pango_attr = Pango.attr_background_new(
-                            (uint16)(m_selected_bg_color.red * uint16.MAX),
-                            (uint16)(m_selected_bg_color.green * uint16.MAX),
-                            (uint16)(m_selected_bg_color.blue * uint16.MAX));
+                           (uint16)(m_rgba.selected_bg.red * uint16.MAX),
+                           (uint16)(m_rgba.selected_bg.green * uint16.MAX),
+                           (uint16)(m_rgba.selected_bg.blue * uint16.MAX));
                     pango_attr.start_index = 0;
                     pango_attr.end_index = candidates[i].get_text().length;
                     attrs.insert((owned)pango_attr);
@@ -181,41 +250,6 @@ class CandidateArea : Gtk.Box {
         }
     }
 
-    private void get_selected_color() {
-        if (m_selected_fg_color != null) {
-            m_selected_fg_color.free();
-            m_selected_fg_color = null;
-        }
-        m_style_context.get(Gtk.StateFlags.SELECTED,
-                            "color",
-                            out m_selected_fg_color);
-
-        string bg_prop = "background-color";
-        Gdk.RGBA *normal_color = null;
-        if (m_selected_bg_color != null) {
-            m_selected_bg_color.free();
-            m_selected_bg_color = null;
-        }
-        m_style_context.get(Gtk.StateFlags.NORMAL,
-                            bg_prop,
-                            out normal_color);
-        m_style_context.get(Gtk.StateFlags.SELECTED,
-                            bg_prop,
-                            out m_selected_bg_color);
-        if (normal_color.red   == m_selected_bg_color.red &&
-            normal_color.green == m_selected_bg_color.green &&
-            normal_color.blue  == m_selected_bg_color.blue &&
-            normal_color.alpha == m_selected_bg_color.alpha) {
-            m_selected_bg_color.free();
-            m_selected_bg_color = null;
-            bg_prop = "-gtk-secondary-caret-color";
-            m_style_context.get(Gtk.StateFlags.SELECTED,
-                                bg_prop,
-                                out m_selected_bg_color);
-        }
-        normal_color.free();
-    }
-
     private void recreate_ui() {
         foreach (Gtk.Widget w in get_children()) {
             w.destroy();
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 5496c4ea1..bc1eff4bf 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -72,12 +72,31 @@ class IBusEmojier : Gtk.Window {
     private class EGrid : Gtk.Grid {
         public EGrid() {
             GLib.Object(
+                row_homogeneous : false,
                 vexpand : true,
                 halign : Gtk.Align.FILL,
                 valign : Gtk.Align.FILL
             );
         }
     }
+    private class EWhiteLabel : Gtk.Label {
+        public EWhiteLabel(string text) {
+            GLib.Object(
+                name : "IBusEmojierWhiteLabel"
+            );
+            if (text != "")
+                set_label(text);
+        }
+    }
+    private class ESelectedLabel : Gtk.Label {
+        public ESelectedLabel(string text) {
+            GLib.Object(
+                name : "IBusEmojierSelectedLabel"
+            );
+            if (text != "")
+                set_label(text);
+        }
+    }
     private class EPaddedLabel : Gtk.Box {
         public EPaddedLabel(string          text,
                             Gtk.Align       align,
@@ -161,6 +180,7 @@ class IBusEmojier : Gtk.Window {
     }
 
     private const uint EMOJI_GRID_PAGE = 10;
+    private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
     private ETitleLabel m_title;
     private EEntry m_entry;
@@ -174,7 +194,8 @@ class IBusEmojier : Gtk.Window {
     private GLib.MainLoop? m_loop;
     private string? m_result;
     private GLib.SList<string> m_lang_list;
-    private string m_current_lang = "en";
+    private string m_current_lang_id = "en";
+    private string m_current_language = "English";
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
     private GLib.HashTable<string, GLib.SList>?
@@ -189,11 +210,8 @@ class IBusEmojier : Gtk.Window {
     private Gtk.Label[] m_candidates;
     private string m_emoji_font = "Monospace 16";
     private string[] m_favorites = {};
-    // TODO: Get the selected color from CandidateArea
-    private Gdk.RGBA m_selected_fg_color = Gdk.RGBA(){
-            red = 1.0, green = 1.0, blue = 1.0, alpha = 1.0 };
-    private Gdk.RGBA m_selected_bg_color = Gdk.RGBA(){
-            red = 0.300, green = 0.565, blue = 0.851, alpha = 1.0 };
+    private bool m_enter_notify_enable = true;
+    private uint m_entry_notify_show_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void loaded_emoji_dict();
@@ -220,7 +238,33 @@ class IBusEmojier : Gtk.Window {
             warning("Could not open display.");
             return;
         }
-        string data = "grid { background-color: #ffffff; }";
+        m_rgba = new ThemedRGBA(this);
+        uint bg_red = (uint)(m_rgba.normal_bg.red * 255);
+        uint bg_green = (uint)(m_rgba.normal_bg.green * 255);
+        uint bg_blue = (uint)(m_rgba.normal_bg.blue * 255);
+        double bg_alpha = m_rgba.normal_bg.alpha;
+        string data =
+                "#IBusEmojierWhiteLabel { background-color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        bg_red, bg_green, bg_blue, bg_alpha) +
+                "border-width: 4px; border-radius: 3px; } ";
+
+        uint fg_red = (uint)(m_rgba.selected_fg.red * 255);
+        uint fg_green = (uint)(m_rgba.selected_fg.green * 255);
+        uint fg_blue = (uint)(m_rgba.selected_fg.blue * 255);
+        double fg_alpha = m_rgba.selected_fg.alpha;
+        bg_red = (uint)(m_rgba.selected_bg.red * 255);
+        bg_green = (uint)(m_rgba.selected_bg.green * 255);
+        bg_blue = (uint)(m_rgba.selected_bg.blue * 255);
+        bg_alpha = m_rgba.selected_bg.alpha;
+        data += "#IBusEmojierSelectedLabel { color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        fg_red, fg_green, fg_blue, fg_alpha) +
+                "background-color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        bg_red, bg_green, bg_blue, bg_alpha) +
+                "border-width: 4px; border-radius: 3px; }";
+
         Gtk.CssProvider css_provider = new Gtk.CssProvider();
         try {
             css_provider.load_from_data(data, -1);
@@ -317,6 +361,8 @@ class IBusEmojier : Gtk.Window {
         lang_list.sort((a, b) => {
             string a_lang = IBus.get_language_name(a);
             string b_lang = IBus.get_language_name(b);
+            a_lang = "%s (%s)".printf(a_lang, a);
+            b_lang = "%s (%s)".printf(b_lang, b);
             return GLib.strcmp(a_lang, b_lang);
         });
         return lang_list;
@@ -325,8 +371,8 @@ class IBusEmojier : Gtk.Window {
     private void reload_emoji_dict() {
         init_emoji_dict();
         make_emoji_dict("en");
-        if (m_current_lang != "en")
-            make_emoji_dict(m_current_lang);
+        if (m_current_lang_id != "en")
+            make_emoji_dict(m_current_lang_id);
         loaded_emoji_dict();
     }
 
@@ -458,22 +504,50 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+    private void activated_language(EBoxRow row) {
+        m_category_active_index = 0;
+        if (m_current_lang_id != row.id) {
+            m_current_lang_id = row.id;
+            m_current_language = row.text;
+            reload_emoji_dict();
+        }
+        m_current_category_type = CategoryType.EMOJI;
+        show_category_list();
+    }
+
     private void show_category_list() {
         remove_all_children();
         m_scrolled_window = new EScrolledWindow();
         set_fixed_size();
-        string language = IBus.get_language_name(m_current_lang);
-        EPaddedLabel label = new EPaddedLabel(language, Gtk.Align.CENTER);
+        EPaddedLabel label;
+        if (m_current_category_type == CategoryType.EMOJI) {
+            label = new EPaddedLabel(m_current_language, Gtk.Align.CENTER);
+        } else if (m_current_category_type == CategoryType.LANG) {
+            label = new EPaddedLabel(m_current_language,
+                                     Gtk.Align.CENTER,
+                                     TravelDirection.BACKWARD);
+        } else {
+            label = new EPaddedLabel("", Gtk.Align.CENTER);
+        }
         Gtk.Button button = new Gtk.Button();
         button.add(label);
         m_vbox.add(button);
         button.show_all();
-        button.button_press_event.connect((e) => {
-            m_category_active_index = 0;
-            m_current_category_type = CategoryType.LANG;
-            show_category_list();
-            return true;
-        });
+        if (m_current_category_type == CategoryType.EMOJI) {
+            button.button_press_event.connect((e) => {
+                m_category_active_index = 0;
+                m_current_category_type = CategoryType.LANG;
+                show_category_list();
+                return true;
+            });
+        } else if (m_current_category_type == CategoryType.LANG) {
+            button.button_press_event.connect((e) => {
+                m_category_active_index = 0;
+                m_current_category_type = CategoryType.EMOJI;
+                show_category_list();
+                return true;
+            });
+        }
 
         m_vbox.add(m_scrolled_window);
         Gtk.Viewport viewport = new Gtk.Viewport(null, null);
@@ -523,21 +597,19 @@ class IBusEmojier : Gtk.Window {
             }
         } else if (m_current_category_type == CategoryType.LANG) {
             m_list_box.row_activated.connect((box, gtkrow) => {
-                m_category_active_index = 0;
-                EBoxRow row = gtkrow as EBoxRow;
-                if (m_current_lang != row.id) {
-                    m_current_lang = row.id;
-                    reload_emoji_dict();
-                }
-                m_current_category_type = CategoryType.EMOJI;
-                show_category_list();
+                activated_language(gtkrow as EBoxRow);
             });
             uint n = 1;
+            string prev_language = null;
             foreach (unowned string id in m_lang_list) {
-                string selected_language = IBus.get_language_name(id);
-                EBoxRow row = new EBoxRow("", id);
+                string language = IBus.get_language_name(id);
+                if (prev_language == language)
+                    language = "%s (%s)".printf(language, id);
+                else
+                    prev_language = language;
+                EBoxRow row = new EBoxRow(language, id);
                 EPaddedLabel widget =
-                        new EPaddedLabel(selected_language, Gtk.Align.CENTER);
+                        new EPaddedLabel(language, Gtk.Align.CENTER);
                 row.add(widget);
                 m_list_box.add(row);
                 if (n++ == m_category_active_index)
@@ -573,27 +645,6 @@ class IBusEmojier : Gtk.Window {
         show_candidate_panel();
     }
 
-    private void label_set_active_color(Gtk.Label label) {
-        unowned string text = label.get_text();
-        Pango.AttrList attrs = new Pango.AttrList();
-        Pango.Attribute pango_attr = Pango.attr_foreground_new(
-                (uint16)(m_selected_fg_color.red * uint16.MAX),
-                (uint16)(m_selected_fg_color.green * uint16.MAX),
-                (uint16)(m_selected_fg_color.blue * uint16.MAX));
-        pango_attr.start_index = 0;
-        pango_attr.end_index = text.char_count();
-        attrs.insert((owned)pango_attr);
-
-        pango_attr = Pango.attr_background_new(
-                (uint16)(m_selected_bg_color.red * uint16.MAX),
-                (uint16)(m_selected_bg_color.green * uint16.MAX),
-                (uint16)(m_selected_bg_color.blue * uint16.MAX));
-        pango_attr.start_index = 0;
-        pango_attr.end_index = text.char_count();
-        attrs.insert((owned)pango_attr);
-        label.set_attributes(attrs);
-    }
-
     private void show_arrow_buttons() {
         Gtk.Button next_button = new Gtk.Button();
         next_button.clicked.connect(() => {
@@ -709,10 +760,17 @@ class IBusEmojier : Gtk.Window {
             });
         }
         EGrid grid = new EGrid();
+        grid.set_row_spacing(5);
+        grid.set_column_spacing(5);
+        grid.set_border_width(2);
         int n = 0;
         for (uint i = page_start_pos; i < page_end_pos; i++) {
             IBus.Text candidate = m_lookup_table.get_candidate(i);
-            Gtk.Label label = new Gtk.Label(candidate.text);
+            Gtk.Label label;
+            if (i == cursor)
+                label = new ESelectedLabel(candidate.text) as Gtk.Label;
+            else
+                label = new EWhiteLabel(candidate.text) as Gtk.Label;
             string emoji_font = m_emoji_font;
             if (candidate.text.char_count() > 2) {
                 Pango.FontDescription font_desc =
@@ -726,9 +784,6 @@ class IBusEmojier : Gtk.Window {
             label.set_markup(markup);
             label.set_halign(Gtk.Align.FILL);
             label.set_valign(Gtk.Align.FILL);
-            if (i == cursor) {
-                label_set_active_color(label);
-            }
             Gtk.EventBox candidate_ebox = new Gtk.EventBox();
             candidate_ebox.add(label);
             // Make a copy of i to workaround a bug in vala.
@@ -738,6 +793,23 @@ class IBusEmojier : Gtk.Window {
                 candidate_clicked(index, e.button, e.state);
                 return true;
             });
+            // m_enter_notify_enable is added because
+            // enter_notify_event conflicts with keyboard operations.
+            if (m_enter_notify_enable) {
+                candidate_ebox.enter_notify_event.connect((e) => {
+                    m_lookup_table.set_cursor_pos(index);
+                    if (m_entry_notify_show_id > 0) {
+                        GLib.Source.remove(m_entry_notify_show_id);
+                    }
+                    // If timeout is not added, memory leak happens and
+                    // button_press_event signal does not work above.
+                    m_entry_notify_show_id = GLib.Timeout.add(100, () => {
+                        show_candidate_panel();
+                        return false;
+                    });
+                    return true;
+                });
+            }
             grid.attach(candidate_ebox,
                         n % (int)EMOJI_GRID_PAGE, n / (int)EMOJI_GRID_PAGE,
                         1, 1);
@@ -797,6 +869,7 @@ class IBusEmojier : Gtk.Window {
     }
 
     private void hide_candidate_panel() {
+        m_enter_notify_enable = true;
         m_candidate_panel_is_visible = false;
         if (m_loop.is_running())
             show_category_list();
@@ -841,6 +914,7 @@ class IBusEmojier : Gtk.Window {
     }
 
     private void candidate_panel_cursor_down() {
+        m_enter_notify_enable = false;
         uint ncandidates = m_lookup_table.get_number_of_candidates();
         uint cursor = m_lookup_table.get_cursor_pos();
         if ((cursor + EMOJI_GRID_PAGE) < ncandidates) {
@@ -854,6 +928,7 @@ class IBusEmojier : Gtk.Window {
     }
 
     private void candidate_panel_cursor_up() {
+        m_enter_notify_enable = false;
         int ncandidates = (int)m_lookup_table.get_number_of_candidates();
         int cursor = (int)m_lookup_table.get_cursor_pos();
         int highest_pos =
@@ -891,6 +966,7 @@ class IBusEmojier : Gtk.Window {
         m_input_context_path = input_context_path;
         m_candidate_panel_is_visible = false;
         m_result = null;
+        m_enter_notify_enable = true;
 
         /* Let gtk recalculate the window size. */
         resize(1, 1);
@@ -1011,7 +1087,10 @@ class IBusEmojier : Gtk.Window {
             } else if (m_category_active_index > 0) {
                 Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
                 EBoxRow row = gtkrow as EBoxRow;
-                show_emoji_for_category(row);
+                if (m_current_category_type == CategoryType.EMOJI)
+                    show_emoji_for_category(row);
+                else if (m_current_category_type == CategoryType.LANG)
+                    activated_language(row);
             }
             return true;
         case Gdk.Key.BackSpace:
@@ -1026,6 +1105,7 @@ class IBusEmojier : Gtk.Window {
                 break;
             }
             if (m_candidate_panel_is_visible) {
+                m_enter_notify_enable = false;
                 m_lookup_table.cursor_down();
                 show_candidate_panel();
             }
@@ -1035,6 +1115,7 @@ class IBusEmojier : Gtk.Window {
             return true;
         case Gdk.Key.Right:
             if (m_candidate_panel_is_visible) {
+                m_enter_notify_enable = false;
                 m_lookup_table.cursor_down();
                 show_candidate_panel();
                 return true;
@@ -1042,6 +1123,7 @@ class IBusEmojier : Gtk.Window {
             break;
         case Gdk.Key.Left:
             if (m_candidate_panel_is_visible) {
+                m_enter_notify_enable = false;
                 m_lookup_table.cursor_up();
                 show_candidate_panel();
                 return true;
@@ -1061,6 +1143,7 @@ class IBusEmojier : Gtk.Window {
             return true;
         case Gdk.Key.Page_Down:
             if (m_candidate_panel_is_visible) {
+                m_enter_notify_enable = false;
                 m_lookup_table.page_down();
                 show_candidate_panel();
                 return true;
@@ -1068,6 +1151,7 @@ class IBusEmojier : Gtk.Window {
             break;
         case Gdk.Key.Page_Up:
             if (m_candidate_panel_is_visible) {
+                m_enter_notify_enable = false;
                 m_lookup_table.page_up();
                 show_candidate_panel();
                 return true;

From 31ed31e5303c3946f53b035a63d76f5c1e3cd84a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Mar 2017 11:43:09 +0900
Subject: [PATCH 384/816] src: Fix ibus_emoji_dict_load()

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/320350043
---
 configure.ac       | 3 ++-
 src/emoji-parser.c | 6 ++++--
 src/ibusemoji.c    | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 027c02739..369485c7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -620,7 +620,8 @@ fi
 
 AC_ARG_WITH(emoji-json-file,
     AS_HELP_STRING([--with-emoji-json-file[=DIR/emoji.json]],
-        [Set emoji.json. (default: "/usr/lib/node_modules/emojione/emoji.json")]),
+        [Set emoji.json. (default: "/usr/lib/node_modules/emojione/emoji.json")
+         You can get emoji.json with "npm install -g emojione".]),
     EMOJI_JSON_FILE=$with_emoji_json_file,
     EMOJI_JSON_FILE="/usr/lib/node_modules/emojione/emoji.json"
 )
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index c5af42c68..5965309b7 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -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) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -20,9 +20,11 @@
  * USA
  */
 
-/* Convert ../data/annotations/en.xml and
+/* Convert /usr/share/unicode/cldr/common/annotations/*.xml and
  * /usr/lib/node_modules/emojione/emoji.json
  * to the dictionary file which look up the Emoji from the annotation.
+ * Get *.xml from https://github.com/fujiwarat/cldr-emoji-annotation
+ * or http://www.unicode.org/repos/cldr/trunk/common/annotations .
  * Get emoji.json with 'npm install -g emojione'.
  * en.xml is used for the Unicode annotations and emoji.json is used
  * for the aliases_ascii, e.g. ":)", and category, e.g. "people".
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index 8d8870489..996d136d2 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -431,10 +431,10 @@ ibus_emoji_dict_load (const gchar *path)
     GHashTable *dict = g_hash_table_new_full (g_str_hash,
                                               g_str_equal,
                                               g_free,
-                                              free_dict_words);
+                                              g_object_unref);
 
     for (l = list; l; l = l->next) {
-        IBusEmojiData *data = list->data;
+        IBusEmojiData *data = l->data;
         if (!IBUS_IS_EMOJI_DATA (data)) {
             g_warning ("Your dict format is no longer supported.\n"
                        "Need to create the dictionaries again.");
@@ -442,7 +442,7 @@ ibus_emoji_dict_load (const gchar *path)
         }
         g_hash_table_insert (dict,
                              g_strdup (ibus_emoji_data_get_emoji (data)),
-                             data);
+                             g_object_ref_sink (data));
     }
 
     g_slist_free (list);

From c580845167b54ccab76d8b72bdc797ef8d64d554 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Mar 2017 11:58:06 +0900
Subject: [PATCH 385/816] ui/gtk3: Fix emoji text entry cusor position

Focus on emoji text entry by default
Remove internal text buffer and use Gtk.Entry buffer instead.
Implement cusor left, right, home, end on emoji annotation preedit.

Review URL: https://codereview.appspot.com/313710043
---
 ui/gtk3/emojier.vala | 104 ++++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index bc1eff4bf..8cecea811 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -75,7 +75,10 @@ class IBusEmojier : Gtk.Window {
                 row_homogeneous : false,
                 vexpand : true,
                 halign : Gtk.Align.FILL,
-                valign : Gtk.Align.FILL
+                valign : Gtk.Align.FILL,
+                row_spacing : 5,
+                column_spacing : 5,
+                border_width : 2
             );
         }
     }
@@ -190,7 +193,6 @@ class IBusEmojier : Gtk.Window {
     private CategoryType m_current_category_type = CategoryType.EMOJI;
     private bool m_is_running = false;
     private string m_input_context_path = "";
-    private GLib.StringBuilder m_buffer_string;
     private GLib.MainLoop? m_loop;
     private string? m_result;
     private GLib.SList<string> m_lang_list;
@@ -288,11 +290,9 @@ class IBusEmojier : Gtk.Window {
         m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
         m_vbox.add(m_entry);
         m_entry.changed.connect(() => {
-            m_buffer_string.assign(m_entry.get_text());
-            update_cadidate_window();
+            update_candidate_window();
         });
         m_entry.icon_release.connect((icon_pos, event) => {
-            m_buffer_string.erase();
             hide_candidate_panel();
         });
 
@@ -303,7 +303,6 @@ class IBusEmojier : Gtk.Window {
         Atk.Object obj = m_entry.get_accessible();
         obj.set_role (Atk.Role.STATUSBAR);
 
-        m_buffer_string = new StringBuilder();
         grab_focus();
 
         // The constructor of IBus.LookupTable does not support more than
@@ -680,11 +679,16 @@ class IBusEmojier : Gtk.Window {
         buttons_hbox.show_all();
     }
 
-    private bool check_unicode_point(bool check_xdigit_only) {
-        m_unicode_point = null;
+    private bool check_unicode_point(string? annotation=null) {
+        bool check_xdigit_only = true;
+        if (annotation == null) {
+            annotation = m_entry.get_text();
+            m_unicode_point = null;
+            check_xdigit_only = false;
+        }
         GLib.StringBuilder buff = new GLib.StringBuilder();
-        for (int i = 0; i < m_buffer_string.str.char_count(); i++) {
-            unichar ch = m_buffer_string.str.get_char(i);
+        for (int i = 0; i < annotation.char_count(); i++) {
+            unichar ch = annotation.get_char(i);
             if (ch == 0)
                 return false;
             if (!ch.isxdigit())
@@ -704,7 +708,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
-    public void update_cadidate_window() {
+    public void update_candidate_window() {
         string annotation = m_entry.get_text();
         if (annotation.length == 0) {
             hide_candidate_panel();
@@ -716,7 +720,7 @@ class IBusEmojier : Gtk.Window {
             return;
         }
         // Call check_unicode_point() to get m_unicode_point
-        check_unicode_point(false);
+        check_unicode_point();
         unowned GLib.SList<string>? emojis =
             m_annotation_to_emojis_dict.lookup(annotation);
         if (emojis == null && m_unicode_point == null) {
@@ -725,7 +729,7 @@ class IBusEmojier : Gtk.Window {
         }
         m_lookup_table.clear();
         // Call check_unicode_point() to update m_lookup_table
-        check_unicode_point(false);
+        check_unicode_point();
         foreach (unowned string emoji in emojis) {
             IBus.Text text = new IBus.Text.from_string(emoji);
             m_lookup_table.append_candidate(text);
@@ -760,9 +764,6 @@ class IBusEmojier : Gtk.Window {
             });
         }
         EGrid grid = new EGrid();
-        grid.set_row_spacing(5);
-        grid.set_column_spacing(5);
-        grid.set_border_width(2);
         int n = 0;
         for (uint i = page_start_pos; i < page_end_pos; i++) {
             IBus.Text candidate = m_lookup_table.get_candidate(i);
@@ -878,14 +879,11 @@ class IBusEmojier : Gtk.Window {
     private bool if_in_range_of_lookup(uint keyval) {
         if (!m_candidate_panel_is_visible)
             return false;
-        string backup_annotation = m_buffer_string.str.dup();
+        StringBuilder buffer_string = new StringBuilder(m_entry.get_text());
         unichar ch = IBus.keyval_to_unicode (keyval);
-        m_buffer_string.append_unichar(ch);
-        if (check_unicode_point(true)) {
-            m_buffer_string.assign(backup_annotation);
+        buffer_string.append_unichar(ch);
+        if (check_unicode_point(buffer_string.str))
             return false;
-        }
-        m_buffer_string.assign(backup_annotation);
         if (keyval < Gdk.Key.@0 || keyval > Gdk.Key.@9)
             return false;
         if (keyval == Gdk.Key.@0)
@@ -958,6 +956,18 @@ class IBusEmojier : Gtk.Window {
         show_category_list();
     }
 
+    private void entry_enter_keyval(uint keyval) {
+        unichar ch = IBus.keyval_to_unicode(keyval);
+        if (!ch.isgraph())
+            return;
+        string str = ch.to_string();
+
+        // what gtk_entry_commit_cb() do
+        int pos = m_entry.get_position();
+        m_entry.insert_text(str, -1, ref pos);
+        m_entry.set_position(pos);
+    }
+
     public string run(Gdk.Event event,
                       string    input_context_path) {
         assert (m_loop == null);
@@ -972,7 +982,7 @@ class IBusEmojier : Gtk.Window {
         resize(1, 1);
 
         m_entry.set_text("");
-        m_buffer_string.erase();
+        m_entry.grab_focus();
 
         Gdk.Device device = event.get_device();
         if (device == null) {
@@ -1070,12 +1080,12 @@ class IBusEmojier : Gtk.Window {
                 m_current_category_type = CategoryType.EMOJI;
                 show_candidate_panel();
                 return true;
-            } else if (m_buffer_string.str.length == 0) {
+            } else if (m_entry.get_text().length == 0) {
                 m_loop.quit();
                 hide_candidate_panel();
                 return true;
             }
-            m_buffer_string.erase();
+            m_entry.delete_text(0, -1);
             break;
         case Gdk.Key.Return:
             if (m_candidate_panel_is_visible) {
@@ -1094,14 +1104,14 @@ class IBusEmojier : Gtk.Window {
             }
             return true;
         case Gdk.Key.BackSpace:
-            if (m_buffer_string.len > 0)
-                m_buffer_string.erase(m_buffer_string.len - 1);
+            if (m_entry.get_text().len() > 0) {
+                GLib.Signal.emit_by_name(m_entry, "backspace");
+            }
             break;
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
             if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
-                unichar ch = IBus.keyval_to_unicode (keyval);
-                m_buffer_string.append_unichar(ch);
+                entry_enter_keyval(keyval);
                 break;
             }
             if (m_candidate_panel_is_visible) {
@@ -1120,6 +1130,12 @@ class IBusEmojier : Gtk.Window {
                 show_candidate_panel();
                 return true;
             }
+            if (m_entry.get_text().len() > 0) {
+                GLib.Signal.emit_by_name(m_entry, "move-cursor",
+                                         Gtk.MovementStep.VISUAL_POSITIONS,
+                                         1, false);
+                return true;
+            }
             break;
         case Gdk.Key.Left:
             if (m_candidate_panel_is_visible) {
@@ -1128,6 +1144,12 @@ class IBusEmojier : Gtk.Window {
                 show_candidate_panel();
                 return true;
             }
+            if (m_entry.get_text().len() > 0) {
+                GLib.Signal.emit_by_name(m_entry, "move-cursor",
+                                         Gtk.MovementStep.VISUAL_POSITIONS,
+                                         -1, false);
+                return true;
+            }
             break;
         case Gdk.Key.Down:
             if (m_candidate_panel_is_visible)
@@ -1157,17 +1179,27 @@ class IBusEmojier : Gtk.Window {
                 return true;
             }
             break;
-        default:
-            unichar ch = IBus.keyval_to_unicode(keyval);
-            if (!ch.isgraph())
+        case Gdk.Key.Home:
+            if (m_entry.get_text().len() > 0) {
+                GLib.Signal.emit_by_name(m_entry, "move-cursor",
+                                         Gtk.MovementStep.DISPLAY_LINE_ENDS,
+                                         -1, false);
+                return true;
+            }
+            break;
+        case Gdk.Key.End:
+            if (m_entry.get_text().len() > 0) {
+                GLib.Signal.emit_by_name(m_entry, "move-cursor",
+                                         Gtk.MovementStep.DISPLAY_LINE_ENDS,
+                                         1, false);
                 return true;
-            m_buffer_string.append_unichar(ch);
+            }
+            break;
+        default:
+            entry_enter_keyval(keyval);
             break;
         }
 
-        string annotation = m_buffer_string.str;
-        m_entry.set_text(annotation);
-
         return true;
     }
 

From fbe3de1789c73a8a175a451b2a6b967f5d3c6514 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 Mar 2017 12:08:21 +0900
Subject: [PATCH 386/816] src: Update emoji-parser to treat tts as emoji
 description

unicode annotation xml files have a 'tts' attribute and seem
it is used as the emoji descriptions instead of emoji annotations.
This can show the translated descriptions.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/319480043
---
 src/emoji-parser.c   | 26 +++++++++++++++++++-------
 src/ibusemoji.c      | 16 +++++++++++++---
 src/ibusemoji.h      | 11 +++++++++++
 ui/gtk3/emojier.vala | 17 ++++++++++++++---
 4 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index 5965309b7..8ff04f12a 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -43,6 +43,7 @@ struct _EmojiData {
     GSList     *annotations;
     gboolean    is_annotation;
     gchar      *description;
+    gboolean    is_tts;
     gchar      *category;
     GSList     *list;
 };
@@ -97,6 +98,8 @@ update_emoji_list (EmojiData *data)
                                        (GCopyFunc) g_strdup,
                                        NULL));
         }
+        if (data->description)
+            ibus_emoji_data_set_description (emoji, data->description);
     } else {
         IBusEmojiData *emoji =
                 ibus_emoji_data_new ("emoji",
@@ -149,13 +152,12 @@ unicode_annotations_start_element_cb (GMarkupParseContext *context,
                 data->emoji = g_strdup (value);
             }
         }
-        else if (g_strcmp0 (attribute, "tts") == 0) {
-            GSList *duplicated = g_slist_find_custom (data->annotations,
-                                                      value,
-                                                      (GCompareFunc) g_strcmp0);
-            if (duplicated == NULL) {
-                data->annotations = g_slist_prepend (data->annotations,
-                                                     g_strdup (value));
+        /* tts seems 'text to speach' and it would be a description
+         * instead of annotation.
+         */
+        else if (g_strcmp0 (attribute, "type") == 0) {
+            if (g_strcmp0 (value, "tts") == 0) {
+                data->is_tts = TRUE;
             }
         }
     }
@@ -177,6 +179,7 @@ unicode_annotations_end_element_cb (GMarkupParseContext *context,
 
     update_emoji_list (data);
     data->is_annotation = FALSE;
+    data->is_tts = FALSE;
 }
 
 void
@@ -194,6 +197,15 @@ unicode_annotations_text_cb (GMarkupParseContext *context,
     g_assert (data != NULL);
     if (!data->is_annotation)
         return;
+    if (data->is_tts) {
+        if (data->description) {
+            g_warning ("Duplicated 'tts' is found: %s: %s",
+                       data->description, text);
+            g_clear_pointer (&data->description, g_free);
+        }
+        data->description = g_strdup (text);
+        return;
+    }
     annotations = g_strsplit (text, " | ", -1);
     for (i = 0; (annotation = annotations[i]) != NULL; i++) {
         GSList *duplicated = g_slist_find_custom (data->annotations,
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index 996d136d2..c61cd703e 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -29,7 +29,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_EMOJI_DATA_MAGIC "IBusEmojiData"
-#define IBUS_EMOJI_DATA_VERSION (1)
+#define IBUS_EMOJI_DATA_VERSION (2)
 
 enum {
     PROP_0 = 0,
@@ -128,7 +128,7 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                         "emoji description",
                         "The emoji description",
                         "",
-                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                        G_PARAM_READWRITE));
 
     /**
      * IBusEmojiData:category:
@@ -352,6 +352,16 @@ ibus_emoji_data_get_description (IBusEmojiData *emoji)
     return emoji->priv->description;
 }
 
+void
+ibus_emoji_data_set_description (IBusEmojiData *emoji,
+                                 const gchar   *description)
+{
+    g_return_if_fail (IBUS_IS_EMOJI_DATA (emoji));
+
+    g_free (emoji->priv->description);
+    emoji->priv->description = g_strdup (description);
+}
+
 const gchar *
 ibus_emoji_data_get_category (IBusEmojiData *emoji)
 {
@@ -541,7 +551,7 @@ ibus_emoji_data_load (const gchar *path)
         goto out_load_cache;
     }
 
-    if (version != IBUS_EMOJI_DATA_VERSION) {
+    if (version > IBUS_EMOJI_DATA_VERSION) {
         g_warning ("cache version is different: %u != %u",
                    version, IBUS_EMOJI_DATA_VERSION);
         goto out_load_cache;
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
index 3fd09a94c..eb24fdda6 100644
--- a/src/ibusemoji.h
+++ b/src/ibusemoji.h
@@ -133,6 +133,17 @@ void            ibus_emoji_data_set_annotations (IBusEmojiData *emoji,
  */
 const gchar *   ibus_emoji_data_get_description (IBusEmojiData *emoji);
 
+/**
+ * ibus_emoji_data_set_description:
+ * @emoji : An #IBusEmojiData
+ * @description: An emoji description
+ *
+ * Sets the description in #IBusEmojiData.
+ */
+void            ibus_emoji_data_set_description (IBusEmojiData *emoji,
+                                                 const gchar   *description);
+
+
 /**
  * ibus_emoji_data_get_category:
  * @emoji : An #IBusEmojiData
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8cecea811..5e126e94b 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -370,8 +370,14 @@ class IBusEmojier : Gtk.Window {
     private void reload_emoji_dict() {
         init_emoji_dict();
         make_emoji_dict("en");
-        if (m_current_lang_id != "en")
+        if (m_current_lang_id != "en") {
+            var lang_ids = m_current_lang_id.split("_");
+            if (lang_ids.length > 1) {
+                string sub_id = lang_ids[0];
+                make_emoji_dict(sub_id);
+            }
             make_emoji_dict(m_current_lang_id);
+        }
         loaded_emoji_dict();
     }
 
@@ -393,8 +399,8 @@ class IBusEmojier : Gtk.Window {
         if (emoji_list == null)
             return;
         foreach (IBus.EmojiData data in emoji_list) {
-            update_annotation_to_emojis_dict(data);
             update_emoji_to_data_dict(data, lang);
+            update_annotation_to_emojis_dict(data);
             update_category_to_emojis_dict(data, lang);
         }
         GLib.List<unowned string> annotations =
@@ -434,11 +440,16 @@ class IBusEmojier : Gtk.Window {
             unowned IBus.EmojiData? en_data =
                     m_emoji_to_data_dict.lookup(emoji);
             if (en_data == null) {
-                warning("No IBusEmojiData for English: %s".printf(emoji));
                 m_emoji_to_data_dict.insert(emoji, data);
                 return;
             }
+            string trans_description = data.get_description();
+            en_data.set_description(trans_description);
             unowned GLib.SList<string> annotations = data.get_annotations();
+            var words = trans_description.split(" ");
+            // If the description has less than 3 words, add it to annotations
+            if (words.length < 3)
+                annotations.append(trans_description);
             unowned GLib.SList<string> en_annotations
                 = en_data.get_annotations();
             foreach (string annotation in en_annotations) {

From ab6c38c192cdf22356cbf254b98fb5b3d9d9a680 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 15 Mar 2017 11:48:24 +0900
Subject: [PATCH 387/816] client/x11: Add XSetIOErrorHandler() for GNOME3
 desktop

When log into GNOME3 desktop immediately after the system is booted,
ibus-daemon is sometimes alive but ibus-x11 is dead after log out
the session. Because gdk_x_io_error() is called as the callback of
XSetIOErrorHandler() in gtk/gdk/x11/gdkmain-x11.c in ibus-x11.
Now I assume the callback is called in logout.

BUG=https://github.com/ibus/ibus/issues/1907

Review URL: https://codereview.appspot.com/319490043
---
 client/x11/main.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/x11/main.c b/client/x11/main.c
index a717a2c8e..159f43031 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -2,6 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus
  * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
@@ -1131,6 +1132,20 @@ _xerror_handler (Display *dpy, XErrorEvent *e)
     return 1;
 }
 
+/* When log into GNOME3 desktop immediately after the system is booted,
+ * ibus-daemon is sometimes alive but ibus-x11 is dead after log out
+ * the session. Because gdk_x_io_error() is called as the callback of
+ * XSetIOErrorHandler() in gtk/gdk/x11/gdkmain-x11.c in ibus-x11.
+ * Now I assume the callback is called in logout.
+ */
+static int
+_xerror_io_handler (Display *dpy)
+{
+    if (_kill_daemon)
+        _atexit_cb ();
+    return 0;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -1146,6 +1161,7 @@ main (int argc, char **argv)
 
     gtk_init (&argc, &argv);
     XSetErrorHandler (_xerror_handler);
+    XSetIOErrorHandler (_xerror_io_handler);
 
     while (1) {
         static struct option long_options [] = {

From 58f6140f427815adc947a5bb5c7dea4f3e315ae8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 15 Mar 2017 11:52:39 +0900
Subject: [PATCH 388/816] ui/gtk3: Implement shortcut keys on emoji dialog

- Implement Ctrl-f, Ctrl-b, Ctrl-n, Ctrl-p, Ctrl-h, Ctrh-e for
  cursor movements; forward, back, next, previous, head, end
  on emoji grid.
- Implement Ctrl-a and Shift+arrow for text selection on emoji annotation.
- Implement Ctrl-u to delete text on emoji annotation.
- Implement to delete a selected text on emoji annotation.
- Change to show page indices to candidate indices on emoji.
- Sorted emoji categories.
- Added timeout of m_enter_notify_enable = false to bring back mouse.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/315700043
---
 ui/gtk3/emojier.vala | 311 ++++++++++++++++++++++++++++++-------------
 1 file changed, 215 insertions(+), 96 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 5e126e94b..7da96c7c9 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -214,6 +214,7 @@ class IBusEmojier : Gtk.Window {
     private string[] m_favorites = {};
     private bool m_enter_notify_enable = true;
     private uint m_entry_notify_show_id;
+    private uint m_entry_notify_disable_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void loaded_emoji_dict();
@@ -525,6 +526,18 @@ class IBusEmojier : Gtk.Window {
         show_category_list();
     }
 
+    private string get_title_string(string orig) {
+        StringBuilder buff = new StringBuilder();
+        for (int i = 0; i < orig.char_count(); i++) {
+            unichar ch = orig.get_char(i);
+            if (i == 0)
+                buff.append_unichar(ch.toupper());
+            else
+                buff.append_unichar(ch);
+        }
+        return buff.str;
+    }
+
     private void show_category_list() {
         remove_all_children();
         m_scrolled_window = new EScrolledWindow();
@@ -586,19 +599,14 @@ class IBusEmojier : Gtk.Window {
             }
             GLib.List<unowned string> categories =
                     m_category_to_emojis_dict.get_keys();
+            categories.sort((a, b) => {
+                return GLib.strcmp(_(a), _(b));
+            });
             foreach (unowned string category in categories) {
                 EBoxRow row = new EBoxRow(category);
                 string locale_category = _(category);
-                StringBuilder capital_category = new StringBuilder();
-                for (int i = 0; i < locale_category.char_count(); i++) {
-                    unichar ch = locale_category.get_char(i);
-                    if (i == 0)
-                        capital_category.append_unichar(ch.toupper());
-                    else
-                        capital_category.append_unichar(ch);
-                }
                 EPaddedLabel widget =
-                        new EPaddedLabel(capital_category.str,
+                        new EPaddedLabel(get_title_string(locale_category),
                                          Gtk.Align.CENTER);
                 row.add(widget);
                 m_list_box.add(row);
@@ -650,7 +658,7 @@ class IBusEmojier : Gtk.Window {
                 IBus.Text text = new IBus.Text.from_string(emoji);
                 m_lookup_table.append_candidate(text);
             }
-            m_backward = row.text;
+            m_backward = get_title_string(row.text);
         }
         show_candidate_panel();
     }
@@ -759,9 +767,7 @@ class IBusEmojier : Gtk.Window {
         uint page_end_pos = uint.min(page_start_pos + page_size, ncandidates);
         if (m_backward != null) {
             string backward_desc =
-                    "%s (%u / %u)".printf(m_backward,
-                                          cursor / page_size + 1,
-                                          ncandidates / page_size + 1);
+                    "%s (%u / %u)".printf(m_backward, cursor, ncandidates - 1);
             EPaddedLabel label = new EPaddedLabel(backward_desc,
                                                   Gtk.Align.CENTER,
                                                   TravelDirection.BACKWARD);
@@ -805,23 +811,23 @@ class IBusEmojier : Gtk.Window {
                 candidate_clicked(index, e.button, e.state);
                 return true;
             });
-            // m_enter_notify_enable is added because
-            // enter_notify_event conflicts with keyboard operations.
-            if (m_enter_notify_enable) {
-                candidate_ebox.enter_notify_event.connect((e) => {
-                    m_lookup_table.set_cursor_pos(index);
-                    if (m_entry_notify_show_id > 0) {
+            candidate_ebox.enter_notify_event.connect((e) => {
+                // m_enter_notify_enable is added because
+                // enter_notify_event conflicts with keyboard operations.
+                if (!m_enter_notify_enable)
+                    return true;
+                m_lookup_table.set_cursor_pos(index);
+                if (m_entry_notify_show_id > 0) {
                         GLib.Source.remove(m_entry_notify_show_id);
-                    }
-                    // If timeout is not added, memory leak happens and
-                    // button_press_event signal does not work above.
-                    m_entry_notify_show_id = GLib.Timeout.add(100, () => {
+                }
+                // If timeout is not added, memory leak happens and
+                // button_press_event signal does not work above.
+                m_entry_notify_show_id = GLib.Timeout.add(100, () => {
                         show_candidate_panel();
                         return false;
-                    });
-                    return true;
                 });
-            }
+                return true;
+            });
             grid.attach(candidate_ebox,
                         n % (int)EMOJI_GRID_PAGE, n / (int)EMOJI_GRID_PAGE,
                         1, 1);
@@ -844,16 +850,23 @@ class IBusEmojier : Gtk.Window {
                 widget.show_all();
                 return;
             }
-            unowned IBus.EmojiData data =
+            unowned IBus.EmojiData? data =
                     m_emoji_to_data_dict.lookup(candidate.text);
-            unowned string description = data.get_description();
-            if (description != "") {
+            if (data == null) {
+                // TODO: Provide a description for the favorite emojis.
                 EPaddedLabel widget = new EPaddedLabel(
-                        _("Description: %s").printf(description),
+                        _("Description: %s").printf(_("None")),
                         Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
+                return;
             }
+            unowned string description = data.get_description();
+            EPaddedLabel desc_widget = new EPaddedLabel(
+                    _("Description: %s").printf(description),
+                    Gtk.Align.START);
+            m_vbox.add(desc_widget);
+            desc_widget.show_all();
             unowned GLib.SList<unowned string>? annotations =
                     data.get_annotations();
             GLib.StringBuilder buff = new GLib.StringBuilder();
@@ -922,8 +935,21 @@ class IBusEmojier : Gtk.Window {
         m_result = text.text;
     }
 
-    private void candidate_panel_cursor_down() {
+    private void enter_notify_disable_with_timer() {
+        // Enable keyboard operation and disable mouse operation.
         m_enter_notify_enable = false;
+        if (m_entry_notify_disable_id > 0) {
+            GLib.Source.remove(m_entry_notify_disable_id);
+        }
+        // Bring back the mouse operation after a timeout.
+        m_entry_notify_show_id = GLib.Timeout.add(100, () => {
+            m_enter_notify_enable = true;
+            return false;
+        });
+    }
+
+    private void candidate_panel_cursor_down() {
+        enter_notify_disable_with_timer();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
         uint cursor = m_lookup_table.get_cursor_pos();
         if ((cursor + EMOJI_GRID_PAGE) < ncandidates) {
@@ -937,11 +963,11 @@ class IBusEmojier : Gtk.Window {
     }
 
     private void candidate_panel_cursor_up() {
-        m_enter_notify_enable = false;
+        enter_notify_disable_with_timer();
         int ncandidates = (int)m_lookup_table.get_number_of_candidates();
         int cursor = (int)m_lookup_table.get_cursor_pos();
         int highest_pos =
-            (ncandidates / (int)EMOJI_GRID_PAGE * (int)EMOJI_GRID_PAGE)
+            ((ncandidates - 1)/ (int)EMOJI_GRID_PAGE * (int)EMOJI_GRID_PAGE)
             + (cursor % (int)EMOJI_GRID_PAGE);
         if ((cursor - (int)EMOJI_GRID_PAGE) >= 0) {
             m_lookup_table.set_cursor_pos(cursor - (int)EMOJI_GRID_PAGE);
@@ -967,13 +993,119 @@ class IBusEmojier : Gtk.Window {
         show_category_list();
     }
 
+    private bool key_press_cursor_horizontal(uint keyval,
+                                             uint modifiers) {
+        assert (keyval == Gdk.Key.Left || keyval == Gdk.Key.Right);
+
+        if (m_candidate_panel_is_visible) {
+            enter_notify_disable_with_timer();
+            if (keyval == Gdk.Key.Left)
+                m_lookup_table.cursor_up();
+            else if (keyval == Gdk.Key.Right)
+                m_lookup_table.cursor_down();
+            show_candidate_panel();
+        } else if (m_entry.get_text().len() > 0) {
+            int step = 0;
+            if (keyval == Gdk.Key.Left)
+                step = -1;
+            else if (keyval == Gdk.Key.Right)
+                step = 1;
+            GLib.Signal.emit_by_name(
+                    m_entry, "move-cursor",
+                    Gtk.MovementStep.VISUAL_POSITIONS,
+                    step,
+                    (modifiers & Gdk.ModifierType.SHIFT_MASK) != 0
+                            ? true : false);
+        } else {
+            // For Gdk.Key.f and Gdk.Key.b
+            if (keyval == Gdk.Key.Left)
+                keyval = Gdk.Key.Up;
+            else if (keyval == Gdk.Key.Right)
+                keyval = Gdk.Key.Down;
+            category_list_cursor_move(keyval);
+        }
+        return true;
+    }
+
+    private bool key_press_cursor_vertical(uint keyval) {
+        assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up);
+
+        if (m_candidate_panel_is_visible) {
+            if (keyval == Gdk.Key.Down)
+                candidate_panel_cursor_down();
+            else if (keyval == Gdk.Key.Up)
+                candidate_panel_cursor_up();
+        } else {
+            category_list_cursor_move(keyval);
+        }
+        return true;
+    }
+
+    private bool key_press_cursor_home_end(uint keyval,
+                                           uint modifiers) {
+        assert (keyval == Gdk.Key.Home || keyval == Gdk.Key.End);
+
+        if (m_candidate_panel_is_visible) {
+            enter_notify_disable_with_timer();
+            if (keyval == Gdk.Key.Home) {
+                m_lookup_table.set_cursor_pos(0);
+            } else if (keyval == Gdk.Key.End) {
+                uint ncandidates = m_lookup_table.get_number_of_candidates();
+                m_lookup_table.set_cursor_pos(ncandidates - 1);
+            }
+            show_candidate_panel();
+            return true;
+        }
+        if (m_entry.get_text().len() > 0) {
+            int step = 0;
+            if (keyval == Gdk.Key.Home)
+                step = -1;
+            else if (keyval == Gdk.Key.End)
+                step = 1;
+            GLib.Signal.emit_by_name(
+                    m_entry, "move-cursor",
+                    Gtk.MovementStep.DISPLAY_LINE_ENDS,
+                    step,
+                    (modifiers & Gdk.ModifierType.SHIFT_MASK) != 0
+                            ? true : false);
+            return true;
+        }
+        return false;
+    }
+
+    private bool key_press_cursor_escape() {
+        if (m_candidate_panel_is_visible) {
+            hide_candidate_panel();
+            return true;
+        } else if (m_current_category_type == CategoryType.LANG) {
+            m_current_category_type = CategoryType.EMOJI;
+            show_candidate_panel();
+            return true;
+        } else if (m_entry.get_text().length == 0) {
+            m_loop.quit();
+            hide_candidate_panel();
+            return true;
+        }
+        m_entry.delete_text(0, -1);
+        return true;
+    }
+
     private void entry_enter_keyval(uint keyval) {
         unichar ch = IBus.keyval_to_unicode(keyval);
-        if (!ch.isgraph())
+        if (ch.iscntrl())
             return;
         string str = ch.to_string();
 
         // what gtk_entry_commit_cb() do
+        if (m_entry.get_selection_bounds(null, null)) {
+            m_entry.delete_selection();
+        } else {
+            if (m_entry.get_overwrite_mode()) {
+               uint text_length = m_entry.get_buffer().get_length();
+               if (m_entry.cursor_position < text_length)
+                   m_entry.delete_from_cursor(Gtk.DeleteType.CHARS, 1);
+            }
+        }
         int pos = m_entry.get_position();
         m_entry.insert_text(str, -1, ref pos);
         m_entry.set_position(pos);
@@ -1084,19 +1216,8 @@ class IBusEmojier : Gtk.Window {
         }
         switch (keyval) {
         case Gdk.Key.Escape:
-            if (m_candidate_panel_is_visible) {
-                hide_candidate_panel();
-                return true;
-            } else if (m_current_category_type == CategoryType.LANG) {
-                m_current_category_type = CategoryType.EMOJI;
-                show_candidate_panel();
+            if (key_press_cursor_escape())
                 return true;
-            } else if (m_entry.get_text().length == 0) {
-                m_loop.quit();
-                hide_candidate_panel();
-                return true;
-            }
-            m_entry.delete_text(0, -1);
             break;
         case Gdk.Key.Return:
             if (m_candidate_panel_is_visible) {
@@ -1126,7 +1247,7 @@ class IBusEmojier : Gtk.Window {
                 break;
             }
             if (m_candidate_panel_is_visible) {
-                m_enter_notify_enable = false;
+                enter_notify_disable_with_timer();
                 m_lookup_table.cursor_down();
                 show_candidate_panel();
             }
@@ -1135,48 +1256,20 @@ class IBusEmojier : Gtk.Window {
             }
             return true;
         case Gdk.Key.Right:
-            if (m_candidate_panel_is_visible) {
-                m_enter_notify_enable = false;
-                m_lookup_table.cursor_down();
-                show_candidate_panel();
-                return true;
-            }
-            if (m_entry.get_text().len() > 0) {
-                GLib.Signal.emit_by_name(m_entry, "move-cursor",
-                                         Gtk.MovementStep.VISUAL_POSITIONS,
-                                         1, false);
-                return true;
-            }
-            break;
+            key_press_cursor_horizontal(keyval, modifiers);
+            return true;
         case Gdk.Key.Left:
-            if (m_candidate_panel_is_visible) {
-                m_enter_notify_enable = false;
-                m_lookup_table.cursor_up();
-                show_candidate_panel();
-                return true;
-            }
-            if (m_entry.get_text().len() > 0) {
-                GLib.Signal.emit_by_name(m_entry, "move-cursor",
-                                         Gtk.MovementStep.VISUAL_POSITIONS,
-                                         -1, false);
-                return true;
-            }
-            break;
+            key_press_cursor_horizontal(keyval, modifiers);
+            return true;
         case Gdk.Key.Down:
-            if (m_candidate_panel_is_visible)
-                candidate_panel_cursor_down();
-            else
-                category_list_cursor_move(Gdk.Key.Down);
+            key_press_cursor_vertical(keyval);
             return true;
         case Gdk.Key.Up:
-            if (m_candidate_panel_is_visible)
-                candidate_panel_cursor_up();
-            else
-                category_list_cursor_move(Gdk.Key.Up);
+            key_press_cursor_vertical(keyval);
             return true;
         case Gdk.Key.Page_Down:
             if (m_candidate_panel_is_visible) {
-                m_enter_notify_enable = false;
+                enter_notify_disable_with_timer();
                 m_lookup_table.page_down();
                 show_candidate_panel();
                 return true;
@@ -1184,33 +1277,59 @@ class IBusEmojier : Gtk.Window {
             break;
         case Gdk.Key.Page_Up:
             if (m_candidate_panel_is_visible) {
-                m_enter_notify_enable = false;
+                enter_notify_disable_with_timer();
                 m_lookup_table.page_up();
                 show_candidate_panel();
                 return true;
             }
             break;
         case Gdk.Key.Home:
-            if (m_entry.get_text().len() > 0) {
-                GLib.Signal.emit_by_name(m_entry, "move-cursor",
-                                         Gtk.MovementStep.DISPLAY_LINE_ENDS,
-                                         -1, false);
+            if (key_press_cursor_home_end(keyval, modifiers))
                 return true;
-            }
             break;
         case Gdk.Key.End:
-            if (m_entry.get_text().len() > 0) {
-                GLib.Signal.emit_by_name(m_entry, "move-cursor",
-                                         Gtk.MovementStep.DISPLAY_LINE_ENDS,
-                                         1, false);
+            if (key_press_cursor_home_end(keyval, modifiers))
                 return true;
-            }
-            break;
-        default:
-            entry_enter_keyval(keyval);
             break;
         }
 
+        if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
+            switch (keyval) {
+            case Gdk.Key.f:
+                key_press_cursor_horizontal(Gdk.Key.Right, modifiers);
+                return true;
+            case Gdk.Key.b:
+                key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
+                return true;
+            case Gdk.Key.n:
+                key_press_cursor_vertical(Gdk.Key.Down);
+                return true;
+            case Gdk.Key.p:
+                key_press_cursor_vertical(Gdk.Key.Up);
+                return true;
+            case Gdk.Key.h:
+                if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
+                    return true;
+                break;
+            case Gdk.Key.e:
+                if (key_press_cursor_home_end(Gdk.Key.End, modifiers))
+                    return true;
+                break;
+            case Gdk.Key.u:
+                if (key_press_cursor_escape())
+                    return true;
+                break;
+            case Gdk.Key.a:
+                if (m_entry.get_text().len() > 0) {
+                    m_entry.select_region(0, -1);
+                    return true;
+                }
+                break;
+            }
+            return false;
+        }
+
+        entry_enter_keyval(keyval);
         return true;
     }
 

From 50e344afaffc29e626dbc27747a1aeee6cccafdf Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 17 Mar 2017 12:08:50 +0900
Subject: [PATCH 389/816] ui/gtk3: Enable strcasecmp to match emoji annotation

Users can type capital annotations.
Also shows emoji annotations in the status bar if the
typing unicode point matches a emoji character.

Review URL: https://codereview.appspot.com/314640043
---
 ui/gtk3/emojier.vala | 97 +++++++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 32 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 7da96c7c9..b1dc50cf8 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -432,10 +432,45 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+    private string utf8_down(string str) {
+        GLib.StringBuilder buff = new GLib.StringBuilder();
+        int length = str.char_count();
+        for (int i = 0; i < length; i++) {
+            buff.append_unichar(str.get_char(0).tolower());
+            str = str.next_char();
+        }
+        return buff.str;
+    }
+
+    private string utf8_title(string str) {
+        StringBuilder buff = new StringBuilder();
+        int length = str.char_count();
+        for (int i = 0; i < length; i++) {
+            unichar ch = str.get_char(0);
+            if (i == 0)
+                buff.append_unichar(ch.toupper());
+            else
+                buff.append_unichar(ch);
+            str = str.next_char();
+        }
+        return buff.str;
+    }
+
     private void update_emoji_to_data_dict(IBus.EmojiData data,
                                            string         lang) {
         string emoji = data.get_emoji();
         if (lang == "en") {
+            string description = utf8_down(data.get_description());
+            unowned GLib.SList<string> annotations = data.get_annotations();
+            var words = description.split(" ");
+            // If the description has less than 3 words, add it to annotations
+            if (words.length < 3 &&
+                annotations.find_custom(
+                        description,
+                        (GLib.CompareFunc<string>)GLib.strcmp) == null) {
+                annotations.append(description);
+                data.set_annotations(annotations.copy_deep(GLib.strdup));
+            }
             m_emoji_to_data_dict.replace(emoji, data);
         } else {
             unowned IBus.EmojiData? en_data =
@@ -446,16 +481,24 @@ class IBusEmojier : Gtk.Window {
             }
             string trans_description = data.get_description();
             en_data.set_description(trans_description);
+            trans_description = utf8_down(trans_description);
             unowned GLib.SList<string> annotations = data.get_annotations();
             var words = trans_description.split(" ");
             // If the description has less than 3 words, add it to annotations
-            if (words.length < 3)
+            if (words.length < 3 &&
+                annotations.find_custom(
+                        trans_description,
+                        (GLib.CompareFunc<string>)GLib.strcmp) == null) {
                 annotations.append(trans_description);
+            }
             unowned GLib.SList<string> en_annotations
                 = en_data.get_annotations();
             foreach (string annotation in en_annotations) {
-                if (annotations.find_custom(annotation, GLib.strcmp) == null)
+                if (annotations.find_custom(
+                            annotation,
+                            (GLib.CompareFunc<string>)GLib.strcmp) == null) {
                     annotations.append(annotation.dup());
+                }
             }
             en_data.set_annotations(annotations.copy_deep(GLib.strdup));
         }
@@ -526,18 +569,6 @@ class IBusEmojier : Gtk.Window {
         show_category_list();
     }
 
-    private string get_title_string(string orig) {
-        StringBuilder buff = new StringBuilder();
-        for (int i = 0; i < orig.char_count(); i++) {
-            unichar ch = orig.get_char(i);
-            if (i == 0)
-                buff.append_unichar(ch.toupper());
-            else
-                buff.append_unichar(ch);
-        }
-        return buff.str;
-    }
-
     private void show_category_list() {
         remove_all_children();
         m_scrolled_window = new EScrolledWindow();
@@ -606,7 +637,7 @@ class IBusEmojier : Gtk.Window {
                 EBoxRow row = new EBoxRow(category);
                 string locale_category = _(category);
                 EPaddedLabel widget =
-                        new EPaddedLabel(get_title_string(locale_category),
+                        new EPaddedLabel(utf8_title(locale_category),
                                          Gtk.Align.CENTER);
                 row.add(widget);
                 m_list_box.add(row);
@@ -658,7 +689,7 @@ class IBusEmojier : Gtk.Window {
                 IBus.Text text = new IBus.Text.from_string(emoji);
                 m_lookup_table.append_candidate(text);
             }
-            m_backward = get_title_string(row.text);
+            m_backward = utf8_title(row.text);
         }
         show_candidate_panel();
     }
@@ -734,6 +765,7 @@ class IBusEmojier : Gtk.Window {
             m_backward = null;
             return;
         }
+        annotation = utf8_down(annotation);
         if (annotation.length > m_emoji_max_seq_len) {
             hide_candidate_panel();
             return;
@@ -841,6 +873,8 @@ class IBusEmojier : Gtk.Window {
             m_vbox.add(grid);
             grid.show_all();
             IBus.Text candidate = m_lookup_table.get_candidate(cursor);
+            unowned IBus.EmojiData? data =
+                    m_emoji_to_data_dict.lookup(candidate.text);
             if (cursor == 0 && candidate.text == m_unicode_point) {
                 EPaddedLabel widget = new EPaddedLabel(
                         _("Description: Unicode point U+%04X").printf(
@@ -848,25 +882,25 @@ class IBusEmojier : Gtk.Window {
                         Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
-                return;
-            }
-            unowned IBus.EmojiData? data =
-                    m_emoji_to_data_dict.lookup(candidate.text);
-            if (data == null) {
-                // TODO: Provide a description for the favorite emojis.
+                if (data == null)
+                    return;
+            } else if (data == null) {
+                // TODO: Provide a custom description and annotation for
+                // the favorite emojis.
                 EPaddedLabel widget = new EPaddedLabel(
                         _("Description: %s").printf(_("None")),
                         Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
                 return;
+            } else {
+                unowned string description = data.get_description();
+                EPaddedLabel widget = new EPaddedLabel(
+                        _("Description: %s").printf(description),
+                        Gtk.Align.START);
+                m_vbox.add(widget);
+                widget.show_all();
             }
-            unowned string description = data.get_description();
-            EPaddedLabel desc_widget = new EPaddedLabel(
-                    _("Description: %s").printf(description),
-                    Gtk.Align.START);
-            m_vbox.add(desc_widget);
-            desc_widget.show_all();
             unowned GLib.SList<unowned string>? annotations =
                     data.get_annotations();
             GLib.StringBuilder buff = new GLib.StringBuilder();
@@ -1243,10 +1277,9 @@ class IBusEmojier : Gtk.Window {
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
             if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
-                entry_enter_keyval(keyval);
-                break;
-            }
-            if (m_candidate_panel_is_visible) {
+                if (m_entry.get_text().len() > 0)
+                    entry_enter_keyval(keyval);
+            } else if (m_candidate_panel_is_visible) {
                 enter_notify_disable_with_timer();
                 m_lookup_table.cursor_down();
                 show_candidate_panel();

From bd7e0ba297f72ae1e2989743f2426c44df29f3ec Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 21 Mar 2017 12:56:23 +0900
Subject: [PATCH 390/816] Make more readable error messages if emoji xml files
 are missed

Also Fix CONFIG_CLEAN_FILES for autoreconf

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/320750043
---
 configure.ac        | 26 +++++++++++++++++---------
 src/Makefile.am     |  5 ++++-
 src/emoji-parser.c  |  2 +-
 ui/gtk3/Makefile.am |  4 +++-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 369485c7a..0a5f2d56e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,17 +611,11 @@ AC_ARG_ENABLE(emoji-dict,
     [enable_emoji_dict=yes]
 )
 AM_CONDITIONAL([ENABLE_EMOJI_DICT], [test x"$enable_emoji_dict" = x"yes"])
-if test x"$enable_emoji_dict" = x"yes"; then
-    PKG_CHECK_MODULES(JSON_GLIB1, [
-        json-glib-1.0
-    ])
-    enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
-fi
 
 AC_ARG_WITH(emoji-json-file,
     AS_HELP_STRING([--with-emoji-json-file[=DIR/emoji.json]],
         [Set emoji.json. (default: "/usr/lib/node_modules/emojione/emoji.json")
-         You can get emoji.json with "npm install -g emojione".]),
+        ]),
     EMOJI_JSON_FILE=$with_emoji_json_file,
     EMOJI_JSON_FILE="/usr/lib/node_modules/emojione/emoji.json"
 )
@@ -630,13 +624,27 @@ AC_SUBST(EMOJI_JSON_FILE)
 AC_ARG_WITH(emoji-annotation-dir,
     AS_HELP_STRING([--with-emoji-annotation-dir[=DIR]],
         [Set the directory of CLDR annotation files.
-         (default: "/usr/share/unicode/cldr/common/annotations")
-         You can get https://github.com/fujiwarat/cldr-emoji-annotation]),
+         (default: "/usr/share/unicode/cldr/common/annotations")]),
     EMOJI_ANNOTATION_DIR=$with_emoji_annotation_dir,
     EMOJI_ANNOTATION_DIR="/usr/share/unicode/cldr/common/annotations"
 )
 AC_SUBST(EMOJI_ANNOTATION_DIR)
 
+if test x"$enable_emoji_dict" = x"yes"; then
+    if test ! -f $EMOJI_JSON_FILE ; then
+        AC_MSG_ERROR(Not found $EMOJI_JSON_FILE. You can get emoji.json \
+with "npm install -g emojione".)
+    fi
+    if test ! -f $EMOJI_ANNOTATION_DIR/en.xml ; then
+        AC_MSG_ERROR(Not found $EMOJI_ANNOTATION_DIR/en.xml. You can get \
+https://github.com/fujiwarat/cldr-emoji-annotation)
+    fi
+    PKG_CHECK_MODULES(JSON_GLIB1, [
+        json-glib-1.0
+    ])
+    enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
+fi
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d403e8b8..7053e3e89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -243,7 +243,10 @@ LANG_FILES = $(basename $(notdir $(wildcard $(EMOJI_ANNOTATION_DIR)/*.xml)))
 noinst_PROGRAMS = emoji-parser
 
 dicts/emoji-en.dict: emoji-parser
-	$(AM_V_at)for f in $(LANG_FILES) ; do \
+	$(AM_V_at)if test x"$(LANG_FILES)" = x ; then \
+	    echo "WARNING: Not found $(EMOJI_ANNOTATION_DIR)/en.xml" 1>&2; \
+	fi; \
+	for f in $(LANG_FILES) ; do \
 	    if test x"$$f" = xen ; then \
 	        $(builddir)/emoji-parser \
 	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index 8ff04f12a..f9e34703f 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -20,7 +20,7 @@
  * USA
  */
 
-/* Convert /usr/share/unicode/cldr/common/annotations/*.xml and
+/* Convert /usr/share/unicode/cldr/common/annotations/\*.xml and
  * /usr/lib/node_modules/emojione/emoji.json
  * to the dictionary file which look up the Emoji from the annotation.
  * Get *.xml from https://github.com/fujiwarat/cldr-emoji-annotation
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 4e7fd1b87..b055f6797 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -81,6 +81,8 @@ AM_VALAFLAGS = \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
+CONFIG_CLEAN_FILES =
+
 if ENABLE_LIBNOTIFY
 AM_CFLAGS += \
 	@LIBNOTIFY_CFLAGS@ \
@@ -239,7 +241,7 @@ vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
 # for make distclean
-CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
+CONFIG_CLEAN_FILES += $(VAPIGEN_VAPIS)
 EXTRA_DIST += $(VAPIGEN_VAPIS)
 
 endif

From 0efb1c503d5901bbddcdb6fa73007b364ba4368d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 27 Mar 2017 15:12:42 +0900
Subject: [PATCH 391/816] Move language setting from IBusEmojier to ibus-setup

The language setting of emoji annotations now can be saved
with ibus-setup.
Implement `ibus emoji [--font|--lang|--help]`

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/323720043
---
 data/ibus.schemas.in      |  46 +++--
 setup/Makefile.am         |  26 +--
 setup/emojilang.py        | 348 ++++++++++++++++++++++++++++++++++++++
 setup/main.py             |  41 +++--
 setup/setup.ui            |  97 +++++++----
 tools/main.vala           |  38 ++++-
 ui/gtk3/emojier.vala      | 295 +++++++++++++-------------------
 ui/gtk3/ibusemojidialog.h |  11 ++
 ui/gtk3/panel.vala        |  39 +++--
 9 files changed, 671 insertions(+), 270 deletions(-)
 create mode 100644 setup/emojilang.py

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 218d223a2..c0bbd6f69 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -105,18 +105,6 @@
           <long>The shortcut keys for turning input method on or off</long>
       </locale>
     </schema>
-    <schema>
-      <key>/schemas/desktop/ibus/general/hotkey/emoji</key>
-      <applyto>/desktop/ibus/general/hotkey/emoji</applyto>
-      <owner>ibus</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[&lt;Control&gt;&lt;Shift&gt;e]</default>
-      <locale name="C">
-        <short>Emoji shortcut keys for gtk_accelerator_parse</short>
-          <long>The shortcut keys for turning emoji typing on or off</long>
-      </locale>
-    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/enable_unconditional</key>
       <applyto>/desktop/ibus/general/hotkey/enable_unconditional</applyto>
@@ -366,8 +354,20 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/desktop/ibus/panel/emoji_font</key>
-      <applyto>/desktop/ibus/panel/emoji_font</applyto>
+      <key>/schemas/desktop/ibus/panel/emoji/hotkey</key>
+      <applyto>/desktop/ibus/panel/emoji/hotkey</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[&lt;Control&gt;&lt;Shift&gt;e]</default>
+      <locale name="C">
+        <short>Emoji shortcut keys for gtk_accelerator_parse</short>
+          <long>The shortcut keys for turning emoji typing on or off</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/font</key>
+      <applyto>/desktop/ibus/panel/emoji/font</applyto>
       <owner>ibus</owner>
       <type>string</type>
       <default>Monospace 16</default>
@@ -377,8 +377,22 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/desktop/ibus/panel/emoji_favorites</key>
-      <applyto>/desktop/ibus/panel/emoji_favorites</applyto>
+      <key>/schemas/desktop/ibus/panel/emoji/lang</key>
+      <applyto>/desktop/ibus/panel/emoji/lang</applyto>
+      <owner>ibus</owner>
+      <type>string</type>
+      <default>en</default>
+      <locale name="C">
+        <short>Default language for emoji dictionary</short>
+	    <long>Choose a default language of emoji dictionaries on
+	          the emoji dialog. The value $lang is applied to
+                  /usr/share/unicode/cldr/common/annotations/$lang.xml
+            </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/favorites</key>
+      <applyto>/desktop/ibus/panel/emoji/favorites</applyto>
       <owner>ibus</owner>
       <type>list</type>
       <default>[]</default>
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 2d822d2ad..b7dd75548 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -21,19 +22,20 @@
 # USA
 
 ibussetup_PYTHON = \
-	main.py \
-	i18n.py \
-	icon.py \
-	enginecombobox.py \
-	enginedialog.py \
-	enginetreeview.py \
-	engineabout.py \
-	keyboardshortcut.py \
-	$(NULL)
+    emojilang.py \
+    enginecombobox.py \
+    enginedialog.py \
+    enginetreeview.py \
+    engineabout.py \
+    i18n.py \
+    icon.py \
+    keyboardshortcut.py \
+    main.py \
+    $(NULL)
 
 ibussetup_DATA = \
-	setup.ui \
-	$(NULL)
+    setup.ui \
+    $(NULL)
 
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
diff --git a/setup/emojilang.py b/setup/emojilang.py
new file mode 100644
index 000000000..8250589d3
--- /dev/null
+++ b/setup/emojilang.py
@@ -0,0 +1,348 @@
+# vim:set et sts=4 sw=4:
+# -*- coding: utf-8 -*-
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2017 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+# for python2
+from __future__ import print_function
+
+__all__ = (
+    "EmojiLangButton",
+);
+
+from gi.repository import Gtk
+from gi.repository import GLib
+from gi.repository import GObject
+from gi.repository import IBus
+
+import functools
+import gettext
+import i18n
+import locale
+import os
+
+from icon import load_icon
+from i18n import _, N_
+
+ROW_TRAVEL_DIRECTION_NONE,      \
+ROW_TRAVEL_DIRECTION_FORWARD,   \
+ROW_TRAVEL_DIRECTION_BACKWARD = list(range(3))
+
+class LanguageString:
+    def __init__(self, id, trans = ""):
+        self.id = id
+        self.trans = trans
+
+class EmojiLangChooser(Gtk.Dialog):
+    __gtype_name__ = 'EmojiLangChooser'
+    __initial_languages = [ IBus.get_language_name('en_US'),
+                            IBus.get_language_name('en_GB'),
+                            IBus.get_language_name('de_DE'),
+                            IBus.get_language_name('fr_FR'),
+                            IBus.get_language_name('es_ES'),
+                            IBus.get_language_name('zh_CN'),
+                            IBus.get_language_name('ja_JP'),
+                            IBus.get_language_name('ru_RU'),
+                            IBus.get_language_name('ar_EG') ]
+
+
+    def __init__(self, id = None, transient_for = None):
+        super(EmojiLangChooser, self).__init__(
+                title = _("Select a language"),
+                transient_for = transient_for,
+                resizable = True)
+        buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
+                   _("_OK"), Gtk.ResponseType.APPLY)
+        self.add_buttons(*buttons)
+
+        if id == None:
+            id = 'en'
+        self.__id = id
+        self.__engines_for_lang = {}
+        self.__untrans_for_lang = {}
+        self.__langs = {}
+        self.__lang_list = []
+
+        self.__scrolled = Gtk.ScrolledWindow(
+                hscrollbar_policy = Gtk.PolicyType.NEVER,
+                vscrollbar_policy = Gtk.PolicyType.NEVER,
+                shadow_type = Gtk.ShadowType.IN,
+                margin_left = 6,
+                margin_right = 6,
+                margin_top = 6,
+                margin_bottom = 6)
+        self.vbox.add(self.__scrolled)
+        viewport = Gtk.Viewport()
+        self.__scrolled.add(viewport)
+        self.__list = Gtk.ListBox(vexpand = True,
+                                  halign = Gtk.Align.FILL,
+                                  valign = Gtk.Align.FILL)
+        viewport.add(self.__list)
+
+        self.__adjustment = self.__scrolled.get_vadjustment()
+        self.__list.set_adjustment(self.__adjustment)
+        self.__list.set_filter_func(self.__list_filter, None)
+        self.__list.connect('row-activated', self.__row_activated)
+
+        self.__showing_extra = False
+        self.__more_row = self.__more_row_new()
+        self.__load_lang_list()
+        self.__show_lang_rows()
+        self.show_all()
+
+
+    def __load_lang_list(self):
+        dictdir = os.path.dirname(__file__) + '/../dicts'
+        for filename in os.listdir(dictdir):
+            suffix = '.dict'
+            if not filename.endswith(suffix):
+                continue
+            lang_id = filename[0:len(filename) - len(suffix)]
+            prefix = 'emoji-'
+            if not lang_id.startswith(prefix):
+                continue
+            lang_id = lang_id[len(prefix):]
+            lang = LanguageString(lang_id, IBus.get_language_name(lang_id))
+            self.__lang_list.append(lang)
+        if len(self.__lang_list) == 0:
+            print("Not found dicts in %s" % dictdir, file=sys.stderr)
+            lang = LanguageString('en', IBus.get_language_name('en'))
+            self.__lang_list.append(lang)
+            return
+
+        def cmp_lang(a, b):
+            label_a = a.trans + a.id
+            label_b = b.trans + b.id
+            return (label_a > label_b) - (label_a < label_b)
+
+        self.__lang_list.sort(key = functools.cmp_to_key(cmp_lang))
+
+        loc = locale.getlocale()[0]
+        # None on C locale
+        if loc == None or loc == 'C':
+            loc = 'en_US'
+        index = 0
+        for lang in self.__lang_list:
+            # move current language to the first place
+            if lang.trans == IBus.get_language_name(loc):
+                self.__lang_list.remove(lang)
+                self.__lang_list.insert(index, lang)
+                index += 1
+
+        for lang in self.__lang_list:
+            # move English to the second place
+            if lang.trans == IBus.get_language_name('en'):
+                self.__lang_list.remove(lang)
+                self.__lang_list.insert(index, lang)
+                index += 1
+
+
+    def __list_filter(self, row, data):
+        if row.id == self.__id:
+            self.__list.select_row(row)
+        if row == self.__more_row:
+            return not self.__showing_extra
+        if not self.__showing_extra and row.is_extra:
+            return False
+        return True
+
+
+    def __row_activated(self, box, row):
+        if row == self.__more_row:
+            self.__show_more()
+            return
+        self.__id = row.id
+
+
+    def __padded_label_new(self, text, icon, alignment, direction):
+        hbox = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL)
+
+        if direction == ROW_TRAVEL_DIRECTION_BACKWARD:
+            rtl = (Gtk.Widget.get_default_direction() == \
+                   Gtk.TextDirection.RTL)
+            if rtl:
+                arrow = Gtk.Image.new_from_icon_name(
+                    'go-previous-rtl-symbolic', Gtk.IconSize.MENU)
+            else:
+                arrow = Gtk.Image.new_from_icon_name(
+                    'go-previous-symbolic', Gtk.IconSize.MENU)
+            hbox.pack_start(arrow, False, True, 0)
+
+        if icon != None:
+            pixbuf = load_icon(icon, Gtk.IconSize.LARGE_TOOLBAR)
+            image = Gtk.Image(pixbuf = pixbuf)
+            hbox.pack_start(image, False, True, 0)
+
+        label = Gtk.Label(label = text)
+        label.set_halign(alignment)
+        label.set_valign(Gtk.Align.CENTER)
+        label.set_margin_left(20)
+        label.set_margin_right(20)
+        label.set_margin_top(6)
+        label.set_margin_bottom(6)
+        hbox.pack_start(label, True, True, 0)
+        return hbox
+
+
+    def __list_box_row_new(self, lang):
+        row = Gtk.ListBoxRow()
+        row.trans = lang.trans
+        row.id = lang.id
+        row.is_extra = False
+        return row
+
+
+    def __lang_row_new(self, lang, prev_lang):
+        row = self.__list_box_row_new(lang)
+        label = lang.trans
+        if lang.id == self.__id:
+            row.is_extra = False
+        elif prev_lang != None and label == prev_lang.trans:
+            label = "%s (%s)" % (lang.trans, lang.id)
+            row.is_extra = True
+        elif not self.__showing_extra and \
+           lang.trans not in self.__initial_languages:
+            row.is_extra = True
+        widget = self.__padded_label_new(label,
+                                         None,
+                                         Gtk.Align.CENTER,
+                                         ROW_TRAVEL_DIRECTION_NONE)
+        row.add(widget)
+        return row
+
+
+    def __more_row_new(self):
+        row = Gtk.ListBoxRow()
+        row.id = None
+        hbox = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL)
+        row.add(hbox)
+        row.set_tooltip_text(_("More…"))
+        arrow = Gtk.Image.new_from_icon_name('view-more-symbolic',
+                                             Gtk.IconSize.MENU)
+        arrow.set_margin_left(20)
+        arrow.set_margin_right(20)
+        arrow.set_margin_top(6)
+        arrow.set_margin_bottom(6)
+        arrow.set_halign(Gtk.Align.CENTER)
+        arrow.set_valign(Gtk.Align.CENTER)
+        hbox.pack_start(arrow, True, True, 0)
+        return row
+
+
+    def __set_fixed_size(self):
+        if self.__scrolled.get_policy()[0] == Gtk.PolicyType.AUTOMATIC:
+            return
+        (width, height) = self.get_size()
+        self.set_size_request(width, height)
+        self.__scrolled.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                   Gtk.PolicyType.AUTOMATIC)
+
+
+    def __remove_all_children(self):
+        for l in self.__list.get_children():
+            self.__list.remove(l)
+
+
+    def __show_lang_rows(self):
+        self.__remove_all_children()
+        prev_lang = None
+        for lang in self.__lang_list:
+            row = self.__lang_row_new(lang, prev_lang)
+            self.__list.add(row)
+            prev_lang = lang
+        self.__list.add(self.__more_row)
+        self.__list.show_all()
+        self.__adjustment.set_value(self.__adjustment.get_lower())
+        self.__list.invalidate_filter()
+        self.__list.set_selection_mode(Gtk.SelectionMode.SINGLE)
+
+
+    def __show_more(self):
+        self.__set_fixed_size()
+        self.__showing_extra = True
+        self.__list.invalidate_filter()
+
+
+    def get_selected_lang(self):
+        return self.__id
+
+
+class EmojiLangButton(Gtk.Button):
+    __gtype_name__ = 'EmojiLangButton'
+    __gproperties__ = {
+        'lang' : (
+            str,
+            'lang',
+            'lang for emojo-*.dict',
+            'en',
+            GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE)
+    }
+
+
+    def __init__(self):
+        super(EmojiLangButton, self).__init__()
+        self.__lang = ''
+
+
+    def do_get_property(self, prop):
+        if prop.name == 'lang':
+            return self.__lang
+        else:
+            raise AttributeError('unknown property %s' % prop.name)
+
+
+    def do_set_property(self, prop, value):
+        if prop.name == 'lang':
+            self.set_lang(value)
+        else:
+            raise AttributeError('unknown property %s' % prop.name)
+
+
+    def do_clicked(self):
+        dialog = EmojiLangChooser(id = self.__lang,
+                                  transient_for = self.get_toplevel())
+        id = dialog.run()
+        if id != Gtk.ResponseType.APPLY:
+            dialog.destroy()
+            return
+        self.set_lang(dialog.get_selected_lang())
+        dialog.destroy()
+
+
+    def set_lang(self, lang):
+        self.__lang = lang
+        self.notify("lang")
+        self.set_label(IBus.get_language_name(lang))
+
+
+    def get_lang(self, lang):
+        return self.__lang
+
+
+GObject.type_register(EmojiLangButton)
+
+
+if __name__ == "__main__":
+        dialog = EmojiLangChooser()
+        id = dialog.run()
+        if id != Gtk.ResponseType.APPLY:
+            dialog.destroy()
+            import sys
+            sys.exit(0)
+        print("Selected language:", dialog.get_selected_lang())
diff --git a/setup/main.py b/setup/main.py
index 09b0ebdf0..7839cea21 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -51,6 +51,7 @@
 import i18n
 import keyboardshortcut
 import locale
+from emojilang import EmojiLangButton
 from enginecombobox import EngineComboBox
 from enginedialog import EngineDialog
 from enginetreeview import EngineTreeView
@@ -92,6 +93,8 @@ def __init__(self):
                 schema = "org.freedesktop.ibus.general.hotkey");
         self.__settings_panel = Gio.Settings(
                 schema = "org.freedesktop.ibus.panel");
+        self.__settings_emoji = Gio.Settings(
+                schema = "org.freedesktop.ibus.panel.emoji");
 
         # IBus.Bus() calls ibus_bus_new().
         # Gtk.Builder().add_from_file() also calls ibus_bus_new_async()
@@ -122,7 +125,10 @@ def __init_hotkeys(self):
         self.__init_hotkey(name, label)
 
     def __init_hotkey(self, name, label, comment=None):
-        shortcuts = self.__settings_hotkey.get_strv(name)
+        if name == 'emoji':
+            shortcuts = self.__settings_emoji.get_strv('hotkey')
+        else:
+            shortcuts = self.__settings_hotkey.get_strv(name)
         button = self.__builder.get_object("button_%s" % label)
         entry = self.__builder.get_object("entry_%s" % label)
         entry.set_text("; ".join(shortcuts))
@@ -130,8 +136,12 @@ def __init_hotkey(self, name, label, comment=None):
         if comment != None:
             tooltip += "\n" + comment
         entry.set_tooltip_text(tooltip)
-        button.connect("clicked", self.__shortcut_button_clicked_cb,
-                name, "general/hotkey", label, entry)
+        if name == 'emoji':
+            button.connect("clicked", self.__shortcut_button_clicked_cb,
+                    'hotkey', 'panel/' + name, label, entry)
+        else:
+            button.connect("clicked", self.__shortcut_button_clicked_cb,
+                    name, "general/hotkey", label, entry)
 
     def __init_panel(self):
         # lookup table orientation
@@ -169,21 +179,27 @@ def __init_panel(self):
 
         self.__fontbutton_custom_font = self.__builder.get_object(
                 "fontbutton_custom_font")
-        self.__fontbutton_emoji_font = self.__builder.get_object(
-                "fontbutton_emoji_font")
-        self.__fontbutton_emoji_font.set_preview_text("🙂🍎🚃💓📧⚽🐳");
         self.__settings_panel.bind('custom-font',
                                     self.__fontbutton_custom_font,
                                    'font-name',
                                    Gio.SettingsBindFlags.DEFAULT)
-        self.__settings_panel.bind('emoji-font',
-                                    self.__fontbutton_emoji_font,
-                                   'font-name',
-                                   Gio.SettingsBindFlags.DEFAULT)
         self.__settings_panel.bind('use-custom-font',
                                     self.__fontbutton_custom_font,
                                    'sensitive',
                                    Gio.SettingsBindFlags.GET)
+        self.__fontbutton_emoji_font = self.__builder.get_object(
+                'fontbutton_emoji_font')
+        self.__fontbutton_emoji_font.set_preview_text('🙂🍎🚃💓📧⚽🐳');
+        self.__settings_emoji.bind('font',
+                                    self.__fontbutton_emoji_font,
+                                   'font-name',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__button_emoji_lang = self.__builder.get_object(
+                'button_emoji_lang')
+        self.__settings_emoji.bind('lang',
+                                    self.__button_emoji_lang,
+                                   'lang',
+                                   Gio.SettingsBindFlags.DEFAULT)
 
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(
@@ -458,7 +474,10 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
         dialog.destroy()
         if id != Gtk.ResponseType.OK:
             return
-        self.__settings_hotkey.set_strv(name, shortcuts)
+        if section == 'panel/emoji':
+            self.__settings_emoji.set_strv(name, shortcuts)
+        else:
+            self.__settings_hotkey.set_strv(name, shortcuts)
         text = "; ".join(shortcuts)
         entry.set_text(text)
         tooltip = "\n".join(shortcuts)
diff --git a/setup/setup.ui b/setup/setup.ui
index d5ee39273..4ef3423b1 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -661,38 +661,11 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="fontbutton_box">
-                            <property name="orientation">vertical</property>
+                          <object class="GtkFontButton" id="fontbutton_custom_font">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkFontButton" id="fontbutton_custom_font">
-                              <property name="use_action_appearance">False</property>
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
-                              <property name="receives_default">True</property>
-                              <property name="use_action_appearance">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkFontButton" id="fontbutton_emoji_font">
-                              <property name="use_action_appearance">False</property>
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
-                              <property name="receives_default">True</property>
-                              <property name="use_action_appearance">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -702,6 +675,68 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="label_emoji_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set a font of emoji candidates on the emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji font:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">7</property>
+                            <property name="bottom_attach">8</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFontButton" id="fontbutton_emoji_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">7</property>
+                            <property name="bottom_attach">8</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label_emoji_lang">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set a language of emoji annotations on the emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji annotation language:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">8</property>
+                            <property name="bottom_attach">9</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="EmojiLangButton" id="button_emoji_lang">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">8</property>
+                            <property name="bottom_attach">9</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
diff --git a/tools/main.vala b/tools/main.vala
index fd9fd0e09..2bf1dc7f8 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -31,6 +31,8 @@ bool name_only = false;
 /* system() exists as a public API. */
 bool is_system = false;
 string cache_file = null;
+string emoji_font = null;
+string annotation_lang = null;
 
 class EngineList {
     public IBus.EngineDesc[] data = {};
@@ -342,12 +344,40 @@ private void run_dialog(IBus.Emojier emojier) {
 }
 
 int emoji_dialog(string[] argv) {
+    const OptionEntry[] options = {
+        { "font", 0, 0, OptionArg.STRING, out emoji_font,
+          N_("FONT for emoji chracters on emoji dialog."), "FONT" },
+        { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
+          N_("LANG for annotations on emoji dialog. E.g. \"en\""), "LANG" },
+        { null }
+    };
+
+    var option = new OptionContext();
+    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+
+    try {
+        option.parse(ref argv);
+    } catch (OptionError e) {
+        stderr.printf("%s\n", e.message);
+        return Posix.EXIT_FAILURE;
+    }
+
     Gtk.init(ref argv);
-    GLib.Settings settings_panel =
-            new GLib.Settings("org.freedesktop.ibus.panel");
-    string emoji_font = settings_panel.get_string("emoji-font");
+    if (emoji_font == null) {
+        GLib.Settings settings_emoji =
+                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+        emoji_font = settings_emoji.get_string("font");
+    }
+    if (annotation_lang == null) {
+        GLib.Settings settings_emoji =
+                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+        annotation_lang = settings_emoji.get_string("lang");
+    }
     IBus.Emojier emojier = new IBus.Emojier();
-    emojier.set_emoji_font(emoji_font);
+    if (emoji_font != null && emoji_font != "")
+        emojier.set_emoji_font(emoji_font);
+    if (annotation_lang != null && annotation_lang != "")
+        emojier.set_annotation_lang(annotation_lang);
     if (emojier.has_loaded_emoji_dict()) {
         run_dialog(emojier);
     } else {
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index b1dc50cf8..20c13785d 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -42,14 +42,11 @@ class IBusEmojier : Gtk.Window {
         }
     }
     private class EBoxRow : Gtk.ListBoxRow {
-        public EBoxRow(string text,
-                       string id="") {
+        public EBoxRow(string text) {
             this.text = text;
-            this.id = id;
         }
 
         public string text { get; set; }
-        public string id { get; set; }
     }
     private class EScrolledWindow : Gtk.ScrolledWindow {
         public EScrolledWindow(Gtk.Adjustment? hadjustment=null,
@@ -132,6 +129,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
     private class ETitleLabel : Gtk.Box {
+        private Gtk.Label m_label;
         private Gtk.Button m_close_button;
         private ulong m_close_handler;
 
@@ -142,14 +140,14 @@ class IBusEmojier : Gtk.Window {
                 orientation : Gtk.Orientation.HORIZONTAL,
                 spacing : 0
             );
-            Gtk.Label label = new Gtk.Label(text);
-            label.set_halign(align);
-            label.set_valign(align);
-            label.set_margin_start(20);
-            label.set_margin_end(20);
-            label.set_margin_top(6);
-            label.set_margin_bottom(6);
-            pack_start(label, true, true, 0);
+            m_label = new Gtk.Label(text);
+            m_label.set_halign(align);
+            m_label.set_valign(align);
+            m_label.set_margin_start(20);
+            m_label.set_margin_end(20);
+            m_label.set_margin_top(6);
+            m_label.set_margin_bottom(6);
+            pack_start(m_label, true, true, 0);
             IconWidget icon = new IconWidget("window-close", Gtk.IconSize.MENU);
             m_close_button = new Gtk.Button();
             m_close_button.add(icon);
@@ -170,6 +168,9 @@ class IBusEmojier : Gtk.Window {
                 m_close_handler = 0;
             }
         }
+        public void set_label(string str) {
+            m_label.set_label(str);
+        }
     }
 
     private enum TravelDirection {
@@ -177,11 +178,6 @@ class IBusEmojier : Gtk.Window {
         BACKWARD,
     }
 
-    private enum CategoryType {
-        EMOJI,
-        LANG,
-    }
-
     private const uint EMOJI_GRID_PAGE = 10;
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
@@ -190,14 +186,11 @@ class IBusEmojier : Gtk.Window {
     private string? m_backward;
     private EScrolledWindow? m_scrolled_window = null;
     private EListBox m_list_box;
-    private CategoryType m_current_category_type = CategoryType.EMOJI;
     private bool m_is_running = false;
     private string m_input_context_path = "";
     private GLib.MainLoop? m_loop;
     private string? m_result;
-    private GLib.SList<string> m_lang_list;
     private string m_current_lang_id = "en";
-    private string m_current_language = "English";
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
     private GLib.HashTable<string, GLib.SList>?
@@ -215,6 +208,7 @@ class IBusEmojier : Gtk.Window {
     private bool m_enter_notify_enable = true;
     private uint m_entry_notify_show_id;
     private uint m_entry_notify_disable_id;
+    private uint m_reload_emoji_dict_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void loaded_emoji_dict();
@@ -323,50 +317,13 @@ class IBusEmojier : Gtk.Window {
             hide_candidate_panel();
         });
 
-        GLib.Idle.add(() => {
-            m_lang_list = read_lang_list();
+        m_reload_emoji_dict_id = GLib.Idle.add(() => {
             reload_emoji_dict();
+            m_reload_emoji_dict_id = 0;
             return false;
         });
     }
 
-    private GLib.SList<string> read_lang_list() {
-        GLib.SList<string> lang_list = new GLib.SList<string>();
-        const string dict_path = Config.PKGDATADIR + "/dicts";
-        GLib.Dir dir = null;
-        try {
-            dir = GLib.Dir.open(dict_path);
-        } catch (GLib.FileError e) {
-            warning("Error loading %s: %s", dict_path, e.message);
-            return lang_list;
-        }
-        string name;
-        while ((name = dir.read_name()) != null) {
-            const string dict_suffix = ".dict";
-            const string dict_prefix = "emoji-";
-            if (name.has_suffix(dict_suffix)) {
-                name = name[0:name.length - dict_suffix.length];
-                if (name.has_prefix(dict_prefix)) {
-                    name = name[dict_prefix.length:name.length];
-                    lang_list.append(name);
-                } else {
-                    warning("Need %s prefix in the filename: %s/%s%s",
-                            dict_prefix, dict_path, name, dict_suffix);
-                }
-            } else {
-                warning("Need %s extention in the filename: %s/%s",
-                        dict_suffix, dict_path, name);
-            }
-        }
-        lang_list.sort((a, b) => {
-            string a_lang = IBus.get_language_name(a);
-            string b_lang = IBus.get_language_name(b);
-            a_lang = "%s (%s)".printf(a_lang, a);
-            b_lang = "%s (%s)".printf(b_lang, b);
-            return GLib.strcmp(a_lang, b_lang);
-        });
-        return lang_list;
-    }
 
     private void reload_emoji_dict() {
         init_emoji_dict();
@@ -382,6 +339,7 @@ class IBusEmojier : Gtk.Window {
         loaded_emoji_dict();
     }
 
+
     private void init_emoji_dict() {
         m_annotation_to_emojis_dict =
                 new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
@@ -394,6 +352,7 @@ class IBusEmojier : Gtk.Window {
                                                        GLib.str_equal);
     }
 
+
     private void make_emoji_dict(string lang) {
         GLib.SList<IBus.EmojiData> emoji_list = IBus.EmojiData.load(
                     Config.PKGDATADIR + "/dicts/emoji-" + lang + ".dict");
@@ -412,6 +371,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     private void update_annotation_to_emojis_dict(IBus.EmojiData data) {
         string emoji = data.get_emoji();
         unowned GLib.SList<string> annotations = data.get_annotations();
@@ -432,6 +392,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     private string utf8_down(string str) {
         GLib.StringBuilder buff = new GLib.StringBuilder();
         int length = str.char_count();
@@ -442,6 +403,7 @@ class IBusEmojier : Gtk.Window {
         return buff.str;
     }
 
+
     private string utf8_title(string str) {
         StringBuilder buff = new StringBuilder();
         int length = str.char_count();
@@ -456,6 +418,7 @@ class IBusEmojier : Gtk.Window {
         return buff.str;
     }
 
+
     private void update_emoji_to_data_dict(IBus.EmojiData data,
                                            string         lang) {
         string emoji = data.get_emoji();
@@ -464,10 +427,11 @@ class IBusEmojier : Gtk.Window {
             unowned GLib.SList<string> annotations = data.get_annotations();
             var words = description.split(" ");
             // If the description has less than 3 words, add it to annotations
+            // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
             if (words.length < 3 &&
                 annotations.find_custom(
                         description,
-                        (GLib.CompareFunc<string>)GLib.strcmp) == null) {
+                        GLib.strcmp) == null) {
                 annotations.append(description);
                 data.set_annotations(annotations.copy_deep(GLib.strdup));
             }
@@ -485,18 +449,20 @@ class IBusEmojier : Gtk.Window {
             unowned GLib.SList<string> annotations = data.get_annotations();
             var words = trans_description.split(" ");
             // If the description has less than 3 words, add it to annotations
+            // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
             if (words.length < 3 &&
                 annotations.find_custom(
                         trans_description,
-                        (GLib.CompareFunc<string>)GLib.strcmp) == null) {
+                        GLib.strcmp) == null) {
                 annotations.append(trans_description);
             }
             unowned GLib.SList<string> en_annotations
                 = en_data.get_annotations();
             foreach (string annotation in en_annotations) {
+                // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
                 if (annotations.find_custom(
                             annotation,
-                            (GLib.CompareFunc<string>)GLib.strcmp) == null) {
+                            GLib.strcmp) == null) {
                     annotations.append(annotation.dup());
                 }
             }
@@ -504,6 +470,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     private void update_category_to_emojis_dict(IBus.EmojiData data,
                                                 string         lang) {
         string emoji = data.get_emoji();
@@ -525,29 +492,12 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     private void set_fixed_size() {
-        if (!m_candidate_panel_is_visible &&
-            m_current_category_type == CategoryType.LANG) {
-            Gtk.PolicyType vpolicy;
-            m_scrolled_window.get_policy(null, out vpolicy);
-            if (vpolicy == Gtk.PolicyType.AUTOMATIC)
-                return;
-            int width, height;
-            get_size(out width, out height);
-            set_size_request(width, height);
-            if (m_scrolled_window != null) {
-                m_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
-                                             Gtk.PolicyType.AUTOMATIC);
-            }
-        } else {
-            resize(20, 1);
-            if (m_scrolled_window != null) {
-                m_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
-                                             Gtk.PolicyType.NEVER);
-            }
-        }
+        resize(20, 1);
     }
 
+
     private void remove_all_children() {
         foreach (Gtk.Widget w in m_vbox.get_children()) {
             if (w.name == "IBusEmojierEntry" ||
@@ -558,51 +508,16 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
-    private void activated_language(EBoxRow row) {
-        m_category_active_index = 0;
-        if (m_current_lang_id != row.id) {
-            m_current_lang_id = row.id;
-            m_current_language = row.text;
-            reload_emoji_dict();
-        }
-        m_current_category_type = CategoryType.EMOJI;
-        show_category_list();
-    }
 
     private void show_category_list() {
         remove_all_children();
         m_scrolled_window = new EScrolledWindow();
         set_fixed_size();
-        EPaddedLabel label;
-        if (m_current_category_type == CategoryType.EMOJI) {
-            label = new EPaddedLabel(m_current_language, Gtk.Align.CENTER);
-        } else if (m_current_category_type == CategoryType.LANG) {
-            label = new EPaddedLabel(m_current_language,
-                                     Gtk.Align.CENTER,
-                                     TravelDirection.BACKWARD);
-        } else {
-            label = new EPaddedLabel("", Gtk.Align.CENTER);
-        }
-        Gtk.Button button = new Gtk.Button();
-        button.add(label);
-        m_vbox.add(button);
-        button.show_all();
-        if (m_current_category_type == CategoryType.EMOJI) {
-            button.button_press_event.connect((e) => {
-                m_category_active_index = 0;
-                m_current_category_type = CategoryType.LANG;
-                show_category_list();
-                return true;
-            });
-        } else if (m_current_category_type == CategoryType.LANG) {
-            button.button_press_event.connect((e) => {
-                m_category_active_index = 0;
-                m_current_category_type = CategoryType.EMOJI;
-                show_category_list();
-                return true;
-            });
-        }
 
+        string language = "%s (%s)".printf(
+            _("Emoji Dialog"),
+            IBus.get_language_name(m_current_lang_id));
+        m_title.set_label(language);
         m_vbox.add(m_scrolled_window);
         Gtk.Viewport viewport = new Gtk.Viewport(null, null);
         m_scrolled_window.add(viewport);
@@ -611,59 +526,38 @@ class IBusEmojier : Gtk.Window {
         viewport.add(m_list_box);
         Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
         m_list_box.set_adjustment(adjustment);
-        if (m_current_category_type == CategoryType.EMOJI) {
-            m_list_box.row_activated.connect((box, gtkrow) => {
-                m_category_active_index = 0;
-                EBoxRow row = gtkrow as EBoxRow;
-                show_emoji_for_category(row);
-            });
+        m_list_box.row_activated.connect((box, gtkrow) => {
+            m_category_active_index = 0;
+            EBoxRow row = gtkrow as EBoxRow;
+            show_emoji_for_category(row);
+        });
 
-            uint n = 1;
-            if (m_favorites.length > 0) {
-                EBoxRow row = new EBoxRow("@favorites");
-                EPaddedLabel widget =
-                        new EPaddedLabel(_("Favorites"), Gtk.Align.CENTER);
-                row.add(widget);
-                m_list_box.add(row);
-                if (n++ == m_category_active_index)
-                    m_list_box.select_row(row);
-            }
-            GLib.List<unowned string> categories =
-                    m_category_to_emojis_dict.get_keys();
-            categories.sort((a, b) => {
-                return GLib.strcmp(_(a), _(b));
-            });
-            foreach (unowned string category in categories) {
-                EBoxRow row = new EBoxRow(category);
-                string locale_category = _(category);
-                EPaddedLabel widget =
-                        new EPaddedLabel(utf8_title(locale_category),
-                                         Gtk.Align.CENTER);
-                row.add(widget);
-                m_list_box.add(row);
-                if (n++ == m_category_active_index)
-                    m_list_box.select_row(row);
-            }
-        } else if (m_current_category_type == CategoryType.LANG) {
-            m_list_box.row_activated.connect((box, gtkrow) => {
-                activated_language(gtkrow as EBoxRow);
-            });
-            uint n = 1;
-            string prev_language = null;
-            foreach (unowned string id in m_lang_list) {
-                string language = IBus.get_language_name(id);
-                if (prev_language == language)
-                    language = "%s (%s)".printf(language, id);
-                else
-                    prev_language = language;
-                EBoxRow row = new EBoxRow(language, id);
-                EPaddedLabel widget =
-                        new EPaddedLabel(language, Gtk.Align.CENTER);
-                row.add(widget);
-                m_list_box.add(row);
-                if (n++ == m_category_active_index)
-                    m_list_box.select_row(row);
-            }
+        uint n = 1;
+        if (m_favorites.length > 0) {
+            EBoxRow row = new EBoxRow("@favorites");
+            EPaddedLabel widget =
+                    new EPaddedLabel(_("Favorites"), Gtk.Align.CENTER);
+            row.add(widget);
+            m_list_box.add(row);
+            if (n++ == m_category_active_index)
+                m_list_box.select_row(row);
+        }
+        GLib.List<unowned string> categories =
+                m_category_to_emojis_dict.get_keys();
+        // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
+        categories.sort((a, b) => {
+            return GLib.strcmp(_(a), _(b));
+        });
+        foreach (unowned string category in categories) {
+            EBoxRow row = new EBoxRow(category);
+            string locale_category = _(category);
+            EPaddedLabel widget =
+                    new EPaddedLabel(utf8_title(locale_category),
+                                     Gtk.Align.CENTER);
+            row.add(widget);
+            m_list_box.add(row);
+            if (n++ == m_category_active_index)
+                m_list_box.select_row(row);
         }
 
         m_scrolled_window.show_all();
@@ -673,6 +567,7 @@ class IBusEmojier : Gtk.Window {
         m_list_box.set_selection_mode(Gtk.SelectionMode.SINGLE);
     }
 
+
     private void show_emoji_for_category(EBoxRow row) {
         if (row.text == "@favorites") {
             m_lookup_table.clear();
@@ -694,6 +589,7 @@ class IBusEmojier : Gtk.Window {
         show_candidate_panel();
     }
 
+
     private void show_arrow_buttons() {
         Gtk.Button next_button = new Gtk.Button();
         next_button.clicked.connect(() => {
@@ -729,6 +625,7 @@ class IBusEmojier : Gtk.Window {
         buttons_hbox.show_all();
     }
 
+
     private bool check_unicode_point(string? annotation=null) {
         bool check_xdigit_only = true;
         if (annotation == null) {
@@ -758,6 +655,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     public void update_candidate_window() {
         string annotation = m_entry.get_text();
         if (annotation.length == 0) {
@@ -788,6 +686,7 @@ class IBusEmojier : Gtk.Window {
         show_candidate_panel();
     }
 
+
     private void show_candidate_panel() {
         remove_all_children();
         set_fixed_size();
@@ -848,6 +747,8 @@ class IBusEmojier : Gtk.Window {
                 // enter_notify_event conflicts with keyboard operations.
                 if (!m_enter_notify_enable)
                     return true;
+                if (m_lookup_table.get_cursor_pos() == index)
+                    return true;
                 m_lookup_table.set_cursor_pos(index);
                 if (m_entry_notify_show_id > 0) {
                         GLib.Source.remove(m_entry_notify_show_id);
@@ -927,6 +828,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     private void hide_candidate_panel() {
         m_enter_notify_enable = true;
         m_candidate_panel_is_visible = false;
@@ -934,6 +836,7 @@ class IBusEmojier : Gtk.Window {
             show_category_list();
     }
 
+
     private bool if_in_range_of_lookup(uint keyval) {
         if (!m_candidate_panel_is_visible)
             return false;
@@ -957,6 +860,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     private void set_number_on_lookup(uint keyval) {
         if (keyval == Gdk.Key.@0)
             keyval = Gdk.Key.@9 + 1;
@@ -969,6 +873,7 @@ class IBusEmojier : Gtk.Window {
         m_result = text.text;
     }
 
+
     private void enter_notify_disable_with_timer() {
         // Enable keyboard operation and disable mouse operation.
         m_enter_notify_enable = false;
@@ -982,6 +887,7 @@ class IBusEmojier : Gtk.Window {
         });
     }
 
+
     private void candidate_panel_cursor_down() {
         enter_notify_disable_with_timer();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
@@ -996,6 +902,7 @@ class IBusEmojier : Gtk.Window {
         show_candidate_panel();
     }
 
+
     private void candidate_panel_cursor_up() {
         enter_notify_disable_with_timer();
         int ncandidates = (int)m_lookup_table.get_number_of_candidates();
@@ -1013,6 +920,7 @@ class IBusEmojier : Gtk.Window {
         show_candidate_panel();
     }
 
+
     private void category_list_cursor_move(uint keyval) {
         GLib.List<weak Gtk.Widget> list = m_list_box.get_children();
         if (keyval == Gdk.Key.Down) {
@@ -1027,6 +935,7 @@ class IBusEmojier : Gtk.Window {
         show_category_list();
     }
 
+
     private bool key_press_cursor_horizontal(uint keyval,
                                              uint modifiers) {
         assert (keyval == Gdk.Key.Left || keyval == Gdk.Key.Right);
@@ -1061,6 +970,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     private bool key_press_cursor_vertical(uint keyval) {
         assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up);
 
@@ -1075,6 +985,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     private bool key_press_cursor_home_end(uint keyval,
                                            uint modifiers) {
         assert (keyval == Gdk.Key.Home || keyval == Gdk.Key.End);
@@ -1107,14 +1018,11 @@ class IBusEmojier : Gtk.Window {
         return false;
     }
 
+
     private bool key_press_cursor_escape() {
         if (m_candidate_panel_is_visible) {
             hide_candidate_panel();
             return true;
-        } else if (m_current_category_type == CategoryType.LANG) {
-            m_current_category_type = CategoryType.EMOJI;
-            show_candidate_panel();
-            return true;
         } else if (m_entry.get_text().length == 0) {
             m_loop.quit();
             hide_candidate_panel();
@@ -1124,6 +1032,7 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     private void entry_enter_keyval(uint keyval) {
         unichar ch = IBus.keyval_to_unicode(keyval);
         if (ch.iscntrl())
@@ -1145,6 +1054,7 @@ class IBusEmojier : Gtk.Window {
         m_entry.set_position(pos);
     }
 
+
     public string run(Gdk.Event event,
                       string    input_context_path) {
         assert (m_loop == null);
@@ -1178,7 +1088,6 @@ class IBusEmojier : Gtk.Window {
             keyboard = device.get_associated_device();
         }
 
-        m_current_category_type = CategoryType.EMOJI;
         show_category_list();
         m_entry.set_activates_default(true);
         show_all();
@@ -1229,12 +1138,14 @@ class IBusEmojier : Gtk.Window {
         return m_result;
     }
 
+
     /* override virtual functions */
     public override void show() {
         base.show();
         set_focus_visible(true);
     }
 
+
     public override bool key_press_event(Gdk.EventKey event) {
         uint keyval = event.keyval;
         uint modifiers = event.state;
@@ -1263,10 +1174,7 @@ class IBusEmojier : Gtk.Window {
             } else if (m_category_active_index > 0) {
                 Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
                 EBoxRow row = gtkrow as EBoxRow;
-                if (m_current_category_type == CategoryType.EMOJI)
-                    show_emoji_for_category(row);
-                else if (m_current_category_type == CategoryType.LANG)
-                    activated_language(row);
+                show_emoji_for_category(row);
             }
             return true;
         case Gdk.Key.BackSpace:
@@ -1366,27 +1274,33 @@ class IBusEmojier : Gtk.Window {
         return true;
     }
 
+
     public bool is_running() {
         return m_is_running;
     }
 
+
     public string get_input_context_path() {
         return m_input_context_path;
     }
 
+
     public string get_selected_string() {
         return m_result;
     }
 
+
     public void reset() {
         m_input_context_path = "";
         m_result = null;
     }
 
+
     public void set_emoji_font(string emoji_font) {
         m_emoji_font = emoji_font;
     }
 
+
     public void set_favorites(string[]? unowned_favorites) {
         m_favorites = {};
         foreach (string favorite in unowned_favorites) {
@@ -1394,6 +1308,7 @@ class IBusEmojier : Gtk.Window {
         }
     }
 
+
     public bool has_loaded_emoji_dict() {
         if (m_emoji_to_data_dict == null)
             return false;
@@ -1402,4 +1317,20 @@ class IBusEmojier : Gtk.Window {
             return false;
         return true;
     }
+
+
+    public void set_annotation_lang(string lang) {
+        if (m_current_lang_id == lang)
+            return;
+        if (m_reload_emoji_dict_id > 0) {
+            GLib.Source.remove(m_reload_emoji_dict_id);
+            m_reload_emoji_dict_id = 0;
+        }
+        m_current_lang_id = lang;
+        m_reload_emoji_dict_id = GLib.Idle.add(() => {
+            reload_emoji_dict();
+            m_reload_emoji_dict_id = 0;
+            return false;
+        });
+    }
 }
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index c36060c12..0f84a486f 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -149,5 +149,16 @@ void          ibus_emojier_set_favorites          (IBusEmojier* self,
  */
 gboolean      ibus_emojier_has_loaded_emoji_dict  (IBusEmojier* self);
 
+/**
+ * ibus_emojier_set_annotation_lang:
+ * @self: An #IBusEmojier
+ * @lang: A langauge id for emoji annotations.
+ *
+ * Set a language id for emoji annotations. #IBusEmojier will load
+ * $PKGDATADIR/dicts/emoji-@lang.dict. The default is "en".
+ */
+void          ibus_emojier_set_annotation_lang    (IBusEmojier* self,
+                                                   const gchar* lang);
+
 G_END_DECLS
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 098213425..7350dccea 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -54,6 +54,7 @@ class Panel : IBus.PanelService {
     private GLib.Settings m_settings_general = null;
     private GLib.Settings m_settings_hotkey = null;
     private GLib.Settings m_settings_panel = null;
+    private GLib.Settings m_settings_emoji = null;
     private IconType m_icon_type = IconType.STATUS_ICON;
     private Indicator m_indicator;
 #if INDICATOR
@@ -161,6 +162,7 @@ class Panel : IBus.PanelService {
         m_settings_hotkey =
                 new GLib.Settings("org.freedesktop.ibus.general.hotkey");
         m_settings_panel = new GLib.Settings("org.freedesktop.ibus.panel");
+        m_settings_emoji = new GLib.Settings("org.freedesktop.ibus.panel.emoji");
 
         m_settings_general.changed["preload-engines"].connect((key) => {
                 update_engines(m_settings_general.get_strv(key),
@@ -193,19 +195,10 @@ class Panel : IBus.PanelService {
                 bind_switch_shortcut();
         });
 
-        m_settings_hotkey.changed["emoji"].connect((key) => {
-                unbind_switch_shortcut(KeyEventFuncType.EMOJI_TYPING);
-                bind_emoji_shortcut();
-        });
-
         m_settings_panel.changed["custom-font"].connect((key) => {
                 set_custom_font();
         });
 
-        m_settings_panel.changed["emoji-font"].connect((key) => {
-                set_custom_font();
-        });
-
         m_settings_panel.changed["use-custom-font"].connect((key) => {
                 set_custom_font();
         });
@@ -239,9 +232,22 @@ class Panel : IBus.PanelService {
                 set_property_icon_delay_time();
         });
 
-        m_settings_panel.changed["emoji-favorites"].connect((key) => {
+        m_settings_emoji.changed["hotkey"].connect((key) => {
+                unbind_switch_shortcut(KeyEventFuncType.EMOJI_TYPING);
+                bind_emoji_shortcut();
+        });
+
+        m_settings_emoji.changed["font"].connect((key) => {
+                set_custom_font();
+        });
+
+        m_settings_emoji.changed["favorites"].connect((key) => {
                 set_emoji_favorites();
         });
+
+        m_settings_emoji.changed["lang"].connect((key) => {
+                set_emoji_lang();
+        });
     }
 
 #if INDICATOR
@@ -398,7 +404,7 @@ class Panel : IBus.PanelService {
 
     private void bind_emoji_shortcut() {
 #if EMOJI_DICT
-        string[] accelerators = m_settings_hotkey.get_strv("emoji");
+        string[] accelerators = m_settings_emoji.get_strv("hotkey");
 
         var keybinding_manager = KeybindingManager.get_instance();
 
@@ -584,9 +590,9 @@ class Panel : IBus.PanelService {
             return;
         }
 
-        string emoji_font = m_settings_panel.get_string("emoji-font");
+        string emoji_font = m_settings_emoji.get_string("font");
         if (emoji_font == null) {
-            warning("No config panel:emoji-font.");
+            warning("No config emoji:font.");
             return;
         }
         m_emojier.set_emoji_font(emoji_font);
@@ -760,7 +766,11 @@ class Panel : IBus.PanelService {
     }
 
     private void set_emoji_favorites() {
-        m_emojier.set_favorites(m_settings_panel.get_strv("emoji-favorites"));
+        m_emojier.set_favorites(m_settings_emoji.get_strv("favorites"));
+    }
+
+    private void set_emoji_lang() {
+        m_emojier.set_annotation_lang(m_settings_emoji.get_string("lang"));
     }
 
     private int compare_versions(string version1, string version2) {
@@ -877,6 +887,7 @@ class Panel : IBus.PanelService {
         set_xkb_icon_rgba();
         set_property_icon_delay_time();
         set_emoji_favorites();
+        set_emoji_lang();
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {

From 164300758c70fd3a590788e038de31b6c53d458a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 28 Mar 2017 12:15:26 +0900
Subject: [PATCH 392/816] data: Fix a typo

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/321800043
---
 data/ibus.schemas.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index c0bbd6f69..096dd71a5 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -386,7 +386,7 @@
         <short>Default language for emoji dictionary</short>
 	    <long>Choose a default language of emoji dictionaries on
 	          the emoji dialog. The value $lang is applied to
-                  /usr/share/unicode/cldr/common/annotations/$lang.xml
+                  /usr/share/ibus/dicts/emoji-$lang.dict
             </long>
       </locale>
     </schema>

From c3168d4701eb4e89094249abaa4f0f83ab24149b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 29 Mar 2017 13:01:28 +0900
Subject: [PATCH 393/816] Fix IBusEmojiDialog_1_0_gir_LIBS for --as-needed
 LDFLAGS

The order gets omitted libibus-1.0.la

BUG=https://github.com/ibus/ibus/issues/1917

Review URL: https://codereview.appspot.com/324720043
---
 ui/gtk3/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index b055f6797..7122ff348 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -205,7 +205,7 @@ IBusEmojiDialog_1_0_gir_SCANNERFLAGS = \
     $(NULL)
 IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
 IBusEmojiDialog_1_0_gir_INCLUDES = Gtk-3.0 GLib-2.0 GObject-2.0 Gio-2.0
-IBusEmojiDialog_1_0_gir_LIBS = $(libibus) $(libibus_emoji_dialog)
+IBusEmojiDialog_1_0_gir_LIBS = $(libibus_emoji_dialog) $(libibus)
 IBusEmojiDialog_1_0_gir_FILES =                      \
     $(addprefix $(srcdir)/,$(introspection_sources)) \
     $(NULL)

From 8b6f9fa531aa9d9b5d6c0184b2294d071f920d7f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 30 Mar 2017 12:08:39 +0900
Subject: [PATCH 394/816] ui/gtk3: Enable to type multiple code points on
 Emojier

- Can type multiple Unicode characters with digits and Shift-space
  keys.  E.g. "1f468 1f468 1f466"
- Always show Unicode points of the selected emoji
- Removed a function to commit an emoji by typing a digit char since
  it conflicts with digit annotations, code points but it had enabled
  with single digits only so not so useful.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/321820043
---
 ui/gtk3/emojier.vala | 207 ++++++++++++++++++++-----------------------
 1 file changed, 98 insertions(+), 109 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 20c13785d..8a2726c79 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -97,12 +97,27 @@ class IBusEmojier : Gtk.Window {
                 set_label(text);
         }
     }
-    private class EPaddedLabel : Gtk.Box {
+    private class EPaddedLabel : Gtk.Label {
         public EPaddedLabel(string          text,
-                            Gtk.Align       align,
-                            TravelDirection direction=TravelDirection.NONE) {
+                            Gtk.Align       align) {
             GLib.Object(
                 name : "IBusEmojierPaddedLabel",
+                halign : align,
+                valign : Gtk.Align.CENTER,
+                margin_start : 20,
+                margin_end : 20,
+                margin_top : 6,
+                margin_bottom : 6
+            );
+            set_text(text);
+        }
+    }
+    private class EPaddedLabelBox : Gtk.Box {
+        public EPaddedLabelBox(string          text,
+                               Gtk.Align       align,
+                               TravelDirection direction=TravelDirection.NONE) {
+            GLib.Object(
+                name : "IBusEmojierPaddedLabelBox",
                 orientation : Gtk.Orientation.HORIZONTAL,
                 spacing : 0
             );
@@ -118,36 +133,29 @@ class IBusEmojier : Gtk.Window {
                 }
                 pack_start(icon, false, true, 0);
             }
-            Gtk.Label label = new Gtk.Label(text);
-            label.set_halign(align);
-            label.set_valign(Gtk.Align.CENTER);
-            label.set_margin_start(20);
-            label.set_margin_end(20);
-            label.set_margin_top(6);
-            label.set_margin_bottom(6);
+            EPaddedLabel label = new EPaddedLabel(text, align);
             pack_start(label, true, true, 0);
         }
     }
-    private class ETitleLabel : Gtk.Box {
-        private Gtk.Label m_label;
+    private class ETitleLabelBox : Gtk.Box {
+        EPaddedLabel m_lang_label;
         private Gtk.Button m_close_button;
         private ulong m_close_handler;
 
-        public ETitleLabel(string    text,
-                           Gtk.Align align) {
+        public ETitleLabelBox(string    text,
+                              Gtk.Align align) {
             GLib.Object(
-                name : "IBusEmojierTitleLabel",
+                name : "IBusEmojierTitleLabelBox",
                 orientation : Gtk.Orientation.HORIZONTAL,
                 spacing : 0
             );
-            m_label = new Gtk.Label(text);
-            m_label.set_halign(align);
-            m_label.set_valign(align);
-            m_label.set_margin_start(20);
-            m_label.set_margin_end(20);
-            m_label.set_margin_top(6);
-            m_label.set_margin_bottom(6);
-            pack_start(m_label, true, true, 0);
+            EPaddedLabel label = new EPaddedLabel(text, align);
+            pack_start(label, true, true, 0);
+            Gtk.Separator separator =
+                    new Gtk.Separator (Gtk.Orientation.VERTICAL);
+            pack_start(separator, false, true, 0);
+            m_lang_label = new EPaddedLabel("", align);
+            pack_start(m_lang_label, false, true, 0);
             IconWidget icon = new IconWidget("window-close", Gtk.IconSize.MENU);
             m_close_button = new Gtk.Button();
             m_close_button.add(icon);
@@ -168,8 +176,8 @@ class IBusEmojier : Gtk.Window {
                 m_close_handler = 0;
             }
         }
-        public void set_label(string str) {
-            m_label.set_label(str);
+        public void set_lang_label(string str) {
+            m_lang_label.set_label(str);
         }
     }
 
@@ -181,7 +189,7 @@ class IBusEmojier : Gtk.Window {
     private const uint EMOJI_GRID_PAGE = 10;
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
-    private ETitleLabel m_title;
+    private ETitleLabelBox m_title;
     private EEntry m_entry;
     private string? m_backward;
     private EScrolledWindow? m_scrolled_window = null;
@@ -278,8 +286,8 @@ class IBusEmojier : Gtk.Window {
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
 
-        m_title = new ETitleLabel(_("Emoji Dialog"),
-                                  Gtk.Align.CENTER);
+        m_title = new ETitleLabelBox(_("Emoji Dialog"),
+                                     Gtk.Align.CENTER);
         m_vbox.add(m_title);
         m_entry = new EEntry();
         m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
@@ -419,6 +427,21 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private string utf8_code_point(string str) {
+        StringBuilder buff = new StringBuilder();
+        int length = str.char_count();
+        for (int i = 0; i < length; i++) {
+            unichar ch = str.get_char(0);
+            if (i == 0)
+                buff.append("U+%04X".printf(ch));
+            else
+                buff.append(" %04X".printf(ch));
+            str = str.next_char();
+        }
+        return buff.str;
+    }
+
+
     private void update_emoji_to_data_dict(IBus.EmojiData data,
                                            string         lang) {
         string emoji = data.get_emoji();
@@ -501,7 +524,7 @@ class IBusEmojier : Gtk.Window {
     private void remove_all_children() {
         foreach (Gtk.Widget w in m_vbox.get_children()) {
             if (w.name == "IBusEmojierEntry" ||
-                w.name == "IBusEmojierTitleLabel") {
+                w.name == "IBusEmojierTitleLabelBox") {
                 continue;
             }
             w.destroy();
@@ -514,10 +537,9 @@ class IBusEmojier : Gtk.Window {
         m_scrolled_window = new EScrolledWindow();
         set_fixed_size();
 
-        string language = "%s (%s)".printf(
-            _("Emoji Dialog"),
-            IBus.get_language_name(m_current_lang_id));
-        m_title.set_label(language);
+        string language =
+            IBus.get_language_name(m_current_lang_id);
+        m_title.set_lang_label(language);
         m_vbox.add(m_scrolled_window);
         Gtk.Viewport viewport = new Gtk.Viewport(null, null);
         m_scrolled_window.add(viewport);
@@ -535,8 +557,8 @@ class IBusEmojier : Gtk.Window {
         uint n = 1;
         if (m_favorites.length > 0) {
             EBoxRow row = new EBoxRow("@favorites");
-            EPaddedLabel widget =
-                    new EPaddedLabel(_("Favorites"), Gtk.Align.CENTER);
+            EPaddedLabelBox widget =
+                    new EPaddedLabelBox(_("Favorites"), Gtk.Align.CENTER);
             row.add(widget);
             m_list_box.add(row);
             if (n++ == m_category_active_index)
@@ -551,9 +573,9 @@ class IBusEmojier : Gtk.Window {
         foreach (unowned string category in categories) {
             EBoxRow row = new EBoxRow(category);
             string locale_category = _(category);
-            EPaddedLabel widget =
-                    new EPaddedLabel(utf8_title(locale_category),
-                                     Gtk.Align.CENTER);
+            EPaddedLabelBox widget =
+                    new EPaddedLabelBox(utf8_title(locale_category),
+                                        Gtk.Align.CENTER);
             row.add(widget);
             m_list_box.add(row);
             if (n++ == m_category_active_index)
@@ -626,18 +648,23 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private bool check_unicode_point(string? annotation=null) {
-        bool check_xdigit_only = true;
-        if (annotation == null) {
-            annotation = m_entry.get_text();
-            m_unicode_point = null;
-            check_xdigit_only = false;
-        }
+    private bool check_unicode_point() {
+        string annotation = m_entry.get_text();
+        m_unicode_point = null;
         GLib.StringBuilder buff = new GLib.StringBuilder();
+        GLib.StringBuilder retval = new GLib.StringBuilder();
         for (int i = 0; i < annotation.char_count(); i++) {
             unichar ch = annotation.get_char(i);
             if (ch == 0)
                 return false;
+            if (ch.isspace()) {
+                unichar code = (unichar)buff.str.to_ulong(null, 16);
+                buff.erase();
+                if (!code.validate())
+                    return false;
+                retval.append(code.to_string());
+                continue;
+            }
             if (!ch.isxdigit())
                 return false;
             buff.append_unichar(ch);
@@ -645,9 +672,8 @@ class IBusEmojier : Gtk.Window {
         unichar code = (unichar)buff.str.to_ulong(null, 16);
         if (!code.validate())
             return false;
-        if (check_xdigit_only)
-            return true;
-        m_unicode_point = code.to_string();
+        retval.append(code.to_string());
+        m_unicode_point = retval.str;
         if (m_unicode_point == null)
             return true;
         IBus.Text text = new IBus.Text.from_string(m_unicode_point);
@@ -699,9 +725,10 @@ class IBusEmojier : Gtk.Window {
         if (m_backward != null) {
             string backward_desc =
                     "%s (%u / %u)".printf(m_backward, cursor, ncandidates - 1);
-            EPaddedLabel label = new EPaddedLabel(backward_desc,
-                                                  Gtk.Align.CENTER,
-                                                  TravelDirection.BACKWARD);
+            EPaddedLabelBox label =
+                    new EPaddedLabelBox(backward_desc,
+                                        Gtk.Align.CENTER,
+                                        TravelDirection.BACKWARD);
             Gtk.Button button = new Gtk.Button();
             button.add(label);
             m_vbox.add(button);
@@ -776,27 +803,24 @@ class IBusEmojier : Gtk.Window {
             IBus.Text candidate = m_lookup_table.get_candidate(cursor);
             unowned IBus.EmojiData? data =
                     m_emoji_to_data_dict.lookup(candidate.text);
-            if (cursor == 0 && candidate.text == m_unicode_point) {
-                EPaddedLabel widget = new EPaddedLabel(
-                        _("Description: Unicode point U+%04X").printf(
-                                m_unicode_point.get_char(0)),
-                        Gtk.Align.START);
-                m_vbox.add(widget);
-                widget.show_all();
-                if (data == null)
-                    return;
-            } else if (data == null) {
+            if (data == null) {
                 // TODO: Provide a custom description and annotation for
                 // the favorite emojis.
-                EPaddedLabel widget = new EPaddedLabel(
+                EPaddedLabelBox widget = new EPaddedLabelBox(
                         _("Description: %s").printf(_("None")),
                         Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
+                EPaddedLabelBox widget_code = new EPaddedLabelBox(
+                        _("Code point: %s").printf(
+                                utf8_code_point(candidate.text)),
+                        Gtk.Align.START);
+                m_vbox.add(widget_code);
+                widget_code.show_all();
                 return;
             } else {
                 unowned string description = data.get_description();
-                EPaddedLabel widget = new EPaddedLabel(
+                EPaddedLabelBox widget = new EPaddedLabelBox(
                         _("Description: %s").printf(description),
                         Gtk.Align.START);
                 m_vbox.add(widget);
@@ -812,19 +836,26 @@ class IBusEmojier : Gtk.Window {
                 else
                     buff.append_printf(" | %s", annotation);
                 if (buff.str.char_count() > 30) {
-                    EPaddedLabel widget = new EPaddedLabel(buff.str,
-                                                           Gtk.Align.START);
+                    EPaddedLabelBox widget =
+                            new EPaddedLabelBox(buff.str,
+                                                Gtk.Align.START);
                     m_vbox.add(widget);
                     widget.show_all();
                     buff.erase();
                 }
             }
             if (buff.str != "") {
-                EPaddedLabel widget = new EPaddedLabel(buff.str,
-                                                       Gtk.Align.START);
+                EPaddedLabelBox widget = new EPaddedLabelBox(buff.str,
+                                                             Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
             }
+            EPaddedLabelBox widget_code = new EPaddedLabelBox(
+                    _("Code point: %s").printf(
+                            utf8_code_point(candidate.text)),
+                    Gtk.Align.START);
+            m_vbox.add(widget_code);
+            widget_code.show_all();
         }
     }
 
@@ -837,43 +868,6 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private bool if_in_range_of_lookup(uint keyval) {
-        if (!m_candidate_panel_is_visible)
-            return false;
-        StringBuilder buffer_string = new StringBuilder(m_entry.get_text());
-        unichar ch = IBus.keyval_to_unicode (keyval);
-        buffer_string.append_unichar(ch);
-        if (check_unicode_point(buffer_string.str))
-            return false;
-        if (keyval < Gdk.Key.@0 || keyval > Gdk.Key.@9)
-            return false;
-        if (keyval == Gdk.Key.@0)
-            keyval = Gdk.Key.@9 + 1;
-        uint index = keyval - Gdk.Key.@1 + 1;
-        uint candidates = m_lookup_table.get_number_of_candidates();
-        uint cursor_pos = m_lookup_table.get_cursor_pos();
-        uint page_size = m_lookup_table.get_page_size();
-        if (index > uint.min(candidates - (cursor_pos / page_size) * page_size,
-                             page_size)) {
-            return false;
-        }
-        return true;
-    }
-
-
-    private void set_number_on_lookup(uint keyval) {
-        if (keyval == Gdk.Key.@0)
-            keyval = Gdk.Key.@9 + 1;
-        uint index = keyval - Gdk.Key.@1;
-        uint cursor_pos = m_lookup_table.get_cursor_pos();
-        uint cursor_in_page= m_lookup_table.get_cursor_in_page();
-        uint real_index = cursor_pos - cursor_in_page + index;
-        m_lookup_table.set_cursor_pos(real_index);
-        IBus.Text text = m_lookup_table.get_candidate(real_index);
-        m_result = text.text;
-    }
-
-
     private void enter_notify_disable_with_timer() {
         // Enable keyboard operation and disable mouse operation.
         m_enter_notify_enable = false;
@@ -1154,11 +1148,6 @@ class IBusEmojier : Gtk.Window {
          * key_release_event() so that this can know if the event
          * was handled by IME.
          */
-        if (if_in_range_of_lookup(keyval)) {
-            set_number_on_lookup(keyval);
-            m_loop.quit();
-            return true;
-        }
         switch (keyval) {
         case Gdk.Key.Escape:
             if (key_press_cursor_escape())

From cb0a36c254dc7a96b2a984e715f96cc2ec32e2d5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 3 Apr 2017 12:24:27 +0900
Subject: [PATCH 395/816] src: Enable unicode_alt in EmojiOne json file

EmojiOne json file has unicode_alt property which includes
emoji modifer characters.

Review URL: https://codereview.appspot.com/316420043
---
 src/emoji-parser.c   | 20 +++++++++++++++---
 src/ibusemoji.c      | 48 ++++++++++++++++++++++++++++++++++++++++----
 src/ibusemoji.h      | 14 +++++++++++++
 ui/gtk3/emojier.vala |  9 ++++++---
 4 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index f9e34703f..e5dce3f80 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -40,6 +40,7 @@
 typedef struct _EmojiData EmojiData;
 struct _EmojiData {
     gchar      *emoji;
+    gchar      *emoji_alternates;
     GSList     *annotations;
     gboolean    is_annotation;
     gchar      *description;
@@ -54,6 +55,7 @@ reset_emoji_element (EmojiData *data)
     g_assert (data != NULL);
 
     g_clear_pointer (&data->emoji, g_free);
+    g_clear_pointer (&data->emoji_alternates, g_free);
     g_slist_free_full (data->annotations, g_free);
     data->annotations = NULL;
     g_clear_pointer (&data->description, g_free);
@@ -112,6 +114,10 @@ update_emoji_list (EmojiData *data)
                                      "category",
                                      data->category ? data->category
                                              : g_strdup (""),
+                                     "emoji-alternates",
+                                     data->emoji_alternates
+                                             ? data->emoji_alternates
+                                             : g_strdup (""),
                                      NULL);
         data->list = g_slist_append (data->list, emoji);
     }
@@ -271,7 +277,8 @@ unicode_annotations_parse_xml_file (const gchar  *filename,
 
 static gboolean
 parse_emojione_unicode (JsonNode  *node,
-                        EmojiData *data)
+                        EmojiData *data,
+                        gboolean   is_alternates)
 {
     const gchar *str, *unicode;
     gchar *endptr = NULL;
@@ -305,7 +312,10 @@ parse_emojione_unicode (JsonNode  *node,
         endptr = NULL;
     }
 
-    data->emoji = g_string_free (emoji, FALSE);
+    if (is_alternates)
+        data->emoji_alternates = g_string_free (emoji, FALSE);
+    else
+        data->emoji = g_string_free (emoji, FALSE);
 
     return TRUE;
 }
@@ -480,7 +490,11 @@ parse_emojione_emoji_data (JsonNode    *node,
                            EmojiData   *data)
 {
     if (g_strcmp0 (member, "unicode") == 0)
-        return parse_emojione_unicode (node, data);
+        return parse_emojione_unicode (node, data, FALSE);
+    else if (g_strcmp0 (member, "unicode_alt") == 0)
+        return parse_emojione_unicode (node, data, TRUE);
+    else if (g_strcmp0 (member, "unicode_alternates") == 0)
+        return parse_emojione_unicode (node, data, TRUE);
     else if (g_strcmp0 (member, "shortname") == 0)
         return parse_emojione_shortname (node, data);
     else if (g_strcmp0 (member, "name") == 0)
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index c61cd703e..4be092acb 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -29,14 +29,15 @@
 #include "ibusinternal.h"
 
 #define IBUS_EMOJI_DATA_MAGIC "IBusEmojiData"
-#define IBUS_EMOJI_DATA_VERSION (2)
+#define IBUS_EMOJI_DATA_VERSION (3)
 
 enum {
     PROP_0 = 0,
     PROP_EMOJI,
     PROP_ANNOTATIONS,
     PROP_DESCRIPTION,
-    PROP_CATEGORY
+    PROP_CATEGORY,
+    PROP_EMOJI_ALTERNATES
 };
 
 struct _IBusEmojiDataPrivate {
@@ -44,6 +45,7 @@ struct _IBusEmojiDataPrivate {
     GSList     *annotations;
     gchar      *description;
     gchar      *category;
+    gchar      *emoji_alternates;
 };
 
 #define IBUS_EMOJI_DATA_GET_PRIVATE(o)  \
@@ -142,6 +144,19 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                         "The emoji category",
                         "",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusEmojiData:emoji_alternates:
+     *
+     * The emoji alternate characters
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_EMOJI_ALTERNATES,
+                    g_param_spec_string ("emoji-alternates",
+                        "emoji alternate charasters",
+                        "The emoji alternate characters UTF-8",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -180,19 +195,24 @@ ibus_emoji_data_set_property (IBusEmojiData *emoji,
         emoji->priv->emoji = g_value_dup_string (value);
         break;
     case PROP_ANNOTATIONS:
-        g_assert (emoji->priv->annotations == NULL);
+        if (emoji->priv->annotations)
+            g_slist_free_full (emoji->priv->annotations, g_free);
         emoji->priv->annotations =
                 g_slist_copy_deep (g_value_get_pointer (value),
                                    (GCopyFunc) g_strdup, NULL);
         break;
     case PROP_DESCRIPTION:
-        g_assert (emoji->priv->description == NULL);
+        g_free (emoji->priv->description);
         emoji->priv->description = g_value_dup_string (value);
         break;
     case PROP_CATEGORY:
         g_assert (emoji->priv->category == NULL);
         emoji->priv->category = g_value_dup_string (value);
         break;
+    case PROP_EMOJI_ALTERNATES:
+        g_assert (emoji->priv->emoji_alternates == NULL);
+        emoji->priv->emoji_alternates = g_value_dup_string (value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
     }
@@ -220,6 +240,9 @@ ibus_emoji_data_get_property (IBusEmojiData *emoji,
     case PROP_CATEGORY:
         g_value_set_string (value, ibus_emoji_data_get_category (emoji));
         break;
+    case PROP_EMOJI_ALTERNATES:
+        g_value_set_string (value, ibus_emoji_data_get_emoji_alternates(emoji));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
     }
@@ -247,6 +270,9 @@ ibus_emoji_data_serialize (IBusEmojiData   *emoji,
     }
     g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->description));
     g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->category));
+    g_variant_builder_add (builder, "s",
+                           NOTNULL (emoji->priv->emoji_alternates));
+#undef NOTNULL
     return TRUE;
 }
 
@@ -277,6 +303,10 @@ ibus_emoji_data_deserialize (IBusEmojiData *emoji,
                                      &emoji->priv->description);
     ibus_g_variant_get_child_string (variant, retval++,
                                      &emoji->priv->category);
+    if (g_variant_n_children (variant) < retval + 1)
+        return retval;
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &emoji->priv->emoji_alternates);
     return retval;
 }
 
@@ -295,6 +325,7 @@ ibus_emoji_data_copy (IBusEmojiData       *dest,
                                                       NULL);
     dest->priv->description      = g_strdup (src->priv->description);
     dest->priv->category         = g_strdup (src->priv->category);
+    dest->priv->emoji_alternates = g_strdup (src->priv->emoji_alternates);
     return TRUE;
 }
 
@@ -314,6 +345,7 @@ ibus_emoji_data_new (const gchar *first_property_name, ...)
     g_assert (emoji->priv->emoji != NULL);
     g_assert (emoji->priv->description != NULL);
     g_assert (emoji->priv->category != NULL);
+    g_assert (emoji->priv->emoji_alternates != NULL);
     return emoji;
 }
 
@@ -370,6 +402,14 @@ ibus_emoji_data_get_category (IBusEmojiData *emoji)
     return emoji->priv->category;
 }
 
+const gchar *
+ibus_emoji_data_get_emoji_alternates (IBusEmojiData *emoji)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
+
+    return emoji->priv->emoji_alternates;
+}
+
 
 static void
 variant_foreach_add_emoji (IBusEmojiData   *emoji,
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
index eb24fdda6..233cadd66 100644
--- a/src/ibusemoji.h
+++ b/src/ibusemoji.h
@@ -155,6 +155,20 @@ void            ibus_emoji_data_set_description (IBusEmojiData *emoji,
 const gchar *   ibus_emoji_data_get_category    (IBusEmojiData *emoji);
 
 
+/**
+ * ibus_emoji_data_get_emoji_alternates:
+ * @emoji : An #IBusEmojiData
+ *
+ * Gets the emoji alternate characters in #IBusEmojiData. It should not be
+ * freed. The alternates are defined in "unicode_alt" in EmojiOne json.
+ *
+ * Returns: emoji alternates property in #IBusEmojiData
+ *
+ */
+const gchar *   ibus_emoji_data_get_emoji_alternates
+                                                (IBusEmojiData *emoji);
+
+
 /**
  * ibus_emoji_dict_save:
  * @path: A path of the saved dictionary file.
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8a2726c79..7b6107f1f 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -381,7 +381,8 @@ class IBusEmojier : Gtk.Window {
 
 
     private void update_annotation_to_emojis_dict(IBus.EmojiData data) {
-        string emoji = data.get_emoji();
+        string emoji = (data.get_emoji_alternates() != "") ?
+                data.get_emoji_alternates() : data.get_emoji();
         unowned GLib.SList<string> annotations = data.get_annotations();
         foreach (string annotation in annotations) {
             bool has_emoji = false;
@@ -444,7 +445,8 @@ class IBusEmojier : Gtk.Window {
 
     private void update_emoji_to_data_dict(IBus.EmojiData data,
                                            string         lang) {
-        string emoji = data.get_emoji();
+        string emoji = (data.get_emoji_alternates() != "") ?
+                data.get_emoji_alternates() : data.get_emoji();
         if (lang == "en") {
             string description = utf8_down(data.get_description());
             unowned GLib.SList<string> annotations = data.get_annotations();
@@ -496,7 +498,8 @@ class IBusEmojier : Gtk.Window {
 
     private void update_category_to_emojis_dict(IBus.EmojiData data,
                                                 string         lang) {
-        string emoji = data.get_emoji();
+        string emoji = (data.get_emoji_alternates() != "") ?
+                data.get_emoji_alternates() : data.get_emoji();
         string category = data.get_category();
         if (lang == "en" && category != "") {
             bool has_emoji = false;

From 648f58a361ea1407f229ed1682486240cc2e5026 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Mon, 10 Apr 2017 14:54:08 +0900
Subject: [PATCH 396/816] Make ibus emojier dialog as an unique application

Because wayland doesn't support clipboard persistence, just hide the dialog; will show the emojier dialog again, when run it again.

In next patches, ibus emoji command will just spawn the process of ibus-ui-emojier.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/320450043

Patch from Peng Wu <alexepico@gmail.com>.
---
 po/POTFILES.in      |  1 +
 po/POTFILES.skip    |  1 +
 ui/gtk3/Makefile.am | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 469f90bcf..65a3526a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -65,3 +65,4 @@ ui/gtk3/property.vala
 ui/gtk3/propertypanel.vala
 ui/gtk3/separator.vala
 ui/gtk3/switcher.vala
+ui/gtk3/emojierapp.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a818c485d..891d2ccb5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -21,3 +21,4 @@ ui/gtk3/property.c
 ui/gtk3/propertypanel.c
 ui/gtk3/separator.c
 ui/gtk3/switcher.c
+ui/gtk3/emojierapp.c
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 7122ff348..96ed3e604 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -108,6 +108,10 @@ endif
 
 libexec_PROGRAMS = ibus-ui-gtk3
 
+if ENABLE_EMOJI_DICT
+libexec_PROGRAMS += ibus-ui-emojier
+endif
+
 ibus_ui_gtk3_SOURCES = \
 	application.vala \
 	candidatearea.vala \
@@ -132,6 +136,26 @@ ibus_ui_gtk3_LDADD = \
 	$(AM_LDADD) \
 	$(NULL)
 
+if ENABLE_EMOJI_DICT
+AM_VALAFLAGS += \
+        --define=EMOJI_DICT \
+        --vapidir=$(top_builddir)/ui/gtk3 \
+        --vapidir=$(top_srcdir)/ui/gtk3 \
+        --pkg=ibus-emoji-dialog-1.0 \
+        --pkg=gtk+-3.0 \
+        $(NULL)
+
+
+ibus_ui_emojier_SOURCES = \
+	emojierapp.vala \
+	$(NULL)
+
+ibus_ui_emojier_LDADD = \
+	$(AM_LDADD) \
+	$(libibus_emoji_dialog) \
+	$(NULL)
+endif
+
 gen-%.xml.c: %.xml
 	echo "Building $@ from $<"
 	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@

From 2f8982a0a4b25f98c969c09b81724e44efc41c27 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Mon, 10 Apr 2017 15:57:48 +0900
Subject: [PATCH 397/816] Make ibus emojier dialog as an unique application

Forgot to commit ui/gtk3/emojierapp.vala from the previous commit.

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/319650043

Patch from Peng Wu <alexepico@gmail.com>.
---
 ui/gtk3/emojierapp.vala | 149 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 ui/gtk3/emojierapp.vala

diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
new file mode 100644
index 000000000..4287bff5e
--- /dev/null
+++ b/ui/gtk3/emojierapp.vala
@@ -0,0 +1,149 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright (c) 2017 Peng Wu <alexepico@gmail.com>
+ *
+ * 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
+ */
+
+string emoji_font = null;
+string annotation_lang = null;
+
+public class EmojiApplication : Application {
+    private IBus.Emojier emojier = new IBus.Emojier();
+
+    private EmojiApplication() {
+        Object(application_id: "org.freedesktop.ibus.panel.emojier",
+                flags: ApplicationFlags.HANDLES_COMMAND_LINE);
+        set_inactivity_timeout(100000);
+    }
+
+    private void show_dialog(ApplicationCommandLine command_line) {
+        Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+        var display = Gdk.Display.get_default();
+        var device_manager = display.get_device_manager();
+        var device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+        event.set_device(device);
+        string emoji = emojier.run(event, "");
+        if (emoji == null) {
+            emojier.reset();
+            command_line.print("%s\n", _("Canceled to choose an emoji."));
+            return;
+        }
+        Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
+        clipboard.set_text(emoji, -1);
+        clipboard.store();
+        emojier.reset();
+        command_line.print("%s\n", _("Copied an emoji to your clipboard."));
+    }
+
+    public void activate_dialog(ApplicationCommandLine command_line) {
+        this.hold ();
+
+        // show dialog
+        if (emojier.has_loaded_emoji_dict()) {
+            show_dialog(command_line);
+        } else {
+            emojier.loaded_emoji_dict.connect(() => {
+                    // The signal is called when the language is changed.
+                    if (emojier.is_running())
+                    return;
+
+                    show_dialog(command_line);
+                    });
+        }
+
+        this.release ();
+    }
+
+    private int _command_line (ApplicationCommandLine command_line) {
+        const OptionEntry[] options = {
+            { "font", 0, 0, OptionArg.STRING, out emoji_font,
+                N_("FONT for emoji chracters on emoji dialog."),
+                "FONT" },
+            { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
+                N_("LANG for annotations on emoji dialog. E.g. \"en\""),
+                "LANG" },
+            { null }
+        };
+
+        var option = new OptionContext();
+        option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+
+        // We have to make an extra copy of the array,
+        // since .parse assumes that it can remove strings
+        // from the array without freeing them.
+        string[] args = command_line.get_arguments();
+        string*[] _args = new string[args.length];
+        for (int i = 0; i < args.length; i++) {
+            _args[i] = args[i];
+        }
+
+        try {
+            unowned string[] tmp = _args;
+            option.parse(ref tmp);
+        } catch (OptionError e) {
+            stderr.printf("%s\n", e.message);
+            return Posix.EXIT_FAILURE;
+        }
+
+        if (emoji_font == null) {
+            GLib.Settings settings_emoji =
+                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+            emoji_font = settings_emoji.get_string("font");
+        }
+
+        if (annotation_lang == null) {
+            GLib.Settings settings_emoji =
+                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+            annotation_lang = settings_emoji.get_string("lang");
+        }
+
+        if (emoji_font != null && emoji_font != "")
+            emojier.set_emoji_font(emoji_font);
+        if (annotation_lang != null && annotation_lang != "")
+            emojier.set_annotation_lang(annotation_lang);
+
+        activate_dialog(command_line);
+
+        return Posix.EXIT_SUCCESS;
+    }
+
+    public override int command_line (ApplicationCommandLine command_line) {
+        // keep the application running until we are done with this commandline
+        this.hold();
+        int result = _command_line(command_line);
+        this.release();
+        return result;
+    }
+
+    public static int main (string[] args) {
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
+                Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
+        GLib.Intl.textdomain(Config.GETTEXT_PACKAGE);
+
+        IBus.init();
+
+        Gtk.init(ref args);
+
+        EmojiApplication app = new EmojiApplication();
+        int status = app.run(args);
+        return status;
+    }
+
+}

From da33672bc738889dcd4ebbec51cb3aa67567f70c Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Thu, 13 Apr 2017 12:40:22 +0900
Subject: [PATCH 398/816] tools: spawn the process of ibus-ui-emojier

BUG=
R=Shawn.P.Huang@gmail.com, takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/324770043

Patch from Peng Wu <alexepico@gmail.com>.
---
 bindings/vala/config.vapi |  1 +
 tools/Makefile.am         |  1 +
 tools/main.vala           | 72 +++++++--------------------------------
 3 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/bindings/vala/config.vapi b/bindings/vala/config.vapi
index f2195dabb..e3c43dfb9 100644
--- a/bindings/vala/config.vapi
+++ b/bindings/vala/config.vapi
@@ -7,6 +7,7 @@ namespace Config
     public const string BINDIR;
     public const string DATADIR;
     public const string PKGDATADIR;
+    public const string LIBEXECDIR;
     public const string GETTEXT_PACKAGE;
     public const string GLIB_LOCALE_DIR;
 }
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bd655af81..9d542bda8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -39,6 +39,7 @@ AM_CFLAGS = \
 	@GIO2_CFLAGS@ \
 	@GTHREAD2_CFLAGS@ \
 	-DG_LOG_DOMAIN=\"IBUS\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DIBUS_DISABLE_DEPRECATED \
 	-Wno-unused-variable \
 	-Wno-unused-but-set-variable \
diff --git a/tools/main.vala b/tools/main.vala
index 2bf1dc7f8..9aca4b00c 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -324,73 +324,27 @@ int reset_config(string[] argv) {
 }
 
 #if EMOJI_DICT
-private void run_dialog(IBus.Emojier emojier) {
-    Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
-    var display = Gdk.Display.get_default();
-    var device_manager = display.get_device_manager();
-    var device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
-    event.set_device(device);
-    string emoji = emojier.run(event, "");
-    if (emoji == null) {
-        emojier.reset();
-        print("%s\n", _("Canceled to choose an emoji."));
-        return;
-    }
-    Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
-    clipboard.set_text(emoji, -1);
-    clipboard.store();
-    emojier.reset();
-    print("%s\n", _("Copied an emoji to your clipboard."));
-}
-
 int emoji_dialog(string[] argv) {
-    const OptionEntry[] options = {
-        { "font", 0, 0, OptionArg.STRING, out emoji_font,
-          N_("FONT for emoji chracters on emoji dialog."), "FONT" },
-        { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
-          N_("LANG for annotations on emoji dialog. E.g. \"en\""), "LANG" },
-        { null }
-    };
+    string cmd = Config.LIBEXECDIR + "/ibus-ui-emojier";
 
-    var option = new OptionContext();
-    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+    var file = File.new_for_path(cmd);
+    if (!file.query_exists())
+        cmd = "../ui/gtk3/ibus-ui-emojier";
+
+    argv[0] = cmd;
+
+    string[] env = Environ.get();
 
     try {
-        option.parse(ref argv);
-    } catch (OptionError e) {
+        // Non-blocking
+        Process.spawn_async(null, argv, env,
+                            SpawnFlags.SEARCH_PATH,
+                            null, null);
+    } catch (SpawnError e) {
         stderr.printf("%s\n", e.message);
         return Posix.EXIT_FAILURE;
     }
 
-    Gtk.init(ref argv);
-    if (emoji_font == null) {
-        GLib.Settings settings_emoji =
-                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
-        emoji_font = settings_emoji.get_string("font");
-    }
-    if (annotation_lang == null) {
-        GLib.Settings settings_emoji =
-                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
-        annotation_lang = settings_emoji.get_string("lang");
-    }
-    IBus.Emojier emojier = new IBus.Emojier();
-    if (emoji_font != null && emoji_font != "")
-        emojier.set_emoji_font(emoji_font);
-    if (annotation_lang != null && annotation_lang != "")
-        emojier.set_annotation_lang(annotation_lang);
-    if (emojier.has_loaded_emoji_dict()) {
-        run_dialog(emojier);
-    } else {
-        GLib.MainLoop loop = new GLib.MainLoop();
-        emojier.loaded_emoji_dict.connect(() => {
-            // The signal is called when the language is changed.
-            if (emojier.is_running())
-                return;
-            run_dialog(emojier);
-            loop.quit();
-        });
-        loop.run();
-    }
     return Posix.EXIT_SUCCESS;
 }
 #endif

From 290f786b82158e7c087b81946727606cd3424e94 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Apr 2017 16:00:26 +0900
Subject: [PATCH 399/816] ui/gtk3: Fix build failures

ibus-ui-emoijer needs to be built at last in ui/gtk3
Also fixed po/POTFILES.in for `make dist`
Now I moved libibusemojidialog.so and IBusEmojiDialog-1.0.[gir|typelib]
and ibus-emoji-dialog-1.0.vapi to noinst because now
ibus-ui-emojier is available and they are private libraries.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/312610043
---
 po/POTFILES.in          |  1 +
 tools/Makefile.am       | 19 ++---------
 ui/gtk3/Makefile.am     | 72 ++++++++++++++++++-----------------------
 ui/gtk3/emojierapp.vala | 33 +++++++++++--------
 4 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65a3526a1..25be4f459 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -31,6 +31,7 @@ ibus/object.py
 ibus/panel.py
 ibus/property.py
 ibus/utility.py
+setup/emojilang.py
 setup/engineabout.py
 setup/enginecombobox.py
 setup/enginedialog.py
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9d542bda8..5c18d3d68 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -101,24 +101,9 @@ CLEANFILES = \
 
 if ENABLE_EMOJI_DICT
 if ENABLE_UI
-AM_CPPFLAGS += \
-	-I$(top_srcdir)/ui/gtk3 \
-	-I$(top_builddir)/ui/gtk3 \
-	$(NULL)
-AM_CFLAGS += \
-	@GTK3_CFLAGS@ \
-	$(NULL)
-AM_LDADD += \
-	@GTK3_LIBS@ \
-	$(libibus_emoji_dialog) \
-	$(NULL)
 AM_VALAFLAGS += \
-	--define=EMOJI_DICT \
-	--vapidir=$(top_builddir)/ui/gtk3 \
-	--vapidir=$(top_srcdir)/ui/gtk3 \
-	--pkg=ibus-emoji-dialog-1.0 \
-	--pkg=gtk+-3.0 \
-	$(NULL)
+    --define=EMOJI_DICT \
+    $(NULL)
 endif
 endif
 
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 96ed3e604..6f0fb62f7 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -81,7 +81,9 @@ AM_VALAFLAGS = \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
+MAINTAINERCLEANFILES =
 CONFIG_CLEAN_FILES =
+noinst_DATA =
 
 if ENABLE_LIBNOTIFY
 AM_CFLAGS += \
@@ -108,10 +110,6 @@ endif
 
 libexec_PROGRAMS = ibus-ui-gtk3
 
-if ENABLE_EMOJI_DICT
-libexec_PROGRAMS += ibus-ui-emojier
-endif
-
 ibus_ui_gtk3_SOURCES = \
 	application.vala \
 	candidatearea.vala \
@@ -136,26 +134,6 @@ ibus_ui_gtk3_LDADD = \
 	$(AM_LDADD) \
 	$(NULL)
 
-if ENABLE_EMOJI_DICT
-AM_VALAFLAGS += \
-        --define=EMOJI_DICT \
-        --vapidir=$(top_builddir)/ui/gtk3 \
-        --vapidir=$(top_srcdir)/ui/gtk3 \
-        --pkg=ibus-emoji-dialog-1.0 \
-        --pkg=gtk+-3.0 \
-        $(NULL)
-
-
-ibus_ui_emojier_SOURCES = \
-	emojierapp.vala \
-	$(NULL)
-
-ibus_ui_emojier_LDADD = \
-	$(AM_LDADD) \
-	$(libibus_emoji_dialog) \
-	$(NULL)
-endif
-
 gen-%.xml.c: %.xml
 	echo "Building $@ from $<"
 	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
@@ -185,11 +163,17 @@ EXTRA_DIST =                            \
     $(NULL)
 
 if ENABLE_EMOJI_DICT
-AM_VALAFLAGS += --define=EMOJI_DICT
+AM_VALAFLAGS += \
+    --define=EMOJI_DICT \
+    --vapidir=$(top_builddir)/ui/gtk3 \
+    --vapidir=$(top_srcdir)/ui/gtk3 \
+    --pkg=ibus-emoji-dialog-1.0 \
+    --pkg=gtk+-3.0 \
+    $(NULL)
 
 libibus_emoji_dialog = libibus-emoji-dialog-1.0.la
 
-lib_LTLIBRARIES = $(libibus_emoji_dialog)
+noinst_LTLIBRARIES = $(libibus_emoji_dialog)
 
 libibus_emoji_dialog_1_0_la_CFLAGS = $(AM_CFLAGS)
 libibus_emoji_dialog_1_0_la_LDFLAGS =   \
@@ -198,11 +182,22 @@ libibus_emoji_dialog_1_0_la_LDFLAGS =   \
     -version-info @LT_VERSION_INFO@     \
     $(NULL)
 libibus_emoji_dialog_1_0_la_SOURCES =   \
-    candidatearea.c                     \
-    emojier.c                           \
-    iconwidget.c                        \
-    pango.c                             \
-    separator.c                         \
+    candidatearea.vala                  \
+    emojier.vala                        \
+    iconwidget.vala                     \
+    pango.vala                          \
+    separator.vala                      \
+    $(NULL)
+
+libexec_PROGRAMS += ibus-ui-emojier
+
+ibus_ui_emojier_SOURCES =                       \
+    $(libibus_emoji_dialog_1_0_la_SOURCES)      \
+    emojierapp.vala                             \
+    $(NULL)
+
+ibus_ui_emojier_LDADD =                         \
+    $(AM_LDADD)                                 \
     $(NULL)
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -214,10 +209,6 @@ INTROSPECTION_COMPILER_ARGS =      \
     $(NULL)
 
 if HAVE_INTROSPECTION
-ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
-ibusinclude_HEADERS =                  \
-    $(emoji_headers)                   \
-    $(NULL)
 introspection_sources =                \
     $(emoji_headers)                   \
     $(NULL)
@@ -242,12 +233,13 @@ IBusEmojiDialog_1_0_gir_CFLAGS =       \
 INTROSPECTION_GIRS = IBusEmojiDialog-1.0.gir
 
 girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+noinst_DATA += $(INTROSPECTION_GIRS)
+CLEANFILES += $(INTROSPECTION_GIRS)
 
 typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+noinst_DATA += $(INTROSPECTION_GIRS:.gir=.typelib)
+CLEANFILES += $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
 
 if ENABLE_VAPIGEN
 -include $(VAPIGEN_MAKEFILE)
@@ -261,9 +253,9 @@ ibus_emoji_dialog_1_0_vapi_METADATADIRS = $(srcdir)
 ibus_emoji_dialog_1_0_vapi_FILES = $(INTROSPECTION_GIRS)
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+noinst_DATA += $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
+MAINTAINERCLEANFILES += $(VAPIGEN_VAPIS)
 # for make distclean
 CONFIG_CLEAN_FILES += $(VAPIGEN_VAPIS)
 EXTRA_DIST += $(VAPIGEN_VAPIS)
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 4287bff5e..6349940d0 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -24,52 +24,55 @@ string emoji_font = null;
 string annotation_lang = null;
 
 public class EmojiApplication : Application {
-    private IBus.Emojier emojier = new IBus.Emojier();
+    private IBusEmojier m_emojier = new IBusEmojier();
 
     private EmojiApplication() {
         Object(application_id: "org.freedesktop.ibus.panel.emojier",
-                flags: ApplicationFlags.HANDLES_COMMAND_LINE);
+               flags: ApplicationFlags.HANDLES_COMMAND_LINE);
         set_inactivity_timeout(100000);
     }
 
+
     private void show_dialog(ApplicationCommandLine command_line) {
         Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
         var display = Gdk.Display.get_default();
         var device_manager = display.get_device_manager();
         var device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
         event.set_device(device);
-        string emoji = emojier.run(event, "");
+        string emoji = m_emojier.run(event, "");
         if (emoji == null) {
-            emojier.reset();
+            m_emojier.reset();
             command_line.print("%s\n", _("Canceled to choose an emoji."));
             return;
         }
         Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
         clipboard.set_text(emoji, -1);
         clipboard.store();
-        emojier.reset();
+        m_emojier.reset();
         command_line.print("%s\n", _("Copied an emoji to your clipboard."));
     }
 
+
     public void activate_dialog(ApplicationCommandLine command_line) {
         this.hold ();
 
         // show dialog
-        if (emojier.has_loaded_emoji_dict()) {
+        if (m_emojier.has_loaded_emoji_dict()) {
             show_dialog(command_line);
         } else {
-            emojier.loaded_emoji_dict.connect(() => {
-                    // The signal is called when the language is changed.
-                    if (emojier.is_running())
+            m_emojier.loaded_emoji_dict.connect(() => {
+                // The signal is called when the language is changed.
+                if (m_emojier.is_running())
                     return;
 
-                    show_dialog(command_line);
-                    });
+                show_dialog(command_line);
+            });
         }
 
         this.release ();
     }
 
+
     private int _command_line (ApplicationCommandLine command_line) {
         const OptionEntry[] options = {
             { "font", 0, 0, OptionArg.STRING, out emoji_font,
@@ -114,15 +117,16 @@ public class EmojiApplication : Application {
         }
 
         if (emoji_font != null && emoji_font != "")
-            emojier.set_emoji_font(emoji_font);
+            m_emojier.set_emoji_font(emoji_font);
         if (annotation_lang != null && annotation_lang != "")
-            emojier.set_annotation_lang(annotation_lang);
+            m_emojier.set_annotation_lang(annotation_lang);
 
         activate_dialog(command_line);
 
         return Posix.EXIT_SUCCESS;
     }
 
+
     public override int command_line (ApplicationCommandLine command_line) {
         // keep the application running until we are done with this commandline
         this.hold();
@@ -131,9 +135,10 @@ public class EmojiApplication : Application {
         return result;
     }
 
+
     public static int main (string[] args) {
         GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
-                Config.GLIB_LOCALE_DIR);
+                                 Config.GLIB_LOCALE_DIR);
         GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         GLib.Intl.textdomain(Config.GETTEXT_PACKAGE);
 

From 4b8d7baf627fb3fc9e4dde74ba33a867091f95b7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Apr 2017 11:44:52 +0900
Subject: [PATCH 400/816] ui/gtk3: Mark LANG and FONT as translatable strings

BUG=https://github.com/ibus/ibus/issues/1920

Review URL: https://codereview.appspot.com/322880043
---
 ui/gtk3/emojierapp.vala | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 6349940d0..eac8d6aac 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -76,11 +76,17 @@ public class EmojiApplication : Application {
     private int _command_line (ApplicationCommandLine command_line) {
         const OptionEntry[] options = {
             { "font", 0, 0, OptionArg.STRING, out emoji_font,
-                N_("FONT for emoji chracters on emoji dialog."),
-                "FONT" },
+                /* TRANSLATORS: "FONT" should be capital and translatable.
+                 * It's used for an argument command --font=FONT
+                 */
+                N_("\"FONT\" for emoji chracters on emoji dialog"),
+                N_("FONT") },
             { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
-                N_("LANG for annotations on emoji dialog. E.g. \"en\""),
-                "LANG" },
+                /* TRANSLATORS: "LANG" should be capital and translatable.
+                 * It's used for an argument command --lang=LANG
+                 */
+                N_("\"LANG\" for annotations on emoji dialog. E.g. \"en\""),
+                N_("LANG") },
             { null }
         };
 

From c6cdf21c7364cbb1e848e44cab0bff270e432e82 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 19 Apr 2017 12:16:37 +0900
Subject: [PATCH 401/816] ui/gtk3: Change modal dialog to focused dialog

There are several problems with the current emoji modal dialog.
If keyboard is grabbed on the popup window, the focus out/in events
cannot be detected so the dialog cannot be closed by the focus changes.

If mouse operation is supported on the popup window, need a custom
GtkHeaderBar with extended handle.vala but the behavior is unclear. [1]

Also current popup window has several extensions for the keyboard grab.

If the closed button is needed on the popup window since the focus events
cannot be detected, I think there is no merit to use the popup window.
Now IBusEmojier simply uses the focused window.

[1] https://mail.gnome.org/archives/gtk-app-devel-list/2017-April/msg00017.html

R=Shawn.P.Huang@gmail.com, alexepico@gmail.com

Review URL: https://codereview.appspot.com/316510043
---
 ui/gtk3/emojier.vala      | 243 +++++++++++++++-----------------------
 ui/gtk3/emojierapp.vala   |  55 +++------
 ui/gtk3/ibusemojidialog.h |  54 ++++-----
 ui/gtk3/panel.vala        |  73 ++++++++----
 4 files changed, 194 insertions(+), 231 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 7b6107f1f..5a9bf8fca 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -137,47 +137,27 @@ class IBusEmojier : Gtk.Window {
             pack_start(label, true, true, 0);
         }
     }
-    private class ETitleLabelBox : Gtk.Box {
-        EPaddedLabel m_lang_label;
-        private Gtk.Button m_close_button;
-        private ulong m_close_handler;
+    private class ETitleLabelBox : Gtk.HeaderBar {
+        private Gtk.Label m_lang_label;
 
-        public ETitleLabelBox(string    text,
-                              Gtk.Align align) {
+        public ETitleLabelBox(string title) {
             GLib.Object(
                 name : "IBusEmojierTitleLabelBox",
-                orientation : Gtk.Orientation.HORIZONTAL,
-                spacing : 0
+                show_close_button: true,
+                decoration_layout: ":close",
+                title: title
             );
-            EPaddedLabel label = new EPaddedLabel(text, align);
-            pack_start(label, true, true, 0);
-            Gtk.Separator separator =
-                    new Gtk.Separator (Gtk.Orientation.VERTICAL);
-            pack_start(separator, false, true, 0);
-            m_lang_label = new EPaddedLabel("", align);
-            pack_start(m_lang_label, false, true, 0);
-            IconWidget icon = new IconWidget("window-close", Gtk.IconSize.MENU);
-            m_close_button = new Gtk.Button();
-            m_close_button.add(icon);
-            pack_end(m_close_button, false, true, 0);
-        }
-        public void set_loop(GLib.MainLoop? loop) {
-            if (m_close_handler > 0)
-                GLib.SignalHandler.disconnect(m_close_button, m_close_handler);
-            m_close_handler = m_close_button.button_press_event.connect((e) => {
-                if (loop != null && loop.is_running())
-                    loop.quit();
-                return true;
-            });
-        }
-        public void unset_loop() {
-            if (m_close_handler > 0) {
-                GLib.SignalHandler.disconnect(m_close_button, m_close_handler);
-                m_close_handler = 0;
-            }
+            var vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            set_custom_title(vbox);
+            var label = new Gtk.Label(title);
+            label.get_style_context().add_class("title");
+            vbox.pack_start(label, true, false, 0);
+            m_lang_label = new Gtk.Label(null);
+            m_lang_label.get_style_context().add_class("subtitle");
+            vbox.pack_start(m_lang_label, true, false, 0);
         }
         public void set_lang_label(string str) {
-            m_lang_label.set_label(str);
+            m_lang_label.set_text(str);
         }
     }
 
@@ -186,7 +166,22 @@ class IBusEmojier : Gtk.Window {
         BACKWARD,
     }
 
-    private const uint EMOJI_GRID_PAGE = 10;
+    private static const uint EMOJI_GRID_PAGE = 10;
+
+    // Set the actual default values in the constructor
+    // because these fields are used for class_init() and static functions,
+    // e.g. set_emoji_font(), can be called before class_init() is called.
+    private static string m_current_lang_id;
+    private static string m_emoji_font;
+    private static string[] m_favorites;
+    private static int m_emoji_max_seq_len;
+    private static GLib.HashTable<string, GLib.SList>?
+            m_annotation_to_emojis_dict;
+    private static GLib.HashTable<string, IBus.EmojiData>?
+            m_emoji_to_data_dict;
+    private static GLib.HashTable<string, GLib.SList>?
+            m_category_to_emojis_dict;
+
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
     private ETitleLabelBox m_title;
@@ -198,43 +193,38 @@ class IBusEmojier : Gtk.Window {
     private string m_input_context_path = "";
     private GLib.MainLoop? m_loop;
     private string? m_result;
-    private string m_current_lang_id = "en";
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
-    private GLib.HashTable<string, GLib.SList>?
-            m_annotation_to_emojis_dict = null;
-    private GLib.HashTable<string, IBus.EmojiData>?
-            m_emoji_to_data_dict = null;
-    private GLib.HashTable<string, GLib.SList>?
-            m_category_to_emojis_dict = null;
     int m_category_active_index;
-    private int m_emoji_max_seq_len = 0;
     private IBus.LookupTable m_lookup_table;
     private Gtk.Label[] m_candidates;
-    private string m_emoji_font = "Monospace 16";
-    private string[] m_favorites = {};
     private bool m_enter_notify_enable = true;
     private uint m_entry_notify_show_id;
     private uint m_entry_notify_disable_id;
-    private uint m_reload_emoji_dict_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
-    public signal void loaded_emoji_dict();
 
     public IBusEmojier() {
         GLib.Object(
-            type : Gtk.WindowType.POPUP,
+            type : Gtk.WindowType.TOPLEVEL,
             events : Gdk.EventMask.KEY_PRESS_MASK |
                      Gdk.EventMask.KEY_RELEASE_MASK |
-                     Gdk.EventMask.BUTTON_PRESS_MASK,
+                     Gdk.EventMask.BUTTON_PRESS_MASK |
+                     Gdk.EventMask.BUTTON_RELEASE_MASK,
             window_position : Gtk.WindowPosition.CENTER,
+            icon_name: "ibus-setup",
             accept_focus : true,
-            decorated : false,
-            modal : true,
             resizable : true,
             focus_visible : true
         );
 
+        if (m_current_lang_id == null)
+            m_current_lang_id = "en";
+        if (m_emoji_font == null)
+            m_emoji_font = "Monospace 16";
+        if (m_favorites == null)
+            m_favorites = {};
+
         Gdk.Display display = Gdk.Display.get_default();
         Gdk.Screen screen = (display != null) ?
                 display.get_default_screen() : null;
@@ -283,12 +273,11 @@ class IBusEmojier : Gtk.Window {
                 css_provider,
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
+        m_title = new ETitleLabelBox(_("Emoji Chooser"));
+        set_titlebar(m_title);
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
 
-        m_title = new ETitleLabelBox(_("Emoji Dialog"),
-                                     Gtk.Align.CENTER);
-        m_vbox.add(m_title);
         m_entry = new EEntry();
         m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
         m_vbox.add(m_entry);
@@ -306,8 +295,6 @@ class IBusEmojier : Gtk.Window {
         Atk.Object obj = m_entry.get_accessible();
         obj.set_role (Atk.Role.STATUSBAR);
 
-        grab_focus();
-
         // The constructor of IBus.LookupTable does not support more than
         // 16 pages.
         m_lookup_table = new IBus.LookupTable(1, 0, true, true);
@@ -325,15 +312,13 @@ class IBusEmojier : Gtk.Window {
             hide_candidate_panel();
         });
 
-        m_reload_emoji_dict_id = GLib.Idle.add(() => {
+        if (m_annotation_to_emojis_dict == null) {
             reload_emoji_dict();
-            m_reload_emoji_dict_id = 0;
-            return false;
-        });
+        }
     }
 
 
-    private void reload_emoji_dict() {
+    private static void reload_emoji_dict() {
         init_emoji_dict();
         make_emoji_dict("en");
         if (m_current_lang_id != "en") {
@@ -344,11 +329,10 @@ class IBusEmojier : Gtk.Window {
             }
             make_emoji_dict(m_current_lang_id);
         }
-        loaded_emoji_dict();
     }
 
 
-    private void init_emoji_dict() {
+    private static void init_emoji_dict() {
         m_annotation_to_emojis_dict =
                 new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
                                                        GLib.str_equal);
@@ -361,7 +345,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private void make_emoji_dict(string lang) {
+    private static void make_emoji_dict(string lang) {
         GLib.SList<IBus.EmojiData> emoji_list = IBus.EmojiData.load(
                     Config.PKGDATADIR + "/dicts/emoji-" + lang + ".dict");
         if (emoji_list == null)
@@ -380,7 +364,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private void update_annotation_to_emojis_dict(IBus.EmojiData data) {
+    private static void update_annotation_to_emojis_dict(IBus.EmojiData data) {
         string emoji = (data.get_emoji_alternates() != "") ?
                 data.get_emoji_alternates() : data.get_emoji();
         unowned GLib.SList<string> annotations = data.get_annotations();
@@ -402,7 +386,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private string utf8_down(string str) {
+    private static string utf8_down(string str) {
         GLib.StringBuilder buff = new GLib.StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
@@ -413,7 +397,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private string utf8_title(string str) {
+    private static string utf8_title(string str) {
         StringBuilder buff = new StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
@@ -428,7 +412,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private string utf8_code_point(string str) {
+    private static string utf8_code_point(string str) {
         StringBuilder buff = new StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
@@ -443,8 +427,8 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private void update_emoji_to_data_dict(IBus.EmojiData data,
-                                           string         lang) {
+    private static void update_emoji_to_data_dict(IBus.EmojiData data,
+                                                  string         lang) {
         string emoji = (data.get_emoji_alternates() != "") ?
                 data.get_emoji_alternates() : data.get_emoji();
         if (lang == "en") {
@@ -496,8 +480,8 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private void update_category_to_emojis_dict(IBus.EmojiData data,
-                                                string         lang) {
+    private static void update_category_to_emojis_dict(IBus.EmojiData data,
+                                                       string         lang) {
         string emoji = (data.get_emoji_alternates() != "") ?
                 data.get_emoji_alternates() : data.get_emoji();
         string category = data.get_category();
@@ -937,7 +921,8 @@ class IBusEmojier : Gtk.Window {
                                              uint modifiers) {
         assert (keyval == Gdk.Key.Left || keyval == Gdk.Key.Right);
 
-        if (m_candidate_panel_is_visible) {
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        if (m_candidate_panel_is_visible && ncandidates > 1) {
             enter_notify_disable_with_timer();
             if (keyval == Gdk.Key.Left)
                 m_lookup_table.cursor_up();
@@ -971,7 +956,8 @@ class IBusEmojier : Gtk.Window {
     private bool key_press_cursor_vertical(uint keyval) {
         assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up);
 
-        if (m_candidate_panel_is_visible) {
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        if (m_candidate_panel_is_visible && ncandidates > 1) {
             if (keyval == Gdk.Key.Down)
                 candidate_panel_cursor_down();
             else if (keyval == Gdk.Key.Up)
@@ -987,12 +973,12 @@ class IBusEmojier : Gtk.Window {
                                            uint modifiers) {
         assert (keyval == Gdk.Key.Home || keyval == Gdk.Key.End);
 
-        if (m_candidate_panel_is_visible) {
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        if (m_candidate_panel_is_visible && ncandidates > 1) {
             enter_notify_disable_with_timer();
             if (keyval == Gdk.Key.Home) {
                 m_lookup_table.set_cursor_pos(0);
             } else if (keyval == Gdk.Key.End) {
-                uint ncandidates = m_lookup_table.get_number_of_candidates();
                 m_lookup_table.set_cursor_pos(ncandidates - 1);
             }
             show_candidate_panel();
@@ -1052,8 +1038,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    public string run(Gdk.Event event,
-                      string    input_context_path) {
+    public string run(string input_context_path) {
         assert (m_loop == null);
 
         m_is_running = true;
@@ -1066,65 +1051,22 @@ class IBusEmojier : Gtk.Window {
         resize(1, 1);
 
         m_entry.set_text("");
-        m_entry.grab_focus();
-
-        Gdk.Device device = event.get_device();
-        if (device == null) {
-            var display = get_display();
-            var device_manager = display.get_device_manager();
-            device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
-        }
-
-        Gdk.Device keyboard;
-        Gdk.Device pointer;
-        if (device.get_source() == Gdk.InputSource.KEYBOARD) {
-            keyboard = device;
-            pointer = device.get_associated_device();
-        } else {
-            pointer = device;
-            keyboard = device.get_associated_device();
-        }
+        //m_entry.grab_focus();
 
         show_category_list();
         m_entry.set_activates_default(true);
         show_all();
 
-        Gdk.GrabStatus status;
-        // Grab all keyboard events
-        status = keyboard.grab(get_window(),
-                               Gdk.GrabOwnership.NONE,
-                               true,
-                               Gdk.EventMask.KEY_PRESS_MASK |
-                               Gdk.EventMask.KEY_RELEASE_MASK,
-                               null,
-                               Gdk.CURRENT_TIME);
-        if (status != Gdk.GrabStatus.SUCCESS)
-            warning("Grab keyboard failed! status = %d", status);
-        // Grab all pointer events
-        status = pointer.grab(get_window(),
-                              Gdk.GrabOwnership.NONE,
-                              true,
-                              Gdk.EventMask.BUTTON_PRESS_MASK |
-                              Gdk.EventMask.BUTTON_RELEASE_MASK,
-                              null,
-                              Gdk.CURRENT_TIME);
-        if (status != Gdk.GrabStatus.SUCCESS)
-            warning("Grab pointer failed! status = %d", status);
-
         m_loop = new GLib.MainLoop();
-        m_title.set_loop(m_loop);
         m_loop.run();
-        m_title.unset_loop();
         m_loop = null;
 
-        keyboard.ungrab(Gdk.CURRENT_TIME);
-        pointer.ungrab(Gdk.CURRENT_TIME);
-
         // Need focus-out on Gtk.Entry to send the emoji to applications.
         Gdk.Event fevent = new Gdk.Event(Gdk.EventType.FOCUS_CHANGE);
         fevent.focus_change.in = 0;
         fevent.focus_change.window  = get_window();
         m_entry.send_focus_change(fevent);
+        fevent.focus_change.window  = null;
 
         hide();
         // Make sure the switcher is hidden before returning from this function.
@@ -1288,20 +1230,23 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    public void set_emoji_font(string emoji_font) {
-        m_emoji_font = emoji_font;
-    }
-
-
-    public void set_favorites(string[]? unowned_favorites) {
-        m_favorites = {};
-        foreach (string favorite in unowned_favorites) {
-            m_favorites += favorite;
-        }
+    public void present_centralize() {
+        present();
+        m_entry.set_activates_default(true);
+        Gtk.Allocation allocation;
+        get_allocation(out allocation);
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_window(get_window());
+        Gdk.Rectangle monitor_area;
+        screen.get_monitor_geometry(monitor_num, out monitor_area);
+        int x = (monitor_area.x + monitor_area.width - allocation.width)/2;
+        int y = (monitor_area.y + monitor_area.height
+                 - allocation.height)/2;
+        move(x, y);
     }
 
 
-    public bool has_loaded_emoji_dict() {
+    public static bool has_loaded_emoji_dict() {
         if (m_emoji_to_data_dict == null)
             return false;
         GLib.List keys = m_emoji_to_data_dict.get_keys();
@@ -1311,18 +1256,26 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    public void set_annotation_lang(string lang) {
+    public static void set_annotation_lang(string? lang) {
+        if (lang == null || lang == "")
+            lang = "en";
         if (m_current_lang_id == lang)
             return;
-        if (m_reload_emoji_dict_id > 0) {
-            GLib.Source.remove(m_reload_emoji_dict_id);
-            m_reload_emoji_dict_id = 0;
-        }
         m_current_lang_id = lang;
-        m_reload_emoji_dict_id = GLib.Idle.add(() => {
-            reload_emoji_dict();
-            m_reload_emoji_dict_id = 0;
-            return false;
-        });
+        reload_emoji_dict();
+    }
+
+
+    public static void set_emoji_font(string? emoji_font) {
+        return_if_fail(emoji_font != null && emoji_font != "");
+        m_emoji_font = emoji_font;
+    }
+
+
+    public static void set_favorites(string[]? unowned_favorites) {
+        m_favorites = {};
+        foreach (string favorite in unowned_favorites) {
+            m_favorites += favorite;
+        }
     }
 }
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index eac8d6aac..4564a2566 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -24,7 +24,10 @@ string emoji_font = null;
 string annotation_lang = null;
 
 public class EmojiApplication : Application {
-    private IBusEmojier m_emojier = new IBusEmojier();
+    private IBusEmojier? m_emojier;
+    GLib.Settings m_settings_emoji =
+            new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+
 
     private EmojiApplication() {
         Object(application_id: "org.freedesktop.ibus.panel.emojier",
@@ -34,41 +37,24 @@ public class EmojiApplication : Application {
 
 
     private void show_dialog(ApplicationCommandLine command_line) {
-        Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
-        var display = Gdk.Display.get_default();
-        var device_manager = display.get_device_manager();
-        var device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
-        event.set_device(device);
-        string emoji = m_emojier.run(event, "");
+        m_emojier = new IBusEmojier();
+        string emoji = m_emojier.run("");
         if (emoji == null) {
-            m_emojier.reset();
+            m_emojier = null;
             command_line.print("%s\n", _("Canceled to choose an emoji."));
             return;
         }
         Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
         clipboard.set_text(emoji, -1);
         clipboard.store();
-        m_emojier.reset();
+        m_emojier = null;
         command_line.print("%s\n", _("Copied an emoji to your clipboard."));
     }
 
 
     public void activate_dialog(ApplicationCommandLine command_line) {
         this.hold ();
-
-        // show dialog
-        if (m_emojier.has_loaded_emoji_dict()) {
-            show_dialog(command_line);
-        } else {
-            m_emojier.loaded_emoji_dict.connect(() => {
-                // The signal is called when the language is changed.
-                if (m_emojier.is_running())
-                    return;
-
-                show_dialog(command_line);
-            });
-        }
-
+        show_dialog(command_line);
         this.release ();
     }
 
@@ -110,22 +96,18 @@ public class EmojiApplication : Application {
             return Posix.EXIT_FAILURE;
         }
 
-        if (emoji_font == null) {
-            GLib.Settings settings_emoji =
-                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
-            emoji_font = settings_emoji.get_string("font");
+        if (m_emojier != null && m_emojier.is_running()) {
+            m_emojier.present_centralize();
+            return Posix.EXIT_SUCCESS;
         }
 
-        if (annotation_lang == null) {
-            GLib.Settings settings_emoji =
-                new GLib.Settings("org.freedesktop.ibus.panel.emoji");
-            annotation_lang = settings_emoji.get_string("lang");
-        }
+        if (emoji_font == null)
+            emoji_font = m_settings_emoji.get_string("font");
+        if (annotation_lang == null)
+            annotation_lang = m_settings_emoji.get_string("lang");
 
-        if (emoji_font != null && emoji_font != "")
-            m_emojier.set_emoji_font(emoji_font);
-        if (annotation_lang != null && annotation_lang != "")
-            m_emojier.set_annotation_lang(annotation_lang);
+        IBusEmojier.set_annotation_lang(annotation_lang);
+        IBusEmojier.set_emoji_font(emoji_font);
 
         activate_dialog(command_line);
 
@@ -156,5 +138,4 @@ public class EmojiApplication : Application {
         int status = app.run(args);
         return status;
     }
-
 }
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index 0f84a486f..1499a3ce7 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -69,7 +69,6 @@ IBusEmojier * ibus_emojier_new                    (void);
 /**
  * ibus_emojier_run:
  * @self: An #IBusEmojier
- * @event: An #GdkEvent
  * @input_context_path: An input context path of #IBusInputContext
  *                      of the focused application.
  *
@@ -78,7 +77,6 @@ IBusEmojier * ibus_emojier_new                    (void);
  * Returns: A selected emoji character.
  */
 gchar *       ibus_emojier_run                    (IBusEmojier* self,
-                                                   GdkEvent*    event,
                                                    const gchar*
                                                            input_context_path);
 
@@ -116,49 +114,49 @@ gchar *       ibus_emojier_get_selected_string    (IBusEmojier* self);
 void          ibus_emojier_reset                  (IBusEmojier* self);
 
 /**
- * ibus_emojier_set_emoji_font:
+ * ibus_emojier_present_centralize:
  * @self: An #IBusEmojier
- * @emoji_font: font name for emoji characters
  *
- * Set emoji font on the emoji dialog
+ * Move the window to the toplevel on the screen and centralize it.
  */
-void          ibus_emojier_set_emoji_font         (IBusEmojier* self,
-                                                   const gchar* emoji_font);
-
-#if 0
-/* TODO: set customized annotations */
-/**
- * ibus_emojier_set_favorites:
- * @self: An #IBusEmojier
- * @favorites: (array length=favorites_length): A custom emoji list.
- * @favorites_length: A length of @favorites
- *
- * Set emoji font on the emoji dialog
- */
-void          ibus_emojier_set_favorites          (IBusEmojier* self,
-                                                   gchar**      favorites,
-                                                   int
-                                                             favorites_length);
-#endif
+void          ibus_emojier_present_centralize     (IBusEmojier* self);
 
 /**
  * ibus_emojier_has_loaded_emoji_dict:
- * @self: An #IBusEmojier
  *
  * Returns: %TRUE if the emoji dict is loaded, otherwise %FALSE.
  */
-gboolean      ibus_emojier_has_loaded_emoji_dict  (IBusEmojier* self);
+gboolean      ibus_emojier_has_loaded_emoji_dict  (void);
 
 /**
  * ibus_emojier_set_annotation_lang:
- * @self: An #IBusEmojier
  * @lang: A langauge id for emoji annotations.
  *
  * Set a language id for emoji annotations. #IBusEmojier will load
  * $PKGDATADIR/dicts/emoji-@lang.dict. The default is "en".
  */
-void          ibus_emojier_set_annotation_lang    (IBusEmojier* self,
-                                                   const gchar* lang);
+void          ibus_emojier_set_annotation_lang    (const gchar* lang);
 
+/**
+ * ibus_emojier_set_emoji_font:
+ * @emoji_font: font name for emoji characters
+ *
+ * Set emoji font on the emoji dialog
+ */
+void          ibus_emojier_set_emoji_font         (const gchar* emoji_font);
+
+#if 0
+/* TODO: set customized annotations */
+/**
+ * ibus_emojier_set_favorites:
+ * @favorites: (array length=favorites_length): A custom emoji list.
+ * @favorites_length: A length of @favorites
+ *
+ * Set emoji font on the emoji dialog
+ */
+void          ibus_emojier_set_favorites          (gchar**      favorites,
+                                                   int
+                                                             favorites_length);
+#endif
 G_END_DECLS
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 7350dccea..23757344a 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -73,7 +73,8 @@ class Panel : IBus.PanelService {
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
     private uint m_switcher_focus_set_engine_id;
-    private IBusEmojier m_emojier;
+    private IBusEmojier? m_emojier;
+    private uint m_emojier_set_emoji_lang_id;
     private uint m_emojier_focus_commit_text_id;
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
@@ -137,7 +138,6 @@ class Panel : IBus.PanelService {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
 
-        m_emojier = new IBusEmojier();
         bind_emoji_shortcut();
 
         m_property_manager = new PropertyManager();
@@ -595,7 +595,7 @@ class Panel : IBus.PanelService {
             warning("No config emoji:font.");
             return;
         }
-        m_emojier.set_emoji_font(emoji_font);
+        IBusEmojier.set_emoji_font(emoji_font);
 
         bool use_custom_font = m_settings_panel.get_boolean("use-custom-font");
 
@@ -766,11 +766,20 @@ class Panel : IBus.PanelService {
     }
 
     private void set_emoji_favorites() {
-        m_emojier.set_favorites(m_settings_emoji.get_strv("favorites"));
+        IBusEmojier.set_favorites(m_settings_emoji.get_strv("favorites"));
     }
 
     private void set_emoji_lang() {
-        m_emojier.set_annotation_lang(m_settings_emoji.get_string("lang"));
+        if (m_emojier_set_emoji_lang_id > 0) {
+            GLib.Source.remove(m_emojier_set_emoji_lang_id);
+            m_emojier_set_emoji_lang_id = 0;
+        }
+        m_emojier_set_emoji_lang_id = GLib.Idle.add(() => {
+            IBusEmojier.set_annotation_lang(
+                    m_settings_emoji.get_string("lang"));
+            m_emojier_set_emoji_lang_id = 0;
+            return false;
+        });
     }
 
     private int compare_versions(string version1, string version2) {
@@ -984,15 +993,24 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private void handle_emoji_typing(Gdk.Event event) {
-        if (m_emojier.is_running())
-            return;
-        string emoji = m_emojier.run(event, m_real_current_context_path);
-        if (emoji == null)
+    private void show_emojier() {
+        m_emojier = new IBusEmojier();
+        string emoji = m_emojier.run(m_real_current_context_path);
+        if (emoji == null) {
+            m_emojier = null;
             return;
+        }
         this.emojier_focus_commit();
     }
 
+    private void handle_emoji_typing(Gdk.Event event) {
+        if (m_emojier != null && m_emojier.is_running()) {
+            m_emojier.present_centralize();
+            return;
+        }
+        show_emojier();
+    }
+
     private void run_preload_engines(IBus.EngineDesc[] engines, int index) {
         string[] names = {};
 
@@ -1361,29 +1379,34 @@ class Panel : IBus.PanelService {
         if (selected_engine == null &&
             prev_context_path != "" &&
             m_switcher.is_running()) {
-            if (m_switcher_focus_set_engine_id > 0) {
+            var context = GLib.MainContext.default();
+            if (m_switcher_focus_set_engine_id > 0 &&
+                context.find_source_by_id(m_switcher_focus_set_engine_id)
+                        != null) {
                 GLib.Source.remove(m_switcher_focus_set_engine_id);
             }
             m_switcher_focus_set_engine_id = GLib.Timeout.add(100, () => {
                 // focus_in is comming before switcher returns
                 switcher_focus_set_engine_real();
-                if (m_switcher_focus_set_engine_id > 0) {
-                    GLib.Source.remove(m_switcher_focus_set_engine_id);
-                    m_switcher_focus_set_engine_id = -1;
-                }
+                m_switcher_focus_set_engine_id = -1;
                 return false;
             });
         } else {
             if (switcher_focus_set_engine_real()) {
-                if (m_switcher_focus_set_engine_id > 0) {
+                var context = GLib.MainContext.default();
+                if (m_switcher_focus_set_engine_id > 0 &&
+                    context.find_source_by_id(m_switcher_focus_set_engine_id)
+                            != null) {
                     GLib.Source.remove(m_switcher_focus_set_engine_id);
-                    m_switcher_focus_set_engine_id = -1;
                 }
+                m_switcher_focus_set_engine_id = -1;
             }
         }
     }
 
     private bool emojier_focus_commit_real() {
+        if (m_emojier == null)
+            return true;
         string selected_string = m_emojier.get_selected_string();
         string prev_context_path = m_emojier.get_input_context_path();
         if (selected_string != null &&
@@ -1391,7 +1414,7 @@ class Panel : IBus.PanelService {
             prev_context_path == m_current_context_path) {
             IBus.Text text = new IBus.Text.from_string(selected_string);
             commit_text(text);
-            m_emojier.reset();
+            m_emojier = null;
             return true;
         }
 
@@ -1399,12 +1422,17 @@ class Panel : IBus.PanelService {
     }
 
     private void emojier_focus_commit() {
+        if (m_emojier == null)
+            return;
         string selected_string = m_emojier.get_selected_string();
         string prev_context_path = m_emojier.get_input_context_path();
         if (selected_string == null &&
             prev_context_path != "" &&
             m_emojier.is_running()) {
-            if (m_emojier_focus_commit_text_id > 0) {
+            var context = GLib.MainContext.default();
+            if (m_emojier_focus_commit_text_id > 0 &&
+                context.find_source_by_id(m_emojier_focus_commit_text_id)
+                        != null) {
                 GLib.Source.remove(m_emojier_focus_commit_text_id);
             }
             m_emojier_focus_commit_text_id = GLib.Timeout.add(100, () => {
@@ -1415,10 +1443,13 @@ class Panel : IBus.PanelService {
             });
         } else {
             if (emojier_focus_commit_real()) {
-                if (m_emojier_focus_commit_text_id > 0) {
+                var context = GLib.MainContext.default();
+                if (m_emojier_focus_commit_text_id > 0 &&
+                    context.find_source_by_id(m_emojier_focus_commit_text_id)
+                            != null) {
                     GLib.Source.remove(m_emojier_focus_commit_text_id);
-                    m_emojier_focus_commit_text_id = -1;
                 }
+                m_emojier_focus_commit_text_id = -1;
             }
         }
     }

From aba81ace1487bea57e80406413ae31cbb37ac7d2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 20 Apr 2017 12:10:47 +0900
Subject: [PATCH 402/816] ui/gtk3: Fix build failures

Add-on fix to 290f786
if /usr/share/vala*/vapi/ibus-emoji-dialog*.vapi does not exist.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/323780043
---
 ui/gtk3/Makefile.am | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 6f0fb62f7..d2ae0d6cd 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -163,13 +163,7 @@ EXTRA_DIST =                            \
     $(NULL)
 
 if ENABLE_EMOJI_DICT
-AM_VALAFLAGS += \
-    --define=EMOJI_DICT \
-    --vapidir=$(top_builddir)/ui/gtk3 \
-    --vapidir=$(top_srcdir)/ui/gtk3 \
-    --pkg=ibus-emoji-dialog-1.0 \
-    --pkg=gtk+-3.0 \
-    $(NULL)
+AM_VALAFLAGS += --define=EMOJI_DICT
 
 libibus_emoji_dialog = libibus-emoji-dialog-1.0.la
 

From 61fa8eabd812a75b3cadd883ad4a4e92cf6877d3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 25 Apr 2017 12:10:00 +0900
Subject: [PATCH 403/816] ui/gtk3: Get emoji font size from gsettings

If Emojier CLI does not specify the font size likes
--font 'Noto Emoji Color Regular', get the default size from GSettings.

R=Shawn.P.Huang@gmail.com, alexepico@gmail.com

Review URL: https://codereview.appspot.com/317540043
---
 setup/setup.ui          |  2 +-
 ui/gtk3/emojier.vala    | 41 ++++++++++++++++++++++++++---------------
 ui/gtk3/emojierapp.vala | 14 ++++++++++----
 ui/gtk3/panel.vala      |  2 +-
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index 4ef3423b1..54ef91644 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -137,7 +137,7 @@
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">The shortcut keys for showing emoji dialog</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji dialog:</property>
+                            <property name="label" translatable="yes">Emoji choice:</property>
                           </object>
                           <packing>
                             <property name="top_attach">5</property>
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 5a9bf8fca..76dca6ce2 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -166,13 +166,14 @@ class IBusEmojier : Gtk.Window {
         BACKWARD,
     }
 
-    private static const uint EMOJI_GRID_PAGE = 10;
+    private const uint EMOJI_GRID_PAGE = 10;
 
     // Set the actual default values in the constructor
     // because these fields are used for class_init() and static functions,
     // e.g. set_emoji_font(), can be called before class_init() is called.
     private static string m_current_lang_id;
-    private static string m_emoji_font;
+    private static string m_emoji_font_family;
+    private static int m_emoji_font_size;
     private static string[] m_favorites;
     private static int m_emoji_max_seq_len;
     private static GLib.HashTable<string, GLib.SList>?
@@ -220,8 +221,10 @@ class IBusEmojier : Gtk.Window {
 
         if (m_current_lang_id == null)
             m_current_lang_id = "en";
-        if (m_emoji_font == null)
-            m_emoji_font = "Monospace 16";
+        if (m_emoji_font_family == null)
+            m_emoji_font_family = "Monospace";
+        if (m_emoji_font_size == 0)
+            m_emoji_font_size = 16;
         if (m_favorites == null)
             m_favorites = {};
 
@@ -242,6 +245,8 @@ class IBusEmojier : Gtk.Window {
                 "#IBusEmojierWhiteLabel { background-color: " +
                         "rgba(%u, %u, %u, %lf); ".printf(
                         bg_red, bg_green, bg_blue, bg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
                 "border-width: 4px; border-radius: 3px; } ";
 
         uint fg_red = (uint)(m_rgba.selected_fg.red * 255);
@@ -255,6 +260,8 @@ class IBusEmojier : Gtk.Window {
         data += "#IBusEmojierSelectedLabel { color: " +
                         "rgba(%u, %u, %u, %lf); ".printf(
                         fg_red, fg_green, fg_blue, fg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
                 "background-color: " +
                         "rgba(%u, %u, %u, %lf); ".printf(
                         bg_red, bg_green, bg_blue, bg_alpha) +
@@ -273,7 +280,7 @@ class IBusEmojier : Gtk.Window {
                 css_provider,
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        m_title = new ETitleLabelBox(_("Emoji Chooser"));
+        m_title = new ETitleLabelBox(_("Emoji Choice"));
         set_titlebar(m_title);
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
@@ -734,17 +741,14 @@ class IBusEmojier : Gtk.Window {
                 label = new ESelectedLabel(candidate.text) as Gtk.Label;
             else
                 label = new EWhiteLabel(candidate.text) as Gtk.Label;
-            string emoji_font = m_emoji_font;
             if (candidate.text.char_count() > 2) {
-                Pango.FontDescription font_desc =
-                        Pango.FontDescription.from_string(emoji_font);
-                string font_family = font_desc.get_family();
-                int font_size = font_desc.get_size() / Pango.SCALE;
-                emoji_font = "%s %d".printf(font_family, font_size -2);
+                string font_family = m_emoji_font_family;
+                int font_size = m_emoji_font_size - 2;
+                string emoji_font = "%s %d".printf(font_family, font_size);
+                string markup = "<span font=\"%s\">%s</span>".
+                        printf(emoji_font, candidate.get_text());
+                label.set_markup(markup);
             }
-            string markup = "<span font=\"%s\">%s</span>".
-                    printf(emoji_font, candidate.get_text());
-            label.set_markup(markup);
             label.set_halign(Gtk.Align.FILL);
             label.set_valign(Gtk.Align.FILL);
             Gtk.EventBox candidate_ebox = new Gtk.EventBox();
@@ -1268,7 +1272,14 @@ class IBusEmojier : Gtk.Window {
 
     public static void set_emoji_font(string? emoji_font) {
         return_if_fail(emoji_font != null && emoji_font != "");
-        m_emoji_font = emoji_font;
+        Pango.FontDescription font_desc =
+                Pango.FontDescription.from_string(emoji_font);
+        string font_family = font_desc.get_family();
+        if (font_family != null)
+            m_emoji_font_family = font_family;
+        int font_size = font_desc.get_size() / Pango.SCALE;
+        if (font_size != 0)
+            m_emoji_font_size = font_size;
     }
 
 
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 4564a2566..cbdd8ba5f 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -60,6 +60,9 @@ public class EmojiApplication : Application {
 
 
     private int _command_line (ApplicationCommandLine command_line) {
+        // Set default font size
+        IBusEmojier.set_emoji_font(m_settings_emoji.get_string("font"));
+
         const OptionEntry[] options = {
             { "font", 0, 0, OptionArg.STRING, out emoji_font,
                 /* TRANSLATORS: "FONT" should be capital and translatable.
@@ -88,6 +91,10 @@ public class EmojiApplication : Application {
             _args[i] = args[i];
         }
 
+        // Need to initialize for the second instance.
+        emoji_font = null;
+        annotation_lang = null;
+
         try {
             unowned string[] tmp = _args;
             option.parse(ref tmp);
@@ -101,13 +108,12 @@ public class EmojiApplication : Application {
             return Posix.EXIT_SUCCESS;
         }
 
-        if (emoji_font == null)
-            emoji_font = m_settings_emoji.get_string("font");
         if (annotation_lang == null)
             annotation_lang = m_settings_emoji.get_string("lang");
-
         IBusEmojier.set_annotation_lang(annotation_lang);
-        IBusEmojier.set_emoji_font(emoji_font);
+
+        if (emoji_font != null)
+            IBusEmojier.set_emoji_font(emoji_font);
 
         activate_dialog(command_line);
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 23757344a..745489b07 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1239,7 +1239,7 @@ class Panel : IBus.PanelService {
             m_sys_menu.append(item);
 
 #if EMOJI_DICT
-            item = new Gtk.MenuItem.with_label(_("Emoji Dialog"));
+            item = new Gtk.MenuItem.with_label(_("Emoji Choice"));
             item.activate.connect((i) => {
                 Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
                 handle_emoji_typing(event);

From 2f73064d03481c9f34d278dd19d1a4427d6ecb27 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 28 Apr 2017 13:10:03 +0900
Subject: [PATCH 404/816] Change to use Unicode Emoji files instead of EmojiOne
 files

EmojiOne Json file have changed the file format since 3.0 [1]
Now IBus migrated to use Unicode Emoji files since the EmojiOne file
had been used for the emoji categories but it can be done with
Unicode emoji-test.txt [2]
Use Unicode Emoji 4.0 until 5.0 will be released officially.
Unicode Emoji 5.0 is available but fonts does not support it yet.

[1] https://github.com/Ranks/emojione/releases/tag/v3.0.0
[2] http://www.unicode.org/Public/emoji/4.0/

Review URL: https://codereview.appspot.com/321860043
---
 bindings/vala/Makefile.am     |   3 +-
 configure.ac                  |  27 +-
 data/annotations/Makefile.am  |   3 +-
 data/annotations/en_ascii.xml |  56 +++
 po/POTFILES.in                |   3 +-
 po/POTFILES.skip              |   2 +-
 src/Makefile.am               |  17 +-
 src/emoji-parser.c            | 632 ++++++++++++++++++++++++++++++----
 src/ibusemoji.c               |  47 +--
 src/ibusemoji.h               |  14 -
 src/ibusemojigen.h            |  39 +++
 ui/gtk3/Makefile.am           |   5 +-
 ui/gtk3/emojier.vala          | 106 ++++--
 13 files changed, 780 insertions(+), 174 deletions(-)
 create mode 100644 data/annotations/en_ascii.xml
 create mode 100644 src/ibusemojigen.h

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index f3eb0d40d..4e34afc79 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -43,8 +43,7 @@ vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
-# for make distclean
-CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
+DISTCLEANFILES = $(VAPIGEN_VAPIS)
 
 EXTRA_DIST = \
 	$(VAPIGEN_VAPIS) \
diff --git a/configure.ac b/configure.ac
index 0a5f2d56e..ea568a00b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,14 +612,14 @@ AC_ARG_ENABLE(emoji-dict,
 )
 AM_CONDITIONAL([ENABLE_EMOJI_DICT], [test x"$enable_emoji_dict" = x"yes"])
 
-AC_ARG_WITH(emoji-json-file,
-    AS_HELP_STRING([--with-emoji-json-file[=DIR/emoji.json]],
-        [Set emoji.json. (default: "/usr/lib/node_modules/emojione/emoji.json")
-        ]),
-    EMOJI_JSON_FILE=$with_emoji_json_file,
-    EMOJI_JSON_FILE="/usr/lib/node_modules/emojione/emoji.json"
+AC_ARG_WITH(unicode-emoji-dir,
+    AS_HELP_STRING([--with-unicode-emoji-dir[=DIR]],
+        [Set the directory of Unicode Emoji.
+         (default: "/usr/share/unicode/emoji")]),
+    UNICODE_EMOJI_DIR=$with_unicode_emoji_dir,
+    UNICODE_EMOJI_DIR="/usr/share/unicode/emoji"
 )
-AC_SUBST(EMOJI_JSON_FILE)
+AC_SUBST(UNICODE_EMOJI_DIR)
 
 AC_ARG_WITH(emoji-annotation-dir,
     AS_HELP_STRING([--with-emoji-annotation-dir[=DIR]],
@@ -631,17 +631,14 @@ AC_ARG_WITH(emoji-annotation-dir,
 AC_SUBST(EMOJI_ANNOTATION_DIR)
 
 if test x"$enable_emoji_dict" = x"yes"; then
-    if test ! -f $EMOJI_JSON_FILE ; then
-        AC_MSG_ERROR(Not found $EMOJI_JSON_FILE. You can get emoji.json \
-with "npm install -g emojione".)
+    if test ! -f $UNICODE_EMOJI_DIR/emoji-test.txt ; then
+        AC_MSG_ERROR(Not found $UNICODE_EMOJI_DIR/emoji-test.txt. You can get \
+the emoji files from http://www.unicode.org/Public/emoji/4.0/)
     fi
     if test ! -f $EMOJI_ANNOTATION_DIR/en.xml ; then
         AC_MSG_ERROR(Not found $EMOJI_ANNOTATION_DIR/en.xml. You can get \
 https://github.com/fujiwarat/cldr-emoji-annotation)
     fi
-    PKG_CHECK_MODULES(JSON_GLIB1, [
-        json-glib-1.0
-    ])
     enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
 fi
 
@@ -730,8 +727,8 @@ Build options:
   Enable surrounding-text       $enable_surrounding_text
   Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
-  emoji.json path               $EMOJI_JSON_FILE
-  CLDR annotation dir           $EMOJI_ANNOTATION_DIR
+  Uicode Emoji directory        $UNICODE_EMOJI_DIR
+  CLDR annotation directory     $EMOJI_ANNOTATION_DIR
   Run test cases                $enable_tests
 ])
 
diff --git a/data/annotations/Makefile.am b/data/annotations/Makefile.am
index d87b933c1..0b7779b43 100644
--- a/data/annotations/Makefile.am
+++ b/data/annotations/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2016 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
 
 EXTRA_DIST = \
 	en.xml \
+	en_ascii.xml \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/annotations/en_ascii.xml b/data/annotations/en_ascii.xml
new file mode 100644
index 000000000..f1bdcbb2b
--- /dev/null
+++ b/data/annotations/en_ascii.xml
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE ldml SYSTEM '../../common/dtd/ldml.dtd'>
+<!-- vim:set et sts=4: -->
+<!--
+    Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+    Copyright (C) 2017 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
+    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
+ -->
+<ldml>
+    <identity>
+        <version number="$Revision: 1 $"/>
+        <language type='en'/>
+    </identity>
+    <annotations>
+        <annotation cp="😂">:') | :'-)</annotation>
+        <annotation cp="😃">:D | :-D | =D</annotation>
+        <annotation cp="😅">':) | ':-) | '=) | ':D | ':-D | '=D</annotation>
+        <annotation cp="😆">&gt;:) | &gt;;) | &gt;:-) | &gt;=)</annotation>
+        <annotation cp="😉">;) | ;-) | *-) | *) | ;-] | ;] | ;D | ;^)</annotation>
+        <annotation cp="😎">B-) | B) | 8) | 8-) | B-D | 8-D</annotation>
+        <annotation cp="😘">:* | :-* | =* | :^*</annotation>
+        <annotation cp="🙂">:) | :-) | =] | =) | :]</annotation>
+        <annotation cp="😑">-_- | -__- | -___-</annotation>
+        <annotation cp="😶">:-X | :X | :-# | :# | =X | =x | :x | :-x | =#</annotation>
+        <annotation cp="😣">&gt;.&lt;</annotation>
+        <annotation cp="😮">:-O | :O | :-o | :o | O_O | &gt;:O</annotation>
+        <annotation cp="😛">:P | :-P | =P | :-p | :p | =p | :-Þ | :Þ | :þ | :-þ | :-b | :b | d:</annotation>
+        <annotation cp="😜">&gt;:P | X-P | x-p</annotation>
+        <annotation cp="😓">':( | ':-( | '=(</annotation>
+        <annotation cp="😕">&gt;:\ | &gt;:/ | :-/ | :-. | :/ | :\ | =/ | =\ | :L | =L</annotation>
+        <annotation cp="😞">&gt;:[ | :-( | :( | :-[ | :[ | =(</annotation>
+        <annotation cp="😢">:'( | :'-( | ;( | ;-(</annotation>
+        <annotation cp="😨">D:</annotation>
+        <annotation cp="😳">:$ | =$</annotation>
+        <annotation cp="😵">#-) | #) | %-) | %) | X) | X-)</annotation>
+        <annotation cp="😠">&gt;:( | &gt;:-( | :@</annotation>
+        <annotation cp="😇">O:-) | 0:-3 | 0:3 | 0:-) | 0:) | 0;^) | O:) | O;-) | O=) | 0;-) | O:-3 | O:3</annotation>
+        <annotation cp="🙆">*\0/* | \0/ | *\O/* | \O/</annotation>
+        <annotation cp="❤">&lt;3</annotation>
+        <annotation cp="💔">&lt;/3</annotation>
+    </annotations>
+</ldml>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 25be4f459..00f7c7f66 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,6 +41,7 @@ setup/keyboardshortcut.py
 setup/main.py
 src/ibusbus.c
 src/ibusconfig.c
+src/ibusemojigen.h
 src/ibusengine.c
 src/ibusfactory.c
 src/ibushotkey.c
@@ -57,6 +58,7 @@ ui/gtk3/application.vala
 ui/gtk3/candidatearea.vala
 ui/gtk3/candidatepanel.vala
 ui/gtk3/emojier.vala
+ui/gtk3/emojierapp.vala
 ui/gtk3/handle.vala
 ui/gtk3/iconwidget.vala
 ui/gtk3/keybindingmanager.vala
@@ -66,4 +68,3 @@ ui/gtk3/property.vala
 ui/gtk3/propertypanel.vala
 ui/gtk3/separator.vala
 ui/gtk3/switcher.vala
-ui/gtk3/emojierapp.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 891d2ccb5..7190221d1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -12,6 +12,7 @@ ui/gtk3/application.c
 ui/gtk3/candidatearea.c
 ui/gtk3/candidatepanel.c
 ui/gtk3/emojier.c
+ui/gtk3/emojierapp.c
 ui/gtk3/handle.c
 ui/gtk3/iconwidget.c
 ui/gtk3/keybindingmanager.c
@@ -21,4 +22,3 @@ ui/gtk3/property.c
 ui/gtk3/propertypanel.c
 ui/gtk3/separator.c
 ui/gtk3/switcher.c
-ui/gtk3/emojierapp.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7053e3e89..27cd168b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -166,6 +166,7 @@ ibusinclude_HEADERS =       \
 ibus_private_headers =          \
     gtkimcontextsimpleseqs.h    \
     ibuscomposetable.h          \
+    ibusemojigen.h              \
     ibusenginesimpleprivate.h   \
     ibusinternal.h              \
     keyname-table.h             \
@@ -247,17 +248,26 @@ dicts/emoji-en.dict: emoji-parser
 	    echo "WARNING: Not found $(EMOJI_ANNOTATION_DIR)/en.xml" 1>&2; \
 	fi; \
 	for f in $(LANG_FILES) ; do \
+	    if test -f \
+	    "$(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml" ; then \
+	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml"; \
+	        plus_comment="derived"; \
+	    fi; \
 	    if test x"$$f" = xen ; then \
 	        $(builddir)/emoji-parser \
+	            --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
 	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
-	            --json $(EMOJI_JSON_FILE) \
+	            $$xml_derived_option \
+	            --xml-ascii $(top_srcdir)/data/annotations/en_ascii.xml \
+	            --out-category ibusemojigen.h \
 	            --out $@; \
 	    else \
 	        $(builddir)/emoji-parser \
 	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
+	            $$xml_derived_option \
 	            --out dicts/emoji-$$f.dict; \
 	    fi; \
-	    echo "Generated dicts/emoji-$$f.dict"; \
+	    echo "Generated $$plus_comment dicts/emoji-$$f.dict"; \
 	done
 
 install-data-hook: $(dict_DATA)
@@ -301,11 +311,9 @@ emoji_parser_SOURCES =          \
     $(NULL)
 emoji_parser_CFLAGS =           \
     $(GLIB2_CFLAGS)             \
-    $(JSON_GLIB1_CFLAGS)        \
     $(NULL)
 emoji_parser_LDADD =            \
     $(GLIB2_LIBS)               \
-    $(JSON_GLIB1_LIBS)          \
     $(libibus)                  \
     $(NULL)
 
@@ -329,6 +337,7 @@ CLEANFILES +=                   \
     $(NULL)
 
 DISTCLEANFILES =                \
+    ibusemojigen.h              \
     ibusversion.h               \
     $(NULL)
 
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index e5dce3f80..5e6155bd0 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -21,34 +21,52 @@
  */
 
 /* Convert /usr/share/unicode/cldr/common/annotations/\*.xml and
- * /usr/lib/node_modules/emojione/emoji.json
+ * /usr/share/unicode/emoji/emoji-test.txt
  * to the dictionary file which look up the Emoji from the annotation.
  * Get *.xml from https://github.com/fujiwarat/cldr-emoji-annotation
  * or http://www.unicode.org/repos/cldr/trunk/common/annotations .
- * Get emoji.json with 'npm install -g emojione'.
- * en.xml is used for the Unicode annotations and emoji.json is used
- * for the aliases_ascii, e.g. ":)", and category, e.g. "people".
+ * Get emoji-test.txt from http://unicode.org/Public/emoji/4.0/ .
+ * en.xml is used for the Unicode annotations and emoji-test.txt is used
+ * for the category, e.g. "Smileys & People".
+ * ASCII emoji annotations are saved in ../data/annotations/en_ascii.xml
  */
 
 #include <glib.h>
+
+#ifdef HAVE_JSON_GLIB1
 #include <json-glib/json-glib.h>
+#endif
 
 #include <string.h>
 
 #include "ibusemoji.h"
 
+/* This file has 21 lines about the license at the top of the file. */
+#define LICENSE_LINES 21
+
+typedef enum {
+  EMOJI_STRICT,
+  EMOJI_VARIANT,
+  EMOJI_NOVARIANT
+} EmojiDataSearchType;
+
 typedef struct _EmojiData EmojiData;
 struct _EmojiData {
-    gchar      *emoji;
-    gchar      *emoji_alternates;
-    GSList     *annotations;
-    gboolean    is_annotation;
-    gchar      *description;
-    gboolean    is_tts;
-    gchar      *category;
-    GSList     *list;
+    gchar              *emoji;
+    gchar              *emoji_alternates;
+    GSList             *annotations;
+    gboolean            is_annotation;
+    gchar              *description;
+    gboolean            is_tts;
+    gchar              *category;
+    gchar              *subcategory;
+    gboolean            is_derived;
+    GSList             *list;
+    EmojiDataSearchType search_type;
 };
 
+static gchar *unicode_emoji_version;
+
 static void
 reset_emoji_element (EmojiData *data)
 {
@@ -59,68 +77,175 @@ reset_emoji_element (EmojiData *data)
     g_slist_free_full (data->annotations, g_free);
     data->annotations = NULL;
     g_clear_pointer (&data->description, g_free);
-    g_clear_pointer (&data->category, g_free);
+}
+
+gint
+strcmp_novariant (const gchar *a,
+                  const gchar *b,
+                  gunichar     a_variant,
+                  gunichar     b_variant)
+{
+    gint retval;
+    gchar *p = NULL;
+    GString *buff = NULL;;
+    gchar *substr = NULL;
+
+    if (a_variant > 0) {
+        if ((p = g_utf8_strchr (a, -1, a_variant)) != NULL) {
+            buff = g_string_new (NULL);
+            if (a != p) {
+                substr = g_strndup (a, p - a);
+                g_string_append (buff, substr);
+                g_free (substr);
+            }
+            p = g_utf8_next_char (p);
+            if (*p != '\0')
+                g_string_append (buff, p);
+            retval = g_strcmp0 (buff->str, b);
+            g_string_free (buff, TRUE);
+            return retval;
+        } else {
+            return -1;
+        }
+    } else if (b_variant > 0) {
+        if ((p = g_utf8_strchr (b, -1, b_variant)) != NULL) {
+            buff = g_string_new (NULL);
+            if (b != p) {
+                substr = g_strndup (b, p - b);
+                g_string_append (buff, substr);
+                g_free (substr);
+            }
+            p = g_utf8_next_char (p);
+            if (*p != '\0')
+                g_string_append (buff, p);
+            retval = g_strcmp0 (a, buff->str);
+            g_string_free (buff, TRUE);
+            return retval;
+        } else {
+            return -1;
+        }
+    }
+    return g_strcmp0 (a, b);
 }
 
 gint
 find_emoji_data_list (IBusEmojiData *a,
-                      const gchar   *b)
+                      EmojiData     *b)
 {
-   g_return_val_if_fail (IBUS_IS_EMOJI_DATA (a), 0);
-   return g_strcmp0 (ibus_emoji_data_get_emoji (a), b);
+    const gchar *a_str;
+
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (a), 0);
+
+    a_str = ibus_emoji_data_get_emoji (a);
+    switch (b->search_type) {
+    case EMOJI_VARIANT:
+        if (strcmp_novariant (a_str, b->emoji, 0xfe0e, 0) == 0)
+            return 0;
+        else if (strcmp_novariant (a_str, b->emoji, 0xfe0f, 0) == 0)
+            return 0;
+        else
+            return g_strcmp0 (a_str, b->emoji);
+        break;
+    case EMOJI_NOVARIANT:
+        if (strcmp_novariant (a_str, b->emoji, 0, 0xfe0e) == 0)
+            return 0;
+        else if (strcmp_novariant (a_str, b->emoji, 0, 0xfe0f) == 0)
+            return 0;
+        else
+            return g_strcmp0 (a_str, b->emoji);
+        break;
+    default:;
+    }
+    return g_strcmp0 (a_str, b->emoji);
 }
 
 static void
-update_emoji_list (EmojiData *data)
+emoji_data_update_object (EmojiData     *data,
+                          IBusEmojiData *emoji)
 {
-    GSList *list = g_slist_find_custom (
-            data->list,
-            data->emoji,
-            (GCompareFunc) find_emoji_data_list);
-    if (list) {
-        IBusEmojiData *emoji = list->data;
-        GSList *src_annotations = data->annotations;
-        GSList *dest_annotations = ibus_emoji_data_get_annotations (emoji);
-        GSList *l;
-        gboolean updated_annotations = FALSE;
-        for (l = src_annotations; l; l = l->next) {
-            GSList *duplicated = g_slist_find_custom (dest_annotations,
-                                                      l->data,
-                                                      (GCompareFunc) g_strcmp0);
-            if (duplicated == NULL) {
-                dest_annotations = g_slist_append (dest_annotations,
-                                                   g_strdup (l->data));
-                updated_annotations = TRUE;
-            }
+    GSList *src_annotations = data->annotations;
+    GSList *dest_annotations = ibus_emoji_data_get_annotations (emoji);
+    GSList *l;
+    gboolean updated_annotations = FALSE;
+    for (l = src_annotations; l; l = l->next) {
+        GSList *duplicated = g_slist_find_custom (dest_annotations,
+                                                  l->data,
+                                                  (GCompareFunc) g_strcmp0);
+        if (duplicated == NULL) {
+            dest_annotations = g_slist_append (dest_annotations,
+                                               g_strdup (l->data));
+            updated_annotations = TRUE;
         }
-        if (updated_annotations) {
-            ibus_emoji_data_set_annotations (
+    }
+    if (updated_annotations) {
+        ibus_emoji_data_set_annotations (
                     emoji,
                     g_slist_copy_deep (dest_annotations,
                                        (GCopyFunc) g_strdup,
                                        NULL));
+    }
+    if (data->description)
+        ibus_emoji_data_set_description (emoji, data->description);
+}
+
+static void
+emoji_data_new_object (EmojiData *data)
+{
+    IBusEmojiData *emoji =
+            ibus_emoji_data_new ("emoji",
+                                 data->emoji,
+                                 "annotations",
+                                 data->annotations,
+                                 "description",
+                                 data->description ? data->description
+                                         : g_strdup (""),
+                                 "category",
+                                 data->category ? data->category
+                                         : g_strdup (""),
+                                 NULL);
+    data->list = g_slist_append (data->list, emoji);
+}
+
+static void
+update_emoji_list (EmojiData *data,
+                   gboolean   base_update)
+{
+    GSList *list;
+    data->search_type = EMOJI_STRICT;
+    list = g_slist_find_custom (
+            data->list,
+            data,
+            (GCompareFunc) find_emoji_data_list);
+    if (list) {
+        emoji_data_update_object (data, list->data);
+        return;
+    } else if (base_update) {
+        emoji_data_new_object (data);
+        return;
+    }
+    if (g_utf8_strchr (data->emoji, -1, 0xfe0e) == NULL &&
+        g_utf8_strchr (data->emoji, -1, 0xfe0f) == NULL) {
+        data->search_type = EMOJI_VARIANT;
+        list = g_slist_find_custom (
+                data->list,
+                data,
+                (GCompareFunc) find_emoji_data_list);
+        if (list) {
+            emoji_data_update_object (data, list->data);
+            return;
         }
-        if (data->description)
-            ibus_emoji_data_set_description (emoji, data->description);
     } else {
-        IBusEmojiData *emoji =
-                ibus_emoji_data_new ("emoji",
-                                     data->emoji,
-                                     "annotations",
-                                     data->annotations,
-                                     "description",
-                                     data->description ? data->description
-                                             : g_strdup (""),
-                                     "category",
-                                     data->category ? data->category
-                                             : g_strdup (""),
-                                     "emoji-alternates",
-                                     data->emoji_alternates
-                                             ? data->emoji_alternates
-                                             : g_strdup (""),
-                                     NULL);
-        data->list = g_slist_append (data->list, emoji);
+        data->search_type = EMOJI_NOVARIANT;
+        list = g_slist_find_custom (
+                data->list,
+                data,
+                (GCompareFunc) find_emoji_data_list);
+        if (list) {
+            emoji_data_update_object (data, list->data);
+            return;
+        }
     }
+    emoji_data_new_object (data);
 }
 
 static void
@@ -183,7 +308,7 @@ unicode_annotations_end_element_cb (GMarkupParseContext *context,
     if (!data->is_annotation)
         return;
 
-    update_emoji_list (data);
+    update_emoji_list (data, FALSE);
     data->is_annotation = FALSE;
     data->is_tts = FALSE;
 }
@@ -227,7 +352,8 @@ unicode_annotations_text_cb (GMarkupParseContext *context,
 
 static gboolean
 unicode_annotations_parse_xml_file (const gchar  *filename,
-                                    GSList      **list)
+                                    GSList      **list,
+                                    gboolean      is_derived)
 {
     gchar *content = NULL;
     gsize length = 0;
@@ -251,6 +377,7 @@ unicode_annotations_parse_xml_file (const gchar  *filename,
     }
 
     data.list = *list;
+    data.is_derived = is_derived;
 
     context = g_markup_parse_context_new (&parser, 0, &data, NULL);
     if (!g_markup_parse_context_parse (context, content, length, &error)) {
@@ -275,6 +402,233 @@ unicode_annotations_parse_xml_file (const gchar  *filename,
     return FALSE;
 }
 
+static gboolean
+unicode_emoji_test_parse_unicode (const gchar *line,
+                                  EmojiData   *data)
+{
+    GString *emoji = NULL;
+    gchar *endptr = NULL;
+    guint32 uch;
+    static gchar outbuf[8] = { 0, };
+
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    emoji = g_string_new (NULL);
+    while (line && *line) {
+        uch = g_ascii_strtoull (line, &endptr, 16);
+        outbuf[g_unichar_to_utf8 (uch, outbuf)] = '\0';
+        g_string_append (emoji, outbuf);
+        if (*endptr == '\0') {
+            break;
+        }
+        line = endptr + 1;
+        while (*line == ' ')
+            line++;
+        endptr = NULL;
+    }
+
+    data->emoji = g_string_free (emoji, FALSE);
+    return TRUE;
+}
+
+static gboolean
+unicode_emoji_test_parse_description (const gchar *line,
+                                      EmojiData   *data)
+{
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    /* skip spaces */
+    while (*line == ' ')
+        line++;
+    /* skip emoji */
+    while (*line != ' ')
+        line++;
+    /* skip spaces */
+    while (*line == ' ')
+        line++;
+    if (*line == '\0')
+        return FALSE;
+    data->description = g_strdup (line);
+    return TRUE;
+}
+
+#define EMOJI_VERSION_TAG "# Version: "
+#define EMOJI_GROUP_TAG "# group: "
+#define EMOJI_SUBGROUP_TAG "# subgroup: "
+#define EMOJI_NON_FULLY_QUALIFIED_TAG "non-fully-qualified"
+
+static gboolean
+unicode_emoji_test_parse_line (const gchar *line,
+                               EmojiData   *data)
+{
+    int tag_length;
+    gchar **segments = NULL;
+
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    tag_length = strlen (EMOJI_VERSION_TAG);
+    if (strlen (line) > tag_length &&
+        g_ascii_strncasecmp (line, EMOJI_VERSION_TAG, tag_length) == 0) {
+        unicode_emoji_version = g_strdup (line + tag_length);
+        return TRUE;
+    }
+    tag_length = strlen (EMOJI_GROUP_TAG);
+    if (strlen (line) > tag_length &&
+        g_ascii_strncasecmp (line, EMOJI_GROUP_TAG, tag_length) == 0) {
+        g_free (data->category);
+        g_clear_pointer (&data->subcategory, g_free);
+        data->category = g_strdup (line + tag_length);
+        return TRUE;
+    }
+    tag_length = strlen (EMOJI_SUBGROUP_TAG);
+    if (strlen (line) > tag_length &&
+        g_ascii_strncasecmp (line, EMOJI_SUBGROUP_TAG, tag_length) == 0) {
+        g_free (data->subcategory);
+        data->subcategory = g_strdup (line + tag_length);
+        return TRUE;
+    }
+    if (*line == '#')
+        return TRUE;
+    segments = g_strsplit (line, "; ", 2);
+    if (segments[1] == NULL) {
+        g_warning ("No qualified line\n");
+        goto failed_to_parse_unicode_emoji_test_line;
+        return FALSE;
+    }
+    tag_length = strlen (EMOJI_NON_FULLY_QUALIFIED_TAG);
+    /* Ignore the non-fully-qualified emoji */
+    if (g_ascii_strncasecmp (segments[1], EMOJI_NON_FULLY_QUALIFIED_TAG,
+                             tag_length) == 0) {
+        g_strfreev (segments);
+        return TRUE;
+    }
+    unicode_emoji_test_parse_unicode (segments[0], data);
+    g_strfreev (segments);
+    segments = g_strsplit (line, "# ", 2);
+    if (segments[1] == NULL) {
+        g_warning ("No description line\n");
+        goto failed_to_parse_unicode_emoji_test_line;
+        return FALSE;
+    }
+    unicode_emoji_test_parse_description (segments[1], data);
+    g_strfreev (segments);
+    if (data->annotations == NULL) {
+        if (data->subcategory) {
+            int i;
+            gchar *amp;
+            segments = g_strsplit(data->subcategory, "-", -1);
+            for (i = 0; segments[i]; i++) {
+                if ((amp = strchr (segments[i], '&')) != NULL) {
+                    if (amp - segments[i] <= 1) {
+                        g_warning ("Wrong ampersand");
+                        goto failed_to_parse_unicode_emoji_test_line;
+                    }
+                    data->annotations = g_slist_append (
+                            data->annotations,
+                            g_strndup (segments[i], amp - segments[i] - 1));
+                    data->annotations = g_slist_append (
+                            data->annotations,
+                            g_strdup (amp + 1));
+                    continue;
+                }
+                data->annotations = g_slist_append (data->annotations,
+                                                    g_strdup (segments[i]));
+            }
+            g_strfreev (segments);
+        } else {
+            g_warning ("No subcategory line\n");
+            goto failed_to_parse_unicode_emoji_test_line;
+        }
+    }
+    update_emoji_list (data, TRUE);
+    reset_emoji_element (data);
+    return TRUE;
+
+failed_to_parse_unicode_emoji_test_line:
+    if (segments)
+        g_strfreev (segments);
+    reset_emoji_element (data);
+    return FALSE;
+}
+
+#undef EMOJI_VERSION_TAG
+#undef EMOJI_GROUP_TAG
+#undef EMOJI_SUBGROUP_TAG
+#undef EMOJI_NON_FULLY_QUALIFIED_TAG
+
+static gboolean
+unicode_emoji_test_parse_file (const gchar *filename,
+                               GSList      **list)
+{
+    gchar *content = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    gchar *head, *end, *line;
+    int n = 1;
+    EmojiData data = { 0, };
+
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (list != NULL, FALSE);
+
+    if (!g_file_get_contents (filename, &content, &length, &error)) {
+        g_warning ("Failed to load %s: %s", filename, error->message);
+        goto failed_to_parse_unicode_emoji_test;
+    }
+    head = end = content;
+    while (*end == '\n' && end - content < length) {
+        end++;
+        n++;
+    }
+    head = end;
+    data.list = *list;
+    while (end - content < length) {
+        while (*end != '\n' && end - content < length)
+            end++;
+        if (end - content >= length)
+            break;
+        line = g_strndup (head, end - head);
+        if (!unicode_emoji_test_parse_line (line, &data))
+            g_warning ("parse error #%d in %s version %s: %s",
+                       n, filename,
+                       unicode_emoji_version ? unicode_emoji_version : "(null)",
+                       line);
+        while (*end == '\n' && end - content < length) {
+            end++;
+            n++;
+        }
+        g_free (line);
+        head = end;
+    }
+    g_free (content);
+    g_free (unicode_emoji_version);
+    *list = data.list;
+    return TRUE;
+
+failed_to_parse_unicode_emoji_test:
+    if (error)
+        g_error_free (error);
+    g_clear_pointer (&content, g_free);
+    return FALSE;
+}
+
+static gboolean 
+unicode_emoji_parse_dir (const gchar *dirname,
+                         GSList      **list)
+{
+    gchar *filename = NULL;
+    g_return_val_if_fail (dirname != NULL, FALSE);
+    g_return_val_if_fail (list != NULL, FALSE);
+
+    filename = g_build_path ("/", dirname, "emoji-test.txt", NULL);
+    if (!unicode_emoji_test_parse_file (filename, list)) {
+        g_free (filename);
+        return FALSE;
+    }
+    g_free (filename);
+    return TRUE;
+}
+
+#ifdef HAVE_JSON_GLIB1
 static gboolean
 parse_emojione_unicode (JsonNode  *node,
                         EmojiData *data,
@@ -426,6 +780,31 @@ parse_emojione_category (JsonNode  *node,
     return TRUE;
 }
 
+#ifdef EMOJIONE_ALIASES_ASCII_PRINT
+static gchar *
+text_to_entity (const gchar *text)
+{
+    gchar *p;
+    GString *buff = g_string_new (NULL);
+    for (p = text; *p; p++) {
+        switch (*p) {
+        case '<':
+            g_string_append (buff, "&lt;");
+            break;
+        case '>':
+            g_string_append (buff, "&gt;");
+            break;
+        case '&':
+            g_string_append (buff, "&amp;");
+            break;
+        default:
+            g_string_append_c (buff, *p);
+        }
+    }
+    g_string_free (buff, FALSE);
+}
+#endif
+
 static gboolean
 parse_emojione_aliases_ascii (JsonNode  *node,
                               EmojiData *data)
@@ -441,11 +820,23 @@ parse_emojione_aliases_ascii (JsonNode  *node,
     aliases_ascii = json_node_get_array (node);
     length = json_array_get_length (aliases_ascii);
     for (i = 0; i < length; i++) {
+#ifdef EMOJIONE_ALIASES_ASCII_PRINT
+        if (i == 0)
+            printf ("        <annotation cp=\"%s\">", data->emoji);
+#endif
         const gchar *alias = json_array_get_string_element (aliases_ascii, i);
         GSList *duplicated = g_slist_find_custom (data->annotations,
                                                   alias,
                                                   (GCompareFunc) g_strcmp0);
         if (duplicated == NULL) {
+#ifdef EMOJIONE_ALIASES_ASCII_PRINT
+            gchar *entity = text_to_entity (alias);
+            if (i != length - 1)
+                printf ("%s | ", entity);
+            else
+                printf ("%s</annotation>\n", entity);
+            g_free (entity);
+#endif
             data->annotations = g_slist_prepend (data->annotations,
                                                  g_strdup (alias));
         }
@@ -535,7 +926,7 @@ parse_emojione_element (JsonNode  *node,
     }
     g_list_free (members);
 
-    update_emoji_list (data);
+    update_emoji_list (data, TRUE);
 
     return TRUE;
 }
@@ -591,27 +982,136 @@ emojione_parse_json_file (const gchar  *filename,
     g_object_unref (parser);
     return FALSE;
 }
+#endif /* HAVE_JSON_GLIB1 */
+
+static void
+emoji_data_list_unify_categories (IBusEmojiData  *data,
+                                  GSList        **list)
+{
+    g_return_if_fail (IBUS_IS_EMOJI_DATA (data));
+    g_return_if_fail (list != NULL);
+
+    const gchar *category = ibus_emoji_data_get_category (data);
+    if (*category == '\0')
+        return;
+    if (g_slist_find_custom (*list, category, (GCompareFunc)g_strcmp0) == NULL)
+        *list = g_slist_append (*list, g_strdup (category));
+}
+
+static void
+category_list_dump (const gchar *category,
+                    GString     *buff)
+{
+    g_return_if_fail (buff != NULL);
+
+    const gchar *line = g_strdup_printf ("    N_(\"%s\"),\n", category);
+    g_string_append (buff, line);
+}
+
+static void
+category_file_save (const gchar *filename,
+                    GSList      *list)
+{
+    gchar *content = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    gchar *p;
+    GString *buff = NULL;
+    int i;
+    GSList *list_categories = NULL;
+
+    g_return_if_fail (filename != NULL);
+    g_return_if_fail (list != NULL);
+
+    g_slist_foreach (list, (GFunc)emoji_data_list_unify_categories, &list_categories);
+    if (list_categories == NULL) {
+        g_warning ("Not found categories in IBusEmojiData list");
+        return;
+    }
+
+    if (!g_file_get_contents (__FILE__, &content, &length, &error)) {
+        g_warning ("Failed to load %s: %s", __FILE__, error->message);
+        g_clear_pointer (&error, g_error_free);
+    }
+    buff = g_string_new (NULL);
+    p = content;
+    for (i = 0; i < LICENSE_LINES; i++, p++) {
+        if ((p = strchr (p, '\n')) == NULL)
+            break;
+    }
+    if (p != NULL) {
+        g_string_append (buff, g_strndup (content, p - content));
+        g_string_append_c (buff, '\n');
+    }
+    g_clear_pointer (&content, g_free);
+
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup_printf ("/* This file is generated by %s. */", __FILE__));
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup ("include <glib/gi18n.h>\n"));
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup ("#ifndef __IBUS_EMOJI_GEN_H_\n"));
+    g_string_append (buff, g_strdup ("#define __IBUS_EMOJI_GEN_H_\n"));
+    g_string_append (buff, g_strdup ("const static char *unicode_emoji_categories[] = {\n"));
+    list_categories = g_slist_sort (list_categories, (GCompareFunc)g_strcmp0);
+    g_slist_foreach (list_categories, (GFunc)category_list_dump, buff);
+    g_slist_free (list_categories);
+    g_string_append (buff, g_strdup ("};\n"));
+    g_string_append (buff, g_strdup ("#endif\n"));
+
+    if (!g_file_set_contents (filename, buff->str, -1, &error)) {
+        g_warning ("Failed to save emoji category file %s: %s", filename, error->message);
+        g_error_free (error);
+    }
+
+    g_string_free (buff, TRUE);
+}
 
 int
 main (int argc, char *argv[])
 {
     gchar *prgname;
+#ifdef HAVE_JSON_GLIB1
     gchar *json_file = NULL;
+#endif
+    gchar *emoji_dir = NULL;
     gchar *xml_file = NULL;
+    gchar *xml_derived_file = NULL;
+    gchar *xml_ascii_file = NULL;
     gchar *output = NULL;
+    gchar *output_category = NULL;
     GOptionEntry     entries[] = {
+#ifdef HAVE_JSON_GLIB1
         { "json", 'j', 0, G_OPTION_ARG_STRING, &json_file,
           "Parse Emoji One JSON file",
           "JSON"
         },
+#endif
+        { "unicode-emoji-dir", 'd', 0, G_OPTION_ARG_STRING, &emoji_dir,
+          "Parse Emoji files in DIRECTORY which includes emoji-test.txt " \
+          "emoji-sequences.txt emoji-zwj-sequences.txt in unicode.org",
+          "DIRECTORY"
+        },
         { "out", 'o', 0, G_OPTION_ARG_STRING, &output,
           "Save the emoji data as FILE",
           "FILE"
         },
+        { "out-category", 'C', 0, G_OPTION_ARG_STRING, &output_category,
+          "Save the translatable categories as FILE",
+          "FILE"
+        },
         { "xml", 'x', 0, G_OPTION_ARG_STRING, &xml_file,
           "Parse Unocode.org ANNOTATIONS file",
           "ANNOTATIONS"
         },
+        { "xml-derived", 'X', 0, G_OPTION_ARG_STRING, &xml_derived_file,
+          "Parse Unocode.org derived ANNOTATIONS file",
+          "ANNOTATIONS"
+        },
+        { "xml-ascii", 'A', 0, G_OPTION_ARG_STRING, &xml_ascii_file,
+          "Parse ASCII ANNOTATIONS file",
+          "ANNOTATIONS"
+        },
         { NULL }
     };
     GOptionContext *context;
@@ -638,12 +1138,22 @@ main (int argc, char *argv[])
     }
     g_option_context_free (context);
 
+#ifdef HAVE_JSON_GLIB1
     if (json_file)
         emojione_parse_json_file (json_file, &list);
+#endif
+    if (emoji_dir)
+        unicode_emoji_parse_dir (emoji_dir, &list);
     if (xml_file)
-        unicode_annotations_parse_xml_file (xml_file, &list);
+        unicode_annotations_parse_xml_file (xml_file, &list, FALSE);
+    if (xml_derived_file)
+        unicode_annotations_parse_xml_file (xml_derived_file, &list, TRUE);
+    if (xml_ascii_file)
+        unicode_annotations_parse_xml_file (xml_ascii_file, &list, FALSE);
     if (list != NULL && output)
         ibus_emoji_data_save (output, list);
+    if (list != NULL && output_category)
+        category_file_save (output_category, list);
     if (list)
         g_slist_free (list);
 
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index 4be092acb..d2e16c591 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -29,7 +29,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_EMOJI_DATA_MAGIC "IBusEmojiData"
-#define IBUS_EMOJI_DATA_VERSION (3)
+#define IBUS_EMOJI_DATA_VERSION (4)
 
 enum {
     PROP_0 = 0,
@@ -37,7 +37,6 @@ enum {
     PROP_ANNOTATIONS,
     PROP_DESCRIPTION,
     PROP_CATEGORY,
-    PROP_EMOJI_ALTERNATES
 };
 
 struct _IBusEmojiDataPrivate {
@@ -45,7 +44,6 @@ struct _IBusEmojiDataPrivate {
     GSList     *annotations;
     gchar      *description;
     gchar      *category;
-    gchar      *emoji_alternates;
 };
 
 #define IBUS_EMOJI_DATA_GET_PRIVATE(o)  \
@@ -108,7 +106,7 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
     /**
-     * IBusEmojiData:annotations:
+     * IBusEmojiData:annotations: (transfer container) (element-type utf8):
      *
      * The emoji annotations
      */
@@ -117,7 +115,7 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                     g_param_spec_pointer ("annotations",
                         "emoji annotations",
                         "The emoji annotation list",
-                        G_PARAM_READWRITE));
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
     /**
      * IBusEmojiData:description:
@@ -130,7 +128,7 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                         "emoji description",
                         "The emoji description",
                         "",
-                        G_PARAM_READWRITE));
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
     /**
      * IBusEmojiData:category:
@@ -144,19 +142,6 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
                         "The emoji category",
                         "",
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-    /**
-     * IBusEmojiData:emoji_alternates:
-     *
-     * The emoji alternate characters
-     */
-    g_object_class_install_property (gobject_class,
-                    PROP_EMOJI_ALTERNATES,
-                    g_param_spec_string ("emoji-alternates",
-                        "emoji alternate charasters",
-                        "The emoji alternate characters UTF-8",
-                        "",
-                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -209,10 +194,6 @@ ibus_emoji_data_set_property (IBusEmojiData *emoji,
         g_assert (emoji->priv->category == NULL);
         emoji->priv->category = g_value_dup_string (value);
         break;
-    case PROP_EMOJI_ALTERNATES:
-        g_assert (emoji->priv->emoji_alternates == NULL);
-        emoji->priv->emoji_alternates = g_value_dup_string (value);
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
     }
@@ -240,9 +221,6 @@ ibus_emoji_data_get_property (IBusEmojiData *emoji,
     case PROP_CATEGORY:
         g_value_set_string (value, ibus_emoji_data_get_category (emoji));
         break;
-    case PROP_EMOJI_ALTERNATES:
-        g_value_set_string (value, ibus_emoji_data_get_emoji_alternates(emoji));
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (emoji, prop_id, pspec);
     }
@@ -270,8 +248,6 @@ ibus_emoji_data_serialize (IBusEmojiData   *emoji,
     }
     g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->description));
     g_variant_builder_add (builder, "s", NOTNULL (emoji->priv->category));
-    g_variant_builder_add (builder, "s",
-                           NOTNULL (emoji->priv->emoji_alternates));
 #undef NOTNULL
     return TRUE;
 }
@@ -303,10 +279,6 @@ ibus_emoji_data_deserialize (IBusEmojiData *emoji,
                                      &emoji->priv->description);
     ibus_g_variant_get_child_string (variant, retval++,
                                      &emoji->priv->category);
-    if (g_variant_n_children (variant) < retval + 1)
-        return retval;
-    ibus_g_variant_get_child_string (variant, retval++,
-                                     &emoji->priv->emoji_alternates);
     return retval;
 }
 
@@ -325,7 +297,6 @@ ibus_emoji_data_copy (IBusEmojiData       *dest,
                                                       NULL);
     dest->priv->description      = g_strdup (src->priv->description);
     dest->priv->category         = g_strdup (src->priv->category);
-    dest->priv->emoji_alternates = g_strdup (src->priv->emoji_alternates);
     return TRUE;
 }
 
@@ -345,7 +316,6 @@ ibus_emoji_data_new (const gchar *first_property_name, ...)
     g_assert (emoji->priv->emoji != NULL);
     g_assert (emoji->priv->description != NULL);
     g_assert (emoji->priv->category != NULL);
-    g_assert (emoji->priv->emoji_alternates != NULL);
     return emoji;
 }
 
@@ -402,15 +372,6 @@ ibus_emoji_data_get_category (IBusEmojiData *emoji)
     return emoji->priv->category;
 }
 
-const gchar *
-ibus_emoji_data_get_emoji_alternates (IBusEmojiData *emoji)
-{
-    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), NULL);
-
-    return emoji->priv->emoji_alternates;
-}
-
-
 static void
 variant_foreach_add_emoji (IBusEmojiData   *emoji,
                            GVariantBuilder *builder)
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
index 233cadd66..eb24fdda6 100644
--- a/src/ibusemoji.h
+++ b/src/ibusemoji.h
@@ -155,20 +155,6 @@ void            ibus_emoji_data_set_description (IBusEmojiData *emoji,
 const gchar *   ibus_emoji_data_get_category    (IBusEmojiData *emoji);
 
 
-/**
- * ibus_emoji_data_get_emoji_alternates:
- * @emoji : An #IBusEmojiData
- *
- * Gets the emoji alternate characters in #IBusEmojiData. It should not be
- * freed. The alternates are defined in "unicode_alt" in EmojiOne json.
- *
- * Returns: emoji alternates property in #IBusEmojiData
- *
- */
-const gchar *   ibus_emoji_data_get_emoji_alternates
-                                                (IBusEmojiData *emoji);
-
-
 /**
  * ibus_emoji_dict_save:
  * @path: A path of the saved dictionary file.
diff --git a/src/ibusemojigen.h b/src/ibusemojigen.h
new file mode 100644
index 000000000..74a60157b
--- /dev/null
+++ b/src/ibusemojigen.h
@@ -0,0 +1,39 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016 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
+ * 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
+ */
+
+
+/* This file is generated by emoji-parser.c. */
+include <glib/gi18n.h>
+
+#ifndef __IBUS_EMOJI_GEN_H_
+#define __IBUS_EMOJI_GEN_H_
+const static char *unicode_emoji_categories[] = {
+    N_("Activities"),
+    N_("Animals & Nature"),
+    N_("Flags"),
+    N_("Food & Drink"),
+    N_("Objects"),
+    N_("Smileys & People"),
+    N_("Symbols"),
+    N_("Travel & Places"),
+};
+#endif
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index d2ae0d6cd..c55747429 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -82,7 +82,7 @@ AM_VALAFLAGS = \
 	$(NULL)
 
 MAINTAINERCLEANFILES =
-CONFIG_CLEAN_FILES =
+DISTCLEANFILES =
 noinst_DATA =
 
 if ENABLE_LIBNOTIFY
@@ -250,8 +250,7 @@ vapidir = $(datadir)/vala/vapi
 noinst_DATA += $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 MAINTAINERCLEANFILES += $(VAPIGEN_VAPIS)
-# for make distclean
-CONFIG_CLEAN_FILES += $(VAPIGEN_VAPIS)
+DISTCLEANFILES += $(VAPIGEN_VAPIS)
 EXTRA_DIST += $(VAPIGEN_VAPIS)
 
 endif
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 76dca6ce2..8f55bd4fd 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -167,6 +167,7 @@ class IBusEmojier : Gtk.Window {
     }
 
     private const uint EMOJI_GRID_PAGE = 10;
+    private const string EMOJI_CATEGORY_OTHERS = N_("Others");
 
     // Set the actual default values in the constructor
     // because these fields are used for class_init() and static functions,
@@ -372,8 +373,7 @@ class IBusEmojier : Gtk.Window {
 
 
     private static void update_annotation_to_emojis_dict(IBus.EmojiData data) {
-        string emoji = (data.get_emoji_alternates() != "") ?
-                data.get_emoji_alternates() : data.get_emoji();
+        string emoji = data.get_emoji();
         unowned GLib.SList<string> annotations = data.get_annotations();
         foreach (string annotation in annotations) {
             bool has_emoji = false;
@@ -434,23 +434,70 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private static string utf8_entity(string str) {
+        GLib.StringBuilder buff = new GLib.StringBuilder();
+        int length = str.char_count();
+        for (int i = 0; i < length; i++) {
+            unichar ch = str.get_char(0);
+            switch(ch) {
+            case '<':
+                buff.append("&lt;");
+                break;
+            case '>':
+                buff.append("&gt;");
+                break;
+            case '&':
+                buff.append("&amp;");
+                break;
+            default:
+                buff.append_unichar(ch);
+                break;
+            }
+            str = str.next_char();
+        }
+        return buff.str;
+    }
+
+
+    private static void
+    update_annotations_with_description (IBus.EmojiData data,
+                                         string         description) {
+        unowned GLib.SList<string> annotations = data.get_annotations();
+        bool update_annotations = false;
+        string former = null;
+        string later = null;
+        int index = description.index_of(": ");
+        if (index > 0) {
+            former = description.substring(0, index);
+            if (annotations.find_custom(former, GLib.strcmp) == null) {
+                annotations.append(former);
+                update_annotations = true;
+            }
+            later = description.substring(index + 2);
+        } else {
+            later = description.dup();
+        }
+        var words = later.split(" ");
+        // If the description has less than 3 words, add it to annotations
+        // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
+        if (words.length < 3 &&
+            annotations.find_custom(
+                    later,
+                    GLib.strcmp) == null) {
+            annotations.append(later);
+            update_annotations = true;
+        }
+        if (update_annotations)
+            data.set_annotations(annotations.copy_deep(GLib.strdup));
+    }
+
+
     private static void update_emoji_to_data_dict(IBus.EmojiData data,
                                                   string         lang) {
-        string emoji = (data.get_emoji_alternates() != "") ?
-                data.get_emoji_alternates() : data.get_emoji();
+        string emoji = data.get_emoji();
         if (lang == "en") {
             string description = utf8_down(data.get_description());
-            unowned GLib.SList<string> annotations = data.get_annotations();
-            var words = description.split(" ");
-            // If the description has less than 3 words, add it to annotations
-            // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
-            if (words.length < 3 &&
-                annotations.find_custom(
-                        description,
-                        GLib.strcmp) == null) {
-                annotations.append(description);
-                data.set_annotations(annotations.copy_deep(GLib.strdup));
-            }
+            update_annotations_with_description (data, description);
             m_emoji_to_data_dict.replace(emoji, data);
         } else {
             unowned IBus.EmojiData? en_data =
@@ -462,16 +509,8 @@ class IBusEmojier : Gtk.Window {
             string trans_description = data.get_description();
             en_data.set_description(trans_description);
             trans_description = utf8_down(trans_description);
+            update_annotations_with_description (data, trans_description);
             unowned GLib.SList<string> annotations = data.get_annotations();
-            var words = trans_description.split(" ");
-            // If the description has less than 3 words, add it to annotations
-            // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
-            if (words.length < 3 &&
-                annotations.find_custom(
-                        trans_description,
-                        GLib.strcmp) == null) {
-                annotations.append(trans_description);
-            }
             unowned GLib.SList<string> en_annotations
                 = en_data.get_annotations();
             foreach (string annotation in en_annotations) {
@@ -489,10 +528,11 @@ class IBusEmojier : Gtk.Window {
 
     private static void update_category_to_emojis_dict(IBus.EmojiData data,
                                                        string         lang) {
-        string emoji = (data.get_emoji_alternates() != "") ?
-                data.get_emoji_alternates() : data.get_emoji();
+        string emoji = data.get_emoji();
         string category = data.get_category();
-        if (lang == "en" && category != "") {
+        if (category == "")
+            category = EMOJI_CATEGORY_OTHERS;
+        if (lang == "en") {
             bool has_emoji = false;
             unowned GLib.SList<string> hits =
                     m_category_to_emojis_dict.lookup(category);
@@ -562,9 +602,17 @@ class IBusEmojier : Gtk.Window {
                 m_category_to_emojis_dict.get_keys();
         // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
         categories.sort((a, b) => {
+            if (a == EMOJI_CATEGORY_OTHERS && b != EMOJI_CATEGORY_OTHERS)
+                return 1;
+            else if (a != EMOJI_CATEGORY_OTHERS && b == EMOJI_CATEGORY_OTHERS)
+                return -1;
             return GLib.strcmp(_(a), _(b));
         });
         foreach (unowned string category in categories) {
+            // "Others" category includes next unicode chars and fonts do not support
+            // the base and varints yet.
+            if (category == EMOJI_CATEGORY_OTHERS)
+               continue;
             EBoxRow row = new EBoxRow(category);
             string locale_category = _(category);
             EPaddedLabelBox widget =
@@ -718,7 +766,7 @@ class IBusEmojier : Gtk.Window {
         uint page_end_pos = uint.min(page_start_pos + page_size, ncandidates);
         if (m_backward != null) {
             string backward_desc =
-                    "%s (%u / %u)".printf(m_backward, cursor, ncandidates - 1);
+                    "%s (%u / %u)".printf(_(m_backward), cursor, ncandidates - 1);
             EPaddedLabelBox label =
                     new EPaddedLabelBox(backward_desc,
                                         Gtk.Align.CENTER,
@@ -746,7 +794,7 @@ class IBusEmojier : Gtk.Window {
                 int font_size = m_emoji_font_size - 2;
                 string emoji_font = "%s %d".printf(font_family, font_size);
                 string markup = "<span font=\"%s\">%s</span>".
-                        printf(emoji_font, candidate.get_text());
+                        printf(emoji_font, utf8_entity(candidate.get_text()));
                 label.set_markup(markup);
             }
             label.set_halign(Gtk.Align.FILL);

From 0836c3ffd6764969dfaa9953f52a24c1cbf2c983 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 6 May 2017 00:22:50 +0900
Subject: [PATCH 405/816] Support to match emoji annotations with partial
 string

Now ibus-setup has a new tab of "Emoji" and it provides
the options to choose a condtion and length to match
emoji annotations partically.

R=alexepico@gmail.com, penghuang@google.com

Review URL: https://codereview.appspot.com/319700043
---
 data/ibus.schemas.in    |  39 ++++
 setup/main.py           | 121 ++++++++--
 setup/setup.ui          | 491 +++++++++++++++++++++++++---------------
 ui/gtk3/emojier.vala    |  64 +++++-
 ui/gtk3/emojierapp.vala |  52 ++++-
 ui/gtk3/panel.vala      |  22 ++
 6 files changed, 582 insertions(+), 207 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 096dd71a5..0647004a4 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -403,6 +403,45 @@
                   if this list has any characters.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/has-partial-match</key>
+      <applyto>/desktop/ibus/panel/emoji/has-partial-match</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether emoji annotaions can be match partially or not</short>
+	    <long>Whether emoji annotations can be matched with a partial
+                  string instead of the exact match or not.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/partial-match-length</key>
+      <applyto>/desktop/ibus/panel/emoji/partial-match-length</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>3</default>
+      <locale name="C">
+        <short>Match emoji annotaions with the specified length</short>
+	    <long>Match emoji annotations partially with more than
+                  the specified number of characters instead of
+                  the exact match.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/partial-match-condition</key>
+      <applyto>/desktop/ibus/panel/emoji/partial-match-condition</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Choose a condition to match emoji annotations partially</short>
+	    <long>Choose one of the following conditions to match emoji
+	          annotations partially:
+                  0 == Prefix match, 1 == Suffix match, 2 == Containing match
+                  </long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/embed_preedit_text</key>
       <applyto>/desktop/ibus/general/embed_preedit_text</applyto>
diff --git a/setup/main.py b/setup/main.py
index 7839cea21..f0eee9964 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -187,19 +187,6 @@ def __init_panel(self):
                                     self.__fontbutton_custom_font,
                                    'sensitive',
                                    Gio.SettingsBindFlags.GET)
-        self.__fontbutton_emoji_font = self.__builder.get_object(
-                'fontbutton_emoji_font')
-        self.__fontbutton_emoji_font.set_preview_text('🙂🍎🚃💓📧⚽🐳');
-        self.__settings_emoji.bind('font',
-                                    self.__fontbutton_emoji_font,
-                                   'font-name',
-                                   Gio.SettingsBindFlags.DEFAULT)
-        self.__button_emoji_lang = self.__builder.get_object(
-                'button_emoji_lang')
-        self.__settings_emoji.bind('lang',
-                                    self.__button_emoji_lang,
-                                   'lang',
-                                   Gio.SettingsBindFlags.DEFAULT)
 
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(
@@ -287,6 +274,113 @@ def __init_general(self):
         self.__treeview.connect("notify::active-engine", self.__treeview_notify_cb)
         self.__treeview.connect("notify::engines", self.__treeview_notify_cb)
 
+    def __init_emoji(self):
+        self.__fontbutton_emoji_font = self.__builder.get_object(
+                'fontbutton_emoji_font')
+        self.__fontbutton_emoji_font.set_preview_text('🙂🍎🚃💓📧⚽🐳');
+        self.__settings_emoji.bind('font',
+                                    self.__fontbutton_emoji_font,
+                                   'font-name',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__button_emoji_lang = self.__builder.get_object(
+                'button_emoji_lang')
+        self.__settings_emoji.bind('lang',
+                                    self.__button_emoji_lang,
+                                   'lang',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__checkbutton_emoji_partial_match = self.__builder.get_object(
+                'checkbutton_emoji_partial_match')
+        checkbutton_label = self.__checkbutton_emoji_partial_match.get_child()
+        if type(checkbutton_label) == Gtk.Label:
+            checkbutton_label.set_property('wrap', True)
+            checkbutton_label.set_property('max-width-chars', 74)
+        self.__spinbutton_emoji_partial_match = self.__builder.get_object(
+                'spinbutton_emoji_partial_match')
+        self.__settings_emoji.bind('has-partial-match',
+                                   self.__checkbutton_emoji_partial_match,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__settings_emoji.bind('has-partial-match',
+                                   self.__spinbutton_emoji_partial_match,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.GET)
+
+        def adjustment_value_changed_cb(obj):
+            key = 'partial-match-length'
+            value = int(adjustment.get_value())
+            if value == self.__settings_emoji.get_int(key):
+                return
+            self.__settings_emoji.set_int(key, value)
+        def settings_emoji_partial_match_length_cb(settings, key):
+            value = self.__settings_emoji.get_int(key)
+            old_value = int(self.__spinbutton_emoji_partial_match.get_value())
+            if value == old_value:
+                return
+            self.__spinbutton_emoji_partial_match.set_value(value)
+        settings_emoji_partial_match_length_cb(None, 'partial-match-length')
+        adjustment = self.__spinbutton_emoji_partial_match.get_adjustment()
+        adjustment.connect('value-changed', adjustment_value_changed_cb)
+        self.__settings_emoji.connect('changed::partial-match-length',
+                                      settings_emoji_partial_match_length_cb)
+
+        self.__hbox_emoji_partial_match = self.__builder.get_object(
+                'hbox_emoji_partial_match')
+        self.__settings_emoji.bind('has-partial-match',
+                                   self.__hbox_emoji_partial_match,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.GET)
+        self.__radiobutton_emoji_prefix_match = self.__builder.get_object(
+                'radiobutton_emoji_prefix_match')
+        self.__radiobutton_emoji_suffix_match = self.__builder.get_object(
+                'radiobutton_emoji_suffix_match')
+        self.__radiobutton_emoji_contain_match = self.__builder.get_object(
+                'radiobutton_emoji_contain_match')
+
+        def radiobuton_emoji_partial_match_cb(obj):
+            key = 'partial-match-condition'
+            condition = 0
+            if not obj.get_active():
+                return
+            if obj == self.__radiobutton_emoji_prefix_match:
+                condition = 0
+            elif obj == self.__radiobutton_emoji_suffix_match:
+                condition = 1
+            elif obj == self.__radiobutton_emoji_contain_match:
+                condition = 2
+            else:
+                print('Wrong emoji partial match object')
+                return
+            self.__settings_emoji.set_int(key, condition)
+        def settings_emoji_partial_match_condition_cb(settings, key):
+            value = self.__settings_emoji.get_int(key)
+            obj = None
+            if value == 0:
+                obj = self.__radiobutton_emoji_prefix_match
+            elif value == 1:
+                obj = self.__radiobutton_emoji_suffix_match
+            elif value == 2:
+                obj = self.__radiobutton_emoji_contain_match
+            else:
+                print('Wrong emoji partial match condition')
+                return
+            if obj.get_active():
+                return
+            obj.set_active(True)
+
+        settings_emoji_partial_match_condition_cb(None,
+                                                  'partial-match-condition')
+        self.__radiobutton_emoji_prefix_match.connect(
+                'toggled',
+                radiobuton_emoji_partial_match_cb)
+        self.__radiobutton_emoji_suffix_match.connect(
+                'toggled',
+                radiobuton_emoji_partial_match_cb)
+        self.__radiobutton_emoji_contain_match.connect(
+                'toggled',
+                radiobuton_emoji_partial_match_cb)
+        self.__settings_emoji.connect('changed::partial-match-condition',
+                                      settings_emoji_partial_match_condition_cb)
+
     def __init_ui(self):
         # add icon search path
         self.__window = self.__builder.get_object("window_preferences")
@@ -306,6 +400,7 @@ def __init_ui(self):
         self.__init_hotkeys()
         self.__init_panel()
         self.__init_general()
+        self.__init_emoji()
 
     def __gdk_window_set_cb(self, object, pspec):
         window = object.get_window()
diff --git a/setup/setup.ui b/setup/setup.ui
index 54ef91644..322f51467 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -55,6 +55,14 @@
       </row>
     </data>
   </object>
+  <object class="GtkAdjustment" id="adjustment_emoji_partial_match">
+    <property name="value">3.0</property>
+    <property name="lower">1.0</property>
+    <property name="upper">255.0</property>
+    <property name="step-increment">1.0</property>
+    <property name="page-increment">10.0</property>
+    <property name="page-size">10.0</property>
+  </object>
   <object class="GtkWindow" id="window_preferences">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -109,8 +117,6 @@
                             <property name="label" translatable="yes">Next input method:</property>
                           </object>
                           <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
@@ -125,68 +131,12 @@
                             <property name="label" translatable="yes">Previous input method:</property>
                           </object>
                           <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="emoji_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">The shortcut keys for showing emoji dialog</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji choice:</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkBox" id="hbox4">
-                            <property name="orientation">horizontal</property>
-                            <property name="no_show_all">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkEntry" id="entry_trigger">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="editable">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="button_trigger">
-                                <property name="label" translatable="yes">...</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
                         <child>
                           <object class="GtkBox" id="hbox5">
                             <property name="orientation">horizontal</property>
@@ -225,8 +175,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
@@ -270,51 +218,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="emoji_hbox">
-                            <property name="orientation">horizontal</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkEntry" id="entry_emoji_dialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="editable">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="button_emoji_dialog">
-                                <property name="label" translatable="yes">...</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
@@ -327,6 +232,8 @@
                             <property name="label" translatable="yes">Enable or disable:</property>
                           </object>
                           <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
@@ -339,8 +246,8 @@
                             <property name="label" translatable="yes">Enable:</property>
                           </object>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
@@ -383,8 +290,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
@@ -396,8 +303,8 @@
                             <property name="label" translatable="yes">Disable:</property>
                           </object>
                           <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
@@ -440,8 +347,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
@@ -675,68 +582,6 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label_emoji_font">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Set a font of emoji candidates on the emoji dialog</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji font:</property>
-                            <property name="justify">right</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFontButton" id="fontbutton_emoji_font">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_emoji_lang">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Set a language of emoji annotations on the emoji dialog</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji annotation language:</property>
-                            <property name="justify">right</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">8</property>
-                            <property name="bottom_attach">9</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="EmojiLangButton" id="button_emoji_lang">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">8</property>
-                            <property name="bottom_attach">9</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
                       </object>
                     </child>
                     <child type="label">
@@ -1026,6 +871,292 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="vbox_emoji1">
+                <property name="orientation">vertical</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">18</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
+                <child>
+                  <object class="GtkFrame" id="frame_emoji1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkTable" id="table_emoji1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_rows">5</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">12</property>
+                        <child>
+                          <object class="GtkLabel" id="label_emoji1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys for showing emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji choice:</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox_emoji1">
+                            <property name="orientation">horizontal</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_emoji_dialog">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_emoji_dialog">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label_emoji2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Keyboard Shortcuts&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame_emoji2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkGrid" id="table_emoji2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_left">12</property>
+                        <property name="row_homogeneous">false</property>
+                        <child>
+                          <object class="GtkLabel" id="label_emoji_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set a font of emoji candidates on the emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji font:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFontButton" id="fontbutton_emoji_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <!-- property name="right_attach">2</property -->
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label_emoji_lang">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Set a language of emoji annotations on the emoji dialog</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Emoji annotation language:</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="EmojiLangButton" id="button_emoji_lang">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_emoji_partial_match">
+                            <property name="label" translatable="yes">Match emoji annotations partially with the following condition and more than the number of characters:</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">If emoji annotations can be matched with a partial string instead of the exact match</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="valign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="width">2</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="spinbutton_emoji_partial_match">
+                            <property name="adjustment">adjustment_emoji_partial_match</property>
+                            <property name="value">3.0</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="width">2</property>
+                            <property name="top_attach">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox_emoji_partial_match">
+                            <property name="orientation">horizontal</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobutton_emoji_prefix_match">
+                                <property name="label" translatable="yes">Prefix match</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="halign">start</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobutton_emoji_suffix_match">
+                                <property name="label" translatable="yes">Suffix match</property>
+                                <property name="group">radiobutton_emoji_prefix_match</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="halign">start</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobutton_emoji_contain_match">
+                                <property name="label" translatable="yes">Containing match</property>
+                                <property name="group">radiobutton_emoji_prefix_match</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="halign">start</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="width">2</property>
+                            <property name="top_attach">4</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label_emoji3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Font and Style&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="emoji_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Emoji</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox" id="vbox7">
                 <property name="orientation">vertical</property>
@@ -1134,7 +1265,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child type="tab">
@@ -1214,7 +1345,7 @@ Homepage: https://github.com/ibus/ibus/wiki
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
             <child type="tab">
@@ -1224,7 +1355,7 @@ Homepage: https://github.com/ibus/ibus/wiki
                 <property name="label" translatable="yes">About</property>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">4</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8f55bd4fd..76d5fed8d 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -177,6 +177,9 @@ class IBusEmojier : Gtk.Window {
     private static int m_emoji_font_size;
     private static string[] m_favorites;
     private static int m_emoji_max_seq_len;
+    private static bool m_has_partial_match;
+    private static uint m_partial_match_length;
+    private static uint m_partial_match_condition;
     private static GLib.HashTable<string, GLib.SList>?
             m_annotation_to_emojis_dict;
     private static GLib.HashTable<string, IBus.EmojiData>?
@@ -738,16 +741,53 @@ class IBusEmojier : Gtk.Window {
         }
         // Call check_unicode_point() to get m_unicode_point
         check_unicode_point();
-        unowned GLib.SList<string>? emojis =
-            m_annotation_to_emojis_dict.lookup(annotation);
-        if (emojis == null && m_unicode_point == null) {
+        GLib.SList<string>? total_emojis = null;
+        unowned GLib.SList<string>? sub_emojis = null;
+        int length = annotation.length;
+        if (m_has_partial_match && length >= m_partial_match_length) {
+            foreach (unowned string key in
+                     m_annotation_to_emojis_dict.get_keys()) {
+                if (key.length < length)
+                    continue;
+                bool matched = false;
+                switch(m_partial_match_condition) {
+                case 0:
+                    if (key.has_prefix(annotation))
+                        matched = true;
+                    break;
+                case 1:
+                    if (key.has_suffix(annotation))
+                        matched = true;
+                    break;
+                case 2:
+                    if (key.str(annotation) != null)
+                        matched = true;
+                    break;
+                default:
+                    break;
+                }
+                if (!matched)
+                    continue;
+                sub_emojis = m_annotation_to_emojis_dict.lookup(key);
+                foreach (unowned string emoji in sub_emojis) {
+                    if (total_emojis.find_custom(emoji, GLib.strcmp) == null) {
+                        total_emojis.append(emoji);
+                    }
+                }
+            }
+        } else {
+            sub_emojis = m_annotation_to_emojis_dict.lookup(annotation);
+            foreach (unowned string emoji in sub_emojis)
+                total_emojis.append(emoji);
+        }
+        if (total_emojis == null && m_unicode_point == null) {
             hide_candidate_panel();
             return;
         }
         m_lookup_table.clear();
         // Call check_unicode_point() to update m_lookup_table
         check_unicode_point();
-        foreach (unowned string emoji in emojis) {
+        foreach (unowned string emoji in total_emojis) {
             IBus.Text text = new IBus.Text.from_string(emoji);
             m_lookup_table.append_candidate(text);
         }
@@ -1331,6 +1371,22 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    public static void set_partial_match(bool has_partial_match) {
+        m_has_partial_match = has_partial_match;
+    }
+
+    public static void set_partial_match_length(int length) {
+        if (length < 1)
+            return;
+        m_partial_match_length = length;
+    }
+
+    public static void set_partial_match_condition(int condition) {
+        if (condition < 0)
+            return;
+        m_partial_match_condition = condition;
+    }
+
     public static void set_favorites(string[]? unowned_favorites) {
         m_favorites = {};
         foreach (string favorite in unowned_favorites) {
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index cbdd8ba5f..dbdbc2763 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -22,6 +22,9 @@
 
 string emoji_font = null;
 string annotation_lang = null;
+bool partial_match = false;
+int partial_match_length = -1;
+int partial_match_condition = -1;
 
 public class EmojiApplication : Application {
     private IBusEmojier? m_emojier;
@@ -65,17 +68,28 @@ public class EmojiApplication : Application {
 
         const OptionEntry[] options = {
             { "font", 0, 0, OptionArg.STRING, out emoji_font,
-                /* TRANSLATORS: "FONT" should be capital and translatable.
-                 * It's used for an argument command --font=FONT
-                 */
-                N_("\"FONT\" for emoji chracters on emoji dialog"),
-                N_("FONT") },
+              /* TRANSLATORS: "FONT" should be capital and translatable.
+               * It's used for an argument command --font=FONT
+               */
+              N_("\"FONT\" for emoji chracters on emoji dialog"),
+              N_("FONT") },
             { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
-                /* TRANSLATORS: "LANG" should be capital and translatable.
-                 * It's used for an argument command --lang=LANG
-                 */
-                N_("\"LANG\" for annotations on emoji dialog. E.g. \"en\""),
-                N_("LANG") },
+              /* TRANSLATORS: "LANG" should be capital and translatable.
+               * It's used for an argument command --lang=LANG
+               */
+              N_("\"LANG\" for annotations on emoji dialog. E.g. \"en\""),
+              N_("LANG") },
+            { "partial-match", 0, 0, OptionArg.NONE, out partial_match,
+              N_("Emoji annotaions can be match partially"),
+              null },
+            { "partial-match-length", 0, 0, OptionArg.INT,
+              out partial_match_length,
+              N_("Match with the length of the specified integer"),
+              null },
+            { "partial-match-condition", 0, 0, OptionArg.INT,
+              out partial_match_condition,
+              N_("Match with the condition of the specified integer"),
+              null },
             { null }
         };
 
@@ -111,6 +125,24 @@ public class EmojiApplication : Application {
         if (annotation_lang == null)
             annotation_lang = m_settings_emoji.get_string("lang");
         IBusEmojier.set_annotation_lang(annotation_lang);
+        IBusEmojier.set_partial_match(partial_match);
+        if (partial_match_length > 0) {
+            IBusEmojier.set_partial_match_length(partial_match_length);
+        } else {
+            IBusEmojier.set_partial_match_length(
+                    m_settings_emoji.get_int("partial-match-length"));
+        }
+        if (partial_match_condition > 2) {
+            warning("Need condition between 0 and 2.");
+            IBusEmojier.set_partial_match_condition(
+                    m_settings_emoji.get_int("partial-match-condition"));
+        }
+        else if (partial_match_condition >= 0) {
+            IBusEmojier.set_partial_match_condition(partial_match_condition);
+        } else {
+            IBusEmojier.set_partial_match_condition(
+                    m_settings_emoji.get_int("partial-match-condition"));
+        }
 
         if (emoji_font != null)
             IBusEmojier.set_emoji_font(emoji_font);
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 745489b07..5f0009eef 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -248,6 +248,18 @@ class Panel : IBus.PanelService {
         m_settings_emoji.changed["lang"].connect((key) => {
                 set_emoji_lang();
         });
+
+        m_settings_emoji.changed["has-partial-match"].connect((key) => {
+                set_emoji_partial_match();
+        });
+
+        m_settings_emoji.changed["partial-match-length"].connect((key) => {
+                set_emoji_partial_match();
+        });
+
+        m_settings_emoji.changed["partial-match-condition"].connect((key) => {
+                set_emoji_partial_match();
+        });
     }
 
 #if INDICATOR
@@ -782,6 +794,15 @@ class Panel : IBus.PanelService {
         });
     }
 
+    private void set_emoji_partial_match() {
+        IBusEmojier.set_partial_match(
+                m_settings_emoji.get_boolean("has-partial-match"));
+        IBusEmojier.set_partial_match_length(
+                m_settings_emoji.get_int("partial-match-length"));
+        IBusEmojier.set_partial_match_condition(
+                m_settings_emoji.get_int("partial-match-condition"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -897,6 +918,7 @@ class Panel : IBus.PanelService {
         set_property_icon_delay_time();
         set_emoji_favorites();
         set_emoji_lang();
+        set_emoji_partial_match();
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {

From edcb4a0259d2833904e7d1aac7c74e1aa49cea5b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 8 May 2017 12:25:54 +0900
Subject: [PATCH 406/816] ui/gtk3: Hide emoji variants by default

The emoji variants, i.e. skin colors and additional items, would not
be used in most cases and it is nice to hide it by default.
Now added GtkMenu and changed GtkWindow to GtkApplicationWindow
for the menu.

R=penghuang@google.com

Review URL: https://codereview.appspot.com/322970043
---
 ui/gtk3/emojier.vala | 299 ++++++++++++++++++++++++++++++-------------
 1 file changed, 211 insertions(+), 88 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 76d5fed8d..db7520a46 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -20,7 +20,7 @@
  * USA
  */
 
-class IBusEmojier : Gtk.Window {
+class IBusEmojier : Gtk.ApplicationWindow {
     private class EEntry : Gtk.SearchEntry {
         public EEntry() {
             GLib.Object(
@@ -97,6 +97,15 @@ class IBusEmojier : Gtk.Window {
                 set_label(text);
         }
     }
+    private class EGoldLabel : Gtk.Label {
+        public EGoldLabel(string text) {
+            GLib.Object(
+                name : "IBusEmojierGoldLabel"
+            );
+            if (text != "")
+                set_label(text);
+        }
+    }
     private class EPaddedLabel : Gtk.Label {
         public EPaddedLabel(string          text,
                             Gtk.Align       align) {
@@ -150,11 +159,21 @@ class IBusEmojier : Gtk.Window {
             var vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
             set_custom_title(vbox);
             var label = new Gtk.Label(title);
-            label.get_style_context().add_class("title");
+            label.get_style_context().add_class(Gtk.STYLE_CLASS_TITLE);
             vbox.pack_start(label, true, false, 0);
             m_lang_label = new Gtk.Label(null);
-            m_lang_label.get_style_context().add_class("subtitle");
+            m_lang_label.get_style_context().add_class(
+                    Gtk.STYLE_CLASS_SUBTITLE);
             vbox.pack_start(m_lang_label, true, false, 0);
+
+            var menu = new GLib.Menu();
+            menu.append(_("Show emoji variants"), "win.variant");
+            var menu_button = new Gtk.MenuButton();
+            menu_button.set_direction(Gtk.ArrowType.NONE);
+            menu_button.set_valign(Gtk.Align.CENTER);
+            menu_button.set_menu_model(menu);
+            menu_button.set_tooltip_text(_("Menu"));
+            pack_end(menu_button);
         }
         public void set_lang_label(string str) {
             m_lang_label.set_text(str);
@@ -167,7 +186,13 @@ class IBusEmojier : Gtk.Window {
     }
 
     private const uint EMOJI_GRID_PAGE = 10;
+    private const string EMOJI_CATEGORY_FAVORITES = N_("Favorites");
     private const string EMOJI_CATEGORY_OTHERS = N_("Others");
+    private const unichar[] EMOJI_VARIANT_LIST = {
+            0x1f3fb, 0x1f3fc, 0x1f3fd, 0x1f3fe, 0x1f3ff, 0x200d };
+    private const GLib.ActionEntry[] m_action_entries = {
+        { "variant", check_action_variant_cb, null, "false", null }
+    };
 
     // Set the actual default values in the constructor
     // because these fields are used for class_init() and static functions,
@@ -180,18 +205,22 @@ class IBusEmojier : Gtk.Window {
     private static bool m_has_partial_match;
     private static uint m_partial_match_length;
     private static uint m_partial_match_condition;
-    private static GLib.HashTable<string, GLib.SList>?
+    private static bool m_show_emoji_variant = false;
+    private static GLib.HashTable<string, GLib.SList<string>>?
             m_annotation_to_emojis_dict;
     private static GLib.HashTable<string, IBus.EmojiData>?
             m_emoji_to_data_dict;
-    private static GLib.HashTable<string, GLib.SList>?
+    private static GLib.HashTable<string, GLib.SList<string>>?
             m_category_to_emojis_dict;
+    private static GLib.HashTable<string, GLib.SList<string>>?
+            m_emoji_to_emoji_variants_dict;
 
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
     private ETitleLabelBox m_title;
     private EEntry m_entry;
     private string? m_backward;
+    private int m_backward_index = -1;
     private EScrolledWindow? m_scrolled_window = null;
     private EListBox m_list_box;
     private bool m_is_running = false;
@@ -200,7 +229,7 @@ class IBusEmojier : Gtk.Window {
     private string? m_result;
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
-    int m_category_active_index;
+    private int m_category_active_index;
     private IBus.LookupTable m_lookup_table;
     private Gtk.Label[] m_candidates;
     private bool m_enter_notify_enable = true;
@@ -223,6 +252,7 @@ class IBusEmojier : Gtk.Window {
             focus_visible : true
         );
 
+        add_action_entries(m_action_entries, this);
         if (m_current_lang_id == null)
             m_current_lang_id = "en";
         if (m_emoji_font_family == null)
@@ -270,6 +300,13 @@ class IBusEmojier : Gtk.Window {
                         "rgba(%u, %u, %u, %lf); ".printf(
                         bg_red, bg_green, bg_blue, bg_alpha) +
                 "border-width: 4px; border-radius: 3px; }";
+        data += "#IBusEmojierGoldLabel { color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        fg_red, fg_green, fg_blue, fg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
+                "background-color: #b09c5f; " +
+                "border-width: 4px; border-radius: 3px; }";
 
         Gtk.CssProvider css_provider = new Gtk.CssProvider();
         try {
@@ -317,10 +354,7 @@ class IBusEmojier : Gtk.Window {
         });
 
         candidate_clicked.connect((i, b, s) => {
-            IBus.Text candidate = m_lookup_table.get_candidate(i);
-            m_result = candidate.text;
-            m_loop.quit();
-            hide_candidate_panel();
+            candidate_panel_select_index(i);
         });
 
         if (m_annotation_to_emojis_dict == null) {
@@ -345,14 +379,17 @@ class IBusEmojier : Gtk.Window {
 
     private static void init_emoji_dict() {
         m_annotation_to_emojis_dict =
-                new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
-                                                       GLib.str_equal);
+                new GLib.HashTable<string, GLib.SList<string>>(GLib.str_hash,
+                                                               GLib.str_equal);
         m_emoji_to_data_dict =
                 new GLib.HashTable<string, IBus.EmojiData>(GLib.str_hash,
                                                            GLib.str_equal);
         m_category_to_emojis_dict =
-                new GLib.HashTable<string, GLib.SList>(GLib.str_hash,
-                                                       GLib.str_equal);
+                new GLib.HashTable<string, GLib.SList<string>>(GLib.str_hash,
+                                                               GLib.str_equal);
+        m_emoji_to_emoji_variants_dict =
+                new GLib.HashTable<string, GLib.SList<string>>(GLib.str_hash,
+                                                               GLib.str_equal);
     }
 
 
@@ -390,14 +427,16 @@ class IBusEmojier : Gtk.Window {
             }
             if (!has_emoji) {
                 hits.append(emoji);
-                m_annotation_to_emojis_dict.replace(annotation, hits.copy());
+                m_annotation_to_emojis_dict.replace(
+                        annotation,
+                        hits.copy_deep(GLib.strdup));
             }
         }
     }
 
 
     private static string utf8_down(string str) {
-        GLib.StringBuilder buff = new GLib.StringBuilder();
+        var buff = new GLib.StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
             buff.append_unichar(str.get_char(0).tolower());
@@ -407,23 +446,8 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private static string utf8_title(string str) {
-        StringBuilder buff = new StringBuilder();
-        int length = str.char_count();
-        for (int i = 0; i < length; i++) {
-            unichar ch = str.get_char(0);
-            if (i == 0)
-                buff.append_unichar(ch.toupper());
-            else
-                buff.append_unichar(ch);
-            str = str.next_char();
-        }
-        return buff.str;
-    }
-
-
     private static string utf8_code_point(string str) {
-        StringBuilder buff = new StringBuilder();
+        var buff = new GLib.StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
             unichar ch = str.get_char(0);
@@ -438,7 +462,7 @@ class IBusEmojier : Gtk.Window {
 
 
     private static string utf8_entity(string str) {
-        GLib.StringBuilder buff = new GLib.StringBuilder();
+        var buff = new GLib.StringBuilder();
         int length = str.char_count();
         for (int i = 0; i < length; i++) {
             unichar ch = str.get_char(0);
@@ -503,8 +527,19 @@ class IBusEmojier : Gtk.Window {
             update_annotations_with_description (data, description);
             m_emoji_to_data_dict.replace(emoji, data);
         } else {
-            unowned IBus.EmojiData? en_data =
-                    m_emoji_to_data_dict.lookup(emoji);
+            unowned IBus.EmojiData? en_data = null;
+            // If emoji presentation (+= 0xfe0f) is already saved in dict,
+            // update it instead of no presentation.
+            // emoji-test.txt has all emoji presentations but $lang.xml has
+            // some no emoji presentations.
+            if (emoji.chr(-1, 0xfe0f) == null) {
+                var buff = new GLib.StringBuilder();
+                buff.append(emoji);
+                buff.append_unichar(0xfe0f);
+                en_data = m_emoji_to_data_dict.lookup(buff.str);
+            }
+            if (en_data == null)
+                en_data = m_emoji_to_data_dict.lookup(emoji);
             if (en_data == null) {
                 m_emoji_to_data_dict.insert(emoji, data);
                 return;
@@ -536,6 +571,36 @@ class IBusEmojier : Gtk.Window {
         if (category == "")
             category = EMOJI_CATEGORY_OTHERS;
         if (lang == "en") {
+            bool has_variant = false;
+            foreach (unichar ch in EMOJI_VARIANT_LIST) {
+                if (emoji.chr(-1, ch) != null) {
+                    has_variant = true;
+                    break;
+                }
+            }
+            // If emoji includes variants (skin colors and items),
+            // it's escaped in m_emoji_to_emoji_variants_dict and
+            // not shown by default.
+            if (has_variant) {
+                unichar base_ch = emoji.get_char();
+                string base_emoji  = base_ch.to_string();
+                var buff = new GLib.StringBuilder();
+                buff.append_unichar(base_ch);
+                buff.append_unichar(0xfe0f);
+                if (m_emoji_to_data_dict.lookup(buff.str) != null)
+                    base_emoji = buff.str;
+                unowned GLib.SList<string>? variants =
+                    m_emoji_to_emoji_variants_dict.lookup(base_emoji);
+                if (variants.find_custom(emoji, GLib.strcmp) == null) {
+                    if (variants == null)
+                        variants.append(base_emoji);
+                    variants.append(emoji);
+                    m_emoji_to_emoji_variants_dict.replace(
+                            base_emoji,
+                            variants.copy_deep(GLib.strdup));
+                }
+                return;
+            }
             bool has_emoji = false;
             unowned GLib.SList<string> hits =
                     m_category_to_emojis_dict.lookup(category);
@@ -547,7 +612,8 @@ class IBusEmojier : Gtk.Window {
             }
             if (!has_emoji) {
                 hits.append(emoji);
-                m_category_to_emojis_dict.replace(category, hits.copy());
+                m_category_to_emojis_dict.replace(category,
+                                                  hits.copy_deep(GLib.strdup));
             }
         }
     }
@@ -588,14 +654,15 @@ class IBusEmojier : Gtk.Window {
         m_list_box.row_activated.connect((box, gtkrow) => {
             m_category_active_index = 0;
             EBoxRow row = gtkrow as EBoxRow;
-            show_emoji_for_category(row);
+            show_emoji_for_category(row.text);
         });
 
         uint n = 1;
         if (m_favorites.length > 0) {
-            EBoxRow row = new EBoxRow("@favorites");
+            EBoxRow row = new EBoxRow(EMOJI_CATEGORY_FAVORITES);
             EPaddedLabelBox widget =
-                    new EPaddedLabelBox(_("Favorites"), Gtk.Align.CENTER);
+                    new EPaddedLabelBox(_(EMOJI_CATEGORY_FAVORITES),
+                                        Gtk.Align.CENTER);
             row.add(widget);
             m_list_box.add(row);
             if (n++ == m_category_active_index)
@@ -617,10 +684,8 @@ class IBusEmojier : Gtk.Window {
             if (category == EMOJI_CATEGORY_OTHERS)
                continue;
             EBoxRow row = new EBoxRow(category);
-            string locale_category = _(category);
             EPaddedLabelBox widget =
-                    new EPaddedLabelBox(utf8_title(locale_category),
-                                        Gtk.Align.CENTER);
+                    new EPaddedLabelBox(_(category), Gtk.Align.CENTER);
             row.add(widget);
             m_list_box.add(row);
             if (n++ == m_category_active_index)
@@ -635,23 +700,40 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private void show_emoji_for_category(EBoxRow row) {
-        if (row.text == "@favorites") {
+    private void show_emoji_for_category(string category) {
+        if (category == EMOJI_CATEGORY_FAVORITES) {
             m_lookup_table.clear();
             foreach (unowned string favorate in m_favorites) {
                 IBus.Text text = new IBus.Text.from_string(favorate);
                 m_lookup_table.append_candidate(text);
             }
-            m_backward = _("Favorites");
+            m_backward = category;
         } else {
             unowned GLib.SList<unowned string> emojis =
-                    m_category_to_emojis_dict.lookup(row.text);
+                    m_category_to_emojis_dict.lookup(category);
             m_lookup_table.clear();
             foreach (unowned string emoji in emojis) {
                 IBus.Text text = new IBus.Text.from_string(emoji);
                 m_lookup_table.append_candidate(text);
             }
-            m_backward = utf8_title(row.text);
+            m_backward = category;
+        }
+        // Restore the cursor position before the special table of
+        // emoji variants is shown.
+        if (m_backward_index >= 0) {
+            m_lookup_table.set_cursor_pos((uint)m_backward_index);
+            m_backward_index = -1;
+        }
+        show_candidate_panel();
+    }
+
+
+    private void show_emoji_variants(GLib.SList<string>? emojis) {
+        m_backward_index = (int)m_lookup_table.get_cursor_pos();
+        m_lookup_table.clear();
+        foreach (unowned string emoji in emojis) {
+            IBus.Text text = new IBus.Text.from_string(emoji);
+            m_lookup_table.append_candidate(text);
         }
         show_candidate_panel();
     }
@@ -696,8 +778,8 @@ class IBusEmojier : Gtk.Window {
     private bool check_unicode_point() {
         string annotation = m_entry.get_text();
         m_unicode_point = null;
-        GLib.StringBuilder buff = new GLib.StringBuilder();
-        GLib.StringBuilder retval = new GLib.StringBuilder();
+        var buff = new GLib.StringBuilder();
+        var retval = new GLib.StringBuilder();
         for (int i = 0; i < annotation.char_count(); i++) {
             unichar ch = annotation.get_char(i);
             if (ch == 0)
@@ -727,7 +809,7 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    public void update_candidate_window() {
+    private void update_candidate_window() {
         string annotation = m_entry.get_text();
         if (annotation.length == 0) {
             hide_candidate_panel();
@@ -795,6 +877,22 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private void show_code_point_description(string text) {
+        EPaddedLabelBox widget_code = new EPaddedLabelBox(
+                    _("Code point: %s").printf(utf8_code_point(text)),
+                    Gtk.Align.START);
+        m_vbox.add(widget_code);
+        widget_code.show_all();
+        if (m_emoji_to_emoji_variants_dict.lookup(text) != null) {
+            EPaddedLabelBox widget_has_variant = new EPaddedLabelBox(
+                    _("Has emoji variants"),
+                    Gtk.Align.START);
+            m_vbox.add(widget_has_variant);
+            widget_has_variant.show_all();
+        }
+    }
+
+
     private void show_candidate_panel() {
         remove_all_children();
         set_fixed_size();
@@ -823,18 +921,27 @@ class IBusEmojier : Gtk.Window {
         EGrid grid = new EGrid();
         int n = 0;
         for (uint i = page_start_pos; i < page_end_pos; i++) {
-            IBus.Text candidate = m_lookup_table.get_candidate(i);
+            string text = m_lookup_table.get_candidate(i).text;
+            bool has_variant =
+                    (m_emoji_to_emoji_variants_dict.lookup(text) != null);
             Gtk.Label label;
-            if (i == cursor)
-                label = new ESelectedLabel(candidate.text) as Gtk.Label;
-            else
-                label = new EWhiteLabel(candidate.text) as Gtk.Label;
-            if (candidate.text.char_count() > 2) {
+            // If 'i' is the cursor position, use the selected color.
+            // If the emoji has emoji variants, use the gold color.
+            // Otherwise the white color.
+            if (i == cursor) {
+                label = new ESelectedLabel(text) as Gtk.Label;
+            } else if (m_show_emoji_variant && has_variant &&
+                       m_backward_index < 0) {
+                label = new EGoldLabel(text) as Gtk.Label;
+            } else {
+                label = new EWhiteLabel(text) as Gtk.Label;
+            }
+            if (text.char_count() > 2) {
                 string font_family = m_emoji_font_family;
                 int font_size = m_emoji_font_size - 2;
                 string emoji_font = "%s %d".printf(font_family, font_size);
                 string markup = "<span font=\"%s\">%s</span>".
-                        printf(emoji_font, utf8_entity(candidate.get_text()));
+                        printf(emoji_font, utf8_entity(text));
                 label.set_markup(markup);
             }
             label.set_halign(Gtk.Align.FILL);
@@ -879,9 +986,8 @@ class IBusEmojier : Gtk.Window {
             show_arrow_buttons();
             m_vbox.add(grid);
             grid.show_all();
-            IBus.Text candidate = m_lookup_table.get_candidate(cursor);
-            unowned IBus.EmojiData? data =
-                    m_emoji_to_data_dict.lookup(candidate.text);
+            string text = m_lookup_table.get_candidate(cursor).text;
+            unowned IBus.EmojiData? data = m_emoji_to_data_dict.lookup(text);
             if (data == null) {
                 // TODO: Provide a custom description and annotation for
                 // the favorite emojis.
@@ -890,12 +996,7 @@ class IBusEmojier : Gtk.Window {
                         Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
-                EPaddedLabelBox widget_code = new EPaddedLabelBox(
-                        _("Code point: %s").printf(
-                                utf8_code_point(candidate.text)),
-                        Gtk.Align.START);
-                m_vbox.add(widget_code);
-                widget_code.show_all();
+                show_code_point_description(text);
                 return;
             } else {
                 unowned string description = data.get_description();
@@ -907,7 +1008,7 @@ class IBusEmojier : Gtk.Window {
             }
             unowned GLib.SList<unowned string>? annotations =
                     data.get_annotations();
-            GLib.StringBuilder buff = new GLib.StringBuilder();
+            var buff = new GLib.StringBuilder();
             int i = 0;
             foreach (unowned string annotation in annotations) {
                 if (i++ == 0)
@@ -929,12 +1030,7 @@ class IBusEmojier : Gtk.Window {
                 m_vbox.add(widget);
                 widget.show_all();
             }
-            EPaddedLabelBox widget_code = new EPaddedLabelBox(
-                    _("Code point: %s").printf(
-                            utf8_code_point(candidate.text)),
-                    Gtk.Align.START);
-            m_vbox.add(widget_code);
-            widget_code.show_all();
+            show_code_point_description(text);
         }
     }
 
@@ -961,6 +1057,20 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private void candidate_panel_select_index(uint index) {
+        string text = m_lookup_table.get_candidate(index).text;
+        unowned GLib.SList<string>? emojis =
+                m_emoji_to_emoji_variants_dict.lookup(text);
+        if (m_show_emoji_variant && emojis != null &&
+            m_backward_index < 0) {
+            show_emoji_variants(emojis);
+        } else {
+            m_result = text;
+            m_loop.quit();
+            hide_candidate_panel();
+        }
+    }
+
     private void candidate_panel_cursor_down() {
         enter_notify_disable_with_timer();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
@@ -1094,8 +1204,11 @@ class IBusEmojier : Gtk.Window {
     }
 
 
-    private bool key_press_cursor_escape() {
-        if (m_candidate_panel_is_visible) {
+    private bool key_press_escape() {
+        if (m_backward_index >= 0 && m_backward != null) {
+            show_emoji_for_category(m_backward);
+            return true;
+        } else if (m_candidate_panel_is_visible) {
             hide_candidate_panel();
             return true;
         } else if (m_entry.get_text().length == 0) {
@@ -1108,6 +1221,19 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private bool key_press_enter() {
+        if (m_candidate_panel_is_visible) {
+            uint index = m_lookup_table.get_cursor_pos();
+            candidate_panel_select_index(index);
+        } else if (m_category_active_index > 0) {
+            Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
+            EBoxRow row = gtkrow as EBoxRow;
+            show_emoji_for_category(row.text);
+        }
+        return true;
+    }
+
+
     private void entry_enter_keyval(uint keyval) {
         unichar ch = IBus.keyval_to_unicode(keyval);
         if (ch.iscntrl())
@@ -1130,6 +1256,13 @@ class IBusEmojier : Gtk.Window {
     }
 
 
+    private void check_action_variant_cb(GLib.SimpleAction action,
+                                         GLib.Variant?     parameter) {
+        m_show_emoji_variant = !action.get_state().get_boolean();
+        action.set_state(new GLib.Variant.boolean(m_show_emoji_variant));
+    }
+
+
     public string run(string input_context_path) {
         assert (m_loop == null);
 
@@ -1187,21 +1320,11 @@ class IBusEmojier : Gtk.Window {
          */
         switch (keyval) {
         case Gdk.Key.Escape:
-            if (key_press_cursor_escape())
+            if (key_press_escape())
                 return true;
             break;
         case Gdk.Key.Return:
-            if (m_candidate_panel_is_visible) {
-                uint index = m_lookup_table.get_cursor_pos();
-                IBus.Text text = m_lookup_table.get_candidate(index);
-                m_result = text.text;
-                m_loop.quit();
-                hide_candidate_panel();
-            } else if (m_category_active_index > 0) {
-                Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
-                EBoxRow row = gtkrow as EBoxRow;
-                show_emoji_for_category(row);
-            }
+            key_press_enter();
             return true;
         case Gdk.Key.BackSpace:
             if (m_entry.get_text().len() > 0) {
@@ -1283,7 +1406,7 @@ class IBusEmojier : Gtk.Window {
                     return true;
                 break;
             case Gdk.Key.u:
-                if (key_press_cursor_escape())
+                if (key_press_escape())
                     return true;
                 break;
             case Gdk.Key.a:

From 5f653d3102ada9139a2bc7504d6beaee1bc9984b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 9 May 2017 13:54:01 +0900
Subject: [PATCH 407/816] ui/gtk3: Add ibus-emoji man mapge

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/323810043
---
 setup/ibus-setup.1.in   | 21 ++++++++++-
 tools/ibus.1.in         | 20 +++++++++-
 ui/gtk3/Makefile.am     | 22 +++++++++++
 ui/gtk3/ibus-emoji.1.in | 81 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 4 deletions(-)
 create mode 100644 ui/gtk3/ibus-emoji.1.in

diff --git a/setup/ibus-setup.1.in b/setup/ibus-setup.1.in
index dab032e56..f9b5f7175 100644
--- a/setup/ibus-setup.1.in
+++ b/setup/ibus-setup.1.in
@@ -1,10 +1,10 @@
 .\" This file is distributed under the same license as the ibus
 .\" package.
 .\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
-.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013-2015.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013-2017.
 .\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
 .\"
-.TH "IBUS-SETUP" 1 "November 2008" "@VERSION@" "User Commands"
+.TH "IBUS-SETUP" 1 "November 2017" "@VERSION@" "User Commands"
 .SH NAME
 .B ibus-setup
 \- configuration program for ibus
@@ -26,6 +26,23 @@ is the configuration program for IBus.
 .PP
 Homepage: https://github.com/ibus/ibus/wiki
 
+.SH "ADVANCED"
+.TP
+\fBUse system keyboard layout\fR
+If this option is enabled, use your system keymap instead and IBus
+does not change it with any input method engines. The system keymap is
+decided by your desktop session. IBus calls
+.B setxkbmap (1)
+command internally to set the selected keymap and override the
+system keymap if this options is disabled.
+You can check the current keymap with
+.B setxkbmap -query
+command.
+.TP
+\fBShare the same input method among all applications\fR
+If this option is disabled, You can choose an input metod engine
+by input context.
+
 .SH BUGS
 If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
 
diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index a420567b3..d34a77aa6 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -1,9 +1,9 @@
 .\" This file is distributed under the same license as the ibus
 .\" package.
-.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2013-2017.
 .\" Copyright (c) Peng Huang <shawn.p.huang@gmail.com>, 2013.
 .\"
-.TH "IBUS" 1 "May 2013" "@VERSION@" "User Commands"
+.TH "IBUS" 1 "May 2017" "@VERSION@" "User Commands"
 .SH NAME
 .B ibus
 \- command line utility for ibus
@@ -95,6 +95,22 @@ configuration file.
 \fBwatch\fR
 Under construction.
 .TP
+\fBemoji\fR [\fB\-\-font=FONT|\-\-lang=LANG|\-\-help|\-\-partial\-match\fR]
+Launch IBus Emojier (
+.B ibus\-emoji (1)
+) and save the selected emoji to your clipboard. Can choose an emoji font with
+.B \-\-font
+option. Can choose a language of emoji annotations with
+.B \-\-lang
+option. If LANG="en", IBus Emojier loads /usr/share/ibus/dicts/emoji-en.dict .
+.B \-\-partial\-match
+option enables to match annotations with a partial string. These settings
+are avaiable with
+.B ibus\-setup (1)
+utility.
 
 .SH BUGS
 If you find a bug, please report it at https://github.com/ibus/ibus/issues
+
+.SH "SEE ALSO"
+.BR ibus-emoji (1)
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index c55747429..270ad1cf3 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -148,6 +148,8 @@ emoji_headers =         \
     ibusemojidialog.h   \
     $(NULL)
 
+man_one_in_files = ibus-emoji.1.in
+
 # References:
 # libappindicator/src/notification-item.xml
 # libappindicator/src/notification-watcher.xml
@@ -155,6 +157,7 @@ emoji_headers =         \
 # kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierWatcher.xml
 EXTRA_DIST =                            \
     $(emoji_headers)                    \
+    $(man_one_in_files)                 \
     IBusEmojiDialog-1.0.metadata        \
     gtkpanel.xml.in                     \
     ibus-emoji-dialog-1.0.deps          \
@@ -253,8 +256,27 @@ MAINTAINERCLEANFILES += $(VAPIGEN_VAPIS)
 DISTCLEANFILES += $(VAPIGEN_VAPIS)
 EXTRA_DIST += $(VAPIGEN_VAPIS)
 
+# end of ENABLE_VAPIGEN
 endif
+# end of HAVE_INTROSPECTION
 endif
+
+man_one_files = $(man_one_in_files:.1.in=.1)
+man_one_DATA =$(man_one_files:.1=.1.gz)
+man_onedir = $(mandir)/man1
+%.1: %.1.in
+	$(AM_V_GEN) sed \
+	    -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+	    mv $@.tmp $@
+%.1.gz: %.1
+	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
+CLEANFILES += \
+    $(man_one_DATA) \
+    $(man_one_files) \
+    $(NULL)
+
+# end of ENABLE_EMOJI_DICT
 endif
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/gtk3/ibus-emoji.1.in b/ui/gtk3/ibus-emoji.1.in
new file mode 100644
index 000000000..3523271b0
--- /dev/null
+++ b/ui/gtk3/ibus-emoji.1.in
@@ -0,0 +1,81 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017.
+.\"
+.TH "IBUS EMOJI" 1 "May 2017" "@VERSION@" "User Commands"
+.SH NAME
+.B ibus emoji utility
+\- Call the IBus emoji utility by
+.B IBus Emojier
+
+.SH "SYNOPSIS"
+.B /usr/libexec/ibus\-ui\-emojier
+[\fIOPTION\fR]...
+
+.SH "DESCRIPTION"
+
+.PP
+IBus Emojier provides a GUI to select an emoji by typing an emoji annotaion
+or choosing a character with mouse click and it's designed to work as
+an extended IBus lookup window using Space, Enter, and Arrow keys.
+The text entry accepts an emoji annotation or Unicode points.
+If IBus panel is launched, IBus panel calls IBus Emojier with a
+shortcut key or the right click menu and output the selected emoji
+on the previous focused text on an application.
+If IBus panel is not available likes GNOME desktop, You can still use
+.B ibus emoji
+command to launch IBus Emojier and it saves the selected emoji in
+your clipboard and you can paste the emoji by a paste key likes
+Control\-v.
+
+.PP
+Refer
+.B emoji
+section in
+.B ibus (1)
+for the command line options.
+
+.PP
+Homepage: https://github.com/ibus/ibus/wiki
+
+.SH "SETTINGS"
+.TP
+\fBANNOTATION LANGUAGE\fR
+You can choose a language of emoji annotations with
+.B ibus\-setup (1).
+.TP
+\fBFONT\fR
+You can choose an emoji font with
+.B ibus\-setup (1).
+E.g. "Noto Color Emoji", "Android Emoji" font.
+
+.SH "KEYBOARD OPERATIONS"
+.TP
+\fBControl-Shift-e\fR
+Launch IBus Emojier. The shortcut key can be customized by
+.B ibus\-setup (1).
+.TP
+\fBLeft or right arrow\fR
+Move the selected category or emoji if an annotation is not typed.
+Otherwise move the cursor in typed annotation.
+.TP
+\fBDown or up arrow\fR
+Move the selected category or emoji.
+.TP
+\fBEnter\fR
+Commit the selected emoji.
+.TP
+\fBEscape\fR
+Go back to the category list from emoji list, erase a typed annotation,
+and close IBus Emojier.
+.TP
+\fBSpace\fR
+Move the selected category or emoji. If Shift\-Space is typed,
+a space chararacter can be inserted between words in an annotation or
+Unicode points. E.g. 1f466 Shift\-Space 1f3fb
+.TP
+\fBPageDown or PageUp\fR
+Move to the next or previous page in emoji list.
+
+.SH BUGS
+If you find a bug, please report it at https://github.com/ibus/ibus/issues

From 1159093dea3fdb8ceb62157f06b3560f8fc28378 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 9 May 2017 13:58:02 +0900
Subject: [PATCH 408/816] Update favorites category automatically by selecting
 emoji

When you commit an emoji with Emojier, Favorite category
will be shown on GUI.
Now a custom annotation also can be assigned to a favorite emoji
by gsetting command.

R=penghuang@google.com

Review URL: https://codereview.appspot.com/312660043
---
 data/ibus.schemas.in      | 13 ++++++++
 src/ibusemoji.h           |  2 +-
 ui/gtk3/emojier.vala      | 63 +++++++++++++++++++++++++++++++++++++--
 ui/gtk3/emojierapp.vala   | 18 +++++++++++
 ui/gtk3/ibusemojidialog.h | 20 +++++++++----
 ui/gtk3/panel.vala        | 21 ++++++++++++-
 6 files changed, 127 insertions(+), 10 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 0647004a4..09b6b2c8d 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -403,6 +403,19 @@
                   if this list has any characters.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/favorite-annotations</key>
+      <applyto>/desktop/ibus/panel/emoji/favorite-annotations</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <default>[]</default>
+      <list_type>string</list_type>
+      <locale name="C">
+        <short>favorite emoji annotation list on emoji dialog</short>
+	    <long>You can assign an annotation for a favorite emoji
+                  in this list.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/emoji/has-partial-match</key>
       <applyto>/desktop/ibus/panel/emoji/has-partial-match</applyto>
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
index eb24fdda6..4edee7268 100644
--- a/src/ibusemoji.h
+++ b/src/ibusemoji.h
@@ -188,7 +188,7 @@ GHashTable *    ibus_emoji_dict_load            (const gchar    *path);
  * @dict: (element-type utf8 IBusEmojiData) (transfer full): An Emoji dictionary
  * @emoji: an emoji character
  *
- * Returns: An #IBusEmojiData of @emoji.
+ * Returns: (transfer none): An #IBusEmojiData of @emoji.
  * This API was prepared for the old dict foramat with Gir and Vala
  * but no longer needed.
  * Use ibus_emoji_data_load() instead.
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index db7520a46..41695509f 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -201,6 +201,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private static string m_emoji_font_family;
     private static int m_emoji_font_size;
     private static string[] m_favorites;
+    private static string[] m_favorite_annotations;
     private static int m_emoji_max_seq_len;
     private static bool m_has_partial_match;
     private static uint m_partial_match_length;
@@ -261,6 +262,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
             m_emoji_font_size = 16;
         if (m_favorites == null)
             m_favorites = {};
+        if (m_favorite_annotations == null)
+            m_favorite_annotations = {};
 
         Gdk.Display display = Gdk.Display.get_default();
         Gdk.Screen screen = (display != null) ?
@@ -374,6 +377,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             }
             make_emoji_dict(m_current_lang_id);
         }
+        update_favorite_emoji_dict();
     }
 
 
@@ -1263,6 +1267,49 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public static void update_favorite_emoji_dict() {
+        if (m_emoji_to_data_dict == null ||
+            m_annotation_to_emojis_dict == null)
+            return;
+
+        for(int i = 0; i < m_favorites.length; i++) {
+            var favorite = m_favorites[i];
+
+            string? annotation = "";
+            if (i < m_favorite_annotations.length) {
+                annotation = m_favorite_annotations[i];
+            }
+            if (annotation == "")
+                continue;
+            unowned IBus.EmojiData? data =
+                    m_emoji_to_data_dict.lookup(favorite);
+            if (data == null) {
+                GLib.SList<string> new_annotations = new GLib.SList<string>();
+                new_annotations.append(annotation);
+                IBus.EmojiData new_data = GLib.Object.new(
+                            typeof(IBus.EmojiData),
+                            "emoji", favorite.dup(),
+                            "annotations", new_annotations,
+                            "description", annotation.dup()
+                    ) as IBus.EmojiData;
+                m_emoji_to_data_dict.insert(favorite, new_data);
+            } else {
+                unowned GLib.SList<string> annotations = data.get_annotations();
+                if (annotations.find_custom(annotation, GLib.strcmp) == null) {
+                    annotations.append(annotation);
+                    data.set_annotations(annotations.copy());
+                }
+            }
+            unowned GLib.SList<string> emojis =
+                    m_annotation_to_emojis_dict.lookup(annotation);
+            if (emojis.find_custom(favorite, GLib.strcmp) == null) {
+                emojis.append(favorite);
+                m_annotation_to_emojis_dict.replace(annotation, emojis.copy());
+            }
+        }
+    }
+
+
     public string run(string input_context_path) {
         assert (m_loop == null);
 
@@ -1510,10 +1557,22 @@ class IBusEmojier : Gtk.ApplicationWindow {
         m_partial_match_condition = condition;
     }
 
-    public static void set_favorites(string[]? unowned_favorites) {
+    public static void set_favorites(string[]? unowned_favorites,
+                                     string[]? unowned_favorite_annotations) {
         m_favorites = {};
-        foreach (string favorite in unowned_favorites) {
+        m_favorite_annotations = {};
+        for(int i = 0; i < unowned_favorites.length; i++) {
+            string? favorite = unowned_favorites[i];
+            // Avoid gsetting value error by manual setting
+            GLib.return_if_fail(favorite != null);
+            GLib.return_if_fail(favorite != "");
             m_favorites += favorite;
         }
+        for(int i = 0; i < unowned_favorite_annotations.length; i++) {
+            string? favorite_annotation = unowned_favorite_annotations[i];
+            GLib.return_if_fail(favorite_annotation != null);
+            m_favorite_annotations += favorite_annotation;
+        }
+        update_favorite_emoji_dict();
     }
 }
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index dbdbc2763..24816bb8e 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -50,6 +50,20 @@ public class EmojiApplication : Application {
         Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
         clipboard.set_text(emoji, -1);
         clipboard.store();
+
+        var emojier_favorites = m_settings_emoji.get_strv("favorites");
+        bool has_favorite = false;
+        foreach (unowned string favorite in emojier_favorites) {
+            if (favorite == emoji) {
+                has_favorite = true;
+                break;
+            }
+        }
+        if (!has_favorite) {
+            emojier_favorites += emoji;
+            m_settings_emoji.set_strv("favorites", emojier_favorites);
+        }
+
         m_emojier = null;
         command_line.print("%s\n", _("Copied an emoji to your clipboard."));
     }
@@ -147,6 +161,10 @@ public class EmojiApplication : Application {
         if (emoji_font != null)
             IBusEmojier.set_emoji_font(emoji_font);
 
+        IBusEmojier.set_favorites(
+                m_settings_emoji.get_strv("favorites"),
+                m_settings_emoji.get_strv("favorite-annotations"));
+
         activate_dialog(command_line);
 
         return Posix.EXIT_SUCCESS;
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index 1499a3ce7..fb0f5a62d 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -145,18 +145,26 @@ void          ibus_emojier_set_annotation_lang    (const gchar* lang);
  */
 void          ibus_emojier_set_emoji_font         (const gchar* emoji_font);
 
-#if 0
-/* TODO: set customized annotations */
 /**
  * ibus_emojier_set_favorites:
  * @favorites: (array length=favorites_length): A custom emoji list.
  * @favorites_length: A length of @favorites
- *
- * Set emoji font on the emoji dialog
+ * @favorite_annotations: (array length=favorite_annotations_length):
+ *                        (nullable):
+ *                        A custom annotation listfor @favorites.
+ * @favorite_annotations_length: A length of @favorite_annotations
+ *
+ * Set custom emojis on the emoji dialog. @favorite_annotations
+ * can be null. If you don't assign an annotation for a specific emoji,
+ * you can pass the annotation as "", e.g.
+ * favorite_annotations = { "", "", "my annotation" };
  */
 void          ibus_emojier_set_favorites          (gchar**      favorites,
                                                    int
-                                                             favorites_length);
-#endif
+                                                   favorites_length,
+                                                   gchar**
+                                                   favorite_annotations,
+                                                   int
+                                                   favorite_annotations_length);
 G_END_DECLS
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 5f0009eef..e4936df10 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -76,6 +76,7 @@ class Panel : IBus.PanelService {
     private IBusEmojier? m_emojier;
     private uint m_emojier_set_emoji_lang_id;
     private uint m_emojier_focus_commit_text_id;
+    private string[] m_emojier_favorites = {};
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
     private GLib.Pid m_setup_pid = 0;
@@ -245,6 +246,10 @@ class Panel : IBus.PanelService {
                 set_emoji_favorites();
         });
 
+        m_settings_emoji.changed["favorite-annotations"].connect((key) => {
+                set_emoji_favorites();
+        });
+
         m_settings_emoji.changed["lang"].connect((key) => {
                 set_emoji_lang();
         });
@@ -778,7 +783,10 @@ class Panel : IBus.PanelService {
     }
 
     private void set_emoji_favorites() {
-        IBusEmojier.set_favorites(m_settings_emoji.get_strv("favorites"));
+        m_emojier_favorites = m_settings_emoji.get_strv("favorites");
+        IBusEmojier.set_favorites(
+                m_emojier_favorites,
+                m_settings_emoji.get_strv("favorite-annotations"));
     }
 
     private void set_emoji_lang() {
@@ -1437,6 +1445,17 @@ class Panel : IBus.PanelService {
             IBus.Text text = new IBus.Text.from_string(selected_string);
             commit_text(text);
             m_emojier = null;
+            bool has_favorite = false;
+            foreach (unowned string favorite in m_emojier_favorites) {
+                if (favorite == selected_string) {
+                    has_favorite = true;
+                    break;
+                }
+            }
+            if (!has_favorite) {
+                m_emojier_favorites += selected_string;
+                m_settings_emoji.set_strv("favorites", m_emojier_favorites);
+            }
             return true;
         }
 

From f6c2e2dd6f42a43fe973cf40701ee7d61f637287 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 10 May 2017 11:50:08 +0900
Subject: [PATCH 409/816] ui/gtk3: Rename ibus-emoji.1.in to ibus-emoji.7.in

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/321900043
---
 tools/ibus.1.in                              |  2 +-
 ui/gtk3/Makefile.am                          | 18 +++++++++---------
 ui/gtk3/{ibus-emoji.1.in => ibus-emoji.7.in} |  0
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename ui/gtk3/{ibus-emoji.1.in => ibus-emoji.7.in} (100%)

diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index d34a77aa6..9275abb76 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -113,4 +113,4 @@ utility.
 If you find a bug, please report it at https://github.com/ibus/ibus/issues
 
 .SH "SEE ALSO"
-.BR ibus-emoji (1)
+.BR ibus-emoji (7)
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 270ad1cf3..c79641a59 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -148,7 +148,7 @@ emoji_headers =         \
     ibusemojidialog.h   \
     $(NULL)
 
-man_one_in_files = ibus-emoji.1.in
+man_seven_in_files = ibus-emoji.7.in
 
 # References:
 # libappindicator/src/notification-item.xml
@@ -157,7 +157,7 @@ man_one_in_files = ibus-emoji.1.in
 # kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierWatcher.xml
 EXTRA_DIST =                            \
     $(emoji_headers)                    \
-    $(man_one_in_files)                 \
+    $(man_seven_in_files)               \
     IBusEmojiDialog-1.0.metadata        \
     gtkpanel.xml.in                     \
     ibus-emoji-dialog-1.0.deps          \
@@ -261,19 +261,19 @@ endif
 # end of HAVE_INTROSPECTION
 endif
 
-man_one_files = $(man_one_in_files:.1.in=.1)
-man_one_DATA =$(man_one_files:.1=.1.gz)
-man_onedir = $(mandir)/man1
-%.1: %.1.in
+man_seven_files = $(man_seven_in_files:.7.in=.7)
+man_seven_DATA =$(man_seven_files:.7=.7.gz)
+man_sevendir = $(mandir)/man7
+%.7: %.7.in
 	$(AM_V_GEN) sed \
 	    -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
 	    mv $@.tmp $@
-%.1.gz: %.1
+%.7.gz: %.7
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
 CLEANFILES += \
-    $(man_one_DATA) \
-    $(man_one_files) \
+    $(man_seven_DATA) \
+    $(man_seven_files) \
     $(NULL)
 
 # end of ENABLE_EMOJI_DICT
diff --git a/ui/gtk3/ibus-emoji.1.in b/ui/gtk3/ibus-emoji.7.in
similarity index 100%
rename from ui/gtk3/ibus-emoji.1.in
rename to ui/gtk3/ibus-emoji.7.in

From 086fc542a7a9b1313198ae60355e711da05f5ed8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 May 2017 13:32:08 +0900
Subject: [PATCH 410/816] ui/gtk3: Fix to focus Emojier when type
 Control-Shift-e twice

Some window managers, e.g. MATE, GNOME, Plasma desktops,
does not give the keyboard focus when Emojier is lauched
twice with Ctrl-Shift-e via XIEvent, if present_with_time()
is not applied.

Also fix to type some of ASCII emoji annotations likes :D
Also update ibus-emoji.7.in to describe Control-f,b,n,p

BUG=https://mail.gnome.org/archives/gtk-devel-list/2017-May/msg00026.html

Review URL: https://codereview.appspot.com/325750043
---
 ui/gtk3/emojier.vala      | 83 ++++++++++++++++++++++++---------------
 ui/gtk3/emojierapp.vala   |  8 +++-
 ui/gtk3/ibus-emoji.7.in   | 23 +++++++----
 ui/gtk3/ibusemojidialog.h |  8 +++-
 ui/gtk3/panel.vala        |  8 ++--
 5 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 41695509f..d0d69ed65 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -439,17 +439,6 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private static string utf8_down(string str) {
-        var buff = new GLib.StringBuilder();
-        int length = str.char_count();
-        for (int i = 0; i < length; i++) {
-            buff.append_unichar(str.get_char(0).tolower());
-            str = str.next_char();
-        }
-        return buff.str;
-    }
-
-
     private static string utf8_code_point(string str) {
         var buff = new GLib.StringBuilder();
         int length = str.char_count();
@@ -527,7 +516,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                                                   string         lang) {
         string emoji = data.get_emoji();
         if (lang == "en") {
-            string description = utf8_down(data.get_description());
+            string description = data.get_description().down();
             update_annotations_with_description (data, description);
             m_emoji_to_data_dict.replace(emoji, data);
         } else {
@@ -550,7 +539,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             }
             string trans_description = data.get_description();
             en_data.set_description(trans_description);
-            trans_description = utf8_down(trans_description);
+            trans_description = trans_description.down();
             update_annotations_with_description (data, trans_description);
             unowned GLib.SList<string> annotations = data.get_annotations();
             unowned GLib.SList<string> en_annotations
@@ -813,20 +802,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private void update_candidate_window() {
-        string annotation = m_entry.get_text();
-        if (annotation.length == 0) {
-            hide_candidate_panel();
-            m_backward = null;
-            return;
-        }
-        annotation = utf8_down(annotation);
-        if (annotation.length > m_emoji_max_seq_len) {
-            hide_candidate_panel();
-            return;
-        }
-        // Call check_unicode_point() to get m_unicode_point
-        check_unicode_point();
+    private GLib.SList<string>?
+    lookup_emojis_from_annotation(string annotation) {
         GLib.SList<string>? total_emojis = null;
         unowned GLib.SList<string>? sub_emojis = null;
         int length = annotation.length;
@@ -866,6 +843,34 @@ class IBusEmojier : Gtk.ApplicationWindow {
             foreach (unowned string emoji in sub_emojis)
                 total_emojis.append(emoji);
         }
+        return total_emojis;
+    }
+
+    private void update_candidate_window() {
+        string annotation = m_entry.get_text();
+        if (annotation.length == 0) {
+            hide_candidate_panel();
+            m_backward = null;
+            return;
+        }
+        if (annotation.length > m_emoji_max_seq_len) {
+            hide_candidate_panel();
+            return;
+        }
+        // Call check_unicode_point() to get m_unicode_point
+        check_unicode_point();
+        GLib.SList<string>? total_emojis =
+            lookup_emojis_from_annotation(annotation);
+        if (total_emojis == null) {
+            /* Users can type title strings against lower case.
+             * E.g. "Smile" against "smile"
+             * But the dictionary has the case sensitive annotations.
+             * E.g. ":D" and ":q"
+             * So need to call lookup_emojis_from_annotation() twice.
+             */
+            annotation = annotation.down();
+            total_emojis = lookup_emojis_from_annotation(annotation);
+        }
         if (total_emojis == null && m_unicode_point == null) {
             hide_candidate_panel();
             return;
@@ -1310,7 +1315,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    public string run(string input_context_path) {
+    public string run(string    input_context_path,
+                      Gdk.Event event) {
         assert (m_loop == null);
 
         m_is_running = true;
@@ -1323,12 +1329,23 @@ class IBusEmojier : Gtk.ApplicationWindow {
         resize(1, 1);
 
         m_entry.set_text("");
-        //m_entry.grab_focus();
 
         show_category_list();
         m_entry.set_activates_default(true);
         show_all();
 
+        /* Some window managers, e.g. MATE, GNOME, Plasma desktops,
+         * does not give the keyboard focus when Emojier is lauched
+         * twice with Ctrl-Shift-e via XIEvent, if present_with_time()
+         * is not applied.
+         * But XFCE4 desktop does not effect this bug.
+         * Seems this is caused by the window manager's focus stealing
+         * prevention logic:
+         * https://mail.gnome.org/archives/gtk-devel-list/2017-May/msg00026.html
+         */
+        uint32 timestamp = event.get_time();
+        present_with_time(timestamp);
+
         m_loop = new GLib.MainLoop();
         m_loop.run();
         m_loop = null;
@@ -1492,9 +1509,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    public void present_centralize() {
-        present();
-        m_entry.set_activates_default(true);
+    public void present_centralize(Gdk.Event event) {
         Gtk.Allocation allocation;
         get_allocation(out allocation);
         Gdk.Screen screen = Gdk.Screen.get_default();
@@ -1505,6 +1520,10 @@ class IBusEmojier : Gtk.ApplicationWindow {
         int y = (monitor_area.y + monitor_area.height
                  - allocation.height)/2;
         move(x, y);
+
+        uint32 timestamp = event.get_time();
+        present_with_time(timestamp);
+        m_entry.set_activates_default(true);
     }
 
 
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 24816bb8e..8c787ebdd 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -41,7 +41,9 @@ public class EmojiApplication : Application {
 
     private void show_dialog(ApplicationCommandLine command_line) {
         m_emojier = new IBusEmojier();
-        string emoji = m_emojier.run("");
+        Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+        event.key.time = Gdk.CURRENT_TIME;
+        string emoji = m_emojier.run("", event);
         if (emoji == null) {
             m_emojier = null;
             command_line.print("%s\n", _("Canceled to choose an emoji."));
@@ -132,7 +134,9 @@ public class EmojiApplication : Application {
         }
 
         if (m_emojier != null && m_emojier.is_running()) {
-            m_emojier.present_centralize();
+            Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+            event.key.time = Gdk.CURRENT_TIME;
+            m_emojier.present_centralize(event);
             return Posix.EXIT_SUCCESS;
         }
 
diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index 3523271b0..a5045f6cb 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -55,27 +55,34 @@ E.g. "Noto Color Emoji", "Android Emoji" font.
 Launch IBus Emojier. The shortcut key can be customized by
 .B ibus\-setup (1).
 .TP
-\fBLeft or right arrow\fR
-Move the selected category or emoji if an annotation is not typed.
-Otherwise move the cursor in typed annotation.
+\fBLeft, Right arrow, Control-b or Control-f\fR
+Select the next left or right category or emoji on the list
+if an annotation is not typed.
+Otherwise move the cursor to the immdediate left or right in the typed
+annotation.
 .TP
-\fBDown or up arrow\fR
-Move the selected category or emoji.
+\fBDown, Up arrow, Control-n or Control-p\fR
+Select the next top or down category or emoji on the list
 .TP
 \fBEnter\fR
 Commit the selected emoji.
 .TP
 \fBEscape\fR
-Go back to the category list from emoji list, erase a typed annotation,
+Go back to the category list from emoji list, erase the typed annotation,
 and close IBus Emojier.
 .TP
 \fBSpace\fR
-Move the selected category or emoji. If Shift\-Space is typed,
+Select the next left category or emoji on the list.
+If Shift\-Space is typed,
 a space chararacter can be inserted between words in an annotation or
 Unicode points. E.g. 1f466 Shift\-Space 1f3fb
 .TP
 \fBPageDown or PageUp\fR
-Move to the next or previous page in emoji list.
+Move to the next or previous page in the emoji list.
+.TP
+\fBHead, End, Control-h or Control-e\fR
+Select the first or last emoji on the list if an annotation is not typed.
+Otherwise move the cursor to the head or end in the typed annotation.
 
 .SH BUGS
 If you find a bug, please report it at https://github.com/ibus/ibus/issues
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index fb0f5a62d..24d195c84 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -71,6 +71,7 @@ IBusEmojier * ibus_emojier_new                    (void);
  * @self: An #IBusEmojier
  * @input_context_path: An input context path of #IBusInputContext
  *                      of the focused application.
+ * @event: A #GdkEventKey for timestamp
  *
  * Runs emoji dialog to select emoji.
  *
@@ -78,7 +79,8 @@ IBusEmojier * ibus_emojier_new                    (void);
  */
 gchar *       ibus_emojier_run                    (IBusEmojier* self,
                                                    const gchar*
-                                                           input_context_path);
+                                                           input_context_path,
+                                                   GdkEvent*    event);
 
 /**
  * ibus_emojier_is_running:
@@ -116,10 +118,12 @@ void          ibus_emojier_reset                  (IBusEmojier* self);
 /**
  * ibus_emojier_present_centralize:
  * @self: An #IBusEmojier
+ * @event: A #GdkEventKey for timestamp
  *
  * Move the window to the toplevel on the screen and centralize it.
  */
-void          ibus_emojier_present_centralize     (IBusEmojier* self);
+void          ibus_emojier_present_centralize     (IBusEmojier* self,
+                                                   GdkEvent*    event);
 
 /**
  * ibus_emojier_has_loaded_emoji_dict:
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index e4936df10..bf43cbf9a 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1023,9 +1023,9 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private void show_emojier() {
+    private void show_emojier(Gdk.Event event) {
         m_emojier = new IBusEmojier();
-        string emoji = m_emojier.run(m_real_current_context_path);
+        string emoji = m_emojier.run(m_real_current_context_path, event);
         if (emoji == null) {
             m_emojier = null;
             return;
@@ -1035,10 +1035,10 @@ class Panel : IBus.PanelService {
 
     private void handle_emoji_typing(Gdk.Event event) {
         if (m_emojier != null && m_emojier.is_running()) {
-            m_emojier.present_centralize();
+            m_emojier.present_centralize(event);
             return;
         }
-        show_emojier();
+        show_emojier(event);
     }
 
     private void run_preload_engines(IBus.EngineDesc[] engines, int index) {

From 21e6c003e0d4b8d50b266c02495ad9d62f30e7b4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 May 2017 13:47:39 +0900
Subject: [PATCH 411/816] Update translations

Update po/ca.po po/cs.po po/de.po po/es.po po/fi.po po/fr.po po/hu.po
       po/it.po po/ja.po po/nl.po po/pl.po po/pt_BR.po po/ru.po
       po/sq.po po/sv.po po/uk.po po/zh_CN.po po/zh_TW.po

Review URL: https://codereview.appspot.com/320300043
---
 po/LINGUAS  |   3 +
 po/ca.po    | 340 +++++++++++++++----------
 po/cs.po    | 369 +++++++++++++++++++--------
 po/de.po    | 409 +++++++++++++++++++++---------
 po/es.po    | 442 ++++++++++++++++++++++++++------
 po/fr.po    | 540 ++++++++++++++++++++++++++-------------
 po/hu.po    | 606 +++++++++++++++++++++++++++++++-------------
 po/it.po    | 711 +++++++++++++++++++++++++++++++++++++---------------
 po/ja.po    | 422 +++++++++++++++++++++++++------
 po/nl.po    | 616 +++++++++++++++++++++++++++++++++++----------
 po/pl.po    | 487 +++++++++++++++++++++++++++--------
 po/pt_BR.po | 411 +++++++++++++++++++++---------
 po/ru.po    | 600 +++++++++++++++++++++++++++++++-------------
 po/ta.po    | 552 ++++++++++++++++++++++++++++------------
 po/uk.po    | 429 +++++++++++++++++++++++++------
 po/zh_CN.po | 375 ++++++++++++++++++---------
 po/zh_TW.po | 363 ++++++++++++++++++---------
 17 files changed, 5579 insertions(+), 2096 deletions(-)

diff --git a/po/LINGUAS b/po/LINGUAS
index b2c09c86c..ba00b8988 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -12,6 +12,7 @@ es
 et
 eu
 fa
+fi
 fr
 gu
 he
@@ -33,8 +34,10 @@ pa
 pl
 pt_BR
 ru
+sq
 sr
 sr@latin
+sv
 ta
 te
 tg
diff --git a/po/ca.po b/po/ca.po
index 2875769b2..a3f7913f0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,7 @@
 # translation of ibus.pot to Catalan
 # Catalan translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,20 +10,21 @@
 # Oscar Osta Pueyo <oostap@gmail.com>, 2009
 # Robert Antoni Buj i Gelonch, 2014
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-03-06 14:41+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-10-13 02:53-0400\n"
+"PO-Revision-Date: 2017-03-20 04:10-0400\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -87,143 +89,151 @@ msgid "Previous input method:"
 msgstr "Mètode d'entrada anterior:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Habilita o deshabilita:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Habilita:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Deshabilita:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Dreceres de teclat</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Estableix l'orientació dels candidats a la taula de cerca"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Orientació dels candidats:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 "Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
 "d'idiomes"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "Mostra el quadre de propietats:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Posició del quadre d'idiomes:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:38
 msgid "Show icon on system tray"
 msgstr "Mostra la icona a la safata del sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:40
 msgid "Show input method name on language bar"
 msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 "Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
 "casella de selecció"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 "Incrusta el text pre-editat del mètode d'entrada en la finestra de "
 "l'aplicació"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
-msgstr "Utilitza un tipus de lletra personalitzat:"
+msgstr "Utilitza la lletra personalitzada:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
 msgid "<b>Font and Style</b>"
-msgstr "<b>Tipus de lletra i estil</b>"
+msgstr "<b>Lletra i estil</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:36
 msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:37 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:38
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:39
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:40
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 "Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:41
 msgid "_Up"
 msgstr "A_munt"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:42
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 "Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:43
 msgid "_Down"
 msgstr "A_vall"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:44
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 "Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:45
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:46
 msgid "Show information of the selected input method"
 msgstr "Mostra la informació del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:47
 msgid "_Preferences"
 msgstr "_Preferències"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:48
 msgid "Show setup of the selected input method"
 msgstr "Mostra la configuració del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:49
 msgid ""
 "<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 "
@@ -234,35 +244,35 @@ msgstr ""
 "del quadre.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:50 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Mètode d'entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:51 ../data/ibus.schemas.in.h:46
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:53
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:54 ../data/ibus.schemas.in.h:58
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:55
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Paràmetres del mètode d'entrada global</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -278,20 +288,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:64
 msgid "Start ibus on login"
 msgstr "Inicia l'IBus en entrar"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:66 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1221
 msgid "About"
 msgstr "Quant a"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:67 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -372,45 +381,53 @@ msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Dreceres de teclat de l'activador per gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:18
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
 msgid "Enable shortcut keys"
 msgstr "Habilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method on"
 msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Disable shortcut keys"
 msgstr "Inhabilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for turning input method off"
 msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Next engine shortcut keys"
 msgstr "Dreceres de teclat del motor següent"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 "Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:26
 msgid "Prev engine shortcut keys"
 msgstr "Dreceres de teclat del motor anterior"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 "Les dreceres de teclat per commutar al mètode d'entrada anterior de la "
 "llista"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:28
 msgid "Auto hide"
 msgstr "Oculta automàticament"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:29
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -418,11 +435,11 @@ msgstr ""
 "El comportament de la propietat panel. 0 = No es mostra, 1 = S'amaga "
 "automàticament, 2 = Es mostra sempre"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:30
 msgid "Language panel position"
 msgstr "Posició del quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 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"
@@ -431,11 +448,11 @@ msgstr ""
 "cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
 "inferior dreta, 4 = personalitzat"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Segueix el cursor d'entrada en el cas que sempre es mostri el quadre"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -443,11 +460,11 @@ msgstr ""
 "Si és cert, el quadre segueix el cursor d'entrada en el cas que sempre es "
 "mostri el quadre. Si és fals, el quadre es mostra en una ubicació fixa."
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "The milliseconds to show property panel"
 msgstr "Mil·lisegons per mostrar el quadre de propietats"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -455,23 +472,23 @@ msgstr ""
 "Els mil·lisegons per mostrar el quadre de propietats després de rebre "
 "l'enfocament o quan se'n canviïn les propietats."
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Orientation of lookup table"
 msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Show input method name"
 msgstr "Mostra el nom del mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "RGBA value of XKB icon"
 msgstr "valor RGBA de la icona XKB"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:43
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -491,11 +508,11 @@ msgstr ""
 "l'interval de 0% a 100%, i «a» té un valor en punt flotant en l'interval de "
 "0 a 1 per l'alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: ../data/ibus.schemas.in.h:44
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Els mil·lisegons per mostrar el quadre d'icona amb una propietat"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:45
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -507,49 +524,63 @@ msgstr ""
 "s'especifica amb el valor icon-prop-key a IBusEngineDesc. Si el valor és 0, "
 "no hi ha retard i la icona de propietat es mostra automàticament."
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Use custom font"
-msgstr "Utilitza un tipus de lletra personalitzat"
+msgstr "Utilitza una lletra personalitzada"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Use custom font name for language panel"
-msgstr "Utilitza un tipus de lletra personalitzat per al quadre d'idiomes"
+msgstr "Utilitza una lletra personalitzada per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
 msgid "Custom font"
-msgstr "Tipus de lletra personalitzat"
+msgstr "Lletra personalitzada"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:51
 msgid "Custom font name for language panel"
-msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
+msgstr "Lletra personalitzada per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
 msgid "Embed Preedit Text"
 msgstr "Incrusta el text pre-editat"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:56
 msgid "Embed Preedit Text in Application Window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:57
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:59
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:60
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
 "d'entrada"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:61
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva els prefixes"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:62
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
@@ -589,7 +620,7 @@ msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
 #: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
+#: ../setup/main.py:441
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -639,21 +670,21 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
+#: ../setup/keyboardshortcut.py:340 ../setup/main.py:442
 msgid "_OK"
 msgstr "_D'acord"
 
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:118 ../setup/main.py:466
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
 "l'anterior mètode d'entrada"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:396
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:417
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -668,155 +699,202 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:431
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:443
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:445
 msgid "switching input methods"
 msgstr "commutació dels mètodes d'entrada"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:49
 msgid "List engine name only"
 msgstr "Mostra tan sols el nom del motor"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:65 ../tools/main.vala:186 ../tools/main.vala:196
 msgid "Can't connect to IBus.\n"
 msgstr "No es pot connectar a IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:91
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:159
 msgid "No engine is set.\n"
 msgstr "No s'ha establert cap motor.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:167
 msgid "Set global engine failed.\n"
 msgstr "S'ha produït un error en establir el motor global.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:172
 msgid "Get global engine failed.\n"
 msgstr "S'ha produït un error en obtenir el motor global.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:211
 msgid "Read the system registry cache."
 msgstr "Llegeix la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:213
 msgid "Read the registry cache FILE."
 msgstr "Llegeix el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:231 ../tools/main.vala:236
 msgid "The registry cache is invalid.\n"
 msgstr "La memòria cau del registre no és vàlida.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:251
 msgid "Write the system registry cache."
 msgstr "Escriu la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:253
 msgid "Write the registry cache FILE."
 msgstr "Escriu el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:305
 msgid "Resetting…"
 msgstr "S'està restablint..."
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:319
 msgid "Done"
 msgstr "Fet"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:333
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../tools/main.vala:340
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#: ../tools/main.vala:377
 msgid "Set or get engine"
 msgstr "Estableix o obté el motor"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:378
 msgid "Exit ibus-daemon"
 msgstr "Surt de l'ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:379
 msgid "Show available engines"
 msgstr "Mostra els motors disponibles"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:380
 msgid "(Not implemented)"
 msgstr "(No implementat)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:381
 msgid "Restart ibus-daemon"
 msgstr "Reinicia l'ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:382
 msgid "Show version"
 msgstr "Mostra la versió"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:383
 msgid "Show the content of registry cache"
 msgstr "Mostra el contingut de la memòria cau del registre"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:384
 msgid "Create registry cache"
 msgstr "Crea la memòria cau del registre"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:385
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Mostra l'adreça D-Bus de l'ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:386
 msgid "Show the configuration values"
 msgstr "Mostra els valors de configuració"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:387
 msgid "Reset the configuration values"
 msgstr "Restableix els valors de configuració"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:388
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:389
 msgid "Show this information"
 msgstr "Mostra aquesta informació"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:395
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Ús: %s ORDRE [OPCIÓ...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:396
 msgid "Commands:\n"
 msgstr "Ordres:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:425
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s no és una ordre reconeguda!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:240 ../ui/gtk3/panel.vala:1213
+msgid "Emoji Dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:244
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:497 ../ui/gtk3/emojier.vala:562
+msgid "Favorites"
+msgstr "Preferits"
+
+#: ../ui/gtk3/emojier.vala:607
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:618
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:756
+#, c-format
+msgid "Description: Unicode point U+%04X"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:768
+#, c-format
+msgid "Description: %s"
+msgstr "Descripció: %s"
+
+#: ../ui/gtk3/emojier.vala:779
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotacions: %s"
+
+#: ../ui/gtk3/panel.vala:265 ../ui/gtk3/panel.vala:296
 msgid "IBus Panel"
 msgstr "Quadre de l'IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:813
 msgid "IBus Update"
 msgstr "Actualització d'IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:814 ../ui/gtk3/panel.vala:825
 msgid "Super+space is now the default hotkey."
 msgstr "Súper+espai ara és l'accés de teclat per defecte."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1185
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1189
 msgid "translator-credits"
 msgstr ""
 "Joan Duran <jodufi@gmail.com>\n"
@@ -825,20 +903,20 @@ msgstr ""
 "Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>,\n"
 "Xavier Conde Rueda <xavi.conde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1208
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1227
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1231
 msgid "Quit"
 msgstr "Surt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:353 ../ui/gtk3/propertypanel.vala:361
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/cs.po b/po/cs.po
index fbb1253d4..dc95a1e8f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,23 +1,27 @@
 # Czech translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
+# Translators:
 # Marek Suchánek <m.suchanek.2@gmail.com>, 2016. #zanata
 # Zdenek <chmelarz@gmail.com>, 2016. #zanata
+# Josef Hruška <hrusjos@gmail.com>, 2017. #zanata
+# Marek Suchánek <m.suchanek.2@gmail.com>, 2017. #zanata
+# Zdenek <chmelarz@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-04-19 19:06+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-09-08 10:02-0400\n"
-"Last-Translator: Marek Suchánek <m.suchanek.2@gmail.com>\n"
+"PO-Revision-Date: 2017-04-18 09:54-0400\n"
+"Last-Translator: Josef Hruška <hrusjos@gmail.com>\n"
 "Language-Team: Czech\n"
 "Language: cs\n"
-"X-Generator: Zanata 3.9.5\n"
+"X-Generator: Zanata 3.9.6\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ../setup/setup.ui.h:1
@@ -81,133 +85,157 @@ msgid "Previous input method:"
 msgstr "Předchozí vstupní metoda:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Klávesová zkratka pro vyvolání dialogu emoji"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr "Dialog emoji:"
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Klávesové zkratky pro zapnutí a vypnutí vstupní metody"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Povolit či zakázat:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Povolit:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Zakázat:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Klávesové zkratky</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Nastavení orientace kandidátů ve vyhledávací tabulce"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Orientace kandidátů:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Nastavit chování ibusu, co se týče schovávání jazykového panelu"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "Zobrazit panel vlastností:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Umístění jazykového panelu:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Zobrazit ikonu v oznamovací oblasti"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Zobrazit v jazykovém panelu vstupní metodu"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 "Pokud je zaškrtnuto, zobrazovat v jazykovém panelu název vstupní metody"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Vkládat předupravený text v okně aplikace"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "Vkládat předupravený text metody vstupu v okně aplikace"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Použít vlastní písmo:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Nastavit písmo kandidátů emoji v dialogu emoji"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Font emoji:"
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Nastavit jazyk anotací emoji v dialogu emoji"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "Jazyk anotací emoji:"
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Písmo a styl</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Obecné"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Přidat"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Přidat vybranou vstupní metodu mezi povolené vstupní metody"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Odebrat"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Odebrat vybranou vstupní metodu z povolených vstupních metod"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "_Výše"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu výše"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "_Níže"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu níže"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "O _metodě"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Ukázat podrobnosti o vybrané vstupní metodě"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Ukázat nastavení vybrané vstupní metody"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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 "
@@ -217,35 +245,35 @@ msgstr ""
 "za pomoci klávesové zkratky nebo kliknutím na ikonu panelu.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Vstupní metoda"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Použít systémové rozložení klávesnice"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Použít systémové rozložení klávesnice (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Rozložení klávesnice</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Používat stejnou vstupní metodu pro všechny aplikace"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globální nastavení vstupní metody</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -261,20 +289,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Spustit ibus při přihlášení"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Spouštění</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
 msgid "About"
 msgstr "O programu"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -500,32 +527,68 @@ msgid "Custom font name for language panel"
 msgstr "Vlastní název fontu pro panel jazyku"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Klávesová zkratka emoji pro gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Klávesová zkratka pro zapínání a vypínání psaní emoji"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Vlastní jméno písma pro znaky emoji v dialogu emoji"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Předvolený jazyk pro slovník emoji"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Zvolte výchozí jazyk slovníků emoji v dialogovém okně emoji. Hodnota $lang "
+"je aplikována na /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "seznam oblíbených emoji v dialogu emoji"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Pokud tento seznam obsahuje nějaké znaky, můžete si v seznamu emoji zobrazit "
+"oblíbené emoji."
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Vložený přededitovaný text"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Vložený přededitovaný text v okně aplikace"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Použít globální vstupní metodu"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Povolit metodu vstupu ve výchozím nastavení"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Povolit metodu vstupu ve výchozím nastavení, pokud aplikace dostane vstupní "
 "fokus"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "Zachovat jméno prefixu DConf "
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefix kláves DConf pro zastavení konverze jména"
 
@@ -541,6 +604,24 @@ msgstr ""
 msgid "Other"
 msgstr "Ostatní"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Vybrat jazyk"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Více…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -564,15 +645,6 @@ msgstr "Popis:\n"
 msgid "Select an input method"
 msgstr "Vybrat metodu vstupu"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Zrušit"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Více…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -615,20 +687,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Stiskněte prosím klávesu (či kombinaci kláves)."
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Použít klávesovou zkratku s posunem k přepnutí na předchozí vstupní metodu"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Démon IBus neběží. Přejete si jej spustit?"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -643,172 +711,251 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Démon IBus nemohl být spuštěn během %d sekund"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vybrat klávesovou zkratku pro %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "přepínání vstupní metody"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Vypsat pouze název enginu"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Nelze se připojit k IBusu.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "jazyk: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Engine není nastaven.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Nepodařilo se nastavit globální engine.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Nepodařilo se získat globální engine.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Číst mezipaměť systémového registru."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Číst mezipaměť souboru registru."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Neplatná mezipaměť registru.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Zapsat mezipaměť systémového registru."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Zapsat mezipaměť souboru registru."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Obnovení..."
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Nastavit nebo získat engine"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Ukončit démona IBusu"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Zobrazit dostupné enginy"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Není implementováno)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Restartovat démona IBusu"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Zobrazit verzi"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Zobrazit obsah mezipaměti registru"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Vytvořit mezipaměti registru"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Vypsat adresu D-Bus démona IBusu"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Zobrazit konfigurační hodnoty"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Obnovit konfigurační hodnoty"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Uložit emoji z dialogu do schránky."
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Zobrazit tuto informaci"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Použití: %s PŘÍKAZ [VOLBY...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Příkazy:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s je neznámý příkaz!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:276
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:282
+msgid "Type annotation or choose emoji"
+msgstr "Napište anotaci nebo vyberte emoji"
+
+#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
+msgid "Favorites"
+msgstr "Oblíbené"
+
+#: ../ui/gtk3/emojier.vala:612
+msgid "Page Down"
+msgstr "Další strana"
+
+#: ../ui/gtk3/emojier.vala:623
+msgid "Page Up"
+msgstr "Předchozí strana"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
+#, c-format
+msgid "Description: %s"
+msgstr "Popis: %s"
+
+#: ../ui/gtk3/emojier.vala:797
+msgid "None"
+msgstr "Žádný"
+
+#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
+#, c-format
+msgid "Code point: %s"
+msgstr "Kódový bod: %s"
+
+#: ../ui/gtk3/emojier.vala:822
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotace: %s"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:832
 msgid "IBus Update"
 msgstr "Aktualizace IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
 msgid "Super+space is now the default hotkey."
 msgstr "Klávesa super+mezerník je nyní výchozí klávesovou zkratkou."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1214
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus je inteligentní vstupní sběrnice pro Linux / Unix."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1218
 msgid "translator-credits"
 msgstr "Kredit-překladatelům"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1237
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1242
+msgid "Emoji Dialog"
+msgstr "Dialog emoji"
+
+#: ../ui/gtk3/panel.vala:1256
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1260
 msgid "Quit"
 msgstr "Ukončit"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "implicitně:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr "Vybírání emoji zrušeno."
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr "Emoji zkopírováno do schránky."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:68
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"PÍSMO\" pro znaky emoji v dialogu emoji."
+
+#: ../ui/gtk3/emojierapp.vala:69
+msgid "FONT"
+msgstr "PÍSMO"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"JAZYK\" pro anotace v dialogu emoji. Např. \"cs\""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "LANG"
+msgstr "JAZYK"
diff --git a/po/de.po b/po/de.po
index 2d5b288ac..4823ff38e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,21 +12,23 @@
 # Rainer <rgromans@redhat.com>, 2013
 # Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
-# FloH. <postfuerflo@gmail.com>, 2016. #zanata
+# Florian Heiser <postfuerflo@gmail.com>, 2016. #zanata
+# Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
+# Tobias Weise <tobias.weise@web.de>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-08-25 03:54-0400\n"
-"Last-Translator: FloH. <postfuerflo@gmail.com>\n"
+"PO-Revision-Date: 2017-04-17 04:50-0400\n"
+"Last-Translator: Tobias Weise <tobias.weise@web.de>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -58,7 +60,7 @@ msgstr "Benutzerdefiniert"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Nicht anzeigen"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
@@ -91,180 +93,207 @@ msgid "Previous input method:"
 msgstr "Vorherige Eingabemethode:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr "Emoji-Dialog."
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Aktivieren oder deaktivieren:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Aktivieren:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Deaktivieren:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Tastenkombinationen</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Ausrichtung der Kandidaten:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 "Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu "
 "verstecken"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
-msgstr ""
+msgstr "Zeige Einstellungsleiste:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 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"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Benutzerdefinierte Schriftart verwenden:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Font von Emoji-Kandidaten im Emoji-Dialog einstellen"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Emoji Font:"
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Einstellen einer Sprache für Emoji-Annotationen im Emoji-Dialog"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "Emoji-Annotationssprache:"
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Schriftart und Stil</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Allgemein"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden "
 "hinzu"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 "Entfernen Sie die gewählte Eingabemethode aus den aktivierten "
 "Eingabemethoden"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "_Hoch"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 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"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "_Runter"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 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"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "_Info"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Informationen zur gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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>"
 msgstr ""
+"<small><i>Die aktive Eingabemethode kann aus der angezeigten Liste durch die "
+"Tastenkombination oder durch einen Klick auf das Icon ausgewählt werden</i></"
+"small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -280,20 +309,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "IBus bei der Anmeldung starten"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Starten</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
 msgid "About"
 msgstr "Info"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -345,20 +373,24 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "Latin Tastaturbelegungen ohne ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
+"US Tastaturbelegung wird den Latin Tastaturbelegungen angefügt. Varianten "
+"können vernachlässigt werden."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "Verwenden von xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"xmodmap ausführen wenn .xmodmap oder .Xmodmap vorhanden ist wenn ibus "
+"Engines gewechselt werden."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -410,6 +442,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Verhalten des Eigenschaften-Panels. 0 = nicht anzeigen, 1 = automatisch "
+"verstecken, 2 = immer anzeigen"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -425,23 +459,27 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Den Input-Cursor verfolgen falls das Panel immer angezeigt wird"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Wenn wahr folgt das Panel dem Input-Cursor wenn das Panel immer angezeigt "
+"wird. Wenn falsch wird das Panel an einer festen Position angezeigt."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Millisekunden bis die Einstellungsleiste angezeigt wird"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Millisekunden bis zum Anzeigen der Eigenschaftenleiste nach Fokuswechsel "
+"oder Eigenschaftenwechsel."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -457,7 +495,7 @@ msgstr "Name der Eingabemethode anzeigen"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "RGBA Werte des XKB Icons"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -470,10 +508,17 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"Das XKB Icon zeigt den Layout-String und der String wird mit dem RGBA Wert "
+"gerendert. Der RGBA Wert kann sein  1. eine X11-Farbe , 2. ein Hex-Wert in "
+"der Form '#rrggbb' wobei 'r', 'g' und 'b' HEX-Werte für Rot, Grün und Blau "
+"sind, 3. eine RGB-Farbe in der Form 'rgb(r,g,b)' oder 4. eine RGBA-Farbe in "
+"der Form 'rgba(r,g,b,a)' wobei 'r', 'g', und 'b' entweder Integer im Bereich "
+"0 bis 255 oder Prozentwerte von 0-100% sind und 'a' ein Gleitkommawert im "
+"Bereich 0 bis 1 für das Alpha ist."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "Millisekunden bis zum Anzeigen der Panel-Icons einer Eigenschaft"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -500,32 +545,68 @@ msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Emoji Tastenkombination für gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Standard-Sprache für das Emoji-Wörterbuch"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Auswahl einer Standard-Sprache der Emoji-Wörterbücher im Emoji-Dialog. Der "
+"Wert $lang wird auf /usr/share/ibus/dicts/emoji-$lang.dict angewendet."
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "Emoji-Favoriteneliste im Emoji-Dialog"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Sie können die favorisierten Emoji in der Emoji-Liste anzeigen wenn die "
+"Liste Zeichen enthält."
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:62
 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:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -541,6 +622,24 @@ msgstr ""
 msgid "Other"
 msgstr "Sonstige"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mehr..."
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -564,15 +663,6 @@ msgstr "Beschreibung:\n"
 msgid "Select an input method"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr ""
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -615,21 +705,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 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:369
+#: ../setup/main.py:412
 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:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -645,175 +731,250 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, 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:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "Eingabemethoden wechseln"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Nur Engine-Name auflisten"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Keine Verbindung zu IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Keine Engine gesetzt.\n"
 "\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Lesen Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Lesen Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Der Registry-Cache ist ungültig.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Schreiben Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Schreiben Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
-msgstr ""
+msgstr "Neustarten..."
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
-msgstr ""
+msgstr "Fertig"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Setzen oder erhalten Modul"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Beenden ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Anzeigen verfügbare Module"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Nicht implementiert)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Neustart ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Anzeigen Version"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Anzeigen Inhalt des Registry-Cache."
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Erstellen Registry-Cache"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Anzeigen der Konfigurationswerte"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Zurücksetzen der Konfigurationswerte"
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Anzeige dieser Information"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Anwendung: %s BEFEHL [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
-msgid "IBus Panel"
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr "Emoji-Dialog"
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr "Favoriten"
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr "Seite runter"
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr "Seite hoch"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr "Beschreibung: %s"
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr "Kein"
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotationen: %s"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr "IBus Panel"
+
+#: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
 msgstr "IBus Aktualisierung"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
 msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1196
 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:1090
+#: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1219
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1238
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1242
 msgid "Quit"
 msgstr "Beenden"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr "Abbrechen der Emoji-Auswahl."
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr "Emoji in die Zwischenablage kopiert."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 5cb3d21e3..0860fe52c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,24 +13,26 @@
 # Gerardo Rosales <grosale86@gmail.com>, 2014
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Alberto Castillo <acastillogordon@gmail.com>, 2016. #zanata
+# Alexis Stevenson <waldoribeiro@sapo.pt>, 2016. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2016. #zanata
 # Omar Berroterán S. <omarberroteranlkf@gmail.com>, 2016. #zanata
-# Waldo Luis Ribeiro <waldoribeiro@sapo.pt>, 2016. #zanata
+# Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-09-04 04:29-0400\n"
-"Last-Translator: Omar Berroterán S. <omarberroteranlkf@gmail.com>\n"
+"PO-Revision-Date: 2017-05-07 08:04-0400\n"
+"Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.5\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -249,31 +251,88 @@ msgstr ""
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Atajo de teclado para mostrar el diálogo de emoji"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Selección de emoji:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Fuente a usar para los emoji candidatos en el cuadro de emoji."
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Fuente para emoji:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+"Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Idioma para las anotaciones de emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Realizar búsqueda parcial en las anotaciones de emoji con la siguiente "
+"condición y más que un mínimo de caracteres:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Si se puede obtener una coincidencia parcial en lugar de exacta en la "
+"búsqueda de anotaciones de emoji."
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Comienza con el texto"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Acaba con el texto"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Contiene el texto"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usar la distribución del teclado del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar la distribución del teclado del sistema (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Distribución del teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuraciones globales de método de entrada</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -289,20 +348,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Iniciar ibus al ingresar"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Acerca de"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -467,7 +525,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
-msgstr "Orientación de búsqueda en la tabla "
+msgstr "Orientación de la tabla de búsqueda"
 
 #: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
@@ -534,32 +592,110 @@ msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Atajos de teclado de emoji para gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+"Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Idioma predeterminado para el diccionario de emoji"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Elija un idioma predeterminado para el diccionario de emoji. Su valor "
+"($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "lista de emoji favoritos en el diálogo de emoji"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Puede mostrar sus emoji favoritos en la lista de emoji si los incluye en "
+"esta lista."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr ""
+"Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Si se puede obtener una coincidencia parcial en la búsqueda de anotaciones "
+"de emoji en lugar de una exacta."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr ""
+"Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
+"indicada"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Obtener coincidencias parciales en lugar de exactas en las anotaciones de "
+"emoji que tengan más que el número de caracteres indicado "
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+"Elija una condición para las coincidencias parciales de anotaciones de emoji"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Elija una de estas condiciones para las coincidencias parciales de "
+"anotaciones de emoji: 0 == inicio del texto, 1 == final del texto, 2 == "
+"contiene el texto."
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por defecto"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilitar método de entrada por defecto cuando la aplicación consigue el "
 "foco de entrada"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -575,6 +711,24 @@ msgstr ""
 msgid "Other"
 msgstr "Otro"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Elija un idioma"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Más..."
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -598,15 +752,6 @@ msgstr "Descripción:\n"
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Más..."
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -649,19 +794,15 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_Aceptar"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:580
 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:369
+#: ../setup/main.py:507
 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:390
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -676,172 +817,309 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:542
 #, 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:416
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "cambiando métodos de entrada"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Actividades"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Animales y naturaleza"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Banderas"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Comida y bebida"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objetos"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Emoticonos y gente"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Símbolos"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Viajes y lugares"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Lea el cache del registro del sistema."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Lea el ARCHIVO de caché del registro."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "El caché del registro es inválido.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Escriba al caché del registro del sistema."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Restableciendo..."
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Hecho"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Mostrar los valores de la configuración"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Restablecer los valores de la configuración"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Guardar emoji del diálogo en el portapapeles."
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "USO: %s COMANDO [OPCION...]\n"
+msgstr "Uso: %s COMANDO [OPCIÓN...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Mostrar variantes de emoji"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menú"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Otros"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Selección de emoji"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Escriba el texto o elija un emoji"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "Siguiente"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "Anterior"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Punto de código: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Tiene variantes emoji"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "Descripción: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "Ninguna"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotaciones: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Cancelada la selección de emoji."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Se copió un emoji al portapapeles."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "FUENTE"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+"IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
+""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "IDIOMA"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Buscar coincidencias con la longtud indicada"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Buscar coincidencias con la condición indicada por el código"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1236
 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:1090
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "Créditos de Traducción"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/fr.po b/po/fr.po
index bce7c70f6..39915e7bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,22 +10,26 @@
 # Julien Humbert <julroy67@gmail.com>, 2009-2014
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
 # Julien Humbert <julroy67@gmail.com>, 2009-2015
-# Jibec <jean-baptiste@holcroft.fr>, 2016. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
+# Edouard Duliege <edouard.duliege@gmail.com>, 2017. #zanata
+# Emmanuel Nedelec <nednet@wanadoo.fr>, 2017. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
+# José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-04-27 12:38+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-08-30 01:49-0400\n"
-"Last-Translator: Jibec <jean-baptiste@holcroft.fr>\n"
+"PO-Revision-Date: 2017-04-20 02:40-0400\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -74,197 +78,222 @@ msgstr "Préférences de IBus"
 #: ../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"
+"Raccourci clavier pour passer à la méthode d’entrée suivante de la liste"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
-msgstr "Méthode d'entrée suivante :"
+msgstr "Méthode d’entrée suivante :"
 
 #: ../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"
+"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:"
-msgstr "Méthode d'entrée précédente :"
+msgstr "Méthode d’entrée précédente :"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Les raccourcis pour afficher la boite de dialogue des émoticônes"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "Raccourcis claviers pour activer ou désactiver les méthodes d'entrées"
+msgstr "Raccourcis claviers pour activer ou désactiver les méthodes d’entrées"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Activer / désactiver :"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Activer :"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Désactiver :"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Raccourcis clavier</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Permet de choisir l'orientation de la liste des candidats"
+msgstr "Permet de choisir l’orientation de la liste des candidats"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Orientation de la liste des candidats :"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Permet de choisir l'affichage de la barre de langues d'ibus"
+msgstr "Permet de choisir l’affichage de la barre de langues d’ibus"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "Afficher le panneau de propriétés :"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Afficher la barre de langues :"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
-msgstr "Afficher l'icône dans la boîte à miniatures"
+msgstr "Afficher l’icône dans la boîte à miniatures"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
-msgstr "Afficher le nom de la méthode d'entrée sur la barre de langues"
+msgstr "Afficher le nom de la méthode d’entrée sur la barre de langues"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 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 "
+"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
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
-msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
+msgstr "Insérer le texte en cours d’édition dans la fenêtre de l’application"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 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"
+"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
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Police des émoticônes :"
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+"Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "Langue d’annotations des émoticônes :"
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Police et Style</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Général"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
-msgstr "A_jouter"
+msgstr "_Ajouter"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
-"Ajouter la méthode d'entrée selectionnée aux méthodes d'entrée actives"
+"Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 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"
+"Supprimer la méthode d’entrée sélectionnée des méthodes d’entrées actives"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "_Monter"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 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"
+"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:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "_Descendre"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 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"
+"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:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "À _propos"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
-msgstr "Afficher les informations de la méthode d'entrée sélectionnée"
+msgstr "Afficher les informations de la méthode d’entrée sélectionnée"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
-msgstr "Afficher le paramétrage de la méthode d'entrée sélectectionnée"
+msgstr "Afficher le paramétrage de la méthode d’entrée sélectectionnée"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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>"
 msgstr ""
-"<small><i>La méthode de saisie active peut être modifiée vers l'une des "
+"<small><i>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.</i></small>"
+"clavier ou en cliquant sur l’icône du panneau.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
-msgstr "Méthode d'entrée"
+msgstr "Méthode d’entrée"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
-msgstr "Partager la même méthode d'entrée pour toutes les applications"
+msgstr "Partager la même méthode d’entrée pour toutes les applications"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
-msgstr "<b>Configuration de la méthode d'éntrée globale</b>"
+msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -275,25 +304,24 @@ msgid ""
 msgstr ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
-"Page d'accueil : https://github.com/ibus/ibus/wiki\n"
+"Page d’accueil : https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Démarrer IBus lors de la connexion"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
 msgid "About"
 msgstr "À propos"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -305,7 +333,7 @@ msgstr "Précharger les moteurs"
 #. Translators: Tooltip for the button “Preload Engines”
 #: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
-msgstr "Précharger les moteurs au démarrage d'ibus"
+msgstr "Précharger les moteurs au démarrage d’ibus"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
@@ -313,13 +341,13 @@ msgstr "Ordre des moteurs"
 
 #: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr "L'ordre des moteurs enregistrés dans la liste des méthodes d'entrées"
+msgstr "L’ordre des moteurs enregistrés dans la liste des méthodes d’entrées"
 
 #: ../data/ibus.schemas.in.h:7
 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"
+"Délai en millisecondes d’affichage de la fenêtre du commutateur de méthode "
+"d’entrée"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
@@ -327,8 +355,8 @@ msgid ""
 " 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 "
+"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 &lt; délai en millisecondes. 0 &gt; ne pas "
 "afficher la fenêtre et permuter avec le moteur précédent ou suivant."
 
@@ -342,11 +370,11 @@ msgid ""
 "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."
+"entre la version d’une installation précédente de ibus et l’actuelle."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr "Dispositions latines ne disposant pas d'ASCII"
+msgstr "Dispositions latines ne disposant pas d’ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
@@ -362,7 +390,7 @@ msgstr "Utiliser xmodmap"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Lancer xmodmap si le fichier .xmodmap ou .Xmodmap existe lors d'un "
+"Lancer xmodmap si le fichier .xmodmap ou .Xmodmap existe lors d’un "
 "basculement de moteur ibus"
 
 #: ../data/ibus.schemas.in.h:15
@@ -379,7 +407,7 @@ msgstr "Activer les raccourcis clavier"
 
 #: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
-msgstr "Les raccourcis clavier pour la méthode d'entrée sont activés"
+msgstr "Les raccourcis clavier pour la méthode d’entrée sont activés"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
@@ -387,7 +415,7 @@ msgstr "Désactiver les raccourcis clavier"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr "Les raccourcis clavier pour désactiver  la méthode d'entrée"
+msgstr "Les raccourcis clavier pour désactiver  la méthode d’entrée"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
@@ -396,7 +424,7 @@ msgstr "Raccourci clavier pour passer au moteur suivant"
 #: ../data/ibus.schemas.in.h:23
 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"
+"Raccourci clavier pour passer à la méthode d’entrée suivante de la liste"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -404,7 +432,7 @@ msgstr "Raccourci clavier pour revenir au moteur précédent"
 
 #: ../data/ibus.schemas.in.h:25
 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"
+msgstr "Raccourci clavier pour revenir à la méthode d’entrée précédente"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -433,14 +461,14 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr "Suivre le curseur d'insertion lorsque le panneau est toujours affiché"
+msgstr "Suivre le curseur d’insertion lorsque le panneau est toujours affiché"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"Si activé, le panneau suit le curseur d'insertion lorsque le panneau est "
+"Si activé, le panneau suit le curseur d’insertion lorsque le panneau est "
 "toujours affiché. Sinon, le panneau est affiché à une position fixe."
 
 #: ../data/ibus.schemas.in.h:32
@@ -465,11 +493,11 @@ msgstr "Orientation de la liste des candidats. 0 = Horizontale, 1 = Verticale"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
-msgstr "Afficher le nom de la méthode d'entrée"
+msgstr "Afficher le nom de la méthode d’entrée"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr "Valeur RGBA de l'icône XKB"
+msgstr "Valeur RGBA de l’icône XKB"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -482,20 +510,20 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
-"L'icône XKB affiche la chaîne de caractères de la disposition et cette "
+"L’icône XKB affiche la chaîne de caractères de la disposition et cette "
 "chaîne de caractères est affichée avec sa valeur RGBA. Cette valeur RGBA "
-"peut être 1. le nom d'une couleur X11, 2. une valeur hexadécimale sous la "
-"forme '#rrggbb' où 'r', 'g', et 'b' sont des chiffres hexadécimaux "
+"peut être 1. le nom d’une couleur X11, 2. une valeur hexadécimale sous la "
+"forme « #rrggbb » où « r », « g » et « b » sont des chiffres hexadécimaux "
 "correspondant respectivement au rouge, vert et bleu, 3. une couleur RGB sous "
-"la forme 'rgb(r,g,b)' ou 4. une couleur RGBA sous la forme 'rgba(r,g,b,a)' "
-"où 'r', 'g' et 'b' sont soit des entiers compris entre 0 et 255, soit un "
-"pourcentage compris entre 0 et 100 %, et 'a', la valeur alpha, est un nombre "
-"à virgule flottante compris entre 0 et 1."
+"la forme « rgb(r,g,b) » ou 4. une couleur RGBA sous la forme « rgba(r,g,b,a) "
+"» où « r », « g » et « b » sont soit des entiers compris entre 0 et 255, "
+"soit un pourcentage compris entre 0 et 100 %, et « a » la valeur alpha, est "
+"un nombre à virgule flottante compris entre 0 et 1."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
-"Temps en millisecondes pour afficher l'icône de panneau d'une propriété"
+"Temps en millisecondes pour afficher l’icône de panneau d’une propriété"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -526,32 +554,72 @@ msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour la barre de langues"
 
 #: ../data/ibus.schemas.in.h:50
-msgid "Embed Preedit Text"
-msgstr "Insérer le texte en cours d'édition"
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Raccourcis clavier des émoticônes pour gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:51
-msgid "Embed Preedit Text in Application Window"
-msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+"Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Use global input method"
-msgstr "Utiliser la méthode d'éntrée globale"
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+"Nom de la police personnalisée pour les caractères d’émoticônes dans la "
+"boite de dialogue"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Langue par défaut pour le dictionnaire des émoticônes"
 
 #: ../data/ibus.schemas.in.h:54
-msgid "Enable input method by default"
-msgstr "Par défaut, activer la méthode d'entrée"
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Choisissez la langue par défaut pour les dictionnaires d’émoticônes dans la "
+"boite de dialogue. La valeur $Lang est appliquée à /usr/share/ibus/dicts/"
+"emoji-$lang.dict"
 
 #: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "liste des émoticônes favorites dans la boite de dialogue"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Vous pouvez afficher les émoticônes favorites dans la liste des émoticônes "
+"si celle-ci contient des caractères."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Embed Preedit Text"
+msgstr "Insérer le texte en cours d’édition"
+
+#: ../data/ibus.schemas.in.h:58
+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:59
+msgid "Use global input method"
+msgstr "Utiliser la méthode d’éntrée globale"
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Enable input method by default"
+msgstr "Par défaut, activer la méthode d’entrée"
+
+#: ../data/ibus.schemas.in.h:62
 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 "
+"Par défaut, activer la méthode d’entrée lorsque l’application reçoit le "
 "focus"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -567,6 +635,24 @@ msgstr ""
 msgid "Other"
 msgstr "Autre"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Sélectionner la langue"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "A_nnuler"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_Valider"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Plus..."
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -588,16 +674,7 @@ msgstr "Description :\n"
 
 #: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
-msgstr "Sélectionnez une méthode d'entrée"
-
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "A_nnuler"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Plus..."
+msgstr "Sélectionnez une méthode d’entrée"
 
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
@@ -641,20 +718,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_Valider"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 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"
+"Utiliser le raccourci clavier pour revenir à la méthode d’entrée précédente"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:412
 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 ?"
+msgstr "Le démon IBus n’est pas démarré. Souhaitez-vous le démarrer ?"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -670,172 +743,285 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, 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"
+msgstr "Le démon IBus n’a pas pu être démarré en %d secondes"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Sélection du raccourci clavier pour %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
-msgstr "Changement de méthode d'entrée"
+msgstr "Changement de méthode d’entrée"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion à IBus impossible.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr "Aucun moteur n'est configuré.\n"
+msgstr "Aucun moteur n’est configuré.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Lire le cache du registre système."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Lire le fichier FILE du cache du registre système."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Le cache du registre est invalide.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Enregistrer le cache du registre système."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Enregistrer le fichier FILE du cache du registre."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Réinitialisation…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Effectuée"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Définir ou obtenir le moteur"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Quitter ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Afficher les moteurs disponibles"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Non implémenté)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Redémarrer ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Afficher le contenu du cache du registre"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Créer le cache du registre"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Afficher l'adresse D-Bus de ibus-daemon"
+msgstr "Afficher l’adresse D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Afficher les valeurs de configuration"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Réinitialiser les valeurs de configuration"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Afficher cette information"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s n'est pas une commande connue !\n"
+msgstr "%s n’est pas une commande connue !\n"
+
+#: ../ui/gtk3/emojier.vala:170
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:284 ../ui/gtk3/panel.vala:1242
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:290
+msgid "Type annotation or choose emoji"
+msgstr "Saisir une annotation ou choisir une émoticône"
+
+#: ../ui/gtk3/emojier.vala:595 ../ui/gtk3/emojier.vala:642
+msgid "Favorites"
+msgstr "Favoris"
+
+#: ../ui/gtk3/emojier.vala:667
+msgid "Page Down"
+msgstr "Page suivante"
+
+#: ../ui/gtk3/emojier.vala:678
+msgid "Page Up"
+msgstr "Page précédente"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:849 ../ui/gtk3/emojier.vala:863
+#, c-format
+msgid "Description: %s"
+msgstr "Description : %s"
+
+#: ../ui/gtk3/emojier.vala:849
+msgid "None"
+msgstr "Aucune"
+
+#: ../ui/gtk3/emojier.vala:854 ../ui/gtk3/emojier.vala:893
+#, c-format
+msgid "Code point: %s"
+msgstr "Point de code : %s"
+
+#: ../ui/gtk3/emojier.vala:874
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotations : %s"
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr "Abandon du choix d’émoticône."
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr "Une émoticône a été copiée dans le presse-papier."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:71
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "« POLICE » des émoticônes dans la boite de dialogue."
+
+#: ../ui/gtk3/emojierapp.vala:72
+msgid "FONT"
+msgstr "POLICE"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+"« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
+"« fr »"
+
+#: ../ui/gtk3/emojierapp.vala:78
+msgid "LANG"
+msgstr "LANGUE"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:832
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1214
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1218
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1237
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1256
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1260
 msgid "Quit"
 msgstr "Quitter"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/hu.po b/po/hu.po
index 845a077c4..05b1ae49e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Hungarian
 # Hungarian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,21 @@
 # kelemeng <kelemeng@gnome.hu>, 2011
 # Sulyok Péter <peti@fedoraproject.org>, 2009
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
+# Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
-"Last-Translator: Zoltan Hoppár <hopparz@gmail.com>\n"
-"Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-07 11:31-0400\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
+"Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -52,11 +54,11 @@ msgstr "Egyéni"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Ne mutassa"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Automatikus elrejtés"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,131 +85,164 @@ msgid "Previous input method:"
 msgstr "Előző beviteli mód:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Az emodzsi párbeszédablak gyorsbillentyűje"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr "Emodzsi párbeszédablak:"
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Engedélyezés vagy tiltás:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Engedélyezés:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Letiltás:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Gyorsbillentyűk</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Jelöltek tájolásának beállítása a keresési táblában"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Jelöltek tájolása:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "A nyelvi panel elhelyezése:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Ikon megjelenítése az értesítési területen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazás ablakába"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 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
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Egyéni betűkészlet használata:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Betűkészlet és stílus</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Általános"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 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:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 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:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "_Fel"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 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:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "_Le"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 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:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Információk megjelenítése a kiválasztott beviteli módról"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "B_eállítások"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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 "
@@ -215,35 +250,35 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Beviteli mód"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Rendszer-billentyűzetkiosztás használata"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globális bevitelimód-beállítások</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Speciális"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -251,194 +286,288 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Az intelligens beviteli busz</small>\nHonlap: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Az intelligens beviteli busz</small>\n"
+"Honlap: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Az IBus indítása bejelentkezéskor"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
 msgid "About"
 msgstr "Névjegy"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Alrendszerek előtöltése"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Alrendszerek előtöltése  az ibus indításakor"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Alrendszerek sorrendje"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Elmentett motorok sorrendje a beviteli metódus listájában"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Felugró ablak késése az IME váltóablaknál"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Késés milliszekundumban. 0 &gt; Nem jeleníti meg az ablakot, és átváltja a köv./előző motorra."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Késés "
+"milliszekundumban. 0 &gt; Nem jeleníti meg az ablakot, és átváltja a köv./"
+"előző motorra."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Aktiválja a gyorsbillentyűket"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Alkalmazza a gyorsbillentyűket a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Gyorsbillentyűk engedélyezése"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Gyorsbillentyűk letiltása"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Következő alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Előző alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Automatikus elrejtés"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Nyelvi panel pozíciója"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Keresési tábla tájolása"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Beviteli mód megjelenítése"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Egyéni betűkészlet használata"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Egyéni betűkészlet használata a nyelv panelen"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Egyéni betűkészlet"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:62
 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:45
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "DConf megtartja a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
 
@@ -446,36 +575,56 @@ msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "Mé_gse"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Nyelv: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Billentyűzetkiosztás: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Szerző: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Leírás:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Válasszon beviteli módot"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Bill."
 
@@ -487,210 +636,311 @@ msgstr "IBus beállításai"
 msgid "Keyboard shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Billentyűkód:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Módosítók:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Törlés"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "Mé_gse"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:485
 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:329
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Az IBus daemon nem működik. El kívánja indítani?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:433
 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:364
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus daemon nem indítható %d mp belül."
 
-#: ../setup/main.py:376
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "beviteli módok váltása"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevét listázza"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Nem tudok csatlakozni az IBus-hoz.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nincs motor beállítva.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Általános motor beállítása nem sikerült.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Általános motor beszerzése nem sikerült.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr ""
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr ""
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+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:309
-#, c-format
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ismeretlen parancs!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr ""
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1196
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
-msgstr "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 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"
-
-#: ../ui/gtk3/panel.vala:732
+msgstr ""
+"Zoltan Hoppar <zoltanh721@fedoraproject.org>, 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:1219
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1238
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1242
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 4a59f95e0..7b3285d2f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Italian
 # Italian translation of ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,19 +12,26 @@
 # milo <milo@ubuntu.com>, 2009
 # primes2h <primes2h@ubuntu.com>, 2009
 # primes2h <primes2h@ubuntu.com>, 2009
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# Alessio Ciregia <alciregi@gmail.com>, 2017. #zanata
+# Andrea Masala <andrea.masala87@gmail.com>, 2017. #zanata
+# Luca Ciavatta <luca.ciavatta@gmail.com>, 2017. #zanata
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:47+0000\n"
-"Last-Translator: fvalen <fvalen@redhat.com>\n"
-"Language-Team:  <it@li.org>\n"
+"POT-Creation-Date: 2017-04-19 19:06+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-18 04:22-0400\n"
+"Last-Translator: Andrea Masala <andrea.masala87@gmail.com>\n"
+"Language-Team: <it@li.org>\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -56,11 +63,11 @@ msgstr "Personalizzato"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Non mostrare"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Nascondi automaticamente"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -72,7 +79,8 @@ msgstr "Preferenze di IBus"
 
 #: ../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:"
@@ -80,174 +88,214 @@ msgstr "Metodo di input successivo:"
 
 #: ../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:"
 msgstr "Metodo di input precedente:"
 
 #: ../setup/setup.ui.h:16
+#, fuzzy
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "I tasti scorciatoia per mostrare la finestra degli emoticon"
+
+#: ../setup/setup.ui.h:17
+#, fuzzy
+msgid "Emoji dialog:"
+msgstr "Finestra degli emoticon:"
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Abilitare o disabilitare:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Abilita:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Disabilita:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Scorciatoie da tastiera</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Orientamento dei candidati:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 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
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
-msgstr ""
+msgstr "Mostra il pannello delle proprietà:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Posizione pannello della lingua:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Mostrare l'icona nell'area di notifica"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Mostrare il nome del metodo di input nella barra della lingua"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 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
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 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
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Usare carattere personalizzato:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+#, fuzzy
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Impostare un font di candidati emoji nella finestra di emoji"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Carattere emoticon:"
+
+#: ../setup/setup.ui.h:37
+#, fuzzy
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Impostare una lingua di annotazioni emoji nella finestra di emoji"
+
+#: ../setup/setup.ui.h:38
+#, fuzzy
+msgid "Emoji annotation language:"
+msgstr "Lingua di annotazione emoji:"
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Tipo di carattere e stile</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Generali"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "A_ggiungi"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "_Su"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "_Giù"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Mostra le informazioni sul metodo di input selezionato"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "Preferen_ze"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Mostra l'impostazione dell'input method selezionato"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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>"
 msgstr ""
+"<small><i>Il metodo di input attivo può essere commutato tra quelli "
+"selezionati nella lista sopra premendo i tasti di scelta rapida della "
+"tastiera o facendo clic sull'icona del pannello.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Metodo di input"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usa la disposizione di tastiera del sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Condivide lo stesso metodo di input tra le applicazioni"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "Seleziona un metodo di input"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -255,194 +303,338 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Il bus di input intelligente</small>\nSito web: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Il bus di input intelligente</small>\n"
+"Sito web: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Avvia IBus all'accesso"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Avvio</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
 msgid "About"
 msgstr "Informazioni"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Pre-carica i motori"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Precarica i motori durante l'avvio di ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Ordine motori"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Ordine motori salvati nell'elenco del metodo di input"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Ritardo popup in millisecondi per la finestra del selettore IME"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Ritardo in millisecondi. 0 &gt; Non mostrare la finestra e passa ai motori prec/succ."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Ritardo in millisecondi. 0 &gt; Non mostrare la "
+"finestra e passa ai motori prec/succ."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "Numero di versione salvata"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:10
+#, fuzzy
 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 ""
+"Il numero di versione salvata verrà usato per controllare la differenza fra "
+"la versione precedente e quella corrente di ibus."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+#, fuzzy
+msgid "Latin layouts which have no ASCII"
+msgstr "Schemi latini senza ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+#, fuzzy
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+"Lo schema US viene accodato agli schemi latini. Le varianti possono essere "
+"omesse."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Utilizza xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+#, fuzzy
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+"Eseguire xmodmap se .xmodmap o .Xmodmap esistono quando i motori ibus "
+"vengono scambiati."
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Tasto di scelta rapida di avvio"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Attiva i tasti scorciatoia per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Abilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "I tasti scorciatoia per abilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Disabilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "I tasti scorciatoia per disabilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida successivo"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida precedente"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "I tasti scorciatoia per passare al metodo di input precedente"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Nasconde automaticamente"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Comportamento del pannello proprietario. 0 = Non mostrare, 1 = Nascondi "
+"automaticamente, 2 = Mostra sempre"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Posizione pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
+"Segui il cursore di input nel caso in cui il pannello sia sempre visibile"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
+#, fuzzy
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Se vero, il pannello segue il cursore di input nel caso il pannello venga "
+"sempre mostrato. Se falso, il pannello viene mostrato in una posizione fissa."
+""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
+#, fuzzy
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "La durata in millisecondi per mostrare il pannello delle proprietà"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
+#, fuzzy
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"La durata in millisecondi per mostrare il pannello delle proprietà dopo "
+"l'acquisizione del fuoco o la modifica delle proprietà."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientamento della tabella di ricerca"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Mostra il nome del metodo di input"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "Valore RGBA dell'icona XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, fuzzy, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+"L'icona XKB mostra la stringa di layout e la stringa è resa con il valore "
+"RGBA. Il valore RGBA può essere 1. un nome di colore X11, 2. un valore hex "
+"in formato '#rrggbb' dove  'r', 'g' e 'b' sono le cifre esadecimali per il "
+"rosso, il verde e il blu, 3. un colore RGB in formato 'rgb(r,g,b)' oppure 4. "
+"un colore RGBA in formato 'rgba(r,g,b,a)' dove 'r', 'g', e 'b' sono interi "
+"compresi nell'intervallo da 0 a 255 o valori percentuali nell'intervallo da "
+"0% a 100%, e 'a' è un numero in virgola mobile nell'intervallo da 0 a 1 "
+"dell'alpha."
+
+#: ../data/ibus.schemas.in.h:42
+#, fuzzy
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+"La durata in millisecondi per mostrare l'icona del pannello di una proprietà"
+
+#: ../data/ibus.schemas.in.h:43
+#, fuzzy
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"I millisecondi per mostrare l'icona del pannello dal sistema a una icona di "
+"struttura se la proprietà è specificata dal valore di icon-prop-key in "
+"IBusEngineDesc. Se il valore è 0, nessun tempo di ritardo e l'icona di "
+"proprietà è mostrata immediatamente."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Usare carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
-msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
+msgstr ""
+"Nome del tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Tasti scelta rapida Emoji per gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+#, fuzzy
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+"Tasti scelta rapida per abilitare o disabilitare il metodo di input delle "
+"Emoji"
+
+#: ../data/ibus.schemas.in.h:52
+#, fuzzy
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+"Nome del tipo di carattere personalizzato per emoji sulla finestra degli "
+"emoji"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Lingua predefinita per il dizionario degli emoji"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Scegliere una lingua predefinita di dizionari emoji nella finestra di "
+"dialogo. Il valore di $lang viene applicato a /usr/share/ibus/dicts/emoji-"
+"$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "Lista di emoji preferite sulla finestra degli emoji"
+
+#: ../data/ibus.schemas.in.h:56
+#, fuzzy
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"È possibile visualizzare le emoji preferite sulla lista emoji se questa "
+"lista ha dei caratteri."
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Inserire il testo pre-modificato"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Usa il metodo di input globale"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Abilita per impostazione predefinita il metodo di input"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:62
 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:45
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "Mantieni i prefissi dei nomi DConf"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
 
@@ -450,36 +642,55 @@ msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Altro"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selezionare una lingua"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "A_nnulla"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Altro..."
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Lingua: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposizione tastiera: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autore: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Descrizione:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Seleziona un metodo di input"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -491,210 +702,312 @@ msgstr "Imposta Preferenze di IBus"
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Codice del tasto:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificatori:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "A_pplica"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "Eli_mina"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Premere un tasto (o una combinazione di tasti)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "A_nnulla"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:485
 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:329
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:433
 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:364
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Impossibile avviare il demone IBus in %d secondi"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selezione delle scorciatoie da tastiera per %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "selezione metodi di input in corso"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Elenca solo il nome del motore"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Impossibile collegarsi a IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "lingua: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nessun motore impostato.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Impostazione motore globale fallita.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Acquisizione motore globale fallita.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Leggere la cache del registro di sistema."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Leggere la cache del registro dei FILE."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "La cache del registro non è valida.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Scrivere la cache del registro di sistema."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Scrivere la cache del registro dei FILE."
+
+#: ../tools/main.vala:307
+#, fuzzy
+msgid "Resetting…"
+msgstr "Reset..."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr "Fatto"
+
+#: ../tools/main.vala:366
 msgid "Set or get engine"
-msgstr ""
+msgstr "Impostare od ottenere motore"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Esci ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:368
 msgid "Show available engines"
-msgstr ""
+msgstr "Mostra motori disponibili"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Non implementato)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Fai ripartire il demone ibus"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:371
 msgid "Show version"
-msgstr ""
+msgstr "Mostra la versione"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Mostra il contenuto della cache del registro"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:373
 msgid "Create registry cache"
-msgstr ""
+msgstr "Creare cache del registro"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Stampare l'indirizzo D-Bus di ibus-deamon"
+
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr "Mostrare i valori della configurazione"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr "Reimpostare i valori della configurazione"
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Salvare emoji sulla finestra degli appunti"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
-msgstr ""
+msgstr "Mostrare questa informazione"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n"
 "\n"
-msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s è un comando sconosciuto!\n"
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
+#: ../ui/gtk3/emojier.vala:276
+msgid "Emoji Choice"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/emojier.vala:282
+#, fuzzy
+msgid "Type annotation or choose emoji"
+msgstr "Scrivere una annotazione oppure scegliere una emoji"
+
+#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
+msgid "Favorites"
+msgstr "Preferiti"
+
+#: ../ui/gtk3/emojier.vala:612
+#, fuzzy
+msgid "Page Down"
+msgstr "Page Down"
+
+#: ../ui/gtk3/emojier.vala:623
+#, fuzzy
+msgid "Page Up"
+msgstr "Page Up"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
+#, c-format
+msgid "Description: %s"
+msgstr "Descrizione: %s"
+
+#: ../ui/gtk3/emojier.vala:797
+msgid "None"
+msgstr "Nessuno"
+
+#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
+#, c-format
+msgid "Code point: %s"
+msgstr "Punto di codice: %s"
+
+#: ../ui/gtk3/emojier.vala:822
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotazioni: %s"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr "Pannello IBus"
+
+#: ../ui/gtk3/panel.vala:832
+msgid "IBus Update"
+msgstr "Aggiorna IBus"
+
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Super+spazio è ora la scelta rapida predefinita."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1214
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1218
 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:732
+#: ../ui/gtk3/panel.vala:1237
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1242
+msgid "Emoji Dialog"
+msgstr "Finestra degli Emoji"
+
+#: ../ui/gtk3/panel.vala:1256
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1260
 msgid "Quit"
 msgstr "Esci"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr "Annullato scegliere un emoji."
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr "Copiato un emoji negli appunti."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:68
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"FONT\" per i caratteri emoji sulla finestra degli emoji"
+
+#: ../ui/gtk3/emojierapp.vala:69
+msgid "FONT"
+msgstr "FONT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"LANG\" per le annotazioni sulla finestra degli emoji. es. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "LANG"
+msgstr "LANG"
diff --git a/po/ja.po b/po/ja.po
index d62cb38d1..8401680c7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Japanese
 # Japanese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,20 +12,22 @@
 # noriko <noriko@redhat.com>, 2013
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
 # carrotsoft <www.carrotsoft@gmail.com>, 2012
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-02-20 03:40-0500\n"
-"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
+"PO-Revision-Date: 2017-05-01 04:35-0400\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -227,31 +229,83 @@ msgstr ""
 msgid "Input Method"
 msgstr "入力メソッド"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "絵文字ダイアログを表示するためのショートカットキー"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "絵文字の選択:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "絵文字ダイアログ上の絵文字候補のフォントを設定します"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "絵文字フォント:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "絵文字ダイアログ上の絵文字ルビの言語を設定します"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "絵文字ルビの言語:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr "絵文字ルビを次の条件と文字数以上で部分一致させる:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることが可能かどうか"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "文頭一致"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "文末一致"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "文中一致"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "絵文字"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>グローバル入力メソッドの設定</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -267,20 +321,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "ログイン時に IBus を起動"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "情報"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -468,10 +521,9 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"あるプロパティーが IBusEngineDesc の icon-prop-key の値に指定されている場合、"
-"エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にその"
-"プロパティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が 0 の"
-"場合、遅延無くプロパティーアイコンが即時に表示される。"
+"あるプロパティーが IBusEngineDesc の icon-prop-key "
+"の値に指定されている場合、エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にそのプロパティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が "
+"0 の場合、遅延無くプロパティーアイコンが即時に表示される。"
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
@@ -490,30 +542,94 @@ msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse のための絵文字ショートカットキー"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "絵文字入力の有効と無効を切り替えるためのショートカットキー"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "絵文字ダイアログ上の絵文字用のカスタムフォント名"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "絵文字辞書用のデフォルトの言語"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang は、/usr/share/ibus/dicts/emoji-$lang."
+"dict に適用されます。"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "絵文字ダイアログ上のお気に入り絵文字リスト"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr "絵文字ルビを部分一致させることを可能にするか否か"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr "指定した長さで絵文字ルビを一致させる"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "絵文字ルビを部分一致させる条件を選ぶ"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr "絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文末一致、2 == 文中一致"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -529,6 +645,24 @@ msgstr ""
 msgid "Other"
 msgstr "その他"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "言語の選択"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "OK(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "さらに…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -552,15 +686,6 @@ msgstr "説明:\n"
 msgid "Select an input method"
 msgstr "入力メソッドの選択"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "さらに…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -602,19 +727,15 @@ msgstr "キーもしくはキーの組み合わせを入力してください。
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "OK(_O)"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -629,155 +750,290 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "活動"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "動物と自然"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "国旗"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "食べ物と飲み物"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "物体"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "スマイリーと人々"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "記号"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "旅行と場所"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "エンジン名のみ表示"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "IBus に接続できません。\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "エンジンが設定されていません。\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "システムレジストリーキャッシュを読み込みます。"
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "レジストリーキャッシュは無効です。\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "システムレジストリーキャッシュを書き込みます。"
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "初期化中…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "完了"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "設定値を表示する"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "設定値を初期化する"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "ダイアログ上の絵文字をクリップボードに保存する"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "使い方: %s コマンド [オプション...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "絵文字異形を表示する"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "メニュー"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "お気に入り"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "その他"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "絵文字の選択"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "ルビを入力するか絵文字を選択してください"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "ページをめくる"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "ページを戻す"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "コードポイント: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "絵文字異形あり"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "説明: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "なし"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "ルビ: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "絵文字の選択を取り消しました。"
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "クリップボードに絵文字をコピーしました。"
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "フォント"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "言語"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr "絵文字ルビを部分一致させることが可能になる"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "指定した数字をもつ長さで一致させる"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "指定した数字の条件で一致させる"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -785,20 +1041,20 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/nl.po b/po/nl.po
index a106cb459..0260f37d0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,23 +1,27 @@
-# translation of nl.po to Dutch
 # Dutch translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Geert Warrink <geert.warrink@onsnet.nu>, 2011-2014
+# Geert Warrink <geert.warrink@onsnet.nu>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# Geert Warrink <geert.warrink@onsnet.nu>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-10-22 12:36+0000\n"
-"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
-"Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-05-06 06:22-0400\n"
+"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
+"Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -65,7 +69,8 @@ msgstr "IBus voorkeuren"
 
 #: ../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 +78,8 @@ msgstr "Volgende invoermethode:"
 
 #: ../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 +119,8 @@ msgstr "Kandidaten oriëntatie:"
 
 #: ../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 property panel:"
@@ -133,7 +140,9 @@ msgstr "Toon naam van invoermethode op taalbalk"
 
 #: ../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"
@@ -141,7 +150,8 @@ msgstr "Insluiten van pre-edit tekst in toepassingsvenster"
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr "Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
+msgstr ""
+"Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
@@ -156,14 +166,15 @@ msgid "General"
 msgstr "Algemeen"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Toevoegen"
 
 #: ../setup/setup.ui.h:36
 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:37
 msgid "_Remove"
@@ -171,7 +182,8 @@ msgstr "_Verwijderen"
 
 #: ../setup/setup.ui.h:38
 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:39
 msgid "_Up"
@@ -179,7 +191,9 @@ msgstr "_Omhoog"
 
 #: ../setup/setup.ui.h:40
 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:41
 msgid "_Down"
@@ -187,7 +201,9 @@ msgstr "O_mlaag"
 
 #: ../setup/setup.ui.h:42
 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:43
 msgid "_About"
@@ -210,38 +226,97 @@ msgid ""
 "<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>"
-msgstr "<small><i>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.</i></small>"
+msgstr ""
+"<small><i>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.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "De sneltoetsen voor het tonen van de emoji dialoog"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Emoji keuze:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Zet een lettertype met emoji kandidaten op de emoji dialoog"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emoji lettertype:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Zet een taal met emoji annotaties op de emoji dialoog"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Emoji annotatietaal:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Match emoji annotaties gedeeltelijk met de volgende conditie en meer dan het "
+"aantal karakters:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Als emoji annotaties gematched kunnen worden met een gedeeltelijke string in "
+"plaats van de exacte match"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Voorvoegsel match"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Achtervoegsel match"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Inhoudelijke match"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globale invoermethode instellingen</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -249,21 +324,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<bib><b>IBus</b></big>\n<small>De intelligente invoer bus</small>\nHomepagina: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<bib><b>IBus</b></big>\n"
+"<small>De intelligente invoer bus</small>\n"
+"Homepagina: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Start ibus bij inloggen"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Over"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Sl_uiten"
 
@@ -291,10 +372,14 @@ msgstr "Pop-up vertraging milliseconden voor IME omschakelvenster"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Vertraging in milliseconden. 0 &gt; Laat het venster niet zien  en schakel vorige/volgende engine om."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Vertraging in "
+"milliseconden. 0 &gt; Laat het venster niet zien  en schakel vorige/volgende "
+"engine om."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -304,7 +389,10 @@ msgstr "Versienummer opgeslagen"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -312,7 +400,9 @@ msgstr "Latin indelingen hebben geen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "US indeling is toegevoegd aan de latin indelingen. variant kan weggelaten worden."
+msgstr ""
+"US indeling is toegevoegd aan de latin indelingen. variant kan weggelaten "
+"worden."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -321,7 +411,9 @@ msgstr "Gebruik xmodmap"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Voer xmodmap uit als .xmodmap of .Xmodmap bestaat als ibus engines worden omgeschakeld."
+msgstr ""
+"Voer xmodmap uit als .xmodmap of .Xmodmap bestaat als ibus engines worden "
+"omgeschakeld."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -353,7 +445,9 @@ msgstr "Volgende engine sneltoetsen"
 
 #: ../data/ibus.schemas.in.h:23
 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:24
 msgid "Prev engine shortcut keys"
@@ -371,7 +465,9 @@ msgstr "Automatisch verbergen"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch verbergen, 2 = Toon het altijd"
+msgstr ""
+"Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch "
+"verbergen, 2 = Toon het altijd"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -381,7 +477,9 @@ msgstr "Taal-paneel positie"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -391,7 +489,10 @@ msgstr "Volg de input cursor als het paneel altijd getoond wordt"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "Als dit waar is zal het paneel de input cursor volgen als het panel altijd getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie getoond."
+msgstr ""
+"Als dit waar is zal het paneel de input cursor volgen als het panel altijd "
+"getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie "
+"getoond."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -401,7 +502,9 @@ msgstr "Het aanral milliseconden om het eigenschapspaneel te tonen "
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of eigenschappen veranderd zijn."
+msgstr ""
+"Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of "
+"eigenschappen veranderd zijn."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -429,49 +532,148 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB icoon toont de indelingsstring en deze string wordt van de RGBA waarde afgeleid. De RGBA waarde kan zijn 1. een X11 kleurnaam, 2. een hexadecimale waarde in de vorm '#rrggbb' waarin 'r', 'g' en 'b' hexadecimale getallen zijn voor het rood, groen en blauw, 3. een RGB kleur in de vorm 'rgb(r,g,b)' of 4. een RGBA kleur in de vorm 'rgba(r,g,b,a)' waarin 'r', 'g' en 'b' gehele getallen zijn in de reeks van 0 tot 255 of procentuele waardes in de reeks van 0% tot 100%, en 'a' een waarde met drijvende komma is in de reeks van 0 tot 1 van alfa."
+msgstr ""
+"XKB icoon toont de indelingsstring en deze string wordt van de RGBA waarde "
+"afgeleid. De RGBA waarde kan zijn 1. een X11 kleurnaam, 2. een hexadecimale "
+"waarde in de vorm '#rrggbb' waarin 'r', 'g' en 'b' hexadecimale getallen "
+"zijn voor het rood, groen en blauw, 3. een RGB kleur in de vorm 'rgb(r,g,b)' "
+"of 4. een RGBA kleur in de vorm 'rgba(r,g,b,a)' waarin 'r', 'g' en 'b' "
+"gehele getallen zijn in de reeks van 0 tot 255 of procentuele waardes in de "
+"reeks van 0% tot 100%, en 'a' een waarde met drijvende komma is in de reeks "
+"van 0 tot 1 van alfa."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+"Het aantal milliseconden om het paneelicoon van een eigenschap te tonen"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Het aantal milliseconden om het paneelicoon  van een engine icoon aan een "
+"eigenschapicoon te tonen wanneer de engines omgeschakeld worden, wordt "
+"gespecificeerd door de waarde van icon-prop-key in IBusEngineDesc. Als de "
+"waarde 0 is, is er geen delay en wordt de eigenschapicoon onmiddellijk "
+"getoond."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Emoji sneltoetsen voor gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "De sneltoetsen om emoji typen aan of uit te zetten"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Aangepaste lettertype naam voor emoji karakters op de emoji dialoog"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Standaard taal voor emoji woordenboek"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Kies een standaard taal met emoji woordenboeken op de emoji dialoog. De "
+"waarde $lang wordt toepast in /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "favoriete emoji lijst op de emoji dialoog"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Je kunt de favoritee emojis op emoji lijst tonen als deze lijst karakters "
+"heeft."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr "Worden emoji annotaties wel of niet gedeeltelijk gematched"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Worden emoji annotaties wel of niet gematched met een gedeeltelijke string "
+"in plaats van de exacte match."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr "Match emoji annotaties met de gespecificeerde lengte"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Match emoji annotaties gedeeltelijk met meer dan het gespecificeerde aantal "
+"karakters in plaats van de exacte match."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "Kies een conditie om emoji annotaties gedeeltelijk te matchen"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Kies een van de volgende condities om emoji annotaties gedeeltelijk te "
+"matchen: 0 == Voorvoegsel match, 1 == Achtervoegel match, 2 == Inhoudelijke "
+"match"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -479,45 +681,56 @@ msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Andere"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selecteer een taal"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_Ok"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Meer…"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Taal: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Toetsenbordindeling: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Beschrijving:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Selecteer een invoermethode"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "Meer…"
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Toetsenbord"
 
@@ -525,7 +738,7 @@ msgstr "Toetsenbord"
 msgid "Set IBus Preferences"
 msgstr "Stel IBus voorkeuren in"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
@@ -538,208 +751,353 @@ msgid "Modifiers:"
 msgstr "Modificatietoetsen:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "Toe_passen"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "_Ok"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 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:368
+#: ../setup/main.py:507
 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:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, 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:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Activiteiten"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Dieren & Natuur"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Vlaggen"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Voedsel & Drank"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objecten"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Smileys & Mensen"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symbolen"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Reizen & Plaatsen"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Lees de systeem registry cache."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Lees het registry cache BESTAND."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "De registry cache is ongeldig.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Schrijf de systeem registry cache."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Herstellen…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Klaar"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Toon de configuratiewaarden"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Herstel de configuratiewaarden"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Sla emoji op dialoog  op naar clipboard "
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Gebruik: %s COMMANDO [OPTIE...]\n"
 "\n"
-msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Toon emoji varianten"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Favorieten"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Andere"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Emoji keuze"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Typeannotatie of kies emoji"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "Pagina naar beneden"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "Pagina omhoog"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Code punt: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Heeft emoji varianten"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "Beschrijving: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "Geen"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotaties: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Annuleer het kiezen van een emoji."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Een emoji naar je clipboard gecopieerd."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"FONT\" voor emoji karakters op emoji dialoog"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "FONT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"TAAL\" voor annotaties op emoji dialoog. B.v. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "TAAL"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Match met de lengte van het gespecificeerde geheel getal"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Match met de conditie van het gespecificeerde geheel getal"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+msgid "IBus Panel"
+msgstr "IBus Paneel"
+
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index a0368512d..3bba7283e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,27 +1,29 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
 # Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-08-31 10:43-0400\n"
+"PO-Revision-Date: 2017-05-06 03:35-0400\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.9.5\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -49,7 +51,7 @@ msgstr "Dolny prawy róg"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "Własna"
+msgstr "Niestandardowa"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
@@ -154,7 +156,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "Własna czcionka:"
+msgstr "Niestandardowa czcionka:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -172,7 +174,7 @@ msgstr "_Dodaj"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "Dodanie wybranej metody wprowadzania do włączonych metod wprowadzania"
+msgstr "Dodaje wybraną metodę wprowadzania do włączonych metod wprowadzania"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -180,9 +182,7 @@ msgstr "_Usuń"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Usunięcie zaznaczonej metody wprowadzania we włączonych metodach "
-"wprowadzania"
+msgstr "Usuwa zaznaczoną metodę wprowadzania z włączonych metod wprowadzania"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -191,7 +191,7 @@ msgstr "W _górę"
 #: ../setup/setup.ui.h:40
 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 "
+"Przenosi w górę zaznaczoną metodę wprowadzania we włączonych metodach "
 "wprowadzania"
 
 #: ../setup/setup.ui.h:41
@@ -201,7 +201,7 @@ msgstr "W _dół"
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
-"Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach "
+"Przenosi w dół zaznaczoną metodę wprowadzania we włączonych metodach "
 "wprowadzania"
 
 #: ../setup/setup.ui.h:43
@@ -210,7 +210,7 @@ msgstr "_O programie"
 
 #: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
-msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
+msgstr "Wyświetla informacje o wybranej metodzie wprowadzania"
 
 #: ../setup/setup.ui.h:45
 msgid "_Preferences"
@@ -218,7 +218,7 @@ msgstr "P_referencje"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr "Wyświetlanie ustawień zaznaczonej metody wprowadzania"
+msgstr "Wyświetla ustawienia zaznaczonej metody wprowadzania"
 
 #: ../setup/setup.ui.h:47
 msgid ""
@@ -235,31 +235,87 @@ msgstr ""
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Klawisze skrótów do wyświetlenia okna emoji"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Wybór emoji:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Ustawienie czcionki dla kandydatów emoji w oknie emoji"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Czcionka emoji:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Ustawienie języka uwag emoji w oknie emoji"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Język uwag emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Częściowe dopasowywanie uwag emoji o tym warunku i więcej niż tej liczbie "
+"znaków:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
+"z dokładnym dopasowaniem"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Dopasowanie przedrostka"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Dopasowanie przyrostka"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Dopasowanie w środku"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
-msgstr "Użycie systemowych ustawień układu klawiatury"
+msgstr "Systemowe ustawienia układu klawiatury"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
-msgstr "Użycie systemowego układu klawiatury (XKB)"
+msgstr "Systemowy układ klawiatury (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
-msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
+msgstr "Ta sama metoda wprowadzania we wszystkich aplikacjach"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -275,20 +331,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Uruchamianie IBus podczas logowania"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
-msgstr "<b>Uruchomienie</b>"
+msgstr "<b>Uruchamianie</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "O programie"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -339,7 +394,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr "Układy łacińskie nieposiadające ASCII"
+msgstr "Układy łacińskie niemające ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
@@ -367,7 +422,7 @@ msgstr "Klawisz skrótu dla „gtk_accelerator_parse”"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
-msgstr "Włącza skróty klawiszowe"
+msgstr "Skróty klawiszowe włączania"
 
 #: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
@@ -375,7 +430,7 @@ msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
-msgstr "Wyłącza skróty klawiszowe"
+msgstr "Skróty klawiszowe wyłączania"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
@@ -388,7 +443,7 @@ msgstr "Klawisze skrótów następnego mechanizmu"
 #: ../data/ibus.schemas.in.h:23
 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"
+"Klawisze skrótów do przełączania na następną metodę wprowadzania na liście"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -397,7 +452,7 @@ msgstr "Klawisze skrótów poprzedniego mechanizmu"
 #: ../data/ibus.schemas.in.h:25
 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"
+"Klawisze skrótów do przełączania na poprzednią metodę wprowadzania na liście"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -421,7 +476,7 @@ msgid ""
 "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"
+"lewy róg, 3 = dolny prawy róg, 4 = niestandardowa"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -504,47 +559,118 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
-msgstr "Użycie własnej czcionki"
+msgstr "Niestandardowa czcionka"
 
 #: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
-msgstr "Nazwa własnej czcionki użytej w panelu języków"
+msgstr "Niestandardowa czcionka dla panelu języków"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
-msgstr "Własna czcionka"
+msgstr "Nazwa niestandardowej czcionki"
 
 #: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
-msgstr "Nazwa własnej czcionki dla panelu języków"
+msgstr "Nazwa niestandardowej czcionki dla panelu języków"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Klawisz skrótu emoji dla „gtk_accelerator_parse”"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Klawisze skrótów do włączania lub wyłączania wpisywania emoji"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Nazwa niestandardowej czcionki dla znaków emoji w oknie emoji"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Domyślny język dla słownika emoji"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Wybór domyślnego języka słowników emoji w oknie emoji. Wartość $lang jest "
+"zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "lista ulubionych emoji w oknie emoji"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
+"z dokładnym dopasowaniem."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr "Dopasowywanie uwag emoji o podanej długości"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Częściowe dopasowywanie uwag emoji o więcej niż tej liczbie znaków, zamiast "
+"dokładnego dopasowywania."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "Warunek częściowego dopasowywania uwag emoji"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Wybór jednego z następujących warunków częściowego dopasowywania uwag emoji: "
+"0 == dopasowywanie przedrostka, 1 == dopasowywanie przyrostka, 2 == "
+"dopasowywanie w środku"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
-msgstr "Użycie globalnej metody wprowadzania"
+msgstr "Globalna metoda wprowadzania"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
 "wprowadzania"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -559,6 +685,24 @@ msgstr "Copyright © 2007-2010 Peng Huang\n"
 msgid "Other"
 msgstr "Inne"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Wybierz język"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Więcej…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -580,16 +724,7 @@ msgstr "Opis:\n"
 
 #: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
-msgstr "Wybór metodę wprowadzania"
-
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Więcej…"
+msgstr "Wybór metody wprowadzania"
 
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
@@ -633,21 +768,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:580
 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"
+"Skrót z klawiszem Shift do przełączania do poprzedniej metody wprowadzania"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:507
 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:390
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -655,180 +785,315 @@ msgid ""
 "  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"
+"Usługa IBus została uruchomiona. 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:404
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "Nie można uruchomić usługi IBus od %d s"
+msgstr "Nie można uruchomić usługi IBus od %d s"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Sport"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Zwierzęta i przyroda"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Flagi"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Jedzenie i napoje"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Rzeczy"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Buźki i ludzie"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symbole"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Podróże i miejsca"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
-msgstr "Nie można połączyć z IBus.\n"
+msgstr "Nie można połączyć z usługą IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Odczytuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Zapisuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Przywracanie…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Wyświetla wartości konfiguracji"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Przywraca wartości konfiguracji"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Zapisuje emoji w oknie do schowka "
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Wyświetlanie wariantów emoji"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Ulubione"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Inne"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Wybór emoji"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Proszę wpisać uwagę lub wybrać emoji"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "Strona w dół"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "Strona w górę"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Kod znaku: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Ma warianty emoji"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "Brak"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "Uwagi: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Anulowano, aby wybrać emoji."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Skopiowano emoji do schowka."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "CZCIONKA"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "JĘZYK"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr "Uwagi emoji mogą być częściowo dopasowywane"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2016"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2017"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 299b26197..e7eea05b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,20 +10,22 @@
 # jonataszv <jonatas.zv@openmailbox.org>, 2014
 # Taylon Silmer <taylon@taylon.eti.br>, 2011
 # Daniel Lara <danniel@fedoraproject.org>, 2016. #zanata
+# Frederico Henrique Gonçalves Lima <fred@fredericolima.com.br>, 2017. #zanata
+# Jonathan Muttini Topanotti <jontopanotti@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-04-27 12:38+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-09-06 09:16-0400\n"
-"Last-Translator: Emerson Santos <em3rson@linuxmail.org>\n"
+"PO-Revision-Date: 2017-04-19 09:33-0400\n"
+"Last-Translator: Jonathan Muttini Topanotti <jontopanotti@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.9.5\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -88,144 +90,168 @@ msgid "Previous input method:"
 msgstr "Método de entrada anterior:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "A tecla de atalho para exibição do diálogo emoji"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji choice:"
+msgstr "Escolha do emoji"
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Ativa ou desativa:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Habilitar:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Desabilitar:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Atalhos do Teclado</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Configure a orientação dos candidatos na tabela de observação"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Orientação dos candidatos:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 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"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "Mostrar painel de propriedades:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
-msgstr "Posição do Painel de Linguagem:"
+msgstr "Posição do Painel de Idioma:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
-msgstr "Apresenta o nome do método de entrada na barra de linguagem"
+msgstr "Apresenta o nome do método de entrada na barra de idioma"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 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"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Embutir texto de pré-edição na janela do aplicativo "
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 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"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Usa a fonte padrão:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Defina uma fonte de candidatos emoji no diálogo emoji"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Fonte do emoji"
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Defina um idioma de anotações emoji no diálogo emoji"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "Idioma de anotação de emoji:"
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Fonte e Estilo</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Geral"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 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"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "A_cima"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 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"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "A_baixo"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 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"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Apresente a informação do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Mostrar configuração do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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 "
@@ -236,35 +262,35 @@ msgstr ""
 "ícone do painel.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configurações de Método de Entrada Global</b> "
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -280,20 +306,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Inicie o ibus na conexão "
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
 msgid "About"
 msgstr "Sobre"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -416,14 +441,14 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
-msgstr "Posição do Painel de Linguagem"
+msgstr "Posição do Painel de Idioma"
 
 #: ../data/ibus.schemas.in.h:29
 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 "
+"A posição do painel de idioma. 0 = Canto esquerdo superior, 1 = Canto "
 "direito superior, 2 = canto esquerdo inferior, 3 = canto direito inferior, 4 "
 "= Padrão "
 
@@ -510,7 +535,7 @@ msgstr "Usa a fonte padrão"
 
 #: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
-msgstr "Usa o nome da fonte padrão para o painel de linguagem"
+msgstr "Usa o nome da fonte padrão para o painel de idioma"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
@@ -518,35 +543,71 @@ msgstr "Fonte padrão"
 
 #: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
-msgstr "Nome da fonte padrão para o painel de linguagem"
+msgstr "Nome da fonte padrão para o painel de idioma"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Teclas de atalho emoji para o gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "A tecla de atalho para habilitar ou desabilitar a digitação emoji"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Nome da fonte customizada para caracteres emoji no diálogo emoji"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Idioma padrão para o dicionário emoji"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Escolha o idioma padrão para os dicionários emoji no diálogo emoji. O valor "
+"$lang é aplicado em /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "lista de emoji favoritos no diálogo emoji"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Você pode exibir os emojis favoritos na lista de emoji se essa lista tiver "
+"algum caractere."
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:62
 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"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -562,10 +623,28 @@ msgstr ""
 msgid "Other"
 msgstr "Outros"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selecione uma língua"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mais…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
-msgstr "Linguagem: %s\n"
+msgstr "Idioma: %s\n"
 
 #: ../setup/engineabout.py:75
 #, python-format
@@ -585,15 +664,6 @@ msgstr "Descrição:\n"
 msgid "Select an input method"
 msgstr "Selecione um método de entrada"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Mais…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -636,21 +706,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 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"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -666,172 +732,283 @@ msgstr ""
 "exportar QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "mudando métodos de entrada"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Somente o Nome do motor da lista"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Não foi possível conectar ao IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nenhum motor configurado.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Configurar motor global falhou.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Obter motor global falhour.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Ler o cache do registro do sistema."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Ler o ARQUIVO de cache do registro."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "O cache do registro é inválido.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Escrever o cache de registro do sistema."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Escrever o ARQUIVO de cache do registro."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Redefinindo…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Concluído"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Definir ou obter motor"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Sair do ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Exibir motores disponíveis"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(Não implementado)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Mostrar versão"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Mostrar conteúdo de cachê do registro"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Criar registro de cache"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir o endereço D-Bus do ibus-daemon"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Mostrar valores de configuração"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Redefinir os valores de configuração"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Salvar emoji no diálogo para a área de transferência"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Mostrar essa informação"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:170
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:284 ../ui/gtk3/panel.vala:1242
+msgid "Emoji Choice"
+msgstr "Escolha do emoji"
+
+#: ../ui/gtk3/emojier.vala:290
+msgid "Type annotation or choose emoji"
+msgstr "Digite a anotação ou escolha o emoji"
+
+#: ../ui/gtk3/emojier.vala:595 ../ui/gtk3/emojier.vala:642
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: ../ui/gtk3/emojier.vala:667
+msgid "Page Down"
+msgstr "Page Down"
+
+#: ../ui/gtk3/emojier.vala:678
+msgid "Page Up"
+msgstr "Page Up"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:849 ../ui/gtk3/emojier.vala:863
+#, c-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: ../ui/gtk3/emojier.vala:849
+msgid "None"
+msgstr "Nenhum"
+
+#: ../ui/gtk3/emojier.vala:854 ../ui/gtk3/emojier.vala:893
+#, c-format
+msgid "Code point: %s"
+msgstr "Ponto de código: %s"
+
+#: ../ui/gtk3/emojier.vala:874
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotações: %s"
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr "Escolha de um emoji cancelada."
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr "Emoji copiado para a sua área de transferência."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:71
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"FONT\" para caracteres  no diálogo emoji"
+
+#: ../ui/gtk3/emojierapp.vala:72
+msgid "FONT"
+msgstr "FONT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"LANG\" para anotações em diálogo emoji. V.g. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:78
+msgid "LANG"
+msgstr "LANG"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
 msgid "IBus Panel"
 msgstr "Painel IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:832
 msgid "IBus Update"
 msgstr "Atualização IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
 msgid "Super+space is now the default hotkey."
 msgstr "Super + espaço agora são as teclas de atalho padrão."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1214
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1218
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1237
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1256
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1260
 msgid "Quit"
 msgstr "Sair"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "padrão:LTR"
diff --git a/po/ru.po b/po/ru.po
index b89b502b8..5c876a4a5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Russian
 # Russian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,23 @@
 # Koterpillar <koterpillar@gmail.com>, 2009
 # Yulia <ypoyarko@redhat.com>, 2010
 # Yulia <yulia.poyarkova@redhat.com>, 2013-2014
+# yuliya <ypoyarko@redhat.com>, 2015. #zanata
+# Igor Gorbounov <igor.gorbounov@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
-"Last-Translator: Yulia <yulia.poyarkova@redhat.com>\n"
-"Language-Team: Russian <trans-ru@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-16 03:37-0400\n"
+"Last-Translator: Igor Gorbounov <igor.gorbounov@gmail.com>\n"
+"Language-Team: Russian <trans-ru@lists.fedoraproject.org>\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"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -52,11 +56,11 @@ msgstr "Свой"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Не показывать"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Автоматически скрывать"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,167 +87,196 @@ msgid "Previous input method:"
 msgstr "Предыдущий метод ввода:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Сочетание клавиш для включения/выключения метода ввода"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "Включить или выключить:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "Включить:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "Выключить:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Горячие клавиши</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Установить ориентацию кандидатов в таблице поиска"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "Ориентация кандидатов:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Установить поведение iBus для показа или скрытия языковой панели"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
-msgstr ""
+msgstr "Показать панель свойств:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "Расположение языковой панели:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Показать значок в области уведомлений"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Показывать название метода ввода на языковой панели"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Показывать название метода ввода на языковой панели, когда пункт выбран"
+msgstr ""
+"Показывать название метода ввода на языковой панели, когда пункт выбран"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "Вставить готовый текст в окно приложения"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "Вставить готовый текст метода ввода в окно приложения"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "Выбрать шрифт:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>Шрифт и стиль</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "Основные"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Добавить выбранный метод ввода к используемым"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Удалить выбранный метод ввода из списка"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "Вв_ерх"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Переместить выбранный метод ввода вверх в списке используемых"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "В_низ"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Переместить выбранный метод ввода вниз в списке используемых"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "_О программе"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "Показать информацию о выбранном методе ввода"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "Показать настройки выбранного метода ввода"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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>"
 msgstr ""
+"<small><i>Активный метод ввода может переключаться на выбранные методы из "
+"приведенного выше списка с помощью сочетаний клавиш или нажатием левой "
+"кнопки мыши на значке в панели.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Метод ввода"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Использовать системную раскладку клавиатуры"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Использовать системную раскладку (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Раскладка клавиатуры</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "Использовать один метод ввода для всех приложений"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Настройки глобального метода ввода</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -251,194 +284,294 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Интеллектуальная система ввода</small>\nДомашняя страница: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Интеллектуальная система ввода</small>\n"
+"Домашняя страница: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "Запускать iBus при входе в систему:"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
 msgid "About"
 msgstr "О программе"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Предварительная загрузка методов ввода"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Загружать методы ввода при запуске iBus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "Порядок модулей"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "Порядок модулей в списке методов ввода"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Задержка всплывающего окна переключателя IME (в миллисекундах)"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "Настройте задержку показа окна выбора метода ввода, которое по умолчанию будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 &lt; задержка в миллисекундах, 0 &gt; окно не будет показано."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"Настройте задержку показа окна выбора метода ввода, которое по умолчанию "
+"будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 "
+"&lt; задержка в миллисекундах, 0 &gt; окно не будет показано."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "Сохраненный номер версии"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 с текущей."
+msgstr ""
+"Сохраненный номер версии используется для сравнения предыдущей версии ibus с "
+"текущей."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Латинские раскладки, в которых нет ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+"Раскладка США добавлена к латинским раскладкам. Вариант может быть опущен."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Использовать xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "Сочетание клавиш для включения/выключения"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Сочетание клавиш для  gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Включить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Сочетания для включения метода ввода"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Отключить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Сочетание для отключения метода ввода"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Клавиши для следующего метода ввода"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Клавиши для предыдущего метода ввода"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Автоматически скрывать"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Режим работы панели свойств. 0 = не показывать, 1 = автоматически скрывать, "
+"2 = всегда показывать"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Расположение языковой панели"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Следовать за курсором ввода, если панель всегда видна"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Если «true», панель следует за курсором ввода в случае, если панель всегда "
+"видна. Если «false», панель отображается в фиксированном месте."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Миллисекунды для отображения панели свойств"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Миллисекунды для отображения панели свойств после смены фокуса ввода или "
+"свойств."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Ориентация таблицы поиска"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Показывать название метода ввода"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "RGBA-значение значка XKB"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Использовать свой шрифт"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Использовать свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Свой шрифт"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "Вставить готовый текст"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вставить готовый текст в окно приложения"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "Использовать глобальный метод ввода"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "Включить метод ввода по умолчанию"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
-msgstr "Включить метод ввода по умолчанию при получении приложением фокуса ввода"
+msgstr ""
+"Включить метод ввода по умолчанию при получении приложением фокуса ввода"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "DConf сохраняет префиксы имен."
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префиксы ключей DConf для предотвращения преобразования имен"
 
@@ -446,36 +579,55 @@ msgstr "Префиксы ключей DConf для предотвращения
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Другие"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "О_тменить"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Язык: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Раскладка: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Автор: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Описание:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Выберите метод ввода"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -487,210 +639,302 @@ msgstr "Настроить параметры IBus"
 msgid "Keyboard shortcuts"
 msgstr "Комбинации клавиш"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Код клавиши:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Модификаторы:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Применить"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Нажмите клавишу (или сочетание клавиш)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "О_тменить"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:485
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Использовать сочетание SHIFT для выбора предыдущего метода ввода"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus не выполняется. Запустить?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:433
 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:364
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не удалось запустить IBus через %d сек."
 
-#: ../setup/main.py:376
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "Выберите комбинацию клавиш для %s"
+msgstr "Выберите комбинацию клавиш, чтобы %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:461
 msgid "switching input methods"
-msgstr "изменение методов ввода"
+msgstr "изменить метод ввода"
 
-#: ../tools/main.vala:42
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Показать имя модуля"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Не удалось подключиться к IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "язык: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Модуль не выбран.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Не удалось настроить глобальный модуль.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Не удалось получить глобальный модуль.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Чтение кэша системного реестра."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Чтение файла кэша реестра."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Недействительный кэш реестра.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Запись в кэш системного реестра."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Запись в файл кэша реестра."
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr ""
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Показать версию"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Формат: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
-msgstr "Формат: %s КОМАНДА [ПАРАМЕТР...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Команды:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Неизвестная команда: %s\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr ""
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
 msgstr "Обновление IBus"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1196
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus &mdash; интеллектуальная система ввода для Linux и Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
-msgstr "Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\nYulia <ypoyarko@redhat.com>, 2010."
+msgstr ""
+"Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\n"
+"Yulia <ypoyarko@redhat.com>, 2010."
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1219
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1238
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1242
 msgid "Quit"
 msgstr "Выход"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 0ad6593af..95190cc8f 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Tamil
 # Tamil translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,19 +12,22 @@
 # I. Felix <ifelix@redhat.com>, 2009
 # shkumar <shkumar@redhat.com>, 2012
 # shkumar <shkumar@redhat.com>, 2012,2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# deadrat <jayabharat@live.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-17 09:18+0000\n"
-"Last-Translator: shkumar <shkumar@redhat.com>\n"
-"Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2017-04-19 19:06+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-19 12:07-0400\n"
+"Last-Translator: deadrat <jayabharat@live.com>\n"
+"Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -36,19 +39,19 @@ msgstr "செங்குத்து"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
-msgstr "மேல் இடது ஓரம்"
+msgstr "மேல் இடது மூலை"
 
 #: ../setup/setup.ui.h:4
 msgid "Top right corner"
-msgstr "மேல் வலது ஓரம்"
+msgstr "மேல் வலது மூலை"
 
 #: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
-msgstr "கீழ் இடது ஓரம்"
+msgstr "கீழ் இடது மூலை"
 
 #: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
-msgstr "கீழ் வலது ஓரம்"
+msgstr "கீழ் வலது மூலை"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
@@ -68,11 +71,11 @@ msgstr "எப்போதும்"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "IBus முன்னுரிமைகள்"
+msgstr "IBus விருப்பங்கள்"
 
 #: ../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:"
@@ -80,175 +83,211 @@ msgstr "அடுத்த உள்ளீடு முறை:"
 
 #: ../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:"
 msgstr "முந்தைய உள்ளீடு முறை:"
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
+msgstr "உள்ளீடு முறைமையை துவக்கவும் நிறுத்தவும் குறுக்குவிசைகள்"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
-msgstr "செயல்படுத்து அல்லது செயல்நீக்கு:"
+msgstr "செயல்படுத்து அல்லது முடக்கு:"
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "செயல்படுத்து:"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
-msgstr "செயல்நீக்கு:"
+msgstr "முடக்கு:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>விசைப்பலகை குறுக்குவழிகள்</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "காணும் அட்டவணையில் நபர்களின் திசையமைப்பை அமை"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "கேண்டிடேட் சார்ந்து:"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "மொழி பட்டையை எவ்வாறு காட்ட அல்லது மறைக்க வேண்டும் என ibus பண்பினை அமை"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "பண்புகள் பலகத்தைக் காட்டு:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
+msgstr ""
+"சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட preedit உரை"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "பயன்பாட்டு சாளரத்தில் preedit உரையின் உள்ளீடு முறையை உட்பொதியவும்"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து:"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>எழுத்துரு மற்றும் தோற்றம்</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "பொது"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "சேர் (_A)"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
-msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
+msgstr ""
+"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "நீக்கு (_R)"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை நீக்கு"
+msgstr ""
+"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை "
+"நீக்கு"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "மேலே (_U)"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து"
+msgstr ""
+"செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு "
+"முறையை மேலே நகர்த்து"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "கீழே (_D)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே நகர்த்து"
+msgstr ""
+"செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே "
+"நகர்த்து"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "பற்றி (_A)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "முன்னுரிமைகள் (_P)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "தேர்ந்தெடுத்த உள்ளிட்டு முறையின் அமைப்பை காட்டு"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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>"
-msgstr "<small><i>மேலே உள்ள பட்டியலில் விசைப்பலகைக் குறுக்குவழி விசைகளை அழுத்துவதன் மூலம் அல்லது பலகம் சின்னத்தை சொடுக்குவதன் மூலம், செயலில் உள்ள உள்ளீட்டு முறையை தேர்ந்தெடுத்துள்ள ஒன்றிலிருந்து வேறொன்றுக்கு மாற்ற முடியும்.</i></small>"
+msgstr ""
+"<small><i>மேலே உள்ள பட்டியலில் விசைப்பலகைக் குறுக்குவழி விசைகளை அழுத்துவதன் "
+"மூலம் அல்லது பலகம் சின்னத்தை சொடுக்குவதன் மூலம், செயலில் உள்ள உள்ளீட்டு "
+"முறையை தேர்ந்தெடுத்துள்ள ஒன்றிலிருந்து வேறொன்றுக்கு மாற்ற முடியும்.</i></"
+"small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "கூடுதல்"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -256,21 +295,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>The intelligent input bus</small>\nமுதன்மை பக்கம்: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"முதன்மை பக்கம்: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "புகுபதிவில் ibusஐ துவக்கு"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>துவக்கம்</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
 msgid "About"
 msgstr "பற்றி"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "மூடு (_C)"
 
@@ -298,10 +343,14 @@ msgstr "IME மாற்ற சாளரத்திற்கான பாப்
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 &lt; தாமத மில்லிசெகன்ட். 0 &gt; சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். "
+"முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 &lt; "
+"தாமத மில்லிசெகன்ட். 0 &gt; சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த "
+"எஞ்சின்களுக்கு மாற்ற."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -311,7 +360,9 @@ msgstr "சேமிக்கப்பட்ட பதிப்பு எண்"
 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:11
 msgid "Latin layouts which have no ASCII"
@@ -319,7 +370,9 @@ msgstr "ASCII கொண்டில்லாத இலத்தீன் லே
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "அமெரிக்க லேயவுட் இலத்தீன் லேயவுட்டுகளுடன் இணைக்கப்படுகிறது. இதன் மாற்று வகையை புறக்கணிக்கலாம்."
+msgstr ""
+"அமெரிக்க லேயவுட் இலத்தீன் லேயவுட்டுகளுடன் இணைக்கப்படுகிறது. இதன் மாற்று "
+"வகையை புறக்கணிக்கலாம்."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -328,7 +381,9 @@ msgstr "xmodmap ஐப் பயன்படுத்து"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus எஞ்சின்கள் மாற்றப்படும் போது .xmodmap அல்லது .Xmodmap வெளியேறினால் xmodmap ஐ இயக்கு."
+msgstr ""
+"ibus எஞ்சின்கள் மாற்றப்படும் போது .xmodmap அல்லது .Xmodmap வெளியேறினால் "
+"xmodmap ஐ இயக்கு."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -378,7 +433,9 @@ msgstr "தானாக மறை"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "பண்புகள் பலகத்தின் நடத்தை. 0 = காண்பிக்க வேண்டாம், 1 = தானாக மறை, 2 = எப்போதும் காண்பி"
+msgstr ""
+"பண்புகள் பலகத்தின் நடத்தை. 0 = காண்பிக்க வேண்டாம், 1 = தானாக மறை, 2 = "
+"எப்போதும் காண்பி"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -388,17 +445,23 @@ msgstr "மொழி பேனல் இடம்"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr "பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் சுட்டியைப் பின் தொடரவும்"
+msgstr ""
+"பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் சுட்டியைப் பின் தொடரவும்"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "ஆம் என அமைக்கப்பட்டால், பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் சுட்டியைப் பின் தொடரும். இல்லை என்று அமைக்கப்பட்டால் பலகம் ஒரு குறிப்பிட்ட இடத்திலேயே இருக்கும்."
+msgstr ""
+"ஆம் என அமைக்கப்பட்டால், பலகம் எப்போதும் காண்பிக்கப்பட்டால் உள்ளீட்டுச் "
+"சுட்டியைப் பின் தொடரும். இல்லை என்று அமைக்கப்பட்டால் பலகம் ஒரு குறிப்பிட்ட "
+"இடத்திலேயே இருக்கும்."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -408,7 +471,9 @@ msgstr "பண்புகள் பலகத்தை காட்ட வேண
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "பண்புகள் பலகத்தில் கவனம் செலுத்திய பிறகு அல்லது பண்புகளை மாற்றிய பிறகு பலகத்தைக் காட்ட வேண்டிய மில்லிசெக்கன்ட்."
+msgstr ""
+"பண்புகள் பலகத்தில் கவனம் செலுத்திய பிறகு அல்லது பண்புகளை மாற்றிய பிறகு "
+"பலகத்தைக் காட்ட வேண்டிய மில்லிசெக்கன்ட்."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -436,49 +501,103 @@ msgid ""
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB சின்னம் லேயவுட் சரத்தைக் காண்பிக்கிறது, அந்தச் சரமானது RGBA மதிப்புட்ன காட்சியாக்கப்படுகிறது. RGBA மதிப்பு 1. X11 இலிருந்து ஒரு நிறத்தின் பெயராகவோ, 2. '#rrggbb' என்ற வடிவத்தில் ஹெக்ஸ் மதிப்பாகவோ (இங்கு 'r', 'g' மற்றும் 'b' ஆகியவை சிவப்பு, பச்சை மற்றும் நீலத்தின் ஹெக்ஸ் மதிபுகள்), 3. 'rgb(r,g,b)' என்ற வடிவத்தில் ஒரு நிறத்தின் RGB நிறமாகவோ அல்லது 4. 'rgba(r,g,b,a)' என்ற வடிவத்தில் (இங்கு 'r', 'g' மற்றும் 'b' ஆகியவை 0 முதல் 255 க்கு இடைப்பட்ட வரம்பிலான முழு எண்கள் அல்லது 0% முதல் 100% க்கு இடைப்பட்ட வரம்பிலான சதவீதங்களாகும், 'a' என்பது 0 முதல் 1 ஆல்ஃபா வரையிலான வரம்பிலமைந்த ஃப்ளோட்டிங் பாயின்ட் எண்ணாகும்) ஒரு RGBA நிறமாகவோ இருக்கலாம்."
+msgstr ""
+"XKB சின்னம் லேயவுட் சரத்தைக் காண்பிக்கிறது, அந்தச் சரமானது RGBA மதிப்புட்ன "
+"காட்சியாக்கப்படுகிறது. RGBA மதிப்பு 1. X11 இலிருந்து ஒரு நிறத்தின் பெயராகவோ, "
+"2. '#rrggbb' என்ற வடிவத்தில் ஹெக்ஸ் மதிப்பாகவோ (இங்கு 'r', 'g' மற்றும் 'b' "
+"ஆகியவை சிவப்பு, பச்சை மற்றும் நீலத்தின் ஹெக்ஸ் மதிபுகள்), 3. 'rgb(r,g,b)' "
+"என்ற வடிவத்தில் ஒரு நிறத்தின் RGB நிறமாகவோ அல்லது 4. 'rgba(r,g,b,a)' என்ற "
+"வடிவத்தில் (இங்கு 'r', 'g' மற்றும் 'b' ஆகியவை 0 முதல் 255 க்கு இடைப்பட்ட "
+"வரம்பிலான முழு எண்கள் அல்லது 0% முதல் 100% க்கு இடைப்பட்ட வரம்பிலான "
+"சதவீதங்களாகும், 'a' என்பது 0 முதல் 1 ஆல்ஃபா வரையிலான வரம்பிலமைந்த "
+"ஃப்ளோட்டிங் பாயின்ட் எண்ணாகும்) ஒரு RGBA நிறமாகவோ இருக்கலாம்."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "தனிப்பயன் எழுத்துரு"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "மொழி பலகத்துக்கான தனிப்பயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
-msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
+msgstr ""
+"பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -486,45 +605,56 @@ msgstr "பெயர் மரபை நிறுத்த DConf விசைக
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "வேறு"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "ரத்து (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "சரி (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "மேலும்…"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "விசைப்பலகை அமைப்பு: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "ஆசிரியர்: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "விளக்கம்:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "ரத்து (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "மேலும்…"
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -532,7 +662,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus முன்னுரிமைகளை அமை"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "விசைப்பலகை குறுக்குவழிகள்"
 
@@ -545,208 +675,298 @@ msgid "Modifiers:"
 msgstr "மாற்றிகள்;"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "செயல்படுத்து (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "அழி (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "சரி (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:485
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் பயன்படுத்தவும்"
+msgstr ""
+"முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் "
+"பயன்படுத்தவும்"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:433
 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:403
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "IBus உடன் இணைக்க முடியாது.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "கணினி பதிவக தேக்ககத்தை வாசி."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "பதிவக தேக்கக FILE ஐ வாசி."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "பதிவக தேக்ககம் செல்லுபடியாகாதது.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "கணினி பதிவக தேக்ககத்தில் எழுது."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "பதிவக தேக்கக FILE இல் எழுது."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "மீட்டமைக்கிறது…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "முடிந்தது"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "எஞ்சினை அமை அல்லது பெறு"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon இலிருந்து வெளியேறு"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "இருக்கும் எஞ்சின்களைக் காட்டு"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(செயல்படுத்தப்படவில்லை)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ஐ மறுதுவக்கு"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "பதிப்பைக் காட்டு"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "பதிவக தேக்கக உள்ளடக்கத்தைக் காண்பி"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "பதிவக தேக்ககத்தை உருவாக்கு"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon இன் D-Bus முகவரியை அச்சிடு"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "அமைவாக்க மதிப்புகளைக் காண்பி"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "அமைவாக்க மதிப்புகளை மீட்டமை"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "இந்தத் தகவலைக் காட்டு"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "கட்டளைகள் :\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s என்பது தெரியாத கட்டளை!\n"
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/emojier.vala:276
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:282
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:612
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:623
+msgid "Page Up"
+msgstr ""
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:797
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:822
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:832
 msgid "IBus Update"
 msgstr "IBus புதுப்பிப்பு"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
 msgid "Super+space is now the default hotkey."
 msgstr "இப்போது Super+space என்பது முன்னிருப்பு குறுக்குவிசையாகும்."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1214
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1218
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1237
 msgid "Preferences"
 msgstr "முன்னுரிமைகள் "
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1242
+msgid "Emoji Dialog"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1256
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1260
 msgid "Quit"
 msgstr "வெளியேறு "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:68
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:69
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "LANG"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 3415fc6fa..19fbb2988 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,27 +1,29 @@
-# translation of ibus.pot to Ukrainian
 # Ukrainian translation of ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
 # Yuri Chornoivan <yurchor@ukr.net>, 2013
 # Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-07-13 09:20-0400\n"
+"PO-Revision-Date: 2017-05-10 01:22-0400\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -235,31 +237,87 @@ msgstr ""
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Клавіатурне скорочення для показу діалогового вікна емодзі"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Вибір емодзі:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Встановити шрифт варіантів емодзі у вікні емодзі"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Шрифт емодзі:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Встановити мову анотацій емодзі у вікні емодзі"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Мова анотацій емодзі:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Встановлювати відповідність емодзі за анотаціями з вказаною умовою та збігом "
+"понад таку кількість символів:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
+"не повним збігом"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Відповідність за префіксом"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Відповідність за суфіксом"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Відповідність за вмістом"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Емодзі"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Загальні параметри способів введення</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -275,20 +333,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Запускати ibus при вході"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Інформація"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -519,31 +576,104 @@ msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Клавіатурне скорочення емодзі для gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Клавіатурне скорочення для вмикання і вимикання введення емодзі"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Назва нетипового шрифту для символів емодзі у вікні емодзі"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Типова мова словника емодзі"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Виберіть типову мову словників емодзі у вікні емодзі. Значення $lang "
+"застосовується до /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "Список улюблених емодзі у вікні емодзі"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Ви зможете переглянути улюблені емодзі у списку емодзі, якщо у цьому списку "
+"є якісь символи."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr "Визначає, чи може бути встановлено часткову відповідність"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
+"не повним збігом"
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Встановлювати часткову відповідність анотацій до емодзі, якщо збігається "
+"вказана кількість символів, але відповідність не є повною."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "Вибрати умову часткової відповідності анотацій до емодзі"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Виберіть одну з таких умов для встановлення часткової відповідності за "
+"анотаціями до емодзі: 0 == відповідність за префіксом, 1 == відповідність за "
+"суфіксом, 2 == відповідність за вмістом"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -558,6 +688,24 @@ msgstr "© Peng Huang, 2007–2010\n"
 msgid "Other"
 msgstr "Інше"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Виберіть мову"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_Гаразд"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Більше…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -581,15 +729,6 @@ msgstr "Опис:\n"
 msgid "Select an input method"
 msgstr "Виберіть спосіб введення"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "_Скасувати"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Більше…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -632,21 +771,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "_Гаразд"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Використовувати комбінацію з Shift для перемикання на попередній спосіб "
 "введення"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -662,172 +797,308 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
-#: ../tools/main.vala:48
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Діяльність"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Тварини і природа"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Прапори"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Їжа і питво"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Об’єкти"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Емоційки і люди"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Символи"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Подорожі і місця"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Показати лише список рушіїв"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "Не вдалося встановити зв’язок з IBus.\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "мова: %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Рушій не встановлено.\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "Читати дані з загальносистемного кешу регістру."
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "Читати дані з кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "Кеш регістру є некоректним.\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "Записати дані до загальносистемного кешу регістру."
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "Скидаємо…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "Виконано"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "Показати значення налаштувань"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "Скинути значення налаштувань до початкових"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Зберегти емодзі з вікна до буфера обміну даними"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Показувати варіанти емодзі"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Меню"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Улюблені"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Інше"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Вибір емодзі"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Введіть анотацію або виберіть емодзі"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "На сторінку вниз"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "На сторінку вгору"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Точка кодування: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Має варіанти емодзі"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "Опис: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "Немає"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "Анотації: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Скасовано вибір емодзі."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Скопійовано емодзі до вашого буфера обміну даними."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "ШРИФТ"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "МОВА"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr ""
+"Встановлення відповідності за анотаціями до емодзі може бути частковим"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Відповідність за вказаною довжиною рядка"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Відповідність з умовою на вказану довжину рядка"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2c4920bd3..bc582d4a2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,7 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,20 +12,21 @@
 # Peng Huang <shawn.p.huang@gmail.com>, 2007
 # simonyanix <simonyan@fedoraproject.org>, 2011
 # Tommy He <lovenemesis@gmail.com>, 2012-2014
+# Jerry Lee <lchopn@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
-"PO-Revision-Date: 2014-03-19 02:43-0400\n"
-"Last-Translator: Tommy He <lovenemesis@gmail.com>\n"
-"Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
-"Language: zh-CN\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-17 11:23-0400\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
+"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -87,132 +89,156 @@ msgid "Previous input method:"
 msgstr "上一输入法："
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "用于显示 emoji 面板的快捷键"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr "Emoji 面板："
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "开关："
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "启用："
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "禁用："
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>快捷键</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "设置候选词表方向"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "候选词排列方向："
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "设置如何显示或隐藏语言栏的方式"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "显示属性栏："
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "选中该项将在语言栏上显示输入法的名字"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "在应用程序窗口中启用输入法的内嵌编辑模式"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "使用自定义字体："
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "设置 emoji 面板中 emoji 候选字的字体"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Emoji 字体："
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "设置 emoji 面板中 emoji 释文的语言"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "Emoji 释文语言："
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>字体和风格</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "常规"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr "添加选中的输入法到启用输入法列表"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "从启用输入法列表删除选中的输入法"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "向上(_U)"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移选中的输入法"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "向下(_D)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移选中的输入法"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "显示选中输入法的信息"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "显示选中输入法的设置界面"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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 "
@@ -220,35 +246,35 @@ msgid ""
 msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全局输入法设置</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "高级"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -264,20 +290,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "登录时运行 IBus"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
 msgid "About"
 msgstr "关于"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -332,12 +357,12 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "使用 xmodmap"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
+msgstr "若 .xmodmap 或者 .Xmodmap 存在则当 ibus 框架启动时执行 xmodmap"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -480,30 +505,62 @@ msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "emoji 字典的默认语言"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "emoji 面板中的最喜爱的 emoji 列表"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -518,6 +575,24 @@ msgstr "版权所有 (c) 2007-2010 黄鹏\n"
 msgid "Other"
 msgstr "其他"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "更多..."
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -541,15 +616,6 @@ msgstr "描述：\n"
 msgid "Select an input method"
 msgstr "选择输入法"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr ""
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
@@ -591,19 +657,15 @@ msgstr "请按一个键盘按键（或者一个组合按键）\n"
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "确定(_O)"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -617,174 +679,249 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "切换输入法"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "读取系统注册缓存。"
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "读取注册缓存 FILE。"
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "注册缓存无效。\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "写入系统注册缓存。"
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "写入注册缓存 FILE。"
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
-msgstr ""
+msgstr "正在重置"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "设定或获取引擎"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "退出 ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "显示可用引擎"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(暂不可用)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "重启 ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "显示版本号"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "显示注册缓存内容。"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "创建注册缓存"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
-msgstr ""
+msgstr "显示配置值"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "重置配置"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "将面板中的 emoji 保存到剪贴板"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "显示本信息"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s 命令 [选项...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
-msgid "IBus Panel"
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr "Emoji 面板"
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr "键入释文或是选择 emoji"
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr "最爱"
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr "下一页"
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr "上一页"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr "描述：%s"
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr "无"
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr "释义：%s"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr "IBus 面板"
+
+#: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space 是目前默认的快捷键。"
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1196
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
 msgstr ""
 "黄鹏 <shawn.p.huang@gmail.com>\n"
 "Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1219
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1238
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1242
 msgid "Quit"
 msgstr "退出"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr "已取消选择一个 emoji"
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr "已将 emoji 复制到你的剪贴板"
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 011643c18..edc896e6e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,20 +9,21 @@
 # Ding-Yi Chen <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-02-18 05:44-0500\n"
-"Last-Translator: tomoe musashi <hkg.musashi@gmail.com>\n"
+"PO-Revision-Date: 2017-04-17 09:17-0400\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -85,132 +86,156 @@ msgid "Previous input method:"
 msgstr "上一個輸入法："
 
 #: ../setup/setup.ui.h:16
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "顯示繪文字對話窗的快捷鍵"
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr "繪文字對話窗："
+
+#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "用來開啟或關閉輸入法的快捷鍵"
 
-#: ../setup/setup.ui.h:18
+#: ../setup/setup.ui.h:20
 msgid "Enable or disable:"
 msgstr "啟用或停用："
 
-#: ../setup/setup.ui.h:19
+#: ../setup/setup.ui.h:21
 msgid "Enable:"
 msgstr "啟用："
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:22
 msgid "Disable:"
 msgstr "停用："
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:23
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>鍵盤快捷鍵</b>"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:24
 msgid "Set the orientation of candidates in lookup table"
 msgstr "設置查詢表單內候選字詞的排列方向"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:25
 msgid "Candidates orientation:"
 msgstr "候選詞排列方向："
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:26
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "設置 iBus 如何顯示或隱藏語言列的行為"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:27
 msgid "Show property panel:"
 msgstr "顯示屬性面板："
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:28
 msgid "Language panel position:"
 msgstr "語言面板位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系統匣顯示圖示"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "在語言列顯示輸入法名稱"
 
-#: ../setup/setup.ui.h:29
+#: ../setup/setup.ui.h:31
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "當選取時在語言列上輸入法名稱"
 
-#: ../setup/setup.ui.h:30
+#: ../setup/setup.ui.h:32
 msgid "Embed preedit text in application window"
 msgstr "在應用程式視窗內嵌預先編輯文字"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:33
 msgid "Embed the preedit text of input method in the application window"
 msgstr "在應用程式視窗內嵌輸入法的預先編輯文字"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:34
 msgid "Use custom font:"
 msgstr "使用自訂字型："
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "設定候選繪文字的字型"
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "繪文字字型："
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "設定繪文字對話窗中的繪文字註釋語言"
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr "繪文字註釋語言："
+
+#: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
 msgstr "<b>字型與風格</b>"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:40
 msgid "General"
 msgstr "通用"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:42
 msgid "Add the selected input method into the enabled input methods"
 msgstr "加入選取的輸入法到已啟用的輸入法內"
 
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:43
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:44
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "從已啟用的輸入法中移除所選的輸入法"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:45
 msgid "_Up"
 msgstr "向上(_U)"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:46
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移所選取的輸入法"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:47
 msgid "_Down"
 msgstr "向下(_D)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:48
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移所選取的輸入法"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:49
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:50
 msgid "Show information of the selected input method"
 msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:51
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:52
 msgid "Show setup of the selected input method"
 msgstr "顯示選取輸入法的設置"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:53
 msgid ""
 "<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 "
@@ -219,35 +244,35 @@ msgstr ""
 "<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:57
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:59
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:60
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:61
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -263,20 +288,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
 msgstr "在登入時啟動 iBus"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -452,7 +476,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "顯示面板屬性圖示的毫秒數"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -461,6 +485,8 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"當切換引擎時將面板的引擎圖示改顯示為屬性圖示的毫秒數，若 IBusEngineDesc 中該屬性的 icon-prop-key 值有指定的話。如果值為 "
+"0，則沒有延遲時間，該屬性圖示將立即顯示。"
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
@@ -479,30 +505,63 @@ msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse 的繪文字快捷鍵"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "開啟繪文字輸入或關閉的快捷鍵"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "繪文字對話窗當中繪文字字元的自訂字型名稱"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "繪文字字典的預設語言"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "繪文字對話窗中的喜愛繪文字清單"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr "您可以在繪文字清單中顯示喜愛的繪文字，若有列出任何字元的話。"
+
+#: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:58
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:59
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -517,6 +576,24 @@ msgstr "版權所有 (c) 2007-2010 黃鵬\n"
 msgid "Other"
 msgstr "其他"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "其他…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -540,15 +617,6 @@ msgstr "描述：\n"
 msgid "Select an input method"
 msgstr "選取輸入法"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "其他…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "鍵盤"
@@ -590,19 +658,15 @@ msgstr "請按鍵盤按鍵 (或是按鍵組合)\n"
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "確定(_O)"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:485
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:412
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:433
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -616,174 +680,249 @@ msgstr ""
 "export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:447
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:459
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:461
 msgid "switching input methods"
 msgstr "切換輸入法"
 
-#: ../tools/main.vala:48
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
 msgstr "無法連接 IBus。\n"
 
-#: ../tools/main.vala:90
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:166
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:171
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:210
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
 msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:212
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
 msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
 msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:250
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
 msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:252
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
 msgstr "寫入註冊快取 FILE。"
 
-#: ../tools/main.vala:304
+#: ../tools/main.vala:307
 msgid "Resetting…"
 msgstr "重設中…"
 
-#: ../tools/main.vala:318
+#: ../tools/main.vala:321
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:366
 msgid "Set or get engine"
 msgstr "設定引擎或取得引擎"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
 msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:339
+#: ../tools/main.vala:368
 msgid "Show available engines"
 msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:340
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
 msgstr "(尚未實作)"
 
-#: ../tools/main.vala:341
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
 msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:342
+#: ../tools/main.vala:371
 msgid "Show version"
 msgstr "顯示版本"
 
-#: ../tools/main.vala:343
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
 msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:344
+#: ../tools/main.vala:373
 msgid "Create registry cache"
 msgstr "建立註冊快取"
 
-#: ../tools/main.vala:345
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
-#: ../tools/main.vala:346
+#: ../tools/main.vala:375
 msgid "Show the configuration values"
 msgstr "顯示組態值"
 
-#: ../tools/main.vala:347
+#: ../tools/main.vala:376
 msgid "Reset the configuration values"
 msgstr "重設組態值"
 
-#: ../tools/main.vala:348
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "將對話窗中的繪文字儲存到剪貼簿"
+
+#: ../tools/main.vala:380
 msgid "Show this information"
 msgstr "顯示此資訊"
 
-#: ../tools/main.vala:354
+#: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:355
+#: ../tools/main.vala:387
 msgid "Commands:\n"
 msgstr "指令：\n"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr "繪文字對話窗"
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr "請輸入註釋或選擇繪文字"
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr "喜愛"
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr "上一頁"
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr "下一頁"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr "描述：%s"
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr "無"
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr "註釋：%s"
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1196
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1219
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1238
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1242
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr "已取消繪文字的選擇。"
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr "已將繪文字複製到您的剪貼簿。"
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""

From ccc602d626b29fae805fae2d0995126afac6d9e6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 May 2017 16:03:34 +0900
Subject: [PATCH 412/816] Release 1.5.16

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/320550043
---
 configure.ac |    2 +-
 po/fi.po     |  915 +++++++++++++++++++++++++++++++++++++++++++
 po/sq.po     |  933 ++++++++++++++++++++++++++++++++++++++++++++
 po/sv.po     | 1060 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 2909 insertions(+), 1 deletion(-)
 create mode 100644 po/fi.po
 create mode 100644 po/sq.po
 create mode 100644 po/sv.po

diff --git a/configure.ac b/configure.ac
index ea568a00b..219b89de3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [15])
+m4_define([ibus_micro_version], [16])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 000000000..fd1157a95
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,915 @@
+# Finnish translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2017. #zanata
+# Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-17 12:26-0400\n"
+"Last-Translator: Toni Rantala <trantalafilo@gmail.com>\n"
+"Language-Team: Finnish\n"
+"Language: fi\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Vaakasuora"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Pystysuora"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Vasen yläkulma"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Oikea yläkulma"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Vasen alakulma"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Oikea alakulma"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr "Älä näytä"
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr "Piilota automaattisesti"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Aina"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus-asetukset"
+
+#: ../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 "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji dialog:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: ../setup/setup.ui.h:20
+msgid "Enable or disable:"
+msgstr "Ota käyttöön tai poista käytöstä"
+
+#: ../setup/setup.ui.h:21
+msgid "Enable:"
+msgstr "Ota käyttöön:"
+
+#: ../setup/setup.ui.h:22
+msgid "Disable:"
+msgstr "Poista käytöstä:"
+
+#: ../setup/setup.ui.h:23
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Pikanäppäimet</b>"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: ../setup/setup.ui.h:25
+msgid "Candidates orientation:"
+msgstr ""
+
+#: ../setup/setup.ui.h:26
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Määritä miten ibus näyttää tai piilotaa kielivalikon"
+
+#: ../setup/setup.ui.h:27
+msgid "Show property panel:"
+msgstr "Näytä ominaisuuspaneeli:"
+
+#: ../setup/setup.ui.h:28
+msgid "Language panel position:"
+msgstr "Kielipaneelin sijainti:"
+
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+msgid "Show icon on system tray"
+msgstr "Näytä kuvake ilmoitusalueella"
+
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+msgid "Show input method name on language bar"
+msgstr "Näytä syötetavan nimi kielipalkissa"
+
+#: ../setup/setup.ui.h:31
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: ../setup/setup.ui.h:32
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:33
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:34
+msgid "Use custom font:"
+msgstr "Käytä mukautettua fonttia:"
+
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr "Hymiöfontti"
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fontti ja tyyli</b>"
+
+#: ../setup/setup.ui.h:40
+msgid "General"
+msgstr "Yleiset"
+
+#. add button
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
+msgid "_Add"
+msgstr "_Lisää"
+
+#: ../setup/setup.ui.h:42
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:43
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../setup/setup.ui.h:44
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:45
+msgid "_Up"
+msgstr "_Ylös"
+
+#: ../setup/setup.ui.h:46
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: ../setup/setup.ui.h:47
+msgid "_Down"
+msgstr "_Alas"
+
+#: ../setup/setup.ui.h:48
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:49
+msgid "_About"
+msgstr "_Tietoja"
+
+#: ../setup/setup.ui.h:50
+msgid "Show information of the selected input method"
+msgstr "Näytä tietoja valitusta syötetavasta"
+
+#: ../setup/setup.ui.h:51
+msgid "_Preferences"
+msgstr "_Asetukset"
+
+#: ../setup/setup.ui.h:52
+msgid "Show setup of the selected input method"
+msgstr "Näytä valitun syötetavan asetukset"
+
+#: ../setup/setup.ui.h:53
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Aktiivinen syötetapa voidaan vaihtaa valitusta ylläolevasta "
+"listasta painamalla pikanäppäiimä tai klikkaamalla paneelin kuvaketta. </i></"
+"small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+msgid "Input Method"
+msgstr "Syötetapa"
+
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+msgid "Use system keyboard layout"
+msgstr "Käytä järjestelmän näppäimistön asettelua"
+
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+msgid "Use system keyboard (XKB) layout"
+msgstr "Käytä järjestelmän näppäimistön (XKB) asettelua"
+
+#: ../setup/setup.ui.h:57
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Näppäimistön asettelu</b>"
+
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+msgid "Share the same input method among all applications"
+msgstr "Jaa sama syötetapa kaikkien sovellusten välillä"
+
+#: ../setup/setup.ui.h:59
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Yleiset syötetavan asetukset</b>"
+
+#: ../setup/setup.ui.h:60
+msgid "Advanced"
+msgstr "Edistyneet"
+
+#: ../setup/setup.ui.h:61
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Älykäs syöteväylä</small>\n"
+"Sivusto: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:68
+msgid "Start ibus on login"
+msgstr "Käynnistä IBus kirjautumisen yhteydessä"
+
+#: ../setup/setup.ui.h:69
+msgid "<b>Startup</b>"
+msgstr "<b>Käynnistys</b>"
+
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
+msgid "About"
+msgstr "Tietoja"
+
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+msgid "_Close"
+msgstr "_Sulje"
+
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Engines order"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:6
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Saved version number"
+msgstr "Tallennettu versionumero"
+
+#: ../data/ibus.schemas.in.h: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 ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Käytä xmodmapia"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr "Käytä pikanäppäimiä"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr "Poista pikanäppäimet käytöstä"
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:23
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Auto hide"
+msgstr "Automaattinen piilotus"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Language panel position"
+msgstr "Kielipaneelin sijainti"
+
+#: ../data/ibus.schemas.in.h:29
+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 ""
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:33
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "XKB-kuvakkeen RGBA-arvo"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Use custom font"
+msgstr "Käytä omavalintaista fonttia"
+
+#: ../data/ibus.schemas.in.h:47
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:48
+msgid "Custom font"
+msgstr "Omavalintainen fontti"
+
+#: ../data/ibus.schemas.in.h:49
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+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 ""
+"Tekijänoikeus (c) 2007-2010 Peng Huang\n"
+"Tekijänoikeus (c) 2007-2010 Red Hat, Inc."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+msgid "Other"
+msgstr "Muu"
+
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Lisää…"
+
+#: ../setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Kieli: %s\n"
+
+#: ../setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Näppäimistön asettelu: %s\n"
+
+#: ../setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Tekijä: %s\n"
+
+#: ../setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Kuvaus:\n"
+
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Valitse syötetapa"
+
+#: ../setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Määritä IBusin asetukset"
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Pikanäppäimet"
+
+#: ../setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Avain koodi"
+
+#: ../setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Muokkaajat:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Poista"
+
+#: ../setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:121 ../setup/main.py:485
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:412
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-taustapalvelu ei ole käynnissä. Haluatko käynnistää sen?"
+
+#: ../setup/main.py:433
+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 on käynnistetty! Jos et voi käyttää IBusia, lisää seuraavat rivit $HOME/"
+".bashrc-tiedostoon ja kirjaudu uudelleen.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: ../setup/main.py:447
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:459
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: ../setup/main.py:461
+msgid "switching input methods"
+msgstr ""
+
+#: ../tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+msgid "Can't connect to IBus.\n"
+msgstr "Yhteys IBusiin ei onnistu.\n"
+
+#: ../tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr "kieli: %s\n"
+
+#: ../tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:213
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:215
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:233 ../tools/main.vala:238
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:253
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:255
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr "Valmis"
+
+#: ../tools/main.vala:366
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:367
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:368
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:369
+msgid "(Not implemented)"
+msgstr "(Ei toteutettu)"
+
+#: ../tools/main.vala:370
+msgid "Restart ibus-daemon"
+msgstr "Käynnistä ibus-daemon uudelleen"
+
+#: ../tools/main.vala:371
+msgid "Show version"
+msgstr "Näytä versio"
+
+#: ../tools/main.vala:372
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:373
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:374
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:380
+msgid "Show this information"
+msgstr "Näytä tämä tieto"
+
+#: ../tools/main.vala:386
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Commands:\n"
+msgstr "Komennot:\n"
+
+#: ../tools/main.vala:416
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s on tuntematon komento!\n"
+
+#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
+msgid "Emoji Dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+msgid "Favorites"
+msgstr "Suosikit"
+
+#: ../ui/gtk3/emojier.vala:628
+msgid "Page Down"
+msgstr "Sivu alas"
+
+#: ../ui/gtk3/emojier.vala:639
+msgid "Page Up"
+msgstr "Sivu ylös"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#, c-format
+msgid "Description: %s"
+msgstr "Kuvaus: %s"
+
+#: ../ui/gtk3/emojier.vala:813
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:838
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr "IBus-paneeli"
+
+#: ../ui/gtk3/panel.vala:823
+msgid "IBus Update"
+msgstr "IBus-päivitys"
+
+#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1196
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus on älykäs syöteväylä Linuxille/Unixille."
+
+#: ../ui/gtk3/panel.vala:1200
+msgid "translator-credits"
+msgstr "kääntäjät"
+
+#: ../ui/gtk3/panel.vala:1219
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../ui/gtk3/panel.vala:1238
+msgid "Restart"
+msgstr "Käynnistä uudelleen"
+
+#: ../ui/gtk3/panel.vala:1242
+msgid "Quit"
+msgstr "Lopeta"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+msgid "default:LTR"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:45
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:52
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:82
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:88
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:89
+msgid "LANG"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
new file mode 100644
index 000000000..8d30683d9
--- /dev/null
+++ b/po/sq.po
@@ -0,0 +1,933 @@
+# Albanian translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Sidorela Uku <uku.sidorela@gmail.com>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2017-04-27 12:38+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-20 11:38-0400\n"
+"Last-Translator: Sidorela Uku <uku.sidorela@gmail.com>\n"
+"Language-Team: Albanian\n"
+"Language: sq\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Cepi lart majtas"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Cepi lart djathtas"
+
+#: ../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 "Do not show"
+msgstr ""
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr ""
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Gjithmonë"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr ""
+
+#: ../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 "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:17
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:18
+msgid "..."
+msgstr ""
+
+#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: ../setup/setup.ui.h:20
+msgid "Enable or disable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:21
+msgid "Enable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:22
+msgid "Disable:"
+msgstr ""
+
+#: ../setup/setup.ui.h:23
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:24
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: ../setup/setup.ui.h:25
+msgid "Candidates orientation:"
+msgstr ""
+
+#: ../setup/setup.ui.h:26
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: ../setup/setup.ui.h:27
+msgid "Show property panel:"
+msgstr ""
+
+#: ../setup/setup.ui.h:28
+msgid "Language panel position:"
+msgstr ""
+
+#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+msgid "Show icon on system tray"
+msgstr ""
+
+#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: ../setup/setup.ui.h:31
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: ../setup/setup.ui.h:32
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:33
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: ../setup/setup.ui.h:34
+msgid "Use custom font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:35
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:36
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:37
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:38
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:39
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:40
+msgid "General"
+msgstr ""
+
+#. add button
+#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
+msgid "_Add"
+msgstr ""
+
+#: ../setup/setup.ui.h:42
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:43
+msgid "_Remove"
+msgstr ""
+
+#: ../setup/setup.ui.h:44
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:45
+msgid "_Up"
+msgstr ""
+
+#: ../setup/setup.ui.h:46
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: ../setup/setup.ui.h:47
+msgid "_Down"
+msgstr ""
+
+#: ../setup/setup.ui.h:48
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: ../setup/setup.ui.h:49
+msgid "_About"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "_Preferences"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid ""
+"<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>"
+msgstr ""
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+msgid "Input Method"
+msgstr ""
+
+#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:61
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: ../setup/setup.ui.h:68
+msgid "Start ibus on login"
+msgstr ""
+
+#: ../setup/setup.ui.h:69
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+msgid "About"
+msgstr ""
+
+#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+msgid "_Close"
+msgstr ""
+
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Engines order"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:6
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Saved version number"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h: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 ""
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:23
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:25
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Auto hide"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Language panel position"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:29
+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 ""
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:31
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:32
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:33
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Show input method name"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Use custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:47
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:48
+msgid "Custom font"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:49
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Use global input method"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Enable input method by default"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+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 ""
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+msgid "Other"
+msgstr ""
+
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+msgid "_Cancel"
+msgstr ""
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:458
+msgid "_OK"
+msgstr ""
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Më shumë..."
+
+#: ../setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Gjuhë: %s\n"
+
+#: ../setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: ../setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autori: %s\n"
+
+#: ../setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Përshkrimi:\n"
+
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr ""
+
+#: ../setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr ""
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Shkurtimet e tastierës"
+
+#: ../setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modifikuesit:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Apliko"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Fshi"
+
+#: ../setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: ../setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: ../setup/main.py:121 ../setup/main.py:485
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:412
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: ../setup/main.py:433
+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:447
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:459
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: ../setup/main.py:461
+msgid "switching input methods"
+msgstr ""
+
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
+
+#: ../tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:213
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:215
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:233 ../tools/main.vala:238
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:253
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:255
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:366
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:367
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:368
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:369
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:370
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:371
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:372
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:373
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:374
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:380
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:386
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:416
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:170
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:284 ../ui/gtk3/panel.vala:1242
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:290
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:595 ../ui/gtk3/emojier.vala:642
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:667
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:678
+msgid "Page Up"
+msgstr ""
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:849 ../ui/gtk3/emojier.vala:863
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:849
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:854 ../ui/gtk3/emojier.vala:893
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:874
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:44
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:51
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:71
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:72
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:78
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:832
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1214
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1218
+msgid "translator-credits"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1237
+msgid "Preferences"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1256
+msgid "Restart"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:1260
+msgid "Quit"
+msgstr ""
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+msgid "default:LTR"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 000000000..72225bc07
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,1060 @@
+# Swedish translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2017-05-01 17:26+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-04-28 04:21-0400\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
+"Language-Team: Swedish\n"
+"Language: sv\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horisontellt"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikalt"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Övre vänstra hörnet"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Övre högra hörnet"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Nedre vänstra hörnet"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Nedre högra hörnet"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Anpassat"
+
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr "Visa inte"
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr "Dölj automatiskt"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Alltid"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus-inställningar"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Kortkommandot för att byta till nästa inmatningsmetod i listan"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Nästa inmatningsmetod:"
+
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Kortkommandot för att byta till föregående inmatningsmetod i listan"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Föregående inmatningsmetod:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "…"
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Kortkommandot för att slå på och av inmatningsmetoden"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aktivera eller avaktivera:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aktivera:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Avaktivera:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Kortkommandon</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ange ordningen av kandidater i tabelluppslagning"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Kandidaters riktning:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Ange beteendet hos ibus hur den visar eller döljer språkpanelen"
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr "Visa egenskapspanel:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Språkpanelens position:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
+msgid "Show icon on system tray"
+msgstr "Visa ikonen i aktivitetsfältet"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
+msgid "Show input method name on language bar"
+msgstr "Visa inmatningsmetodens namn i språkpanelen"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Visa inmatningsmetodens namn i språkpanelen när kryssrytan är iklickad"
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Bädda in förredigeringstext i programfönstret"
+
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Bädda in förredigeringstext för inmatningsmetoden i programfönstret"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Använd ett anpassat typsnitt:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Typsnitt och stil</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Allmänt"
+
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Lägg till den valda inmatningsmetoden till de aktiverade inmatningsmetoderna"
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: ../setup/setup.ui.h:38
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Ta bort den valda inmatningsmetoden från de aktiverade inmatningsmetoderna"
+
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Upp"
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Flytta upp den valda inmatningsmetoden i listan över aktiverade "
+"inmatningsmetoder"
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Ner"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Flytta ner den valda inmatningsmetoden i listan över aktiverade "
+"inmatningsmetoder"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "_Om"
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr "Visa information om den valda inmatningsmetoden"
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Inställningar"
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr "Visa uppsättningen av den valda inmatningsmetoden"
+
+#: ../setup/setup.ui.h:47
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Den aktiva inmatningsmetoden kan bytas mellan de valda i listan "
+"ovan genom att trycka snabbkommandot eller klicka i panelikonen.</i></small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
+msgid "Input Method"
+msgstr "Inmatningsmetod"
+
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Kortkommandot för att visa emoji-dialogen"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Emoji-val:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Ange ett typsnitt för emoji-kandidater i emoji-dialogen"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emoji-typsnitt:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Ange ett språk för emoji-annotationer i emoji-dialogen"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Språk för emoji-annotationer:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+msgid "Use system keyboard layout"
+msgstr "Använd systemets tangentbordslayout"
+
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+msgid "Use system keyboard (XKB) layout"
+msgstr "Använd systemets (XKB) tangentbordslayout"
+
+#: ../setup/setup.ui.h:63
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tangentbordslayout</b>"
+
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+msgid "Share the same input method among all applications"
+msgstr "Dela samma inmatningsmetod mellan alla program"
+
+#: ../setup/setup.ui.h:65
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Inställningar för global inmatningsmetod</b>"
+
+#: ../setup/setup.ui.h:66
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: ../setup/setup.ui.h:67
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligenta inmatningsbussen</small>\n"
+"Hemsida: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:74
+msgid "Start ibus on login"
+msgstr "Starta ibus vid inloggning"
+
+#: ../setup/setup.ui.h:75
+msgid "<b>Startup</b>"
+msgstr "<b>Uppstart</b>"
+
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+msgid "About"
+msgstr "Om"
+
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+msgid "_Close"
+msgstr "_Stäng"
+
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines"
+msgstr "Förhandsladda maskiner"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
+msgid "Preload engines during ibus starts up"
+msgstr "Förhandsladda maskiner när ibus startas upp"
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Engines order"
+msgstr "Maskinordning"
+
+#: ../data/ibus.schemas.in.h:6
+msgid "Saved engines order in input method list"
+msgstr "Sparad maskinordning i listan över inmatningsmetoder"
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Fördröjning i millisekunder för pop-up-fönster för IME-byte"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"Ange fördröjningen i millisekunder för att visa pop-up-fönstret för IME-byte."
+"  Standard är 400.  0 = Visa fönstret omedelbart. 0 &lt; Vänta millisekunder."
+" 0 &gt; Visa inte fönstret och byt till föregående/nästa maskin."
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Saved version number"
+msgstr "Sparade versionsnummer"
+
+#: ../data/ibus.schemas.in.h: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 ""
+"Sparade versionsnummer kommer användas för att kontrollera skillnaden mellan "
+"versionen på den tidigare installerade ibus:en och den nuvarande ibus:en."
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Latinsk layout som inte har ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr ""
+"USA-layout läggs till till den latinska layouten, varianten kan utelämnas."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Använd xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Kör xmodmap om .xmodmap eller .Xmodmap finns när ibus-maskiner byts."
+
+#: ../data/ibus.schemas.in.h:15
+msgid "Trigger shortcut keys"
+msgstr "Utlös kortkommandon"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Utlös kortkommando för gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr "Aktivera kortkommandon"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr "Kortkommandot för att slå på inmatningsmetoden"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr "Avaktivera kortkommandon"
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr "Kortkommandot för att slå av inmatningsmetoden"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Next engine shortcut keys"
+msgstr "Kortkommandon för nästa maskin"
+
+#: ../data/ibus.schemas.in.h:23
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Kortkommandot för att byta till nästa inmatningsmetod i listan"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Prev engine shortcut keys"
+msgstr "Kortkommandon för föregående maskin"
+
+#: ../data/ibus.schemas.in.h:25
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Kortkommandot för att byta till föregående inmatningsmetod"
+
+#: ../data/ibus.schemas.in.h:26
+msgid "Auto hide"
+msgstr "Dölj automatiskt"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"Beteendet hos egenskapspanelen.  0 = Visa inte, 1 = Dölj automatiskt 2 = "
+"Visa alltid"
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Language panel position"
+msgstr "Språkpanelens position"
+
+#: ../data/ibus.schemas.in.h:29
+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 ""
+"Språkpanelens position. 0 = Övre vänstra hörnet, 1 = Övre högra hörnet, 2 = "
+"Nedre vänstra hörnet, 3 = Nedre högra hörnet, 4 = Anpassat"
+
+#: ../data/ibus.schemas.in.h:30
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "Följ inmatningsmarkören i fallet när panelen alltid visas"
+
+#: ../data/ibus.schemas.in.h:31
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+"Om sant följer panelen inmatningsmarkören i fallet när panelen alltid visas. "
+" Om falskt visas panelen på en bestämd plats."
+
+#: ../data/ibus.schemas.in.h:32
+msgid "The milliseconds to show property panel"
+msgstr "Antalet millisekunder att visa egenskapspanelen"
+
+#: ../data/ibus.schemas.in.h:33
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+"Antalet millisekunder att visa egenskapspanelen efter infokusering eller att "
+"egenskaperna ändrats."
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Orientation of lookup table"
+msgstr "Orienteringen på uppslagningstabellen"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+"Orienteringen på uppslagningstabellen.  0 = horisontellt, 1 = vertikalt"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Show input method name"
+msgstr "Välj namn på inmatningsmetoden"
+
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "RGBA-värde på XKB-ikonen"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+"XKB-ikonen visar layout-strängen och strängen visas med RGBA-värdet.  RGBA-"
+"värdet kan vara 1. ett färgnamn från X11, 2. ett hexadecimalt värde på "
+"formen ”#rrggbb” där ”r”, ”g” och ”b” är hexadecimala siffror för rött, "
+"grönt och blått, 3. en RGB-färg på formen ”rgb(r,g,b)” eller 4. en RGBA-färg "
+"på formen ”rgba(r,g,b,a)” där ”r”, ”g” och ”b” är antingen heltal i "
+"intervallet 0 till 255 eller procentsatser i intervallet 0% till 100%, och "
+"”a” är ett flyttalsvärde i intervallet 0 till 1 för alfa."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Antalet millisekunder att visa panelikonen för en egenskap"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Antalet millisekunder att visa panelikonen från maskinikonen för en "
+"egenskapsikon när maskinen byts om egenskapen anges av värdet på icon-prop-"
+"key i IBusEngineDesc.  Om värdet är 0, ingen fördröjning och egenskapsikonen "
+"visas omedelbart."
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Use custom font"
+msgstr "Använd anpassat typsnitt"
+
+#: ../data/ibus.schemas.in.h:47
+msgid "Use custom font name for language panel"
+msgstr "Använd det anpassade typsnittsnamnet till språkpanelen"
+
+#: ../data/ibus.schemas.in.h:48
+msgid "Custom font"
+msgstr "Anpassat typsnitt"
+
+#: ../data/ibus.schemas.in.h:49
+msgid "Custom font name for language panel"
+msgstr "Anpassat typsnittsnamn till språkpanelen"
+
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Emoji-kortkommando för gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Kortkommandot för att slå på och av emoji-inmatning"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Anpassat typsnitt för emoji-tecken i emoji-dialogen"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Standardspråk för emoji-ordlista"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Välj ett standardspråk med emoji-ordlistor i emoji-dialogen.  Värdet $lang "
+"används i /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "favorit-emoji-lista i emoji-dialogen"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Du kan visa favorit-emoji:erna i emoji-listan om denna lista har några "
+"tecken."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotaions can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotaions with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Embed Preedit Text"
+msgstr "Bädda in förredigerad text"
+
+#: ../data/ibus.schemas.in.h:64
+msgid "Embed Preedit Text in Application Window"
+msgstr "Bädda in förredigerad text i programfönstret"
+
+#: ../data/ibus.schemas.in.h:65
+msgid "Use global input method"
+msgstr "Använd den globala inmatningsmetoden"
+
+#: ../data/ibus.schemas.in.h:67
+msgid "Enable input method by default"
+msgstr "Aktivera inmatningsmetoden som standard"
+
+#: ../data/ibus.schemas.in.h:68
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Aktivera inmatningsmetoden som standard när programmet får inmatningsfokus"
+
+#: ../data/ibus.schemas.in.h:69
+msgid "DConf preserve name prefixes"
+msgstr "DConf namnbevarandeprefix"
+
+#: ../data/ibus.schemas.in.h:70
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefix av DConf-tangenter för att förhindra namnkonvertering"
+
+#: ../ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 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:158
+msgid "Other"
+msgstr "Andra"
+
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Välj ett språk"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mer …"
+
+#: ../setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Språk: %s\n"
+
+#: ../setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tangentbordslayout: %s\n"
+
+#: ../setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Upphovsman: %s\n"
+
+#: ../setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beskrivning:\n"
+
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Välj en inmatningsmetod"
+
+#: ../setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Sätt IBus-inställningar"
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Kortkommandon"
+
+#: ../setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Tangentkod:"
+
+#: ../setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modifierare:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Verkställ"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Radera"
+
+#: ../setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Tryck en tangent (eller tangentkombination).\n"
+"Dialogen kommer stängas när tangenten släpps."
+
+#: ../setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Tryck en tangent (eller tangentkombination)"
+
+#: ../setup/main.py:121 ../setup/main.py:580
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Använd kortkommandot med skift för att byta till föregående inmatningsmetod"
+
+#: ../setup/main.py:507
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-demonen kör inte.  Vill du starta den?"
+
+#: ../setup/main.py:528
+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 har startats!  Om du inte kan använda IBus, lägg till följande rader i "
+"din $HOME/.bashrc; och logga därefter in igen till ditt skrivbord.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: ../setup/main.py:542
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus-demonen kunde inte startas på %d sekunder"
+
+#: ../setup/main.py:554
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Välj snabbkommando för %s"
+
+#. Translators: Title of the window
+#: ../setup/main.py:556
+msgid "switching input methods"
+msgstr "byter inmatningsmetoder"
+
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Aktiviteter"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Djur & natur"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Flaggor"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Mat & dryck"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Föremål"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Smajlisar & folk"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symboler"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Resor & platser"
+
+#: ../tools/main.vala:51
+msgid "List engine name only"
+msgstr "Lista endast maskinnamn"
+
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+msgid "Can't connect to IBus.\n"
+msgstr "Kan inte ansluta till IBus.\n"
+
+#: ../tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr "språk: %s\n"
+
+#: ../tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr "Ingen maskin är satt.\n"
+
+#: ../tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr "Att sätta den globala maskinen misslyckades.\n"
+
+#: ../tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr "Att hämta den globala maskinen misslyckades.\n"
+
+#: ../tools/main.vala:213
+msgid "Read the system registry cache."
+msgstr "Läs systemregistercachen."
+
+#: ../tools/main.vala:215
+msgid "Read the registry cache FILE."
+msgstr "Läs registercachen i FIL."
+
+#: ../tools/main.vala:233 ../tools/main.vala:238
+msgid "The registry cache is invalid.\n"
+msgstr "Registercachen är felaktig.\n"
+
+#: ../tools/main.vala:253
+msgid "Write the system registry cache."
+msgstr "Skriv systemregistercachen."
+
+#: ../tools/main.vala:255
+msgid "Write the registry cache FILE."
+msgstr "Skriv registercachen till FIL."
+
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr "Återställer …"
+
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr "Klart"
+
+#: ../tools/main.vala:366
+msgid "Set or get engine"
+msgstr "Sätt eller hämta maskin"
+
+#: ../tools/main.vala:367
+msgid "Exit ibus-daemon"
+msgstr "Avsluta ibus-demonen"
+
+#: ../tools/main.vala:368
+msgid "Show available engines"
+msgstr "Visa tillgängliga maskiner"
+
+#: ../tools/main.vala:369
+msgid "(Not implemented)"
+msgstr "(Inte implementerat)"
+
+#: ../tools/main.vala:370
+msgid "Restart ibus-daemon"
+msgstr "Starta om ibus-demonen"
+
+#: ../tools/main.vala:371
+msgid "Show version"
+msgstr "Visa versionen"
+
+#: ../tools/main.vala:372
+msgid "Show the content of registry cache"
+msgstr "Vissa innehållet i registercachen"
+
+#: ../tools/main.vala:373
+msgid "Create registry cache"
+msgstr "Skapa en registercache"
+
+#: ../tools/main.vala:374
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Skriv ut D-Bus-adressen till ibus-demonen"
+
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr "Visa konfigurationsvärdena"
+
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr "Återställ konfigurationsvärdena"
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Spara emoji i dialogen till urklipp"
+
+#: ../tools/main.vala:380
+msgid "Show this information"
+msgstr "Visa denna information"
+
+#: ../tools/main.vala:386
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Användning: %s KOMMANDO [FLAGGA …]\n"
+"\n"
+
+#: ../tools/main.vala:387
+msgid "Commands:\n"
+msgstr "Kommandon:\n"
+
+#: ../tools/main.vala:416
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s är ett okänt kommando!\n"
+
+#: ../ui/gtk3/emojier.vala:170
+msgid "Others"
+msgstr "Annat"
+
+#: ../ui/gtk3/emojier.vala:287 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Emoji-val"
+
+#: ../ui/gtk3/emojier.vala:293
+msgid "Type annotation or choose emoji"
+msgstr "Ange annotation eller välj emoji"
+
+#: ../ui/gtk3/emojier.vala:598 ../ui/gtk3/emojier.vala:645
+msgid "Favorites"
+msgstr "Favoriter"
+
+#: ../ui/gtk3/emojier.vala:670
+msgid "Page Down"
+msgstr "Bläddra ned"
+
+#: ../ui/gtk3/emojier.vala:681
+msgid "Page Up"
+msgstr "Bläddra upp"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:889 ../ui/gtk3/emojier.vala:903
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivning: %s"
+
+#: ../ui/gtk3/emojier.vala:889
+msgid "None"
+msgstr "Ingen"
+
+#: ../ui/gtk3/emojier.vala:894 ../ui/gtk3/emojier.vala:933
+#, c-format
+msgid "Code point: %s"
+msgstr "Kodpunkt: %s"
+
+#: ../ui/gtk3/emojier.vala:914
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotationer: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Avbröt att välja en emoji."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Kopierade en emoji till ditt urklipp."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "TYPSNITT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "SPRÅK"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotaions can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+msgid "IBus Panel"
+msgstr "IBus-panel"
+
+#: ../ui/gtk3/panel.vala:853
+msgid "IBus Update"
+msgstr "IBus-uppdatering"
+
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+msgid "Super+space is now the default hotkey."
+msgstr "Super+ mellanslag är nu standardsnabbkommando."
+
+#: ../ui/gtk3/panel.vala:1236
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:1240
+msgid "translator-credits"
+msgstr "Göran Uddeborg <goeran@uddeborg.se>"
+
+#: ../ui/gtk3/panel.vala:1259
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: ../ui/gtk3/panel.vala:1278
+msgid "Restart"
+msgstr "Starta om"
+
+#: ../ui/gtk3/panel.vala:1282
+msgid "Quit"
+msgstr "Avsluta"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+msgid "default:LTR"
+msgstr "standard:LTR"

From e6bab7ab78c69d238a70a64e60963dd5a6711ffe Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Fri, 19 May 2017 12:13:04 +0900
Subject: [PATCH 413/816] Fix a typo in configure.ac

BUG=https://github.com/ibus/ibus/pull/1927
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/317640043

Patch from Felix Yan <felixonmars@archlinux.org>.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 219b89de3..2cc96d187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,7 +727,7 @@ Build options:
   Enable surrounding-text       $enable_surrounding_text
   Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
-  Uicode Emoji directory        $UNICODE_EMOJI_DIR
+  Unicode Emoji directory       $UNICODE_EMOJI_DIR
   CLDR annotation directory     $EMOJI_ANNOTATION_DIR
   Run test cases                $enable_tests
 ])

From 4fe3050efa7335f82870fb1d5a1d170d20afc160 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 22 May 2017 12:04:28 +0900
Subject: [PATCH 414/816] configure: Change relative paths to absolute ones

BUG=https://github.com/ibus/ibus/issues/1926
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/322990043
---
 configure.ac | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2cc96d187..cb48ad4ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -634,10 +634,21 @@ if test x"$enable_emoji_dict" = x"yes"; then
     if test ! -f $UNICODE_EMOJI_DIR/emoji-test.txt ; then
         AC_MSG_ERROR(Not found $UNICODE_EMOJI_DIR/emoji-test.txt. You can get \
 the emoji files from http://www.unicode.org/Public/emoji/4.0/)
+    else
+        # POSIX SHELL has no ${FOO:0:1}
+        head=`echo "$UNICODE_EMOJI_DIR" | cut -c1`;
+        if test $head != "/" ; then
+            UNICODE_EMOJI_DIR=`realpath "$UNICODE_EMOJI_DIR"`
+        fi
     fi
     if test ! -f $EMOJI_ANNOTATION_DIR/en.xml ; then
         AC_MSG_ERROR(Not found $EMOJI_ANNOTATION_DIR/en.xml. You can get \
 https://github.com/fujiwarat/cldr-emoji-annotation)
+    else
+        head=`echo "$EMOJI_ANNOTATION_DIR" | cut -c1`;
+        if test $head != "/" ; then
+            EMOJI_ANNOTATION_DIR=`realpath "$EMOJI_ANNOTATION_DIR"`
+        fi
     fi
     enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
 fi

From 44d053577a6ac115f3fd3b7beb7bdd65da81aa64 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 24 May 2017 11:52:19 +0900
Subject: [PATCH 415/816] engine: Add Malay and Mongolian keymaps

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/325790043
---
 engine/simple.xml.in | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index c08000f00..f35d7a58f 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -706,5 +706,27 @@
                         <icon>ibus-keyboard</icon>
 			<rank>1</rank>
 		</engine>
+                <engine>
+                        <name>xkb:my::msa</name>
+                        <language>ms</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>my</layout>
+                        <longname>Malay (Jawi)</longname>
+                        <description>Malay (Jawi)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
+                <engine>
+                        <name>xkb:mn::mon</name>
+                        <language>mn</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>mn</layout>
+                        <longname>Mongolian</longname>
+                        <description>Mongolian</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
 	</engines>
 </component>

From 081d09f1a927f459dacda3bcc59a1678ca2f9a95 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 29 May 2017 11:54:31 +0900
Subject: [PATCH 416/816] ui/gtk3: Emojier supports Ctrl-c,v,x and Ctrl-Shift-c

Ctrl-[c|v|x] copy, paste, or cut the emoji annotatons.
Ctrl-Shift-c copies the selected emoji.
Also Ctrl-Backspace is implemented to delete an annotation word.
Also updated ibus-emoji.7.in man page.

R=penghuang@google.com

Review URL: https://codereview.appspot.com/316650043
---
 ui/gtk3/emojier.vala    | 58 +++++++++++++++++++++++++++++++++++++++--
 ui/gtk3/ibus-emoji.7.in | 11 ++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index d0d69ed65..1d105fd29 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1392,7 +1392,26 @@ class IBusEmojier : Gtk.ApplicationWindow {
             return true;
         case Gdk.Key.BackSpace:
             if (m_entry.get_text().len() > 0) {
-                GLib.Signal.emit_by_name(m_entry, "backspace");
+                if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
+                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
+                                             Gtk.DeleteType.WORD_ENDS, -1);
+                } else {
+                    GLib.Signal.emit_by_name(m_entry, "backspace");
+                }
+                return true;
+            }
+            break;
+        case Gdk.Key.Delete:
+        case Gdk.Key.KP_Delete:
+            if (m_entry.get_text().len() > 0) {
+                if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
+                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
+                                             Gtk.DeleteType.WORD_ENDS, 1);
+                } else {
+                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
+                                             Gtk.DeleteType.CHARS, 1);
+                }
+                return true;
             }
             break;
         case Gdk.Key.space:
@@ -1445,6 +1464,10 @@ class IBusEmojier : Gtk.ApplicationWindow {
             if (key_press_cursor_home_end(keyval, modifiers))
                 return true;
             break;
+        case Gdk.Key.Insert:
+        case Gdk.Key.KP_Insert:
+            GLib.Signal.emit_by_name(m_entry, "toggle-overwrite");
+            return true;
         }
 
         if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
@@ -1470,8 +1493,13 @@ class IBusEmojier : Gtk.ApplicationWindow {
                     return true;
                 break;
             case Gdk.Key.u:
-                if (key_press_escape())
+                if (m_entry.get_text().len() > 0) {
+                    GLib.Signal.emit_by_name(m_entry,
+                                             "delete-from-cursor",
+                                             Gtk.DeleteType.PARAGRAPH_ENDS,
+                                             -1);
                     return true;
+                }
                 break;
             case Gdk.Key.a:
                 if (m_entry.get_text().len() > 0) {
@@ -1479,6 +1507,32 @@ class IBusEmojier : Gtk.ApplicationWindow {
                     return true;
                 }
                 break;
+            case Gdk.Key.x:
+                if (m_entry.get_text().len() > 0) {
+                    GLib.Signal.emit_by_name(m_entry, "cut-clipboard");
+                    return true;
+                }
+                break;
+            case Gdk.Key.C:
+            case Gdk.Key.c:
+                if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                    if (m_candidate_panel_is_visible) {
+                        uint index = m_lookup_table.get_cursor_pos();
+                        var text = m_lookup_table.get_candidate(index).text;
+                        Gtk.Clipboard clipboard =
+                                Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
+                        clipboard.set_text(text, -1);
+                        clipboard.store();
+                        return true;
+                    }
+                } else if (m_entry.get_text().len() > 0) {
+                    GLib.Signal.emit_by_name(m_entry, "copy-clipboard");
+                    return true;
+                }
+                break;
+            case Gdk.Key.v:
+                GLib.Signal.emit_by_name(m_entry, "paste-clipboard");
+                return true;
             }
             return false;
         }
diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index a5045f6cb..4ee863641 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -83,6 +83,17 @@ Move to the next or previous page in the emoji list.
 \fBHead, End, Control-h or Control-e\fR
 Select the first or last emoji on the list if an annotation is not typed.
 Otherwise move the cursor to the head or end in the typed annotation.
+.TP
+\fBControl-u\fR
+Erase the typed annotation.
+.TP
+\fBControl-x or Control-v or Control-c\fR
+Cut the selected annotation to the clipboard with Control-x. Paste
+the contents of the clipboard into the annotation entry with Control-v.
+Copy the selected annotation to the clipboard with Control-c.
+.TP
+\fBControl-Shift-c\fR
+Copy the selected emoji to the clipboard.
 
 .SH BUGS
 If you find a bug, please report it at https://github.com/ibus/ibus/issues

From ad80999f5a10faee1a665a2232e1cf60be901cc8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 29 May 2017 12:03:41 +0900
Subject: [PATCH 417/816] Make all emoji dicts for fully qualified

Currently only emoji-en.dict enables fully qualified since it imports
emoji-test.txt and it causes to hardly compare emojis between
emoji-en.dict and emoji-$lang.dict when m_show_emoji_variant
is enabled. E.g. U+1F3CC-FE0F-200D-2642-FE0F
Now emoji-$lang.dict also import emoji-test.txt and enables
fully qualified.

R=penghuang@google.com

Review URL: https://codereview.appspot.com/323860043
---
 src/Makefile.am      |   1 +
 src/emoji-parser.c   | 167 ++++++++++++++++++++++++++++++++++++++-----
 src/ibusemoji.c      |   2 +-
 ui/gtk3/emojier.vala |  34 ++++-----
 4 files changed, 169 insertions(+), 35 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 27cd168b5..e7bc8be5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -263,6 +263,7 @@ dicts/emoji-en.dict: emoji-parser
 	            --out $@; \
 	    else \
 	        $(builddir)/emoji-parser \
+	            --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
 	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
 	            $$xml_derived_option \
 	            --out dicts/emoji-$$f.dict; \
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index 5e6155bd0..fe3e4ef8a 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -31,12 +31,20 @@
  * ASCII emoji annotations are saved in ../data/annotations/en_ascii.xml
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 
 #ifdef HAVE_JSON_GLIB1
 #include <json-glib/json-glib.h>
 #endif
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 #include <string.h>
 
 #include "ibusemoji.h"
@@ -65,8 +73,73 @@ struct _EmojiData {
     EmojiDataSearchType search_type;
 };
 
+typedef struct _NoTransData NoTransData;
+struct _NoTransData {
+    const gchar *xml_file;
+    const gchar *xml_derived_file;
+    GSList      *emoji_list;
+};
+
 static gchar *unicode_emoji_version;
 
+
+static void
+init_annotations (IBusEmojiData *emoji,
+                  gpointer       user_data)
+{
+    g_return_if_fail (IBUS_IS_EMOJI_DATA (emoji));
+    ibus_emoji_data_set_annotations (emoji, NULL);
+    ibus_emoji_data_set_description (emoji, "");
+}
+
+static void
+check_no_trans (IBusEmojiData *emoji,
+                NoTransData   *no_trans_data)
+{
+    const gchar *str = NULL;
+    g_return_if_fail (IBUS_IS_EMOJI_DATA (emoji));
+    if (ibus_emoji_data_get_annotations (emoji) != NULL)
+        return;
+    str = ibus_emoji_data_get_emoji (emoji);
+    if (g_getenv ("IBUS_EMOJI_PARSER_DEBUG") != NULL) {
+        gchar *basename = NULL;
+        if (no_trans_data->xml_file)
+            basename = g_path_get_basename (no_trans_data->xml_file);
+        else if (no_trans_data->xml_derived_file)
+            basename = g_path_get_basename (no_trans_data->xml_derived_file);
+        else
+            basename = g_strdup ("WRONG FILE");
+        g_warning ("Not found emoji %s in the file %s", str, basename);
+        g_free (basename);
+    }
+    no_trans_data->emoji_list =
+            g_slist_append (no_trans_data->emoji_list, g_strdup (str));
+}
+
+int
+strcmp_ibus_emoji_data_str (IBusEmojiData *emoji,
+                            const gchar   *str)
+{
+    g_return_val_if_fail (IBUS_IS_EMOJI_DATA (emoji), -1);
+    return g_strcmp0 (ibus_emoji_data_get_emoji (emoji), str);
+}
+
+static void
+delete_emoji_from_list (const gchar  *str,
+                        GSList      **list)
+{
+    IBusEmojiData *emoji;
+
+    g_return_if_fail (list != NULL);
+    GSList *p = g_slist_find_custom (*list,
+                                     str,
+                                     (GCompareFunc)strcmp_ibus_emoji_data_str);
+    g_return_if_fail (p != NULL);
+    emoji = p->data;
+    *list = g_slist_remove (*list, emoji);
+    g_object_unref (emoji);
+}
+
 static void
 reset_emoji_element (EmojiData *data)
 {
@@ -79,6 +152,13 @@ reset_emoji_element (EmojiData *data)
     g_clear_pointer (&data->description, g_free);
 }
 
+/**
+ * strcmp_novariant:
+ *
+ * Return 0 between non-fully-qualified and fully-qualified emojis.
+ * E.g. U+1F3CC-200D-2642 and U+1F3CC-FE0F-200D-2642-FE0F
+ * in case @a_variant or @b_variant == U+FE0F
+ */
 gint
 strcmp_novariant (const gchar *a,
                   const gchar *b,
@@ -86,40 +166,54 @@ strcmp_novariant (const gchar *a,
                   gunichar     b_variant)
 {
     gint retval;
-    gchar *p = NULL;
     GString *buff = NULL;;
+    gchar *head = NULL;
+    gchar *p;
+    gchar *variant = NULL;
     gchar *substr = NULL;
 
     if (a_variant > 0) {
-        if ((p = g_utf8_strchr (a, -1, a_variant)) != NULL) {
+        if (g_utf8_strchr (a, -1, a_variant) != NULL) {
             buff = g_string_new (NULL);
-            if (a != p) {
-                substr = g_strndup (a, p - a);
-                g_string_append (buff, substr);
-                g_free (substr);
+            p = head = g_strdup (a);
+            while (*p != '\0') {
+                if ((variant = g_utf8_strchr (p, -1, a_variant)) == NULL) {
+                    g_string_append (buff, p);
+                    break;
+                }
+                if (p != variant) {
+                    substr = g_strndup (p, variant - p);
+                    g_string_append (buff, substr);
+                    g_free (substr);
+                }
+                p = g_utf8_next_char (variant);
             }
-            p = g_utf8_next_char (p);
-            if (*p != '\0')
-                g_string_append (buff, p);
             retval = g_strcmp0 (buff->str, b);
             g_string_free (buff, TRUE);
+            g_free (head);
             return retval;
         } else {
             return -1;
         }
     } else if (b_variant > 0) {
-        if ((p = g_utf8_strchr (b, -1, b_variant)) != NULL) {
+        if (g_utf8_strchr (b, -1, b_variant) != NULL) {
             buff = g_string_new (NULL);
-            if (b != p) {
-                substr = g_strndup (b, p - b);
-                g_string_append (buff, substr);
-                g_free (substr);
+            p = head = g_strdup (b);
+            while (*p != '\0') {
+                if ((variant = g_utf8_strchr (p, -1, b_variant)) == NULL) {
+                    g_string_append (buff, p);
+                    break;
+                }
+                if (p != variant) {
+                    substr = g_strndup (p, variant - p);
+                    g_string_append (buff, substr);
+                    g_free (substr);
+                }
+                p = g_utf8_next_char (variant);
             }
-            p = g_utf8_next_char (p);
-            if (*p != '\0')
-                g_string_append (buff, p);
             retval = g_strcmp0 (a, buff->str);
             g_string_free (buff, TRUE);
+            g_free (head);
             return retval;
         } else {
             return -1;
@@ -1117,6 +1211,12 @@ main (int argc, char *argv[])
     GOptionContext *context;
     GError *error = NULL;
     GSList *list = NULL;
+    gboolean is_en = TRUE;
+
+#ifdef HAVE_LOCALE_H
+    /* To output emoji warnings. */
+    setlocale (LC_ALL, "");
+#endif
 
     prgname = g_path_get_basename (argv[0]);
     g_set_prgname (prgname);
@@ -1144,12 +1244,45 @@ main (int argc, char *argv[])
 #endif
     if (emoji_dir)
         unicode_emoji_parse_dir (emoji_dir, &list);
+    if (list) {
+#define CHECK_IS_EN(file) if ((file)) {                                     \
+    gchar *basename = g_path_get_basename ((file));                         \
+    is_en = (g_ascii_strncasecmp (basename, "en.", 3) == 0) ?               \
+            TRUE : FALSE;                                                   \
+    g_free (basename);                                                      \
+}
+
+        CHECK_IS_EN(xml_derived_file);
+        CHECK_IS_EN(xml_file);
+#undef CHECK_IS_EN
+
+        /* Use English emoji-test.txt to get fully-qualified. */
+        if (!is_en)
+            g_slist_foreach (list, (GFunc)init_annotations, NULL);
+    }
     if (xml_file)
         unicode_annotations_parse_xml_file (xml_file, &list, FALSE);
     if (xml_derived_file)
         unicode_annotations_parse_xml_file (xml_derived_file, &list, TRUE);
     if (xml_ascii_file)
         unicode_annotations_parse_xml_file (xml_ascii_file, &list, FALSE);
+    if (list != NULL && !is_en) {
+        /* If emoji-test.txt has an emoji but $lang.xml does not, clear it
+         * since the language dicts do not want English annotations.
+         */
+        NoTransData no_trans_data = {
+            xml_file,
+            xml_derived_file,
+            NULL
+        };
+        g_slist_foreach (list, (GFunc)check_no_trans, &no_trans_data);
+        if (no_trans_data.emoji_list) {
+            g_slist_foreach (no_trans_data.emoji_list,
+                             (GFunc)delete_emoji_from_list,
+                             &list);
+            g_slist_free_full (no_trans_data.emoji_list, g_free);
+        }
+    }
     if (list != NULL && output)
         ibus_emoji_data_save (output, list);
     if (list != NULL && output_category)
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index d2e16c591..3d38c2a9f 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -29,7 +29,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_EMOJI_DATA_MAGIC "IBusEmojiData"
-#define IBUS_EMOJI_DATA_VERSION (4)
+#define IBUS_EMOJI_DATA_VERSION (5)
 
 enum {
     PROP_0 = 0,
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 1d105fd29..95912bf36 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -190,9 +190,6 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private const string EMOJI_CATEGORY_OTHERS = N_("Others");
     private const unichar[] EMOJI_VARIANT_LIST = {
             0x1f3fb, 0x1f3fc, 0x1f3fd, 0x1f3fe, 0x1f3ff, 0x200d };
-    private const GLib.ActionEntry[] m_action_entries = {
-        { "variant", check_action_variant_cb, null, "false", null }
-    };
 
     // Set the actual default values in the constructor
     // because these fields are used for class_init() and static functions,
@@ -253,7 +250,13 @@ class IBusEmojier : Gtk.ApplicationWindow {
             focus_visible : true
         );
 
-        add_action_entries(m_action_entries, this);
+        // GLib.ActionEntry accepts const variables only.
+        var action = new GLib.SimpleAction.stateful(
+                "variant",
+                null,
+                new GLib.Variant.boolean(m_show_emoji_variant));
+        action.activate.connect(check_action_variant_cb);
+        add_action(action);
         if (m_current_lang_id == null)
             m_current_lang_id = "en";
         if (m_emoji_font_family == null)
@@ -521,18 +524,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             m_emoji_to_data_dict.replace(emoji, data);
         } else {
             unowned IBus.EmojiData? en_data = null;
-            // If emoji presentation (+= 0xfe0f) is already saved in dict,
-            // update it instead of no presentation.
-            // emoji-test.txt has all emoji presentations but $lang.xml has
-            // some no emoji presentations.
-            if (emoji.chr(-1, 0xfe0f) == null) {
-                var buff = new GLib.StringBuilder();
-                buff.append(emoji);
-                buff.append_unichar(0xfe0f);
-                en_data = m_emoji_to_data_dict.lookup(buff.str);
-            }
-            if (en_data == null)
-                en_data = m_emoji_to_data_dict.lookup(emoji);
+            en_data = m_emoji_to_data_dict.lookup(emoji);
             if (en_data == null) {
                 m_emoji_to_data_dict.insert(emoji, data);
                 return;
@@ -923,7 +915,12 @@ class IBusEmojier : Gtk.ApplicationWindow {
             m_vbox.add(button);
             button.show_all();
             button.button_press_event.connect((w, e) => {
-                hide_candidate_panel();
+                // Bring back to emoji candidate panel in case
+                // m_show_emoji_variant is enabled and shows variants.
+                if (m_backward_index >= 0 && m_backward != null)
+                    show_emoji_for_category(m_backward);
+                else
+                    hide_candidate_panel();
                 return true;
             });
         }
@@ -1269,6 +1266,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
                                          GLib.Variant?     parameter) {
         m_show_emoji_variant = !action.get_state().get_boolean();
         action.set_state(new GLib.Variant.boolean(m_show_emoji_variant));
+        // Redraw emoji candidate panel for m_show_emoji_variant
+        if (m_candidate_panel_is_visible)
+            show_candidate_panel();
     }
 
 

From 56b5126f09887b41c2cc6cb97bfd72593b60732f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 25 Jul 2017 11:55:08 +0900
Subject: [PATCH 418/816] po: Replace s/annotaions/annotations/

BUG=https://github.com/ibus/ibus/issues/1933
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/323330043
---
 data/ibus.schemas.in    |   4 +-
 po/cs.po                | 410 +++++++++++++--------
 po/da.po                | 776 ++++++++++++++++++++++++++++++----------
 po/de.po                | 402 +++++++++++++--------
 po/es.po                |   6 +-
 po/fr.po                | 348 +++++++++++-------
 po/hu.po                | 404 +++++++++++++--------
 po/ja.po                |   6 +-
 po/nl.po                |   6 +-
 po/pl.po                |   6 +-
 po/pt_BR.po             | 321 +++++++++++------
 po/sv.po                |  84 +++--
 po/uk.po                |   6 +-
 po/zh_TW.po             | 398 ++++++++++++++-------
 ui/gtk3/emojierapp.vala |   2 +-
 15 files changed, 2128 insertions(+), 1051 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 09b6b2c8d..278362d78 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -423,7 +423,7 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-        <short>Whether emoji annotaions can be match partially or not</short>
+        <short>Whether emoji annotations can be match partially or not</short>
 	    <long>Whether emoji annotations can be matched with a partial
                   string instead of the exact match or not.</long>
       </locale>
@@ -435,7 +435,7 @@
       <type>int</type>
       <default>3</default>
       <locale name="C">
-        <short>Match emoji annotaions with the specified length</short>
+        <short>Match emoji annotations with the specified length</short>
 	    <long>Match emoji annotations partially with more than
                   the specified number of characters instead of
                   the exact match.</long>
diff --git a/po/cs.po b/po/cs.po
index dc95a1e8f..0eaabe115 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-19 19:06+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-18 09:54-0400\n"
-"Last-Translator: Josef Hruška <hrusjos@gmail.com>\n"
+"PO-Revision-Date: 2017-05-15 11:19-0400\n"
+"Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
 "Language: cs\n"
 "X-Generator: Zanata 3.9.6\n"
@@ -85,157 +85,133 @@ msgid "Previous input method:"
 msgstr "Předchozí vstupní metoda:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Klávesová zkratka pro vyvolání dialogu emoji"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "Dialog emoji:"
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Klávesové zkratky pro zapnutí a vypnutí vstupní metody"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Povolit či zakázat:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Povolit:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Zakázat:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Klávesové zkratky</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Nastavení orientace kandidátů ve vyhledávací tabulce"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Orientace kandidátů:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Nastavit chování ibusu, co se týče schovávání jazykového panelu"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Zobrazit panel vlastností:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Umístění jazykového panelu:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Zobrazit ikonu v oznamovací oblasti"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Zobrazit v jazykovém panelu vstupní metodu"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 "Pokud je zaškrtnuto, zobrazovat v jazykovém panelu název vstupní metody"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Vkládat předupravený text v okně aplikace"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr "Vkládat předupravený text metody vstupu v okně aplikace"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Použít vlastní písmo:"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Nastavit písmo kandidátů emoji v dialogu emoji"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Font emoji:"
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Nastavit jazyk anotací emoji v dialogu emoji"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "Jazyk anotací emoji:"
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Písmo a styl</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Obecné"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Přidat"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Přidat vybranou vstupní metodu mezi povolené vstupní metody"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Odebrat"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Odebrat vybranou vstupní metodu z povolených vstupních metod"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "_Výše"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu výše"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "_Níže"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Posunout v seznamu povolených vstupních metod vybranou metodu níže"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "O _metodě"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Ukázat podrobnosti o vybrané vstupní metodě"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Ukázat nastavení vybrané vstupní metody"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -245,35 +221,91 @@ msgstr ""
 "za pomoci klávesové zkratky nebo kliknutím na ikonu panelu.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Vstupní metoda"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Klávesová zkratka pro vyvolání dialogu emoji"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Výběr emoji:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Nastavit písmo kandidátů emoji v dialogu emoji"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Font emoji:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Nastavit jazyk anotací emoji v dialogu emoji"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Jazyk anotací emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Částečně odpovídá anotacím emoji s následujícími podmínkami a s více než "
+"počtem znaků:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Pokud se anotace emoji mohou shodovat s částečným řetězcem namísto přesné "
+"shody"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Předpona shody"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Přípona shody"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Obsahuje shodu"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Použít systémové rozložení klávesnice"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Použít systémové rozložení klávesnice (XKB)"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Rozložení klávesnice</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Používat stejnou vstupní metodu pro všechny aplikace"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globální nastavení vstupní metody</b>"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -289,19 +321,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Spustit ibus při přihlášení"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Spouštění</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "O programu"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -563,32 +595,68 @@ msgstr ""
 "oblíbené emoji."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Zda se anotace emoji mohou částečně shodovat nebo ne"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Zda anotace emoji mohou být porovnány s částečným řetězcem namísto přesné "
+"shody nebo ne."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr "Shoda anotací emoji se zadanou délkou"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Částečně odpovídá anotacím emoji s více než zadaným počtem znaků místo "
+"přesné shody."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "Vyberat podmínku částečně odpovídající anotaci emoji"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Zvolte jednu z následujících podmínek, která částečně odpovídá anotaci emoji:"
+" 0 == Předpona shody, 1 == Přípona shody, 2 == Obsahuje shodu"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Vložený přededitovaný text"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Vložený přededitovaný text v okně aplikace"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Použít globální vstupní metodu"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Povolit metodu vstupu ve výchozím nastavení"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Povolit metodu vstupu ve výchozím nastavení, pokud aplikace dostane vstupní "
 "fokus"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "Zachovat jméno prefixu DConf "
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefix kláves DConf pro zastavení konverze jména"
 
@@ -609,12 +677,12 @@ msgid "Select a language"
 msgstr "Vybrat jazyk"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "_Zrušit"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_OK"
 
@@ -687,16 +755,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Stiskněte prosím klávesu (či kombinaci kláves)."
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Použít klávesovou zkratku s posunem k přepnutí na předchozí vstupní metodu"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Démon IBus neběží. Přejete si jej spustit?"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -711,21 +779,53 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Démon IBus nemohl být spuštěn během %d sekund"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vybrat klávesovou zkratku pro %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "přepínání vstupní metody"
 
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Aktivity"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Zvířata & příroda"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Vlajky"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Jídlo & nápoje"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objekty"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Smajlíci & lidé"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symboly"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Cestování & místa"
+
 #: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Vypsat pouze název enginu"
@@ -847,80 +947,134 @@ msgstr "Příkazy:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s je neznámý příkaz!\n"
 
-#: ../ui/gtk3/emojier.vala:276
-msgid "Emoji Choice"
-msgstr ""
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Zobrazit varianty emoji"
 
-#: ../ui/gtk3/emojier.vala:282
-msgid "Type annotation or choose emoji"
-msgstr "Napište anotaci nebo vyberte emoji"
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Nabídka"
 
-#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
+#: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#: ../ui/gtk3/emojier.vala:612
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Ostatní"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Výběr emoji:"
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Napište anotaci nebo vyberte emoji"
+
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "Další strana"
 
-#: ../ui/gtk3/emojier.vala:623
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "Předchozí strana"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Kódový bod: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Obsahuje varianty emoji"
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../ui/gtk3/emojier.vala:797
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "Žádný"
 
-#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
-#, c-format
-msgid "Code point: %s"
-msgstr "Kódový bod: %s"
-
-#: ../ui/gtk3/emojier.vala:822
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotace: %s"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Vybírání emoji zrušeno."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Emoji zkopírováno do schránky."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"PÍSMO\" pro znaky emoji v dialogu emoji."
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "PÍSMO"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"JAZYK\" pro anotace v dialogu emoji. Např. \"cs\""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "JAZYK"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr "Anotace emoji se mohou částečně shodovat"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Odpovídá délce zadaného celku"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Odpovídá podmínce zadaného celku"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:832
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Aktualizace IBus"
 
-#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Klávesa super+mezerník je nyní výchozí klávesovou zkratkou."
 
-#: ../ui/gtk3/panel.vala:1214
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus je inteligentní vstupní sběrnice pro Linux / Unix."
 
-#: ../ui/gtk3/panel.vala:1218
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "Kredit-překladatelům"
 
-#: ../ui/gtk3/panel.vala:1237
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../ui/gtk3/panel.vala:1242
-msgid "Emoji Dialog"
-msgstr "Dialog emoji"
-
-#: ../ui/gtk3/panel.vala:1256
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../ui/gtk3/panel.vala:1260
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -929,33 +1083,3 @@ msgstr "Ukončit"
 #: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "implicitně:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:44
-msgid "Canceled to choose an emoji."
-msgstr "Vybírání emoji zrušeno."
-
-#: ../ui/gtk3/emojierapp.vala:51
-msgid "Copied an emoji to your clipboard."
-msgstr "Emoji zkopírováno do schránky."
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:68
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr "\"PÍSMO\" pro znaky emoji v dialogu emoji."
-
-#: ../ui/gtk3/emojierapp.vala:69
-msgid "FONT"
-msgstr "PÍSMO"
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:74
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"JAZYK\" pro anotace v dialogu emoji. Např. \"cs\""
-
-#: ../ui/gtk3/emojierapp.vala:75
-msgid "LANG"
-msgstr "JAZYK"
diff --git a/po/da.po b/po/da.po
index 3fb0419cd..0a13cd963 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,31 +1,34 @@
 # translation of ibus.pot to Danish
 # Danish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2009,2011
+# scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: kristho <lakristho@gmail.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-07-03 04:29-0400\n"
+"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr "Horisontal"
+msgstr "Vandret"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
-msgstr "Vertikal"
+msgstr "Lodret"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
@@ -49,11 +52,11 @@ msgstr "Brugertilpasset"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Vis ikke"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Skjul automatisk"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -61,7 +64,7 @@ msgstr "Altid"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "Indstillinger for IBus"
+msgstr "IBus-indstillinger"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -69,7 +72,7 @@ msgstr "Genvejstaster for skift til den næste inputmetode i listen"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
-msgstr "Næste inddatametode:"
+msgstr "Næste inputmetode:"
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
@@ -77,13 +80,13 @@ msgstr "Genvejstaster for skift til den forrige inputmetode i listen"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
-msgstr "Forrige inddatametode:"
+msgstr "Forrige inputmetode:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Genvejstasterne for at tænde og slukke inputmetode"
 
@@ -113,21 +116,22 @@ msgstr "Orientering for kandidater:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
+msgstr ""
+"Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Vis egenskabspanel:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Placering af sprogpanel:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
-msgstr "Vis ikon i statusfelt"
+msgstr "Vis ikon i systembakke"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Vis navn på inputmetode i sprogpanel"
 
@@ -156,7 +160,8 @@ msgid "General"
 msgstr "Generelt"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Tilføj"
 
@@ -210,37 +215,96 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>Den aktive inputmetode kan skiftes til en anden i listen ovenfor, "
+"ved at trykke på tastaturgenvejene eller ved at klikke på panelikonet.</i></"
+"small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Inputmetode"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Genvejstasten til at vise emoji-dialogen"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Valg af emoji:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Sæt en skrifttype af emoji-kandidater i emoji-dialogen"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emoji-skrifttype:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Sæt et sprog af emoji-kandidater i emoji-dialogen"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Emoji annoteringssprog:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Match emoji-annoteringer delvist med følgende betingelse og flere end "
+"antallet af tegn:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Hvorvidt emoji-annonteringer kan matches med en delvis streng i stedet for "
+"det præcise match"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Præfiks match"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Suffiks match"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Indeholdende match"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
-msgstr "Brug tastaturlayout for system"
+msgstr "Brug systemets tastaturlayout"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
-msgstr "Brug systemttastaturlayout (XKB)"
+msgstr "Brug systemets tastaturlayout (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturlayout</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Del den samme inputmetode i alle programmer"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Indstillinger for global inputmetode</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -248,446 +312,772 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Den intelligente inddatabus</small>\nNetsted: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligente inputbus</small>\n"
+"Hjemmeside: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
-msgstr "Start ibus ved logind"
+msgstr "Start ibus ved login"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Opstart</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Om"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Forindlæs motorer"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Forindlæs motorer under opstarten af IBus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
-msgstr ""
+msgstr "Rækkefølge for motorer"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Gemte rækkefølge på motorer i inputmetodeliste"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "Pop op-forsinkelse i millisekunder for IME-skifter-vindue"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
 msgstr ""
+"Sæt pop op-forsinkelse millisekunder som IME-skifter-vindue skal vises. "
+"Standarden er 400. 0 = Vis vinduet med det samme. 0 &lt; Forsinkelse "
+"millisekunder. 0 &gt; Vis ikke vinduet og skift til forrige/næste motorer."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "Gemt versionsnummer"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
+"Det gemte versionnummer vil blive brugt til at tjekke forskellen mellem "
+"versionen af den tidligere installerede ibus og en af den nuværende ibus."
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr "Latinske layout som ikke har nogen ASCII"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgstr "US-layout tilføjes til de latinske layouts. Variant kan udelades."
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr "Brug xmodmap"
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+"Kør xmodmap hvis .xmodmap eller .Xmodmap findes når der skiftes ibus-motorer."
+""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
-msgstr "Udløser tastaturgenveje"
+msgstr "Udløs tastaturgenveje"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Udløs tastaturgenveje for gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "Aktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Genvejstasterne for at tænde inputmetode"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Deaktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Genvejstasterne for slukning af inputmetode"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Genvejstaster for næste motor"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 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:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Genvejstaster for forrige motor"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Genvejstasterne for at skifte til forrige inputmetode"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Skjul automatisk"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Opførsel for egenskabspanelt. 0 = Vis ikke, 1 = Skjul automatisk, 2 = Vis "
+"altid"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Placering for sprogpanel"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Følg inputmarkøren hvis panelet altid vises"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Hvis sand, følger panelet inputmarkøren hvis panelet altid vises. Hvis "
+"falsk, vises panelet på en fastsat placering."
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Millisekunder som egenskabspanelet skal vises i"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Millisekunderne som egenskabspanelet skal vises i efter fokus-ind eller "
+"egenskaber ændres."
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientering af opslagstabel"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Vis navn på inputmetode"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr "RGBA-værdi for XKB-ikon"
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+"XKB-ikon viser layoutstrengen og strengen gengives med RGBA-værdien. RGBA-"
+"værdien kan være 1. Et farvenavn fra X11, 2. En heksadecimalværdi i formatet "
+"'#rrggbb' hvor 'r', 'g' og 'b' er heksadecimale cifre af den røde, grønne og "
+"blå, 3. En RGB-farve i formatet 'rgb(r,g,b)' eller 4. En RGBA-farve i "
+"formatet 'rgba(r,g,b,a)' hvor 'r', 'g', og 'b' enten er heltal fra 0 til 255 "
+"eller procentværdier fra 0% til 100%, og 'a' hvis det er en kommatalværdi "
+"fra 0 til 1 af alfaen."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "Millisekunder som panelikonet for en egenskab skal vises i"
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+"Millisekunder som panelikonet vises fra motorikonet til et egenskabsikon når "
+"motorer skiftes hvis egenskaben er angivet af værdien af icon-prop-key i "
+"IBusEngineDesc. Hvis værdien er 0, er der ingen forsinkelsestid og "
+"egenskabsikonet vises med det samme."
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Brug tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Brugertilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "Emoji-genvejstaster for gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "Genvejstasterne til at slå emoji-indtastning til eller fra"
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji chracters on emoji dialog"
+msgstr "Tilpasset skrifttypenavn for emoji-tegn i emoji-dialog"
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr "Standardsprog for emojiordbog"
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Vælg et standardsprog af emoji-ordbøger i emoji-dialogen. Værdien $lang "
+"anvendes på /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "Farvorit emojiliste i emoji-dialog"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+"Du kan vise farvorit emojierne i emojiliste hvis denne liste har nogen tegn."
+
+#: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Hvorvidt emoji-annoteringer kan matches delvist eller ej"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Hvorvidt emoji-annoteringer kan matches med en delvis streng i stedet for "
+"det præcise match eller ej."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr "Match emoji-annoteringer med den angivne længde"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Match emoji-annoteringer delvist med flere end det angivne antal tegn i "
+"stedet for det præcise match."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr "Vælg en betingelse til delvist at matche emoji-annonteringer"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 ="
+"= Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Indbyg forudredigeret tekst"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Aktivér inputmetode som standard"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
-msgstr "Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
+msgstr ""
+"Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf bevar navnepræfiks"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "Præfiks af DConf-taster til stop af navnekonvertering"
 
 #: ../ibus/_config.py.in:41
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Andre"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Vælg et sprog"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_O.k."
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mere…"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Sprog: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturlayout: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Forfatter: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Beskrivelse:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
-msgstr "Vælg en inddatametode"
+msgstr "Vælg en inputmetode"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "Angiv indstillinger for IBus"
+msgstr "Angiv IBus-indstillinger"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Tastaturgenveje"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Nøglekode:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Kombinationstaster:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Anvend"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Slet"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Tryk venligst på en tast (eller en tastekombination)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Annullér"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_O.k."
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
+msgstr "Brug genvej med skift for at skifte til forrige inputmetode"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "IBus-dæmonen kører. Vil du starte den?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:528
 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, så tilføj følgende "
+"linjer til din $HOME/.bashrc; og så log ind på dit skrivebord igen.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus-dæmon kunne ikke startes på %d sekunder"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vælg tastaturgenveje til %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:556
 msgid "switching input methods"
-msgstr ""
+msgstr "skifter inputmetoder"
+
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Aktiviteter"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Dyr og natur"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Flag"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Mad og drikke"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objekter"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Smileyer og mennesker"
 
-#: ../tools/main.vala:42
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symboler"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Rejse og steder"
+
+#: ../tools/main.vala:51
 msgid "List engine name only"
-msgstr ""
+msgstr "Vis kun motornavn"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "Kan ikke oprette forbindelse til IBus.\n"
 
-#: ../tools/main.vala:84
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "sprog: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "Ingen motor er sat.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "Sætning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "Hentning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:204
+#: ../tools/main.vala:213
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Læs systemets registreringsmellemlager."
 
-#: ../tools/main.vala:206
+#: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Læs den registreringsmellemlageret FIL."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "Registreringsmellemlageret er ugyldigt.\n"
 
-#: ../tools/main.vala:244
+#: ../tools/main.vala:253
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Skriv systemets registreringsmellemlager."
 
-#: ../tools/main.vala:246
+#: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Skriv den registreringsmellemlageret FIL."
+
+#: ../tools/main.vala:307
+msgid "Resetting…"
+msgstr "Nulstiller…"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:321
+msgid "Done"
+msgstr "Færdig"
+
+#: ../tools/main.vala:366
 msgid "Set or get engine"
-msgstr ""
+msgstr "Sæt eller hent motor"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Forlad ibus-daemon"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:368
 msgid "Show available engines"
-msgstr ""
+msgstr "Vis tilgængelige motorer"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:369
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(ikke implementeret)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Genstart ibus-daemon"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:371
 msgid "Show version"
-msgstr ""
+msgstr "Vis version"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:372
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Vis indholdet af registreringsmellemlager"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:373
 msgid "Create registry cache"
-msgstr ""
+msgstr "Opret registreringsmellemlager"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Print D-Bus-adressen af ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show the configuration values"
+msgstr "Vis konfigurationsværdierne"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:376
+msgid "Reset the configuration values"
+msgstr "Nulstil konfigurationsværdierne"
+
+#: ../tools/main.vala:378
+msgid "Save emoji on dialog to clipboard "
+msgstr "Gem emoji i dialog til udklipsholder "
+
+#: ../tools/main.vala:380
 msgid "Show this information"
-msgstr ""
+msgstr "Vis denne information"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:386
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
 "\n"
-msgstr ""
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:387
 msgid "Commands:\n"
-msgstr ""
+msgstr "Kommandoer:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s er ukendt kommando!\n"
+
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Vis emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Farvoritter"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Andre"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr "Valg af emoji"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Skriv annotering eller vælg emoji"
+
+#: ../ui/gtk3/emojier.vala:752
+msgid "Page Down"
+msgstr "Page Down"
+
+#: ../ui/gtk3/emojier.vala:763
+msgid "Page Up"
+msgstr "Page Up"
+
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Kodepunkt: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Har emoji-varianter"
+
+#. TODO: Provide a custom description and annotation for
+#. the favorite emojis.
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../ui/gtk3/emojier.vala:995
+msgid "None"
+msgstr "Ingen"
+
+#: ../ui/gtk3/emojier.vala:1015
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annoteringer: %s"
+
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Annulleret for at vælge en emoji."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Kopierede en emoji til dit skrivebord."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "SKRIFTTYPE"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr "SPROG"
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr "Emoji-annoteringer kan matches delvist"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Match med længen af det angive heltal"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Match med betingelsen af det angive heltal"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+msgid "IBus Panel"
+msgstr "IBus-panel"
+
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
-msgstr ""
+msgstr "IBus-opdatering"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Super+mellemrum er nu standardhotkeyen."
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus er en intelligent inddatabus til Linux/Unix."
+msgstr "IBus er en intelligent inputbus til Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
-msgstr "Kris Thomsen\n\nDansk-gruppen <dansk@dansk-gruppen.dk>\nMere info: http://www.dansk-gruppen.dk"
+msgstr ""
+"Kris Thomsen\n"
+"\n"
+"Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
+"Mere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Afslut"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/de.po b/po/de.po
index 4823ff38e..82d83e497 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,19 +12,21 @@
 # Rainer <rgromans@redhat.com>, 2013
 # Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
-# Florian Heiser <postfuerflo@gmail.com>, 2016. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# Florian H. <postfuerflo@gmail.com>, 2016. #zanata
+# Roman Spirgi <rspirgi@gmail.com>, 2017. #zanata
 # Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
 # Tobias Weise <tobias.weise@web.de>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-17 04:50-0400\n"
-"Last-Translator: Tobias Weise <tobias.weise@web.de>\n"
+"PO-Revision-Date: 2017-05-21 05:49-0400\n"
+"Last-Translator: Roman Spirgi <rspirgi@gmail.com>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -93,168 +95,144 @@ msgid "Previous input method:"
 msgstr "Vorherige Eingabemethode:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "Emoji-Dialog."
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Aktivieren oder deaktivieren:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Aktivieren:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Deaktivieren:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Tastenkombinationen</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Ausrichtung der Kandidaten:"
 
-#: ../setup/setup.ui.h:26
+#: ../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"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Zeige Einstellungsleiste:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
-#: ../setup/setup.ui.h:31
+#: ../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"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Benutzerdefinierte Schriftart verwenden:"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Font von Emoji-Kandidaten im Emoji-Dialog einstellen"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Emoji Font:"
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Einstellen einer Sprache für Emoji-Annotationen im Emoji-Dialog"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "Emoji-Annotationssprache:"
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Schriftart und Stil</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Allgemein"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden "
 "hinzu"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 "Entfernen Sie die gewählte Eingabemethode aus den aktivierten "
 "Eingabemethoden"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "_Hoch"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "_Runter"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "_Info"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Informationen zur gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -265,35 +243,87 @@ msgstr ""
 "small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Emoji-Auswahl:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Font von Emoji-Kandidaten im Emoji-Dialog einstellen"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emoji Font:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Einstellen einer Sprache für Emoji-Annotationen im Emoji-Dialog"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Emoji-Annotationssprache:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -309,19 +339,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "IBus bei der Anmeldung starten"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Starten</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Info"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -581,32 +611,62 @@ msgstr ""
 "Liste Zeichen enthält."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 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:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -624,15 +684,15 @@ msgstr "Sonstige"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "Eine Sprache auswählen"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_OK"
 
@@ -705,17 +765,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 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:412
+#: ../setup/main.py:507
 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:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -731,21 +791,53 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, 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:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "Eingabemethoden wechseln"
 
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Aktivitäten"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Tiere & Natur"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Flaggen"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Essen & Trinken"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objekte"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Smileys & Leute"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Symbole"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Reisen & Orte"
+
 #: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Nur Engine-Name auflisten"
@@ -868,78 +960,136 @@ msgstr "Befehle:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
-msgid "Emoji Dialog"
-msgstr "Emoji-Dialog"
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Emoji-Varianten anzeigen"
 
-#: ../ui/gtk3/emojier.vala:293
-msgid "Type annotation or choose emoji"
-msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menü"
 
-#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+#: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: ../ui/gtk3/emojier.vala:628
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Andere"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "Seite runter"
 
-#: ../ui/gtk3/emojier.vala:639
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "Seite hoch"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr ""
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../ui/gtk3/emojier.vala:813
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "Kein"
 
-#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
-#, c-format
-msgid "Code point: %s"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:838
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationen: %s"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "Abbrechen der Emoji-Auswahl."
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "Emoji in die Zwischenablage kopiert."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr "SCHRIFT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "IBus Panel"
 
-#: ../ui/gtk3/panel.vala:823
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "IBus Aktualisierung"
 
-#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
 
-#: ../ui/gtk3/panel.vala:1196
+#: ../ui/gtk3/panel.vala:1236
 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:1200
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:1219
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/gtk3/panel.vala:1238
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Beenden"
 
@@ -948,33 +1098,3 @@ msgstr "Beenden"
 #: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:45
-msgid "Canceled to choose an emoji."
-msgstr "Abbrechen der Emoji-Auswahl."
-
-#: ../ui/gtk3/emojierapp.vala:52
-msgid "Copied an emoji to your clipboard."
-msgstr "Emoji in die Zwischenablage kopiert."
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:82
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:83
-msgid "FONT"
-msgstr ""
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:88
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:89
-msgid "LANG"
-msgstr ""
diff --git a/po/es.po b/po/es.po
index 0860fe52c..717037e15 100644
--- a/po/es.po
+++ b/po/es.po
@@ -629,7 +629,7 @@ msgstr ""
 "esta lista."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
+msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
 
@@ -642,7 +642,7 @@ msgstr ""
 "de emoji en lugar de una exacta."
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
+msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
 "indicada"
@@ -1075,7 +1075,7 @@ msgid "LANG"
 msgstr "IDIOMA"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
+msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
 #: ../ui/gtk3/emojierapp.vala:87
diff --git a/po/fr.po b/po/fr.po
index 39915e7bc..cdd7c2a27 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # French translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,6 +10,7 @@
 # Julien Humbert <julroy67@gmail.com>, 2009-2014
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
 # Julien Humbert <julroy67@gmail.com>, 2009-2015
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
 # Edouard Duliege <edouard.duliege@gmail.com>, 2017. #zanata
@@ -20,12 +21,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-27 12:38+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-20 02:40-0400\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2017-07-22 06:35-0400\n"
+"Last-Translator: José Fournier <jaaf64@zoraldia.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -94,167 +95,142 @@ msgid "Previous input method:"
 msgstr "Méthode d’entrée précédente :"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Les raccourcis pour afficher la boite de dialogue des émoticônes"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji choice:"
-msgstr ""
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Raccourcis claviers pour activer ou désactiver les méthodes d’entrées"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Activer / désactiver :"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Activer :"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Désactiver :"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Raccourcis clavier</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Permet de choisir l’orientation de la liste des candidats"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Orientation de la liste des candidats :"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "Permet de choisir l’affichage de la barre de langues d’ibus"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Afficher le panneau de propriétés :"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Afficher la barre de langues :"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Afficher l’icône dans la boîte à miniatures"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Afficher le nom de la méthode d’entrée sur la barre de langues"
 
-#: ../setup/setup.ui.h:31
+#: ../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"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Insérer le texte en cours d’édition dans la fenêtre de l’application"
 
-#: ../setup/setup.ui.h:33
+#: ../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"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Police des émoticônes :"
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-"Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "Langue d’annotations des émoticônes :"
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Police et Style</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Général"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "_Monter"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "_Descendre"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "À _propos"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Afficher les informations de la méthode d’entrée sélectionnée"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Afficher le paramétrage de la méthode d’entrée sélectectionnée"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -265,35 +241,92 @@ msgstr ""
 "clavier ou en cliquant sur l’icône du panneau.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Méthode d’entrée"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Les raccourcis pour afficher la boite de dialogue des émoticônes"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Choix d’émoticônes :"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Police des émoticônes :"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+"Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Langue d’annotations des émoticônes :"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Correspondances partielles d’annotations des émoticônes ayant les conditions "
+"suivantes et plus que le nombre de caractères  :"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Si les annotations peuvent correspondre à une chaîne partielle plutôt qu’une "
+"correspondance exacte"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Correspondance de préfixe"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Correspondance de suffixe"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Correspondance de contenu"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Émoticône"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 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:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -309,19 +342,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Démarrer IBus lors de la connexion"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "À propos"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -594,32 +627,71 @@ msgstr ""
 "si celle-ci contient des caractères."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+"Si les annotations d’émoticônes peuvent correspondre partiellement ou non"
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
+"partielle plutôt qu’à la chaîne complète"
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr "Correspondance d’annotations d’émoticônes ayant la longueur spécifiée"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Correspondances partielles avec plus que le nombre de caractères spécifié "
+"plutôt qu'une correspondance exacte."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+"Choisir une condition de correspondance partielle d'annotations d'émoticônes"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+"Choisissez une des conditions suivantes pour pour la correspondance "
+"partielle d'annotations d'émoticônes : 0 == correspondance de préfixe, 1 == "
+"correspondance de suffixe, 2 == correspondance de contenu"
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d’édition"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 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:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Utiliser la méthode d’éntrée globale"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d’entrée"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 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"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -640,12 +712,12 @@ msgid "Select a language"
 msgstr "Sélectionner la langue"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "A_nnuler"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_Valider"
 
@@ -718,16 +790,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 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"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 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:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -743,52 +815,52 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, 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:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Sélection du raccourci clavier pour %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "Changement de méthode d’entrée"
 
 #: ../src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "Activités"
 
 #: ../src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "Animaux & nature"
 
 #: ../src/ibusemojigen.h:32
 msgid "Flags"
-msgstr ""
+msgstr "Drapeaux"
 
 #: ../src/ibusemojigen.h:33
 msgid "Food & Drink"
-msgstr ""
+msgstr "Nourriture & boisson"
 
 #: ../src/ibusemojigen.h:34
 msgid "Objects"
-msgstr ""
+msgstr "Objets"
 
 #: ../src/ibusemojigen.h:35
 msgid "Smileys & People"
-msgstr ""
+msgstr "Frimousses & personnes"
 
 #: ../src/ibusemojigen.h:36
 msgid "Symbols"
-msgstr ""
+msgstr "Symboles"
 
 #: ../src/ibusemojigen.h:37
 msgid "Travel & Places"
-msgstr ""
+msgstr "Voyages & lieux"
 
 #: ../tools/main.vala:51
 msgid "List engine name only"
@@ -912,111 +984,135 @@ msgid "%s is unknown command!\n"
 msgstr "%s n’est pas une commande connue !\n"
 
 #: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Montrer les variantes d’émoticônes"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Favoris"
+
+#: ../ui/gtk3/emojier.vala:190
 msgid "Others"
-msgstr ""
+msgstr "Autres"
 
-#: ../ui/gtk3/emojier.vala:284 ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
 msgid "Emoji Choice"
-msgstr ""
+msgstr "Choix d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:290
+#: ../ui/gtk3/emojier.vala:330
 msgid "Type annotation or choose emoji"
 msgstr "Saisir une annotation ou choisir une émoticône"
 
-#: ../ui/gtk3/emojier.vala:595 ../ui/gtk3/emojier.vala:642
-msgid "Favorites"
-msgstr "Favoris"
-
-#: ../ui/gtk3/emojier.vala:667
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ../ui/gtk3/emojier.vala:678
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "Page précédente"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Point de code : %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "A des variantes d’émoticônes"
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:849 ../ui/gtk3/emojier.vala:863
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../ui/gtk3/emojier.vala:849
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "Aucune"
 
-#: ../ui/gtk3/emojier.vala:854 ../ui/gtk3/emojier.vala:893
-#, c-format
-msgid "Code point: %s"
-msgstr "Point de code : %s"
-
-#: ../ui/gtk3/emojier.vala:874
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ../ui/gtk3/emojierapp.vala:44
+#: ../ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ../ui/gtk3/emojierapp.vala:51
+#: ../ui/gtk3/emojierapp.vala:54
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:71
+#: ../ui/gtk3/emojierapp.vala:74
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue."
 
-#: ../ui/gtk3/emojierapp.vala:72
+#: ../ui/gtk3/emojierapp.vala:75
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:80
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ../ui/gtk3/emojierapp.vala:78
+#: ../ui/gtk3/emojierapp.vala:81
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr "Faire correspondre avec la longueur de l’entier indiqué"
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr "Faire correspondre avec la condition de l’entier indiqué"
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ../ui/gtk3/panel.vala:832
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:1214
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1218
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1237
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1256
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1260
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Quitter"
 
diff --git a/po/hu.po b/po/hu.po
index 05b1ae49e..4ffa23c76 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,17 +8,19 @@
 # kelemeng <kelemeng@gnome.hu>, 2011
 # Sulyok Péter <peti@fedoraproject.org>, 2009
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
+# Norbert Makula <iamreallynotapokemon@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-07 11:31-0400\n"
-"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
+"PO-Revision-Date: 2017-07-17 04:15-0400\n"
+"Last-Translator: Norbert Makula <iamreallynotapokemon@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -85,164 +87,140 @@ msgid "Previous input method:"
 msgstr "Előző beviteli mód:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Az emodzsi párbeszédablak gyorsbillentyűje"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "Emodzsi párbeszédablak:"
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Engedélyezés vagy tiltás:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Engedélyezés:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Letiltás:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Gyorsbillentyűk</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Jelöltek tájolásának beállítása a keresési táblában"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Jelöltek tájolása:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Tulajdonságpanel megjelenítése:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "A nyelvi panel elhelyezése:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Ikon megjelenítése az értesítési területen"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazás ablakába"
 
-#: ../setup/setup.ui.h:33
+#: ../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"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Egyéni betűkészlet használata:"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr ""
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr ""
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Betűkészlet és stílus</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Általános"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 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"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "_Fel"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "_Le"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Információk megjelenítése a kiválasztott beviteli módról"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "B_eállítások"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -250,35 +228,88 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Beviteli mód"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Az emodzsi párbeszédablak gyorsbillentyűje"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Emodzsi választás:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+"Emodzsi jelöltekből álló betűkészlet beállítása az emodzsi párbeszédablakon"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emodzsi betűkészlet:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Emodzsi annotációk nyelvének beállítása az emodzsi párbeszédablakon"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Emodzsi annotációk nyelve:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Előtag illeszkedés"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Utótag illeszkedés"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Tartalmazó illeszkedés"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emodzsi"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Rendszer-billentyűzetkiosztás használata"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globális bevitelimód-beállítások</b>"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Speciális"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -294,19 +325,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Az IBus indítása bejelentkezéskor"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Névjegy"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -345,7 +376,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "Mentett verziószám"
 
 #: ../data/ibus.schemas.in.h:10
 msgid ""
@@ -362,8 +393,9 @@ msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
+#, fuzzy
 msgid "Use xmodmap"
-msgstr ""
+msgstr "Xmodmap használata"
 
 #: ../data/ibus.schemas.in.h:14
 msgid ""
@@ -467,7 +499,7 @@ msgstr "Beviteli mód megjelenítése"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "RGBA értéke a XKB ikonnak"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -523,7 +555,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:53
 msgid "Default language for emoji dictionary"
-msgstr ""
+msgstr "Alapértelmezett nyelv az emoji könyvtárhoz"
 
 #: ../data/ibus.schemas.in.h:54
 msgid ""
@@ -542,32 +574,62 @@ msgid ""
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 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"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf megtartja a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
 
@@ -588,12 +650,12 @@ msgid "Select a language"
 msgstr ""
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "Mé_gse"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_OK"
 
@@ -666,17 +728,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 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"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Az IBus daemon nem működik. El kívánja indítani?"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -691,21 +753,53 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus daemon nem indítható %d mp belül."
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "beviteli módok váltása"
 
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
+
 #: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevét listázza"
@@ -827,64 +921,122 @@ msgstr "Parancsok:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s ismeretlen parancs!\n"
 
-#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
-msgid "Emoji Dialog"
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:293
-msgid "Type annotation or choose emoji"
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+#: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:628
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:639
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr ""
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr ""
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:813
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
-msgid "Code point: %s"
+msgid "Annotations: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:838
-#, c-format
-msgid "Annotations: %s"
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:823
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:1196
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
 
-#: ../ui/gtk3/panel.vala:1200
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr ""
 "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 2012.\n"
@@ -897,15 +1049,15 @@ msgstr ""
 "  Token https://launchpad.net/~kozmad\n"
 "  fergekolferol https://launchpad.net/~ferge-kolferol"
 
-#: ../ui/gtk3/panel.vala:1219
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:1238
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -914,33 +1066,3 @@ msgstr "Kilépés"
 #: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:45
-msgid "Canceled to choose an emoji."
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:52
-msgid "Copied an emoji to your clipboard."
-msgstr ""
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:82
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:83
-msgid "FONT"
-msgstr ""
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:88
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:89
-msgid "LANG"
-msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 8401680c7..f0b99566b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -576,7 +576,7 @@ msgid ""
 msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
+msgid "Whether emoji annotations can be match partially or not"
 msgstr "絵文字ルビを部分一致させることを可能にするか否か"
 
 #: ../data/ibus.schemas.in.h:58
@@ -586,7 +586,7 @@ msgid ""
 msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
+msgid "Match emoji annotations with the specified length"
 msgstr "指定した長さで絵文字ルビを一致させる"
 
 #: ../data/ibus.schemas.in.h:60
@@ -1006,7 +1006,7 @@ msgid "LANG"
 msgstr "言語"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
+msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
 #: ../ui/gtk3/emojierapp.vala:87
diff --git a/po/nl.po b/po/nl.po
index 0260f37d0..13914ebe8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -613,7 +613,7 @@ msgstr ""
 "heeft."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
+msgid "Whether emoji annotations can be match partially or not"
 msgstr "Worden emoji annotaties wel of niet gedeeltelijk gematched"
 
 #: ../data/ibus.schemas.in.h:58
@@ -625,7 +625,7 @@ msgstr ""
 "in plaats van de exacte match."
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
+msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji annotaties met de gespecificeerde lengte"
 
 #: ../data/ibus.schemas.in.h:60
@@ -1053,7 +1053,7 @@ msgid "LANG"
 msgstr "TAAL"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
+msgid "Emoji annotations can be match partially"
 msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
 
 #: ../ui/gtk3/emojierapp.vala:87
diff --git a/po/pl.po b/po/pl.po
index 3bba7283e..923e59a3c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -608,7 +608,7 @@ msgid ""
 msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
+msgid "Whether emoji annotations can be match partially or not"
 msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
 
 #: ../data/ibus.schemas.in.h:58
@@ -620,7 +620,7 @@ msgstr ""
 "z dokładnym dopasowaniem."
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
+msgid "Match emoji annotations with the specified length"
 msgstr "Dopasowywanie uwag emoji o podanej długości"
 
 #: ../data/ibus.schemas.in.h:60
@@ -1048,7 +1048,7 @@ msgid "LANG"
 msgstr "JĘZYK"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
+msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
 #: ../ui/gtk3/emojierapp.vala:87
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e7eea05b3..d5633cf29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,16 +12,17 @@
 # Daniel Lara <danniel@fedoraproject.org>, 2016. #zanata
 # Frederico Henrique Gonçalves Lima <fred@fredericolima.com.br>, 2017. #zanata
 # Jonathan Muttini Topanotti <jontopanotti@gmail.com>, 2017. #zanata
+# Mateus de Melo Santos <mateusms@tutanota.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-27 12:38+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-19 09:33-0400\n"
-"Last-Translator: Jonathan Muttini Topanotti <jontopanotti@gmail.com>\n"
+"PO-Revision-Date: 2017-06-09 04:32-0400\n"
+"Last-Translator: Mateus de Melo Santos <mateusms@tutanota.com>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -90,168 +91,144 @@ msgid "Previous input method:"
 msgstr "Método de entrada anterior:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "A tecla de atalho para exibição do diálogo emoji"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji choice:"
-msgstr "Escolha do emoji"
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Ativa ou desativa:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Habilitar:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Desabilitar:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Atalhos do Teclado</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Configure a orientação dos candidatos na tabela de observação"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Orientação dos candidatos:"
 
-#: ../setup/setup.ui.h:26
+#: ../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"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Mostrar painel de propriedades:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posição do Painel de Idioma:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Apresenta um ícone na bandeja do sistema"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Apresenta o nome do método de entrada na barra de idioma"
 
-#: ../setup/setup.ui.h:31
+#: ../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"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Embutir texto de pré-edição na janela do aplicativo "
 
-#: ../setup/setup.ui.h:33
+#: ../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"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Usa a fonte padrão:"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Defina uma fonte de candidatos emoji no diálogo emoji"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Fonte do emoji"
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Defina um idioma de anotações emoji no diálogo emoji"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "Idioma de anotação de emoji:"
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Fonte e Estilo</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Geral"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 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"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 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"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "A_cima"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 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"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "A_baixo"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 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"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Apresente a informação do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostrar configuração do método de entrada selecionado"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -262,35 +239,87 @@ msgstr ""
 "ícone do painel.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Método de Entrada"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "A tecla de atalho para exibição do diálogo emoji"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Escolha do emoji"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Defina uma fonte de candidatos emoji no diálogo emoji"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Fonte do emoji"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Defina um idioma de anotações emoji no diálogo emoji"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Idioma de anotação de emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usa o desenho do teclado do sistema"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa o desenho do teclado do sistema (XKB)"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configurações de Método de Entrada Global</b> "
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -306,19 +335,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Inicie o ibus na conexão "
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "Sobre"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -582,32 +611,62 @@ msgstr ""
 "algum caractere."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 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"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -628,12 +687,12 @@ msgid "Select a language"
 msgstr "Selecione uma língua"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_OK"
 
@@ -706,17 +765,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 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"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -732,24 +791,24 @@ msgstr ""
 "exportar QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecione o atalho do teclado para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "mudando métodos de entrada"
 
 #: ../src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "Atividades"
 
 #: ../src/ibusemojigen.h:31
 msgid "Animals & Nature"
@@ -757,7 +816,7 @@ msgstr ""
 
 #: ../src/ibusemojigen.h:32
 msgid "Flags"
-msgstr ""
+msgstr "Bandeiras"
 
 #: ../src/ibusemojigen.h:33
 msgid "Food & Drink"
@@ -765,7 +824,7 @@ msgstr ""
 
 #: ../src/ibusemojigen.h:34
 msgid "Objects"
-msgstr ""
+msgstr "Objetos"
 
 #: ../src/ibusemojigen.h:35
 msgid "Smileys & People"
@@ -773,7 +832,7 @@ msgstr ""
 
 #: ../src/ibusemojigen.h:36
 msgid "Symbols"
-msgstr ""
+msgstr "Símbolos"
 
 #: ../src/ibusemojigen.h:37
 msgid "Travel & Places"
@@ -901,109 +960,133 @@ msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
 #: ../ui/gtk3/emojier.vala:170
-msgid "Others"
+msgid "Show emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:284 ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr "Outros"
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
 msgid "Emoji Choice"
 msgstr "Escolha do emoji"
 
-#: ../ui/gtk3/emojier.vala:290
+#: ../ui/gtk3/emojier.vala:330
 msgid "Type annotation or choose emoji"
 msgstr "Digite a anotação ou escolha o emoji"
 
-#: ../ui/gtk3/emojier.vala:595 ../ui/gtk3/emojier.vala:642
-msgid "Favorites"
-msgstr "Favoritos"
-
-#: ../ui/gtk3/emojier.vala:667
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:678
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "Page Up"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Ponto de código: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr ""
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:849 ../ui/gtk3/emojier.vala:863
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../ui/gtk3/emojier.vala:849
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "Nenhum"
 
-#: ../ui/gtk3/emojier.vala:854 ../ui/gtk3/emojier.vala:893
-#, c-format
-msgid "Code point: %s"
-msgstr "Ponto de código: %s"
-
-#: ../ui/gtk3/emojier.vala:874
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotações: %s"
 
-#: ../ui/gtk3/emojierapp.vala:44
+#: ../ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Escolha de um emoji cancelada."
 
-#: ../ui/gtk3/emojierapp.vala:51
+#: ../ui/gtk3/emojierapp.vala:54
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji copiado para a sua área de transferência."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:71
+#: ../ui/gtk3/emojierapp.vala:74
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "\"FONT\" para caracteres  no diálogo emoji"
 
-#: ../ui/gtk3/emojierapp.vala:72
+#: ../ui/gtk3/emojierapp.vala:75
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:80
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"LANG\" para anotações em diálogo emoji. V.g. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:78
+#: ../ui/gtk3/emojierapp.vala:81
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "Painel IBus"
 
-#: ../ui/gtk3/panel.vala:832
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "Atualização IBus"
 
-#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "Super + espaço agora são as teclas de atalho padrão."
 
-#: ../ui/gtk3/panel.vala:1214
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1218
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:1237
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:1256
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:1260
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "Sair"
 
diff --git a/po/sv.po b/po/sv.po
index 72225bc07..a29ff1859 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-01 17:26+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-28 04:21-0400\n"
+"PO-Revision-Date: 2017-06-02 04:07-0400\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -256,28 +256,32 @@ msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
+"Matcha emoji-annotationer partiellt med följande villkor och mer än antalet "
+"tecken:"
 
 #: ../setup/setup.ui.h:56
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
+"Om emoji-annotationer kan matchas med en partiell sträng istället för en "
+"exakt matchning"
 
 #: ../setup/setup.ui.h:57
 msgid "Prefix match"
-msgstr ""
+msgstr "Prefixmatchning"
 
 #: ../setup/setup.ui.h:58
 msgid "Suffix match"
-msgstr ""
+msgstr "Suffixmatchning"
 
 #: ../setup/setup.ui.h:59
 msgid "Containing match"
-msgstr ""
+msgstr "Innehållsmatchning"
 
 #: ../setup/setup.ui.h:60
 msgid "Emoji"
-msgstr ""
+msgstr "Emoji"
 
 #: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
@@ -590,34 +594,40 @@ msgstr ""
 "tecken."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
-msgstr ""
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Huruvida emoji-annotationer kan matchas partiellt eller inte"
 
 #: ../data/ibus.schemas.in.h:58
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
+"Huruvida emoji-annotationer kan matchas med en partiell sträng istället för "
+"den exakta matchningen eller inte."
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
-msgstr ""
+msgid "Match emoji annotations with the specified length"
+msgstr "Matcha emoji-annotationer med den angivna längden"
 
 #: ../data/ibus.schemas.in.h:60
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
+"Matcha emoji-annotationer partiellt med mer än det angivna antalet tecken "
+"istället för den exakta matchningen."
 
 #: ../data/ibus.schemas.in.h:61
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "Välj ett villkor för att matcha emoji-annotationer partiellt"
 
 #: ../data/ibus.schemas.in.h:62
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 =="
+" prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
 #: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
@@ -935,46 +945,58 @@ msgid "%s is unknown command!\n"
 msgstr "%s är ett okänt kommando!\n"
 
 #: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr "Visa emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr "Meny"
+
+#: ../ui/gtk3/emojier.vala:189
+msgid "Favorites"
+msgstr "Favoriter"
+
+#: ../ui/gtk3/emojier.vala:190
 msgid "Others"
 msgstr "Annat"
 
-#: ../ui/gtk3/emojier.vala:287 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
-#: ../ui/gtk3/emojier.vala:293
+#: ../ui/gtk3/emojier.vala:330
 msgid "Type annotation or choose emoji"
 msgstr "Ange annotation eller välj emoji"
 
-#: ../ui/gtk3/emojier.vala:598 ../ui/gtk3/emojier.vala:645
-msgid "Favorites"
-msgstr "Favoriter"
-
-#: ../ui/gtk3/emojier.vala:670
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ../ui/gtk3/emojier.vala:681
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "Bläddra upp"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr "Kodpunkt: %s"
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr "Har emoji-varianter"
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:889 ../ui/gtk3/emojier.vala:903
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:894 ../ui/gtk3/emojier.vala:933
-#, c-format
-msgid "Code point: %s"
-msgstr "Kodpunkt: %s"
-
-#: ../ui/gtk3/emojier.vala:914
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
@@ -1010,16 +1032,16 @@ msgid "LANG"
 msgstr "SPRÅK"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
-msgstr ""
+msgid "Emoji annotations can be match partially"
+msgstr "Emoji-annotationer kan matcha partiellt"
 
 #: ../ui/gtk3/emojierapp.vala:87
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "Matcha med längden på det angivna heltalet"
 
 #: ../ui/gtk3/emojierapp.vala:91
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "Matcha med villkoret för det angivna heltalet"
 
 #: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
diff --git a/po/uk.po b/po/uk.po
index 19fbb2988..c1c2211ab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -612,7 +612,7 @@ msgstr ""
 "є якісь символи."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotaions can be match partially or not"
+msgid "Whether emoji annotations can be match partially or not"
 msgstr "Визначає, чи може бути встановлено часткову відповідність"
 
 #: ../data/ibus.schemas.in.h:58
@@ -624,7 +624,7 @@ msgstr ""
 "не повним збігом"
 
 #: ../data/ibus.schemas.in.h:59
-msgid "Match emoji annotaions with the specified length"
+msgid "Match emoji annotations with the specified length"
 msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
 
 #: ../data/ibus.schemas.in.h:60
@@ -1053,7 +1053,7 @@ msgid "LANG"
 msgstr "МОВА"
 
 #: ../ui/gtk3/emojierapp.vala:83
-msgid "Emoji annotaions can be match partially"
+msgid "Emoji annotations can be match partially"
 msgstr ""
 "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index edc896e6e..53bb2274b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,18 +8,20 @@
 # Ding-Yi Chen <dchen@redhat.com>, 2009
 # Ding-Yi Chen <dchen@redhat.com>, 2009
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
+# Caius "kaio" Chance <caius.chance@gmail.com>, 2017. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"POT-Creation-Date: 2017-05-06 02:04+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-17 09:17-0400\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"PO-Revision-Date: 2017-05-19 10:57-0400\n"
+"Last-Translator: Caius \"kaio\" Chance <caius.chance@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -86,156 +88,132 @@ msgid "Previous input method:"
 msgstr "上一個輸入法："
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "顯示繪文字對話窗的快捷鍵"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "繪文字對話窗："
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "用來開啟或關閉輸入法的快捷鍵"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "啟用或停用："
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "啟用："
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "停用："
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>鍵盤快捷鍵</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "設置查詢表單內候選字詞的排列方向"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "候選詞排列方向："
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "設置 iBus 如何顯示或隱藏語言列的行為"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "顯示屬性面板："
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "語言面板位置："
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系統匣顯示圖示"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "在語言列顯示輸入法名稱"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "當選取時在語言列上輸入法名稱"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "在應用程式視窗內嵌預先編輯文字"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr "在應用程式視窗內嵌輸入法的預先編輯文字"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "使用自訂字型："
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "設定候選繪文字的字型"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "繪文字字型："
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "設定繪文字對話窗中的繪文字註釋語言"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "繪文字註釋語言："
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>字型與風格</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "通用"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "加入選取的輸入法到已啟用的輸入法內"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "從已啟用的輸入法中移除所選的輸入法"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "向上(_U)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移所選取的輸入法"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "向下(_D)"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移所選取的輸入法"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "顯示選取輸入法的設置"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -244,35 +222,87 @@ msgstr ""
 "<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "顯示繪文字對話窗的快捷鍵"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "繪文字選擇："
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "設定候選繪文字的字型"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "繪文字字型："
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "設定繪文字對話窗中的繪文字註釋語言"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "繪文字註釋語言："
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -288,19 +318,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "在登入時啟動 iBus"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -538,30 +568,60 @@ msgid ""
 msgstr "您可以在繪文字清單中顯示喜愛的繪文字，若有列出任何字元的話。"
 
 #: ../data/ibus.schemas.in.h:57
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:64
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:65
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:67
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:68
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:69
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:70
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -581,12 +641,12 @@ msgid "Select a language"
 msgstr ""
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -658,15 +718,15 @@ msgstr "請按鍵盤按鍵 (或是按鍵組合)\n"
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -680,21 +740,53 @@ msgstr ""
 "export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "切換輸入法"
 
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
+
 #: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
@@ -816,78 +908,136 @@ msgstr "指令：\n"
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
-msgid "Emoji Dialog"
-msgstr "繪文字對話窗"
+#: ../ui/gtk3/emojier.vala:170
+msgid "Show emoji variants"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:293
-msgid "Type annotation or choose emoji"
-msgstr "請輸入註釋或選擇繪文字"
+#: ../ui/gtk3/emojier.vala:175
+msgid "Menu"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
+#: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
 msgstr "喜愛"
 
-#: ../ui/gtk3/emojier.vala:628
+#: ../ui/gtk3/emojier.vala:190
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:330
+msgid "Type annotation or choose emoji"
+msgstr "請輸入註釋或選擇繪文字"
+
+#: ../ui/gtk3/emojier.vala:752
 msgid "Page Down"
 msgstr "上一頁"
 
-#: ../ui/gtk3/emojier.vala:639
+#: ../ui/gtk3/emojier.vala:763
 msgid "Page Up"
 msgstr "下一頁"
 
+#: ../ui/gtk3/emojier.vala:882
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:888
+msgid "Has emoji variants"
+msgstr ""
+
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:813
+#: ../ui/gtk3/emojier.vala:995
 msgid "None"
 msgstr "無"
 
-#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
-#, c-format
-msgid "Code point: %s"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:838
+#: ../ui/gtk3/emojier.vala:1015
 #, c-format
 msgid "Annotations: %s"
 msgstr "註釋：%s"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr "已取消繪文字的選擇。"
+
+#: ../ui/gtk3/emojierapp.vala:54
+msgid "Copied an emoji to your clipboard."
+msgstr "已將繪文字複製到您的剪貼簿。"
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:74
+msgid "\"FONT\" for emoji chracters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:75
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:80
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:81
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:83
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:87
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:91
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:823
+#: ../ui/gtk3/panel.vala:853
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
+#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:1196
+#: ../ui/gtk3/panel.vala:1236
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1200
+#: ../ui/gtk3/panel.vala:1240
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
 
-#: ../ui/gtk3/panel.vala:1219
+#: ../ui/gtk3/panel.vala:1259
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1238
+#: ../ui/gtk3/panel.vala:1278
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/panel.vala:1282
 msgid "Quit"
 msgstr "結束"
 
@@ -896,33 +1046,3 @@ msgstr "結束"
 #: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
 msgid "default:LTR"
 msgstr "default:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:45
-msgid "Canceled to choose an emoji."
-msgstr "已取消繪文字的選擇。"
-
-#: ../ui/gtk3/emojierapp.vala:52
-msgid "Copied an emoji to your clipboard."
-msgstr "已將繪文字複製到您的剪貼簿。"
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:82
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:83
-msgid "FONT"
-msgstr ""
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:88
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:89
-msgid "LANG"
-msgstr ""
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 8c787ebdd..1df859019 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -96,7 +96,7 @@ public class EmojiApplication : Application {
               N_("\"LANG\" for annotations on emoji dialog. E.g. \"en\""),
               N_("LANG") },
             { "partial-match", 0, 0, OptionArg.NONE, out partial_match,
-              N_("Emoji annotaions can be match partially"),
+              N_("Emoji annotations can be match partially"),
               null },
             { "partial-match-length", 0, 0, OptionArg.INT,
               out partial_match_length,

From bc0f91342c6f3a6e554493af9430d634d906ee19 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 25 Jul 2017 12:00:14 +0900
Subject: [PATCH 419/816] ui/gtk3: Fix SEGV of IBusEmojier on de_DE.UTF-8

de's decimal_point is ',' instead of '.' and failed to load the
CSS data in Gtk.CssProvider.load_from_data(), launched null
window of emojis and finally caused a SEGV due to the null window.
This also fixes some memory leaks.

BUG=rhbz#1471079

Review URL: https://codereview.appspot.com/323310043
---
 src/ibusemoji.c      |  1 +
 ui/gtk3/emojier.vala | 33 ++++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index 3d38c2a9f..d56c48aad 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -591,6 +591,7 @@ ibus_emoji_data_load (const gchar *path)
         g_variant_unref (variant);
     if (variant_table)
         g_variant_unref (variant_table);
+    g_free (contents);
 
     return retval;
 }
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 95912bf36..9df59ac48 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -276,6 +276,17 @@ class IBusEmojier : Gtk.ApplicationWindow {
             warning("Could not open display.");
             return;
         }
+        // Set en locale because de_DE's decimal_point is ',' instead of '.'
+        string? backup_locale =
+            Intl.setlocale(LocaleCategory.NUMERIC, null).dup();
+        if (Intl.setlocale(LocaleCategory.NUMERIC, "en_US.UTF-8") == null) {
+          if (Intl.setlocale(LocaleCategory.NUMERIC, "C.UTF-8") == null) {
+              if (Intl.setlocale(LocaleCategory.NUMERIC, "C") == null) {
+                  warning("You don't install either en_US.UTF-8 or C.UTF-8 " +
+                          "or C locale");
+              }
+          }
+        }
         m_rgba = new ThemedRGBA(this);
         uint bg_red = (uint)(m_rgba.normal_bg.red * 255);
         uint bg_green = (uint)(m_rgba.normal_bg.green * 255);
@@ -321,6 +332,10 @@ class IBusEmojier : Gtk.ApplicationWindow {
             warning("Failed css_provider_from_data: %s", e.message);
             return;
         }
+        if (backup_locale != null)
+            Intl.setlocale(LocaleCategory.NUMERIC, backup_locale);
+        else
+            Intl.setlocale(LocaleCategory.NUMERIC, "");
 
         Gtk.StyleContext.add_provider_for_screen(
                 screen,
@@ -424,8 +439,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
         unowned GLib.SList<string> annotations = data.get_annotations();
         foreach (string annotation in annotations) {
             bool has_emoji = false;
-            unowned GLib.SList<string> hits =
-                    m_annotation_to_emojis_dict.lookup(annotation);
+            GLib.SList<string> hits =
+                    m_annotation_to_emojis_dict.lookup(annotation).copy_deep(
+                            GLib.strdup);
             foreach (string hit_emoji in hits) {
                 if (hit_emoji == emoji) {
                     has_emoji = true;
@@ -485,7 +501,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private static void
     update_annotations_with_description (IBus.EmojiData data,
                                          string         description) {
-        unowned GLib.SList<string> annotations = data.get_annotations();
+        GLib.SList<string> annotations =
+                data.get_annotations().copy_deep(GLib.strdup);
         bool update_annotations = false;
         string former = null;
         string later = null;
@@ -574,8 +591,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 buff.append_unichar(0xfe0f);
                 if (m_emoji_to_data_dict.lookup(buff.str) != null)
                     base_emoji = buff.str;
-                unowned GLib.SList<string>? variants =
-                    m_emoji_to_emoji_variants_dict.lookup(base_emoji);
+                GLib.SList<string>? variants =
+                        m_emoji_to_emoji_variants_dict.lookup(
+                                base_emoji).copy_deep(GLib.strdup);
                 if (variants.find_custom(emoji, GLib.strcmp) == null) {
                     if (variants == null)
                         variants.append(base_emoji);
@@ -587,8 +605,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 return;
             }
             bool has_emoji = false;
-            unowned GLib.SList<string> hits =
-                    m_category_to_emojis_dict.lookup(category);
+            GLib.SList<string> hits =
+                    m_category_to_emojis_dict.lookup(category).copy_deep(
+                            GLib.strdup);
             foreach (string hit_emoji in hits) {
                 if (hit_emoji == emoji) {
                     has_emoji = true;

From 91bebf01e41116d71e60876e793284cf9d8dc186 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 28 Jul 2017 11:45:28 +0900
Subject: [PATCH 420/816] ui/gtk3: Fix SEGV of XKeysymToKeycode() on Wayland

BUG=rhbz#1368593
BUG=rhbz#1446816
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/325120043
---
 ui/gtk3/application.vala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index 5ae6e8372..fa8027215 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -99,6 +100,9 @@ class Application {
     }
 
     public static void main(string[] argv) {
+        // for Gdk.X11.get_default_xdisplay()
+        Gdk.set_allowed_backends("x11");
+
         Application app = new Application(argv);
         app.run();
     }

From 6a3301db85e77e0652f7e00894cce493b6a942f6 Mon Sep 17 00:00:00 2001
From: Xiang Fan <sfanxiang@gmail.com>
Date: Thu, 10 Aug 2017 11:24:39 +0900
Subject: [PATCH 421/816] client/gtk2: include the scaling factor

Scaling factor, which exists for HiDPI displays, needs to be included in
the calculation of cursor location. This does not affect devices without
a HiDPI display.

Candidate windows would be misplaced to smaller coordinates without this
patch.

BUG=https://github.com/ibus/ibus/issues/1806

Review URL: https://codereview.appspot.com/328250043

Patch from Xiang Fan <sfanxiang@gmail.com>.
---
 client/gtk2/ibusimcontext.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 0df006204..41c7a3afb 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -999,6 +999,24 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
         gtk_im_context_set_client_window (ibusimcontext->slave, client);
 }
 
+static void
+_set_rect_scale_factor_with_window (GdkRectangle *area,
+                                    GdkWindow    *window)
+{
+#if GTK_CHECK_VERSION (3, 10, 0)
+    int scale_factor;
+
+    g_assert (area);
+    g_assert (GDK_IS_WINDOW (window));
+
+    scale_factor = gdk_window_get_scale_factor (window);
+    area->x *= scale_factor;
+    area->y *= scale_factor;
+    area->width *= scale_factor;
+    area->height *= scale_factor;
+#endif
+}
+
 static gboolean
 _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 {
@@ -1024,6 +1042,8 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
             window = parent;
         }
 
+        _set_rect_scale_factor_with_window (&area,
+                                            ibusimcontext->client_window);
         ibus_input_context_set_cursor_location_relative (
             ibusimcontext->ibuscontext,
             area.x,
@@ -1049,6 +1069,7 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
     gdk_window_get_root_coords (ibusimcontext->client_window,
                                 area.x, area.y,
                                 &area.x, &area.y);
+    _set_rect_scale_factor_with_window (&area, ibusimcontext->client_window);
     ibus_input_context_set_cursor_location (ibusimcontext->ibuscontext,
                                             area.x,
                                             area.y,

From c1b93f933f5cbd74f3e06575d26ed7432a5420fd Mon Sep 17 00:00:00 2001
From: Mario Bodemann <mario.bodemann@gmail.com>
Date: Tue, 15 Aug 2017 12:10:56 +0900
Subject: [PATCH 422/816] Typo fix

BUG=https://github.com/ibus/ibus/pull/1939

Review URL: https://codereview.appspot.com/327080043

Patch from Mario Bodemann <mario.bodemann@gmail.com>.
---
 ui/gtk3/ibus-emoji.7.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index 4ee863641..d5eae3106 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -15,7 +15,7 @@
 .SH "DESCRIPTION"
 
 .PP
-IBus Emojier provides a GUI to select an emoji by typing an emoji annotaion
+IBus Emojier provides a GUI to select an emoji by typing an emoji annotation
 or choosing a character with mouse click and it's designed to work as
 an extended IBus lookup window using Space, Enter, and Arrow keys.
 The text entry accepts an emoji annotation or Unicode points.

From 203a3df5a239d644cf42b7bac03a268eb5babfc7 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 30 Aug 2017 11:38:09 +0900
Subject: [PATCH 423/816] Initial version of ibus portal

This adds a dbus service called org.freedesktop.portal.IBus on the
session bus. It is a very limited service that only implements
CreateInputContext and the InputContext interface (and Service.Destroy
for lifetime access).

It uses gdbus code generation for demarshalling the method calls which
means it will verify that all arguments have the right type.

Additionally all method calls to the input context object have to be
from the client that created it, so each client is isolated.

BUG=https://github.com/flatpak/flatpak/issues/675
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/326350043

Patch from Alexander Larsson <alexl@redhat.com>.
---
 Makefile.am                                   |   1 +
 configure.ac                                  |   5 +-
 portal/Makefile.am                            |  95 +++
 portal/org.freedesktop.IBus.Portal.xml        | 132 ++++
 portal/org.freedesktop.portal.IBus.service.in |   3 +
 portal/portal.c                               | 698 ++++++++++++++++++
 src/ibusshare.h                               |  14 +
 7 files changed, 947 insertions(+), 1 deletion(-)
 create mode 100644 portal/Makefile.am
 create mode 100644 portal/org.freedesktop.IBus.Portal.xml
 create mode 100644 portal/org.freedesktop.portal.IBus.service.in
 create mode 100644 portal/portal.c

diff --git a/Makefile.am b/Makefile.am
index f703d4c6f..c8e802da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ SUBDIRS = \
 	util \
 	conf \
 	client \
+	portal \
 	data \
 	m4 \
 	po \
diff --git a/configure.ac b/configure.ac
index cb48ad4ce..14556a3a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ PKG_CHECK_MODULES(GOBJECT2, [
     gobject-2.0 >= glib_required_version
 ])
 PKG_CHECK_MODULES(GIO2, [
-    gio-2.0 >= glib_required_version
+    gio-2.0 gio-unix-2.0 >= glib_required_version
 ])
 PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= glib_required_version
@@ -660,6 +660,8 @@ PKG_CHECK_MODULES(ISOCODES, [
 ISOCODES_PREFIX=`$PKG_CONFIG iso-codes --variable=prefix`
 AC_SUBST(ISOCODES_PREFIX)
 
+AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
+
 # OUTPUT files
 AC_CONFIG_FILES([ po/Makefile.in
 Makefile
@@ -674,6 +676,7 @@ src/Makefile
 src/ibusversion.h
 src/tests/Makefile
 bus/Makefile
+portal/Makefile
 engine/Makefile
 util/Makefile
 util/IMdkit/Makefile
diff --git a/portal/Makefile.am b/portal/Makefile.am
new file mode 100644
index 000000000..954fc5915
--- /dev/null
+++ b/portal/Makefile.am
@@ -0,0 +1,95 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-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
+# 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
+
+NULL =
+
+libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src   \
+	-I$(top_builddir)/src \
+	$(NULL)
+
+AM_CFLAGS = \
+	@GLIB2_CFLAGS@ \
+	@GIO2_CFLAGS@ \
+	@GTHREAD2_CFLAGS@ \
+	-DG_LOG_DOMAIN=\"IBUS\" \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DBINDIR=\"@bindir@\" \
+	-DIBUS_DISABLE_DEPRECATED \
+	$(NULL)
+AM_LDADD = \
+	@GOBJECT2_LIBS@ \
+	@GLIB2_LIBS@ \
+	@GIO2_LIBS@ \
+	@GTHREAD2_LIBS@ \
+	$(libibus) \
+	$(NULL)
+
+ibus_dbus_built_sources = ibus-portal-dbus.c ibus-portal-dbus.h
+BUILT_SOURCES = $(ibus_dbus_built_sources)
+
+libexec_PROGRAMS = ibus-portal
+ibus_portal_DEPENDENCIES = \
+	$(libibus) \
+	$(NULL)
+ibus_portal_SOURCES = \
+	portal.c \
+	$(ibus_dbus_built_sources) \
+	$(NULL)
+ibus_portal_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(NULL)
+ibus_portal_LDADD = \
+	$(AM_LDADD) \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(NULL)
+
+CLEANFILES = \
+	$(NULL)
+
+$(libibus):
+	$(MAKE) -C $(top_builddir)/src
+
+dbusservice_in_files = org.freedesktop.portal.IBus.service.in
+dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+dbusservicedir=${datadir}/dbus-1/services
+
+org.freedesktop.portal.IBus.service: org.freedesktop.portal.IBus.service.in
+	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|"  $< > $@.tmp && mv $@.tmp $@
+
+$(ibus_dbus_built_sources) : org.freedesktop.IBus.Portal.xml
+	$(AM_V_GEN) $(GDBUS_CODEGEN)                            \
+		--interface-prefix org.freedesktop.IBus.        \
+		--c-namespace IBusDbus                          \
+		--generate-c-code $(builddir)/ibus-portal-dbus  \
+		$^ \
+		$(NULL)
+
+EXTRA_DIST += $(dbusservice_in_files)
+CLEANFILES += $(dbusservice_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/portal/org.freedesktop.IBus.Portal.xml b/portal/org.freedesktop.IBus.Portal.xml
new file mode 100644
index 000000000..afce4daa7
--- /dev/null
+++ b/portal/org.freedesktop.IBus.Portal.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2017 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
+ License as published by the Free Software Foundation; either
+ version 2 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, see <http://www.gnu.org/licenses/>.
+
+ Author: Alexander Larsson <alexl@redhat.com>
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.IBus.Portal:
+      @short_description: Portal for ibus client access
+
+      This interface is a minimal interface to IBus that is safe to expose to
+      clients.
+  -->
+  <interface name="org.freedesktop.IBus.Portal">
+    <method name='CreateInputContext'>
+      <arg direction='in'  type='s' name='client_name' />
+      <arg direction='out' type='o' name='object_path' />
+    </method>
+  </interface>
+
+  <!-- This is a copy of the interface in inputcontext.c, they should be shared.
+       We want this for the code generator so that we can be sure we verify all
+       caller types, etc.
+  -->
+  <interface name='org.freedesktop.IBus.InputContext'>
+    <method name='ProcessKeyEvent'>
+      <arg direction='in'  type='u' name='keyval' />
+      <arg direction='in'  type='u' name='keycode' />
+      <arg direction='in'  type='u' name='state' />
+      <arg direction='out' type='b' name='handled' />
+    </method>
+    <method name='SetCursorLocation'>
+      <arg direction='in' type='i' name='x' />
+      <arg direction='in' type='i' name='y' />
+      <arg direction='in' type='i' name='w' />
+      <arg direction='in' type='i' name='h' />
+    </method>
+    <method name='SetCursorLocationRelative'>
+      <arg direction='in' type='i' name='x' />
+      <arg direction='in' type='i' name='y' />
+      <arg direction='in' type='i' name='w' />
+      <arg direction='in' type='i' name='h' />
+    </method>
+    <method name='ProcessHandWritingEvent'>
+      <arg direction='in' type='ad' name='coordinates' />
+    </method>
+    <method name='CancelHandWriting'>
+      <arg direction='in' type='u' name='n_strokes' />
+    </method>
+    <method name='FocusIn' />
+    <method name='FocusOut' />
+    <method name='Reset' />
+    <method name='SetCapabilities'>
+      <arg direction='in' type='u' name='caps' />
+    </method>
+    <method name='PropertyActivate'>
+      <arg direction='in' type='s' name='name' />
+      <arg direction='in' type='u' name='state' />
+    </method>
+    <method name='SetEngine'>
+      <arg direction='in' type='s' name='name' />
+    </method>
+    <method name='GetEngine'>
+      <arg direction='out' type='v' name='desc' />
+    </method>
+    <method name='SetSurroundingText'>
+      <arg direction='in' type='v' name='text' />
+      <arg direction='in' type='u' name='cursor_pos' />
+      <arg direction='in' type='u' name='anchor_pos' />
+    </method>
+
+    <signal name='CommitText'>
+      <arg type='v' name='text' />
+    </signal>
+    <signal name='ForwardKeyEvent'>
+      <arg type='u' name='keyval' />
+      <arg type='u' name='keycode' />
+      <arg type='u' name='state' />
+    </signal>
+    <signal name='UpdatePreeditText'>
+      <arg type='v' name='text' />
+      <arg type='u' name='cursor_pos' />
+      <arg type='b' name='visible' />
+    </signal>
+    <signal name='ShowPreeditText'/>
+    <signal name='HidePreeditText'/>
+    <signal name='UpdateAuxiliaryText'>
+      <arg type='v' name='text' />
+      <arg type='b' name='visible' />
+    </signal>
+    <signal name='ShowAuxiliaryText'/>
+    <signal name='HideAuxiliaryText'/>
+    <signal name='UpdateLookupTable'>
+      <arg type='v' name='table' />
+      <arg type='b' name='visible' />
+    </signal>
+    <signal name='ShowLookupTable'/>
+    <signal name='HideLookupTable'/>
+    <signal name='PageUpLookupTable'/>
+    <signal name='PageDownLookupTable'/>
+    <signal name='CursorUpLookupTable'/>
+    <signal name='CursorDownLookupTable'/>
+    <signal name='RegisterProperties'>
+      <arg type='v' name='props' />
+    </signal>
+    <signal name='UpdateProperty'>
+      <arg type='v' name='prop' />
+    </signal>
+
+    <property name='ContentType' type='(uu)' access='write' />
+  </interface>
+
+  <interface name='org.freedesktop.IBus.Service'>
+    <method name='Destroy' />
+  </interface>
+
+</node>
diff --git a/portal/org.freedesktop.portal.IBus.service.in b/portal/org.freedesktop.portal.IBus.service.in
new file mode 100644
index 000000000..47ae9ffcb
--- /dev/null
+++ b/portal/org.freedesktop.portal.IBus.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.portal.IBus
+Exec=@libexecdir@/ibus-portal
diff --git a/portal/portal.c b/portal/portal.c
new file mode 100644
index 000000000..0415f9960
--- /dev/null
+++ b/portal/portal.c
@@ -0,0 +1,698 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2017 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
+ * 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 <config.h>
+#include <fcntl.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include <ibus.h>
+#include <locale.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "ibus-portal-dbus.h"
+
+typedef struct _IBusPortal IBusPortal;
+typedef struct _IBusPortalClass IBusPortalClass;
+typedef struct _IBusPortalContext IBusPortalContext;
+typedef struct _IBusPortalContextClass IBusPortalContextClass;
+
+struct _IBusPortalContext
+{
+    IBusDbusInputContextSkeleton parent_instance;
+    IBusInputContext *context;
+    guint id;
+    char *owner;
+    char *object_path;
+    IBusDbusService *service;
+};
+
+struct _IBusPortalContextClass
+{
+    IBusDbusInputContextSkeletonClass parent_class;
+};
+
+struct _IBusPortal
+{
+    IBusDbusPortalSkeleton parent_instance;
+
+};
+
+struct _IBusPortalClass
+{
+    IBusDbusPortalSkeletonClass parent_class;
+};
+
+enum
+{
+    PROP_CONTENT_TYPE = 1,
+    N_PROPERTIES
+};
+
+static GMainLoop *loop = NULL;
+static IBusBus *ibus_bus;
+static IBusPortal *ibus_portal = NULL;
+static gboolean opt_verbose;
+static gboolean opt_replace;
+
+static GList *all_contexts = NULL;
+
+static guint next_context_id;
+
+GType ibus_portal_context_get_type (void) G_GNUC_CONST;
+static void ibus_portal_context_iface_init (IBusDbusInputContextIface *iface);
+
+static void portal_context_g_signal (GDBusProxy        *proxy,
+                                     const gchar       *sender_name,
+                                     const gchar       *signal_name,
+                                     GVariant          *parameters,
+                                     IBusPortalContext *portal_context);
+
+G_DEFINE_TYPE_WITH_CODE (IBusPortalContext,
+                         ibus_portal_context,
+                         IBUS_DBUS_TYPE_INPUT_CONTEXT_SKELETON,
+                         G_IMPLEMENT_INTERFACE (IBUS_DBUS_TYPE_INPUT_CONTEXT,
+                                 ibus_portal_context_iface_init));
+
+static void
+_forward_method_cb (GObject *source_object,
+                    GAsyncResult *res,
+                    gpointer user_data)
+{
+    GDBusMethodInvocation *invocation = user_data;
+    IBusPortalContext *portal_context =
+            (IBusPortalContext *) g_dbus_method_invocation_get_user_data (
+                    invocation);
+    IBusEngineDesc *desc;
+    GError *error = NULL;
+
+    GVariant *variant = g_dbus_proxy_call_finish ((GDBusProxy *) source_object,
+                                                  res, &error);
+    if (variant == NULL) {
+        g_dbus_method_invocation_return_gerror (invocation, error);
+        g_error_free (error);
+        return;
+    }
+
+    g_dbus_method_invocation_return_value (invocation, variant);
+}
+
+static gboolean
+_forward_method (IBusDbusInputContext  *object,
+                 GDBusMethodInvocation *invocation)
+{
+    IBusPortalContext *portal_context = (IBusPortalContext *)object;
+    GDBusMessage *message = g_dbus_method_invocation_get_message (invocation);
+
+    g_dbus_proxy_call (G_DBUS_PROXY (portal_context->context),
+                       g_dbus_method_invocation_get_method_name (invocation),
+                       g_dbus_message_get_body (message),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL, /* cancellable */
+                       _forward_method_cb, invocation);
+    return TRUE;
+}
+
+static gboolean
+ibus_dbus_context_cancel_hand_writing (IBusDbusInputContext  *object,
+                                       GDBusMethodInvocation *invocation,
+                                       guint                  arg_n_strokes)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_focus_in (IBusDbusInputContext  *object,
+                            GDBusMethodInvocation *invocation)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_focus_out (IBusDbusInputContext  *object,
+                             GDBusMethodInvocation *invocation)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_get_engine (IBusDbusInputContext  *object,
+                              GDBusMethodInvocation *invocation)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_process_hand_writing_event (IBusDbusInputContext  *object,
+                                              GDBusMethodInvocation *invocation,
+                                              GVariant
+                                                               *arg_coordinates)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_process_key_event (IBusDbusInputContext  *object,
+                                     GDBusMethodInvocation *invocation,
+                                     guint                  arg_keyval,
+                                     guint                  arg_keycode,
+                                     guint                  arg_state)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_property_activate (IBusDbusInputContext  *object,
+                                     GDBusMethodInvocation *invocation,
+                                     const gchar           *arg_name,
+                                     guint                  arg_state)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_reset (IBusDbusInputContext  *object,
+                         GDBusMethodInvocation *invocation)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_set_capabilities (IBusDbusInputContext  *object,
+                                    GDBusMethodInvocation *invocation,
+                                    guint                  arg_caps)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_set_cursor_location (IBusDbusInputContext  *object,
+                                       GDBusMethodInvocation *invocation,
+                                       gint                   arg_x,
+                                       gint                   arg_y,
+                                       gint                   arg_w,
+                                       gint                   arg_h)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_set_cursor_location_relative (IBusDbusInputContext  *object,
+                                                GDBusMethodInvocation
+                                                                    *invocation,
+                                                gint                   arg_x,
+                                                gint                   arg_y,
+                                                gint                   arg_w,
+                                                gint                   arg_h)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_set_engine (IBusDbusInputContext  *object,
+                              GDBusMethodInvocation *invocation,
+                              const gchar           *arg_name)
+{
+    return _forward_method (object, invocation);
+}
+
+static gboolean
+ibus_dbus_context_set_surrounding_text (IBusDbusInputContext  *object,
+                                        GDBusMethodInvocation *invocation,
+                                        GVariant              *arg_text,
+                                        guint                  arg_cursor_pos,
+                                        guint                  arg_anchor_pos)
+{
+    return _forward_method (object, invocation);
+}
+
+static void
+ibus_portal_context_iface_init (IBusDbusInputContextIface *iface)
+{
+    iface->handle_cancel_hand_writing = ibus_dbus_context_cancel_hand_writing;
+    iface->handle_focus_in = ibus_dbus_context_focus_in;
+    iface->handle_focus_out = ibus_dbus_context_focus_out;
+    iface->handle_get_engine = ibus_dbus_context_get_engine;
+    iface->handle_process_hand_writing_event =
+            ibus_dbus_context_process_hand_writing_event;
+    iface->handle_process_key_event = ibus_dbus_context_process_key_event;
+    iface->handle_property_activate = ibus_dbus_context_property_activate;
+    iface->handle_reset = ibus_dbus_context_reset;
+    iface->handle_set_capabilities = ibus_dbus_context_set_capabilities;
+    iface->handle_set_cursor_location = ibus_dbus_context_set_cursor_location;
+    iface->handle_set_cursor_location_relative =
+            ibus_dbus_context_set_cursor_location_relative;
+    iface->handle_set_engine = ibus_dbus_context_set_engine;
+    iface->handle_set_surrounding_text = ibus_dbus_context_set_surrounding_text;
+}
+
+static void
+ibus_portal_context_init (IBusPortalContext *portal_context)
+{
+}
+
+static void
+ibus_portal_context_finalize (GObject *object)
+{
+    IBusPortalContext *portal_context = (IBusPortalContext *)object;
+
+    all_contexts = g_list_remove (all_contexts, portal_context);
+
+    g_dbus_interface_skeleton_unexport (
+            G_DBUS_INTERFACE_SKELETON (portal_context->service));
+    g_dbus_interface_skeleton_unexport (
+            G_DBUS_INTERFACE_SKELETON (portal_context));
+
+    g_free (portal_context->owner);
+    g_free (portal_context->object_path);
+    g_object_unref (portal_context->service);
+
+    g_signal_handlers_disconnect_by_func (
+            portal_context->context,
+            G_CALLBACK(portal_context_g_signal),
+            portal_context);
+    g_object_unref (portal_context->context);
+
+    G_OBJECT_CLASS (ibus_portal_context_parent_class)->finalize (object);
+}
+
+static void
+ibus_portal_context_set_property (IBusPortalContext *portal_context,
+                                  guint              prop_id,
+                                  const GValue      *value,
+                                  GParamSpec        *pspec)
+{
+    switch (prop_id) {
+    case PROP_CONTENT_TYPE:
+        g_dbus_proxy_call (G_DBUS_PROXY (portal_context->context),
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new ("(ssv)",
+                                          IBUS_INTERFACE_INPUT_CONTEXT,
+                                          "ContentType",
+                                          g_value_get_variant (value)),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           NULL, /* cancellable */
+                           NULL, /* callback */
+                           NULL  /* user_data */
+                           );
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (portal_context, prop_id, pspec);
+    }
+}
+
+static void
+ibus_portal_context_get_property (IBusPortalContext *portal_context,
+                                  guint              prop_id,
+                                  GValue            *value,
+                                  GParamSpec        *pspec)
+{
+    switch (prop_id) {
+    case PROP_CONTENT_TYPE:
+        g_warning ("No support for setting content type");
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (portal_context, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_portal_context_g_authorize_method (GDBusInterfaceSkeleton *interface,
+                                        GDBusMethodInvocation  *invocation)
+{
+    IBusPortalContext *portal_context = (IBusPortalContext *)interface;
+
+    if (g_strcmp0 (g_dbus_method_invocation_get_sender (invocation),
+                   portal_context->owner) == 0) {
+        return TRUE;
+    }
+
+    g_dbus_method_invocation_return_error (invocation,
+                                           G_DBUS_ERROR,
+                                           G_DBUS_ERROR_FAILED,
+                                           "Access denied");
+    return FALSE;
+}
+
+
+static void
+ibus_portal_context_class_init (IBusPortalContextClass *klass)
+{
+    GObjectClass *gobject_class;
+    GDBusInterfaceSkeletonClass *skeleton_class;
+
+    gobject_class = G_OBJECT_CLASS (klass);
+    gobject_class->finalize  = ibus_portal_context_finalize;
+    gobject_class->set_property  =
+            (GObjectSetPropertyFunc) ibus_portal_context_set_property;
+    gobject_class->get_property  =
+            (GObjectGetPropertyFunc) ibus_portal_context_get_property;
+
+    skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS(klass);
+    skeleton_class->g_authorize_method = ibus_portal_context_g_authorize_method;
+
+    ibus_dbus_input_context_override_properties (gobject_class,
+                                                 PROP_CONTENT_TYPE);
+}
+
+static void
+portal_context_g_signal (GDBusProxy        *proxy,
+                         const gchar       *sender_name,
+                         const gchar       *signal_name,
+                         GVariant          *parameters,
+                         IBusPortalContext *portal_context)
+{
+    GError *error = NULL;
+    GDBusConnection *connection;
+
+    if (g_strcmp0 (sender_name, IBUS_SERVICE_IBUS) != 0)
+        return;
+
+    connection = g_dbus_interface_skeleton_get_connection (
+            G_DBUS_INTERFACE_SKELETON (portal_context));
+    if (!g_dbus_connection_emit_signal (connection,
+                                        portal_context->owner,
+                                        portal_context->object_path,
+                                        IBUS_INTERFACE_INPUT_CONTEXT,
+                                        signal_name,
+                                        parameters,
+                                        &error)) {
+        g_warning ("Unable to emit signal %s: %s", signal_name, error->message);
+        g_error_free (error);
+    }
+
+    g_signal_stop_emission_by_name (proxy, "g-signal");
+}
+
+static gboolean
+ibus_portal_context_handle_destroy (IBusDbusService       *object,
+                                    GDBusMethodInvocation *invocation,
+                                    IBusPortalContext     *portal_context)
+{
+    g_object_unref (portal_context);
+}
+
+static IBusPortalContext *
+ibus_portal_context_new (IBusInputContext *context,
+                         GDBusConnection  *connection,
+                         const char       *owner,
+                         GError          **error)
+{
+    IBusPortalContext *portal_context =
+            g_object_new (ibus_portal_context_get_type (), NULL);
+
+    g_signal_connect (context,
+                      "g-signal",
+                      G_CALLBACK(portal_context_g_signal),
+                      portal_context);
+
+    portal_context->id = ++next_context_id;
+    portal_context->context = g_object_ref (context);
+    portal_context->owner = g_strdup (owner);
+    portal_context->object_path =
+            g_strdup_printf (IBUS_PATH_INPUT_CONTEXT, portal_context->id);
+    portal_context->service = ibus_dbus_service_skeleton_new ();
+
+    g_signal_connect (portal_context->service,
+                      "handle-destroy",
+                      G_CALLBACK (ibus_portal_context_handle_destroy),
+                      portal_context);
+
+    if (!g_dbus_interface_skeleton_export (
+                G_DBUS_INTERFACE_SKELETON (portal_context->service),
+                connection, portal_context->object_path,
+                error) ||
+        !g_dbus_interface_skeleton_export (
+                G_DBUS_INTERFACE_SKELETON (portal_context),
+                connection, portal_context->object_path,
+                error)) {
+        g_object_unref (portal_context);
+        return NULL;
+    }
+
+    all_contexts = g_list_prepend (all_contexts, portal_context);
+
+    return portal_context;
+}
+
+GType ibus_portal_get_type (void) G_GNUC_CONST;
+static void ibus_portal_iface_init (IBusDbusPortalIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (IBusPortal, ibus_portal,
+                         IBUS_DBUS_TYPE_PORTAL_SKELETON,
+                         G_IMPLEMENT_INTERFACE (IBUS_DBUS_TYPE_PORTAL,
+                                                ibus_portal_iface_init));
+
+
+static void
+create_input_context_done (IBusBus               *bus,
+                           GAsyncResult          *res,
+                           GDBusMethodInvocation *invocation)
+{
+    GError *error = NULL;
+    IBusInputContext *context;
+    IBusPortalContext *portal_context;
+    char *object_path;
+
+    context = ibus_bus_create_input_context_async_finish (ibus_bus,
+                                                          res,
+                                                          &error);
+    if (context == NULL) {
+        g_dbus_method_invocation_return_gerror (invocation, error);
+        g_error_free (error);
+        return;
+    }
+
+    portal_context = ibus_portal_context_new (
+            context,
+            g_dbus_method_invocation_get_connection (invocation),
+            g_dbus_method_invocation_get_sender (invocation),
+            &error);
+    g_object_unref (context);
+
+    if (portal_context == NULL) {
+        g_dbus_method_invocation_return_gerror (invocation, error);
+        g_error_free (error);
+        g_object_unref (portal_context);
+        return;
+    }
+
+    ibus_dbus_portal_complete_create_input_context (
+            IBUS_DBUS_PORTAL(ibus_portal),
+            invocation, portal_context->object_path);
+}
+
+static gboolean
+ibus_portal_handle_create_input_context (IBusDbusPortal        *object,
+                                         GDBusMethodInvocation *invocation,
+                                         const gchar           *arg_client_name)
+{
+    ibus_bus_create_input_context_async (
+            ibus_bus,
+            arg_client_name, -1,
+            NULL,
+            (GAsyncReadyCallback)create_input_context_done,
+            invocation);
+    return TRUE;
+}
+
+static void
+ibus_portal_iface_init (IBusDbusPortalIface *iface)
+{
+    iface->handle_create_input_context =
+            ibus_portal_handle_create_input_context;
+}
+
+static void
+ibus_portal_init (IBusPortal *portal)
+{
+}
+
+static void
+ibus_portal_class_init (IBusPortalClass *klass)
+{
+}
+
+
+static void
+show_version_and_quit (void)
+{
+    g_print ("%s - Version %s\n", g_get_application_name (), VERSION);
+    exit (EXIT_SUCCESS);
+}
+
+static const GOptionEntry entries[] =
+{
+    { "version",   'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+      show_version_and_quit, "Show the application's version.", NULL },
+    { "verbose",   'v', 0, G_OPTION_ARG_NONE, 
+      &opt_verbose,   "verbose.", NULL },
+    { "replace",   'r', 0, G_OPTION_ARG_NONE,
+      &opt_replace,   "Replace.", NULL },
+    { NULL },
+};
+
+static void
+on_bus_acquired (GDBusConnection *connection,
+                 const gchar     *name,
+                 gpointer         user_data)
+{
+    GError *error = NULL;
+
+    ibus_portal = g_object_new (ibus_portal_get_type (), NULL);
+
+    if (!g_dbus_interface_skeleton_export (
+                G_DBUS_INTERFACE_SKELETON (ibus_portal),
+                connection,
+                IBUS_PATH_IBUS,
+                &error)) {
+        g_warning ("Error exporting portal: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+}
+
+static void
+on_name_acquired (GDBusConnection *connection,
+                  const gchar     *name,
+                  gpointer         user_data)
+{
+}
+
+static void
+on_name_lost (GDBusConnection *connection,
+              const gchar     *name,
+              gpointer         user_data)
+{
+    g_main_loop_quit (loop);
+}
+
+static void
+name_owner_changed (GDBusConnection *connection,
+                    const gchar     *sender_name,
+                    const gchar     *object_path,
+                    const gchar     *interface_name,
+                    const gchar     *signal_name,
+                    GVariant        *parameters,
+                    gpointer         user_data)
+{
+  const char *name, *from, *to;
+
+  g_variant_get (parameters, "(sss)", &name, &from, &to);
+
+  if (name[0] == ':' &&
+      g_strcmp0 (name, from) == 0 &&
+      g_strcmp0 (to, "") == 0)
+    {
+        GList *l, *next;
+        /* Client disconnected, free any input contexts it may have */
+        for (l = all_contexts; l != NULL; l = next) {
+            IBusPortalContext *portal_context = l->data;
+            next = l->next;
+
+            if (g_strcmp0 (portal_context->owner, name) == 0) {
+                g_object_unref (portal_context);
+            }
+        }
+    }
+}
+
+static void
+_bus_disconnected_cb (IBusBus            *ibusbus)
+{
+    g_main_loop_quit (loop);
+}
+
+gint
+main (gint argc, gchar **argv)
+{
+    GDBusConnection *session_bus = NULL;
+    guint owner_id;
+
+    setlocale (LC_ALL, "");
+
+    GOptionContext *context = g_option_context_new ("- ibus daemon");
+    g_option_context_add_main_entries (context, entries, "ibus-daemon");
+
+    GError *error = NULL;
+    if (!g_option_context_parse (context, &argc, &argv, &error)) {
+        g_printerr ("Option parsing failed: %s\n", error->message);
+        g_error_free (error);
+        exit (-1);
+    }
+
+    /* Avoid even loading gvfs to avoid accidental confusion */
+    g_setenv ("GIO_USE_VFS", "local", TRUE);
+
+    ibus_init ();
+
+    ibus_set_log_handler (opt_verbose);
+
+    ibus_bus = ibus_bus_new ();
+    if (!ibus_bus_is_connected (ibus_bus)) {
+        g_printerr ("Not connected to the ibus bus\n");
+        exit (1);
+    }
+
+    g_signal_connect (ibus_bus, "disconnected",
+                      G_CALLBACK (_bus_disconnected_cb), NULL);
+
+    loop = g_main_loop_new (NULL, FALSE);
+
+    session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+    if (session_bus == NULL) {
+        g_printerr ("No session bus: %s", error->message);
+        exit (-1);
+    }
+
+    g_dbus_connection_signal_subscribe (session_bus,
+                                        "org.freedesktop.DBus",
+                                        "org.freedesktop.DBus",
+                                        "NameOwnerChanged",
+                                        "/org/freedesktop/DBus",
+                                        NULL,
+                                        G_DBUS_SIGNAL_FLAGS_NONE,
+                                        name_owner_changed,
+                                        NULL, NULL);
+
+    owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                               IBUS_SERVICE_PORTAL,
+                               G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
+                               (opt_replace ? G_BUS_NAME_OWNER_FLAGS_REPLACE
+                                            : 0),
+                               on_bus_acquired,
+                               on_name_acquired,
+                               on_name_lost,
+                               NULL,
+                               NULL);
+
+    g_main_loop_run (loop);
+
+    g_bus_unown_name (owner_id);
+    g_main_loop_unref (loop);
+
+    return 0;
+}
diff --git a/src/ibusshare.h b/src/ibusshare.h
index bca477c0f..f3e2011ed 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -51,6 +51,13 @@
  */
 #define IBUS_SERVICE_IBUS       "org.freedesktop.IBus"
 
+/**
+ * IBUS_SERVICE_PORTAL:
+ *
+ * Address of IBus portalservice.
+ */
+#define IBUS_SERVICE_PORTAL     "org.freedesktop.portal.IBus"
+
 /**
  * IBUS_SERVICE_PANEL:
  *
@@ -121,6 +128,13 @@
  */
 #define IBUS_INTERFACE_IBUS     "org.freedesktop.IBus"
 
+/**
+ * IBUS_INTERFACE_PORTAL:
+ *
+ * D-Bus interface for IBus portal.
+ */
+#define IBUS_INTERFACE_PORTAL   "org.freedesktop.IBus.Portal"
+
 /**
  * IBUS_INTERFACE_INPUT_CONTEXT:
  *

From 35ce62474fa97a5460d72c360943700a413a07ae Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 31 Aug 2017 12:03:37 +0900
Subject: [PATCH 424/816] Support the portal in the gtk im modules

This adds a new way to create an IbusBus, ibus_bus_new_async_client().
This returns an object that is not guarantee to handle any calls
that are not needed by a client, meaning CreateInputContext and
handling the input context.

If you are running in a flatpak, or if IBUS_USE_PORTAL is set, then
instead of talking to the regular ibus bus we connect to
org.freedesktop.portal.IBus on the session bus and use the
limited org.freedesktop.IBus.Portal interface instead of the
org.freedesktop.IBus interface.

This allows flatpaks (or other sandbox systems) to safely use
dbus clients (apps).

BUG=https://github.com/flatpak/flatpak/issues/675

Review URL: https://codereview.appspot.com/328410043

Patch from Alexander Larsson <alexl@redhat.com>.
---
 client/gtk2/ibusimcontext.c |   4 +-
 src/ibusbus.c               | 248 ++++++++++++++++++++++++++++++++----
 src/ibusbus.h               |  23 ++++
 src/ibusinputcontext.c      |  12 +-
 4 files changed, 256 insertions(+), 31 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 41c7a3afb..b4ca88284 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -583,7 +583,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 
     /* init bus object */
     if (_bus == NULL) {
-        _bus = ibus_bus_new_async ();
+        _bus = ibus_bus_new_async_client ();
 
         /* init the global fake context */
         if (ibus_bus_is_connected (_bus)) {
@@ -603,7 +603,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     }
 
     _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                              IBUS_SERVICE_IBUS,
+                                              ibus_bus_get_service_name (_bus),
                                               G_BUS_NAME_WATCHER_FLAGS_NONE,
                                               daemon_name_appeared,
                                               daemon_name_vanished,
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 75406a370..fc0c90335 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -48,12 +48,14 @@ enum {
 enum {
     PROP_0 = 0,
     PROP_CONNECT_ASYNC,
+    PROP_CLIENT_ONLY,
 };
 
 /* IBusBusPriv */
 struct _IBusBusPrivate {
     GFileMonitor *monitor;
     GDBusConnection *connection;
+    gboolean connected;
     gboolean watch_dbus_signal;
     guint watch_dbus_signal_id;
     gboolean watch_ibus_signal;
@@ -62,7 +64,10 @@ struct _IBusBusPrivate {
     gchar *unique_name;
     gboolean connect_async;
     gchar *bus_address;
+    gboolean use_portal;
+    gboolean client_only;
     GCancellable *cancellable;
+    guint portal_name_watch_id;
 };
 
 static guint    bus_signals[LAST_SIGNAL] = { 0 };
@@ -74,6 +79,7 @@ static GObject  *ibus_bus_constructor           (GType                   type,
                                                  guint                   n_params,
                                                  GObjectConstructParam  *params);
 static void      ibus_bus_destroy               (IBusObject             *object);
+static void      ibus_bus_connect_async         (IBusBus                *bus);
 static void      ibus_bus_watch_dbus_signal     (IBusBus                *bus);
 static void      ibus_bus_unwatch_dbus_signal   (IBusBus                *bus);
 static void      ibus_bus_watch_ibus_signal     (IBusBus                *bus);
@@ -117,8 +123,10 @@ ibus_bus_class_init (IBusBusClass *class)
     IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
 
     gobject_class->constructor = ibus_bus_constructor;
-    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_bus_set_property;
-    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_bus_get_property;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_bus_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_bus_get_property;
     ibus_object_class->destroy = ibus_bus_destroy;
 
     /* install properties */
@@ -128,13 +136,28 @@ ibus_bus_class_init (IBusBusClass *class)
      * Whether the #IBusBus object should connect asynchronously to the bus.
      *
      */
-    g_object_class_install_property (gobject_class,
-                                     PROP_CONNECT_ASYNC,
-                                     g_param_spec_boolean ("connect-async",
-                                                           "Connect Async",
-                                                           "Connect asynchronously to the bus",
-                                                           FALSE,
-                                                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+    g_object_class_install_property (
+            gobject_class,
+            PROP_CONNECT_ASYNC,
+            g_param_spec_boolean ("connect-async",
+                                  "Connect Async",
+                                  "Connect asynchronously to the bus",
+                                  FALSE,
+                                  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+    /**
+     * IBusBus:client-only:
+     *
+     * Whether the #IBusBus object is for client use only.
+     *
+     */
+    g_object_class_install_property (
+            gobject_class,
+            PROP_CLIENT_ONLY,
+            g_param_spec_boolean ("client-only",
+                                  "ClientOnly",
+                                  "Client use only",
+                                  FALSE,
+                                  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
     /* install signals */
     /**
@@ -294,6 +317,8 @@ ibus_bus_close_connection (IBusBus *bus)
     g_cancellable_cancel (bus->priv->cancellable);
     g_cancellable_reset (bus->priv->cancellable);
 
+    bus->priv->connected = FALSE;
+
     /* unref the old connection at first */
     if (bus->priv->connection != NULL) {
         g_signal_handlers_disconnect_by_func (bus->priv->connection,
@@ -311,6 +336,8 @@ static void
 ibus_bus_connect_completed (IBusBus *bus)
 {
     g_assert (bus->priv->connection);
+
+    bus->priv->connected = TRUE;
     /* FIXME */
     ibus_bus_hello (bus);
 
@@ -328,10 +355,39 @@ ibus_bus_connect_completed (IBusBus *bus)
     g_signal_emit (bus, bus_signals[CONNECTED], 0);
 }
 
+static void
+_bus_connect_start_portal_cb (GObject      *source_object,
+                              GAsyncResult *res,
+                              gpointer      user_data)
+{
+    IBusBus *bus = IBUS_BUS (user_data);
+    GVariant *result;
+    GError *error = NULL;
+
+    result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
+                                            res,
+                                            &error);
+    if (result != NULL) {
+        ibus_bus_connect_completed (bus);
+        g_variant_unref (result);
+    } else {
+        g_error_free (error);
+
+        g_dbus_connection_close (bus->priv->connection, NULL, NULL, NULL);
+        g_object_unref (bus->priv->connection);
+        bus->priv->connection = NULL;
+
+        g_free (bus->priv->bus_address);
+        bus->priv->bus_address = NULL;
+    }
+
+    g_object_unref (bus);
+}
+
 static void
 _bus_connect_async_cb (GObject      *source_object,
-                        GAsyncResult *res,
-                        gpointer      user_data)
+                       GAsyncResult *res,
+                       gpointer      user_data)
 {
     g_return_if_fail (user_data != NULL);
     g_return_if_fail (IBUS_IS_BUS (user_data));
@@ -349,7 +405,26 @@ _bus_connect_async_cb (GObject      *source_object,
     }
 
     if (bus->priv->connection != NULL) {
-        ibus_bus_connect_completed (bus);
+        if (bus->priv->use_portal) {
+            g_object_set_data (G_OBJECT (bus->priv->connection),
+                               "ibus-portal-connection",
+                               GINT_TO_POINTER (TRUE));
+            g_dbus_connection_call (
+                    bus->priv->connection,
+                    IBUS_SERVICE_PORTAL,
+                    IBUS_PATH_IBUS,
+                    "org.freedesktop.DBus.Peer",
+                    "Ping",
+                    g_variant_new ("()"),
+                    G_VARIANT_TYPE ("()"),
+                    G_DBUS_CALL_FLAGS_NONE,
+                    -1,
+                    bus->priv->cancellable,
+                    (GAsyncReadyCallback) _bus_connect_start_portal_cb,
+                    g_object_ref (bus));
+        } else {
+            ibus_bus_connect_completed (bus);
+        }
     }
     else {
         g_free (bus->priv->bus_address);
@@ -360,21 +435,32 @@ _bus_connect_async_cb (GObject      *source_object,
     g_object_unref (bus);
 }
 
+static gchar *
+ibus_bus_get_bus_address (IBusBus *bus)
+{
+    if (_bus->priv->use_portal)
+        return g_dbus_address_get_for_bus_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+    else
+        return g_strdup (ibus_get_address ());
+}
+
 static void
 ibus_bus_connect_async (IBusBus *bus)
 {
-    const gchar *bus_address = ibus_get_address ();
+    gchar *bus_address = ibus_bus_get_bus_address (bus);
 
     if (bus_address == NULL)
         return;
 
-    if (g_strcmp0 (bus->priv->bus_address, bus_address) == 0)
+    if (g_strcmp0 (bus->priv->bus_address, bus_address) == 0) {
+        g_free (bus_address);
         return;
+    }
 
     /* Close current connection and cancel ongoing connect request. */
     ibus_bus_close_connection (bus);
 
-    bus->priv->bus_address = g_strdup (bus_address);
+    bus->priv->bus_address = bus_address;
     g_object_ref (bus);
     g_dbus_connection_new_for_address (
             bus_address,
@@ -385,6 +471,28 @@ ibus_bus_connect_async (IBusBus *bus)
             _bus_connect_async_cb, bus);
 }
 
+static gboolean
+is_in_flatpak (void)
+{
+    static gboolean flatpak_info_read;
+    static gboolean in_flatpak;
+
+    if (flatpak_info_read)
+        return in_flatpak;
+
+    flatpak_info_read = TRUE;
+    if (g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS))
+        in_flatpak = TRUE;
+    return in_flatpak;
+}
+
+static gboolean
+ibus_bus_should_connect_portal (IBusBus *bus)
+{
+    return bus->priv->client_only &&
+        (is_in_flatpak () || g_getenv ("IBUS_USE_PORTAL") != NULL);
+}
+
 static void
 ibus_bus_connect (IBusBus *bus)
 {
@@ -431,7 +539,6 @@ ibus_bus_init (IBusBus *bus)
 {
     struct stat buf;
     gchar *path;
-    GFile *file;
 
     bus->priv = IBUS_BUS_GET_PRIVATE (bus);
 
@@ -443,6 +550,7 @@ ibus_bus_init (IBusBus *bus)
     bus->priv->watch_ibus_signal_id = 0;
     bus->priv->unique_name = NULL;
     bus->priv->connect_async = FALSE;
+    bus->priv->client_only = FALSE;
     bus->priv->bus_address = NULL;
     bus->priv->cancellable = g_cancellable_new ();
 
@@ -453,17 +561,12 @@ ibus_bus_init (IBusBus *bus)
 
     if (stat (path, &buf) == 0) {
         if (buf.st_uid != getuid ()) {
-            g_warning ("The owner of %s is not %s!", path, ibus_get_user_name ());
+            g_warning ("The owner of %s is not %s!",
+                       path, ibus_get_user_name ());
             return;
         }
     }
 
-    file = g_file_new_for_path (ibus_get_socket_path ());
-    bus->priv->monitor = g_file_monitor_file (file, 0, NULL, NULL);
-
-    g_signal_connect (bus->priv->monitor, "changed", (GCallback) _changed_cb, bus);
-
-    g_object_unref (file);
     g_free (path);
 }
 
@@ -477,6 +580,9 @@ ibus_bus_set_property (IBusBus      *bus,
     case PROP_CONNECT_ASYNC:
         bus->priv->connect_async = g_value_get_boolean (value);
         break;
+    case PROP_CLIENT_ONLY:
+        bus->priv->client_only = g_value_get_boolean (value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (bus, prop_id, pspec);
     }
@@ -492,25 +598,73 @@ ibus_bus_get_property (IBusBus    *bus,
     case PROP_CONNECT_ASYNC:
         g_value_set_boolean (value, bus->priv->connect_async);
         break;
+    case PROP_CLIENT_ONLY:
+        g_value_set_boolean (value, bus->priv->client_only);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (bus, prop_id, pspec);
     }
 }
 
+static void
+portal_name_appeared (GDBusConnection *connection,
+                      const gchar     *name,
+                      const gchar     *owner,
+                      gpointer         user_data)
+{
+    IBusBus *bus = IBUS_BUS (user_data);
+
+    if (bus->priv->connection == NULL)
+        ibus_bus_connect_async (bus);
+}
+
+static void
+portal_name_vanished (GDBusConnection *connection,
+                      const gchar     *name,
+                      gpointer         user_data)
+{
+    IBusBus *bus = IBUS_BUS (user_data);
+
+    if (bus->priv->connection)
+        g_dbus_connection_close (bus->priv->connection, NULL, NULL, NULL);
+}
+
+
 static GObject*
 ibus_bus_constructor (GType                  type,
                       guint                  n_params,
                       GObjectConstructParam *params)
 {
     GObject *object;
+    GFile *file;
 
     /* share one IBusBus instance in whole application */
     if (_bus == NULL) {
-        object = G_OBJECT_CLASS (ibus_bus_parent_class)->constructor (type, n_params, params);
+        object = G_OBJECT_CLASS (ibus_bus_parent_class)->constructor (
+                type, n_params, params);
         /* make bus object sink */
         g_object_ref_sink (object);
         _bus = IBUS_BUS (object);
 
+        _bus->priv->use_portal = ibus_bus_should_connect_portal (_bus);
+
+        if (!_bus->priv->use_portal) {
+            file = g_file_new_for_path (ibus_get_socket_path ());
+            _bus->priv->monitor = g_file_monitor_file (file, 0, NULL, NULL);
+            g_signal_connect (_bus->priv->monitor, "changed",
+                              (GCallback) _changed_cb, _bus);
+            g_object_unref (file);
+        } else {
+            _bus->priv->portal_name_watch_id =
+                g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                  IBUS_SERVICE_PORTAL,
+                                  G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                  portal_name_appeared,
+                                  portal_name_vanished,
+                                  _bus, NULL);
+        }
+
+
         if (_bus->priv->connect_async)
             ibus_bus_connect_async (_bus);
         else
@@ -561,6 +715,11 @@ ibus_bus_destroy (IBusObject *object)
     g_object_unref (bus->priv->cancellable);
     bus->priv->cancellable = NULL;
 
+    if (bus->priv->portal_name_watch_id) {
+        g_bus_unwatch_name (bus->priv->portal_name_watch_id);
+        bus->priv->portal_name_watch_id = 0;
+    }
+
     IBUS_OBJECT_CLASS (ibus_bus_parent_class)->destroy (object);
 }
 
@@ -656,6 +815,7 @@ ibus_bus_new (void)
 {
     IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS,
                                            "connect-async", FALSE,
+                                           "client-only", FALSE,
                                            NULL));
 
     return bus;
@@ -666,6 +826,18 @@ ibus_bus_new_async (void)
 {
     IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS,
                                            "connect-async", TRUE,
+                                           "client-only", FALSE,
+                                           NULL));
+
+    return bus;
+}
+
+IBusBus *
+ibus_bus_new_async_client (void)
+{
+    IBusBus *bus = IBUS_BUS (g_object_new (IBUS_TYPE_BUS,
+                                           "connect-async", TRUE,
+                                           "client-only", TRUE,
                                            NULL));
 
     return bus;
@@ -679,7 +851,7 @@ ibus_bus_is_connected (IBusBus *bus)
     if (bus->priv->connection == NULL || g_dbus_connection_is_closed (bus->priv->connection))
         return FALSE;
 
-    return TRUE;
+    return bus->priv->connected;
 }
 
 IBusInputContext *
@@ -795,9 +967,9 @@ ibus_bus_create_input_context_async (IBusBus            *bus,
      * 2. New local IBusInputContext proxy of the remote IC
      */
     g_dbus_connection_call (bus->priv->connection,
-            IBUS_SERVICE_IBUS,
+            ibus_bus_get_service_name (bus),
             IBUS_PATH_IBUS,
-            IBUS_INTERFACE_IBUS,
+            bus->priv->use_portal ? IBUS_INTERFACE_PORTAL : IBUS_INTERFACE_IBUS,
             "CreateInputContext",
             g_variant_new ("(s)", client_name),
             G_VARIANT_TYPE("(o)"),
@@ -1454,6 +1626,14 @@ ibus_bus_get_connection (IBusBus *bus)
     return bus->priv->connection;
 }
 
+const gchar *
+ibus_bus_get_service_name (IBusBus *bus)
+{
+    if (bus->priv->use_portal)
+        return IBUS_SERVICE_PORTAL;
+    return IBUS_SERVICE_IBUS;
+}
+
 gboolean
 ibus_bus_exit (IBusBus *bus,
                gboolean restart)
@@ -2369,6 +2549,13 @@ ibus_bus_call_sync (IBusBus            *bus,
     g_assert (member != NULL);
     g_return_val_if_fail (ibus_bus_is_connected (bus), NULL);
 
+    if (bus->priv->use_portal &&
+        g_strcmp0 (bus_name, IBUS_SERVICE_IBUS) == 0)  {
+        bus_name = IBUS_SERVICE_PORTAL;
+        if (g_strcmp0 (interface, IBUS_INTERFACE_IBUS) == 0)
+            interface = IBUS_INTERFACE_PORTAL;
+    }
+
     GError *error = NULL;
     GVariant *result;
     result = g_dbus_connection_call_sync (bus->priv->connection,
@@ -2436,6 +2623,13 @@ ibus_bus_call_async (IBusBus            *bus,
     task = g_task_new (bus, cancellable, callback, user_data);
     g_task_set_source_tag (task, source_tag);
 
+    if (bus->priv->use_portal &&
+        g_strcmp0 (bus_name, IBUS_SERVICE_IBUS) == 0)  {
+        bus_name = IBUS_SERVICE_PORTAL;
+        if (g_strcmp0 (interface, IBUS_INTERFACE_IBUS) == 0)
+            interface = IBUS_INTERFACE_PORTAL;
+    }
+
     g_dbus_connection_call (bus->priv->connection,
                             bus_name,
                             path,
diff --git a/src/ibusbus.h b/src/ibusbus.h
index 9f65d36ac..dff3dfb70 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -105,6 +105,19 @@ IBusBus     *ibus_bus_new               (void);
  */
 IBusBus     *ibus_bus_new_async         (void);
 
+/**
+ * ibus_bus_new_async_client:
+ *
+ * Creates a new #IBusBus instance for client use only. It will possibly
+ * be limited in what it can do.
+ *
+ * The instance will asynchronously connect to the IBus daemon.
+ *
+ * Returns: A newly allocated #IBusBus instance, and the instance is not
+ * floating.
+ */
+IBusBus     *ibus_bus_new_async_client  (void);
+
 
 /**
  * ibus_bus_is_connected:
@@ -127,6 +140,16 @@ gboolean     ibus_bus_is_connected      (IBusBus        *bus);
 GDBusConnection *
              ibus_bus_get_connection    (IBusBus        *bus);
 
+/**
+ * ibus_bus_get_service_name:
+ * @bus: An #IBusBus.
+ *
+ * Return the main service name to use for calls on the ibus connection.
+ *
+ * Returns: at dbus name.
+ */
+const gchar * ibus_bus_get_service_name (IBusBus        *bus);
+
 /**
  * ibus_bus_hello:
  * @bus: An #IBusBus.
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 9a50acc0f..ae7048ad9 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -684,16 +684,20 @@ ibus_input_context_new (const gchar     *path,
 {
     g_assert (path != NULL);
     g_assert (G_IS_DBUS_CONNECTION (connection));
+    const gchar *service_name = IBUS_SERVICE_IBUS;
 
     GInitable *initable;
 
     GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
 
+    if (g_object_get_data (G_OBJECT (connection), "ibus-portal-connection"))
+        service_name = IBUS_SERVICE_PORTAL;
+
     initable = g_initable_new (IBUS_TYPE_INPUT_CONTEXT,
                                cancellable,
                                error,
                                "g-connection",      connection,
-                               "g-name",            IBUS_SERVICE_IBUS,
+                               "g-name",            service_name,
                                "g-flags",           flags,
                                "g-interface-name",  IBUS_INTERFACE_INPUT_CONTEXT,
                                "g-object-path",     path,
@@ -714,16 +718,20 @@ ibus_input_context_new_async (const gchar         *path,
     g_assert (path != NULL);
     g_assert (G_IS_DBUS_CONNECTION (connection));
     g_assert (callback != NULL);
+    const gchar *service_name = IBUS_SERVICE_IBUS;
 
     GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
 
+    if (g_object_get_data (G_OBJECT (connection), "ibus-portal-connection"))
+        service_name = IBUS_SERVICE_PORTAL;
+
     g_async_initable_new_async (IBUS_TYPE_INPUT_CONTEXT,
                                 G_PRIORITY_DEFAULT,
                                 cancellable,
                                 callback,
                                 user_data,
                                 "g-connection",      connection,
-                                "g-name",            IBUS_SERVICE_IBUS,
+                                "g-name",            service_name,
                                 "g-flags",           flags,
                                 "g-interface-name",  IBUS_INTERFACE_INPUT_CONTEXT,
                                 "g-object-path",     path,

From 9772e800f3e6937510f2609c5ce9a6860c59cb81 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 4 Sep 2017 12:02:17 +0900
Subject: [PATCH 425/816] test: Testing in flatpak

Test with:
flatpak-builder --force-clean app org.test.IBus.json
flatpak-builder --run --nofilesystem=host app org.test.IBus.json zenity --entry

BUG=https://github.com/flatpak/flatpak/issues/675
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/329090043

Patch from Alexander Larsson <alexl@redhat.com>.
---
 test/org.test.IBus.json | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 test/org.test.IBus.json

diff --git a/test/org.test.IBus.json b/test/org.test.IBus.json
new file mode 100644
index 000000000..dc3caa62c
--- /dev/null
+++ b/test/org.test.IBus.json
@@ -0,0 +1,43 @@
+{
+    "app-id": "org.test.IBus",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.24",
+    "sdk": "org.gnome.Sdk",
+    "command": "/usr/bin/zenity",
+    "finish-args": [
+        /* X11 + XShm access */
+        "--share=ipc", "--socket=x11",
+        /* Wayland access */
+        "--socket=wayland",
+        /* Needed for dconf to work */
+        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--env=GTK_IM_MODULE_FILE=/app/lib/gtk-3.0/3.0.0/immodules.cache"
+    ],
+    "build-options" : {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": ["/include", "/lib/pkgconfig",
+                "/share/pkgconfig", "/share/aclocal",
+                "/man", "/share/man", "/share/gtk-doc",
+                "/share/vala",
+                "*.la", "*.a"],
+    "modules": [
+        {
+            "name": "ibus",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/alexlarsson/ibus",
+                    "branch": "ibus-portal"
+                }
+            ],
+            "config-opts": ["--disable-emoji-dict", "--disable-dconf"],
+            "post-install": ["gtk-query-immodules-3.0 /app/lib/gtk-3.0/3.0.0/immodules/im-ibus.so > /app/lib/gtk-3.0/3.0.0/immodules.cache"]
+        }
+    ]
+}

From 9937a0e4501ccf0cfd238ce7c97733c3099db3f7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 4 Sep 2017 12:19:07 +0900
Subject: [PATCH 426/816] bus: ibus-daemon activates ibus-portal

When ibus-daemon restarts, ibus-portal exits with on_name_lost() and
the clients wait for portal_name_appeared() until ibus-poral restarts.
Now the clients can connect to ibus-daemon with this way and also
they don't have to activate ibus-portal.

BUG=https://github.com/flatpak/flatpak/issues/675
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/321530043
---
 bus/server.c    | 45 +++++++++++++++++++++++++++++++++++++++++++--
 portal/portal.c |  6 +-----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index ff3ea093b..e28982741 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -93,6 +93,45 @@ bus_new_connection_cb (GDBusServer     *server,
     return TRUE;
 }
 
+static void
+_server_connect_start_portal_cb (GObject      *source_object,
+                                 GAsyncResult *res,
+                                 gpointer      user_data)
+{
+    GVariant *result;
+    GError *error = NULL;
+
+    result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
+                                            res,
+                                            &error);
+    if (result != NULL) {
+        g_variant_unref (result);
+    } else {
+        g_print ("portal is not running: %s\n", error->message);
+        g_error_free (error);
+    }
+}
+
+static void
+bus_acquired_handler (GDBusConnection *connection,
+                      const gchar     *name,
+                      gpointer         user_data)
+{
+    g_dbus_connection_call (connection,
+                            IBUS_SERVICE_PORTAL,
+                            IBUS_PATH_IBUS,
+                            "org.freedesktop.DBus.Peer",
+                            "Ping",
+                            g_variant_new ("()"),
+                            G_VARIANT_TYPE ("()"),
+                            G_DBUS_CALL_FLAGS_NONE,
+                            -1,
+                            NULL /* cancellable */,
+                            (GAsyncReadyCallback)
+                                    _server_connect_start_portal_cb,
+                            NULL);
+}
+
 void
 bus_server_init (void)
 {
@@ -134,8 +173,10 @@ bus_server_init (void)
     ibus_write_address (address);
 
     /* own a session bus name so that third parties can easily track our life-cycle */
-    g_bus_own_name (G_BUS_TYPE_SESSION, IBUS_SERVICE_IBUS, G_BUS_NAME_OWNER_FLAGS_NONE,
-                    NULL, NULL, NULL, NULL, NULL);
+    g_bus_own_name (G_BUS_TYPE_SESSION, IBUS_SERVICE_IBUS,
+                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                    bus_acquired_handler,
+                    NULL, NULL, NULL, NULL);
 }
 
 const gchar *
diff --git a/portal/portal.c b/portal/portal.c
index 0415f9960..cb24d257b 100644
--- a/portal/portal.c
+++ b/portal/portal.c
@@ -101,10 +101,6 @@ _forward_method_cb (GObject *source_object,
                     gpointer user_data)
 {
     GDBusMethodInvocation *invocation = user_data;
-    IBusPortalContext *portal_context =
-            (IBusPortalContext *) g_dbus_method_invocation_get_user_data (
-                    invocation);
-    IBusEngineDesc *desc;
     GError *error = NULL;
 
     GVariant *variant = g_dbus_proxy_call_finish ((GDBusProxy *) source_object,
@@ -413,6 +409,7 @@ ibus_portal_context_handle_destroy (IBusDbusService       *object,
                                     IBusPortalContext     *portal_context)
 {
     g_object_unref (portal_context);
+    return FALSE;
 }
 
 static IBusPortalContext *
@@ -475,7 +472,6 @@ create_input_context_done (IBusBus               *bus,
     GError *error = NULL;
     IBusInputContext *context;
     IBusPortalContext *portal_context;
-    char *object_path;
 
     context = ibus_bus_create_input_context_async_finish (ibus_bus,
                                                           res,

From 3e01bab972ad12b92c55a9dde554a0359c217290 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 6 Sep 2017 12:04:52 +0900
Subject: [PATCH 427/816] portal: Add org.freedesktop.IBus.Portal.xml in
 EXTRA_DIST

Review URL: https://codereview.appspot.com/325370043
---
 portal/Makefile.am | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/portal/Makefile.am b/portal/Makefile.am
index 954fc5915..d1e2051ae 100644
--- a/portal/Makefile.am
+++ b/portal/Makefile.am
@@ -65,12 +65,6 @@ ibus_portal_LDADD = \
 	$(AM_LDADD) \
 	$(NULL)
 
-EXTRA_DIST = \
-	$(NULL)
-
-CLEANFILES = \
-	$(NULL)
-
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
 
@@ -89,7 +83,14 @@ $(ibus_dbus_built_sources) : org.freedesktop.IBus.Portal.xml
 		$^ \
 		$(NULL)
 
-EXTRA_DIST += $(dbusservice_in_files)
-CLEANFILES += $(dbusservice_DATA)
+EXTRA_DIST = \
+    $(dbusservice_in_files) \
+    org.freedesktop.IBus.Portal.xml \
+    $(NULL)
+
+CLEANFILES = \
+    $(dbusservice_DATA) \
+    $(NULL)
+
 
 -include $(top_srcdir)/git.mk

From 21bac4733684ca6a74ddb02f457c0fe19eb9180d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 6 Sep 2017 12:11:01 +0900
Subject: [PATCH 428/816] ui/gtk3: Move ibus-emoji-dialog.vapi from ui/gtk3 to
 bindings/vala

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/322590043
---
 .../vala}/IBusEmojiDialog-1.0.metadata        |   0
 bindings/vala/Makefile.am                     | 161 ++++++++++++++++--
 .../vala}/ibus-emoji-dialog-1.0.deps          |   0
 po/POTFILES.skip                              |   5 +
 ui/gtk3/Makefile.am                           | 113 +++---------
 ui/gtk3/emojier.vala                          |  19 ++-
 ui/gtk3/ibusemojidialog.h                     |  26 +++
 7 files changed, 213 insertions(+), 111 deletions(-)
 rename {ui/gtk3 => bindings/vala}/IBusEmojiDialog-1.0.metadata (100%)
 rename {ui/gtk3 => bindings/vala}/ibus-emoji-dialog-1.0.deps (100%)

diff --git a/ui/gtk3/IBusEmojiDialog-1.0.metadata b/bindings/vala/IBusEmojiDialog-1.0.metadata
similarity index 100%
rename from ui/gtk3/IBusEmojiDialog-1.0.metadata
rename to bindings/vala/IBusEmojiDialog-1.0.metadata
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 4e34afc79..fc8e2f012 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2017 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
@@ -22,15 +23,47 @@
 
 -include $(VAPIGEN_MAKEFILE)
 
+libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+
+noinst_LTLIBRARIES =
+noinst_DATA =
+INTROSPECTION_GIRS =
+girdir = $(datadir)/gir-1.0
+
+AM_CPPFLAGS = \
+    -I$(top_srcdir)/src \
+    -I$(top_builddir)/src \
+    -include $(CONFIG_HEADER) \
+    $(NULL)
+AM_CFLAGS = \
+    -DG_LOG_DOMAIN=\"IBUS\" \
+    -DPKGDATADIR=\"$(pkgdatadir)\" \
+    -DIBUS_DISABLE_DEPRECATED \
+    -Wno-unused-variable \
+    -Wno-unused-but-set-variable \
+    -Wno-unused-function \
+    $(NULL)
+AM_VALAFLAGS = \
+    --vapidir=$(builddir) \
+    --vapidir=$(srcdir) \
+    --pkg=posix \
+    --pkg=gtk+-3.0 \
+    --pkg=gdk-x11-3.0 \
+    --pkg=ibus-1.0 \
+    --pkg=config \
+    --pkg=xi \
+    --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
+    $(NULL)
+
 vapi_deps = \
 	IBus-1.0.metadata \
-	IBus-1.0-custom.vala \
 	$(top_builddir)/src/IBus-1.0.gir \
 	$(NULL)
 
 ibus-1.0.vapi: $(vapi_deps)
 
-VAPIGEN_VAPIS = ibus-1.0.vapi
+ibus_vapi = ibus-1.0.vapi
+VAPIGEN_VAPIS = $(ibus_vapi)
 
 ibus_1_0_vapi_DEPS = gio-2.0
 ibus_1_0_vapi_METADATADIRS = $(srcdir)
@@ -40,18 +73,118 @@ ibus_1_0_vapi_FILES = \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+vapi_DATA = $(ibus_vapi) $(ibus_vapi:.vapi=.deps)
 
-MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
-DISTCLEANFILES = $(VAPIGEN_VAPIS)
+MAINTAINERCLEANFILES = $(ibus_vapi)
+DISTCLEANFILES = $(ibus_vapi)
 
-EXTRA_DIST = \
-	$(VAPIGEN_VAPIS) \
-	IBus-1.0.metadata \
-	IBus-1.0-custom.vala \
-	ibus-1.0.deps \
-	config.vapi \
-	xi.vapi \
-	$(NULL)
+EXTRA_DIST =                                    \
+    $(ibus_vapi)                                \
+    IBus-1.0.metadata                           \
+    IBus-1.0-custom.vala                        \
+    IBusEmojiDialog-1.0.metadata                \
+    ibus-1.0.deps                               \
+    ibus-emoji-dialog-1.0.deps                  \
+    config.vapi                                 \
+    xi.vapi                                     \
+    $(NULL)
+
+if ENABLE_EMOJI_DICT
+AM_VALAFLAGS += --define=EMOJI_DICT
+
+libibus_emoji_dialog = libibus-emoji-dialog-1.0.la
+noinst_LTLIBRARIES += $(libibus_emoji_dialog)
+
+libibus_emoji_dialog_1_0_la_SOURCES =           \
+    candidatearea.vala                          \
+    emojier.vala                                \
+    iconwidget.vala                             \
+    pango.vala                                  \
+    separator.vala                              \
+    $(NULL)
+libibus_emoji_dialog_1_0_la_CFLAGS =            \
+    $(AM_CFLAGS)                                \
+    @GLIB2_CFLAGS@                              \
+    @GIO2_CFLAGS@                               \
+    @GTHREAD2_CFLAGS@                           \
+    @GTK3_CFLAGS@                               \
+    @X11_CFLAGS@                                \
+    -DBINDIR=\"$(bindir)\"                      \
+    $(NULL)
+libibus_emoji_dialog_1_0_la_LIBADD =            \
+    @GLIB2_LIBS@                                \
+    @GIO2_LIBS@                                 \
+    @GTHREAD2_LIBS@                             \
+    @GTK3_LIBS@                                 \
+    @X11_LIBS@                                  \
+    -lXi                                        \
+    $(libibus)                                  \
+    $(NULL)
+libibus_emoji_dialog_1_0_la_LDFLAGS =           \
+    -no-undefined                               \
+    -export-symbols-regex "ibus_.*"             \
+    $(NULL)
+
+# per file setting is needed to avoid conflicting LN_S by calling
+# duplicated times in parallel make
+%.vala: $(ibus_vapi)
+	if test ! -f $@ ; then                                              \
+	    $(LN_S) $(top_srcdir)/ui/gtk3/$@ .;                             \
+	fi;
+
+MAINTAINERCLEANFILES += $(libibus_emoji_dialog_1_0_la_SOURCES)
+DISTCLEANFILES += $(libibus_emoji_dialog_1_0_la_SOURCES)
+
+if HAVE_INTROSPECTION
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_SCANNER_ARGS =
+INTROSPECTION_COMPILER_ARGS =                   \
+    --includedir=$(srcdir)                      \
+    --includedir=.                              \
+    --includedir=$(top_srcdir)/src              \
+    $(NULL)
+
+
+emoji_headers =                                 \
+    $(top_srcdir)/ui/gtk3/ibusemojidialog.h     \
+    $(NULL)
+
+IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
+IBusEmojiDialog_1_0_gir_SCANNERFLAGS =          \
+    --pkg-export=ibus-1.0                       \
+    --pkg=gtk+-3.0                              \
+    $(IBUS_GIR_SCANNERFLAGS)                    \
+    $(NULL)
+IBusEmojiDialog_1_0_gir_INCLUDES = Gtk-3.0 GLib-2.0 GObject-2.0 Gio-2.0
+IBusEmojiDialog_1_0_gir_LIBS = $(libibus_emoji_dialog) $(libibus)
+IBusEmojiDialog_1_0_gir_FILES = $(emoji_headers)
+IBusEmojiDialog_1_0_gir_CFLAGS =                \
+    -I$(srcdir)                                 \
+    -I$(builddir)                               \
+    -I$(top_srcdir)/src                         \
+    $(NULL)
+
+ibus_emoji_dialog_gir = IBusEmojiDialog-1.0.gir
+INTROSPECTION_GIRS += $(ibus_emoji_dialog_gir)
+noinst_DATA += $(ibus_emoji_dialog_gir)
+EXTRA_DIST += $(ibus_emoji_dialog_gir)
+MAINTAINERCLEANFILES += $(ibus_emoji_dialog_gir)
+DISTCLEANFILES += $(ibus_emoji_dialog_gir)
+
+ibus-emoji-dialog-1.0.vapi: $(ibus_emoji_dialog_gir) IBusEmojiDialog-1.0.metadata
+ibus_emoji_dialog_vapi = ibus-emoji-dialog-1.0.vapi
+ibus_emoji_dialog_1_0_vapi_DEPS = gtk+-3.0 gio-2.0
+ibus_emoji_dialog_1_0_vapi_METADATADIRS = $(srcdir)
+ibus_emoji_dialog_1_0_vapi_FILES = IBusEmojiDialog-1.0.gir
+VAPIGEN_VAPIS += $(ibus_emoji_dialog_vapi)
+noinst_DATA += $(ibus_emoji_dialog_vapi)
+EXTRA_DIST += $(ibus_emoji_dialog_vapi)
+MAINTAINERCLEANFILES += $(ibus_emoji_dialog_vapi)
+DISTCLEANFILES += $(ibus_emoji_dialog_vapi)
+
+endif
+#end of HAVE_INTROSPECTION
+endif
+# end of ENABLE_EMOJI_DICT
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/gtk3/ibus-emoji-dialog-1.0.deps b/bindings/vala/ibus-emoji-dialog-1.0.deps
similarity index 100%
rename from ui/gtk3/ibus-emoji-dialog-1.0.deps
rename to bindings/vala/ibus-emoji-dialog-1.0.deps
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7190221d1..10b882982 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,6 +2,11 @@
 # Please keep this file in alphabetical order.
 # Files under ui/gtk2/ are not shipped in the distribution, but kept
 # in the git repository for reference.
+bindings/vala/candidatearea.c
+bindings/vala/emojier.c
+bindings/vala/iconwidget.c
+bindings/vala/pango.c
+bindings/vala/separator.c
 ibus/_config.py
 tools/main.c
 ui/gtk2/candidatepanel.py
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index c79641a59..786b80e60 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -81,10 +81,6 @@ AM_VALAFLAGS = \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
-MAINTAINERCLEANFILES =
-DISTCLEANFILES =
-noinst_DATA =
-
 if ENABLE_LIBNOTIFY
 AM_CFLAGS += \
 	@LIBNOTIFY_CFLAGS@ \
@@ -158,9 +154,8 @@ man_seven_in_files = ibus-emoji.7.in
 EXTRA_DIST =                            \
     $(emoji_headers)                    \
     $(man_seven_in_files)               \
-    IBusEmojiDialog-1.0.metadata        \
+    emojierapp.vala                     \
     gtkpanel.xml.in                     \
-    ibus-emoji-dialog-1.0.deps          \
     notification-item.xml               \
     notification-watcher.xml            \
     $(NULL)
@@ -168,98 +163,40 @@ EXTRA_DIST =                            \
 if ENABLE_EMOJI_DICT
 AM_VALAFLAGS += --define=EMOJI_DICT
 
-libibus_emoji_dialog = libibus-emoji-dialog-1.0.la
-
-noinst_LTLIBRARIES = $(libibus_emoji_dialog)
-
-libibus_emoji_dialog_1_0_la_CFLAGS = $(AM_CFLAGS)
-libibus_emoji_dialog_1_0_la_LDFLAGS =   \
-    -no-undefined                       \
-    -export-symbols-regex "ibus_.*"     \
-    -version-info @LT_VERSION_INFO@     \
-    $(NULL)
-libibus_emoji_dialog_1_0_la_SOURCES =   \
-    candidatearea.vala                  \
-    emojier.vala                        \
-    iconwidget.vala                     \
-    pango.vala                          \
-    separator.vala                      \
-    $(NULL)
-
 libexec_PROGRAMS += ibus-ui-emojier
 
-ibus_ui_emojier_SOURCES =                       \
-    $(libibus_emoji_dialog_1_0_la_SOURCES)      \
+ibus_ui_emojier_VALASOURCES =                   \
     emojierapp.vala                             \
+    candidatearea.vala                          \
+    emojier.vala                                \
+    iconwidget.vala                             \
+    pango.vala                                  \
+    separator.vala                              \
+    $(NULL)
+ibus_ui_emojier_SOURCES =                       \
+    $(ibus_ui_emojier_VALASOURCES:.vala=.c)     \
     $(NULL)
 
 ibus_ui_emojier_LDADD =                         \
     $(AM_LDADD)                                 \
     $(NULL)
 
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ARGS =
-INTROSPECTION_COMPILER_ARGS =      \
-    --includedir=$(srcdir)         \
-    --includedir=.                 \
-    --includedir=$(top_srcdir)/src \
-    $(NULL)
-
-if HAVE_INTROSPECTION
-introspection_sources =                \
-    $(emoji_headers)                   \
-    $(NULL)
-IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
-IBusEmojiDialog_1_0_gir_SCANNERFLAGS = \
-    --pkg-export=ibus-1.0              \
-    --pkg=gtk+-3.0                     \
-    $(IBUS_GIR_SCANNERFLAGS)           \
+ibus_ui_emojier_VALAFLAGS =                     \
+    $(AM_VALAFLAGS)                             \
     $(NULL)
-IBusEmojiDialog-1.0.gir: $(libibus_emoji_dialog) Makefile
-IBusEmojiDialog_1_0_gir_INCLUDES = Gtk-3.0 GLib-2.0 GObject-2.0 Gio-2.0
-IBusEmojiDialog_1_0_gir_LIBS = $(libibus_emoji_dialog) $(libibus)
-IBusEmojiDialog_1_0_gir_FILES =                      \
-    $(addprefix $(srcdir)/,$(introspection_sources)) \
-    $(NULL)
-IBusEmojiDialog_1_0_gir_CFLAGS =       \
-    -DIBUS_COMPILATION                 \
-    -I$(srcdir)                        \
-    -I$(builddir)                      \
-    -I$(top_srcdir)/src                \
-    $(NULL)
-INTROSPECTION_GIRS = IBusEmojiDialog-1.0.gir
-
-girdir = $(datadir)/gir-1.0
-noinst_DATA += $(INTROSPECTION_GIRS)
-CLEANFILES += $(INTROSPECTION_GIRS)
 
-typelibsdir = $(libdir)/girepository-1.0
-noinst_DATA += $(INTROSPECTION_GIRS:.gir=.typelib)
-CLEANFILES += $(INTROSPECTION_GIRS:.gir=.typelib)
-
-
-if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
-
-ibus-emoji-dialog-1.0.vapi: $(INTROSPECTION_GIRS) IBusEmojiDialog-1.0.metadata
-
-VAPIGEN_VAPIS = ibus-emoji-dialog-1.0.vapi
-
-ibus_emoji_dialog_1_0_vapi_DEPS = gtk+-3.0 gio-2.0
-ibus_emoji_dialog_1_0_vapi_METADATADIRS = $(srcdir)
-ibus_emoji_dialog_1_0_vapi_FILES = $(INTROSPECTION_GIRS)
-
-vapidir = $(datadir)/vala/vapi
-noinst_DATA += $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
-
-MAINTAINERCLEANFILES += $(VAPIGEN_VAPIS)
-DISTCLEANFILES += $(VAPIGEN_VAPIS)
-EXTRA_DIST += $(VAPIGEN_VAPIS)
-
-# end of ENABLE_VAPIGEN
-endif
-# end of HAVE_INTROSPECTION
-endif
+# This line and foo_VALASOURCES line can delete the duplicated entries
+# of emojier.c: emojier.vala
+emojierapp.c: $(ibus_ui_emojier_VALASOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
+$(VALAFLAGS) -C $(ibus_ui_emojier_VALASOURCES)
+	$(NULL)
+# make dist creates .c files in a different srcdir
+emojierapp.o: $(srcdir)/emojierapp.c
+	$(AM_V_CC)source='$<' object='$@' libtool=no \
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
+	$(NULL)
 
 man_seven_files = $(man_seven_in_files:.7.in=.7)
 man_seven_DATA =$(man_seven_files:.7=.7.gz)
@@ -276,7 +213,7 @@ CLEANFILES += \
     $(man_seven_files) \
     $(NULL)
 
-# end of ENABLE_EMOJI_DICT
 endif
+# end of ENABLE_EMOJI_DICT
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 9df59ac48..36ab4babe 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1139,6 +1139,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                     m_category_active_index = (int)list.length();
         }
         Gtk.Adjustment adjustment = m_list_box.get_adjustment();
+        m_scrolled_window.set_hadjustment(new Gtk.Adjustment(0, 0, 0, 0, 0, 0));
         m_scrolled_window.set_vadjustment(adjustment);
         show_category_list();
     }
@@ -1156,7 +1157,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             else if (keyval == Gdk.Key.Right)
                 m_lookup_table.cursor_down();
             show_candidate_panel();
-        } else if (m_entry.get_text().len() > 0) {
+        } else if (m_entry.get_text().length > 0) {
             int step = 0;
             if (keyval == Gdk.Key.Left)
                 step = -1;
@@ -1211,7 +1212,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             show_candidate_panel();
             return true;
         }
-        if (m_entry.get_text().len() > 0) {
+        if (m_entry.get_text().length > 0) {
             int step = 0;
             if (keyval == Gdk.Key.Home)
                 step = -1;
@@ -1410,7 +1411,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             key_press_enter();
             return true;
         case Gdk.Key.BackSpace:
-            if (m_entry.get_text().len() > 0) {
+            if (m_entry.get_text().length > 0) {
                 if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
                     GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
                                              Gtk.DeleteType.WORD_ENDS, -1);
@@ -1422,7 +1423,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             break;
         case Gdk.Key.Delete:
         case Gdk.Key.KP_Delete:
-            if (m_entry.get_text().len() > 0) {
+            if (m_entry.get_text().length > 0) {
                 if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
                     GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
                                              Gtk.DeleteType.WORD_ENDS, 1);
@@ -1436,7 +1437,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
             if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
-                if (m_entry.get_text().len() > 0)
+                if (m_entry.get_text().length > 0)
                     entry_enter_keyval(keyval);
             } else if (m_candidate_panel_is_visible) {
                 enter_notify_disable_with_timer();
@@ -1512,7 +1513,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                     return true;
                 break;
             case Gdk.Key.u:
-                if (m_entry.get_text().len() > 0) {
+                if (m_entry.get_text().length > 0) {
                     GLib.Signal.emit_by_name(m_entry,
                                              "delete-from-cursor",
                                              Gtk.DeleteType.PARAGRAPH_ENDS,
@@ -1521,13 +1522,13 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 }
                 break;
             case Gdk.Key.a:
-                if (m_entry.get_text().len() > 0) {
+                if (m_entry.get_text().length > 0) {
                     m_entry.select_region(0, -1);
                     return true;
                 }
                 break;
             case Gdk.Key.x:
-                if (m_entry.get_text().len() > 0) {
+                if (m_entry.get_text().length > 0) {
                     GLib.Signal.emit_by_name(m_entry, "cut-clipboard");
                     return true;
                 }
@@ -1544,7 +1545,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                         clipboard.store();
                         return true;
                     }
-                } else if (m_entry.get_text().len() > 0) {
+                } else if (m_entry.get_text().length > 0) {
                     GLib.Signal.emit_by_name(m_entry, "copy-clipboard");
                     return true;
                 }
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index 24d195c84..ed8886a8e 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -170,5 +170,31 @@ void          ibus_emojier_set_favorites          (gchar**      favorites,
                                                    favorite_annotations,
                                                    int
                                                    favorite_annotations_length);
+
+/**
+ * ibus_emojier_set_partial_match:
+ * @has_partial_match: Enable the partial match if %TRUE. Otherwise if %FALSE.
+ *
+ * Set partial match for emoji annotations.
+ */
+void          ibus_emojier_set_partial_match      (gboolean  has_partial_match);
+
+/**
+ * ibus_emojier_set_partial_match_length:
+ * @length: minimum lenght to match partially.
+ *
+ * Set the minimum lenght to match partially.
+ */
+void          ibus_emojier_set_partial_match_length
+                                                  (gint         length);
+
+/**
+ * ibus_emojier_set_partial_match_condition:
+ * @condition: condition id between 0 and 2.
+ *
+ * Set the partial match condition with the integer.
+ */
+void          ibus_emojier_set_partial_match_condition
+                                                  (gint         condition);
 G_END_DECLS
 #endif

From d788918b635275d0247e68f26f9c840100bca366 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 6 Sep 2017 12:17:30 +0900
Subject: [PATCH 429/816] ui/gtk3: Switcher should ignore mouse until it moves

BUG=https://github.com/ibus/ibus/issues/1929

Review URL: https://codereview.appspot.com/329100043
---
 ui/gtk3/switcher.vala | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index cf1875556..269a68d4c 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -91,6 +91,9 @@ class Switcher : Gtk.Window {
     private uint m_popup_delay_time_id = 0;
     private int m_root_x;
     private int m_root_y;
+    private double m_mouse_init_x;
+    private double m_mouse_init_y;
+    private bool   m_mouse_moved;
     private GLib.HashTable<string, string> m_xkb_languages =
             new GLib.HashTable<string, string>(GLib.str_hash,
                                                GLib.str_equal);
@@ -221,6 +224,11 @@ class Switcher : Gtk.Window {
                               Gdk.CURRENT_TIME);
         if (status != Gdk.GrabStatus.SUCCESS)
             warning("Grab pointer failed! status = %d", status);
+        // Probably we can delete m_popup_delay_time in 1.6
+        pointer.get_position_double(null,
+                                    out m_mouse_init_x,
+                                    out m_mouse_init_y);
+        m_mouse_moved = false;
 
 
         m_loop = new GLib.MainLoop();
@@ -263,12 +271,30 @@ class Switcher : Gtk.Window {
             var button = new IBusEngineButton(engine, this);
             var longname = engine.get_longname();
             button.set_relief(Gtk.ReliefStyle.NONE);
+            button.add_events(Gdk.EventMask.POINTER_MOTION_MASK);
             button.show();
 
             button.enter_notify_event.connect((e) => {
+                // avoid gtk_button_update_state()
+                return true;
+            });
+            button.motion_notify_event.connect((e) => {
+#if VALA_0_24
+                Gdk.EventMotion pe = e;
+#else
+                Gdk.EventMotion *pe = &e;
+#endif
+                if (m_selected_engine == index)
+                    return false;
+                if (!m_mouse_moved &&
+                    m_mouse_init_x == pe.x_root &&
+                    m_mouse_init_y == pe.y_root) {
+                    return false;
+                }
+                m_mouse_moved = true;
                 button.grab_focus();
                 m_selected_engine = index;
-                return true;
+                return false;
             });
 
             button.button_press_event.connect((e) => {

From bbfb3d738b9d61d1eb0658a9ce56e3cd8c111ac4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 6 Sep 2017 14:08:40 +0900
Subject: [PATCH 430/816] client/gtk2: Do not send key events to
 GtkIMContextSimple

GtkIMContextSimple binds Ctrl-Shift-u but IBus clients do not now.

BUG=https://github.com/ibus/ibus/issues/1889
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/327290043
---
 client/gtk2/ibusimcontext.c | 41 +++++++++++++++++++++++++++++++++++--
 src/ibusenginesimple.c      | 23 ++-------------------
 src/ibusenginesimple.h      | 24 ++++++++++++++++++++--
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index b4ca88284..3ea46951c 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2017 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
@@ -247,6 +248,39 @@ _focus_out_cb (GtkWidget     *widget,
     return FALSE;
 }
 
+static gboolean
+ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
+                              GdkEventKey   *event)
+{
+    int i;
+    GdkModifierType no_text_input_mask;
+    gunichar ch;
+
+    if (event->type == GDK_KEY_RELEASE)
+        return FALSE;
+    /* Ignore modifier key presses */
+    for (i = 0; i < G_N_ELEMENTS (IBUS_COMPOSE_IGNORE_KEYLIST); i++)
+        if (event->keyval == IBUS_COMPOSE_IGNORE_KEYLIST[i])
+            return FALSE;
+    no_text_input_mask = gdk_keymap_get_modifier_mask (
+            gdk_keymap_get_for_display (gdk_display_get_default ()),
+            GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
+    if (event->state & no_text_input_mask ||
+        event->keyval == GDK_KEY_Return ||
+        event->keyval == GDK_KEY_ISO_Enter ||
+        event->keyval == GDK_KEY_KP_Enter) {
+        return FALSE;
+    }
+    ch = ibus_keyval_to_unicode (event->keyval);
+    if (ch != 0 && !g_unichar_iscntrl (ch)) {
+        IBusText *text = ibus_text_new_from_unichar (ch);
+        g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
+        g_object_unref (text);
+        return TRUE;
+    }
+   return FALSE;
+}
+
 static void
 _process_key_event_done (GObject      *object,
                          GAsyncResult *res,
@@ -797,8 +831,11 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
     if (event->state & IBUS_HANDLED_MASK)
         return TRUE;
 
+    /* Do not call gtk_im_context_filter_keypress() because
+     * gtk_im_context_simple_filter_keypress() binds Ctrl-Shift-u
+     */
     if (event->state & IBUS_IGNORED_MASK)
-        return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
+        return ibus_im_context_commit_event (ibusimcontext, event);
 
     /* XXX it is a workaround for some applications do not set client
      * window. */
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index cddd932c5..63785223a 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -81,25 +81,6 @@ const IBusComposeTableCompact ibus_compose_table_compact = {
 
 static GSList *global_tables;
 
-static const guint16 ibus_compose_ignore[] = {
-    IBUS_KEY_Shift_L,
-    IBUS_KEY_Shift_R,
-    IBUS_KEY_Control_L,
-    IBUS_KEY_Control_R,
-    IBUS_KEY_Caps_Lock,
-    IBUS_KEY_Shift_Lock,
-    IBUS_KEY_Meta_L,
-    IBUS_KEY_Meta_R,
-    IBUS_KEY_Alt_L,
-    IBUS_KEY_Alt_R,
-    IBUS_KEY_Super_L,
-    IBUS_KEY_Super_R,
-    IBUS_KEY_Hyper_L,
-    IBUS_KEY_Hyper_R,
-    IBUS_KEY_Mode_switch,
-    IBUS_KEY_ISO_Level3_Shift
-};
-
 /* functions prototype */
 static void     ibus_engine_simple_destroy      (IBusEngineSimple   *simple);
 static void     ibus_engine_simple_reset        (IBusEngine         *engine);
@@ -1045,8 +1026,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     }
 
     /* Ignore modifier key presses */
-    for (i = 0; i < G_N_ELEMENTS (ibus_compose_ignore); i++)
-        if (keyval == ibus_compose_ignore[i])
+    for (i = 0; i < G_N_ELEMENTS (IBUS_COMPOSE_IGNORE_KEYLIST); i++)
+        if (keyval == IBUS_COMPOSE_IGNORE_KEYLIST[i])
             return FALSE;
 
     if ((priv->in_hex_sequence || priv->in_emoji_sequence)
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index 8712659c3..a5ef34fb3 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2016 Red Hat, Inc.
+ * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2017 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
@@ -40,6 +40,7 @@
  */
 
 #include "ibusengine.h"
+#include "ibuskeysyms.h"
 
 G_BEGIN_DECLS
 
@@ -94,6 +95,25 @@ struct _IBusEngineSimpleClass {
     gpointer pdummy[8];
 };
 
+static const guint16 IBUS_COMPOSE_IGNORE_KEYLIST[] = {
+    IBUS_KEY_Shift_L,
+    IBUS_KEY_Shift_R,
+    IBUS_KEY_Control_L,
+    IBUS_KEY_Control_R,
+    IBUS_KEY_Caps_Lock,
+    IBUS_KEY_Shift_Lock,
+    IBUS_KEY_Meta_L,
+    IBUS_KEY_Meta_R,
+    IBUS_KEY_Alt_L,
+    IBUS_KEY_Alt_R,
+    IBUS_KEY_Super_L,
+    IBUS_KEY_Super_R,
+    IBUS_KEY_Hyper_L,
+    IBUS_KEY_Hyper_R,
+    IBUS_KEY_Mode_switch,
+    IBUS_KEY_ISO_Level3_Shift
+};
+
 GType   ibus_engine_simple_get_type       (void);
 
 /**

From d784e04c38eeb069f9a8da8b30743f4463fa34c3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 7 Sep 2017 10:57:14 +0900
Subject: [PATCH 431/816] client/gtk2: Fix a build failure with
 GDK_MODIFIER_INTENT_NO_TEXT_INPUT

BUG=https://github.com/ibus/ibus/issues/1942

Review URL: https://codereview.appspot.com/327300043
---
 client/gtk2/ibusimcontext.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 3ea46951c..a806382d5 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -262,9 +262,21 @@ ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
     for (i = 0; i < G_N_ELEMENTS (IBUS_COMPOSE_IGNORE_KEYLIST); i++)
         if (event->keyval == IBUS_COMPOSE_IGNORE_KEYLIST[i])
             return FALSE;
+#if GTK_CHECK_VERSION (3, 4, 0)
     no_text_input_mask = gdk_keymap_get_modifier_mask (
             gdk_keymap_get_for_display (gdk_display_get_default ()),
             GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
+#else
+#  ifndef GDK_WINDOWING_QUARTZ
+#    define _IBUS_NO_TEXT_INPUT_MOD_MASK (GDK_MOD1_MASK | GDK_CONTROL_MASK)
+#  else
+#    define _IBUS_NO_TEXT_INPUT_MOD_MASK (GDK_MOD2_MASK | GDK_CONTROL_MASK)
+#  endif
+
+    no_text_input_mask = _IBUS_NO_TEXT_INPUT_MOD_MASK;
+
+#  undef _IBUS_NO_TEXT_INPUT_MOD_MASK
+#endif
     if (event->state & no_text_input_mask ||
         event->keyval == GDK_KEY_Return ||
         event->keyval == GDK_KEY_ISO_Enter ||

From 79aebc5553adeb2beff924135ee3b7e4e6c7eb94 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 11 Sep 2017 12:32:35 +0900
Subject: [PATCH 432/816] Remove debian directory upon the Debian's request

Makefile.am is also modified to get rid of debian words.

BUG=https://github.com/ibus/ibus/issues/1945
R=Shawn.P.Huang@gmail.com, osamu.aoki@gmail.com, shawn.p.huang@gmail.com

Review URL: https://codereview.appspot.com/322670043
---
 Makefile.am                  |  42 -----
 debian/README.source         |  26 ---
 debian/changelog.in          |   5 -
 debian/clean                 |   4 -
 debian/compat                |   1 -
 debian/control               | 100 -----------
 debian/copyright             | 260 ---------------------------
 debian/docs                  |   2 -
 debian/ibus-daemon.1         |   1 -
 debian/ibus-gconf.1          |   1 -
 debian/ibus-gtk2.install     |   1 -
 debian/ibus-gtk3.install     |   1 -
 debian/ibus-setup.1          |  26 ---
 debian/ibus-ui-gtk.1         |   1 -
 debian/ibus-x11.1            |   1 -
 debian/ibus.1                |  27 ---
 debian/ibus.install          |   9 -
 debian/ibus.manpages         |   6 -
 debian/ibus.postinst         |  34 ----
 debian/ibus.prerm            |  30 ----
 debian/libibus-1.0-0.install |   2 -
 debian/libibus-1.0-0.symbols | 328 -----------------------------------
 debian/libibus-dev.install   |   6 -
 debian/patches/00list        |   0
 debian/python-ibus.install   |   1 -
 debian/pyversions            |   1 -
 debian/rules                 |  61 -------
 debian/source/format         |   1 -
 debian/watch                 |   3 -
 debian/xinput/ibus           |  16 --
 30 files changed, 997 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/changelog.in
 delete mode 100644 debian/clean
 delete mode 100644 debian/compat
 delete mode 100644 debian/control
 delete mode 100644 debian/copyright
 delete mode 100644 debian/docs
 delete mode 100644 debian/ibus-daemon.1
 delete mode 100644 debian/ibus-gconf.1
 delete mode 100644 debian/ibus-gtk2.install
 delete mode 100644 debian/ibus-gtk3.install
 delete mode 100644 debian/ibus-setup.1
 delete mode 100644 debian/ibus-ui-gtk.1
 delete mode 100644 debian/ibus-x11.1
 delete mode 100644 debian/ibus.1
 delete mode 100644 debian/ibus.install
 delete mode 100644 debian/ibus.manpages
 delete mode 100644 debian/ibus.postinst
 delete mode 100644 debian/ibus.prerm
 delete mode 100644 debian/libibus-1.0-0.install
 delete mode 100644 debian/libibus-1.0-0.symbols
 delete mode 100644 debian/libibus-dev.install
 delete mode 100644 debian/patches/00list
 delete mode 100644 debian/python-ibus.install
 delete mode 100644 debian/pyversions
 delete mode 100755 debian/rules
 delete mode 100644 debian/source/format
 delete mode 100644 debian/watch
 delete mode 100644 debian/xinput/ibus

diff --git a/Makefile.am b/Makefile.am
index c8e802da1..f427f4d06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,48 +134,6 @@ srpm: dist @PACKAGE_NAME@.spec
 			--define "_specdir `pwd`/rpm" \
 			@PACKAGE_NAME@.spec
 
-.PHONY: debian/changelog
-debian/changelog:
-	$(AM_V_GEN) \
-	( \
-		. /etc/lsb-release; \
-		date=`date -R`; \
-		version=@VERSION@; \
-		serie=$(serie); \
-		if test -z "$$serie"; then \
-		  serie=$$DISTRIB_CODENAME; \
-		fi; \
-		if test -z "$$release"; then \
-		  release=1; \
-		fi; \
-		s=`cat debian/changelog.in`; \
-		eval "echo \"$${s}\""; \
-	) > $@
-
-ppa: dist debian/changelog
-	$(AM_V_GEN) \
-	( \
-		mkdir ppa; \
-		cd ppa; \
-		tar zxvf ../$(distdir).tar.gz ; \
-		cd $(distdir); \
-		cp -a ../../debian . ; \
-		cd debian; \
-		debuild -S -sa ; \
-	)
-
-dpkg: dist debian/changelog
-	$(AM_V_GEN) \
-	( \
-		mkdir ppa; \
-		cd ppa; \
-		tar zxvf ../$(distdir).tar.gz ; \
-		cd $(distdir); \
-		cp -a ../../debian . ; \
-		cd debian; \
-		debuild -b -us -uc; \
-	)
-
 clean-rpm:
 	$(RM) -r "`uname -i`"
 
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b59f07855..000000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
-    debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
diff --git a/debian/changelog.in b/debian/changelog.in
deleted file mode 100644
index f40cd0684..000000000
--- a/debian/changelog.in
+++ /dev/null
@@ -1,5 +0,0 @@
-ibus (${version}-1phuang${release}~${serie}1) ${serie}; urgency=low
-
-  * Upstream release.
-
- -- Peng Huang <shawn.p.huang@gmail.com>  ${date}
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 7d90c680c..000000000
--- a/debian/clean
+++ /dev/null
@@ -1,4 +0,0 @@
-config.guess
-config.sub
-po/ibus10.pot
-install-stamp
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index da39a2ac3..000000000
--- a/debian/control
+++ /dev/null
@@ -1,100 +0,0 @@
-Source: ibus
-Section: utils
-Priority: optional
-Maintainer: LI Daobing <lidaobing@debian.org>
-Uploaders: Zhengpeng Hou <zhengpeng-hou@ubuntu.com>
-Build-Depends: debhelper (>= 7),
- autotools-dev,
- autoconf,
- automake,
- dpatch,
- gtk-doc-tools,
- gobject-introspection (>= 0.6.8),
- libgirepository1.0-dev (>= 0.6.8),
- intltool (>= 0.40.0),
- iso-codes,
- libgconf2-dev,
- libgtk2.0-dev,
- libgtk-3-dev,
- libtool,
- python-support (>= 0.6),
- python-dev,
- python-gobject-dev,
- python-dbus (>= 0.83.0)
-Standards-Version: 3.8.4
-Homepage: http://code.google.com/p/ibus/
-Vcs-Bzr: lp:~lidaobing/ibus/ibus
-Vcs-Browser: https://code.launchpad.net/~lidaobing/ibus/ibus
-
-Package: ibus
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-glade2,
- python-ibus (= ${source:Version}), librsvg2-common
-Recommends: im-switch, ibus-gtk2, ibus-gtk3, ibus-qt4
-Conflicts: ibus-anthy (<< 1.2),
- ibus-table (<< 1.2),
- ibus-pinyin (<< 1.2.99),
- ibus-m17n (<< 1.2.99),
- ibus-hangul (<< 1.2.99),
- ibus-chewing (<< 1.2.99)
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
-
-Package: libibus-1.0-0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
- .
- libibus-1.0-0 is the library of ibus.
-
-Package: libibus-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libibus-1.0-0 (= ${binary:Version}),
-         libglib2.0-dev
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
- .
- This package contains the header files and static libraries which is
- needed for developing the IBus applications.
-
-Package: ibus-gtk2
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
- .
- ibus-gtk2 is the GTK+-2.0 client of ibus, it provide a gtk-immodule for ibus.
-
-Package: ibus-gtk3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
- .
- ibus-gtk3 is the GTK+-3.0 client of ibus, it provide a gtk-immodule for ibus.
- 
-Package: python-ibus
-Section: python
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-dbus (>= 0.83.0), iso-codes
-Description: New input method framework using dbus
- IBus is an Intelligent Input Bus. It is a new input framework for Linux
- OS. It provides full featured and user friendly input method user interface.
- It also may help developers to develop input method easily.
- .
- python-ibus is the Python binding of ibus.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 39bdda912..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,260 +0,0 @@
-This package was debianized by LI Daobing <lidaobing@gmail.com> on
-Sat, 04 Oct 2008 15:30:08 +0800.
-
-It was downloaded from http://code.google.com/p/ibus/
-
-Upstream Author:
-
-    Huang Peng <shawn.p.huang@gmail.com>
-
-Copyright:
-
-    Copyright (C) 2007,2008 Huang Peng <shawn.p.huang@gmail.com>
-
-License:
-
-    This package 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 of the License, or (at your option) any later version.
-
-    This package 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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The Debian packaging is (C) 2008, LI Daobing <lidaobing@gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-some files belong to different copyright holder or in a different
-license, following is the list of the files and licenses.
-
--------------------------------------------------------------------------------
-
-ibus/keysyms.py: LGPL (v2.1 or later)
-  Copyright: 1998-2003 James Henstridge
-
--------------------------------------------------------------------------------
-
-util/gconf/gconf-fixes.c: LGPL (v2 or later)
-  Copyright: 2002 Johan Dahlin
-
--------------------------------------------------------------------------------
-
-util/gconf/gconf-types.c, util/gconf/gconf-types.h: LGPL (v2.1 or later)
-  [Copyright: 2005 Red Hat, Inc]
-
--------------------------------------------------------------------------------
-
-util/IMdkit/FrameMgr.c, util/IMdkit/FrameMgr.h:
-
-/******************************************************************
-Copyright 1993, 1994 by Digital Equipment Corporation, Maynard, Massachusetts,
- 
-                        All Rights Reserved
- 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital or MIT not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
- 
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
- 
-  Author: Hiroyuki Miyamoto  Digital Equipment Corporation
-                             miyamoto@jrd.dec.com
-
-    This version tidied and debugged by Steve Underwood May 1999
-
-******************************************************************/
-
-----------------------------------------------------------------------------
-
-util/IMdkit/i18nAttr.c,
-util/IMdkit/i18nClbk.c,
-util/IMdkit/i18nIc.c,
-util/IMdkit/i18nMethod.c,
-util/IMdkit/i18nPtHdr.c,
-util/IMdkit/i18nUtil.c,
-util/IMdkit/i18nX.c,
-util/IMdkit/IMConn.c,
-util/IMdkit/IMdkit.h,
-util/IMdkit/IMMethod.c,
-util/IMdkit/IMValues.c,
-util/IMdkit/Xi18n.h,
-util/IMdkit/Xi18nX.h,
-util/IMdkit/XimFunc.h:
-
-/******************************************************************
- 
-         Copyright 1994, 1995 by Sun Microsystems, Inc.
-         Copyright 1993, 1994 by Hewlett-Packard Company
- 
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and Hewlett-Packard not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and Hewlett-Packard make no representations about
-the suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
- 
-SUN MICROSYSTEMS INC. AND HEWLETT-PACKARD COMPANY DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-SUN MICROSYSTEMS, INC. AND HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
-  Author: Hidetoshi Tajima(tajima@Eng.Sun.COM) Sun Microsystems, Inc.
-
-    This version tidied and debugged by Steve Underwood May 1999
- 
-******************************************************************/
-
---------------------------------------------------------------------------
-
-util/IMdkit/i18nIMProro.c:
-
-/******************************************************************
-Copyright 1993, 1994 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1993, 1994 by Hewlett-Packard Company
- 
-Copyright 1994, 1995 by Sun Microsystems, Inc.
- 
-                        All Rights Reserved
- 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital or MIT not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
- 
-DIGITAL AND HEWLETT-PACKARD COMPANY DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL AND HEWLETT-PACKARD COMPANY BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
-  Author: Hiroyuki Miyamoto  Digital Equipment Corporation
-                             miyamoto@jrd.dec.com
-	  Hidetoshi Tajima(tajima@Eng.Sun.COM) Sun Microsystems, Inc.
-
-    This version tidied and debugged by Steve Underwood May 1999
- 
-******************************************************************/
-
---------------------------------------------------------------------
-
-util/IMdkit/XimProto.h:
-
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FUJITSU LIMITED
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose. 
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-  Author: Takashi Fujiwara     FUJITSU LIMITED 
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-    This version tidied and debugged by Steve Underwood May 1999
-
-******************************************************************/
-
-------------------------------------------------------------------------
-
-util/IMdkit/Xtrans.h
-
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-
-/* Copyright (c) 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 6f12db508..000000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS
-README
diff --git a/debian/ibus-daemon.1 b/debian/ibus-daemon.1
deleted file mode 100644
index 9ddd9f926..000000000
--- a/debian/ibus-daemon.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/ibus.1
diff --git a/debian/ibus-gconf.1 b/debian/ibus-gconf.1
deleted file mode 100644
index 9ddd9f926..000000000
--- a/debian/ibus-gconf.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/ibus.1
diff --git a/debian/ibus-gtk2.install b/debian/ibus-gtk2.install
deleted file mode 100644
index 3cdfe6a9c..000000000
--- a/debian/ibus-gtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.so
diff --git a/debian/ibus-gtk3.install b/debian/ibus-gtk3.install
deleted file mode 100644
index 6906adcaa..000000000
--- a/debian/ibus-gtk3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.so
diff --git a/debian/ibus-setup.1 b/debian/ibus-setup.1
deleted file mode 100644
index 1c01b39fb..000000000
--- a/debian/ibus-setup.1
+++ /dev/null
@@ -1,26 +0,0 @@
-.\" This file is distributed under the same license as the ibus
-.\" package.
-.\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
-.\"
-.TH "IBUS-SETUP" 1 "2008-11-08" "" ""
-.SH NAME
-ibus-setup \- configuration program for ibus
-
-.SH "SYNOPSIS"
-.B ibus-setup
-
-.SH "DESCRIPTION"
-
-.PP
-IBus is an Intelligent Input Bus. It is a new input framework for Linux
-OS. It provides full featured and user friendly input method user
-interface.  It also may help developers to develop input method easily.  
-
-.PP
-ibus-setup is the configuration program for IBus.
-
-.PP
-Homepage: http://code.google.com/p/ibus/
-
-.SH "SEE ALSO"
-.BR ibus (1)
diff --git a/debian/ibus-ui-gtk.1 b/debian/ibus-ui-gtk.1
deleted file mode 100644
index 9ddd9f926..000000000
--- a/debian/ibus-ui-gtk.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/ibus.1
diff --git a/debian/ibus-x11.1 b/debian/ibus-x11.1
deleted file mode 100644
index 9ddd9f926..000000000
--- a/debian/ibus-x11.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/ibus.1
diff --git a/debian/ibus.1 b/debian/ibus.1
deleted file mode 100644
index c0c05b518..000000000
--- a/debian/ibus.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.\" This file is distributed under the same license as the ibus
-.\" package.
-.\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
-.\"
-.TH "IBUS" 1 "2008-11-08" "" ""
-.SH NAME
-ibus \- Intelligent Input Bus for Linux / Unix OS
-
-.SH "SYNOPSIS"
-.B ibus
-
-.SH "DESCRIPTION"
-
-.PP
-IBus is an Intelligent Input Bus. It is a new input framework for Linux
-OS. It provides full featured and user friendly input method user
-interface.  It also may help developers to develop input method easily.  
-
-.PP
-ibus will launch ibus-daemon, ibus-gconf, ibus-ui-gtk and ibus-x11.
-
-.PP
-Homepage: http://code.google.com/p/ibus/
-
-.SH "SEE ALSO"
-.BR scim (1),
-.BR fcitx (1)
diff --git a/debian/ibus.install b/debian/ibus.install
deleted file mode 100644
index a1c511792..000000000
--- a/debian/ibus.install
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/etc/gconf/schemas/*
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/locale/*
-debian/tmp/usr/share/applications/*
-debian/tmp/usr/share/ibus/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/gtk-doc/*
-debian/tmp/usr/lib/ibus/*
-debian/xinput/* etc/X11/xinit/xinput.d
diff --git a/debian/ibus.manpages b/debian/ibus.manpages
deleted file mode 100644
index b255c4155..000000000
--- a/debian/ibus.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/ibus-x11.1
-debian/ibus-setup.1
-debian/ibus-gconf.1
-debian/ibus-daemon.1
-debian/ibus.1
-debian/ibus-ui-gtk.1
diff --git a/debian/ibus.postinst b/debian/ibus.postinst
deleted file mode 100644
index 853fd82fb..000000000
--- a/debian/ibus.postinst
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-ua_inst () {
-	update-alternatives \
-        --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \
-        /etc/X11/xinit/xinput.d/$2 $3 ;
-}
-
-case "$1" in
-    configure)
-        #ua_inst all_ALL ibus  0
-        ua_inst ja_JP   ibus 60
-        ua_inst ko_KR   ibus 60
-        ua_inst zh_CN   ibus 60
-        ua_inst zh_TW   ibus 60
-        ua_inst zh_HK   ibus 60
-        ua_inst zh_SG   ibus 60
-	rm -f /etc/xdg/autostart/ibus.desktop
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-
diff --git a/debian/ibus.prerm b/debian/ibus.prerm
deleted file mode 100644
index f32ef339b..000000000
--- a/debian/ibus.prerm
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-set -e
-
-ua_remove () {
-	update-alternatives \
-        --remove xinput-$1 \
-        /etc/X11/xinit/xinput.d/$2 ;
-}
-
-case "$1" in
-    remove|upgrade|deconfigure)
-        ua_remove all_ALL ibus
-        ua_remove ja_JP   ibus
-        ua_remove ko_KR   ibus
-        ua_remove zh_CN   ibus
-        ua_remove zh_TW   ibus
-        ua_remove zh_HK   ibus
-        ua_remove zh_SG   ibus
-	;;
-    failed-upgrade)
-	;;
-    *)
-	echo "prerm called with unknown argument \`$1'" >&2
-	exit 1
-   ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libibus-1.0-0.install b/debian/libibus-1.0-0.install
deleted file mode 100644
index b6fcee942..000000000
--- a/debian/libibus-1.0-0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libibus-*.so.*
-debian/tmp/usr/lib/girepository-1.0/*
diff --git a/debian/libibus-1.0-0.symbols b/debian/libibus-1.0-0.symbols
deleted file mode 100644
index 778b4ead1..000000000
--- a/debian/libibus-1.0-0.symbols
+++ /dev/null
@@ -1,328 +0,0 @@
-libibus-1.0.so.0 libibus-1.0-0 #MINVER#
- ibus_attr_background_new@Base 1.3.99.20101019
- ibus_attr_foreground_new@Base 1.3.99.20101019
- ibus_attr_list_append@Base 1.3.99.20101019
- ibus_attr_list_get@Base 1.3.99.20101019
- ibus_attr_list_get_type@Base 1.3.99.20101019
- ibus_attr_list_new@Base 1.3.99.20101019
- ibus_attr_type_get_type@Base 1.3.99.20101019
- ibus_attr_underline_get_type@Base 1.3.99.20101019
- ibus_attr_underline_new@Base 1.3.99.20101019
- ibus_attribute_get_type@Base 1.3.99.20101019
- ibus_attribute_new@Base 1.3.99.20101019
- ibus_bus_add_match@Base 1.3.99.20101019
- ibus_bus_add_match_async@Base 1.3.99.20110309
- ibus_bus_add_match_async_finish@Base 1.3.99.20110309
- ibus_bus_create_input_context@Base 1.3.99.20101019
- ibus_bus_create_input_context_async@Base 1.3.99.20110309
- ibus_bus_create_input_context_async_finish@Base 1.3.99.20110309
- ibus_bus_current_input_context@Base 1.3.99.20101019
- ibus_bus_current_input_context_async@Base 1.3.99.20110309
- ibus_bus_current_input_context_async_finish@Base 1.3.99.20110309
- ibus_bus_exit@Base 1.3.99.20101019
- ibus_bus_exit_async@Base 1.3.99.20110309
- ibus_bus_exit_async_finish@Base 1.3.99.20110309
- ibus_bus_get_config@Base 1.3.99.20101019
- ibus_bus_get_connection@Base 1.3.99.20101019
- ibus_bus_get_global_engine@Base 1.3.99.20101019
- ibus_bus_get_global_engine_async@Base 1.3.99.20110309
- ibus_bus_get_global_engine_async_finish@Base 1.3.99.20110309
- ibus_bus_get_name_owner@Base 1.3.99.20101019
- ibus_bus_get_name_owner_async@Base 1.3.99.20110309
- ibus_bus_get_name_owner_async_finish@Base 1.3.99.20110309
- ibus_bus_get_type@Base 1.3.99.20101019
- ibus_bus_get_use_global_engine@Base 1.3.99.20101019
- ibus_bus_get_use_global_engine_async@Base 1.3.99.20110309
- ibus_bus_get_use_global_engine_async_finish@Base 1.3.99.20110309
- ibus_bus_get_use_sys_layout@Base 1.3.99.20101019
- ibus_bus_get_use_sys_layout_async@Base 1.3.99.20110309
- ibus_bus_get_use_sys_layout_async_finish@Base 1.3.99.20110309
- ibus_bus_hello@Base 1.3.99.20101019
- ibus_bus_is_connected@Base 1.3.99.20101019
- ibus_bus_is_global_engine_enabled@Base 1.3.99.20101019
- ibus_bus_is_global_engine_enabled_async@Base 1.3.99.20110309
- ibus_bus_is_global_engine_enabled_async_finish@Base 1.3.99.20110309
- ibus_bus_list_active_engines@Base 1.3.99.20101019
- ibus_bus_list_active_engines_async@Base 1.3.99.20110309
- ibus_bus_list_active_engines_async_finish@Base 1.3.99.20110309
- ibus_bus_list_engines@Base 1.3.99.20101019
- ibus_bus_list_engines_async@Base 1.3.99.20110309
- ibus_bus_list_engines_async_finish@Base 1.3.99.20110309
- ibus_bus_list_names@Base 1.3.99.20101019
- ibus_bus_list_queued_owners@Base 1.3.99.20110405
- ibus_bus_name_flag_get_type@Base 1.3.99.20110405
- ibus_bus_name_has_owner@Base 1.3.99.20101019
- ibus_bus_name_has_owner_async@Base 1.3.99.20110309
- ibus_bus_name_has_owner_async_finish@Base 1.3.99.20110309
- ibus_bus_new@Base 1.3.99.20101019
- ibus_bus_register_component@Base 1.3.99.20101019
- ibus_bus_register_component_async@Base 1.3.99.20110309
- ibus_bus_register_component_async_finish@Base 1.3.99.20110309
- ibus_bus_release_name@Base 1.3.99.20101019
- ibus_bus_release_name_async@Base 1.3.99.20110309
- ibus_bus_release_name_async_finish@Base 1.3.99.20110309
- ibus_bus_remove_match@Base 1.3.99.20101019
- ibus_bus_remove_match_async@Base 1.3.99.20110309
- ibus_bus_remove_match_async_finish@Base 1.3.99.20110309
- ibus_bus_request_name@Base 1.3.99.20101019
- ibus_bus_request_name_async@Base 1.3.99.20110309
- ibus_bus_request_name_async_finish@Base 1.3.99.20110309
- ibus_bus_request_name_reply_get_type@Base 1.3.99.20110405
- ibus_bus_set_global_engine@Base 1.3.99.20101019
- ibus_bus_set_global_engine_async@Base 1.3.99.20110217
- ibus_bus_set_global_engine_async_finish@Base 1.3.99.20110217
- ibus_bus_set_watch_dbus_signal@Base 1.3.99.20101019
- ibus_bus_set_watch_ibus_signal@Base 1.3.99.20110117
- ibus_capabilite_get_type@Base 1.3.99.20101019
- ibus_component_add_engine@Base 1.3.99.20101019
- ibus_component_add_observed_path@Base 1.3.99.20101019
- ibus_component_check_modification@Base 1.3.99.20101019
- ibus_component_get_author@Base 1.3.99.20101019
- ibus_component_get_description@Base 1.3.99.20101019
- ibus_component_get_engines@Base 1.3.99.20101019
- ibus_component_get_exec@Base 1.3.99.20101019
- ibus_component_get_homepage@Base 1.3.99.20101019
- ibus_component_get_license@Base 1.3.99.20101019
- ibus_component_get_name@Base 1.3.99.20101019
- ibus_component_get_textdomain@Base 1.3.99.20101019
- ibus_component_get_type@Base 1.3.99.20101019
- ibus_component_get_version@Base 1.3.99.20101019
- ibus_component_new@Base 1.3.99.20101019
- ibus_component_new_from_file@Base 1.3.99.20101019
- ibus_component_new_from_xml_node@Base 1.3.99.20101019
- ibus_component_new_varargs@Base 1.3.99.20101101
- ibus_component_output@Base 1.3.99.20101019
- ibus_component_output_engines@Base 1.3.99.20101019
- ibus_config_get_type@Base 1.3.99.20101019
- ibus_config_get_value@Base 1.3.99.20101019
- ibus_config_get_value_async@Base 1.3.99.20101115
- ibus_config_get_value_async_finish@Base 1.3.99.20101115
- ibus_config_get_values@Base 1.3.99.20110616
- ibus_config_get_values_async@Base 1.3.99.20110616
- ibus_config_get_values_async_finish@Base 1.3.99.20110616
- ibus_config_new@Base 1.3.99.20101019
- ibus_config_new_async@Base 1.3.99.20110606
- ibus_config_new_async_finish@Base 1.3.99.20110606
- ibus_config_service_get_type@Base 1.3.99.20101019
- ibus_config_service_new@Base 1.3.99.20101019
- ibus_config_service_value_changed@Base 1.3.99.20101019
- ibus_config_set_value@Base 1.3.99.20101019
- ibus_config_set_value_async@Base 1.3.99.20110217
- ibus_config_set_value_async_finish@Base 1.3.99.20110217
- ibus_config_unset@Base 1.3.99.20101019
- ibus_engine_commit_text@Base 1.3.99.20101019
- ibus_engine_delete_surrounding_text@Base 1.3.99.20101019
- ibus_engine_desc_get_author@Base 1.3.99.20101019
- ibus_engine_desc_get_description@Base 1.3.99.20101019
- ibus_engine_desc_get_hotkeys@Base 1.3.99.20101019
- ibus_engine_desc_get_icon@Base 1.3.99.20101019
- ibus_engine_desc_get_language@Base 1.3.99.20101019
- ibus_engine_desc_get_layout@Base 1.3.99.20101019
- ibus_engine_desc_get_license@Base 1.3.99.20101019
- ibus_engine_desc_get_longname@Base 1.3.99.20101019
- ibus_engine_desc_get_name@Base 1.3.99.20101019
- ibus_engine_desc_get_rank@Base 1.3.99.20101019
- ibus_engine_desc_get_symbol@Base 1.3.99.20110616
- ibus_engine_desc_get_type@Base 1.3.99.20101019
- ibus_engine_desc_new@Base 1.3.99.20101019
- ibus_engine_desc_new_from_xml_node@Base 1.3.99.20101019
- ibus_engine_desc_new_varargs@Base 1.3.99.20101101
- ibus_engine_desc_output@Base 1.3.99.20101019
- ibus_engine_forward_key_event@Base 1.3.99.20101019
- ibus_engine_get_name@Base 1.3.99.20101019
- ibus_engine_get_surrounding_text@Base 1.3.99.20110405
- ibus_engine_get_type@Base 1.3.99.20101019
- ibus_engine_hide_auxiliary_text@Base 1.3.99.20101019
- ibus_engine_hide_lookup_table@Base 1.3.99.20101019
- ibus_engine_hide_preedit_text@Base 1.3.99.20101019
- ibus_engine_new@Base 1.3.99.20101019
- ibus_engine_new_type@Base 1.3.99.20101019
- ibus_engine_register_properties@Base 1.3.99.20101019
- ibus_engine_show_auxiliary_text@Base 1.3.99.20101019
- ibus_engine_show_lookup_table@Base 1.3.99.20101019
- ibus_engine_show_preedit_text@Base 1.3.99.20101019
- ibus_engine_update_auxiliary_text@Base 1.3.99.20101019
- ibus_engine_update_lookup_table@Base 1.3.99.20101019
- ibus_engine_update_lookup_table_fast@Base 1.3.99.20101019
- ibus_engine_update_preedit_text@Base 1.3.99.20101019
- ibus_engine_update_preedit_text_with_mode@Base 1.3.99.20101019
- ibus_engine_update_property@Base 1.3.99.20101019
- ibus_error_get_type@Base 1.3.99.20110606
- ibus_error_quark@Base 1.3.99.20110606
- ibus_factory_add_engine@Base 1.3.99.20101019
- ibus_factory_get_type@Base 1.3.99.20101019
- ibus_factory_new@Base 1.3.99.20101019
- ibus_free_strv@Base 1.3.99.20101019
- ibus_get_address@Base 1.3.99.20101019
- ibus_get_daemon_uid@Base 1.3.99.20101019
- ibus_get_language_name@Base 1.3.99.20110405
- ibus_get_local_machine_id@Base 1.3.99.20101019
- ibus_get_session_id@Base 1.3.99.20101019
- ibus_get_socket_path@Base 1.3.99.20101019
- ibus_get_timeout@Base 1.3.99.20110117
- ibus_get_user_name@Base 1.3.99.20101019
- ibus_hotkey_get_type@Base 1.3.99.20101019
- ibus_hotkey_profile_add_hotkey@Base 1.3.99.20101019
- ibus_hotkey_profile_add_hotkey_from_string@Base 1.3.99.20101019
- ibus_hotkey_profile_filter_key_event@Base 1.3.99.20101019
- ibus_hotkey_profile_get_type@Base 1.3.99.20101019
- ibus_hotkey_profile_lookup_hotkey@Base 1.3.99.20101019
- ibus_hotkey_profile_new@Base 1.3.99.20101019
- ibus_hotkey_profile_remove_hotkey@Base 1.3.99.20101019
- ibus_hotkey_profile_remove_hotkey_by_event@Base 1.3.99.20101019
- ibus_init@Base 1.3.99.20101019
- ibus_input_context_cancel_hand_writing@Base 1.3.99.20110430
- ibus_input_context_cursor_down@Base 1.3.99.20101019
- ibus_input_context_cursor_up@Base 1.3.99.20101019
- ibus_input_context_disable@Base 1.3.99.20101019
- ibus_input_context_enable@Base 1.3.99.20101019
- ibus_input_context_focus_in@Base 1.3.99.20101019
- ibus_input_context_focus_out@Base 1.3.99.20101019
- ibus_input_context_get_engine@Base 1.3.99.20101019
- ibus_input_context_get_engine_async@Base 1.3.99.20110322
- ibus_input_context_get_engine_async_finish@Base 1.3.99.20110322
- ibus_input_context_get_input_context@Base 1.3.99.20101019
- ibus_input_context_get_input_context_async@Base 1.3.99.20110316
- ibus_input_context_get_input_context_async_finish@Base 1.3.99.20110316
- ibus_input_context_get_type@Base 1.3.99.20101019
- ibus_input_context_is_enabled@Base 1.3.99.20101019
- ibus_input_context_is_enabled_async@Base 1.3.99.20110322
- ibus_input_context_is_enabled_async_finish@Base 1.3.99.20110322
- ibus_input_context_needs_surrounding_text@Base 1.3.99.20110405
- ibus_input_context_new@Base 1.3.99.20101019
- ibus_input_context_new_async@Base 1.3.99.20110316
- ibus_input_context_new_async_finish@Base 1.3.99.20110316
- ibus_input_context_page_down@Base 1.3.99.20101019
- ibus_input_context_page_up@Base 1.3.99.20101019
- ibus_input_context_process_hand_writing_event@Base 1.3.99.20110430
- ibus_input_context_process_key_event@Base 1.3.99.20101019
- ibus_input_context_process_key_event_async@Base 1.3.99.20110124
- ibus_input_context_process_key_event_async_finish@Base 1.3.99.20110124
- ibus_input_context_property_activate@Base 1.3.99.20101019
- ibus_input_context_property_hide@Base 1.3.99.20101019
- ibus_input_context_property_show@Base 1.3.99.20101019
- ibus_input_context_reset@Base 1.3.99.20101019
- ibus_input_context_set_capabilities@Base 1.3.99.20101019
- ibus_input_context_set_cursor_location@Base 1.3.99.20101019
- ibus_input_context_set_engine@Base 1.3.99.20101019
- ibus_input_context_set_surrounding_text@Base 1.3.99.20110405
- ibus_key_event_from_string@Base 1.3.99.20101019
- ibus_key_event_to_string@Base 1.3.99.20101019
- ibus_keymap_fill@Base 1.3.99.20101019
- ibus_keymap_get@Base 1.3.99.20101019
- ibus_keymap_get_type@Base 1.3.99.20101019
- ibus_keymap_lookup_keysym@Base 1.3.99.20101019
- ibus_keymap_new@Base 1.3.99.20101019
- ibus_keyval_from_name@Base 1.3.99.20101019
- ibus_keyval_name@Base 1.3.99.20101019
- ibus_lookup_table_append_candidate@Base 1.3.99.20101019
- ibus_lookup_table_append_label@Base 1.3.99.20101019
- ibus_lookup_table_clear@Base 1.3.99.20101019
- ibus_lookup_table_cursor_down@Base 1.3.99.20101019
- ibus_lookup_table_cursor_up@Base 1.3.99.20101019
- ibus_lookup_table_get_candidate@Base 1.3.99.20101019
- ibus_lookup_table_get_cursor_in_page@Base 1.3.99.20101019
- ibus_lookup_table_get_cursor_pos@Base 1.3.99.20101019
- ibus_lookup_table_get_label@Base 1.3.99.20101019
- ibus_lookup_table_get_number_of_candidates@Base 1.3.99.20101019
- ibus_lookup_table_get_orientation@Base 1.3.99.20101019
- ibus_lookup_table_get_page_size@Base 1.3.99.20101019
- ibus_lookup_table_get_type@Base 1.3.99.20101019
- ibus_lookup_table_is_cursor_visible@Base 1.3.99.20101019
- ibus_lookup_table_is_round@Base 1.3.99.20101019
- ibus_lookup_table_new@Base 1.3.99.20101019
- ibus_lookup_table_page_down@Base 1.3.99.20101019
- ibus_lookup_table_page_up@Base 1.3.99.20101019
- ibus_lookup_table_set_cursor_pos@Base 1.3.99.20101019
- ibus_lookup_table_set_cursor_visible@Base 1.3.99.20101019
- ibus_lookup_table_set_label@Base 1.3.99.20101019
- ibus_lookup_table_set_orientation@Base 1.3.99.20101019
- ibus_lookup_table_set_page_size@Base 1.3.99.20101019
- ibus_lookup_table_set_round@Base 1.3.99.20101019
- ibus_main@Base 1.3.99.20101019
- ibus_modifier_type_get_type@Base 1.3.99.20101019
- ibus_object_destroy@Base 1.3.99.20101019
- ibus_object_flags_get_type@Base 1.3.99.20101019
- ibus_object_get_type@Base 1.3.99.20101019
- ibus_object_new@Base 1.3.99.20101019
- ibus_observed_path_check_modification@Base 1.3.99.20101019
- ibus_observed_path_get_type@Base 1.3.99.20101019
- ibus_observed_path_new@Base 1.3.99.20101019
- ibus_observed_path_new_from_xml_node@Base 1.3.99.20101019
- ibus_observed_path_output@Base 1.3.99.20101019
- ibus_observed_path_traverse@Base 1.3.99.20101019
- ibus_orientation_get_type@Base 1.3.99.20101019
- ibus_panel_service_candidate_clicked@Base 1.3.99.20101019
- ibus_panel_service_cursor_down@Base 1.3.99.20101019
- ibus_panel_service_cursor_up@Base 1.3.99.20101019
- ibus_panel_service_get_type@Base 1.3.99.20101019
- ibus_panel_service_new@Base 1.3.99.20101019
- ibus_panel_service_page_down@Base 1.3.99.20101019
- ibus_panel_service_page_up@Base 1.3.99.20101019
- ibus_panel_service_property_activate@Base 1.3.99.20101019
- ibus_panel_service_property_hide@Base 1.3.99.20101019
- ibus_panel_service_property_show@Base 1.3.99.20101019
- ibus_preedit_focus_mode_get_type@Base 1.3.99.20101019
- ibus_prop_list_append@Base 1.3.99.20101019
- ibus_prop_list_get@Base 1.3.99.20101019
- ibus_prop_list_get_type@Base 1.3.99.20101019
- ibus_prop_list_new@Base 1.3.99.20101019
- ibus_prop_list_update_property@Base 1.3.99.20101019
- ibus_prop_state_get_type@Base 1.3.99.20101019
- ibus_prop_type_get_type@Base 1.3.99.20101019
- ibus_property_get_icon@Base 1.3.99.20110405
- ibus_property_get_key@Base 1.3.99.20110405
- ibus_property_get_label@Base 1.3.99.20110405
- ibus_property_get_prop_type@Base 1.3.99.20110405
- ibus_property_get_sensitive@Base 1.3.99.20110405
- ibus_property_get_state@Base 1.3.99.20110405
- ibus_property_get_sub_props@Base 1.3.99.20110405
- ibus_property_get_tooltip@Base 1.3.99.20110405
- ibus_property_get_type@Base 1.3.99.20101019
- ibus_property_get_visible@Base 1.3.99.20110405
- ibus_property_new@Base 1.3.99.20101019
- ibus_property_set_icon@Base 1.3.99.20101019
- ibus_property_set_label@Base 1.3.99.20101019
- ibus_property_set_sensitive@Base 1.3.99.20101019
- ibus_property_set_state@Base 1.3.99.20101019
- ibus_property_set_sub_props@Base 1.3.99.20101019
- ibus_property_set_tooltip@Base 1.3.99.20101019
- ibus_property_set_visible@Base 1.3.99.20101019
- ibus_property_update@Base 1.3.99.20101019
- ibus_proxy_destroy@Base 1.3.99.20101019
- ibus_proxy_get_type@Base 1.3.99.20101019
- ibus_quit@Base 1.3.99.20101019
- ibus_serializable_copy@Base 1.3.99.20101019
- ibus_serializable_deserialize@Base 1.3.99.20101019
- ibus_serializable_get_qattachment@Base 1.3.99.20101019
- ibus_serializable_get_type@Base 1.3.99.20101019
- ibus_serializable_new@Base 1.3.99.20101019
- ibus_serializable_remove_qattachment@Base 1.3.99.20101019
- ibus_serializable_serialize@Base 1.3.99.20101019
- ibus_serializable_set_qattachment@Base 1.3.99.20101019
- ibus_service_class_add_interfaces@Base 1.3.99.20101019
- ibus_service_emit_signal@Base 1.3.99.20101019
- ibus_service_get_connection@Base 1.3.99.20101019
- ibus_service_get_object_path@Base 1.3.99.20101019
- ibus_service_get_type@Base 1.3.99.20101019
- ibus_service_new@Base 1.3.99.20101019
- ibus_service_register@Base 1.3.99.20101019
- ibus_service_unregister@Base 1.3.99.20101019
- ibus_set_display@Base 1.3.99.20101019
- ibus_set_log_handler@Base 1.3.99.20101019
- ibus_text_append_attribute@Base 1.3.99.20101019
- ibus_text_get_attributes@Base 1.3.99.20110405
- ibus_text_get_is_static@Base 1.3.99.20110405
- ibus_text_get_length@Base 1.3.99.20101019
- ibus_text_get_text@Base 1.3.99.20110405
- ibus_text_get_type@Base 1.3.99.20101019
- ibus_text_new_from_printf@Base 1.3.99.20101019
- ibus_text_new_from_static_string@Base 1.3.99.20101019
- ibus_text_new_from_string@Base 1.3.99.20101019
- ibus_text_new_from_ucs4@Base 1.3.99.20101019
- ibus_text_new_from_unichar@Base 1.3.99.20101019
- ibus_write_address@Base 1.3.99.20101019
- ibus_xml_free@Base 1.3.99.20101019
- ibus_xml_output@Base 1.3.99.20101019
- ibus_xml_parse_buffer@Base 1.3.99.20101019
- ibus_xml_parse_file@Base 1.3.99.20101019
diff --git a/debian/libibus-dev.install b/debian/libibus-dev.install
deleted file mode 100644
index 34eb19e8f..000000000
--- a/debian/libibus-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/libibus-*.so
-debian/tmp/usr/lib/libibus-*.a
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/share/gir-1.0/*
-debian/tmp/usr/share/vala/vapi/*
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29bb..000000000
diff --git a/debian/python-ibus.install b/debian/python-ibus.install
deleted file mode 100644
index 5996c8a02..000000000
--- a/debian/python-ibus.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python*/*
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41ebc..000000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index a3bc5f107..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpatch/dpatch.make
-
-build: patch
-	ln -sf /usr/share/misc/config.sub config.sub
-	ln -sf /usr/share/misc/config.guess config.guess
-	dh $@ --before auto_configure
-	dh_auto_configure -- \
-		--enable-gtk3 \
-		--enable-static \
-		--enable-surrounding-text \
-		--enable-gtk-doc \
-		--with-panel-icon-keyboard=ibus-keyboard \
-		LDFLAGS="-Wl,--as-needed"
-	dh $@ --before auto_test
-	cd po; make ibus10.pot # https://bugs.launchpad.net/ubuntu/+source/ibus/+bug/188690
-	dh $@ --after auto_test
-
-install:
-	dh $@ --until auto_install
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/libibus*.la \
-		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.a \
-		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.la \
-		$(CURDIR)/debian/tmp/usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.a \
-		$(CURDIR)/debian/tmp/usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.la \
-		$(CURDIR)/debian/tmp/etc/xdg \
-		$(CURDIR)/debian/tmp/usr/share/applications/ibus.desktop
-	dh_install --list-missing --fail-missing
-	dh_installdocs # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552293
-	dh $@ --after installdocs
-	LD_LIBRARY_PATH=debian/libibus-1.0-0/usr/lib:$(LD_LIBRARY_PATH) \
-		dh_gtkmodules -p ibus-gtk2 -s
-	LD_LIBRARY_PATH=debian/libibus-1.0-0/usr/lib:$(LD_LIBRARY_PATH) \
-		dh_gtkmodules -p ibus-gtk3 -s
-
-install-stamp: install
-	touch $@
-
-binary: binary-indep binary-arch
-
-binary-indep: install-stamp
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install-stamp
-	dh_strip -s
-	dh_makeshlibs -Nibus-gtk2 -s
-	dh_makeshlibs -Nibus-gtk3 -s
-	dh_shlibdeps -s
-	dh_installdeb -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
-
-clean: clean0 unpatch
-
-clean0:
-	dh clean
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index d3827e75a..000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 9b8c3653f..000000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://code.google.com/p/ibus/downloads/list \
-http://ibus.googlecode.com/files/ibus-([0-9].*)\.tar\.gz
diff --git a/debian/xinput/ibus b/debian/xinput/ibus
deleted file mode 100644
index 12069462a..000000000
--- a/debian/xinput/ibus
+++ /dev/null
@@ -1,16 +0,0 @@
-XIM=ibus
-XIM_PROGRAM=/usr/bin/ibus-daemon
-XIM_ARGS="--xim"
-if [ -e /usr/lib/gtk-2.0/*/immodules/im-ibus.so ]; then
-    GTK_IM_MODULE=ibus
-else
-    GTK_IM_MODULE=xim
-fi
-
-if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
-	QT_IM_MODULE=ibus
-else
-	QT_IM_MODULE=xim
-fi
-DEPENDS="ibus, ibus-gtk2, ibus-gtk3|ibus-qt4"
-# vim:ft=sh:

From 0632cbbbb573749bbca96a416fde1490810e52d2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 13 Sep 2017 18:15:06 +0900
Subject: [PATCH 433/816] ui/gtk3: Fix PropertyPanel position in workarea

gdk_screen_get_monitor_workarea() no longer return the correct area
from "_NET_WORKAREA" atom in GTK 3.22 and now use
gdk_monitor_get_workarea() instead.

Use gdk_seat_grab() instead of deprecated gdk_device_grab().

Use gtk_menu_popup_at_rect() instead of deprecated gtk_menu_popup() and
generate a new foreign GdkWindow with mouse cursor for the Qt Window.

Also fixed some deprecated APIs.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/330190043
---
 ui/gtk3/candidatepanel.vala    |  40 ++++++------
 ui/gtk3/emojier.vala           |  24 +++++---
 ui/gtk3/handle.vala            |   7 ++-
 ui/gtk3/indicator.vala         |  68 +++++++++++++++++++--
 ui/gtk3/keybindingmanager.vala |   2 +-
 ui/gtk3/panel.vala             | 108 +++++++++++++++++++++++++--------
 ui/gtk3/propertypanel.vala     |  21 ++++++-
 ui/gtk3/switcher.vala          |  84 ++++++++++++++++++-------
 8 files changed, 270 insertions(+), 84 deletions(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 0e5e3bc2b..ec2d3db4f 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -292,6 +292,26 @@ public class CandidatePanel : Gtk.Box{
             adjust_window_position_vertical();
     }
 
+    private Gdk.Rectangle get_monitor_geometry() {
+        Gdk.Rectangle monitor_area = { 0, };
+
+        // Use get_monitor_geometry() instead of get_monitor_area().
+        // get_monitor_area() excludes docks, but the lookup window should be
+        // shown over them.
+#if VALA_0_34
+        Gdk.Monitor monitor = Gdk.Display.get_default().get_monitor_at_point(
+                m_cursor_location.x,
+                m_cursor_location.y);
+        monitor_area = monitor.get_geometry();
+#else
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
+                                                      m_cursor_location.y);
+        screen.get_monitor_geometry(monitor_num, out monitor_area);
+#endif
+        return monitor_area;
+    }
+
     private void adjust_window_position_horizontal() {
         Gdk.Point cursor_right_bottom = {
                 m_cursor_location.x + m_cursor_location.width,
@@ -305,14 +325,7 @@ public class CandidatePanel : Gtk.Box{
             cursor_right_bottom.y + allocation.height
         };
 
-        Gdk.Screen screen = Gdk.Screen.get_default();
-        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
-                                                      m_cursor_location.y);
-        // Use get_monitor_geometry() instead of get_monitor_area().
-        // get_monitor_area() excludes docks, but the lookup window should be
-        // shown over them.
-        Gdk.Rectangle monitor_area;
-        screen.get_monitor_geometry(monitor_num, out monitor_area);
+        Gdk.Rectangle monitor_area = get_monitor_geometry();
         int monitor_right = monitor_area.x + monitor_area.width;
         int monitor_bottom = monitor_area.y + monitor_area.height;
 
@@ -358,14 +371,7 @@ public class CandidatePanel : Gtk.Box{
             m_cursor_location.y + allocation.height
         };
 
-        Gdk.Screen screen = Gdk.Screen.get_default();
-        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
-                                                      m_cursor_location.y);
-        // Use get_monitor_geometry() instead of get_monitor_area().
-        // get_monitor_area() excludes docks, but the lookup window should be
-        // shown over them.
-        Gdk.Rectangle monitor_area;
-        screen.get_monitor_geometry(monitor_num, out monitor_area);
+        Gdk.Rectangle monitor_area = get_monitor_geometry();
         int monitor_right = monitor_area.x + monitor_area.width;
         int monitor_bottom = monitor_area.y + monitor_area.height;
 
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 36ab4babe..9cd98140f 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -575,7 +575,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
         if (lang == "en") {
             bool has_variant = false;
             foreach (unichar ch in EMOJI_VARIANT_LIST) {
-                if (emoji.chr(-1, ch) != null) {
+                if (emoji.index_of_char(ch) >= 0) {
                     has_variant = true;
                     break;
                 }
@@ -782,15 +782,17 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private bool check_unicode_point() {
         string annotation = m_entry.get_text();
         m_unicode_point = null;
-        var buff = new GLib.StringBuilder();
+        // Add "0x" because uint64.ascii_strtoull() is not accessible
+        // and need to use uint64.parse()
+        var buff = new GLib.StringBuilder("0x");
         var retval = new GLib.StringBuilder();
         for (int i = 0; i < annotation.char_count(); i++) {
             unichar ch = annotation.get_char(i);
             if (ch == 0)
                 return false;
             if (ch.isspace()) {
-                unichar code = (unichar)buff.str.to_ulong(null, 16);
-                buff.erase();
+                unichar code = (unichar)uint64.parse(buff.str);
+                buff.assign("0x");
                 if (!code.validate())
                     return false;
                 retval.append(code.to_string());
@@ -800,7 +802,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 return false;
             buff.append_unichar(ch);
         }
-        unichar code = (unichar)buff.str.to_ulong(null, 16);
+        unichar code = (unichar)uint64.parse(buff.str);
         if (!code.validate())
             return false;
         retval.append(code.to_string());
@@ -834,7 +836,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                         matched = true;
                     break;
                 case 2:
-                    if (key.str(annotation) != null)
+                    if (key.index_of(annotation) >= 0)
                         matched = true;
                     break;
                 default:
@@ -1586,10 +1588,16 @@ class IBusEmojier : Gtk.ApplicationWindow {
     public void present_centralize(Gdk.Event event) {
         Gtk.Allocation allocation;
         get_allocation(out allocation);
-        Gdk.Screen screen = Gdk.Screen.get_default();
-        int monitor_num = screen.get_monitor_at_window(get_window());
         Gdk.Rectangle monitor_area;
+#if VALA_0_34
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Monitor monitor = display.get_monitor_at_window(this.get_window());
+        monitor_area = monitor.get_geometry();
+#else
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_window(this.get_window());
         screen.get_monitor_geometry(monitor_num, out monitor_area);
+#endif
         int x = (monitor_area.x + monitor_area.width - allocation.width)/2;
         int y = (monitor_area.y + monitor_area.height
                  - allocation.height)/2;
diff --git a/ui/gtk3/handle.vala b/ui/gtk3/handle.vala
index bef5e8ba7..fc9164a05 100644
--- a/ui/gtk3/handle.vala
+++ b/ui/gtk3/handle.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2016 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -59,7 +59,6 @@ class Handle : Gtk.EventBox {
 
     public override void realize() {
         base.realize();
-        // get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.FLEUR));
     }
 
     public override bool button_press_event(Gdk.EventButton event) {
@@ -138,7 +137,9 @@ class Handle : Gtk.EventBox {
         m_move_begined = false;
         m_press_pos.x = 0;
         m_press_pos.y = 0;
-        get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+        get_window().set_cursor(new Gdk.Cursor.for_display(
+                   Gdk.Display.get_default(),
+                   Gdk.CursorType.FLEUR));
         move_end();
         return true;
     }
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index dac72b49f..4d111a649 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright(c) 2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -97,6 +97,7 @@ class Indicator : IBus.Service
     private int m_context_menu_y;
     private int m_activate_menu_x;
     private int m_activate_menu_y;
+    private Gdk.Window m_indicator_window;
 
     public Indicator(string id,
                      GLib.DBusConnection connection,
@@ -206,7 +207,8 @@ class Indicator : IBus.Service
         GLib.Variant var_y = parameters.get_child_value(1);
         m_context_menu_x = var_x.get_int32();
         m_context_menu_y = var_y.get_int32();
-        context_menu(2, 0);
+        Gdk.Window window = query_gdk_window();
+        context_menu(m_context_menu_x, m_context_menu_y, window, 2, 0);
     }
 
     private void _activate_menu_cb(GLib.DBusConnection       connection,
@@ -216,7 +218,57 @@ class Indicator : IBus.Service
         GLib.Variant var_y = parameters.get_child_value(1);
         m_activate_menu_x = var_x.get_int32();
         m_activate_menu_y = var_y.get_int32();
-        activate();
+        Gdk.Window window = query_gdk_window();
+        activate(m_activate_menu_x, m_activate_menu_y, window);
+    }
+
+    private Gdk.Window? query_gdk_window() {
+        if (m_indicator_window != null)
+            return m_indicator_window;
+
+        Gdk.Display display = Gdk.Display.get_default();
+        unowned X.Display xdisplay =
+                (display as Gdk.X11.Display).get_xdisplay();
+        X.Window current = xdisplay.default_root_window();
+        X.Window parent = 0;
+        X.Window child = 0;
+        int root_x, root_y, win_x, win_y;
+        uint mask = 0;
+        root_x = root_y = win_x = win_y = 0;
+        bool retval;
+        // Need XSetErrorHandler for BadWindow?
+        while ((retval = xdisplay.query_pointer(current,
+                                      out parent, out child,
+                                      out root_x, out root_y,
+                                      out win_x, out win_y,
+                                      out mask))) {
+            if (child == 0)
+                break;
+            current = child;
+        }
+        if (!retval) {
+            string format =
+                    "XQueryPointer is failed: current: %x root: %x " +
+                    "child: %x (%d, %d), (%d, %d), %u";
+            string message = format.printf((uint)current,
+                                           (uint)xdisplay.default_root_window(),
+                                           (uint)child,
+                                           root_x, root_y, win_x, win_y,
+                                           mask);
+            warning("XQueryPointer is failed: %s", message);
+            return null;
+        }
+        if (current == xdisplay.default_root_window())
+            warning("The query window is root window");
+        m_indicator_window = Gdk.X11.Window.lookup_for_display(
+                display as Gdk.X11.Display,
+                current);
+        if (m_indicator_window != null)
+            return m_indicator_window;
+        m_indicator_window = new Gdk.X11.Window.foreign_for_display(
+                display as Gdk.X11.Display,
+                current);
+        return m_indicator_window;
     }
 
     private GLib.Variant? _get_id(GLib.DBusConnection connection) {
@@ -479,7 +531,13 @@ class Indicator : IBus.Service
         push_in = false;
     }
 
-    public signal void context_menu(uint button, uint activate_time);
-    public signal void activate();
+    public signal void context_menu(int        x,
+                                    int        y,
+                                    Gdk.Window window,
+                                    uint       button,
+                                    uint       activate_time);
+    public signal void activate(int        x,
+                                int        y,
+                                Gdk.Window window);
     public signal void registered_status_notifier_item();
 }
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index 49013b8dd..c8b1e7f6c 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -18,7 +18,7 @@ public class KeybindingManager : GLib.Object {
 
     private static KeybindingManager m_instance = null;
 
-    public static const uint MODIFIER_FILTER =
+    public const uint MODIFIER_FILTER =
         Gdk.ModifierType.MODIFIER_MASK & ~(
         Gdk.ModifierType.LOCK_MASK |  // Caps Lock
         // Gdk.ModifierType.MOD1_MASK |  // Alt
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index bf43cbf9a..629dadce3 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -267,6 +267,27 @@ class Panel : IBus.PanelService {
         });
     }
 
+    private void popup_menu_at_area_window(Gtk.Menu              menu,
+                                           Gdk.Rectangle         area,
+                                           Gdk.Window?           window,
+                                           Gtk.MenuPositionFunc? func) {
+#if VALA_0_34
+        Gdk.Gravity rect_anchor = Gdk.Gravity.SOUTH_WEST;
+        Gdk.Gravity menu_anchor = Gdk.Gravity.NORTH_WEST;
+
+        // Gtk.Menu.popup() is now deprecated but
+        // Gtk.Menu.popup_at_rect() requires a Gdk.Window and
+        // Gtk.Menu.popup_at_rect() outputs a warning of
+        // "no trigger event for menu popup"
+        // for the foreigner QT window which is generated by
+        // Gdk.X11.Window.foreign_for_display.
+        // https://git.gnome.org/browse/gtk+/tree/gtk/gtkmenu.c?h=gtk-3-22#n2251
+        menu.popup_at_rect(window, area, rect_anchor, menu_anchor, null);
+#else
+        menu.popup(null, null, func, 0, Gtk.get_current_event_time());
+#endif
+    }
+
 #if INDICATOR
     private bool is_kde() {
         if (Environment.get_variable("XDG_CURRENT_DESKTOP") == "KDE")
@@ -276,6 +297,19 @@ class Panel : IBus.PanelService {
         return false;
     }
 
+    private void popup_menu_at_pointer_window(Gtk.Menu              menu,
+                                              int                   x,
+                                              int                   y,
+                                              Gdk.Window?           window,
+                                              Gtk.MenuPositionFunc? func) {
+        int win_x = 0;
+        int win_y = 0;
+        window.get_origin(out win_x, out win_y);
+        Gdk.Rectangle area = { x - win_x, y - win_y, 1, 1 };
+        // window is a bottom wide panel instead of status icon
+        popup_menu_at_area_window(menu, area, window, func);
+    }
+
     private void init_indicator() {
         m_icon_type = IconType.INDICATOR;
         GLib.Bus.get.begin(GLib.BusType.SESSION, null, (obj, res) => {
@@ -290,21 +324,17 @@ class Panel : IBus.PanelService {
                     m_indicator.set_status(Indicator.Status.ACTIVE);
                     state_changed();
                 });
-                m_indicator.context_menu.connect((b, t) => {
-                    Gtk.Menu menu = create_context_menu();
-                    menu.popup(null,
-                               null,
-                               m_indicator.position_context_menu,
-                               0,
-                               Gtk.get_current_event_time());
+                m_indicator.context_menu.connect((x, y, w, b, t) => {
+                    popup_menu_at_pointer_window(
+                            create_context_menu(),
+                            x, y, w,
+                            m_indicator.position_context_menu);
                 });
-                m_indicator.activate.connect(() => {
-                    Gtk.Menu menu = create_activate_menu();
-                    menu.popup(null,
-                               null,
-                               m_indicator.position_activate_menu,
-                               0,
-                               Gtk.get_current_event_time());
+                m_indicator.activate.connect((x, y, w) => {
+                    popup_menu_at_pointer_window(
+                            create_activate_menu(),
+                            x, y, w,
+                            m_indicator.position_activate_menu);
                 });
             } catch (GLib.IOError e) {
                 warning("Failed to get the session bus: %s", e.message);
@@ -317,21 +347,47 @@ class Panel : IBus.PanelService {
         m_status_icon = new Gtk.StatusIcon();
         m_status_icon.set_name("ibus-ui-gtk");
         m_status_icon.set_title(_("IBus Panel"));
+
+        // Gdk.Window.get_width() is needed for the menu position
+        if (m_status_icon.get_size() > 0)
+            init_status_icon_menu();
+        else
+            m_status_icon.notify["size"].connect(init_status_icon_menu);
+    }
+
+    private void init_status_icon_menu() {
+        Gdk.Rectangle area = { 0, 0, 0, 0 };
+        Gdk.Window? window = null;
+        Gtk.MenuPositionFunc? func = null;
+#if VALA_0_34
+        window = Gdk.X11.Window.lookup_for_display(
+                Gdk.Display.get_default() as Gdk.X11.Display,
+                m_status_icon.get_x11_window_id()) as Gdk.Window;
+        if (window == null) {
+            warning("StatusIcon does not have GdkWindow");
+            return;
+        }
+        Gtk.Orientation orient;
+        m_status_icon.get_geometry(null, out area, out orient);
+        int win_x = 0;
+        int win_y = 0;
+        window.get_origin(out win_x, out win_y);
+        // The (x, y) is converted by gdk_window_get_root_coords()
+        // in gdk_window_impl_move_to_rect()
+        area.x -= win_x;
+        area.y -= win_y;
+#else
+        func = m_status_icon.position_menu;
+#endif
         m_status_icon.popup_menu.connect((b, t) => {
-                Gtk.Menu menu = create_context_menu();
-                menu.popup(null,
-                           null,
-                           m_status_icon.position_menu,
-                           0,
-                           Gtk.get_current_event_time());
+                popup_menu_at_area_window(
+                        create_context_menu(),
+                        area, window, func);
         });
         m_status_icon.activate.connect(() => {
-                Gtk.Menu menu = create_activate_menu();
-                menu.popup(null,
-                           null,
-                           m_status_icon.position_menu,
-                           0,
-                           Gtk.get_current_event_time());
+                popup_menu_at_area_window(
+                        create_activate_menu(),
+                        area, window, func);
         });
         m_status_icon.set_from_icon_name("ibus-keyboard");
     }
diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index dd4342ec2..857f8e200 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -4,7 +4,7 @@
  *
  * Copyright(c) 2013-2016 Red Hat, Inc.
  * Copyright(c) 2013-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2013-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -330,8 +330,16 @@ public class PropertyPanel : Gtk.Box {
         Gtk.Allocation allocation;
         m_toplevel.get_allocation(out allocation);
 
+        Gdk.Rectangle monitor_area;
+#if VALA_0_34
+        // gdk_screen_get_monitor_workarea() no longer return the correct
+        // area from "_NET_WORKAREA" atom in GTK 3.22
+        Gdk.Monitor monitor = Gdk.Display.get_default().get_monitor(0);
+        monitor_area = monitor.get_workarea();
+#else
         Gdk.Screen screen = Gdk.Screen.get_default();
-        Gdk.Rectangle monitor_area = screen.get_monitor_workarea(0);
+        monitor_area = screen.get_monitor_workarea(0);
+#endif
         int monitor_right = monitor_area.x + monitor_area.width;
         int monitor_bottom = monitor_area.y + monitor_area.height;
         int x, y;
@@ -472,8 +480,15 @@ public class PropMenu : Gtk.Menu, IPropToolItem {
     public new void popup(uint       button,
                           uint32     activate_time,
                           Gtk.Widget widget) {
+#if VALA_0_34
+        base.popup_at_widget(widget,
+                             Gdk.Gravity.SOUTH_WEST,
+                             Gdk.Gravity.NORTH_WEST,
+                             null);
+#else
         m_parent_button = widget;
         base.popup(null, null, menu_position, button, activate_time);
+#endif
     }
 
     public override void destroy() {
@@ -532,6 +547,7 @@ public class PropMenu : Gtk.Menu, IPropToolItem {
         }
     }
 
+#if !VALA_0_34
     private void menu_position(Gtk.Menu menu,
                                out int  x,
                                out int  y,
@@ -580,6 +596,7 @@ public class PropMenu : Gtk.Menu, IPropToolItem {
 
         push_in = false;
     }
+#endif
 }
 
 public class PropToolButton : Gtk.ToolButton, IPropToolItem {
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 269a68d4c..0ce742a19 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -157,6 +157,55 @@ class Switcher : Gtk.Window {
         m_label.set_text(m_buttons[index].longname);
         m_buttons[index].grab_focus();
 
+        // Avoid regressions.
+        if (m_popup_delay_time > 0) {
+            get_position(out m_root_x, out m_root_y);
+            // Pull the window from the screen so that the window gets
+            // the key press and release events but mouse does not select
+            // an IME unexpectedly.
+            move(-1000, -1000);
+        }
+
+        show_all();
+
+        if (m_popup_delay_time > 0) {
+            // Restore the window position after m_popup_delay_time
+            m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
+                                                     () => {
+                restore_window_position("timeout");
+                return false;
+            });
+        }
+
+        Gdk.Device pointer;
+#if VALA_0_34
+        Gdk.Seat seat = event.get_seat();
+        if (seat == null) {
+            var display = get_display();
+            seat = display.get_default_seat();
+        }
+        //keyboard = seat.get_keyboard();
+        pointer = seat.get_pointer();
+
+        Gdk.GrabStatus status;
+        // Grab all keyboard events
+        status = seat.grab(get_window(),
+                           Gdk.SeatCapabilities.KEYBOARD,
+                           true,
+                           null,
+                           event,
+                           null);
+        if (status != Gdk.GrabStatus.SUCCESS)
+            warning("Grab keyboard failed! status = %d", status);
+        status = seat.grab(get_window(),
+                           Gdk.SeatCapabilities.POINTER,
+                           true,
+                           null,
+                           event,
+                           null);
+        if (status != Gdk.GrabStatus.SUCCESS)
+            warning("Grab pointer failed! status = %d", status);
+#else
         Gdk.Device device = event.get_device();
         if (device == null) {
             var display = get_display();
@@ -174,7 +223,6 @@ class Switcher : Gtk.Window {
         }
 
         Gdk.Device keyboard;
-        Gdk.Device pointer;
         if (device.get_source() == Gdk.InputSource.KEYBOARD) {
             keyboard = device;
             pointer = device.get_associated_device();
@@ -183,26 +231,6 @@ class Switcher : Gtk.Window {
             keyboard = device.get_associated_device();
         }
 
-        // Avoid regressions.
-        if (m_popup_delay_time > 0) {
-            get_position(out m_root_x, out m_root_y);
-            // Pull the window from the screen so that the window gets
-            // the key press and release events but mouse does not select
-            // an IME unexpectedly.
-            move(-1000, -1000);
-        }
-
-        show_all();
-
-        if (m_popup_delay_time > 0) {
-            // Restore the window position after m_popup_delay_time
-            m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
-                                                     () => {
-                restore_window_position("timeout");
-                return false;
-            });
-        }
-
         Gdk.GrabStatus status;
         // Grab all keyboard events
         status = keyboard.grab(get_window(),
@@ -224,6 +252,8 @@ class Switcher : Gtk.Window {
                               Gdk.CURRENT_TIME);
         if (status != Gdk.GrabStatus.SUCCESS)
             warning("Grab pointer failed! status = %d", status);
+#endif
+
         // Probably we can delete m_popup_delay_time in 1.6
         pointer.get_position_double(null,
                                     out m_mouse_init_x,
@@ -235,8 +265,12 @@ class Switcher : Gtk.Window {
         m_loop.run();
         m_loop = null;
 
+#if VALA_0_34
+        seat.ungrab();
+#else
         keyboard.ungrab(Gdk.CURRENT_TIME);
         pointer.ungrab(Gdk.CURRENT_TIME);
+#endif
 
         hide();
         // Make sure the switcher is hidden before returning from this function.
@@ -319,13 +353,19 @@ class Switcher : Gtk.Window {
         m_label.set_ellipsize(Pango.EllipsizeMode.END);
 
         Gdk.Display display = Gdk.Display.get_default();
+        int screen_width = 0;
+#if VALA_0_34
+        Gdk.Monitor monitor = display.get_monitor_at_window(this.get_window());
+        Gdk.Rectangle area = monitor.get_geometry();
+        screen_width = area.width;
+#else
         Gdk.Screen screen = (display != null) ?
                 display.get_default_screen() : null;
-        int screen_width = 0;
 
         if (screen != null) {
             screen_width = screen.get_width();
         }
+#endif
 
         if (screen_width > 0 && max_label_width > (screen_width / 4)) {
             max_label_width = screen_width / 4;

From 4a541639f50f05bf01b1b84792a7f4039b88c296 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 15 Sep 2017 17:49:57 +0900
Subject: [PATCH 434/816] ui/gtk3: Fix to enable menu button on PropertyPanel

Review URL: https://codereview.appspot.com/330720043
---
 ui/gtk3/propertypanel.vala | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index 857f8e200..f5d9cff76 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -84,6 +84,23 @@ public class PropertyPanel : Gtk.Box {
     public void set_properties(IBus.PropList props) {
         debug("set_properties()\n");
 
+        // When click PropMenuToolButton, the focus is changed and
+        // set_properties() is called here while the menu button is active.
+        // Ignore that case here not to remove items.
+        bool has_active = false;
+        foreach (var item in m_items) {
+            Type type = item.get_type();
+            if (type == typeof(PropMenuToolButton) ||
+                type == typeof(PropToggleToolButton)) {
+                if ((item as Gtk.ToggleToolButton).get_active()) {
+                    has_active = true;
+                    break;
+                }
+            }
+        }
+        if (has_active)
+            return;
+
         foreach (var item in m_items)
             remove((item as Gtk.Widget));
         m_items = {};

From d37c8bbdf9164ca76fb5ca513891e48273556881 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 26 Sep 2017 11:42:23 +0900
Subject: [PATCH 435/816] ui/gtk3: Unset GDK_CORE_DEVICE_EVENTS

Plasma deskop sets this variable and prevents Super-space
and Ctrl-Shift-e when ibus-ui-gtk3 runs after the
desktop is launched.
Also fixed a SEGV in display.get_monitor_at_window()
Regression from rhbz#226465

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/321710043
---
 ui/gtk3/application.vala | 6 ++++++
 ui/gtk3/switcher.vala    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index fa8027215..1bbaa6de5 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -100,6 +100,12 @@ class Application {
     }
 
     public static void main(string[] argv) {
+        // https://bugzilla.redhat.com/show_bug.cgi?id=1226465#c20
+        // In /etc/xdg/plasma-workspace/env/gtk3_scrolling.sh
+        // Plasma deskop sets this variable and prevents Super-space,
+        // and Ctrl-Shift-e when ibus-ui-gtk3 runs after the
+        // desktop is launched.
+        GLib.Environment.unset_variable("GDK_CORE_DEVICE_EVENTS");
         // for Gdk.X11.get_default_xdisplay()
         Gdk.set_allowed_backends("x11");
 
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 0ce742a19..2a48c1f11 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -355,7 +355,8 @@ class Switcher : Gtk.Window {
         Gdk.Display display = Gdk.Display.get_default();
         int screen_width = 0;
 #if VALA_0_34
-        Gdk.Monitor monitor = display.get_monitor_at_window(this.get_window());
+        // display.get_monitor_at_window() is null because of unrealized window
+        Gdk.Monitor monitor = display.get_primary_monitor();
         Gdk.Rectangle area = monitor.get_geometry();
         screen_width = area.width;
 #else

From 98f70ee5966cfe182a75c6cc6466032bf414c640 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 11 Oct 2017 12:54:10 +0900
Subject: [PATCH 436/816] ui/gtk3: Do not activate emoji cells on mouse until
 mouse moves

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/324660043
---
 ui/gtk3/emojier.vala    | 67 ++++++++++++++++++++++++++++++++++++++---
 ui/gtk3/emojierapp.vala | 11 +++++--
 ui/gtk3/panel.vala      |  9 +++++-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 9cd98140f..f3e9f15ce 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -39,6 +39,25 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 halign : Gtk.Align.FILL,
                 valign : Gtk.Align.FILL
             );
+            this.motion_notify_event.connect((e) => {
+#if VALA_0_24
+                Gdk.EventMotion pe = e;
+#else
+                Gdk.EventMotion *pe = &e;
+#endif
+                if (m_mouse_x == pe.x_root && m_mouse_y == pe.y_root)
+                    return false;
+                m_mouse_x = pe.x_root;
+                m_mouse_y = pe.y_root;
+                var row = this.get_row_at_y((int)e.y);
+                if (row != null)
+                    this.select_row(row);
+                return false;
+            });
+            this.enter_notify_event.connect((e) => {
+                // avoid gtk_button_update_state()
+                return true;
+            });
         }
     }
     private class EBoxRow : Gtk.ListBoxRow {
@@ -233,6 +252,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private bool m_enter_notify_enable = true;
     private uint m_entry_notify_show_id;
     private uint m_entry_notify_disable_id;
+    protected static double m_mouse_x;
+    protected static double m_mouse_y;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
 
@@ -974,6 +995,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             label.set_halign(Gtk.Align.FILL);
             label.set_valign(Gtk.Align.FILL);
             Gtk.EventBox candidate_ebox = new Gtk.EventBox();
+            candidate_ebox.add_events(Gdk.EventMask.POINTER_MOTION_MASK);
             candidate_ebox.add(label);
             // Make a copy of i to workaround a bug in vala.
             // https://bugzilla.gnome.org/show_bug.cgi?id=628336
@@ -982,15 +1004,27 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 candidate_clicked(index, e.button, e.state);
                 return true;
             });
-            candidate_ebox.enter_notify_event.connect((e) => {
+            candidate_ebox.motion_notify_event.connect((e) => {
                 // m_enter_notify_enable is added because
                 // enter_notify_event conflicts with keyboard operations.
                 if (!m_enter_notify_enable)
-                    return true;
+                    return false;
                 if (m_lookup_table.get_cursor_pos() == index)
-                    return true;
+                    return false;
+#if VALA_0_24
+                Gdk.EventMotion pe = e;
+#else
+                Gdk.EventMotion *pe = &e;
+#endif
+                if (m_mouse_x == pe.x_root && m_mouse_y == pe.y_root)
+                    return false;
+                m_mouse_x = pe.x_root;
+                m_mouse_y = pe.y_root;
+
                 m_lookup_table.set_cursor_pos(index);
-                if (m_entry_notify_show_id > 0) {
+                if (m_entry_notify_show_id > 0 &&
+                    GLib.MainContext.default().find_source_by_id(
+                            m_entry_notify_show_id) != null) {
                         GLib.Source.remove(m_entry_notify_show_id);
                 }
                 // If timeout is not added, memory leak happens and
@@ -999,7 +1033,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                         show_candidate_panel();
                         return false;
                 });
-                return true;
+                return false;
             });
             grid.attach(candidate_ebox,
                         n % (int)EMOJI_GRID_PAGE, n / (int)EMOJI_GRID_PAGE,
@@ -1368,6 +1402,29 @@ class IBusEmojier : Gtk.ApplicationWindow {
         uint32 timestamp = event.get_time();
         present_with_time(timestamp);
 
+        Gdk.Device pointer;
+#if VALA_0_34
+        Gdk.Seat seat = event.get_seat();
+        if (seat == null) {
+            var display = get_display();
+            seat = display.get_default_seat();
+        }
+        pointer = seat.get_pointer();
+#else
+        Gdk.Device device = event.get_device();
+        if (device == null) {
+            var display = get_display();
+            device = display.list_devices().data;
+        }
+        if (device.get_source() == Gdk.InputSource.KEYBOARD)
+            pointer = device.get_associated_device();
+        else
+            pointer = device;
+#endif
+        pointer.get_position_double(null,
+                                    out m_mouse_x,
+                                    out m_mouse_y);
+
         m_loop = new GLib.MainLoop();
         m_loop.run();
         m_loop = null;
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 1df859019..6615f22bc 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -41,8 +41,15 @@ public class EmojiApplication : Application {
 
     private void show_dialog(ApplicationCommandLine command_line) {
         m_emojier = new IBusEmojier();
-        Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
-        event.key.time = Gdk.CURRENT_TIME;
+        Gdk.Event event = Gtk.get_current_event();
+        // Plasma and GNOME3 desktop returns null event
+        if (event == null) {
+            event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+            event.key.time = Gdk.CURRENT_TIME;
+            // event.get_seat() refers event.any.window
+            event.key.window = Gdk.get_default_root_window();
+            event.key.window.ref();
+        }
         string emoji = m_emojier.run("", event);
         if (emoji == null) {
             m_emojier = null;
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 629dadce3..0ac215994 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1327,7 +1327,14 @@ class Panel : IBus.PanelService {
 #if EMOJI_DICT
             item = new Gtk.MenuItem.with_label(_("Emoji Choice"));
             item.activate.connect((i) => {
-                Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+                Gdk.Event event = Gtk.get_current_event();
+                if (event == null) {
+                    event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
+                    event.key.time = Gdk.CURRENT_TIME;
+                    // event.get_seat() refers event.any.window
+                    event.key.window = Gdk.get_default_root_window();
+                    event.key.window.ref();
+                }
                 handle_emoji_typing(event);
             });
             m_sys_menu.append(item);

From dfe21a2729f13107ef28c4cd075ac81d501384ea Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 19 Oct 2017 10:53:27 +0900
Subject: [PATCH 437/816] ui/gtk3: Unref Panel and Indicator when double panels
 run

If unref is not called properly, Panel.finalize() is not called
and Gtk.StatusIcon won't be hidden with double panels.

Review URL: https://codereview.appspot.com/329510043
---
 ui/gtk3/application.vala |  9 +++++
 ui/gtk3/indicator.vala   | 45 +++++++++++++++++++++++
 ui/gtk3/panel.vala       | 77 ++++++++++++++++++++++++++++++++++------
 3 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index 1bbaa6de5..806b4b224 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -86,7 +86,16 @@ class Application {
                                   string interface_name,
                                   string signal_name,
                                   Variant parameters) {
+        // "Destroy" dbus method was called before this callback is called.
+        // "Destroy" dbus method -> ibus_service_destroy()
+        // -> g_dbus_connection_unregister_object()
+        // -> g_object_unref(m_panel) will be called later with an idle method,
+        // which was assigned in the arguments of
+        // g_dbus_connection_register_object()
         debug("signal_name = %s", signal_name);
+
+        // unref m_panel
+        m_panel.disconnect_signals();
         m_panel = null;
     }
 
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index 4d111a649..e04d48395 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -99,6 +99,7 @@ class Indicator : IBus.Service
     private int m_activate_menu_y;
     private Gdk.Window m_indicator_window;
 
+
     public Indicator(string id,
                      GLib.DBusConnection connection,
                      Category category = Category.OTHER) {
@@ -143,6 +144,7 @@ class Indicator : IBus.Service
         check_connect();
     }
 
+
     private void check_connect() {
         if (m_proxy == null) {
             GLib.DBusProxy.new.begin(
@@ -162,6 +164,7 @@ class Indicator : IBus.Service
         }
     }
 
+
     private void bus_watcher_ready(GLib.Object? obj, GLib.AsyncResult? res) {
         if (res != null) {
             try {
@@ -200,6 +203,7 @@ class Indicator : IBus.Service
                            });
     }
 
+
     private void _context_menu_cb(GLib.DBusConnection       connection,
                                   GLib.Variant              parameters,
                                   GLib.DBusMethodInvocation invocation) {
@@ -211,6 +215,7 @@ class Indicator : IBus.Service
         context_menu(m_context_menu_x, m_context_menu_y, window, 2, 0);
     }
 
+
     private void _activate_menu_cb(GLib.DBusConnection       connection,
                                    GLib.Variant              parameters,
                                    GLib.DBusMethodInvocation invocation) {
@@ -222,6 +227,7 @@ class Indicator : IBus.Service
         activate(m_activate_menu_x, m_activate_menu_y, window);
     }
 
+
     private Gdk.Window? query_gdk_window() {
         if (m_indicator_window != null)
             return m_indicator_window;
@@ -271,66 +277,81 @@ class Indicator : IBus.Service
         return m_indicator_window;
     }
 
+
     private GLib.Variant? _get_id(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.id);
     }
 
+
     private GLib.Variant? _get_category(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.category_s);
     }
 
+
     private GLib.Variant? _get_status(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.status_s);
     }
 
+
     private GLib.Variant? _get_icon_name(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_name);
     }
 
+
     private GLib.Variant? _get_icon_vector(GLib.DBusConnection connection) {
         return this.icon_vector;
     }
 
+
     private GLib.Variant? _get_icon_desc(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_desc);
     }
 
+
     private GLib.Variant? _get_attention_icon_name(GLib.DBusConnection
                                                              connection) {
         return new GLib.Variant.string(this.attention_icon_name);
     }
 
+
     private GLib.Variant? _get_attention_icon_desc(GLib.DBusConnection
                                                              connection) {
         return new GLib.Variant.string(this.attention_icon_desc);
     }
 
+
     private GLib.Variant? _get_title(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.title);
     }
 
+
     private GLib.Variant? _get_icon_theme_path(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.icon_theme_path);
     }
 
+
     private GLib.Variant? _get_menu(GLib.DBusConnection connection) {
         return null;
     }
 
+
     private GLib.Variant? _get_xayatana_label(GLib.DBusConnection connection) {
         return new GLib.Variant.string(this.label_s);
     }
 
+
     private GLib.Variant? _get_xayatana_label_guide(GLib.DBusConnection
                                                               connection) {
         return new GLib.Variant.string(this.label_guide_s);
     }
 
+
     private GLib.Variant? _get_xayatana_ordering_index(GLib.DBusConnection
                                                               connection) {
         return new GLib.Variant.uint32(this.ordering_index);
     }
 
+
     public override void service_method_call(GLib.DBusConnection
                                                                 connection,
                                              string             sender,
@@ -356,6 +377,7 @@ class Indicator : IBus.Service
                 method_name);
     }
 
+
     public override GLib.Variant? service_get_property(GLib.DBusConnection
                                                                 connection,
                                                        string   sender,
@@ -402,6 +424,7 @@ class Indicator : IBus.Service
         return null;
     }
 
+
     public override bool service_set_property(GLib.DBusConnection
                                                            connection,
                                               string       sender,
@@ -412,6 +435,7 @@ class Indicator : IBus.Service
         return false;
     }
 
+
     // AppIndicator.set_status() converts enum value to string internally.
     public void set_status(Status status) {
         string status_s = status.to_nick();
@@ -437,6 +461,7 @@ class Indicator : IBus.Service
         }
     }
 
+
     // AppIndicator.set_icon() is deprecated.
     public void set_icon_full(string icon_name, string? icon_desc) {
         bool changed = false;
@@ -470,6 +495,7 @@ class Indicator : IBus.Service
         }
     }
 
+
     public void set_cairo_image_surface_full(Cairo.ImageSurface image,
                                              string?            icon_desc) {
         int width = image.get_width();
@@ -513,6 +539,7 @@ class Indicator : IBus.Service
         }
     }
 
+
     public void position_context_menu(Gtk.Menu menu,
                                       out int  x,
                                       out int  y,
@@ -522,6 +549,7 @@ class Indicator : IBus.Service
         push_in = false;
     }
 
+
     public void position_activate_menu(Gtk.Menu menu,
                                        out int  x,
                                        out int  y,
@@ -531,6 +559,23 @@ class Indicator : IBus.Service
         push_in = false;
     }
 
+
+    /**
+     * unregister_connection:
+     *
+     * "Destroy" dbus method is not called for the indicator's connection
+     * when panel's connection is disconneted because the dbus connection
+     * is a shared session bus so need to call
+     * g_dbus_connection_unregister_object() by manual here
+     * so that g_object_unref(m_panel) will be called later with an idle method,
+     * which was assigned in the arguments of
+     * g_dbus_connection_register_object()
+     */
+    public void unregister_connection() {
+        unregister(get_connection());
+    }
+
+
     public signal void context_menu(int        x,
                                     int        y,
                                     Gdk.Window window,
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 0ac215994..f15ba5d4b 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -99,6 +99,14 @@ class Panel : IBus.PanelService {
     private string m_icon_prop_key = "";
     private int m_property_icon_delay_time = 500;
     private uint m_property_icon_delay_time_id;
+#if INDICATOR
+    private bool m_is_kde = is_kde();
+#else
+    private bool m_is_kde = false;
+#endif
+    private ulong m_popup_menu_id;
+    private ulong m_activate_id;
+    private ulong m_registered_status_notifier_item_id;
 
     private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
@@ -114,7 +122,7 @@ class Panel : IBus.PanelService {
 
         // init ui
 #if INDICATOR
-        if (is_kde()) {
+        if (m_is_kde) {
             init_indicator();
         } else {
             init_status_icon();
@@ -155,6 +163,11 @@ class Panel : IBus.PanelService {
     }
 
     ~Panel() {
+#if INDICATOR
+        // unref m_indicator
+        if (m_indicator != null)
+            m_indicator.unregister_connection();
+#endif
         unbind_switch_shortcut(KeyEventFuncType.ANY);
     }
 
@@ -289,7 +302,7 @@ class Panel : IBus.PanelService {
     }
 
 #if INDICATOR
-    private bool is_kde() {
+    private static bool is_kde() {
         if (Environment.get_variable("XDG_CURRENT_DESKTOP") == "KDE")
             return true;
         warning ("If you launch KDE5 on xterm, " +
@@ -320,17 +333,21 @@ class Panel : IBus.PanelService {
                                       m_session_bus_connection,
                                       Indicator.Category.APPLICATION_STATUS);
                 m_indicator.title = _("IBus Panel");
-                m_indicator.registered_status_notifier_item.connect(() => {
+                m_registered_status_notifier_item_id =
+                        m_indicator.registered_status_notifier_item.connect(
+                                () => {
                     m_indicator.set_status(Indicator.Status.ACTIVE);
                     state_changed();
                 });
-                m_indicator.context_menu.connect((x, y, w, b, t) => {
+                m_popup_menu_id =
+                        m_indicator.context_menu.connect((x, y, w, b, t) => {
                     popup_menu_at_pointer_window(
-                            create_context_menu(),
-                            x, y, w,
-                            m_indicator.position_context_menu);
+                        create_context_menu(),
+                        x, y, w,
+                        m_indicator.position_context_menu);
                 });
-                m_indicator.activate.connect((x, y, w) => {
+                m_activate_id =
+                        m_indicator.activate.connect((x, y, w) => {
                     popup_menu_at_pointer_window(
                             create_activate_menu(),
                             x, y, w,
@@ -379,12 +396,12 @@ class Panel : IBus.PanelService {
 #else
         func = m_status_icon.position_menu;
 #endif
-        m_status_icon.popup_menu.connect((b, t) => {
+        m_popup_menu_id = m_status_icon.popup_menu.connect((b, t) => {
                 popup_menu_at_area_window(
                         create_context_menu(),
                         area, window, func);
         });
-        m_status_icon.activate.connect(() => {
+        m_activate_id = m_status_icon.activate.connect(() => {
                 popup_menu_at_area_window(
                         create_activate_menu(),
                         area, window, func);
@@ -985,6 +1002,46 @@ class Panel : IBus.PanelService {
         set_emoji_partial_match();
     }
 
+    /**
+     * disconnect_signals:
+     *
+     * Call this API before m_panel = null so that the ref_count becomes 0
+     */
+    public void disconnect_signals() {
+        unowned GLib.Object object = m_status_icon;
+#if INDICATOR
+        if (m_is_kde)
+            object = m_indicator;
+#endif
+        if (m_popup_menu_id > 0) {
+            // No name functions refer m_panel in m_status_icon
+            if (GLib.SignalHandler.is_connected(object, m_popup_menu_id))
+                object.disconnect(m_popup_menu_id);
+            m_popup_menu_id = 0;
+        }
+        if (m_activate_id > 0) {
+            if (GLib.SignalHandler.is_connected(object, m_activate_id))
+                object.disconnect(m_activate_id);
+            m_activate_id = 0;
+        }
+        if (m_registered_status_notifier_item_id > 0) {
+            if (GLib.SignalHandler.is_connected(
+                    object,
+                    m_registered_status_notifier_item_id)) {
+                object.disconnect(m_registered_status_notifier_item_id);
+            }
+            m_registered_status_notifier_item_id = 0;
+        }
+        if (m_preload_engines_id > 0) {
+            GLib.Source.remove(m_preload_engines_id);
+            m_preload_engines_id = 0;
+        }
+        if (m_emojier_set_emoji_lang_id > 0) {
+            GLib.Source.remove(m_emojier_set_emoji_lang_id);
+            m_emojier_set_emoji_lang_id = 0;
+        }
+    }
+
     private void engine_contexts_insert(IBus.EngineDesc engine) {
         if (m_use_global_engine)
             return;

From 53d1f9e92666c77ec13efaeb5f330d05332a8360 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Oct 2017 11:34:55 +0900
Subject: [PATCH 438/816] ui/gtk3: Increase timeout of window filter in
 PropertyPanel

The latest Plasma desktop takes more time to generate _NET_WORKAREA
atom and this patch increases the timeout from 1 minute to 5 minutes
so that PropertyPanel locate within the workarea.

Review URL: https://codereview.appspot.com/336840043
---
 ui/gtk3/propertypanel.vala | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/propertypanel.vala b/ui/gtk3/propertypanel.vala
index f5d9cff76..b94b2b794 100644
--- a/ui/gtk3/propertypanel.vala
+++ b/ui/gtk3/propertypanel.vala
@@ -40,7 +40,9 @@ public class PropertyPanel : Gtk.Box {
     private uint m_auto_hide_timeout = 10000;
     private uint m_auto_hide_timeout_id = 0;
     private bool m_follow_input_cursor_when_always_shown = false;
-    private const uint MONITOR_NET_WORKAREA_TIMEOUT = 60000;
+    // The timeout indicates milliseconds. 1000 msec == 1 sec
+    private const uint MONITOR_NET_WORKAREA_TIMEOUT = 300000;
+    private uint m_remove_filter_id;
 
     public PropertyPanel() {
         /* Chain up base class constructor */
@@ -390,6 +392,11 @@ public class PropertyPanel : Gtk.Box {
             string aname = m_xdisplay.get_atom_name(xevent.xproperty.atom);
             if (aname == "_NET_WORKAREA" && xevent.xproperty.state == 0) {
                 set_default_location();
+                m_root_window.remove_filter(root_window_filter);
+                if (m_remove_filter_id > 0) {
+                    GLib.Source.remove(m_remove_filter_id);
+                    m_remove_filter_id = 0;
+                }
                 return Gdk.FilterReturn.CONTINUE;
             }
         }
@@ -404,7 +411,9 @@ public class PropertyPanel : Gtk.Box {
 
         m_root_window.add_filter(root_window_filter);
 
-        GLib.Timeout.add(MONITOR_NET_WORKAREA_TIMEOUT, () => {
+        m_remove_filter_id = GLib.Timeout.add(MONITOR_NET_WORKAREA_TIMEOUT,
+                                              () => {
+            m_remove_filter_id = 0;
             m_root_window.remove_filter(root_window_filter);
             return false;
         },

From 8cb149bfed9938967af1e823c3a09284a9f2501c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 22 Oct 2017 19:16:52 +0900
Subject: [PATCH 439/816] Update translations

Update cs.po da.po es.po fr.po hu.po ja.po nl.po pl.po sv.po
       uk.po zh_TW.po

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/331040043
---
 po/cs.po    |  93 +++++++-------
 po/da.po    | 121 +++++++++---------
 po/es.po    |  95 +++++++-------
 po/fr.po    |  98 ++++++++-------
 po/hu.po    | 352 +++++++++++++++++++++++++++++-----------------------
 po/ja.po    |  92 +++++++-------
 po/nl.po    |  96 +++++++-------
 po/pl.po    |  95 +++++++-------
 po/sv.po    |  93 +++++++-------
 po/uk.po    |  93 +++++++-------
 po/zh_TW.po | 162 ++++++++++++------------
 11 files changed, 763 insertions(+), 627 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 0eaabe115..9d6577f6a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,15 +9,16 @@
 # Josef Hruška <hrusjos@gmail.com>, 2017. #zanata
 # Marek Suchánek <m.suchanek.2@gmail.com>, 2017. #zanata
 # Zdenek <chmelarz@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-15 11:19-0400\n"
+"PO-Revision-Date: 2017-08-29 05:58-0400\n"
 "Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
 "Language: cs\n"
@@ -293,7 +294,7 @@ msgstr "Použít systémové rozložení klávesnice (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Rozložení klávesnice</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Používat stejnou vstupní metodu pro všechny aplikace"
 
@@ -329,7 +330,7 @@ msgstr "Spustit ibus při přihlášení"
 msgid "<b>Startup</b>"
 msgstr "<b>Spouštění</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "O programu"
 
@@ -595,10 +596,18 @@ msgstr ""
 "oblíbené emoji."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "seznam oblíbených emoji anotací v dialogu emoji"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Můžete přiřadit anotaci k oblíbenému emoji v tomto seznamu"
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Zda se anotace emoji mohou částečně shodovat nebo ne"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -606,11 +615,11 @@ msgstr ""
 "Zda anotace emoji mohou být porovnány s částečným řetězcem namísto přesné "
 "shody nebo ne."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Shoda anotací emoji se zadanou délkou"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -618,11 +627,11 @@ msgstr ""
 "Částečně odpovídá anotacím emoji s více než zadaným počtem znaků místo "
 "přesné shody."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Vyberat podmínku částečně odpovídající anotaci emoji"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -630,33 +639,33 @@ msgstr ""
 "Zvolte jednu z následujících podmínek, která částečně odpovídá anotaci emoji:"
 " 0 == Předpona shody, 1 == Přípona shody, 2 == Obsahuje shodu"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Vložený přededitovaný text"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Vložený přededitovaný text v okně aplikace"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Použít globální vstupní metodu"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Povolit metodu vstupu ve výchozím nastavení"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Povolit metodu vstupu ve výchozím nastavení, pokud aplikace dostane vstupní "
 "fokus"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Zachovat jméno prefixu DConf "
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefix kláves DConf pro zastavení konverze jména"
 
@@ -963,118 +972,118 @@ msgstr "Oblíbené"
 msgid "Others"
 msgstr "Ostatní"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Výběr emoji:"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Napište anotaci nebo vyberte emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Další strana"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Předchozí strana"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódový bod: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Obsahuje varianty emoji"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Žádný"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotace: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Vybírání emoji zrušeno."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji zkopírováno do schránky."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "\"PÍSMO\" pro znaky emoji v dialogu emoji."
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "PÍSMO"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"JAZYK\" pro anotace v dialogu emoji. Např. \"cs\""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "JAZYK"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Anotace emoji se mohou částečně shodovat"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Odpovídá délce zadaného celku"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Odpovídá podmínce zadaného celku"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "Aktualizace IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Klávesa super+mezerník je nyní výchozí klávesovou zkratkou."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus je inteligentní vstupní sběrnice pro Linux / Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Kredit-překladatelům"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Ukončit"
 
diff --git a/po/da.po b/po/da.po
index 0a13cd963..c35e7a14f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,11 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-03 04:29-0400\n"
+"PO-Revision-Date: 2017-10-06 03:44-0400\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -48,7 +48,7 @@ msgstr "Nederste højre hjørne"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "Brugertilpasset"
+msgstr "Tilpasset"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
@@ -64,7 +64,7 @@ msgstr "Altid"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr "IBus-indstillinger"
+msgstr "IBus-præferencer"
 
 #: ../setup/setup.ui.h:12
 msgid "The shortcut keys for switching to next input method in the list"
@@ -96,7 +96,7 @@ msgstr "Aktivér eller deaktivér:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "Aktivér"
+msgstr "Aktivér:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
@@ -116,8 +116,7 @@ msgstr "Orientering for kandidater:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"Angiv adfæren for hvordan IBus skal vises eller skjules i sprogpanelet"
+msgstr "Angiv adfæren for hvordan IBus skal vises eller sprogpanelet"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
@@ -149,7 +148,7 @@ msgstr "Indlejr forudredigeret tekst for inputmetode i programvinduet"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "Brug brugertilpasset skrifttype:"
+msgstr "Brug tilpasset skrifttype:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -203,7 +202,7 @@ msgstr "Vis information om den valgte inputmetode"
 
 #: ../setup/setup.ui.h:45
 msgid "_Preferences"
-msgstr "_Indstillinger"
+msgstr "_Præferencer"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
@@ -292,7 +291,7 @@ msgstr "Brug systemets tastaturlayout (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturlayout</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Del den samme inputmetode i alle programmer"
 
@@ -328,7 +327,7 @@ msgstr "Start ibus ved login"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Om"
 
@@ -462,7 +461,7 @@ msgid ""
 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"
+"Tilpasset"
 
 #: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -549,7 +548,7 @@ msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
 #: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
-msgstr "Brugertilpasset skrifttype"
+msgstr "Tilpasset skrifttype"
 
 #: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
@@ -581,7 +580,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:55
 msgid "favorite emoji list on emoji dialog"
-msgstr "Farvorit emojiliste i emoji-dialog"
+msgstr "farvorit emojiliste i emoji-dialog"
 
 #: ../data/ibus.schemas.in.h:56
 msgid ""
@@ -591,10 +590,18 @@ msgstr ""
 "Du kan vise farvorit emojierne i emojiliste hvis denne liste har nogen tegn."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotations can be match partially or not"
-msgstr "Hvorvidt emoji-annoteringer kan matches delvist eller ej"
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "favorit emoji-annonteringsliste i emoji-dialog"
 
 #: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Du kan tildele en annotering til en favorit-emoji i denne liste."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Hvorvidt emoji-annonteringer kan matches delvist eller ej"
+
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -602,11 +609,11 @@ msgstr ""
 "Hvorvidt emoji-annoteringer kan matches med en delvis streng i stedet for "
 "det præcise match eller ej."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji-annoteringer med den angivne længde"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -614,11 +621,11 @@ msgstr ""
 "Match emoji-annoteringer delvist med flere end det angivne antal tegn i "
 "stedet for det præcise match."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Vælg en betingelse til delvist at matche emoji-annonteringer"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -626,32 +633,32 @@ msgstr ""
 "Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 ="
 "= Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Indbyg forudredigeret tekst"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Aktivér inputmetode som standard"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 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:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf bevar navnepræfiks"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Præfiks af DConf-taster til stop af navnekonvertering"
 
@@ -674,12 +681,12 @@ msgstr "Vælg et sprog"
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
-msgstr "_Annullér"
+msgstr "_Annuller"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
 #: ../setup/main.py:553
 msgid "_OK"
-msgstr "_O.k."
+msgstr "_OK"
 
 #: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
 msgid "More…"
@@ -714,7 +721,7 @@ msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "Angiv IBus-indstillinger"
+msgstr "Angiv IBus-præferencer"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -957,106 +964,106 @@ msgstr "Farvoritter"
 msgid "Others"
 msgstr "Andre"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Valg af emoji"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Skriv annotering eller vælg emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodepunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annoteringer: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Annulleret for at vælge en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierede en emoji til dit skrivebord."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "SKRIFTTYPE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "SPROG"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annoteringer kan matches delvist"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Match med længen af det angive heltal"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Match med betingelsen af det angive heltal"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "IBus-opdatering"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+mellemrum er nu standardhotkeyen."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inputbus til Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
@@ -1064,15 +1071,15 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
-msgstr "Indstillinger"
+msgstr "Præferencer"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Afslut"
 
diff --git a/po/es.po b/po/es.po
index 717037e15..56fc3f338 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,20 +14,21 @@
 # Gladys Guerrero <gguerrer@redhat.com>, 2012-2014
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Alberto Castillo <acastillogordon@gmail.com>, 2016. #zanata
+# Alberto Castillo <acg@albertocg.com>, 2016. #zanata
 # Alexis Stevenson <waldoribeiro@sapo.pt>, 2016. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2016. #zanata
 # Omar Berroterán S. <omarberroteranlkf@gmail.com>, 2016. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-07 08:04-0400\n"
+"PO-Revision-Date: 2017-07-24 11:58-0400\n"
 "Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
@@ -320,7 +321,7 @@ msgstr "Usar la distribución del teclado del sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Distribución del teclado</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
@@ -356,7 +357,7 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Acerca de"
 
@@ -629,11 +630,19 @@ msgstr ""
 "esta lista."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "lista de anotaciones de emoji favoritos en el diálogo de emoji"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Puede poner anotaciones a sus emoji favoritos en esta lista."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -641,13 +650,13 @@ msgstr ""
 "Si se puede obtener una coincidencia parcial en la búsqueda de anotaciones "
 "de emoji en lugar de una exacta."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
 "indicada"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -655,12 +664,12 @@ msgstr ""
 "Obtener coincidencias parciales en lugar de exactas en las anotaciones de "
 "emoji que tengan más que el número de caracteres indicado "
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Elija una condición para las coincidencias parciales de anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -669,33 +678,33 @@ msgstr ""
 "anotaciones de emoji: 0 == inicio del texto, 1 == final del texto, 2 == "
 "contiene el texto."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por defecto"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilitar método de entrada por defecto cuando la aplicación consigue el "
 "foco de entrada"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -1001,120 +1010,120 @@ msgstr "Favoritos"
 msgid "Others"
 msgstr "Otros"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Selección de emoji"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Escriba el texto o elija un emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Siguiente"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Anterior"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto de código: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Tiene variantes emoji"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Ninguna"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotaciones: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Cancelada la selección de emoji."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Se copió un emoji al portapapeles."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "FUENTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
 ""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "IDIOMA"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Buscar coincidencias con la longtud indicada"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Buscar coincidencias con la condición indicada por el código"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 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:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Créditos de Traducción"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Salir"
 
diff --git a/po/fr.po b/po/fr.po
index cdd7c2a27..3d0a853e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,16 +17,17 @@
 # Emmanuel Nedelec <nednet@wanadoo.fr>, 2017. #zanata
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-22 06:35-0400\n"
-"Last-Translator: José Fournier <jaaf64@zoraldia.com>\n"
+"PO-Revision-Date: 2017-10-05 08:54-0400\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -314,7 +315,7 @@ msgstr "Utiliser la disposition clavier système (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Partager la même méthode d’entrée pour toutes les applications"
 
@@ -350,7 +351,7 @@ msgstr "Démarrer IBus lors de la connexion"
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "À propos"
 
@@ -627,11 +628,22 @@ msgstr ""
 "si celle-ci contient des caractères."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+"liste des annotations d’émoticônes favorites dans la boite de dialogue"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+"Vous pouvez assigner une annotation pour une émoticône favorite dans cette "
+"liste."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre partiellement ou non"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -639,11 +651,11 @@ msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
 "partielle plutôt qu’à la chaîne complète"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Correspondance d’annotations d’émoticônes ayant la longueur spécifiée"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -651,12 +663,12 @@ msgstr ""
 "Correspondances partielles avec plus que le nombre de caractères spécifié "
 "plutôt qu'une correspondance exacte."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Choisir une condition de correspondance partielle d'annotations d'émoticônes"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -665,33 +677,33 @@ msgstr ""
 "partielle d'annotations d'émoticônes : 0 == correspondance de préfixe, 1 == "
 "correspondance de suffixe, 2 == correspondance de contenu"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d’édition"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 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:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Utiliser la méthode d’éntrée globale"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d’entrée"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 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"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -999,120 +1011,120 @@ msgstr "Favoris"
 msgid "Others"
 msgstr "Autres"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Choix d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Saisir une annotation ou choisir une émoticône"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Aucune"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue."
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Faire correspondre avec la longueur de l’entier indiqué"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Faire correspondre avec la condition de l’entier indiqué"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Quitter"
 
diff --git a/po/hu.po b/po/hu.po
index 4ffa23c76..fe2339654 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,19 +8,17 @@
 # kelemeng <kelemeng@gnome.hu>, 2011
 # Sulyok Péter <peti@fedoraproject.org>, 2009
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
-# Norbert Makula <iamreallynotapokemon@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-17 04:15-0400\n"
-"Last-Translator: Norbert Makula <iamreallynotapokemon@gmail.com>\n"
+"PO-Revision-Date: 2017-09-17 12:01-0400\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -120,7 +118,9 @@ msgstr "Jelöltek tájolása:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "A nyelv panel megjelenítési vagy elrejtési módjának beállítása"
+msgstr ""
+"Az ibus viselkedésének megadása, hogyan jelenítse meg vagy rejtse el a "
+"nyelvi sávot"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
@@ -128,7 +128,7 @@ msgstr "Tulajdonságpanel megjelenítése:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
-msgstr "A nyelvi panel elhelyezése:"
+msgstr "Nyelvi panel elhelyezése:"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
@@ -136,11 +136,13 @@ msgstr "Ikon megjelenítése az értesítési területen"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
-msgstr "Beviteli mód megjelenítése a nyelvi eszköztáron"
+msgstr "Beviteli mód nevének megjelenítése a nyelvi eszköztáron"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Beviteli mód nevének megjelenítése a nyelv panelen"
+msgstr ""
+"A beviteli mód nevének megjelenítése a nyelvi eszköztáron, ha be van jelölve "
+"a mező"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -226,6 +228,9 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>Az aktív beviteli mód a fenti listában szereplők közül állítható "
+"be, a gyorsbillentyűk megnyomásával, vagy a panel ikonra kattintva.</i></"
+"small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
@@ -262,12 +267,16 @@ msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
+"Az emodzsi annotációk részleges illesztése a következő feltétel szerint, ha "
+"több mint ennyi karakter lett megadva:"
 
 #: ../setup/setup.ui.h:56
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
+"Ha az emodzsi annotációkat részleges szövegre kell illeszteni, pontos "
+"egyezés helyett"
 
 #: ../setup/setup.ui.h:57
 msgid "Prefix match"
@@ -287,7 +296,7 @@ msgstr "Emodzsi"
 
 #: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
-msgstr "Rendszer-billentyűzetkiosztás használata"
+msgstr "Rendszer billentyűzetkiosztásának használata"
 
 #: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
@@ -297,13 +306,13 @@ msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
 #: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
-msgstr "<b>Globális bevitelimód-beállítások</b>"
+msgstr "<b>Globális beviteli mód beállítások</b>"
 
 #: ../setup/setup.ui.h:66
 msgid "Advanced"
@@ -333,7 +342,7 @@ msgstr "Az IBus indítása bejelentkezéskor"
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Névjegy"
 
@@ -357,11 +366,11 @@ msgstr "Alrendszerek sorrendje"
 
 #: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr "Elmentett motorok sorrendje a beviteli metódus listájában"
+msgstr "Mentett alrendszerek sorrendje a beviteli módok listájában"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "Felugró ablak késése az IME váltóablaknál"
+msgstr "Felugró ablak késleltetése az IME váltóablaknál"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
@@ -369,10 +378,10 @@ msgid ""
 " 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Késés "
-"milliszekundumban. 0 &gt; Nem jeleníti meg az ablakot, és átváltja a köv./"
-"előző motorra."
+"Beállítja a felugró ablak késleltetését az IME váltóablaknál. Az "
+"alapértelmezett 400.0  =  Azonnal megjelenik.  0 &lt; Késleltetés "
+"ezredmásodpercben. 0 &gt; Nem jeleníti meg az ablakot, és átvált a következő/"
+"előző alrendszerre."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -383,17 +392,19 @@ 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 ""
+"A mentett verziószám arra lesz használva, hogy ellenőrizve legyen az "
+"előzőleg telepített ibus, és az ibus jelenlegi verziója közti különbség."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "Latin kiosztások, amelyekben nincs ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
+"USA kiosztás a latin kiosztások mögé fűzve. A változat nem kihagyható."
 
 #: ../data/ibus.schemas.in.h:13
-#, fuzzy
 msgid "Use xmodmap"
 msgstr "Xmodmap használata"
 
@@ -401,14 +412,16 @@ msgstr "Xmodmap használata"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"Az xmodmap futtatása, ha létezik .xmodmap vagy .Xmodmap fájl az ibus "
+"alrendszerváltáskor."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
-msgstr "Aktiválja a gyorsbillentyűket"
+msgstr "Gyorsbillentyűk aktiválása"
 
 #: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Alkalmazza a gyorsbillentyűket a  gtk_accelerator_parse részére"
+msgstr "Aktiválja a gyorsbillentyűket a  gtk_accelerator_parse részére"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
@@ -416,7 +429,7 @@ msgstr "Gyorsbillentyűk engedélyezése"
 
 #: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
-msgstr "Gyorsbillentyűk a beviteli mód bekapcsolásához "
+msgstr "A beviteli mód bekapcsolásához használt gyorsbillentyűk"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
@@ -424,7 +437,7 @@ msgstr "Gyorsbillentyűk letiltása"
 
 #: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
-msgstr "Gyorsbillentyűk a beviteli mód kikapcsolásához "
+msgstr "A beviteli mód kikapcsolásához használt gyorsbillentyűk"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
@@ -432,8 +445,7 @@ msgstr "Következő alrendszer gyorsbillentyűi"
 
 #: ../data/ibus.schemas.in.h:23
 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ásához használt gyorsbillentyű"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -441,7 +453,7 @@ msgstr "Előző alrendszer gyorsbillentyűi"
 
 #: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "A lista előző beviteli módjára váltáshoz használandó gyorsbillentyű"
+msgstr "A lista előző beviteli módjára váltásához használt gyorsbillentyű"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -452,6 +464,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"A tulajdonságpanel viselkedése. 0 = Nem jelenik meg, 1 = Automatikus "
+"elrejtés, 2 = Mindig látszik"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -462,32 +476,36 @@ 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 "
+"A nyelvi 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:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "A bemeneti kurzor követése, ha a panel mindig megjelenik"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Ha igaz, akkor a panel követi a bemeneti kurzort abban az esetben, ha a "
+"panel mindig megjelenik. Ha hamis, akkor a panel egy fix helyen jelenik meg."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "A tulajdonságpanel megjelenítési ideje ezredmásodpercben"
 
 #: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Hány ezredmásodpercig jelenjen meg a tulajdonságpanel a fókuszálás, vagy a "
+"tulajdonságok változása után."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
-msgstr "Keresési tábla tájolása"
+msgstr "Kikeresési tábla tájolása"
 
 #: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
@@ -495,11 +513,11 @@ msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
-msgstr "Beviteli mód megjelenítése"
+msgstr "Beviteli mód nevének megjelenítése"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
-msgstr "RGBA értéke a XKB ikonnak"
+msgstr "Az XKB ikon RGBA értéke"
 
 #: ../data/ibus.schemas.in.h:41
 #, no-c-format
@@ -512,10 +530,17 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"Az XKB ikon az elrendezési karakterláncot mutatja, és a karakterlánc egy "
+"RGBA értékkel jelenik meg. Az RGA érték a következők egyike lehet. 1. egy "
+"X11 színnév, 2. egy hexadecimális érték, „#rrggbb” formában, ahol az „r”, "
+"„g” és „b” a vörös, zöld és kék színek értékei hexadecimális számjegyekkel, "
+"3. egy RGB szín „rgb(r,g,b,a)” alakban, ahol az „r”, „g” és „b” egész számok "
+"0 és 255 között, vagy százalékos értékek 0% és 100% között, az „a” pedig az "
+"alfa lebegőpontos értéke 0 és 1 között."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "A panel ikon megjelenítési ideje egy tulajdonsághoz ezredmásodpercben"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -543,95 +568,115 @@ msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Emodzsi gyorsbillentyűket a  gtk_accelerator_parse részére"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
+msgstr "Gyorsbillentyűk az emodzsi bevitel ki- vagy bekapcsolásához"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Custom font name for emoji chracters on emoji dialog"
-msgstr ""
+msgstr "Egyéni emodzsi betűkészlet neve az emodzsi párbeszédablakhoz"
 
 #: ../data/ibus.schemas.in.h:53
 msgid "Default language for emoji dictionary"
-msgstr "Alapértelmezett nyelv az emoji könyvtárhoz"
+msgstr "Emodzsi szótár alapértelmezett neve"
 
 #: ../data/ibus.schemas.in.h:54
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
+"Válassza ki az emodzsi párbeszédablakon megjelenő emodzsi szótárak "
+"alapértelmezett nyelvét. A $lang érték ebbe lesz behelyettesítve: /usr/share/"
+"ibus/dicts/emoji-$lang.dict"
 
 #: ../data/ibus.schemas.in.h:55
 msgid "favorite emoji list on emoji dialog"
-msgstr ""
+msgstr "kedvenc emodzsik listája az emodzsi párbeszédablakon"
 
 #: ../data/ibus.schemas.in.h:56
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
+"Megjelenítheti a kedvenc emodzsijait a listában, ha vannak ilyen karakterek"
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "kedvenc emodzsik annotációinak listája az emodzsi párbeszédablakon"
 
 #: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Annotációkat adhat hozzá a kedvenc, listában szereplő emodzsijainak."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Az emodzsi annotációkra lehet-e részlegesen illeszteni"
+
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
+"Illeszthetőek-e részleges karakterláncokra az emodzsi annotációk, a pontos "
+"egyezés helyett"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "Illesztés a megadott hosszúságú emodzsi annotációkra"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
+"Az emodzsi annotációk részleges illesztése, a pontos egyezés helyett, ha "
+"több mint ennyi karakter lett megadva"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "Válasszon egy feltételt az emodzsi annotációk részleges illesztéséhez"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Válasszon egyet a következő feltételek közül, az emodzsi annotációk "
+"részleges illesztéséhez: 0 == szó elejére illesztés, 1 == szó végére "
+"illesztés, 2 == tartalmazási illesztés"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 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"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
-msgstr "DConf megtartja a név előtagokat"
+msgstr "A DConf megőrzi a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "A DConf billentyűket prefixálja hogy megállítsa a név konverziókat"
+msgstr ""
+"A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
 
 #: ../ibus/_config.py.in:41
 msgid ""
@@ -647,7 +692,7 @@ msgstr "Egyéb"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "Válasszon nyelvet"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
@@ -661,7 +706,7 @@ msgstr "_OK"
 
 #: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
 msgid "More…"
-msgstr ""
+msgstr "Tovább…"
 
 #: ../setup/engineabout.py:72
 #, python-format
@@ -692,7 +737,7 @@ msgstr "Bill."
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "IBus beállításai"
+msgstr "IBus beállítások megadása"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -731,12 +776,12 @@ msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 #: ../setup/main.py:121 ../setup/main.py:580
 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"
+"Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli "
+"módra"
 
 #: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Az IBus daemon nem működik. El kívánja indítani?"
+msgstr "Az IBus démon nem fut. Elindítja?"
 
 #: ../setup/main.py:528
 msgid ""
@@ -746,8 +791,8 @@ msgid ""
 "  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"
+"Az IBus elindult. Ha nem tudja használni az IBust, adja a következő sorokat "
+"a $HOME/.bashrc fájlhoz; majd jelentkezzen be újra.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -756,7 +801,7 @@ msgstr ""
 #: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus daemon nem indítható %d mp belül."
+msgstr "Az IBus démon nem indítható el %d másodpercen belül."
 
 #: ../setup/main.py:554
 #, python-format
@@ -770,43 +815,43 @@ msgstr "beviteli módok váltása"
 
 #: ../src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "Tevékenységek"
 
 #: ../src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "Állatok és természet"
 
 #: ../src/ibusemojigen.h:32
 msgid "Flags"
-msgstr ""
+msgstr "Zászlók"
 
 #: ../src/ibusemojigen.h:33
 msgid "Food & Drink"
-msgstr ""
+msgstr "Étel és ital"
 
 #: ../src/ibusemojigen.h:34
 msgid "Objects"
-msgstr ""
+msgstr "Tárgyak"
 
 #: ../src/ibusemojigen.h:35
 msgid "Smileys & People"
-msgstr ""
+msgstr "Hangulatjelek és emberek"
 
 #: ../src/ibusemojigen.h:36
 msgid "Symbols"
-msgstr ""
+msgstr "Szimbólumok"
 
 #: ../src/ibusemojigen.h:37
 msgid "Travel & Places"
-msgstr ""
+msgstr "Utazás és helyek"
 
 #: ../tools/main.vala:51
 msgid "List engine name only"
-msgstr "Csak az alrendszerek nevét listázza"
+msgstr "Csak az alrendszerek nevének listázása"
 
 #: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
 msgid "Can't connect to IBus.\n"
-msgstr "Nem tudok csatlakozni az IBus-hoz.\n"
+msgstr "Nem lehet csatlakozni a IBushoz.\n"
 
 #: ../tools/main.vala:93
 #, c-format
@@ -815,101 +860,101 @@ msgstr "nyelv: %s\n"
 
 #: ../tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr "Nincs motor beállítva.\n"
+msgstr "Nincs alrendszer beállítva.\n"
 
 #: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
-msgstr "Általános motor beállítása nem sikerült.\n"
+msgstr "Nem sikerült az általános alrendszer beállítása.\n"
 
 #: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
-msgstr "Általános motor beszerzése nem sikerült.\n"
+msgstr "Nem sikerült az általános alrendszer lekérése.\n"
 
 #: ../tools/main.vala:213
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "A rendszer regisztrációs gyorsítótárának olvasása."
 
 #: ../tools/main.vala:215
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "A rendszer regisztrációs FÁJLjának olvasása."
 
 #: ../tools/main.vala:233 ../tools/main.vala:238
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "A regisztrációs gyorsítótár érvénytelen.\n"
 
 #: ../tools/main.vala:253
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "A rendszer regisztrációs gyorsítótárának írása."
 
 #: ../tools/main.vala:255
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "A rendszer regisztrációs FÁJLjának írása."
 
 #: ../tools/main.vala:307
 msgid "Resetting…"
-msgstr ""
+msgstr "Visszaállítás…"
 
 #: ../tools/main.vala:321
 msgid "Done"
-msgstr ""
+msgstr "Kész"
 
 #: ../tools/main.vala:366
 msgid "Set or get engine"
-msgstr ""
+msgstr "Alrendszer beállítása vagy lekérése"
 
 #: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Kilépés az ibus-daemon-ból"
 
 #: ../tools/main.vala:368
 msgid "Show available engines"
-msgstr ""
+msgstr "Elérhető alrendszerek megjelenítése"
 
 #: ../tools/main.vala:369
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Nincs megvalósítva)"
 
 #: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Az ibus-daemon újraindítása"
 
 #: ../tools/main.vala:371
 msgid "Show version"
-msgstr ""
+msgstr "Verzió megjelenítése"
 
 #: ../tools/main.vala:372
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "A regisztrációs gyorsítótár tartalmának megjelenítése"
 
 #: ../tools/main.vala:373
 msgid "Create registry cache"
-msgstr ""
+msgstr "Regisztrációs gyorsítótár létrehozása"
 
 #: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Az ibus-daemon D-Bus címének kiírása"
 
 #: ../tools/main.vala:375
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Beállítási értékek megjelenítése"
 
 #: ../tools/main.vala:376
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "A beállítási értékek visszaállítása"
 
 #: ../tools/main.vala:378
 msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
 
 #: ../tools/main.vala:380
 msgid "Show this information"
-msgstr ""
+msgstr "Ezen információk megjelenítése"
 
 #: ../tools/main.vala:386
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Használat: %s PARANCS [OPCIÓK...]\n"
+msgstr "Használat: %s PARANCS [KAPCSOLÓK…]\n"
 "\n"
 
 #: ../tools/main.vala:387
@@ -919,127 +964,128 @@ msgstr "Parancsok:\n"
 #: ../tools/main.vala:416
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s ismeretlen parancs!\n"
+msgstr "%s: ismeretlen parancs!\n"
 
 #: ../ui/gtk3/emojier.vala:170
 msgid "Show emoji variants"
-msgstr ""
+msgstr "Emodzsi változatok megjelenítése"
 
 #: ../ui/gtk3/emojier.vala:175
 msgid "Menu"
-msgstr ""
+msgstr "Menü"
 
 #: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
-msgstr ""
+msgstr "Kedvencek"
 
 #: ../ui/gtk3/emojier.vala:190
 msgid "Others"
-msgstr ""
+msgstr "Többi"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
-msgstr ""
+msgstr "Emodzsi választás"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
-msgstr ""
+msgstr "Írja be az annotációt, vagy válasszon emodzsit"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
-msgstr ""
+msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
-msgstr ""
+msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "Kódpont: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
-msgstr ""
+msgstr "Vannak emodzsi változatai"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
-msgstr ""
+msgstr "Leírás: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
-msgstr ""
+msgstr "Annotációk: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
-msgstr ""
+msgstr "Emodzsi kiválasztás megszakítva."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
-msgstr ""
+msgstr "Emodzsi vágólapra másolva."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
+msgstr "„BETŰKÉSZLET” az emodzsi választó párbeszédablakon"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
-msgstr ""
+msgstr "BETŰKÉSZLET"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "„NYELV”  az emodzsi párbeszédablak annotációhoz. Például „en”"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
-msgstr ""
+msgstr "NYELV"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "Az emodzsi annotációkra lehet részlegesen illeszteni"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "Illesztés a megadott egész számmal egyező hosszra"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "Illesztés a megadott egész szám feltételével"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
-msgstr ""
+msgstr "IBus panel"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
-msgstr ""
+msgstr "IBus frissítés"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Most már a Super+Szóköz az alapértelmezett gyorsbillentyű."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez"
+msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr ""
 "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 2012.\n"
+"Meskó Balázs <meskobalazs@fedoraproject.org>, 2017.\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
@@ -1049,15 +1095,15 @@ msgstr ""
 "  Token https://launchpad.net/~kozmad\n"
 "  fergekolferol https://launchpad.net/~ferge-kolferol"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Kilépés"
 
diff --git a/po/ja.po b/po/ja.po
index f0b99566b..d75cb30ce 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -18,11 +18,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-01 04:35-0400\n"
+"PO-Revision-Date: 2017-10-20 12:16+0900\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
@@ -293,7 +293,7 @@ msgstr "システムのキーボード (XKB) レイアウトを使用する"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
@@ -329,7 +329,7 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "情報"
 
@@ -576,60 +576,68 @@ msgid ""
 msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "絵文字ダイアログ上のお気に入りの絵文字ルビリスト"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "このリストの中にお気に入りの絵文字用のルビを指定できます。"
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "絵文字ルビを部分一致させることを可能にするか否か"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "指定した長さで絵文字ルビを一致させる"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "絵文字ルビを部分一致させる条件を選ぶ"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr "絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文末一致、2 == 文中一致"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -934,106 +942,106 @@ msgstr "お気に入り"
 msgid "Others"
 msgstr "その他"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "ルビを入力するか絵文字を選択してください"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "なし"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "絵文字の選択を取り消しました。"
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "クリップボードに絵文字をコピーしました。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "フォント"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "言語"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "指定した数字をもつ長さで一致させる"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -1041,15 +1049,15 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "終了"
 
diff --git a/po/nl.po b/po/nl.po
index 13914ebe8..6b51c538e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translation of ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,15 +8,16 @@
 # Geert Warrink <geert.warrink@onsnet.nu>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Geert Warrink <geert.warrink@onsnet.nu>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-06 06:22-0400\n"
+"PO-Revision-Date: 2017-07-28 10:10-0400\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
@@ -304,7 +305,7 @@ msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
@@ -340,7 +341,7 @@ msgstr "Start ibus bij inloggen"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Over"
 
@@ -613,10 +614,19 @@ msgstr ""
 "heeft."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "favoriete emoji annotatielijst op de emoji dialoog"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+"Je kunt in deze lijst een annotatie toekennen aan een favoriete emoji."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Worden emoji annotaties wel of niet gedeeltelijk gematched"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -624,11 +634,11 @@ msgstr ""
 "Worden emoji annotaties wel of niet gematched met een gedeeltelijke string "
 "in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji annotaties met de gespecificeerde lengte"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -636,11 +646,11 @@ msgstr ""
 "Match emoji annotaties gedeeltelijk met meer dan het gespecificeerde aantal "
 "karakters in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Kies een conditie om emoji annotaties gedeeltelijk te matchen"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -649,31 +659,31 @@ msgstr ""
 "matchen: 0 == Voorvoegsel match, 1 == Achtervoegel match, 2 == Inhoudelijke "
 "match"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -981,118 +991,118 @@ msgstr "Favorieten"
 msgid "Others"
 msgstr "Andere"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Emoji keuze"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Typeannotatie of kies emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Pagina naar beneden"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Pagina omhoog"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Code punt: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Heeft emoji varianten"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Geen"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotaties: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Annuleer het kiezen van een emoji."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Een emoji naar je clipboard gecopieerd."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "\"FONT\" voor emoji karakters op emoji dialoog"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"TAAL\" voor annotaties op emoji dialoog. B.v. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "TAAL"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Match met de lengte van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Match met de conditie van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "IBus Paneel"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Afsluiten"
 
diff --git a/po/pl.po b/po/pl.po
index 923e59a3c..83c6710a2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,5 +1,5 @@
 # Polish translation of ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
@@ -9,15 +9,16 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata
 # Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-06 03:35-0400\n"
+"PO-Revision-Date: 2017-07-24 05:17-0400\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "Language: pl\n"
@@ -303,7 +304,7 @@ msgstr "Systemowy układ klawiatury (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Ta sama metoda wprowadzania we wszystkich aplikacjach"
 
@@ -339,7 +340,7 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchamianie</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "O programie"
 
@@ -608,10 +609,18 @@ msgid ""
 msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "lista ulubionych uwag emoji w oknie emoji"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Można przydzielić uwagę do ulubionej emoji na tej liście."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -619,11 +628,11 @@ msgstr ""
 "Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
 "z dokładnym dopasowaniem."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Dopasowywanie uwag emoji o podanej długości"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -631,11 +640,11 @@ msgstr ""
 "Częściowe dopasowywanie uwag emoji o więcej niż tej liczbie znaków, zamiast "
 "dokładnego dopasowywania."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Warunek częściowego dopasowywania uwag emoji"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -644,33 +653,33 @@ msgstr ""
 "0 == dopasowywanie przedrostka, 1 == dopasowywanie przyrostka, 2 == "
 "dopasowywanie w środku"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Globalna metoda wprowadzania"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
 "wprowadzania"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -976,119 +985,119 @@ msgstr "Ulubione"
 msgid "Others"
 msgstr "Inne"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Proszę wpisać uwagę lub wybrać emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Brak"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Anulowano, aby wybrać emoji."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Skopiowano emoji do schowka."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "CZCIONKA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "JĘZYK"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2017"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Zakończ"
 
diff --git a/po/sv.po b/po/sv.po
index a29ff1859..7887896ff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,15 +5,16 @@
 #
 # Translators:
 # Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-06-02 04:07-0400\n"
+"PO-Revision-Date: 2017-08-07 02:24-0400\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -295,7 +296,7 @@ msgstr "Använd systemets (XKB) tangentbordslayout"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tangentbordslayout</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Dela samma inmatningsmetod mellan alla program"
 
@@ -331,7 +332,7 @@ msgstr "Starta ibus vid inloggning"
 msgid "<b>Startup</b>"
 msgstr "<b>Uppstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Om"
 
@@ -594,10 +595,18 @@ msgstr ""
 "tecken."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "favorit-emoji-annoteringslista i emoji-dialogen"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Du kan tilldela en annotering för en favorit-emoji i denna lista."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Huruvida emoji-annotationer kan matchas partiellt eller inte"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -605,11 +614,11 @@ msgstr ""
 "Huruvida emoji-annotationer kan matchas med en partiell sträng istället för "
 "den exakta matchningen eller inte."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Matcha emoji-annotationer med den angivna längden"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -617,11 +626,11 @@ msgstr ""
 "Matcha emoji-annotationer partiellt med mer än det angivna antalet tecken "
 "istället för den exakta matchningen."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Välj ett villkor för att matcha emoji-annotationer partiellt"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -629,32 +638,32 @@ msgstr ""
 "Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 =="
 " prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Bädda in förredigerad text"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Bädda in förredigerad text i programfönstret"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Använd den globala inmatningsmetoden"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Aktivera inmatningsmetoden som standard"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Aktivera inmatningsmetoden som standard när programmet får inmatningsfokus"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf namnbevarandeprefix"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefix av DConf-tangenter för att förhindra namnkonvertering"
 
@@ -960,118 +969,118 @@ msgstr "Favoriter"
 msgid "Others"
 msgstr "Annat"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Ange annotation eller välj emoji"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "Bläddra upp"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodpunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Avbröt att välja en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "SPRÅK"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annotationer kan matcha partiellt"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Matcha med längden på det angivna heltalet"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Matcha med villkoret för det angivna heltalet"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "IBus-uppdatering"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Super+ mellanslag är nu standardsnabbkommando."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Starta om"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Avsluta"
 
diff --git a/po/uk.po b/po/uk.po
index c1c2211ab..aca8cc522 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,15 +9,16 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-10 01:22-0400\n"
+"PO-Revision-Date: 2017-07-25 05:31-0400\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -305,7 +306,7 @@ msgstr "Використовувати розкладку клавіатури 
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
@@ -341,7 +342,7 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "Інформація"
 
@@ -612,10 +613,18 @@ msgstr ""
 "є якісь символи."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "список анотацій до улюблених емодзі у вікні емодзі"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "Ви можете додавати анотації до улюблених емодзі у цьому списку."
+
+#: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Визначає, чи може бути встановлено часткову відповідність"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -623,11 +632,11 @@ msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
 "не повним збігом"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -635,11 +644,11 @@ msgstr ""
 "Встановлювати часткову відповідність анотацій до емодзі, якщо збігається "
 "вказана кількість символів, але відповідність не є повною."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Вибрати умову часткової відповідності анотацій до емодзі"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -648,32 +657,32 @@ msgstr ""
 "анотаціями до емодзі: 0 == відповідність за префіксом, 1 == відповідність за "
 "суфіксом, 2 == відповідність за вмістом"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -981,119 +990,119 @@ msgstr "Улюблені"
 msgid "Others"
 msgstr "Інше"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "Введіть анотацію або виберіть емодзі"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "Немає"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "Скасовано вибір емодзі."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "Скопійовано емодзі до вашого буфера обміну даними."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
 msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
 msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
 msgstr "МОВА"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
 msgstr ""
 "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
 msgstr "Відповідність за вказаною довжиною рядка"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "Вийти"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 53bb2274b..e1da31fee 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -16,12 +16,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2017-07-24 15:28+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-19 10:57-0400\n"
-"Last-Translator: Caius \"kaio\" Chance <caius.chance@gmail.com>\n"
+"PO-Revision-Date: 2017-09-03 09:35-0400\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -254,29 +254,29 @@ msgstr "繪文字註釋語言："
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
-msgstr ""
+msgstr "部分繪文字註解符合下列條件以及至少字數："
 
 #: ../setup/setup.ui.h:56
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
-msgstr ""
+msgstr "是否繪文字註解可以用部分字串符合取代精確符合"
 
 #: ../setup/setup.ui.h:57
 msgid "Prefix match"
-msgstr ""
+msgstr "前綴符合"
 
 #: ../setup/setup.ui.h:58
 msgid "Suffix match"
-msgstr ""
+msgstr "後綴符合"
 
 #: ../setup/setup.ui.h:59
 msgid "Containing match"
-msgstr ""
+msgstr "內含符合"
 
 #: ../setup/setup.ui.h:60
 msgid "Emoji"
-msgstr ""
+msgstr "繪文字"
 
 #: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
@@ -290,7 +290,7 @@ msgstr "使用系統鍵盤 (XKB) 配置"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
@@ -326,7 +326,7 @@ msgstr "在登入時啟動 iBus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
 msgid "About"
 msgstr "關於"
 
@@ -568,60 +568,68 @@ msgid ""
 msgstr "您可以在繪文字清單中顯示喜愛的繪文字，若有列出任何字元的話。"
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "繪文字對話盒中喜愛的繪文字註解列表"
 
 #: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr "您可以為清單中喜愛的繪文字指派註解。"
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "是否可以只部分符合繪文字註解"
+
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr ""
+msgstr "比對時是否可以只有部分字串符合繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "以指定長度符合繪文字註解"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr ""
+msgstr "以超過指定字數符合部分繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "選擇部分符合繪文字註解的條件"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr ""
+msgstr "選擇下列部分符合繪文字註解的條件之一：0 == 前綴符合，1 == 後綴符合, 2 == 內含符合"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -638,7 +646,7 @@ msgstr "其他"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "選取語言"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
@@ -757,35 +765,35 @@ msgstr "切換輸入法"
 
 #: ../src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "活動"
 
 #: ../src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "動物與自然"
 
 #: ../src/ibusemojigen.h:32
 msgid "Flags"
-msgstr ""
+msgstr "旗幟"
 
 #: ../src/ibusemojigen.h:33
 msgid "Food & Drink"
-msgstr ""
+msgstr "食物與飲品"
 
 #: ../src/ibusemojigen.h:34
 msgid "Objects"
-msgstr ""
+msgstr "物體"
 
 #: ../src/ibusemojigen.h:35
 msgid "Smileys & People"
-msgstr ""
+msgstr "表情與人物"
 
 #: ../src/ibusemojigen.h:36
 msgid "Symbols"
-msgstr ""
+msgstr "符號"
 
 #: ../src/ibusemojigen.h:37
 msgid "Travel & Places"
-msgstr ""
+msgstr "旅行與地點"
 
 #: ../tools/main.vala:51
 msgid "List engine name only"
@@ -910,11 +918,11 @@ msgstr "%s 為未知指令！\n"
 
 #: ../ui/gtk3/emojier.vala:170
 msgid "Show emoji variants"
-msgstr ""
+msgstr "顯示繪文字變化"
 
 #: ../ui/gtk3/emojier.vala:175
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #: ../ui/gtk3/emojier.vala:189
 msgid "Favorites"
@@ -922,122 +930,122 @@ msgstr "喜愛"
 
 #: ../ui/gtk3/emojier.vala:190
 msgid "Others"
-msgstr ""
+msgstr "其他"
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
+#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
 msgid "Emoji Choice"
-msgstr ""
+msgstr "繪文字選擇"
 
-#: ../ui/gtk3/emojier.vala:330
+#: ../ui/gtk3/emojier.vala:336
 msgid "Type annotation or choose emoji"
 msgstr "請輸入註釋或選擇繪文字"
 
-#: ../ui/gtk3/emojier.vala:752
+#: ../ui/gtk3/emojier.vala:737
 msgid "Page Down"
 msgstr "上一頁"
 
-#: ../ui/gtk3/emojier.vala:763
+#: ../ui/gtk3/emojier.vala:748
 msgid "Page Up"
 msgstr "下一頁"
 
-#: ../ui/gtk3/emojier.vala:882
+#: ../ui/gtk3/emojier.vala:883
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "碼點：%s"
 
-#: ../ui/gtk3/emojier.vala:888
+#: ../ui/gtk3/emojier.vala:889
 msgid "Has emoji variants"
-msgstr ""
+msgstr "有繪文字變化"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
+#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:995
+#: ../ui/gtk3/emojier.vala:1001
 msgid "None"
 msgstr "無"
 
-#: ../ui/gtk3/emojier.vala:1015
+#: ../ui/gtk3/emojier.vala:1021
 #, c-format
 msgid "Annotations: %s"
 msgstr "註釋：%s"
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:49
 msgid "Canceled to choose an emoji."
 msgstr "已取消繪文字的選擇。"
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:70
 msgid "Copied an emoji to your clipboard."
 msgstr "已將繪文字複製到您的剪貼簿。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:90
 msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
+msgstr "繪文字對話盒之繪文字字元用「FONT」字型"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:91
 msgid "FONT"
-msgstr ""
+msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:96
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "繪文字對話盒的「LANG」語言註解。例：「en」"
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:97
 msgid "LANG"
-msgstr ""
+msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:99
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "可以部分符合繪文字註解"
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "符合指定整數長度"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:107
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "符合指定整數的條件"
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:861
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1244
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1248
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1267
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1286
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1290
 msgid "Quit"
 msgstr "結束"
 

From 4f9fa092924b75084b3b9e3fc368d0744db8ad2a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 22 Oct 2017 19:25:55 +0900
Subject: [PATCH 440/816] Release 1.5.17

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/332030043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 14556a3a7..4789328ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [16])
+m4_define([ibus_micro_version], [17])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From c36081898d93c6256ee78fa94dccd769fffff41f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 26 Oct 2017 11:03:18 +0900
Subject: [PATCH 441/816] tools: Do not change keymaps with
 'use-system-keyboard-layout'

BUG=https://github.com/ibus/ibus/issues/1951

Review URL: https://codereview.appspot.com/334890043
---
 tools/main.vala | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/main.vala b/tools/main.vala
index 9aca4b00c..8c0b64d3d 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -21,18 +21,21 @@
  * USA
  */
 
+private const string IBUS_SCHEMAS_GENERAL = "org.freedesktop.ibus.general";
+private const string IBUS_SCHEMAS_GENERAL_PANEL =
+        "org.freedesktop.ibus.general.panel";
+private const string IBUS_SCHEMAS_PANEL = "org.freedesktop.ibus.panel";
+
 private const string[] IBUS_SCHEMAS = {
-    "org.freedesktop.ibus.general",
-    "org.freedesktop.ibus.general.hotkey",
-    "org.freedesktop.ibus.panel",
+    IBUS_SCHEMAS_GENERAL,
+    IBUS_SCHEMAS_GENERAL_PANEL,
+    IBUS_SCHEMAS_PANEL,
 };
 
 bool name_only = false;
 /* system() exists as a public API. */
 bool is_system = false;
 string cache_file = null;
-string emoji_font = null;
-string annotation_lang = null;
 
 class EngineList {
     public IBus.EngineDesc[] data = {};
@@ -175,7 +178,11 @@ int get_set_engine(string[] argv) {
         return Posix.EXIT_FAILURE;
     }
 
-    return exec_setxkbmap(desc);
+    var settings = new GLib.Settings(IBUS_SCHEMAS_GENERAL);
+    if (!settings.get_boolean("use-system-keyboard-layout"))
+        return exec_setxkbmap(desc);
+
+    return Posix.EXIT_SUCCESS;
 }
 
 int message_watch(string[] argv) {
@@ -362,7 +369,7 @@ struct CommandEntry {
     unowned EntryFunc entry;
 }
 
-static const CommandEntry commands[]  = {
+const CommandEntry commands[]  = {
     { "engine", N_("Set or get engine"), get_set_engine },
     { "exit", N_("Exit ibus-daemon"), exit_daemon },
     { "list-engine", N_("Show available engines"), list_engine },

From 1cbe86726d99b79201cf3735610524e9a49aa08b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 31 Oct 2017 13:17:16 +0900
Subject: [PATCH 442/816] src: Fix GVariant leaks

g_task_propagate_pointer() gives ownership of the data to the caller, so
the GVariants handed this way must be unref'ed after the contents have
been extracted/copied.

BUG=https://github.com/ibus/ibus/pull/1956

Review URL: https://codereview.appspot.com/330710043

Patch from Carlos Garnacho <carlosg@gnome.org>.
---
 src/ibusbus.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index fc0c90335..11659c41f 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -755,6 +755,7 @@ _async_finish_object_path (GTask   *task,
     g_variant_get (result, "(v)", &variant);
     path = g_variant_dup_string (variant, NULL);
     g_variant_unref (variant);
+    g_variant_unref (result);
     return path;
 }
 
@@ -772,6 +773,7 @@ _async_finish_string (GTask   *task,
     }
     g_return_val_if_fail (variant != NULL, NULL);
     g_variant_get (variant, "(&s)", &s);
+    g_variant_unref (variant);
     return s;
 }
 
@@ -789,6 +791,7 @@ _async_finish_gboolean (GTask   *task,
     }
     g_return_val_if_fail (variant != NULL, FALSE);
     g_variant_get (variant, "(b)", &retval);
+    g_variant_unref (variant);
     return retval;
 }
 
@@ -807,6 +810,7 @@ _async_finish_guint (GTask   *task,
     }
     g_return_val_if_fail (variant != NULL, bad_id);
     g_variant_get (variant, "(u)", &id);
+    g_variant_unref (variant);
     return id;
 }
 
@@ -1864,6 +1868,7 @@ ibus_bus_list_engines_async_finish (IBusBus      *bus,
     }
     g_variant_iter_free (iter);
     g_variant_unref (variant);
+    g_variant_unref (result);
     return retval;
 }
 
@@ -2243,6 +2248,7 @@ ibus_bus_get_global_engine_async_finish (IBusBus      *bus,
         g_variant_unref (obj);
         g_variant_unref (variant);
     }
+    g_variant_unref (result);
     return engine;
 }
 
@@ -2461,6 +2467,7 @@ ibus_bus_get_ibus_property_async_finish (IBusBus      *bus,
     g_return_val_if_fail (result != NULL, NULL);
     GVariant *retval = NULL;
     g_variant_get (result, "(v)", &retval);
+    g_variant_unref (result);
 
     return retval;
 }

From f5e0752fe345db2033a2b49de206dc62acd00a2b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 Nov 2017 12:14:08 +0900
Subject: [PATCH 443/816] src: Added some error handlings from a code review

Review URL: https://codereview.appspot.com/337900043
---
 src/ibuscomposetable.c | 49 ++++++++++++++++--------------
 src/ibusenginesimple.c | 68 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 86c9314cf..d473f5819 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -678,30 +678,33 @@ ibus_compose_table_load_cache (const gchar *compose_file)
     gsize length = 0;
     GError *error = NULL;
 
-    hash = g_str_hash (compose_file);
-    if ((path = ibus_compose_hash_get_cache_path (hash)) == NULL)
-        return NULL;
-    if (!g_file_test (path, G_FILE_TEST_EXISTS))
-        goto out_load_cache;
-
-    g_stat (compose_file, &original_buf);
-    g_stat (path, &cache_buf);
-    if (original_buf.st_mtime > cache_buf.st_mtime)
-        goto out_load_cache;
-    if (!g_file_get_contents (path, &contents, &length, &error)) {
-        g_warning ("Failed to get cache content %s: %s", path, error->message);
-        g_error_free (error);
-        goto out_load_cache;
-    }
-
-    retval = ibus_compose_table_deserialize (contents, length);
-    if (retval == NULL)
-        g_warning ("Failed to load the cache file: %s", path);
-    else
-        retval->id = hash;
+    do {
+        hash = g_str_hash (compose_file);
+        if ((path = ibus_compose_hash_get_cache_path (hash)) == NULL)
+            return NULL;
+        if (!g_file_test (path, G_FILE_TEST_EXISTS))
+            break;
+
+        if (g_stat (compose_file, &original_buf))
+            break;
+        if (g_stat (path, &cache_buf))
+            break;
+        if (original_buf.st_mtime > cache_buf.st_mtime)
+            break;
+        if (!g_file_get_contents (path, &contents, &length, &error)) {
+            g_warning ("Failed to get cache content %s: %s",
+                       path, error->message);
+            g_error_free (error);
+            break;
+        }
 
+        retval = ibus_compose_table_deserialize (contents, length);
+        if (retval == NULL)
+            g_warning ("Failed to load the cache file: %s", path);
+        else
+            retval->id = hash;
+    } while (0);
 
-out_load_cache:
     g_free (contents);
     g_free (path);
     return retval;
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 63785223a..6100eb7b5 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -48,6 +48,27 @@
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
+#define SET_COMPOSE_BUFFER_ELEMENT_NEXT(buffer, index, value) {         \
+    if ((index) < EMOJI_SOURCE_LEN) {                                   \
+        (buffer)[(index)] = (value);                                    \
+        (index) += 1;                                                   \
+    }                                                                   \
+}
+
+#define SET_COMPOSE_BUFFER_ELEMENT_END(buffer, index, value) {          \
+    if ((index) >= EMOJI_SOURCE_LEN) {                                  \
+        (index) = EMOJI_SOURCE_LEN;                                     \
+        (buffer)[EMOJI_SOURCE_LEN - 1] = (value);                       \
+    } else {                                                            \
+        (buffer)[(index)] = (value);                                    \
+    }                                                                   \
+}
+
+#define CHECK_COMPOSE_BUFFER_LENGTH(index) {                            \
+    if ((index) > EMOJI_SOURCE_LEN)                                     \
+        (index) = EMOJI_SOURCE_LEN;                                     \
+}
+
 typedef struct {
     GHashTable *dict;
     int         max_seq_len;
@@ -307,6 +328,8 @@ check_hex (IBusEngineSimple *simple,
     gchar *nptr = NULL;
     gchar buf[7];
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     priv->tentative_match = 0;
     priv->tentative_match_len = 0;
 
@@ -387,6 +410,8 @@ check_emoji_table (IBusEngineSimple       *simple,
 
     g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     if (priv->lookup_table == NULL) {
         priv->lookup_table = ibus_lookup_table_new (10, 0, TRUE, TRUE);
         g_object_ref_sink (priv->lookup_table);
@@ -492,6 +517,7 @@ check_table (IBusEngineSimple       *simple,
     guint16 *seq;
 
     g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
 
     if (n_compose > table->max_seq_len)
         return FALSE;
@@ -562,6 +588,8 @@ ibus_check_compact_table (const IBusComposeTableCompact *table,
     if (output_char)
         *output_char = 0;
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     /* Will never match, if the sequence in the compose buffer is longer
      * than the sequences in the table.  Further, compare_seq (key, val)
      * will overrun val if key is longer than val. */
@@ -659,6 +687,8 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 
     n_combinations = 1;
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     for (i = 1; i < n_compose; i++ )
         n_combinations *= i;
 
@@ -719,6 +749,8 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
     if (output_char)
         *output_char = 0;
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     if (n_compose >= IBUS_MAX_COMPOSE_LEN)
         return FALSE;
 
@@ -806,6 +838,8 @@ no_sequence_matches (IBusEngineSimple *simple,
 
     gunichar ch;
 
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
+
     /* No compose sequences found, check first if we have a partial
      * match pending.
      */
@@ -975,8 +1009,12 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     gboolean compose_finish;
     gunichar output_char;
 
-    while (priv->compose_buffer[n_compose] != 0)
+    while (priv->compose_buffer[n_compose] != 0 && n_compose < EMOJI_SOURCE_LEN)
         n_compose++;
+    if (n_compose >= EMOJI_SOURCE_LEN) {
+        g_warning ("copmose table buffer is full.");
+        n_compose = EMOJI_SOURCE_LEN - 1;
+    }
 
     if (modifiers & IBUS_RELEASE_MASK) {
         if (priv->in_hex_sequence &&
@@ -1197,15 +1235,16 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
     /* Then, check for compose sequences */
     if (priv->in_hex_sequence) {
-        if (hex_keyval)
-            priv->compose_buffer[n_compose++] = hex_keyval;
-        else if (is_escape) {
+        if (hex_keyval) {
+            SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
+                                             n_compose,
+                                             hex_keyval);
+        } else if (is_escape) {
             // FIXME
             ibus_engine_simple_reset (engine);
 
             return TRUE;
-        }
-        else if (!is_hex_end) {
+        } else if (!is_hex_end) {
             // FIXME
             /* non-hex character in hex sequence */
             // beep_window (event->window);
@@ -1220,11 +1259,15 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                  * E.g. "1" and "2" are  indexes of emoji "1".
                  * "100" is an annotation of the emoji "100".
                  */
-                priv->compose_buffer[n_compose++] = printable_keyval;
+                SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
+                                                 n_compose,
+                                                 printable_keyval);
             }
         }
         else if (is_space && (modifiers & IBUS_SHIFT_MASK)) {
-            priv->compose_buffer[n_compose++] = IBUS_KEY_space;
+            SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
+                                             n_compose,
+                                             IBUS_KEY_space);
         }
         else if (is_escape) {
             ibus_engine_simple_reset (engine);
@@ -1235,10 +1278,14 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             return TRUE;
         }
     } else {
-        priv->compose_buffer[n_compose++] = keyval;
+        SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
+                                         n_compose,
+                                         keyval);
     }
 
-    priv->compose_buffer[n_compose] = 0;
+    SET_COMPOSE_BUFFER_ELEMENT_END (priv->compose_buffer,
+                                    n_compose,
+                                    0);
 
     if (priv->in_hex_sequence) {
         /* If the modifiers are still held down, consider the sequence again */
@@ -1427,6 +1474,7 @@ ibus_engine_simple_candidate_clicked (IBusEngine *engine,
         keyval = IBUS_KEY_1 + index;
     while (priv->compose_buffer[n_compose] != 0)
         n_compose++;
+    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
     ibus_engine_simple_set_number_on_lookup_table (simple, keyval, n_compose);
 }
 

From a28fa740bfc64bfb65eab9c5fad8bb2086a1e45a Mon Sep 17 00:00:00 2001
From: Danny <lesarde@gmail.com>
Date: Thu, 16 Nov 2017 12:32:52 +0900
Subject: [PATCH 444/816] src: Add libgobject.so to LDADD for Debian libtool

Debian libtool ignores dependency_libs in libibus.la for dlopen modules
so need to add libraries in LDADD explicitly.
https://www.mail-archive.com/libtool@gnu.org/msg11616.html

BUG=https://github.com/ibus/ibus/issues/1952
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/334070043

Patch from Danny <lesarde@gmail.com>.
---
 src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e7bc8be5a..303250f57 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -312,10 +312,12 @@ emoji_parser_SOURCES =          \
     $(NULL)
 emoji_parser_CFLAGS =           \
     $(GLIB2_CFLAGS)             \
+    $(GOBJECT2_CFLAGS)          \
     $(NULL)
 emoji_parser_LDADD =            \
-    $(GLIB2_LIBS)               \
     $(libibus)                  \
+    $(GLIB2_LIBS)               \
+    $(GOBJECT2_LIBS)            \
     $(NULL)
 
 clean-local:

From 88b9a93d61824ba8b18cc9fc943527937db5e40b Mon Sep 17 00:00:00 2001
From: Aaron Muir Hamilton <aaron@correspondwith.me>
Date: Fri, 17 Nov 2017 12:27:30 +0900
Subject: [PATCH 445/816] src: Reintroduce the hex mode keybind with an
 environment variable

  This was removed by "Move emoji implementation from
  IBusEngineSimple to IBusPanel". Reintroduced here
  behind an environment variable.

BUG=https://github.com/ibus/ibus/issues/1961

Review URL: https://codereview.appspot.com/335030043

Patch from Aaron Muir Hamilton <aaron@correspondwith.me>.
---
 src/ibusenginesimple.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 6100eb7b5..94ce53b70 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -80,6 +80,7 @@ struct _IBusEngineSimplePrivate {
     gchar              *tentative_emoji;
     gint                tentative_match_len;
 
+    guint               hex_mode_enabled : 1;
     guint               in_hex_sequence : 1;
     guint               in_emoji_sequence : 1;
     guint               modifiers_dropped : 1;
@@ -150,6 +151,9 @@ static void
 ibus_engine_simple_init (IBusEngineSimple *simple)
 {
     simple->priv = IBUS_ENGINE_SIMPLE_GET_PRIVATE (simple);
+    simple->priv->hex_mode_enabled =
+        g_getenv("IBUS_ENABLE_CTRL_SHIFT_U") != NULL ||
+        g_getenv("IBUS_ENABLE_CONTROL_SHIFT_U") != NULL;
 }
 
 
@@ -1075,6 +1079,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         have_hex_mods = (modifiers & (HEX_MOD_MASK)) == HEX_MOD_MASK;
     }
 
+    is_hex_start = (keyval == IBUS_KEY_U) && priv->hex_mode_enabled;
     is_hex_end = (keyval == IBUS_KEY_space ||
                   keyval == IBUS_KEY_KP_Space ||
                   keyval == IBUS_KEY_Return ||

From 0ab0dd3149cbcf0a914a711ecf421ba32b1300c3 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Fri, 12 Jan 2018 12:00:00 +0900
Subject: [PATCH 446/816] ui/gtk3: Translate input method name in ibus

Translate input method name in ibus menu and switcher

BUG=
R=takao.fujiwara1@gmail.com

Review URL: https://codereview.appspot.com/339170043

Patch from Peng Wu <alexepico@gmail.com>.
---
 ui/gtk3/panel.vala    |  4 +++-
 ui/gtk3/switcher.vala | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index f15ba5d4b..4f032f6f0 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1429,8 +1429,10 @@ class Panel : IBus.PanelService {
         foreach (var engine in m_engines) {
             var language = engine.get_language();
             var longname = engine.get_longname();
+            var textdomain = engine.get_textdomain();
+            var transname = GLib.dgettext(textdomain, longname);
             var item = new Gtk.MenuItem.with_label(
-                "%s - %s".printf (IBus.get_language_name(language), longname));
+                "%s - %s".printf (IBus.get_language_name(language), transname));
             // Make a copy of engine to workaround a bug in vala.
             // https://bugzilla.gnome.org/show_bug.cgi?id=628336
             var e = engine;
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 2a48c1f11..0de44e986 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -26,7 +26,9 @@ class Switcher : Gtk.Window {
         public IBusEngineButton(IBus.EngineDesc engine, Switcher switcher) {
             GLib.Object();
 
-            this.longname = engine.get_longname();
+            var longname = engine.get_longname();
+            var textdomain = engine.get_textdomain();
+            this.transname = GLib.dgettext(textdomain, longname);
 
             var name = engine.get_name();
 
@@ -58,7 +60,7 @@ class Switcher : Gtk.Window {
             }
         }
 
-        public string longname { get; set; }
+        public string transname { get; set; }
 
         public override bool draw(Cairo.Context cr) {
             base.draw(cr);
@@ -154,7 +156,7 @@ class Switcher : Gtk.Window {
         /* Let gtk recalculate the window size. */
         resize(1, 1);
 
-        m_label.set_text(m_buttons[index].longname);
+        m_label.set_text(m_buttons[index].transname);
         m_buttons[index].grab_focus();
 
         // Avoid regressions.
@@ -304,6 +306,8 @@ class Switcher : Gtk.Window {
             var engine = m_engines[i];
             var button = new IBusEngineButton(engine, this);
             var longname = engine.get_longname();
+            var textdomain = engine.get_textdomain();
+            var transname = GLib.dgettext(textdomain, longname);
             button.set_relief(Gtk.ReliefStyle.NONE);
             button.add_events(Gdk.EventMask.POINTER_MOTION_MASK);
             button.show();
@@ -338,8 +342,8 @@ class Switcher : Gtk.Window {
                 return true;
             });
 
-            button.longname = longname;
-            m_label.set_label(longname);
+            button.transname = transname;
+            m_label.set_label(transname);
 
             int width;
             m_label.get_preferred_width(null, out width);
@@ -349,7 +353,7 @@ class Switcher : Gtk.Window {
             m_buttons += button;
         }
 
-        m_label.set_text(m_buttons[0].longname);
+        m_label.set_text(m_buttons[0].transname);
         m_label.set_ellipsize(Pango.EllipsizeMode.END);
 
         Gdk.Display display = Gdk.Display.get_default();
@@ -382,7 +386,7 @@ class Switcher : Gtk.Window {
             m_selected_engine = 0;
         else
             m_selected_engine ++;
-        m_label.set_text(m_buttons[m_selected_engine].longname);
+        m_label.set_text(m_buttons[m_selected_engine].transname);
         set_focus(m_buttons[m_selected_engine]);
     }
 
@@ -391,7 +395,7 @@ class Switcher : Gtk.Window {
             m_selected_engine = m_engines.length - 1;
         else
             m_selected_engine --;
-        m_label.set_text(m_buttons[m_selected_engine].longname);
+        m_label.set_text(m_buttons[m_selected_engine].transname);
         set_focus(m_buttons[m_selected_engine]);
     }
 

From bfe57d20e9d39d52428e95e493d9af0bd034a82f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 15 Jan 2018 14:44:07 +0900
Subject: [PATCH 447/816] Added DBus filtering against malware

The proposal prevents non-ower of the GDBusConnection from accessing
DBus methods against malicious usages.

BUG=https://github.com/ibus/ibus/issues/1955

Review URL: https://codereview.appspot.com/335380043
---
 bus/inputcontext.c     | 24 +++++++++++++++++++++++-
 src/ibusengine.c       | 18 +++++++++++++++++-
 src/ibuspanelservice.c | 14 +++++++++++++-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index d8be9e3ff..4f2ecafc1 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -1148,6 +1148,20 @@ _ic_set_surrounding_text (BusInputContext       *context,
     g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
+/*
+ * Since IBusService is inherited by IBusImpl, this method cannot be
+ * applied to IBusServiceClass.method_call() directly but can be in
+ * each child class.method_call().
+ */
+static gboolean
+bus_input_context_service_authorized_method (IBusService     *service,
+                                             GDBusConnection *connection)
+{
+    if (ibus_service_get_connection (service) == connection)
+        return TRUE;
+    return FALSE;
+}
+
 /**
  * bus_input_context_service_method_call:
  *
@@ -1197,6 +1211,10 @@ bus_input_context_service_method_call (IBusService            *service,
     };
 
     gint i;
+
+    if (!bus_input_context_service_authorized_method (service, connection))
+        return;
+
     for (i = 0; i < G_N_ELEMENTS (methods); i++) {
         if (g_strcmp0 (method_name, methods[i].method_name) == 0) {
             methods[i].method_callback ((BusInputContext *)service, parameters, invocation);
@@ -1270,6 +1288,9 @@ bus_input_context_service_set_property (IBusService     *service,
                                   error);
     }
 
+    if (!bus_input_context_service_authorized_method (service, connection))
+        return FALSE;
+
     if (g_strcmp0 (property_name, "ContentType") == 0) {
         BusInputContext *context = (BusInputContext *) service;
         _ic_set_content_type (context, value);
@@ -1279,6 +1300,7 @@ bus_input_context_service_set_property (IBusService     *service,
     g_return_val_if_reached (FALSE);
 }
 
+
 gboolean
 bus_input_context_has_focus (BusInputContext *context)
 {
diff --git a/src/ibusengine.c b/src/ibusengine.c
index b2a8022aa..da648d11f 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -851,6 +852,15 @@ ibus_engine_get_property (IBusEngine *engine,
     }
 }
 
+static gboolean
+ibus_engine_service_authorized_method (IBusService     *service,
+                                       GDBusConnection *connection)
+{
+    if (ibus_service_get_connection (service) == connection)
+        return TRUE;
+    return FALSE;
+}
+
 static void
 ibus_engine_service_method_call (IBusService           *service,
                                  GDBusConnection       *connection,
@@ -876,6 +886,9 @@ ibus_engine_service_method_call (IBusService           *service,
         return;
     }
 
+    if (!ibus_engine_service_authorized_method (service, connection))
+        return;
+
     if (g_strcmp0 (method_name, "ProcessKeyEvent") == 0) {
         guint keyval, keycode, state;
         gboolean retval = FALSE;
@@ -1085,6 +1098,9 @@ ibus_engine_service_set_property (IBusService        *service,
                                   error);
     }
 
+    if (!ibus_engine_service_authorized_method (service, connection))
+        return FALSE;
+
     if (g_strcmp0 (property_name, "ContentType") == 0) {
         guint purpose = 0;
         guint hints = 0;
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 468aa324d..33949fa13 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -3,7 +3,7 @@
 /* ibus - The Input Bus
  * Copyright (c) 2009-2014 Google Inc. All rights reserved.
  * Copyright (C) 2010-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -936,6 +936,15 @@ _g_object_unref_if_floating (gpointer instance)
         g_object_unref (instance);
 }
 
+static gboolean
+ibus_panel_service_service_authorized_method (IBusService     *service,
+                                              GDBusConnection *connection)
+{
+    if (ibus_service_get_connection (service) == connection)
+        return TRUE;
+    return FALSE;
+}
+
 static void
 ibus_panel_service_service_method_call (IBusService           *service,
                                         GDBusConnection       *connection,
@@ -961,6 +970,9 @@ ibus_panel_service_service_method_call (IBusService           *service,
         return;
     }
 
+    if (!ibus_panel_service_service_authorized_method (service, connection))
+        return;
+
     if (g_strcmp0 (method_name, "UpdatePreeditText") == 0) {
         GVariant *variant = NULL;
         guint cursor = 0;

From e17c99859d06ab75326730e45072e1061f7d87c7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 29 Jan 2018 16:50:07 +0900
Subject: [PATCH 448/816] Implement Unicode choice on Emojier

BUG=https://github.com/ibus/ibus/issues/1922

Review URL: https://codereview.appspot.com/340190043
---
 configure.ac              |   41 +-
 po/POTFILES.in            |    1 +
 src/Makefile.am           |   55 +-
 src/emoji-parser.c        |    3 +-
 src/ibus.h                |    4 +-
 src/ibusunicode.c         | 1069 ++++++++++++++++++++++++++++++++++
 src/ibusunicode.h         |  299 ++++++++++
 src/ibusunicodegen.h      | 1151 +++++++++++++++++++++++++++++++++++++
 src/unicode-parser.c      |  502 ++++++++++++++++
 ui/gtk3/emojier.vala      |  550 +++++++++++++++---
 ui/gtk3/emojierapp.vala   |    2 +
 ui/gtk3/ibusemojidialog.h |    9 +-
 ui/gtk3/panel.vala        |    3 +-
 13 files changed, 3613 insertions(+), 76 deletions(-)
 create mode 100644 src/ibusunicode.c
 create mode 100644 src/ibusunicode.h
 create mode 100644 src/ibusunicodegen.h
 create mode 100644 src/unicode-parser.c

diff --git a/configure.ac b/configure.ac
index 4789328ef..bd41069b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2017 Red Hat, Inc.
+# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -653,6 +653,41 @@ https://github.com/fujiwarat/cldr-emoji-annotation)
     enable_emoji_dict="yes (enabled, use --disable-emoji-dict to disable)"
 fi
 
+# --disable-unicode-dict option.
+AC_ARG_ENABLE(unicode-dict,
+    AS_HELP_STRING([--disable-unicode-dict],
+                   [Do not build Unicode dict files]),
+    [enable_unicode_dict=$enableval],
+    [enable_unicode_dict=yes]
+)
+AM_CONDITIONAL([ENABLE_UNICODE_DICT], [test x"$enable_unicode_dict" = x"yes"])
+
+AC_ARG_WITH(ucd-dir,
+    AS_HELP_STRING([--with-ucd-dir[=DIR]],
+        [Set the directory of UCD (Unicode Character Database) files.
+         (default: "/usr/share/unicode/ucd")]),
+    UCD_DIR=$with_emoji_annotation_dir,
+    UCD_DIR="/usr/share/unicode/ucd"
+)
+AC_SUBST(UCD_DIR)
+
+if test x"$enable_unicode_dict" = x"yes"; then
+    if test ! -f $UCD_DIR/NamesList.txt ; then
+        AC_MSG_ERROR(Not found $UCD_DIR/NamesList.txt. You can get \
+the UCD files from https://www.unicode.org/Public/UNIDATA/)
+    elif test ! -f $UCD_DIR/Blocks.txt ; then
+        AC_MSG_ERROR(Not found $UCD_DIR/Blocks.txt. You can get \
+the UCD files from https://www.unicode.org/Public/UNIDATA/)
+    else
+        # POSIX SHELL has no ${FOO:0:1}
+        head=`echo "$UCD_DIR" | cut -c1`;
+        if test $head != "/" ; then
+            UCD_DIR=`realpath "$UCD_DIR"`
+        fi
+    fi
+    enable_unicode_dict="yes (enabled, use --disable-unicode-dict to disable)"
+fi
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -743,6 +778,8 @@ Build options:
   Enable Emoji dict             $enable_emoji_dict
   Unicode Emoji directory       $UNICODE_EMOJI_DIR
   CLDR annotation directory     $EMOJI_ANNOTATION_DIR
+  Enable Unicode dict           $enable_unicode_dict
+  UCD directory                 $UCD_DIR
   Run test cases                $enable_tests
 ])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 00f7c7f66..58d1e39d5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,6 +51,7 @@ src/ibuspanelservice.c
 src/ibusproxy.c
 src/ibusregistry.c
 src/ibusservice.c
+src/ibusunicodegen.h
 src/ibusutil.c
 src/keyname-table.h
 tools/main.vala
diff --git a/src/Makefile.am b/src/Makefile.am
index 303250f57..1ba418d86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ INTROSPECTION_COMPILER_ARGS = \
     $(NULL)
 INTROSPECTION_GIRS =
 CLEANFILES =
+noinst_PROGRAMS =
 
 # C preprocessor flags
 AM_CPPFLAGS =                                           \
@@ -100,6 +101,7 @@ ibus_sources =              \
     ibusservice.c           \
     ibusshare.c             \
     ibustext.c              \
+    ibusunicode.c           \
     ibusutil.c              \
     ibusxml.c               \
     $(NULL)
@@ -151,6 +153,7 @@ ibus_headers =              \
     ibusshare.h             \
     ibustext.h              \
     ibustypes.h             \
+    ibusunicode.h           \
     ibusutil.h              \
     ibusxml.h               \
     $(NULL)
@@ -169,6 +172,7 @@ ibus_private_headers =          \
     ibusemojigen.h              \
     ibusenginesimpleprivate.h   \
     ibusinternal.h              \
+    ibusunicodegen.h            \
     keyname-table.h             \
     $(NULL)
 noinst_HEADERS =            \
@@ -241,7 +245,7 @@ dictdir = $(pkgdatadir)/dicts
 dict_DATA = dicts/emoji-en.dict
 LANG_FILES = $(basename $(notdir $(wildcard $(EMOJI_ANNOTATION_DIR)/*.xml)))
 
-noinst_PROGRAMS = emoji-parser
+noinst_PROGRAMS += emoji-parser
 
 dicts/emoji-en.dict: emoji-parser
 	$(AM_V_at)if test x"$(LANG_FILES)" = x ; then \
@@ -325,12 +329,60 @@ clean-local:
 	$(NULL)
 endif
 
+if ENABLE_UNICODE_DICT
+unicodedir = $(pkgdatadir)/dicts
+unicode_DATA = dicts/unicode-names.dict dicts/unicode-blocks.dict
+noinst_PROGRAMS += unicode-parser
+
+dicts/unicode-names.dict: unicode-parser
+	$(AM_V_at)input_file="$(UCD_DIR)/NamesList.txt"; \
+	if test ! -f "$$input_file" ; then \
+	    echo "WARNING: Not found $$input_file" 1>&2; \
+	else \
+	    $(builddir)/unicode-parser \
+	        --input-names-list $$input_file \
+	        --output-names-list $@; \
+	    echo "Generated $@"; \
+	fi;
+
+dicts/unicode-blocks.dict: unicode-parser
+	$(AM_V_at)input_file="$(UCD_DIR)/Blocks.txt"; \
+	if test ! -f "$$input_file" ; then \
+	    echo "WARNING: Not found $$input_file" 1>&2; \
+	else \
+	    $(builddir)/unicode-parser \
+	        --input-blocks $$input_file \
+	        --output-blocks-trans ibusunicodegen.h \
+	        --output-blocks $@; \
+	    echo "Generated $@"; \
+	fi;
+
+ibusunicodegen.h: dicts/unicode-blocks.dict
+	$(NULL)
+
+unicode_parser_SOURCES =        \
+    unicode-parser.c            \
+    $(NULL)
+unicode_parser_CFLAGS =         \
+    $(GLIB2_CFLAGS)             \
+    $(NULL)
+unicode_parser_LDADD =          \
+    $(GLIB2_LIBS)               \
+    $(libibus)                  \
+    $(NULL)
+
+clean-local:
+	-rm -rf dicts
+	$(NULL)
+endif
+
 EXTRA_DIST =                    \
     emoji-parser.c              \
     ibusversion.h.in            \
     ibusmarshalers.list         \
     ibusenumtypes.h.template    \
     ibusenumtypes.c.template    \
+    unicode-parser.c            \
     $(NULL)
 
 CLEANFILES +=                   \
@@ -341,6 +393,7 @@ CLEANFILES +=                   \
 
 DISTCLEANFILES =                \
     ibusemojigen.h              \
+    ibusunicodegen.h            \
     ibusversion.h               \
     $(NULL)
 
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index fe3e4ef8a..0f7c8cfb1 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -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) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -1126,6 +1126,7 @@ category_file_save (const gchar *filename,
     if (!g_file_get_contents (__FILE__, &content, &length, &error)) {
         g_warning ("Failed to load %s: %s", __FILE__, error->message);
         g_clear_pointer (&error, g_error_free);
+        return;
     }
     buff = g_string_new (NULL);
     p = content;
diff --git a/src/ibus.h b/src/ibus.h
index c6cf58cf5..8011729f9 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -57,6 +58,7 @@
 #include <ibusutil.h>
 #include <ibusregistry.h>
 #include <ibusemoji.h>
+#include <ibusunicode.h>
 
 #ifndef IBUS_DISABLE_DEPRECATED
 #include <ibuskeysyms-compat.h>
diff --git a/src/ibusunicode.c b/src/ibusunicode.c
new file mode 100644
index 000000000..8559819d4
--- /dev/null
+++ b/src/ibusunicode.c
@@ -0,0 +1,1069 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gstdio.h>
+#include "ibusinternal.h"
+#include "ibuserror.h"
+#include "ibusunicode.h"
+
+#define IBUS_UNICODE_DATA_MAGIC "IBusUnicodeData"
+#define IBUS_UNICODE_BLOCK_MAGIC "IBusUnicodeBlock"
+#define IBUS_UNICODE_DATA_VERSION (1)
+#define IBUS_UNICODE_DESERIALIZE_SIGNALL_STR \
+        "deserialize-unicode"
+
+enum {
+    PROP_0 = 0,
+    PROP_CODE,
+    PROP_NAME,
+    PROP_ALIAS,
+    PROP_BLOCK_NAME,
+    PROP_START,
+    PROP_END
+};
+
+struct _IBusUnicodeDataPrivate {
+    gunichar    code;
+    gchar      *name;
+    gchar      *alias;
+    gchar      *block_name;
+};
+
+struct _IBusUnicodeBlockPrivate {
+    gunichar    start;
+    gunichar    end;
+    gchar      *name;
+};
+
+typedef struct {
+    IBusUnicodeDataLoadAsyncFinish callback;
+    gpointer                       user_data;
+} IBusUnicodeDataLoadData;
+
+#define IBUS_UNICODE_DATA_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+    IBUS_TYPE_UNICODE_DATA, \
+    IBusUnicodeDataPrivate))
+#define IBUS_UNICODE_BLOCK_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+    IBUS_TYPE_UNICODE_BLOCK, \
+    IBusUnicodeBlockPrivate))
+
+/* functions prototype */
+static void      ibus_unicode_data_set_property (IBusUnicodeData      *unicode,
+                                                 guint                 prop_id,
+                                                 const GValue         *value,
+                                                 GParamSpec           *pspec);
+static void      ibus_unicode_data_get_property (IBusUnicodeData      *unicode,
+                                                 guint                 prop_id,
+                                                 GValue               *value,
+                                                 GParamSpec           *pspec);
+static void      ibus_unicode_data_destroy      (IBusUnicodeData      *unicode);
+static gboolean  ibus_unicode_data_serialize    (IBusUnicodeData      *unicode,
+                                                 GVariantBuilder      *builder);
+static gint      ibus_unicode_data_deserialize  (IBusUnicodeData      *unicode,
+                                                 GVariant             *variant);
+static gboolean  ibus_unicode_data_copy         (IBusUnicodeData      *dest,
+                                                const IBusUnicodeData *src);
+static void      ibus_unicode_block_set_property
+                                                (IBusUnicodeBlock     *block,
+                                                 guint                 prop_id,
+                                                 const GValue         *value,
+                                                 GParamSpec           *pspec);
+static void      ibus_unicode_block_get_property
+                                                (IBusUnicodeBlock     *block,
+                                                 guint                 prop_id,
+                                                 GValue               *value,
+                                                 GParamSpec           *pspec);
+static void      ibus_unicode_block_destroy     (IBusUnicodeBlock     *block);
+static gboolean  ibus_unicode_block_serialize   (IBusUnicodeBlock     *block,
+                                                 GVariantBuilder      *builder);
+static gint      ibus_unicode_block_deserialize (IBusUnicodeBlock     *block,
+                                                 GVariant             *variant);
+static gboolean  ibus_unicode_block_copy        (IBusUnicodeBlock     *dest,
+                                                const IBusUnicodeBlock *src);
+
+G_DEFINE_TYPE (IBusUnicodeData, ibus_unicode_data, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE (IBusUnicodeBlock, ibus_unicode_block, IBUS_TYPE_SERIALIZABLE)
+
+static void
+ibus_unicode_data_class_init (IBusUnicodeDataClass *class)
+{
+    IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
+
+    object_class->destroy = (IBusObjectDestroyFunc) ibus_unicode_data_destroy;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_unicode_data_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_unicode_data_get_property;
+    serializable_class->serialize   =
+            (IBusSerializableSerializeFunc) ibus_unicode_data_serialize;
+    serializable_class->deserialize =
+            (IBusSerializableDeserializeFunc) ibus_unicode_data_deserialize;
+    serializable_class->copy        =
+            (IBusSerializableCopyFunc) ibus_unicode_data_copy;
+
+    g_type_class_add_private (class, sizeof (IBusUnicodeDataPrivate));
+
+    /* install properties */
+    /**
+     * IBusUnicodeData:code:
+     *
+     * The Uniode code point
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_CODE,
+                    g_param_spec_unichar ("code",
+                        "code point",
+                        "The Unicode code point",
+                        0,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+
+    /**
+     * IBusUnicodeData:name:
+     *
+     * The Uniode name
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_NAME,
+                    g_param_spec_string ("name",
+                        "name",
+                        "The Unicode name",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+    /**
+     * IBusUnicodeData:alias:
+     *
+     * The Uniode alias name
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_ALIAS,
+                    g_param_spec_string ("alias",
+                        "alias name",
+                        "The Unicode alias name",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+    /**
+     * IBusUnicodeData:block-name:
+     *
+     * The Uniode block name
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_BLOCK_NAME,
+                    g_param_spec_string ("block-name",
+                        "block name",
+                        "The Unicode block name",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+}
+
+static void
+ibus_unicode_data_init (IBusUnicodeData *unicode)
+{
+    unicode->priv = IBUS_UNICODE_DATA_GET_PRIVATE (unicode);
+}
+
+static void
+ibus_unicode_data_destroy (IBusUnicodeData *unicode)
+{
+    g_clear_pointer (&unicode->priv->name, g_free);
+    g_clear_pointer (&unicode->priv->alias, g_free);
+    g_clear_pointer (&unicode->priv->block_name, g_free);
+
+    IBUS_OBJECT_CLASS (ibus_unicode_data_parent_class)->
+            destroy (IBUS_OBJECT (unicode));
+}
+
+static void
+ibus_unicode_data_set_property (IBusUnicodeData *unicode,
+                                guint            prop_id,
+                                const GValue    *value,
+                                GParamSpec      *pspec)
+{
+    switch (prop_id) {
+    case PROP_CODE:
+        g_assert (unicode->priv->code == 0);
+        unicode->priv->code = g_value_get_uint (value);
+        break;
+    case PROP_NAME:
+        g_assert (unicode->priv->name == NULL);
+        unicode->priv->name = g_value_dup_string (value);
+        break;
+    case PROP_ALIAS:
+        g_assert (unicode->priv->alias == NULL);
+        unicode->priv->alias = g_value_dup_string (value);
+        break;
+    case PROP_BLOCK_NAME:
+        g_free (unicode->priv->block_name);
+        unicode->priv->block_name = g_value_dup_string (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (unicode, prop_id, pspec);
+    }
+}
+
+static void
+ibus_unicode_data_get_property (IBusUnicodeData *unicode,
+                                guint            prop_id,
+                                GValue          *value,
+                                GParamSpec      *pspec)
+{
+    switch (prop_id) {
+    case PROP_CODE:
+        g_value_set_uint (value, ibus_unicode_data_get_code (unicode));
+        break;
+    case PROP_NAME:
+        g_value_set_string (value, ibus_unicode_data_get_name (unicode));
+        break;
+    case PROP_ALIAS:
+        g_value_set_string (value, ibus_unicode_data_get_alias (unicode));
+        break;
+    case PROP_BLOCK_NAME:
+        g_value_set_string (value, ibus_unicode_data_get_block_name (unicode));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (unicode, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_unicode_data_serialize (IBusUnicodeData   *unicode,
+                             GVariantBuilder   *builder)
+{
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_data_parent_class)->
+            serialize ((IBusSerializable *)unicode, builder);
+    g_return_val_if_fail (retval, FALSE);
+
+#define NOTNULL(s) ((s) != NULL ? (s) : "")
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_builder_add (builder, "u", unicode->priv->code);
+    g_variant_builder_add (builder, "s", NOTNULL (unicode->priv->name));
+    g_variant_builder_add (builder, "s", NOTNULL (unicode->priv->alias));
+    /* Use IBusUnicodeBlock for memory usage.
+    g_variant_builder_add (builder, "s", NOTNULL (unicode->priv->block_name));
+     */
+#undef NOTNULL
+    return TRUE;
+}
+
+static gint
+ibus_unicode_data_deserialize (IBusUnicodeData *unicode,
+                               GVariant        *variant)
+{
+    gint retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_data_parent_class)->
+            deserialize ((IBusSerializable *)unicode, variant);
+    g_return_val_if_fail (retval, 0);
+
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_get_child (variant, retval++, "u", &unicode->priv->code);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &unicode->priv->name);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &unicode->priv->alias);
+    /* Use IBusUnicodeBlock for memory usage.
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &unicode->priv->block_name);
+     */
+    return retval;
+}
+
+static gboolean
+ibus_unicode_data_copy (IBusUnicodeData       *dest,
+                        const IBusUnicodeData *src)
+{
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_data_parent_class)->
+            copy ((IBusSerializable *)dest,
+                  (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest->priv->code             = src->priv->code;
+    dest->priv->name             = g_strdup (src->priv->name);
+    dest->priv->alias            = g_strdup (src->priv->alias);
+    dest->priv->block_name       = g_strdup (src->priv->block_name);
+    return TRUE;
+}
+
+IBusUnicodeData *
+ibus_unicode_data_new (const gchar *first_property_name, ...)
+{
+    va_list var_args;
+    IBusUnicodeData *unicode;
+
+    g_assert (first_property_name != NULL);
+    va_start (var_args, first_property_name);
+    unicode = (IBusUnicodeData *) g_object_new_valist (IBUS_TYPE_UNICODE_DATA,
+                                                       first_property_name,
+                                                       var_args);
+    va_end (var_args);
+    /* code is required. Other properties are set in class_init by default. */
+    g_assert (unicode->priv->name != NULL);
+    g_assert (unicode->priv->alias != NULL);
+    g_assert (unicode->priv->block_name != NULL);
+    return unicode;
+}
+
+gunichar
+ibus_unicode_data_get_code (IBusUnicodeData *unicode)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_DATA (unicode), G_MAXUINT32);
+
+    return unicode->priv->code;
+}
+
+const gchar *
+ibus_unicode_data_get_name (IBusUnicodeData *unicode)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_DATA (unicode), "");
+
+    return unicode->priv->name;
+}
+
+const gchar *
+ibus_unicode_data_get_alias (IBusUnicodeData *unicode)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_DATA (unicode), "");
+
+    return unicode->priv->alias;
+}
+
+const gchar *
+ibus_unicode_data_get_block_name (IBusUnicodeData *unicode)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_DATA (unicode), "");
+
+    return unicode->priv->block_name;
+}
+
+void
+ibus_unicode_data_set_block_name (IBusUnicodeData *unicode,
+                                  const gchar     *block_name)
+{
+    g_return_if_fail (IBUS_IS_UNICODE_DATA (unicode));
+
+    g_free (unicode->priv->block_name);
+    unicode->priv->block_name = g_strdup (block_name);
+}
+
+static void
+variant_foreach_add_unicode (IBusUnicodeData *unicode,
+                             GVariantBuilder *builder)
+{
+    g_variant_builder_add (
+            builder, "v",
+            ibus_serializable_serialize (IBUS_SERIALIZABLE (unicode)));
+}
+
+static GVariant *
+ibus_unicode_data_list_serialize (GSList *list)
+{
+    GVariantBuilder builder;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
+    g_slist_foreach (list,  (GFunc) variant_foreach_add_unicode, &builder);
+    return g_variant_builder_end (&builder);
+}
+
+static GSList *
+ibus_unicode_data_list_deserialize (GVariant *variant,
+                                    GObject  *source_object)
+{
+    GSList *list = NULL;
+    GVariantIter iter;
+    GVariant *unicode_variant = NULL;
+    gsize i, size;
+    gboolean has_signal = FALSE;
+
+    if (G_IS_OBJECT (source_object)) {
+        has_signal = g_signal_lookup (
+                IBUS_UNICODE_DESERIALIZE_SIGNALL_STR,
+                G_OBJECT_TYPE (source_object));
+        if (!has_signal) {
+            const gchar type_name = g_type_name (source_object);
+            g_warning ("GObject %s does not have the signal \"%s\"",
+                       type_name ? type_name : "(null)",
+                       IBUS_UNICODE_DESERIALIZE_SIGNALL_STR);
+        }
+    }
+    g_variant_iter_init (&iter, variant);
+    size = g_variant_iter_n_children (&iter);
+    i = 0;
+    while (g_variant_iter_loop (&iter, "v", &unicode_variant)) {
+        IBusUnicodeData *data =
+                IBUS_UNICODE_DATA (ibus_serializable_deserialize (
+                        unicode_variant));
+        list = g_slist_append (list, data);
+        g_clear_pointer (&unicode_variant, g_variant_unref);
+        if (has_signal && (i == 0 || ((i + 1) % 100) == 0)) {
+            g_signal_emit_by_name (source_object,
+                                   IBUS_UNICODE_DESERIALIZE_SIGNALL_STR,
+                                   i + 1, size);
+        }
+        i++;
+    }
+    if (has_signal && (i != 1 && (i % 100) != 0)) {
+        g_signal_emit_by_name (source_object,
+                               IBUS_UNICODE_DESERIALIZE_SIGNALL_STR,
+                               i, size);
+    }
+
+    return list;
+}
+
+void
+ibus_unicode_data_save (const gchar *path,
+                        GSList      *list)
+{
+    GVariant *variant;
+    const gchar *header = IBUS_UNICODE_DATA_MAGIC;
+    const guint16 version = IBUS_UNICODE_DATA_VERSION;
+    const gchar *contents;
+    gsize length;
+    gchar *dir;
+    GStatBuf buf = { 0, };
+    GError *error = NULL;
+
+    g_return_if_fail (path != NULL);
+    g_return_if_fail (list != NULL);
+    if (list->data == NULL) {
+        g_warning ("Failed to save IBus Unicode data: Need a list data.");
+        return;
+    }
+
+    variant = g_variant_new ("(sqv)",
+                             header,
+                             version,
+                             ibus_unicode_data_list_serialize (list));
+
+    contents =  g_variant_get_data (variant);
+    length =  g_variant_get_size (variant);
+
+    dir = g_path_get_dirname (path);
+    if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
+        g_mkdir_with_parents (dir, 0777);
+    }
+    g_free (dir);
+    if (!g_file_set_contents (path, contents, length, &error)) {
+        g_warning ("Failed to save Unicode dict %s: %s", path, error->message);
+        g_error_free (error);
+    }
+
+    g_variant_unref (variant);
+}
+
+static GSList *
+ibus_unicode_data_load_with_error (const gchar *path,
+                                   GObject     *source_object,
+                                   GError     **error)
+{
+    gchar *contents = NULL;
+    gsize length = 0;
+    GVariant *variant_table = NULL;
+    GVariant *variant = NULL;
+    const gchar *header = NULL;
+    guint16 version = 0;
+    GSList *retval = NULL;
+
+    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "Unicode dict does not exist: %s", path);
+        goto out_load_cache;
+    }
+
+    if (!g_file_get_contents (path, &contents, &length, error)) {
+        goto out_load_cache;
+    }
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sq)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sq)", &header, &version);
+
+    if (g_strcmp0 (header, IBUS_UNICODE_DATA_MAGIC) != 0) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "cache is not IBusUnicodeData.");
+        goto out_load_cache;
+    }
+
+    if (version > IBUS_UNICODE_DATA_VERSION) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "cache version is different: %u != %u",
+                     version, IBUS_UNICODE_DATA_VERSION);
+        goto out_load_cache;
+    }
+
+    version = 0;
+    header = NULL;
+    g_variant_unref (variant_table);
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sqv)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sqv)",
+                   NULL,
+                   NULL,
+                   &variant);
+
+    if (variant == NULL) {
+        g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "cache dict is broken.");
+        goto out_load_cache;
+    }
+
+    retval = ibus_unicode_data_list_deserialize (variant, source_object);
+
+out_load_cache:
+    if (variant)
+        g_variant_unref (variant);
+    if (variant_table)
+        g_variant_unref (variant_table);
+    g_free (contents);
+
+    return retval;
+}
+
+GSList *
+ibus_unicode_data_load (const gchar *path,
+                        GObject     *source_object)
+{
+    GError *error = NULL;
+    GSList *retval = ibus_unicode_data_load_with_error (path,
+                                                        source_object,
+                                                        &error);
+
+    if (retval == NULL) {
+        g_warning ("%s", error->message);
+        g_error_free (error);
+    }
+
+    return retval;
+}
+
+static void
+ibus_unicode_data_load_async_thread (GTask        *task,
+                                     gpointer      source_object,
+                                     gpointer      task_data,
+                                     GCancellable *cancellable)
+{
+    GSList *retval;
+    gchar *path = (gchar *)task_data;
+    GError *error = NULL;
+
+    g_assert (path != NULL);
+
+    retval = ibus_unicode_data_load_with_error (path, source_object, &error);
+    g_free (path);
+    if (retval == NULL)
+        g_task_return_error (task, error);
+    else
+        g_task_return_pointer (task, retval, NULL);
+    g_object_unref (task);
+}
+
+static void
+ibus_unicode_data_load_async_done (GObject *source_object,
+                                   GAsyncResult *res,
+                                   gpointer user_data)
+{
+    IBusUnicodeDataLoadData *data = (IBusUnicodeDataLoadData*)user_data;
+    GSList *list;
+    GError *error = NULL;
+    g_assert (data != NULL);
+    list = g_task_propagate_pointer (G_TASK (res), &error);
+    if (error) {
+        g_warning ("%s", error->message);
+        g_error_free (error);
+        data->callback (NULL, data->user_data);
+    } else {
+        data->callback (list, data->user_data);
+    }
+    g_slice_free (IBusUnicodeDataLoadData, data);
+}
+
+void
+ibus_unicode_data_load_async (const gchar        *path,
+                              GObject            *source_object,
+                              GCancellable       *cancellable,
+                              IBusUnicodeDataLoadAsyncFinish
+                                                  callback,
+                              gpointer            user_data)
+{
+    GTask *task;
+    IBusUnicodeDataLoadData *data;
+
+    g_return_if_fail (path != NULL);
+
+    data = g_slice_new0 (IBusUnicodeDataLoadData);
+    data->callback = callback;
+    data->user_data = user_data;
+    task = g_task_new (source_object,
+                       cancellable,
+                       ibus_unicode_data_load_async_done,
+                       data);
+    g_task_set_source_tag (task, ibus_unicode_data_load_async);
+    g_task_set_task_data (task, g_strdup (path), NULL);
+    g_task_run_in_thread (task, ibus_unicode_data_load_async_thread);
+}
+
+static void
+ibus_unicode_block_class_init (IBusUnicodeBlockClass *class)
+{
+    IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
+
+    object_class->destroy = (IBusObjectDestroyFunc) ibus_unicode_data_destroy;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_unicode_block_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_unicode_block_get_property;
+    serializable_class->serialize   =
+            (IBusSerializableSerializeFunc) ibus_unicode_block_serialize;
+    serializable_class->deserialize =
+            (IBusSerializableDeserializeFunc) ibus_unicode_block_deserialize;
+    serializable_class->copy        =
+            (IBusSerializableCopyFunc) ibus_unicode_block_copy;
+
+    g_type_class_add_private (class, sizeof (IBusUnicodeBlockPrivate));
+
+    /* install properties */
+    /**
+     * IBusUnicodeBlock:start:
+     *
+     * The Uniode start code point
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_START,
+                    /* Cannot use g_param_spec_unichar() for the Unicode
+                     * boundary values because the function checks
+                     * if the value is a valid Unicode besides MAXUINT.
+                     */
+                    g_param_spec_uint ("start",
+                        "start code point",
+                        "The Unicode start code point",
+                        0,
+                        G_MAXUINT,
+                        0,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+
+    /**
+     * IBusUnicodeBlock:end:
+     *
+     * The Uniode end code point
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_END,
+                    /* Cannot use g_param_spec_unichar() for the Unicode
+                     * boundary values because the function checks
+                     * if the value is a valid Unicode besides MAXUINT.
+                     */
+                    g_param_spec_uint ("end",
+                        "end code point",
+                        "The Unicode end code point",
+                        0,
+                        G_MAXUINT,
+                        0,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+
+    /**
+     * IBusUnicodeBlock:name:
+     *
+     * The Uniode block name
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_NAME,
+                    g_param_spec_string ("name",
+                        "name",
+                        "The Unicode name",
+                        "",
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+}
+
+static void
+ibus_unicode_block_init (IBusUnicodeBlock *block)
+{
+    block->priv = IBUS_UNICODE_BLOCK_GET_PRIVATE (block);
+}
+
+static void
+ibus_unicode_block_destroy (IBusUnicodeBlock *block)
+{
+    g_clear_pointer (&block->priv->name, g_free);
+
+    IBUS_OBJECT_CLASS (ibus_unicode_data_parent_class)->
+            destroy (IBUS_OBJECT (block));
+}
+
+static void
+ibus_unicode_block_set_property (IBusUnicodeBlock *block,
+                                 guint             prop_id,
+                                 const GValue     *value,
+                                 GParamSpec       *pspec)
+{
+    switch (prop_id) {
+    case PROP_START:
+        g_assert (block->priv->start == 0);
+        block->priv->start = g_value_get_uint (value);
+        break;
+    case PROP_END:
+        g_assert (block->priv->end == 0);
+        block->priv->end = g_value_get_uint (value);
+        break;
+    case PROP_NAME:
+        g_assert (block->priv->name == NULL);
+        block->priv->name = g_value_dup_string (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (block, prop_id, pspec);
+    }
+}
+
+static void
+ibus_unicode_block_get_property (IBusUnicodeBlock *block,
+                                 guint             prop_id,
+                                 GValue           *value,
+                                 GParamSpec       *pspec)
+{
+    switch (prop_id) {
+    case PROP_START:
+        g_value_set_uint (value, ibus_unicode_block_get_start (block));
+        break;
+    case PROP_END:
+        g_value_set_uint (value, ibus_unicode_block_get_end (block));
+        break;
+    case PROP_NAME:
+        g_value_set_string (value, ibus_unicode_block_get_name (block));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (block, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_unicode_block_serialize (IBusUnicodeBlock *block,
+                              GVariantBuilder  *builder)
+{
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_block_parent_class)->
+            serialize ((IBusSerializable *)block, builder);
+    g_return_val_if_fail (retval, FALSE);
+
+#define NOTNULL(s) ((s) != NULL ? (s) : "")
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_builder_add (builder, "u", block->priv->start);
+    g_variant_builder_add (builder, "u", block->priv->end);
+    g_variant_builder_add (builder, "s", NOTNULL (block->priv->name));
+#undef NOTNULL
+    return TRUE;
+}
+
+static gint
+ibus_unicode_block_deserialize (IBusUnicodeBlock *block,
+                                GVariant        *variant)
+{
+    gint retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_block_parent_class)->
+            deserialize ((IBusSerializable *)block, variant);
+    g_return_val_if_fail (retval, 0);
+
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_get_child (variant, retval++, "u", &block->priv->start);
+    g_variant_get_child (variant, retval++, "u", &block->priv->end);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &block->priv->name);
+    return retval;
+}
+
+static gboolean
+ibus_unicode_block_copy (IBusUnicodeBlock       *dest,
+                         const IBusUnicodeBlock *src)
+{
+    gboolean retval = IBUS_SERIALIZABLE_CLASS (ibus_unicode_block_parent_class)->
+            copy ((IBusSerializable *)dest,
+                  (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest->priv->start            = src->priv->start;
+    dest->priv->end              = src->priv->end;
+    dest->priv->name             = g_strdup (src->priv->name);
+    return TRUE;
+}
+
+IBusUnicodeBlock *
+ibus_unicode_block_new (const gchar *first_property_name, ...)
+{
+    va_list var_args;
+    IBusUnicodeBlock *block;
+
+    g_assert (first_property_name != NULL);
+    va_start (var_args, first_property_name);
+    block = (IBusUnicodeBlock *) g_object_new_valist (IBUS_TYPE_UNICODE_BLOCK,
+                                                     first_property_name,
+                                                     var_args);
+    va_end (var_args);
+    /* end is required. Other properties are set in class_init by default. */
+    g_assert (block->priv->start != block->priv->end);
+    g_assert (block->priv->name != NULL);
+    return block;
+}
+
+gunichar
+ibus_unicode_block_get_start (IBusUnicodeBlock *block)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_BLOCK (block), G_MAXUINT32);
+
+    return block->priv->start;
+}
+
+gunichar
+ibus_unicode_block_get_end (IBusUnicodeBlock *block)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_BLOCK (block), G_MAXUINT32);
+
+    return block->priv->end;
+}
+
+const gchar *
+ibus_unicode_block_get_name (IBusUnicodeBlock *block)
+{
+    g_return_val_if_fail (IBUS_IS_UNICODE_BLOCK (block), "");
+
+    return block->priv->name;
+}
+
+static void
+variant_foreach_add_block (IBusUnicodeBlock *block,
+                           GVariantBuilder *builder)
+{
+    g_variant_builder_add (
+            builder, "v",
+            ibus_serializable_serialize (IBUS_SERIALIZABLE (block)));
+}
+
+static GVariant *
+ibus_unicode_block_list_serialize (GSList *list)
+{
+    GVariantBuilder builder;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
+    g_slist_foreach (list,  (GFunc) variant_foreach_add_block, &builder);
+    return g_variant_builder_end (&builder);
+}
+
+static GSList *
+ibus_unicode_block_list_deserialize (GVariant *variant)
+{
+    GSList *list = NULL;
+    GVariantIter iter;
+    GVariant *unicode_variant = NULL;
+
+    g_variant_iter_init (&iter, variant);
+    while (g_variant_iter_loop (&iter, "v", &unicode_variant)) {
+        IBusUnicodeBlock *data =
+                IBUS_UNICODE_BLOCK (ibus_serializable_deserialize (
+                        unicode_variant));
+        list = g_slist_append (list, data);
+        g_clear_pointer (&unicode_variant, g_variant_unref);
+    }
+
+    return list;
+}
+
+void
+ibus_unicode_block_save (const gchar *path,
+                         GSList      *list)
+{
+    GVariant *variant;
+    const gchar *header = IBUS_UNICODE_BLOCK_MAGIC;
+    const guint16 version = IBUS_UNICODE_DATA_VERSION;
+    const gchar *contents;
+    gsize length;
+    gchar *dir;
+    GStatBuf buf = { 0, };
+    GError *error = NULL;
+
+    g_return_if_fail (path != NULL);
+    g_return_if_fail (list != NULL);
+    if (list->data == NULL) {
+        g_warning ("Failed to save IBus Unicode block: Need a list data.");
+        return;
+    }
+
+    variant = g_variant_new ("(sqv)",
+                             header,
+                             version,
+                             ibus_unicode_block_list_serialize (list));
+
+    contents =  g_variant_get_data (variant);
+    length =  g_variant_get_size (variant);
+
+    dir = g_path_get_dirname (path);
+    if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
+        g_mkdir_with_parents (dir, 0777);
+    }
+    g_free (dir);
+    if (!g_file_set_contents (path, contents, length, &error)) {
+        g_warning ("Failed to save Unicode dict %s: %s", path, error->message);
+        g_error_free (error);
+    }
+
+    g_variant_unref (variant);
+}
+
+GSList *
+ibus_unicode_block_load (const gchar *path)
+{
+    gchar *contents = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    GVariant *variant_table = NULL;
+    GVariant *variant = NULL;
+    const gchar *header = NULL;
+    guint16 version = 0;
+    GSList *retval = NULL;
+
+    if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+        g_warning ("Unicode dict does not exist: %s", path);
+        goto out_load_cache;
+    }
+
+    if (!g_file_get_contents (path, &contents, &length, &error)) {
+        g_warning ("Failed to get dict content %s: %s", path, error->message);
+        g_error_free (error);
+        goto out_load_cache;
+    }
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sq)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sq)", &header, &version);
+
+    if (g_strcmp0 (header, IBUS_UNICODE_BLOCK_MAGIC) != 0) {
+        g_warning ("cache is not IBusUnicodeBlock.");
+        goto out_load_cache;
+    }
+
+    if (version > IBUS_UNICODE_DATA_VERSION) {
+        g_warning ("cache version is different: %u != %u",
+                   version, IBUS_UNICODE_DATA_VERSION);
+        goto out_load_cache;
+    }
+
+    version = 0;
+    header = NULL;
+    g_variant_unref (variant_table);
+
+    variant_table = g_variant_new_from_data (G_VARIANT_TYPE ("(sqv)"),
+                                             contents,
+                                             length,
+                                             FALSE,
+                                             NULL,
+                                             NULL);
+
+    if (variant_table == NULL) {
+        g_warning ("cache table is broken.");
+        goto out_load_cache;
+    }
+
+    g_variant_get (variant_table, "(&sqv)",
+                   NULL,
+                   NULL,
+                   &variant);
+
+    if (variant == NULL) {
+        g_warning ("cache dict is broken.");
+        goto out_load_cache;
+    }
+
+    retval = ibus_unicode_block_list_deserialize (variant);
+
+out_load_cache:
+    if (variant)
+        g_variant_unref (variant);
+    if (variant_table)
+        g_variant_unref (variant_table);
+    g_free (contents);
+
+    return retval;
+}
+
diff --git a/src/ibusunicode.h b/src/ibusunicode.h
new file mode 100644
index 000000000..99de94516
--- /dev/null
+++ b/src/ibusunicode.h
@@ -0,0 +1,299 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* bus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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
+ */
+
+#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
+#error "Only <ibus.h> can be included directly"
+#endif
+
+#ifndef __IBUS_UNICODE_H_
+#define __IBUS_UNICODE_H_
+
+/**
+ * SECTION: ibusunicode
+ * @short_description: unicode utility.
+ * @stability: Unstable
+ *
+ * miscellaneous unicode APIs.
+ */
+
+#include <gio/gio.h>
+#include "ibusserializable.h"
+
+/*
+ * Type macros.
+ */
+/* define GOBJECT macros */
+#define IBUS_TYPE_UNICODE_DATA       (ibus_unicode_data_get_type ())
+#define IBUS_UNICODE_DATA(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                      IBUS_TYPE_UNICODE_DATA, IBusUnicodeData))
+#define IBUS_UNICODE_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                      IBUS_TYPE_UNICODE_DATA, \
+                                      IBusUnicodeDataClass))
+#define IBUS_IS_UNICODE_DATA(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                      IBUS_TYPE_UNICODE_DATA))
+#define IBUS_TYPE_UNICODE_BLOCK      (ibus_unicode_block_get_type ())
+#define IBUS_UNICODE_BLOCK(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                      IBUS_TYPE_UNICODE_BLOCK, \
+                                      IBusUnicodeBlock))
+#define IBUS_UNICODE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                      IBUS_TYPE_UNICODE_BLOCK, \
+                                      IBusUnicodeBlockClass))
+#define IBUS_IS_UNICODE_BLOCK(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+                                      IBUS_TYPE_UNICODE_BLOCK))
+
+
+G_BEGIN_DECLS
+
+typedef struct _IBusUnicodeData IBusUnicodeData;
+typedef struct _IBusUnicodeDataPrivate IBusUnicodeDataPrivate;
+typedef struct _IBusUnicodeDataClass IBusUnicodeDataClass;
+typedef struct _IBusUnicodeBlock IBusUnicodeBlock;
+typedef struct _IBusUnicodeBlockPrivate IBusUnicodeBlockPrivate;
+typedef struct _IBusUnicodeBlockClass IBusUnicodeBlockClass;
+
+/**
+ * IBusUnicodeDataLoadAsyncFinish:
+ * @data_list: (transfer full) (element-type IBusUnicodeData):
+ *
+ * This callback can receive the list of #IBusUnicodeData.
+ */
+typedef void (*IBusUnicodeDataLoadAsyncFinish) (GSList  *data_list,
+                                                gpointer user_data);
+
+/**
+ * IBusUnicodeData:
+ *
+ * Unicode data likes code, name, alias, block-name.
+ * You can get extended values with g_object_get_properties.
+ */
+struct _IBusUnicodeData {
+    IBusSerializable parent;
+    /* instance members */
+
+    /*< public >*/
+    /*< private >*/
+    IBusUnicodeDataPrivate *priv;
+};
+
+struct _IBusUnicodeDataClass {
+    IBusSerializableClass parent;
+    /* class members */
+};
+
+struct _IBusUnicodeBlock {
+    IBusSerializable parent;
+    /* instance members */
+
+    /*< public >*/
+    /*< private >*/
+    IBusUnicodeBlockPrivate *priv;
+};
+
+struct _IBusUnicodeBlockClass {
+    IBusSerializableClass parent;
+    /* class members */
+};
+
+GType           ibus_unicode_data_get_type    (void);
+GType           ibus_unicode_block_get_type   (void);
+
+/**
+ * ibus_unicode_data_new:
+ * @first_property_name: Name of the first property.
+ * @...: the NULL-terminated arguments of the properties and values.
+ *
+ * Creates a new #IBusUnicodeData.
+ * code property is required. e.g.
+ * ibus_unicode_data_new ("code", 0x3042, NULL)
+ *
+ * Returns: A newly allocated #IBusUnicodeData.
+ */
+IBusUnicodeData * ibus_unicode_data_new       (const gchar *first_property_name,
+                                               ...);
+
+/**
+ * ibus_unicode_data_get_code:
+ * @unicode: An #IBusUnicodeData
+ *
+ * Gets the code point in #IBusUnicodeData.
+ *
+ * Returns: code property in #IBusUnicodeData
+ */
+gunichar          ibus_unicode_data_get_code  (IBusUnicodeData    *unicode);
+
+/**
+ * ibus_unicode_data_get_name:
+ * @unicode: An #IBusUnicodeData
+ *
+ * Gets the name in #IBusUnicodeData. It should not be freed.
+ *
+ * Returns: name property in #IBusUnicodeData
+ */
+const gchar *     ibus_unicode_data_get_name  (IBusUnicodeData    *unicode);
+
+/**
+ * ibus_unicode_data_get_alias:
+ * @unicode: An #IBusUnicodeData
+ *
+ * Gets the alias in #IBusUnicodeData. It should not be freed.
+ *
+ * Returns: alias property in #IBusUnicodeData
+ */
+const gchar *     ibus_unicode_data_get_alias (IBusUnicodeData    *unicode);
+
+/**
+ * ibus_unicode_data_get_block_name:
+ * @unicode: An #IBusUnicodeData
+ *
+ * Gets the block name in #IBusUnicodeData. It should not be freed.
+ *
+ * Returns: block-name property in #IBusUnicodeData
+ */
+const gchar *     ibus_unicode_data_get_block_name
+                                              (IBusUnicodeData    *unicode);
+
+/**
+ * ibus_unicode_data_set_block_name:
+ * @unicode: An #IBusUnicodeData
+ * @block_name: A block name
+ *
+ * Sets the block name in #IBusUnicodeData.
+ */
+void              ibus_unicode_data_set_block_name
+                                              (IBusUnicodeData    *unicode,
+                                               const gchar        *block_name);
+
+/**
+ * ibus_unicode_data_save:
+ * @path: A path of the saved Unicode data.
+ * @list: (element-type IBusUnicodeData) (transfer none): A list of unicode
+ *  data.
+ *
+ * Save the list of #IBusUnicodeData to the cache file.
+ */
+void              ibus_unicode_data_save      (const gchar        *path,
+                                               GSList             *list);
+
+/**
+ * ibus_unicode_data_load:
+ * @path: A path of the saved dictionary file.
+ * @object: (nullable): If the #GObject has "unicode-deserialize-progress"
+ *    signal, this function will emit (the number of desrialized
+ *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
+ *    with that signal by 100 times. Otherwise %NULL.
+ *
+ * Returns: (element-type IBusUnicodeData) (transfer container):
+ * An #IBusUnicodeData list loaded from the saved cache file.
+ */
+GSList *          ibus_unicode_data_load      (const gchar        *path,
+                                               GObject            *object);
+
+/**
+ * ibus_unicode_data_load_async:
+ * @path: A path of the saved dictionary file.
+ * @object: (nullable): If the #GObject has "unicode-deserialize-progress"
+ *    signal, this function will emit (the number of desrialized
+ *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
+ *    with that signal by 100 times. Otherwise %NULL.
+ * @cancellable: cancellable.
+ * @callback: (scope notified): IBusUnicodeDataLoadAsyncFinish.
+ * @user_data: User data.
+ *
+ * IBusUnicodeDataLoadAsyncFinish can receive the list of #IBusUnicodeData.
+ */
+void              ibus_unicode_data_load_async
+                                              (const gchar        *path,
+                                               GObject            *object,
+                                               GCancellable       *cancellable,
+                                               IBusUnicodeDataLoadAsyncFinish
+                                                                   callback,
+                                               gpointer            user_data);
+
+/**
+ * ibus_unicode_block_new:
+ * @first_property_name: Name of the first property.
+ * @...: the NULL-terminated arguments of the properties and values.
+ *
+ * Creates a new #IBusUnicodeBlock.
+ * block property is required. e.g.
+ * ibus_unicode_block_new ("start", 0x0000, "end", "0x007f", "name", "basic",
+ * NULL)
+ *
+ * Returns: A newly allocated #IBusUnicodeBlock.
+ */
+IBusUnicodeBlock *ibus_unicode_block_new      (const gchar *first_property_name,
+                                               ...);
+
+/**
+ * ibus_unicode_block_get_start:
+ * @block: An #IBusUnicodeData
+ *
+ * Gets the start code point in #IBusUnicodeBlock.
+ *
+ * Returns: start property in #IBusUnicodeBlock
+ */
+gunichar          ibus_unicode_block_get_start
+                                              (IBusUnicodeBlock   *block);
+
+/**
+ * ibus_unicode_block_get_end:
+ * @block: An #IBusUnicodeData
+ *
+ * Gets the end code point in #IBusUnicodeBlock.
+ *
+ * Returns: end property in #IBusUnicodeBlock
+ */
+gunichar          ibus_unicode_block_get_end
+                                              (IBusUnicodeBlock   *block);
+
+/**
+ * ibus_unicode_block_get_name:
+ * @block: An #IBusUnicodeBlock
+ *
+ * Gets the name in #IBusUnicodeBlock. It should not be freed.
+ *
+ * Returns: name property in #IBusUnicodeBlock
+ */
+const gchar *     ibus_unicode_block_get_name (IBusUnicodeBlock   *block);
+
+/**
+ * ibus_unicode_block_save:
+ * @path: A path of the saved Unicode block.
+ * @list: (element-type IBusUnicodeBlock) (transfer none): A list of unicode
+ *  block.
+ *
+ * Save the list of #IBusUnicodeBlock to the cache file.
+ */
+void              ibus_unicode_block_save     (const gchar        *path,
+                                               GSList             *list);
+
+/**
+ * ibus_unicode_block_load:
+ * @path: A path of the saved dictionary file.
+ *
+ * Returns: (element-type IBusUnicodeBlock) (transfer container):
+ * An #IBusUnicodeBlock list loaded from the saved cache file.
+ */
+GSList *          ibus_unicode_block_load     (const gchar        *path);
+
+G_END_DECLS
+#endif
diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
new file mode 100644
index 000000000..c613b81b1
--- /dev/null
+++ b/src/ibusunicodegen.h
@@ -0,0 +1,1151 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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
+ */
+
+
+/* This file is generated by unicode-parser.c. */
+include <glib/gi18n.h>
+
+#ifndef __IBUS_UNICODE_GEN_H_
+#define __IBUS_UNICODE_GEN_H_
+const static char *unicode_blocks[] = {
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Basic Latin"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin-1 Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("IPA Extensions"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Spacing Modifier Letters"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Combining Diacritical Marks"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Greek and Coptic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cyrillic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cyrillic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Armenian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hebrew"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Syriac"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Thaana"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("NKo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Samaritan"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mandaic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Syriac Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Devanagari"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bengali"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Gurmukhi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Gujarati"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Oriya"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tamil"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Telugu"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kannada"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Malayalam"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sinhala"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Thai"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lao"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tibetan"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Myanmar"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Georgian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hangul Jamo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ethiopic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ethiopic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cherokee"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Unified Canadian Aboriginal Syllabics"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ogham"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Runic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tagalog"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hanunoo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Buhid"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tagbanwa"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khmer"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mongolian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Unified Canadian Aboriginal Syllabics Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Limbu"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tai Le"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("New Tai Lue"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khmer Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Buginese"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tai Tham"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Combining Diacritical Marks Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Balinese"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sundanese"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Batak"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lepcha"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ol Chiki"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cyrillic Extended-C"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sundanese Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Vedic Extensions"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Phonetic Extensions"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Phonetic Extensions Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Combining Diacritical Marks Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended Additional"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Greek Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("General Punctuation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Superscripts and Subscripts"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Currency Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Combining Diacritical Marks for Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Letterlike Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Number Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arrows"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mathematical Operators"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Technical"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Control Pictures"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Optical Character Recognition"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Enclosed Alphanumerics"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Box Drawing"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Block Elements"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Geometric Shapes"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Dingbats"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Mathematical Symbols-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Arrows-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Braille Patterns"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Arrows-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Mathematical Symbols-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Mathematical Operators"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Symbols and Arrows"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Glagolitic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-C"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Coptic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Georgian Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tifinagh"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ethiopic Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cyrillic Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Punctuation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Radicals Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kangxi Radicals"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ideographic Description Characters"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Symbols and Punctuation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hiragana"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Katakana"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bopomofo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hangul Compatibility Jamo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kanbun"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bopomofo Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Strokes"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Katakana Phonetic Extensions"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Enclosed CJK Letters and Months"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Compatibility"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Yijing Hexagram Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Yi Syllables"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Yi Radicals"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lisu"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Vai"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cyrillic Extended-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bamum"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Modifier Tone Letters"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-D"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Syloti Nagri"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Common Indic Number Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Phags-pa"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Saurashtra"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Devanagari Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kayah Li"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Rejang"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hangul Jamo Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Javanese"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Myanmar Extended-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cham"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Myanmar Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tai Viet"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Meetei Mayek Extensions"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ethiopic Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-E"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cherokee Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Meetei Mayek"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hangul Syllables"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hangul Jamo Extended-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("High Surrogates"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("High Private Use Surrogates"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Low Surrogates"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Private Use Area"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Compatibility Ideographs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Alphabetic Presentation Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Presentation Forms-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Variation Selectors"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Vertical Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Combining Half Marks"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Compatibility Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Small Form Variants"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Presentation Forms-B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Halfwidth and Fullwidth Forms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Specials"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Linear B Syllabary"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Linear B Ideograms"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Aegean Numbers"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ancient Greek Numbers"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ancient Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Phaistos Disc"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lycian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Carian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Coptic Epact Numbers"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Italic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Gothic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Permic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ugaritic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Persian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Deseret"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Shavian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Osmanya"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Osage"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Elbasan"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Caucasian Albanian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Linear A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cypriot Syllabary"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Imperial Aramaic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Palmyrene"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Nabataean"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hatran"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Phoenician"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lydian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Meroitic Hieroglyphs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Meroitic Cursive"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kharoshthi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old South Arabian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old North Arabian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Manichaean"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Avestan"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Inscriptional Parthian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Inscriptional Pahlavi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Psalter Pahlavi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Turkic"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Hungarian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Rumi Numeral Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Brahmi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kaithi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sora Sompeng"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Chakma"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mahajani"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sharada"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sinhala Archaic Numbers"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khojki"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Multani"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khudawadi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Grantha"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Newa"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tirhuta"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Siddham"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Modi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mongolian Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Takri"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ahom"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Warang Citi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Zanabazar Square"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Soyombo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Pau Cin Hau"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bhaiksuki"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Marchen"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Masaram Gondi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cuneiform"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cuneiform Numbers and Punctuation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Early Dynastic Cuneiform"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Egyptian Hieroglyphs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Anatolian Hieroglyphs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bamum Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mro"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Bassa Vah"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Pahawh Hmong"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miao"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ideographic Symbols and Punctuation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tangut"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tangut Components"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kana Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kana Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Nushu"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Duployan"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Shorthand Format Controls"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Byzantine Musical Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Musical Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ancient Greek Musical Notation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tai Xuan Jing Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Counting Rod Numerals"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mathematical Alphanumeric Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sutton SignWriting"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Glagolitic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mende Kikakui"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Adlam"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Mathematical Alphabetic Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mahjong Tiles"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Domino Tiles"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Playing Cards"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Enclosed Alphanumeric Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Enclosed Ideographic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Miscellaneous Symbols and Pictographs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Emoticons"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ornamental Dingbats"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Transport and Map Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Alchemical Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Geometric Shapes Extended"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Arrows-C"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplemental Symbols and Pictographs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension B"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension C"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension D"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension E"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension F"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Compatibility Ideographs Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tags"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Variation Selectors Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplementary Private Use Area-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Supplementary Private Use Area-B"),
+};
+#endif
diff --git a/src/unicode-parser.c b/src/unicode-parser.c
new file mode 100644
index 000000000..e98c6d5fa
--- /dev/null
+++ b/src/unicode-parser.c
@@ -0,0 +1,502 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#include "ibusunicode.h"
+
+#define NAMES_LIST_SUBJECT "The Unicode Standard"
+#define BLOCKS_SUBJECT "Blocks-"
+
+/* This file has 21 lines about the license at the top of the file. */
+#define LICENSE_LINES 21
+
+typedef enum
+{
+    UCD_NAMES_LIST,
+    UCD_BLOCKS
+} UCDType;
+
+typedef struct _UnicodeData UnicodeData;
+typedef struct _UnicodeDataIndex UnicodeDataIndex;
+
+struct _UnicodeData{
+    gunichar code;
+    gchar   *name;
+    gchar   *alias;
+    gunichar start;
+    gunichar end;
+    GSList  *list;
+};
+
+struct _UnicodeDataIndex {
+    gchar *index;
+    UnicodeData *data_list;
+};
+
+static gchar *unicode_version;
+
+static void
+unicode_data_new_object (UnicodeData *data)
+{
+    g_return_if_fail (data != NULL);
+    if (!data->name) {
+        g_warning ("No name in U+%04X", data->code);
+    }
+    IBusUnicodeData *unicode =
+            ibus_unicode_data_new ("code",
+                                   data->code,
+                                   "name",
+                                   data->name ? g_strdup (data->name)
+                                           : g_strdup (""),
+                                   "alias",
+                                   data->alias ? g_strdup (data->alias)
+                                           : g_strdup (""),
+                                   NULL);
+    data->list = g_slist_append (data->list, unicode);
+}
+
+static void
+unicode_block_new_object (UnicodeData *data)
+{
+    g_return_if_fail (data != NULL);
+    if (!data->name) {
+        g_warning ("No name in U+%04X", data->start);
+    }
+    IBusUnicodeBlock *block =
+            ibus_unicode_block_new ("start",
+                                    data->start,
+                                    "end",
+                                    data->end,
+                                    "name",
+                                    data->name ? g_strdup (data->name)
+                                           : g_strdup (""),
+                                   NULL);
+    data->list = g_slist_append (data->list, block);
+}
+
+static void
+unicode_data_reset (UnicodeData *data)
+{
+    g_return_if_fail (data != NULL);
+    data->code = 0;
+    g_clear_pointer (&data->name, g_free);
+    g_clear_pointer (&data->alias, g_free);
+    data->start = 0;
+    data->end = 0;
+}
+
+static gboolean
+ucd_names_list_parse_comment (const gchar *line)
+{
+    static gboolean has_version = FALSE;
+
+    if (has_version)
+        return TRUE;
+    if (strlen (line) > 4 && strncmp (line, "@@@", 3) == 0) {
+        gchar **elements = g_strsplit (line, "\t", -1);
+        if (strncmp (elements[1], NAMES_LIST_SUBJECT,
+            strlen (NAMES_LIST_SUBJECT)) == 0) {
+            unicode_version =
+                    g_strdup (elements[1] + strlen (NAMES_LIST_SUBJECT) + 1);
+            has_version = TRUE;
+        }
+        g_strfreev (elements);
+    }
+    return TRUE;
+}
+
+static gboolean
+ucd_names_list_parse_alias (const gchar *line,
+                            UnicodeData *data)
+{
+    g_return_val_if_fail (line != NULL, FALSE);
+    g_return_val_if_fail (data != NULL, FALSE);
+
+    if (*line == '\0')
+        return FALSE;
+    data->alias = g_strdup (line);
+    return TRUE;
+}
+
+static gboolean
+ucd_names_list_parse_indent_line (const gchar *line,
+                                  UnicodeData *data)
+{
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    switch (*line) {
+    case '\0':
+        return FALSE;
+    case '=':
+        line++;
+        while (*line == ' ') line++;
+        return ucd_names_list_parse_alias (line, data);
+    default:;
+    }
+    return TRUE;
+}
+
+static gboolean
+ucd_names_list_parse_line (const gchar *line,
+                           UnicodeData *data)
+{
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    switch (*line) {
+    case '\0':
+        return TRUE;
+    case ';':
+        return TRUE;
+    case '@':
+        return ucd_names_list_parse_comment (line);
+    case '\t':
+        return ucd_names_list_parse_indent_line (line + 1, data);
+    default:;
+    }
+    if (g_ascii_isxdigit (*line)) {
+        gchar **elements = g_strsplit (line, "\t", -1);
+        gunichar code;
+        gchar *name;
+
+        if (g_strv_length (elements) < 2) {
+            g_strfreev (elements);
+            return FALSE;
+        }
+        code = g_ascii_strtoull (elements[0], NULL, 16);
+        name = g_strdup (elements[1]);
+        if (data->name) {
+            unicode_data_new_object (data);
+            unicode_data_reset (data);
+        }
+        data->code = code;
+        data->name = name;
+    }
+    return TRUE;
+}
+
+static gboolean
+ucd_blocks_parse_comment (const gchar *line)
+{
+    static gboolean has_version = FALSE;
+
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    if (has_version)
+        return TRUE;
+    while (*line == ' ') line++;
+    if (strlen (line) > strlen (BLOCKS_SUBJECT) &&
+        strncmp (line, BLOCKS_SUBJECT, strlen (BLOCKS_SUBJECT)) == 0) {
+            unicode_version = g_strdup (line + strlen (BLOCKS_SUBJECT) + 1);
+            has_version = TRUE;
+    }
+    return TRUE;
+}
+
+static gboolean
+ucd_blocks_parse_line (const gchar *line,
+                       UnicodeData *data)
+{
+    g_return_val_if_fail (line != NULL, FALSE);
+
+    switch (*line) {
+    case '\0':
+        return TRUE;
+    case '#':
+        return ucd_blocks_parse_comment (line + 1);
+    default:;
+    }
+    if (g_ascii_isxdigit (*line)) {
+        gchar *endptr = NULL;
+        gunichar start = g_ascii_strtoull (line, &endptr, 16);
+        gunichar end;
+        gchar *name = NULL;
+
+        if (endptr == NULL || *endptr == '\0')
+            return FALSE;
+        while (*endptr == '.') endptr++;
+        line = endptr;
+        endptr = NULL;
+        end = g_ascii_strtoull (line, &endptr, 16);
+        if (endptr == NULL || *endptr == '\0')
+            return FALSE;
+        while (*endptr == ';') endptr++;
+        while (*endptr == ' ') endptr++;
+        if (*endptr == '\0')
+            return FALSE;
+        name = g_strdup (endptr);
+        if (data->name) {
+            unicode_block_new_object (data);
+            unicode_data_reset (data);
+        }
+        data->start = start;
+        data->end = end;
+        data->name = name;
+    }
+    return TRUE;
+}
+
+static gboolean
+ucd_parse_file (const gchar *filename,
+                GSList     **list,
+                UCDType      type)
+{
+    UnicodeData data = { 0, };
+    gchar *content = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    gchar *head, *end, *line;
+    int n = 1;
+
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (list != NULL, FALSE);
+
+    if (!g_file_get_contents (filename, &content, &length, &error)) {
+        g_warning ("Failed to load %s: %s", filename, error->message);
+        goto failed_to_parse_ucd_names_list;
+    }
+    head = end = content;
+    while (*end == '\n' && end - content < length) {
+        end++;
+        n++;
+    }
+    head = end;
+    while (end - content < length) {
+        while (*end != '\n' && end - content < length)
+            end++;
+        if (end - content >= length)
+            break;
+        line = g_strndup (head, end - head);
+        switch (type) {
+        case UCD_NAMES_LIST:
+            if (!ucd_names_list_parse_line (line, &data)) {
+                g_warning ("parse error #%d in %s version %s: %s",
+                           n, filename,
+                           unicode_version ? unicode_version : "(null)",
+                           line);
+            }
+            break;
+        case UCD_BLOCKS:
+            if (!ucd_blocks_parse_line (line, &data)) {
+                g_warning ("parse error #%d in %s version %s: %s",
+                           n, filename,
+                           unicode_version ? unicode_version : "(null)",
+                           line);
+            }
+            break;
+        default:
+            g_abort ();
+        }
+        while (*end == '\n' && end - content < length) {
+            end++;
+            n++;
+        }
+        g_free (line);
+        head = end;
+    }
+    if (data.name != NULL) {
+        switch (type) {
+        case UCD_NAMES_LIST:
+            unicode_data_new_object (&data);
+            break;
+        case UCD_BLOCKS:
+            unicode_block_new_object (&data);
+            break;
+        default:;
+        }
+        unicode_data_reset (&data);
+    }
+    g_free (content);
+    *list = data.list;
+    return TRUE;
+
+failed_to_parse_ucd_names_list:
+    if (error)
+        g_error_free (error);
+    g_clear_pointer (&content, g_free);
+    *list = data.list;
+    return FALSE;
+}
+
+static void
+block_list_dump (IBusUnicodeBlock *block,
+                 GString          *buff)
+{
+    g_return_if_fail (buff != NULL);
+
+    g_string_append (buff, "    /* TRANSLATORS: You might refer the "         \
+                           "translations from gucharmap with\n"               \
+                           "                    the following command:\n"     \
+                           "       msgmerge -C gucharmap.po ibus.po "         \
+                           "ibus.pot */\n");
+    gchar *line = g_strdup_printf ("    N_(\"%s\"),\n",
+                                   ibus_unicode_block_get_name (block));
+    g_string_append (buff, line);
+}
+
+static void
+ucd_block_translatable_save (const gchar *filename,
+                             GSList      *blocks_list)
+{
+    gchar *content = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    gchar *p;
+    GString *buff = NULL;
+    int i;
+    GSList *list = blocks_list;
+
+    g_return_if_fail (filename != NULL);
+    g_return_if_fail (list != NULL);
+
+    if (!g_file_get_contents (__FILE__, &content, &length, &error)) {
+        g_warning ("Failed to load %s: %s", __FILE__, error->message);
+        g_clear_pointer (&error, g_error_free);
+        return;
+    }
+
+    buff = g_string_new (NULL);
+    p = content;
+    for (i = 0; i < LICENSE_LINES; i++, p++) {
+        if ((p = strchr (p, '\n')) == NULL)
+            break;
+    }
+    if (p != NULL) {
+        g_string_append (buff, g_strndup (content, p - content));
+        g_string_append_c (buff, '\n');
+    }
+    g_clear_pointer (&content, g_free);
+
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup_printf ("/* This file is generated by %s. */", __FILE__));
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup ("include <glib/gi18n.h>\n"));
+    g_string_append (buff, g_strdup ("\n"));
+    g_string_append (buff, g_strdup ("#ifndef __IBUS_UNICODE_GEN_H_\n"));
+    g_string_append (buff, g_strdup ("#define __IBUS_UNICODE_GEN_H_\n"));
+    g_string_append (buff, g_strdup ("const static char *unicode_blocks[] = {\n"));
+    g_slist_foreach (list, (GFunc)block_list_dump, buff);
+    g_string_append (buff, g_strdup ("};\n"));
+    g_string_append (buff, g_strdup ("#endif\n"));
+
+    if (!g_file_set_contents (filename, buff->str, -1, &error)) {
+        g_warning ("Failed to save emoji category file %s: %s", filename, error->message);
+        g_error_free (error);
+    }
+
+    g_string_free (buff, TRUE);
+}
+
+int
+main (int argc, char *argv[])
+{
+    gchar *prgname;
+    gchar *input_names_list = NULL;
+    gchar *input_blocks = NULL;
+    gchar *output_names_list = NULL;
+    gchar *output_blocks = NULL;
+    gchar *output_blocks_trans = NULL;
+    GOptionEntry     entries[] = {
+        { "input-names-list", 'n', 0, G_OPTION_ARG_STRING, &input_names_list,
+          "Parse NamesList.txt FILE in unicode.org ",
+          "FILE"
+        },
+        { "input-blocks", 'b', 0, G_OPTION_ARG_STRING, &input_blocks,
+          "Parse Blocks.txt FILE in unicode.org ",
+          "FILE"
+        },
+        { "output-names-list", 'o', 0, G_OPTION_ARG_STRING, &output_names_list,
+          "Save the Unicode data as FILE",
+          "FILE"
+        },
+        { "output-blocks", 'B', 0, G_OPTION_ARG_STRING, &output_blocks,
+          "Save the Unicode block list as FILE",
+          "FILE"
+        },
+        { "output-blocks-trans", 'C', 0, G_OPTION_ARG_STRING,
+          &output_blocks_trans,
+          "Save the translatable Unicode blocks as FILE",
+          "FILE"
+        },
+        { NULL }
+    };
+    GOptionContext *context;
+    GError *error = NULL;
+    GSList *names_list = NULL;
+    GSList *blocks_list = NULL;
+
+#ifdef HAVE_LOCALE_H
+    /* To output emoji warnings. */
+    setlocale (LC_ALL, "");
+#endif
+
+    prgname = g_path_get_basename (argv[0]);
+    g_set_prgname (prgname);
+    g_free (prgname);
+
+    context = g_option_context_new (NULL);
+    g_option_context_add_main_entries (context, entries, NULL);
+
+    if (argc < 3) {
+        g_print ("%s", g_option_context_get_help (context, TRUE, NULL));
+        g_option_context_free (context);
+        return -1;
+    }
+
+    if (!g_option_context_parse (context, &argc, &argv, &error)) {
+        g_warning ("Failed options: %s", error->message);
+        g_error_free (error);
+        return -1;
+    }
+    g_option_context_free (context);
+
+    if (input_names_list) {
+        ucd_parse_file (input_names_list, &names_list, UCD_NAMES_LIST);
+        g_free (input_names_list);
+    }
+    if (output_names_list && names_list)
+        ibus_unicode_data_save (output_names_list, names_list);
+    g_free (output_names_list);
+
+    if (input_blocks) {
+        ucd_parse_file (input_blocks, &blocks_list, UCD_BLOCKS);
+        g_free (input_blocks);
+    }
+    if (output_blocks && blocks_list)
+        ibus_unicode_block_save (output_blocks, blocks_list);
+    if (output_blocks_trans && blocks_list)
+        ucd_block_translatable_save (output_blocks_trans, blocks_list);
+    g_free (output_blocks);
+
+    g_free (unicode_version);
+    return 0;
+}
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index f3e9f15ce..555ea68f1 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
  * USA
  */
 
-class IBusEmojier : Gtk.ApplicationWindow {
+public class IBusEmojier : Gtk.ApplicationWindow {
     private class EEntry : Gtk.SearchEntry {
         public EEntry() {
             GLib.Object(
@@ -99,15 +99,70 @@ class IBusEmojier : Gtk.ApplicationWindow {
         }
     }
     private class EWhiteLabel : Gtk.Label {
+        private int m_minimum_width = 0;
+        private int m_natural_width = 0;
+        private int m_minimum_height = 0;
+        private int m_natural_height = 0;
         public EWhiteLabel(string text) {
             GLib.Object(
                 name : "IBusEmojierWhiteLabel"
             );
-            if (text != "")
-                set_label(text);
+            set_label(text);
+        }
+        public override void get_preferred_width(out int minimum_width,
+                                                 out int natural_width) {
+            if (m_minimum_height == 0 && m_natural_height == 0) {
+                base.get_preferred_height(out m_minimum_height,
+                                          out m_natural_height);
+            }
+            var text = get_label();
+            var ch = text.get_char();
+            if (text.length == 1 && ch == '\t') {
+                m_minimum_width = minimum_width = m_minimum_height;
+                m_natural_width = natural_width = m_natural_height;
+                return;
+            }
+            base.get_preferred_width(out minimum_width, out natural_width);
+            if (text.length == 1 && (ch == '\n' || ch == '\r')) {
+                minimum_width /= 2;
+                natural_width /= 2;
+                m_minimum_width = minimum_width;
+                m_natural_width = natural_width;
+                return;
+            }
+            if (minimum_width < m_minimum_height)
+                minimum_width = m_minimum_height;
+            if (natural_width < m_natural_height)
+                natural_width = m_natural_height;
+            m_minimum_width = minimum_width;
+            m_natural_width = natural_width;
+        }
+        public override void get_preferred_height(out int minimum_height,
+                                                  out int natural_height) {
+            if (m_minimum_width == 0 && m_natural_width == 0) {
+                base.get_preferred_width(out m_minimum_width,
+                                         out m_natural_width);
+            }
+            var text = get_label();
+            var ch = text.get_char();
+            if (text.length == 1 && ch == '\v') {
+                m_minimum_height = minimum_height = m_minimum_width;
+                m_natural_height = natural_height = m_natural_width;
+                return;
+            }
+            base.get_preferred_height(out minimum_height, out natural_height);
+            if (text.length == 1 && (ch == '\n' || ch == '\r')) {
+                minimum_height /= 2;
+                natural_height /= 2;
+                m_minimum_height = minimum_height;
+                m_natural_height = natural_height;
+                return;
+            }
+            m_minimum_height = minimum_height;
+            m_natural_height = natural_height;
         }
     }
-    private class ESelectedLabel : Gtk.Label {
+    private class ESelectedLabel : EWhiteLabel {
         public ESelectedLabel(string text) {
             GLib.Object(
                 name : "IBusEmojierSelectedLabel"
@@ -116,7 +171,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 set_label(text);
         }
     }
-    private class EGoldLabel : Gtk.Label {
+    private class EGoldLabel : EWhiteLabel {
         public EGoldLabel(string text) {
             GLib.Object(
                 name : "IBusEmojierGoldLabel"
@@ -167,6 +222,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
     private class ETitleLabelBox : Gtk.HeaderBar {
         private Gtk.Label m_lang_label;
+        private Gtk.Label m_title_label;
 
         public ETitleLabelBox(string title) {
             GLib.Object(
@@ -177,9 +233,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
             );
             var vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
             set_custom_title(vbox);
-            var label = new Gtk.Label(title);
-            label.get_style_context().add_class(Gtk.STYLE_CLASS_TITLE);
-            vbox.pack_start(label, true, false, 0);
+            m_title_label = new Gtk.Label(title);
+            m_title_label.get_style_context().add_class(Gtk.STYLE_CLASS_TITLE);
+            vbox.pack_start(m_title_label, true, false, 0);
             m_lang_label = new Gtk.Label(null);
             m_lang_label.get_style_context().add_class(
                     Gtk.STYLE_CLASS_SUBTITLE);
@@ -194,10 +250,19 @@ class IBusEmojier : Gtk.ApplicationWindow {
             menu_button.set_tooltip_text(_("Menu"));
             pack_end(menu_button);
         }
+        public new void set_title(string title) {
+            m_title_label.set_text(title);
+        }
         public void set_lang_label(string str) {
             m_lang_label.set_text(str);
         }
     }
+    private class LoadProgressObject : GLib.Object {
+        public LoadProgressObject() {
+        }
+        public signal void deserialize_unicode(uint done, uint total);
+    }
+
 
     private enum TravelDirection {
         NONE,
@@ -207,6 +272,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private const uint EMOJI_GRID_PAGE = 10;
     private const string EMOJI_CATEGORY_FAVORITES = N_("Favorites");
     private const string EMOJI_CATEGORY_OTHERS = N_("Others");
+    private const string EMOJI_CATEGORY_UNICODE = N_("Open Unicode choice");
     private const unichar[] EMOJI_VARIANT_LIST = {
             0x1f3fb, 0x1f3fc, 0x1f3fd, 0x1f3fe, 0x1f3ff, 0x200d };
 
@@ -223,6 +289,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private static uint m_partial_match_length;
     private static uint m_partial_match_condition;
     private static bool m_show_emoji_variant = false;
+    private static int m_default_window_width;
+    private static int m_default_window_height;
     private static GLib.HashTable<string, GLib.SList<string>>?
             m_annotation_to_emojis_dict;
     private static GLib.HashTable<string, IBus.EmojiData>?
@@ -231,6 +299,14 @@ class IBusEmojier : Gtk.ApplicationWindow {
             m_category_to_emojis_dict;
     private static GLib.HashTable<string, GLib.SList<string>>?
             m_emoji_to_emoji_variants_dict;
+    private static GLib.HashTable<unichar, IBus.UnicodeData>?
+            m_unicode_to_data_dict;
+    private static GLib.HashTable<string, GLib.SList<unichar>>?
+            m_name_to_unicodes_dict;
+    private static GLib.SList<IBus.UnicodeBlock> m_unicode_block_list;
+    private static bool m_show_unicode = false;
+    private static LoadProgressObject m_unicode_progress_object;
+    private static bool m_loaded_unicode = false;
 
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
@@ -246,7 +322,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private string? m_result;
     private string? m_unicode_point = null;
     private bool m_candidate_panel_is_visible;
-    private int m_category_active_index;
+    private int m_category_active_index = -1;
     private IBus.LookupTable m_lookup_table;
     private Gtk.Label[] m_candidates;
     private bool m_enter_notify_enable = true;
@@ -254,6 +330,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private uint m_entry_notify_disable_id;
     protected static double m_mouse_x;
     protected static double m_mouse_y;
+    private Gtk.ProgressBar m_unicode_progress_bar;
+    private Gtk.Label m_unicode_percent_label;
+    private double m_unicode_percent;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
 
@@ -402,6 +481,8 @@ class IBusEmojier : Gtk.ApplicationWindow {
         if (m_annotation_to_emojis_dict == null) {
             reload_emoji_dict();
         }
+
+        get_load_progress_object();
     }
 
 
@@ -433,6 +514,13 @@ class IBusEmojier : Gtk.ApplicationWindow {
         m_emoji_to_emoji_variants_dict =
                 new GLib.HashTable<string, GLib.SList<string>>(GLib.str_hash,
                                                                GLib.str_equal);
+        m_unicode_to_data_dict =
+                new GLib.HashTable<unichar, IBus.UnicodeData>(
+                        GLib.direct_hash,
+                        GLib.direct_equal);
+        m_name_to_unicodes_dict =
+                new GLib.HashTable<string, GLib.SList<unichar>>(GLib.str_hash,
+                                                                GLib.str_equal);
     }
 
 
@@ -482,6 +570,10 @@ class IBusEmojier : Gtk.ApplicationWindow {
     private static string utf8_code_point(string str) {
         var buff = new GLib.StringBuilder();
         int length = str.char_count();
+        if (length == 0) {
+            buff.append("U+%04X".printf(0));
+            return buff.str;
+        }
         for (int i = 0; i < length; i++) {
             unichar ch = str.get_char(0);
             if (i == 0)
@@ -644,6 +736,72 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private static void make_unicode_block_dict() {
+        m_unicode_block_list = IBus.UnicodeBlock.load(
+                    Config.PKGDATADIR + "/dicts/unicode-blocks.dict");
+        foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
+            unowned string name = block.get_name();
+            if (m_emoji_max_seq_len < name.length)
+                m_emoji_max_seq_len = name.length;
+        }
+    }
+
+
+    private static void make_unicode_name_dict(Object source_object) {
+        IBus.UnicodeData.load_async(
+                    Config.PKGDATADIR + "/dicts/unicode-names.dict",
+                    source_object,
+                    null,
+        (IBus.UnicodeDataLoadAsyncFinish)make_unicode_name_dict_finish);
+    }
+
+    private static void
+    make_unicode_name_dict_finish(GLib.SList<IBus.UnicodeData> unicode_list) {
+        if (unicode_list == null)
+            return;
+        foreach (IBus.UnicodeData data in unicode_list) {
+            update_unicode_to_data_dict(data);
+            update_name_to_unicodes_dict(data);
+        }
+        GLib.List<unowned string> names =
+                m_name_to_unicodes_dict.get_keys();
+        foreach (unowned string name in names) {
+            if (m_emoji_max_seq_len < name.length)
+                m_emoji_max_seq_len = name.length;
+        }
+        m_loaded_unicode = true;
+    }
+
+
+    private static void update_unicode_to_data_dict(IBus.UnicodeData data) {
+        unichar code = data.get_code();
+        m_unicode_to_data_dict.replace(code, data);
+    }
+
+
+    private static void update_name_to_unicodes_dict(IBus.UnicodeData data) {
+        unichar code = data.get_code();
+        string[] names = {data.get_name().down(), data.get_alias().down()};
+        foreach (unowned string name in names) {
+            if (name == "")
+                continue;
+            bool has_code = false;
+            GLib.SList<unichar> hits =
+                    m_name_to_unicodes_dict.lookup(name).copy();
+            foreach (unichar hit_code in hits) {
+                if (hit_code == code) {
+                    has_code = true;
+                    break;
+                }
+            }
+            if (!has_code) {
+                hits.append(code);
+                m_name_to_unicodes_dict.replace(name, hits.copy());
+            }
+        }
+    }
+
+
     private void set_fixed_size() {
         resize(20, 1);
     }
@@ -665,6 +823,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
         m_scrolled_window = new EScrolledWindow();
         set_fixed_size();
 
+        m_title.set_title(_("Emoji Choice"));
         string language =
             IBus.get_language_name(m_current_lang_id);
         m_title.set_lang_label(language);
@@ -677,12 +836,12 @@ class IBusEmojier : Gtk.ApplicationWindow {
         Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
         m_list_box.set_adjustment(adjustment);
         m_list_box.row_activated.connect((box, gtkrow) => {
-            m_category_active_index = 0;
+            m_category_active_index = -1;
             EBoxRow row = gtkrow as EBoxRow;
             show_emoji_for_category(row.text);
         });
 
-        uint n = 1;
+        uint n = 0;
         if (m_favorites.length > 0) {
             EBoxRow row = new EBoxRow(EMOJI_CATEGORY_FAVORITES);
             EPaddedLabelBox widget =
@@ -716,9 +875,19 @@ class IBusEmojier : Gtk.ApplicationWindow {
             if (n++ == m_category_active_index)
                 m_list_box.select_row(row);
         }
+        if (m_unicode_block_list.length() > 0) {
+            EBoxRow row = new EBoxRow(EMOJI_CATEGORY_UNICODE);
+            EPaddedLabelBox widget =
+                    new EPaddedLabelBox(_(EMOJI_CATEGORY_UNICODE),
+                                        Gtk.Align.CENTER);
+            row.add(widget);
+            m_list_box.add(row);
+            if (n++ == m_category_active_index)
+                m_list_box.select_row(row);
+        }
 
         m_scrolled_window.show_all();
-        if (m_category_active_index == 0)
+        if (m_category_active_index == -1)
             m_list_box.unselect_all();
         m_list_box.invalidate_filter();
         m_list_box.set_selection_mode(Gtk.SelectionMode.SINGLE);
@@ -733,6 +902,11 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 m_lookup_table.append_candidate(text);
             }
             m_backward = category;
+        } else if (category == EMOJI_CATEGORY_UNICODE) {
+            m_category_active_index = -1;
+            m_show_unicode = true;
+            show_unicode_blocks();
+            return;
         } else {
             unowned GLib.SList<unowned string> emojis =
                     m_category_to_emojis_dict.lookup(category);
@@ -764,6 +938,126 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private void show_unicode_blocks() {
+        m_show_unicode = true;
+        if (m_default_window_width == 0 && m_default_window_height == 0)
+            get_size(out m_default_window_width, out m_default_window_height);
+        remove_all_children();
+        set_fixed_size();
+
+        m_title.set_title(_("Unicode Choice"));
+        EPaddedLabelBox label =
+                new EPaddedLabelBox(_("Bring back emoji choice"),
+                                    Gtk.Align.CENTER,
+                                    TravelDirection.BACKWARD);
+        Gtk.Button button = new Gtk.Button();
+        button.add(label);
+        m_vbox.add(button);
+        button.show_all();
+        button.button_press_event.connect((w, e) => {
+            m_category_active_index = -1;
+            m_show_unicode = false;
+            hide_candidate_panel();
+            return true;
+        });
+        m_scrolled_window = new EScrolledWindow();
+        m_title.set_lang_label("");
+        m_vbox.add(m_scrolled_window);
+        Gtk.Viewport viewport = new Gtk.Viewport(null, null);
+        m_scrolled_window.add(viewport);
+
+        m_list_box = new EListBox();
+        viewport.add(m_list_box);
+        Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
+        m_list_box.set_adjustment(adjustment);
+        m_list_box.row_activated.connect((box, gtkrow) => {
+            m_category_active_index = -1;
+            EBoxRow row = gtkrow as EBoxRow;
+            show_unicode_for_block(row.text);
+        });
+
+        uint n = 0;
+        foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
+            string name = block.get_name();
+            EBoxRow row = new EBoxRow(name);
+            EPaddedLabelBox widget =
+                    new EPaddedLabelBox(_(name), Gtk.Align.CENTER);
+            row.add(widget);
+            m_list_box.add(row);
+            if (n++ == m_category_active_index) {
+                m_list_box.select_row(row);
+            }
+        }
+
+        set_size_request(-1, m_default_window_height + 100);
+        m_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
+                                     Gtk.PolicyType.AUTOMATIC);
+        m_scrolled_window.show_all();
+        if (m_category_active_index == -1)
+            m_list_box.unselect_all();
+        m_list_box.invalidate_filter();
+        m_list_box.set_selection_mode(Gtk.SelectionMode.SINGLE);
+    }
+
+    private void show_unicode_for_block(string block_name) {
+        if (!m_loaded_unicode) {
+            remove_all_children();
+            set_fixed_size();
+            m_unicode_progress_bar = new Gtk.ProgressBar();
+            m_unicode_progress_bar.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
+            m_unicode_progress_bar.set_halign(Gtk.Align.CENTER);
+            m_unicode_progress_bar.set_valign(Gtk.Align.CENTER);
+            m_vbox.add(m_unicode_progress_bar);
+            m_unicode_progress_bar.show();
+            var hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
+            hbox.set_halign(Gtk.Align.CENTER);
+            hbox.set_valign(Gtk.Align.CENTER);
+            m_vbox.add(hbox);
+            var label = new Gtk.Label(_("Loading a Unicode dictionary:"));
+            hbox.pack_start(label, false, true, 0);
+            m_unicode_percent_label = new Gtk.Label("");
+            hbox.pack_start(m_unicode_percent_label, false, true, 0);
+            hbox.show_all();
+
+            m_unicode_progress_object.deserialize_unicode.connect((i, n) => {
+                m_unicode_percent = (double)i / n;
+            });
+            GLib.Timeout.add(100, () => {
+                m_unicode_progress_bar.set_fraction(m_unicode_percent);
+                m_unicode_percent_label.set_text(
+                        "%.0f%%\n".printf(m_unicode_percent * 100));
+                m_unicode_progress_bar.show();
+                m_unicode_percent_label.show();
+                if (m_loaded_unicode) {
+                    show_unicode_for_block(block_name);
+                }
+                return !m_loaded_unicode;
+            });
+            return;
+        }
+        unichar start = 0;
+        unichar end = 0;
+        foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
+            string name = block.get_name();
+            if (block_name == name) {
+                start = block.get_start();
+                end = block.get_end();
+            }
+        }
+        m_lookup_table.clear();
+        for (unichar ch = start; ch < end; ch++) {
+            unowned IBus.UnicodeData? data =
+                    m_unicode_to_data_dict.lookup(ch);
+            if (data == null)
+                continue;
+            IBus.Text text = new IBus.Text.from_unichar(ch);
+            m_lookup_table.append_candidate(text);
+        }
+        m_backward = block_name;
+        show_candidate_panel();
+    }
+
+
     private void show_arrow_buttons() {
         Gtk.Button next_button = new Gtk.Button();
         next_button.clicked.connect(() => {
@@ -840,6 +1134,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
     lookup_emojis_from_annotation(string annotation) {
         GLib.SList<string>? total_emojis = null;
         unowned GLib.SList<string>? sub_emojis = null;
+        unowned GLib.SList<unichar>? sub_unicodes = null;
         int length = annotation.length;
         if (m_has_partial_match && length >= m_partial_match_length) {
             foreach (unowned string key in
@@ -877,6 +1172,22 @@ class IBusEmojier : Gtk.ApplicationWindow {
             foreach (unowned string emoji in sub_emojis)
                 total_emojis.append(emoji);
         }
+        if (length >= m_partial_match_length) {
+            foreach (unowned string key in m_name_to_unicodes_dict.get_keys()) {
+                bool matched = false;
+                if (key.index_of(annotation) >= 0)
+                        matched = true;
+                if (!matched)
+                    continue;
+                sub_unicodes = m_name_to_unicodes_dict.lookup(key);
+                foreach (unichar code in sub_unicodes) {
+                    string ch = code.to_string();
+                    if (total_emojis.find_custom(ch, GLib.strcmp) == null) {
+                        total_emojis.append(ch);
+                    }
+                }
+            }
+        }
         return total_emojis;
     }
 
@@ -1049,58 +1360,99 @@ class IBusEmojier : Gtk.ApplicationWindow {
             grid.show_all();
             string text = m_lookup_table.get_candidate(cursor).text;
             unowned IBus.EmojiData? data = m_emoji_to_data_dict.lookup(text);
-            if (data == null) {
-                // TODO: Provide a custom description and annotation for
-                // the favorite emojis.
-                EPaddedLabelBox widget = new EPaddedLabelBox(
-                        _("Description: %s").printf(_("None")),
-                        Gtk.Align.START);
-                m_vbox.add(widget);
-                widget.show_all();
-                show_code_point_description(text);
+            if (data != null) {
+                show_emoji_description(data, text);
                 return;
-            } else {
-                unowned string description = data.get_description();
-                EPaddedLabelBox widget = new EPaddedLabelBox(
-                        _("Description: %s").printf(description),
-                        Gtk.Align.START);
-                m_vbox.add(widget);
-                widget.show_all();
             }
-            unowned GLib.SList<unowned string>? annotations =
-                    data.get_annotations();
-            var buff = new GLib.StringBuilder();
-            int i = 0;
-            foreach (unowned string annotation in annotations) {
-                if (i++ == 0)
-                    buff.append_printf(_("Annotations: %s"), annotation);
-                else
-                    buff.append_printf(" | %s", annotation);
-                if (buff.str.char_count() > 30) {
-                    EPaddedLabelBox widget =
-                            new EPaddedLabelBox(buff.str,
-                                                Gtk.Align.START);
-                    m_vbox.add(widget);
-                    widget.show_all();
-                    buff.erase();
+            if (text.char_count() <= 1) {
+                unichar code = text.get_char();
+                unowned IBus.UnicodeData? udata =
+                        m_unicode_to_data_dict.lookup(code);
+                if (udata != null) {
+                    show_unicode_description(udata, text);
+                    return;
                 }
             }
-            if (buff.str != "") {
-                EPaddedLabelBox widget = new EPaddedLabelBox(buff.str,
-                                                             Gtk.Align.START);
+            // TODO: Provide a custom description and annotation for
+            // the favorite emojis.
+            EPaddedLabelBox widget = new EPaddedLabelBox(
+                        _("Description: %s").printf(_("None")),
+                        Gtk.Align.START);
+            m_vbox.add(widget);
+            widget.show_all();
+            show_code_point_description(text);
+        }
+    }
+
+
+    private void show_emoji_description(IBus.EmojiData data,
+                                        string         text) {
+        unowned string description = data.get_description();
+        {
+            EPaddedLabelBox widget = new EPaddedLabelBox(
+                    _("Description: %s").printf(description),
+                    Gtk.Align.START);
+            m_vbox.add(widget);
+            widget.show_all();
+        }
+        unowned GLib.SList<unowned string>? annotations =
+                data.get_annotations();
+        var buff = new GLib.StringBuilder();
+        int i = 0;
+        foreach (unowned string annotation in annotations) {
+            if (i++ == 0)
+                buff.append_printf(_("Annotations: %s"), annotation);
+            else
+                buff.append_printf(" | %s", annotation);
+            if (buff.str.char_count() > 30) {
+                EPaddedLabelBox widget =
+                        new EPaddedLabelBox(buff.str,
+                                            Gtk.Align.START);
                 m_vbox.add(widget);
                 widget.show_all();
+                buff.erase();
             }
-            show_code_point_description(text);
         }
+        if (buff.str != "") {
+            EPaddedLabelBox widget = new EPaddedLabelBox(buff.str,
+                                                         Gtk.Align.START);
+            m_vbox.add(widget);
+            widget.show_all();
+        }
+        show_code_point_description(text);
+    }
+
+    private void show_unicode_description(IBus.UnicodeData data,
+                                          string           text) {
+        unowned string name = data.get_name();
+        {
+            EPaddedLabelBox widget = new EPaddedLabelBox(
+                    _("Name: %s").printf(name),
+                    Gtk.Align.START);
+            m_vbox.add(widget);
+            widget.show_all();
+        }
+        unowned string alias = data.get_alias();
+        {
+            EPaddedLabelBox widget = new EPaddedLabelBox(
+                    _("Alias: %s").printf(alias),
+                    Gtk.Align.START);
+            m_vbox.add(widget);
+            widget.show_all();
+        }
+        show_code_point_description(text);
     }
 
 
     private void hide_candidate_panel() {
         m_enter_notify_enable = true;
         m_candidate_panel_is_visible = false;
-        if (m_loop.is_running())
-            show_category_list();
+        if (m_loop.is_running()) {
+            if (m_show_unicode)
+                show_unicode_blocks();
+            else
+                show_category_list();
+        }
     }
 
 
@@ -1165,19 +1517,41 @@ class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private void category_list_cursor_move(uint keyval) {
+    private bool category_list_cursor_move(uint keyval) {
         GLib.List<weak Gtk.Widget> list = m_list_box.get_children();
-        if (keyval == Gdk.Key.Down) {
-            m_category_active_index =
-                    ++m_category_active_index % ((int)list.length() + 1);
-        } else if (keyval == Gdk.Key.Up) {
+        int length = (int)list.length();
+        if (length == 0)
+            return false;
+        switch(keyval) {
+        case Gdk.Key.Down:
+            if (++m_category_active_index == length)
+                m_category_active_index = 0;
+            break;
+        case Gdk.Key.Up:
             if (--m_category_active_index < 0)
-                    m_category_active_index = (int)list.length();
+                    m_category_active_index = length - 1;
+            break;
+        case Gdk.Key.Home:
+            m_category_active_index = 0;
+            break;
+        case Gdk.Key.End:
+            m_category_active_index = length - 1;
+            break;
         }
-        Gtk.Adjustment adjustment = m_list_box.get_adjustment();
-        m_scrolled_window.set_hadjustment(new Gtk.Adjustment(0, 0, 0, 0, 0, 0));
-        m_scrolled_window.set_vadjustment(adjustment);
-        show_category_list();
+        var row = m_list_box.get_selected_row();
+        if (row != null)
+            m_list_box.unselect_row(row);
+        if (m_category_active_index >= 0) {
+            row = m_list_box.get_row_at_index(m_category_active_index);
+            m_list_box.select_row(row);
+        } else {
+            row = m_list_box.get_row_at_index(0);
+        }
+        Gtk.Allocation alloc = { 0, 0, 0, 0 };
+        row.get_allocation(out alloc);
+        var adjustment = m_scrolled_window.get_vadjustment();
+        adjustment.clamp_page(alloc.y, alloc.y + alloc.height);
+        return true;
     }
 
 
@@ -1211,7 +1585,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
                 keyval = Gdk.Key.Up;
             else if (keyval == Gdk.Key.Right)
                 keyval = Gdk.Key.Down;
-            category_list_cursor_move(keyval);
+            return category_list_cursor_move(keyval);
         }
         return true;
     }
@@ -1227,7 +1601,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
             else if (keyval == Gdk.Key.Up)
                 candidate_panel_cursor_up();
         } else {
-            category_list_cursor_move(keyval);
+            return category_list_cursor_move(keyval);
         }
         return true;
     }
@@ -1262,12 +1636,25 @@ class IBusEmojier : Gtk.ApplicationWindow {
                             ? true : false);
             return true;
         }
+        if (!m_candidate_panel_is_visible)
+            return category_list_cursor_move(keyval);
         return false;
     }
 
 
     private bool key_press_escape() {
-        if (m_backward_index >= 0 && m_backward != null) {
+        if (m_show_unicode) {
+            if (m_candidate_panel_is_visible) {
+                m_candidate_panel_is_visible = false;
+                show_unicode_blocks();
+                return true;
+            } else {
+                m_show_unicode = false;
+                m_category_active_index = -1;
+                hide_candidate_panel();
+                return true;
+            }
+        } else if (m_backward_index >= 0 && m_backward != null) {
             show_emoji_for_category(m_backward);
             return true;
         } else if (m_candidate_panel_is_visible) {
@@ -1287,10 +1674,13 @@ class IBusEmojier : Gtk.ApplicationWindow {
         if (m_candidate_panel_is_visible) {
             uint index = m_lookup_table.get_cursor_pos();
             candidate_panel_select_index(index);
-        } else if (m_category_active_index > 0) {
+        } else if (m_category_active_index >= 0) {
             Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
             EBoxRow row = gtkrow as EBoxRow;
-            show_emoji_for_category(row.text);
+            if (m_show_unicode)
+                show_unicode_for_block(row.text);
+            else
+                show_emoji_for_category(row.text);
         }
         return true;
     }
@@ -1380,6 +1770,7 @@ class IBusEmojier : Gtk.ApplicationWindow {
         m_candidate_panel_is_visible = false;
         m_result = null;
         m_enter_notify_enable = true;
+        m_show_unicode = false;
 
         /* Let gtk recalculate the window size. */
         resize(1, 1);
@@ -1399,8 +1790,9 @@ class IBusEmojier : Gtk.ApplicationWindow {
          * prevention logic:
          * https://mail.gnome.org/archives/gtk-devel-list/2017-May/msg00026.html
          */
-        uint32 timestamp = event.get_time();
-        present_with_time(timestamp);
+        //uint32 timestamp = event.get_time();
+        //present_with_time(timestamp);
+        present_centralize(event);
 
         Gdk.Device pointer;
 #if VALA_0_34
@@ -1646,18 +2038,24 @@ class IBusEmojier : Gtk.ApplicationWindow {
         Gtk.Allocation allocation;
         get_allocation(out allocation);
         Gdk.Rectangle monitor_area;
+        Gdk.Rectangle work_area;
 #if VALA_0_34
         Gdk.Display display = Gdk.Display.get_default();
         Gdk.Monitor monitor = display.get_monitor_at_window(this.get_window());
         monitor_area = monitor.get_geometry();
+        work_area = monitor.get_workarea();
 #else
         Gdk.Screen screen = Gdk.Screen.get_default();
         int monitor_num = screen.get_monitor_at_window(this.get_window());
         screen.get_monitor_geometry(monitor_num, out monitor_area);
+        work_area = screen.get_monitor_workarea(monitor_num);
 #endif
         int x = (monitor_area.x + monitor_area.width - allocation.width)/2;
         int y = (monitor_area.y + monitor_area.height
                  - allocation.height)/2;
+        // Do not hide a bottom panel in XFCE4
+        if (work_area.y < y)
+            y = work_area.y;
         move(x, y);
 
         uint32 timestamp = event.get_time();
@@ -1723,7 +2121,6 @@ class IBusEmojier : Gtk.ApplicationWindow {
             string? favorite = unowned_favorites[i];
             // Avoid gsetting value error by manual setting
             GLib.return_if_fail(favorite != null);
-            GLib.return_if_fail(favorite != "");
             m_favorites += favorite;
         }
         for(int i = 0; i < unowned_favorite_annotations.length; i++) {
@@ -1733,4 +2130,19 @@ class IBusEmojier : Gtk.ApplicationWindow {
         }
         update_favorite_emoji_dict();
     }
+
+
+    private static GLib.Object get_load_progress_object() {
+            if (m_unicode_progress_object == null)
+                m_unicode_progress_object = new LoadProgressObject();
+            return m_unicode_progress_object as GLib.Object;
+    }
+
+
+    public static void load_unicode_dict() {
+        if (m_unicode_block_list.length() == 0)
+            make_unicode_block_dict();
+        if (m_name_to_unicodes_dict.size() == 0)
+            make_unicode_name_dict(IBusEmojier.get_load_progress_object());
+    }
 }
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 6615f22bc..d816352e7 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -176,6 +176,8 @@ public class EmojiApplication : Application {
                 m_settings_emoji.get_strv("favorites"),
                 m_settings_emoji.get_strv("favorite-annotations"));
 
+        IBusEmojier.load_unicode_dict();
+
         activate_dialog(command_line);
 
         return Posix.EXIT_SUCCESS;
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index ed8886a8e..3b420b21c 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -196,5 +196,12 @@ void          ibus_emojier_set_partial_match_length
  */
 void          ibus_emojier_set_partial_match_condition
                                                   (gint         condition);
+/**
+ * ibus_emojier_load_unicode_dict:
+ *
+ * Load the dictionary of #IBusUnicodeData.
+ */
+void          ibus_emojier_load_unicode_dict      (void);
+
 G_END_DECLS
 #endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 4f032f6f0..bcb3ed755 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2017 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -871,6 +871,7 @@ class Panel : IBus.PanelService {
             IBusEmojier.set_annotation_lang(
                     m_settings_emoji.get_string("lang"));
             m_emojier_set_emoji_lang_id = 0;
+            IBusEmojier.load_unicode_dict();
             return false;
         });
     }

From 4cfd5ad7c6d071cfef6c7d678cc027ea480b8fc9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Feb 2018 11:02:09 +0900
Subject: [PATCH 449/816] Fix typo in ibusunicode.c

Review URL: https://codereview.appspot.com/340740043
---
 src/ibusunicode.c    | 5 +++--
 ui/gtk3/emojier.vala | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ibusunicode.c b/src/ibusunicode.c
index 8559819d4..aac9c135c 100644
--- a/src/ibusunicode.c
+++ b/src/ibusunicode.c
@@ -412,7 +412,8 @@ ibus_unicode_data_list_deserialize (GVariant *variant,
                 IBUS_UNICODE_DESERIALIZE_SIGNALL_STR,
                 G_OBJECT_TYPE (source_object));
         if (!has_signal) {
-            const gchar type_name = g_type_name (source_object);
+            const gchar *type_name =
+                    g_type_name (G_OBJECT_TYPE (source_object));
             g_warning ("GObject %s does not have the signal \"%s\"",
                        type_name ? type_name : "(null)",
                        IBUS_UNICODE_DESERIALIZE_SIGNALL_STR);
@@ -677,7 +678,7 @@ ibus_unicode_block_class_init (IBusUnicodeBlockClass *class)
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
-    object_class->destroy = (IBusObjectDestroyFunc) ibus_unicode_data_destroy;
+    object_class->destroy = (IBusObjectDestroyFunc) ibus_unicode_block_destroy;
     gobject_class->set_property =
             (GObjectSetPropertyFunc) ibus_unicode_block_set_property;
     gobject_class->get_property =
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 555ea68f1..0bf34da8d 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1373,8 +1373,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                     return;
                 }
             }
-            // TODO: Provide a custom description and annotation for
-            // the favorite emojis.
             EPaddedLabelBox widget = new EPaddedLabelBox(
                         _("Description: %s").printf(_("None")),
                         Gtk.Align.START);
@@ -1790,8 +1788,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
          * prevention logic:
          * https://mail.gnome.org/archives/gtk-devel-list/2017-May/msg00026.html
          */
-        //uint32 timestamp = event.get_time();
-        //present_with_time(timestamp);
         present_centralize(event);
 
         Gdk.Device pointer;

From ff611a4bf2f74fcb7c3df3f57ba3bff4e50a16ff Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Feb 2018 11:05:10 +0900
Subject: [PATCH 450/816] Add ISSUE_TEMPLATE

BUG=https://github.com/blog/2111-issue-and-pull-request-templates

Review URL: https://codereview.appspot.com/336540043
---
 .github/ISSUE_TEMPLATE.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..67a540fd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+Please fill in the following items if you don't know the root cause.
+
+Which distribusion and version?: 
+(E.g. Fedora 27. Check /etc/fedora-release)
+
+Which desktop environment and version?: 
+(E.g. GNOME 3.24. Check $XDG_CURRENT_DESKTOP and your ISO image.)
+
+Which session type?: 
+(X11 or Wayland. Check $XDG_SESSION_TYPE)
+
+Which application and version?: 
+(E.g. gedit 3.24, leafpad, kate, xterm)
+
+IBus verion?: 
+(Run `ibus version`)
+
+Issue description:
+
+
+Steps to reproduce:
+1. 
+1. 
+1. 
+1. 
+
+Can you reproduce your problem when you restart ibus-daemon? (yes / no): 
+(Run `ibus exit` and `ibus-daemon --xim &`)
+
+Do you see any errors when you run ibus-daemon with the verbose option?:
+(Run `ibus-daemon --xim --verbose &` and look at the output when you encounter your problem.)
+
+
+Can you reproduce your problem with a new user account instead of the current your account? (yes / no): 
+

From 9f2699c6023e37bd096484d36b2a83b1e680f1b3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 8 Feb 2018 11:59:59 +0900
Subject: [PATCH 451/816] Fix typo in ISSUE_TEMPLATE

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/340240043
---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 67a540fd7..acf811458 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 Please fill in the following items if you don't know the root cause.
 
-Which distribusion and version?: 
+Which distribution and version?: 
 (E.g. Fedora 27. Check /etc/fedora-release)
 
 Which desktop environment and version?: 
@@ -12,7 +12,7 @@ Which session type?:
 Which application and version?: 
 (E.g. gedit 3.24, leafpad, kate, xterm)
 
-IBus verion?: 
+IBus version?: 
 (Run `ibus version`)
 
 Issue description:

From fb07f64764f18f702221ff5574b2fd2193f051f0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 20 Feb 2018 17:25:07 +0900
Subject: [PATCH 452/816] Implement ibus-extension-gtk3 for the global
 keybinding

Currently IBus panel (ibus-ui-gtk3) is not available in GNOME and Plasma
so the emoji and unicode point typings are not available in GNOME and Plasma.
The workaround `ibus emoji` command is available but it put the selected
character into the copy buffer and users have to paste the character.

Originaly the emoji feature was implemented in IBus GtkIMModule but
it had several problems; the first is the keybinding is hard-coded
and IBus GtkIMModule does not use GSettings for the customized settings.
The second is the feature was available for GTK applications.
The third is that XKB input sources uses gtk-im-context-simple
but not ibus in GNOME desktop so users have to add an IM input sources
to enable IBus for the XKB input sources. The fourth is the feature
was available for IBusEngineSimple only and other IBus IMEs need to
inherit that class to get the emoji feature. The fifth is that
emoji typing is available for English only since IBusEngineSimple
had the feature. The sixth is that the default one dimension lookup
window was not useful to choose an emoji and needed two dimensions
lookup window.

And the implementation was moved from IBus GtkIMModule to IBus panel
to fix above problems.
But users have to use `ibus emoji` at present if ibus-ui-gtk3
is not available.

Now I think to move the emoji feature from ibus-ui-gtk3 to another
IBus component; ibus-extension-gtk3 which manages the Ctrl-Shift-e.
GNOME and Plasma desktops still do not show the GUI menu but
the shortcut key is available in this implementation.

BUG=RHBZ#1430501
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/339300043
---
 bindings/vala/IBus-1.0-custom.vala |    4 +
 bus/Makefile.am                    |    7 +-
 bus/ibusimpl.c                     |   82 ++-
 bus/main.c                         |   25 +-
 bus/marshalers.list                |    1 +
 bus/panelproxy.c                   |   57 +-
 bus/panelproxy.h                   |   20 +-
 src/Makefile.am                    |    4 +-
 src/ibus.h                         |    1 +
 src/ibusmarshalers.list            |    1 +
 src/ibuspanelservice.c             |   81 ++-
 src/ibuspanelservice.h             |   15 +-
 src/ibusserializable.c             |    7 +-
 src/ibusserializable.h             |   18 +-
 src/ibusshare.c                    |    4 +-
 src/ibusshare.h                    |   17 +-
 src/ibusxevent.c                   | 1004 ++++++++++++++++++++++++++++
 src/ibusxevent.h                   |  294 ++++++++
 src/tests/runtest                  |    1 +
 ui/gtk3/Makefile.am                |   59 +-
 ui/gtk3/bindingcommon.vala         |  215 ++++++
 ui/gtk3/candidatearea.vala         |  102 ---
 ui/gtk3/extension.vala             |  124 ++++
 ui/gtk3/gtkextension.xml.in        |   12 +
 ui/gtk3/iconwidget.vala            |  103 +++
 ui/gtk3/panel.vala                 |  408 ++---------
 ui/gtk3/panelbinding.vala          |  335 ++++++++++
 27 files changed, 2506 insertions(+), 495 deletions(-)
 create mode 100644 src/ibusxevent.c
 create mode 100644 src/ibusxevent.h
 create mode 100644 ui/gtk3/bindingcommon.vala
 create mode 100644 ui/gtk3/extension.vala
 create mode 100644 ui/gtk3/gtkextension.xml.in
 create mode 100644 ui/gtk3/panelbinding.vala

diff --git a/bindings/vala/IBus-1.0-custom.vala b/bindings/vala/IBus-1.0-custom.vala
index 144d75e22..cf1fc3fab 100644
--- a/bindings/vala/IBus-1.0-custom.vala
+++ b/bindings/vala/IBus-1.0-custom.vala
@@ -6,4 +6,8 @@ namespace IBus {
 		[CCode (cname = "ibus_text_new_from_static_string", has_construct_function = false)]
 		public Text.from_static_string (string str);
 	}
+	public class XEvent : IBus.Serializable {
+		[CCode (cname = "ibus_x_event_new", has_construct_function = true)]
+		public XEvent (string first_property_name, ...);
+	}
 }
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 864ba9237..8bcc8e169 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2013-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -105,6 +106,10 @@ marshalers.c: marshalers.h marshalers.list
 	$(GLIB_GENMARSHAL) --prefix=bus_marshal $(srcdir)/marshalers.list --body --internal) > $@.tmp && \
 	mv $@.tmp $@
 
+if ENABLE_EMOJI_DICT
+AM_CFLAGS += -DEMOJI_DICT
+endif
+
 
 if ENABLE_TESTS
 TESTS = \
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index f99307ad5..58d205cf8 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -73,6 +74,7 @@ struct _BusIBusImpl {
 
     BusInputContext *focused_context;
     BusPanelProxy   *panel;
+    BusPanelProxy   *extension;
 
     /* a default keymap of ibus-daemon (usually "us") which is used only
      * when use_sys_layout is FALSE. */
@@ -290,12 +292,37 @@ _panel_destroy_cb (BusPanelProxy *panel,
     g_assert (BUS_IS_PANEL_PROXY (panel));
     g_assert (BUS_IS_IBUS_IMPL (ibus));
 
-    g_return_if_fail (ibus->panel == panel);
-
-    ibus->panel = NULL;
+    if (ibus->panel == panel)
+        ibus->panel = NULL;
+    else if (ibus->extension == panel)
+        ibus->extension = NULL;
+    else
+        g_return_if_reached ();
     g_object_unref (panel);
 }
 
+static void
+_panel_panel_extension_cb (BusPanelProxy *panel,
+                           GVariant      *parameters,
+                           BusIBusImpl  *ibus)
+{
+    if (!ibus->extension) {
+        g_warning ("Panel extension is not running.");
+        return;
+    }
+
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+    g_return_if_fail (BUS_IS_PANEL_PROXY (ibus->extension));
+
+    /* Use the DBus method because it seems any DBus signal,
+     * g_dbus_message_new_signal(), cannot be reached to the server. */
+    g_dbus_proxy_call (G_DBUS_PROXY (ibus->extension),
+                       "PanelExtensionReceived",
+                       parameters,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
+
 static void
 _registry_changed_cb (IBusRegistry *registry,
                       BusIBusImpl  *ibus)
@@ -317,33 +344,47 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
                              const gchar   *new_name,
                              BusIBusImpl   *ibus)
 {
+    PanelType panel_type = PANEL_TYPE_NONE;
+
     g_assert (BUS_IS_DBUS_IMPL (dbus));
     g_assert (name != NULL);
     g_assert (old_name != NULL);
     g_assert (new_name != NULL);
     g_assert (BUS_IS_IBUS_IMPL (ibus));
 
-    if (g_strcmp0 (name, IBUS_SERVICE_PANEL) == 0) {
+    if (!g_strcmp0 (name, IBUS_SERVICE_PANEL))
+        panel_type = PANEL_TYPE_PANEL;
+    else if (!g_strcmp0 (name, IBUS_SERVICE_PANEL_EXTENSION))
+        panel_type = PANEL_TYPE_EXTENSION;
+
+    if (panel_type != PANEL_TYPE_NONE) {
         if (g_strcmp0 (new_name, "") != 0) {
             /* a Panel process is started. */
             BusConnection *connection;
             BusInputContext *context = NULL;
-
-            if (ibus->panel != NULL) {
-                ibus_proxy_destroy ((IBusProxy *) ibus->panel);
-                /* panel should be NULL after destroy. See _panel_destroy_cb for details. */
-                g_assert (ibus->panel == NULL);
+            BusPanelProxy   **panel = (panel_type == PANEL_TYPE_PANEL) ?
+                                       &ibus->panel : &ibus->extension;
+
+            if (*panel != NULL) {
+                ibus_proxy_destroy ((IBusProxy *)(*panel));
+                /* panel should be NULL after destroy. See _panel_destroy_cb
+                 * for details. */
+                g_assert (*panel == NULL);
             }
 
             connection = bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS, new_name);
             g_return_if_fail (connection != NULL);
 
-            ibus->panel = bus_panel_proxy_new (connection);
+            *panel = bus_panel_proxy_new (connection, panel_type);
 
-            g_signal_connect (ibus->panel,
+            g_signal_connect (*panel,
                               "destroy",
                               G_CALLBACK (_panel_destroy_cb),
                               ibus);
+            g_signal_connect (*panel,
+                              "panel-extension",
+                              G_CALLBACK (_panel_panel_extension_cb),
+                              ibus);
 
             if (ibus->focused_context != NULL) {
                 context = ibus->focused_context;
@@ -355,14 +396,13 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
             if (context != NULL) {
                 BusEngineProxy *engine;
 
-                bus_panel_proxy_focus_in (ibus->panel, context);
+                bus_panel_proxy_focus_in (*panel, context);
 
                 engine = bus_input_context_get_engine (context);
                 if (engine != NULL) {
                     IBusPropList *prop_list =
                         bus_engine_proxy_get_properties (engine);
-                    bus_panel_proxy_register_properties (ibus->panel,
-                                                         prop_list);
+                    bus_panel_proxy_register_properties (*panel, prop_list);
                 }
             }
         }
@@ -403,6 +443,7 @@ bus_ibus_impl_init (BusIBusImpl *ibus)
     ibus->contexts = NULL;
     ibus->focused_context = NULL;
     ibus->panel = NULL;
+    ibus->extension = NULL;
 
     ibus->keymap = ibus_keymap_get ("us");
 
@@ -635,6 +676,8 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
 
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_out (ibus->panel, ibus->focused_context);
+        if (ibus->extension != NULL)
+            bus_panel_proxy_focus_out (ibus->extension, ibus->focused_context);
 
         bus_input_context_get_content_type (ibus->focused_context,
                                             &purpose, &hints);
@@ -658,6 +701,8 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
 
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_in (ibus->panel, context);
+        if (ibus->extension != NULL)
+            bus_panel_proxy_focus_in (ibus->extension, context);
     }
 
     if (engine != NULL)
@@ -846,8 +891,13 @@ _context_destroy_cb (BusInputContext    *context,
         bus_ibus_impl_set_focused_context (ibus, NULL);
 
     if (ibus->panel &&
-        bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS)
+        bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS) {
         bus_panel_proxy_destroy_context (ibus->panel, context);
+    }
+    if (ibus->extension &&
+        bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS) {
+        bus_panel_proxy_destroy_context (ibus->extension, context);
+    }
 
     ibus->contexts = g_list_remove (ibus->contexts, context);
     g_object_unref (context);
diff --git a/bus/main.c b/bus/main.c
index 6ad60179b..5b2589b12 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2013-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -42,6 +43,7 @@ static gboolean xim = FALSE;
 static gboolean replace = FALSE;
 static gboolean restart = FALSE;
 static gchar *panel = "default";
+static gchar *panel_extension = "default";
 static gchar *config = "default";
 static gchar *desktop = "gnome";
 
@@ -60,6 +62,7 @@ static const GOptionEntry entries[] =
     { "xim",       'x', 0, G_OPTION_ARG_NONE,   &xim,       "execute ibus XIM server.", NULL },
     { "desktop",   'n', 0, G_OPTION_ARG_STRING, &desktop,   "specify the name of desktop session. [default=gnome]", "name" },
     { "panel",     'p', 0, G_OPTION_ARG_STRING, &panel,     "specify the cmdline of panel program. pass 'disable' not to start a panel program.", "cmdline" },
+    { "panel-extension", 'E', 0, G_OPTION_ARG_STRING, &panel_extension, "specify the cmdline of panel extension program. pass 'disable' not to start an extension program.", "cmdline" },
     { "config",    'c', 0, G_OPTION_ARG_STRING, &config,    "specify the cmdline of config program. pass 'disable' not to start a config program.", "cmdline" },
     { "address",   'a', 0, G_OPTION_ARG_STRING, &g_address,   "specify the address of ibus daemon.", "address" },
     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
@@ -268,7 +271,27 @@ main (gint argc, gchar **argv)
             if (!execute_cmdline (panel))
                 exit (-1);
         }
+
+#ifdef EMOJI_DICT
+        if (g_strcmp0 (panel_extension, "default") == 0) {
+            BusComponent *component;
+            component = bus_ibus_impl_lookup_component_by_name (
+                    BUS_DEFAULT_IBUS, IBUS_SERVICE_PANEL_EXTENSION);
+            if (component) {
+                bus_component_set_restart (component, restart);
+            }
+            if (component == NULL ||
+                !bus_component_start (component, g_verbose)) {
+                g_printerr ("Can not execute default panel program\n");
+                exit (-1);
+            }
+        } else if (g_strcmp0 (panel_extension, "disable") != 0 &&
+                   g_strcmp0 (panel_extension, "") != 0) {
+            if (!execute_cmdline (panel_extension))
+                exit (-1);
+        }
     }
+#endif
 
     /* execute ibus xim server */
     if (xim) {
diff --git a/bus/marshalers.list b/bus/marshalers.list
index c032cdaae..437c6feea 100644
--- a/bus/marshalers.list
+++ b/bus/marshalers.list
@@ -12,4 +12,5 @@ VOID:STRING
 VOID:STRING,INT
 VOID:UINT,UINT
 VOID:UINT,UINT,UINT
+VOID:VARIANT
 VOID:VOID
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 8381d7dc1..c3908fcf3 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2014 Red Hat, Inc.
+ * Copyright (C) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -51,6 +51,7 @@ enum {
     PROPERTY_SHOW,
     PROPERTY_HIDE,
     COMMIT_TEXT,
+    PANEL_EXTENSION,
     LAST_SIGNAL,
 };
 
@@ -59,6 +60,7 @@ struct _BusPanelProxy {
 
     /* instance members */
     BusInputContext *focused_context;
+    PanelType panel_type;
 };
 
 struct _BusPanelProxyClass {
@@ -110,22 +112,39 @@ static void     bus_panel_proxy_commit_text
 G_DEFINE_TYPE(BusPanelProxy, bus_panel_proxy, IBUS_TYPE_PROXY)
 
 BusPanelProxy *
-bus_panel_proxy_new (BusConnection *connection)
+bus_panel_proxy_new (BusConnection *connection,
+                     PanelType      panel_type)
 {
+    const gchar *path = NULL;
+    GObject *obj;
+    BusPanelProxy *panel;
+
     g_assert (BUS_IS_CONNECTION (connection));
 
-    GObject *obj;
+    switch (panel_type) {
+    case PANEL_TYPE_PANEL:
+        path = IBUS_PATH_PANEL;
+        break;
+    case PANEL_TYPE_EXTENSION:
+        path = IBUS_PATH_PANEL_EXTENSION;
+        break;
+    default:
+        g_return_val_if_reached (NULL);
+    }
+
     obj = g_initable_new (BUS_TYPE_PANEL_PROXY,
                           NULL,
                           NULL,
-                          "g-object-path",     IBUS_PATH_PANEL,
+                          "g-object-path",     path,
                           "g-interface-name",  IBUS_INTERFACE_PANEL,
                           "g-connection",      bus_connection_get_dbus_connection (connection),
                           "g-default-timeout", g_gdbus_timeout,
                           "g-flags",           G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                           NULL);
 
-    return BUS_PANEL_PROXY (obj);
+    panel = BUS_PANEL_PROXY (obj);
+    panel->panel_type = panel_type;
+    return panel;
 }
 
 static void
@@ -231,6 +250,16 @@ bus_panel_proxy_class_init (BusPanelProxyClass *class)
             bus_marshal_VOID__OBJECT,
             G_TYPE_NONE, 1,
             IBUS_TYPE_TEXT);
+
+    panel_signals[PANEL_EXTENSION] =
+        g_signal_new (I_("panel-extension"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__VARIANT,
+            G_TYPE_NONE, 1,
+            G_TYPE_VARIANT);
 }
 
 static void
@@ -337,6 +366,15 @@ bus_panel_proxy_g_signal (GDBusProxy  *proxy,
         return;
     }
 
+    if (g_strcmp0 ("PanelExtension", signal_name) == 0) {
+        if (panel->panel_type != PANEL_TYPE_PANEL) {
+            g_warning ("Wrong signal");
+            return;
+        }
+        g_signal_emit (panel, panel_signals[PANEL_EXTENSION], 0, parameters);
+        return;
+    }
+
     /* shound not be reached */
     g_return_if_reached ();
 }
@@ -832,3 +870,10 @@ bus_panel_proxy_destroy_context (BusPanelProxy    *panel,
 
     g_object_unref (context);
 }
+
+PanelType
+bus_panel_proxy_get_panel_type (BusPanelProxy    *panel)
+{
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    return panel->panel_type;
+}
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index 5002f86d0..b5a7af176 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2014 Red Hat, Inc.
+ * Copyright (C) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -50,12 +51,25 @@
 
 G_BEGIN_DECLS
 
+typedef enum
+{
+    PANEL_TYPE_NONE,
+    PANEL_TYPE_PANEL,
+    PANEL_TYPE_EXTENSION
+} PanelType;
+
 typedef struct _BusPanelProxy BusPanelProxy;
 typedef struct _BusPanelProxyClass BusPanelProxyClass;
 
 GType            bus_panel_proxy_get_type      (void);
-BusPanelProxy   *bus_panel_proxy_new           (BusConnection     *connection);
+BusPanelProxy   *bus_panel_proxy_new           (BusConnection     *connection,
+                                                PanelType          panel_type);
 
+gboolean         bus_panel_proxy_send_signal   (BusPanelProxy   *panel,
+                                                const gchar     *interface_name,
+                                                const gchar     *signal_name,
+                                                GVariant        *parameters,
+                                                GError         **error);
 /* functions that invoke D-Bus methods of the panel component. */
 void             bus_panel_proxy_focus_in      (BusPanelProxy     *panel,
                                                 BusInputContext   *context);
@@ -119,6 +133,8 @@ void             bus_panel_proxy_set_content_type
                                                (BusPanelProxy     *panel,
                                                 guint              purpose,
                                                 guint              hints);
+PanelType        bus_panel_proxy_get_panel_type
+                                               (BusPanelProxy     *panel);
 G_END_DECLS
 #endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ba418d86..72ec05abb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -103,6 +103,7 @@ ibus_sources =              \
     ibustext.c              \
     ibusunicode.c           \
     ibusutil.c              \
+    ibusxevent.c            \
     ibusxml.c               \
     $(NULL)
 libibus_1_0_la_SOURCES =    \
@@ -155,6 +156,7 @@ ibus_headers =              \
     ibustypes.h             \
     ibusunicode.h           \
     ibusutil.h              \
+    ibusxevent.h            \
     ibusxml.h               \
     $(NULL)
 ibusincludedir = $(includedir)/ibus-@IBUS_API_VERSION@
diff --git a/src/ibus.h b/src/ibus.h
index 8011729f9..b15dded90 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -59,6 +59,7 @@
 #include <ibusregistry.h>
 #include <ibusemoji.h>
 #include <ibusunicode.h>
+#include <ibusxevent.h>
 
 #ifndef IBUS_DISABLE_DEPRECATED
 #include <ibuskeysyms-compat.h>
diff --git a/src/ibusmarshalers.list b/src/ibusmarshalers.list
index 918bc7f7a..8d91937e0 100644
--- a/src/ibusmarshalers.list
+++ b/src/ibusmarshalers.list
@@ -24,4 +24,5 @@ VOID:STRING,STRING,STRING
 VOID:UINT
 VOID:UINT,POINTER
 VOID:POINTER,UINT
+VOID:VARIANT
 OBJECT:STRING
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 33949fa13..f37b91c3a 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -25,6 +25,10 @@
 #include "ibusmarshalers.h"
 #include "ibusinternal.h"
 
+#define IBUS_PANEL_SERVICE_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_PANEL_SERVICE, \
+                                 IBusPanelServicePrivate))
+
 enum {
     UPDATE_PREEDIT_TEXT,
     UPDATE_AUXILIARY_TEXT,
@@ -52,6 +56,7 @@ enum {
     STATE_CHANGED,
     DESTROY_CONTEXT,
     SET_CONTENT_TYPE,
+    PANEL_EXTENSION_RECEIVED,
     LAST_SIGNAL,
 };
 
@@ -146,6 +151,9 @@ static void      ibus_panel_service_set_content_type
                                    (IBusPanelService       *panel,
                                     guint                   purpose,
                                     guint                   hints);
+static void      ibus_panel_service_panel_extension_received
+                                   (IBusPanelService       *panel,
+                                    GVariant               *data);
 
 G_DEFINE_TYPE (IBusPanelService, ibus_panel_service, IBUS_TYPE_SERVICE)
 
@@ -212,6 +220,9 @@ static const gchar introspection_xml[] =
     "      <arg direction='in'  type='u' name='purpose' />"
     "      <arg direction='in'  type='u' name='hints' />"
     "    </method>"
+    "    <method name='PanelExtensionReceived'>"
+    "      <arg direction='in' type='v' name='data' />"
+    "    </method>"
     /* Signals */
     "    <signal name='CursorUp' />"
     "    <signal name='CursorDown' />"
@@ -235,6 +246,9 @@ static const gchar introspection_xml[] =
     "    <signal name='CommitText'>"
     "      <arg type='v' name='text' />"
     "    </signal>"
+    "    <signal name='PanelExtension'>"
+    "      <arg type='v' name='data' />"
+    "    </signal>"
     "  </interface>"
     "</node>";
 
@@ -274,6 +288,8 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
     class->update_preedit_text   = ibus_panel_service_update_preedit_text;
     class->update_property       = ibus_panel_service_update_property;
     class->set_content_type      = ibus_panel_service_set_content_type;
+    class->panel_extension_received =
+            ibus_panel_service_panel_extension_received;
 
     class->cursor_down_lookup_table = ibus_panel_service_not_implemented;
     class->cursor_up_lookup_table   = ibus_panel_service_not_implemented;
@@ -891,6 +907,30 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             2,
             G_TYPE_UINT,
             G_TYPE_UINT);
+
+    /**
+     * IBusPanelService::panel-extension-received:
+     * @panel: An #IBusPanelService
+     * @data: A #GVariant
+     *
+     * Emitted when the client application get the ::panel-extension-received.
+     * Implement the member function
+     * IBusPanelServiceClass::panel_extension_received in extended class to
+     * receive this signal.
+     *
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
+     */
+    panel_signals[PANEL_EXTENSION_RECEIVED] =
+        g_signal_new (I_("panel-extension-received"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, panel_extension_received),
+            NULL, NULL,
+            _ibus_marshal_VOID__VARIANT,
+            G_TYPE_NONE,
+            1,
+            G_TYPE_VARIANT);
 }
 
 static void
@@ -1088,6 +1128,24 @@ ibus_panel_service_service_method_call (IBusService           *service,
         return;
     }
 
+    if (g_strcmp0 (method_name, "PanelExtensionReceived") == 0) {
+        GVariant *variant = NULL;
+        g_variant_get (parameters, "(v)", &variant);
+        if (variant == NULL) {
+            g_dbus_method_invocation_return_error (
+                    invocation,
+                    G_DBUS_ERROR,
+                    G_DBUS_ERROR_FAILED,
+                    "PanelExtensionReceived method gives NULL");
+            return;
+        }
+        g_signal_emit (panel, panel_signals[PANEL_EXTENSION_RECEIVED], 0,
+                       variant);
+        g_variant_unref (variant);
+        g_dbus_method_invocation_return_value (invocation, NULL);
+        return;
+    }
+
     const static struct {
         const gchar *name;
         const gint signal_id;
@@ -1259,6 +1317,13 @@ ibus_panel_service_set_content_type (IBusPanelService *panel,
     ibus_panel_service_not_implemented(panel);
 }
 
+static void
+ibus_panel_service_panel_extension_received (IBusPanelService *panel,
+                                             GVariant         *data)
+{
+    ibus_panel_service_not_implemented(panel);
+}
+
 IBusPanelService *
 ibus_panel_service_new (GDBusConnection *connection)
 {
@@ -1347,6 +1412,21 @@ ibus_panel_service_commit_text (IBusPanelService *panel,
     }
 }
 
+void
+ibus_panel_service_panel_extension (IBusPanelService *panel,
+                                    GVariant         *variant)
+{
+    g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
+    g_return_if_fail (variant);
+
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "PanelExtension",
+                              g_variant_new ("(v)", variant),
+                              NULL);
+}
+
 #define DEFINE_FUNC(name, Name)                             \
     void                                                    \
     ibus_panel_service_##name (IBusPanelService *panel)     \
@@ -1364,4 +1444,3 @@ DEFINE_FUNC (cursor_up, CursorUp)
 DEFINE_FUNC (page_down, PageDown)
 DEFINE_FUNC (page_up, PageUp)
 #undef DEFINE_FUNC
-
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index a5b13c732..60ef842b4 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (c) 2009-2014 Google Inc. All rights reserved.
- * Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -128,6 +128,9 @@ struct _IBusPanelServiceClass {
                                             gint                    y,
                                             gint                    w,
                                             gint                    h);
+    void     (* panel_extension_received)
+                                           (IBusPanelService       *panel,
+                                            GVariant               *data);
 
     /*< private >*/
     /* padding */
@@ -242,5 +245,15 @@ void ibus_panel_service_property_hide     (IBusPanelService *panel,
 void ibus_panel_service_commit_text       (IBusPanelService *panel,
                                            IBusText         *text);
 
+/**
+ * ibus_panel_service_panel_extension:
+ * @panel: An #IBusPanelService
+ * @data: (transfer full): A #GVariant data which is sent to a panel extension. 
+ *
+ * Notify that a data is sent
+ * by sending a "PanelExtension" message to IBus panel extension service.
+ */
+void ibus_panel_service_panel_extension   (IBusPanelService *panel,
+                                           GVariant         *data);
 G_END_DECLS
 #endif
diff --git a/src/ibusserializable.c b/src/ibusserializable.c
index d7f867f41..a377b6139 100644
--- a/src/ibusserializable.c
+++ b/src/ibusserializable.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -251,7 +252,7 @@ ibus_serializable_copy (IBusSerializable *object)
 }
 
 GVariant *
-ibus_serializable_serialize (IBusSerializable *object)
+ibus_serializable_serialize_object (IBusSerializable *object)
 {
     g_return_val_if_fail (IBUS_IS_SERIALIZABLE (object), FALSE);
     gboolean retval;
@@ -267,7 +268,7 @@ ibus_serializable_serialize (IBusSerializable *object)
 }
 
 IBusSerializable *
-ibus_serializable_deserialize (GVariant *variant)
+ibus_serializable_deserialize_object (GVariant *variant)
 {
     g_return_val_if_fail (variant != NULL, NULL);
 
diff --git a/src/ibusserializable.h b/src/ibusserializable.h
index 4327eaeef..102de1bdb 100644
--- a/src/ibusserializable.h
+++ b/src/ibusserializable.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -248,10 +249,10 @@ void                 ibus_serializable_remove_qattachment
  *
  * See also: IBusSerializableCopyFunc().
  */
-IBusSerializable    *ibus_serializable_copy             (IBusSerializable   *serializable);
+IBusSerializable    *ibus_serializable_copy (IBusSerializable   *serializable);
 
 /**
- * ibus_serializable_serialize:
+ * ibus_serializable_serialize_object:
  * @serializable: An #IBusSerializable.
  *
  * Serialize an #IBusSerializable to a #GVariant.
@@ -261,10 +262,11 @@ IBusSerializable    *ibus_serializable_copy             (IBusSerializable   *ser
  *
  * See also: IBusSerializableCopyFunc().
  */
-GVariant            *ibus_serializable_serialize        (IBusSerializable   *serializable);
+GVariant            *ibus_serializable_serialize_object
+                                            (IBusSerializable   *serializable);
 
 /**
- * ibus_serializable_deserialize:
+ * ibus_serializable_deserialize_object:
  * @variant: A #GVariant.
  *
  * Deserialize a #GVariant to an #IBusSerializable/
@@ -274,7 +276,11 @@ GVariant            *ibus_serializable_serialize        (IBusSerializable   *ser
  *
  * See also: IBusSerializableCopyFunc().
  */
-IBusSerializable    *ibus_serializable_deserialize      (GVariant           *variant);
+IBusSerializable    *ibus_serializable_deserialize_object
+                                            (GVariant           *variant);
+
+#define ibus_serializable_serialize ibus_serializable_serialize_object
+#define ibus_serializable_deserialize ibus_serializable_deserialize_object
 
 G_END_DECLS
 #endif
diff --git a/src/ibusshare.c b/src/ibusshare.c
index b793a962f..d7724a6b2 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -287,6 +288,7 @@ ibus_init (void)
     IBUS_TYPE_ENGINE_DESC;
     IBUS_TYPE_OBSERVED_PATH;
     IBUS_TYPE_REGISTRY;
+    IBUS_TYPE_X_EVENT;
 }
 
 static GMainLoop *main_loop = NULL;
diff --git a/src/ibusshare.h b/src/ibusshare.h
index f3e2011ed..757d915b3 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -65,6 +66,13 @@
  */
 #define IBUS_SERVICE_PANEL      "org.freedesktop.IBus.Panel"
 
+/**
+ * IBUS_SERVICE_PANEL_EXTENSION:
+ *
+ * Address of IBus panel extension service.
+ */
+#define IBUS_SERVICE_PANEL_EXTENSION "org.freedesktop.IBus.Panel.Extension"
+
 /**
  * IBUS_SERVICE_CONFIG:
  *
@@ -100,6 +108,13 @@
  */
 #define IBUS_PATH_PANEL         "/org/freedesktop/IBus/Panel"
 
+/**
+ * IBUS_PATH_PANEL_EXTENSION:
+ *
+ * D-Bus path for IBus panel.
+ */
+#define IBUS_PATH_PANEL_EXTENSION "/org/freedesktop/IBus/Panel/Extension"
+
 /**
  * IBUS_PATH_CONFIG:
  *
diff --git a/src/ibusxevent.c b/src/ibusxevent.c
new file mode 100644
index 000000000..dea80272a
--- /dev/null
+++ b/src/ibusxevent.c
@@ -0,0 +1,1004 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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 "ibusinternal.h"
+#include "ibusxevent.h"
+
+#define IBUS_X_EVENT_VERSION 1
+#define IBUS_X_EVENT_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_X_EVENT, IBusXEventPrivate))
+
+enum {
+    PROP_0,
+    PROP_VERSION,
+    PROP_EVENT_TYPE,
+    PROP_WINDOW,
+    PROP_SEND_EVENT,
+    PROP_SERIAL,
+    PROP_TIME,
+    PROP_STATE,
+    PROP_KEYVAL,
+    PROP_LENGTH,
+    PROP_STRING,
+    PROP_HARDWARE_KEYCODE,
+    PROP_GROUP,
+    PROP_IS_MODIFIER,
+    PROP_ROOT,
+    PROP_SUBWINDOW,
+    PROP_X,
+    PROP_Y,
+    PROP_X_ROOT,
+    PROP_Y_ROOT,
+    PROP_SAME_SCREEN,
+    PROP_PURPOSE
+};
+
+
+struct _IBusXEventPrivate {
+    guint    version;
+    guint32  time;
+    guint    state;
+    guint    keyval;
+    gint     length;
+    gchar   *string;
+    guint16  hardware_keycode;
+    guint8   group;
+    gboolean is_modifier;
+    guint    root;
+    guint    subwindow;
+    gint     x;
+    gint     y;
+    gint     x_root;
+    gint     y_root;
+    gboolean same_screen;
+    gchar   *purpose;
+};
+
+/* functions prototype */
+static void      ibus_x_event_destroy        (IBusXEvent         *event);
+static void      ibus_x_event_set_property   (IBusXEvent         *event,
+                                              guint               prop_id,
+                                              const GValue       *value,
+                                              GParamSpec         *pspec);
+static void      ibus_x_event_get_property   (IBusXEvent         *event,
+                                              guint               prop_id,
+                                              GValue             *value,
+                                              GParamSpec         *pspec);
+static gboolean  ibus_x_event_serialize      (IBusXEvent         *event,
+                                              GVariantBuilder    *builder);
+static gint      ibus_x_event_deserialize    (IBusXEvent         *event,
+                                              GVariant           *variant);
+static gboolean  ibus_x_event_copy           (IBusXEvent         *dest,
+                                              const IBusXEvent   *src);
+
+G_DEFINE_TYPE (IBusXEvent, ibus_x_event, IBUS_TYPE_SERIALIZABLE)
+
+static void
+ibus_x_event_class_init (IBusXEventClass *class)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
+
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_x_event_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_x_event_get_property;
+
+    object_class->destroy = (IBusObjectDestroyFunc) ibus_x_event_destroy;
+
+    serializable_class->serialize   =
+            (IBusSerializableSerializeFunc) ibus_x_event_serialize;
+    serializable_class->deserialize =
+            (IBusSerializableDeserializeFunc) ibus_x_event_deserialize;
+    serializable_class->copy        =
+            (IBusSerializableCopyFunc) ibus_x_event_copy;
+
+    /* install properties */
+    /**
+     * IBusXEvent:version:
+     *
+     * Version of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_VERSION,
+                    g_param_spec_uint ("version",
+                        "version",
+                        "version",
+                        0,
+                        G_MAXUINT32,
+                        IBUS_X_EVENT_VERSION,
+                        G_PARAM_READABLE));
+
+    /**
+     * IBusXEvent:event-type:
+     *
+     * IBusXEventType of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_EVENT_TYPE,
+                    g_param_spec_int ("event-type",
+                        "event type",
+                        "event type",
+                        -1,
+                        G_MAXINT32,
+                        -1,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:window:
+     *
+     * window of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_WINDOW,
+                    g_param_spec_uint ("window",
+                        "window",
+                        "window",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:send-event:
+     *
+     * send_event of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_SEND_EVENT,
+                    g_param_spec_int ("send-event",
+                        "send event",
+                        "send event",
+                        0,
+                        G_MAXINT8,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:serial:
+     *
+     * serial of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_SERIAL,
+                    g_param_spec_ulong ("serial",
+                        "serial",
+                        "serial",
+                        0,
+                        G_MAXUINT64,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:time:
+     *
+     * time of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_TIME,
+                    g_param_spec_uint ("time",
+                        "time",
+                        "time",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:state:
+     *
+     * state of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_STATE,
+                    g_param_spec_uint ("state",
+                        "state",
+                        "state",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:keyval:
+     *
+     * keyval of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_KEYVAL,
+                    g_param_spec_uint ("keyval",
+                        "keyval",
+                        "keyval",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:length:
+     *
+     * keyval of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_LENGTH,
+                    g_param_spec_int ("length",
+                        "length",
+                        "length",
+                        -1,
+                        G_MAXINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:string:
+     *
+     * string of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_STRING,
+                    g_param_spec_string ("string",
+                        "string",
+                        "string",
+                        "",
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:hardware-keycode:
+     *
+     * hardware keycode of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_HARDWARE_KEYCODE,
+                    g_param_spec_uint ("hardware-keycode",
+                        "hardware keycode",
+                        "hardware keycode",
+                        0,
+                        G_MAXUINT16,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:group:
+     *
+     * group of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_GROUP,
+                    g_param_spec_uint ("group",
+                        "group",
+                        "group",
+                        0,
+                        G_MAXUINT8,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:is-modifier:
+     *
+     * is_modifier of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_IS_MODIFIER,
+                    g_param_spec_boolean ("is-modifier",
+                        "is modifier",
+                        "is modifier",
+                        FALSE,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:root:
+     *
+     * root window of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_ROOT,
+                    g_param_spec_uint ("root",
+                        "root",
+                        "root",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:subwindow:
+     *
+     * subwindow of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_SUBWINDOW,
+                    g_param_spec_uint ("subwindow",
+                        "subwindow",
+                        "subwindow",
+                        0,
+                        G_MAXUINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:x:
+     *
+     * x of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_X,
+                    g_param_spec_int ("x",
+                        "x",
+                        "x",
+                        G_MININT32,
+                        G_MAXINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:y:
+     *
+     * x of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_Y,
+                    g_param_spec_int ("y",
+                        "y",
+                        "y",
+                        G_MININT32,
+                        G_MAXINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:x-root:
+     *
+     * root-x of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_X_ROOT,
+                    g_param_spec_int ("x-root",
+                        "x root",
+                        "x root",
+                        G_MININT32,
+                        G_MAXINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:y-root:
+     *
+     * root-y of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_Y_ROOT,
+                    g_param_spec_int ("y-root",
+                        "y root",
+                        "y root",
+                        G_MININT32,
+                        G_MAXINT32,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:same-screen:
+     *
+     * same_screen of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_SAME_SCREEN,
+                    g_param_spec_boolean ("same-screen",
+                        "same screen",
+                        "same screen",
+                        TRUE,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusXEvent:purpose:
+     *
+     * purpose of this IBusXEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_PURPOSE,
+                    g_param_spec_string ("purpose",
+                        "purpose",
+                        "purpose",
+                        "",
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    g_type_class_add_private (class, sizeof (IBusXEventPrivate));
+}
+
+static void
+ibus_x_event_init (IBusXEvent *event)
+{
+    event->priv = IBUS_X_EVENT_GET_PRIVATE (event);
+    event->priv->version = IBUS_X_EVENT_VERSION;
+}
+
+static void
+ibus_x_event_destroy (IBusXEvent *event)
+{
+    g_clear_pointer (&event->priv->string, g_free);
+
+    IBUS_OBJECT_CLASS(ibus_x_event_parent_class)->destroy (IBUS_OBJECT (event));
+}
+
+static void
+ibus_x_event_set_property (IBusXEvent   *event,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+    IBusXEventPrivate *priv = event->priv;
+
+    switch (prop_id) {
+    case PROP_EVENT_TYPE:
+        event->event_type = g_value_get_int (value);
+        break;
+    case PROP_WINDOW:
+        event->window = g_value_get_uint (value);
+        break;
+    case PROP_SEND_EVENT:
+        event->send_event = g_value_get_int (value);
+        break;
+    case PROP_SERIAL:
+        event->serial = g_value_get_ulong (value);
+        break;
+    case PROP_TIME:
+        priv->time = g_value_get_uint (value);
+        break;
+    case PROP_STATE:
+        priv->state = g_value_get_uint (value);
+        break;
+    case PROP_KEYVAL:
+        priv->keyval = g_value_get_uint (value);
+        break;
+    case PROP_LENGTH:
+        priv->length = g_value_get_int (value);
+        break;
+    case PROP_STRING:
+        g_free (priv->string);
+        priv->string = g_value_dup_string (value);
+        break;
+    case PROP_HARDWARE_KEYCODE:
+        priv->hardware_keycode = g_value_get_uint (value);
+        break;
+    case PROP_GROUP:
+        priv->group = g_value_get_uint (value);
+        break;
+    case PROP_IS_MODIFIER:
+        priv->is_modifier = g_value_get_boolean (value);
+        break;
+    case PROP_ROOT:
+        priv->root = g_value_get_uint (value);
+        break;
+    case PROP_SUBWINDOW:
+        priv->subwindow = g_value_get_uint (value);
+        break;
+    case PROP_X:
+        priv->x = g_value_get_int (value);
+        break;
+    case PROP_Y:
+        priv->y = g_value_get_int (value);
+        break;
+    case PROP_X_ROOT:
+        priv->x_root = g_value_get_int (value);
+        break;
+    case PROP_Y_ROOT:
+        priv->y_root = g_value_get_int (value);
+        break;
+    case PROP_SAME_SCREEN:
+        priv->same_screen = g_value_get_boolean (value);
+        break;
+    case PROP_PURPOSE:
+        g_free (priv->purpose);
+        priv->purpose = g_value_dup_string (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (event, prop_id, pspec);
+    }
+}
+
+static void
+ibus_x_event_get_property (IBusXEvent *event,
+                          guint        prop_id,
+                          GValue      *value,
+                          GParamSpec  *pspec)
+{
+    IBusXEventPrivate *priv = event->priv;
+    switch (prop_id) {
+    case PROP_VERSION:
+        g_value_set_uint (value, priv->version);
+        break;
+    case PROP_EVENT_TYPE:
+        g_value_set_int (value, event->event_type);
+        break;
+    case PROP_WINDOW:
+        g_value_set_uint (value, event->window);
+        break;
+    case PROP_SEND_EVENT:
+        g_value_set_int (value, event->send_event);
+        break;
+    case PROP_SERIAL:
+        g_value_set_ulong (value, event->serial);
+        break;
+    case PROP_TIME:
+        g_value_set_uint (value, priv->time);
+        break;
+    case PROP_STATE:
+        g_value_set_uint (value, priv->state);
+        break;
+    case PROP_KEYVAL:
+        g_value_set_uint (value, priv->keyval);
+        break;
+    case PROP_LENGTH:
+        g_value_set_int (value, priv->length);
+        break;
+    case PROP_STRING:
+        g_value_set_string (value, priv->string);
+        break;
+    case PROP_HARDWARE_KEYCODE:
+        g_value_set_uint (value, priv->hardware_keycode);
+        break;
+    case PROP_GROUP:
+        g_value_set_uint (value, priv->group);
+        break;
+    case PROP_IS_MODIFIER:
+        g_value_set_boolean (value, priv->is_modifier);
+        break;
+    case PROP_ROOT:
+        g_value_set_uint (value, priv->root);
+        break;
+    case PROP_SUBWINDOW:
+        g_value_set_uint (value, priv->subwindow);
+        break;
+    case PROP_X:
+        g_value_set_int (value, priv->x);
+        break;
+    case PROP_Y:
+        g_value_set_int (value, priv->y);
+        break;
+    case PROP_X_ROOT:
+        g_value_set_int (value, priv->x_root);
+        break;
+    case PROP_Y_ROOT:
+        g_value_set_int (value, priv->y_root);
+        break;
+    case PROP_SAME_SCREEN:
+        g_value_set_boolean (value, priv->same_screen);
+        break;
+    case PROP_PURPOSE:
+        g_value_set_string (value, priv->purpose);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (event, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_x_event_serialize (IBusXEvent      *event,
+                        GVariantBuilder *builder)
+{
+    gboolean retval;
+    IBusXEventPrivate *priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_x_event_parent_class)->
+            serialize ((IBusSerializable *)event, builder);
+    g_return_val_if_fail (retval, FALSE);
+    /* End dict iter */
+
+    priv = event->priv;
+#define NOTNULL(s) ((s) != NULL ? (s) : "")
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_builder_add (builder, "u", priv->version);
+    g_variant_builder_add (builder, "u", event->event_type);
+    g_variant_builder_add (builder, "u", event->window);
+    g_variant_builder_add (builder, "i", event->send_event);
+    g_variant_builder_add (builder, "t", event->serial);
+    g_variant_builder_add (builder, "u", priv->time);
+    g_variant_builder_add (builder, "u", priv->state);
+    g_variant_builder_add (builder, "u", priv->keyval);
+    g_variant_builder_add (builder, "i", priv->length);
+    g_variant_builder_add (builder, "s", NOTNULL (priv->string));
+    g_variant_builder_add (builder, "u", priv->hardware_keycode);
+    g_variant_builder_add (builder, "u", priv->group);
+    g_variant_builder_add (builder, "b", priv->is_modifier);
+    g_variant_builder_add (builder, "u", priv->root);
+    g_variant_builder_add (builder, "u", priv->subwindow);
+    g_variant_builder_add (builder, "i", priv->x);
+    g_variant_builder_add (builder, "i", priv->y);
+    g_variant_builder_add (builder, "i", priv->x_root);
+    g_variant_builder_add (builder, "i", priv->y_root);
+    g_variant_builder_add (builder, "b", priv->same_screen);
+    g_variant_builder_add (builder, "s", NOTNULL (priv->purpose));
+#undef NOTNULL
+
+    return TRUE;
+}
+
+static gint
+ibus_x_event_deserialize (IBusXEvent *event,
+                          GVariant   *variant)
+{
+    gint retval;
+    IBusXEventPrivate *priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_x_event_parent_class)->
+            deserialize ((IBusSerializable *)event, variant);
+    g_return_val_if_fail (retval, 0);
+
+    priv = event->priv;
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_get_child (variant, retval++, "u", &priv->version);
+    g_variant_get_child (variant, retval++, "u", &event->event_type);
+    g_variant_get_child (variant, retval++, "u", &event->window);
+    g_variant_get_child (variant, retval++, "i", &event->send_event);
+    g_variant_get_child (variant, retval++, "t", &event->serial);
+    g_variant_get_child (variant, retval++, "u", &priv->time);
+    g_variant_get_child (variant, retval++, "u", &priv->state);
+    g_variant_get_child (variant, retval++, "u", &priv->keyval);
+    g_variant_get_child (variant, retval++, "i", &priv->length);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &priv->string);
+    g_variant_get_child (variant, retval++, "u", &priv->hardware_keycode);
+    g_variant_get_child (variant, retval++, "u", &priv->group);
+    g_variant_get_child (variant, retval++, "b", &priv->is_modifier);
+    g_variant_get_child (variant, retval++, "u", &priv->root);
+    g_variant_get_child (variant, retval++, "u", &priv->subwindow);
+    g_variant_get_child (variant, retval++, "i", &priv->x);
+    g_variant_get_child (variant, retval++, "i", &priv->y);
+    g_variant_get_child (variant, retval++, "i", &priv->x_root);
+    g_variant_get_child (variant, retval++, "i", &priv->y_root);
+    g_variant_get_child (variant, retval++, "b", &priv->same_screen);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &priv->purpose);
+
+    return retval;
+}
+
+static gboolean
+ibus_x_event_copy (IBusXEvent       *dest,
+                   const IBusXEvent *src)
+{
+    gboolean retval;
+    IBusXEventPrivate *dest_priv = dest->priv;
+    IBusXEventPrivate *src_priv = src->priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_x_event_parent_class)->
+            copy ((IBusSerializable *)dest, (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest_priv->version           = src_priv->version;
+    dest->event_type             = src->event_type;
+    dest->window                 = src->window;
+    dest->send_event             = src->send_event;
+    dest->serial                 = src->serial;
+    dest_priv->time              = src_priv->time;
+    dest_priv->state             = src_priv->state;
+    dest_priv->keyval            = src_priv->keyval;
+    dest_priv->length            = src_priv->length;
+    dest_priv->string            = g_strdup (src_priv->string);
+    dest_priv->hardware_keycode  = src_priv->hardware_keycode;
+    dest_priv->group             = src_priv->group;
+    dest_priv->is_modifier       = src_priv->is_modifier;
+    dest_priv->root              = src_priv->root;
+    dest_priv->subwindow         = src_priv->subwindow;
+    dest_priv->x                 = src_priv->x;
+    dest_priv->y                 = src_priv->y;
+    dest_priv->x_root            = src_priv->x_root;
+    dest_priv->y_root            = src_priv->y_root;
+    dest_priv->same_screen       = src_priv->same_screen;
+    dest_priv->purpose           = g_strdup (src_priv->purpose);
+
+    return TRUE;
+}
+
+IBusXEvent *
+ibus_x_event_new (const gchar   *first_property_name,
+                  ...)
+{
+    va_list var_args;
+    IBusXEvent *event;
+
+    va_start (var_args, first_property_name);
+    event = (IBusXEvent *) g_object_new_valist (IBUS_TYPE_X_EVENT,
+                                                first_property_name,
+                                                var_args);
+    va_end (var_args);
+    g_assert (event->priv->version != 0);
+    g_assert (event->event_type != IBUS_X_EVENT_NOTHING);
+    return event;
+}
+
+guint
+ibus_x_event_get_version (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    return event->priv->version;
+}
+
+IBusXEventType
+ibus_x_event_get_event_type (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    return event->event_type;
+}
+
+guint32
+ibus_x_event_get_window (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    return event->window;
+}
+
+gint8
+ibus_x_event_get_send_event (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), -1);
+    return event->send_event;
+}
+
+gulong
+ibus_x_event_get_serial (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    return event->serial;
+}
+
+guint32
+ibus_x_event_get_time (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->time;
+}
+
+guint
+ibus_x_event_get_state (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->state;
+}
+
+guint
+ibus_x_event_get_keyval (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->keyval;
+}
+
+gint
+ibus_x_event_get_length (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), -1);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (-1);
+    }
+    return event->priv->length;
+}
+
+const gchar *
+ibus_x_event_get_string (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), "");
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached ("");
+    }
+    return event->priv->string;
+}
+
+guint16
+ibus_x_event_get_hardware_keycode (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->hardware_keycode;
+}
+
+guint8
+ibus_x_event_get_group (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->group;
+}
+
+gboolean
+ibus_x_event_get_is_modifier (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->is_modifier;
+}
+
+guint32
+ibus_x_event_get_root (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->root;
+}
+
+guint32
+ibus_x_event_get_subwindow (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->subwindow;
+}
+
+gint
+ibus_x_event_get_x (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->x;
+}
+
+gint
+ibus_x_event_get_y (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->y;
+}
+
+gint
+ibus_x_event_get_x_root (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->x_root;
+}
+
+gint
+ibus_x_event_get_y_root (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), 0);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (0);
+    }
+    return event->priv->y_root;
+}
+
+gboolean
+ibus_x_event_get_same_screen (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), TRUE);
+    switch (event->event_type) {
+    case IBUS_X_EVENT_KEY_PRESS:
+    case IBUS_X_EVENT_KEY_RELEASE:
+        break;
+    default:
+        g_return_val_if_reached (TRUE);
+    }
+    return event->priv->same_screen;
+}
+
+const gchar *
+ibus_x_event_get_purpose (IBusXEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_X_EVENT (event), "");
+    return event->priv->purpose;
+}
diff --git a/src/ibusxevent.h b/src/ibusxevent.h
new file mode 100644
index 000000000..f35f14e45
--- /dev/null
+++ b/src/ibusxevent.h
@@ -0,0 +1,294 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018 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
+ * 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
+ */
+
+#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
+#error "Only <ibus.h> can be included directly"
+#endif
+
+#ifndef __IBUS_X_EVENT_H_
+#define __IBUS_X_EVENT_H_
+
+/**
+ * SECTION: ibusxevent
+ * @short_description: XEvent wrapper object
+ * @title: IBusXEvent
+ * @stability: Unstable
+ *
+ * An IBusXEvent provides a wrapper of XEvent.
+ *
+ * see_also: #IBusComponent, #IBusEngineDesc
+ */
+
+#include "ibusserializable.h"
+
+/*
+ * Type macros.
+ */
+
+/* define GOBJECT macros */
+#define IBUS_TYPE_X_EVENT            \
+    (ibus_x_event_get_type ())
+#define IBUS_X_EVENT(obj)            \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_X_EVENT, IBusXEvent))
+#define IBUS_X_EVENT_CLASS(klass)    \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_X_EVENT, IBusXEventClass))
+#define IBUS_IS_X_EVENT(obj)         \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_X_EVENT))
+#define IBUS_IS_X_EVENT_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_X_EVENT))
+#define IBUS_X_EVENT_GET_CLASS(obj)  \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_X_EVENT, IBusXEventClass))
+
+G_BEGIN_DECLS
+
+typedef struct _IBusXEvent IBusXEvent;
+typedef struct _IBusXEventClass IBusXEventClass;
+typedef struct _IBusXEventPrivate IBusXEventPrivate;
+
+typedef enum {
+    IBUS_X_EVENT_NOTHING           = -1,
+    IBUS_X_EVENT_KEY_PRESS         = 0,
+    IBUS_X_EVENT_KEY_RELEASE       = 1,
+    IBUS_X_EVENT_OTHER             = 2,
+    IBUS_X_EVENT_EVENT_LAST        /* helper variable for decls */
+} IBusXEventType;
+
+/**
+ * IBusXEvent:
+ * @type: event type
+ *
+ * IBusEngine properties.
+ */
+struct _IBusXEvent {
+    /*< private >*/
+    IBusSerializable parent;
+    IBusXEventPrivate *priv;
+
+    /* instance members */
+    /*< public >*/
+    IBusXEventType event_type;
+    guint          window;
+    gint8          send_event;
+    gulong         serial;
+};
+
+struct _IBusXEventClass {
+    /*< private >*/
+    IBusSerializableClass parent;
+
+    /* class members */
+    /*< public >*/
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[10];
+};
+
+GType        ibus_x_event_get_type       (void);
+
+/**
+ * ibus_x_event_new:
+ * @first_property_name: Name of the first property.
+ * @...: the NULL-terminated arguments of the properties and values.
+ *
+ * Create a new #IBusXEvent.
+ *
+ * Returns: A newly allocated #IBusXEvent. E.g.
+ * ibus_x_event_new ("event-type", IBUS_X_EVENT_KEY_PRESS, NULL);
+ */
+IBusXEvent *   ibus_x_event_new            (const gchar
+                                                           *first_property_name,
+                                            ...);
+
+/**
+ * ibus_x_event_get_version:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: Version of #IBusXEvent
+ */
+guint          ibus_x_event_get_version    (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_event_type:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: IBusXEventType of #IBusXEvent
+ */
+IBusXEventType ibus_x_event_get_event_type (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_window:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: XID of #IBusXEvent
+ */
+guint32        ibus_x_event_get_window     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_send_event:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: send_event of #IBusXEvent
+ */
+gint8          ibus_x_event_get_send_event (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_serial:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: serial of #IBusXEvent
+ */
+gulong         ibus_x_event_get_serial     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_time:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: time of #IBusXEvent
+ */
+guint32        ibus_x_event_get_time       (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_state:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: state of #IBusXEvent
+ */
+guint          ibus_x_event_get_state      (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_keyval:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: keyval of #IBusXEvent
+ */
+guint          ibus_x_event_get_keyval     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_length:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: length of #IBusXEvent
+ */
+gint           ibus_x_event_get_length     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_string:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: string of #IBusXEvent
+ */
+const gchar *  ibus_x_event_get_string     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_hardware_keycode:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: hardware keycode of #IBusXEvent
+ */
+guint16        ibus_x_event_get_hardware_keycode
+                                           (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_group:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: group of #IBusXEvent
+ */
+guint8         ibus_x_event_get_group      (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_is_modifier:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: is_modifier of #IBusXEvent
+ */
+gboolean       ibus_x_event_get_is_modifier
+                                           (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_subwindow:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: subwindow of #IBusXEvent
+ */
+guint32        ibus_x_event_get_subwindow  (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_root:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: root window of #IBusXEvent
+ */
+guint32        ibus_x_event_get_root       (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_x:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: x of #IBusXEvent
+ */
+gint           ibus_x_event_get_x          (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_y:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: y of #IBusXEvent
+ */
+gint           ibus_x_event_get_y          (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_x_root:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: x-root of #IBusXEvent
+ */
+gint           ibus_x_event_get_x_root     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_y_root:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: y-root of #IBusXEvent
+ */
+gint           ibus_x_event_get_y_root     (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_same_screen:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: same_screen of #IBusXEvent
+ */
+gboolean       ibus_x_event_get_same_screen
+                                           (IBusXEvent         *event);
+
+/**
+ * ibus_x_event_get_purpose:
+ * @event: An #IBusXEvent.
+ *
+ * Returns: purpose of #IBusXEvent
+ */
+const gchar *  ibus_x_event_get_purpose    (IBusXEvent         *event);
+
+G_END_DECLS
+#endif
diff --git a/src/tests/runtest b/src/tests/runtest
index 91c4e95f1..0e43fee59 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -106,6 +106,7 @@ test -d $tstdir || mkdir $tstdir
     --daemonize \
     --cache=none \
     --panel=disable \
+    --panel-extension=disable \
     --config=default \
     --verbose;
 
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 786b80e60..0a8f42001 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2017 Takao Fujwiara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2017 Red Hat, Inc.
+# Copyright (c) 2015-2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -30,7 +30,7 @@ component_DATA = \
 	$(NULL)
 componentdir = $(pkgdatadir)/component
 
-gtkpanel.xml: gtkpanel.xml.in
+%.xml: %.xml.in
 	$(AM_V_GEN) sed \
 		-e 's|@VERSION[@]|$(VERSION)|g' \
 		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
@@ -108,6 +108,7 @@ libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
 	application.vala \
+	bindingcommon.vala \
 	candidatearea.vala \
 	candidatepanel.vala \
 	emojier.vala \
@@ -155,9 +156,12 @@ EXTRA_DIST =                            \
     $(emoji_headers)                    \
     $(man_seven_in_files)               \
     emojierapp.vala                     \
+    extension.vala                      \
+    gtkextension.xml.in                 \
     gtkpanel.xml.in                     \
     notification-item.xml               \
     notification-watcher.xml            \
+    panelbinding.vala                   \
     $(NULL)
 
 if ENABLE_EMOJI_DICT
@@ -167,10 +171,8 @@ libexec_PROGRAMS += ibus-ui-emojier
 
 ibus_ui_emojier_VALASOURCES =                   \
     emojierapp.vala                             \
-    candidatearea.vala                          \
     emojier.vala                                \
     iconwidget.vala                             \
-    pango.vala                                  \
     separator.vala                              \
     $(NULL)
 ibus_ui_emojier_SOURCES =                       \
@@ -198,6 +200,53 @@ emojierapp.o: $(srcdir)/emojierapp.c
 	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
 	$(NULL)
 
+component_DATA += gtkextension.xml
+CLEANFILES += gtkextension.xml
+libexec_PROGRAMS += ibus-extension-gtk3
+
+ibus_extension_gtk3_VALASOURCES =               \
+    bindingcommon.vala                          \
+    emojier.vala                                \
+    extension.vala                              \
+    iconwidget.vala                             \
+    keybindingmanager.vala                      \
+    panelbinding.vala                           \
+    $(NULL)
+ibus_extension_gtk3_SOURCES =                   \
+    $(ibus_extension_gtk3_VALASOURCES:.vala=.c) \
+    $(NULL)
+
+ibus_extension_gtk3_LDADD =                     \
+    $(AM_LDADD)                                 \
+    $(NULL)
+ibus_extension_gtk3_VALAFLAGS =                 \
+    $(AM_VALAFLAGS)                             \
+    $(NULL)
+
+# This line and foo_VALASOURCES line can delete the duplicated entries
+# of emojier.c: emojier.vala
+extension.c: $(ibus_extension_gtk3_VALASOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
+$(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
+	$(NULL)
+# make dist creates .c files in a different srcdir
+extension.o: $(srcdir)/extension.c
+	$(AM_V_CC)source='$<' object='$@' libtool=no \
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
+	$(NULL)
+# of emojier.c: emojier.vala
+panelbinding.c: $(ibus_extension_gtk3_VALASOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) \
+$(VALAFLAGS) -C $(ibus_extension_gtk3_VALASOURCES)
+	$(NULL)
+# make dist creates .c files in a different srcdir
+panelbinding.o: $(srcdir)/panelbinding.c
+	$(AM_V_CC)source='$<' object='$@' libtool=no \
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
+	$(NULL)
+
 man_seven_files = $(man_seven_in_files:.7.in=.7)
 man_seven_DATA =$(man_seven_files:.7=.7.gz)
 man_sevendir = $(mandir)/man7
diff --git a/ui/gtk3/bindingcommon.vala b/ui/gtk3/bindingcommon.vala
new file mode 100644
index 000000000..4171f29df
--- /dev/null
+++ b/ui/gtk3/bindingcommon.vala
@@ -0,0 +1,215 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ *
+ * 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
+ */
+
+/* This file depends on keybindingmanager.vala */
+
+class BindingCommon {
+    public enum KeyEventFuncType {
+        ANY,
+        IME_SWITCHER,
+        EMOJI_TYPING,
+    }
+
+    public class Keybinding : GLib.Object {
+        public Keybinding(uint             keysym,
+                          Gdk.ModifierType modifiers,
+                          bool             reverse,
+                          KeyEventFuncType ftype) {
+            this.keysym = keysym;
+            this.modifiers = modifiers;
+            this.reverse = reverse;
+            this.ftype = ftype;
+        }
+
+        public uint keysym { get; set; }
+        public Gdk.ModifierType modifiers { get; set; }
+        public bool reverse { get; set; }
+        public KeyEventFuncType ftype { get; set; }
+    }
+
+    public delegate void KeybindingFuncHandlerFunc(Gdk.Event event);
+
+    public static void
+    keybinding_manager_bind(KeybindingManager           keybinding_manager,
+                            ref GLib.List<Keybinding>   keybindings,
+                            string?                     accelerator,
+                            KeyEventFuncType            ftype,
+                            KeybindingManager.KeybindingHandlerFunc
+                                                        handler_normal,
+                            KeybindingManager.KeybindingHandlerFunc?
+                                                        handler_reverse) {
+        uint switch_keysym = 0;
+        Gdk.ModifierType switch_modifiers = 0;
+        Gdk.ModifierType reverse_modifier = Gdk.ModifierType.SHIFT_MASK;
+        Keybinding keybinding;
+
+        Gtk.accelerator_parse(accelerator,
+                out switch_keysym, out switch_modifiers);
+
+        // Map virtual modifiers to (i.e. Mod2, Mod3, ...)
+        const Gdk.ModifierType VIRTUAL_MODIFIERS = (
+                Gdk.ModifierType.SUPER_MASK |
+                Gdk.ModifierType.HYPER_MASK |
+                Gdk.ModifierType.META_MASK);
+        if ((switch_modifiers & VIRTUAL_MODIFIERS) != 0) {
+        // workaround a bug in gdk vapi vala > 0.18
+        // https://bugzilla.gnome.org/show_bug.cgi?id=677559
+#if VALA_0_18
+            Gdk.Keymap.get_default().map_virtual_modifiers(
+                    ref switch_modifiers);
+#else
+            if ((switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
+                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+            if ((switch_modifiers & Gdk.ModifierType.HYPER_MASK) != 0)
+                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
+#endif
+            switch_modifiers &= ~VIRTUAL_MODIFIERS;
+        }
+
+        if (switch_keysym == 0 && switch_modifiers == 0) {
+            warning("Parse accelerator '%s' failed!", accelerator);
+            return;
+        }
+
+        keybinding = new Keybinding(switch_keysym,
+                                    switch_modifiers,
+                                    false,
+                                    ftype);
+        keybindings.append(keybinding);
+
+        keybinding_manager.bind(switch_keysym, switch_modifiers,
+                                handler_normal);
+        if (ftype == KeyEventFuncType.EMOJI_TYPING) {
+            return;
+        }
+
+        // accelerator already has Shift mask
+        if ((switch_modifiers & reverse_modifier) != 0) {
+            return;
+        }
+
+        switch_modifiers |= reverse_modifier;
+
+        keybinding = new Keybinding(switch_keysym,
+                                    switch_modifiers,
+                                    true,
+                                    ftype);
+        keybindings.append(keybinding);
+
+        if (ftype == KeyEventFuncType.IME_SWITCHER) {
+            keybinding_manager.bind(switch_keysym, switch_modifiers,
+                                    handler_reverse);
+        }
+        return;
+    }
+
+    public static void
+    unbind_switch_shortcut(KeyEventFuncType      ftype,
+                           GLib.List<Keybinding> keybindings) {
+        var keybinding_manager = KeybindingManager.get_instance();
+
+        while (keybindings != null) {
+            Keybinding keybinding = keybindings.data;
+
+            if (ftype == KeyEventFuncType.ANY ||
+                ftype == keybinding.ftype) {
+                keybinding_manager.unbind(keybinding.keysym,
+                                          keybinding.modifiers);
+            }
+            keybindings = keybindings.next;
+        }
+    }
+
+    public static void
+    set_custom_font(GLib.Settings?       settings_panel,
+                    GLib.Settings?       settings_emoji,
+                    ref Gtk.CssProvider? css_provider) {
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Screen screen = (display != null) ?
+                display.get_default_screen() : null;
+
+        if (screen == null) {
+            warning("Could not open display.");
+            return;
+        }
+
+        if (settings_emoji != null) {
+            string emoji_font = settings_emoji.get_string("font");
+            if (emoji_font == null) {
+                warning("No config emoji:font.");
+                return;
+            }
+            IBusEmojier.set_emoji_font(emoji_font);
+        }
+
+        if (settings_panel == null)
+            return;
+
+        bool use_custom_font = settings_panel.get_boolean("use-custom-font");
+
+        if (css_provider != null) {
+            Gtk.StyleContext.remove_provider_for_screen(screen,
+                                                        css_provider);
+            css_provider = null;
+        }
+
+        if (use_custom_font == false) {
+            return;
+        }
+
+        string custom_font = settings_panel.get_string("custom-font");
+        if (custom_font == null) {
+            warning("No config panel:custom-font.");
+            return;
+        }
+
+        Pango.FontDescription font_desc =
+                Pango.FontDescription.from_string(custom_font);
+        string font_family = font_desc.get_family();
+        int font_size = font_desc.get_size() / Pango.SCALE;
+        string data;
+
+        if (Gtk.MAJOR_VERSION < 3 ||
+            (Gtk.MAJOR_VERSION == 3 && Gtk.MINOR_VERSION < 20)) {
+            data = "GtkLabel { font: %s; }".printf(custom_font);
+        } else {
+            data = "label { font-family: %s; font-size: %dpt; }"
+                           .printf(font_family, font_size);
+        }
+
+        css_provider = new Gtk.CssProvider();
+
+        try {
+            css_provider.load_from_data(data, -1);
+        } catch (GLib.Error e) {
+            warning("Failed css_provider_from_data: %s: %s", custom_font,
+                                                             e.message);
+            return;
+        }
+
+        Gtk.StyleContext.add_provider_for_screen(
+                screen,
+                css_provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+}
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index e162a960e..f590cf3aa 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -21,108 +21,6 @@
  * USA
  */
 
-class ThemedRGBA {
-    public Gdk.RGBA *normal_fg { get; set; }
-    public Gdk.RGBA *normal_bg { get; set; }
-    public Gdk.RGBA *selected_fg { get; set; }
-    public Gdk.RGBA *selected_bg { get; set; }
-
-    private Gtk.StyleContext m_style_context;
-
-    public ThemedRGBA(Gtk.Widget widget) {
-        this.normal_fg = null;
-        this.normal_bg = null;
-        this.selected_fg = null;
-        this.selected_bg = null;
-
-        /* Use the color of Gtk.TextView instead of Gtk.Label
-         * because the selected label "color" is not configured
-         * in "Adwaita" theme and the selected label "background-color"
-         * is not configured in "Maia" theme.
-         * https://github.com/ibus/ibus/issues/1871
-         */
-        Gtk.WidgetPath widget_path = new Gtk.WidgetPath();
-        widget_path.append_type(typeof(Gtk.TextView));
-        m_style_context = new Gtk.StyleContext();
-        m_style_context.set_path(widget_path);
-        m_style_context.add_class(Gtk.STYLE_CLASS_VIEW);
-
-        /* "-gtk-secondary-caret-color" value is different
-         * if the parent widget is set in "Menta" theme.
-         */
-        m_style_context.set_parent(widget.get_style_context());
-
-        get_rgba();
-
-        m_style_context.changed.connect(() => { get_rgba(); });
-    }
-
-    ~ThemedRGBA() {
-        reset_rgba();
-    }
-
-    private void reset_rgba() {
-        if (this.normal_fg != null) {
-            this.normal_fg.free();
-            this.normal_fg = null;
-        }
-        if (this.normal_bg != null) {
-            this.normal_bg.free();
-            this.normal_bg = null;
-        }
-        if (this.selected_fg != null) {
-            this.selected_fg.free();
-            this.selected_fg = null;
-        }
-        if (this.selected_bg != null) {
-            this.selected_bg.free();
-            this.selected_bg = null;
-        }
-    }
-
-    private void get_rgba() {
-        reset_rgba();
-        Gdk.RGBA *normal_fg = null;
-        Gdk.RGBA *normal_bg = null;
-        Gdk.RGBA *selected_fg = null;
-        Gdk.RGBA *selected_bg = null;
-        m_style_context.get(Gtk.StateFlags.NORMAL,
-                            "color",
-                            out normal_fg);
-        m_style_context.get(Gtk.StateFlags.SELECTED,
-                            "color",
-                            out selected_fg);
-
-        string bg_prop = "background-color";
-        m_style_context.get(Gtk.StateFlags.NORMAL,
-                            bg_prop,
-                            out normal_bg);
-        m_style_context.get(Gtk.StateFlags.SELECTED,
-                            bg_prop,
-                            out selected_bg);
-        if (normal_bg.red   == selected_bg.red &&
-            normal_bg.green == selected_bg.green &&
-            normal_bg.blue  == selected_bg.blue &&
-            normal_bg.alpha == selected_bg.alpha) {
-            normal_bg.free();
-            normal_bg = null;
-            normal_bg.free();
-            normal_bg = null;
-            bg_prop = "-gtk-secondary-caret-color";
-            m_style_context.get(Gtk.StateFlags.NORMAL,
-                                bg_prop,
-                                out normal_bg);
-            m_style_context.get(Gtk.StateFlags.SELECTED,
-                                bg_prop,
-                                out selected_bg);
-        }
-        this.normal_fg   = normal_fg;
-        this.normal_bg   = normal_bg;
-        this.selected_fg = selected_fg;
-        this.selected_bg = selected_bg;
-    }
-}
-
 class CandidateArea : Gtk.Box {
     private bool m_vertical;
     private Gtk.Label[] m_labels;
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
new file mode 100644
index 000000000..a170280bb
--- /dev/null
+++ b/ui/gtk3/extension.vala
@@ -0,0 +1,124 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ *
+ * 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
+ */
+
+class ExtensionGtk {
+    private IBus.Bus m_bus;
+    private PanelBinding m_panel;
+
+    public ExtensionGtk(string[] argv) {
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
+                                 Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
+        IBus.init();
+        Gtk.init(ref argv);
+
+        m_bus = new IBus.Bus();
+
+        m_bus.connected.connect(bus_connected);
+        m_bus.disconnected.connect(bus_disconnected);
+
+        if (m_bus.is_connected()) {
+            init();
+        }
+    }
+
+    private void init() {
+        DBusConnection connection = m_bus.get_connection();
+        connection.signal_subscribe("org.freedesktop.DBus",
+                                    "org.freedesktop.DBus",
+                                    "NameAcquired",
+                                    "/org/freedesktop/DBus",
+                                    IBus.SERVICE_PANEL_EXTENSION,
+                                    DBusSignalFlags.NONE,
+                                    bus_name_acquired_cb);
+        connection.signal_subscribe("org.freedesktop.DBus",
+                                    "org.freedesktop.DBus",
+                                    "NameLost",
+                                    "/org/freedesktop/DBus",
+                                    IBus.SERVICE_PANEL_EXTENSION,
+                                    DBusSignalFlags.NONE,
+                                    bus_name_lost_cb);
+        var flags =
+                IBus.BusNameFlag.ALLOW_REPLACEMENT |
+                IBus.BusNameFlag.REPLACE_EXISTING;
+        m_bus.request_name(IBus.SERVICE_PANEL_EXTENSION, flags);
+    }
+
+    public int run() {
+        Gtk.main();
+        return 0;
+    }
+
+    private void bus_name_acquired_cb(DBusConnection connection,
+                                      string sender_name,
+                                      string object_path,
+                                      string interface_name,
+                                      string signal_name,
+                                      Variant parameters) {
+        debug("signal_name = %s", signal_name);
+        m_panel = new PanelBinding(m_bus);
+        m_panel.load_settings();
+    }
+
+    private void bus_name_lost_cb(DBusConnection connection,
+                                  string sender_name,
+                                  string object_path,
+                                  string interface_name,
+                                  string signal_name,
+                                  Variant parameters) {
+        // "Destroy" dbus method was called before this callback is called.
+        // "Destroy" dbus method -> ibus_service_destroy()
+        // -> g_dbus_connection_unregister_object()
+        // -> g_object_unref(m_panel) will be called later with an idle method,
+        // which was assigned in the arguments of
+        // g_dbus_connection_register_object()
+        debug("signal_name = %s", signal_name);
+
+        // unref m_panel
+        m_panel.disconnect_signals();
+        m_panel = null;
+    }
+
+    private void bus_disconnected(IBus.Bus bus) {
+        debug("connection is lost.");
+        Gtk.main_quit();
+    }
+
+    private void bus_connected(IBus.Bus bus) {
+        init();
+    }
+
+    public static void main(string[] argv) {
+        // https://bugzilla.redhat.com/show_bug.cgi?id=1226465#c20
+        // In /etc/xdg/plasma-workspace/env/gtk3_scrolling.sh
+        // Plasma deskop sets this variable and prevents Super-space,
+        // and Ctrl-Shift-e when ibus-ui-gtk3 runs after the
+        // desktop is launched.
+        GLib.Environment.unset_variable("GDK_CORE_DEVICE_EVENTS");
+        // for Gdk.X11.get_default_xdisplay()
+        Gdk.set_allowed_backends("x11");
+
+        ExtensionGtk extension = new ExtensionGtk(argv);
+        extension.run();
+    }
+}
diff --git a/ui/gtk3/gtkextension.xml.in b/ui/gtk3/gtkextension.xml.in
new file mode 100644
index 000000000..b8157c97f
--- /dev/null
+++ b/ui/gtk3/gtkextension.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- filename: gtkextension.xml -->
+<component>
+	<name>org.freedesktop.IBus.Panel.Extension</name>
+	<description>Gtk Panel Extension Component</description>
+	<exec>@libexecdir@/ibus-extension-gtk3</exec>
+	<version>@VERSION@</version>
+	<author>Takao Fujiwara &lt;takao.fujiwara1@gmail.com&gt;</author>
+	<license>GPL</license>
+	<homepage>https://github.com/ibus/ibus/wiki</homepage>
+	<textdomain>ibus</textdomain>
+</component>
diff --git a/ui/gtk3/iconwidget.vala b/ui/gtk3/iconwidget.vala
index d322650c7..36643c74b 100644
--- a/ui/gtk3/iconwidget.vala
+++ b/ui/gtk3/iconwidget.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,108 @@
  * USA
  */
 
+class ThemedRGBA {
+    public Gdk.RGBA *normal_fg { get; set; }
+    public Gdk.RGBA *normal_bg { get; set; }
+    public Gdk.RGBA *selected_fg { get; set; }
+    public Gdk.RGBA *selected_bg { get; set; }
+
+    private Gtk.StyleContext m_style_context;
+
+    public ThemedRGBA(Gtk.Widget widget) {
+        this.normal_fg = null;
+        this.normal_bg = null;
+        this.selected_fg = null;
+        this.selected_bg = null;
+
+        /* Use the color of Gtk.TextView instead of Gtk.Label
+         * because the selected label "color" is not configured
+         * in "Adwaita" theme and the selected label "background-color"
+         * is not configured in "Maia" theme.
+         * https://github.com/ibus/ibus/issues/1871
+         */
+        Gtk.WidgetPath widget_path = new Gtk.WidgetPath();
+        widget_path.append_type(typeof(Gtk.TextView));
+        m_style_context = new Gtk.StyleContext();
+        m_style_context.set_path(widget_path);
+        m_style_context.add_class(Gtk.STYLE_CLASS_VIEW);
+
+        /* "-gtk-secondary-caret-color" value is different
+         * if the parent widget is set in "Menta" theme.
+         */
+        m_style_context.set_parent(widget.get_style_context());
+
+        get_rgba();
+
+        m_style_context.changed.connect(() => { get_rgba(); });
+    }
+
+    ~ThemedRGBA() {
+        reset_rgba();
+    }
+
+    private void reset_rgba() {
+        if (this.normal_fg != null) {
+            this.normal_fg.free();
+            this.normal_fg = null;
+        }
+        if (this.normal_bg != null) {
+            this.normal_bg.free();
+            this.normal_bg = null;
+        }
+        if (this.selected_fg != null) {
+            this.selected_fg.free();
+            this.selected_fg = null;
+        }
+        if (this.selected_bg != null) {
+            this.selected_bg.free();
+            this.selected_bg = null;
+        }
+    }
+
+    private void get_rgba() {
+        reset_rgba();
+        Gdk.RGBA *normal_fg = null;
+        Gdk.RGBA *normal_bg = null;
+        Gdk.RGBA *selected_fg = null;
+        Gdk.RGBA *selected_bg = null;
+        m_style_context.get(Gtk.StateFlags.NORMAL,
+                            "color",
+                            out normal_fg);
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            "color",
+                            out selected_fg);
+
+        string bg_prop = "background-color";
+        m_style_context.get(Gtk.StateFlags.NORMAL,
+                            bg_prop,
+                            out normal_bg);
+        m_style_context.get(Gtk.StateFlags.SELECTED,
+                            bg_prop,
+                            out selected_bg);
+        if (normal_bg.red   == selected_bg.red &&
+            normal_bg.green == selected_bg.green &&
+            normal_bg.blue  == selected_bg.blue &&
+            normal_bg.alpha == selected_bg.alpha) {
+            normal_bg.free();
+            normal_bg = null;
+            normal_bg.free();
+            normal_bg = null;
+            bg_prop = "-gtk-secondary-caret-color";
+            m_style_context.get(Gtk.StateFlags.NORMAL,
+                                bg_prop,
+                                out normal_bg);
+            m_style_context.get(Gtk.StateFlags.SELECTED,
+                                bg_prop,
+                                out selected_bg);
+        }
+        this.normal_fg   = normal_fg;
+        this.normal_bg   = normal_bg;
+        this.selected_fg = selected_fg;
+        this.selected_bg = selected_bg;
+    }
+}
+
 class IconWidget: Gtk.Image {
     /**
      * IconWidget:
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index bcb3ed755..d9238c893 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -22,39 +22,16 @@
  */
 
 class Panel : IBus.PanelService {
-    private class Keybinding {
-        public Keybinding(uint keysym,
-                          Gdk.ModifierType modifiers,
-                          bool reverse,
-                          KeyEventFuncType ftype) {
-            this.keysym = keysym;
-            this.modifiers = modifiers;
-            this.reverse = reverse;
-            this.ftype = ftype;
-        }
-
-        public uint keysym { get; set; }
-        public Gdk.ModifierType modifiers { get; set; }
-        public bool reverse { get; set; }
-        public KeyEventFuncType ftype { get; set; }
-    }
 
     private enum IconType {
         STATUS_ICON,
         INDICATOR,
     }
 
-    private enum KeyEventFuncType {
-        ANY,
-        IME_SWITCHER,
-        EMOJI_TYPING,
-    }
-
     private IBus.Bus m_bus;
     private GLib.Settings m_settings_general = null;
     private GLib.Settings m_settings_hotkey = null;
     private GLib.Settings m_settings_panel = null;
-    private GLib.Settings m_settings_emoji = null;
     private IconType m_icon_type = IconType.STATUS_ICON;
     private Indicator m_indicator;
 #if INDICATOR
@@ -73,10 +50,6 @@ class Panel : IBus.PanelService {
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
     private uint m_switcher_focus_set_engine_id;
-    private IBusEmojier? m_emojier;
-    private uint m_emojier_set_emoji_lang_id;
-    private uint m_emojier_focus_commit_text_id;
-    private string[] m_emojier_favorites = {};
     private PropertyManager m_property_manager;
     private PropertyPanel m_property_panel;
     private GLib.Pid m_setup_pid = 0;
@@ -108,7 +81,8 @@ class Panel : IBus.PanelService {
     private ulong m_activate_id;
     private ulong m_registered_status_notifier_item_id;
 
-    private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
+    private GLib.List<BindingCommon.Keybinding> m_keybindings =
+            new GLib.List<BindingCommon.Keybinding>();
 
     public Panel(IBus.Bus bus) {
         GLib.assert(bus.is_connected());
@@ -147,8 +121,6 @@ class Panel : IBus.PanelService {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
 
-        bind_emoji_shortcut();
-
         m_property_manager = new PropertyManager();
         m_property_manager.property_activate.connect((w, k, s) => {
             property_activate(k, s);
@@ -168,7 +140,9 @@ class Panel : IBus.PanelService {
         if (m_indicator != null)
             m_indicator.unregister_connection();
 #endif
-        unbind_switch_shortcut(KeyEventFuncType.ANY);
+        BindingCommon.unbind_switch_shortcut(
+                BindingCommon.KeyEventFuncType.ANY, m_keybindings);
+        m_keybindings = null;
     }
 
     private void init_settings() {
@@ -176,7 +150,6 @@ class Panel : IBus.PanelService {
         m_settings_hotkey =
                 new GLib.Settings("org.freedesktop.ibus.general.hotkey");
         m_settings_panel = new GLib.Settings("org.freedesktop.ibus.panel");
-        m_settings_emoji = new GLib.Settings("org.freedesktop.ibus.panel.emoji");
 
         m_settings_general.changed["preload-engines"].connect((key) => {
                 update_engines(m_settings_general.get_strv(key),
@@ -205,16 +178,23 @@ class Panel : IBus.PanelService {
         });
 
         m_settings_hotkey.changed["triggers"].connect((key) => {
-                unbind_switch_shortcut(KeyEventFuncType.IME_SWITCHER);
+                BindingCommon.unbind_switch_shortcut(
+                        BindingCommon.KeyEventFuncType.IME_SWITCHER,
+                        m_keybindings);
+                m_keybindings = null;
                 bind_switch_shortcut();
         });
 
         m_settings_panel.changed["custom-font"].connect((key) => {
-                set_custom_font();
+                BindingCommon.set_custom_font(m_settings_panel,
+                                              null,
+                                              ref m_css_provider);
         });
 
         m_settings_panel.changed["use-custom-font"].connect((key) => {
-                set_custom_font();
+                BindingCommon.set_custom_font(m_settings_panel,
+                                              null,
+                                              ref m_css_provider);
         });
 
         m_settings_panel.changed["show-icon-on-systray"].connect((key) => {
@@ -245,39 +225,6 @@ class Panel : IBus.PanelService {
         m_settings_panel.changed["property-icon-delay-time"].connect((key) => {
                 set_property_icon_delay_time();
         });
-
-        m_settings_emoji.changed["hotkey"].connect((key) => {
-                unbind_switch_shortcut(KeyEventFuncType.EMOJI_TYPING);
-                bind_emoji_shortcut();
-        });
-
-        m_settings_emoji.changed["font"].connect((key) => {
-                set_custom_font();
-        });
-
-        m_settings_emoji.changed["favorites"].connect((key) => {
-                set_emoji_favorites();
-        });
-
-        m_settings_emoji.changed["favorite-annotations"].connect((key) => {
-                set_emoji_favorites();
-        });
-
-        m_settings_emoji.changed["lang"].connect((key) => {
-                set_emoji_lang();
-        });
-
-        m_settings_emoji.changed["has-partial-match"].connect((key) => {
-                set_emoji_partial_match();
-        });
-
-        m_settings_emoji.changed["partial-match-length"].connect((key) => {
-                set_emoji_partial_match();
-        });
-
-        m_settings_emoji.changed["partial-match-condition"].connect((key) => {
-                set_emoji_partial_match();
-        });
     }
 
     private void popup_menu_at_area_window(Gtk.Menu              menu,
@@ -409,120 +356,40 @@ class Panel : IBus.PanelService {
         m_status_icon.set_from_icon_name("ibus-keyboard");
     }
 
-    private void keybinding_manager_bind(KeybindingManager keybinding_manager,
-                                         string?           accelerator,
-                                         KeyEventFuncType  ftype) {
-        uint switch_keysym = 0;
-        Gdk.ModifierType switch_modifiers = 0;
-        Gdk.ModifierType reverse_modifier = Gdk.ModifierType.SHIFT_MASK;
-        Keybinding keybinding;
-
-        Gtk.accelerator_parse(accelerator,
-                out switch_keysym, out switch_modifiers);
-
-        // Map virtual modifiers to (i.e. Mod2, Mod3, ...)
-        const Gdk.ModifierType VIRTUAL_MODIFIERS = (
-                Gdk.ModifierType.SUPER_MASK |
-                Gdk.ModifierType.HYPER_MASK |
-                Gdk.ModifierType.META_MASK);
-        if ((switch_modifiers & VIRTUAL_MODIFIERS) != 0) {
-        // workaround a bug in gdk vapi vala > 0.18
-        // https://bugzilla.gnome.org/show_bug.cgi?id=677559
-#if VALA_0_18
-            Gdk.Keymap.get_default().map_virtual_modifiers(
-                    ref switch_modifiers);
-#else
-            if ((switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
-                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
-            if ((switch_modifiers & Gdk.ModifierType.HYPER_MASK) != 0)
-                switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
-#endif
-            switch_modifiers &= ~VIRTUAL_MODIFIERS;
-        }
-
-        if (switch_keysym == 0 && switch_modifiers == 0) {
-            warning("Parse accelerator '%s' failed!", accelerator);
-            return;
-        }
-
-        keybinding = new Keybinding(switch_keysym,
-                                    switch_modifiers,
-                                    false,
-                                    ftype);
-        m_keybindings.append(keybinding);
-
-        /* Workaround not to free the pointer of handle_engine_switch() */
-        if (ftype == KeyEventFuncType.IME_SWITCHER) {
-            keybinding_manager.bind(switch_keysym, switch_modifiers,
-                    (e) => handle_engine_switch(e, false));
-        } else if (ftype == KeyEventFuncType.EMOJI_TYPING) {
-            keybinding_manager.bind(switch_keysym, switch_modifiers,
-                    (e) => handle_emoji_typing(e));
-            return;
-        }
-
-        // accelerator already has Shift mask
-        if ((switch_modifiers & reverse_modifier) != 0) {
-            return;
-        }
-
-        switch_modifiers |= reverse_modifier;
-
-        keybinding = new Keybinding(switch_keysym,
-                                    switch_modifiers,
-                                    true,
-                                    ftype);
-        m_keybindings.append(keybinding);
-
-        if (ftype == KeyEventFuncType.IME_SWITCHER) {
-            keybinding_manager.bind(switch_keysym, switch_modifiers,
-                    (e) => handle_engine_switch(e, true));
-        }
-    }
-
     private void bind_switch_shortcut() {
         string[] accelerators = m_settings_hotkey.get_strv("triggers");
 
         var keybinding_manager = KeybindingManager.get_instance();
 
         foreach (var accelerator in accelerators) {
-            keybinding_manager_bind(keybinding_manager,
-                                    accelerator,
-                                    KeyEventFuncType.IME_SWITCHER);
-        }
-    }
-
-    private void bind_emoji_shortcut() {
-#if EMOJI_DICT
-        string[] accelerators = m_settings_emoji.get_strv("hotkey");
-
-        var keybinding_manager = KeybindingManager.get_instance();
-
-        foreach (var accelerator in accelerators) {
-            keybinding_manager_bind(keybinding_manager,
-                                    accelerator,
-                                    KeyEventFuncType.EMOJI_TYPING);
+            BindingCommon.keybinding_manager_bind(
+                    keybinding_manager,
+                    ref m_keybindings,
+                    accelerator,
+                    BindingCommon.KeyEventFuncType.IME_SWITCHER,
+                    handle_engine_switch_normal,
+                    handle_engine_switch_reverse);
         }
-#endif
     }
 
-    private void unbind_switch_shortcut(KeyEventFuncType ftype) {
+/*
+    public static void
+    unbind_switch_shortcut(KeyEventFuncType      ftype,
+                           GLib.List<Keybinding> keybindings) {
         var keybinding_manager = KeybindingManager.get_instance();
 
-        unowned GLib.List<Keybinding> keybindings = m_keybindings;
-
         while (keybindings != null) {
             Keybinding keybinding = keybindings.data;
 
-            if (ftype == KeyEventFuncType.ANY || ftype == keybinding.ftype) {
+            if (ftype == KeyEventFuncType.ANY ||
+                ftype == keybinding.ftype) {
                 keybinding_manager.unbind(keybinding.keysym,
                                           keybinding.modifiers);
             }
             keybindings = keybindings.next;
         }
-
-        m_keybindings = null;
     }
+*/
 
     /**
      * panel_get_engines_from_xkb:
@@ -670,69 +537,6 @@ class Panel : IBus.PanelService {
         m_settings_general.set_strv("preload-engines", names);
     }
 
-    private void set_custom_font() {
-        Gdk.Display display = Gdk.Display.get_default();
-        Gdk.Screen screen = (display != null) ?
-                display.get_default_screen() : null;
-
-        if (screen == null) {
-            warning("Could not open display.");
-            return;
-        }
-
-        string emoji_font = m_settings_emoji.get_string("font");
-        if (emoji_font == null) {
-            warning("No config emoji:font.");
-            return;
-        }
-        IBusEmojier.set_emoji_font(emoji_font);
-
-        bool use_custom_font = m_settings_panel.get_boolean("use-custom-font");
-
-        if (m_css_provider != null) {
-            Gtk.StyleContext.remove_provider_for_screen(screen,
-                                                        m_css_provider);
-            m_css_provider = null;
-        }
-
-        if (use_custom_font == false) {
-            return;
-        }
-
-        string custom_font = m_settings_panel.get_string("custom-font");
-        if (custom_font == null) {
-            warning("No config panel:custom-font.");
-            return;
-        }
-
-        Pango.FontDescription font_desc =
-                Pango.FontDescription.from_string(custom_font);
-        string font_family = font_desc.get_family();
-        int font_size = font_desc.get_size() / Pango.SCALE;
-        string data;
-
-        if (Gtk.MAJOR_VERSION < 3 ||
-            (Gtk.MAJOR_VERSION == 3 && Gtk.MINOR_VERSION < 20)) {
-            data = "GtkLabel { font: %s; }".printf(custom_font);
-        } else {
-            data = "label { font-family: %s; font-size: %dpt; }"
-                           .printf(font_family, font_size);
-        }
-
-        m_css_provider = new Gtk.CssProvider();
-
-        try {
-            m_css_provider.load_from_data(data, -1);
-        } catch (GLib.Error e) {
-            warning("Failed css_provider_from_data: %s: %s", custom_font,
-                                                             e.message);
-            return;
-        }
-
-        Gtk.StyleContext.add_provider_for_screen(screen,
-                                                 m_css_provider,
-                                                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
 
     private void set_switcher_delay_time() {
         m_switcher_delay_time =
@@ -855,35 +659,6 @@ class Panel : IBus.PanelService {
                 m_settings_panel.get_int("property-icon-delay-time");
     }
 
-    private void set_emoji_favorites() {
-        m_emojier_favorites = m_settings_emoji.get_strv("favorites");
-        IBusEmojier.set_favorites(
-                m_emojier_favorites,
-                m_settings_emoji.get_strv("favorite-annotations"));
-    }
-
-    private void set_emoji_lang() {
-        if (m_emojier_set_emoji_lang_id > 0) {
-            GLib.Source.remove(m_emojier_set_emoji_lang_id);
-            m_emojier_set_emoji_lang_id = 0;
-        }
-        m_emojier_set_emoji_lang_id = GLib.Idle.add(() => {
-            IBusEmojier.set_annotation_lang(
-                    m_settings_emoji.get_string("lang"));
-            m_emojier_set_emoji_lang_id = 0;
-            IBusEmojier.load_unicode_dict();
-            return false;
-        });
-    }
-
-    private void set_emoji_partial_match() {
-        IBusEmojier.set_partial_match(
-                m_settings_emoji.get_boolean("has-partial-match"));
-        IBusEmojier.set_partial_match_length(
-                m_settings_emoji.get_int("partial-match-length"));
-        IBusEmojier.set_partial_match_condition(
-                m_settings_emoji.get_int("partial-match-condition"));
-    }
 
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
@@ -985,12 +760,16 @@ class Panel : IBus.PanelService {
         set_use_xmodmap();
         update_engines(m_settings_general.get_strv("preload-engines"),
                        m_settings_general.get_strv("engines-order"));
-        unbind_switch_shortcut(KeyEventFuncType.ANY);
+        BindingCommon.unbind_switch_shortcut(
+                BindingCommon.KeyEventFuncType.ANY,
+                m_keybindings);
+        m_keybindings = null;
         bind_switch_shortcut();
-        bind_emoji_shortcut();
         set_switcher_delay_time();
         set_embed_preedit_text();
-        set_custom_font();
+        BindingCommon.set_custom_font(m_settings_panel,
+                                      null,
+                                      ref m_css_provider);
         set_show_icon_on_systray();
         set_lookup_table_orientation();
         set_show_property_panel();
@@ -998,9 +777,6 @@ class Panel : IBus.PanelService {
         set_follow_input_cursor_when_always_shown_property_panel();
         set_xkb_icon_rgba();
         set_property_icon_delay_time();
-        set_emoji_favorites();
-        set_emoji_lang();
-        set_emoji_partial_match();
     }
 
     /**
@@ -1037,10 +813,6 @@ class Panel : IBus.PanelService {
             GLib.Source.remove(m_preload_engines_id);
             m_preload_engines_id = 0;
         }
-        if (m_emojier_set_emoji_lang_id > 0) {
-            GLib.Source.remove(m_emojier_set_emoji_lang_id);
-            m_emojier_set_emoji_lang_id = 0;
-        }
     }
 
     private void engine_contexts_insert(IBus.EngineDesc engine) {
@@ -1091,7 +863,15 @@ class Panel : IBus.PanelService {
         set_engine(engine);
     }
 
-    private void handle_engine_switch(Gdk.Event event, bool revert) {
+    private void handle_engine_switch_normal(Gdk.Event event) {
+        handle_engine_switch(event, false);
+    }
+
+    private void handle_engine_switch_reverse(Gdk.Event event) {
+        handle_engine_switch(event, true);
+    }
+
+    private void handle_engine_switch(Gdk.Event event, bool reverse) {
         // Do not need switch IME
         if (m_engines.length <= 1)
             return;
@@ -1105,12 +885,12 @@ class Panel : IBus.PanelService {
         bool pressed = KeybindingManager.primary_modifier_still_pressed(
                 event, primary_modifiers);
 
-        if (revert) {
+        if (reverse) {
             modifiers &= ~Gdk.ModifierType.SHIFT_MASK;
         }
 
         if (pressed && m_switcher_delay_time >= 0) {
-            int i = revert ? m_engines.length - 1 : 1;
+            int i = reverse ? m_engines.length - 1 : 1;
 
             /* The flag of m_switcher.is_running avoids the following problem:
              *
@@ -1132,28 +912,11 @@ class Panel : IBus.PanelService {
                 this.switcher_focus_set_engine();
             }
         } else {
-            int i = revert ? m_engines.length - 1 : 1;
+            int i = reverse ? m_engines.length - 1 : 1;
             switch_engine(i);
         }
     }
 
-    private void show_emojier(Gdk.Event event) {
-        m_emojier = new IBusEmojier();
-        string emoji = m_emojier.run(m_real_current_context_path, event);
-        if (emoji == null) {
-            m_emojier = null;
-            return;
-        }
-        this.emojier_focus_commit();
-    }
-
-    private void handle_emoji_typing(Gdk.Event event) {
-        if (m_emojier != null && m_emojier.is_running()) {
-            m_emojier.present_centralize(event);
-            return;
-        }
-        show_emojier(event);
-    }
 
     private void run_preload_engines(IBus.EngineDesc[] engines, int index) {
         string[] names = {};
@@ -1393,7 +1156,18 @@ class Panel : IBus.PanelService {
                     event.key.window = Gdk.get_default_root_window();
                     event.key.window.ref();
                 }
-                handle_emoji_typing(event);
+                IBus.XEvent xevent = new IBus.XEvent(
+                        "event-type", IBus.XEventType.KEY_PRESS,
+                        "window",
+                        (event.key.window as Gdk.X11.Window).get_xid(),
+                        "time", event.key.time,
+                        "purpose", "emoji");
+                /* new GLib.Variant("(sv)", "emoji", xevent.serialize_object())
+                 * will call g_variant_unref() for the child variant by vala.
+                 * I have no idea not to unref the object so integrated
+                 * the purpose to IBus.XEvent above.
+                 */
+                panel_extension(xevent.serialize_object());
             });
             m_sys_menu.append(item);
 #endif
@@ -1557,67 +1331,6 @@ class Panel : IBus.PanelService {
         }
     }
 
-    private bool emojier_focus_commit_real() {
-        if (m_emojier == null)
-            return true;
-        string selected_string = m_emojier.get_selected_string();
-        string prev_context_path = m_emojier.get_input_context_path();
-        if (selected_string != null &&
-            prev_context_path != "" &&
-            prev_context_path == m_current_context_path) {
-            IBus.Text text = new IBus.Text.from_string(selected_string);
-            commit_text(text);
-            m_emojier = null;
-            bool has_favorite = false;
-            foreach (unowned string favorite in m_emojier_favorites) {
-                if (favorite == selected_string) {
-                    has_favorite = true;
-                    break;
-                }
-            }
-            if (!has_favorite) {
-                m_emojier_favorites += selected_string;
-                m_settings_emoji.set_strv("favorites", m_emojier_favorites);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    private void emojier_focus_commit() {
-        if (m_emojier == null)
-            return;
-        string selected_string = m_emojier.get_selected_string();
-        string prev_context_path = m_emojier.get_input_context_path();
-        if (selected_string == null &&
-            prev_context_path != "" &&
-            m_emojier.is_running()) {
-            var context = GLib.MainContext.default();
-            if (m_emojier_focus_commit_text_id > 0 &&
-                context.find_source_by_id(m_emojier_focus_commit_text_id)
-                        != null) {
-                GLib.Source.remove(m_emojier_focus_commit_text_id);
-            }
-            m_emojier_focus_commit_text_id = GLib.Timeout.add(100, () => {
-                // focus_in is comming before switcher returns
-                emojier_focus_commit_real();
-                m_emojier_focus_commit_text_id = -1;
-                return false;
-            });
-        } else {
-            if (emojier_focus_commit_real()) {
-                var context = GLib.MainContext.default();
-                if (m_emojier_focus_commit_text_id > 0 &&
-                    context.find_source_by_id(m_emojier_focus_commit_text_id)
-                            != null) {
-                    GLib.Source.remove(m_emojier_focus_commit_text_id);
-                }
-                m_emojier_focus_commit_text_id = -1;
-            }
-        }
-    }
-
     public override void focus_in(string input_context_path) {
         m_current_context_path = input_context_path;
 
@@ -1632,7 +1345,6 @@ class Panel : IBus.PanelService {
             m_real_current_context_path = m_current_context_path;
             m_property_panel.focus_in();
             this.switcher_focus_set_engine();
-            this.emojier_focus_commit();
         }
 
         if (m_use_global_engine)
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
new file mode 100644
index 000000000..507001214
--- /dev/null
+++ b/ui/gtk3/panelbinding.vala
@@ -0,0 +1,335 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright(c) 2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ *
+ * 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
+ */
+
+class PanelBinding : IBus.PanelService {
+    private IBus.Bus m_bus;
+    private GLib.Settings m_settings_panel = null;
+    private GLib.Settings m_settings_emoji = null;
+    private string m_current_context_path = "";
+    private string m_real_current_context_path = "";
+    private IBusEmojier? m_emojier;
+    private uint m_emojier_set_emoji_lang_id;
+    private uint m_emojier_focus_commit_text_id;
+    private string[] m_emojier_favorites = {};
+    private Gtk.CssProvider m_css_provider;
+    private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
+    private GLib.List<BindingCommon.Keybinding> m_keybindings =
+            new GLib.List<BindingCommon.Keybinding>();
+
+    public PanelBinding(IBus.Bus bus) {
+        GLib.assert(bus.is_connected());
+        // Chain up base class constructor
+        GLib.Object(connection : bus.get_connection(),
+                    object_path : IBus.PATH_PANEL_EXTENSION);
+
+        m_bus = bus;
+
+        init_settings();
+
+        bind_emoji_shortcut();
+    }
+
+
+    ~PanelBinding() {
+        BindingCommon.unbind_switch_shortcut(
+                BindingCommon.KeyEventFuncType.ANY,
+                m_keybindings);
+    }
+
+
+    private void init_settings() {
+        m_settings_panel = new GLib.Settings("org.freedesktop.ibus.panel");
+        m_settings_emoji = new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+
+        m_settings_panel.changed["custom-font"].connect((key) => {
+                BindingCommon.set_custom_font(m_settings_panel,
+                                              m_settings_emoji,
+                                              ref m_css_provider);
+        });
+
+        m_settings_panel.changed["use-custom-font"].connect((key) => {
+                BindingCommon.set_custom_font(m_settings_panel,
+                                              m_settings_emoji,
+                                              ref m_css_provider);
+        });
+
+        m_settings_emoji.changed["hotkey"].connect((key) => {
+                BindingCommon.unbind_switch_shortcut(
+                        BindingCommon.KeyEventFuncType.EMOJI_TYPING,
+                        m_keybindings);
+                bind_emoji_shortcut();
+        });
+
+        m_settings_emoji.changed["font"].connect((key) => {
+                BindingCommon.set_custom_font(m_settings_panel,
+                                              m_settings_emoji,
+                                              ref m_css_provider);
+        });
+
+        m_settings_emoji.changed["favorites"].connect((key) => {
+                set_emoji_favorites();
+        });
+
+        m_settings_emoji.changed["favorite-annotations"].connect((key) => {
+                set_emoji_favorites();
+        });
+
+        m_settings_emoji.changed["lang"].connect((key) => {
+                set_emoji_lang();
+        });
+
+        m_settings_emoji.changed["has-partial-match"].connect((key) => {
+                set_emoji_partial_match();
+        });
+
+        m_settings_emoji.changed["partial-match-length"].connect((key) => {
+                set_emoji_partial_match();
+        });
+
+        m_settings_emoji.changed["partial-match-condition"].connect((key) => {
+                set_emoji_partial_match();
+        });
+    }
+
+
+    private void bind_emoji_shortcut() {
+#if EMOJI_DICT
+        string[] accelerators = m_settings_emoji.get_strv("hotkey");
+
+        var keybinding_manager = KeybindingManager.get_instance();
+
+        foreach (var accelerator in accelerators) {
+            BindingCommon.keybinding_manager_bind(
+                    keybinding_manager,
+                    ref m_keybindings,
+                    accelerator,
+                    BindingCommon.KeyEventFuncType.EMOJI_TYPING,
+                    handle_emoji_typing,
+                    null);
+        }
+#endif
+    }
+
+
+    private void set_emoji_favorites() {
+        m_emojier_favorites = m_settings_emoji.get_strv("favorites");
+        IBusEmojier.set_favorites(
+                m_emojier_favorites,
+                m_settings_emoji.get_strv("favorite-annotations"));
+    }
+
+
+    private void set_emoji_lang() {
+        if (m_emojier_set_emoji_lang_id > 0) {
+            GLib.Source.remove(m_emojier_set_emoji_lang_id);
+            m_emojier_set_emoji_lang_id = 0;
+        }
+        m_emojier_set_emoji_lang_id = GLib.Idle.add(() => {
+            IBusEmojier.set_annotation_lang(
+                    m_settings_emoji.get_string("lang"));
+            m_emojier_set_emoji_lang_id = 0;
+            IBusEmojier.load_unicode_dict();
+            return false;
+        });
+    }
+
+
+    private void set_emoji_partial_match() {
+        IBusEmojier.set_partial_match(
+                m_settings_emoji.get_boolean("has-partial-match"));
+        IBusEmojier.set_partial_match_length(
+                m_settings_emoji.get_int("partial-match-length"));
+        IBusEmojier.set_partial_match_condition(
+                m_settings_emoji.get_int("partial-match-condition"));
+    }
+
+
+    public void load_settings() {
+        BindingCommon.unbind_switch_shortcut(BindingCommon.KeyEventFuncType.ANY,
+                                             m_keybindings);
+        bind_emoji_shortcut();
+        BindingCommon.set_custom_font(m_settings_panel,
+                                      m_settings_emoji,
+                                      ref m_css_provider);
+        set_emoji_favorites();
+        set_emoji_lang();
+        set_emoji_partial_match();
+    }
+
+
+    /**
+     * disconnect_signals:
+     *
+     * Call this API before m_panel = null so that the ref_count becomes 0
+     */
+    public void disconnect_signals() {
+        if (m_emojier_set_emoji_lang_id > 0) {
+            GLib.Source.remove(m_emojier_set_emoji_lang_id);
+            m_emojier_set_emoji_lang_id = 0;
+        }
+    }
+
+
+    private void show_emojier(Gdk.Event event) {
+        m_emojier = new IBusEmojier();
+        string emoji = m_emojier.run(m_real_current_context_path, event);
+        if (emoji == null) {
+            m_emojier = null;
+            return;
+        }
+        this.emojier_focus_commit();
+    }
+
+
+    private void handle_emoji_typing(Gdk.Event event) {
+        if (m_emojier != null && m_emojier.is_running()) {
+            m_emojier.present_centralize(event);
+            return;
+        }
+        show_emojier(event);
+    }
+
+
+    private bool emojier_focus_commit_real() {
+        if (m_emojier == null)
+            return true;
+        string selected_string = m_emojier.get_selected_string();
+        string prev_context_path = m_emojier.get_input_context_path();
+        if (selected_string != null &&
+            prev_context_path != "" &&
+            prev_context_path == m_current_context_path) {
+            IBus.Text text = new IBus.Text.from_string(selected_string);
+            commit_text(text);
+            m_emojier = null;
+            bool has_favorite = false;
+            foreach (unowned string favorite in m_emojier_favorites) {
+                if (favorite == selected_string) {
+                    has_favorite = true;
+                    break;
+                }
+            }
+            if (!has_favorite) {
+                m_emojier_favorites += selected_string;
+                m_settings_emoji.set_strv("favorites", m_emojier_favorites);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+
+    private void emojier_focus_commit() {
+        if (m_emojier == null)
+            return;
+        string selected_string = m_emojier.get_selected_string();
+        string prev_context_path = m_emojier.get_input_context_path();
+        if (selected_string == null &&
+            prev_context_path != "" &&
+            m_emojier.is_running()) {
+            var context = GLib.MainContext.default();
+            if (m_emojier_focus_commit_text_id > 0 &&
+                context.find_source_by_id(m_emojier_focus_commit_text_id)
+                        != null) {
+                GLib.Source.remove(m_emojier_focus_commit_text_id);
+            }
+            m_emojier_focus_commit_text_id = GLib.Timeout.add(100, () => {
+                // focus_in is comming before switcher returns
+                emojier_focus_commit_real();
+                m_emojier_focus_commit_text_id = -1;
+                return false;
+            });
+        } else {
+            if (emojier_focus_commit_real()) {
+                var context = GLib.MainContext.default();
+                if (m_emojier_focus_commit_text_id > 0 &&
+                    context.find_source_by_id(m_emojier_focus_commit_text_id)
+                            != null) {
+                    GLib.Source.remove(m_emojier_focus_commit_text_id);
+                }
+                m_emojier_focus_commit_text_id = -1;
+            }
+        }
+    }
+
+
+    public override void focus_in(string input_context_path) {
+        m_current_context_path = input_context_path;
+
+        /* 'fake' input context is named as 
+         * '/org/freedesktop/IBus/InputContext_1' and always send in
+         * focus-out events by ibus-daemon for the global engine mode.
+         * Now ibus-daemon assumes to always use the global engine.
+         * But this event should not be used for modal dialogs
+         * such as Switcher.
+         */
+        if (!input_context_path.has_suffix("InputContext_1")) {
+            m_real_current_context_path = m_current_context_path;
+            this.emojier_focus_commit();
+        }
+    }
+
+
+    public override void focus_out(string input_context_path) {
+        m_current_context_path = "";
+    }
+
+
+    public override void panel_extension_received(GLib.Variant data) {
+        IBus.XEvent? xevent = IBus.Serializable.deserialize_object(data)
+                as IBus.XEvent;
+        if (xevent == null) {
+            warning ("Failed to deserialize IBusXEvent");
+            return;
+        }
+        if (xevent.get_purpose() != "emoji") {
+            string format = "The purpose %s is not implemented in PanelExtension";
+            warning (format.printf(xevent.get_purpose()));
+            return;
+        }
+        Gdk.EventType event_type;
+        if (xevent.get_event_type() == IBus.XEventType.KEY_PRESS) {
+            event_type = Gdk.EventType.KEY_PRESS;
+        } else if (xevent.get_event_type() == IBus.XEventType.KEY_RELEASE) {
+            event_type = Gdk.EventType.KEY_RELEASE;
+        } else {
+            warning ("Not supported type %d".printf(xevent.get_event_type()));
+            return;
+        }
+        Gdk.Event event = new Gdk.Event(event_type);
+        event.key.time = xevent.get_time();
+        Gdk.Display? display = Gdk.Display.get_default();
+        X.Window xid = xevent.get_window();
+        Gdk.X11.Window window;
+        window = Gdk.X11.Window.lookup_for_display(
+                display as Gdk.X11.Display, xid);
+        if (window != null) {
+            event.key.window = window;
+        } else {
+            window = new Gdk.X11.Window.foreign_for_display(
+                    display as Gdk.X11.Display, xid);
+            event.key.window = window;
+        }
+        handle_emoji_typing(event);
+    }
+}

From 366963d57d1468914611c71929cc64c83be9affd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Tue, 20 Feb 2018 18:57:32 +0900
Subject: [PATCH 453/816] Fix typos in translatable strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BUG=https://github.com/ibus/ibus/pull/1983
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/333670043

Patch from Piotr Drąg <piotrdrag@gmail.com>.
---
 data/ibus.schemas.in    | 6 +++---
 ui/gtk3/emojierapp.vala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 278362d78..4523ccc44 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -64,7 +64,7 @@
       <default>[ara,bg,cz,dev,gr,gur,in,jp(kana),mal,mkd,ru,ua]</default>
       <locale name="C">
         <short>Latin layouts which have no ASCII</short>
-           <long>US layout is appended to the latin layouts. variant can be
+           <long>US layout is appended to the Latin layouts. variant can be
                  omitted.
            </long>
       </locale>
@@ -299,7 +299,7 @@
                   and blue, 3. a RGB color in form 'rgb(r,g,b)' or
                   4. a RGBA color in form 'rgba(r,g,b,a)' where 'r',
                   'g', and 'b' are either integers in the range 0 to 255
-                  or precentage values in the range 0% to 100%, and
+                  or percentage values in the range 0% to 100%, and
                   'a' is a floating point value in the range 0 to 1
                   of the alpha.</long>
       </locale>
@@ -373,7 +373,7 @@
       <default>Monospace 16</default>
       <locale name="C">
         <short>Custom font</short>
-	    <long>Custom font name for emoji chracters on emoji dialog</long>
+	    <long>Custom font name for emoji characters on emoji dialog</long>
       </locale>
     </schema>
     <schema>
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index d816352e7..efedf3440 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -94,7 +94,7 @@ public class EmojiApplication : Application {
               /* TRANSLATORS: "FONT" should be capital and translatable.
                * It's used for an argument command --font=FONT
                */
-              N_("\"FONT\" for emoji chracters on emoji dialog"),
+              N_("\"FONT\" for emoji characters on emoji dialog"),
               N_("FONT") },
             { "lang", 0, 0, OptionArg.STRING, out annotation_lang,
               /* TRANSLATORS: "LANG" should be capital and translatable.

From d1ebb3d77ebfe8f58188261c383d8122e2125fe6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 21 Feb 2018 12:12:11 +0900
Subject: [PATCH 454/816] ui/gtk3: Show code points on Unicode name list dialog

The code points are useful since the list has many names.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/340770043
---
 ui/gtk3/emojier.vala | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 0bf34da8d..c85dfa863 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -198,7 +198,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private class EPaddedLabelBox : Gtk.Box {
         public EPaddedLabelBox(string          text,
                                Gtk.Align       align,
-                               TravelDirection direction=TravelDirection.NONE) {
+                               TravelDirection direction=TravelDirection.NONE,
+                               string?         caption=null) {
             GLib.Object(
                 name : "IBusEmojierPaddedLabelBox",
                 orientation : Gtk.Orientation.HORIZONTAL,
@@ -218,6 +219,11 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
             EPaddedLabel label = new EPaddedLabel(text, align);
             pack_start(label, true, true, 0);
+            if (caption != null) {
+                EPaddedLabel label_r = new EPaddedLabel(caption,
+                                                        Gtk.Align.END);
+                pack_end(label_r, true, true, 0);
+            }
         }
     }
     private class ETitleLabelBox : Gtk.HeaderBar {
@@ -979,9 +985,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         uint n = 0;
         foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
             string name = block.get_name();
+            string caption = "U+%08X".printf(block.get_start());
             EBoxRow row = new EBoxRow(name);
             EPaddedLabelBox widget =
-                    new EPaddedLabelBox(_(name), Gtk.Align.CENTER);
+                    new EPaddedLabelBox(_(name),
+                                        Gtk.Align.CENTER,
+                                        TravelDirection.NONE,
+                                        caption);
             row.add(widget);
             m_list_box.add(row);
             if (n++ == m_category_active_index) {

From fc54b0c051c2eb4a2c1f836b1415def00314cfc1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 21 Feb 2018 12:17:31 +0900
Subject: [PATCH 455/816] ui/gtk3: Load Unicode data when open the dialog by
 default

The emoji data requires about 10MB and the Unicode data requires about 15MB.
Now the emoji data is loaded at the time of startup and the Unicode data
is loaded if users open the dialog at the beginning.
The settings can be customized with gsettings command and the keys
of 'load-emoji-at-startup' and 'load-unicode-at-startup' in
'org.freedesktop.ibus.panel.emoji' schema.

Review URL: https://codereview.appspot.com/340780043
---
 data/ibus.schemas.in      | 32 ++++++++++++++++++++++++++++++
 ui/gtk3/panelbinding.vala | 41 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 4523ccc44..3c6b6f69c 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -455,6 +455,38 @@
                   </long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/load-emoji-at-startup</key>
+      <applyto>/desktop/ibus/panel/emoji/load-emoji-at-startup</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Load the emoji data at the time of startup</short>
+	    <long>Load the emoji data at the time of startup if true.
+                  About 10MB memory is needed to load the data.
+                  Load the emoji data when open the emoji dialog at the
+                  beginning if false.
+            </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/load-unicode-at-startup</key>
+      <applyto>/desktop/ibus/panel/emoji/load-unicode-at-startup</applyto>
+      <owner>ibus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Load the Unicode data at the time of startup</short>
+	    <long>Load the Unicode data at the time of startup if true.
+                  About 15MB memory is needed to load the data.
+                  Load the Unicode data when open the emoji dialog at the
+                  beginning if false.
+                  The Unicode data is always loaded after the emoji data
+                  is loaded even if true.
+            </long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/embed_preedit_text</key>
       <applyto>/desktop/ibus/general/embed_preedit_text</applyto>
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 507001214..1fbf6cfc9 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -35,6 +35,10 @@ class PanelBinding : IBus.PanelService {
     private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
     private GLib.List<BindingCommon.Keybinding> m_keybindings =
             new GLib.List<BindingCommon.Keybinding>();
+    private bool m_load_emoji_at_startup;
+    private bool m_loaded_emoji = false;
+    private bool m_load_unicode_at_startup;
+    private bool m_loaded_unicode = false;
 
     public PanelBinding(IBus.Bus bus) {
         GLib.assert(bus.is_connected());
@@ -109,6 +113,14 @@ class PanelBinding : IBus.PanelService {
         m_settings_emoji.changed["partial-match-condition"].connect((key) => {
                 set_emoji_partial_match();
         });
+
+        m_settings_emoji.changed["load-emoji-at-startup"].connect((key) => {
+                set_load_emoji_at_startup();
+        });
+
+        m_settings_emoji.changed["load-unicode-at-startup"].connect((key) => {
+                set_load_unicode_at_startup();
+        });
     }
 
 
@@ -148,7 +160,11 @@ class PanelBinding : IBus.PanelService {
             IBusEmojier.set_annotation_lang(
                     m_settings_emoji.get_string("lang"));
             m_emojier_set_emoji_lang_id = 0;
-            IBusEmojier.load_unicode_dict();
+            m_loaded_emoji = true;
+            if (m_load_unicode_at_startup && !m_loaded_unicode) {
+                IBusEmojier.load_unicode_dict();
+                m_loaded_unicode = true;
+            }
             return false;
         });
     }
@@ -164,7 +180,21 @@ class PanelBinding : IBus.PanelService {
     }
 
 
+    private void set_load_emoji_at_startup() {
+        m_load_emoji_at_startup =
+            m_settings_emoji.get_boolean("load-emoji-at-startup");
+    }
+
+
+    private void set_load_unicode_at_startup() {
+        m_load_unicode_at_startup =
+            m_settings_emoji.get_boolean("load-unicode-at-startup");
+    }
+
     public void load_settings() {
+
+        set_load_emoji_at_startup();
+        set_load_unicode_at_startup();
         BindingCommon.unbind_switch_shortcut(BindingCommon.KeyEventFuncType.ANY,
                                              m_keybindings);
         bind_emoji_shortcut();
@@ -172,7 +202,8 @@ class PanelBinding : IBus.PanelService {
                                       m_settings_emoji,
                                       ref m_css_provider);
         set_emoji_favorites();
-        set_emoji_lang();
+        if (m_load_emoji_at_startup && !m_loaded_emoji)
+            set_emoji_lang();
         set_emoji_partial_match();
     }
 
@@ -191,6 +222,12 @@ class PanelBinding : IBus.PanelService {
 
 
     private void show_emojier(Gdk.Event event) {
+        if (!m_loaded_emoji)
+            set_emoji_lang();
+        if (!m_loaded_unicode && m_loaded_emoji) {
+            IBusEmojier.load_unicode_dict();
+            m_loaded_unicode = true;
+        }
         m_emojier = new IBusEmojier();
         string emoji = m_emojier.run(m_real_current_context_path, event);
         if (emoji == null) {

From 7ccbd21ca7d163cdd71dc6c0405d8a32d63d324d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 27 Feb 2018 14:06:30 +0900
Subject: [PATCH 456/816] Disable panel extension for gdm user

The gdm user's process is also running while the login user's process
is running so the double panel extensions are better to be avoided for
the memory usage.

Review URL: https://codereview.appspot.com/340330044
---
 bus/main.c | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/bus/main.c b/bus/main.c
index 5b2589b12..fe603778f 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -47,6 +47,10 @@ static gchar *panel_extension = "default";
 static gchar *config = "default";
 static gchar *desktop = "gnome";
 
+static gchar *panel_extension_disable_users[] = {
+    "gdm"
+};
+
 static void
 show_version_and_quit (void)
 {
@@ -170,6 +174,9 @@ _sig_usr2_handler (int sig)
 gint
 main (gint argc, gchar **argv)
 {
+    int i;
+    const gchar *username = ibus_get_user_name ();
+
     setlocale (LC_ALL, "");
 
     GOptionContext *context = g_option_context_new ("- ibus daemon");
@@ -194,9 +201,7 @@ main (gint argc, gchar **argv)
 
     /* check uid */
     {
-        const gchar *username = ibus_get_user_name ();
-        uid_t uid = getuid ();
-        struct passwd *pwd = getpwuid (uid);
+        struct passwd *pwd = getpwuid (getuid ());
 
         if (pwd == NULL || g_strcmp0 (pwd->pw_name, username) != 0) {
             g_printerr ("Please run ibus-daemon with login user! Do not run ibus-daemon with sudo or su.\n");
@@ -237,6 +242,12 @@ main (gint argc, gchar **argv)
     }
 
     bus_server_init ();
+    for (i = 0; i < G_N_ELEMENTS(panel_extension_disable_users); i++) {
+        if (!g_strcmp0 (username, panel_extension_disable_users[i]) != 0) {
+            panel_extension = "disable";
+            break;
+        }
+    }
     if (!single) {
         /* execute config component */
         if (g_strcmp0 (config, "default") == 0) {
@@ -271,25 +282,25 @@ main (gint argc, gchar **argv)
             if (!execute_cmdline (panel))
                 exit (-1);
         }
+    }
 
 #ifdef EMOJI_DICT
-        if (g_strcmp0 (panel_extension, "default") == 0) {
-            BusComponent *component;
-            component = bus_ibus_impl_lookup_component_by_name (
-                    BUS_DEFAULT_IBUS, IBUS_SERVICE_PANEL_EXTENSION);
-            if (component) {
-                bus_component_set_restart (component, restart);
-            }
-            if (component == NULL ||
-                !bus_component_start (component, g_verbose)) {
-                g_printerr ("Can not execute default panel program\n");
-                exit (-1);
-            }
-        } else if (g_strcmp0 (panel_extension, "disable") != 0 &&
-                   g_strcmp0 (panel_extension, "") != 0) {
-            if (!execute_cmdline (panel_extension))
-                exit (-1);
+    if (g_strcmp0 (panel_extension, "default") == 0) {
+        BusComponent *component;
+        component = bus_ibus_impl_lookup_component_by_name (
+                BUS_DEFAULT_IBUS, IBUS_SERVICE_PANEL_EXTENSION);
+        if (component) {
+            bus_component_set_restart (component, restart);
+        }
+        if (component == NULL ||
+            !bus_component_start (component, g_verbose)) {
+            g_printerr ("Can not execute default panel program\n");
+            exit (-1);
         }
+    } else if (g_strcmp0 (panel_extension, "disable") != 0 &&
+               g_strcmp0 (panel_extension, "") != 0) {
+        if (!execute_cmdline (panel_extension))
+            exit (-1);
     }
 #endif
 

From c57b7c34d75871db172e023b0094b979000f62fc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 27 Feb 2018 14:10:29 +0900
Subject: [PATCH 457/816] Enable emoji keybinding in Wayland

XI2 keybinding does not work for the root window in Wayland because
of a security issue maybe. Now I think to move the keybinding in
ibus-extension-gtk3 to each IBusEngine.

FIXME: Unfortunatelly gtk_get_current_event_time() cannot get time
for the delayed DBus events and gtk_window_move() does not work for
GtkDialog without a parent window in Wayland.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/333700043
---
 bus/engineproxy.c         |  19 +-
 bus/ibusimpl.c            |  47 +++-
 bus/inputcontext.c        |  29 ++-
 src/Makefile.am           |   2 +
 src/ibus.h                |   1 +
 src/ibusaccelgroup.c      | 529 ++++++++++++++++++++++++++++++++++++++
 src/ibusaccelgroup.h      |  51 ++++
 src/ibusengine.c          | 179 ++++++++++++-
 ui/gtk3/emojier.vala      |   1 +
 ui/gtk3/extension.vala    |   5 +-
 ui/gtk3/panelbinding.vala |  65 ++---
 11 files changed, 863 insertions(+), 65 deletions(-)
 create mode 100644 src/ibusaccelgroup.c
 create mode 100644 src/ibusaccelgroup.h

diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index cd4d54fd1..175aec569 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -90,6 +90,7 @@ enum {
     CURSOR_DOWN_LOOKUP_TABLE,
     REGISTER_PROPERTIES,
     UPDATE_PROPERTY,
+    PANEL_EXTENSION,
     LAST_SIGNAL,
 };
 
@@ -370,6 +371,17 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
             1,
             IBUS_TYPE_PROPERTY);
 
+    engine_signals[PANEL_EXTENSION] =
+        g_signal_new (I_("panel-extension"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__VARIANT,
+            G_TYPE_NONE,
+            1,
+            G_TYPE_VARIANT);
+
     text_empty = ibus_text_new_from_static_string ("");
     g_object_ref_sink (text_empty);
 
@@ -631,6 +643,11 @@ bus_engine_proxy_g_signal (GDBusProxy  *proxy,
         return;
     }
 
+    if (g_strcmp0 (signal_name, "PanelExtension") == 0) {
+        g_signal_emit (engine, engine_signals[PANEL_EXTENSION], 0, parameters);
+        return;
+    }
+
     g_return_if_reached ();
 }
 
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 58d205cf8..a4ce3d9d8 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -302,9 +302,8 @@ _panel_destroy_cb (BusPanelProxy *panel,
 }
 
 static void
-_panel_panel_extension_cb (BusPanelProxy *panel,
-                           GVariant      *parameters,
-                           BusIBusImpl  *ibus)
+bus_ibus_impl_panel_extension_received (BusIBusImpl *ibus,
+                                        GVariant    *parameters)
 {
     if (!ibus->extension) {
         g_warning ("Panel extension is not running.");
@@ -323,6 +322,14 @@ _panel_panel_extension_cb (BusPanelProxy *panel,
                        -1, NULL, NULL, NULL);
 }
 
+static void
+_panel_panel_extension_cb (BusPanelProxy *panel,
+                           GVariant      *parameters,
+                           BusIBusImpl  *ibus)
+{
+    bus_ibus_impl_panel_extension_received (ibus, parameters);
+}
+
 static void
 _registry_changed_cb (IBusRegistry *registry,
                       BusIBusImpl  *ibus)
@@ -642,6 +649,21 @@ bus_ibus_impl_set_context_engine_from_desc (BusIBusImpl     *ibus,
                                           NULL);
 }
 
+static void
+_context_panel_extension_cb (BusInputContext *context,
+                             GVariant        *parameters,
+                             BusIBusImpl     *ibus)
+{
+    bus_ibus_impl_panel_extension_received (ibus, parameters);
+}
+
+const static struct {
+    const gchar *name;
+    GCallback    callback;
+} context_signals [] = {
+    { "panel-extension",             G_CALLBACK (_context_panel_extension_cb) }
+};
+
 /**
  * bus_ibus_impl_set_focused_context:
  *
@@ -651,6 +673,11 @@ static void
 bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
                                    BusInputContext *context)
 {
+    gint i;
+    BusEngineProxy *engine = NULL;
+    guint purpose = 0;
+    guint hints = 0;
+
     g_assert (BUS_IS_IBUS_IMPL (ibus));
     g_assert (context == NULL || BUS_IS_INPUT_CONTEXT (context));
     g_assert (context == NULL || bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS);
@@ -660,10 +687,6 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
         return;
     }
 
-    BusEngineProxy *engine = NULL;
-    guint purpose = 0;
-    guint hints = 0;
-
     if (ibus->focused_context) {
         if (ibus->use_global_engine) {
             /* dettach engine from the focused context */
@@ -681,6 +704,10 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
 
         bus_input_context_get_content_type (ibus->focused_context,
                                             &purpose, &hints);
+        for (i = 0; i < G_N_ELEMENTS(context_signals); i++) {
+            g_signal_handlers_disconnect_by_func (ibus->focused_context,
+                    context_signals[i].callback, ibus);
+        }
         g_object_unref (ibus->focused_context);
         ibus->focused_context = NULL;
     }
@@ -698,6 +725,12 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
             bus_input_context_set_engine (context, engine);
             bus_input_context_enable (context);
         }
+        for (i = 0; i < G_N_ELEMENTS(context_signals); i++) {
+            g_signal_connect (ibus->focused_context,
+                              context_signals[i].name,
+                              context_signals[i].callback,
+                              ibus);
+        }
 
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_in (ibus->panel, context);
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 4f2ecafc1..a957d1077 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -127,6 +127,7 @@ enum {
     ENGINE_CHANGED,
     REQUEST_ENGINE,
     SET_CONTENT_TYPE,
+    PANEL_EXTENSION,
     LAST_SIGNAL,
 };
 
@@ -598,6 +599,17 @@ bus_input_context_class_init (BusInputContextClass *class)
             G_TYPE_UINT,
             G_TYPE_UINT);
 
+    context_signals[PANEL_EXTENSION] =
+        g_signal_new (I_("panel-extension"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__VARIANT,
+            G_TYPE_NONE,
+            1,
+            G_TYPE_VARIANT);
+
     text_empty = ibus_text_new_from_string ("");
     g_object_ref_sink (text_empty);
     lookup_table_empty = ibus_lookup_table_new (9 /* page size */, 0, FALSE, FALSE);
@@ -2102,6 +2114,20 @@ _engine_update_property_cb (BusEngineProxy  *engine,
     bus_input_context_update_property (context, prop);
 }
 
+/**
+ * _engine_panel_extension_cb:
+ *
+ * A function to be called when "panel-extension" glib signal is sent
+ * from the engine object.
+ */
+static void
+_engine_panel_extension_cb (BusEngineProxy  *engine,
+                            GVariant        *parameters,
+                            BusInputContext *context)
+{
+    g_signal_emit (context, context_signals[PANEL_EXTENSION], 0, parameters);
+}
+
 #define DEFINE_FUNCTION(name)                                   \
     static void                                                 \
     _engine_##name##_cb (BusEngineProxy   *engine,              \
@@ -2244,7 +2270,8 @@ const static struct {
     { "cursor-down-lookup-table", G_CALLBACK (_engine_cursor_down_lookup_table_cb) },
     { "register-properties",      G_CALLBACK (_engine_register_properties_cb) },
     { "update-property",          G_CALLBACK (_engine_update_property_cb) },
-    { "destroy",                  G_CALLBACK (_engine_destroy_cb) },
+    { "panel-extension",          G_CALLBACK (_engine_panel_extension_cb) },
+    { "destroy",                  G_CALLBACK (_engine_destroy_cb) }
 };
 
 static void
diff --git a/src/Makefile.am b/src/Makefile.am
index 72ec05abb..6a62e0f01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ libibus_1_0_la_LDFLAGS =            \
     $(NULL)
 
 ibus_sources =              \
+    ibusaccelgroup.c        \
     ibusattribute.c         \
     ibusattrlist.c          \
     ibusbus.c               \
@@ -122,6 +123,7 @@ ibus_enumtypes_sources =    \
     $(NULL)
 ibus_headers =              \
     ibus.h                  \
+    ibusaccelgroup.h        \
     ibusattribute.h         \
     ibusattrlist.h          \
     ibusbus.h               \
diff --git a/src/ibus.h b/src/ibus.h
index b15dded90..256d57bac 100644
--- a/src/ibus.h
+++ b/src/ibus.h
@@ -60,6 +60,7 @@
 #include <ibusemoji.h>
 #include <ibusunicode.h>
 #include <ibusxevent.h>
+#include <ibusaccelgroup.h>
 
 #ifndef IBUS_DISABLE_DEPRECATED
 #include <ibuskeysyms-compat.h>
diff --git a/src/ibusaccelgroup.c b/src/ibusaccelgroup.c
new file mode 100644
index 000000000..8a81597ec
--- /dev/null
+++ b/src/ibusaccelgroup.c
@@ -0,0 +1,529 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1998, 2001 Tim Janik
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#include "config.h"
+#include <string.h>
+#include <stdlib.h>
+
+#include "ibusaccelgroup.h"
+#include "ibuskeys.h"
+#include "ibuskeysyms.h"
+
+
+/* for _gtk_get_primary_accel_mod() */
+#define _IBUS_GET_PRIMARY_ACCEL_MOD IBUS_CONTROL_MASK
+
+/**
+ * SECTION: ibusaccelgroup
+ * @short_description: Groups of global keyboard accelerators for an
+ *     entire GtkWindow
+ * @title: Accelerator Groups
+ * @stability: Unstable
+ *
+ * Provides ibus_accelerator_parse()
+ */
+
+
+/**
+ * ibus_accelerator_valid:
+ * @keyval: a GDK keyval
+ * @modifiers: modifier mask
+ *
+ * Determines whether a given keyval and modifier mask constitute
+ * a valid keyboard accelerator. For example, the #IBUS_KEY_a keyval
+ * plus #IBUS_CONTROL_MASK is valid - this is a “Ctrl+a” accelerator.
+ * But, you can't, for instance, use the #IBUS_KEY_Control_L keyval
+ * as an accelerator.
+ *
+ * Returns: %TRUE if the accelerator is valid
+ */
+gboolean
+ibus_accelerator_valid (guint           keyval,
+                        IBusModifierType modifiers)
+{
+    static const guint invalid_accelerator_vals[] = {
+        IBUS_KEY_Shift_L, IBUS_KEY_Shift_R, IBUS_KEY_Shift_Lock,
+        IBUS_KEY_Caps_Lock, IBUS_KEY_ISO_Lock, IBUS_KEY_Control_L,
+        IBUS_KEY_Control_R, IBUS_KEY_Meta_L, IBUS_KEY_Meta_R,
+        IBUS_KEY_Alt_L, IBUS_KEY_Alt_R, IBUS_KEY_Super_L, IBUS_KEY_Super_R,
+        IBUS_KEY_Hyper_L, IBUS_KEY_Hyper_R, IBUS_KEY_ISO_Level3_Shift,
+        IBUS_KEY_ISO_Next_Group, IBUS_KEY_ISO_Prev_Group,
+        IBUS_KEY_ISO_First_Group, IBUS_KEY_ISO_Last_Group,
+        IBUS_KEY_Mode_switch, IBUS_KEY_Num_Lock, IBUS_KEY_Multi_key,
+        IBUS_KEY_Scroll_Lock, IBUS_KEY_Sys_Req,
+        IBUS_KEY_Tab, IBUS_KEY_ISO_Left_Tab, IBUS_KEY_KP_Tab,
+        IBUS_KEY_First_Virtual_Screen, IBUS_KEY_Prev_Virtual_Screen,
+        IBUS_KEY_Next_Virtual_Screen, IBUS_KEY_Last_Virtual_Screen,
+        IBUS_KEY_Terminate_Server, IBUS_KEY_AudibleBell_Enable,
+        0
+    };
+    static const guint invalid_unmodified_vals[] = {
+        IBUS_KEY_Up, IBUS_KEY_Down, IBUS_KEY_Left, IBUS_KEY_Right,
+        IBUS_KEY_KP_Up, IBUS_KEY_KP_Down, IBUS_KEY_KP_Left, IBUS_KEY_KP_Right,
+        0
+    };
+    const guint *ac_val;
+
+    modifiers &= IBUS_MODIFIER_MASK;
+
+    if (keyval <= 0xFF)
+        return keyval >= 0x20;
+
+    ac_val = invalid_accelerator_vals;
+    while (*ac_val) {
+        if (keyval == *ac_val++)
+            return FALSE;
+    }
+
+    if (!modifiers) {
+        ac_val = invalid_unmodified_vals;
+        while (*ac_val) {
+            if (keyval == *ac_val++)
+                return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+static inline gboolean
+is_alt (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'a' || string[1] == 'A') &&
+            (string[2] == 'l' || string[2] == 'L') &&
+            (string[3] == 't' || string[3] == 'T') &&
+            (string[4] == '>'));
+}
+
+static inline gboolean
+is_ctl (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'c' || string[1] == 'C') &&
+            (string[2] == 't' || string[2] == 'T') &&
+            (string[3] == 'l' || string[3] == 'L') &&
+            (string[4] == '>'));
+}
+
+static inline gboolean
+is_modx (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'm' || string[1] == 'M') &&
+            (string[2] == 'o' || string[2] == 'O') &&
+            (string[3] == 'd' || string[3] == 'D') &&
+            (string[4] >= '1' && string[4] <= '5') &&
+            (string[5] == '>'));
+}
+
+static inline gboolean
+is_ctrl (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'c' || string[1] == 'C') &&
+            (string[2] == 't' || string[2] == 'T') &&
+            (string[3] == 'r' || string[3] == 'R') &&
+            (string[4] == 'l' || string[4] == 'L') &&
+            (string[5] == '>'));
+}
+
+static inline gboolean
+is_shft (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 's' || string[1] == 'S') &&
+            (string[2] == 'h' || string[2] == 'H') &&
+            (string[3] == 'f' || string[3] == 'F') &&
+            (string[4] == 't' || string[4] == 'T') &&
+            (string[5] == '>'));
+}
+
+static inline gboolean
+is_shift (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 's' || string[1] == 'S') &&
+            (string[2] == 'h' || string[2] == 'H') &&
+            (string[3] == 'i' || string[3] == 'I') &&
+            (string[4] == 'f' || string[4] == 'F') &&
+            (string[5] == 't' || string[5] == 'T') &&
+            (string[6] == '>'));
+}
+
+static inline gboolean
+is_control (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'c' || string[1] == 'C') &&
+            (string[2] == 'o' || string[2] == 'O') &&
+            (string[3] == 'n' || string[3] == 'N') &&
+            (string[4] == 't' || string[4] == 'T') &&
+            (string[5] == 'r' || string[5] == 'R') &&
+            (string[6] == 'o' || string[6] == 'O') &&
+            (string[7] == 'l' || string[7] == 'L') &&
+            (string[8] == '>'));
+}
+
+static inline gboolean
+is_release (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'r' || string[1] == 'R') &&
+            (string[2] == 'e' || string[2] == 'E') &&
+            (string[3] == 'l' || string[3] == 'L') &&
+            (string[4] == 'e' || string[4] == 'E') &&
+            (string[5] == 'a' || string[5] == 'A') &&
+            (string[6] == 's' || string[6] == 'S') &&
+            (string[7] == 'e' || string[7] == 'E') &&
+            (string[8] == '>'));
+}
+
+static inline gboolean
+is_meta (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'm' || string[1] == 'M') &&
+            (string[2] == 'e' || string[2] == 'E') &&
+            (string[3] == 't' || string[3] == 'T') &&
+            (string[4] == 'a' || string[4] == 'A') &&
+            (string[5] == '>'));
+}
+
+static inline gboolean
+is_super (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 's' || string[1] == 'S') &&
+            (string[2] == 'u' || string[2] == 'U') &&
+            (string[3] == 'p' || string[3] == 'P') &&
+            (string[4] == 'e' || string[4] == 'E') &&
+            (string[5] == 'r' || string[5] == 'R') &&
+            (string[6] == '>'));
+}
+
+static inline gboolean
+is_hyper (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'h' || string[1] == 'H') &&
+            (string[2] == 'y' || string[2] == 'Y') &&
+            (string[3] == 'p' || string[3] == 'P') &&
+            (string[4] == 'e' || string[4] == 'E') &&
+            (string[5] == 'r' || string[5] == 'R') &&
+            (string[6] == '>'));
+}
+
+static inline gboolean
+is_primary (const gchar *string)
+{
+    return ((string[0] == '<') &&
+            (string[1] == 'p' || string[1] == 'P') &&
+            (string[2] == 'r' || string[2] == 'R') &&
+            (string[3] == 'i' || string[3] == 'I') &&
+            (string[4] == 'm' || string[4] == 'M') &&
+            (string[5] == 'a' || string[5] == 'A') &&
+            (string[6] == 'r' || string[6] == 'R') &&
+            (string[7] == 'y' || string[7] == 'Y') &&
+            (string[8] == '>'));
+}
+
+static inline gboolean
+is_keycode (const gchar *string)
+{
+    return (string[0] == '0' &&
+            string[1] == 'x' &&
+            g_ascii_isxdigit (string[2]) &&
+            g_ascii_isxdigit (string[3]));
+}
+
+/**
+ * ibus_accelerator_parse:
+ * @accelerator: string representing an accelerator
+ * @accelerator_key: (out) (allow-none): return location for accelerator
+ *     keyval, or %NULL
+ * @accelerator_mods: (out) (allow-none): return location for accelerator
+ *     modifier mask, %NULL
+ *
+ * Parses a string representing an accelerator. The format looks like
+ * “<Control>a” or “<Shift><Alt>F1” or “<Release>z” (the last one is
+ * for key release).
+ *
+ * The parser is fairly liberal and allows lower or upper case, and also
+ * abbreviations such as “<Ctl>” and “<Ctrl>”. Key names are parsed using
+ * gdk_keyval_from_name(). For character keys the name is not the symbol,
+ * but the lowercase name, e.g. one would use “<Ctrl>minus” instead of
+ * “<Ctrl>-”.
+ *
+ * If the parse fails, @accelerator_key and @accelerator_mods will
+ * be set to 0 (zero).
+ *
+ * Since: 1.5.18
+ */
+void
+ibus_accelerator_parse (const gchar      *accelerator,
+                        guint            *accelerator_key,
+                        IBusModifierType *accelerator_mods)
+{
+    guint keyval;
+    IBusModifierType mods;
+    gint len;
+    gboolean error;
+
+    if (accelerator_key)
+        *accelerator_key = 0;
+    if (accelerator_mods)
+        *accelerator_mods = 0;
+    g_return_if_fail (accelerator != NULL);
+
+    error = FALSE;
+    keyval = 0;
+    mods = 0;
+    len = strlen (accelerator);
+    while (len) {
+        if (*accelerator == '<') {
+            if (len >= 9 && is_release (accelerator)) {
+                accelerator += 9;
+                len -= 9;
+                mods |= IBUS_RELEASE_MASK;
+            } else if (len >= 9 && is_primary (accelerator)) {
+                accelerator += 9;
+                len -= 9;
+                mods |= _IBUS_GET_PRIMARY_ACCEL_MOD;
+            } else if (len >= 9 && is_control (accelerator)) {
+                accelerator += 9;
+                len -= 9;
+                mods |= IBUS_CONTROL_MASK;
+            } else if (len >= 7 && is_shift (accelerator)) {
+                accelerator += 7;
+                len -= 7;
+                mods |= IBUS_SHIFT_MASK;
+            } else if (len >= 6 && is_shft (accelerator)) {
+                accelerator += 6;
+                len -= 6;
+                mods |= IBUS_SHIFT_MASK;
+            } else if (len >= 6 && is_ctrl (accelerator)) {
+                accelerator += 6;
+                len -= 6;
+                mods |= IBUS_CONTROL_MASK;
+            } else if (len >= 6 && is_modx (accelerator)) {
+                static const guint mod_vals[] = {
+                    IBUS_MOD1_MASK, IBUS_MOD2_MASK, IBUS_MOD3_MASK,
+                    IBUS_MOD4_MASK, IBUS_MOD5_MASK
+                };
+
+                len -= 6;
+                accelerator += 4;
+                mods |= mod_vals[*accelerator - '1'];
+                accelerator += 2;
+            } else if (len >= 5 && is_ctl (accelerator)) {
+                accelerator += 5;
+                len -= 5;
+                mods |= IBUS_CONTROL_MASK;
+            } else if (len >= 5 && is_alt (accelerator)) {
+                accelerator += 5;
+                len -= 5;
+                mods |= IBUS_MOD1_MASK;
+            } else if (len >= 6 && is_meta (accelerator)) {
+                accelerator += 6;
+                len -= 6;
+                mods |= IBUS_META_MASK;
+            } else if (len >= 7 && is_hyper (accelerator)) {
+                accelerator += 7;
+                len -= 7;
+                mods |= IBUS_HYPER_MASK;
+            } else if (len >= 7 && is_super (accelerator)) {
+                accelerator += 7;
+                len -= 7;
+                mods |= IBUS_SUPER_MASK;
+            } else {
+                gchar last_ch;
+
+                last_ch = *accelerator;
+                while (last_ch && last_ch != '>') {
+                    last_ch = *accelerator;
+                    accelerator += 1;
+                    len -= 1;
+                }
+            }
+        } else {
+            if (len >= 4 && is_keycode (accelerator)) {
+                /* There was a keycode in the string, but
+                 * we cannot store it, so we have an error */
+                error = TRUE;
+                goto out;
+            } else {
+	        keyval = ibus_keyval_from_name (accelerator);
+	        if (keyval == IBUS_KEY_VoidSymbol) {
+	            error = TRUE;
+	            goto out;
+		}
+	    }
+
+            accelerator += len;
+            len -= len;
+        }
+    }
+
+out:
+    if (error)
+        keyval = mods = 0;
+
+    if (accelerator_key)
+        *accelerator_key = ibus_keyval_to_lower (keyval);
+    if (accelerator_mods)
+        *accelerator_mods = mods;
+}
+
+/**
+ * ibus_accelerator_name:
+ * @accelerator_key: accelerator keyval
+ * @accelerator_mods: accelerator modifier mask
+ *
+ * Converts an accelerator keyval and modifier mask into a string
+ * parseable by gtk_accelerator_parse(). For example, if you pass in
+ * #IBUS_KEY_q and #IBUS_CONTROL_MASK, this function returns “<Control>q”.
+ *
+ * If you need to display accelerators in the user interface,
+ * see gtk_accelerator_get_label().
+ *
+ * Returns: a newly-allocated accelerator name
+ */
+gchar*
+ibus_accelerator_name (guint            accelerator_key,
+                       IBusModifierType accelerator_mods)
+{
+   static const gchar text_release[] = "<Release>";
+   static const gchar text_primary[] = "<Primary>";
+   static const gchar text_shift[] = "<Shift>";
+   static const gchar text_control[] = "<Control>";
+   static const gchar text_mod1[] = "<Alt>";
+   static const gchar text_mod2[] = "<Mod2>";
+   static const gchar text_mod3[] = "<Mod3>";
+   static const gchar text_mod4[] = "<Mod4>";
+   static const gchar text_mod5[] = "<Mod5>";
+   static const gchar text_meta[] = "<Meta>";
+   static const gchar text_super[] = "<Super>";
+   static const gchar text_hyper[] = "<Hyper>";
+   IBusModifierType saved_mods;
+   guint l;
+   const gchar *keyval_name;
+   gchar *accelerator;
+
+    accelerator_mods &= IBUS_MODIFIER_MASK;
+
+    keyval_name = ibus_keyval_name (ibus_keyval_to_lower (accelerator_key));
+    if (!keyval_name)
+        keyval_name = "";
+
+    saved_mods = accelerator_mods;
+    l = 0;
+    if (accelerator_mods & IBUS_RELEASE_MASK)
+        l += sizeof (text_release) - 1;
+    if (accelerator_mods & _IBUS_GET_PRIMARY_ACCEL_MOD) {
+        l += sizeof (text_primary) - 1;
+        /* consume the default accel */
+        accelerator_mods &= ~_IBUS_GET_PRIMARY_ACCEL_MOD;
+    }
+    if (accelerator_mods & IBUS_SHIFT_MASK)
+        l += sizeof (text_shift) - 1;
+    if (accelerator_mods & IBUS_CONTROL_MASK)
+        l += sizeof (text_control) - 1;
+    if (accelerator_mods & IBUS_MOD1_MASK)
+        l += sizeof (text_mod1) - 1;
+    if (accelerator_mods & IBUS_MOD2_MASK)
+        l += sizeof (text_mod2) - 1;
+    if (accelerator_mods & IBUS_MOD3_MASK)
+        l += sizeof (text_mod3) - 1;
+    if (accelerator_mods & IBUS_MOD4_MASK)
+        l += sizeof (text_mod4) - 1;
+    if (accelerator_mods & IBUS_MOD5_MASK)
+        l += sizeof (text_mod5) - 1;
+    l += strlen (keyval_name);
+    if (accelerator_mods & IBUS_META_MASK)
+        l += sizeof (text_meta) - 1;
+    if (accelerator_mods & IBUS_HYPER_MASK)
+        l += sizeof (text_hyper) - 1;
+    if (accelerator_mods & IBUS_SUPER_MASK)
+        l += sizeof (text_super) - 1;
+
+    accelerator = g_new (gchar, l + 1);
+
+    accelerator_mods = saved_mods;
+    l = 0;
+    accelerator[l] = 0;
+    if (accelerator_mods & IBUS_RELEASE_MASK) {
+        strcpy (accelerator + l, text_release);
+        l += sizeof (text_release) - 1;
+    }
+    if (accelerator_mods & _IBUS_GET_PRIMARY_ACCEL_MOD) {
+        strcpy (accelerator + l, text_primary);
+        l += sizeof (text_primary) - 1;
+        /* consume the default accel */
+        accelerator_mods &= ~_IBUS_GET_PRIMARY_ACCEL_MOD;
+    }
+    if (accelerator_mods & IBUS_SHIFT_MASK) {
+        strcpy (accelerator + l, text_shift);
+        l += sizeof (text_shift) - 1;
+    }
+    if (accelerator_mods & IBUS_CONTROL_MASK) {
+        strcpy (accelerator + l, text_control);
+        l += sizeof (text_control) - 1;
+    }
+    if (accelerator_mods & IBUS_MOD1_MASK) {
+        strcpy (accelerator + l, text_mod1);
+        l += sizeof (text_mod1) - 1;
+    }
+    if (accelerator_mods & IBUS_MOD2_MASK) {
+        strcpy (accelerator + l, text_mod2);
+        l += sizeof (text_mod2) - 1;
+    }
+    if (accelerator_mods & IBUS_MOD3_MASK) {
+        strcpy (accelerator + l, text_mod3);
+        l += sizeof (text_mod3) - 1;
+    }
+    if (accelerator_mods & IBUS_MOD4_MASK) {
+        strcpy (accelerator + l, text_mod4);
+        l += sizeof (text_mod4) - 1;
+    }
+    if (accelerator_mods & IBUS_MOD5_MASK) {
+        strcpy (accelerator + l, text_mod5);
+        l += sizeof (text_mod5) - 1;
+    }
+    if (accelerator_mods & IBUS_META_MASK) {
+        strcpy (accelerator + l, text_meta);
+        l += sizeof (text_meta) - 1;
+    }
+    if (accelerator_mods & IBUS_HYPER_MASK) {
+        strcpy (accelerator + l, text_hyper);
+        l += sizeof (text_hyper) - 1;
+    }
+    if (accelerator_mods & IBUS_SUPER_MASK) {
+        strcpy (accelerator + l, text_super);
+        l += sizeof (text_super) - 1;
+    }
+    strcpy (accelerator + l, keyval_name);
+
+    return accelerator;
+}
diff --git a/src/ibusaccelgroup.h b/src/ibusaccelgroup.h
new file mode 100644
index 000000000..cb38bee40
--- /dev/null
+++ b/src/ibusaccelgroup.h
@@ -0,0 +1,51 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1998, 2001 Tim Janik
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __IBUS_ACCEL_GROUP_H_
+#define __IBUS_ACCEL_GROUP_H_
+
+
+#if !defined (__IBUS_H_INSIDE__) && !defined (IBUS_COMPILATION)
+#error "Only <ibus.h> can be included directly"
+#endif
+
+#include <glib.h>
+#include <ibustypes.h>
+
+G_BEGIN_DECLS
+
+
+/* --- Accelerators--- */
+gboolean ibus_accelerator_valid               (guint            keyval,
+                                               IBusModifierType modifiers)
+                                               G_GNUC_CONST;
+void     ibus_accelerator_parse               (const gchar      *accelerator,
+                                               guint            *accelerator_key,
+                                               IBusModifierType *accelerator_mods);
+gchar*   ibus_accelerator_name                (guint            accelerator_key,
+                                               IBusModifierType accelerator_mods);
+
+G_END_DECLS
+
+#endif /* __IBUS_ACCEL_GROUP_H_ */
diff --git a/src/ibusengine.c b/src/ibusengine.c
index da648d11f..9a0b1a8ad 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -20,12 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
-#include "ibusengine.h"
 #include <stdarg.h>
 #include <string.h>
+
+#include "ibusaccelgroup.h"
+#include "ibusengine.h"
+#include "ibuskeysyms.h"
 #include "ibusmarshalers.h"
 #include "ibusinternal.h"
 #include "ibusshare.h"
+#include "ibusxevent.h"
 
 #define IBUS_ENGINE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE, IBusEnginePrivate))
@@ -60,6 +64,8 @@ enum {
 };
 
 
+typedef struct _IBusEngineKeybinding IBusEngineKeybinding;
+
 /* IBusEnginePriv */
 struct _IBusEnginePrivate {
     gchar *engine_name;
@@ -74,11 +80,19 @@ struct _IBusEnginePrivate {
     /* cached content-type */
     guint content_purpose;
     guint content_hints;
+
+    GSettings             *settings_emoji;
+    IBusEngineKeybinding **emoji_keybindings;
+};
+
+struct _IBusEngineKeybinding {
+    guint            keyval;
+    IBusModifierType modifiers;
 };
 
 static guint            engine_signals[LAST_SIGNAL] = { 0 };
 
-static IBusText *text_empty = NULL;
+static IBusText *text_empty;
 
 /* functions prototype */
 static void      ibus_engine_destroy         (IBusEngine         *engine);
@@ -176,6 +190,11 @@ static void      ibus_engine_dbus_property_changed
                                              (IBusEngine         *engine,
                                               const gchar        *property_name,
                                               GVariant           *value);
+static void      ibus_engine_keybinding_free (IBusEngine         *engine);
+static void      settings_emoji_hotkey_changed_cb 
+                                             (GSettings          *settings,
+                                              const gchar        *key,
+                                              gpointer            data);
 
 
 G_DEFINE_TYPE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
@@ -263,11 +282,27 @@ static const gchar introspection_xml[] =
     "      <arg type='u' name='keycode' />"
     "      <arg type='u' name='state' />"
     "    </signal>"
+    "    <signal name='PanelExtension'>"
+    "      <arg type='v' name='data' />"
+    "    </signal>"
     /* FIXME properties */
     "    <property name='ContentType' type='(uu)' access='write' />"
     "  </interface>"
     "</node>";
 
+static const guint IBUS_MODIFIER_FILTER =
+        IBUS_MODIFIER_MASK & ~(
+        IBUS_LOCK_MASK |  /* Caps Lock */
+        IBUS_MOD2_MASK |  /* Num Lock */
+        IBUS_BUTTON1_MASK |
+        IBUS_BUTTON2_MASK |
+        IBUS_BUTTON3_MASK |
+        IBUS_BUTTON4_MASK |
+        IBUS_BUTTON5_MASK |
+        IBUS_SUPER_MASK |
+        IBUS_HYPER_MASK |
+        IBUS_META_MASK);
+
 static void
 ibus_engine_class_init (IBusEngineClass *class)
 {
@@ -802,9 +837,15 @@ ibus_engine_class_init (IBusEngineClass *class)
 static void
 ibus_engine_init (IBusEngine *engine)
 {
-    engine->priv = IBUS_ENGINE_GET_PRIVATE (engine);
-
-    engine->priv->surrounding_text = g_object_ref_sink (text_empty);
+    IBusEnginePrivate *priv;
+    engine->priv = priv = IBUS_ENGINE_GET_PRIVATE (engine);
+
+    priv->surrounding_text = g_object_ref_sink (text_empty);
+    priv->settings_emoji =
+            g_settings_new ("org.freedesktop.ibus.panel.emoji");
+    settings_emoji_hotkey_changed_cb (priv->settings_emoji, "hotkey", engine);
+    g_signal_connect (priv->settings_emoji, "changed::hotkey",
+                      G_CALLBACK (settings_emoji_hotkey_changed_cb), engine);
 }
 
 static void
@@ -817,6 +858,7 @@ ibus_engine_destroy (IBusEngine *engine)
         g_object_unref (engine->priv->surrounding_text);
         engine->priv->surrounding_text = NULL;
     }
+    ibus_engine_keybinding_free (engine);
 
     IBUS_OBJECT_CLASS(ibus_engine_parent_class)->destroy (IBUS_OBJECT (engine));
 }
@@ -852,6 +894,53 @@ ibus_engine_get_property (IBusEngine *engine,
     }
 }
 
+static void
+ibus_engine_panel_extension (IBusEngine *engine)
+{
+    IBusXEvent *xevent = ibus_x_event_new (
+            "event-type", IBUS_X_EVENT_KEY_PRESS,
+            "purpose", "emoji",
+            NULL);
+    GVariant *data = ibus_serializable_serialize_object (
+            IBUS_SERIALIZABLE (xevent));
+
+    g_assert (data != NULL);
+    ibus_engine_emit_signal (engine,
+                             "PanelExtension",
+                             g_variant_new ("(v)", data));
+}
+
+static gboolean
+ibus_engine_filter_key_event (IBusEngine *engine,
+                              guint       keyval,
+                              guint       keycode,
+                              guint       state)
+{
+    IBusEnginePrivate *priv;
+    int i;
+    guint modifiers;
+
+    if ((state & IBUS_RELEASE_MASK) != 0)
+        return FALSE;
+    g_return_val_if_fail (IBUS_IS_ENGINE (engine), FALSE);
+
+    priv = engine->priv;
+    modifiers = state & IBUS_MODIFIER_FILTER;
+    if (keyval >= IBUS_KEY_A && keyval <= IBUS_KEY_Z &&
+        (modifiers & IBUS_SHIFT_MASK) != 0) {
+        keyval = keyval - IBUS_KEY_A + IBUS_KEY_a;
+    }
+    for (i = 0; priv->emoji_keybindings[i]; i++) {
+        IBusEngineKeybinding *binding = priv->emoji_keybindings[i];
+        if (binding->keyval == keyval &&
+            binding->modifiers == modifiers) {
+            ibus_engine_panel_extension (engine);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 static gboolean
 ibus_engine_service_authorized_method (IBusService     *service,
                                        GDBusConnection *connection)
@@ -892,6 +981,7 @@ ibus_engine_service_method_call (IBusService           *service,
     if (g_strcmp0 (method_name, "ProcessKeyEvent") == 0) {
         guint keyval, keycode, state;
         gboolean retval = FALSE;
+
         g_variant_get (parameters, "(uuu)", &keyval, &keycode, &state);
         g_signal_emit (engine,
                        engine_signals[PROCESS_KEY_EVENT],
@@ -900,6 +990,12 @@ ibus_engine_service_method_call (IBusService           *service,
                        keycode,
                        state,
                        &retval);
+        if (!retval) {
+            retval = ibus_engine_filter_key_event (engine,
+                                                   keyval,
+                                                   keycode,
+                                                   state);
+        }
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", retval));
         return;
     }
@@ -1338,6 +1434,79 @@ ibus_engine_dbus_property_changed (IBusEngine  *engine,
     g_object_unref (message);
 }
 
+static void
+ibus_engine_keybinding_free (IBusEngine *engine)
+{
+    IBusEnginePrivate *priv;
+    int i;
+
+    g_return_if_fail (IBUS_IS_ENGINE (engine));
+
+    priv = engine->priv;
+    if (priv->emoji_keybindings) {
+        for (i = 0; priv->emoji_keybindings[i]; i++)
+            g_slice_free (IBusEngineKeybinding, priv->emoji_keybindings[i]);
+        g_clear_pointer (&priv->emoji_keybindings, g_free);
+    }
+}
+
+static IBusEngineKeybinding *
+ibus_engine_keybinding_new (IBusEngine  *engine,
+                            const gchar *accelerator)
+{
+    guint keyval = 0U;
+    IBusModifierType modifiers = 0;
+    IBusEngineKeybinding *binding = NULL;
+
+    ibus_accelerator_parse (accelerator, &keyval, &modifiers);
+    if (keyval == 0U && modifiers == 0) {
+        g_warning ("Failed to parse shortcut key '%s'", accelerator);
+        return NULL;
+    }
+    if (modifiers & IBUS_SUPER_MASK) {
+        modifiers^=IBUS_SUPER_MASK;
+        modifiers|=IBUS_MOD4_MASK;
+    }
+
+    binding = g_slice_new0 (IBusEngineKeybinding);
+    binding->keyval = keyval;
+    binding->modifiers = modifiers;
+    return binding;
+}
+
+static void
+settings_emoji_hotkey_changed_cb (GSettings   *settings,
+                                  const gchar *key,
+                                  gpointer     data)
+{
+    IBusEngine *engine;
+    IBusEnginePrivate *priv;
+    gchar **accelerators;
+    int i, j, length;
+    g_return_if_fail (IBUS_IS_ENGINE (data));
+    engine = IBUS_ENGINE (data);
+    priv = engine->priv;
+
+    if (g_strcmp0 (key, "hotkey") != 0)
+        return;
+    accelerators = g_settings_get_strv (settings, key);
+    length = g_strv_length (accelerators);
+    ibus_engine_keybinding_free (engine);
+    if (length == 0) {
+        g_strfreev (accelerators);
+        return;
+    }
+    priv->emoji_keybindings = g_new0 (IBusEngineKeybinding*, length + 1);
+    for (i = 0, j = 0; i < length; i++) {
+        IBusEngineKeybinding *binding =
+                ibus_engine_keybinding_new (engine, accelerators[i]);
+        if (!binding)
+            continue;
+        priv->emoji_keybindings[j++] = binding;
+    }
+    g_strfreev (accelerators);
+}
+
 IBusEngine *
 ibus_engine_new (const gchar     *engine_name,
                  const gchar     *object_path,
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index c85dfa863..8217a000b 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2062,6 +2062,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         // Do not hide a bottom panel in XFCE4
         if (work_area.y < y)
             y = work_area.y;
+        // FIXME: move() does not work in Wayland
         move(x, y);
 
         uint32 timestamp = event.get_time();
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index a170280bb..03026d001 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -115,8 +115,9 @@ class ExtensionGtk {
         // and Ctrl-Shift-e when ibus-ui-gtk3 runs after the
         // desktop is launched.
         GLib.Environment.unset_variable("GDK_CORE_DEVICE_EVENTS");
-        // for Gdk.X11.get_default_xdisplay()
-        Gdk.set_allowed_backends("x11");
+        // Gdk.set_allowed_backends("x11") let present_with_time() failed on
+        // launching the dialog secondly in Wayland.
+        //Gdk.set_allowed_backends("x11");
 
         ExtensionGtk extension = new ExtensionGtk(argv);
         extension.run();
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 1fbf6cfc9..e3f39e12d 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -33,8 +33,6 @@ class PanelBinding : IBus.PanelService {
     private string[] m_emojier_favorites = {};
     private Gtk.CssProvider m_css_provider;
     private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
-    private GLib.List<BindingCommon.Keybinding> m_keybindings =
-            new GLib.List<BindingCommon.Keybinding>();
     private bool m_load_emoji_at_startup;
     private bool m_loaded_emoji = false;
     private bool m_load_unicode_at_startup;
@@ -49,15 +47,6 @@ class PanelBinding : IBus.PanelService {
         m_bus = bus;
 
         init_settings();
-
-        bind_emoji_shortcut();
-    }
-
-
-    ~PanelBinding() {
-        BindingCommon.unbind_switch_shortcut(
-                BindingCommon.KeyEventFuncType.ANY,
-                m_keybindings);
     }
 
 
@@ -77,13 +66,6 @@ class PanelBinding : IBus.PanelService {
                                               ref m_css_provider);
         });
 
-        m_settings_emoji.changed["hotkey"].connect((key) => {
-                BindingCommon.unbind_switch_shortcut(
-                        BindingCommon.KeyEventFuncType.EMOJI_TYPING,
-                        m_keybindings);
-                bind_emoji_shortcut();
-        });
-
         m_settings_emoji.changed["font"].connect((key) => {
                 BindingCommon.set_custom_font(m_settings_panel,
                                               m_settings_emoji,
@@ -124,25 +106,6 @@ class PanelBinding : IBus.PanelService {
     }
 
 
-    private void bind_emoji_shortcut() {
-#if EMOJI_DICT
-        string[] accelerators = m_settings_emoji.get_strv("hotkey");
-
-        var keybinding_manager = KeybindingManager.get_instance();
-
-        foreach (var accelerator in accelerators) {
-            BindingCommon.keybinding_manager_bind(
-                    keybinding_manager,
-                    ref m_keybindings,
-                    accelerator,
-                    BindingCommon.KeyEventFuncType.EMOJI_TYPING,
-                    handle_emoji_typing,
-                    null);
-        }
-#endif
-    }
-
-
     private void set_emoji_favorites() {
         m_emojier_favorites = m_settings_emoji.get_strv("favorites");
         IBusEmojier.set_favorites(
@@ -195,9 +158,6 @@ class PanelBinding : IBus.PanelService {
 
         set_load_emoji_at_startup();
         set_load_unicode_at_startup();
-        BindingCommon.unbind_switch_shortcut(BindingCommon.KeyEventFuncType.ANY,
-                                             m_keybindings);
-        bind_emoji_shortcut();
         BindingCommon.set_custom_font(m_settings_panel,
                                       m_settings_emoji,
                                       ref m_css_provider);
@@ -354,19 +314,26 @@ class PanelBinding : IBus.PanelService {
             return;
         }
         Gdk.Event event = new Gdk.Event(event_type);
-        event.key.time = xevent.get_time();
-        Gdk.Display? display = Gdk.Display.get_default();
+        uint32 time = xevent.get_time();
+        if (time == 0)
+            time = Gtk.get_current_event_time();
+        event.key.time = time;
         X.Window xid = xevent.get_window();
-        Gdk.X11.Window window;
-        window = Gdk.X11.Window.lookup_for_display(
-                display as Gdk.X11.Display, xid);
-        if (window != null) {
-            event.key.window = window;
-        } else {
+        Gdk.Display? display = Gdk.Display.get_default();
+        Gdk.Window? window = null;
+        if (window == null && xid != 0) {
+            window = Gdk.X11.Window.lookup_for_display(
+                    display as Gdk.X11.Display, xid);
+        }
+        if (window == null && xid != 0) {
             window = new Gdk.X11.Window.foreign_for_display(
                     display as Gdk.X11.Display, xid);
-            event.key.window = window;
         }
+        if (window == null) {
+            window = Gdk.get_default_root_window();
+            window.ref();
+        }
+        event.key.window = window;
         handle_emoji_typing(event);
     }
 }

From 56c67b1362344e2ab4a061bcc913c455b190ef20 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2018 15:37:15 +0900
Subject: [PATCH 458/816] ui/gtk3: Set title string in gnome-shell

gnome-shell uses .desktop files to get the application title names.
Probably the reason is to manage any windows and Xorg and Wayland.

BUG=https://mail.gnome.org/archives/gtk-app-devel-list/2018-February/msg00027.html
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/338520043
---
 po/POTFILES.in                            |  2 ++
 ui/gtk3/Makefile.am                       | 27 +++++++++++++++++++++++
 ui/gtk3/emojierapp.vala                   |  7 ++++--
 ui/gtk3/extension.vala                    | 27 ++++++++++++++---------
 ui/gtk3/ibus-extension-gtk3.desktop.in.in |  6 +++++
 ui/gtk3/ibus-ui-emojier.desktop.in.in     |  6 +++++
 ui/gtk3/panelbinding.vala                 |  9 +++++++-
 7 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 ui/gtk3/ibus-extension-gtk3.desktop.in.in
 create mode 100644 ui/gtk3/ibus-ui-emojier.desktop.in.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 58d1e39d5..c81292d2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -61,6 +61,8 @@ ui/gtk3/candidatepanel.vala
 ui/gtk3/emojier.vala
 ui/gtk3/emojierapp.vala
 ui/gtk3/handle.vala
+ui/gtk3/ibus-extension-gtk3.desktop.in.in
+ui/gtk3/ibus-ui-emojier.desktop.in.in
 ui/gtk3/iconwidget.vala
 ui/gtk3/keybindingmanager.vala
 ui/gtk3/panel.vala
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 0a8f42001..bf9f98d76 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -161,6 +161,8 @@ EXTRA_DIST =                            \
     gtkpanel.xml.in                     \
     notification-item.xml               \
     notification-watcher.xml            \
+    ibus-ui-emojier.desktop.in.in       \
+    ibus-extension-gtk3.desktop.in.in   \
     panelbinding.vala                   \
     $(NULL)
 
@@ -257,7 +259,32 @@ man_sevendir = $(mandir)/man7
 %.7.gz: %.7
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
+desktop_in_in_files = \
+    ibus-ui-emojier.desktop.in.in \
+    ibus-extension-gtk3.desktop.in.in \
+    $(NULL)
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_DATA = \
+    org.freedesktop.IBus.Panel.Emojier.desktop \
+    org.freedesktop.IBus.Panel.Extension.Gtk3.desktop \
+    $(NULL)
+desktopdir = $(datadir)/applications
+%.desktop.in: %.desktop.in.in
+	$(AM_V_GEN) sed \
+		-e 's|^_Name=|Name=|g' \
+		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+                mv $@.tmp $@
+	$(NULL)
+org.freedesktop.IBus.Panel.Emojier.desktop: ibus-ui-emojier.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+	$(NULL)
+org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+	$(NULL)
+
 CLEANFILES += \
+    $(desktop_DATA) \
+    $(desktop_in_files) \
     $(man_seven_DATA) \
     $(man_seven_files) \
     $(NULL)
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index efedf3440..9506a9451 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -26,14 +26,14 @@ bool partial_match = false;
 int partial_match_length = -1;
 int partial_match_condition = -1;
 
-public class EmojiApplication : Application {
+public class EmojiApplication : Gtk.Application {
     private IBusEmojier? m_emojier;
     GLib.Settings m_settings_emoji =
             new GLib.Settings("org.freedesktop.ibus.panel.emoji");
 
 
     private EmojiApplication() {
-        Object(application_id: "org.freedesktop.ibus.panel.emojier",
+        Object(application_id: "org.freedesktop.IBus.Panel.Emojier",
                flags: ApplicationFlags.HANDLES_COMMAND_LINE);
         set_inactivity_timeout(100000);
     }
@@ -41,6 +41,8 @@ public class EmojiApplication : Application {
 
     private void show_dialog(ApplicationCommandLine command_line) {
         m_emojier = new IBusEmojier();
+        // For title handling in gnome-shell
+        add_window(m_emojier);
         Gdk.Event event = Gtk.get_current_event();
         // Plasma and GNOME3 desktop returns null event
         if (event == null) {
@@ -51,6 +53,7 @@ public class EmojiApplication : Application {
             event.key.window.ref();
         }
         string emoji = m_emojier.run("", event);
+        remove_window(m_emojier);
         if (emoji == null) {
             m_emojier = null;
             command_line.print("%s\n", _("Canceled to choose an emoji."));
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index 03026d001..7d6d76e77 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -21,16 +21,18 @@
  * USA
  */
 
-class ExtensionGtk {
+class ExtensionGtk : Gtk.Application {
     private IBus.Bus m_bus;
     private PanelBinding m_panel;
 
-    public ExtensionGtk(string[] argv) {
+    public ExtensionGtk(string[] args) {
+        Object(application_id: "org.freedesktop.IBus.Panel.Extension.Gtk3",
+               flags: ApplicationFlags.FLAGS_NONE);
         GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
                                  Config.GLIB_LOCALE_DIR);
         GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         IBus.init();
-        Gtk.init(ref argv);
+        Gtk.init(ref args);
 
         m_bus = new IBus.Bus();
 
@@ -64,10 +66,6 @@ class ExtensionGtk {
         m_bus.request_name(IBus.SERVICE_PANEL_EXTENSION, flags);
     }
 
-    public int run() {
-        Gtk.main();
-        return 0;
-    }
 
     private void bus_name_acquired_cb(DBusConnection connection,
                                       string sender_name,
@@ -76,7 +74,7 @@ class ExtensionGtk {
                                       string signal_name,
                                       Variant parameters) {
         debug("signal_name = %s", signal_name);
-        m_panel = new PanelBinding(m_bus);
+        m_panel = new PanelBinding(m_bus, this);
         m_panel.load_settings();
     }
 
@@ -108,7 +106,13 @@ class ExtensionGtk {
         init();
     }
 
-    public static void main(string[] argv) {
+
+    public override void activate() {
+        Gtk.main();
+    }
+
+
+    public static int main(string[] args) {
         // https://bugzilla.redhat.com/show_bug.cgi?id=1226465#c20
         // In /etc/xdg/plasma-workspace/env/gtk3_scrolling.sh
         // Plasma deskop sets this variable and prevents Super-space,
@@ -119,7 +123,8 @@ class ExtensionGtk {
         // launching the dialog secondly in Wayland.
         //Gdk.set_allowed_backends("x11");
 
-        ExtensionGtk extension = new ExtensionGtk(argv);
-        extension.run();
+        ExtensionGtk extension = new ExtensionGtk(args);
+        int status = extension.run(args);
+        return status;
     }
 }
diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in.in b/ui/gtk3/ibus-extension-gtk3.desktop.in.in
new file mode 100644
index 000000000..6ec5585f9
--- /dev/null
+++ b/ui/gtk3/ibus-extension-gtk3.desktop.in.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Emoji Choice
+Icon=ibus
+Exec=@libexecdir@/ibus-extension-gtk3
+Type=Application
+OnlyShowIn=
diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in.in b/ui/gtk3/ibus-ui-emojier.desktop.in.in
new file mode 100644
index 000000000..f4b750a89
--- /dev/null
+++ b/ui/gtk3/ibus-ui-emojier.desktop.in.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Emoji Choice
+Icon=ibus
+Exec=ibus emoji
+Type=Application
+OnlyShowIn=
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index e3f39e12d..581f721e9 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -23,6 +23,7 @@
 
 class PanelBinding : IBus.PanelService {
     private IBus.Bus m_bus;
+    private Gtk.Application m_application;
     private GLib.Settings m_settings_panel = null;
     private GLib.Settings m_settings_emoji = null;
     private string m_current_context_path = "";
@@ -38,13 +39,15 @@ class PanelBinding : IBus.PanelService {
     private bool m_load_unicode_at_startup;
     private bool m_loaded_unicode = false;
 
-    public PanelBinding(IBus.Bus bus) {
+    public PanelBinding(IBus.Bus bus,
+                        Gtk.Application application) {
         GLib.assert(bus.is_connected());
         // Chain up base class constructor
         GLib.Object(connection : bus.get_connection(),
                     object_path : IBus.PATH_PANEL_EXTENSION);
 
         m_bus = bus;
+        m_application = application;
 
         init_settings();
     }
@@ -178,6 +181,7 @@ class PanelBinding : IBus.PanelService {
             GLib.Source.remove(m_emojier_set_emoji_lang_id);
             m_emojier_set_emoji_lang_id = 0;
         }
+        m_application = null;
     }
 
 
@@ -189,7 +193,10 @@ class PanelBinding : IBus.PanelService {
             m_loaded_unicode = true;
         }
         m_emojier = new IBusEmojier();
+        // For title handling in gnome-shell
+        m_application.add_window(m_emojier);
         string emoji = m_emojier.run(m_real_current_context_path, event);
+        m_application.remove_window(m_emojier);
         if (emoji == null) {
             m_emojier = null;
             return;

From afe60c12a0e5bf70344930c6769675a439dc82d2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2018 15:42:03 +0900
Subject: [PATCH 459/816] ui/gtk3: Implement Page_Down, Page_Up on Unicode name
 list

Page_Down and Page_Up are useful on Unicode name list since the
names are many. Also add Ctrl-Shift-[n|p] for the same purpose.

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/340800043
---
 ui/gtk3/emojier.vala    | 89 +++++++++++++++++++++++++++++++----------
 ui/gtk3/ibus-emoji.7.in |  4 +-
 2 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8217a000b..8707e432d 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1525,6 +1525,19 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private int get_page_num() {
+        if (m_category_active_index < 0)
+            m_category_active_index = 0;
+        var row = m_list_box.get_row_at_index(m_category_active_index);
+        Gtk.Allocation alloc = { 0, 0, 0, 0 };
+        row.get_allocation(out alloc);
+        var adjustment = m_scrolled_window.get_vadjustment();
+        var page_size = (int)adjustment.get_page_size();
+        int page_num = page_size / alloc.height;
+        page_num += ((page_size % alloc.height) > 0) ? 1 : 0;
+        return page_num;
+    }
+
     private bool category_list_cursor_move(uint keyval) {
         GLib.List<weak Gtk.Widget> list = m_list_box.get_children();
         int length = (int)list.length();
@@ -1545,6 +1558,24 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         case Gdk.Key.End:
             m_category_active_index = length - 1;
             break;
+        case Gdk.Key.Page_Down:
+            var page_num = get_page_num();
+            if (m_category_active_index + 1 == length)
+                m_category_active_index = 0;
+            else if (m_category_active_index + page_num >= length)
+                m_category_active_index = length - 1;
+            else
+                m_category_active_index += page_num;
+            break;
+        case Gdk.Key.Page_Up:
+            var page_num = get_page_num();
+            if (m_category_active_index  == 0)
+                m_category_active_index = length - 1;
+            else if (m_category_active_index - page_num < 0)
+                m_category_active_index = 0;
+            else
+                m_category_active_index -= page_num;
+            break;
         }
         var row = m_list_box.get_selected_row();
         if (row != null)
@@ -1599,15 +1630,37 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private bool key_press_cursor_vertical(uint keyval) {
-        assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up);
+    private bool key_press_cursor_vertical(uint keyval,
+                                           uint modifiers) {
+        assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up ||
+                keyval == Gdk.Key.Page_Down || keyval == Gdk.Key.Page_Up);
 
+        if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+            if (keyval == Gdk.Key.Down)
+                keyval = Gdk.Key.Page_Down;
+            else if (keyval == Gdk.Key.Up)
+                keyval = Gdk.Key.Page_Up;
+        }
         uint ncandidates = m_lookup_table.get_number_of_candidates();
         if (m_candidate_panel_is_visible && ncandidates > 1) {
-            if (keyval == Gdk.Key.Down)
+            switch (keyval) {
+            case Gdk.Key.Down:
                 candidate_panel_cursor_down();
-            else if (keyval == Gdk.Key.Up)
+                break;
+            case Gdk.Key.Up:
                 candidate_panel_cursor_up();
+                break;
+            case Gdk.Key.Page_Down:
+                enter_notify_disable_with_timer();
+                m_lookup_table.page_down();
+                show_candidate_panel();
+                break;
+            case Gdk.Key.Page_Up:
+                enter_notify_disable_with_timer();
+                m_lookup_table.page_up();
+                show_candidate_panel();
+                break;
+            }
         } else {
             return category_list_cursor_move(keyval);
         }
@@ -1912,27 +1965,17 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             key_press_cursor_horizontal(keyval, modifiers);
             return true;
         case Gdk.Key.Down:
-            key_press_cursor_vertical(keyval);
+            key_press_cursor_vertical(keyval, modifiers);
             return true;
         case Gdk.Key.Up:
-            key_press_cursor_vertical(keyval);
+            key_press_cursor_vertical(keyval, modifiers);
             return true;
         case Gdk.Key.Page_Down:
-            if (m_candidate_panel_is_visible) {
-                enter_notify_disable_with_timer();
-                m_lookup_table.page_down();
-                show_candidate_panel();
-                return true;
-            }
-            break;
+            key_press_cursor_vertical(keyval, modifiers);
+            return true;
         case Gdk.Key.Page_Up:
-            if (m_candidate_panel_is_visible) {
-                enter_notify_disable_with_timer();
-                m_lookup_table.page_up();
-                show_candidate_panel();
-                return true;
-            }
-            break;
+            key_press_cursor_vertical(keyval, modifiers);
+            return true;
         case Gdk.Key.Home:
             if (key_press_cursor_home_end(keyval, modifiers))
                 return true;
@@ -1956,10 +1999,12 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
                 return true;
             case Gdk.Key.n:
-                key_press_cursor_vertical(Gdk.Key.Down);
+            case Gdk.Key.N:
+                key_press_cursor_vertical(Gdk.Key.Down, modifiers);
                 return true;
             case Gdk.Key.p:
-                key_press_cursor_vertical(Gdk.Key.Up);
+            case Gdk.Key.P:
+                key_press_cursor_vertical(Gdk.Key.Up, modifiers);
                 return true;
             case Gdk.Key.h:
                 if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index d5eae3106..3a2db2c04 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -77,8 +77,8 @@ If Shift\-Space is typed,
 a space chararacter can be inserted between words in an annotation or
 Unicode points. E.g. 1f466 Shift\-Space 1f3fb
 .TP
-\fBPageDown or PageUp\fR
-Move to the next or previous page in the emoji list.
+\fBPageDown, PageUp, Control-Shift-n or Control-Shift-p\fR
+Move to the next or previous page in the category or emoji list.
 .TP
 \fBHead, End, Control-h or Control-e\fR
 Select the first or last emoji on the list if an annotation is not typed.

From ece320bda762024541b23178a1b65c3ec968416f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2018 15:48:03 +0900
Subject: [PATCH 460/816] bus: Add liveuser to disabled panel extension

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/335610043
---
 bus/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bus/main.c b/bus/main.c
index fe603778f..7aa89fc41 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -48,7 +48,8 @@ static gchar *config = "default";
 static gchar *desktop = "gnome";
 
 static gchar *panel_extension_disable_users[] = {
-    "gdm"
+    "gdm",
+    "liveuser"
 };
 
 static void

From 73b420f49ba54b6eac74fb59cb3af948f3a592d6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 1 Mar 2018 15:51:00 +0900
Subject: [PATCH 461/816] Updated translations

Updated po/ca.po po/da.po po/hu.po po/ja.po po/ko.po

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/340720043
---
 po/as.po    | 2702 ++++++++++++++++++++++++++++++++++++++++++++++----
 po/bn_IN.po | 2703 +++++++++++++++++++++++++++++++++++++++++++++++----
 po/ca.po    | 2630 ++++++++++++++++++++++++++++++++++++++++++++-----
 po/cs.po    | 2131 ++++++++++++++++++++++++++++++++++++++--
 po/da.po    | 2356 ++++++++++++++++++++++++++++++++++++++++----
 po/de.po    | 2344 ++++++++++++++++++++++++++++++++++++++++----
 po/es.po    | 2133 ++++++++++++++++++++++++++++++++++++++--
 po/fr.po    | 2130 ++++++++++++++++++++++++++++++++++++++--
 po/gu.po    | 2669 ++++++++++++++++++++++++++++++++++++++++++++++----
 po/hu.po    | 2134 ++++++++++++++++++++++++++++++++++++++--
 po/it.po    | 2609 ++++++++++++++++++++++++++++++++++++++++++++-----
 po/ja.po    | 2130 ++++++++++++++++++++++++++++++++++++++--
 po/kn.po    | 2700 ++++++++++++++++++++++++++++++++++++++++++++++----
 po/ko.po    | 2634 +++++++++++++++++++++++++++++++++++++++++++++----
 po/mr.po    | 2679 ++++++++++++++++++++++++++++++++++++++++++++++----
 po/nl.po    | 2131 ++++++++++++++++++++++++++++++++++++++--
 po/pl.po    | 2135 ++++++++++++++++++++++++++++++++++++++--
 po/pt_BR.po | 2344 ++++++++++++++++++++++++++++++++++++++++----
 po/sv.po    | 2130 ++++++++++++++++++++++++++++++++++++++--
 po/ta.po    | 2586 +++++++++++++++++++++++++++++++++++++++++++-----
 po/te.po    | 2695 ++++++++++++++++++++++++++++++++++++++++++++++----
 po/uk.po    | 2128 ++++++++++++++++++++++++++++++++++++++--
 po/zh_CN.po | 2603 ++++++++++++++++++++++++++++++++++++++++++++-----
 po/zh_HK.po | 2537 ++++++++++++++++++++++++++++++++++++++++++++---
 po/zh_TW.po | 2131 ++++++++++++++++++++++++++++++++++++++--
 25 files changed, 56452 insertions(+), 3652 deletions(-)

diff --git a/po/as.po b/po/as.po
index 8026e391c..1090db224 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Assamese
 # Assamese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,22 @@
 # Amitakhya Phukan <aphukan@redhat.com>, 2010
 # Nilamdyuti Goswami <ngoswami@redhat.com>, 2011
 # Nilamdyuti Goswami <ngoswami@redhat.com>, 2012-2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-08 09:04+0000\n"
-"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:21-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -68,7 +71,8 @@ msgstr "IBus পছন্দসমূহ"
 
 #: ../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:"
@@ -76,7 +80,9 @@ msgstr "পিছৰ ইনপুট পদ্ধতি:"
 
 #: ../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:"
@@ -88,7 +94,8 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ইনপুট পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় চৰ্টকাট কি' নিৰ্ধাৰণ কৰক"
+msgstr ""
+"ইনপুট পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় চৰ্টকাট কি' নিৰ্ধাৰণ কৰক"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -159,8 +166,8 @@ msgid "General"
 msgstr "সাধাৰণ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "যোগ কৰক (_A)"
 
@@ -174,7 +181,8 @@ msgstr "আঁতৰাওক (_R)"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ পৰা নিৰ্বাচিত ইনপুট পদ্ধতি আঁতৰুৱা হ'ব"
+msgstr ""
+"সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ পৰা নিৰ্বাচিত ইনপুট পদ্ধতি আঁতৰুৱা হ'ব"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -182,7 +190,8 @@ msgstr "ওপৰত (_U)"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ ওপৰলৈ স্থানান্তৰ কৰক"
+msgstr ""
+"নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ ওপৰলৈ স্থানান্তৰ কৰক"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -190,7 +199,8 @@ msgstr "তলত (_D)"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ তললৈ স্থানান্তৰ কৰক"
+msgstr ""
+"নিৰ্বাচিত ইনপুট পদ্ধতিক সামৰ্থবান ইনপুট পদ্ধতিৰ তালিকাৰ তললৈ স্থানান্তৰ কৰক"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -213,38 +223,92 @@ msgid ""
 "<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>"
-msgstr "<small><i>কি'বৰ্ড চৰ্টকাট কি অথবা পেনেল আইকন ক্লিক কৰি সক্ৰিয় ইনপুট পদ্ধতিত ওপৰৰ তালিকাত নিৰ্বাচিতসমূহৰ পৰা চুইচ কৰিব পৰা যাব। </i></small>"
+msgstr ""
+"<small><i>কি'বৰ্ড চৰ্টকাট কি অথবা পেনেল আইকন ক্লিক কৰি সক্ৰিয় ইনপুট পদ্ধতিত "
+"ওপৰৰ তালিকাত নিৰ্বাচিতসমূহৰ পৰা চুইচ কৰিব পৰা যাব। </i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "চিস্টেম কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰক"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "চিস্টেম কিবৰ্ড (XKB) বিন্যাস ব্যৱহাৰ কৰক"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কিবৰ্ডৰ বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "সকলো এপ্লিকেচনৰ মাজত একেই ইনপুট পদ্ধতি অংশীদাৰী কৰক"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>বিশ্বব্যাপী ইনপুট পদ্ধতি সংহতিসমূহ</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -252,21 +316,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিমান ইনপুট bus</small>\nঘৰৰ পৃষ্ঠা: htthttps://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>বুদ্ধিমান ইনপুট bus</small>\n"
+"ঘৰৰ পৃষ্ঠা: htthttps://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "লগিনত ibus আৰম্ভ কৰক"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>আৰম্ভণি</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "বিষয়ে"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "বন্ধ কৰক (_C)"
 
@@ -294,10 +364,13 @@ msgstr "IME চুইচাৰ উইন্ডোৰ বাবে মিলি
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল 400. 0 = উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 &lt; মিলিছেকেণ্ডত বিলম্ব। 0 &gt; উইন্ডো নেদেখুৱাব আৰু পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।"
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল "
+"400. 0 = উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 &lt; মিলিছেকেণ্ডত বিলম্ব। 0 &gt; উইন্ডো "
+"নেদেখুৱাব আৰু পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -307,14 +380,16 @@ msgstr "সংৰক্ষিত সংস্কৰণ সংখ্যা"
 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:11
 msgid "Latin layouts which have no ASCII"
 msgstr "ASCII নথকা লেটিন বিন্যাসসমূহ"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US বিন্যাসক লেটিন বিন্যাসসমূহলৈ সংযোজন কৰা হয়। অপৰক বাদ দিব পাৰি।"
 
 #: ../data/ibus.schemas.in.h:13
@@ -324,7 +399,8 @@ msgstr "xmodmap ব্যৱহাৰ কৰক"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus ইঞ্জিনসমূহ চুইচ কৰোতে যদি .xmodmap অথবা .Xmodmap থাকে xmodmap চলাব।"
+msgstr ""
+"ibus ইঞ্জিনসমূহ চুইচ কৰোতে যদি .xmodmap অথবা .Xmodmap থাকে xmodmap চলাব।"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -374,7 +450,9 @@ msgstr "স্বচালিতভাৱে লুকাওক"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "বৈশিষ্ট্য পেনেলৰ আচৰণ। 0 = নেদেখুৱাব,  1 = স্বচালিতভাৱে লুকুৱাওক, 2 = সদায় দেখুৱাব"
+msgstr ""
+"বৈশিষ্ট্য পেনেলৰ আচৰণ। 0 = নেদেখুৱাব,  1 = স্বচালিতভাৱে লুকুৱাওক, 2 = সদায় "
+"দেখুৱাব"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,7 +462,9 @@ msgstr "ভাষাৰ পেনেলৰ স্থান"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -394,7 +474,9 @@ msgstr "পেনেল সদায় দেখুৱা হলে ইনপু
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "যদি সত্য, পেনেলে ইনপুট কাৰ্চাৰক দেখুৱায় যদি পেনেলক সদায় দেখুৱা হয়। যদি ভুল, পেনেলক এটা নিৰ্দিষ্ট স্থানত দেখুৱা হয়।"
+msgstr ""
+"যদি সত্য, পেনেলে ইনপুট কাৰ্চাৰক দেখুৱায় যদি পেনেলক সদায় দেখুৱা হয়। যদি ভুল, "
+"পেনেলক এটা নিৰ্দিষ্ট স্থানত দেখুৱা হয়।"
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -404,7 +486,9 @@ msgstr "বৈশিষ্ট্য পেনেল দেখুৱাবলৈ
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "ফকাচ-ইন আৰু বৈশিষ্ট্যসমূহ পৰিবৰ্তন হোৱাৰ পিছত বৈশিষ্ট্য পেনেল দেখুৱাবলৈ মিলিছেকেণ্ড।"
+msgstr ""
+"ফকাচ-ইন আৰু বৈশিষ্ট্যসমূহ পৰিবৰ্তন হোৱাৰ পিছত বৈশিষ্ট্য পেনেল দেখুৱাবলৈ "
+"মিলিছেকেণ্ড।"
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -430,51 +514,141 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB আইকনে বিন্যাস স্ট্ৰিং দেখুৱায় আৰু স্ট্ৰিং RGBA মানৰ সৈতে ৰেণ্ডাৰ হয়। RGBA মান হব পাৰে 1. X11 ৰ পৰা এটা ৰঙৰ নাম, 2. '#rrggbb' বিন্যাসত এটা হেক্স মান য'ত 'r', 'g' আৰু 'b' হল ৰঙা, সেউজীয়া আৰু নীলাৰ হেক্স ডিজিট, 3. 'rgb(r,g,b)' বিন্যাসত এটা RGB ৰঙ অথবা 4. 'rgba(r,g,b,a)' বিন্যাসত এটা RGBA ৰঙ য'ত  'r', 'g', and 'b' 0 ৰ পৰা 255 বিস্তাৰত পূৰ্ণসংখ্যা অথবা 0% ৰ পৰা 100% বিস্তাৰত শতাংশ মান, আৰু 'a' 0 ৰ পৰা 1 বিস্তাৰত এটা দশমিক মান।"
+msgstr ""
+"XKB আইকনে বিন্যাস স্ট্ৰিং দেখুৱায় আৰু স্ট্ৰিং RGBA মানৰ সৈতে ৰেণ্ডাৰ হয়। "
+"RGBA মান হব পাৰে 1. X11 ৰ পৰা এটা ৰঙৰ নাম, 2. '#rrggbb' বিন্যাসত এটা হেক্স "
+"মান য'ত 'r', 'g' আৰু 'b' হল ৰঙা, সেউজীয়া আৰু নীলাৰ হেক্স ডিজিট, 3. "
+"'rgb(r,g,b)' বিন্যাসত এটা RGB ৰঙ অথবা 4. 'rgba(r,g,b,a)' বিন্যাসত এটা RGBA "
+"ৰঙ য'ত  'r', 'g', and 'b' 0 ৰ পৰা 255 বিস্তাৰত পূৰ্ণসংখ্যা অথবা 0% ৰ পৰা "
+"100% বিস্তাৰত শতাংশ মান, আৰু 'a' 0 ৰ পৰা 1 বিস্তাৰত এটা দশমিক মান।"
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "এপ্লিকেচনৰ উইন্ডোত পূৰ্বসম্পাদনা লিখনী প্ৰোথিত কৰক"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "সৰ্বব্যাপী ইনপুট পদ্ধতি ব্যৱহাৰ কৰক"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "ইনপুট পদ্ধতি অবিকল্পিতভাৱে সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান কৰক"
+msgstr ""
+"যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি "
+"সামৰ্থবান কৰক"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf সংৰক্ষিত নাম উপসৰ্গসমূহ"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নাম পৰিবৰ্তন বন্ধ কৰিবলে DConf কি'সমূহৰ উপসৰ্গসমূহ"
 
@@ -482,45 +656,56 @@ msgstr "নাম পৰিবৰ্তন বন্ধ কৰিবলে DConf
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "অন্য"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "অধিক"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কিবৰ্ডৰ বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "লিখক: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "বিৱৰণ:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "এটা ইনপুট পদ্ধতি বাছক"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "অধিক"
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -528,7 +713,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus পছন্দসমূহ সংহতি কৰক"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "কিবৰ্ডৰ চৰ্টকাটসমূহ"
 
@@ -541,208 +726,2339 @@ msgid "Modifiers:"
 msgstr "পৰিবৰ্তক:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "প্ৰয়োগ কৰক (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "আঁতৰাওক (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "ঠিক আছে (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলৈ চুইচ কৰিবলে shift ৰ সৈতে চৰ্টকাট ব্যৱহাৰ কৰক"
+msgstr ""
+"পূৰ্বৱৰ্তী ইনপুট পদ্ধতিলৈ চুইচ কৰিবলে shift ৰ সৈতে চৰ্টকাট ব্যৱহাৰ কৰক"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডিমন চলি থকা নাই। আপুনি আৰম্ভ কৰিব বিচাৰে নেকি?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডিমনক %d ছেকেণ্ডত আৰম্ভ কৰিব পৰা নগল"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ৰ কাৰণে কিবৰ্ডৰ চৰ্টকাট বাছক"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতিসমূহ চুইচ কৰা"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "কেৱল ইঞ্জিন নাম তালিকাভুক্ত কৰক"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus লে সংযোগ কৰিব নোৱাৰি।\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "ভাষা: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "কোনো ইঞ্জিন সংহতি কৰা হোৱা নাই।\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "বিশ্বব্যাপী ইঞ্জিন সংহতি কৰা ব্যৰ্থ হল।\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "বিশ্বব্যাপী ইঞ্জিন প্ৰাপ্ত কৰা ব্যৰ্থ হল।\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ পঢ়ক।"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE পঢ়ক।"
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "ৰেজিস্ট্ৰি ক্যাশ বৈধ নহয়।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ লিখক।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE লিখক।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "পুনৰ সংহতি কৰা হৈছে"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "কৰা হল"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "ইঞ্জিন সংহতি কৰক অথবা প্ৰাপ্ত কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon প্ৰস্থান কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "উপলব্ধ ইঞ্জিনসমূহ দেখুৱাওক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(প্ৰণয়ন কৰা হোৱা নাই)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon পুনৰাম্ভ কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "সংস্কৰণ দেখুৱাওক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "ৰেজিস্ট্ৰি ক্যাশৰ সমল দেখুৱাওক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "ৰেজিস্ট্ৰি ক্যাশ সৃষ্টি কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon ৰ D-Bus ঠিকনা প্ৰিন্ট কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "সংৰূপৰ মানসমূহ দেখুৱাওক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "সংৰূপৰ মানসমূহ পুনৰ সংহতি কৰক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "এই তথ্য দেখুৱাওক"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "ব্যৱহাৰ: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "কমান্ডসমূহ:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s এটা অজ্ঞাত কমান্ড!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
-msgid "IBus Update"
-msgstr "IBus আপডেইট"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space এতিয়া অবিকল্পিত হটকি।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:903
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:907
-msgid "translator-credits"
-msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "কেৱল ইঞ্জিন নাম তালিকাভুক্ত কৰক"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus লে সংযোগ কৰিব নোৱাৰি।\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "ভাষা: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "কোনো ইঞ্জিন সংহতি কৰা হোৱা নাই।\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "বিশ্বব্যাপী ইঞ্জিন সংহতি কৰা ব্যৰ্থ হল।\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "বিশ্বব্যাপী ইঞ্জিন প্ৰাপ্ত কৰা ব্যৰ্থ হল।\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ পঢ়ক।"
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE পঢ়ক।"
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "ৰেজিস্ট্ৰি ক্যাশ বৈধ নহয়।\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "চিস্টেম ৰেজিস্ট্ৰি ক্যাশ লিখক।"
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "ৰেজিস্ট্ৰি ক্যাশ FILE লিখক।"
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "পুনৰ সংহতি কৰা হৈছে"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "কৰা হল"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "ইঞ্জিন সংহতি কৰক অথবা প্ৰাপ্ত কৰক"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon প্ৰস্থান কৰক"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "উপলব্ধ ইঞ্জিনসমূহ দেখুৱাওক"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(প্ৰণয়ন কৰা হোৱা নাই)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon পুনৰাম্ভ কৰক"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "সংস্কৰণ দেখুৱাওক"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "ৰেজিস্ট্ৰি ক্যাশৰ সমল দেখুৱাওক"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "ৰেজিস্ট্ৰি ক্যাশ সৃষ্টি কৰক"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon ৰ D-Bus ঠিকনা প্ৰিন্ট কৰক"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "সংৰূপৰ মানসমূহ দেখুৱাওক"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "সংৰূপৰ মানসমূহ পুনৰ সংহতি কৰক"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "এই তথ্য দেখুৱাওক"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ব্যৱহাৰ: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "কমান্ডসমূহ:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s এটা অজ্ঞাত কমান্ড!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:710
+msgid "IBus Update"
+msgstr "IBus আপডেইট"
+
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
+msgid "Super+space is now the default hotkey."
+msgstr "Super+space এতিয়া অবিকল্পিত হটকি।"
+
+#: ../ui/gtk3/panel.vala:1121
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান ইনপুট bus।"
+
+#: ../ui/gtk3/panel.vala:1125
+msgid "translator-credits"
+msgstr ""
+"অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী "
+"(ngoswami@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "পুনাৰম্ভ"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "প্ৰস্থান"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 406f511a2..e22da7ec0 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Bengali (India)
 # Bengali (India) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,19 +11,22 @@
 # runab <runab@redhat.com>, 2009-2010
 # runa <runabh@gmail.com>, 2012
 # Saibal Ray, 2013-2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-11-11 10:28+0000\n"
-"Last-Translator: Saibal Ray\n"
-"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn_IN\n"
+"PO-Revision-Date: 2018-02-20 04:21-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
+"Language: bn-IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -71,7 +74,8 @@ msgstr "IBus সংক্রান্ত পছন্দ"
 
 #: ../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:"
@@ -79,7 +83,9 @@ msgstr "পরবর্তী ইনপুট পদ্ধতি:"
 
 #: ../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:"
@@ -91,7 +97,8 @@ msgstr "..."
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
-msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+msgstr ""
+"ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -139,7 +146,8 @@ msgstr "ভাষার বারের মধ্যে ইনপুট পদ
 
 #: ../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 +155,8 @@ msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ
 
 #: ../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:"
@@ -162,8 +171,8 @@ msgid "General"
 msgstr "সাধারণ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "যোগ করুন (_A)"
 
@@ -177,7 +186,8 @@ msgstr "মুছে ফেলুন (_R)"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
+msgstr ""
+"সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -185,7 +195,9 @@ msgstr "উপরে (_U)"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
+msgstr ""
+"নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা "
+"হবে"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -193,7 +205,9 @@ msgstr "নীচে (_D)"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
+msgstr ""
+"নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা "
+"হবে"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -216,38 +230,92 @@ msgid ""
 "<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>"
-msgstr "<small><i>কীবোর্ড শর্টকাট কী টিপে বা প্যানেল অাইকনে ক্লিক করে, উপরের তালিকায় নির্বাচিতটি থেকে সক্রিয় ইনপুট পদ্ধতি পাল্টানো যেতে পারে।</i></small>"
+msgstr ""
+"<small><i>কীবোর্ড শর্টকাট কী টিপে বা প্যানেল অাইকনে ক্লিক করে, উপরের তালিকায় "
+"নির্বাচিতটি থেকে সক্রিয় ইনপুট পদ্ধতি পাল্টানো যেতে পারে।</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>কি-বোর্ডের বিন্যাস</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -255,21 +323,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\nহোম-পেজ: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>বুদ্ধিবিশিষ্ট ইনপুট বাস</small>\n"
+"হোম-পেজ: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>প্রারম্ভ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "পরিচিতি"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
@@ -297,10 +371,13 @@ msgstr "IME স্যুইচার উইন্ডোর ক্ষেত্র
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = উইন্ডো সংগে সংগে দেখান। 0 &lt; মিলিসেকেন্ড বিলম্ব। 0 &gt; উইন্ডো দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।"
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400."
+" 0 = উইন্ডো সংগে সংগে দেখান। 0 &lt; মিলিসেকেন্ড বিলম্ব। 0 &gt; উইন্ডো "
+"দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -310,14 +387,16 @@ msgstr "সংরক্ষিত সংস্করণ নম্বর"
 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:11
 msgid "Latin layouts which have no ASCII"
 msgstr "ল্যাটিন সজ্জা যাতে কোনো ASCII নেই"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US সজ্জা ল্যাটিন সজ্জাতে প্রয়োগ করা হয়। বৈচিত্র্য বাদ দেওয়া হতে পারে।"
 
 #: ../data/ibus.schemas.in.h:13
@@ -327,7 +406,9 @@ msgstr "xmodmap ব্যবহার করুন"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus ইঞ্জিনগুলি পাল্টানোর সময়ে, .xmodmap বা .Xmodmap বিদ্যমান থাকলে xmodmap চালান।"
+msgstr ""
+"ibus ইঞ্জিনগুলি পাল্টানোর সময়ে, .xmodmap বা .Xmodmap বিদ্যমান থাকলে xmodmap "
+"চালান।"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -359,7 +440,8 @@ msgstr "পরবর্তী ইঞ্জিনের জন্য শর্ট
 
 #: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+msgstr ""
+"তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -367,7 +449,9 @@ msgstr "পূর্ববর্তী ইঞ্জিনের শর্টক
 
 #: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+msgstr ""
+"তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট "
+"কি"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -377,7 +461,9 @@ msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হব
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "বিশিষ্টতা প্যানেলের অাচরণ। 0 = দেখাবেন না, 1 = স্বয়ংক্রিয় ভাবে লুকানো, 2 = সর্বদা দেখান"
+msgstr ""
+"বিশিষ্টতা প্যানেলের অাচরণ। 0 = দেখাবেন না, 1 = স্বয়ংক্রিয় ভাবে লুকানো, 2 = "
+"সর্বদা দেখান"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -387,7 +473,9 @@ msgstr "ভাষার প্যানেলের অবস্থান"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -397,7 +485,9 @@ msgstr "প্যানেল সর্বদা দেখানো হলে, 
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "সত্য হলে, প্যানেল সর্বদা দেখানো হলে প্যানেল ইনপুট কার্সার অনুসরণ করে। মিথ্যা হলে, প্যানেল একটি নির্দিষ্ট অবস্থানে দেখানো হয়।"
+msgstr ""
+"সত্য হলে, প্যানেল সর্বদা দেখানো হলে প্যানেল ইনপুট কার্সার অনুসরণ করে। মিথ্যা "
+"হলে, প্যানেল একটি নির্দিষ্ট অবস্থানে দেখানো হয়।"
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -407,7 +497,9 @@ msgstr "বিশিষ্টতা প্যানেল দেখাতে ম
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "ফোকাস-ইন বা বিশিষ্টতা পরিবর্তিত হওয়ার পরে, বিশিষ্টতা প্যানেল দেখাতে মিলিসেকেন্ড।"
+msgstr ""
+"ফোকাস-ইন বা বিশিষ্টতা পরিবর্তিত হওয়ার পরে, বিশিষ্টতা প্যানেল দেখাতে "
+"মিলিসেকেন্ড।"
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -433,51 +525,141 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB অাইকন সজ্জা স্ট্রীং দেখায় এবং স্ট্রীং RGBA মানের সাথে রেন্ডার হয়। RGBA মান হতে পারে 1. X11 থেকে একটি রঙের নাম, 2. '#rrggbb' থেকে একটি হেক্স মান যেখানে 'r', 'g' এবং 'b' হল লাল, সবুজ, এবং নীলের হেক্স ডিজিট 3. একটি RGB রঙ, 'rgb(r,g,b)' ফর্মে অথবা 4. একটি RGBA রঙ, 'rgba(r,g,b,a)' ফর্মে, যেখানে 'r', 'g', এবং 'b' হয় 0 থেকে 255 রেঞ্জে পূর্ণসংখ্যা বা 0% থেকে 100% রেঞ্জে শতাংশ মান, এবং 'a' হল একটি ফ্লোটিং পয়েন্ট মান, অালফার 0 থেকে 1 রেঞ্জে।"
+msgstr ""
+"XKB অাইকন সজ্জা স্ট্রীং দেখায় এবং স্ট্রীং RGBA মানের সাথে রেন্ডার হয়। RGBA "
+"মান হতে পারে 1. X11 থেকে একটি রঙের নাম, 2. '#rrggbb' থেকে একটি হেক্স মান "
+"যেখানে 'r', 'g' এবং 'b' হল লাল, সবুজ, এবং নীলের হেক্স ডিজিট 3. একটি RGB রঙ, "
+"'rgb(r,g,b)' ফর্মে অথবা 4. একটি RGBA রঙ, 'rgba(r,g,b,a)' ফর্মে, যেখানে 'r', "
+"'g', এবং 'b' হয় 0 থেকে 255 রেঞ্জে পূর্ণসংখ্যা বা 0% থেকে 100% রেঞ্জে শতাংশ "
+"মান, এবং 'a' হল একটি ফ্লোটিং পয়েন্ট মান, অালফার 0 থেকে 1 রেঞ্জে।"
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
+msgstr ""
+"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট "
+"পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf দ্বারা নেম প্রেফিক্স সংরক্ষণ করা হবে"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নেম পরিবর্তন প্রতিরোধ করার জন্য DConf-কির প্রেফিক্স"
 
@@ -485,45 +667,56 @@ msgstr "নেম পরিবর্তন প্রতিরোধ করার
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "অারো…"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কি-বোর্ড বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "নির্মাতা: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "অারো…"
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -531,7 +724,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "কি-বোর্ড শর্ট-কাট"
 
@@ -544,208 +737,2338 @@ msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "প্রয়োগ করুন (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "মুছে ফেলুন (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "ঠিক আছে (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য শিফ্ট সমেত শর্ট-কাট কি ব্যবহার করুন"
+msgstr ""
+"পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য শিফ্ট সমেত শর্ট-কাট কি ব্যবহার "
+"করুন"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ডেমন বর্তমানে চলছে না। এটি আরম্ভ করা হবে কি?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ডেমনটি %d সেকেন্ডে আরম্ভ করা যায়নি।"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "ইনপুট পদ্ধতি পরিবর্তন"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "শুধুমাত্র ইঞ্জিনের নামের তালিকা প্রদর্শন করা হবে"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus-র সাথে সংযোগ করতে ব্যর্থ।\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "ভাষা: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "কোনো ইঞ্জিন নির্ধারিত হয়নি।\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "গ্লোবাল ইঞ্জিন নির্ধারণ করতে ব্যর্থ।\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "গ্লোবাল ইঞ্জিন প্রাপ্ত করতে ব্যর্থ।\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ পড়ুন।"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "রেজিস্ট্রি ক্যাশ FILE পড়ুন।"
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "রেজিস্ট্রি ক্যাশ অবৈধ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ লিখুন।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "রেজিস্ট্রি ক্যাশ FILE লিখুন।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "পুনঃসেট…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "সম্পন্ন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "ইঞ্জিন সেট করুন বা পান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon থেকে প্রস্থান করুন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "উপলব্ধ ইঞ্জিনগুলি দেখান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(বাস্তবায়িত নয়)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon বন্ধ করে অাবার চালু করুন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "সংস্করণ দেখান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "রেজিস্ট্রি ক্যাশের বিষয়বস্তু দেখান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "রেজিস্ট্রি ক্যাশ তৈরি করুন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon এর D-Bus ঠিকানা প্রিন্ট করুন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "কনফিগারেশন মানগুলি দেখান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "কনফিগারেশন মানগুলি পুনঃসেট করুন"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "এই তথ্য দেখান"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "কমান্ড:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s একটি অজানা কমান্ড!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "শুধুমাত্র ইঞ্জিনের নামের তালিকা প্রদর্শন করা হবে"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus-র সাথে সংযোগ করতে ব্যর্থ।\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "ভাষা: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "কোনো ইঞ্জিন নির্ধারিত হয়নি।\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "গ্লোবাল ইঞ্জিন নির্ধারণ করতে ব্যর্থ।\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "গ্লোবাল ইঞ্জিন প্রাপ্ত করতে ব্যর্থ।\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ পড়ুন।"
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "রেজিস্ট্রি ক্যাশ FILE পড়ুন।"
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "রেজিস্ট্রি ক্যাশ অবৈধ।\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ লিখুন।"
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "রেজিস্ট্রি ক্যাশ FILE লিখুন।"
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "পুনঃসেট…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "সম্পন্ন"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "ইঞ্জিন সেট করুন বা পান"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon থেকে প্রস্থান করুন"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "উপলব্ধ ইঞ্জিনগুলি দেখান"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(বাস্তবায়িত নয়)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon বন্ধ করে অাবার চালু করুন"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "সংস্করণ দেখান"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "রেজিস্ট্রি ক্যাশের বিষয়বস্তু দেখান"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "রেজিস্ট্রি ক্যাশ তৈরি করুন"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon এর D-Bus ঠিকানা প্রিন্ট করুন"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "কনফিগারেশন মানগুলি দেখান"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "কনফিগারেশন মানগুলি পুনঃসেট করুন"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "এই তথ্য দেখান"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "কমান্ড:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s একটি অজানা কমান্ড!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus অাপডেট"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space হল এখন ডিফল্ট হট-কী।"
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "পুনরারম্ভ"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "প্রস্থান"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ca.po b/po/ca.po
index a3f7913f0..d2e0fffbf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,6 @@
-# translation of ibus.pot to Catalan
 # Catalan translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,17 +9,19 @@
 # Oscar Osta Pueyo <oostap@gmail.com>, 2009
 # Robert Antoni Buj i Gelonch, 2014
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-03-06 14:41+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-03-20 04:10-0400\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -89,151 +90,143 @@ msgid "Previous input method:"
 msgstr "Mètode d'entrada anterior:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr ""
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 "Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Habilita o deshabilita:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Habilita:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Deshabilita:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Dreceres de teclat</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Estableix l'orientació dels candidats a la taula de cerca"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Orientació dels candidats:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 "Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
 "d'idiomes"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Mostra el quadre de propietats:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posició del quadre d'idiomes:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Mostra la icona a la safata del sistema"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:40
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 "Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
 "casella de selecció"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 "Incrusta el text pre-editat del mètode d'entrada en la finestra de "
 "l'aplicació"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Utilitza la lletra personalitzada:"
 
-#: ../setup/setup.ui.h:35
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Lletra i estil</b>"
 
-#: ../setup/setup.ui.h:36
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "General"
 
 #. add button
-#: ../setup/setup.ui.h:37 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 "Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:41
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "A_munt"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 "Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "A_vall"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 "Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Mostra la informació del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "_Preferències"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostra la configuració del mètode d'entrada seleccionat"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -244,35 +237,91 @@ msgstr ""
 "del quadre.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:50 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Mètode d'entrada"
 
-#: ../setup/setup.ui.h:51 ../data/ibus.schemas.in.h:46
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "Les tecles de la drecera de teclat per mostrar el diàleg d'emojis"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr "Tria de l'emoji:"
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Estableix la lletra dels emojis al diàleg d'emojis"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Lletra de l'emoji:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Estableix l'idioma de les anotacions dels emojis al diàleg d'emojis"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Idioma d'anotació de l'emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Fes coincidir parcialment les anotacions dels emojis amb la següent condició "
+"i més que el nombre de caràcters:"
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
+"comptes de la coincidència exacta"
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr "Coincidència del prefix"
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr "Coincidència del sufix"
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr "Coincidència conté"
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr "Emoji"
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:47
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:54 ../data/ibus.schemas.in.h:58
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Paràmetres del mètode d'entrada global</b>"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -288,19 +337,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:64
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Inicia l'IBus en entrar"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:66 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1221
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Quant a"
 
-#: ../setup/setup.ui.h:67 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -356,10 +405,8 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Les disposicions llatines no tenen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"La disposició dels EUA és un annex de les disposicions llatines. Es pot "
-"ometre la variant."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -381,53 +428,45 @@ msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Dreceres de teclat de l'activador per gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:18
-msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
 msgid "Enable shortcut keys"
 msgstr "Habilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "Inhabilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Dreceres de teclat del motor següent"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 "Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Dreceres de teclat del motor anterior"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 "Les dreceres de teclat per commutar al mètode d'entrada anterior de la "
 "llista"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Oculta automàticament"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -435,11 +474,11 @@ msgstr ""
 "El comportament de la propietat panel. 0 = No es mostra, 1 = S'amaga "
 "automàticament, 2 = Es mostra sempre"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Posició del quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:29
 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"
@@ -448,11 +487,11 @@ msgstr ""
 "cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
 "inferior dreta, 4 = personalitzat"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Segueix el cursor d'entrada en el cas que sempre es mostri el quadre"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -460,11 +499,11 @@ msgstr ""
 "Si és cert, el quadre segueix el cursor d'entrada en el cas que sempre es "
 "mostri el quadre. Si és fals, el quadre es mostra en una ubicació fixa."
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr "Mil·lisegons per mostrar el quadre de propietats"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -472,23 +511,23 @@ msgstr ""
 "Els mil·lisegons per mostrar el quadre de propietats després de rebre "
 "l'enfocament o quan se'n canviïn les propietats."
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Mostra el nom del mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
 msgstr "valor RGBA de la icona XKB"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:41
 #, no-c-format
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
@@ -496,7 +535,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "La icona XKB mostra la cadena de text de la disposició, la cadena de text es "
@@ -508,11 +547,11 @@ msgstr ""
 "l'interval de 0% a 100%, i «a» té un valor en punt flotant en l'interval de "
 "0 a 1 per l'alfa."
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Els mil·lisegons per mostrar el quadre d'icona amb una propietat"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:43
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -524,63 +563,132 @@ msgstr ""
 "s'especifica amb el valor icon-prop-key a IBusEngineDesc. Si el valor és 0, "
 "no hi ha retard i la icona de propietat es mostra automàticament."
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Utilitza una lletra personalitzada"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Utilitza una lletra personalitzada per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Lletra personalitzada"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Lletra personalitzada per al quadre d'idiomes"
 
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "La drecera de teclat per activar o desactivar el tecleig d'emojis"
+
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
+"El nom de la lletra personalitzada per als caràcters emoji al diàleg dels "
+"emojis"
 
 #: ../data/ibus.schemas.in.h:53
-msgid "favorite emoji list on emoji dialog"
-msgstr ""
+msgid "Default language for emoji dictionary"
+msgstr "Idioma predeterminat per al diccionari emoji"
 
 #: ../data/ibus.schemas.in.h:54
 msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+"Trieu l'idioma predeterminat per ls diccionaris dels emojis al diàleg "
+"d'emojis. El valor $lang s'aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr "llista d'emojis preferits al diàleg dels emojis"
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
+"Podeu visualitzar els emojis preferits a la llista d'emojis, si aquesta "
+"llista té qualsevol caràcter."
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr "llista d'anotacions dels emojis preferits al diàleg dels emojis"
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+"En aquesta llista podeu assignar una anotació per a un emoji preferit."
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr "Si les anotacions dels emojis poden coincidir parcialment o no"
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+"Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
+"comptes de la coincidència exacta, o no."
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+"Coincidència de les anotacions dels emojis amb la llargada especificada"
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+"Coincidència parcial de les anotacions dels emojis amb el nombre de "
+"caràcters especificat en comptes de la coincidència exacta."
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+"Trieu una condició per coincidir parcialment amb les anotacions dels emojis"
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Incrusta el text pre-editat"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
 "d'entrada"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva els prefixes"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
@@ -596,6 +704,24 @@ msgstr ""
 msgid "Other"
 msgstr "Altres"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selecciona un idioma"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "_D'acord"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "Més..."
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -619,22 +745,13 @@ msgstr "Descripció:\n"
 msgid "Select an input method"
 msgstr "Seleccioneu un mètode d'entrada"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:441
-msgid "_Cancel"
-msgstr "_Cancel·la"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Més..."
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "Estableix les preferències de l'IBus"
+msgstr "Establiu les preferències de l'IBus"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -642,7 +759,7 @@ msgstr "Dreceres de teclat"
 
 #: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
-msgstr "Codi de lletra:"
+msgstr "Codi de tecla:"
 
 #: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
@@ -670,21 +787,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:442
-msgid "_OK"
-msgstr "_D'acord"
-
-#: ../setup/main.py:118 ../setup/main.py:466
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
 "l'anterior mètode d'entrada"
 
-#: ../setup/main.py:396
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
 
-#: ../setup/main.py:417
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -699,202 +812,2275 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:431
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
 
-#: ../setup/main.py:443
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:445
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "commutació dels mètodes d'entrada"
 
-#: ../tools/main.vala:49
-msgid "List engine name only"
-msgstr "Mostra tan sols el nom del motor"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Activitats"
 
-#: ../tools/main.vala:65 ../tools/main.vala:186 ../tools/main.vala:196
-msgid "Can't connect to IBus.\n"
-msgstr "No es pot connectar a IBus.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Animals i natura"
 
-#: ../tools/main.vala:91
-#, c-format
-msgid "language: %s\n"
-msgstr "idioma: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "Banderes"
 
-#: ../tools/main.vala:159
-msgid "No engine is set.\n"
-msgstr "No s'ha establert cap motor.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "Menjar i beguda"
 
-#: ../tools/main.vala:167
-msgid "Set global engine failed.\n"
-msgstr "S'ha produït un error en establir el motor global.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "Objectes"
 
-#: ../tools/main.vala:172
-msgid "Get global engine failed.\n"
-msgstr "S'ha produït un error en obtenir el motor global.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "Emoticones i gent"
 
-#: ../tools/main.vala:211
-msgid "Read the system registry cache."
-msgstr "Llegeix la memòria cau del registre del sistema."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "Símbols"
 
-#: ../tools/main.vala:213
-msgid "Read the registry cache FILE."
-msgstr "Llegeix el FITXER de la memòria cau del registre."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "Viatges i llocs"
 
-#: ../tools/main.vala:231 ../tools/main.vala:236
-msgid "The registry cache is invalid.\n"
-msgstr "La memòria cau del registre no és vàlida.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:251
-msgid "Write the system registry cache."
-msgstr "Escriu la memòria cau del registre del sistema."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the registry cache FILE."
-msgstr "Escriu el FITXER de la memòria cau del registre."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:305
-msgid "Resetting…"
-msgstr "S'està restablint..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:319
-msgid "Done"
-msgstr "Fet"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:333
-msgid "Canceled to choose an emoji."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
 msgstr ""
 
-#: ../tools/main.vala:340
-msgid "Copied an emoji to your clipboard."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
 msgstr ""
 
-#: ../tools/main.vala:377
-msgid "Set or get engine"
-msgstr "Estableix o obté el motor"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Exit ibus-daemon"
-msgstr "Surt de l'ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:379
-msgid "Show available engines"
-msgstr "Mostra els motors disponibles"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "(Not implemented)"
-msgstr "(No implementat)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:381
-msgid "Restart ibus-daemon"
-msgstr "Reinicia l'ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:382
-msgid "Show version"
-msgstr "Mostra la versió"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:383
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "Mostra tan sols el nom del motor"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "No es pot connectar a IBus.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "idioma: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "No s'ha establert cap motor.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "S'ha produït un error en establir el motor global.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "S'ha produït un error en obtenir el motor global.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "Llegeix la memòria cau del registre del sistema."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "Llegeix el FITXER de la memòria cau del registre."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "La memòria cau del registre no és vàlida.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "Escriu la memòria cau del registre del sistema."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "Escriu el FITXER de la memòria cau del registre."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "S'està restablint..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "Fet"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "Estableix o obté el motor"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "Surt de l'ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "Mostra els motors disponibles"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(No implementat)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "Reinicia el dimoni d'ibus"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "Mostra la versió"
+
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Mostra el contingut de la memòria cau del registre"
 
-#: ../tools/main.vala:384
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Crea la memòria cau del registre"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Mostra l'adreça D-Bus de l'ibus-daemon"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Mostra els valors de configuració"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Restableix els valors de configuració"
 
-#: ../tools/main.vala:388
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgstr "Desa l'emoji del diàleg al porta-retalls"
 
-#: ../tools/main.vala:389
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Mostra aquesta informació"
 
-#: ../tools/main.vala:395
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Ús: %s ORDRE [OPCIÓ...]\n"
 "\n"
 
-#: ../tools/main.vala:396
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Ordres:\n"
 
-#: ../tools/main.vala:425
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s no és una ordre reconeguda!\n"
 
-#: ../ui/gtk3/emojier.vala:240 ../ui/gtk3/panel.vala:1213
-msgid "Emoji Dialog"
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr "Mostra les variants dels emojis"
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr "Menú"
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "Preferits"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr "Altres"
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:244
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Tria de l'emoji"
+
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
+msgstr "Teclegeu l'anotació o trieu l'emoji"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:497 ../ui/gtk3/emojier.vala:562
-msgid "Favorites"
-msgstr "Preferits"
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:607
-msgid "Page Down"
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:618
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr "Av Pàg"
+
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
-msgstr ""
+msgstr "Re Pàg"
 
-#: ../ui/gtk3/emojier.vala:756
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
-msgid "Description: Unicode point U+%04X"
+msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:768
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr "Té variants d'emoji"
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Descripció: %s"
 
-#: ../ui/gtk3/emojier.vala:779
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr "Sense"
+
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotacions: %s"
 
-#: ../ui/gtk3/panel.vala:265 ../ui/gtk3/panel.vala:296
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr "S'ha cancel·lat per triar un emoji."
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr "S'ha copiat un emoji al vostre porta-retalls."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr "Les anotacions dels emonjis poden coincidir parcialment"
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr "Coincideix amb la llargada de l'enter especificat"
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr "Coincideix amb la condició de l'enter especificat"
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Quadre de l'IBus"
 
-#: ../ui/gtk3/panel.vala:813
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Actualització d'IBus"
 
-#: ../ui/gtk3/panel.vala:814 ../ui/gtk3/panel.vala:825
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Súper+espai ara és l'accés de teclat per defecte."
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "L'IBus és un bus d'entrada intel·ligent per al Linux/Unix."
+msgstr "L'IBus és un bus d'entrada intel·ligent per a Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1189
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Joan Duran <jodufi@gmail.com>\n"
@@ -903,20 +3089,20 @@ msgstr ""
 "Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>,\n"
 "Xavier Conde Rueda <xavi.conde@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1208
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:1227
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:1231
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Surt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:353 ../ui/gtk3/propertypanel.vala:361
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/cs.po b/po/cs.po
index 9d6577f6a..90fb30e1d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,6 @@
 # Czech translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,15 +10,17 @@
 # Marek Suchánek <m.suchanek.2@gmail.com>, 2017. #zanata
 # Zdenek <chmelarz@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Zdenek <chmelarz@gmail.com>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-08-29 05:58-0400\n"
+"PO-Revision-Date: 2018-02-21 10:23-0500\n"
 "Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
 "Language: cs\n"
@@ -330,7 +332,7 @@ msgstr "Spustit ibus při přihlášení"
 msgid "<b>Startup</b>"
 msgstr "<b>Spouštění</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "O programu"
 
@@ -389,9 +391,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Rozložení latinky, které nemá ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Americké rozvržení je připojeno k latinskému. Varianta může být vynechána."
+"Americké rozvržení je připojeno k Latinskému. Varianta může být vynechána."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -516,7 +518,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "Ikona XKB zobrazuje řetězec rozložení a řetězec je vykreslen hodnotou RGBA. "
@@ -568,7 +570,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Klávesová zkratka pro zapínání a vypínání psaní emoji"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Vlastní jméno písma pro znaky emoji v dialogu emoji"
 
 #: ../data/ibus.schemas.in.h:53
@@ -835,260 +837,2247 @@ msgstr "Symboly"
 msgid "Travel & Places"
 msgstr "Cestování & místa"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Základní latinka"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Doplněk latinky-1"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Rozšířená latinka-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Rozšířená latinka-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Rozšíření IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "Distanční modifikační písmena"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "Kombinace diakritických znamének"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "Řečtina a koptština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Cyrilice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Doplněk cyrilice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Arménština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "Hebrejština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Arabština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "Syrština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "Doplněk arabštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr "Thaanaština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr "NKo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "Samaritánština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "Mandaic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "Doplněk syrštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "Rozšířená arabština-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "Bengálština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "Gurmukhština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "Gudžarátština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "Urijština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "Tamilština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "Telugština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "Kannadština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "Malajálamština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "Sinhálština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "Thajština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "Laoština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "Tibetština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "Barmština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "Gruzínština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "Hangul Jamo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "Etiopština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "Doplněk etiopštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "Cherokéština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "Slabičné písmo kanadských domorodců"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "Ogham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "Runy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "Tagalština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr "Hanunoo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr "Buhidština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr "Tagbanwanština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "Khmerština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "Mongolština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "Rozšířené slabičné písmo kanadských domorodců"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "Limbu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr "Tai Le"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "Nové Tai Lue"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "Khmerské symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "Bugiština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr "Tai Tham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "Kombinace rozšířených diakritických značek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "Balinéština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "Sundanština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "Batakština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr "Lepčština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr "Ol Chiki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "Rozšířená cyrilice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr "Doplněk sundanštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr "Rozšíření pro védy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr "Fonetické rozšíření"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr "Doplněk fonetického rozšíření"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr "Kombinace doplňku s diakritickými značkami"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr "Další rozšířená latinka"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr "Rozšířená řečtina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr "Obecná interpunkční znaménka"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr "Horní a dolní indexy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "Symboly měn"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "Kombinace diakritických značek pro symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr "Symboly podobné písmenům"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "Formy čísel"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "Šipky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "Matematické operátory"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "Různé technické znaky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "Ovládací obrázky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr "Optické rozpoznávání znaků"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr "Uzavřené alfanumerické znaky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr "Vykreslování rámečku"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr "Blokové prvky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "Geometrické tvary"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "Různé symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr "Dingbats"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "Různé matematické symboly-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr "Doplňkové šipky-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr "Braillské vzory"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr "Doplňkové šipky-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "Různé matematické symboly-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr "Doplňkové matematické operátory"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "Různé symboly a šipky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr "Glagolitičtina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr "Rozšířená latinka-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr "Koptština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr "Doplněk gruzínštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr "Rozšířená etiopština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr "Rozšířená cyrilice-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr "Doplňkové interpunkce"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr "Doplňkové radikály CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr "Radikály Kangxi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr "Znaky ideografického popisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr "Symboly a interpunkce CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr "Hiragana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr "Katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr "Bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr "Hangul Jamo kompatibilní"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr "Kanbun"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr "Rozšířené bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr "CJK tahy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr "Fonetické rozšíření katakany"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr "Uzavřené písmo CJK a měsíce"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr "CJK kompatibilní"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr "CJK rozšíření sdružených ideogramů A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr "Hexagramové symboly Yijing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr "Jednotné ideografie CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr "Slabiky Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr "Radikály Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr "Lisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr "Vai"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr "Rozšířená cyrilice-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr "Bamumština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr "Modifikátory tónových písmen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr "Rozšířená latinka-D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr "Syloti Nagri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr "Formy běžných indických čísel"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr "Phags-pa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr "Saurashtra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr "Rozšířené devanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr "Kayah Li"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr "Rejang"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr "Rozšířené Hangul Jamo A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr "Jávština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr "Rozšířená barmština B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr "Chamština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr "Rozšířená barmština A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr "Tai Viet"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr "Rozšíření Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr "Rozšířená etiopština A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr "Rozšířená latinka-E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr "Doplněk cherokéštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr "Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr "Slabiky Hangul"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr "Rozšířené Hangul Jamo B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr "Vysoké náhrady"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr "Vysoké soukromé použití náhrad"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr "Nízké náhrady"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr "Oblast soukromého užití"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr "Ideologie kompatibility CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr "Abecední prezentační formy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr "Arabská prezentační forma-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr "Variátory výběru"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr "Vertikální formy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr "Kombinace poločasů"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr "Formy kompatibilit CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr "Malé varianty forem"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr "Arabská prezentační forma-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "Formy s poloviční a plnou šířkou"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "Speciály"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr "Lineární B syllabary"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr "Lineární B ideogramy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr "Egejské číslice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr "Starověké řecké číslice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr "Starověké symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr "Disk z Faistu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr "Likijské písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr "Kárské písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr "Koptské číslice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr "Staré italické písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr "Gotické písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr "Staré permské písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr "Ugaritské písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr "Staré perské písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr "Deseret"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr "Shavian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr "Osmanya"
+
+# auto translated by TM merge from project: Fedora Release Notes, version: f25, DocId: Development_Tools
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr "Osage"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr "Elbasan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr "Kavkazská albánština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr "Lineární A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr "Kyperské syllabary"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr "Císařská aramejština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr "Palmyrene"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr "Nabataean"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr "Hatran"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr "Féničtina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr "Lidijščina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr "Meroitické hieroglyfy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr "Meroitická kurzíva"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr "Kharóšthí"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr "Stará jihoarabština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr "Stará severoarabština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr "Manichaean"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr "Avestánština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr "Parthské nápisy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr "Nápisy Pahlaví"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr "Psalter Pahlavi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr "Staroturečtina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr "Staromaďarština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr "Číselné symboly Rumi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr "Bráhmí"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr "Kaithi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr "Sora Sompeng"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr "Čakmovština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr "Mahajánština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr "Sharada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr "Archaické čísla sinhálštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr "Khojki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr "Multani"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr "Khudawadi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr "Grantha"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr "Névárština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr "Tirhuta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr "Siddham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr "Modi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr "Doplněk mongolštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr "Takri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr "Ahom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr "Warang Citi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr "Zanzibarské čtverce"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr "Soyombo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr "Pau Cin Hau"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr "Bhaiksuki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr "Marchen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr "Masaram Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr "Klínové písmo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "Číslice a interpunkce klínového písma"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr "Klínové písmo rané dynastie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr "Egyptské hieroglyfy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr "Anatolské hieroglyfy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr "Doplněk Bamum"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr "Mro"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr "Bassa Vah"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr "Pahawh Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr "Miao"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr "Ideografické symboly a interpunkce"
+
+# auto translated by TM merge from project: Fedora Release Notes, version: f25, DocId: Development_Tools
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr "Tangutština"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr "Komponenty tangutštiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr "Doplněk kana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr "Rozšířená kana A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr "Nushu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr "Duployan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr "Kontroly zkratkového formátu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr "Byzantské hudební symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr "Hudební symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr "Starověká řecká hudební notace"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr "Tai Xuan Jing symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr "Čínské početní tyčky"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "Matematické alfanumerické symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr "Znakopis Sutonové"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr "Doplněk glagolitičtiny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr "Mende Kikakui"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr "Adlam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Arabské matematické abecední symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr "Mahjongské dlaždice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr "Domino dlaždice"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr "Hrací karty"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "Uzavřený alfanumerický doplněk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr "Uzavřený ideografický doplněk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "Různé symboly a piktogramy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr "Emotikony"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr "Ozdobné  Dingbats"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr "Symboly dopravy a map"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr "Alchymistické symboly"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr "Geometrické tvary rozšířené"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr "Doplňkové šipky-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr "Doplňkové symboly a piktogramy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr "CJK rozšíření sdružených ideogramů B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr "CJK rozšíření sdružených ideogramů C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr "CJK rozšíření sdružených ideogramů D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr "CJK rozšíření sdružených ideogramů E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr "CJK rozšíření sdružených ideogramů F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "Doplněk Ideologie kompatibility CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr "Tagy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr "Dodatek výběru variant"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr "Doplňková oblast pro soukromé použití A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr "Doplňková oblast pro soukromé použití B"
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Vypsat pouze název enginu"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Nelze se připojit k IBusu.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "jazyk: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Engine není nastaven.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Nepodařilo se nastavit globální engine.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Nepodařilo se získat globální engine.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Číst mezipaměť systémového registru."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Číst mezipaměť souboru registru."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "Neplatná mezipaměť registru.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Zapsat mezipaměť systémového registru."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Zapsat mezipaměť souboru registru."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Obnovení..."
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Nastavit nebo získat engine"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Ukončit démona IBusu"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Zobrazit dostupné enginy"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Není implementováno)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Restartovat démona IBusu"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Zobrazit verzi"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Zobrazit obsah mezipaměti registru"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Vytvořit mezipaměti registru"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Vypsat adresu D-Bus démona IBusu"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Zobrazit konfigurační hodnoty"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Obnovit konfigurační hodnoty"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Uložit emoji z dialogu do schránky."
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Zobrazit tuto informaci"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Použití: %s PŘÍKAZ [VOLBY...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Příkazy:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s je neznámý příkaz!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Zobrazit varianty emoji"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Nabídka"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Ostatní"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "Otevřít volbu Unicode"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Výběr emoji:"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Napište anotaci nebo vyberte emoji"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Volba Unicode"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "Přivést zpět na výběr emoji"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "Načítání slovníku Unicode:"
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Další strana"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Předchozí strana"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódový bod: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Obsahuje varianty emoji"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Žádný"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotace: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "Název: %s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Vybírání emoji zrušeno."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji zkopírováno do schránky."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"PÍSMO\" pro znaky emoji v dialogu emoji."
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "PÍSMO"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"JAZYK\" pro anotace v dialogu emoji. Např. \"cs\""
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "JAZYK"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Anotace emoji se mohou částečně shodovat"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Odpovídá délce zadaného celku"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Odpovídá podmínce zadaného celku"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Aktualizace IBus"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Klávesa super+mezerník je nyní výchozí klávesovou zkratkou."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus je inteligentní vstupní sběrnice pro Linux / Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Kredit-překladatelům"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Ukončit"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "implicitně:LTR"
diff --git a/po/da.po b/po/da.po
index c35e7a14f..f4916888f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,22 +1,23 @@
-# translation of ibus.pot to Danish
 # Danish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2009,2011
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-10-06 03:44-0400\n"
-"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -327,7 +328,7 @@ msgstr "Start ibus ved login"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Om"
 
@@ -384,8 +385,8 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Latinske layout som ikke har nogen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "US-layout tilføjes til de latinske layouts. Variant kan udelades."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr "US-layout tilføjes til de Latinske layouts. Variant kan udelades."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -511,7 +512,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB-ikon viser layoutstrengen og strengen gengives med RGBA-værdien. RGBA-"
@@ -563,7 +564,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Genvejstasterne til at slå emoji-indtastning til eller fra"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Tilpasset skrifttypenavn for emoji-tegn i emoji-dialog"
 
 #: ../data/ibus.schemas.in.h:53
@@ -681,7 +682,7 @@ msgstr "Vælg et sprog"
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
-msgstr "_Annuller"
+msgstr "_Annullér"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
 #: ../setup/main.py:553
@@ -827,243 +828,2228 @@ msgstr "Symboler"
 msgid "Travel & Places"
 msgstr "Rejse og steder"
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "Vis kun motornavn"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "Kan ikke oprette forbindelse til IBus.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "sprog: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "Ingen motor er sat.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "Sætning af global motor mislykkedes.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "Hentning af global motor mislykkedes.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "Læs systemets registreringsmellemlager."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "Læs den registreringsmellemlageret FIL."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "Registreringsmellemlageret er ugyldigt.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "Skriv systemets registreringsmellemlager."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "Skriv den registreringsmellemlageret FIL."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:307
-msgid "Resetting…"
-msgstr "Nulstiller…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "Færdig"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "Sæt eller hent motor"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "Forlad ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "Vis tilgængelige motorer"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(ikke implementeret)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "Genstart ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "Vis version"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "Vis indholdet af registreringsmellemlager"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "Opret registreringsmellemlager"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Print D-Bus-adressen af ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "Vis konfigurationsværdierne"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "Nulstil konfigurationsværdierne"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr "Gem emoji i dialog til udklipsholder "
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "Vis denne information"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "Kommandoer:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s er ukendt kommando!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:170
-msgid "Show emoji variants"
-msgstr "Vis emoji-varianter"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:175
-msgid "Menu"
-msgstr "Menu"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:189
-msgid "Favorites"
-msgstr "Farvoritter"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:190
-msgid "Others"
-msgstr "Andre"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
-msgid "Emoji Choice"
-msgstr "Valg af emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:336
-msgid "Type annotation or choose emoji"
-msgstr "Skriv annotering eller vælg emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:737
-msgid "Page Down"
-msgstr "Page Down"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:748
-msgid "Page Up"
-msgstr "Page Up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:883
-#, c-format
-msgid "Code point: %s"
-msgstr "Kodepunkt: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:889
-msgid "Has emoji variants"
-msgstr "Har emoji-varianter"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
-#, c-format
-msgid "Description: %s"
-msgstr "Beskrivelse: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1001
-msgid "None"
-msgstr "Ingen"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1021
-#, c-format
-msgid "Annotations: %s"
-msgstr "Annoteringer: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:49
-msgid "Canceled to choose an emoji."
-msgstr "Annulleret for at vælge en emoji."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:70
-msgid "Copied an emoji to your clipboard."
-msgstr "Kopierede en emoji til dit skrivebord."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
 
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:91
-msgid "FONT"
-msgstr "SKRIFTTYPE"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
 
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:96
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:97
-msgid "LANG"
-msgstr "SPROG"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:99
-msgid "Emoji annotations can be match partially"
-msgstr "Emoji-annoteringer kan matches delvist"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:103
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "Vis kun motornavn"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "Kan ikke oprette forbindelse til IBus.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "sprog: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "Ingen motor er sat.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "Sætning af global motor mislykkedes.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "Hentning af global motor mislykkedes.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "Læs systemets registreringsmellemlager."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "Læs den registreringsmellemlageret FIL."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "Registreringsmellemlageret er ugyldigt.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "Skriv systemets registreringsmellemlager."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "Skriv den registreringsmellemlageret FIL."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "Nulstiller…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "Færdig"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "Sæt eller hent motor"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "Forlad ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "Vis tilgængelige motorer"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(ikke implementeret)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "Genstart ibus-daemon"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "Vis version"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "Vis indholdet af registreringsmellemlager"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "Opret registreringsmellemlager"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Print D-Bus-adressen af ibus-daemon"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "Vis konfigurationsværdierne"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "Nulstil konfigurationsværdierne"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr "Gem emoji i dialog til udklipsholder "
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "Vis denne information"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "Kommandoer:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s er ukendt kommando!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr "Vis emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "Farvoritter"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr "Andre"
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Valg af emoji"
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr "Skriv annotering eller vælg emoji"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr "Page Down"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr "Page Up"
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr "Kodepunkt: %s"
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr "Har emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr "Ingen"
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annoteringer: %s"
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr "Annulleret for at vælge en emoji."
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr "Kopierede en emoji til dit skrivebord."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr "SKRIFTTYPE"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr "SPROG"
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr "Emoji-annoteringer kan matches delvist"
+
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Match med længen af det angive heltal"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Match med betingelsen af det angive heltal"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus-opdatering"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+mellemrum er nu standardhotkeyen."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inputbus til Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
@@ -1071,20 +3057,20 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Afslut"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/de.po b/po/de.po
index 82d83e497..0742ef4b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,19 +14,20 @@
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Florian H. <postfuerflo@gmail.com>, 2016. #zanata
-# Roman Spirgi <rspirgi@gmail.com>, 2017. #zanata
+# Roman Spirgi <bigant@fedoraproject.org>, 2017. #zanata
 # Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
 # Tobias Weise <tobias.weise@web.de>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-21 05:49-0400\n"
-"Last-Translator: Roman Spirgi <rspirgi@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German <trans-de@lists.fedoraproject.org>\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -311,7 +312,7 @@ msgstr "System-Tastatur (XKB) Belegung verwenden"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturbelegung</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
@@ -347,7 +348,7 @@ msgstr "IBus bei der Anmeldung starten"
 msgid "<b>Startup</b>"
 msgstr "<b>Starten</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Info"
 
@@ -406,7 +407,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Latin Tastaturbelegungen ohne ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "US Tastaturbelegung wird den Latin Tastaturbelegungen angefügt. Varianten "
 "können vernachlässigt werden."
@@ -535,7 +536,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "Das XKB Icon zeigt den Layout-String und der String wird mit dem RGBA Wert "
@@ -583,7 +584,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog"
 
 #: ../data/ibus.schemas.in.h:53
@@ -611,62 +612,70 @@ msgstr ""
 "Liste Zeichen enthält."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotations can be match partially or not"
+msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 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:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -838,263 +847,2248 @@ msgstr "Symbole"
 msgid "Travel & Places"
 msgstr "Reisen & Orte"
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "Nur Engine-Name auflisten"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "Keine Verbindung zu IBus.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "Sprache: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "Keine Engine gesetzt.\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "Lesen Sie den System-Registry-Cache."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "Lesen Sie die Registry-Cache DATEI."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "Der Registry-Cache ist ungültig.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "Schreiben Sie den System-Registry-Cache."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "Schreiben Sie die Registry-Cache DATEI."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:307
-msgid "Resetting…"
-msgstr "Neustarten..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "Fertig"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "Setzen oder erhalten Modul"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "Beenden ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "Anzeigen verfügbare Module"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(Nicht implementiert)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "Neustart ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "Anzeigen Version"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "Anzeigen Inhalt des Registry-Cache."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "Erstellen Registry-Cache"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "Anzeigen der Konfigurationswerte"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "Zurücksetzen der Konfigurationswerte"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "Anzeige dieser Information"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "Anwendung: %s BEFEHL [OPTION...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "Befehle:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s ist ein unbekannter Befehl!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:170
-msgid "Show emoji variants"
-msgstr "Emoji-Varianten anzeigen"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:175
-msgid "Menu"
-msgstr "Menü"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:189
-msgid "Favorites"
-msgstr "Favoriten"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:190
-msgid "Others"
-msgstr "Andere"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
-msgid "Emoji Choice"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:330
-msgid "Type annotation or choose emoji"
-msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:752
-msgid "Page Down"
-msgstr "Seite runter"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:763
-msgid "Page Up"
-msgstr "Seite hoch"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:882
-#, c-format
-msgid "Code point: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:888
-msgid "Has emoji variants"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
 msgstr ""
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
-#, c-format
-msgid "Description: %s"
-msgstr "Beschreibung: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:995
-msgid "None"
-msgstr "Kein"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1015
-#, c-format
-msgid "Annotations: %s"
-msgstr "Annotationen: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "Nur Engine-Name auflisten"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "Keine Verbindung zu IBus.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "Sprache: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "Keine Engine gesetzt.\n"
+"\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "Lesen Sie den System-Registry-Cache."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "Lesen Sie die Registry-Cache DATEI."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "Der Registry-Cache ist ungültig.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "Schreiben Sie den System-Registry-Cache."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "Schreiben Sie die Registry-Cache DATEI."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "Neustarten..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "Fertig"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "Setzen oder erhalten Modul"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "Beenden ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "Anzeigen verfügbare Module"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(Nicht implementiert)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "Neustart ibus-daemon"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "Anzeigen Version"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "Anzeigen Inhalt des Registry-Cache."
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "Erstellen Registry-Cache"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "Anzeigen der Konfigurationswerte"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "Zurücksetzen der Konfigurationswerte"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage"
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "Anzeige dieser Information"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Anwendung: %s BEFEHL [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "Befehle:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ist ein unbekannter Befehl!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr "Emoji-Varianten anzeigen"
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr "Menü"
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "Favoriten"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr "Andere"
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr "Seite runter"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr "Seite hoch"
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr "Beschreibung: %s"
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr "Kein"
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr "Annotationen: %s"
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Abbrechen der Emoji-Auswahl."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji in die Zwischenablage kopiert."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "SCHRIFT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus Panel"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus Aktualisierung"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1121
 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:1240
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009."
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Beenden"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/es.po b/po/es.po
index 56fc3f338..5835446f2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,21 +15,23 @@
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Alberto Castillo <acg@albertocg.com>, 2016. #zanata
-# Alexis Stevenson <waldoribeiro@sapo.pt>, 2016. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2016. #zanata
 # Omar Berroterán S. <omarberroteranlkf@gmail.com>, 2016. #zanata
+# Waldo Ribeiro <waldoribeiro@sapo.pt>, 2016. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-24 11:58-0400\n"
-"Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -357,7 +359,7 @@ msgstr "Iniciar ibus al ingresar"
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Acerca de"
 
@@ -415,9 +417,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Disposiciones latinas que no tienen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Disposición de los Estados Unidos se anexa a los Disposiciones latino. "
+"Disposición de los Estados Unidos se anexa a los Disposiciones Latino. "
 "variante puede ser omitida."
 
 #: ../data/ibus.schemas.in.h:13
@@ -548,7 +550,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "El ícono XKB muestra la cadena de diseño que se renderiza con el valor RGBA. "
@@ -601,7 +603,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
 
@@ -873,262 +875,2247 @@ msgstr "Símbolos"
 msgid "Travel & Places"
 msgstr "Viajes y lugares"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Latino básico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Latino-1 (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Latino extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Latino extendido-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Extensiones IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "Modificadores del espaciado"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "Marcas diacríticas combinantes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "Griego y copto"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Cirílico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Cirílico (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Armenio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Árabe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "Sirio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "Árabe (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr "Thaana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr "N'Ko"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "Samaritano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "Mandeo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "Sirio (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "Árabe extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "Bengalí"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "Oriya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "Tamil"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "Telugu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "Kannada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "Sinhala"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "Tailandés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "Lao"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "Tibetano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "Georgiano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "Hangul Jamo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "Etíope"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "Etíope (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "Cheroqui"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "Silabarios indígenas canadienses"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "Ogam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "Rúnico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "Tagalo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr "Hanunóo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr "Buhid"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr "Tagbanwa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "Jemer"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "Mongol"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "Silabarios indígenas canadienses extendidos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "Limbu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr "Tai Le"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "Nuevo Tai Lue"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "Jemer (símbolos)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "Buginés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr "Tai Tham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "Marcas diacríticas combinantes extendidas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "Balinés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "Sondanés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "Batak"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr "Lepcha"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr "Ol Chiki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "Cirílico extendido-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr "Sondanés (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr "Extensiones vedas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr "Extensiones fonéticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr "Extensiones fonéticas (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr "Marcas diacríticas combinantes (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr "Latino extendido adicional"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr "Griego extendido"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr "Puntuación general"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr "Superíndices y subíndices"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "Símbolos monetarios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "Marcas diacríticas combinantes para símbolos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr "Símbolos similares a letras"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "Formas numéricas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "Flechas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "Operadores matemáticos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "Técnicos variados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "Descriptores de control"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr "Reconocimiento óptico de caracteres"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr "Alfanuméricos encerrados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr "Dibujos de cuadros"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr "Bloques"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "Formas geométricas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "Símbolos variados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr "Caracteres gráficos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "Símbolos matemáticos variados A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr "Flechas suplementarias A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr "Patrones Braille"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr "Flechas suplementarias B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "Símbolos matemáticos variados B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr "Operadores matemáticos suplementarios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "Símbolos y flechas variados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr "Glagolítico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr "Latino extendido-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr "Copto"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr "Georgiano (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr "Tifinag"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr "Etíope extendido"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr "Cirílico extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr "Puntuación (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr "CJK, radicales (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr "Kangxi (radicales)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr "Caracteres ideográficos de descripción"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr "CJK, símbolos y puntuación"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr "Hiragana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr "Katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr "Bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr "Jamo con compatibilidad hangul"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr "Kanbun"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr "Bopomofo extendido"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr "CJK, trazos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr "Katakana, extensiones fonéticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr "CJK, letras y meses encerrados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr "CJK (compatibilidad)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr "CJK, ideogramas unificados extensión A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr "Hexagramas del I-Ching"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr "CJK, ideogramas unificados"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr "Yi, sílabas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr "Yi, radicales"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr "Lisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr "Vai"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr "Cirílico extendido-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr "Shümom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr "Letras modificadoras del tono"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr "Latino extendido-D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr "Syloti Nagri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr "Formas numéricas índicas comunes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr "'Phags-pa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr "Saurashtra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr "Devanagari extendido"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr "Kayah Li"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr "Rejang"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr "Hangul Jamo extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr "Javanés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr "Myanmar extendido-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr "Cham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr "Myanmar extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr "Tai Viet"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr "Meetei Mayek, extensiones"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr "Etíope extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr "Latino extendido-E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr "Cheroqui (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr "Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr "Hangul, sílabas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr "Hangul Jamo extendido-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr "Subrogaciones altas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr "Subrogaciones altas de uso privado"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr "Subrogaciones bajas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr "Área de uso privado"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr "CJK, ideogramas de compatibilidad"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr "Formas de presentación alfabética"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr "Formas de presentación árabes-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr "Selectores de variación"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr "Formas verticales"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr "Marcas intermedias combinantes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr "CJK, formas de compatibilidad"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr "Variantes de formas pequeñas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr "Árabe, formas de presentación B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "Formas de ancho completo e intermedio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "Especiales"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr "Silabario lineal B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr "Ideogramas lineales B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr "Números egeos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr "Números de griego antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr "Símbolos antiguos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr "Disco de Festo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr "Licio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr "Cario"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr "Números epact coptos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr "Italo antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr "Gótico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr "Pérmico antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr "Ugarítico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr "Persa antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr "Deseret"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr "Shaviano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr "Osmanya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr "Osage"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr "Elbasano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr "Albanocaucásico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr "Lineal A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr "Silabario chipriota"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr "Arameo imperial"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr "Palmireno"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr "Nabateo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr "Hatrano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr "Fenicio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr "Lidio"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr "Meroítico, jeroglíficos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr "Meroítico, cursiva"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr "Karosti"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr "Árabe meridional antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr "Árabe del norte antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr "Maniqueo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr "Avéstico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr "Parto, inscripciones"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr "Pahlaví, inscripciones"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr "Pahlaví, salmos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr "Turco antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr "Húngaro antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr "Numerales rumi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr "Brahmi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr "Kaithi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr "Sora Sompeng"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr "Chakma"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr "Mahajani"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr "Sharada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr "Sinhala, numerales antiguos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr "Khojki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr "Multani"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr "Khudawadi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr "Grantha"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr "Newa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr "Tirhuta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr "Siddham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr "Modi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr "Mongol (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr "Takri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr "Ahom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr "Warang Citi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr "Zanabazar cuadrada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr "Soyombo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr "Pau Cin Hau"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr "Bhaiksuki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr "Marchen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr "Masaram Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr "Cuneiforme"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "Cuneiforme, números y puntuación"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr "Cuneiforme arcaico"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr "Jeroglíficos egipcios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr "Jeroglíficos anatolios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr "Shümom (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr "Mro"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr "Vah"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr "Pahawh Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr "Pollard Miao"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr "Símbolos y puntuación ideográfica"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr "Tangut"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr "Tangut, componentes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr "Kana (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr "Kana extendido-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr "Nü shu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr "Duployana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr "Taquigrafía, controles de formato"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr "Símbolos musicales biznatinos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr "Símbolos musicales"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr "Notación musical del griego antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr "Tai Xuan Jing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr "Varillas de numeración"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "Símbolos matemáticos alfanuméricos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr "Lengua de signos Sutton"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr "Glagolítico (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr "Silabario ki-ka-ku"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr "Adlam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Símbolos alfabéticos matemáticos árabes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr "Fichas de Mahjong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr "Fichas de dominó"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr "Naipes"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "Alfanuméricos encerrados (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr "Ideogramas encerrados (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "Símbolos y pictogramas varios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr "Emoticonos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr "Pictogramas ornamentales"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr "Símbolos de transporte y mapas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr "Símbolos alquímicos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr "Formas geométricas extendidas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr "Flechas (suplemento-C)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr "Símbolos y pictogramas (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr "CJK, ideogramas unificados extensión B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr "CJK, ideogramas unificados extensión C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr "CJK, ideogramas unificados extensión D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr "CJK, ideogramas unificados extensión E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr "CJK, ideogramas unificados extensión F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "CJK, ideogramas de compatibilidad (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr "Selectores de variación (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr "Área suplementaria de uso privado A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr "Área suplementaria de uso privado B"
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Lea el cache del registro del sistema."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Lea el ARCHIVO de caché del registro."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "El caché del registro es inválido.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Escriba al caché del registro del sistema."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Restableciendo..."
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Hecho"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Mostrar los valores de la configuración"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Restablecer los valores de la configuración"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Guardar emoji del diálogo en el portapapeles."
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMANDO [OPCIÓN...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Mostrar variantes de emoji"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Menú"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Otros"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "Abrir selección Unicode"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Selección de emoji"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Escriba el texto o elija un emoji"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Selección Unicode"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "Volver a la selección emoji"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "Cargando un diccionario Unicode:"
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Siguiente"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Anterior"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto de código: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Tiene variantes emoji"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Ninguna"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotaciones: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "Nombre: %s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Cancelada la selección de emoji."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Se copió un emoji al portapapeles."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "FUENTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
 ""
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "IDIOMA"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Buscar coincidencias con la longtud indicada"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Buscar coincidencias con la condición indicada por el código"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Actualización de IBus"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 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:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Créditos de Traducción"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/fr.po b/po/fr.po
index 3d0a853e2..f4813032e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # French translation of ibus.
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
@@ -18,16 +18,17 @@
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-10-05 08:54-0400\n"
-"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -351,7 +352,7 @@ msgstr "Démarrer IBus lors de la connexion"
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "À propos"
 
@@ -411,9 +412,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Dispositions latines ne disposant pas d’ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"La disposition US est ajoutée aux dispositions latines. Les variantes "
+"La disposition US est ajoutée aux dispositions Latines. Les variantes "
 "peuvent être omises."
 
 #: ../data/ibus.schemas.in.h:13
@@ -541,7 +542,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "L’icône XKB affiche la chaîne de caractères de la disposition et cette "
@@ -597,7 +598,7 @@ msgstr ""
 "Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nom de la police personnalisée pour les caractères d’émoticônes dans la "
 "boite de dialogue"
@@ -874,262 +875,2247 @@ msgstr "Symboles"
 msgid "Travel & Places"
 msgstr "Voyages & lieux"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion à IBus impossible.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Aucun moteur n’est configuré.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Lire le cache du registre système."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Lire le fichier FILE du cache du registre système."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "Le cache du registre est invalide.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Enregistrer le cache du registre système."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Enregistrer le fichier FILE du cache du registre."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Réinitialisation…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Effectuée"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Définir ou obtenir le moteur"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Quitter ibus-daemon"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Afficher les moteurs disponibles"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Non implémenté)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Redémarrer ibus-daemon"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Afficher le contenu du cache du registre"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Créer le cache du registre"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Afficher l’adresse D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Afficher les valeurs de configuration"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Réinitialiser les valeurs de configuration"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Afficher cette information"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s n’est pas une commande connue !\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Montrer les variantes d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Autres"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Choix d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Saisir une annotation ou choisir une émoticône"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Aucune"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue."
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Faire correspondre avec la longueur de l’entier indiqué"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Faire correspondre avec la condition de l’entier indiqué"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Mise à jour de IBus"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+espace est maintenant le raccourci par défaut."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Quitter"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/gu.po b/po/gu.po
index d84f4f8ae..877ad57c9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Gujarati
 # Gujarati translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,19 +9,23 @@
 # sweta <swkothar@redhat.com>, 2009-2010
 # sweta <swkothar@redhat.com>, 2011-2013
 # sweta <swkothar@redhat.com>, 2013-2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-29 09:30+0000\n"
-"Last-Translator: sweta <swkothar@redhat.com>\n"
-"Language-Team: Gujarati (http://www.transifex.com/projects/p/ibus/language/gu/)\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/ibus/language/"
+"gu/)\n"
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -117,7 +121,9 @@ msgstr "ઉમેદવારોની દિશા:"
 
 #: ../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 property panel:"
@@ -137,7 +143,8 @@ msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ ન
 
 #: ../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"
@@ -160,8 +167,8 @@ msgid "General"
 msgstr "સામાન્ય"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "ઉમેરો (_A)"
 
@@ -214,38 +221,92 @@ msgid ""
 "<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>"
-msgstr "<small><i>કિબોર્ડ ટૂંકાણ કીને દબાવીને અથવા પેનલ ચિહ્ન પર ક્લિક કરીને ઉપરની યાદીમાં પસંદ થયેલ એકમાંથી સક્રિય ઇનપુટ પદ્દતિને બદલી શકાય છે.</i></small>"
+msgstr ""
+"<small><i>કિબોર્ડ ટૂંકાણ કીને દબાવીને અથવા પેનલ ચિહ્ન પર ક્લિક કરીને ઉપરની "
+"યાદીમાં પસંદ થયેલ એકમાંથી સક્રિય ઇનપુટ પદ્દતિને બદલી શકાય છે.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ઇનપુટ પદ્દતિ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>કિબોર્ડ લેઆઉટ</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>વૈશ્ર્વિક ઇનપુટ પદ્દતિ સુયોજનો</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "ઉન્નત"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -253,21 +314,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>હોશિયાર ઇનપુટ બસ</small>\nઘરપાનું: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>હોશિયાર ઇનપુટ બસ</small>\n"
+"ઘરપાનું: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>શરૂઆત કરો</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "વિશે"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "બંધ કરો (_C)"
 
@@ -295,10 +362,13 @@ msgstr "IME સ્વીચર વિન્ડો માટે પોપઅપ
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = વિન્ડોને તરત જ બતાવો. 0 &lt; મિલિસેકંડમાં વિલંબ. 0 &gt; વિન્ડોને બતાવો નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે."
+" 0 = વિન્ડોને તરત જ બતાવો. 0 &lt; મિલિસેકંડમાં વિલંબ. 0 &gt; વિન્ડોને બતાવો "
+"નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -308,14 +378,16 @@ msgstr "સંગ્રહેલ આવૃત્તિ નંબર"
 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:11
 msgid "Latin layouts which have no ASCII"
 msgstr "લેટિન લેઆઉટ કે જેની પાસે ASCII નથી"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US લેઆઉટ એ લેટિન લેઆઉટ સાથે જોડાયેલ છે. ચલને કાઢી શકાય છે."
 
 #: ../data/ibus.schemas.in.h:13
@@ -325,7 +397,9 @@ msgstr "xmodmap ને વાપરો"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "xmodmap ને ચલાવો જો .xmodmap અથવા .Xmodmap અસ્તિત્વમાં હોય જ્યારે ibus એંજિન બદલેલ હોય."
+msgstr ""
+"xmodmap ને ચલાવો જો .xmodmap અથવા .Xmodmap અસ્તિત્વમાં હોય જ્યારે ibus એંજિન "
+"બદલેલ હોય."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -375,7 +449,8 @@ msgstr "આપમેળે છુપાવો"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "ગુણધર્મ પેનલનું વર્તન. 0 = બતાવો નહિં, 1 = આપમેળે છુપાડો, 2 = હંમેસા બતાવો"
+msgstr ""
+"ગુણધર્મ પેનલનું વર્તન. 0 = બતાવો નહિં, 1 = આપમેળે છુપાડો, 2 = હંમેસા બતાવો"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -385,7 +460,9 @@ msgstr "ભાષા પેનલ સ્થાન"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -395,7 +472,9 @@ msgstr "સ્થિતિમાં ઇનપુટ કર્સરને અન
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "જો true હોય તો, પેનલ હંમેશા બતાવેલ છે તે સ્થિતિમાં ઇનપુટ કર્સરને અનૂસરે છે. જો false હોય તો, પેનલ સુધારેલ સ્થાન પર બતાવેલ છે."
+msgstr ""
+"જો true હોય તો, પેનલ હંમેશા બતાવેલ છે તે સ્થિતિમાં ઇનપુટ કર્સરને અનૂસરે છે. "
+"જો false હોય તો, પેનલ સુધારેલ સ્થાન પર બતાવેલ છે."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -405,7 +484,8 @@ msgstr "ગુણધર્મ પેનલને બતાવવા માટે
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "પ્રકાશિત થાય પછી ગુણધર્મ પેનલને બતાવવા માટે મિલિસેકંડ અથવા ગુણધર્મો બદલેલ છે"
+msgstr ""
+"પ્રકાશિત થાય પછી ગુણધર્મ પેનલને બતાવવા માટે મિલિસેકંડ અથવા ગુણધર્મો બદલેલ છે"
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -431,51 +511,141 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB ચિહ્ન એ લેઆઉટ શબ્દમાળાને બતાવે છે અને શબ્દમાળા એ RGBA કિંમત સાથે રેન્ડર થયેલ છે. RGBA કિંમત 1 હોઇ શકે છે. X11 માંથી રંગ નામ, 2. '#rrggbb' માંથી હેક્સ કિંમત જ્યાં 'r', 'g' અને 'b' એ લાલ, લીલો, અને વાદળીનાં હેક્સ આંકડા છે, 3. 'rgb(r,g,b)' રૂપમાં RGB રંગ અથવા 4. 'rgba(r,g,b,a)' રૂપમાં  RGBA રંગ જ્યાં 'r', 'g', અને 'b' એ ક્યાંતો સીમા 0 થી 255 માં પૂર્ણાંકો અથવા સીમા 0% થી 100% સીમામાં ટકાવારી કિંમતો, અને 'a' એ આલ્ફાની સીમા 0 થી 1 માં ફ્લોટીંગ પોઇંટ કિંમત છે."
+msgstr ""
+"XKB ચિહ્ન એ લેઆઉટ શબ્દમાળાને બતાવે છે અને શબ્દમાળા એ RGBA કિંમત સાથે રેન્ડર "
+"થયેલ છે. RGBA કિંમત 1 હોઇ શકે છે. X11 માંથી રંગ નામ, 2. '#rrggbb' માંથી "
+"હેક્સ કિંમત જ્યાં 'r', 'g' અને 'b' એ લાલ, લીલો, અને વાદળીનાં હેક્સ આંકડા છે, "
+"3. 'rgb(r,g,b)' રૂપમાં RGB રંગ અથવા 4. 'rgba(r,g,b,a)' રૂપમાં  RGBA રંગ "
+"જ્યાં 'r', 'g', અને 'b' એ ક્યાંતો સીમા 0 થી 255 માં પૂર્ણાંકો અથવા સીમા 0% "
+"થી 100% સીમામાં ટકાવારી કિંમતો, અને 'a' એ આલ્ફાની સીમા 0 થી 1 માં ફ્લોટીંગ "
+"પોઇંટ કિંમત છે."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "વૈવિધ્ય ફોન્ટ"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ભાષા પેનલ માટે વૈવિધ્ય ફોન્ટ નામ"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "કાર્યક્રમ વિન્ડોમાં બેસાડેલ Preedit લખાણ"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
+msgstr ""
+"મૂળભૂત રીતે ઇનપુટ પદ્દતિને સક્રિય કરો જ્યારે કાર્યક્રમને ઇનપુટ ફોકસ મળે છે"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf નામ ઉપસર્ગને સાચવે છે"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "નામનું રૂપાંતરણને બંધ કરવા માટે DConf કીઓનાં ઉપસર્ગો"
 
@@ -483,45 +653,56 @@ msgstr "નામનું રૂપાંતરણને બંધ કરવા
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "બીજા"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "રદ કરો (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "બરાબર (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "વધારે..."
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ભાષા: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "કિબોર્ડ લેઆઉટ: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "લેખક: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "વર્ણન:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "ઇનપુટ પદ્દતિને પસંદ કરો"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "રદ કરો (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "વધારે..."
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -529,7 +710,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus પસંદગીઓને સુયોજિત કરો"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "કિબોર્ડ ટૂંકાણો"
 
@@ -542,208 +723,2336 @@ msgid "Modifiers:"
 msgstr "બદલનારો:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "અમલમાં મૂકો (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "બરાબર (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "પહેલાંની ઇનપુટ પદ્દતિને બદલવા shift સાથે ટૂંકાણ વાપરો"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ડિમન ચાલી રહ્યુ નથી. શું તમે તેને શરૂ કરવા ઇચ્છો છો?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "ઇનપુટ પદ્દતિને બદલી રહ્યા છે"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "ફક્ત એંજિન નામની યાદી કરો"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus માં જોડી શકાતુ નથી.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "ભાષા: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "એજિંન સુયોજિત નથી.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "વૈશ્ર્વિક એંજિનને સુયોજિત કરવામાં નિષ્ફળતા.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "વૈશ્ર્વિક એંજિનને મેળવવામાં નિષ્ફળતા.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "સિસ્ટમ રજીસ્ટરી કેશને વાંચો."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "રજીસ્ટરી કેશ FILE ને વાંચો."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "રજીસ્ટરી કેશ અયોગ્ય છે.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "સિસ્ટમ રજીસ્ટરી કેશને લખો."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "રજીસ્ટરી કેશ FILE ને લખો."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "પુન:સુયોજિત કરી રહ્યા છે.."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "પૂર્ણ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "એંજિનને સુયોજિત અથવા મેળવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon માંથી બહાર નીકળો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "ઉપલબ્ધ એંજિનને બતાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(અમલીકરણ થયેલ નથી)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon ને પુન:શરૂ કરો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "આવૃત્તિને બતાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "રજીસ્ટરી કેશનાં સમાવિષ્ટને બતાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "રજીસ્ટરી કેશને બનાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon નાં D-Bus સરનામાંને છાપો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "રૂપરેખાંકન કિંમતોને બતાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "રૂપરેખાંકન કિંમતોને પુન:સુયોજિત કરો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "આ જાણકારીને બતાવો"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "વપરાશ: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "આદેશો:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s એ અજ્ઞાત આદેશ છે!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "ફક્ત એંજિન નામની યાદી કરો"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus માં જોડી શકાતુ નથી.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "ભાષા: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "એજિંન સુયોજિત નથી.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "વૈશ્ર્વિક એંજિનને સુયોજિત કરવામાં નિષ્ફળતા.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "વૈશ્ર્વિક એંજિનને મેળવવામાં નિષ્ફળતા.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "સિસ્ટમ રજીસ્ટરી કેશને વાંચો."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "રજીસ્ટરી કેશ FILE ને વાંચો."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "રજીસ્ટરી કેશ અયોગ્ય છે.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "સિસ્ટમ રજીસ્ટરી કેશને લખો."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "રજીસ્ટરી કેશ FILE ને લખો."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "પુન:સુયોજિત કરી રહ્યા છે.."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "પૂર્ણ"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "એંજિનને સુયોજિત અથવા મેળવો"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon માંથી બહાર નીકળો"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "ઉપલબ્ધ એંજિનને બતાવો"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(અમલીકરણ થયેલ નથી)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon ને પુન:શરૂ કરો"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "આવૃત્તિને બતાવો"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "રજીસ્ટરી કેશનાં સમાવિષ્ટને બતાવો"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "રજીસ્ટરી કેશને બનાવો"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon નાં D-Bus સરનામાંને છાપો"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "રૂપરેખાંકન કિંમતોને બતાવો"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "રૂપરેખાંકન કિંમતોને પુન:સુયોજિત કરો"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "આ જાણકારીને બતાવો"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "વપરાશ: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "આદેશો:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s એ અજ્ઞાત આદેશ છે!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus સુધારો"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space એ હવે મૂળભૂત હોટકી છે."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "પસંદગીઓ "
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "બહાર નીકળો "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/hu.po b/po/hu.po
index fe2339654..2631e319c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
 # Hungarian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,16 +9,17 @@
 # Sulyok Péter <peti@fedoraproject.org>, 2009
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-09-17 12:01-0400\n"
-"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -342,7 +343,7 @@ msgstr "Az IBus indítása bejelentkezéskor"
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Névjegy"
 
@@ -400,9 +401,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Latin kiosztások, amelyekben nincs ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"USA kiosztás a latin kiosztások mögé fűzve. A változat nem kihagyható."
+"USA kiosztás a Latin kiosztások mögé fűzve. A változat nem kihagyható."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -527,7 +528,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "Az XKB ikon az elrendezési karakterláncot mutatja, és a karakterlánc egy "
@@ -549,6 +550,10 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"A panel ikon megjelenítési ideje egy tulajdonsághoz ezredmásodpercben, ha az "
+"alrendszerek között vált, és ha a tulajdonság az icon-prop-key értékeként "
+"van megadva az IBusEngineDesc-ben. Ha az érték 0, akkor nincs késleltetés, "
+"és a tulajdonságikon azonnal megjelenik."
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
@@ -575,7 +580,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Gyorsbillentyűk az emodzsi bevitel ki- vagy bekapcsolásához"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Egyéni emodzsi betűkészlet neve az emodzsi párbeszédablakhoz"
 
 #: ../data/ibus.schemas.in.h:53
@@ -845,243 +850,2228 @@ msgstr "Szimbólumok"
 msgid "Travel & Places"
 msgstr "Utazás és helyek"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevének listázása"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Nem lehet csatlakozni a IBushoz.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Nincs alrendszer beállítva.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer beállítása.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer lekérése.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának olvasása."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának olvasása."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "A regisztrációs gyorsítótár érvénytelen.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának írása."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának írása."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Visszaállítás…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Kész"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Alrendszer beállítása vagy lekérése"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Kilépés az ibus-daemon-ból"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Elérhető alrendszerek megjelenítése"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Nincs megvalósítva)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Az ibus-daemon újraindítása"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Verzió megjelenítése"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "A regisztrációs gyorsítótár tartalmának megjelenítése"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Regisztrációs gyorsítótár létrehozása"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Az ibus-daemon D-Bus címének kiírása"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Beállítási értékek megjelenítése"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "A beállítási értékek visszaállítása"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Ezen információk megjelenítése"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Használat: %s PARANCS [KAPCSOLÓK…]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s: ismeretlen parancs!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Emodzsi változatok megjelenítése"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Menü"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Többi"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Emodzsi választás"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Írja be az annotációt, vagy válasszon emodzsit"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódpont: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Vannak emodzsi változatai"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Nincs"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotációk: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Emodzsi kiválasztás megszakítva."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Emodzsi vágólapra másolva."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„BETŰKÉSZLET” az emodzsi választó párbeszédablakon"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "BETŰKÉSZLET"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„NYELV”  az emodzsi párbeszédablak annotációhoz. Például „en”"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "NYELV"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Az emodzsi annotációkra lehet részlegesen illeszteni"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Illesztés a megadott egész számmal egyező hosszra"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Illesztés a megadott egész szám feltételével"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus panel"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus frissítés"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Most már a Super+Szóköz az alapértelmezett gyorsbillentyű."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 2012.\n"
@@ -1095,20 +3085,20 @@ msgstr ""
 "  Token https://launchpad.net/~kozmad\n"
 "  fergekolferol https://launchpad.net/~ferge-kolferol"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/it.po b/po/it.po
index 7b3285d2f..e976c5c79 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # Italian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
@@ -18,16 +18,17 @@
 # Luca Ciavatta <luca.ciavatta@gmail.com>, 2017. #zanata
 # Luigi Toscano <luigi.toscano@tiscali.it>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-19 19:06+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-18 04:22-0400\n"
-"Last-Translator: Andrea Masala <andrea.masala87@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: <it@li.org>\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -96,167 +97,138 @@ msgid "Previous input method:"
 msgstr "Metodo di input precedente:"
 
 #: ../setup/setup.ui.h:16
-#, fuzzy
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "I tasti scorciatoia per mostrare la finestra degli emoticon"
-
-#: ../setup/setup.ui.h:17
-#, fuzzy
-msgid "Emoji dialog:"
-msgstr "Finestra degli emoticon:"
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "Abilitare o disabilitare:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "Abilita:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "Disabilita:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Scorciatoie da tastiera</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "Orientamento dei candidati:"
 
-#: ../setup/setup.ui.h:26
+#: ../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"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "Mostra il pannello delle proprietà:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Posizione pannello della lingua:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Mostrare l'icona nell'area di notifica"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Mostrare il nome del metodo di input nella barra della lingua"
 
-#: ../setup/setup.ui.h:31
+#: ../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"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../setup/setup.ui.h:33
+#: ../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"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "Usare carattere personalizzato:"
 
-#: ../setup/setup.ui.h:35
-#, fuzzy
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Impostare un font di candidati emoji nella finestra di emoji"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Carattere emoticon:"
-
-#: ../setup/setup.ui.h:37
-#, fuzzy
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Impostare una lingua di annotazioni emoji nella finestra di emoji"
-
-#: ../setup/setup.ui.h:38
-#, fuzzy
-msgid "Emoji annotation language:"
-msgstr "Lingua di annotazione emoji:"
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>Tipo di carattere e stile</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "Generali"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "A_ggiungi"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "_Su"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "_Giù"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "Mostra le informazioni sul metodo di input selezionato"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "Preferen_ze"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "Mostra l'impostazione dell'input method selezionato"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -267,35 +239,91 @@ msgstr ""
 "tastiera o facendo clic sull'icona del pannello.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Metodo di input"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+#, fuzzy
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "I tasti scorciatoia per mostrare la finestra degli emoticon"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+#, fuzzy
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "Impostare un font di candidati emoji nella finestra di emoji"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Carattere emoticon:"
+
+#: ../setup/setup.ui.h:53
+#, fuzzy
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Impostare una lingua di annotazioni emoji nella finestra di emoji"
+
+#: ../setup/setup.ui.h:54
+#, fuzzy
+msgid "Emoji annotation language:"
+msgstr "Lingua di annotazione emoji:"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usa la disposizione di tastiera del sistema"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usa la disposizione di tastiera del sistema (XKB)"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Condivide lo stesso metodo di input tra le applicazioni"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "Seleziona un metodo di input"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -311,19 +339,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "Avvia IBus all'accesso"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>Avvio</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Informazioni"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -380,9 +408,9 @@ msgstr "Schemi latini senza ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 #, fuzzy
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Lo schema US viene accodato agli schemi latini. Le varianti possono essere "
+"Lo schema US viene accodato agli schemi Latini. Le varianti possono essere "
 "omesse."
 
 #: ../data/ibus.schemas.in.h:13
@@ -516,7 +544,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "L'icona XKB mostra la stringa di layout e la stringa è resa con il valore "
@@ -577,7 +605,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:52
 #, fuzzy
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nome del tipo di carattere personalizzato per emoji sulla finestra degli "
 "emoji"
@@ -609,32 +637,70 @@ msgstr ""
 "lista ha dei caratteri."
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Inserire il testo pre-modificato"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Usa il metodo di input globale"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Abilita per impostazione predefinita il metodo di input"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:70
 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"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Mantieni i prefissi dei nomi DConf"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
 
@@ -654,12 +720,12 @@ msgid "Select a language"
 msgstr "Selezionare una lingua"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "A_nnulla"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "_OK"
 
@@ -732,16 +798,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Premere un tasto (o una combinazione di tasti)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 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"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -757,257 +823,2298 @@ msgstr ""
 "  export QT_IM_MODULE=ibus\""
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Impossibile avviare il demone IBus in %d secondi"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selezione delle scorciatoie da tastiera per %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "selezione metodi di input in corso"
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "Elenca solo il nome del motore"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "Impossibile collegarsi a IBus.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "lingua: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "Nessun motore impostato.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "Impostazione motore globale fallita.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "Acquisizione motore globale fallita.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "Leggere la cache del registro di sistema."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "Leggere la cache del registro dei FILE."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "La cache del registro non è valida.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "Scrivere la cache del registro di sistema."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "Scrivere la cache del registro dei FILE."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:307
-#, fuzzy
-msgid "Resetting…"
-msgstr "Reset..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "Fatto"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "Impostare od ottenere motore"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "Esci ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "Mostra motori disponibili"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(Non implementato)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "Fai ripartire il demone ibus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "Mostra la versione"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "Mostra il contenuto della cache del registro"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "Creare cache del registro"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Stampare l'indirizzo D-Bus di ibus-deamon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "Mostrare i valori della configurazione"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "Reimpostare i valori della configurazione"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr "Salvare emoji sulla finestra degli appunti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "Mostrare questa informazione"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "Comandi:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s è un comando sconosciuto!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:276
-msgid "Emoji Choice"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:282
-#, fuzzy
-msgid "Type annotation or choose emoji"
-msgstr "Scrivere una annotazione oppure scegliere una emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
-msgid "Favorites"
-msgstr "Preferiti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "Elenca solo il nome del motore"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "Impossibile collegarsi a IBus.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "lingua: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "Nessun motore impostato.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "Impostazione motore globale fallita.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "Acquisizione motore globale fallita.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "Leggere la cache del registro di sistema."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "Leggere la cache del registro dei FILE."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "La cache del registro non è valida.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "Scrivere la cache del registro di sistema."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "Scrivere la cache del registro dei FILE."
+
+#: ../tools/main.vala:314
+#, fuzzy
+msgid "Resetting…"
+msgstr "Reset..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "Fatto"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "Impostare od ottenere motore"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "Esci ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "Mostra motori disponibili"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(Non implementato)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "Fai ripartire il demone ibus"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "Mostra la versione"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "Mostra il contenuto della cache del registro"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "Creare cache del registro"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Stampare l'indirizzo D-Bus di ibus-deamon"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "Mostrare i valori della configurazione"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "Reimpostare i valori della configurazione"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr "Salvare emoji sulla finestra degli appunti"
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "Mostrare questa informazione"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "Comandi:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s è un comando sconosciuto!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "Preferiti"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+#, fuzzy
+msgid "Type annotation or choose emoji"
+msgstr "Scrivere una annotazione oppure scegliere una emoji"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:612
+#: ../ui/gtk3/emojier.vala:1071
 #, fuzzy
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:623
+#: ../ui/gtk3/emojier.vala:1082
 #, fuzzy
 msgid "Page Up"
 msgstr "Page Up"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr "Punto di codice: %s"
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../ui/gtk3/emojier.vala:797
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Nessuno"
 
-#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
-#, c-format
-msgid "Code point: %s"
-msgstr "Punto di codice: %s"
-
-#: ../ui/gtk3/emojier.vala:822
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotazioni: %s"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr "Annullato scegliere un emoji."
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr "Copiato un emoji negli appunti."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr "\"FONT\" per i caratteri emoji sulla finestra degli emoji"
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr "FONT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr "\"LANG\" per le annotazioni sulla finestra degli emoji. es. \"en\""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr "LANG"
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Pannello IBus"
 
-#: ../ui/gtk3/panel.vala:832
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Aggiorna IBus"
 
-#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spazio è ora la scelta rapida predefinita."
 
-#: ../ui/gtk3/panel.vala:1214
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1218
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sergio Zanchetta https://launchpad.net/~primes2h"
 
-#: ../ui/gtk3/panel.vala:1237
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../ui/gtk3/panel.vala:1242
-msgid "Emoji Dialog"
-msgstr "Finestra degli Emoji"
-
-#: ../ui/gtk3/panel.vala:1256
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../ui/gtk3/panel.vala:1260
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Esci"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:44
-msgid "Canceled to choose an emoji."
-msgstr "Annullato scegliere un emoji."
-
-#: ../ui/gtk3/emojierapp.vala:51
-msgid "Copied an emoji to your clipboard."
-msgstr "Copiato un emoji negli appunti."
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:68
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr "\"FONT\" per i caratteri emoji sulla finestra degli emoji"
-
-#: ../ui/gtk3/emojierapp.vala:69
-msgid "FONT"
-msgstr "FONT"
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:74
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"LANG\" per le annotazioni sulla finestra degli emoji. es. \"en\""
-
-#: ../ui/gtk3/emojierapp.vala:75
-msgid "LANG"
-msgstr "LANG"
diff --git a/po/ja.po b/po/ja.po
index d75cb30ce..195893e5d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # Japanese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,15 +14,16 @@
 # carrotsoft <www.carrotsoft@gmail.com>, 2012
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-10-20 12:16+0900\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
@@ -329,7 +330,7 @@ msgstr "ログイン時に IBus を起動"
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "情報"
 
@@ -385,7 +386,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "ASCII を持たないラテンレイアウト"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US レイアウトはラテンレイアウトに追加されます。variant は省略可能です。"
 
 #: ../data/ibus.schemas.in.h:13
@@ -501,7 +502,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 "
@@ -550,7 +551,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "絵文字入力の有効と無効を切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用のカスタムフォント名"
 
 #: ../data/ibus.schemas.in.h:53
@@ -805,243 +806,2232 @@ msgstr "記号"
 msgid "Travel & Places"
 msgstr "旅行と場所"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "基本ラテン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "ラテン1補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "ラテン文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "ラテン文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "IPA 拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "前進を伴う修飾文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "ダイアクリティカルマーク (合成可能)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "ギリシア文字及びコプト文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "キリール文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "キリール文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "アルメニア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "ヘブライ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "アラビア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "シリア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "アラビア文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr "ターナ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr "ンコ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "サマリア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "マンダ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "シリア文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "アラビア文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "デーヴァナーガリー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "ベンガル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "グルムキー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "グジャラート文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "オリヤー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "タミル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "テルグ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "カンナダ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "マラヤーラム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "シンハラ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "タイ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "ラオス文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "チベット文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "ミャンマー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "グルジア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "ハングル字母"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "エチオピア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "エチオピア文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "チェロキー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "統合カナダ先住民音節"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "オガム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "ルーン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "タガログ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr "ハヌノオ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr "ブヒッド文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr "タグバヌア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "クメール文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "モンゴル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "統合カナダ先住民音節拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "リンブ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr "タイ ロ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "新タイ ロ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "クメール文字用記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "ブギス文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr "ラーンナー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "ダイアクリティカルマーク (合成可能) 拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "バリ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "スンダ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "バタク文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr "レプチャ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr "オル・チキ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "キリール文字拡張 C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr "スンダ文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr "ヴェーダ文字拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr "音声記号拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr "音声記号拡張補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr "ダイアクリティカルマーク (合成可能) 補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr "ラテン文字拡張追加"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr "ギリシア文字拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr "一般句読点"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr "上付き・下付き"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "通貨記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "記号用ダイアクリティカルマーク (合成可能)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr "文字様記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "数字に準じるもの"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "矢印"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "数学記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "その他の技術用記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "制御機能用記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr "光学的文字認識、OCR"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr "囲み英数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr "けい線素片"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr "ブロック要素"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "幾何学模様"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "その他の記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr "装飾記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "その他の数学記号 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr "補助矢印 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr "点字図形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr "補助矢印 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "その他の数学記号 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr "補助数学記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "その他の記号及び矢印"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr "グラゴル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr "ラテン文字拡張 C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr "コプト文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr "グルジア文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr "ティフナグ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr "エチオピア文字拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr "キリール文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr "補助句読点"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr "CJK 部首補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr "康熙部首"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr "漢字構成記述文字、IDC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr "CJK の記号及び句読点"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr "平仮名"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr "片仮名"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr "注音字母"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr "ハングル互換字母"
+
+# JIS のブロック名は KANBUN (CJK miscellaneous)、日本語による通用名称は「漢文用記号 (その他の CJK 文字)」
+# だが、メッセージは Kanbun のみなので訳は「漢文用記号」のみとした
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr "漢文用記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr "注音字母拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr "CJK の筆画"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr "片仮名拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr "囲み CJK 文字・月"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr "CJK 互換用文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr "CJK 統合漢字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr "易経記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr "CJK 統合漢字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr "イ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr "イ文字部首"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr "リス文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr "ヴァイ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr "キリール文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr "バムン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr "声調修飾文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr "ラテン文字拡張 D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr "シロティナグリ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr "共通インド数字に準じるもの"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr "パスパ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr "サウラーシュトラ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr "デーヴァナーガリー文字拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr "カヤー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr "ルジャン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr "ハングル字母拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr "ジャワ文字"
+
+# 「ミャンマー文字拡張 A」と合わせた
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr "ミャンマー文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr "チャム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr "ミャンマー文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr "タイ・ヴェト文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr "マニプリ文字拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr "エチオピア文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr "ラテン文字拡張 E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr "チェロキー文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr "マニプリ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr "ハングル音節文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr "ハングル字母拡張 B"
+
+# サロゲートペアは JIS(UCS) になし。
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr "上位代用符号位置"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr "上位私用代用符号位置"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr "下位代用符号位置"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr "私用領域"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr "CJK 互換漢字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr "アルファベット表示形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr "アラビア表示形 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr "字形選択子"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr "縦書き形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr "半記号 (合成可能)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr "CJK 互換形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr "小字形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr "アラビア表示形 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "半角・全角形"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "特殊用途文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr "線文字 B 音節文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr "線文字 B 表意文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr "エーゲ数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr "古代ギリシア数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr "古代記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr "ファイストスの円盤の文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr "リキア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr "カリア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr "コプト・エパクト数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr "古代イタリア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr "ゴート文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr "古代ペルム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr "ウガリト文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr "古代ペルシャ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr "デザレット文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr "シェイヴィアン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr "オスマニア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr "オセージ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr "エルバサン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr "カフカース・アルバニア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr "線文字 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr "キプロス音節文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr "アラム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr "パラミラ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr "ナバテア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr "ハトラ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr "フェニキア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr "リディア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr "メロエ記念碑文体"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr "メロエ草書体"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr "カローシュティー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr "古典南アラビア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr "古典北アラビア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr "マニ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr "アヴェスター文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr "碑文パルティア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr "碑文パフラヴィー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr "聖詠パフラヴィー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr "古テュルク文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr "ロヴァーシュ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr "ルーミー数字記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr "ブラーフミー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr "カイティ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr "ソラ・ソンペン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr "チャクマ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr "マハージャニー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr "シャラダ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr "シンハラ旧数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr "ホジャ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr "ムルターニー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr "フダーワーディー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr "グランタ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr "ネワ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr "ティルフータ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr "悉曇文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr "モーディー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr "モンゴル文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr "タクリ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr "アーホム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr "ワラング・クシティ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr "ザナバザル方形文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr "ソヨンボ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr "パウ・チン・ハウ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr "バイクシュキー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr "マルチェン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr "マサラム・ゴーンディー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr "くさび形文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "くさび形文字の数字及び句読点"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr "シュメール楔形文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr "ヒエログリフ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr "アナトリア・ヒエログリフ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr "バムン文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr "ムロ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr "バサ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr "パハウ・フモン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr "ポラード文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr "漢字の記号及び句読点"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr "西夏文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr "西南文字の構成要素"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr "仮名文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr "仮名文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr "女書"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr "デュプロワイエ式速記"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr "速記書式制御記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr "ビザンチン音楽記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr "音楽記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr "古代ギリシア音符記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr "太玄経記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr "算木用数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "数学用英数字記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr "サットン手話表記法"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr "グラゴル文文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr "メンデ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr "アドラム文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "アラビア数学用英数字記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr "麻雀牌"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr "ドミノ牌"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr "トランプ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "囲み英数字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr "囲み表意文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "その他の記号と絵文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr "顔文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr "オーナメント"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr "交通と地図の記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr "錬金術記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr "幾何学模様拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr "補助矢印 C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr "補助記号と絵文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr "CJK 統合漢字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr "CJK 統合漢字拡張 C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr "CJK 統合漢字拡張 D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr "CJK 統合漢字拡張 E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr "CJK 統合漢字拡張 F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "CJK 互換漢字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr "タグ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr "字形選択子補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr "補助私用領域 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr "補助私用領域 B"
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "エンジン名のみ表示"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "IBus に接続できません。\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "エンジンが設定されていません。\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "システムレジストリーキャッシュを読み込みます。"
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "レジストリーキャッシュは無効です。\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "システムレジストリーキャッシュを書き込みます。"
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "初期化中…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "完了"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "設定値を表示する"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "設定値を初期化する"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "ダイアログ上の絵文字をクリップボードに保存する"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "使い方: %s コマンド [オプション...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "絵文字異形を表示する"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "メニュー"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "その他"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "Unicode の選択を開く"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "ルビを入力するか絵文字を選択してください"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Unicode の選択"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "絵文字の選択に戻る"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "Unicode の辞書を読み込んでいます:"
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "なし"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "名前: %s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "別名: %s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "絵文字の選択を取り消しました。"
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "クリップボードに絵文字をコピーしました。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "フォント"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "言語"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "指定した数字をもつ長さで一致させる"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -1049,20 +3039,20 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/kn.po b/po/kn.po
index 57055d231..c9faabe50 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Kannada
 # Kannada translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,22 @@
 # shanky <prasad.mvs@gmail.com>, 2012
 # shankar <svenkate@redhat.com>, 2009-2010,2013
 # shanky <prasad.mvs@gmail.com>, 2011-2013
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-27 19:17+0000\n"
-"Last-Translator: shanky <prasad.mvs@gmail.com>\n"
-"Language-Team: Kannada <trans-kn@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Kannada <trans-kn@lists.fedoraproject.org>\n"
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -116,7 +119,9 @@ msgstr "ಅಭ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
 
 #: ../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 property panel:"
@@ -136,7 +141,9 @@ msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವ
 
 #: ../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"
@@ -159,14 +166,15 @@ msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "ಸೇರಿಸು (_A)"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳಿಗೆ ಸೇರಿಸಿ"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
@@ -174,7 +182,9 @@ msgstr "ತೆಗೆದು ಹಾಕು (_R)"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ "
+"ತೆಗೆದು ಹಾಕಿ"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
@@ -182,7 +192,9 @@ msgstr "ಮೇಲಕ್ಕೆ (_U)"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ "
+"ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -190,7 +202,9 @@ msgstr "ಕೆಳಕ್ಕೆ (_D)"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
+msgstr ""
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ "
+"ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -213,38 +227,93 @@ msgid ""
 "<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>"
-msgstr "<small><i>ಸಕ್ರಿಯ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿರುವುದರಿಂದ ಮೇಲಿನ ಪಟ್ಟಿಯಲ್ಲಿನ ಬೇರೆಯೊಂದಕ್ಕೆ ಬದಲಾಯಿಸಲು ಕೀಲಿಮಣೆ ಸಮೀಪಮಾರ್ಗಗಳನ್ನು ಬಳಸಬಹುದು ಅಥವ ಪ್ಯಾನಲ್‌ ಚಿಹ್ನೆಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಬಹುದು.</i></small>"
+msgstr ""
+"<small><i>ಸಕ್ರಿಯ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿರುವುದರಿಂದ ಮೇಲಿನ "
+"ಪಟ್ಟಿಯಲ್ಲಿನ ಬೇರೆಯೊಂದಕ್ಕೆ ಬದಲಾಯಿಸಲು ಕೀಲಿಮಣೆ ಸಮೀಪಮಾರ್ಗಗಳನ್ನು ಬಳಸಬಹುದು ಅಥವ "
+"ಪ್ಯಾನಲ್‌ ಚಿಹ್ನೆಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಬಹುದು.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ಜಾಗತಿಕ ಇನ್‌ಪುಟ್‌ ವಿಧಾನದ ಸಿದ್ಧತೆಗಳು</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "ಸುಧಾರಿತ"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -252,21 +321,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\nHomepage: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭಿಸು"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>ಆರಂಭ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "ಮುಚ್ಚು (_C)"
 
@@ -294,10 +369,14 @@ msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟ
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಲು ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುಟಿಕೆ (ಪಾಪ್ಅಪ್) ವಿಳಂಬವನ್ನು ಹೊಂದಿಸಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400 ಆಗಿರುತ್ತದೆ. 0 = ಕಿಟಕಿಯನ್ನು ತಕ್ಷಣವೆ ತೋರಿಸು. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಹಿಂದಿನ/ಮುಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಲು ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪುಟಿಕೆ (ಪಾಪ್ಅಪ್) "
+"ವಿಳಂಬವನ್ನು ಹೊಂದಿಸಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400 ಆಗಿರುತ್ತದೆ. 0 = ಕಿಟಕಿಯನ್ನು ತಕ್ಷಣವೆ "
+"ತೋರಿಸು. 0 &lt; ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ ವಿಳಂಬ. 0 &gt; ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು "
+"ಹಿಂದಿನ/ಮುಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -307,15 +386,19 @@ msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆ"
 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:11
 msgid "Latin layouts which have no ASCII"
 msgstr "ಯಾವುದೆ ASCII ಅನ್ನು ಹೊಂದಿರದ ಲ್ಯಾಟಿನ್ ವಿನ್ಯಾಸಗಳು (ಲೇಔಟ್‌)"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
-msgstr "US ವಿನ್ಯಾಸವನ್ನು ಲ್ಯಾಟಿನ್‌ ವಿನ್ಯಾಸಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ವೇರಿಯಂಟ್‌ ಅನ್ನು ಬಿಡಬಹುದು."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+"US ವಿನ್ಯಾಸವನ್ನು ಲ್ಯಾಟಿನ್‌ ವಿನ್ಯಾಸಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ವೇರಿಯಂಟ್‌ ಅನ್ನು "
+"ಬಿಡಬಹುದು."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -324,7 +407,9 @@ msgstr "xmodmap ಅನ್ನು ಬಳಸು"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus ಅನ್ನು ಬದಲಾಯಿಸಿದಾಗ, .xmodmap ಅಥವ .Xmodmap ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ xmodmap ಅನ್ನು ಚಲಾಯಿಸಿ."
+msgstr ""
+"ibus ಅನ್ನು ಬದಲಾಯಿಸಿದಾಗ, .xmodmap ಅಥವ .Xmodmap ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ xmodmap "
+"ಅನ್ನು ಚಲಾಯಿಸಿ."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -374,7 +459,9 @@ msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "ಗುಣದ ಪ್ಯಾನಲ್‌ನ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = ಯಾವಾಗಲೂ ತೋರಿಸು"
+msgstr ""
+"ಗುಣದ ಪ್ಯಾನಲ್‌ನ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = "
+"ಯಾವಾಗಲೂ ತೋರಿಸು"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,17 +471,23 @@ msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr "ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದರೆ ಇನ್‌ಪುಟ್ ತೆರೆಸೂಚಕವನ್ನು ಅನುಸರಿಸು"
+msgstr ""
+"ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದರೆ ಇನ್‌ಪುಟ್ ತೆರೆಸೂಚಕವನ್ನು ಅನುಸರಿಸು"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "ಟ್ರೂ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದಲ್ಲಿ, ಇನ್‌ಪುಟ್ ತೆರೆಸೂಚಕವನ್ನು ಪ್ಯಾನಲ್‌ ಅನುಸರಿಸುತ್ತದೆ. ಫಾಲ್ಸ್ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ನಿಶ್ಚಿತ ಸ್ಥಳದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ."
+msgstr ""
+"ಟ್ರೂ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲಾಗುತ್ತಿದ್ದಲ್ಲಿ, ಇನ್‌ಪುಟ್ "
+"ತೆರೆಸೂಚಕವನ್ನು ಪ್ಯಾನಲ್‌ ಅನುಸರಿಸುತ್ತದೆ. ಫಾಲ್ಸ್ ಆದಲ್ಲಿ, ಪ್ಯಾನಲ್‌ ಅನ್ನು ನಿಶ್ಚಿತ "
+"ಸ್ಥಳದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -404,7 +497,9 @@ msgstr "ಗುಣದ ಪ್ಯಾನಲ್‌ ಅನ್ನು ತೋರಿಸಬ
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "ಗಮನವು ಅಥವ ಗುಣಗಳನ್ನು ಬದಲಾಯಿಸಿದ ನಂತರ ಗುಣದ ಪ್ಯಾನಲ್ ಅನ್ನು ತೋರಿಸಬೇಕಿರುವ ಮಿಲಿಸೆಕೆಂಡುಗಳು."
+msgstr ""
+"ಗಮನವು ಅಥವ ಗುಣಗಳನ್ನು ಬದಲಾಯಿಸಿದ ನಂತರ ಗುಣದ ಪ್ಯಾನಲ್ ಅನ್ನು ತೋರಿಸಬೇಕಿರುವ "
+"ಮಿಲಿಸೆಕೆಂಡುಗಳು."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -430,51 +525,144 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB ಚಿಹ್ನೆಯು ವಿನ್ಯಾಸದ ವಾಕ್ಯಾಂಶವನ್ನು ತೋರಿಸುತ್ತದೆ ಮತ್ತು ವಾಕ್ಯಾಂಶವು RGBA ಮೌಲ್ಯದಿಂದ ರೆಂಡರ್ ಮಾಡಲಾಗುತ್ತದೆ. RGBA ಮೌಲ್ಯವು 1. X11 ಇಂದ ಒಂದು ಬಣ್ಣದ ಮೌಲ್ಯವಾಗಿರಬಹುದು, 2. '#rrggbb' ರೂಪದಲ್ಲಿರುವ  ಒಂದು ಹೆಕ್ಸ್‌ ಮೌಲ್ಯವಾಗಿರಬಹುದು, ಇಲ್ಲಿ 'r', 'g' ಮತ್ತು 'b' ಎನ್ನುವವು ಅನುಕ್ರಮವಾಗಿ ಕೆಂಪು, ಹಸಿರು, ಮತ್ತು ನೀಲಿ ಬಣ್ಣದ ಹೆಕ್ಸ್‌ ಅಂಕಿಯಾಗಿರುತ್ತವೆ, 3. 'rgb(r,g,b)' ರೂಪದಲ್ಲಿರುವ ಒಂದು RGB ಬಣ್ಣವಾಗಿರಬಹುದು, ಅಥವ 4. 'rgba(r,g,b,a)' ರೂಪದಲ್ಲಿರುವ RGBA ಬಣ್ಣವಾಗಿರಬಹುದು, ಇಲ್ಲಿ 'r', 'g', ಮತ್ತು 'b' ಗಳು 0 ಇಂದ 255 ಒಳಗಿನ ಪೂರ್ಣಾಂಕಗಳಾಗಿರುತ್ತದೆ ಅಥವ 0% ಇಂದ 100% ರ ಒಳಗಿನ ಪ್ರತಿಶತ ಮೌಲ್ಯಗಳಾಗಿರುತ್ತದೆ, ಮತ್ತು 'a' ಎನ್ನುವುದು ಆಲ್ಫಾದ 0 ಇಂದ 1 ರ ಒಳಗಿನ ಒಂದು ತೇಲುವ ಬಿಂದುವಾಗಿರುತ್ತದೆ."
+msgstr ""
+"XKB ಚಿಹ್ನೆಯು ವಿನ್ಯಾಸದ ವಾಕ್ಯಾಂಶವನ್ನು ತೋರಿಸುತ್ತದೆ ಮತ್ತು ವಾಕ್ಯಾಂಶವು RGBA "
+"ಮೌಲ್ಯದಿಂದ ರೆಂಡರ್ ಮಾಡಲಾಗುತ್ತದೆ. RGBA ಮೌಲ್ಯವು 1. X11 ಇಂದ ಒಂದು ಬಣ್ಣದ "
+"ಮೌಲ್ಯವಾಗಿರಬಹುದು, 2. '#rrggbb' ರೂಪದಲ್ಲಿರುವ  ಒಂದು ಹೆಕ್ಸ್‌ ಮೌಲ್ಯವಾಗಿರಬಹುದು, "
+"ಇಲ್ಲಿ 'r', 'g' ಮತ್ತು 'b' ಎನ್ನುವವು ಅನುಕ್ರಮವಾಗಿ ಕೆಂಪು, ಹಸಿರು, ಮತ್ತು ನೀಲಿ ಬಣ್ಣದ "
+"ಹೆಕ್ಸ್‌ ಅಂಕಿಯಾಗಿರುತ್ತವೆ, 3. 'rgb(r,g,b)' ರೂಪದಲ್ಲಿರುವ ಒಂದು RGB "
+"ಬಣ್ಣವಾಗಿರಬಹುದು, ಅಥವ 4. 'rgba(r,g,b,a)' ರೂಪದಲ್ಲಿರುವ RGBA ಬಣ್ಣವಾಗಿರಬಹುದು, "
+"ಇಲ್ಲಿ 'r', 'g', ಮತ್ತು 'b' ಗಳು 0 ಇಂದ 255 ಒಳಗಿನ ಪೂರ್ಣಾಂಕಗಳಾಗಿರುತ್ತದೆ ಅಥವ 0% "
+"ಇಂದ 100% ರ ಒಳಗಿನ ಪ್ರತಿಶತ ಮೌಲ್ಯಗಳಾಗಿರುತ್ತದೆ, ಮತ್ತು 'a' ಎನ್ನುವುದು ಆಲ್ಫಾದ 0 ಇಂದ "
+"1 ರ ಒಳಗಿನ ಒಂದು ತೇಲುವ ಬಿಂದುವಾಗಿರುತ್ತದೆ."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ(ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಶಕ್ತಗೊಳಿಸು"
+msgstr ""
+"ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ "
+"ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf ಹೆಸರುಗಳು ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು ಹಾಗೆಯೆ ಇರಿಸಿಕೊಳ್ಳುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ಹೆಸರಿನ ಪರಿವರ್ತನೆಯನ್ನು ಬದಲಿಸುವ DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
 
@@ -482,45 +670,56 @@ msgstr "ಹೆಸರಿನ ಪರಿವರ್ತನೆಯನ್ನು ಬದಲ
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "ರದ್ದು ಮಾಡು (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "ಸರಿ (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "ಇನ್ನಷ್ಟು..."
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ಭಾಷೆ: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "ಕತೃ: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "ವಿವರಣೆ:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "ರದ್ದು ಮಾಡು (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "ಇನ್ನಷ್ಟು..."
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -528,7 +727,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus ಆದ್ಯತೆಗಳನ್ನು ಸಿದ್ಧಗೊಳಿಸು"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
 
@@ -541,208 +740,2337 @@ msgid "Modifiers:"
 msgstr "ಮಾರ್ಪಡಕಗಳು:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "ಅನ್ವಯಿಸು (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "ಅಳಿಸು (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "ಸರಿ (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಸಮೀಪಮಾರ್ಗವನ್ನು ಬಳಸಿ"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಆರಂಭಿಸಲಾಗಿಲ್ಲ"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬದಲಿಸುವಿಕೆ"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus ನೊಂದಿಗೆ ಸಂಪರ್ಕಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "ಭಾಷೆ: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಓದು."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯು ಅಮಾನ್ಯವಾಗಿದೆ.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಬರೆ."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಬರೆ."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "ಮರುಹೊಂದಿಸುವಿಕೆ..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "ಮುಗಿಯಿತು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "ಎಂಜಿನ್  ಅನ್ನು ಹೊಂದಿಸು ಅಥವ ಪಡೆದುಕೊ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon ಇಂದ ನಿರ್ಗಮಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "ಲಭ್ಯವಿರುವ ಎಂಜಿನ್‌ಗಳನ್ನು ತೋರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon ಅನ್ನು ಮರಳಿ ಸ್ಥಾಪಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯಲ್ಲಿರುವ ವಿಷಯವನ್ನು ತೋರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ರಚಿಸು."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon ನ D-Bus ವಿಳಾಸವನ್ನು ಮುದ್ರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "ಸಂರಚನೆಯ ಮೌಲ್ಯಗಳನ್ನು ತೋರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "ಸಂರಚನಾ ಮೌಲ್ಯಗಳನ್ನು ಮರುಹೊಂದಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "ಈ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "ಆದೇಶಗಳು:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s ಎನ್ನುವುದು ಗೊತ್ತಿರದ ಆದೇಶ!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus ನೊಂದಿಗೆ ಸಂಪರ್ಕಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "ಭಾಷೆ: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "ಸಾರ್ವತ್ರಿಕ ಎಂಜಿನ್ ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಓದು."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯು ಅಮಾನ್ಯವಾಗಿದೆ.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಬರೆ."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಬರೆ."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "ಮರುಹೊಂದಿಸುವಿಕೆ..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "ಮುಗಿಯಿತು"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "ಎಂಜಿನ್  ಅನ್ನು ಹೊಂದಿಸು ಅಥವ ಪಡೆದುಕೊ"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon ಇಂದ ನಿರ್ಗಮಿಸು"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "ಲಭ್ಯವಿರುವ ಎಂಜಿನ್‌ಗಳನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon ಅನ್ನು ಮರಳಿ ಸ್ಥಾಪಿಸು"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯಲ್ಲಿರುವ ವಿಷಯವನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ರಚಿಸು."
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon ನ D-Bus ವಿಳಾಸವನ್ನು ಮುದ್ರಿಸು"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "ಸಂರಚನೆಯ ಮೌಲ್ಯಗಳನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "ಸಂರಚನಾ ಮೌಲ್ಯಗಳನ್ನು ಮರುಹೊಂದಿಸು"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "ಈ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "ಆದೇಶಗಳು:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s ಎನ್ನುವುದು ಗೊತ್ತಿರದ ಆದೇಶ!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus ಅಪ್‌ಡೇಟ್‌"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space ಎನ್ನುವುದು ಈಗ ಪೂರ್ವನಿಯೋಜಿತ ಹಾಟ್‌ಕೀಲ್ ಆಗಿರುತ್ತದೆ."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "ಆದ್ಯತೆಗಳು "
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "ಬಿಟ್ಟು ಬಿಡು "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ko.po b/po/ko.po
index 101536881..0ecb44da3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Korean
 # Korean translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,19 +11,23 @@
 # lego37yoon <lego37yoon@outlook.com>, 2014
 # Michelle Kim <mkim33@gmail.com>, 2012-2014
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# Michelle Kim <mkim33@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-12-21 11:47+0000\n"
-"Last-Translator: lego37yoon <lego37yoon@outlook.com>\n"
-"Language-Team: Korean <en@li.org>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Korean <en@li.org>\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -162,8 +166,8 @@ msgid "General"
 msgstr "일반"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "추가(_A)"
 
@@ -216,38 +220,92 @@ msgid ""
 "<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>"
-msgstr "<small><i>활성화된 입력 방식 목록에서 키보드 단축키를 누르거나 패널 아이콘을 클릭하여 선택한 활성 입력 방식을 전환할 수 있습니다.</i></small>"
+msgstr ""
+"<small><i>활성화된 입력 방식 목록에서 키보드 단축키를 누르거나 패널 아이콘을 클릭하여 선택한 활성 입력 방식을 전환할 수 "
+"있습니다.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "입력 방식"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "시스템 키보드 레이아웃 사용"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "시스템 키보드 (XKB) 레이아웃 사용"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>키보드 레이아웃</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>전역 입력 방식 설정</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "고급"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -255,21 +313,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>지능형 입력 버스</small>\n홈페이지: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>지능형 입력 버스</small>\n"
+"홈페이지: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "로그인 시 ibus 시작"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>시작</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "정보"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "닫기(_C)"
 
@@ -297,10 +361,12 @@ msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연"
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; 밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; "
+"밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -317,7 +383,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "ASCII가 없는 라틴어 레이아웃"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US 레이아웃이 라틴어 레인아웃에 추가되었습니다. 변형된 것은 생략될 수 있습니다."
 
 #: ../data/ibus.schemas.in.h:13
@@ -433,51 +499,137 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' 'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0 부터 255까지의 값 또는 0% 부터 100% 까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. 여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
+msgstr ""
+"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' "
+"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0 "
+"부터 255까지의 값 또는 0% 부터 100% 까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
+"여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "편집전 텍스트 포함"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "입력기를 디폴트로 활성화"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf는 이름 접두사를 보존합니다"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
 
@@ -485,53 +637,64 @@ msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "기타"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "확인(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "더보기..."
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "언어: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "키보드 레이아웃: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "저자: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "설명:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "취소(_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "더보기..."
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr "IBus 환경 설정"
+msgstr "IBus 환경 설정 변경"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "단축키"
 
@@ -544,208 +707,2335 @@ msgid "Modifiers:"
 msgstr "수정자:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "적용(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "확인(_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "입력 방식 전환 중"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "엔진 이름만 나열 "
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus에 연결할 수 없습니다.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "언어: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "엔진이 설정되어 있지 않습니다.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "시스템 레지스트리 캐시 읽어들이기"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "레지스트리 캐시 파일 읽어들이기"
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "레지스트리 캐시가 잘못되었습니다.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "시스템 레지스트리 캐시 쓰기"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "레지스트리 캐시파일 쓰기"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "재설정중..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "완료"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "엔진을 설정하거나 얻기"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon 종료"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "존재하는 엔진 표시"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(구현 안함)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon 재시작"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "버전 보기"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "레지스트리 캐시 내용 표시"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "레지스트리 캐시 만들기"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon의 D-Bus 주소 출력"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "설정 값 표시"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "설정 값 재설정"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "이 정보 표시"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "사용법: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "명령:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s는 알 수 없는 명령입니다!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "엔진 이름만 나열 "
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus에 연결할 수 없습니다.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "언어: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "엔진이 설정되어 있지 않습니다.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "시스템 레지스트리 캐시 읽어들이기"
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "레지스트리 캐시 파일 읽어들이기"
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "레지스트리 캐시가 잘못되었습니다.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "시스템 레지스트리 캐시 쓰기"
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "레지스트리 캐시파일 쓰기"
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "재설정중..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "완료"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "엔진을 설정하거나 얻기"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon 종료"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "존재하는 엔진 표시"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(구현 안함)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon 재시작"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "버전 보기"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "레지스트리 캐시 내용 표시"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "레지스트리 캐시 만들기"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon의 D-Bus 주소 출력"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "설정 값 표시"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "설정 값 재설정"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "이 정보 표시"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "사용법: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "명령:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s는 알 수 없는 명령입니다!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus 업데이트"
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space는 이제 기본 단축키입니다."
 
-#: ../ui/gtk3/panel.vala:903
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다."
 
-#: ../ui/gtk3/panel.vala:907
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "재시작"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "끝내기"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/mr.po b/po/mr.po
index 015c3ec8d..a3dcce691 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,6 +1,6 @@
-# translation of mr.po to Marathi
 # Marathi translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,19 +8,22 @@
 # sandeeps <sshedmak@redhat.com>, 2009,2012
 # sandeeps <sshedmak@redhat.com>, 2009,2011-2013
 # sandeeps <sshedmak@redhat.com>, 2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-22 06:57+0000\n"
-"Last-Translator: sandeeps <sshedmak@redhat.com>\n"
-"Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -159,8 +162,8 @@ msgid "General"
 msgstr "सर्वसाधारण"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "समावेष करा (_A)"
 
@@ -213,38 +216,92 @@ msgid ""
 "<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>"
-msgstr "<small><i> कळफलक शॉर्टकट किज दाबून किंवा पटलावरील चिन्ह क्लिक करून वरील सूचीपासून पसंत केलेल्या सक्रीय इंपुट पद्धतीचा वापर शक्य आहे.</i></small>"
+msgstr ""
+"<small><i> कळफलक शॉर्टकट किज दाबून किंवा पटलावरील चिन्ह क्लिक करून वरील "
+"सूचीपासून पसंत केलेल्या सक्रीय इंपुट पद्धतीचा वापर शक्य आहे.</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "इंपुट पद्धत"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>कळफलक मांडणी</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ग्लोबल इंपुट पद्धत सेटिंग्स्</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "प्रगत"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -252,21 +309,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>हुशार इनपुट बस</small>\nमुख्यपान: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>हुशार इनपुट बस</small>\n"
+"मुख्यपान: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "प्रवेशवेळी ibus सुरू करा"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>स्टार्टअप</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "विषयी"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "बंद करा (_C)"
 
@@ -294,10 +357,13 @@ msgstr "IME स्वीचर पटलकरिता डिले मिल
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. पूर्वनिर्धारित 400. 0 = पटल पटकन दाखवा. 0 &lt; मिलिसेकंदातील विलंब. 0 &gt; पटल दाखवू नका व मागील किंवा पुढील इंजिन्स्चा वापर करू नका."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. "
+"पूर्वनिर्धारित 400. 0 = पटल पटकन दाखवा. 0 &lt; मिलिसेकंदातील विलंब. 0 &gt; "
+"पटल दाखवू नका व मागील किंवा पुढील इंजिन्स्चा वापर करू नका."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -307,14 +373,16 @@ msgstr "आवृत्ती क्रमांक साठवले"
 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:11
 msgid "Latin layouts which have no ASCII"
 msgstr "लॅटिन मांडणी ज्याकडे ASCII नाही"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "लॅटिन मांडणीमध्ये US मांडणी समावेश केली आहे. वेरिएंट आवश्यक नाही."
 
 #: ../data/ibus.schemas.in.h:13
@@ -324,7 +392,9 @@ msgstr "xmodmapचा वापर करा"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus इंजिन्सचा वापर करतेवेळी, xmodmap किंवा .Xmodmap अस्तित्वात असल्यास xmodmap चालवा."
+msgstr ""
+"ibus इंजिन्सचा वापर करतेवेळी, xmodmap किंवा .Xmodmap अस्तित्वात असल्यास "
+"xmodmap चालवा."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -374,7 +444,8 @@ msgstr "स्वयं लपवा"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "गुणधर्म पटलाचे वर्तन. 0 = दाखवू नका, 1 = स्व छुपे करा, 2 = नेहमी दाखवा"
+msgstr ""
+"गुणधर्म पटलाचे वर्तन. 0 = दाखवू नका, 1 = स्व छुपे करा, 2 = नेहमी दाखवा"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -384,7 +455,9 @@ msgstr "भाषा पटलचे स्थान"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -394,7 +467,9 @@ msgstr "पटल नेहमी दाखवले जात असल्य
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "खरे असल्यास, पटल नेहमी दाखवले जात असल्यास पटल इंपुट कर्सरचे पालन करते. खोटे असल्यास, पटल ठराविक ठिकाणी दाखविले जाते."
+msgstr ""
+"खरे असल्यास, पटल नेहमी दाखवले जात असल्यास पटल इंपुट कर्सरचे पालन करते. खोटे "
+"असल्यास, पटल ठराविक ठिकाणी दाखविले जाते."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -404,7 +479,8 @@ msgstr "गुणधर्म पटल दाखवण्याकरिता
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "फोकस-इन किंवा गुणधर्म बदलवण्यानंतर, गुणधर्म पटल दाखवण्याकरिता मिलिसेकंद."
+msgstr ""
+"फोकस-इन किंवा गुणधर्म बदलवण्यानंतर, गुणधर्म पटल दाखवण्याकरिता मिलिसेकंद."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -430,51 +506,142 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB चिन्ह मांडणी स्ट्रिंग दाखवते आणि स्ट्रिंग RGBA मूल्यसह दाखविले जाईल. RGBA मूल्य 1 असू शकते. X11 पासून रंग नाव, 2. फॉर्म '#rrggbb' मधील हेक्स मूल्य जेथे 'r', 'g' आणि 'b' हे रेड, ग्रीन, आणि ब्लुचे हेक्स अंक आहेत, 3. RGB रंग 'rgb(r,g,b)' स्वरूपात किंवा 4. एक RGBA रंग, 'rgba(r,g,b,a)' स्वरूपात जेथे 'r', 'g', आणि 'b' एकतर इंटिजर्स असतात, 0 ते 255 व्याप्तिमध्ये किंवा टक्केवारि मूल्य, 0% ते 100% अशा व्याप्ति अंतर्गत, आणि 'a' फ्लोटिंग पॉइंट मूल्य आहे, अल्फाच्या 0 ते 1 अशा व्याप्तिमध्ये."
+msgstr ""
+"XKB चिन्ह मांडणी स्ट्रिंग दाखवते आणि स्ट्रिंग RGBA मूल्यसह दाखविले जाईल. "
+"RGBA मूल्य 1 असू शकते. X11 पासून रंग नाव, 2. फॉर्म '#rrggbb' मधील हेक्स "
+"मूल्य जेथे 'r', 'g' आणि 'b' हे रेड, ग्रीन, आणि ब्लुचे हेक्स अंक आहेत, 3. RGB "
+"रंग 'rgb(r,g,b)' स्वरूपात किंवा 4. एक RGBA रंग, 'rgba(r,g,b,a)' स्वरूपात "
+"जेथे 'r', 'g', आणि 'b' एकतर इंटिजर्स असतात, 0 ते 255 व्याप्तिमध्ये किंवा "
+"टक्केवारि मूल्य, 0% ते 100% अशा व्याप्ति अंतर्गत, आणि 'a' फ्लोटिंग पॉइंट "
+"मूल्य आहे, अल्फाच्या 0 ते 1 अशा व्याप्तिमध्ये."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "स्वपसंत फॉन्ट वापरा"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "मनपसंत फॉन्ट"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "भाषा पटल करीता स्वपसंत फॉन्ट नाव"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "ऍप्लिकेशन पटलात प्रिएडीट मजकूर एम्बेड करा"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "ग्लोबल इंपुट पद्धत नीवडा"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "पूर्वनितर्धारीतपणे इंपुट पद्धत सुरू करा"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू करा"
+msgstr ""
+"ऍप्लिकेशनला इंपुट फोकस प्राप्त झाल्यावर इंपुट पद्धत पूर्वनिर्धारीतपणे सुरू "
+"करा"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf प्रिझर्व्ह नेम प्रिफिक्सेस्"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "नाव रूपांतर थांबवण्याकरीता DConf किज्चे प्रिफिक्सेस्"
 
@@ -482,45 +649,56 @@ msgstr "नाव रूपांतर थांबवण्याकरीत
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "इतर"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "ठिक आहे (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "आणखी…"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "भाषा: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "कळफलक मांडणी: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "लेखक: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "वर्णन:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "इंपुट पद्धत नीवडा"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "रद्द करा (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "आणखी…"
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -528,7 +706,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "IBus पसंती सुरू करा"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "कळफलक शार्टकट"
 
@@ -541,208 +719,2337 @@ msgid "Modifiers:"
 msgstr "मॉडिफायर:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "लागू करा (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "नष्ट करा (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "ठिक आहे (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "मागील इंपुट पद्धतीचा वापर करण्यासाठी शिफ्टसह शार्टकटचा वापर करा"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus डिमन सुरू नाही. तुम्हाला ते सुरू करायचे?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s करीता कळफलक शार्टकट नीवडा"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "इंपुट पद्धतींचा वापर करत आहे"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "फक्त इंजिन नाव सूचीत दाखवा"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "IBus शी जोडणी अशक्य.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "भाषा: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "इंजिन ठरवले नाही.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "प्रणाली रेजिस्ट्रि कॅशे वाचा."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "रेजिस्ट्रि कॅशे FILE वाचा."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "रेजिस्ट्रि कॅशे अवैध आहे.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "प्रणाली रेजिस्ट्रि कॅशे लिहा."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "रेजिस्ट्रि कॅशे FILE लिहा."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "पुन्हा सेट करत आहे…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "पूर्ण झाले"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "इंजिन सेट किंवा प्राप्त करा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon पासून बाहेर पडा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "उपलब्ध इंजिन्स दाखवा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(लागू केले नाही)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon पुन्हा सुरू करा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "आवृत्ती दाखवा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "रेजिस्ट्रि कॅशेमधील अंतर्भुत माहिती दाखवा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "रेजिस्ट्रि कॅशे निर्माण करा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon च्या D-Bus पत्त्याची छपाई करा "
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "संरचना मूल्ये दाखवा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "संरचना मूल्य मूळस्थितीत आणा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "ही माहिती दाखवा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "वापर: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "आदेश:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s अपरिचीत आदेश आहे!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
-msgid "IBus Update"
-msgstr "IBus सुधारणा"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space आत्ता पूर्वनिर्धारित हॉटि आहे."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:903
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:907
-msgid "translator-credits"
-msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके <sshedmak@redhat.com>, 2009, 2010."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "फक्त इंजिन नाव सूचीत दाखवा"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus शी जोडणी अशक्य.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "भाषा: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "इंजिन ठरवले नाही.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "ग्रोबल इंजिन ठरवण्यास अपयशी.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "प्रणाली रेजिस्ट्रि कॅशे वाचा."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "रेजिस्ट्रि कॅशे FILE वाचा."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "रेजिस्ट्रि कॅशे अवैध आहे.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "प्रणाली रेजिस्ट्रि कॅशे लिहा."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "रेजिस्ट्रि कॅशे FILE लिहा."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "पुन्हा सेट करत आहे…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "पूर्ण झाले"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "इंजिन सेट किंवा प्राप्त करा"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon पासून बाहेर पडा"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "उपलब्ध इंजिन्स दाखवा"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(लागू केले नाही)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon पुन्हा सुरू करा"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "आवृत्ती दाखवा"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "रेजिस्ट्रि कॅशेमधील अंतर्भुत माहिती दाखवा"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "रेजिस्ट्रि कॅशे निर्माण करा"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon च्या D-Bus पत्त्याची छपाई करा "
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "संरचना मूल्ये दाखवा"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "संरचना मूल्य मूळस्थितीत आणा"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "ही माहिती दाखवा"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "वापर: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "आदेश:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s अपरिचीत आदेश आहे!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:710
+msgid "IBus Update"
+msgstr "IBus सुधारणा"
+
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
+msgid "Super+space is now the default hotkey."
+msgstr "Super+space आत्ता पूर्वनिर्धारित हॉटि आहे."
+
+#: ../ui/gtk3/panel.vala:1121
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
+
+#: ../ui/gtk3/panel.vala:1125
+msgid "translator-credits"
+msgstr ""
+"संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009; संदिप शेडमाके "
+"<sshedmak@redhat.com>, 2009, 2010."
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "आवड निवड"
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "पुन्हा चालू करा"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "बाहेर पडा "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/nl.po b/po/nl.po
index 6b51c538e..65d8fd047 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translation of ibus.
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,16 +9,18 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Geert Warrink <geert.warrink@onsnet.nu>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Geert Warrink <geert.warrink@onsnet.nu>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-28 10:10-0400\n"
-"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -341,7 +343,7 @@ msgstr "Start ibus bij inloggen"
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Over"
 
@@ -400,9 +402,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Latin indelingen hebben geen ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"US indeling is toegevoegd aan de latin indelingen. variant kan weggelaten "
+"US indeling is toegevoegd aan de Latin indelingen. variant kan weggelaten "
 "worden."
 
 #: ../data/ibus.schemas.in.h:13
@@ -531,7 +533,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB icoon toont de indelingsstring en deze string wordt van de RGBA waarde "
@@ -586,7 +588,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "De sneltoetsen om emoji typen aan of uit te zetten"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Aangepaste lettertype naam voor emoji karakters op de emoji dialoog"
 
 #: ../data/ibus.schemas.in.h:53
@@ -854,260 +856,2245 @@ msgstr "Symbolen"
 msgid "Travel & Places"
 msgstr "Reizen & Plaatsen"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Basis Latijn"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Lees de systeem registry cache."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Lees het registry cache BESTAND."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "De registry cache is ongeldig.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Schrijf de systeem registry cache."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Herstellen…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Klaar"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Toon de configuratiewaarden"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Herstel de configuratiewaarden"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Sla emoji op dialoog  op naar clipboard "
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Toon emoji varianten"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Andere"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Emoji keuze"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Typeannotatie of kies emoji"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Pagina naar beneden"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Pagina omhoog"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Code punt: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Heeft emoji varianten"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Geen"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotaties: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Annuleer het kiezen van een emoji."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Een emoji naar je clipboard gecopieerd."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" voor emoji karakters op emoji dialoog"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"TAAL\" voor annotaties op emoji dialoog. B.v. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "TAAL"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Match met de lengte van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Match met de conditie van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus Paneel"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index 83c6710a2..70060b2c9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # Polish translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,16 +10,18 @@
 # Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata
 # Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-24 05:17-0400\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
@@ -340,7 +342,7 @@ msgstr "Uruchamianie IBus podczas logowania"
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchamianie</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "O programie"
 
@@ -398,9 +400,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Układy łacińskie niemające ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Układ US jest dołączany do układów łacińskich. Można pominąć „variant”."
+"Układ US jest dołączany do układów Łacińskich. Można pominąć „variant”."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -529,7 +531,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości "
@@ -583,7 +585,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania wpisywania emoji"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nazwa niestandardowej czcionki dla znaków emoji w oknie emoji"
 
 #: ../data/ibus.schemas.in.h:53
@@ -848,261 +850,2246 @@ msgstr "Symbole"
 msgid "Travel & Places"
 msgstr "Podróże i miejsca"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Podstawowy łaciński"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Uzupełnienie Latin-1"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Rozszerzony łaciński A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Rozszerzony łaciński B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Rozszerzenia IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "Oddzielone litery modyfikujące"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "Składające znaki diakrytyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "Grecki i koptyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Cyrylica"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Uzupełnienie cyrylicy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Ormiański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "Hebrajski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Arabski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "Syryjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "Uzupełnienie arabskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr "Thaana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr "N’Ko"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "Samarytański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "Mandejski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "Uzupełnienie syryjskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "Rozszerzony arabski A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "Dewanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "Bengalski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "Gudżarati"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "Orija"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "Tamilski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "Telugu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "Kannada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "Malajalam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "Syngaleski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "Tajski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "Laotański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "Tybetański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "Birmański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "Gruziński"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "Dzamo hangyl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "Etiopski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "Uzupełnienie etiopskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "Czirokeski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "Ujednolicony sylabariusz rdzennych Kanadyjczyków"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "Ogamiczny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "Runiczny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "Tagalski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr "Hanunoo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr "Buid"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr "Tagbanwa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "Khmerski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "Mongolski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "Rozszerzony ujednolicony sylabariusz rdzennych Kanadyjczyków"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "Limbu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr "Tai le"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "Nowy tai le"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "Symbole khmerskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "Bugiński"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr "Tai Tham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "Rozszerzone składające znaki diakrytyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "Balijski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "Sundajski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "Batak"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr "Lepczowski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr "Ol Chiki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "Rozszerzona cyrylica C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr "Uzupełnienie sundajskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr "Rozszerzenia wed"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr "Rozszerzenia fonetyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr "Uzupełnienie rozszerzeń fonetycznych"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr "Uzupełnienie składających znaków diakrytycznych"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr "Łaciński rozszerzony dodatkowy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr "Grecki rozszerzony"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr "Ogólne znaki interpunkcyjne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr "Indeksy górne i dolne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "Symbole walutowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "Składające znaki diakrytyczne dla symboli"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr "Symbole literopodobne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "Formy liczbowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "Strzałki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "Operatory matematyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "Różne znaki techniczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "Obrazy znaków sterujących"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr "Optyczne rozpoznawanie znaków"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr "Otoczone symbole alfanumeryczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr "Rysowanie ramek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr "Elementy blokowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "Kształty geometryczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "Różnorodne symbole"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr "Ozdoby drukarskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "Różne symbole matematyczne A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr "Dodatkowe strzałki A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr "Pismo Braille’a"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr "Dodatkowe strzałki B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "Różne symbole matematyczne B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr "Dodatkowe operatory matematyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "Różne symbole i strzałki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr "Głagolica"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr "Rozszerzony łaciński C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr "Koptyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr "Uzupełnienie gruzińskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr "Rozszerzony etiopski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr "Rozszerzona cyrylica A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr "Dodatkowe znaki interpunkcyjne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr "Radykały CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr "Radykały Kangxi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr "Znaki opisu ideograficznego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr "Symbole i znaki interpunkcyjne CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr "Hiragana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr "Katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr "Bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr "Dzamo zgodności dla hangyl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr "Kanbun"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr "Rozszerzone bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr "Kreski CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr "Rozszerzenia fonetyczne katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr "Otoczone litery i miesiące CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr "Znaki zgodności CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr "Rozszerzenie A ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr "Heksagramy Yijing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr "Ujednolicone ideogramy CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr "Sylaby Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr "Radykały Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr "Lisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr "Wai"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr "Rozszerzona cyrylica B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr "Bamum"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr "Modyfikujące litery tonów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr "Rozszerzony łaciński D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr "Syloti Nagri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr "Wspólne indyjskie formy liczbowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr "Phags-Pa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr "Saurashtra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr "Rozszerzone dewanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr "Kayah Li"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr "Rejang"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr "Rozszerzony dzamo hangyl A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr "Jawajski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr "Rozszerzony birmański B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr "Czamski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr "Rozszerzony birmański A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr "Tai Viet"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr "Rozszerzenia Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr "Rozszerzony etiopski A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr "Rozszerzony łaciński E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr "Uzupełnienie czirokeskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr "Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr "Sylaby Hangyl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr "Rozszerzony dzamo hangyl B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr "Starsze surogaty"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr "Starsze surogaty prywatnego użytku"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr "Młodsze surogaty"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr "Obszar prywatnego użytku"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr "Ideogramy zgodności CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr "Alfabetyczne formy prezentacyjne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr "Arabskie formy prezentacyjne A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr "Przełączniki wariantów glifów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr "Formy pionowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr "Składające półznaki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr "Formy zgodności CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr "Różne małe formy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr "Arabskie formy prezentacyjne B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "Formy połowy i pełnej szerokości"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "Specjalne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr "Sylabariusz pisma linearnego B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr "Ideogramy pisma linearnego B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr "Cyfry egejskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr "Starożytne cyfry greckie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr "Symbole starożytne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr "Dysk z Fajstos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr "Licyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr "Karyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr "Koptyjskie cyfry epakta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr "Staroitalski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr "Gocki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr "Staropermski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr "Ugarycki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr "Staroperski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr "Deseret"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr "Alfabet Shawa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr "Osmański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr "Osage"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr "Elbasański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr "Kaukasko-albański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr "Linearne A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr "Sylabariusz cypryjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr "Aramejski imperialny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr "Palmyreński"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr "Nabatejski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr "Hatran"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr "Fenicki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr "Lidyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr "Hieroglify meroickie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr "Kursywa meroicka"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr "Charosti"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr "Południowoarabski epigraficzny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr "Północnoarabski epigraficzny"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr "Manichejski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr "Awestyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr "Inskrypcyjny partyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr "Inskrypcyjny pahlawi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr "Psałterzowy pahlawi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr "Staroturecki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr "Starowęgierski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr "Symbole numeryczne rumi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr "Brahmi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr "Kaithi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr "Sorang sompeng"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr "Czakma"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr "Mahajański"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr "Śarada"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr "Archaiczne cyfry syngaleskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr "Chodżycki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr "Multani"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr "Khudawadi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr "Grantha"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr "Newa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr "Tirhuta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr "Siddham"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr "Modi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr "Uzupełnienie mongolskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr "Takri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr "Ahom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr "Varang kshiti"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr "Kwadratowe Zanabazara"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr "Sojombo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr "Pau Cin Hau"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr "Bhaiksuki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr "Marchen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr "Gondi masarama"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr "Pismo klinowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "Cyfry i interpunkcja pisma klinowego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr "Wczesnodynastyczne pismo klinowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr "Hieroglify egipskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr "Hieroglify anatolijskie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr "Uzupełnienie bamum"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr "Mro"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr "Bassa vah"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr "Pahawh hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr "Miao"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr "Ideograficzne symbole i znaki interpunkcyjne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr "Tangucki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr "Składniki tanguckie"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr "Uzupełnienie kana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr "Rozszerzony kana A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr "Nüshu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr "Stenografia Duployé’a"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr "Modyfikatory formatu stenograficznego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr "Bizantyjskie symbole muzyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr "Symbole muzyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr "Starożytna grecka notacja muzyczna"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr "Symbole Tai xuan Jing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr "Cyfry w chińskim zapisie pałeczkowym"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "Matematyczne symbole alfanumeryczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr "Sutton SignWriting"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr "Uzupełnienie głagolicy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr "Pismo ki-ka-ku"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr "Adlam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Arabskie matematyczne symbole alfabetyczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr "Klocki Mahjong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr "Klocki domina"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr "Karty do gry"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "Uzupełnienie otoczonych symboli alfanumerycznych"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr "Uzupełnienie otoczonych ideogramów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "Różne symbole i piktogramy"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr "Emotikony"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr "Ozdoby drukarskie Dingbat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr "Symbole transportowe i dla map"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr "Symbole alchemiczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr "Rozszerzone kształty geometryczne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr "Uzupełnienie strzałek C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr "Uzupełnienie symboli i piktogramów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr "Rozszerzenie B ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr "Rozszerzenie C ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr "Rozszerzenie D ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr "Rozszerzenie E ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr "Rozszerzenie F ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "Dodatkowe ideogramy zgodności CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr "Znaczniki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr "Dodatkowe przełączniki wariantów glifów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr "Dodatkowy obszar prywatnego użytku A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr "Dodatkowy obszar prywatnego użytku B"
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Nie można połączyć z usługą IBus.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Odczytuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Zapisuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Przywracanie…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Wyświetla wartości konfiguracji"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Przywraca wartości konfiguracji"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Zapisuje emoji w oknie do schowka "
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Wyświetlanie wariantów emoji"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Inne"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "Otwórz wybór unikodu"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Proszę wpisać uwagę lub wybrać emoji"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Wybór unikodu"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "Wróć do wyboru emoji"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "Wczytywanie słownika unikodu:"
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Brak"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "Nazwa: %s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Anulowano, aby wybrać emoji."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Skopiowano emoji do schowka."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "CZCIONKA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "JĘZYK"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2017"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2018"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5633cf29..fe9074d84 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # Portuguese (Brazil) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,16 +13,17 @@
 # Frederico Henrique Gonçalves Lima <fred@fredericolima.com.br>, 2017. #zanata
 # Jonathan Muttini Topanotti <jontopanotti@gmail.com>, 2017. #zanata
 # Mateus de Melo Santos <mateusms@tutanota.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-05-06 02:04+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-06-09 04:32-0400\n"
-"Last-Translator: Mateus de Melo Santos <mateusms@tutanota.com>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
 "Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -307,7 +308,7 @@ msgstr "Usa o desenho do teclado do sistema (XKB)"
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Desenho do Teclado</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:66
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
 
@@ -343,7 +344,7 @@ msgstr "Inicie o ibus na conexão "
 msgid "<b>Startup</b>"
 msgstr "<b>Inicialização</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1272
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Sobre"
 
@@ -400,9 +401,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Leiautes latinos nos quais não contém ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Leiaute US é anexado aos leiautes latinos. variantes podem ser omitidas."
+"Leiaute US é anexado aos leiautes Latinos. variantes podem ser omitidas."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -529,7 +530,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "O ícone XKB exibe a cadeia de caracteres de leiaute e a cadeira de "
@@ -583,7 +584,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "A tecla de atalho para habilitar ou desabilitar a digitação emoji"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nome da fonte customizada para caracteres emoji no diálogo emoji"
 
 #: ../data/ibus.schemas.in.h:53
@@ -611,62 +612,70 @@ msgstr ""
 "algum caractere."
 
 #: ../data/ibus.schemas.in.h:57
-msgid "Whether emoji annotations can be match partially or not"
+msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "Embutir Texto de Pré-Edição "
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "Use o método de entrada global"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por padrão"
 
-#: ../data/ibus.schemas.in.h:68
+#: ../data/ibus.schemas.in.h:70
 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"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "Prefixo de nome de preservação do DConf"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
@@ -838,260 +847,2245 @@ msgstr "Símbolos"
 msgid "Travel & Places"
 msgstr ""
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "Somente o Nome do motor da lista"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "Não foi possível conectar ao IBus.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "idioma: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "Nenhum motor configurado.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "Configurar motor global falhou.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "Obter motor global falhour.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "Ler o cache do registro do sistema."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "Ler o ARQUIVO de cache do registro."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "O cache do registro é inválido.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "Escrever o cache de registro do sistema."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "Escrever o ARQUIVO de cache do registro."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:307
-msgid "Resetting…"
-msgstr "Redefinindo…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "Concluído"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "Definir ou obter motor"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "Sair do ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "Exibir motores disponíveis"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(Não implementado)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "Reiniciar ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "Mostrar versão"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "Mostrar conteúdo de cachê do registro"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "Criar registro de cache"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Imprimir o endereço D-Bus do ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "Mostrar valores de configuração"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "Redefinir os valores de configuração"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr "Salvar emoji no diálogo para a área de transferência"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "Mostrar essa informação"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "Uso: %s COMMAND [OPTION...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "Comandos:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s é um comando desconhecido!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:170
-msgid "Show emoji variants"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:175
-msgid "Menu"
-msgstr "Menu"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:189
-msgid "Favorites"
-msgstr "Favoritos"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:190
-msgid "Others"
-msgstr "Outros"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:324 ../ui/gtk3/panel.vala:1264
-msgid "Emoji Choice"
-msgstr "Escolha do emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:330
-msgid "Type annotation or choose emoji"
-msgstr "Digite a anotação ou escolha o emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:752
-msgid "Page Down"
-msgstr "Page Down"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:763
-msgid "Page Up"
-msgstr "Page Up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:882
-#, c-format
-msgid "Code point: %s"
-msgstr "Ponto de código: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:888
-msgid "Has emoji variants"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
 msgstr ""
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:995 ../ui/gtk3/emojier.vala:1004
-#, c-format
-msgid "Description: %s"
-msgstr "Descrição: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:995
-msgid "None"
-msgstr "Nenhum"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1015
-#, c-format
-msgid "Annotations: %s"
-msgstr "Anotações: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "Somente o Nome do motor da lista"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "Não foi possível conectar ao IBus.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "idioma: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "Nenhum motor configurado.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "Configurar motor global falhou.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "Obter motor global falhour.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "Ler o cache do registro do sistema."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "Ler o ARQUIVO de cache do registro."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "O cache do registro é inválido.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "Escrever o cache de registro do sistema."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "Escrever o ARQUIVO de cache do registro."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "Redefinindo…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "Concluído"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "Definir ou obter motor"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "Sair do ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "Exibir motores disponíveis"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(Não implementado)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "Reiniciar ibus-daemon"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "Mostrar versão"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "Mostrar conteúdo de cachê do registro"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "Criar registro de cache"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Imprimir o endereço D-Bus do ibus-daemon"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "Mostrar valores de configuração"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "Redefinir os valores de configuração"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr "Salvar emoji no diálogo para a área de transferência"
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "Mostrar essa informação"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Uso: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "Comandos:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s é um comando desconhecido!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr "Outros"
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Escolha do emoji"
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr "Digite a anotação ou escolha o emoji"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr "Page Down"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr "Page Up"
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr "Ponto de código: %s"
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr "Nenhum"
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotações: %s"
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:47
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Escolha de um emoji cancelada."
 
-#: ../ui/gtk3/emojierapp.vala:54
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji copiado para a sua área de transferência."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" para caracteres  no diálogo emoji"
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:80
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"LANG\" para anotações em diálogo emoji. V.g. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:81
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:83
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:87
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:283 ../ui/gtk3/panel.vala:314
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Painel IBus"
 
-#: ../ui/gtk3/panel.vala:853
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Atualização IBus"
 
-#: ../ui/gtk3/panel.vala:854 ../ui/gtk3/panel.vala:865
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super + espaço agora são as teclas de atalho padrão."
 
-#: ../ui/gtk3/panel.vala:1236
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1240
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:1259
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:1278
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:1282
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Sair"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "padrão:LTR"
diff --git a/po/sv.po b/po/sv.po
index 7887896ff..507c3774d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,21 +1,22 @@
 # Swedish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-08-07 02:24-0400\n"
-"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
 "X-Generator: Zanata 3.9.6\n"
@@ -332,7 +333,7 @@ msgstr "Starta ibus vid inloggning"
 msgid "<b>Startup</b>"
 msgstr "<b>Uppstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Om"
 
@@ -389,9 +390,9 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Latinsk layout som inte har ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"USA-layout läggs till till den latinska layouten, varianten kan utelämnas."
+"USA-layout läggs till till den Latinska layouten, varianten kan utelämnas."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -515,7 +516,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB-ikonen visar layout-strängen och strängen visas med RGBA-värdet.  RGBA-"
@@ -567,7 +568,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Kortkommandot för att slå på och av emoji-inmatning"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Anpassat typsnitt för emoji-tecken i emoji-dialogen"
 
 #: ../data/ibus.schemas.in.h:53
@@ -832,260 +833,2245 @@ msgstr "Symboler"
 msgid "Travel & Places"
 msgstr "Resor & platser"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Lista endast maskinnamn"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Kan inte ansluta till IBus.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "språk: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Ingen maskin är satt.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Att sätta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Att hämta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Läs systemregistercachen."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Läs registercachen i FIL."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "Registercachen är felaktig.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Skriv systemregistercachen."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Skriv registercachen till FIL."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Återställer …"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Klart"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Sätt eller hämta maskin"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Avsluta ibus-demonen"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Visa tillgängliga maskiner"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(Inte implementerat)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Starta om ibus-demonen"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Visa versionen"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Vissa innehållet i registercachen"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Skapa en registercache"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Skriv ut D-Bus-adressen till ibus-demonen"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Visa konfigurationsvärdena"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Återställ konfigurationsvärdena"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Spara emoji i dialogen till urklipp"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Visa denna information"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Användning: %s KOMMANDO [FLAGGA …]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Kommandon:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s är ett okänt kommando!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Visa emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Meny"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Annat"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Ange annotation eller välj emoji"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "Bläddra upp"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodpunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Avbröt att välja en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "SPRÅK"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annotationer kan matcha partiellt"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Matcha med längden på det angivna heltalet"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Matcha med villkoret för det angivna heltalet"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus-uppdatering"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+ mellanslag är nu standardsnabbkommando."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Starta om"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Avsluta"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "standard:LTR"
diff --git a/po/ta.po b/po/ta.po
index 95190cc8f..47b199eb6 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,6 +1,6 @@
 # Tamil translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,16 +14,17 @@
 # shkumar <shkumar@redhat.com>, 2012,2014
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # deadrat <jayabharat@live.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-19 19:06+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-19 12:07-0400\n"
-"Last-Translator: deadrat <jayabharat@live.com>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -90,164 +91,140 @@ msgid "Previous input method:"
 msgstr "முந்தைய உள்ளீடு முறை:"
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr ""
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "உள்ளீடு முறைமையை துவக்கவும் நிறுத்தவும் குறுக்குவிசைகள்"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "செயல்படுத்து அல்லது முடக்கு:"
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "செயல்படுத்து:"
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "முடக்கு:"
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>விசைப்பலகை குறுக்குவழிகள்</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "காணும் அட்டவணையில் நபர்களின் திசையமைப்பை அமை"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "கேண்டிடேட் சார்ந்து:"
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "மொழி பட்டையை எவ்வாறு காட்ட அல்லது மறைக்க வேண்டும் என ibus பண்பினை அமை"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "பண்புகள் பலகத்தைக் காட்டு:"
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 "சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட preedit உரை"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr "பயன்பாட்டு சாளரத்தில் preedit உரையின் உள்ளீடு முறையை உட்பொதியவும்"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து:"
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr ""
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr ""
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>எழுத்துரு மற்றும் தோற்றம்</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "பொது"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "சேர் (_A)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை சேர்"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "நீக்கு (_R)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை "
 "நீக்கு"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "மேலே (_U)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 "செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு "
 "முறையை மேலே நகர்த்து"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "கீழே (_D)"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை கீழே "
 "நகர்த்து"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "பற்றி (_A)"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "முன்னுரிமைகள் (_P)"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "தேர்ந்தெடுத்த உள்ளிட்டு முறையின் அமைப்பை காட்டு"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -259,35 +236,87 @@ msgstr ""
 "small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>விசைப்பலகை அமைப்பு</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "கூடுதல்"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -303,19 +332,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "புகுபதிவில் ibusஐ துவக்கு"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>துவக்கம்</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1250
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "பற்றி"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "மூடு (_C)"
 
@@ -369,7 +398,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "ASCII கொண்டில்லாத இலத்தீன் லேயவுட்டுகள்"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "அமெரிக்க லேயவுட் இலத்தீன் லேயவுட்டுகளுடன் இணைக்கப்படுகிறது. இதன் மாற்று "
 "வகையை புறக்கணிக்கலாம்."
@@ -499,7 +528,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB சின்னம் லேயவுட் சரத்தைக் காண்பிக்கிறது, அந்தச் சரமானது RGBA மதிப்புட்ன "
@@ -549,7 +578,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:53
@@ -573,31 +602,69 @@ msgid ""
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -618,12 +685,12 @@ msgid "Select a language"
 msgstr ""
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "ரத்து (_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "சரி (_O)"
 
@@ -696,17 +763,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் "
 "பயன்படுத்தவும்"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -722,251 +789,2292 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "IBus உடன் இணைக்க முடியாது.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "மொழி: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "கணினி பதிவக தேக்ககத்தை வாசி."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "பதிவக தேக்கக FILE ஐ வாசி."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "பதிவக தேக்ககம் செல்லுபடியாகாதது.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "கணினி பதிவக தேக்ககத்தில் எழுது."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "பதிவக தேக்கக FILE இல் எழுது."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:307
-msgid "Resetting…"
-msgstr "மீட்டமைக்கிறது…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "முடிந்தது"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "எஞ்சினை அமை அல்லது பெறு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon இலிருந்து வெளியேறு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "இருக்கும் எஞ்சின்களைக் காட்டு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(செயல்படுத்தப்படவில்லை)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon ஐ மறுதுவக்கு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "பதிப்பைக் காட்டு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "பதிவக தேக்கக உள்ளடக்கத்தைக் காண்பி"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "பதிவக தேக்ககத்தை உருவாக்கு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon இன் D-Bus முகவரியை அச்சிடு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "அமைவாக்க மதிப்புகளைக் காண்பி"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "அமைவாக்க மதிப்புகளை மீட்டமை"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
 msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "இந்தத் தகவலைக் காட்டு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "கட்டளைகள் :\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s என்பது தெரியாத கட்டளை!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:276
-msgid "Emoji Choice"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:282
-msgid "Type annotation or choose emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:548 ../ui/gtk3/emojier.vala:587
-msgid "Favorites"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:612
-msgid "Page Down"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:623
-msgid "Page Up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
 msgstr ""
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:797 ../ui/gtk3/emojier.vala:811
-#, c-format
-msgid "Description: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:797
-msgid "None"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:802 ../ui/gtk3/emojier.vala:841
-#, c-format
-msgid "Code point: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:822
-#, c-format
-msgid "Annotations: %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
-msgid "IBus Panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:832
-msgid "IBus Update"
-msgstr "IBus புதுப்பிப்பு"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:833 ../ui/gtk3/panel.vala:844
-msgid "Super+space is now the default hotkey."
-msgstr "இப்போது Super+space என்பது முன்னிருப்பு குறுக்குவிசையாகும்."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:1214
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:1218
-msgid "translator-credits"
-msgstr "I. Felix <ifelix@redhat.com>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:1237
-msgid "Preferences"
-msgstr "முன்னுரிமைகள் "
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:1242
-msgid "Emoji Dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:1256
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:1260
-msgid "Quit"
-msgstr "வெளியேறு "
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
 
-#. Translators: If your locale is RTL, the msgstr is "default:RTL".
-#. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
-msgid "default:LTR"
-msgstr "default:LTR"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "IBus உடன் இணைக்க முடியாது.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "மொழி: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "கணினி பதிவக தேக்ககத்தை வாசி."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "பதிவக தேக்கக FILE ஐ வாசி."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "பதிவக தேக்ககம் செல்லுபடியாகாதது.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "கணினி பதிவக தேக்ககத்தில் எழுது."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "பதிவக தேக்கக FILE இல் எழுது."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "மீட்டமைக்கிறது…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "முடிந்தது"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "எஞ்சினை அமை அல்லது பெறு"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon இலிருந்து வெளியேறு"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "இருக்கும் எஞ்சின்களைக் காட்டு"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(செயல்படுத்தப்படவில்லை)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon ஐ மறுதுவக்கு"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "பதிப்பைக் காட்டு"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "பதிவக தேக்கக உள்ளடக்கத்தைக் காண்பி"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "பதிவக தேக்ககத்தை உருவாக்கு"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon இன் D-Bus முகவரியை அச்சிடு"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "அமைவாக்க மதிப்புகளைக் காண்பி"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "அமைவாக்க மதிப்புகளை மீட்டமை"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "இந்தத் தகவலைக் காட்டு"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "கட்டளைகள் :\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s என்பது தெரியாத கட்டளை!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:44
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:51
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr ""
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:68
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:69
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr ""
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:74
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:75
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:710
+msgid "IBus Update"
+msgstr "IBus புதுப்பிப்பு"
+
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
+msgid "Super+space is now the default hotkey."
+msgstr "இப்போது Super+space என்பது முன்னிருப்பு குறுக்குவிசையாகும்."
+
+#: ../ui/gtk3/panel.vala:1121
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
+
+#: ../ui/gtk3/panel.vala:1125
+msgid "translator-credits"
+msgstr "I. Felix <ifelix@redhat.com>"
+
+#: ../ui/gtk3/panel.vala:1144
+msgid "Preferences"
+msgstr "முன்னுரிமைகள் "
+
+#: ../ui/gtk3/panel.vala:1181
+msgid "Restart"
+msgstr "மறுதுவக்கம்"
+
+#: ../ui/gtk3/panel.vala:1185
+msgid "Quit"
+msgstr "வெளியேறு "
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/te.po b/po/te.po
index 68e7ab34d..e5b27ca37 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Telugu
 # Telugu translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,19 +10,22 @@
 # Krishnababu Krothapalli <krisnababu@gmail.com>, 2014
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011,2014
 # ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-07-18 13:09+0900\n"
-"PO-Revision-Date: 2014-09-25 14:22+0000\n"
-"Last-Translator: Krishnababu Krothapalli <krisnababu@gmail.com>\n"
-"Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Telugu <trans-te@lists.fedoraproject.org>\n"
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -118,7 +121,8 @@ msgstr "సభ్యుల దృక్పథం:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ఐబస్ ప్రవర్తనను అమర్చండి"
+msgstr ""
+"భాషా పట్టీని ఎలా చూపాలి మరియు దాయాలి అనేదానికి ఐబస్ ప్రవర్తనను అమర్చండి"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
@@ -138,7 +142,8 @@ msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధ
 
 #: ../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"
@@ -146,7 +151,9 @@ msgstr "అనువర్తనము కిటికీ నందు ముం
 
 #: ../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:"
@@ -161,8 +168,8 @@ msgid "General"
 msgstr "సాధారణం"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:128
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "జతచేయి (_A)"
 
@@ -184,7 +191,8 @@ msgstr "పైన (_U)"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "చేతనమైన ఇన్‌పుట్ పద్ధతుల జాబితాలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని పైకి కదుపు"
+msgstr ""
+"చేతనమైన ఇన్‌పుట్ పద్ధతుల జాబితాలో ఎంచుకున్న ఇన్‌పుట్ పద్ధతిని పైకి కదుపు"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -215,38 +223,93 @@ msgid ""
 "<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>"
-msgstr "<small><i>పై జాబితాలోని ఇన్పుట్ పద్దతిని కీబోర్డ్ షార్ట్‌కట్ కీలతో గాని లేదా పానల్ ఐకాన్ నొక్కిగాని ఎంపికచేసి, ఏక్టివ్ ఇన్పుట్ పద్దతిని దానికి మార్చవచ్చు.</i></small>"
+msgstr ""
+"<small><i>పై జాబితాలోని ఇన్పుట్ పద్దతిని కీబోర్డ్ షార్ట్‌కట్ కీలతో గాని లేదా "
+"పానల్ ఐకాన్ నొక్కిగాని ఎంపికచేసి, ఏక్టివ్ ఇన్పుట్ పద్దతిని దానికి మార్చవచ్చు."
+"</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ఇన్‌పుట్ పద్ధతి"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:43
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>కీబోర్డు నమూనా</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:51
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "అన్ని అనువర్తనాలలోనూ ఇన్పుట్ పద్దతిని పంచుకొను"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>సార్వత్రిక ఇన్‌పుట్ పద్ధతి అమరికలు</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "అధునాతనం"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -254,21 +317,27 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>ఐబస్</b></big>\n<small>తెలివైన ఇన్‌పుట్ బస్</small>\nనివాసపుట: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>ఐబస్</b></big>\n"
+"<small>తెలివైన ఇన్‌పుట్ బస్</small>\n"
+"నివాసపుట: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "ప్రవేశించేప్పుడు ఐబస్‌ను ప్రారంభించు"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>ప్రారంభము</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:35 ../ui/gtk3/panel.vala:932
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "గురించి"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:38
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "మూసివేయి (_C)"
 
@@ -296,10 +365,13 @@ msgstr "IME స్విచర్ విండో కొరకు పాపప
 
 #: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 &lt; ఆలస్యం మిల్లీసెకన్లలో. 0 &gt; విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
+msgstr ""
+"IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం "
+"400. 0 = విండోను తక్షణమే చూపును. 0 &lt; ఆలస్యం మిల్లీసెకన్లలో. 0 &gt; "
+"విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
@@ -309,14 +381,16 @@ msgstr "భద్రపరచిన రూపాంతరం సంఖ్య"
 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 "భద్రపరచిన రూపాంతరం సంఖ్య అనునది గతంలో స్థాపించిన ఐబస్ రూపాంతరానికి మరియు ప్రస్తుత ఐబస్ రూపాంతరానికి మధ్యని తేడాను పరిశీలించుటకు ఉపయోగించును."
+msgstr ""
+"భద్రపరచిన రూపాంతరం సంఖ్య అనునది గతంలో స్థాపించిన ఐబస్ రూపాంతరానికి మరియు "
+"ప్రస్తుత ఐబస్ రూపాంతరానికి మధ్యని తేడాను పరిశీలించుటకు ఉపయోగించును."
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
 msgstr "ASCII లేని లాటిన్ నమూనాలు"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US నమూనా లాటిన్ నమూనాలకు కలుపబడెను. వేరియంట్‌ను విస్మరించవచ్చు."
 
 #: ../data/ibus.schemas.in.h:13
@@ -326,7 +400,8 @@ msgstr "xmodmap ఉపయోగించు"
 #: ../data/ibus.schemas.in.h:14
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus ఇంజన్లు మార్చినప్పుడు .xmodmap లేదా .Xmodmap ఉంటే గనుక xmodmap నడుపుము."
+msgstr ""
+"ibus ఇంజన్లు మార్చినప్పుడు .xmodmap లేదా .Xmodmap ఉంటే గనుక xmodmap నడుపుము."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -376,7 +451,9 @@ msgstr "స్వయంగా దాగు"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "ప్రోపర్టీ పానల్ యొక్క ప్రవర్తన. 0 = చూపవద్దు, 1 = స్వయంచాలకంగా దాచివేయి, 2 = ఎల్లప్పుడూ చూపు"
+msgstr ""
+"ప్రోపర్టీ పానల్ యొక్క ప్రవర్తన. 0 = చూపవద్దు, 1 = స్వయంచాలకంగా దాచివేయి, 2 = "
+"ఎల్లప్పుడూ చూపు"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -386,7 +463,9 @@ msgstr "భాషా ప్యానల్ స్థానం"
 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:30
 msgid "Follow the input cursor in case the panel is always shown"
@@ -396,7 +475,9 @@ msgstr "పానల్ గనుక ఎల్లప్పుడూ చూపబ
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "true అయితే, పానల్ ఎల్లప్పుడూ చూపబడుతూన్న సందర్బంలో ఇన్పుప్ కర్సర్‌ను అనుసరించును. false అయితే, పానల్ ఒక స్థిరమైన స్థానంలో చూపబడును."
+msgstr ""
+"true అయితే, పానల్ ఎల్లప్పుడూ చూపబడుతూన్న సందర్బంలో ఇన్పుప్ కర్సర్‌ను "
+"అనుసరించును. false అయితే, పానల్ ఒక స్థిరమైన స్థానంలో చూపబడును."
 
 #: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
@@ -406,7 +487,9 @@ msgstr "ప్రోపర్టీ పానల్ చూపుటకు మి
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "దృష్టిసారించిన తరువాత లేదా లక్షణాలు మార్చిన తరువాత ప్రోపర్టీ పానల్ చూపుటకు మిల్లీసెకన్లు."
+msgstr ""
+"దృష్టిసారించిన తరువాత లేదా లక్షణాలు మార్చిన తరువాత ప్రోపర్టీ పానల్ చూపుటకు "
+"మిల్లీసెకన్లు."
 
 #: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
@@ -432,51 +515,142 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
-msgstr "XKB ప్రతిమ అనేది నమూనా స్ట్రింగ్ చూపును మరియు ఆ స్ట్రింగ్ RGBA విలువతో రెండర్ అగును. RGBA విలువ ఇలా ఉండగలదు 1. X11 నుండి ఒక రంగు, 2. '#rrggbb' నుండి హెక్స్ విలువ ఇచట 'r', 'g' మరియు 'b' లు ఎరుపు, పచ్చ, మరియు నీలం యొక్క హెక్స్ అంకెలు, 3. RGB రంగు 'rgb(r,g,b)' నుండి లేదా 4. RGBA రంగు 'rgba(r,g,b,a)' రూపంలో ఇచట 'r', 'g', మరియు 'b' లు 0 నుండి 255 వరకు పూర్ణాంకాలు గాని లేదా 0% నుండి 100% విస్తృతిలో శాతపు విలువలు గాని అవుతాయి, మరియు 'a' అనేది అల్ఫా యొక్క 0 నుండి 1 విస్తృతిలో ఫ్లోటింగ్ పాయింట్ విలువ అవుతుంది."
+msgstr ""
+"XKB ప్రతిమ అనేది నమూనా స్ట్రింగ్ చూపును మరియు ఆ స్ట్రింగ్ RGBA విలువతో "
+"రెండర్ అగును. RGBA విలువ ఇలా ఉండగలదు 1. X11 నుండి ఒక రంగు, 2. '#rrggbb' "
+"నుండి హెక్స్ విలువ ఇచట 'r', 'g' మరియు 'b' లు ఎరుపు, పచ్చ, మరియు నీలం యొక్క "
+"హెక్స్ అంకెలు, 3. RGB రంగు 'rgb(r,g,b)' నుండి లేదా 4. RGBA రంగు "
+"'rgba(r,g,b,a)' రూపంలో ఇచట 'r', 'g', మరియు 'b' లు 0 నుండి 255 వరకు "
+"పూర్ణాంకాలు గాని లేదా 0% నుండి 100% విస్తృతిలో శాతపు విలువలు గాని అవుతాయి, "
+"మరియు 'a' అనేది అల్ఫా యొక్క 0 నుండి 1 విస్తృతిలో ఫ్లోటింగ్ పాయింట్ విలువ "
+"అవుతుంది."
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "అనురూపిత ఖతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "భాషా ప్యానల్ కొరకు అనురూపిత ఖతి పేరును ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "అనురూపిత ఖతి"
 
-#: ../data/ibus.schemas.in.h:47
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "భాష ప్యానల్ కొరకు అనురూపించిన ఖతి పేరు"
 
-#: ../data/ibus.schemas.in.h:48
+#: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:49
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "అనువర్తన కిటికీ నందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠ్యం"
 
-#: ../data/ibus.schemas.in.h:50
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "సార్వత్రిక ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
-msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
+msgstr ""
+"అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనించు"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "పేరు మార్పును ఆపుటకు DConf మీటల ప్రిఫిక్సులు"
 
@@ -484,45 +658,56 @@ msgstr "పేరు మార్పును ఆపుటకు DConf మీట
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "ఇతర"
 
-#: ../setup/engineabout.py:70
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "సరే (_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "మరిన్ని..."
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "భాష: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "కీబోర్డు నమూనా: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "మూలకర్త: %s\n"
 
-#: ../setup/engineabout.py:79
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "వివరణ:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:56
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
-#: ../setup/enginedialog.py:59 ../setup/keyboardshortcut.py:341
-#: ../setup/main.py:413
-msgid "_Cancel"
-msgstr "రద్దుచేయి (_C)"
-
-#: ../setup/enginedialog.py:203
-msgid "More…"
-msgstr "మరిన్ని..."
-
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -530,7 +715,7 @@ msgstr "Kbd"
 msgid "Set IBus Preferences"
 msgstr "ఐబస్ ప్రాధాన్యతలను అమర్చు"
 
-#: ../setup/keyboardshortcut.py:56
+#: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "కీబోర్డు అడ్డదార్లు"
 
@@ -543,208 +728,2338 @@ msgid "Modifiers:"
 msgstr "సవరణిలు:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:134
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "అనువర్తించు (_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:140
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "తొలగించు (_D)"
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:252
 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:259
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "దయచేసి మీటను వత్తండి (లేదా మీటల సమ్మేళనం)"
 
-#: ../setup/keyboardshortcut.py:342 ../setup/main.py:414
-msgid "_OK"
-msgstr "సరే (_O)"
-
-#: ../setup/main.py:113 ../setup/main.py:438
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "మునుపటి ఇన్పుట్ పద్దతికి మారుటకు అడ్డదారిని shift తో ఉపయోగించు"
 
-#: ../setup/main.py:368
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "ఐబస్ డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/main.py:389
+#: ../setup/main.py:528
 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 ""
+"ఐబస్ ప్రారంభమైంది! మీరు ఐబస్ ఉపయోగించలేకుంటే, మీ $HOME/.bashrc కు కింది "
+"పంక్తులను జతచేయండి; అప్పుడు తిరిగి డెస్కుటాప్‌కు ప్రవేశించండి.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr "ఐబస్ ప్రారంభమైంది! మీరు ఐబస్ ఉపయోగించలేకుంటే, మీ $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:403
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "ఐబస్ డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:415
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
 #. Translators: Title of the window
-#: ../setup/main.py:417
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "ఇన్పుట్ పద్దతులు మార్చుట"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "యంత్రం పేరు మాత్రమే జాబితాచేయి"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "ఐబస్‌కు అనుసంధానం కాలేదు.\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "భాష: %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "ఏ యంత్రము అమర్చలేదు.\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "సార్వత్రిక యంత్రం అమర్చుట విఫలమైంది.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "సార్వత్రిక యంత్రం పొందుట విఫలమైంది.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ చదువు."
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "రిజిస్ట్రీ క్యాచీ FILE చదువు."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "రిజిస్ట్రీ క్యాచీ చెల్లనిది.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ వ్రాయి."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "రిజిస్ట్రీ క్యాచీ FILE వ్రాయి."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "తిరిగివుంచుతోంది..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "అయినది"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "యంత్రాన్ని అమర్చు లేదా పొందు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon నిష్క్రమించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "అందుబాటులోని యంత్రాలను చూపించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(అమలు చేయలేదు)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "ibus-daemon పునఃప్రారంభించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "రూపాంతరాన్ని చూపించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "రిజిస్ట్రీ క్యాచీ యొక్క కాంటెంట్ చూపు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "రిజిస్ట్రీ క్యాచీ సృష్టించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "ibus-daemon యొక్క D-Bus చిరునామా ముద్రించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "ఆకృతీకరణ విలువలను చూపుము"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "ఆకృతీకరణ విలువలను తిరిగివుంచుము"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "ఈ సమాచారం చూపించు"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "వాడుక: %s COMMAND [OPTION...]\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "ఆదేశాలు:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s తెలియని ఆదేశం!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:611
-msgid "IBus Update"
-msgstr "ఐబస్ నవీకరణ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:612 ../ui/gtk3/panel.vala:623
-msgid "Super+space is now the default hotkey."
-msgstr "ఇప్పుడు Super+space అప్రమేయ హాట్‌కీ."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:903
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:907
-msgid "translator-credits"
-msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\nప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-14."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "యంత్రం పేరు మాత్రమే జాబితాచేయి"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "ఐబస్‌కు అనుసంధానం కాలేదు.\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "భాష: %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "ఏ యంత్రము అమర్చలేదు.\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "సార్వత్రిక యంత్రం అమర్చుట విఫలమైంది.\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "సార్వత్రిక యంత్రం పొందుట విఫలమైంది.\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ చదువు."
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "రిజిస్ట్రీ క్యాచీ FILE చదువు."
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "రిజిస్ట్రీ క్యాచీ చెల్లనిది.\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ వ్రాయి."
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "రిజిస్ట్రీ క్యాచీ FILE వ్రాయి."
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "తిరిగివుంచుతోంది..."
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "అయినది"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "యంత్రాన్ని అమర్చు లేదా పొందు"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon నిష్క్రమించు"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "అందుబాటులోని యంత్రాలను చూపించు"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(అమలు చేయలేదు)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon పునఃప్రారంభించు"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "రూపాంతరాన్ని చూపించు"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "రిజిస్ట్రీ క్యాచీ యొక్క కాంటెంట్ చూపు"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "రిజిస్ట్రీ క్యాచీ సృష్టించు"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon యొక్క D-Bus చిరునామా ముద్రించు"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "ఆకృతీకరణ విలువలను చూపుము"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "ఆకృతీకరణ విలువలను తిరిగివుంచుము"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "ఈ సమాచారం చూపించు"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "వాడుక: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "ఆదేశాలు:\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s తెలియని ఆదేశం!\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:710
+msgid "IBus Update"
+msgstr "ఐబస్ నవీకరణ"
+
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
+msgid "Super+space is now the default hotkey."
+msgstr "ఇప్పుడు Super+space అప్రమేయ హాట్‌కీ."
+
+#: ../ui/gtk3/panel.vala:1121
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
+
+#: ../ui/gtk3/panel.vala:1125
+msgid "translator-credits"
+msgstr ""
+"కృష్ణబాబు కె <kkrothap@redhat.com> 2009.\n"
+"ప్రవీణ్ యిళ్ళ <mail2ipn@gmail.com> 2010-14."
 
-#: ../ui/gtk3/panel.vala:928
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు "
 
-#: ../ui/gtk3/panel.vala:938
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
 
-#: ../ui/gtk3/panel.vala:942
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "నిష్క్రమించు "
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:371
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/uk.po b/po/uk.po
index aca8cc522..0fc8b1831 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
 # Ukrainian translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,15 +10,16 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-25 05:31-0400\n"
+"PO-Revision-Date: 2018-02-20 12:43-0500\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -342,7 +343,7 @@ msgstr "Запускати ibus при вході"
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "Інформація"
 
@@ -400,7 +401,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "Розкладки латиниці, у яких немає символів ASCII"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "Американська розкладка додається до латинських розкладок, варіант можна "
 "пропустити."
@@ -531,7 +532,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде "
@@ -585,7 +586,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання введення емодзі"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Назва нетипового шрифту для символів емодзі у вікні емодзі"
 
 #: ../data/ibus.schemas.in.h:53
@@ -853,261 +854,2246 @@ msgstr "Символи"
 msgid "Travel & Places"
 msgstr "Подорожі і місця"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Основні латинські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Додаткові Latin-1"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Латинь розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Латинь розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Розширена IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "Знаки інтервалів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "Об’єднання діакритичних знаків"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "Грецькі і коптські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Кирилиця"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Додаткова кирилиця"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Вірменська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "Іврит"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Арабська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "Сирійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "Додаткові арабські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr "Таана"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr "Н’Ко"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "Самаритянська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "Мандейська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "Додаткові сирійські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "Арабська розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "Деванагарі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "Бенгальська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "Гурмухі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "Гуджараті"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "Орія"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "Тамільська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "Телугу"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "Каннада"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "Малаялам"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "Сингальська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "Тайська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "Лаоська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "Тибетська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "М’янмська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "Грузинська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "Хангиль-чжамо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "Ефіопська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "Додаткові ефіопські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "Черокі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "Уніфіковані силабічні канадських аборигенів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "Огам"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "Рунічна"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "Тагалог"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr "Хануну"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr "Бухід"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr "Таґбанва"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "Кхмерська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "Монгольська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "Уніфіковані силабічні канадських аборигенів (додаткові)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "Лімбу"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr "Тай лі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "Нова тай лі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "Кхмерські символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "Бугійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr "Тай-тхем"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "Розширення об’єднання діакритичних знаків"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "Балійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "Сунданська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "Батак"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr "Лепча"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr "Ол-чикі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "Кирилиця розширена-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr "Розширена суданська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr "Ведичні розширення"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr "Фонетичні розширення"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr "Додаткові фонетичні розширення"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr "Додаткові об’єднання діакритичних знаків"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr "Латинські додаткові розширені"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr "Розширена грецька"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr "Загальна пунктуація"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr "Верхні і нижні індекси"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "Символи грошових одиниць"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "Об’єднання діакритичних знаків і символів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr "Схожі на літери символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "Форми чисел"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "Стрілки"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "Математичні оператори"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "Різні технічні"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "Малюнки керування"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr "Оптичне розпізнавання знаків"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr "Буквено-цифрові у рамках"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr "Для малювання рамок"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr "Блокові елементи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "Геометричні форми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "Різні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr "Декоративні"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "Різні математичні символи-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr "Додаткові стрілки-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr "Шаблони Брайля"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr "Додаткові стрілки-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "Різні математичні символи-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr "Додаткові математичні дії"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "Різні символи і стрілки"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr "Глаголиця"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr "Латинь розширена-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr "Коптська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr "Додаткові грузинські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr "Тіфінаг"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr "Розширена ефіопська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr "Розширена кирилиця-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr "Додаткова пунктуація"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr "Додатки радикалів ієрогліфів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr "Радикали кандзі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr "Символи-ідеограми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr "Ієрогліфічні символи і пунктуація"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr "Хірагана"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr "Катакана"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr "Бопомофо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr "Сумісні корейські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr "Канбун"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr "Додаткові бопомофо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr "Ієрогліфічні штрихи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr "Фонетичні розширення катакани"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr "Вкладені ієрогліфи і назви місяців"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr "Сумісність з ієрогліфами"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr "Ієрогліфічні ідеограми, додаток A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr "Символи гексаграм «Книги перетворень»"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr "Універсальні ідеографічні ієрогліфи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr "Склади Ї"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr "Радикалі Ї"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr "Лісу"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr "Вай"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr "Кирилиця розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr "Бамум"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr "Символи зміни тону"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr "Латинь розширена-D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr "Силоті нагрі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr "Загальні індійські форми чисел"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr "Фагс-па"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr "Саураштра"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr "Розширена деванагарі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr "Кая-лі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr "Реджан"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr "Корейска розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr "Яванська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr "М’янмська розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr "Тьям"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr "М’янмська розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr "Тай-в’єт"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr "Маніпурі розширена"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr "Ефіопська розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr "Латинь розширена-E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr "Додаткові черокі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr "Маніпурі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr "Склади хангиля"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr "Корейська розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr "Верхні замінники"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr "Верхні приватні замінники"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr "Нижні замінники"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr "Область приватного використання"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr "Сумісні ієрогліфічні ідеограми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr "Форми відтворення абеток"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr "Форми відображення арабської A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr "Вибір варіантів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr "Вертикальні форми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr "Комбіновані позначки половинок"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr "Сумісні ієрогліфічні форми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr "Варіанти малих форм"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr "Форми відображення арабської B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "Форми півширини та повної ширини"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "Спеціальні"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr "Лінійна писемність B, склади"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr "Лінійна писемність B, ідеограми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr "Егейські числа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr "Давньогрецькі числа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr "Давні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr "Фестський диск"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr "Лікійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr "Карійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr "Коптські місячні числа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr "Давня італійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr "Готичні"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr "Давня пермська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr "Угаритська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr "Давня перська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr "Дезерет"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr "Шавіан"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr "Османья"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr "Осейдж"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr "Ельбасан"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr "Кавказька албанська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr "Лінійна писемність A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr "Кіпріотська складова"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr "імперська арамейська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr "Пальмірська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr "Набатейська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr "Хатран"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr "Фінікійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr "Лідійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr "Мероїтська ієрогліфічна"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr "Мероїтська, скоропис"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr "Кхароштхі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr "Давня південноарабська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr "Давня північноарабська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr "Маніхейська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr "Авестанська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr "Інскрипційна парфянська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr "Інскрипційна пехлеві"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr "Псалтирська пехлеві"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr "Давня турецька"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr "Давня угорська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr "Числові символи румі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr "Брахмійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr "Кайтхі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr "Соранг сомпенг"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr "Чакма"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr "Махаджані"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr "Шарада"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr "Сингальські архаїчні числа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr "Ходжкі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr "Мултанська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr "Худабадська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr "Грантха"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr "Неварська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr "Тірхута"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr "Сіддхам"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr "Моді"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr "Додаткові монгольські"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr "Такрі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr "Ахом"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr "Варанг-кшиті"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr "Квадратний Занабазара"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr "Сойомбо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr "Пау Цин Хау"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr "Бхайксукі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr "Марчен"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr "Масарам гонді"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr "Клинопис"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "Клинописні числа і пунктуація"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr "Клинопис ранньої династії"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr "Єгипетська ієрогліфічна"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr "Анатолійьска ієрогліфічна"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr "Розширений бамум"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr "Мро"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr "Басса-вах"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr "Пахау-хмонг"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr "Мяо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr "Ідеографічні символи і пунктуація"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr "Тангутська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr "Компоненти тангутської"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr "Додаткова кана"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr "Кана розширена-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr "Нюй-шу"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr "Система Дюполоє"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr "Керування форматами скоропису"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr "Візантійські музичні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr "Музичні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr "Давньогрецькі символи запису музики"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr "Символи Тай Хуан Жинь"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr "Числа з паличок для лічби"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "Математичні буквено-цифрові символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr "Жестова писемність Саттон"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr "Додаткові глаголиці"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr "Менде кікауї"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr "Адлам"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Арабські математичні символи абетки"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr "Плитки маджонґ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr "Плитки доміно"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr "Ігрові карти"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "Додаткові буквенно-цифрові у рамках"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr "Додаткові ідеографічні у рамках"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "Різні символи і піктограми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr "Емоційки"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr "Орнаментальні декоративні"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr "Транспортні і картографічні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr "Алхімічні символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr "Розширені геометричні форми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr "Додаткові стрілки-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr "Додаткові символи і піктограми"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr "Уніфіковані ієрогліфічні ідеограми, додаток B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr "Ієрогліфічні ідеограми, додаток C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr "Ієрогліфічні ідеограми, додаток D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr "Ієрогліфічні ідеограми, додаток E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr "Ієрогліфічні ідеограми, додаток F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "Додаткові ієрогліфічні ідеограми для сумісності"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr "Мітки"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr "Додаткові символи зміни"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr "Додаткова область приватного використання A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr "Додаткова область приватного використання B"
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "Показати лише список рушіїв"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "Не вдалося встановити зв’язок з IBus.\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "мова: %s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "Рушій не встановлено.\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "Читати дані з загальносистемного кешу регістру."
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "Читати дані з кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "Кеш регістру є некоректним.\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "Записати дані до загальносистемного кешу регістру."
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "Скидаємо…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "Виконано"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "Показати значення налаштувань"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "Скинути значення налаштувань до початкових"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "Зберегти емодзі з вікна до буфера обміну даними"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "Показувати варіанти емодзі"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "Меню"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "Улюблені"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "Інше"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "Відкрити вибір Unicode"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "Введіть анотацію або виберіть емодзі"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Вибір Unicode"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "Повернути вибір емоційок"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "Завантаження словника Unicode:"
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "Немає"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "Назва: %s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "Альтернативна назва: %s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "Скасовано вибір емодзі."
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "Скопійовано емодзі до вашого буфера обміну даними."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "МОВА"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr ""
 "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "Відповідність за вказаною довжиною рядка"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bc582d4a2..ad6b49b4a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,6 @@
-# translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,16 +11,19 @@
 # Peng Huang <shawn.p.huang@gmail.com>, 2007
 # simonyanix <simonyan@fedoraproject.org>, 2011
 # Tommy He <lovenemesis@gmail.com>, 2012-2014
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Jerry Lee <lchopn@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-17 11:23-0400\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "Language: zh-CN\n"
@@ -89,156 +91,132 @@ msgid "Previous input method:"
 msgstr "上一输入法："
 
 #: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "用于显示 emoji 面板的快捷键"
-
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "Emoji 面板："
-
-#: ../setup/setup.ui.h:18
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
-#: ../setup/setup.ui.h:20
+#: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
 msgstr "开关："
 
-#: ../setup/setup.ui.h:21
+#: ../setup/setup.ui.h:19
 msgid "Enable:"
 msgstr "启用："
 
-#: ../setup/setup.ui.h:22
+#: ../setup/setup.ui.h:20
 msgid "Disable:"
 msgstr "禁用："
 
-#: ../setup/setup.ui.h:23
+#: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>快捷键</b>"
 
-#: ../setup/setup.ui.h:24
+#: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
 msgstr "设置候选词表方向"
 
-#: ../setup/setup.ui.h:25
+#: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
 msgstr "候选词排列方向："
 
-#: ../setup/setup.ui.h:26
+#: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr "设置如何显示或隐藏语言栏的方式"
 
-#: ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:25
 msgid "Show property panel:"
 msgstr "显示属性栏："
 
-#: ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
-#: ../setup/setup.ui.h:31
+#: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr "选中该项将在语言栏上显示输入法的名字"
 
-#: ../setup/setup.ui.h:32
+#: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../setup/setup.ui.h:33
+#: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
 msgstr "在应用程序窗口中启用输入法的内嵌编辑模式"
 
-#: ../setup/setup.ui.h:34
+#: ../setup/setup.ui.h:32
 msgid "Use custom font:"
 msgstr "使用自定义字体："
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "设置 emoji 面板中 emoji 候选字的字体"
-
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Emoji 字体："
-
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "设置 emoji 面板中 emoji 释文的语言"
-
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
-msgstr "Emoji 释文语言："
-
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
 msgstr "<b>字体和风格</b>"
 
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:34
 msgid "General"
 msgstr "常规"
 
 #. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
 #: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../setup/setup.ui.h:42
+#: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
 msgstr "添加选中的输入法到启用输入法列表"
 
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:37
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../setup/setup.ui.h:44
+#: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
 msgstr "从启用输入法列表删除选中的输入法"
 
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:39
 msgid "_Up"
 msgstr "向上(_U)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "上移选中的输入法"
 
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:41
 msgid "_Down"
 msgstr "向下(_D)"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "下移选中的输入法"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:43
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
 msgstr "显示选中输入法的信息"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:45
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
 msgstr "显示选中输入法的设置界面"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:47
 msgid ""
 "<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 "
@@ -246,35 +224,87 @@ msgid ""
 msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr "用于显示 emoji 面板的快捷键"
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr "设置 emoji 面板中 emoji 候选字的字体"
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr "Emoji 字体："
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "设置 emoji 面板中 emoji 释文的语言"
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr "Emoji 释文语言："
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全局输入法设置</b>"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "高级"
 
-#: ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -290,19 +320,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:68
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "登录时运行 IBus"
 
-#: ../setup/setup.ui.h:69
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "关于"
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -352,7 +382,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
@@ -468,7 +498,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜色名；2. '#rrggbb' "
@@ -513,7 +543,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:53
@@ -537,30 +567,68 @@ msgid ""
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -580,12 +648,12 @@ msgid "Select a language"
 msgstr ""
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
+#: ../setup/main.py:553
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -657,15 +725,15 @@ msgstr "请按一个键盘按键（或者一个组合按键）\n"
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/main.py:121 ../setup/main.py:485
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:412
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:433
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -679,249 +747,2294 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:447
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:459
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
 #. Translators: Title of the window
-#: ../setup/main.py:461
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "切换输入法"
 
-#: ../tools/main.vala:51
-msgid "List engine name only"
-msgstr "仅列出引擎名称"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
-msgid "Can't connect to IBus.\n"
-msgstr "无法连接 IBus。\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:93
-#, c-format
-msgid "language: %s\n"
-msgstr "语言： %s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:161
-msgid "No engine is set.\n"
-msgstr "尚未设置引擎。\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:169
-msgid "Set global engine failed.\n"
-msgstr "设定全局引擎失败。\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:174
-msgid "Get global engine failed.\n"
-msgstr "获取全局引擎失败。\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:213
-msgid "Read the system registry cache."
-msgstr "读取系统注册缓存。"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:215
-msgid "Read the registry cache FILE."
-msgstr "读取注册缓存 FILE。"
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
-msgid "The registry cache is invalid.\n"
-msgstr "注册缓存无效。\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:253
-msgid "Write the system registry cache."
-msgstr "写入系统注册缓存。"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:255
-msgid "Write the registry cache FILE."
-msgstr "写入注册缓存 FILE。"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:307
-msgid "Resetting…"
-msgstr "正在重置"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:321
-msgid "Done"
-msgstr "完成"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:366
-msgid "Set or get engine"
-msgstr "设定或获取引擎"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:367
-msgid "Exit ibus-daemon"
-msgstr "退出 ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:368
-msgid "Show available engines"
-msgstr "显示可用引擎"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:369
-msgid "(Not implemented)"
-msgstr "(暂不可用)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:370
-msgid "Restart ibus-daemon"
-msgstr "重启 ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:371
-msgid "Show version"
-msgstr "显示版本号"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:372
-msgid "Show the content of registry cache"
-msgstr "显示注册缓存内容。"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:373
-msgid "Create registry cache"
-msgstr "创建注册缓存"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:374
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:375
-msgid "Show the configuration values"
-msgstr "显示配置值"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:376
-msgid "Reset the configuration values"
-msgstr "重置配置"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr "将面板中的 emoji 保存到剪贴板"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:380
-msgid "Show this information"
-msgstr "显示本信息"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:386
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "用法：%s 命令 [选项...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:387
-msgid "Commands:\n"
-msgstr "命令：\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
 
-#: ../tools/main.vala:416
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s 是未知命令！\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
-msgid "Emoji Dialog"
-msgstr "Emoji 面板"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:293
-msgid "Type annotation or choose emoji"
-msgstr "键入释文或是选择 emoji"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
-msgid "Favorites"
-msgstr "最爱"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:628
-msgid "Page Down"
-msgstr "下一页"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:639
-msgid "Page Up"
-msgstr "上一页"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
-#, c-format
-msgid "Description: %s"
-msgstr "描述：%s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:813
-msgid "None"
-msgstr "无"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "仅列出引擎名称"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "无法连接 IBus。\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "语言： %s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "尚未设置引擎。\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "设定全局引擎失败。\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "获取全局引擎失败。\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "读取系统注册缓存。"
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "读取注册缓存 FILE。"
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "注册缓存无效。\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "写入系统注册缓存。"
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "写入注册缓存 FILE。"
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "正在重置"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "完成"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "设定或获取引擎"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "退出 ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "显示可用引擎"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(暂不可用)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "重启 ibus-daemon"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "显示版本号"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "显示注册缓存内容。"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "创建注册缓存"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "显示配置值"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "重置配置"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr "将面板中的 emoji 保存到剪贴板"
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "显示本信息"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s 命令 [选项...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "命令：\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s 是未知命令！\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr "最爱"
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr "键入释文或是选择 emoji"
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr "下一页"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr "上一页"
+
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:838
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr "描述：%s"
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr "无"
+
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "释义：%s"
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr "已取消选择一个 emoji"
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr "已将 emoji 复制到你的剪贴板"
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:823
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space 是目前默认的快捷键。"
 
-#: ../ui/gtk3/panel.vala:1196
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:1200
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "黄鹏 <shawn.p.huang@gmail.com>\n"
 "Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1219
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:1238
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:1242
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "退出"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
-
-#: ../ui/gtk3/emojierapp.vala:45
-msgid "Canceled to choose an emoji."
-msgstr "已取消选择一个 emoji"
-
-#: ../ui/gtk3/emojierapp.vala:52
-msgid "Copied an emoji to your clipboard."
-msgstr "已将 emoji 复制到你的剪贴板"
-
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:82
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:83
-msgid "FONT"
-msgstr ""
-
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:88
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
-
-#: ../ui/gtk3/emojierapp.vala:89
-msgid "LANG"
-msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2b134bcdd..ddf067798 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,29 +1,32 @@
-# Traditional Chinese (Hong Kong) translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Traditional Chinese translation for ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010
 # Peng Huang <shawn.p.huang@gmail.com>, 2008
+# Peng Huang <shawn.p.huang@gmail.com>, 2008
 # Terry Chuang <tchuang@redhat.com>, 2010
 # Terry Chuang <tchuang@redhat.com>, 2014
 # tomoe_musashi <hkg.musashi@gmail.com>, 2015
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2015-07-13 19:48+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-10 11:57-0500\n"
-"Last-Translator: tomoe musashi <hkg.musashi@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
 "Language: zh-HK\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Generator: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -224,31 +227,83 @@ msgstr ""
 msgid "Input Method"
 msgstr "輸入法"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:49
+msgid "The shortcut keys for showing emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji choice:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "Set a font of emoji candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Emoji font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤佈局"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 佈局"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:63
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤佈局</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:53
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
 msgid "Share the same input method among all applications"
 msgstr "在所有的應用程式中共享同一個輸入法"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:66
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:67
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -264,20 +319,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:74
 msgid "Start ibus on login"
 msgstr "在登入時啟動 ibus"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:75
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:37
-#: ../ui/gtk3/panel.vala:1113
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -327,7 +381,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "無 ASCII 的拉丁鍵盤佈局"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US 鍵盤佈局附加到拉丁鍵盤佈局。variant 可被省略。"
 
 #: ../data/ibus.schemas.in.h:13
@@ -443,7 +497,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB 圖示會顯示鍵盤佈局的字串，而且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2."
@@ -480,30 +534,100 @@ msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
 msgstr "內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:66
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌編輯模式"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:67
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:69
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:70
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:71
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:72
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 用來停止名稱轉換的鍵其前綴"
 
@@ -518,6 +642,24 @@ msgstr "版權所有 (c) 2007-2010 黃鵬\n"
 msgid "Other"
 msgstr "其他"
 
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:553
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "更多…"
+
 #: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
@@ -541,15 +683,6 @@ msgstr "描述：\n"
 msgid "Select an input method"
 msgstr "選取輸入法"
 
-#: ../setup/enginedialog.py:60 ../setup/keyboardshortcut.py:339
-#: ../setup/main.py:414
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "更多…"
-
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "鍵盤"
@@ -591,19 +724,15 @@ msgstr "請按一個鍵盤按鍵 (或是按鍵組合)\n"
 msgid "Please press a key (or a key combination)"
 msgstr "請按一個鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/keyboardshortcut.py:340 ../setup/main.py:415
-msgid "_OK"
-msgstr "確定(_O)"
-
-#: ../setup/main.py:114 ../setup/main.py:439
+#: ../setup/main.py:121 ../setup/main.py:580
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至上一個輸入法"
 
-#: ../setup/main.py:369
+#: ../setup/main.py:507
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "鍵盤輸入法 (IBus 背景程式) 並未執行。是否啟動？"
 
-#: ../setup/main.py:390
+#: ../setup/main.py:528
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -617,155 +746,2275 @@ msgstr ""
 "export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:404
+#: ../setup/main.py:542
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 背景程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:416
+#: ../setup/main.py:554
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:418
+#: ../setup/main.py:556
 msgid "switching input methods"
 msgstr "切換輸入法"
 
-#: ../tools/main.vala:48
-msgid "List engine name only"
-msgstr "只列出引擎名稱"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
 
-#: ../tools/main.vala:64 ../tools/main.vala:185 ../tools/main.vala:195
-msgid "Can't connect to IBus.\n"
-msgstr "無法連接至 IBus。\n"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
 
-#: ../tools/main.vala:90
-#, c-format
-msgid "language: %s\n"
-msgstr "語言：%s\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr ""
 
-#: ../tools/main.vala:158
-msgid "No engine is set.\n"
-msgstr "尚未設定引擎。\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr ""
 
-#: ../tools/main.vala:166
-msgid "Set global engine failed.\n"
-msgstr "無法設定全域引擎。\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr ""
 
-#: ../tools/main.vala:171
-msgid "Get global engine failed.\n"
-msgstr "無法取得全域引擎。\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr ""
 
-#: ../tools/main.vala:210
-msgid "Read the system registry cache."
-msgstr "讀取系統註冊快取。"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr ""
 
-#: ../tools/main.vala:212
-msgid "Read the registry cache FILE."
-msgstr "讀取註冊快取 FILE。"
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr ""
 
-#: ../tools/main.vala:230 ../tools/main.vala:235
-msgid "The registry cache is invalid.\n"
-msgstr "註冊快取無效。\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
 
-#: ../tools/main.vala:250
-msgid "Write the system registry cache."
-msgstr "寫入系統註冊快取。"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:252
-msgid "Write the registry cache FILE."
-msgstr "寫入註冊快取 FILE。"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:304
-msgid "Resetting…"
-msgstr "重設中…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:318
-msgid "Done"
-msgstr "完成"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:337
-msgid "Set or get engine"
-msgstr "設定或取得引擎"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:338
-msgid "Exit ibus-daemon"
-msgstr "離開 ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:339
-msgid "Show available engines"
-msgstr "顯示可用的引擎"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:340
-msgid "(Not implemented)"
-msgstr "(尚未實作)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:341
-msgid "Restart ibus-daemon"
-msgstr "重新啟動 ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:342
-msgid "Show version"
-msgstr "顯示版本"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:343
-msgid "Show the content of registry cache"
-msgstr "顯示註冊快取的內容"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:344
-msgid "Create registry cache"
-msgstr "建立註冊快取"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
 
-#: ../tools/main.vala:345
-msgid "Print the D-Bus address of ibus-daemon"
-msgstr "列印 ibus-daemon 的 D-Bus 位址"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
 
-#: ../tools/main.vala:346
-msgid "Show the configuration values"
-msgstr "顯示組態值"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:347
-msgid "Reset the configuration values"
-msgstr "重設組態值"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:348
-msgid "Show this information"
-msgstr "顯示此資訊"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:354
-#, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
-"\n"
-msgstr "用法：%s COMMAND [OPTION...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
 
-#: ../tools/main.vala:355
-msgid "Commands:\n"
-msgstr "指令：\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
 
-#: ../tools/main.vala:384
-#, c-format
-msgid "%s is unknown command!\n"
-msgstr "%s 為未知指令！\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
+msgid "List engine name only"
+msgstr "只列出引擎名稱"
+
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+msgid "Can't connect to IBus.\n"
+msgstr "無法連接至 IBus。\n"
+
+#: ../tools/main.vala:96
+#, c-format
+msgid "language: %s\n"
+msgstr "語言：%s\n"
+
+#: ../tools/main.vala:164
+msgid "No engine is set.\n"
+msgstr "尚未設定引擎。\n"
+
+#: ../tools/main.vala:172
+msgid "Set global engine failed.\n"
+msgstr "無法設定全域引擎。\n"
+
+#: ../tools/main.vala:177
+msgid "Get global engine failed.\n"
+msgstr "無法取得全域引擎。\n"
+
+#: ../tools/main.vala:220
+msgid "Read the system registry cache."
+msgstr "讀取系統註冊快取。"
+
+#: ../tools/main.vala:222
+msgid "Read the registry cache FILE."
+msgstr "讀取註冊快取 FILE。"
+
+#: ../tools/main.vala:240 ../tools/main.vala:245
+msgid "The registry cache is invalid.\n"
+msgstr "註冊快取無效。\n"
+
+#: ../tools/main.vala:260
+msgid "Write the system registry cache."
+msgstr "寫入系統註冊快取。"
+
+#: ../tools/main.vala:262
+msgid "Write the registry cache FILE."
+msgstr "寫入註冊快取 FILE。"
+
+#: ../tools/main.vala:314
+msgid "Resetting…"
+msgstr "重設中…"
+
+#: ../tools/main.vala:328
+msgid "Done"
+msgstr "完成"
+
+#: ../tools/main.vala:373
+msgid "Set or get engine"
+msgstr "設定或取得引擎"
+
+#: ../tools/main.vala:374
+msgid "Exit ibus-daemon"
+msgstr "離開 ibus-daemon"
+
+#: ../tools/main.vala:375
+msgid "Show available engines"
+msgstr "顯示可用的引擎"
+
+#: ../tools/main.vala:376
+msgid "(Not implemented)"
+msgstr "(尚未實作)"
+
+#: ../tools/main.vala:377
+msgid "Restart ibus-daemon"
+msgstr "重新啟動 ibus-daemon"
+
+#: ../tools/main.vala:378
+msgid "Show version"
+msgstr "顯示版本"
+
+#: ../tools/main.vala:379
+msgid "Show the content of registry cache"
+msgstr "顯示註冊快取的內容"
+
+#: ../tools/main.vala:380
+msgid "Create registry cache"
+msgstr "建立註冊快取"
+
+#: ../tools/main.vala:381
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "列印 ibus-daemon 的 D-Bus 位址"
+
+#: ../tools/main.vala:382
+msgid "Show the configuration values"
+msgstr "顯示組態值"
+
+#: ../tools/main.vala:383
+msgid "Reset the configuration values"
+msgstr "重設組態值"
+
+#: ../tools/main.vala:385
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:387
+msgid "Show this information"
+msgstr "顯示此資訊"
+
+#: ../tools/main.vala:393
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "用法：%s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:394
+msgid "Commands:\n"
+msgstr "指令：\n"
+
+#: ../tools/main.vala:423
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s 為未知指令！\n"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:250
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:273
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:274
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:451
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1071
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1236
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1242
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1377
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1402
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:56
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:77
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:98
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:103
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:104
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:106
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:110
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "Match with the condition of the specified integer"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:235 ../ui/gtk3/panel.vala:266
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:731
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:732 ../ui/gtk3/panel.vala:743
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:1086
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1090
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009\n"
@@ -773,20 +3022,20 @@ msgstr ""
 "Terry Chuang <tchuang@redhat.com>, 2014\n"
 "tomoe_musashi <hkg.musashi@gmail.com>, 2015"
 
-#: ../ui/gtk3/panel.vala:1109
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1119
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1123
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:400 ../ui/gtk3/propertypanel.vala:408
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e1da31fee..4e1eb123f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,16 +12,18 @@
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
 # Caius "kaio" Chance <caius.chance@gmail.com>, 2017. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-07-24 15:28+0900\n"
+"POT-Creation-Date: 2018-02-20 17:31+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-09-03 09:35-0400\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"PO-Revision-Date: 2018-02-20 04:23-0500\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -326,7 +328,7 @@ msgstr "在登入時啟動 iBus"
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1280
+#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
 msgid "About"
 msgstr "關於"
 
@@ -380,7 +382,7 @@ msgid "Latin layouts which have no ASCII"
 msgstr "無 ASCII 之拉丁鍵盤配置"
 
 #: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US 鍵盤配置附加到拉丁鍵盤配置。variant 可以省略。"
 
 #: ../data/ibus.schemas.in.h:13
@@ -496,7 +498,7 @@ msgid ""
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
 "blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
 "'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2."
@@ -543,7 +545,7 @@ msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "開啟繪文字輸入或關閉的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "繪文字對話窗當中繪文字字元的自訂字型名稱"
 
 #: ../data/ibus.schemas.in.h:53
@@ -795,262 +797,2247 @@ msgstr "符號"
 msgid "Travel & Places"
 msgstr "旅行與地點"
 
-#: ../tools/main.vala:51
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:54
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
 msgid "Can't connect to IBus.\n"
 msgstr "無法連接 IBus。\n"
 
-#: ../tools/main.vala:93
+#: ../tools/main.vala:96
 #, c-format
 msgid "language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../tools/main.vala:161
+#: ../tools/main.vala:164
 msgid "No engine is set.\n"
 msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:169
+#: ../tools/main.vala:172
 msgid "Set global engine failed.\n"
 msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:174
+#: ../tools/main.vala:177
 msgid "Get global engine failed.\n"
 msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:213
+#: ../tools/main.vala:220
 msgid "Read the system registry cache."
 msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:215
+#: ../tools/main.vala:222
 msgid "Read the registry cache FILE."
 msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: ../tools/main.vala:240 ../tools/main.vala:245
 msgid "The registry cache is invalid.\n"
 msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:253
+#: ../tools/main.vala:260
 msgid "Write the system registry cache."
 msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:255
+#: ../tools/main.vala:262
 msgid "Write the registry cache FILE."
 msgstr "寫入註冊快取 FILE。"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:314
 msgid "Resetting…"
 msgstr "重設中…"
 
-#: ../tools/main.vala:321
+#: ../tools/main.vala:328
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:366
+#: ../tools/main.vala:373
 msgid "Set or get engine"
 msgstr "設定引擎或取得引擎"
 
-#: ../tools/main.vala:367
+#: ../tools/main.vala:374
 msgid "Exit ibus-daemon"
 msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:368
+#: ../tools/main.vala:375
 msgid "Show available engines"
 msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:369
+#: ../tools/main.vala:376
 msgid "(Not implemented)"
 msgstr "(尚未實作)"
 
-#: ../tools/main.vala:370
+#: ../tools/main.vala:377
 msgid "Restart ibus-daemon"
 msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:371
+#: ../tools/main.vala:378
 msgid "Show version"
 msgstr "顯示版本"
 
-#: ../tools/main.vala:372
+#: ../tools/main.vala:379
 msgid "Show the content of registry cache"
 msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:380
 msgid "Create registry cache"
 msgstr "建立註冊快取"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:381
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:382
 msgid "Show the configuration values"
 msgstr "顯示組態值"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:383
 msgid "Reset the configuration values"
 msgstr "重設組態值"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
 msgstr "將對話窗中的繪文字儲存到剪貼簿"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:387
 msgid "Show this information"
 msgstr "顯示此資訊"
 
-#: ../tools/main.vala:386
+#: ../tools/main.vala:393
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:394
 msgid "Commands:\n"
 msgstr "指令：\n"
 
-#: ../tools/main.vala:416
+#: ../tools/main.vala:423
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/emojier.vala:170
+#: ../ui/gtk3/emojier.vala:245
 msgid "Show emoji variants"
 msgstr "顯示繪文字變化"
 
-#: ../ui/gtk3/emojier.vala:175
+#: ../ui/gtk3/emojier.vala:250
 msgid "Menu"
 msgstr "選單"
 
-#: ../ui/gtk3/emojier.vala:189
+#: ../ui/gtk3/emojier.vala:273
 msgid "Favorites"
 msgstr "喜愛"
 
-#: ../ui/gtk3/emojier.vala:190
+#: ../ui/gtk3/emojier.vala:274
 msgid "Others"
 msgstr "其他"
 
-#: ../ui/gtk3/emojier.vala:330 ../ui/gtk3/panel.vala:1272
+#: ../ui/gtk3/emojier.vala:275
+msgid "Open Unicode choice"
+msgstr "開啟 Unicode 選擇"
+
+#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
+#: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
 msgstr "繪文字選擇"
 
-#: ../ui/gtk3/emojier.vala:336
+#: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
 msgstr "請輸入註釋或選擇繪文字"
 
-#: ../ui/gtk3/emojier.vala:737
+#: ../ui/gtk3/emojier.vala:948
+msgid "Unicode Choice"
+msgstr "Unicode 選擇"
+
+#: ../ui/gtk3/emojier.vala:950
+msgid "Bring back emoji choice"
+msgstr "返回繪文字選擇"
+
+#: ../ui/gtk3/emojier.vala:1016
+msgid "Loading a Unicode dictionary:"
+msgstr "載入 Unicode 字典："
+
+#: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
 msgstr "上一頁"
 
-#: ../ui/gtk3/emojier.vala:748
+#: ../ui/gtk3/emojier.vala:1082
 msgid "Page Up"
 msgstr "下一頁"
 
-#: ../ui/gtk3/emojier.vala:883
+#: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
 msgstr "碼點：%s"
 
-#: ../ui/gtk3/emojier.vala:889
+#: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
 msgstr "有繪文字變化"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:1001 ../ui/gtk3/emojier.vala:1010
+#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:1001
+#: ../ui/gtk3/emojier.vala:1377
 msgid "None"
 msgstr "無"
 
-#: ../ui/gtk3/emojier.vala:1021
+#: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
 msgstr "註釋：%s"
 
-#: ../ui/gtk3/emojierapp.vala:49
+#: ../ui/gtk3/emojier.vala:1428
+#, c-format
+msgid "Name: %s"
+msgstr "名稱：%s"
+
+#: ../ui/gtk3/emojier.vala:1436
+#, c-format
+msgid "Alias: %s"
+msgstr "別名：%s"
+
+#: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
 msgstr "已取消繪文字的選擇。"
 
-#: ../ui/gtk3/emojierapp.vala:70
+#: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
 msgstr "已將繪文字複製到您的剪貼簿。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:90
-msgid "\"FONT\" for emoji chracters on emoji dialog"
+#: ../ui/gtk3/emojierapp.vala:97
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "繪文字對話盒之繪文字字元用「FONT」字型"
 
-#: ../ui/gtk3/emojierapp.vala:91
+#: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:96
+#: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "繪文字對話盒的「LANG」語言註解。例：「en」"
 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:99
+#: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
 msgstr "可以部分符合繪文字註解"
 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
 msgstr "符合指定整數長度"
 
-#: ../ui/gtk3/emojierapp.vala:107
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
 msgstr "符合指定整數的條件"
 
-#: ../ui/gtk3/panel.vala:288 ../ui/gtk3/panel.vala:319
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:861
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus 更新"
 
-#: ../ui/gtk3/panel.vala:862 ../ui/gtk3/panel.vala:873
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
 
-#: ../ui/gtk3/panel.vala:1244
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1248
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-14."
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-17."
 
-#: ../ui/gtk3/panel.vala:1267
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1286
+#: ../ui/gtk3/panel.vala:1181
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1290
+#: ../ui/gtk3/panel.vala:1185
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"

From 86963f2f94d1e4fc213b01c2bc2ba9dcf4b22219 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 2 Mar 2018 15:31:12 +0900
Subject: [PATCH 462/816] Release 1.5.18

R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/336630043
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index bd41069b0..6c00803f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [17])
+m4_define([ibus_micro_version], [18])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From c6439d74d5472c95de4d5c2cdc6487bfd508e3d8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 15 Mar 2018 16:57:02 +0900
Subject: [PATCH 463/816] ui/gtk3: Add num pad Enter, Down, Up, Left, Right on
 Emojier

BUG=rhbz#1554813
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/337690043
---
 ui/gtk3/emojier.vala | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8707e432d..240297031 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1918,6 +1918,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 return true;
             break;
         case Gdk.Key.Return:
+        case Gdk.Key.KP_Enter:
             key_press_enter();
             return true;
         case Gdk.Key.BackSpace:
@@ -1959,29 +1960,37 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
             return true;
         case Gdk.Key.Right:
-            key_press_cursor_horizontal(keyval, modifiers);
+        case Gdk.Key.KP_Right:
+            key_press_cursor_horizontal(Gdk.Key.Right, modifiers);
             return true;
         case Gdk.Key.Left:
-            key_press_cursor_horizontal(keyval, modifiers);
+        case Gdk.Key.KP_Left:
+            key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
             return true;
         case Gdk.Key.Down:
-            key_press_cursor_vertical(keyval, modifiers);
+        case Gdk.Key.KP_Down:
+            key_press_cursor_vertical(Gdk.Key.Down, modifiers);
             return true;
         case Gdk.Key.Up:
-            key_press_cursor_vertical(keyval, modifiers);
+        case Gdk.Key.KP_Up:
+            key_press_cursor_vertical(Gdk.Key.Up, modifiers);
             return true;
         case Gdk.Key.Page_Down:
-            key_press_cursor_vertical(keyval, modifiers);
+        case Gdk.Key.KP_Page_Down:
+            key_press_cursor_vertical(Gdk.Key.Page_Down, modifiers);
             return true;
         case Gdk.Key.Page_Up:
-            key_press_cursor_vertical(keyval, modifiers);
+        case Gdk.Key.KP_Page_Up:
+            key_press_cursor_vertical(Gdk.Key.Page_Up, modifiers);
             return true;
         case Gdk.Key.Home:
-            if (key_press_cursor_home_end(keyval, modifiers))
+        case Gdk.Key.KP_Home:
+            if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
                 return true;
             break;
         case Gdk.Key.End:
-            if (key_press_cursor_home_end(keyval, modifiers))
+        case Gdk.Key.KP_End:
+            if (key_press_cursor_home_end(Gdk.Key.End, modifiers))
                 return true;
             break;
         case Gdk.Key.Insert:

From b184861396279d903e62bf6aad271a2205a79832 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 30 Mar 2018 12:33:59 +0900
Subject: [PATCH 464/816] ui/gtk3: Sort Unicode candidates

BUG=rhbz#1554714
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/339430043
---
 ui/gtk3/emojier.vala | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 240297031..0c0865f17 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1144,9 +1144,11 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     lookup_emojis_from_annotation(string annotation) {
         GLib.SList<string>? total_emojis = null;
         unowned GLib.SList<string>? sub_emojis = null;
+        unowned GLib.SList<unichar>? sub_exact_unicodes = null;
         unowned GLib.SList<unichar>? sub_unicodes = null;
         int length = annotation.length;
         if (m_has_partial_match && length >= m_partial_match_length) {
+            GLib.SList<string>? sorted_emojis = null;
             foreach (unowned string key in
                      m_annotation_to_emojis_dict.get_keys()) {
                 if (key.length < length)
@@ -1173,16 +1175,29 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 sub_emojis = m_annotation_to_emojis_dict.lookup(key);
                 foreach (unowned string emoji in sub_emojis) {
                     if (total_emojis.find_custom(emoji, GLib.strcmp) == null) {
-                        total_emojis.append(emoji);
+                        sorted_emojis.insert_sorted(emoji, GLib.strcmp);
                     }
                 }
             }
+            foreach (string emoji in sorted_emojis) {
+                if (total_emojis.find_custom(emoji, GLib.strcmp) == null) {
+                    total_emojis.append(emoji);
+                }
+            }
         } else {
             sub_emojis = m_annotation_to_emojis_dict.lookup(annotation);
             foreach (unowned string emoji in sub_emojis)
                 total_emojis.append(emoji);
         }
+        sub_exact_unicodes = m_name_to_unicodes_dict.lookup(annotation);
+        foreach (unichar code in sub_exact_unicodes) {
+            string ch = code.to_string();
+            if (total_emojis.find_custom(ch, GLib.strcmp) == null) {
+                total_emojis.append(ch);
+            }
+        }
         if (length >= m_partial_match_length) {
+            GLib.SList<string>? sorted_unicodes = null;
             foreach (unowned string key in m_name_to_unicodes_dict.get_keys()) {
                 bool matched = false;
                 if (key.index_of(annotation) >= 0)
@@ -1192,11 +1207,16 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 sub_unicodes = m_name_to_unicodes_dict.lookup(key);
                 foreach (unichar code in sub_unicodes) {
                     string ch = code.to_string();
-                    if (total_emojis.find_custom(ch, GLib.strcmp) == null) {
-                        total_emojis.append(ch);
+                    if (sorted_unicodes.find_custom(ch, GLib.strcmp) == null) {
+                        sorted_unicodes.insert_sorted(ch, GLib.strcmp);
                     }
                 }
             }
+            foreach (string ch in sorted_unicodes) {
+                if (total_emojis.find_custom(ch, GLib.strcmp) == null) {
+                    total_emojis.append(ch);
+                }
+            }
         }
         return total_emojis;
     }

From 5788be80685f397c3db3bdf4e672d67cfb9b3433 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Fri, 30 Mar 2018 12:37:27 +0900
Subject: [PATCH 465/816] Fix ucd directory override

BUG=https://github.com/ibus/ibus/pull/1995
R=Shawn.P.Huang@gmail.com

Review URL: https://codereview.appspot.com/339450043

Patch from Jeremy Bicha <jbicha@ubuntu.com>.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6c00803f0..d19aa874f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -666,7 +666,7 @@ AC_ARG_WITH(ucd-dir,
     AS_HELP_STRING([--with-ucd-dir[=DIR]],
         [Set the directory of UCD (Unicode Character Database) files.
          (default: "/usr/share/unicode/ucd")]),
-    UCD_DIR=$with_emoji_annotation_dir,
+    UCD_DIR=$with_ucd_dir,
     UCD_DIR="/usr/share/unicode/ucd"
 )
 AC_SUBST(UCD_DIR)

From 75a6667b6ad8c8cb801cb160b7b04625334f9094 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 5 Apr 2018 16:54:41 +0900
Subject: [PATCH 466/816] src/tests: Fix ibus-compose for the latest GTK

---
 src/tests/ibus-compose.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index eb7b9f191..aabb36ac8 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -2,6 +2,10 @@
 #include "ibus.h"
 #include "ibuscomposetable.h"
 
+#define GREEN "\033[0;32m"
+#define RED   "\033[0;31m"
+#define NC    "\033[0m"
+
 IBusBus *m_bus;
 IBusComposeTable *m_compose_table;
 IBusEngine *m_engine;
@@ -172,7 +176,12 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
                          guint           nchars,
                          gpointer        data)
 {
+/* https://gitlab.gnome.org/GNOME/gtk/commit/9981f46e0b
+ * The latest GTK does not emit "inserted-text" when the text is "".
+ */
+#if !GTK_CHECK_VERSION (3, 22, 16)
     static int n_loop = 0;
+#endif
     static guint stride = 0;
     guint i;
     int seq;
@@ -182,16 +191,18 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
 
     g_assert (m_compose_table != NULL);
 
+#if !GTK_CHECK_VERSION (3, 22, 16)
     if (n_loop % 2 == 1) {
         n_loop = 0;
         return;
     }
+#endif
     i = stride + (m_compose_table->max_seq_len + 2) - 1;
     seq = (i + 1) / (m_compose_table->max_seq_len + 2);
     if (m_compose_table->data[i] == code) {
-        test = "OK";
+        test = GREEN "PASS" NC;
     } else {
-        test = "NG";
+        test = RED "FAIL" NC;
         m_retval = -1;
     }
     g_print ("%05d/%05d %s expected: %04X typed: %04X\n",
@@ -207,7 +218,9 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
     }
 
     stride += m_compose_table->max_seq_len + 2;
+#if !GTK_CHECK_VERSION (3, 22, 16)
     n_loop++;
+#endif
     gtk_entry_set_text (entry, "");
 }
 

From 28d0c1d4bc47beb38995d84cc4bb1d539c08a070 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 6 Apr 2018 16:02:11 +0900
Subject: [PATCH 467/816] src: Make the call to chmod in ibus_bus_init
 conditional

BUG=https://github.com/ibus/ibus/issues/1996
---
 src/ibusbus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index 11659c41f..98820e8a9 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -557,7 +557,6 @@ ibus_bus_init (IBusBus *bus)
     path = g_path_get_dirname (ibus_get_socket_path ());
 
     g_mkdir_with_parents (path, 0700);
-    g_chmod (path, 0700);
 
     if (stat (path, &buf) == 0) {
         if (buf.st_uid != getuid ()) {
@@ -565,6 +564,9 @@ ibus_bus_init (IBusBus *bus)
                        path, ibus_get_user_name ());
             return;
         }
+        if (buf.st_mode != (S_IFDIR | S_IRWXU)) {
+            g_chmod (path, 0700);
+        }
     }
 
     g_free (path);

From 32f2f2bab149ad766674e7421f7044ebe98bb0b6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Apr 2018 20:24:08 +0900
Subject: [PATCH 468/816] tests: Added an automation testing on console

test-console.sh runs /usr/bin/ibus-daemon on console after install ibus.

Login as root
  --builddir /root/ibus/src/tests --srcdir /root/ibus/src/tests

Also added DISABLE_GUI_TESTS parameters for make check.
---
 bus/Makefile.am       |   1 +
 src/tests/Makefile.am |   5 +-
 src/tests/runtest     | 151 ++++++++++++++++----------
 test/test-console.sh  | 242 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 343 insertions(+), 56 deletions(-)
 create mode 100755 test/test-console.sh

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 8bcc8e169..76166a0fe 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -122,6 +122,7 @@ TESTS_ENVIRONMENT = \
     top_builddir=$(top_builddir) \
     top_srcdir=$(top_srcdir) \
     builddir=$(builddir) \
+    srcdir=$(srcdir) \
     $(NULL)
 
 LOG_COMPILER = $(top_srcdir)/src/tests/runtest
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 125be3fc5..8bcac8f27 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -66,6 +67,8 @@ TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir) \
 	builddir=$(builddir) \
+	srcdir=$(srcdir) \
+	DISABLE_GUI_TESTS=$(DISABLE_GUI_TESTS) \
 	$(NULL)
 
 LOG_COMPILER = $(srcdir)/runtest
diff --git a/src/tests/runtest b/src/tests/runtest
index 0e43fee59..b3b2a1ceb 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+# vim:set et sts=4:
+
 # Run a test case given by the first argument in a separate directory.
 # This script may also launch $top_builddir/bus/ibus-daemon for testing.
 
@@ -17,6 +20,8 @@
 : ${top_builddir:=../..}
 : ${top_srcdir:=../..}
 : ${builddir:=.}
+: ${srcdir:=.}
+: ${DISABLE_GUI_TESTS:=''}
 
 BUS_REQUIRED_TESTS="
 ibus-bus
@@ -29,50 +34,51 @@ ibus-engine-switch
 ibus-compose
 test-stress
 "
+retval=0
 
 # Portable replacement of basename.
 func_basename () {
-  case "$1" in
+    case "$1" in
     */*)
-      expr "$1" : '.*/\(.*\)'
-      ;;
+        expr "$1" : '.*/\(.*\)'
+        ;;
     *)
-      echo "$1"
-  esac
+        echo "$1"
+    esac
 }
 
 # Portable replacement of dirname.
 func_dirname () {
-  case "$1" in
+    case "$1" in
     */*)
-      expr "$1" : '\(.*\)/.*'
-      ;;
+        expr "$1" : '\(.*\)/.*'
+        ;;
     *)
-      echo .
-  esac
+        echo .
+    esac
 }
 
 # Kill ibus-daemon process and remove temporary files.
 func_cleanup () {
-  tstdir=$1
-  if test -f $tstdir/ibus-daemon.pid; then
-    . $tstdir/ibus-daemon.pid
-    kill $IBUS_DAEMON_PID &> /dev/null
-  fi
-  rm -fr $tstdir
+    tstdir=$1
+    if test -f $tstdir/ibus-daemon.pid; then
+        . $tstdir/ibus-daemon.pid
+        kill $IBUS_DAEMON_PID &> /dev/null
+    fi
+    rm -fr $tstdir
 }
 
 # Prepare component files necessary for testing, under components/.
 func_copy_component () {
-  file=$1
-  base=`func_basename $file`
-  libexecdir=`func_dirname $file`
-  # top_srcdir != top_builddir in make dist
-  libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
-  if test -f $file.in; then
-    mkdir -p components
-    sed "s|@libexecdir@|$libexecdir|g" < $file.in > components/$base
-  fi
+    file=$1
+    base=`func_basename $file`
+    libexecdir=`func_dirname $file`
+    # top_srcdir != top_builddir in make dist
+    libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
+    if test -f $file.in; then
+        mkdir -p components
+        sed "s|@libexecdir@|$libexecdir|g" < $file.in > components/$base
+    fi
 }
 
 trap 'func_cleanup $tstdir' 1 2 3 15
@@ -80,44 +86,79 @@ trap 'func_cleanup $tstdir' 1 2 3 15
 tst=$1; shift
 tstdir=tmp-`func_basename $tst`
 
-test -d $tstdir || mkdir $tstdir
-
-( cd $tstdir
-
-  need_bus=no
-  for t in $BUS_REQUIRED_TESTS; do
+for t in $DISABLE_GUI_TESTS; do
     if test $t = `func_basename $tst`; then
-      need_bus=yes
+        exit 77
     fi
-  done
-
-  if test $need_bus = yes; then
-    func_copy_component "../$top_srcdir/engine/simple.xml"
-    func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
+done
 
-    IBUS_COMPONENT_PATH=$PWD/components
-    export IBUS_COMPONENT_PATH
+test -d $tstdir || mkdir $tstdir
 
-    IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
-    export IBUS_ADDRESS_FILE
+run_test_case()
+{
+    pushd $tstdir
+
+    need_bus=no
+    for t in $BUS_REQUIRED_TESTS; do
+        if test $t = `func_basename $tst`; then
+            need_bus=yes
+        fi
+    done
+
+    if test $need_bus = yes; then
+        func_copy_component "../$top_srcdir/engine/simple.xml"
+        func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
+
+        IBUS_COMPONENT_PATH=$PWD/components
+        export IBUS_COMPONENT_PATH
+
+        IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
+        export IBUS_ADDRESS_FILE
+
+        # Start ibus-daemon.
+        ../$top_builddir/bus/ibus-daemon \
+        --daemonize \
+        --cache=none \
+        --panel=disable \
+        --panel-extension=disable \
+        --config=default \
+        --verbose;
+
+        # Wait until all necessary components are up.
+        sleep 1
+    fi
 
-    # Start ibus-daemon.
-    ../$top_builddir/bus/ibus-daemon \
-    --daemonize \
-    --cache=none \
-    --panel=disable \
-    --panel-extension=disable \
-    --config=default \
-    --verbose;
+    "../$tst" ${1+"$@"}
 
-    # Wait until all necessary components are up.
-    sleep 1
-  fi
+    retval=`expr $retval \| $?`
 
-  exec "../$tst" ${1+"$@"} )
+    $popd
 
-retval=$?
+    func_cleanup $tstdir
+}
 
-func_cleanup $tstdir
+envfile=$srcdir/`func_basename $tst`.env
+if test -f $envfile ; then
+    ENVS="`cat $envfile`"
+fi;
+if test x"$ENVS" = x ; then
+    run_test_case
+else
+    LANG_backup=$LANG
+    i=1
+    for e in $ENVS; do
+        first=`echo "$e" | cut -c1-1`
+        if test x"$first" = x"#" ; then
+            continue
+        fi
+        export $e
+        echo "Run `func_basename $tst` on $e"
+        echo "======================="
+        run_test_case
+        echo ""
+        i=`expr $i + 1`
+    done
+    export LANG=$LANG_backup
+fi
 
 exit $retval
diff --git a/test/test-console.sh b/test/test-console.sh
new file mode 100755
index 000000000..7199f7a76
--- /dev/null
+++ b/test/test-console.sh
@@ -0,0 +1,242 @@
+#!/bin/sh
+# -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+# vim:set noet ts=4:
+#
+# ibus-anthy - The Anthy engine for IBus
+#
+# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# This test runs /usr/bin/ibus-daemon after install ibus
+#
+# # init 3
+# Login as root
+# # /root/ibus/tests/test-console.sh --tests ibus-compose \
+#   --builddir /root/ibus/src/tests --srcdir /root/ibus/src/tests
+
+PROGNAME=`basename $0`
+VERSION=0.1
+DISPLAY=:99.0
+BUILDDIR="."
+SRCDIR="."
+TEST_LOG=test-suite.log
+HAVE_GRAPHICS=1
+DESKTOP_COMMAND="gnome-session"
+PID_XORG=0
+PID_GNOME_SESSION=0
+TESTS=""
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+NC='\033[0m'
+
+usage()
+{
+    echo -e \
+"This test runs /usr/bin/ibus-daemon after install ibus\n"                     \
+"$PROGNAME [OPTIONS…]\n"                                                       \
+"\n"                                                                           \
+"OPTIONS:\n"                                                                   \
+"-h, --help                       This help\n"                                 \
+"-v, --version                    Show version\n"                              \
+"-b, --builddir=BUILDDIR          Set the BUILDDIR\n"                          \
+"-s, --srcdir=SOURCEDIR           Set the SOURCEDIR\n"                         \
+"-c, --no-graphics                Use Xvfb instead of Xorg\n"                  \
+"-d, --desktop=DESKTOP            Run DESTKTOP. The default is gnome-session\n" \
+"-t, --tests=\"TESTS...\"           Run TESTS programs which is separated by space\n" \
+""
+}
+
+parse_args()
+{
+    # This is GNU getopt. "sudo port getopt" in BSD?
+    ARGS=`getopt -o hvb:s:cd:t: --long help,version,builddir:,srcdir:,no-graphics,desktop:,tests:\
+        -- "$@"`;
+    eval set -- "$ARGS"
+    while [ 1 ] ; do
+        case "$1" in
+        -h | --help )        usage; exit 0;;
+        -v | --version )     echo -e "$VERSION"; exit 0;;
+        -b | --builddir )    BUILDDIR="$2"; shift 2;;
+        -s | --srcdir )      SRCDIR="$2"; shift 2;;
+        -c | --no-graphics ) HAVE_GRAPHICS=0; shift;;
+        -d | --desktop )     DESKTOP_COMMAND="$2"; shift 2;;
+        -t | --tests )       TESTS="$2"; shift 2;;
+        -- )                 shift; break;;
+        * )                  usage; exit 1;;
+        esac
+    done
+}
+
+init_desktop()
+{
+    if test x$FORCE_TEST != x ; then
+        RUN_ARGS="$RUN_ARGS --force"
+    fi
+
+    if test ! -f $HOME/.config/gnome-initial-setup-done ; then
+        if test ! -f /var/lib/AccountsService/users/$USER ; then
+            mkdir -p /var/lib/AccountsService/users
+            cat >> /var/lib/AccountsService/users/$USER << _EOF
+[User]
+Language=ja_JP.UTF-8
+XSession=gnome
+SystemAccount=false
+_EOF
+        fi
+        mkdir -p $HOME/.config
+        touch $HOME/.config/gnome-initial-setup-done
+    fi
+}
+
+run_dbus_daemon()
+{
+    a=`ps -ef | grep dbus-daemon | grep "\-\-system" | grep -v session | grep -v grep`
+    if test x"$a" = x ; then
+        eval `dbus-launch --sh-syntax`
+    fi
+    SUSER=`echo "$USER" | cut -c 1-7`
+    a=`ps -ef | grep dbus-daemon | grep "$SUSER" | grep -v gdm | grep session | grep -v grep`
+    if test x"$a" = x ; then
+        systemctl --user start dbus
+        export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/bus
+    fi
+    systemctl --user status dbus | col -b
+    ps -ef | grep dbus-daemon | grep "$SUSER" | grep -v gdm | egrep 'session|system' | grep -v grep
+    systemctl --user show-environment | col -b
+}
+
+run_desktop()
+{
+    if test $HAVE_GRAPHICS -eq 1 ; then
+        /usr/libexec/Xorg.wrap -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . $DISPLAY &
+    else
+        /usr/bin/Xvfb $DISPLAY -noreset +extension GLX +extension RANDR +extension RENDER -screen 0 1280x1024x24 &
+    fi
+    PID_XORG=$!
+    sleep 1
+    export DISPLAY=$DISPLAY
+    $DESKTOP_COMMAND &
+    PID_GNOME_SESSION=$!
+    sleep 30
+    if test "$DESKTOP_COMMAND" != "gnome-session" ; then
+        ibus-daemon --daemonize --verbose
+        sleep 1
+    fi
+}
+
+count_case_result()
+{
+    retval=$1
+    pass=$2
+    fail=$3
+
+    if test $retval -eq  0 ; then
+        pass=`expr $pass + 1`
+    else
+        fail=`expr $fail + 1`
+    fi
+    echo $pass $fail
+}
+
+echo_case_result()
+{
+    retval=$1
+    tst=$2
+    log=$3
+    subtst=${4:-''}
+
+    if test $retval -eq  0 ; then
+        echo -e "${GREEN}PASS${NC}: $tst $subtst"
+    else
+        echo -e "${RED}FAIL${NC}: $tst $subtst"
+        echo "FAIL: $tst $subtst" >> $TEST_LOG
+        echo "======================" >> $TEST_LOG
+        echo "" >> $TEST_LOG
+        cat "$log" >> $TEST_LOG
+        echo "" >> $TEST_LOG
+    fi
+}
+
+run_test_suite()
+{
+    cd `dirname $0`
+    pass=0
+    fail=0
+
+    if test -f $TEST_LOG ; then
+        rm $TEST_LOG
+    fi
+    for tst in $TESTS; do
+        ENVS=
+        if test -f $SRCDIR/${tst}.env ; then
+            ENVS="`cat $SRCDIR/${tst}.env`"
+        fi
+        if test x"$ENVS" = x ; then
+            $BUILDDIR/$tst >&${tst}.log
+            retval=$?
+            read pass fail << EOF
+            `count_case_result $retval $pass $fail`
+EOF
+            echo_case_result $retval $tst ${tst}.log
+        else
+            LANG_backup=$LANG
+            i=1
+            for e in $ENVS; do
+                first=`echo "$e" | cut -c1-1`
+                if test x"$first" = x"#" ; then
+                    continue
+                fi
+                export $e
+                $BUILDDIR/$tst >&${tst}.${i}.log
+                retval=$?
+                read pass fail << EOF
+                `count_case_result $retval $pass $fail`
+EOF
+                echo_case_result $retval $tst ${tst}.${i}.log $e
+                i=`expr $i + 1`
+            done
+            export LANG=$LANG_backup
+        fi
+    done
+    echo ""
+    echo -e "# ${GREEN}PASS${NC}: $pass"
+    echo -e "# ${RED}FAIL${NC}: $fail"
+    if test -f ${TEST_LOG} ; then
+        echo ""
+        echo -e "${RED}See ${TEST_LOG}$NC"
+    fi
+}
+
+finit()
+{
+    if test "$DESKTOP_COMMAND" != "gnome-session" ; then
+        ibus exit
+    fi
+    kill $PID_GNOME_SESSION $PID_XORG
+}
+
+main()
+{
+    parse_args $@
+    init_desktop
+    run_dbus_daemon
+    run_desktop
+    run_test_suite
+    finit
+}
+
+main $@

From 68e162a59c7943ee6207ff7d21f9a75d1e6f2f79 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Apr 2018 20:35:50 +0900
Subject: [PATCH 469/816] src/tests: Fix a typo in runtest

---
 src/tests/runtest | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tests/runtest b/src/tests/runtest
index b3b2a1ceb..09026be0c 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -92,10 +92,9 @@ for t in $DISABLE_GUI_TESTS; do
     fi
 done
 
-test -d $tstdir || mkdir $tstdir
-
 run_test_case()
 {
+    test -d $tstdir || mkdir $tstdir
     pushd $tstdir
 
     need_bus=no
@@ -132,7 +131,7 @@ run_test_case()
 
     retval=`expr $retval \| $?`
 
-    $popd
+    popd
 
     func_cleanup $tstdir
 }

From c360cbd830943a4bfb0ece9cc07b99a426dc2121 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 9 Apr 2018 11:57:09 +0900
Subject: [PATCH 470/816] src/tests: Add ibus-compose.env

---
 src/tests/ibus-compose.env | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/tests/ibus-compose.env

diff --git a/src/tests/ibus-compose.env b/src/tests/ibus-compose.env
new file mode 100644
index 000000000..734ab8fa8
--- /dev/null
+++ b/src/tests/ibus-compose.env
@@ -0,0 +1,3 @@
+LANG=el_GR.UTF-8
+LANG=fi_FI.UTF-8
+LANG=pt_BR.UTF-8

From 68bd2695c4cc6a06cb8a55a55fed2054d29f0995 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Apr 2018 16:31:29 +0900
Subject: [PATCH 471/816] src/tests: Fix a typo

---
 src/tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 8bcac8f27..11ebb5315 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -68,7 +68,7 @@ TESTS_ENVIRONMENT = \
 	top_srcdir=$(top_srcdir) \
 	builddir=$(builddir) \
 	srcdir=$(srcdir) \
-	DISABLE_GUI_TESTS=$(DISABLE_GUI_TESTS) \
+	DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
 	$(NULL)
 
 LOG_COMPILER = $(srcdir)/runtest

From 8d4c4738d07b6850e56ae74d46b7b13b7382f865 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Apr 2018 17:33:50 +0900
Subject: [PATCH 472/816] configure: Add --disable-python2 option

---
 bindings/pygobject/Makefile.am |  6 ++++++
 configure.ac                   | 37 +++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index 238a537af..fb2e2a7aa 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -4,6 +4,8 @@
 #
 # Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
 # Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2012-2018 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
@@ -22,11 +24,13 @@
 
 NULL =
 
+if ENABLE_PYTHON2
 py2_compile = PYTHON=$(PYTHON2) $(SHELL) $(py_compile)
 overrides2dir = $(py2overridesdir)
 overrides2_DATA =				\
 	gi/overrides/IBus.py			\
 	$(NULL)
+endif
 
 overridesdir = $(pyoverridesdir)
 overrides_PYTHON =				\
@@ -56,6 +60,7 @@ EXTRA_DIST =					\
 	$(NULL)
 
 install-data-hook:
+if ENABLE_PYTHON2
 	@for data in $(overrides2_DATA); do \
 	    file=`echo $$data | sed -e 's|^.*/||'`; \
 	    dlist="$$dlist $$file"; \
@@ -63,6 +68,7 @@ install-data-hook:
 	$(py2_compile) --destdir "$(DESTDIR)" \
 	               --basedir "$(overrides2dir)" \
 	               $$dlist
+endif
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index d19aa874f..085cecb8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,6 +391,14 @@ fi
 AC_PATH_PROG(ENV_IBUS_TEST, env)
 AC_SUBST(ENV_IBUS_TEST)
 
+AC_ARG_ENABLE(python2,
+    AS_HELP_STRING([--disable-python2],
+                   [Do not install bindings/pygobject/gi and ibus for python2.
+                    '--disable-python2' bring '--disable-python-library'.]),
+    [enable_python2=$enableval],
+    [enable_python2=yes]
+)
+
 AC_ARG_ENABLE(python-library,
     AS_HELP_STRING([--enable-python-library],
                    [Use ibus python library]),
@@ -405,10 +413,6 @@ AC_ARG_ENABLE(setup,
     [enable_setup=yes]
 )
 
-AM_CONDITIONAL([ENABLE_PYTHON_LIBRARY], [test x"$enable_python_library" = x"yes"])
-AM_CONDITIONAL([ENABLE_SETUP], [test x"$enable_setup" = x"yes"])
-AM_CONDITIONAL([ENABLE_DAEMON], [true])
-
 # Define python version
 AC_ARG_WITH(python,
     AS_HELP_STRING([--with-python[=PATH]],
@@ -417,12 +421,24 @@ AC_ARG_WITH(python,
 )
 
 AM_PATH_PYTHON([2.5])
-AC_PATH_PROG(PYTHON2, python2)
 
-if test x"$PYTHON2" = x""; then
-    PYTHON2=$PYTHON
+if test x"$enable_python2" != x"yes"; then
+    enable_python_library=no
+    PYTHON2=
+    enable_python2="no (disabled, use --enable-python2 to enable)"
+else
+    AC_PATH_PROG(PYTHON2, python2)
+
+    if test x"$PYTHON2" = x""; then
+        PYTHON2=$PYTHON
+    fi
 fi
 
+AM_CONDITIONAL([ENABLE_PYTHON2], [test x"$enable_python2" = x"yes"])
+AM_CONDITIONAL([ENABLE_PYTHON_LIBRARY], [test x"$enable_python_library" = x"yes"])
+AM_CONDITIONAL([ENABLE_SETUP], [test x"$enable_setup" = x"yes"])
+AM_CONDITIONAL([ENABLE_DAEMON], [true])
+
 PYGOBJECT_REQUIRED=3.0.0
 
 PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
@@ -434,8 +450,10 @@ if test "x$enable_pygobject" = "xyes"; then
     pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
     AC_SUBST(pyoverridesdir)
 
-    py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
-    AC_SUBST(py2overridesdir)
+    if test x"$enable_python2" = x"yes"; then
+        py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
+        AC_SUBST(py2overridesdir)
+    fi
 fi
 
 AM_CONDITIONAL(ENABLE_PYGOBJECT, test x"$enable_pygobject" = "xyes")
@@ -752,6 +770,7 @@ Build options:
   CFLAGS                        $CFLAGS
   PYTHON                        $PYTHON
   PYTHON2                       $PYTHON2
+  Enable python2                $enable_python2
   Gtk2 immodule dir             $GTK2_IM_MODULEDIR
   Gtk3 immodule dir             $GTK3_IM_MODULEDIR
   Build gtk2 immodule           $enable_gtk2

From 7bc160f2139799b853678264c6b01277f0721336 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Apr 2018 19:39:09 +0900
Subject: [PATCH 473/816] bus: Add DISABLE_GUI_TESTS for test-stress

---
 bus/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 76166a0fe..dda79eac8 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -110,7 +110,6 @@ if ENABLE_EMOJI_DICT
 AM_CFLAGS += -DEMOJI_DICT
 endif
 
-
 if ENABLE_TESTS
 TESTS = \
 	test-matchrule \
@@ -123,6 +122,7 @@ TESTS_ENVIRONMENT = \
     top_srcdir=$(top_srcdir) \
     builddir=$(builddir) \
     srcdir=$(srcdir) \
+    DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
     $(NULL)
 
 LOG_COMPILER = $(top_srcdir)/src/tests/runtest

From 10cc30eac200d10b581d9d2122d5a732f4880943 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 17 Apr 2018 14:00:20 +0900
Subject: [PATCH 474/816] src/tests: Enable GSettings in runtest

---
 src/tests/runtest | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/tests/runtest b/src/tests/runtest
index 09026be0c..35825b1be 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -34,6 +34,8 @@ ibus-engine-switch
 ibus-compose
 test-stress
 "
+IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
+
 retval=0
 
 # Portable replacement of basename.
@@ -92,6 +94,12 @@ for t in $DISABLE_GUI_TESTS; do
     fi
 done
 
+# IBusEngine has GSettings
+if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then
+    echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE"
+    exit -1
+fi
+
 run_test_case()
 {
     test -d $tstdir || mkdir $tstdir
@@ -114,6 +122,20 @@ run_test_case()
         IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
         export IBUS_ADDRESS_FILE
 
+        cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
+        glib-compile-schemas $PWD
+        if test $? -ne 0 ; then
+            echo "FAILED glib-compile-schemas"
+            retval=1
+            return
+        fi
+        if test ! -f $PWD/gschemas.compiled ; then
+            echo "NOT FOUND $PWD/gschemas.compiled"
+            retval=1
+            return
+        fi
+        export GSETTINGS_SCHEMA_DIR=$PWD
+
         # Start ibus-daemon.
         ../$top_builddir/bus/ibus-daemon \
         --daemonize \

From 3280848b42b07afbac3d59066474c5f429de9182 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 17 Apr 2018 14:43:02 +0900
Subject: [PATCH 475/816] bus: Enable sub package of gtkextension.xml and
 ibus-extension-gtk3

GNOME destkop asked not to install ibus-extension-gtk3 by default
since the UI is not called by gnome-shell.

BUG=rhbz#1567689
---
 bus/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/main.c b/bus/main.c
index 7aa89fc41..e1cc423b6 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -293,7 +293,7 @@ main (gint argc, gchar **argv)
         if (component) {
             bus_component_set_restart (component, restart);
         }
-        if (component == NULL ||
+        if (component != NULL &&
             !bus_component_start (component, g_verbose)) {
             g_printerr ("Can not execute default panel program\n");
             exit (-1);

From d8f901f856ddd75baba5826038d1346c5a43d048 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Apr 2018 15:58:06 +0900
Subject: [PATCH 476/816] Replace OnlyShowIn= with NoDisplay=true

BUG=rhbz#1567689
---
 ui/gtk3/ibus-extension-gtk3.desktop.in.in | 2 +-
 ui/gtk3/ibus-ui-emojier.desktop.in.in     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in.in b/ui/gtk3/ibus-extension-gtk3.desktop.in.in
index 6ec5585f9..a119ec8e9 100644
--- a/ui/gtk3/ibus-extension-gtk3.desktop.in.in
+++ b/ui/gtk3/ibus-extension-gtk3.desktop.in.in
@@ -3,4 +3,4 @@ _Name=Emoji Choice
 Icon=ibus
 Exec=@libexecdir@/ibus-extension-gtk3
 Type=Application
-OnlyShowIn=
+NoDisplay=true
diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in.in b/ui/gtk3/ibus-ui-emojier.desktop.in.in
index f4b750a89..6d9422d5b 100644
--- a/ui/gtk3/ibus-ui-emojier.desktop.in.in
+++ b/ui/gtk3/ibus-ui-emojier.desktop.in.in
@@ -3,4 +3,4 @@ _Name=Emoji Choice
 Icon=ibus
 Exec=ibus emoji
 Type=Application
-OnlyShowIn=
+NoDisplay=true

From 886ad3651d16dd821e2526e8601c69738533a7e8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 7 May 2018 12:35:03 +0900
Subject: [PATCH 477/816] src: Fix SEGV in IBusEngine if no emoji shortcut keys

BUG=https://github.com/ibus/ibus/issues/2005
---
 src/ibusengine.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 9a0b1a8ad..fd61102ac 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -925,6 +925,9 @@ ibus_engine_filter_key_event (IBusEngine *engine,
     g_return_val_if_fail (IBUS_IS_ENGINE (engine), FALSE);
 
     priv = engine->priv;
+    if (!priv->emoji_keybindings)
+        return FALSE;
+
     modifiers = state & IBUS_MODIFIER_FILTER;
     if (keyval >= IBUS_KEY_A && keyval <= IBUS_KEY_Z &&
         (modifiers & IBUS_SHIFT_MASK) != 0) {

From 196216a89a9167425dd9b41f4f1d8a494d370249 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 11 May 2018 19:13:03 +0900
Subject: [PATCH 478/816] src: Add ibus-keypress

---
 configure.ac              |   8 +
 src/tests/Makefile.am     |   7 +
 src/tests/ibus-keypress.c | 298 ++++++++++++++++++++++++++++++++++++++
 src/tests/runtest         |   1 +
 4 files changed, 314 insertions(+)
 create mode 100644 src/tests/ibus-keypress.c

diff --git a/configure.ac b/configure.ac
index 085cecb8e..f332a775a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,6 +621,14 @@ if test x"$enable_libnotify" = x"yes"; then
     enable_libnotify="yes (enabled, use --disable-libnotify to disable)"
 fi
 
+PKG_CHECK_MODULES(XTEST,
+    [x11 xtst],
+    [enable_xtest=yes],
+    [enable_xtest=no]
+)
+AM_CONDITIONAL([ENABLE_XTEST], [test x"$enable_xtest" = x"yes"])
+
+
 # --disable-emoji-dict option.
 AC_ARG_ENABLE(emoji-dict,
     AS_HELP_STRING([--disable-emoji-dict],
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 11ebb5315..5f21ebcd3 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -61,6 +61,9 @@ endif
 
 if ENABLE_GTK3
 TESTS += ibus-compose
+if ENABLE_XTEST
+TESTS += ibus-keypress
+endif
 endif
 
 TESTS_ENVIRONMENT = \
@@ -103,6 +106,10 @@ ibus_inputcontext_create_LDADD = $(prog_ldadd)
 ibus_keynames_SOURCES = ibus-keynames.c
 ibus_keynames_LDADD = $(prog_ldadd)
 
+ibus_keypress_SOURCES = ibus-keypress.c
+ibus_keypress_CFLAGS = @GTK3_CFLAGS@ @XTEST_CFLAGS@
+ibus_keypress_LDADD = $(prog_ldadd) @GTK3_LIBS@ @XTEST_LIBS@
+
 ibus_registry_SOURCES = ibus-registry.c
 ibus_registry_LDADD = $(prog_ldadd)
 
diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
new file mode 100644
index 000000000..3486523b1
--- /dev/null
+++ b/src/tests/ibus-keypress.c
@@ -0,0 +1,298 @@
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "ibus.h"
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XTest.h>
+
+#define GREEN "\033[0;32m"
+#define RED   "\033[0;31m"
+#define NC    "\033[0m"
+
+typedef struct _KeyData {
+    guint keyval;
+    guint modifiers;
+} KeyData;
+
+static const KeyData test_cases[][30] = {
+   { { IBUS_KEY_a, 0 }, { IBUS_KEY_comma, IBUS_SHIFT_MASK },
+     { IBUS_KEY_b, 0 }, { IBUS_KEY_period, IBUS_SHIFT_MASK },
+     { IBUS_KEY_c, 0 }, { IBUS_KEY_slash, IBUS_SHIFT_MASK },
+     { IBUS_KEY_d, 0 }, { IBUS_KEY_semicolon, IBUS_SHIFT_MASK },
+     { IBUS_KEY_e, 0 }, { IBUS_KEY_apostrophe, IBUS_SHIFT_MASK },
+     { IBUS_KEY_f, 0 }, { IBUS_KEY_bracketleft, IBUS_SHIFT_MASK },
+     { IBUS_KEY_g, 0 }, { IBUS_KEY_backslash, IBUS_SHIFT_MASK },
+     { 0, 0 } },
+   { { IBUS_KEY_grave, IBUS_SHIFT_MASK }, { IBUS_KEY_a, IBUS_SHIFT_MASK },
+     { IBUS_KEY_1, IBUS_SHIFT_MASK }, { IBUS_KEY_b, IBUS_SHIFT_MASK  },
+     { IBUS_KEY_2, IBUS_SHIFT_MASK }, { IBUS_KEY_c, IBUS_SHIFT_MASK  },
+     { IBUS_KEY_3, IBUS_SHIFT_MASK }, { IBUS_KEY_d, IBUS_SHIFT_MASK },
+     { IBUS_KEY_9, IBUS_SHIFT_MASK }, { IBUS_KEY_e, IBUS_SHIFT_MASK },
+     { IBUS_KEY_0, IBUS_SHIFT_MASK }, { IBUS_KEY_f, IBUS_SHIFT_MASK },
+     { IBUS_KEY_equal, IBUS_SHIFT_MASK }, { IBUS_KEY_g, IBUS_SHIFT_MASK },
+     { 0, 0 } },
+   { { 0, 0 } }
+};
+
+KeyData test_end_key = { IBUS_KEY_z, IBUS_SHIFT_MASK };
+
+static const gunichar test_results[][60] = {
+   { 'a', '<', 'b', '>', 'c', '?', 'd', ':', 'e', '"', 'f', '{', 'g', '|', 0 },
+   { '~', 'A', '!', 'B', '@', 'C', '#', 'D', '(', 'E', ')', 'F', '+', 'G', 0 },
+   { 0 }
+};
+
+
+IBusBus *m_bus;
+IBusEngine *m_engine;
+
+static gboolean window_focus_in_event_cb (GtkWidget     *entry,
+                                          GdkEventFocus *event,
+                                          gpointer       data);
+
+static IBusEngine *
+create_engine_cb (IBusFactory *factory, const gchar *name, gpointer data)
+{
+    static int i = 1;
+    gchar *engine_path =
+            g_strdup_printf ("/org/freedesktop/IBus/engine/simpletest/%d",
+                             i++);
+
+    m_engine = ibus_engine_new_with_type (IBUS_TYPE_ENGINE_SIMPLE,
+                                          name,
+                                          engine_path,
+                                          ibus_bus_get_connection (m_bus));
+    g_free (engine_path);
+    return m_engine;
+}
+
+static gboolean
+register_ibus_engine ()
+{
+    IBusFactory *factory;
+    IBusComponent *component;
+    IBusEngineDesc *desc;
+
+    m_bus = ibus_bus_new ();
+    if (!ibus_bus_is_connected (m_bus)) {
+        g_critical ("ibus-daemon is not running.");
+        return FALSE;
+    }
+    factory = ibus_factory_new (ibus_bus_get_connection (m_bus));
+    g_signal_connect (factory, "create-engine",
+                      G_CALLBACK (create_engine_cb), NULL);
+
+    component = ibus_component_new (
+            "org.freedesktop.IBus.SimpleTest",
+            "Simple Engine Test",
+            "0.0.1",
+            "GPL",
+            "Takao Fujiwara <takao.fujiwara1@gmail.com>",
+            "https://github.com/ibus/ibus/wiki",
+            "",
+            "ibus");
+    desc = ibus_engine_desc_new (
+            "xkbtest:us::eng",
+            "XKB Test",
+            "XKB Test",
+            "en",
+            "GPL",
+            "Takao Fujiwara <takao.fujiwara1@gmail.com>",
+            "ibus-engine",
+            "us");
+    ibus_component_add_engine (component, desc);
+    ibus_bus_register_component (m_bus, component);
+
+    return TRUE;
+}
+
+static gboolean
+finit (gpointer data)
+{
+    g_critical ("time out");
+    gtk_main_quit ();
+    return FALSE;
+}
+
+static void
+send_key_event (Display *xdisplay,
+                guint    keyval,
+                guint    modifiers)
+{
+    static struct {
+        guint   state;
+        KeySym  keysym;
+    } state2keysym[] = {
+        { IBUS_CONTROL_MASK, XK_Control_L } ,
+        { IBUS_MOD1_MASK,    XK_Alt_L },
+        { IBUS_MOD4_MASK,    XK_Super_L },
+        { IBUS_SHIFT_MASK,   XK_Shift_L },
+        { IBUS_LOCK_MASK,    XK_Caps_Lock },
+        { 0,           0L }
+    };
+    int i;
+    guint keycode;
+    guint state = modifiers;
+
+    while (state) {
+        for (i = 0; state2keysym[i].state; i++) {
+            if ((state2keysym[i].state & state) != 0) {
+                keycode = XKeysymToKeycode (xdisplay, state2keysym[i].keysym);
+                XTestFakeKeyEvent (xdisplay, keycode, True, CurrentTime);
+                XSync (xdisplay, False);
+                state ^= state2keysym[i].state;
+                break;
+            }
+        }
+    }
+    keycode = XKeysymToKeycode (xdisplay, keyval);
+    XTestFakeKeyEvent (xdisplay, keycode, True, CurrentTime);
+    XSync (xdisplay, False);
+    XTestFakeKeyEvent (xdisplay, keycode, False, CurrentTime);
+    XSync (xdisplay, False);
+
+    state = modifiers;
+    while (state) {
+        for (i = G_N_ELEMENTS (state2keysym) - 1; i >= 0; i--) {
+            if ((state2keysym[i].state & state) != 0) {
+                keycode = XKeysymToKeycode (xdisplay, state2keysym[i].keysym);
+                XTestFakeKeyEvent (xdisplay, keycode, False, CurrentTime);
+                XSync (xdisplay, False);
+                state ^= state2keysym[i].state;
+                break;
+            }
+        }
+    }
+}
+
+static void
+set_engine_cb (GObject      *object,
+               GAsyncResult *res,
+               gpointer      data)
+{
+    IBusBus *bus = IBUS_BUS (object);
+    GtkWidget *entry = GTK_WIDGET (data);
+    GdkDisplay *display;
+    Display *xdisplay;
+    GError *error = NULL;
+    int i, j;
+
+    g_assert (GTK_IS_ENTRY (entry));
+
+    if (!ibus_bus_set_global_engine_async_finish (bus, res, &error)) {
+        g_critical ("set engine failed: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+
+    display = gtk_widget_get_display (entry);
+    if (GDK_IS_X11_DISPLAY (display)) {
+        xdisplay = gdk_x11_display_get_xdisplay (display);
+    } else {
+#if 0
+        xdisplay = XOpenDisplay (NULL);
+#else
+        g_critical ("No idea to simulate key events in Wayland\n");
+#endif
+    }
+    g_return_if_fail (xdisplay);
+
+    for (i = 0; test_cases[i][0].keyval; i++) {
+        for (j = 0; test_cases[i][j].keyval; j++) {
+            send_key_event (xdisplay,
+                            test_cases[i][j].keyval,
+                            test_cases[i][j].modifiers);
+        }
+        send_key_event (xdisplay, test_end_key.keyval, test_end_key.modifiers);
+    }
+
+    g_timeout_add_seconds (10, finit, NULL);
+}
+
+static gboolean
+window_focus_in_event_cb (GtkWidget *entry, GdkEventFocus *event, gpointer data)
+{
+    g_assert (m_bus != NULL);
+    ibus_bus_set_global_engine_async (m_bus,
+                                      "xkbtest:us::eng",
+                                      -1,
+                                      NULL,
+                                      set_engine_cb,
+                                      entry);
+    return FALSE;
+}
+
+static void
+window_inserted_text_cb (GtkEntryBuffer *buffer,
+                         guint           position,
+                         const gchar    *chars,
+                         guint           nchars,
+                         gpointer        data)
+{
+    GtkWidget *entry = data;
+    static int i = 0;
+    static int j = 0;
+
+    if (g_utf8_get_char (chars) == 'Z') {
+        int k;
+        g_print ("\n" GREEN "PASS" NC ": ");
+        for (k = 0; k < j; k++)
+            g_print ("%lc(%X) ", test_results[i][k], test_results[i][k]);
+        g_print ("\n");
+        i++;
+        j = 0;
+        if (test_results[i][0] == 0)
+            gtk_main_quit ();
+        else
+            gtk_entry_set_text (GTK_ENTRY (entry), "");
+        return;
+    }
+    g_assert (g_utf8_get_char (chars) == test_results[i][j]);
+    j++;
+}
+
+static void
+create_window ()
+{
+    GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    GtkWidget *entry = gtk_entry_new ();
+    GtkEntryBuffer *buffer;
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_main_quit), NULL);
+    g_signal_connect (entry, "focus-in-event",
+                      G_CALLBACK (window_focus_in_event_cb), NULL);
+    buffer = gtk_entry_get_buffer (GTK_ENTRY (entry));
+    g_signal_connect (buffer, "inserted-text",
+                      G_CALLBACK (window_inserted_text_cb), entry);
+    gtk_container_add (GTK_CONTAINER (window), entry);
+    gtk_widget_show_all (window);
+}
+
+static void
+test_keypress (void)
+{
+    int status = 0;
+    GError *error = NULL;
+
+    g_spawn_command_line_sync ("setxkbmap -layout us",
+                               NULL, NULL,
+                               &status, &error);
+    g_assert (register_ibus_engine ());
+
+    create_window ();
+    gtk_main ();
+}
+
+int
+main (int argc, char *argv[])
+{
+    ibus_init ();
+    g_test_init (&argc, &argv, NULL);
+    gtk_init (&argc, &argv);
+
+    g_test_add_func ("/ibus/keyrepss", test_keypress);
+
+
+    return g_test_run ();
+}
diff --git a/src/tests/runtest b/src/tests/runtest
index 35825b1be..b6b845d63 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -32,6 +32,7 @@ ibus-inputcontext
 ibus-inputcontext-create
 ibus-engine-switch
 ibus-compose
+ibus-keypress
 test-stress
 "
 IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'

From 8ab0b603ba1cd8701583aee46c712898d52005f1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 23 May 2018 19:20:10 +0900
Subject: [PATCH 479/816] bus: Fix a SEGV in bus_input_context_emit_signal

IBus engines can call 'RequireSurroundingText' for a fake input context
if there is no input focus.
---
 bus/inputcontext.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index a957d1077..dfb98c361 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -716,7 +716,9 @@ bus_input_context_emit_signal (BusInputContext *context,
                                GError         **error)
 {
     if (context->connection == NULL) {
-        g_variant_unref (parameters);
+        /* fake context has no connections. */
+        if (parameters)
+            g_variant_unref (parameters);
         return TRUE;
     }
 

From a1f91b27145b046a112bb5eba2561880dae5d6a2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 4 Jun 2018 17:44:17 +0900
Subject: [PATCH 480/816] ui/gtk3: Get PangoAttrList of auxiliary text from
 IBusText

Since IBus auxiliary text would be one line, it's better to show the
character attributes likes color, italic, bold, on the auxiliary text.

Also deleted the cursor width from the X position of CandidatePanel
because IBus preedit overrides the original cursor of the applications.
---
 ui/gtk3/candidatepanel.vala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index ec2d3db4f..d404c6597 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -153,6 +153,8 @@ public class CandidatePanel : Gtk.Box{
     public void set_auxiliary_text(IBus.Text? text) {
         if (text != null) {
             m_aux_label.set_text(text.get_text());
+            Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(text);
+            m_aux_label.set_attributes(attrs);
             m_aux_label.show();
         } else {
             m_aux_label.set_text("");
@@ -314,7 +316,7 @@ public class CandidatePanel : Gtk.Box{
 
     private void adjust_window_position_horizontal() {
         Gdk.Point cursor_right_bottom = {
-                m_cursor_location.x + m_cursor_location.width,
+                m_cursor_location.x,
                 m_cursor_location.y + m_cursor_location.height
         };
 

From cf4e2f1d815b700b0470380e0ff428ff266cc18a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 Jun 2018 17:29:06 +0900
Subject: [PATCH 481/816] bus: Rename panel-extension to emoji-extension for
 CLI

---
 bus/main.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bus/main.c b/bus/main.c
index e1cc423b6..2fb37b69b 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -43,7 +43,7 @@ static gboolean xim = FALSE;
 static gboolean replace = FALSE;
 static gboolean restart = FALSE;
 static gchar *panel = "default";
-static gchar *panel_extension = "default";
+static gchar *emoji_extension = "default";
 static gchar *config = "default";
 static gchar *desktop = "gnome";
 
@@ -67,7 +67,7 @@ static const GOptionEntry entries[] =
     { "xim",       'x', 0, G_OPTION_ARG_NONE,   &xim,       "execute ibus XIM server.", NULL },
     { "desktop",   'n', 0, G_OPTION_ARG_STRING, &desktop,   "specify the name of desktop session. [default=gnome]", "name" },
     { "panel",     'p', 0, G_OPTION_ARG_STRING, &panel,     "specify the cmdline of panel program. pass 'disable' not to start a panel program.", "cmdline" },
-    { "panel-extension", 'E', 0, G_OPTION_ARG_STRING, &panel_extension, "specify the cmdline of panel extension program. pass 'disable' not to start an extension program.", "cmdline" },
+    { "emoji-extension", 'E', 0, G_OPTION_ARG_STRING, &emoji_extension, "specify the cmdline of emoji extension program. pass 'disable' not to start an extension program.", "cmdline" },
     { "config",    'c', 0, G_OPTION_ARG_STRING, &config,    "specify the cmdline of config program. pass 'disable' not to start a config program.", "cmdline" },
     { "address",   'a', 0, G_OPTION_ARG_STRING, &g_address,   "specify the address of ibus daemon.", "address" },
     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
@@ -245,7 +245,7 @@ main (gint argc, gchar **argv)
     bus_server_init ();
     for (i = 0; i < G_N_ELEMENTS(panel_extension_disable_users); i++) {
         if (!g_strcmp0 (username, panel_extension_disable_users[i]) != 0) {
-            panel_extension = "disable";
+            emoji_extension = "disable";
             break;
         }
     }
@@ -286,7 +286,7 @@ main (gint argc, gchar **argv)
     }
 
 #ifdef EMOJI_DICT
-    if (g_strcmp0 (panel_extension, "default") == 0) {
+    if (g_strcmp0 (emoji_extension, "default") == 0) {
         BusComponent *component;
         component = bus_ibus_impl_lookup_component_by_name (
                 BUS_DEFAULT_IBUS, IBUS_SERVICE_PANEL_EXTENSION);
@@ -298,9 +298,9 @@ main (gint argc, gchar **argv)
             g_printerr ("Can not execute default panel program\n");
             exit (-1);
         }
-    } else if (g_strcmp0 (panel_extension, "disable") != 0 &&
-               g_strcmp0 (panel_extension, "") != 0) {
-        if (!execute_cmdline (panel_extension))
+    } else if (g_strcmp0 (emoji_extension, "disable") != 0 &&
+               g_strcmp0 (emoji_extension, "") != 0) {
+        if (!execute_cmdline (emoji_extension))
             exit (-1);
     }
 #endif

From ddc2284200971141947a37057356b4bbd84be7ce Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 Jun 2018 18:30:46 +0900
Subject: [PATCH 482/816] tools: Add ibus read-config --engine-id option for
 engine schemas

Fixed ibus read-config and reset-config options and also added --engine-id
sub option for engine schemas.
E.g.
% ibus read-config --engine-id anthy
% ibus read-config --engine-id com.github.libpinyin.ibus-libpinyin.libpinyin
---
 tools/main.vala | 99 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 85 insertions(+), 14 deletions(-)

diff --git a/tools/main.vala b/tools/main.vala
index 8c0b64d3d..6e201f300 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,20 +22,17 @@
  */
 
 private const string IBUS_SCHEMAS_GENERAL = "org.freedesktop.ibus.general";
-private const string IBUS_SCHEMAS_GENERAL_PANEL =
-        "org.freedesktop.ibus.general.panel";
+private const string IBUS_SCHEMAS_GENERAL_HOTKEY =
+        "org.freedesktop.ibus.general.hotkey";
 private const string IBUS_SCHEMAS_PANEL = "org.freedesktop.ibus.panel";
-
-private const string[] IBUS_SCHEMAS = {
-    IBUS_SCHEMAS_GENERAL,
-    IBUS_SCHEMAS_GENERAL_PANEL,
-    IBUS_SCHEMAS_PANEL,
-};
+private const string IBUS_SCHEMAS_PANEL_EMOJI =
+        "org.freedesktop.ibus.panel.emoji";
 
 bool name_only = false;
 /* system() exists as a public API. */
 bool is_system = false;
 string cache_file = null;
+string engine_id = null;
 
 class EngineList {
     public IBus.EngineDesc[] data = {};
@@ -292,15 +289,78 @@ int print_address(string[] argv) {
     return Posix.EXIT_SUCCESS;
 }
 
+private int read_config_options(string[] argv) {
+    const OptionEntry[] options = {
+        { "engine-id", 0, 0, OptionArg.STRING, out engine_id,
+          N_("Use engine schema paths instead of ibus core, " +
+             "which can be comma-separated values."), "ENGINE_ID" },
+        { null }
+    };
+
+    var option = new OptionContext();
+    option.add_main_entries(options, Config.GETTEXT_PACKAGE);
+
+    try {
+        option.parse(ref argv);
+    } catch (OptionError e) {
+        stderr.printf("%s\n", e.message);
+        return Posix.EXIT_FAILURE;
+    }
+    return Posix.EXIT_SUCCESS;
+}
+
+private GLib.SList<string> get_ibus_schemas() {
+    string[] ids = {};
+    if (engine_id != null) {
+        ids = engine_id.split(",");
+    }
+    GLib.SList<string> ibus_schemas = new GLib.SList<string>();
+    GLib.SettingsSchemaSource schema_source =
+            GLib.SettingsSchemaSource.get_default();
+    string[] list_schemas = {};
+    schema_source.list_schemas(true, out list_schemas, null);
+    foreach (string schema in list_schemas) {
+        if (ids.length != 0) {
+            foreach (unowned string id in ids) {
+                if (id == schema ||
+                    schema.has_prefix("org.freedesktop.ibus.engine." + id)) {
+                    ibus_schemas.prepend(schema);
+                    break;
+                }
+            }
+        } else if (schema.has_prefix("org.freedesktop.ibus") &&
+            !schema.has_prefix("org.freedesktop.ibus.engine")) {
+            ibus_schemas.prepend(schema);
+        }
+    }
+    if (ibus_schemas.length() == 0) {
+        printerr("Not found schemas of \"org.freedesktop.ibus\"\n");
+        return ibus_schemas;
+    }
+    ibus_schemas.sort(GLib.strcmp);
+
+    return ibus_schemas;
+}
+
 int read_config(string[] argv) {
-    var output = new GLib.StringBuilder();
+    if (read_config_options(argv) == Posix.EXIT_FAILURE)
+        return Posix.EXIT_FAILURE;
+
+    GLib.SList<string> ibus_schemas = get_ibus_schemas();
+    if (ibus_schemas.length() == 0)
+        return Posix.EXIT_FAILURE;
 
-    foreach (string schema in IBUS_SCHEMAS) {
+    GLib.SettingsSchemaSource schema_source =
+            GLib.SettingsSchemaSource.get_default();
+    var output = new GLib.StringBuilder();
+    foreach (string schema in ibus_schemas) {
+        GLib.SettingsSchema settings_schema = schema_source.lookup(schema,
+                                                                   false);
         GLib.Settings settings = new GLib.Settings(schema);
 
         output.append_printf("SCHEMA: %s\n", schema);
 
-        foreach (string key in settings.list_keys()) {
+        foreach (string key in settings_schema.list_keys()) {
             GLib.Variant variant = settings.get_value(key);
             output.append_printf("  %s: %s\n", key, variant.print(true));
         }
@@ -311,14 +371,25 @@ int read_config(string[] argv) {
 }
 
 int reset_config(string[] argv) {
+    if (read_config_options(argv) == Posix.EXIT_FAILURE)
+        return Posix.EXIT_FAILURE;
+
+    GLib.SList<string> ibus_schemas = get_ibus_schemas();
+    if (ibus_schemas.length() == 0)
+        return Posix.EXIT_FAILURE;
+
     print("%s\n", _("Resetting…"));
 
-    foreach (string schema in IBUS_SCHEMAS) {
+    GLib.SettingsSchemaSource schema_source =
+            GLib.SettingsSchemaSource.get_default();
+    foreach (string schema in ibus_schemas) {
+        GLib.SettingsSchema settings_schema = schema_source.lookup(schema,
+                                                                   false);
         GLib.Settings settings = new GLib.Settings(schema);
 
         print("SCHEMA: %s\n", schema);
 
-        foreach (string key in settings.list_keys()) {
+        foreach (string key in settings_schema.list_keys()) {
             print("  %s\n", key);
             settings.reset(key);
         }

From 37aa95f1adcdde82ef473936cadc0fa3fe8a4e44 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 15 Jun 2018 19:23:27 +0900
Subject: [PATCH 483/816] setup: Replace GtkTable /w GtkGrid

---
 setup/setup.ui | 113 ++++++++++++++++++-------------------------------
 1 file changed, 41 insertions(+), 72 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index 322f51467..e64b10468 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -99,11 +99,9 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkTable" id="table1">
+                      <object class="GtkGrid" id="table1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">2</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
@@ -117,8 +115,8 @@
                             <property name="label" translatable="yes">Next input method:</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -131,10 +129,8 @@
                             <property name="label" translatable="yes">Previous input method:</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -143,6 +139,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkEntry" id="entry_switch_engine">
                                 <property name="visible">True</property>
@@ -174,8 +171,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -184,6 +180,7 @@
                             <property name="no_show_all">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkEntry" id="entry_prev_engine">
   >                                     <property name="no_show_all">True</property>
@@ -217,10 +214,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -232,10 +226,8 @@
                             <property name="label" translatable="yes">Enable or disable:</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -246,10 +238,8 @@
                             <property name="label" translatable="yes">Enable:</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -258,6 +248,7 @@
                             <property name="no_show_all">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkEntry" id="entry_enable_unconditional">
                                 <property name="visible">True</property>
@@ -289,10 +280,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -303,10 +291,8 @@
                             <property name="label" translatable="yes">Disable:</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -315,6 +301,7 @@
                             <property name="no_show_all">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkEntry" id="entry_disable_unconditional">
                                 <property name="visible">True</property>
@@ -346,10 +333,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                       </object>
@@ -376,11 +360,9 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkTable" id="table2">
+                      <object class="GtkGrid" id="table2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">7</property>
-                        <property name="n_columns">2</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
@@ -393,10 +375,11 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Candidates orientation:</property>
                             <property name="justify">right</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -404,6 +387,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="model">model_candidates_orientation</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer1"/>
                               <attributes>
@@ -413,8 +397,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -425,12 +408,11 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Show property panel:</property>
                             <property name="justify">right</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -440,12 +422,11 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Language panel position:</property>
                             <property name="justify">right</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -453,6 +434,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="model">model_panel_show_mode</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer2"/>
                               <attributes>
@@ -462,10 +444,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -473,6 +452,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="model">model_panel_position</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer3"/>
                               <attributes>
@@ -482,10 +462,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -499,13 +476,12 @@
                             <property name="use_action_appearance">False</property>
                             <property name="halign">start</property>
                             <property name="draw_indicator">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
-                            <property name="right_attach">2</property>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
@@ -519,13 +495,12 @@
                             <property name="use_action_appearance">False</property>
                             <property name="halign">start</property>
                             <property name="draw_indicator">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
-                            <property name="right_attach">2</property>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
@@ -539,13 +514,12 @@
                             <property name="use_action_appearance">False</property>
                             <property name="halign">start</property>
                             <property name="draw_indicator">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
-                            <property name="right_attach">2</property>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
@@ -559,12 +533,11 @@
                             <property name="use_underline">True</property>
                             <property name="halign">start</property>
                             <property name="draw_indicator">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -573,13 +546,11 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_action_appearance">False</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                       </object>
@@ -888,11 +859,9 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkTable" id="table_emoji1">
+                      <object class="GtkGrid" id="table_emoji1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">2</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
@@ -906,8 +875,8 @@
                             <property name="label" translatable="yes">Emoji choice:</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -916,6 +885,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">true</property>
                             <child>
                               <object class="GtkEntry" id="entry_emoji_dialog">
                                 <property name="visible">True</property>
@@ -947,8 +917,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                       </object>

From 5ee3f48049ecf128391da6448ae7e74786bd171b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 18 Jun 2018 12:46:11 +0900
Subject: [PATCH 484/816] Move input focus on Emojier to engines' preedit

---
 bindings/vala/IBus-1.0-custom.vala |   7 +
 bindings/vala/Makefile.am          |   3 +-
 bindings/vala/gdk-wayland.vapi     |   7 +
 bus/engineproxy.c                  |  53 +-
 bus/engineproxy.h                  |  25 +-
 bus/ibusimpl.c                     | 247 +++++--
 bus/inputcontext.c                 | 399 +++++++++---
 bus/inputcontext.h                 | 110 +++-
 bus/panelproxy.c                   | 210 +++++-
 bus/panelproxy.h                   |  23 +-
 data/ibus.schemas.in               |  12 +
 setup/main.py                      |  10 +-
 setup/setup.ui                     |  58 +-
 src/ibusengine.c                   | 305 +++++----
 src/ibuspanelservice.c             | 318 ++++++++-
 src/ibuspanelservice.h             | 117 +++-
 src/ibusshare.h                    |  17 +-
 src/ibusxevent.c                   | 375 ++++++++++-
 src/ibusxevent.h                   | 143 ++++-
 ui/gtk3/Makefile.am                |   3 +
 ui/gtk3/emojier.vala               | 991 +++++++++++++++++++++--------
 ui/gtk3/emojierapp.vala            |  74 ++-
 ui/gtk3/extension.vala             |   6 +-
 ui/gtk3/panel.vala                 |  23 +-
 ui/gtk3/panelbinding.vala          | 859 ++++++++++++++++++++++---
 25 files changed, 3695 insertions(+), 700 deletions(-)
 create mode 100644 bindings/vala/gdk-wayland.vapi

diff --git a/bindings/vala/IBus-1.0-custom.vala b/bindings/vala/IBus-1.0-custom.vala
index cf1fc3fab..7d34a8bd3 100644
--- a/bindings/vala/IBus-1.0-custom.vala
+++ b/bindings/vala/IBus-1.0-custom.vala
@@ -6,8 +6,15 @@ namespace IBus {
 		[CCode (cname = "ibus_text_new_from_static_string", has_construct_function = false)]
 		public Text.from_static_string (string str);
 	}
+	public class ExtensionEvent : IBus.Serializable {
+		[CCode (cname = "ibus_extension_event_new", has_construct_function = true)]
+		public ExtensionEvent (string first_property_name, ...);
+	}
 	public class XEvent : IBus.Serializable {
 		[CCode (cname = "ibus_x_event_new", has_construct_function = true)]
 		public XEvent (string first_property_name, ...);
 	}
+	public class PanelService : IBus.Service {
+                public void panel_extension_register_keys(string first_property_name, ...);
+	}
 }
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index fc8e2f012..e4ecab977 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -86,6 +86,7 @@ EXTRA_DIST =                                    \
     ibus-1.0.deps                               \
     ibus-emoji-dialog-1.0.deps                  \
     config.vapi                                 \
+    gdk-wayland.vapi                            \
     xi.vapi                                     \
     $(NULL)
 
diff --git a/bindings/vala/gdk-wayland.vapi b/bindings/vala/gdk-wayland.vapi
new file mode 100644
index 000000000..c65f2be48
--- /dev/null
+++ b/bindings/vala/gdk-wayland.vapi
@@ -0,0 +1,7 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "gdk/gdkwayland.h")]
+namespace GdkWayland
+{
+    [CCode (type_id = "gdk_wayland_display_get_type ()")]
+    public class Display : Gdk.Display {
+    }
+}
diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 175aec569..2d98995c3 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -377,10 +377,10 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            bus_marshal_VOID__VARIANT,
+            bus_marshal_VOID__OBJECT,
             G_TYPE_NONE,
             1,
-            G_TYPE_VARIANT);
+            IBUS_TYPE_EXTENSION_EVENT);
 
     text_empty = ibus_text_new_from_static_string ("");
     g_object_ref_sink (text_empty);
@@ -644,7 +644,16 @@ bus_engine_proxy_g_signal (GDBusProxy  *proxy,
     }
 
     if (g_strcmp0 (signal_name, "PanelExtension") == 0) {
-        g_signal_emit (engine, engine_signals[PANEL_EXTENSION], 0, parameters);
+        GVariant *arg0 = NULL;
+        g_variant_get (parameters, "(v)", &arg0);
+        g_return_if_fail (arg0 != NULL);
+
+        IBusExtensionEvent *event = IBUS_EXTENSION_EVENT (
+                ibus_serializable_deserialize (arg0));
+        g_variant_unref (arg0);
+        g_return_if_fail (event != NULL);
+        g_signal_emit (engine, engine_signals[PANEL_EXTENSION], 0, event);
+        _g_object_unref_if_floating (event);
         return;
     }
 
@@ -1323,6 +1332,44 @@ bus_engine_proxy_is_enabled (BusEngineProxy *engine)
     return engine->enabled;
 }
 
+void
+bus_engine_proxy_panel_extension_received (BusEngineProxy     *engine,
+                                           IBusExtensionEvent *event)
+{
+    GVariant *variant;
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+    g_assert (IBUS_IS_EXTENSION_EVENT (event));
+
+    variant = ibus_serializable_serialize_object (
+            IBUS_SERIALIZABLE (event));
+    g_return_if_fail (variant != NULL);
+    g_dbus_proxy_call ((GDBusProxy *)engine,
+                       "PanelExtensionReceived",
+                       g_variant_new ("(v)", variant),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL,
+                       NULL,
+                       NULL);
+}
+
+void
+bus_engine_proxy_panel_extension_register_keys (BusEngineProxy *engine,
+                                                GVariant       *parameters)
+{
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+    g_assert (parameters);
+
+    g_dbus_proxy_call ((GDBusProxy *)engine,
+                       "PanelExtensionRegisterKeys",
+                       g_variant_new ("(v)", g_variant_ref (parameters)),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL,
+                       NULL,
+                       NULL);
+}
+
 static gboolean
 initable_init (GInitable     *initable,
                GCancellable  *cancellable,
diff --git a/bus/engineproxy.h b/bus/engineproxy.h
index 528e61b74..a3006b472 100644
--- a/bus/engineproxy.h
+++ b/bus/engineproxy.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -325,5 +326,27 @@ void            bus_engine_proxy_set_content_type
 IBusPropList   *bus_engine_proxy_get_properties
                                              (BusEngineProxy     *engine);
 
+/**
+ * bus_engine_proxy_panel_extension_received:
+ * @engine: A #BusEngineProxy.
+ * @event: An #IBusExtensionEvent.
+ *
+ * Send an #IBusExtensionEvent to the engine.
+ */
+void            bus_engine_proxy_panel_extension_received
+                                             (BusEngineProxy     *engine,
+                                              IBusExtensionEvent *event);
+
+/**
+ * bus_engine_proxy_panel_extension_register_keys:
+ * @engine: A #BusEngineProxy.
+ * @parameters: A #GVariant array which includes the name and shortcut keys.
+ *
+ * Send shortcut keys to the engine to enable the extension.
+ */
+void            bus_engine_proxy_panel_extension_register_keys
+                                             (BusEngineProxy     *engine,
+                                              GVariant           *parameters);
+
 G_END_DECLS
 #endif
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index a4ce3d9d8..ec1caea8f 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -74,7 +74,8 @@ struct _BusIBusImpl {
 
     BusInputContext *focused_context;
     BusPanelProxy   *panel;
-    BusPanelProxy   *extension;
+    BusPanelProxy   *emoji_extension;
+    gboolean         enable_emoji_extension;
 
     /* a default keymap of ibus-daemon (usually "us") which is used only
      * when use_sys_layout is FALSE. */
@@ -83,6 +84,7 @@ struct _BusIBusImpl {
     gboolean use_global_engine;
     gchar *global_engine_name;
     gchar *global_previous_engine_name;
+    GVariant *extension_register_keys;
 };
 
 struct _BusIBusImplClass {
@@ -294,40 +296,158 @@ _panel_destroy_cb (BusPanelProxy *panel,
 
     if (ibus->panel == panel)
         ibus->panel = NULL;
-    else if (ibus->extension == panel)
-        ibus->extension = NULL;
+    else if (ibus->emoji_extension == panel)
+        ibus->emoji_extension = NULL;
     else
         g_return_if_reached ();
     g_object_unref (panel);
 }
 
 static void
-bus_ibus_impl_panel_extension_received (BusIBusImpl *ibus,
-                                        GVariant    *parameters)
+bus_ibus_impl_set_panel_extension_mode (BusIBusImpl        *ibus,
+                                        IBusExtensionEvent *event)
 {
-    if (!ibus->extension) {
+    gboolean is_extension = FALSE;
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+    g_return_if_fail (IBUS_IS_EXTENSION_EVENT (event));
+
+    if (!ibus->emoji_extension) {
         g_warning ("Panel extension is not running.");
         return;
     }
 
-    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
-    g_return_if_fail (BUS_IS_PANEL_PROXY (ibus->extension));
+    g_return_if_fail (BUS_IS_PANEL_PROXY (ibus->emoji_extension));
+
+    ibus->enable_emoji_extension = ibus_extension_event_is_enabled (event);
+    is_extension = ibus_extension_event_is_extension (event);
+    if (ibus->focused_context != NULL) {
+        if (ibus->enable_emoji_extension) {
+            bus_input_context_set_emoji_extension (ibus->focused_context,
+                                                   ibus->emoji_extension);
+        } else {
+            bus_input_context_set_emoji_extension (ibus->focused_context, NULL);
+        }
+        if (is_extension)
+            bus_input_context_panel_extension_received (ibus->focused_context,
+                                                        event);
+    }
+    if (is_extension)
+        return;
 
     /* Use the DBus method because it seems any DBus signal,
      * g_dbus_message_new_signal(), cannot be reached to the server. */
-    g_dbus_proxy_call (G_DBUS_PROXY (ibus->extension),
-                       "PanelExtensionReceived",
-                       parameters,
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1, NULL, NULL, NULL);
+    bus_panel_proxy_panel_extension_received (ibus->emoji_extension,
+                                              event);
+}
+
+static void
+bus_ibus_impl_set_panel_extension_keys (BusIBusImpl *ibus,
+                                        GVariant    *parameters)
+{
+    BusEngineProxy *engine = NULL;
+
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+    g_return_if_fail (parameters);
+
+    if (!ibus->emoji_extension) {
+        g_warning ("Panel extension is not running.");
+        return;
+    }
+
+    if (ibus->extension_register_keys)
+        g_variant_unref (ibus->extension_register_keys);
+    ibus->extension_register_keys = g_variant_ref_sink (parameters);
+    if (ibus->focused_context != NULL) {
+            engine = bus_input_context_get_engine (ibus->focused_context);
+    }
+    if (!engine)
+        return;
+    bus_engine_proxy_panel_extension_register_keys (engine, parameters);
 }
 
 static void
-_panel_panel_extension_cb (BusPanelProxy *panel,
-                           GVariant      *parameters,
-                           BusIBusImpl  *ibus)
+_panel_panel_extension_cb (BusPanelProxy      *panel,
+                           IBusExtensionEvent *event,
+                           BusIBusImpl        *ibus)
 {
-    bus_ibus_impl_panel_extension_received (ibus, parameters);
+    bus_ibus_impl_set_panel_extension_mode (ibus, event);
+}
+
+static void
+_panel_panel_extension_register_keys_cb (BusInputContext *context,
+                                         GVariant        *parameters,
+                                         BusIBusImpl     *ibus)
+{
+    bus_ibus_impl_set_panel_extension_keys (ibus, parameters);
+}
+
+static void
+_panel_update_preedit_text_received_cb (BusPanelProxy *panel,
+                                        IBusText      *text,
+                                        guint          cursor_pos,
+                                        gboolean       visible,
+                                        BusIBusImpl   *ibus)
+{
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+
+    if (!ibus->focused_context)
+        return;
+    bus_input_context_update_preedit_text (ibus->focused_context,
+        text, cursor_pos, visible, IBUS_ENGINE_PREEDIT_CLEAR, FALSE);
+}
+
+static void
+_panel_update_lookup_table_received_cb (BusPanelProxy   *panel,
+                                        IBusLookupTable *table,
+                                        gboolean         visible,
+                                        BusIBusImpl     *ibus)
+{
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+    g_return_if_fail (IBUS_IS_LOOKUP_TABLE (table));
+
+    if (!ibus->focused_context)
+        return;
+    /* Call bus_input_context_update_lookup_table() instead of
+     * bus_panel_proxy_update_lookup_table() for panel extensions because
+     * bus_input_context_page_up() can call bus_panel_proxy_page_up_received().
+     */
+    bus_input_context_update_lookup_table (
+            ibus->focused_context, table, visible, TRUE);
+}
+
+static void
+_panel_update_auxiliary_text_received_cb (BusPanelProxy *panel,
+                                          IBusText      *text,
+                                          gboolean       visible,
+                                          BusIBusImpl   *ibus)
+{
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+    g_return_if_fail (IBUS_IS_TEXT (text));
+
+    if (!ibus->panel)
+        return;
+    bus_panel_proxy_update_auxiliary_text (
+            ibus->panel, text, visible);
+}
+
+static void
+_panel_show_lookup_table_received_cb (BusPanelProxy *panel,
+                                      BusIBusImpl   *ibus)
+{
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+
+    if (ibus->panel)
+        bus_panel_proxy_show_lookup_table (ibus->panel);
+}
+
+static void
+_panel_hide_lookup_table_received_cb (BusPanelProxy *panel,
+                                      BusIBusImpl   *ibus)
+{
+    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
+
+    if (ibus->panel)
+        bus_panel_proxy_hide_lookup_table (ibus->panel);
 }
 
 static void
@@ -361,8 +481,8 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
 
     if (!g_strcmp0 (name, IBUS_SERVICE_PANEL))
         panel_type = PANEL_TYPE_PANEL;
-    else if (!g_strcmp0 (name, IBUS_SERVICE_PANEL_EXTENSION))
-        panel_type = PANEL_TYPE_EXTENSION;
+    else if (!g_strcmp0 (name, IBUS_SERVICE_PANEL_EXTENSION_EMOJI))
+        panel_type = PANEL_TYPE_EXTENSION_EMOJI;
 
     if (panel_type != PANEL_TYPE_NONE) {
         if (g_strcmp0 (new_name, "") != 0) {
@@ -370,7 +490,7 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
             BusConnection *connection;
             BusInputContext *context = NULL;
             BusPanelProxy   **panel = (panel_type == PANEL_TYPE_PANEL) ?
-                                       &ibus->panel : &ibus->extension;
+                                      &ibus->panel : &ibus->emoji_extension;
 
             if (*panel != NULL) {
                 ibus_proxy_destroy ((IBusProxy *)(*panel));
@@ -383,6 +503,8 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
             g_return_if_fail (connection != NULL);
 
             *panel = bus_panel_proxy_new (connection, panel_type);
+            if (panel_type == PANEL_TYPE_EXTENSION_EMOJI)
+                ibus->enable_emoji_extension = FALSE;
 
             g_signal_connect (*panel,
                               "destroy",
@@ -392,6 +514,26 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
                               "panel-extension",
                               G_CALLBACK (_panel_panel_extension_cb),
                               ibus);
+            g_signal_connect (*panel,
+                              "panel-extension-register-keys",
+                              G_CALLBACK (
+                                      _panel_panel_extension_register_keys_cb),
+                              ibus);
+            g_signal_connect (
+                    *panel,
+                    "update-preedit-text-received",
+                    G_CALLBACK (_panel_update_preedit_text_received_cb),
+                    ibus);
+            g_signal_connect (
+                    *panel,
+                    "update-lookup-table-received",
+                    G_CALLBACK (_panel_update_lookup_table_received_cb),
+                    ibus);
+            g_signal_connect (
+                    *panel,
+                    "update-auxiliary-text-received",
+                    G_CALLBACK (_panel_update_auxiliary_text_received_cb),
+                    ibus);
 
             if (ibus->focused_context != NULL) {
                 context = ibus->focused_context;
@@ -450,7 +592,7 @@ bus_ibus_impl_init (BusIBusImpl *ibus)
     ibus->contexts = NULL;
     ibus->focused_context = NULL;
     ibus->panel = NULL;
-    ibus->extension = NULL;
+    ibus->emoji_extension = NULL;
 
     ibus->keymap = ibus_keymap_get ("us");
 
@@ -650,11 +792,11 @@ bus_ibus_impl_set_context_engine_from_desc (BusIBusImpl     *ibus,
 }
 
 static void
-_context_panel_extension_cb (BusInputContext *context,
-                             GVariant        *parameters,
-                             BusIBusImpl     *ibus)
+_context_panel_extension_cb (BusInputContext    *context,
+                             IBusExtensionEvent *event,
+                             BusIBusImpl        *ibus)
 {
-    bus_ibus_impl_panel_extension_received (ibus, parameters);
+    bus_ibus_impl_set_panel_extension_mode (ibus, event);
 }
 
 const static struct {
@@ -694,13 +836,18 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
             if (engine) {
                 g_object_ref (engine);
                 bus_input_context_set_engine (ibus->focused_context, NULL);
+                bus_input_context_set_emoji_extension (ibus->focused_context,
+                                                       NULL);
             }
         }
 
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_out (ibus->panel, ibus->focused_context);
-        if (ibus->extension != NULL)
-            bus_panel_proxy_focus_out (ibus->extension, ibus->focused_context);
+        if (ibus->emoji_extension != NULL) {
+            bus_panel_proxy_focus_out (ibus->emoji_extension,
+                                       ibus->focused_context);
+        }
+        bus_input_context_set_emoji_extension (ibus->focused_context, NULL);
 
         bus_input_context_get_content_type (ibus->focused_context,
                                             &purpose, &hints);
@@ -724,6 +871,12 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
         if (engine != NULL) {
             bus_input_context_set_engine (context, engine);
             bus_input_context_enable (context);
+            if (ibus->enable_emoji_extension) {
+                bus_input_context_set_emoji_extension (context,
+                                                       ibus->emoji_extension);
+            } else {
+                bus_input_context_set_emoji_extension (context, NULL);
+            }
         }
         for (i = 0; i < G_N_ELEMENTS(context_signals); i++) {
             g_signal_connect (ibus->focused_context,
@@ -734,8 +887,8 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
 
         if (ibus->panel != NULL)
             bus_panel_proxy_focus_in (ibus->panel, context);
-        if (ibus->extension != NULL)
-            bus_panel_proxy_focus_in (ibus->extension, context);
+        if (ibus->emoji_extension != NULL)
+            bus_panel_proxy_focus_in (ibus->emoji_extension, context);
     }
 
     if (engine != NULL)
@@ -751,6 +904,12 @@ bus_ibus_impl_set_global_engine (BusIBusImpl    *ibus,
 
     if (ibus->focused_context) {
         bus_input_context_set_engine (ibus->focused_context, engine);
+        if (ibus->enable_emoji_extension) {
+            bus_input_context_set_emoji_extension (ibus->focused_context,
+                                                   ibus->emoji_extension);
+        } else {
+            bus_input_context_set_emoji_extension (ibus->focused_context, NULL);
+        }
     } else if (ibus->fake_context) {
         bus_input_context_set_engine (ibus->fake_context, engine);
     }
@@ -927,9 +1086,9 @@ _context_destroy_cb (BusInputContext    *context,
         bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS) {
         bus_panel_proxy_destroy_context (ibus->panel, context);
     }
-    if (ibus->extension &&
+    if (ibus->emoji_extension &&
         bus_input_context_get_capabilities (context) & IBUS_CAP_FOCUS) {
-        bus_panel_proxy_destroy_context (ibus->extension, context);
+        bus_panel_proxy_destroy_context (ibus->emoji_extension, context);
     }
 
     ibus->contexts = g_list_remove (ibus->contexts, context);
@@ -1489,6 +1648,7 @@ _ibus_set_global_engine_ready_cb (BusInputContext       *context,
     else {
         g_dbus_method_invocation_return_value (data->invocation, NULL);
 
+        BusEngineProxy *engine = bus_input_context_get_engine (context);
         if (ibus->use_global_engine && (context != ibus->focused_context)) {
             /* context and ibus->focused_context don't match. This means that
              * the focus is moved before _ibus_set_global_engine() asynchronous
@@ -1496,14 +1656,28 @@ _ibus_set_global_engine_ready_cb (BusInputContext       *context,
              * being focused hasn't been updated. Update the engine here so that
              * subsequent _ibus_get_global_engine() call could return a
              * consistent engine name. */
-            BusEngineProxy *engine = bus_input_context_get_engine (context);
             if (engine && ibus->focused_context != NULL) {
                 g_object_ref (engine);
                 bus_input_context_set_engine (context, NULL);
+                bus_input_context_set_emoji_extension (context, NULL);
                 bus_input_context_set_engine (ibus->focused_context, engine);
+                if (ibus->enable_emoji_extension) {
+                    bus_input_context_set_emoji_extension (
+                            ibus->focused_context,
+                            ibus->emoji_extension);
+                } else {
+                    bus_input_context_set_emoji_extension (
+                            ibus->focused_context,
+                            NULL);
+                }
                 g_object_unref (engine);
             }
         }
+        if (engine && ibus->extension_register_keys) {
+            bus_engine_proxy_panel_extension_register_keys (
+                    engine,
+                    ibus->extension_register_keys);
+        }
     }
 
     g_object_unref (ibus);
@@ -2013,11 +2187,12 @@ bus_ibus_impl_registry_destroy (BusIBusImpl *ibus)
     g_list_free_full (ibus->components, g_object_unref);
     ibus->components = NULL;
 
-    g_hash_table_destroy (ibus->engine_table);
-    ibus->engine_table = NULL;
+    g_clear_pointer (&ibus->engine_table, g_hash_table_destroy);
 
-    ibus_object_destroy (IBUS_OBJECT (ibus->registry));
-    ibus->registry = NULL;
+    g_clear_pointer (&ibus->registry, ibus_object_destroy);
+
+    if (ibus->extension_register_keys)
+        g_clear_pointer (&ibus->extension_register_keys, g_variant_unref);
 }
 
 static gint
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index dfb98c361..bf9eafcff 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -94,6 +94,9 @@ struct _BusInputContext {
     /* content-type (primary purpose and hints) */
     guint    purpose;
     guint    hints;
+
+    BusPanelProxy *emoji_extension;
+    gboolean is_extension_lookup_table;
 };
 
 struct _BusInputContextClass {
@@ -162,16 +165,12 @@ static gboolean bus_input_context_service_set_property
                                     GError               **error);
 static void     bus_input_context_unset_engine
                                    (BusInputContext       *context);
-static void     bus_input_context_update_preedit_text
-                                   (BusInputContext       *context,
-                                    IBusText              *text,
-                                    guint                  cursor_pos,
-                                    gboolean               visible,
-                                    guint                  mode);
 static void     bus_input_context_show_preedit_text
-                                   (BusInputContext       *context);
+                                   (BusInputContext       *context,
+                                    gboolean               is_extension);
 static void     bus_input_context_hide_preedit_text
-                                   (BusInputContext       *context);
+                                   (BusInputContext       *context,
+                                    gboolean               is_extension);
 static void     bus_input_context_update_auxiliary_text
                                    (BusInputContext       *context,
                                     IBusText              *text,
@@ -180,10 +179,6 @@ static void     bus_input_context_show_auxiliary_text
                                    (BusInputContext       *context);
 static void     bus_input_context_hide_auxiliary_text
                                    (BusInputContext       *context);
-static void     bus_input_context_update_lookup_table
-                                   (BusInputContext       *context,
-                                    IBusLookupTable       *table,
-                                    gboolean               visible);
 static void     bus_input_context_show_lookup_table
                                    (BusInputContext       *context);
 static void     bus_input_context_hide_lookup_table
@@ -605,10 +600,10 @@ bus_input_context_class_init (BusInputContextClass *class)
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            bus_marshal_VOID__VARIANT,
+            bus_marshal_VOID__OBJECT,
             G_TYPE_NONE,
             1,
-            G_TYPE_VARIANT);
+            IBUS_TYPE_EXTENSION_EVENT);
 
     text_empty = ibus_text_new_from_string ("");
     g_object_ref_sink (text_empty);
@@ -760,28 +755,85 @@ bus_input_context_property_changed (BusInputContext *context,
                                           error);
 }
 
+
+/**
+ * _panel_process_key_event_cb:
+ *
+ * A GAsyncReadyCallback function to be called when
+ * bus_panel_proxy_process_key_event() is finished.
+ */
+static void
+_panel_process_key_event_cb (GObject               *source,
+                             GAsyncResult          *res,
+                             GDBusMethodInvocation *invocation)
+{
+    GError *error = NULL;
+    GVariant *value = g_dbus_proxy_call_finish ((GDBusProxy *)source,
+                                                 res,
+                                                 &error);
+    if (value != NULL) {
+        g_dbus_method_invocation_return_value (invocation, value);
+        g_variant_unref (value);
+    }
+    else {
+        g_dbus_method_invocation_return_gerror (invocation, error);
+        g_error_free (error);
+    }
+}
+
+typedef struct _ProcessKeyEventData ProcessKeyEventData;
+struct _ProcessKeyEventData {
+    GDBusMethodInvocation *invocation;
+    BusInputContext       *context;
+    guint keyval;
+    guint keycode;
+    guint modifiers;
+};
+
 /**
  * _ic_process_key_event_reply_cb:
  *
- * A GAsyncReadyCallback function to be called when bus_engine_proxy_process_key_event() is finished.
+ * A GAsyncReadyCallback function to be called when
+ * bus_engine_proxy_process_key_event() is finished.
  */
 static void
 _ic_process_key_event_reply_cb (GObject               *source,
                                 GAsyncResult          *res,
-                                GDBusMethodInvocation *invocation)
+                                ProcessKeyEventData   *data)
 {
+    GDBusMethodInvocation *invocation = data->invocation;
+    BusInputContext *context = data->context;
+    guint keyval = data->keyval;
+    guint keycode = data->keycode;
+    guint modifiers = data->modifiers;
     GError *error = NULL;
     GVariant *value = g_dbus_proxy_call_finish ((GDBusProxy *)source,
                                                  res,
                                                  &error);
+
     if (value != NULL) {
-        g_dbus_method_invocation_return_value (invocation, value);
+        gboolean retval = FALSE;
+        g_variant_get (value, "(b)", &retval);
+        if (context->emoji_extension && !retval) {
+            bus_panel_proxy_process_key_event (context->emoji_extension,
+                                               keyval,
+                                               keycode,
+                                               modifiers,
+                                               (GAsyncReadyCallback)
+                                                    _panel_process_key_event_cb,
+                                               invocation);
+        } else {
+            g_dbus_method_invocation_return_value (invocation, value);
+        }
         g_variant_unref (value);
     }
     else {
         g_dbus_method_invocation_return_gerror (invocation, error);
         g_error_free (error);
     }
+
+    g_object_unref (context);
+    g_slice_free (ProcessKeyEventData, data);
 }
 
 /**
@@ -840,12 +892,19 @@ _ic_process_key_event  (BusInputContext       *context,
 
     /* ignore key events, if it is a fake input context */
     if (context->has_focus && context->engine && context->fake == FALSE) {
+        ProcessKeyEventData *data = g_slice_new0 (ProcessKeyEventData);
+        data->invocation = invocation;
+        data->context = g_object_ref (context);
+        data->keyval = keyval;
+        data->keycode = keycode;
+        data->modifiers = modifiers;
         bus_engine_proxy_process_key_event (context->engine,
                                             keyval,
                                             keycode,
                                             modifiers,
-                                            (GAsyncReadyCallback) _ic_process_key_event_reply_cb,
-                                            invocation);
+                                            (GAsyncReadyCallback)
+                                                _ic_process_key_event_reply_cb,
+                                            data);
     }
     else {
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", FALSE));
@@ -880,6 +939,13 @@ _ic_set_cursor_location (BusInputContext       *context,
                        context->y,
                        context->w,
                        context->h);
+        if (context->emoji_extension) {
+            bus_panel_proxy_set_cursor_location (context->emoji_extension,
+                                                 context->x,
+                                                 context->y,
+                                                 context->w,
+                                                 context->h);
+        }
     }
 }
 
@@ -912,6 +978,14 @@ _ic_set_cursor_location_relative (BusInputContext       *context,
                        y,
                        w,
                        h);
+        if (context->emoji_extension) {
+            bus_panel_proxy_set_cursor_location_relative (
+                    context->emoji_extension,
+                    x,
+                    y,
+                    w,
+                    h);
+        }
     }
 }
 
@@ -1394,7 +1468,7 @@ bus_input_context_clear_preedit_text (BusInputContext *context)
 
     /* always clear preedit text */
     bus_input_context_update_preedit_text (context,
-        text_empty, 0, FALSE, IBUS_ENGINE_PREEDIT_CLEAR);
+        text_empty, 0, FALSE, IBUS_ENGINE_PREEDIT_CLEAR, TRUE);
 }
 
 void
@@ -1407,7 +1481,10 @@ bus_input_context_focus_out (BusInputContext *context)
 
     bus_input_context_clear_preedit_text (context);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
-    bus_input_context_update_lookup_table (context, lookup_table_empty, FALSE);
+    bus_input_context_update_lookup_table (context,
+                                           lookup_table_empty,
+                                           FALSE,
+                                           FALSE);
     bus_input_context_register_properties (context, props_empty);
 
     if (context->engine) {
@@ -1427,7 +1504,12 @@ bus_input_context_focus_out (BusInputContext *context)
     {                                                                       \
         g_assert (BUS_IS_INPUT_CONTEXT (context));                          \
                                                                             \
-        if (context->has_focus && context->engine) {    \
+        if (context->is_extension_lookup_table &&                           \
+            context->emoji_extension) {                                     \
+            bus_panel_proxy_##name##_lookup_table (context->emoji_extension); \
+            return;                                                         \
+        }                                                                   \
+        if (context->has_focus && context->engine) {                        \
             bus_engine_proxy_##name (context->engine);                      \
         }                                                                   \
     }
@@ -1447,6 +1529,14 @@ bus_input_context_candidate_clicked (BusInputContext *context,
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
+    if (context->is_extension_lookup_table && context->emoji_extension) {
+        bus_panel_proxy_candidate_clicked_lookup_table (
+                context->emoji_extension,
+                index,
+                button,
+                state);
+            return;
+    }
     if (context->engine) {
         bus_engine_proxy_candidate_clicked (context->engine,
                                             index,
@@ -1467,61 +1557,33 @@ bus_input_context_property_activate (BusInputContext *context,
     }
 }
 
-/**
- * bus_input_context_update_preedit_text:
- *
- * Update a preedit text. Send D-Bus signal to update status of client or send glib signal to the panel, depending on capabilities of the client.
- */
-static void
-bus_input_context_update_preedit_text (BusInputContext *context,
-                                       IBusText        *text,
-                                       guint            cursor_pos,
-                                       gboolean         visible,
-                                       guint            mode)
-{
-    g_assert (BUS_IS_INPUT_CONTEXT (context));
-
-    if (context->preedit_text) {
-        g_object_unref (context->preedit_text);
-    }
-
-    context->preedit_text = (IBusText *) g_object_ref_sink (text ? text : text_empty);
-    context->preedit_cursor_pos = cursor_pos;
-    context->preedit_visible = visible;
-    context->preedit_mode = mode;
-
-    if (PREEDIT_CONDITION) {
-        GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)context->preedit_text);
-        bus_input_context_emit_signal (context,
-                                       "UpdatePreeditText",
-                                       g_variant_new ("(vub)", variant, context->preedit_cursor_pos, context->preedit_visible),
-                                       NULL);
-    }
-    else {
-        g_signal_emit (context,
-                       context_signals[UPDATE_PREEDIT_TEXT],
-                       0,
-                       context->preedit_text,
-                       context->preedit_cursor_pos,
-                       context->preedit_visible);
-    }
-}
-
 /**
  * bus_input_context_show_preedit_text:
  *
  * Show a preedit text. Send D-Bus signal to update status of client or send glib signal to the panel, depending on capabilities of the client.
  */
 static void
-bus_input_context_show_preedit_text (BusInputContext *context)
+bus_input_context_show_preedit_text (BusInputContext *context,
+                                     gboolean         is_extension)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    if (context->preedit_visible) {
+    if (context->preedit_visible)
         return;
-    }
+    if (!is_extension && context->emoji_extension)
+        return;
+
+    if (!is_extension)
+        context->preedit_visible = TRUE;
 
-    context->preedit_visible = TRUE;
+    if (context->emoji_extension && !is_extension) {
+        /* Do not use HIDE_PREEDIT_TEXT signal below but call
+         * bus_panel_proxy_hide_preedit_text() directly for the extension only
+         * but not for the normal panel.
+         */
+        bus_panel_proxy_show_preedit_text (context->emoji_extension);
+        return;
+    }
 
     if (PREEDIT_CONDITION) {
         bus_input_context_emit_signal (context,
@@ -1542,15 +1604,25 @@ bus_input_context_show_preedit_text (BusInputContext *context)
  * Hide a preedit text. Send D-Bus signal to update status of client or send glib signal to the panel, depending on capabilities of the client.
  */
 static void
-bus_input_context_hide_preedit_text (BusInputContext *context)
+bus_input_context_hide_preedit_text (BusInputContext *context,
+                                     gboolean         is_extension)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    if (!context->preedit_visible) {
+    if (!is_extension && !context->preedit_visible)
         return;
-    }
 
-    context->preedit_visible = FALSE;
+    if (!is_extension)
+        context->preedit_visible = FALSE;
+
+    if (context->emoji_extension && !is_extension) {
+        /* Do not use HIDE_PREEDIT_TEXT signal below but call
+         * bus_panel_proxy_hide_preedit_text() directly for the extension only
+         * but not for the normal panel.
+         */
+        bus_panel_proxy_hide_preedit_text (context->emoji_extension);
+        return;
+    }
 
     if (PREEDIT_CONDITION) {
         bus_input_context_emit_signal (context,
@@ -1658,19 +1730,15 @@ bus_input_context_hide_auxiliary_text (BusInputContext *context)
     }
 }
 
-/**
- * bus_input_context_update_lookup_table:
- *
- * Update contents in the lookup table.
- * Send D-Bus signal to update status of client or send glib signal to the panel, depending on capabilities of the client.
- */
-static void
+void
 bus_input_context_update_lookup_table (BusInputContext *context,
                                        IBusLookupTable *table,
-                                       gboolean         visible)
+                                       gboolean         visible,
+                                       gboolean         is_extension)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
+    context->is_extension_lookup_table = is_extension;
     if (context->lookup_table) {
         g_object_unref (context->lookup_table);
     }
@@ -2035,7 +2103,9 @@ _engine_update_preedit_text_cb (BusEngineProxy  *engine,
 
     g_assert (context->engine == engine);
 
-    bus_input_context_update_preedit_text (context, text, cursor_pos, visible, mode);
+    bus_input_context_update_preedit_text (context, text,
+                                           cursor_pos, visible, mode,
+                                           TRUE);
 }
 
 /**
@@ -2075,7 +2145,7 @@ _engine_update_lookup_table_cb (BusEngineProxy   *engine,
 
     g_assert (context->engine == engine);
 
-    bus_input_context_update_lookup_table (context, table, visible);
+    bus_input_context_update_lookup_table (context, table, visible, FALSE);
 }
 
 /**
@@ -2123,11 +2193,35 @@ _engine_update_property_cb (BusEngineProxy  *engine,
  * from the engine object.
  */
 static void
-_engine_panel_extension_cb (BusEngineProxy  *engine,
-                            GVariant        *parameters,
-                            BusInputContext *context)
+_engine_panel_extension_cb (BusEngineProxy     *engine,
+                            IBusExtensionEvent *event,
+                            BusInputContext    *context)
 {
-    g_signal_emit (context, context_signals[PANEL_EXTENSION], 0, parameters);
+    g_signal_emit (context, context_signals[PANEL_EXTENSION], 0, event);
+}
+
+static void
+_engine_show_preedit_text_cb (BusEngineProxy  *engine,
+                              BusInputContext *context)
+{
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    g_assert (context->engine == engine);
+
+    bus_input_context_show_preedit_text (context, FALSE);
+}
+
+static void
+_engine_hide_preedit_text_cb (BusEngineProxy  *engine,
+                              BusInputContext *context)
+{
+    g_assert (BUS_IS_ENGINE_PROXY (engine));
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    g_assert (context->engine == engine);
+
+    bus_input_context_hide_preedit_text (context, FALSE);
 }
 
 #define DEFINE_FUNCTION(name)                                   \
@@ -2143,8 +2237,6 @@ _engine_panel_extension_cb (BusEngineProxy  *engine,
         bus_input_context_##name (context);                     \
     }
 
-DEFINE_FUNCTION (show_preedit_text)
-DEFINE_FUNCTION (hide_preedit_text)
 DEFINE_FUNCTION (show_auxiliary_text)
 DEFINE_FUNCTION (hide_auxiliary_text)
 DEFINE_FUNCTION (show_lookup_table)
@@ -2239,7 +2331,10 @@ bus_input_context_disable (BusInputContext *context)
 
     bus_input_context_clear_preedit_text (context);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
-    bus_input_context_update_lookup_table (context, lookup_table_empty, FALSE);
+    bus_input_context_update_lookup_table (context,
+                                           lookup_table_empty,
+                                           FALSE,
+                                           FALSE);
     bus_input_context_register_properties (context, props_empty);
 
     if (context->engine) {
@@ -2283,7 +2378,10 @@ bus_input_context_unset_engine (BusInputContext *context)
 
     bus_input_context_clear_preedit_text (context);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
-    bus_input_context_update_lookup_table (context, lookup_table_empty, FALSE);
+    bus_input_context_update_lookup_table (context,
+                                           lookup_table_empty,
+                                           FALSE,
+                                           FALSE);
     bus_input_context_register_properties (context, props_empty);
 
     if (context->engine) {
@@ -2639,17 +2737,128 @@ bus_input_context_set_content_type (BusInputContext *context,
 }
 
 void
-bus_input_context_commit_text (BusInputContext *context,
-                               IBusText        *text)
+bus_input_context_commit_text_use_extension (BusInputContext *context,
+                                             IBusText        *text,
+                                             gboolean         use_extension)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
     if (text == text_empty || text == NULL)
         return;
 
-    GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)text);
-    bus_input_context_emit_signal (context,
-                                   "CommitText",
-                                   g_variant_new ("(v)", variant),
-                                   NULL);
+    if (use_extension && context->emoji_extension) {
+        bus_panel_proxy_commit_text_received (context->emoji_extension, text);
+    } else {
+        GVariant *variant = ibus_serializable_serialize (
+                (IBusSerializable *)text);
+        bus_input_context_emit_signal (context,
+                                       "CommitText",
+                                       g_variant_new ("(v)", variant),
+                                       NULL);
+    }
+}
+
+void
+bus_input_context_commit_text (BusInputContext *context,
+                               IBusText        *text)
+{
+    bus_input_context_commit_text_use_extension (context, text, TRUE);
+}
+
+void
+bus_input_context_update_preedit_text (BusInputContext *context,
+                                       IBusText        *text,
+                                       guint            cursor_pos,
+                                       gboolean         visible,
+                                       guint            mode,
+                                       gboolean         use_extension)
+{
+    gboolean extension_visible = FALSE;
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    if (context->preedit_text) {
+        g_object_unref (context->preedit_text);
+    }
+
+    context->preedit_text = (IBusText *) g_object_ref_sink (text ? text :
+                                                            text_empty);
+    context->preedit_cursor_pos = cursor_pos;
+    if (use_extension)
+        context->preedit_visible = visible;
+    if (use_extension)
+        context->preedit_mode = mode;
+    extension_visible = context->preedit_visible |
+                        (context->emoji_extension != NULL);
+
+    if (use_extension && context->emoji_extension) {
+        bus_panel_proxy_update_preedit_text (context->emoji_extension,
+                                             context->preedit_text,
+                                             context->preedit_cursor_pos,
+                                             context->preedit_visible);
+    } else if (PREEDIT_CONDITION) {
+        GVariant *variant = ibus_serializable_serialize (
+                (IBusSerializable *)context->preedit_text);
+        bus_input_context_emit_signal (context,
+                                       "UpdatePreeditText",
+                                       g_variant_new (
+                                               "(vub)",
+                                               variant,
+                                               context->preedit_cursor_pos,
+                                               extension_visible),
+                                       NULL);
+    } else {
+        g_signal_emit (context,
+                       context_signals[UPDATE_PREEDIT_TEXT],
+                       0,
+                       context->preedit_text,
+                       context->preedit_cursor_pos,
+                       extension_visible);
+    }
+}
+
+void
+bus_input_context_set_emoji_extension (BusInputContext *context,
+                                       BusPanelProxy   *emoji_extension)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    if (context->emoji_extension)
+        g_object_unref (context->emoji_extension);
+    context->emoji_extension = emoji_extension;
+    if (emoji_extension) {
+        g_object_ref (context->emoji_extension);
+        if (!context->connection)
+            return;
+        bus_input_context_show_preedit_text (context, TRUE);
+        bus_panel_proxy_set_cursor_location (context->emoji_extension,
+                                             context->x,
+                                             context->y,
+                                             context->w,
+                                             context->h);
+    } else {
+        if (!context->connection)
+            return;
+        /* https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/113
+         * Cannot use bus_input_context_hide_preedit_text () yet.
+         */
+        if (!context->preedit_visible) {
+            bus_input_context_update_preedit_text (context,
+                                                   text_empty,
+                                                   0,
+                                                   FALSE,
+                                                   IBUS_ENGINE_PREEDIT_CLEAR,
+                                                   FALSE);
+        }
+    }
+}
+
+void
+bus_input_context_panel_extension_received (BusInputContext    *context,
+                                            IBusExtensionEvent *event)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+
+    if (!context->engine)
+        return;
+    bus_engine_proxy_panel_extension_received (context->engine, event);
 }
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index 7674abd8f..a46d5c062 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -28,6 +28,11 @@
 #include "connection.h"
 #include "factoryproxy.h"
 
+#ifndef __BUS_PANEL_PROXY_DEFINED
+#define __BUS_PANEL_PROXY_DEFINED
+typedef struct _BusPanelProxy BusPanelProxy;
+#endif
+
 /*
  * Type macros.
  */
@@ -63,6 +68,7 @@ BusInputContext     *bus_input_context_new      (BusConnection      *connection,
 
 /**
  * bus_input_context_focus_in:
+ * @context: A #BusInputContext.
  *
  * Give a focus to the context. Call FocusIn, Enable, SetCapabilities,
  * and SetCursorLocation methods of the engine for the context,
@@ -73,6 +79,7 @@ void                 bus_input_context_focus_in (BusInputContext    *context);
 
 /**
  * bus_input_context_focus_out:
+ * @context: A #BusInputContext.
  *
  * Remove a focus from the context. Call FocusOut method of the engine for
  * the context.
@@ -83,6 +90,7 @@ void                 bus_input_context_focus_out
 
 /**
  * bus_input_context_has_focus:
+ * @context: A #BusInputContext.
  * @returns: context->has_focus.
  */
 gboolean             bus_input_context_has_focus
@@ -90,6 +98,7 @@ gboolean             bus_input_context_has_focus
 
 /**
  * bus_input_context_enable:
+ * @context: A #BusInputContext.
  *
  * Enable the current engine for the context. Request an engine (if needed),
  * call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
@@ -100,6 +109,7 @@ void                 bus_input_context_enable   (BusInputContext    *context);
 
 /**
  * bus_input_context_disable:
+ * @context: A #BusInputContext.
  *
  * Disable the current engine for the context. Request an engine (if needed),
  * call FocusIn, Enable, SetCapabilities, and SetCursorLocation methods
@@ -110,6 +120,7 @@ void                 bus_input_context_disable  (BusInputContext    *context);
 
 /**
  * bus_input_context_page_up:
+ * @context: A #BusInputContext.
  *
  * Call page_up method of the current engine proxy.
  */
@@ -117,6 +128,7 @@ void                 bus_input_context_page_up  (BusInputContext    *context);
 
 /**
  * bus_input_context_page_down:
+ * @context: A #BusInputContext.
  *
  * Call page_down method of the current engine proxy.
  */
@@ -125,6 +137,7 @@ void                 bus_input_context_page_down
 
 /**
  * bus_input_context_cursor_up:
+ * @context: A #BusInputContext.
  *
  * Call cursor_up method of the current engine proxy.
  */
@@ -133,6 +146,7 @@ void                 bus_input_context_cursor_up
 
 /**
  * bus_input_context_cursor_down:
+ * @context: A #BusInputContext.
  *
  * Call cursor_down method of the current engine proxy.
  */
@@ -141,6 +155,10 @@ void                 bus_input_context_cursor_down
 
 /**
  * bus_input_context_candidate_clicked:
+ * @context: A #BusInputContext.
+ * @index: An index.
+ * @button: A button number.
+ * @state: A button state.
  *
  * Call candidate_clicked method of the current engine proxy.
  */
@@ -152,6 +170,8 @@ void                 bus_input_context_candidate_clicked
 
 /**
  * bus_input_context_set_engine:
+ * @context: A #BusInputContext.
+ * @engine: A #BusEngineProxy.
  *
  * Use the engine on the context.
  */
@@ -161,12 +181,14 @@ void                 bus_input_context_set_engine
 
 /**
  * bus_input_context_set_engine_by_desc:
+ * @context: A #BusInputContext.
  * @desc: the engine to use on the context.
  * @timeout: timeout (in ms) for D-Bus calls.
  * @callback: a function to be called when bus_input_context_set_engine_by_desc
  *            is finished. if NULL, the default callback
  *            function, which just calls
  *            bus_input_context_set_engine_by_desc_finish, is used.
+ * @user_data: an argument of @callback.
  *
  * Create a new BusEngineProxy object and use it on the context.
  */
@@ -181,6 +203,9 @@ void                 bus_input_context_set_engine_by_desc
 
 /**
  * bus_input_context_set_engine_by_desc_finish:
+ * @context: A #BusInputContext.
+ * @res: A #GAsyncResult.
+ * @error: A #GError.
  *
  * A function to be called by the GAsyncReadyCallback function for
  * bus_input_context_set_engine_by_desc.
@@ -192,6 +217,7 @@ gboolean             bus_input_context_set_engine_by_desc_finish
 
 /**
  * bus_input_context_get_engine:
+ * @context: A #BusInputContext.
  *
  * Get a BusEngineProxy object of the current engine.
  */
@@ -200,6 +226,7 @@ BusEngineProxy      *bus_input_context_get_engine
 
 /**
  * bus_input_context_get_engine_desc:
+ * @context: A #BusInputContext.
  *
  * Get an IBusEngineDesc object of the current engine.
  */
@@ -208,6 +235,9 @@ IBusEngineDesc      *bus_input_context_get_engine_desc
 
 /**
  * bus_input_context_property_activate:
+ * @context: A #BusInputContext.
+ * @prop_name: A property name.
+ * @prop_state: A property state.
  *
  * Call property_activate method of the current engine proxy.
  */
@@ -219,6 +249,7 @@ void                 bus_input_context_property_activate
 
 /**
  * bus_input_context_get_capabilities:
+ * @context: A #BusInputContext.
  * @returns: context->capabilities.
  */
 guint                bus_input_context_get_capabilities
@@ -226,6 +257,8 @@ guint                bus_input_context_get_capabilities
 
 /**
  * bus_input_context_set_capabilities:
+ * @context: A #BusInputContext.
+ * @capabilities: capabilities.
  *
  * Call set_capabilities method of the current engine proxy.
  */
@@ -236,6 +269,7 @@ void                 bus_input_context_set_capabilities
 
 /**
  * bus_input_context_get_client:
+ * @context: A #BusInputContext.
  * @returns: context->client.
  */
 const gchar         *bus_input_context_get_client
@@ -243,6 +277,7 @@ const gchar         *bus_input_context_get_client
 
 /**
  * bus_input_context_get_content_type:
+ * @context: A #BusInputContext.
  * @purpose: Input purpose.
  * @hints: Input hints.
  */
@@ -253,6 +288,7 @@ void                 bus_input_context_get_content_type
 
 /**
  * bus_input_context_set_content_type:
+ * @context: A #BusInputContext.
  * @purpose: Input purpose.
  * @hints: Input hints.
  */
@@ -263,11 +299,83 @@ void                 bus_input_context_set_content_type
 
 /**
  * bus_input_context_commit_text:
- * @text: a commited text.
+ * @context: A #BusInputContext.
+ * @text: A committed text.
  */
 void                 bus_input_context_commit_text
                                                 (BusInputContext *context,
                                                  IBusText        *text);
 
+/**
+ * bus_input_context_commit_text:
+ * @context: A #BusInputContext.
+ * @text: A committed text.
+ * @use_extension: Use an extension if it's %TRUE and the extension is
+ *                 available.
+ */
+void                 bus_input_context_commit_text_use_extension
+                                               (BusInputContext *context,
+                                                IBusText        *text,
+                                                gboolean         use_extension);
+
+/**
+ * bus_input_context_set_emoji_extension:
+ * @context: A #BusInputContext.
+ * @extension: A #BusPanelProxy.
+ */
+void                 bus_input_context_set_emoji_extension
+                                                (BusInputContext *context,
+                                                 BusPanelProxy   *extension);
+
+/**
+ * bus_input_context_update_preedit_text:
+ * @context: A #BusInputContext.
+ * @text: An #IBusText.
+ * @cursor_pos: The cursor position.
+ * @visible: %TRUE if the preedit is visible. Otherwise %FALSE.
+ * @mode: The preedit commit mode.
+ * @use_extension: %TRUE if preedit text is sent to the extesion at first.
+ *
+ * Update a preedit text. Send D-Bus signal to update status of client or
+ * send glib signal to the panel, depending on capabilities of the client.
+ */
+void                 bus_input_context_update_preedit_text
+                                                (BusInputContext    *context,
+                                                 IBusText           *text,
+                                                 guint               cursor_pos,
+                                                 gboolean            visible,
+                                                 guint               mode,
+                                                 gboolean
+                                                                 use_extension);
+
+/**
+ * bus_input_context_update_lookup_table:
+ * @context: A #BusInputContext.
+ * @table: An #IBusTable.
+ * @visible: %TRUE if the lookup table is visible. Otherwise %FALSE.
+ * @is_extension: %TRUE if the lookup table is created by panel extensions.
+ *
+ * Update contents in the lookup table.
+ * Send D-Bus signal to update status of client or send glib signal to the
+ * panel, depending on capabilities of the client.
+ */
+void                 bus_input_context_update_lookup_table
+                                                (BusInputContext    *context,
+                                                 IBusLookupTable    *table,
+                                                 gboolean            visible,
+                                                 gboolean
+                                                                  is_extension);
+
+
+/**
+ * bus_input_context_panel_extension_received:
+ * @context: A #BusInputContext.
+ * @event: An #IBusExtensionEvent.
+ *
+ * Send An #IBusExtensionEvent callback from an extension.
+ */
+void                 bus_input_context_panel_extension_received
+                                                (BusInputContext    *context,
+                                                 IBusExtensionEvent *event);
 G_END_DECLS
 #endif
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index c3908fcf3..1c0fcca26 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -52,6 +52,10 @@ enum {
     PROPERTY_HIDE,
     COMMIT_TEXT,
     PANEL_EXTENSION,
+    PANEL_EXTENSION_REGISTER_KEYS,
+    UPDATE_PREEDIT_TEXT_RECEIVED,
+    UPDATE_LOOKUP_TABLE_RECEIVED,
+    UPDATE_AUXILIARY_TEXT_RECEIVED,
     LAST_SIGNAL,
 };
 
@@ -125,8 +129,8 @@ bus_panel_proxy_new (BusConnection *connection,
     case PANEL_TYPE_PANEL:
         path = IBUS_PATH_PANEL;
         break;
-    case PANEL_TYPE_EXTENSION:
-        path = IBUS_PATH_PANEL_EXTENSION;
+    case PANEL_TYPE_EXTENSION_EMOJI:
+        path = IBUS_PATH_PANEL_EXTENSION_EMOJI;
         break;
     default:
         g_return_val_if_reached (NULL);
@@ -253,6 +257,16 @@ bus_panel_proxy_class_init (BusPanelProxyClass *class)
 
     panel_signals[PANEL_EXTENSION] =
         g_signal_new (I_("panel-extension"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__OBJECT,
+            G_TYPE_NONE, 1,
+            IBUS_TYPE_EXTENSION_EVENT);
+
+    panel_signals[PANEL_EXTENSION_REGISTER_KEYS] =
+        g_signal_new (I_("panel-extension-register-keys"),
             G_TYPE_FROM_CLASS (class),
             G_SIGNAL_RUN_LAST,
             0,
@@ -260,6 +274,40 @@ bus_panel_proxy_class_init (BusPanelProxyClass *class)
             bus_marshal_VOID__VARIANT,
             G_TYPE_NONE, 1,
             G_TYPE_VARIANT);
+
+    panel_signals[UPDATE_PREEDIT_TEXT_RECEIVED] =
+        g_signal_new (I_("update-preedit-text-received"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__OBJECT_UINT_BOOLEAN,
+            G_TYPE_NONE, 3,
+            IBUS_TYPE_TEXT,
+            G_TYPE_UINT,
+            G_TYPE_BOOLEAN);
+
+    panel_signals[UPDATE_LOOKUP_TABLE_RECEIVED] =
+        g_signal_new (I_("update-lookup-table-received"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__OBJECT_BOOLEAN,
+            G_TYPE_NONE, 2,
+            IBUS_TYPE_LOOKUP_TABLE,
+            G_TYPE_BOOLEAN);
+
+    panel_signals[UPDATE_AUXILIARY_TEXT_RECEIVED] =
+        g_signal_new (I_("update-auxiliary-text-received"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            bus_marshal_VOID__OBJECT_BOOLEAN,
+            G_TYPE_NONE, 2,
+            IBUS_TYPE_TEXT,
+            G_TYPE_BOOLEAN);
 }
 
 static void
@@ -355,23 +403,83 @@ bus_panel_proxy_g_signal (GDBusProxy  *proxy,
 
     if (g_strcmp0 ("CommitText", signal_name) == 0) {
         GVariant *arg0 = NULL;
-        g_variant_get (parameters, "(v)", &arg0);
-        g_return_if_fail (arg0 != NULL);
 
+        g_variant_get (parameters, "(v)", &arg0);
+        g_return_if_fail (arg0);
         IBusText *text = IBUS_TEXT (ibus_serializable_deserialize (arg0));
         g_variant_unref (arg0);
-        g_return_if_fail (text != NULL);
+        g_return_if_fail (text);
         g_signal_emit (panel, panel_signals[COMMIT_TEXT], 0, text);
         _g_object_unref_if_floating (text);
         return;
     }
 
     if (g_strcmp0 ("PanelExtension", signal_name) == 0) {
-        if (panel->panel_type != PANEL_TYPE_PANEL) {
-            g_warning ("Wrong signal");
-            return;
-        }
-        g_signal_emit (panel, panel_signals[PANEL_EXTENSION], 0, parameters);
+        GVariant *arg0 = NULL;
+
+        g_variant_get (parameters, "(v)", &arg0);
+        g_return_if_fail (arg0);
+        IBusExtensionEvent *event = IBUS_EXTENSION_EVENT (
+                ibus_serializable_deserialize (arg0));
+        g_variant_unref (arg0);
+        g_return_if_fail (event);
+        g_signal_emit (panel, panel_signals[PANEL_EXTENSION], 0, event);
+        _g_object_unref_if_floating (event);
+        return;
+    }
+
+    if (g_strcmp0 ("PanelExtensionRegisterKeys", signal_name) == 0) {
+        g_signal_emit (panel, panel_signals[PANEL_EXTENSION_REGISTER_KEYS], 0,
+                       parameters);
+        return;
+    }
+
+    if (g_strcmp0 ("UpdatePreeditTextReceived", signal_name) == 0) {
+        GVariant *variant = NULL;
+        guint cursor_pos = 0;
+        gboolean visible = FALSE;
+        IBusText *text = NULL;
+
+        g_variant_get (parameters, "(vub)", &variant, &cursor_pos, &visible);
+        g_return_if_fail (variant);
+        text = (IBusText *) ibus_serializable_deserialize (variant);
+        g_variant_unref (variant);
+        g_return_if_fail (text);
+        g_signal_emit (panel, panel_signals[UPDATE_PREEDIT_TEXT_RECEIVED], 0,
+                       text, cursor_pos, visible);
+        _g_object_unref_if_floating (text);
+        return;
+    }
+
+    if (g_strcmp0 ("UpdateLookupTableReceived", signal_name) == 0) {
+        GVariant *variant = NULL;
+        gboolean visible = FALSE;
+        IBusLookupTable *table = NULL;
+
+        g_variant_get (parameters, "(vb)", &variant, &visible);
+        g_return_if_fail (variant);
+        table = (IBusLookupTable *) ibus_serializable_deserialize (variant);
+        g_variant_unref (variant);
+        g_return_if_fail (table);
+        g_signal_emit (panel, panel_signals[UPDATE_LOOKUP_TABLE_RECEIVED], 0,
+                       table, visible);
+        _g_object_unref_if_floating (table);
+        return;
+    }
+
+    if (g_strcmp0 ("UpdateAuxiliaryTextReceived", signal_name) == 0) {
+        GVariant *variant = NULL;
+        gboolean visible = FALSE;
+        IBusText *text = NULL;
+
+        g_variant_get (parameters, "(vb)", &variant, &visible);
+        g_return_if_fail (variant);
+        text = (IBusText *) ibus_serializable_deserialize (variant);
+        g_variant_unref (variant);
+        g_return_if_fail (text);
+        g_signal_emit (panel, panel_signals[UPDATE_AUXILIARY_TEXT_RECEIVED], 0,
+                       text, visible);
+        _g_object_unref_if_floating (text);
         return;
     }
 
@@ -552,12 +660,17 @@ static void
 bus_panel_proxy_commit_text (BusPanelProxy *panel,
                              IBusText      *text)
 {
+    gboolean use_extension = TRUE;
     g_assert (BUS_IS_PANEL_PROXY (panel));
     g_assert (text != NULL);
 
-    if (panel->focused_context) {
-        bus_input_context_commit_text (panel->focused_context, text);
-    }
+    if (!panel->focused_context)
+        return;
+    if (panel->panel_type != PANEL_TYPE_PANEL)
+        use_extension = FALSE;
+    bus_input_context_commit_text_use_extension (panel->focused_context,
+                                                 text,
+                                                 use_extension);
 }
 
 #define DEFINE_FUNCTION(Name, name)                     \
@@ -877,3 +990,74 @@ bus_panel_proxy_get_panel_type (BusPanelProxy    *panel)
     g_assert (BUS_IS_PANEL_PROXY (panel));
     return panel->panel_type;
 }
+
+void
+bus_panel_proxy_panel_extension_received (BusPanelProxy      *panel,
+                                          IBusExtensionEvent *event)
+{
+    GVariant *data;
+
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    g_assert (event);
+
+    data = ibus_serializable_serialize (IBUS_SERIALIZABLE (event));
+    g_return_if_fail (data);
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "PanelExtensionReceived",
+                       g_variant_new ("(v)", data),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
+
+void
+bus_panel_proxy_process_key_event (BusPanelProxy       *panel,
+                                   guint                keyval,
+                                   guint                keycode,
+                                   guint                state,
+                                   GAsyncReadyCallback  callback,
+                                   gpointer             user_data)
+{
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "ProcessKeyEvent",
+                       g_variant_new ("(uuu)", keyval, keycode, state),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL,
+                       callback,
+                       user_data);
+}
+
+void
+bus_panel_proxy_commit_text_received (BusPanelProxy *panel,
+                                      IBusText      *text)
+{
+    GVariant *variant;
+
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+    g_assert (IBUS_IS_TEXT (text));
+
+    variant = ibus_serializable_serialize (IBUS_SERIALIZABLE (text));
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "CommitTextReceived",
+                       g_variant_new ("(v)", variant),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
+
+void
+bus_panel_proxy_candidate_clicked_lookup_table (BusPanelProxy *panel,
+                                                guint          index,
+                                                guint          button,
+                                                guint          state)
+{
+    gboolean use_extension = TRUE;
+    g_assert (BUS_IS_PANEL_PROXY (panel));
+
+    g_dbus_proxy_call ((GDBusProxy *)panel,
+                       "CandidateClickedLookupTable",
+                       g_variant_new ("(uuu)", index, button, state),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, NULL, NULL);
+}
diff --git a/bus/panelproxy.h b/bus/panelproxy.h
index b5a7af176..4d8afb986 100644
--- a/bus/panelproxy.h
+++ b/bus/panelproxy.h
@@ -55,7 +55,7 @@ typedef enum
 {
     PANEL_TYPE_NONE,
     PANEL_TYPE_PANEL,
-    PANEL_TYPE_EXTENSION
+    PANEL_TYPE_EXTENSION_EMOJI
 } PanelType;
 
 typedef struct _BusPanelProxy BusPanelProxy;
@@ -135,6 +135,27 @@ void             bus_panel_proxy_set_content_type
                                                 guint              hints);
 PanelType        bus_panel_proxy_get_panel_type
                                                (BusPanelProxy     *panel);
+void             bus_panel_proxy_panel_extension_received
+                                               (BusPanelProxy     *panel,
+                                                IBusExtensionEvent
+                                                                  *event);
+void             bus_panel_proxy_process_key_event
+                                               (BusPanelProxy     *panel,
+                                                guint              keyval,
+                                                guint              keycode,
+                                                guint              state,
+                                                GAsyncReadyCallback
+                                                                   callback,
+                                                gpointer           user_data);
+void             bus_panel_proxy_commit_text_received
+                                               (BusPanelProxy     *panel,
+                                                IBusText          *text);
+void             bus_panel_proxy_candidate_clicked_lookup_table
+                                               (BusPanelProxy     *panel,
+                                                guint              index,
+                                                guint              button,
+                                                guint              state);
+
 G_END_DECLS
 #endif
 
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 3c6b6f69c..f4a019d0d 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -353,6 +353,18 @@
 	    <long>Custom font name for language panel</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/emoji/unicode-hotkey</key>
+      <applyto>/desktop/ibus/panel/emoji/unicode-hotkey</applyto>
+      <owner>ibus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[&lt;Control&gt;&lt;Shift&gt;u]</default>
+      <locale name="C">
+        <short>Unicode shortcut keys for gtk_accelerator_parse</short>
+          <long>The shortcut keys for turning Unicode typing on or off</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/emoji/hotkey</key>
       <applyto>/desktop/ibus/panel/emoji/hotkey</applyto>
diff --git a/setup/main.py b/setup/main.py
index f0eee9964..f6adb0982 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -4,7 +4,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2016 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -123,10 +123,15 @@ def __init_hotkeys(self):
         name = 'emoji'
         label = 'emoji_dialog'
         self.__init_hotkey(name, label)
+        name = 'unicode'
+        label = 'unicode_dialog'
+        self.__init_hotkey(name, label)
 
     def __init_hotkey(self, name, label, comment=None):
         if name == 'emoji':
             shortcuts = self.__settings_emoji.get_strv('hotkey')
+        elif name == 'unicode':
+            shortcuts = self.__settings_emoji.get_strv('unicode-hotkey')
         else:
             shortcuts = self.__settings_hotkey.get_strv(name)
         button = self.__builder.get_object("button_%s" % label)
@@ -139,6 +144,9 @@ def __init_hotkey(self, name, label, comment=None):
         if name == 'emoji':
             button.connect("clicked", self.__shortcut_button_clicked_cb,
                     'hotkey', 'panel/' + name, label, entry)
+        elif name == 'unicode':
+            button.connect("clicked", self.__shortcut_button_clicked_cb,
+                    'unicode-hotkey', 'panel/emoji', label, entry)
         else:
             button.connect("clicked", self.__shortcut_button_clicked_cb,
                     name, "general/hotkey", label, entry)
diff --git a/setup/setup.ui b/setup/setup.ui
index e64b10468..f1beb1de0 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -870,9 +870,9 @@
                           <object class="GtkLabel" id="label_emoji1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">The shortcut keys for showing emoji dialog</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys to enable conversions of emoji annotations or Unicode names</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji choice:</property>
+                            <property name="label" translatable="yes">Emoji annotation:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -920,6 +920,60 @@
                             <property name="top_attach">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="label_unicode1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">The shortcut keys to enable Unicode code point conversions</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Unicode code point:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox_unicode1">
+                            <property name="orientation">horizontal</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <property name="hexpand">true</property>
+                            <child>
+                              <object class="GtkEntry" id="entry_unicode_dialog">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_unicode_dialog">
+                                <property name="label" translatable="yes">...</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
diff --git a/src/ibusengine.c b/src/ibusengine.c
index fd61102ac..a3ccd7ddb 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -64,8 +64,6 @@ enum {
 };
 
 
-typedef struct _IBusEngineKeybinding IBusEngineKeybinding;
-
 /* IBusEnginePriv */
 struct _IBusEnginePrivate {
     gchar *engine_name;
@@ -81,14 +79,11 @@ struct _IBusEnginePrivate {
     guint content_purpose;
     guint content_hints;
 
-    GSettings             *settings_emoji;
-    IBusEngineKeybinding **emoji_keybindings;
+    GHashTable            *extension_keybindings;
+    gboolean               enable_extension;
+    gchar                 *current_extension_name;
 };
 
-struct _IBusEngineKeybinding {
-    guint            keyval;
-    IBusModifierType modifiers;
-};
 
 static guint            engine_signals[LAST_SIGNAL] = { 0 };
 
@@ -191,10 +186,6 @@ static void      ibus_engine_dbus_property_changed
                                               const gchar        *property_name,
                                               GVariant           *value);
 static void      ibus_engine_keybinding_free (IBusEngine         *engine);
-static void      settings_emoji_hotkey_changed_cb 
-                                             (GSettings          *settings,
-                                              const gchar        *key,
-                                              gpointer            data);
 
 
 G_DEFINE_TYPE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
@@ -253,6 +244,12 @@ static const gchar introspection_xml[] =
     "      <arg direction='in'  type='u' name='cursor_pos' />"
     "      <arg direction='in'  type='u' name='anchor_pos' />"
     "    </method>"
+    "    <method name='PanelExtensionReceived'>"
+    "      <arg direction='in'  type='v' name='event' />"
+    "    </method>"
+    "    <method name='PanelExtensionRegisterKeys'>"
+    "      <arg direction='in'  type='v' name='data' />"
+    "    </method>"
     /* FIXME signals */
     "    <signal name='CommitText'>"
     "      <arg type='v' name='text' />"
@@ -309,16 +306,22 @@ ibus_engine_class_init (IBusEngineClass *class)
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
     IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
 
-    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_engine_set_property;
-    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_engine_get_property;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_engine_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_engine_get_property;
 
     ibus_object_class->destroy = (IBusObjectDestroyFunc) ibus_engine_destroy;
 
-    IBUS_SERVICE_CLASS (class)->service_method_call  = ibus_engine_service_method_call;
-    IBUS_SERVICE_CLASS (class)->service_get_property = ibus_engine_service_get_property;
-    IBUS_SERVICE_CLASS (class)->service_set_property = ibus_engine_service_set_property;
+    IBUS_SERVICE_CLASS (class)->service_method_call  =
+            ibus_engine_service_method_call;
+    IBUS_SERVICE_CLASS (class)->service_get_property =
+            ibus_engine_service_get_property;
+    IBUS_SERVICE_CLASS (class)->service_set_property =
+            ibus_engine_service_set_property;
 
-    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class), introspection_xml);
+    ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class),
+                                       introspection_xml);
 
     class->process_key_event = ibus_engine_process_key_event;
     class->focus_in     = ibus_engine_focus_in;
@@ -839,26 +842,25 @@ ibus_engine_init (IBusEngine *engine)
 {
     IBusEnginePrivate *priv;
     engine->priv = priv = IBUS_ENGINE_GET_PRIVATE (engine);
-
     priv->surrounding_text = g_object_ref_sink (text_empty);
-    priv->settings_emoji =
-            g_settings_new ("org.freedesktop.ibus.panel.emoji");
-    settings_emoji_hotkey_changed_cb (priv->settings_emoji, "hotkey", engine);
-    g_signal_connect (priv->settings_emoji, "changed::hotkey",
-                      G_CALLBACK (settings_emoji_hotkey_changed_cb), engine);
+    priv->extension_keybindings = g_hash_table_new_full (
+            g_str_hash,
+            g_str_equal,
+            g_free,
+            g_free);
 }
 
 static void
 ibus_engine_destroy (IBusEngine *engine)
 {
-    g_free (engine->priv->engine_name);
-    engine->priv->engine_name = NULL;
+    IBusEnginePrivate *priv = engine->priv;
 
-    if (engine->priv->surrounding_text) {
-        g_object_unref (engine->priv->surrounding_text);
-        engine->priv->surrounding_text = NULL;
-    }
-    ibus_engine_keybinding_free (engine);
+    g_clear_pointer (&priv->engine_name, g_free);
+    g_clear_pointer (&priv->current_extension_name, g_free);
+    if (priv->surrounding_text)
+        g_clear_object (&priv->surrounding_text);
+    if (priv->extension_keybindings)
+        g_clear_pointer (&priv->extension_keybindings, g_hash_table_destroy);
 
     IBUS_OBJECT_CLASS(ibus_engine_parent_class)->destroy (IBUS_OBJECT (engine));
 }
@@ -895,19 +897,38 @@ ibus_engine_get_property (IBusEngine *engine,
 }
 
 static void
-ibus_engine_panel_extension (IBusEngine *engine)
+ibus_engine_panel_extension (IBusEngine  *engine,
+                             const gchar *name)
 {
-    IBusXEvent *xevent = ibus_x_event_new (
-            "event-type", IBUS_X_EVENT_KEY_PRESS,
-            "purpose", "emoji",
+    IBusEnginePrivate *priv;
+    IBusExtensionEvent *event;
+    GVariant *data;
+
+    g_assert (IBUS_IS_ENGINE (engine));
+    g_assert (name);
+
+    priv = engine->priv;
+    if (!g_strcmp0 (name, priv->current_extension_name))
+        priv->enable_extension = !priv->enable_extension;
+    else
+        priv->enable_extension = TRUE;
+    if (priv->enable_extension) {
+        g_free (priv->current_extension_name);
+        priv->current_extension_name = g_strdup (name);
+    }
+    event = ibus_extension_event_new (
+            "name", name,
+            "is-enabled", priv->enable_extension,
             NULL);
-    GVariant *data = ibus_serializable_serialize_object (
-            IBUS_SERIALIZABLE (xevent));
+    g_assert (IBUS_IS_EXTENSION_EVENT (event));
+    data = ibus_serializable_serialize_object (
+            IBUS_SERIALIZABLE (event));
 
     g_assert (data != NULL);
     ibus_engine_emit_signal (engine,
                              "PanelExtension",
                              g_variant_new ("(v)", data));
+    g_object_unref (event);
 }
 
 static gboolean
@@ -917,7 +938,8 @@ ibus_engine_filter_key_event (IBusEngine *engine,
                               guint       state)
 {
     IBusEnginePrivate *priv;
-    int i;
+    GList *names, *n;
+    IBusProcessKeyEventData *keys;
     guint modifiers;
 
     if ((state & IBUS_RELEASE_MASK) != 0)
@@ -925,22 +947,29 @@ ibus_engine_filter_key_event (IBusEngine *engine,
     g_return_val_if_fail (IBUS_IS_ENGINE (engine), FALSE);
 
     priv = engine->priv;
-    if (!priv->emoji_keybindings)
-        return FALSE;
-
     modifiers = state & IBUS_MODIFIER_FILTER;
     if (keyval >= IBUS_KEY_A && keyval <= IBUS_KEY_Z &&
         (modifiers & IBUS_SHIFT_MASK) != 0) {
         keyval = keyval - IBUS_KEY_A + IBUS_KEY_a;
     }
-    for (i = 0; priv->emoji_keybindings[i]; i++) {
-        IBusEngineKeybinding *binding = priv->emoji_keybindings[i];
-        if (binding->keyval == keyval &&
-            binding->modifiers == modifiers) {
-            ibus_engine_panel_extension (engine);
-            return TRUE;
+    names = g_hash_table_get_keys (priv->extension_keybindings);
+    if (!names)
+        return FALSE;
+    for (n = names; n; n = n->next) {
+        const gchar *name = (const gchar *)n->data;
+        keys = g_hash_table_lookup (priv->extension_keybindings, name);
+        for (; keys; keys++) {
+            if (keys->keyval == 0 && keys->keycode == 0 && keys->state == 0)
+                break;
+            if (keys->keyval == keyval &&
+                keys->state == modifiers &&
+                (keys->keycode == 0 || keys->keycode == keycode)) {
+                ibus_engine_panel_extension (engine, name);
+                return TRUE;
+            }
         }
     }
+    g_list_free (names);
     return FALSE;
 }
 
@@ -953,6 +982,97 @@ ibus_engine_service_authorized_method (IBusService     *service,
     return FALSE;
 }
 
+static void
+ibus_engine_service_panel_extension_register_keys (IBusEngine      *engine,
+                                                   GVariant        *parameters,
+                                                   GDBusMethodInvocation
+                                                                   *invocation)
+{
+    IBusEnginePrivate *priv = engine->priv;
+    GVariant *v1 = NULL;
+    GVariant *v2 = NULL;
+    GVariant *v3 = NULL;
+    GVariant *vkeys = NULL;
+    GVariantIter *iter1 = NULL;
+    GVariantIter *iter2 = NULL;
+    const gchar *name = NULL;
+    guint failure_id = 0;
+
+    g_variant_get (parameters, "(v)", &v1);
+    if (v1)
+        g_variant_get (v1, "(v)", &v2);
+    else
+        failure_id = 1;
+    if (v2)
+        g_variant_get (v2, "a{sv}", &iter1);
+    else
+        failure_id = 2;
+    if (iter1) {
+        while (g_variant_iter_loop (iter1, "{&sv}", &name, &vkeys)) {
+            if (vkeys)
+                g_variant_get (vkeys, "av", &iter2);
+            if (name && iter2) {
+                IBusProcessKeyEventData *keys = NULL;
+                gint num = 0;
+                while (g_variant_iter_loop (iter2, "v", &v3)) {
+                    if (v3) {
+                        guint keyval = 0;
+                        guint keycode = 0;
+                        guint state = 0;
+                        g_variant_get (v3, "(iii)",
+                                       &keyval, &keycode, &state);
+                        if (!keys)
+                            keys = g_new0 (IBusProcessKeyEventData, 2);
+                        else
+                            keys = g_renew (IBusProcessKeyEventData,
+                                            keys,
+                                            num + 2);
+                        keys[num].keyval = keyval;
+                        keys[num].keycode = keycode;
+                        keys[num].state = state;
+                        keys[num + 1].keyval = 0;
+                        keys[num + 1].keycode = 0;
+                        keys[num + 1].state = 0;
+                        g_clear_pointer (&v3, g_variant_unref);
+                        num++;
+                    } else {
+                        failure_id = 5;
+                    }
+                }
+                if (num > 0) {
+                    g_hash_table_replace (priv->extension_keybindings,
+                                          g_strdup (name),
+                                          keys);
+                } else {
+                    g_hash_table_remove (priv->extension_keybindings, name);
+                }
+                g_clear_pointer (&iter2, g_variant_iter_free);
+            } else {
+                failure_id = 4;
+            }
+            g_clear_pointer (&vkeys, g_variant_unref);
+            name = NULL;
+        }
+        g_variant_iter_free (iter1);
+    } else {
+        failure_id = 3;
+    }
+    if (failure_id == 0) {
+        g_dbus_method_invocation_return_value (invocation, NULL);
+    } else {
+        g_dbus_method_invocation_return_error (
+                invocation,
+                G_DBUS_ERROR,
+                G_DBUS_ERROR_FAILED,
+                "PanelExtensionRegisterKeys method gives NULL: %d",
+                failure_id);
+    }
+    if (v2)
+        g_variant_unref (v2);
+    if (v1)
+        g_variant_unref (v1);
+}
+
 static void
 ibus_engine_service_method_call (IBusService           *service,
                                  GDBusConnection       *connection,
@@ -964,6 +1084,7 @@ ibus_engine_service_method_call (IBusService           *service,
                                  GDBusMethodInvocation *invocation)
 {
     IBusEngine *engine = IBUS_ENGINE (service);
+    IBusEnginePrivate *priv = engine->priv;
 
     if (g_strcmp0 (interface_name, IBUS_INTERFACE_ENGINE) != 0) {
         IBUS_SERVICE_CLASS (ibus_engine_parent_class)->
@@ -1002,6 +1123,33 @@ ibus_engine_service_method_call (IBusService           *service,
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("(b)", retval));
         return;
     }
+    if (g_strcmp0 (method_name, "PanelExtensionReceived") == 0) {
+        GVariant *arg0 = NULL;
+        IBusExtensionEvent *event = NULL;
+
+        g_variant_get (parameters, "(v)", &arg0);
+        if (arg0) {
+            event = (IBusExtensionEvent *)ibus_serializable_deserialize_object (
+                    arg0);
+        }
+        if (!event) {
+            g_dbus_method_invocation_return_error (
+                    invocation,
+                    G_DBUS_ERROR,
+                    G_DBUS_ERROR_FAILED,
+                    "PanelExtensionReceived method gives NULL");
+            return;
+        }
+        priv->enable_extension = ibus_extension_event_is_enabled (event);
+        g_dbus_method_invocation_return_value (invocation, NULL);
+        return;
+    }
+    if (g_strcmp0 (method_name, "PanelExtensionRegisterKeys") == 0) {
+        ibus_engine_service_panel_extension_register_keys (engine,
+                                                           parameters,
+                                                           invocation);
+        return;
+    }
 
     static const struct {
         gchar *member;
@@ -1441,73 +1589,10 @@ static void
 ibus_engine_keybinding_free (IBusEngine *engine)
 {
     IBusEnginePrivate *priv;
-    int i;
 
     g_return_if_fail (IBUS_IS_ENGINE (engine));
 
     priv = engine->priv;
-    if (priv->emoji_keybindings) {
-        for (i = 0; priv->emoji_keybindings[i]; i++)
-            g_slice_free (IBusEngineKeybinding, priv->emoji_keybindings[i]);
-        g_clear_pointer (&priv->emoji_keybindings, g_free);
-    }
-}
-
-static IBusEngineKeybinding *
-ibus_engine_keybinding_new (IBusEngine  *engine,
-                            const gchar *accelerator)
-{
-    guint keyval = 0U;
-    IBusModifierType modifiers = 0;
-    IBusEngineKeybinding *binding = NULL;
-
-    ibus_accelerator_parse (accelerator, &keyval, &modifiers);
-    if (keyval == 0U && modifiers == 0) {
-        g_warning ("Failed to parse shortcut key '%s'", accelerator);
-        return NULL;
-    }
-    if (modifiers & IBUS_SUPER_MASK) {
-        modifiers^=IBUS_SUPER_MASK;
-        modifiers|=IBUS_MOD4_MASK;
-    }
-
-    binding = g_slice_new0 (IBusEngineKeybinding);
-    binding->keyval = keyval;
-    binding->modifiers = modifiers;
-    return binding;
-}
-
-static void
-settings_emoji_hotkey_changed_cb (GSettings   *settings,
-                                  const gchar *key,
-                                  gpointer     data)
-{
-    IBusEngine *engine;
-    IBusEnginePrivate *priv;
-    gchar **accelerators;
-    int i, j, length;
-    g_return_if_fail (IBUS_IS_ENGINE (data));
-    engine = IBUS_ENGINE (data);
-    priv = engine->priv;
-
-    if (g_strcmp0 (key, "hotkey") != 0)
-        return;
-    accelerators = g_settings_get_strv (settings, key);
-    length = g_strv_length (accelerators);
-    ibus_engine_keybinding_free (engine);
-    if (length == 0) {
-        g_strfreev (accelerators);
-        return;
-    }
-    priv->emoji_keybindings = g_new0 (IBusEngineKeybinding*, length + 1);
-    for (i = 0, j = 0; i < length; i++) {
-        IBusEngineKeybinding *binding =
-                ibus_engine_keybinding_new (engine, accelerators[i]);
-        if (!binding)
-            continue;
-        priv->emoji_keybindings[j++] = binding;
-    }
-    g_strfreev (accelerators);
 }
 
 IBusEngine *
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index f37b91c3a..71028ebf3 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -57,6 +57,9 @@ enum {
     DESTROY_CONTEXT,
     SET_CONTENT_TYPE,
     PANEL_EXTENSION_RECEIVED,
+    PROCESS_KEY_EVENT,
+    COMMIT_TEXT_RECEIVED,
+    CANDIDATE_CLICKED_LOOKUP_TABLE,
     LAST_SIGNAL,
 };
 
@@ -153,7 +156,7 @@ static void      ibus_panel_service_set_content_type
                                     guint                   hints);
 static void      ibus_panel_service_panel_extension_received
                                    (IBusPanelService       *panel,
-                                    GVariant               *data);
+                                    IBusExtensionEvent     *event);
 
 G_DEFINE_TYPE (IBusPanelService, ibus_panel_service, IBUS_TYPE_SERVICE)
 
@@ -184,6 +187,11 @@ static const gchar introspection_xml[] =
     "    <method name='CursorDownLookupTable' />"
     "    <method name='PageUpLookupTable' />"
     "    <method name='PageDownLookupTable' />"
+    "    <method name='CandidateClickedLookupTable'>"
+    "      <arg direction='in' type='u' name='index' />"
+    "      <arg direction='in' type='u' name='button' />"
+    "      <arg direction='in' type='u' name='state' />"
+    "    </method>"
     "    <method name='RegisterProperties'>"
     "      <arg direction='in'  type='v' name='props' />"
     "    </method>"
@@ -221,7 +229,16 @@ static const gchar introspection_xml[] =
     "      <arg direction='in'  type='u' name='hints' />"
     "    </method>"
     "    <method name='PanelExtensionReceived'>"
-    "      <arg direction='in' type='v' name='data' />"
+    "      <arg direction='in' type='v' name='event' />"
+    "    </method>"
+    "    <method name='ProcessKeyEvent'>"
+    "      <arg direction='in'  type='u' name='keyval' />"
+    "      <arg direction='in'  type='u' name='keycode' />"
+    "      <arg direction='in'  type='u' name='state' />"
+    "      <arg direction='out' type='b' />"
+    "    </method>"
+    "    <method name='CommitTextReceived'>"
+    "      <arg direction='in' type='v' name='text' />"
     "    </method>"
     /* Signals */
     "    <signal name='CursorUp' />"
@@ -247,7 +264,23 @@ static const gchar introspection_xml[] =
     "      <arg type='v' name='text' />"
     "    </signal>"
     "    <signal name='PanelExtension'>"
+    "      <arg type='v' name='event' />"
+    "    </signal>"
+    "    <method name='PanelExtensionRegisterKeys'>"
     "      <arg type='v' name='data' />"
+    "    </method>"
+    "    <signal name='UpdatePreeditTextReceived'>"
+    "      <arg type='v' name='text' />"
+    "      <arg type='u' name='cursor_pos' />"
+    "      <arg type='b' name='visible' />"
+    "    </signal>"
+    "    <signal name='UpdateAuxiliaryTextReceived'>"
+    "      <arg type='v' name='text' />"
+    "      <arg type='b' name='visible' />"
+    "    </signal>"
+    "    <signal name='UpdateLookupTableReceived'>"
+    "      <arg type='v' name='table' />"
+    "      <arg type='b' name='visible' />"
     "    </signal>"
     "  </interface>"
     "</node>";
@@ -927,10 +960,81 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             G_SIGNAL_RUN_LAST,
             G_STRUCT_OFFSET (IBusPanelServiceClass, panel_extension_received),
             NULL, NULL,
-            _ibus_marshal_VOID__VARIANT,
+            _ibus_marshal_VOID__OBJECT,
+            G_TYPE_NONE,
+            1,
+            IBUS_TYPE_EXTENSION_EVENT);
+
+    /**
+     * IBusPanelService::process-key-event:
+     * @panel: An #IBusPanelService
+     * @keyval: Key symbol of the key press.
+     * @keycode: KeyCode of the key press.
+     * @state: Key modifier flags.
+     *
+     * Emitted when a key event is received.
+     * Implement the member function IBusPanelServiceClass::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.
+     *
+     * Returns: %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>
+     */
+    panel_signals[PROCESS_KEY_EVENT] =
+        g_signal_new (I_("process-key-event"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, process_key_event),
+            g_signal_accumulator_true_handled, NULL,
+            _ibus_marshal_BOOL__UINT_UINT_UINT,
+            G_TYPE_BOOLEAN,
+            3,
+            G_TYPE_UINT,
+            G_TYPE_UINT,
+            G_TYPE_UINT);
+
+    /**
+     * IBusPanelService::commit-text-received:
+     * @panel: An #IBusPanelService
+     * @text: A #IBusText
+     *
+     * Emitted when the client application get the ::commit-text-received.
+     * Implement the member function
+     * IBusPanelServiceClass::commit_text_received in extended class to
+     * receive this signal.
+     *
+     * <note><para>Argument @user_data is ignored in this function.</para>
+     * </note>
+     */
+    panel_signals[COMMIT_TEXT_RECEIVED] =
+        g_signal_new (I_("commit-text-received"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass, commit_text_received),
+            NULL, NULL,
+            _ibus_marshal_VOID__OBJECT,
             G_TYPE_NONE,
             1,
-            G_TYPE_VARIANT);
+            IBUS_TYPE_TEXT);
+
+    panel_signals[CANDIDATE_CLICKED_LOOKUP_TABLE] =
+        g_signal_new (I_("candidate-clicked-lookup-table"),
+            G_TYPE_FROM_CLASS (gobject_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (IBusPanelServiceClass,
+                             candidate_clicked_lookup_table),
+            NULL, NULL,
+            _ibus_marshal_VOID__UINT_UINT_UINT,
+            G_TYPE_NONE,
+            3,
+            G_TYPE_UINT,
+            G_TYPE_UINT,
+            G_TYPE_UINT);
 }
 
 static void
@@ -1129,9 +1233,14 @@ ibus_panel_service_service_method_call (IBusService           *service,
     }
 
     if (g_strcmp0 (method_name, "PanelExtensionReceived") == 0) {
-        GVariant *variant = NULL;
-        g_variant_get (parameters, "(v)", &variant);
-        if (variant == NULL) {
+        GVariant *arg0 = NULL;
+        IBusExtensionEvent *event = NULL;
+        g_variant_get (parameters, "(v)", &arg0);
+        if (arg0) {
+            event = IBUS_EXTENSION_EVENT (ibus_serializable_deserialize (arg0));
+            g_variant_unref (arg0);
+        }
+        if (!event) {
             g_dbus_method_invocation_return_error (
                     invocation,
                     G_DBUS_ERROR,
@@ -1140,11 +1249,63 @@ ibus_panel_service_service_method_call (IBusService           *service,
             return;
         }
         g_signal_emit (panel, panel_signals[PANEL_EXTENSION_RECEIVED], 0,
-                       variant);
-        g_variant_unref (variant);
+                       event);
+        _g_object_unref_if_floating (event);
         g_dbus_method_invocation_return_value (invocation, NULL);
         return;
     }
+    if (g_strcmp0 (method_name, "ProcessKeyEvent") == 0) {
+        guint keyval, keycode, state;
+        gboolean retval = FALSE;
+
+        g_variant_get (parameters, "(uuu)", &keyval, &keycode, &state);
+        g_signal_emit (panel,
+                       panel_signals[PROCESS_KEY_EVENT],
+                       0,
+                       keyval,
+                       keycode,
+                       state,
+                       &retval);
+        g_dbus_method_invocation_return_value (invocation,
+                                               g_variant_new ("(b)", retval));
+        return;
+    }
+    if (g_strcmp0 (method_name, "CommitTextReceived") == 0) {
+        GVariant *arg0 = NULL;
+        IBusText *text = NULL;
+
+        g_variant_get (parameters, "(v)", &arg0);
+        if (arg0) {
+            text = (IBusText *) ibus_serializable_deserialize (arg0);
+            g_variant_unref (arg0);
+        }
+        if (!text) {
+            g_dbus_method_invocation_return_error (
+                    invocation,
+                    G_DBUS_ERROR,
+                    G_DBUS_ERROR_FAILED,
+                    "CommitTextReceived method gives NULL");
+            return;
+        }
+        g_signal_emit (panel,
+                       panel_signals[COMMIT_TEXT_RECEIVED],
+                       0,
+                       text);
+        _g_object_unref_if_floating (text);
+        return;
+    }
+    if (g_strcmp0 (method_name, "CandidateClickedLookupTable") == 0) {
+        guint index = 0;
+        guint button = 0;
+        guint state = 0;
+        g_variant_get (parameters, "(uuu)", &index, &button, &state);
+        g_signal_emit (panel,
+                       panel_signals[CANDIDATE_CLICKED_LOOKUP_TABLE],
+                       0,
+                       index, button, state);
+        return;
+    }
+
 
     const static struct {
         const gchar *name;
@@ -1318,8 +1479,8 @@ ibus_panel_service_set_content_type (IBusPanelService *panel,
 }
 
 static void
-ibus_panel_service_panel_extension_received (IBusPanelService *panel,
-                                             GVariant         *data)
+ibus_panel_service_panel_extension_received (IBusPanelService   *panel,
+                                             IBusExtensionEvent *event)
 {
     ibus_panel_service_not_implemented(panel);
 }
@@ -1396,10 +1557,11 @@ void
 ibus_panel_service_commit_text (IBusPanelService *panel,
                                 IBusText         *text)
 {
+    GVariant *variant;
     g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
     g_return_if_fail (IBUS_IS_TEXT (text));
 
-    GVariant *variant = ibus_serializable_serialize ((IBusSerializable *)text);
+    variant = ibus_serializable_serialize ((IBusSerializable *)text);
     ibus_service_emit_signal ((IBusService *) panel,
                               NULL,
                               IBUS_INTERFACE_PANEL,
@@ -1413,18 +1575,144 @@ ibus_panel_service_commit_text (IBusPanelService *panel,
 }
 
 void
-ibus_panel_service_panel_extension (IBusPanelService *panel,
-                                    GVariant         *variant)
+ibus_panel_service_panel_extension (IBusPanelService   *panel,
+                                    IBusExtensionEvent *event)
 {
+    GVariant *variant;
     g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
-    g_return_if_fail (variant);
+    g_return_if_fail (IBUS_IS_EXTENSION_EVENT (event));
 
+    variant = ibus_serializable_serialize ((IBusSerializable *)event);
     ibus_service_emit_signal ((IBusService *) panel,
                               NULL,
                               IBUS_INTERFACE_PANEL,
                               "PanelExtension",
                               g_variant_new ("(v)", variant),
                               NULL);
+
+    if (g_object_is_floating (event)) {
+        g_object_unref (event);
+    }
+}
+
+void
+ibus_panel_service_panel_extension_register_keys (IBusPanelService   *panel,
+                                                  const gchar
+                                                           *first_property_name,
+                                                  ...)
+{
+    GVariantBuilder builder;
+    GVariantBuilder child;
+    const gchar *name;
+    va_list var_args;
+    IBusProcessKeyEventData *keys;
+
+    g_return_if_fail (first_property_name);
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+    name = first_property_name;
+
+    va_start (var_args, first_property_name);
+    do {
+        keys = va_arg (var_args, IBusProcessKeyEventData *);
+        g_return_if_fail (keys != NULL);
+        g_variant_builder_init (&child, G_VARIANT_TYPE ("av"));
+        for (; keys; keys++) {
+            if (keys->keyval == 0 && keys->keycode == 0 && keys->state == 0)
+                break;
+            g_variant_builder_add (&child, "v",
+                                   g_variant_new ("(iii)",
+                                                  keys->keyval,
+                                                  keys->keycode, 
+                                                  keys->state));
+        }
+        g_variant_builder_add (&builder, "{sv}",
+                               g_strdup (name), g_variant_builder_end (&child));
+    } while ((name = va_arg (var_args, const gchar *)));
+    va_end (var_args);
+
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "PanelExtensionRegisterKeys",
+                              g_variant_new ("(v)",
+                                             g_variant_builder_end (&builder)),
+                              NULL);
+}
+
+void
+ibus_panel_service_update_preedit_text_received (IBusPanelService *panel,
+                                                 IBusText         *text,
+                                                 guint             cursor_pos,
+                                                 gboolean          visible)
+{
+    GVariant *variant;
+
+    g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
+    g_return_if_fail (IBUS_IS_TEXT (text));
+
+    variant = ibus_serializable_serialize ((IBusSerializable *)text);
+    g_return_if_fail (variant);
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "UpdatePreeditTextReceived",
+                              g_variant_new ("(vub)",
+                                             variant, cursor_pos, visible),
+                              NULL);
+
+    if (g_object_is_floating (text)) {
+        g_object_unref (text);
+    }
+}
+
+void
+ibus_panel_service_update_auxiliary_text_received (IBusPanelService *panel,
+                                                   IBusText         *text,
+                                                   gboolean          visible)
+{
+    GVariant *variant;
+    g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
+    g_return_if_fail (IBUS_IS_TEXT (text));
+
+    variant = ibus_serializable_serialize ((IBusSerializable *)text);
+    g_return_if_fail (variant);
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "UpdateAuxiliaryTextReceived",
+                              g_variant_new ("(vb)",
+                                             variant, visible),
+                              NULL);
+
+    if (g_object_is_floating (text)) {
+        g_object_unref (text);
+    }
+}
+
+void
+ibus_panel_service_update_lookup_table_received (IBusPanelService *panel,
+                                                 IBusLookupTable  *table,
+                                                 gboolean          visible)
+{
+    GVariant *variant;
+
+    g_return_if_fail (IBUS_IS_PANEL_SERVICE (panel));
+    g_return_if_fail (IBUS_IS_LOOKUP_TABLE (table));
+
+    variant = ibus_serializable_serialize ((IBusSerializable *)table);
+    g_return_if_fail (variant);
+    ibus_service_emit_signal ((IBusService *) panel,
+                              NULL,
+                              IBUS_INTERFACE_PANEL,
+                              "UpdateLookupTableReceived",
+                              g_variant_new ("(vb)",
+                                             variant, visible),
+                              NULL);
+
+    if (g_object_is_floating (table)) {
+        g_object_unref (table);
+    }
 }
 
 #define DEFINE_FUNC(name, Name)                             \
diff --git a/src/ibuspanelservice.h b/src/ibuspanelservice.h
index 60ef842b4..d91f2309d 100644
--- a/src/ibuspanelservice.h
+++ b/src/ibuspanelservice.h
@@ -38,6 +38,7 @@
 #include "ibuslookuptable.h"
 #include "ibusservice.h"
 #include "ibusproplist.h"
+#include "ibusxevent.h"
 
 /*
  * Type macros.
@@ -130,11 +131,24 @@ struct _IBusPanelServiceClass {
                                             gint                    h);
     void     (* panel_extension_received)
                                            (IBusPanelService       *panel,
-                                            GVariant               *data);
+                                            IBusExtensionEvent     *event);
+    gboolean (* process_key_event)
+                                           (IBusPanelService       *panel,
+                                            guint                   keyval,
+                                            guint                   keycode,
+                                            guint                   state);
+    void     (* commit_text_received)
+                                           (IBusPanelService       *panel,
+                                            IBusText               *text);
+    void     (* candidate_clicked_lookup_table)
+                                           (IBusPanelService       *panel,
+                                            guint                   index,
+                                            guint                   button,
+                                            guint                   state);
 
     /*< private >*/
     /* padding */
-    gpointer pdummy[5];  // We can add 8 pointers without breaking the ABI.
+    gpointer pdummy[2];  // We can add 8 pointers without breaking the ABI.
 };
 
 GType            ibus_panel_service_get_type  (void);
@@ -248,12 +262,105 @@ void ibus_panel_service_commit_text       (IBusPanelService *panel,
 /**
  * ibus_panel_service_panel_extension:
  * @panel: An #IBusPanelService
- * @data: (transfer full): A #GVariant data which is sent to a panel extension. 
+ * @event: (transfer full): A #PanelExtensionEvent which is sent to a
+ *                          panel extension. 
  *
+ * Enable or disable a panel extension with #IBusExtensionEvent.
  * Notify that a data is sent
  * by sending a "PanelExtension" message to IBus panel extension service.
  */
-void ibus_panel_service_panel_extension   (IBusPanelService *panel,
-                                           GVariant         *data);
+void ibus_panel_service_panel_extension   (IBusPanelService   *panel,
+                                           IBusExtensionEvent *event);
+
+/**
+ * ibus_panel_service_panel_extension_register_keys:
+ * @panel: An #IBusPanelService
+ * @first_property_name: the first name of the shortcut keys. This is %NULL
+ " terminated.
+ *
+ * Register shortcut keys to enable panel extensions with #IBusExtensionEvent.
+ * Notify that a data is sent
+ * by sending a "PanelExtensionRegisterKeys" message to IBus panel extension
+ * service. Seems Vala does not support uint[][3] and use
+ * IBusProcessKeyEventData[]. E.g.
+ * IBusProcessKeyEventData[] keys = {{
+ *         IBUS_KEY_e, 0, IBUS_SHIFT_MASK | IBUS_SUPER_MASK }};
+ * ibus_panel_service_panel_extension_register_keys(panel, "emoji", keys, NULL);
+ */
+void ibus_panel_service_panel_extension_register_keys
+                                           (IBusPanelService  *panel,
+                                            const gchar       *first_property_name,
+                                            ...);
+
+/**
+ * ibus_panel_service_update_preedit_text_received:
+ * @panel: An #IBusPanelService
+ * @text: Update content.
+ * @cursor_pos: Current position of cursor
+ * @visible: Whether the pre-edit buffer is visible.
+ *
+ * Notify that the preedit is updated by the panel extension
+ *
+ * (Note: The table object will be released, if it is floating.
+ *  If caller want to keep the object, caller should make the object
+ *  sink by g_object_ref_sink.)
+ */
+void ibus_panel_service_update_preedit_text_received
+                                          (IBusPanelService *panel,
+                                           IBusText         *text,
+                                           guint             cursor_pos,
+                                           gboolean          visible);
+
+/**
+ * ibus_panel_service_show_preedit_text_received:
+ * @panel: An IBusPanelService
+ *
+ * Notify that the preedit is shown by the panel extension
+ */
+void ibus_panel_service_show_preedit_text_received
+                                          (IBusPanelService *panel);
+
+/**
+ * ibus_panel_service_hide_preedit_text_received:
+ * @panel: An IBusPanelService
+ *
+ * Notify that the preedit is hidden by the panel extension
+ */
+void ibus_panel_service_hide_preedit_text_received
+                                          (IBusPanelService *panel);
+
+/**
+ * ibus_panel_service_update_auxiliary_text_received:
+ * @panel: An #IBusPanelService
+ * @text: An #IBusText
+ * @visible: Whether the auxilirary text is visible.
+ *
+ * Notify that the auxilirary is updated by the panel extension.
+ *
+ * (Note: The table object will be released, if it is floating.
+ *  If caller want to keep the object, caller should make the object
+ *  sink by g_object_ref_sink.)
+ */
+void ibus_panel_service_update_auxiliary_text_received
+                                          (IBusPanelService *panel,
+                                           IBusText         *text,
+                                           gboolean          visible);
+
+/**
+ * ibus_panel_service_update_lookup_table_received:
+ * @panel: An #IBusPanelService
+ * @table: An #IBusLookupTable
+ * @visible: Whether the lookup table is visible.
+ *
+ * Notify that the lookup table is updated by the panel extension.
+ *
+ * (Note: The table object will be released, if it is floating.
+ *  If caller want to keep the object, caller should make the object
+ *  sink by g_object_ref_sink.)
+ */
+void ibus_panel_service_update_lookup_table_received
+                                          (IBusPanelService *panel,
+                                           IBusLookupTable  *table,
+                                           gboolean          visible);
 G_END_DECLS
 #endif
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 757d915b3..4f5a306bf 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -73,6 +73,15 @@
  */
 #define IBUS_SERVICE_PANEL_EXTENSION "org.freedesktop.IBus.Panel.Extension"
 
+/**
+ * IBUS_SERVICE_PANEL_EXTENSION_EMOJI:
+ *
+ * Address of IBus panel extension service for emoji.
+ * This service provides emoji, Unicode code point, Unicode name features.
+ */
+#define IBUS_SERVICE_PANEL_EXTENSION_EMOJI \
+        "org.freedesktop.IBus.Panel.Extension.Emoji"
+
 /**
  * IBUS_SERVICE_CONFIG:
  *
@@ -109,11 +118,13 @@
 #define IBUS_PATH_PANEL         "/org/freedesktop/IBus/Panel"
 
 /**
- * IBUS_PATH_PANEL_EXTENSION:
+ * IBUS_PATH_PANEL_EXTENSION_EMOJI:
  *
- * D-Bus path for IBus panel.
+ * D-Bus path for IBus extension panel for emoji.
+ * This service provides emoji, Unicode code point, Unicode name features.
  */
-#define IBUS_PATH_PANEL_EXTENSION "/org/freedesktop/IBus/Panel/Extension"
+#define IBUS_PATH_PANEL_EXTENSION_EMOJI \
+        "/org/freedesktop/IBus/Panel/Extension/Emoji"
 
 /**
  * IBUS_PATH_CONFIG:
diff --git a/src/ibusxevent.c b/src/ibusxevent.c
index dea80272a..287bb99bc 100644
--- a/src/ibusxevent.c
+++ b/src/ibusxevent.c
@@ -22,13 +22,23 @@
 #include "ibusinternal.h"
 #include "ibusxevent.h"
 
+#define IBUS_EXTENSION_EVENT_VERSION 1
+#define IBUS_EXTENSION_EVENT_GET_PRIVATE(o)                             \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o),                                   \
+                                 IBUS_TYPE_EXTENSION_EVENT,             \
+                                 IBusExtensionEventPrivate))
+
 #define IBUS_X_EVENT_VERSION 1
-#define IBUS_X_EVENT_GET_PRIVATE(o)  \
+#define IBUS_X_EVENT_GET_PRIVATE(o)                                     \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_X_EVENT, IBusXEventPrivate))
 
 enum {
     PROP_0,
     PROP_VERSION,
+    PROP_NAME,
+    PROP_IS_ENABLED,
+    PROP_IS_EXTENSION,
+    PROP_PARAMS,
     PROP_EVENT_TYPE,
     PROP_WINDOW,
     PROP_SEND_EVENT,
@@ -52,6 +62,14 @@ enum {
 };
 
 
+struct _IBusExtensionEventPrivate {
+    guint     version;
+    gchar    *name;
+    gboolean  is_enabled;
+    gboolean  is_extension;
+    gchar    *params;
+};
+
 struct _IBusXEventPrivate {
     guint    version;
     guint32  time;
@@ -73,24 +91,346 @@ struct _IBusXEventPrivate {
 };
 
 /* functions prototype */
-static void      ibus_x_event_destroy        (IBusXEvent         *event);
-static void      ibus_x_event_set_property   (IBusXEvent         *event,
-                                              guint               prop_id,
-                                              const GValue       *value,
-                                              GParamSpec         *pspec);
-static void      ibus_x_event_get_property   (IBusXEvent         *event,
-                                              guint               prop_id,
-                                              GValue             *value,
-                                              GParamSpec         *pspec);
-static gboolean  ibus_x_event_serialize      (IBusXEvent         *event,
-                                              GVariantBuilder    *builder);
-static gint      ibus_x_event_deserialize    (IBusXEvent         *event,
-                                              GVariant           *variant);
-static gboolean  ibus_x_event_copy           (IBusXEvent         *dest,
-                                              const IBusXEvent   *src);
-
+static void      ibus_extension_event_destroy      (IBusExtensionEvent *event);
+static void      ibus_extension_event_set_property (IBusExtensionEvent *event,
+                                                    guint               prop_id,
+                                                    const GValue       *value,
+                                                    GParamSpec         *pspec);
+static void      ibus_extension_event_get_property (IBusExtensionEvent *event,
+                                                    guint               prop_id,
+                                                    GValue             *value,
+                                                    GParamSpec         *pspec);
+static gboolean  ibus_extension_event_serialize    (IBusExtensionEvent *event,
+                                                    GVariantBuilder
+                                                                      *builder);
+static gint      ibus_extension_event_deserialize  (IBusExtensionEvent *event,
+                                                    GVariant
+                                                                      *variant);
+static gboolean  ibus_extension_event_copy         (IBusExtensionEvent
+                                                                          *dest,
+                                                    const IBusExtensionEvent
+                                                                          *src);
+static void      ibus_x_event_destroy              (IBusXEvent         *event);
+static void      ibus_x_event_set_property         (IBusXEvent         *event,
+                                                    guint               prop_id,
+                                                    const GValue       *value,
+                                                    GParamSpec         *pspec);
+static void      ibus_x_event_get_property         (IBusXEvent         *event,
+                                                    guint               prop_id,
+                                                    GValue             *value,
+                                                    GParamSpec         *pspec);
+static gboolean  ibus_x_event_serialize            (IBusXEvent         *event,
+                                                    GVariantBuilder
+                                                                      *builder);
+static gint      ibus_x_event_deserialize          (IBusXEvent         *event,
+                                                    GVariant
+                                                                      *variant);
+static gboolean  ibus_x_event_copy                 (IBusXEvent         *dest,
+                                                    const IBusXEvent   *src);
+
+G_DEFINE_TYPE (IBusExtensionEvent, ibus_extension_event, IBUS_TYPE_SERIALIZABLE)
 G_DEFINE_TYPE (IBusXEvent, ibus_x_event, IBUS_TYPE_SERIALIZABLE)
 
+static void
+ibus_extension_event_class_init (IBusExtensionEventClass *class)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+    IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
+    IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
+
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_extension_event_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_extension_event_get_property;
+
+    object_class->destroy =
+            (IBusObjectDestroyFunc) ibus_extension_event_destroy;
+
+    serializable_class->serialize   =
+            (IBusSerializableSerializeFunc) ibus_extension_event_serialize;
+    serializable_class->deserialize =
+            (IBusSerializableDeserializeFunc) ibus_extension_event_deserialize;
+    serializable_class->copy        =
+            (IBusSerializableCopyFunc) ibus_extension_event_copy;
+
+    /* install properties */
+    /**
+     * IBusExtensionEvent:version:
+     *
+     * Version of the #IBusExtensionEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_VERSION,
+                    g_param_spec_uint ("version",
+                        "version",
+                        "version",
+                        0,
+                        G_MAXUINT32,
+                        IBUS_EXTENSION_EVENT_VERSION,
+                        G_PARAM_READABLE));
+
+    /**
+     * IBusExtensionEvent:name:
+     *
+     * Name of the extension in the #IBusExtensionEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_NAME,
+                    g_param_spec_string ("name",
+                        "name",
+                        "name of the extension",
+                        "",
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusExtensionEvent:is-enabled:
+     *
+     * %TRUE if the extension is enabled in the #IBusExtensionEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_IS_ENABLED,
+                    g_param_spec_boolean ("is-enabled",
+                        "is enabled",
+                        "if the extension is enabled",
+                        FALSE,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusExtensionEvent:is-extension:
+     *
+     * %TRUE if the #IBusExtensionEvent is called by an extension.
+     * %FALSE if the #IBusExtensionEvent is called by an active engine or
+     * panel.
+     * If this value is %TRUE, the event is send to ibus-daemon, an active
+     * engine. If it's %FALSE, the event is sned to ibus-daemon, panels.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_IS_EXTENSION,
+                    g_param_spec_boolean ("is-extension",
+                        "is extension",
+                        "if the event is called by an extension",
+                        FALSE,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    /**
+     * IBusExtensionEvent:params:
+     *
+     * Parameters to enable the extension in the #IBusExtensionEvent.
+     */
+    g_object_class_install_property (gobject_class,
+                    PROP_PARAMS,
+                    g_param_spec_string ("params",
+                        "params",
+                        "Parameters to enable the extension",
+                        "",
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY));
+
+    g_type_class_add_private (class, sizeof (IBusExtensionEventPrivate));
+}
+
+static void
+ibus_extension_event_init (IBusExtensionEvent *event)
+{
+    event->priv = IBUS_EXTENSION_EVENT_GET_PRIVATE (event);
+    event->priv->version = IBUS_EXTENSION_EVENT_VERSION;
+}
+
+static void
+ibus_extension_event_destroy (IBusExtensionEvent *event)
+{
+    g_clear_pointer (&event->priv->name, g_free);
+
+    IBUS_OBJECT_CLASS(ibus_extension_event_parent_class)->
+            destroy (IBUS_OBJECT (event));
+}
+
+static void
+ibus_extension_event_set_property (IBusExtensionEvent   *event,
+                                   guint         prop_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+    IBusExtensionEventPrivate *priv = event->priv;
+
+    switch (prop_id) {
+    case PROP_NAME:
+        g_free (priv->name);
+        priv->name = g_value_dup_string (value);
+        break;
+    case PROP_IS_ENABLED:
+        priv->is_enabled = g_value_get_boolean (value);
+        break;
+    case PROP_IS_EXTENSION:
+        priv->is_extension = g_value_get_boolean (value);
+        break;
+    case PROP_PARAMS:
+        priv->params = g_value_dup_string (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (event, prop_id, pspec);
+    }
+}
+
+static void
+ibus_extension_event_get_property (IBusExtensionEvent *event,
+                                   guint               prop_id,
+                                   GValue             *value,
+                                   GParamSpec         *pspec)
+{
+    IBusExtensionEventPrivate *priv = event->priv;
+    switch (prop_id) {
+    case PROP_VERSION:
+        g_value_set_uint (value, priv->version);
+        break;
+    case PROP_NAME:
+        g_value_set_string (value, priv->name);
+        break;
+    case PROP_IS_ENABLED:
+        g_value_set_boolean (value, priv->is_enabled);
+        break;
+    case PROP_IS_EXTENSION:
+        g_value_set_boolean (value, priv->is_extension);
+        break;
+    case PROP_PARAMS:
+        g_value_set_string (value, priv->params);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (event, prop_id, pspec);
+    }
+}
+
+static gboolean
+ibus_extension_event_serialize (IBusExtensionEvent *event,
+                                GVariantBuilder    *builder)
+{
+    gboolean retval;
+    IBusExtensionEventPrivate *priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_extension_event_parent_class)->
+            serialize ((IBusSerializable *)event, builder);
+    g_return_val_if_fail (retval, FALSE);
+    /* End dict iter */
+
+    priv = event->priv;
+#define NOTNULL(s) ((s) != NULL ? (s) : "")
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_builder_add (builder, "u", priv->version);
+    g_variant_builder_add (builder, "s", NOTNULL (priv->name));
+    g_variant_builder_add (builder, "b", priv->is_enabled);
+    g_variant_builder_add (builder, "b", priv->is_extension);
+    g_variant_builder_add (builder, "s", NOTNULL (priv->params));
+#undef NOTNULL
+
+    return TRUE;
+}
+
+static gint
+ibus_extension_event_deserialize (IBusExtensionEvent *event,
+                                  GVariant           *variant)
+{
+    gint retval;
+    IBusExtensionEventPrivate *priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_extension_event_parent_class)->
+            deserialize ((IBusSerializable *)event, variant);
+    g_return_val_if_fail (retval, 0);
+
+    priv = event->priv;
+    /* If you will add a new property, you can append it at the end and
+     * you should not change the serialized order of name, longname,
+     * description, ... because the order is also used in other applications
+     * likes ibus-qt. */
+    g_variant_get_child (variant, retval++, "u", &priv->version);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &priv->name);
+    g_variant_get_child (variant, retval++, "b", &priv->is_enabled);
+    g_variant_get_child (variant, retval++, "b", &priv->is_extension);
+    ibus_g_variant_get_child_string (variant, retval++,
+                                     &priv->params);
+
+    return retval;
+}
+
+static gboolean
+ibus_extension_event_copy (IBusExtensionEvent       *dest,
+                           const IBusExtensionEvent *src)
+{
+    gboolean retval;
+    IBusExtensionEventPrivate *dest_priv = dest->priv;
+    IBusExtensionEventPrivate *src_priv = src->priv;
+
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_extension_event_parent_class)->
+            copy ((IBusSerializable *)dest, (IBusSerializable *)src);
+    g_return_val_if_fail (retval, FALSE);
+
+    dest_priv->version           = src_priv->version;
+    dest_priv->name              = g_strdup (src_priv->name);
+    dest_priv->is_enabled        = src_priv->is_enabled;
+    dest_priv->is_extension      = src_priv->is_extension;
+    dest_priv->params            = g_strdup (src_priv->params);
+    return TRUE;
+}
+
+IBusExtensionEvent *
+ibus_extension_event_new (const gchar   *first_property_name,
+                          ...)
+{
+    va_list var_args;
+    IBusExtensionEvent *event;
+
+    va_start (var_args, first_property_name);
+    event = (IBusExtensionEvent *) g_object_new_valist (
+            IBUS_TYPE_EXTENSION_EVENT,
+            first_property_name,
+            var_args);
+    va_end (var_args);
+    g_assert (event->priv->version != 0);
+    return event;
+}
+
+guint
+ibus_extension_event_get_version (IBusExtensionEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_EXTENSION_EVENT (event), 0);
+    return event->priv->version;
+}
+
+const gchar *
+ibus_extension_event_get_name (IBusExtensionEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_EXTENSION_EVENT (event), "");
+    return event->priv->name;
+}
+
+gboolean
+ibus_extension_event_is_enabled (IBusExtensionEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_EXTENSION_EVENT (event), FALSE);
+    return event->priv->is_enabled;
+}
+
+gboolean
+ibus_extension_event_is_extension (IBusExtensionEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_EXTENSION_EVENT (event), FALSE);
+    return event->priv->is_extension;
+}
+
+const gchar *
+ibus_extension_event_get_params (IBusExtensionEvent *event)
+{
+    g_return_val_if_fail (IBUS_IS_EXTENSION_EVENT (event), "");
+    return event->priv->params;
+}
+
+
 static void
 ibus_x_event_class_init (IBusXEventClass *class)
 {
@@ -454,6 +794,7 @@ static void
 ibus_x_event_destroy (IBusXEvent *event)
 {
     g_clear_pointer (&event->priv->string, g_free);
+    g_clear_pointer (&event->priv->purpose, g_free);
 
     IBUS_OBJECT_CLASS(ibus_x_event_parent_class)->destroy (IBUS_OBJECT (event));
 }
diff --git a/src/ibusxevent.h b/src/ibusxevent.h
index f35f14e45..d44cc8f45 100644
--- a/src/ibusxevent.h
+++ b/src/ibusxevent.h
@@ -29,8 +29,8 @@
 
 /**
  * SECTION: ibusxevent
- * @short_description: XEvent wrapper object
- * @title: IBusXEvent
+ * @short_description: Extension Event wrapper object
+ * @title: IBusExtensionEvent
  * @stability: Unstable
  *
  * An IBusXEvent provides a wrapper of XEvent.
@@ -45,25 +45,150 @@
  */
 
 /* define GOBJECT macros */
-#define IBUS_TYPE_X_EVENT            \
+#define IBUS_TYPE_EXTENSION_EVENT                                       \
+    (ibus_extension_event_get_type ())
+#define IBUS_EXTENSION_EVENT(obj)                                       \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                 \
+                                 IBUS_TYPE_EXTENSION_EVENT,             \
+                                 IBusExtensionEvent))
+#define IBUS_EXTENSION_EVENT_CLASS(klass)                               \
+    (G_TYPE_CHECK_CLASS_CAST ((klass),                                  \
+                              IBUS_TYPE_EXTENSION_EVENT,                \
+                              IBusExtensionEventClass))
+#define IBUS_IS_EXTENSION_EVENT(obj)                                    \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_EXTENSION_EVENT))
+#define IBUS_IS_EXTENSION_EVENT_CLASS(klass)                            \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_EXTENSION_EVENT))
+#define IBUS_EXTENSION_EVENT_GET_CLASS(obj)                             \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj),                                  \
+                                IBUS_TYPE_EXTENSION_EVENT,              \
+                                IBusExtensionEventClass))
+
+#define IBUS_TYPE_X_EVENT                                               \
     (ibus_x_event_get_type ())
-#define IBUS_X_EVENT(obj)            \
+#define IBUS_X_EVENT(obj)                                               \
     (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_TYPE_X_EVENT, IBusXEvent))
-#define IBUS_X_EVENT_CLASS(klass)    \
+#define IBUS_X_EVENT_CLASS(klass)                                       \
     (G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_TYPE_X_EVENT, IBusXEventClass))
-#define IBUS_IS_X_EVENT(obj)         \
+#define IBUS_IS_X_EVENT(obj)                                            \
     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_TYPE_X_EVENT))
-#define IBUS_IS_X_EVENT_CLASS(klass) \
+#define IBUS_IS_X_EVENT_CLASS(klass)                                    \
     (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_TYPE_X_EVENT))
-#define IBUS_X_EVENT_GET_CLASS(obj)  \
+#define IBUS_X_EVENT_GET_CLASS(obj)                                     \
     (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_TYPE_X_EVENT, IBusXEventClass))
 
 G_BEGIN_DECLS
 
+typedef struct _IBusProcessKeyEventData IBusProcessKeyEventData;
+typedef struct _IBusExtensionEvent IBusExtensionEvent;
+typedef struct _IBusExtensionEventClass IBusExtensionEventClass;
+typedef struct _IBusExtensionEventPrivate IBusExtensionEventPrivate;
 typedef struct _IBusXEvent IBusXEvent;
 typedef struct _IBusXEventClass IBusXEventClass;
 typedef struct _IBusXEventPrivate IBusXEventPrivate;
 
+/**
+ * IBusProcessKeyEventData:
+ *
+ * IBuProcessKeyEventData properties.
+ */
+struct _IBusProcessKeyEventData {
+    /*< public >*/
+    guint keyval;
+    guint keycode;
+    guint state;
+};
+
+/**
+ * IBusExtensionEvent:
+ *
+ * IBusExtensionEvent properties.
+ */
+struct _IBusExtensionEvent {
+    /*< private >*/
+    IBusSerializable parent;
+    IBusExtensionEventPrivate *priv;
+
+    /* instance members */
+    /*< public >*/
+};
+
+struct _IBusExtensionEventClass {
+    /*< private >*/
+    IBusSerializableClass parent;
+
+    /* class members */
+    /*< public >*/
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[10];
+};
+
+
+GType              ibus_extension_event_get_type    (void);
+
+/**
+ * ibus_extension_event_new:
+ * @first_property_name: Name of the first property.
+ * @...: the NULL-terminated arguments of the properties and values.
+ *
+ * Create a new #IBusExtensionEvent.
+ *
+ * Returns: A newly allocated #IBusExtensionEvent. E.g.
+ * ibus_extension_event_new ("name", "emoji", "is-enabled", TRUE, NULL);
+ */
+IBusExtensionEvent *ibus_extension_event_new        (const gchar
+                                                           *first_property_name,
+                                                     ...);
+
+/**
+ * ibus_extension_event_get_version:
+ * @event: An #IBusExtensionEvent.
+ *
+ * Returns: Version of #IBusExtensionEvent
+ */
+guint              ibus_extension_event_get_version (IBusExtensionEvent *event);
+
+/**
+ * ibus_extension_event_get_purpose:
+ * @event: An #IBusExtensionEvent.
+ *
+ * Returns: name of the extension for #IBusXEvent
+ */
+const gchar *      ibus_extension_event_get_name    (IBusExtensionEvent *event);
+
+/**
+ * ibus_extension_event_is_enabled:
+ * @event: An #IBusExtensionEvent.
+ *
+ * Returns: %TRUE if the extension is enabled for #IBusExtensionEvent
+ */
+gboolean           ibus_extension_event_is_enabled  (IBusExtensionEvent *event);
+
+/**
+ * ibus_extension_event_is_extension:
+ * @event: An #IBusExtensionEvent.
+ *
+ * Returns: %TRUE if the #IBusExtensionEvent is called by an extension.
+ * %FALSE if the #IBusExtensionEvent is called by an active engine or
+ * panel.
+ * If this value is %TRUE, the event is send to ibus-daemon, an active
+ * engine. If it's %FALSE, the event is sned to ibus-daemon, panels.
+ */
+gboolean           ibus_extension_event_is_extension
+                                                    (IBusExtensionEvent *event);
+
+/**
+ * ibus_extension_event_get_params:
+ * @event: An #IBusExtensionEvent.
+ *
+ * Returns: Parameters to enable the extension for #IBusXEvent
+ */
+const gchar *      ibus_extension_event_get_params  (IBusExtensionEvent *event);
+
+
+
 typedef enum {
     IBUS_X_EVENT_NOTHING           = -1,
     IBUS_X_EVENT_KEY_PRESS         = 0,
@@ -76,7 +201,7 @@ typedef enum {
  * IBusXEvent:
  * @type: event type
  *
- * IBusEngine properties.
+ * IBusXEvent properties.
  */
 struct _IBusXEvent {
     /*< private >*/
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index bf9f98d76..aaba7a4d8 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -78,6 +78,7 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=config \
 	--pkg=xi \
+	--pkg=gdk-wayland \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
@@ -176,6 +177,7 @@ ibus_ui_emojier_VALASOURCES =                   \
     emojier.vala                                \
     iconwidget.vala                             \
     separator.vala                              \
+    pango.vala                                  \
     $(NULL)
 ibus_ui_emojier_SOURCES =                       \
     $(ibus_ui_emojier_VALASOURCES:.vala=.c)     \
@@ -213,6 +215,7 @@ ibus_extension_gtk3_VALASOURCES =               \
     iconwidget.vala                             \
     keybindingmanager.vala                      \
     panelbinding.vala                           \
+    pango.vala                                  \
     $(NULL)
 ibus_extension_gtk3_SOURCES =                   \
     $(ibus_extension_gtk3_VALASOURCES:.vala=.c) \
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 0c0865f17..cd98c9d78 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -226,43 +226,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
         }
     }
-    private class ETitleLabelBox : Gtk.HeaderBar {
-        private Gtk.Label m_lang_label;
-        private Gtk.Label m_title_label;
-
-        public ETitleLabelBox(string title) {
-            GLib.Object(
-                name : "IBusEmojierTitleLabelBox",
-                show_close_button: true,
-                decoration_layout: ":close",
-                title: title
-            );
-            var vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-            set_custom_title(vbox);
-            m_title_label = new Gtk.Label(title);
-            m_title_label.get_style_context().add_class(Gtk.STYLE_CLASS_TITLE);
-            vbox.pack_start(m_title_label, true, false, 0);
-            m_lang_label = new Gtk.Label(null);
-            m_lang_label.get_style_context().add_class(
-                    Gtk.STYLE_CLASS_SUBTITLE);
-            vbox.pack_start(m_lang_label, true, false, 0);
-
-            var menu = new GLib.Menu();
-            menu.append(_("Show emoji variants"), "win.variant");
-            var menu_button = new Gtk.MenuButton();
-            menu_button.set_direction(Gtk.ArrowType.NONE);
-            menu_button.set_valign(Gtk.Align.CENTER);
-            menu_button.set_menu_model(menu);
-            menu_button.set_tooltip_text(_("Menu"));
-            pack_end(menu_button);
-        }
-        public new void set_title(string title) {
-            m_title_label.set_text(title);
-        }
-        public void set_lang_label(string str) {
-            m_lang_label.set_text(str);
-        }
-    }
     private class LoadProgressObject : GLib.Object {
         public LoadProgressObject() {
         }
@@ -275,6 +238,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         BACKWARD,
     }
 
+    public const uint BUTTON_CLOSE_BUTTON = 1000;
+
     private const uint EMOJI_GRID_PAGE = 10;
     private const string EMOJI_CATEGORY_FAVORITES = N_("Favorites");
     private const string EMOJI_CATEGORY_OTHERS = N_("Others");
@@ -313,11 +278,19 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private static bool m_show_unicode = false;
     private static LoadProgressObject m_unicode_progress_object;
     private static bool m_loaded_unicode = false;
+    private static string m_warning_message = "";
 
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
-    private ETitleLabelBox m_title;
     private EEntry m_entry;
+    /* If emojier is emoji category list or Unicode category list,
+     * m_annotation is "" and preedit is also "".
+     * If emojier is candidate mode, m_annotation is an annotation and
+     * get_current_candidate() returns the current emoji.
+     * But the current preedit can be "" in candidate mode in case that
+     * Unicode candidate window has U+0000.
+     */
+    private string m_annotation = "";
     private string? m_backward;
     private int m_backward_index = -1;
     private EScrolledWindow? m_scrolled_window = null;
@@ -326,8 +299,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private string m_input_context_path = "";
     private GLib.MainLoop? m_loop;
     private string? m_result;
-    private string? m_unicode_point = null;
+    /* If m_candidate_panel_is_visible is true, emojier is candidate mode and
+     * the emoji lookup window is visible.
+     * If m_candidate_panel_is_visible is false, the emoji lookup window is
+     * not visible but the mode is not clear.
+     */
     private bool m_candidate_panel_is_visible;
+    /* If m_candidate_panel_mode is true, emojier is candidate mode and
+     * it does not depend on whether the window is visible or not.
+     * I.E. the first candidate does not show the lookup window and the
+     * second one shows the window.
+     * If m_candidate_panel_mode is false, emojier is emoji category list or
+     * Unicode category list.
+     */
+    private bool m_candidate_panel_mode;
     private int m_category_active_index = -1;
     private IBus.LookupTable m_lookup_table;
     private Gtk.Label[] m_candidates;
@@ -337,23 +322,18 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     protected static double m_mouse_x;
     protected static double m_mouse_y;
     private Gtk.ProgressBar m_unicode_progress_bar;
+    private uint m_unicode_progress_id;
     private Gtk.Label m_unicode_percent_label;
     private double m_unicode_percent;
+    private Gdk.Rectangle m_cursor_location;
+    private bool m_is_up_side_down = false;
+    private uint m_redraw_window_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
 
     public IBusEmojier() {
         GLib.Object(
-            type : Gtk.WindowType.TOPLEVEL,
-            events : Gdk.EventMask.KEY_PRESS_MASK |
-                     Gdk.EventMask.KEY_RELEASE_MASK |
-                     Gdk.EventMask.BUTTON_PRESS_MASK |
-                     Gdk.EventMask.BUTTON_RELEASE_MASK,
-            window_position : Gtk.WindowPosition.CENTER,
-            icon_name: "ibus-setup",
-            accept_focus : true,
-            resizable : true,
-            focus_visible : true
+            type : Gtk.WindowType.POPUP
         );
 
         // GLib.ActionEntry accepts const variables only.
@@ -363,6 +343,9 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 new GLib.Variant.boolean(m_show_emoji_variant));
         action.activate.connect(check_action_variant_cb);
         add_action(action);
+        action = new GLib.SimpleAction("close", null);
+        action.activate.connect(action_close_cb);
+        add_action(action);
         if (m_current_lang_id == null)
             m_current_lang_id = "en";
         if (m_emoji_font_family == null)
@@ -448,14 +431,12 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 css_provider,
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        m_title = new ETitleLabelBox(_("Emoji Choice"));
-        set_titlebar(m_title);
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
 
         m_entry = new EEntry();
         m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
-        m_vbox.add(m_entry);
+        //m_vbox.add(m_entry);
         m_entry.changed.connect(() => {
             update_candidate_window();
         });
@@ -480,10 +461,16 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 m_loop.quit();
         });
 
+        size_allocate.connect((w, a) => {
+            adjust_window_position();
+        });
+
         candidate_clicked.connect((i, b, s) => {
-            candidate_panel_select_index(i);
+            if (m_input_context_path != "")
+                candidate_panel_select_index(i, b);
         });
 
+
         if (m_annotation_to_emojis_dict == null) {
             reload_emoji_dict();
         }
@@ -814,6 +801,12 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
 
     private void remove_all_children() {
+        if (m_list_box != null) {
+            foreach (Gtk.Widget w in m_list_box.get_children()) {
+                w.destroy();
+            }
+            m_list_box = null;
+        }
         foreach (Gtk.Widget w in m_vbox.get_children()) {
             if (w.name == "IBusEmojierEntry" ||
                 w.name == "IBusEmojierTitleLabelBox") {
@@ -824,15 +817,40 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private void clamp_page() {
+        Gtk.ListBoxRow row;
+        if (m_category_active_index >= 0) {
+            row = m_list_box.get_row_at_index(m_category_active_index);
+            m_list_box.select_row(row);
+        } else {
+            row = m_list_box.get_row_at_index(0);
+        }
+        Gtk.Allocation alloc = { 0, 0, 0, 0 };
+        row.get_allocation(out alloc);
+        var adjustment = m_scrolled_window.get_vadjustment();
+        adjustment.clamp_page(alloc.y, alloc.y + alloc.height);
+        return_val_if_fail(m_category_active_index >= 0, false);
+        m_lookup_table.set_cursor_pos((uint)m_category_active_index);
+    }
+
+
     private void show_category_list() {
+        // Do not call remove_all_children() to work adjustment.clamp_page()
+        // with PageUp/Down.
+        // After show_candidate_panel() is called, m_category_active_index
+        // is saved for Escape key but m_list_box is null by
+        // remove_all_children().
+        if (m_category_active_index >= 0 && m_list_box != null) {
+            var row = m_list_box.get_row_at_index(m_category_active_index);
+            m_list_box.select_row(row);
+            return;
+        }
+        if (m_category_active_index < 0)
+            m_category_active_index = 0;
         remove_all_children();
         m_scrolled_window = new EScrolledWindow();
         set_fixed_size();
 
-        m_title.set_title(_("Emoji Choice"));
-        string language =
-            IBus.get_language_name(m_current_lang_id);
-        m_title.set_lang_label(language);
         m_vbox.add(m_scrolled_window);
         Gtk.Viewport viewport = new Gtk.Viewport(null, null);
         m_scrolled_window.add(viewport);
@@ -842,53 +860,21 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
         m_list_box.set_adjustment(adjustment);
         m_list_box.row_activated.connect((box, gtkrow) => {
-            m_category_active_index = -1;
+            m_category_active_index = gtkrow.get_index();
             EBoxRow row = gtkrow as EBoxRow;
             show_emoji_for_category(row.text);
+            show_all();
         });
 
-        uint n = 0;
-        if (m_favorites.length > 0) {
-            EBoxRow row = new EBoxRow(EMOJI_CATEGORY_FAVORITES);
-            EPaddedLabelBox widget =
-                    new EPaddedLabelBox(_(EMOJI_CATEGORY_FAVORITES),
-                                        Gtk.Align.CENTER);
-            row.add(widget);
-            m_list_box.add(row);
-            if (n++ == m_category_active_index)
-                m_list_box.select_row(row);
-        }
-        GLib.List<unowned string> categories =
-                m_category_to_emojis_dict.get_keys();
-        // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
-        categories.sort((a, b) => {
-            if (a == EMOJI_CATEGORY_OTHERS && b != EMOJI_CATEGORY_OTHERS)
-                return 1;
-            else if (a != EMOJI_CATEGORY_OTHERS && b == EMOJI_CATEGORY_OTHERS)
-                return -1;
-            return GLib.strcmp(_(a), _(b));
-        });
-        foreach (unowned string category in categories) {
-            // "Others" category includes next unicode chars and fonts do not support
-            // the base and varints yet.
-            if (category == EMOJI_CATEGORY_OTHERS)
-               continue;
+        uint ncandidates = m_lookup_table.get_number_of_candidates();
+        for (uint i = 0; i < ncandidates; i++) {
+            string category = m_lookup_table.get_candidate(i).text;
             EBoxRow row = new EBoxRow(category);
             EPaddedLabelBox widget =
                     new EPaddedLabelBox(_(category), Gtk.Align.CENTER);
             row.add(widget);
             m_list_box.add(row);
-            if (n++ == m_category_active_index)
-                m_list_box.select_row(row);
-        }
-        if (m_unicode_block_list.length() > 0) {
-            EBoxRow row = new EBoxRow(EMOJI_CATEGORY_UNICODE);
-            EPaddedLabelBox widget =
-                    new EPaddedLabelBox(_(EMOJI_CATEGORY_UNICODE),
-                                        Gtk.Align.CENTER);
-            row.add(widget);
-            m_list_box.add(row);
-            if (n++ == m_category_active_index)
+            if (i == m_category_active_index)
                 m_list_box.select_row(row);
         }
 
@@ -903,6 +889,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private void show_emoji_for_category(string category) {
         if (category == EMOJI_CATEGORY_FAVORITES) {
             m_lookup_table.clear();
+            m_candidate_panel_mode = true;
             foreach (unowned string favorate in m_favorites) {
                 IBus.Text text = new IBus.Text.from_string(favorate);
                 m_lookup_table.append_candidate(text);
@@ -911,25 +898,26 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         } else if (category == EMOJI_CATEGORY_UNICODE) {
             m_category_active_index = -1;
             m_show_unicode = true;
-            show_unicode_blocks();
+            update_unicode_blocks();
             return;
         } else {
             unowned GLib.SList<unowned string> emojis =
                     m_category_to_emojis_dict.lookup(category);
             m_lookup_table.clear();
+            m_candidate_panel_mode = true;
             foreach (unowned string emoji in emojis) {
                 IBus.Text text = new IBus.Text.from_string(emoji);
                 m_lookup_table.append_candidate(text);
             }
             m_backward = category;
         }
+        m_annotation = m_lookup_table.get_candidate(0).text;
         // Restore the cursor position before the special table of
         // emoji variants is shown.
         if (m_backward_index >= 0) {
             m_lookup_table.set_cursor_pos((uint)m_backward_index);
             m_backward_index = -1;
         }
-        show_candidate_panel();
     }
 
 
@@ -940,18 +928,28 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             IBus.Text text = new IBus.Text.from_string(emoji);
             m_lookup_table.append_candidate(text);
         }
-        show_candidate_panel();
     }
 
 
     private void show_unicode_blocks() {
+        // Do not call remove_all_children() to work adjustment.clamp_page()
+        // with PageUp/Down.
+        // After show_candidate_panel() is called, m_category_active_index
+        // is saved for Escape key but m_list_box is null by
+        // remove_all_children().
+        if (m_category_active_index >= 0 && m_list_box != null) {
+            var row = m_list_box.get_row_at_index(m_category_active_index);
+            m_list_box.select_row(row);
+            return;
+        }
+        if (m_category_active_index < 0)
+            m_category_active_index = 0;
         m_show_unicode = true;
         if (m_default_window_width == 0 && m_default_window_height == 0)
             get_size(out m_default_window_width, out m_default_window_height);
         remove_all_children();
         set_fixed_size();
 
-        m_title.set_title(_("Unicode Choice"));
         EPaddedLabelBox label =
                 new EPaddedLabelBox(_("Bring back emoji choice"),
                                     Gtk.Align.CENTER,
@@ -964,10 +962,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             m_category_active_index = -1;
             m_show_unicode = false;
             hide_candidate_panel();
+            show_all();
             return true;
         });
         m_scrolled_window = new EScrolledWindow();
-        m_title.set_lang_label("");
         m_vbox.add(m_scrolled_window);
         Gtk.Viewport viewport = new Gtk.Viewport(null, null);
         m_scrolled_window.add(viewport);
@@ -977,9 +975,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         Gtk.Adjustment adjustment = m_scrolled_window.get_vadjustment();
         m_list_box.set_adjustment(adjustment);
         m_list_box.row_activated.connect((box, gtkrow) => {
-            m_category_active_index = -1;
+            m_category_active_index = gtkrow.get_index();
             EBoxRow row = gtkrow as EBoxRow;
             show_unicode_for_block(row.text);
+            show_candidate_panel();
         });
 
         uint n = 0;
@@ -1007,44 +1006,18 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             m_list_box.unselect_all();
         m_list_box.invalidate_filter();
         m_list_box.set_selection_mode(Gtk.SelectionMode.SINGLE);
+        Gtk.ListBoxRow row = m_list_box.get_row_at_index((int)n - 1);
+
+        // If clamp_page() would be called without the allocation signal,
+        // the jumping page could be failed when returns from 
+        // show_unicode_for_block() with Escape key.
+        row.size_allocate.connect((w, a) => {
+            clamp_page();
+        });
     }
 
+
     private void show_unicode_for_block(string block_name) {
-        if (!m_loaded_unicode) {
-            remove_all_children();
-            set_fixed_size();
-            m_unicode_progress_bar = new Gtk.ProgressBar();
-            m_unicode_progress_bar.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
-            m_unicode_progress_bar.set_halign(Gtk.Align.CENTER);
-            m_unicode_progress_bar.set_valign(Gtk.Align.CENTER);
-            m_vbox.add(m_unicode_progress_bar);
-            m_unicode_progress_bar.show();
-            var hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
-            hbox.set_halign(Gtk.Align.CENTER);
-            hbox.set_valign(Gtk.Align.CENTER);
-            m_vbox.add(hbox);
-            var label = new Gtk.Label(_("Loading a Unicode dictionary:"));
-            hbox.pack_start(label, false, true, 0);
-            m_unicode_percent_label = new Gtk.Label("");
-            hbox.pack_start(m_unicode_percent_label, false, true, 0);
-            hbox.show_all();
-
-            m_unicode_progress_object.deserialize_unicode.connect((i, n) => {
-                m_unicode_percent = (double)i / n;
-            });
-            GLib.Timeout.add(100, () => {
-                m_unicode_progress_bar.set_fraction(m_unicode_percent);
-                m_unicode_percent_label.set_text(
-                        "%.0f%%\n".printf(m_unicode_percent * 100));
-                m_unicode_progress_bar.show();
-                m_unicode_percent_label.show();
-                if (m_loaded_unicode) {
-                    show_unicode_for_block(block_name);
-                }
-                return !m_loaded_unicode;
-            });
-            return;
-        }
         unichar start = 0;
         unichar end = 0;
         foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
@@ -1055,6 +1028,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
         }
         m_lookup_table.clear();
+        m_candidate_panel_mode = true;
         for (unichar ch = start; ch < end; ch++) {
             unowned IBus.UnicodeData? data =
                     m_unicode_to_data_dict.lookup(ch);
@@ -1064,7 +1038,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             m_lookup_table.append_candidate(text);
         }
         m_backward = block_name;
-        show_candidate_panel();
+        m_annotation = m_lookup_table.get_candidate(0).text;
     }
 
 
@@ -1091,6 +1065,41 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         prev_button.set_relief(Gtk.ReliefStyle.NONE);
         prev_button.set_tooltip_text(_("Page Up"));
 
+        var menu = new GLib.Menu();
+        menu.append(_("Show emoji variants"), "win.variant");
+        menu.append(_("Close"), "win.close");
+        var menu_button = new Gtk.MenuButton();
+        menu_button.set_direction(Gtk.ArrowType.NONE);
+        menu_button.set_valign(Gtk.Align.CENTER);
+        menu_button.set_menu_model(menu);
+        menu_button.set_relief(Gtk.ReliefStyle.NONE);
+        menu_button.set_tooltip_text(_("Menu"));
+
+        IBus.Text text = this.get_title_text();
+        Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(text);
+        Gtk.Label title_label = new Gtk.Label(text.get_text());
+        title_label.set_attributes(attrs);
+
+        Gtk.Button? warning_button = null;
+        if (m_warning_message != "") { 
+            warning_button = new Gtk.Button();
+            warning_button.set_tooltip_text(
+                    _("Click to view a warning message"));
+            warning_button.set_image(new Gtk.Image.from_icon_name(
+                                  "dialog-warning",
+                                  Gtk.IconSize.MENU));
+            warning_button.set_relief(Gtk.ReliefStyle.NONE);
+            warning_button.clicked.connect(() => {
+                Gtk.Label warning_label = new Gtk.Label(m_warning_message);
+                warning_label.set_line_wrap(true);
+                warning_label.set_max_width_chars(40);
+                Gtk.Popover popover = new Gtk.Popover(warning_button);
+                popover.add(warning_label);
+                popover.show_all();
+                popover.popup();
+            });
+        }
+
         Gtk.Box buttons_hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
         Gtk.Label state_label = new Gtk.Label(null);
         state_label.set_size_request(10, -1);
@@ -1099,14 +1108,55 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         buttons_hbox.pack_start(state_label, false, true, 0);
         buttons_hbox.pack_start(prev_button, false, false, 0);
         buttons_hbox.pack_start(next_button, false, false, 0);
+        buttons_hbox.pack_start(title_label, false, false, 0);
+        if (warning_button != null)
+            buttons_hbox.pack_start(warning_button, false, false, 0);
+        buttons_hbox.pack_end(menu_button, false, false, 0);
         m_vbox.pack_start(buttons_hbox, false, false, 0);
         buttons_hbox.show_all();
     }
 
 
-    private bool check_unicode_point() {
-        string annotation = m_entry.get_text();
-        m_unicode_point = null;
+    private void show_unicode_progress_bar() {
+        m_unicode_progress_bar = new Gtk.ProgressBar();
+        m_unicode_progress_bar.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
+        m_unicode_progress_bar.set_halign(Gtk.Align.CENTER);
+        m_unicode_progress_bar.set_valign(Gtk.Align.CENTER);
+        m_vbox.add(m_unicode_progress_bar);
+        m_unicode_progress_bar.show();
+        var hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
+        hbox.set_halign(Gtk.Align.CENTER);
+        hbox.set_valign(Gtk.Align.CENTER);
+        m_vbox.add(hbox);
+        var label = new Gtk.Label(_("Loading a Unicode dictionary:"));
+        hbox.pack_start(label, false, true, 0);
+        m_unicode_percent_label = new Gtk.Label("");
+        hbox.pack_start(m_unicode_percent_label, false, true, 0);
+        hbox.show_all();
+
+        m_unicode_progress_object.deserialize_unicode.connect((i, n) => {
+            m_unicode_percent = (double)i / n;
+        });
+        if (m_unicode_progress_id > 0) {
+            GLib.Source.remove(m_unicode_progress_id);
+        }
+        m_unicode_progress_id = GLib.Timeout.add(100, () => {
+            m_unicode_progress_id = 0;
+            m_unicode_progress_bar.set_fraction(m_unicode_percent);
+            m_unicode_percent_label.set_text(
+                    "%.0f%%\n".printf(m_unicode_percent * 100));
+            m_unicode_progress_bar.show();
+            m_unicode_percent_label.show();
+            if (m_loaded_unicode) {
+                show_candidate_panel();
+            }
+            return !m_loaded_unicode;
+        });
+    }
+
+
+    private static string? check_unicode_point(string annotation) {
+        string unicode_point = null;
         // Add "0x" because uint64.ascii_strtoull() is not accessible
         // and need to use uint64.parse()
         var buff = new GLib.StringBuilder("0x");
@@ -1114,33 +1164,31 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         for (int i = 0; i < annotation.char_count(); i++) {
             unichar ch = annotation.get_char(i);
             if (ch == 0)
-                return false;
+                return null;
             if (ch.isspace()) {
                 unichar code = (unichar)uint64.parse(buff.str);
                 buff.assign("0x");
                 if (!code.validate())
-                    return false;
+                    return null;
                 retval.append(code.to_string());
                 continue;
             }
             if (!ch.isxdigit())
-                return false;
+                return null;
             buff.append_unichar(ch);
         }
         unichar code = (unichar)uint64.parse(buff.str);
         if (!code.validate())
-            return false;
+            return null;
         retval.append(code.to_string());
-        m_unicode_point = retval.str;
-        if (m_unicode_point == null)
-            return true;
-        IBus.Text text = new IBus.Text.from_string(m_unicode_point);
-        m_lookup_table.append_candidate(text);
-        return true;
+        unicode_point = retval.str;
+        if (unicode_point == null)
+            return null;
+        return unicode_point;
     }
 
 
-    private GLib.SList<string>?
+    private static GLib.SList<string>?
     lookup_emojis_from_annotation(string annotation) {
         GLib.SList<string>? total_emojis = null;
         unowned GLib.SList<string>? sub_emojis = null;
@@ -1221,19 +1269,19 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         return total_emojis;
     }
 
+
     private void update_candidate_window() {
-        string annotation = m_entry.get_text();
+        string annotation = m_annotation;
         if (annotation.length == 0) {
-            hide_candidate_panel();
             m_backward = null;
             return;
         }
+        m_lookup_table.clear();
+        m_category_active_index = -1;
         if (annotation.length > m_emoji_max_seq_len) {
-            hide_candidate_panel();
             return;
         }
-        // Call check_unicode_point() to get m_unicode_point
-        check_unicode_point();
+        string? unicode_point = check_unicode_point(annotation);
         GLib.SList<string>? total_emojis =
             lookup_emojis_from_annotation(annotation);
         if (total_emojis == null) {
@@ -1246,18 +1294,75 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             annotation = annotation.down();
             total_emojis = lookup_emojis_from_annotation(annotation);
         }
-        if (total_emojis == null && m_unicode_point == null) {
-            hide_candidate_panel();
+        if (total_emojis == null && unicode_point == null) {
             return;
         }
-        m_lookup_table.clear();
-        // Call check_unicode_point() to update m_lookup_table
-        check_unicode_point();
+        if (unicode_point != null) {
+            IBus.Text text = new IBus.Text.from_string(unicode_point);
+            m_lookup_table.append_candidate(text);
+        }
         foreach (unowned string emoji in total_emojis) {
             IBus.Text text = new IBus.Text.from_string(emoji);
             m_lookup_table.append_candidate(text);
         }
-        show_candidate_panel();
+        m_candidate_panel_is_visible =
+            (m_lookup_table.get_number_of_candidates() > 0) ? true : false;
+        m_candidate_panel_mode = true;
+    }
+
+
+    private void update_category_list() {
+        // Always update m_lookup_table even if the contents are same
+        // because m_category_active_index needs to be kept after
+        // bring back this API from show_emoji_for_category().
+        reset_window_mode();
+        m_lookup_table.clear();
+        IBus.Text text;
+        if (m_favorites.length > 0) {
+            text = new IBus.Text.from_string(EMOJI_CATEGORY_FAVORITES);
+            m_lookup_table.append_candidate(text);
+        }
+        GLib.List<unowned string> categories =
+                m_category_to_emojis_dict.get_keys();
+        // FIXME: How to cast GLib.CompareFunc<string> to strcmp?
+        categories.sort((a, b) => {
+            if (a == EMOJI_CATEGORY_OTHERS && b != EMOJI_CATEGORY_OTHERS)
+                return 1;
+            else if (a != EMOJI_CATEGORY_OTHERS && b == EMOJI_CATEGORY_OTHERS)
+                return -1;
+            return GLib.strcmp(_(a), _(b));
+        });
+        foreach (unowned string category in categories) {
+            // "Others" category includes next unicode chars and fonts do not
+            // support the base and varints yet.
+            if (category == EMOJI_CATEGORY_OTHERS)
+               continue;
+            text = new IBus.Text.from_string(category);
+            m_lookup_table.append_candidate(text);
+        }
+        if (m_unicode_block_list.length() > 0) {
+            text = new IBus.Text.from_string(EMOJI_CATEGORY_UNICODE);
+            m_lookup_table.append_candidate(text);
+        }
+        // Do not set m_category_active_index to 0 here so that
+        // show_category_list() handles it.
+    }
+
+
+    private void update_unicode_blocks() {
+        // Always update m_lookup_table even if the contents are same
+        // because m_category_active_index needs to be kept after
+        // bring back this API from show_emoji_for_category().
+        reset_window_mode();
+        m_lookup_table.clear();
+        m_show_unicode = true;
+        foreach (unowned IBus.UnicodeBlock block in m_unicode_block_list) {
+            string name = block.get_name();
+            IBus.Text text = new IBus.Text.from_string(name);
+            m_lookup_table.append_candidate(text);
+        }
+        // Do not set m_category_active_index to 0 here so that
+        // show_unicode_blocks() handles it.
     }
 
 
@@ -1283,27 +1388,27 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         uint page_size = m_lookup_table.get_page_size();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
         uint cursor = m_lookup_table.get_cursor_pos();
-
         uint page_start_pos = cursor / page_size * page_size;
         uint page_end_pos = uint.min(page_start_pos + page_size, ncandidates);
+        Gtk.Button? backward_button = null;
         if (m_backward != null) {
-            string backward_desc =
-                    "%s (%u / %u)".printf(_(m_backward), cursor, ncandidates - 1);
+            string backward_desc = _(m_backward);
             EPaddedLabelBox label =
                     new EPaddedLabelBox(backward_desc,
                                         Gtk.Align.CENTER,
                                         TravelDirection.BACKWARD);
-            Gtk.Button button = new Gtk.Button();
-            button.add(label);
-            m_vbox.add(button);
-            button.show_all();
-            button.button_press_event.connect((w, e) => {
+            backward_button = new Gtk.Button();
+            backward_button.add(label);
+            backward_button.button_press_event.connect((w, e) => {
                 // Bring back to emoji candidate panel in case
                 // m_show_emoji_variant is enabled and shows variants.
-                if (m_backward_index >= 0 && m_backward != null)
+                if (m_backward_index >= 0 && m_backward != null) {
                     show_emoji_for_category(m_backward);
-                else
+                    show_candidate_panel();
+                } else {
                     hide_candidate_panel();
+                    show_all();
+                }
                 return true;
             });
         }
@@ -1385,34 +1490,60 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         }
         if (n > 0) {
             m_candidate_panel_is_visible = true;
-            show_arrow_buttons();
-            m_vbox.add(grid);
-            grid.show_all();
-            string text = m_lookup_table.get_candidate(cursor).text;
-            unowned IBus.EmojiData? data = m_emoji_to_data_dict.lookup(text);
-            if (data != null) {
-                show_emoji_description(data, text);
-                return;
+            if (!m_is_up_side_down) {
+                show_arrow_buttons();
+                if (backward_button != null) {
+                    m_vbox.add(backward_button);
+                    backward_button.show_all();
+                }
+                m_vbox.add(grid);
+                grid.show_all();
+                show_description();
+                if (!m_loaded_unicode)
+                    show_unicode_progress_bar();
             }
-            if (text.char_count() <= 1) {
-                unichar code = text.get_char();
-                unowned IBus.UnicodeData? udata =
-                        m_unicode_to_data_dict.lookup(code);
-                if (udata != null) {
-                    show_unicode_description(udata, text);
-                    return;
+            if (m_is_up_side_down) {
+                if (!m_loaded_unicode)
+                    show_unicode_progress_bar();
+                show_description();
+                m_vbox.add(grid);
+                grid.show_all();
+                if (backward_button != null) {
+                    m_vbox.add(backward_button);
+                    backward_button.show_all();
                 }
+                show_arrow_buttons();
             }
-            EPaddedLabelBox widget = new EPaddedLabelBox(
-                        _("Description: %s").printf(_("None")),
-                        Gtk.Align.START);
-            m_vbox.add(widget);
-            widget.show_all();
-            show_code_point_description(text);
         }
     }
 
 
+    private void show_description() {
+        uint cursor = m_lookup_table.get_cursor_pos();
+        string text = m_lookup_table.get_candidate(cursor).text;
+        unowned IBus.EmojiData? data = m_emoji_to_data_dict.lookup(text);
+        if (data != null) {
+            show_emoji_description(data, text);
+            return;
+        }
+        if (text.char_count() <= 1) {
+            unichar code = text.get_char();
+            unowned IBus.UnicodeData? udata =
+                    m_unicode_to_data_dict.lookup(code);
+            if (udata != null) {
+                show_unicode_description(udata, text);
+                return;
+            }
+        }
+        EPaddedLabelBox widget = new EPaddedLabelBox(
+                _("Description: %s").printf(_("None")),
+                Gtk.Align.START);
+        m_vbox.add(widget);
+        widget.show_all();
+        show_code_point_description(text);
+    }
+
+
     private void show_emoji_description(IBus.EmojiData data,
                                         string         text) {
         unowned string description = data.get_description();
@@ -1473,14 +1604,17 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
 
     private void hide_candidate_panel() {
+        hide();
         m_enter_notify_enable = true;
-        m_candidate_panel_is_visible = false;
-        if (m_loop.is_running()) {
-            if (m_show_unicode)
-                show_unicode_blocks();
-            else
-                show_category_list();
-        }
+        m_annotation = "";
+        // Call remove_all_children() instead of show_category_list()
+        // so that show_category_list do not remove children with
+        // PageUp/PageDown.
+        remove_all_children();
+        if (m_show_unicode)
+            update_unicode_blocks();
+        else
+            update_category_list();
     }
 
 
@@ -1498,20 +1632,34 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private void candidate_panel_select_index(uint index) {
+    private void candidate_panel_select_index(uint index,
+                                              uint button) {
+        if (button == BUTTON_CLOSE_BUTTON) {
+            hide();
+            if (m_candidate_panel_mode &&
+                m_lookup_table.get_number_of_candidates() > 0) {
+                // Call remove_all_children() instead of show_category_list()
+                // so that show_category_list do not remove children with
+                // PageUp/PageDown.
+                remove_all_children();
+            }
+            m_result = "";
+            return;
+        }
         string text = m_lookup_table.get_candidate(index).text;
         unowned GLib.SList<string>? emojis =
                 m_emoji_to_emoji_variants_dict.lookup(text);
         if (m_show_emoji_variant && emojis != null &&
             m_backward_index < 0) {
             show_emoji_variants(emojis);
+            show_all();
         } else {
             m_result = text;
-            m_loop.quit();
-            hide_candidate_panel();
+            hide();
         }
     }
 
+
     private void candidate_panel_cursor_down() {
         enter_notify_disable_with_timer();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
@@ -1523,7 +1671,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         } else {
             m_lookup_table.set_cursor_pos(0);
         }
-        show_candidate_panel();
     }
 
 
@@ -1541,7 +1688,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         } else {
             m_lookup_table.set_cursor_pos(0);
         }
-        show_candidate_panel();
     }
 
 
@@ -1558,7 +1704,9 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         return page_num;
     }
 
+
     private bool category_list_cursor_move(uint keyval) {
+        return_val_if_fail (m_list_box != null, false);
         GLib.List<weak Gtk.Widget> list = m_list_box.get_children();
         int length = (int)list.length();
         if (length == 0)
@@ -1600,32 +1748,37 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         var row = m_list_box.get_selected_row();
         if (row != null)
             m_list_box.unselect_row(row);
-        if (m_category_active_index >= 0) {
-            row = m_list_box.get_row_at_index(m_category_active_index);
-            m_list_box.select_row(row);
-        } else {
-            row = m_list_box.get_row_at_index(0);
-        }
-        Gtk.Allocation alloc = { 0, 0, 0, 0 };
-        row.get_allocation(out alloc);
-        var adjustment = m_scrolled_window.get_vadjustment();
-        adjustment.clamp_page(alloc.y, alloc.y + alloc.height);
+        clamp_page ();
         return true;
     }
 
 
-    private bool key_press_cursor_horizontal(uint keyval,
-                                             uint modifiers) {
+    public bool has_variants(uint index) {
+        if (index >= m_lookup_table.get_number_of_candidates())
+            return false;
+        string text = m_lookup_table.get_candidate(index).text;
+        unowned GLib.SList<string>? emojis =
+                m_emoji_to_emoji_variants_dict.lookup(text);
+        if (m_show_emoji_variant && emojis != null &&
+            m_backward_index < 0) {
+            show_emoji_variants(emojis);
+            return true;
+        }
+        return false;
+    }
+
+
+    public bool key_press_cursor_horizontal(uint keyval,
+                                            uint modifiers) {
         assert (keyval == Gdk.Key.Left || keyval == Gdk.Key.Right);
 
-        uint ncandidates = m_lookup_table.get_number_of_candidates();
-        if (m_candidate_panel_is_visible && ncandidates > 1) {
+        if (m_candidate_panel_mode &&
+            m_lookup_table.get_number_of_candidates() > 0) {
             enter_notify_disable_with_timer();
             if (keyval == Gdk.Key.Left)
                 m_lookup_table.cursor_up();
             else if (keyval == Gdk.Key.Right)
                 m_lookup_table.cursor_down();
-            show_candidate_panel();
         } else if (m_entry.get_text().length > 0) {
             int step = 0;
             if (keyval == Gdk.Key.Left)
@@ -1650,8 +1803,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private bool key_press_cursor_vertical(uint keyval,
-                                           uint modifiers) {
+    public bool key_press_cursor_vertical(uint keyval,
+                                          uint modifiers) {
         assert (keyval == Gdk.Key.Down || keyval == Gdk.Key.Up ||
                 keyval == Gdk.Key.Page_Down || keyval == Gdk.Key.Page_Up);
 
@@ -1661,8 +1814,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             else if (keyval == Gdk.Key.Up)
                 keyval = Gdk.Key.Page_Up;
         }
-        uint ncandidates = m_lookup_table.get_number_of_candidates();
-        if (m_candidate_panel_is_visible && ncandidates > 1) {
+        if ((m_candidate_panel_is_visible || m_annotation.length > 0)
+            && m_lookup_table.get_number_of_candidates() > 0) {
             switch (keyval) {
             case Gdk.Key.Down:
                 candidate_panel_cursor_down();
@@ -1673,12 +1826,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             case Gdk.Key.Page_Down:
                 enter_notify_disable_with_timer();
                 m_lookup_table.page_down();
-                show_candidate_panel();
                 break;
             case Gdk.Key.Page_Up:
                 enter_notify_disable_with_timer();
                 m_lookup_table.page_up();
-                show_candidate_panel();
                 break;
             }
         } else {
@@ -1688,19 +1839,18 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private bool key_press_cursor_home_end(uint keyval,
-                                           uint modifiers) {
+    public bool key_press_cursor_home_end(uint keyval,
+                                          uint modifiers) {
         assert (keyval == Gdk.Key.Home || keyval == Gdk.Key.End);
 
         uint ncandidates = m_lookup_table.get_number_of_candidates();
-        if (m_candidate_panel_is_visible && ncandidates > 1) {
+        if (m_candidate_panel_mode && ncandidates > 0) {
             enter_notify_disable_with_timer();
             if (keyval == Gdk.Key.Home) {
                 m_lookup_table.set_cursor_pos(0);
             } else if (keyval == Gdk.Key.End) {
                 m_lookup_table.set_cursor_pos(ncandidates - 1);
             }
-            show_candidate_panel();
             return true;
         }
         if (m_entry.get_text().length > 0) {
@@ -1717,44 +1867,41 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                             ? true : false);
             return true;
         }
-        if (!m_candidate_panel_is_visible)
-            return category_list_cursor_move(keyval);
-        return false;
+        return category_list_cursor_move(keyval);
     }
 
 
-    private bool key_press_escape() {
+    public bool key_press_escape() {
         if (m_show_unicode) {
-            if (m_candidate_panel_is_visible) {
-                m_candidate_panel_is_visible = false;
-                show_unicode_blocks();
-                return true;
-            } else {
+            if (!m_candidate_panel_is_visible) {
                 m_show_unicode = false;
                 m_category_active_index = -1;
-                hide_candidate_panel();
-                return true;
             }
+            hide_candidate_panel();
+            return true;
         } else if (m_backward_index >= 0 && m_backward != null) {
             show_emoji_for_category(m_backward);
             return true;
-        } else if (m_candidate_panel_is_visible) {
-            hide_candidate_panel();
-            return true;
-        } else if (m_entry.get_text().length == 0) {
-            m_loop.quit();
+        } else if (m_candidate_panel_is_visible && m_backward != null) {
             hide_candidate_panel();
             return true;
         }
-        m_entry.delete_text(0, -1);
-        return true;
+        hide();
+        if (m_candidate_panel_mode &&
+            m_lookup_table.get_number_of_candidates() > 0) {
+            // Call remove_all_children() instead of show_category_list()
+            // so that show_category_list do not remove children with
+            // PageUp/PageDown.
+            remove_all_children();
+        }
+        return false;
     }
 
 
-    private bool key_press_enter() {
+    public bool key_press_enter() {
         if (m_candidate_panel_is_visible) {
             uint index = m_lookup_table.get_cursor_pos();
-            candidate_panel_select_index(index);
+            return has_variants(index);
         } else if (m_category_active_index >= 0) {
             Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
             EBoxRow row = gtkrow as EBoxRow;
@@ -1789,13 +1936,111 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private Gdk.Rectangle get_monitor_geometry() {
+        Gdk.Rectangle monitor_area = { 0, };
+
+        // Use get_monitor_geometry() instead of get_monitor_area().
+        // get_monitor_area() excludes docks, but the lookup window should be
+        // shown over them.
+#if VALA_0_34
+        Gdk.Monitor monitor = Gdk.Display.get_default().get_monitor_at_point(
+                m_cursor_location.x,
+                m_cursor_location.y);
+        monitor_area = monitor.get_geometry();
+#else
+        Gdk.Screen screen = Gdk.Screen.get_default();
+        int monitor_num = screen.get_monitor_at_point(m_cursor_location.x,
+                                                      m_cursor_location.y);
+        screen.get_monitor_geometry(monitor_num, out monitor_area);
+#endif
+        return monitor_area;
+    }
+
+
+    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;
+        get_allocation(out allocation);
+        Gdk.Point window_right_bottom = {
+            cursor_right_bottom.x + allocation.width,
+            cursor_right_bottom.y + allocation.height
+        };
+
+        Gdk.Rectangle monitor_area = get_monitor_geometry();
+        int monitor_right = monitor_area.x + monitor_area.width;
+        int monitor_bottom = monitor_area.y + monitor_area.height;
+
+        int x, y;
+        if (window_right_bottom.x > monitor_right)
+            x = monitor_right - allocation.width;
+        else
+            x = cursor_right_bottom.x;
+        if (x < 0)
+            x = 0;
+
+        bool changed = false;
+        if (window_right_bottom.y > monitor_bottom) {
+            y = m_cursor_location.y - allocation.height;
+            // Do not up side down in Wayland
+            if (m_input_context_path == "") {
+                changed = (m_is_up_side_down == false);
+                m_is_up_side_down = true;
+            } else {
+                changed = (m_is_up_side_down == true);
+                m_is_up_side_down = false;
+            }
+        } else {
+            y = cursor_right_bottom.y;
+            changed = (m_is_up_side_down == true);
+            m_is_up_side_down = false;
+        }
+        if (y < 0)
+            y = 0;
+
+        move(x, y);
+        if (changed) {
+            if (m_redraw_window_id > 0)
+                GLib.Source.remove(m_redraw_window_id);
+            m_redraw_window_id = GLib.Timeout.add(100, () => {
+                m_redraw_window_id = 0;
+                this.show_all();
+                return false;
+            });
+        }
+    }
+
+
+#if 0
+    private void check_action_variant_cb(Gtk.MenuItem item) {
+        Gtk.CheckMenuItem check = item as Gtk.CheckMenuItem;
+        m_show_emoji_variant = check.get_active();
+        // Redraw emoji candidate panel for m_show_emoji_variant
+        if (m_candidate_panel_is_visible) {
+            // DOTO: queue_draw() does not effect at the real time.
+            this.queue_draw();
+        }
+    }
+#else
     private void check_action_variant_cb(GLib.SimpleAction action,
                                          GLib.Variant?     parameter) {
         m_show_emoji_variant = !action.get_state().get_boolean();
         action.set_state(new GLib.Variant.boolean(m_show_emoji_variant));
         // Redraw emoji candidate panel for m_show_emoji_variant
-        if (m_candidate_panel_is_visible)
-            show_candidate_panel();
+        if (m_candidate_panel_is_visible) {
+            // DOTO: queue_draw() does not effect at the real time.
+            this.queue_draw();
+        }
+    }
+#endif
+
+
+    private void action_close_cb(GLib.SimpleAction action,
+                                 GLib.Variant?     parameter) {
+        candidate_clicked(0, BUTTON_CLOSE_BUTTON, 0);
     }
 
 
@@ -1842,6 +2087,123 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public void set_annotation(string annotation) {
+        m_annotation = annotation;
+        remove_all_children();
+        if (annotation.length > 0) {
+            update_candidate_window();
+        } else {
+            if (m_show_unicode)
+                update_unicode_blocks();
+            else
+                update_category_list();
+        }
+    }
+
+
+    public IBus.LookupTable get_one_dimension_lookup_table() {
+        var lookup_table = new IBus.LookupTable(EMOJI_GRID_PAGE, 0, true, true);
+        uint i = 0;
+        for (; i < m_lookup_table.get_number_of_candidates(); i++) {
+            IBus.Text text = new IBus.Text.from_string("");
+            text.copy(m_lookup_table.get_candidate(i));
+            lookup_table.append_candidate(text);
+        }
+        if (i > 0)
+            lookup_table.set_cursor_pos(m_lookup_table.get_cursor_pos());
+        return lookup_table;
+    }
+
+
+    public uint get_number_of_candidates() {
+        return m_lookup_table.get_number_of_candidates();
+    }
+
+
+    public uint get_cursor_pos() {
+        return m_lookup_table.get_cursor_pos();
+    }
+
+
+    public void set_cursor_pos(uint cursor_pos) {
+        m_lookup_table.set_cursor_pos(cursor_pos);
+    }
+
+
+    public string get_current_candidate() {
+        // If category_list mode, do not show the category name on preedit.
+        // If candidate_panel mode, the first space key does not show the
+        // lookup table but the first candidate is avaiable on preedit.
+        if (!m_candidate_panel_mode)
+            return "";
+        uint cursor = m_lookup_table.get_cursor_pos();
+        return m_lookup_table.get_candidate(cursor).text;
+    }
+
+
+    public IBus.Text get_title_text() {
+        var language = _(IBus.get_language_name(m_current_lang_id));
+        uint ncandidates = this.get_number_of_candidates();
+        string main_title = _("Emoji Choice");
+        if (m_show_unicode)
+            main_title = _("Unicode Choice");
+        var text = new IBus.Text.from_string(
+                "%s (%s) (%u / %u)".printf(
+                        main_title,
+                        language,
+                        this.get_cursor_pos() + 1,
+                        ncandidates));
+        int char_count = text.text.char_count();
+        int start_index = -1;
+        for (int i = 0; i < char_count; i++) {
+            if (text.text.utf8_offset(i).has_prefix(language)) {
+                start_index = i;
+                break;
+            }
+        }
+        if (start_index >= 0) {
+            var attr = new IBus.Attribute(
+                    IBus.AttrType.FOREGROUND,
+                    0x808080,
+                    start_index,
+                    start_index + language.char_count());
+            var attrs = new IBus.AttrList();
+            attrs.append(attr);
+            text.set_attributes(attrs);
+        }
+        return text;
+    }
+
+
+#if 0
+    public GLib.SList<string>? get_candidates() {
+        if (m_annotation.length == 0) {
+            return null;
+        }
+        if (m_annotation.length > m_emoji_max_seq_len) {
+            return null;
+        }
+        string? unicode_point = check_unicode_point(m_annotation);
+        GLib.SList<string>? total_emojis =
+            lookup_emojis_from_annotation(m_annotation);
+        if (total_emojis == null) {
+            /* Users can type title strings against lower case.
+             * E.g. "Smile" against "smile"
+             * But the dictionary has the case sensitive annotations.
+             * E.g. ":D" and ":q"
+             * So need to call lookup_emojis_from_annotation() twice.
+             */
+            string lower_annotation = m_annotation.down();
+            total_emojis = lookup_emojis_from_annotation(lower_annotation);
+        }
+        if (unicode_point != null)
+            total_emojis.prepend(unicode_point);
+        return total_emojis;
+    }
+#endif
+
+
+#if 0
     public string run(string    input_context_path,
                       Gdk.Event event) {
         assert (m_loop == null);
@@ -1915,12 +2277,34 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
         return m_result;
     }
+#endif
 
 
     /* override virtual functions */
-    public override void show() {
-        base.show();
-        set_focus_visible(true);
+    public override void show_all() {
+        base.show_all();
+        if (m_candidate_panel_mode)
+            show_candidate_panel();
+        else if (m_show_unicode)
+            show_unicode_blocks();
+        else
+            show_category_list();
+    }
+
+
+    public override void hide() {
+        base.hide();
+        m_candidate_panel_is_visible = false;
+        // m_candidate_panel_mode is not false in when you type something
+        // during enabling the candidate panel.
+        if (m_redraw_window_id > 0) {
+            GLib.Source.remove(m_redraw_window_id);
+            m_redraw_window_id = 0;
+        }
+        if (m_unicode_progress_id > 0) {
+            GLib.Source.remove(m_unicode_progress_id);
+            m_unicode_progress_id = 0;
+        }
     }
 
 
@@ -1935,11 +2319,16 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         switch (keyval) {
         case Gdk.Key.Escape:
             if (key_press_escape())
-                return true;
-            break;
+                show_all();
+            return true;
         case Gdk.Key.Return:
         case Gdk.Key.KP_Enter:
-            key_press_enter();
+            if (key_press_enter()) {
+                show_all();
+            } else {
+                m_result = get_current_candidate();
+                hide();
+            }
             return true;
         case Gdk.Key.BackSpace:
             if (m_entry.get_text().length > 0) {
@@ -1977,42 +2366,49 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
             else {
                 category_list_cursor_move(Gdk.Key.Down);
+                show_all();
             }
             return true;
         case Gdk.Key.Right:
         case Gdk.Key.KP_Right:
             key_press_cursor_horizontal(Gdk.Key.Right, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Left:
         case Gdk.Key.KP_Left:
             key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Down:
         case Gdk.Key.KP_Down:
             key_press_cursor_vertical(Gdk.Key.Down, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Up:
         case Gdk.Key.KP_Up:
             key_press_cursor_vertical(Gdk.Key.Up, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Page_Down:
         case Gdk.Key.KP_Page_Down:
             key_press_cursor_vertical(Gdk.Key.Page_Down, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Page_Up:
         case Gdk.Key.KP_Page_Up:
             key_press_cursor_vertical(Gdk.Key.Page_Up, modifiers);
+            show_all();
             return true;
         case Gdk.Key.Home:
         case Gdk.Key.KP_Home:
-            if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
-                return true;
-            break;
+            key_press_cursor_home_end(Gdk.Key.Home, modifiers);
+            show_all();
+            return true;
         case Gdk.Key.End:
         case Gdk.Key.KP_End:
-            if (key_press_cursor_home_end(Gdk.Key.End, modifiers))
-                return true;
-            break;
+            key_press_cursor_home_end(Gdk.Key.End, modifiers);
+            show_all();
+            return true;
         case Gdk.Key.Insert:
         case Gdk.Key.KP_Insert:
             GLib.Signal.emit_by_name(m_entry, "toggle-overwrite");
@@ -2023,26 +2419,30 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             switch (keyval) {
             case Gdk.Key.f:
                 key_press_cursor_horizontal(Gdk.Key.Right, modifiers);
+                show_all();
                 return true;
             case Gdk.Key.b:
                 key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
+                show_all();
                 return true;
             case Gdk.Key.n:
             case Gdk.Key.N:
                 key_press_cursor_vertical(Gdk.Key.Down, modifiers);
+                show_all();
                 return true;
             case Gdk.Key.p:
             case Gdk.Key.P:
                 key_press_cursor_vertical(Gdk.Key.Up, modifiers);
+                show_all();
                 return true;
             case Gdk.Key.h:
-                if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
-                    return true;
-                break;
+                key_press_cursor_home_end(Gdk.Key.Home, modifiers);
+                show_all();
+                return true;
             case Gdk.Key.e:
-                if (key_press_cursor_home_end(Gdk.Key.End, modifiers))
-                    return true;
-                break;
+                key_press_cursor_home_end(Gdk.Key.End, modifiers);
+                show_all();
+                return true;
             case Gdk.Key.u:
                 if (m_entry.get_text().length > 0) {
                     GLib.Signal.emit_by_name(m_entry,
@@ -2103,14 +2503,41 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public void set_input_context_path(string input_context_path) {
+        m_input_context_path = input_context_path;
+        if (input_context_path == "") {
+            m_warning_message = _("" +
+                "Failed to get the current text application. " +
+                "Please re-focus your application. E.g. Press Esc key " +
+                "several times to release the emoji typing mode, " +
+                "click your desktop and click your text application again."
+            );
+        } else {
+            m_warning_message = "";
+        }
+    }
+
+
     public string get_selected_string() {
         return m_result;
     }
 
 
+    private void reset_window_mode() {
+        m_backward_index = -1;
+        m_backward = null;
+        m_candidate_panel_is_visible = false;
+        m_candidate_panel_mode = false;
+        // Do not clear m_lookup_table to work with space key later.
+    }
+
+
     public void reset() {
+        reset_window_mode();
         m_input_context_path = "";
         m_result = null;
+        m_category_active_index = -1;
+        m_show_unicode = false;
     }
 
 
@@ -2145,6 +2572,23 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public void set_cursor_location(int x,
+                                    int y,
+                                    int width,
+                                    int height) {
+        Gdk.Rectangle location = Gdk.Rectangle(){
+            x = x, y = y, width = width, height = height };
+        if (m_cursor_location == location)
+            return;
+        m_cursor_location = location;
+    }
+
+
+    public bool is_candidate_panel_mode() {
+        return m_candidate_panel_mode;
+    }
+
+
     public static bool has_loaded_emoji_dict() {
         if (m_emoji_to_data_dict == null)
             return false;
@@ -2165,6 +2609,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public static string get_annotation_lang() {
+        return m_current_lang_id;
+    }
+
     public static void set_emoji_font(string? emoji_font) {
         return_if_fail(emoji_font != null && emoji_font != "");
         Pango.FontDescription font_desc =
@@ -2182,18 +2630,21 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         m_has_partial_match = has_partial_match;
     }
 
+
     public static void set_partial_match_length(int length) {
         if (length < 1)
             return;
         m_partial_match_length = length;
     }
 
+
     public static void set_partial_match_condition(int condition) {
         if (condition < 0)
             return;
         m_partial_match_condition = condition;
     }
 
+
     public static void set_favorites(string[]? unowned_favorites,
                                      string[]? unowned_favorite_annotations) {
         m_favorites = {};
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 9506a9451..787d448f3 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -28,8 +28,9 @@ int partial_match_condition = -1;
 
 public class EmojiApplication : Gtk.Application {
     private IBusEmojier? m_emojier;
-    GLib.Settings m_settings_emoji =
+    private GLib.Settings m_settings_emoji =
             new GLib.Settings("org.freedesktop.ibus.panel.emoji");
+    private ApplicationCommandLine? m_command_line = null;
 
 
     private EmojiApplication() {
@@ -40,25 +41,39 @@ public class EmojiApplication : Gtk.Application {
 
 
     private void show_dialog(ApplicationCommandLine command_line) {
-        m_emojier = new IBusEmojier();
-        // For title handling in gnome-shell
-        add_window(m_emojier);
-        Gdk.Event event = Gtk.get_current_event();
-        // Plasma and GNOME3 desktop returns null event
-        if (event == null) {
-            event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
-            event.key.time = Gdk.CURRENT_TIME;
-            // event.get_seat() refers event.any.window
-            event.key.window = Gdk.get_default_root_window();
-            event.key.window.ref();
+        m_command_line = command_line;
+        m_emojier.reset();
+        m_emojier.set_annotation("");
+        m_emojier.show_all();
+    }
+
+
+    public void candidate_clicked_lookup_table(uint index,
+                                               uint button,
+                                               uint state) {
+        if (m_command_line == null)
+            return;
+        if (button == IBusEmojier.BUTTON_CLOSE_BUTTON) {
+            m_emojier.hide();
+            m_command_line.print("%s\n", _("Canceled to choose an emoji."));
+            m_command_line = null;
+            return;
         }
-        string emoji = m_emojier.run("", event);
-        remove_window(m_emojier);
-        if (emoji == null) {
-            m_emojier = null;
-            command_line.print("%s\n", _("Canceled to choose an emoji."));
+        if (m_emojier == null)
+            return;
+        bool show_candidate = false;
+        uint ncandidates = m_emojier.get_number_of_candidates();
+        if (ncandidates > 0 && ncandidates >= index) {
+            m_emojier.set_cursor_pos(index);
+            show_candidate = m_emojier.has_variants(index);
+        } else {
+            return;
+        }
+        if (show_candidate) {
             return;
         }
+        string emoji = m_emojier.get_current_candidate();
+        m_emojier.hide();
         Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
         clipboard.set_text(emoji, -1);
         clipboard.store();
@@ -75,9 +90,8 @@ public class EmojiApplication : Gtk.Application {
             emojier_favorites += emoji;
             m_settings_emoji.set_strv("favorites", emojier_favorites);
         }
-
-        m_emojier = null;
-        command_line.print("%s\n", _("Copied an emoji to your clipboard."));
+        m_command_line.print("%s\n", _("Copied an emoji to your clipboard."));
+        m_command_line = null;
     }
 
 
@@ -88,7 +102,7 @@ public class EmojiApplication : Gtk.Application {
     }
 
 
-    private int _command_line (ApplicationCommandLine command_line) {
+    private int _command_line(ApplicationCommandLine command_line) {
         // Set default font size
         IBusEmojier.set_emoji_font(m_settings_emoji.get_string("font"));
 
@@ -181,13 +195,22 @@ public class EmojiApplication : Gtk.Application {
 
         IBusEmojier.load_unicode_dict();
 
+        if (m_emojier == null) {
+            m_emojier = new IBusEmojier();
+            // For title handling in gnome-shell
+            add_window(m_emojier);
+            m_emojier.candidate_clicked.connect((i, b, s) => {
+                candidate_clicked_lookup_table(i, b, s);
+            });
+        }
+
         activate_dialog(command_line);
 
         return Posix.EXIT_SUCCESS;
     }
 
 
-    public override int command_line (ApplicationCommandLine command_line) {
+    public override int command_line(ApplicationCommandLine command_line) {
         // keep the application running until we are done with this commandline
         this.hold();
         int result = _command_line(command_line);
@@ -196,6 +219,13 @@ public class EmojiApplication : Gtk.Application {
     }
 
 
+    public override void shutdown() {
+        base.shutdown();
+        remove_window(m_emojier);
+        m_emojier = null;
+    }
+
+
     public static int main (string[] args) {
         GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
                                  Config.GLIB_LOCALE_DIR);
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index 7d6d76e77..c729fd7e0 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -50,20 +50,20 @@ class ExtensionGtk : Gtk.Application {
                                     "org.freedesktop.DBus",
                                     "NameAcquired",
                                     "/org/freedesktop/DBus",
-                                    IBus.SERVICE_PANEL_EXTENSION,
+                                    IBus.SERVICE_PANEL_EXTENSION_EMOJI,
                                     DBusSignalFlags.NONE,
                                     bus_name_acquired_cb);
         connection.signal_subscribe("org.freedesktop.DBus",
                                     "org.freedesktop.DBus",
                                     "NameLost",
                                     "/org/freedesktop/DBus",
-                                    IBus.SERVICE_PANEL_EXTENSION,
+                                    IBus.SERVICE_PANEL_EXTENSION_EMOJI,
                                     DBusSignalFlags.NONE,
                                     bus_name_lost_cb);
         var flags =
                 IBus.BusNameFlag.ALLOW_REPLACEMENT |
                 IBus.BusNameFlag.REPLACE_EXISTING;
-        m_bus.request_name(IBus.SERVICE_PANEL_EXTENSION, flags);
+        m_bus.request_name(IBus.SERVICE_PANEL_EXTENSION_EMOJI, flags);
     }
 
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index d9238c893..4c3b00ca9 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1148,26 +1148,15 @@ class Panel : IBus.PanelService {
 #if EMOJI_DICT
             item = new Gtk.MenuItem.with_label(_("Emoji Choice"));
             item.activate.connect((i) => {
-                Gdk.Event event = Gtk.get_current_event();
-                if (event == null) {
-                    event = new Gdk.Event(Gdk.EventType.KEY_PRESS);
-                    event.key.time = Gdk.CURRENT_TIME;
-                    // event.get_seat() refers event.any.window
-                    event.key.window = Gdk.get_default_root_window();
-                    event.key.window.ref();
-                }
-                IBus.XEvent xevent = new IBus.XEvent(
-                        "event-type", IBus.XEventType.KEY_PRESS,
-                        "window",
-                        (event.key.window as Gdk.X11.Window).get_xid(),
-                        "time", event.key.time,
-                        "purpose", "emoji");
-                /* new GLib.Variant("(sv)", "emoji", xevent.serialize_object())
+                IBus.ExtensionEvent event = new IBus.ExtensionEvent(
+                        "name", "emoji", "is-enabled", true,
+                        "params", "category-list");
+                /* new GLib.Variant("(sv)", "emoji", event.serialize_object())
                  * will call g_variant_unref() for the child variant by vala.
                  * I have no idea not to unref the object so integrated
-                 * the purpose to IBus.XEvent above.
+                 * the purpose to IBus.ExtensionEvent above.
                  */
-                panel_extension(xevent.serialize_object());
+                panel_extension(event);
             });
             m_sys_menu.append(item);
 #endif
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 581f721e9..52b78c17f 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -21,7 +21,193 @@
  * USA
  */
 
+class Preedit : Gtk.Window {
+    private Gtk.Label m_extension_preedit_text;
+    private Gtk.Label m_extension_preedit_emoji;
+    private IBus.Text? m_engine_preedit_text;
+    private bool m_engine_preedit_text_show;
+    private uint m_engine_preedit_cursor_pos;
+    private string m_prefix = "@";
+    private bool m_is_shown = true;
+
+
+    public Preedit() {
+        GLib.Object(
+            name : "IBusPreedit",
+            type: Gtk.WindowType.POPUP
+        );
+        m_extension_preedit_text  = new Gtk.Label("");
+        m_extension_preedit_emoji  = new Gtk.Label("");
+    }
+
+
+    public new void hide() {
+        reset();
+        base.hide();
+        m_is_shown = false;
+    }
+
+
+    public bool is_shown() {
+        return m_is_shown;
+    }
+
+
+    public void reset() {
+        set_emoji("");
+        set_text("");
+        resize(1, 1);
+        m_is_shown = true;
+    }
+
+    public void append_text(string text) {
+        if (text.length == 0)
+            return;
+        string total = m_extension_preedit_text.get_text();
+        total += text;
+        m_extension_preedit_text.set_text(total);
+    }
+
+
+    public string get_text() {
+        return m_extension_preedit_text.get_text();
+    }
+
+
+    public void set_text(string text) {
+        m_extension_preedit_text.set_text(text);
+    }
+
+
+    public string get_emoji() {
+        return m_extension_preedit_emoji.get_text();
+    }
+
+
+    public void set_emoji(string text) {
+        m_extension_preedit_emoji.set_text(text);
+    }
+
+
+    public bool backspace() {
+        string total = m_extension_preedit_emoji.get_text();
+        if (total.length > 0) {
+            m_extension_preedit_emoji.set_text("");
+            resize(1, 1);
+            return false;
+        }
+        total = m_extension_preedit_text.get_text();
+        int char_count = total.char_count();
+        if (char_count == 0)
+            return true;
+        total = total[0:total.index_of_nth_char(char_count - 1)];
+        resize(1, 1);
+        m_extension_preedit_text.set_text(total);
+        if (total.length == 0)
+            resize(1, 1);
+        return true;
+    }
+
+
+    private string get_extension_text () {
+        string extension_text = m_extension_preedit_emoji.get_text();
+        if (extension_text.length == 0)
+            extension_text = m_extension_preedit_text.get_text();
+        return m_prefix + extension_text;
+    }
+
+
+    private void set_preedit_color(IBus.Text text,
+                                   uint start_index,
+                                   uint end_index) {
+        text.append_attribute(IBus.AttrType.UNDERLINE,
+                              IBus.AttrUnderline.SINGLE,
+                              start_index, (int)end_index);
+    }
+
+
+    public IBus.Text get_engine_preedit_text() {
+        string extension_text = get_extension_text();
+        uint char_count = extension_text.char_count();
+        IBus.Text retval;
+        if (m_engine_preedit_text == null || !m_engine_preedit_text_show) {
+            retval = new IBus.Text.from_string(extension_text);
+            set_preedit_color(retval, 0, char_count);
+            return retval;
+        }
+        retval = new IBus.Text.from_string(
+                extension_text + m_engine_preedit_text.get_text());
+        set_preedit_color(retval, 0, char_count);
+
+        unowned IBus.AttrList attrs = m_engine_preedit_text.get_attributes();
+
+        if (attrs == null)
+            return retval;
+
+        int i = 0;
+        while (true) {
+            IBus.Attribute attr = attrs.get(i++);
+            if (attr == null)
+                break;
+            long start_index = attr.start_index;
+            long end_index = attr.end_index;
+            if (start_index < 0)
+                start_index = 0;
+            if (end_index < 0)
+                end_index = m_engine_preedit_text.get_length();
+            retval.append_attribute(attr.type, attr.value,
+                                    char_count + (uint)start_index,
+                                    (int)char_count + (int)end_index);
+        }
+        return retval;
+    }
+
+
+    public void set_engine_preedit_text(IBus.Text? text) {
+        m_engine_preedit_text = text;
+    }
+
+
+    public void show_engine_preedit_text() {
+        m_engine_preedit_text_show = true;
+    }
+
+
+    public void hide_engine_preedit_text() {
+        m_engine_preedit_text_show = false;
+    }
+
+
+    public uint get_engine_preedit_cursor_pos() {
+        return get_extension_text().char_count() + m_engine_preedit_cursor_pos;
+    }
+
+
+    public void set_engine_preedit_cursor_pos(uint cursor_pos) {
+        m_engine_preedit_cursor_pos = cursor_pos;
+    }
+
+
+    public IBus.Text get_commit_text() {
+        string extension_text = m_extension_preedit_emoji.get_text();
+        if (extension_text.length == 0)
+            extension_text = m_extension_preedit_text.get_text();
+        return new IBus.Text.from_string(extension_text);
+    }
+
+
+    public void set_extension_name(string extension_name) {
+        if (extension_name.length == 0)
+            m_prefix = "@";
+        else
+            m_prefix = extension_name[0:1];
+    }
+}
+
+
 class PanelBinding : IBus.PanelService {
+    private bool m_is_wayland;
+    private bool m_wayland_lookup_table_is_visible;
     private IBus.Bus m_bus;
     private Gtk.Application m_application;
     private GLib.Settings m_settings_panel = null;
@@ -38,18 +224,26 @@ class PanelBinding : IBus.PanelService {
     private bool m_loaded_emoji = false;
     private bool m_load_unicode_at_startup;
     private bool m_loaded_unicode = false;
+    private bool m_enable_extension;
+    private string m_extension_name = "";
+    private Preedit m_preedit;
 
     public PanelBinding(IBus.Bus bus,
                         Gtk.Application application) {
         GLib.assert(bus.is_connected());
         // Chain up base class constructor
         GLib.Object(connection : bus.get_connection(),
-                    object_path : IBus.PATH_PANEL_EXTENSION);
+                    object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
+
+        Type instance_type = Gdk.Display.get_default().get_type();
+        Type wayland_type = typeof(GdkWayland.Display);
+        m_is_wayland = instance_type.is_a(wayland_type);
 
         m_bus = bus;
         m_application = application;
 
         init_settings();
+        m_preedit = new Preedit();
     }
 
 
@@ -69,12 +263,20 @@ class PanelBinding : IBus.PanelService {
                                               ref m_css_provider);
         });
 
+        m_settings_emoji.changed["unicode-hotkey"].connect((key) => {
+                set_emoji_hotkey();
+        });
+
         m_settings_emoji.changed["font"].connect((key) => {
                 BindingCommon.set_custom_font(m_settings_panel,
                                               m_settings_emoji,
                                               ref m_css_provider);
         });
 
+        m_settings_emoji.changed["hotkey"].connect((key) => {
+                set_emoji_hotkey();
+        });
+
         m_settings_emoji.changed["favorites"].connect((key) => {
                 set_emoji_favorites();
         });
@@ -109,6 +311,54 @@ class PanelBinding : IBus.PanelService {
     }
 
 
+    private unowned
+    IBus.ProcessKeyEventData? parse_accelerator(string accelerator) {
+        IBus.ProcessKeyEventData key = {};
+        uint keysym = 0;
+        IBus.ModifierType modifiers = 0;
+        IBus.accelerator_parse(accelerator,
+                out keysym, out modifiers);
+        if (keysym == 0U && modifiers == 0) {
+            warning("Failed to parse shortcut key '%s'".printf(accelerator));
+            return null;
+        }
+        if ((modifiers & IBus.ModifierType.SUPER_MASK) != 0) {
+            modifiers ^= IBus.ModifierType.SUPER_MASK;
+            modifiers |= IBus.ModifierType.MOD4_MASK;
+        }
+        key.keyval = keysym;
+        key.state = modifiers;
+        return key;
+    }
+
+
+    private void set_emoji_hotkey() {
+        IBus.ProcessKeyEventData[] emoji_keys = {};
+        IBus.ProcessKeyEventData key;
+        string[] accelerators = m_settings_emoji.get_strv("hotkey");
+        foreach (var accelerator in accelerators) {
+            key = parse_accelerator(accelerator);
+            emoji_keys += key;
+        }
+
+        /* Since {} is not allocated, parse_accelerator() should be unowned. */
+        key = {};
+        emoji_keys += key;
+
+        IBus.ProcessKeyEventData[] unicode_keys = {};
+        accelerators = m_settings_emoji.get_strv("unicode-hotkey");
+        foreach (var accelerator in accelerators) {
+            key = parse_accelerator(accelerator);
+            unicode_keys += key;
+        }
+        key = {};
+        unicode_keys += key;
+
+        panel_extension_register_keys("emoji", emoji_keys,
+                                      "unicode", unicode_keys);
+    }
+
+
     private void set_emoji_favorites() {
         m_emojier_favorites = m_settings_emoji.get_strv("favorites");
         IBusEmojier.set_favorites(
@@ -159,6 +409,7 @@ class PanelBinding : IBus.PanelService {
 
     public void load_settings() {
 
+        set_emoji_hotkey();
         set_load_emoji_at_startup();
         set_load_unicode_at_startup();
         BindingCommon.set_custom_font(m_settings_panel,
@@ -181,36 +432,37 @@ class PanelBinding : IBus.PanelService {
             GLib.Source.remove(m_emojier_set_emoji_lang_id);
             m_emojier_set_emoji_lang_id = 0;
         }
-        m_application = null;
-    }
-
-
-    private void show_emojier(Gdk.Event event) {
-        if (!m_loaded_emoji)
-            set_emoji_lang();
-        if (!m_loaded_unicode && m_loaded_emoji) {
-            IBusEmojier.load_unicode_dict();
-            m_loaded_unicode = true;
-        }
-        m_emojier = new IBusEmojier();
-        // For title handling in gnome-shell
-        m_application.add_window(m_emojier);
-        string emoji = m_emojier.run(m_real_current_context_path, event);
-        m_application.remove_window(m_emojier);
-        if (emoji == null) {
+        if (m_emojier != null) {
+            m_application.remove_window(m_emojier);
             m_emojier = null;
-            return;
         }
-        this.emojier_focus_commit();
+        m_application = null;
     }
 
 
-    private void handle_emoji_typing(Gdk.Event event) {
-        if (m_emojier != null && m_emojier.is_running()) {
-            m_emojier.present_centralize(event);
+    private void commit_text_update_favorites(IBus.Text text) {
+        commit_text(text);
+        IBus.ExtensionEvent event = new IBus.ExtensionEvent(
+                    "name", m_extension_name,
+                    "is-enabled", false,
+                    "is-extension", true);
+        panel_extension(event);
+        string committed_string = text.text;
+        string preedit_string = m_preedit.get_text();
+        m_preedit.hide();
+        if (preedit_string == committed_string)
             return;
+        bool has_favorite = false;
+        foreach (unowned string favorite in m_emojier_favorites) {
+            if (favorite == committed_string) {
+                has_favorite = true;
+                break;
+            }
+        }
+        if (!has_favorite) {
+            m_emojier_favorites += committed_string;
+            m_settings_emoji.set_strv("favorites", m_emojier_favorites);
         }
-        show_emojier(event);
     }
 
 
@@ -223,19 +475,8 @@ class PanelBinding : IBus.PanelService {
             prev_context_path != "" &&
             prev_context_path == m_current_context_path) {
             IBus.Text text = new IBus.Text.from_string(selected_string);
-            commit_text(text);
-            m_emojier = null;
-            bool has_favorite = false;
-            foreach (unowned string favorite in m_emojier_favorites) {
-                if (favorite == selected_string) {
-                    has_favorite = true;
-                    break;
-                }
-            }
-            if (!has_favorite) {
-                m_emojier_favorites += selected_string;
-                m_settings_emoji.set_strv("favorites", m_emojier_favorites);
-            }
+            commit_text_update_favorites(text);
+            m_emojier.reset();
             return true;
         }
 
@@ -249,8 +490,7 @@ class PanelBinding : IBus.PanelService {
         string selected_string = m_emojier.get_selected_string();
         string prev_context_path = m_emojier.get_input_context_path();
         if (selected_string == null &&
-            prev_context_path != "" &&
-            m_emojier.is_running()) {
+            prev_context_path != "") {
             var context = GLib.MainContext.default();
             if (m_emojier_focus_commit_text_id > 0 &&
                 context.find_source_by_id(m_emojier_focus_commit_text_id)
@@ -277,6 +517,243 @@ class PanelBinding : IBus.PanelService {
     }
 
 
+    private bool key_press_escape() {
+        if (is_emoji_lookup_table()) {
+            bool show_candidate = m_emojier.key_press_escape();
+            convert_preedit_text();
+            return show_candidate;
+        }
+        if (m_preedit.get_emoji() != "") {
+            m_preedit.set_emoji("");
+            string annotation = m_preedit.get_text();
+            m_emojier.set_annotation(annotation);
+            return false;
+        }
+        m_enable_extension = false;
+        hide_emoji_lookup_table();
+        m_preedit.hide();
+        IBus.ExtensionEvent event = new IBus.ExtensionEvent(
+                "name", m_extension_name,
+                "is-enabled", false,
+                "is-extension", true);
+        panel_extension(event);
+        return false;
+    }
+
+
+    private bool key_press_enter() {
+        if (m_extension_name != "unicode" && is_emoji_lookup_table()) {
+            // Check if variats exist
+            if (m_emojier.key_press_enter())
+                return true;
+        }
+        IBus.Text text = m_preedit.get_commit_text();
+        commit_text_update_favorites(text);
+        return false;
+    }
+
+
+    private void convert_preedit_text() {
+        if (m_emojier.get_number_of_candidates() > 0)
+            m_preedit.set_emoji(m_emojier.get_current_candidate());
+        else
+            m_preedit.set_emoji("");
+    }
+
+
+    private bool key_press_space() {
+        bool show_candidate = false;
+        if (m_preedit.get_emoji() != "") {
+            m_emojier.key_press_cursor_horizontal(Gdk.Key.Right, 0);
+            show_candidate = true;
+        } else {
+            string annotation = m_preedit.get_text();
+            if (annotation.length == 0) {
+                show_candidate = true;
+                if (is_emoji_lookup_table())
+                    m_emojier.key_press_cursor_horizontal(Gdk.Key.Right, 0);
+            } else {
+                m_emojier.set_annotation(annotation);
+            }
+        }
+        convert_preedit_text();
+        return show_candidate;
+    }
+
+
+    private bool key_press_cursor_horizontal(uint keyval,
+                                             uint modifiers) {
+        if (is_emoji_lookup_table()) {
+            m_emojier.key_press_cursor_horizontal(keyval, modifiers);
+            convert_preedit_text();
+            return true;
+        }
+        return false;
+    }
+
+
+    private bool key_press_cursor_vertical(uint keyval,
+                                           uint modifiers) {
+        if (is_emoji_lookup_table()) {
+            m_emojier.key_press_cursor_vertical(keyval, modifiers);
+            convert_preedit_text();
+            return true;
+        }
+        return false;
+    }
+
+
+    private bool key_press_cursor_home_end(uint keyval,
+                                           uint modifiers) {
+        if (is_emoji_lookup_table()) {
+            m_emojier.key_press_cursor_home_end(keyval, modifiers);
+            convert_preedit_text();
+            return true;
+        }
+        return false;
+    }
+
+
+    private bool key_press_control_keyval(uint keyval,
+                                          uint modifiers) {
+        bool show_candidate = false;
+        switch(keyval) {
+        case Gdk.Key.f:
+            show_candidate = key_press_cursor_horizontal(Gdk.Key.Right,
+                                                         modifiers);
+            break;
+        case Gdk.Key.b:
+            show_candidate = key_press_cursor_horizontal(Gdk.Key.Left,
+                                                         modifiers);
+            break;
+        case Gdk.Key.n:
+        case Gdk.Key.N:
+            show_candidate = key_press_cursor_vertical(Gdk.Key.Down, modifiers);
+            break;
+        case Gdk.Key.p:
+        case Gdk.Key.P:
+            show_candidate = key_press_cursor_vertical(Gdk.Key.Up, modifiers);
+            break;
+        case Gdk.Key.h:
+            show_candidate = key_press_cursor_home_end(Gdk.Key.Home, modifiers);
+            break;
+        case Gdk.Key.e:
+            show_candidate = key_press_cursor_home_end(Gdk.Key.End, modifiers);
+            break;
+        case Gdk.Key.u:
+            m_preedit.reset();
+            m_emojier.set_annotation("");
+            hide_emoji_lookup_table();
+            break;
+        case Gdk.Key.C:
+        case Gdk.Key.c:
+            if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                if (!m_is_wayland && m_emojier != null &&
+                    m_emojier.get_number_of_candidates() > 0) {
+                    var text = m_emojier.get_current_candidate();
+                    Gtk.Clipboard clipboard =
+                            Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
+                    clipboard.set_text(text, -1);
+                    clipboard.store();
+                }
+                show_candidate = is_emoji_lookup_table();
+            }
+            break;
+        default:
+            show_candidate = is_emoji_lookup_table();
+            break;
+        }
+        return show_candidate;
+    }
+
+
+    private void hide_wayland_lookup_table() {
+        m_wayland_lookup_table_is_visible = false;
+        var text = new IBus.Text.from_string("");
+        update_auxiliary_text_received(text, false);
+        update_lookup_table_received(
+                new IBus.LookupTable(1, 0, false, true),
+                false);
+    }
+
+
+    private void show_wayland_lookup_table(IBus.Text text) {
+        m_wayland_lookup_table_is_visible = true;
+        var table = m_emojier.get_one_dimension_lookup_table();
+        uint ncandidates = table.get_number_of_candidates();
+        update_auxiliary_text_received(
+                text,
+                ncandidates > 0 ? true : false);
+        update_lookup_table_received(
+                table,
+                ncandidates > 0 ? true : false);
+    }
+
+
+    private bool is_visible_wayland_lookup_table() {
+        return m_wayland_lookup_table_is_visible;
+    }
+
+
+    private void hide_emoji_lookup_table() {
+        if (m_emojier == null)
+            return;
+        if (m_is_wayland)
+            hide_wayland_lookup_table();
+        else
+            m_emojier.hide();
+    }
+
+
+    private void show_emoji_lookup_table() {
+        /* Emojier category_list is shown in both Xorg and Wayland
+         * because the annotation information is useful but the Wayland lookup
+         * window is alway one dimension. So the category_list is shown
+         * when the user annotation is null.
+         */
+        if (m_is_wayland && m_preedit.get_text() != "") {
+            var text = m_emojier.get_title_text();
+            show_wayland_lookup_table(text);
+        } else {
+            // POPUP window takes the focus in Wayland.
+            if (m_is_wayland)
+                m_emojier.set_input_context_path(m_real_current_context_path);
+            m_emojier.show_all();
+        }
+    }
+
+
+    private bool is_emoji_lookup_table() {
+        if (m_is_wayland)
+            return is_visible_wayland_lookup_table();
+        else
+            return m_emojier.get_visible();
+    }
+
+
+    private void show_preedit_and_candidate(bool show_candidate) {
+        uint cursor_pos = 0;
+        if (!show_candidate)
+            cursor_pos = m_preedit.get_engine_preedit_cursor_pos();
+        update_preedit_text_received(
+                m_preedit.get_engine_preedit_text(),
+                cursor_pos,
+                true);
+        if (!show_candidate) {
+            hide_emoji_lookup_table();
+            return;
+        }
+        if (m_emojier == null)
+            return;
+        /* Wayland gives the focus on Emojir which is a GTK popup window
+         * and move the focus fom the current input context to Emojier.
+         * This forwards the lookup table to gnome-shell's lookup table
+         * but it enables one dimension lookup table only.
+         */
+        show_emoji_lookup_table();
+    }
+
+
     public override void focus_in(string input_context_path) {
         m_current_context_path = input_context_path;
 
@@ -299,48 +776,280 @@ class PanelBinding : IBus.PanelService {
     }
 
 
-    public override void panel_extension_received(GLib.Variant data) {
-        IBus.XEvent? xevent = IBus.Serializable.deserialize_object(data)
-                as IBus.XEvent;
-        if (xevent == null) {
-            warning ("Failed to deserialize IBusXEvent");
+    public override void panel_extension_received(IBus.ExtensionEvent event) {
+        m_extension_name = event.get_name();
+        if (m_extension_name != "emoji" && m_extension_name != "unicode") {
+            string format = "The name %s is not implemented in PanelExtension";
+            warning (format.printf(m_extension_name));
+            m_extension_name = "";
             return;
         }
-        if (xevent.get_purpose() != "emoji") {
-            string format = "The purpose %s is not implemented in PanelExtension";
-            warning (format.printf(xevent.get_purpose()));
+        m_enable_extension = event.is_enabled;
+        if (!m_enable_extension) {
+            hide_emoji_lookup_table();
+            return;
+        }
+        if (!m_loaded_emoji)
+            set_emoji_lang();
+        if (!m_loaded_unicode && m_loaded_emoji) {
+            IBusEmojier.load_unicode_dict();
+            m_loaded_unicode = true;
+        }
+        if (m_emojier == null) {
+            m_emojier = new IBusEmojier();
+            // For title handling in gnome-shell
+            m_application.add_window(m_emojier);
+            m_emojier.candidate_clicked.connect((i, b, s) => {
+                if (!m_is_wayland)
+                    candidate_clicked_lookup_table(i, b, s);
+            });
+        }
+        m_emojier.reset();
+        m_emojier.set_annotation("");
+        m_preedit.set_extension_name(m_extension_name);
+        m_preedit.reset();
+        update_preedit_text_received(
+                m_preedit.get_engine_preedit_text(),
+                m_preedit.get_engine_preedit_cursor_pos(),
+                true);
+        string params = event.get_params();
+        if (params == "category-list") {
+            key_press_space();
+            show_preedit_and_candidate(true);
+        }
+    }
+
+
+    public override void set_cursor_location(int x,
+                                             int y,
+                                             int width,
+                                             int height) {
+        if (m_emojier != null)
+            m_emojier.set_cursor_location(x, y, width, height);
+    }
+
+
+    public override void update_preedit_text(IBus.Text text,
+                                             uint      cursor_pos,
+                                             bool      visible) {
+        m_preedit.set_engine_preedit_text(text);
+        if (visible)
+            m_preedit.show_engine_preedit_text();
+        else
+            m_preedit.hide_engine_preedit_text();
+        m_preedit.set_engine_preedit_cursor_pos(cursor_pos);
+        update_preedit_text_received(m_preedit.get_engine_preedit_text(),
+                                     m_preedit.get_engine_preedit_cursor_pos(),
+                                     visible);
+    }
+
+
+    public override void show_preedit_text() {
+        m_preedit.show_engine_preedit_text();
+        show_preedit_and_candidate(false);
+    }
+
+
+    public override void hide_preedit_text() {
+        m_preedit.hide_engine_preedit_text();
+        show_preedit_and_candidate(false);
+    }
+
+
+    public override bool process_key_event(uint keyval,
+                                           uint keycode,
+                                           uint state) {
+        if ((state & IBus.ModifierType.RELEASE_MASK) != 0)
+            return false;
+        uint modifiers = state;
+        bool show_candidate = false;
+        switch(keyval) {
+        case Gdk.Key.Escape:
+            show_candidate = key_press_escape();
+            if (!m_preedit.is_shown())
+                return true;
+            break;
+        case Gdk.Key.Return:
+        case Gdk.Key.KP_Enter:
+            if (m_extension_name == "unicode")
+                key_press_space();
+            show_candidate = key_press_enter();
+            if (!m_preedit.is_shown()) {
+                hide_emoji_lookup_table();
+                return true;
+            }
+            break;
+        case Gdk.Key.BackSpace:
+            m_preedit.backspace();
+            string annotation = m_preedit.get_text();
+            if (annotation == "" && m_extension_name == "unicode") {
+                key_press_escape();
+                return true;
+            }
+            m_emojier.set_annotation(annotation);
+            break;
+        case Gdk.Key.space:
+        case Gdk.Key.KP_Space:
+            show_candidate = key_press_space();
+            if (m_extension_name == "unicode") {
+                key_press_enter();
+                return true;
+            }
+            break;
+        case Gdk.Key.Right:
+        case Gdk.Key.KP_Right:
+            /* one dimension in Wayland, two dimensions in X11 */
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Down,
+                                                           modifiers);
+            } else {
+                show_candidate = key_press_cursor_horizontal(Gdk.Key.Right,
+                                                             modifiers);
+            }
+            break;
+        case Gdk.Key.Left:
+        case Gdk.Key.KP_Left:
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Up,
+                                                           modifiers);
+            } else {
+                show_candidate = key_press_cursor_horizontal(Gdk.Key.Left,
+                                                             modifiers);
+            }
+            break;
+        case Gdk.Key.Down:
+        case Gdk.Key.KP_Down:
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_horizontal(Gdk.Key.Right,
+                                                             modifiers);
+            } else {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Down,
+                                                           modifiers);
+            }
+            break;
+        case Gdk.Key.Up:
+        case Gdk.Key.KP_Up:
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_horizontal(Gdk.Key.Left,
+                                                             modifiers);
+            } else {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Up,
+                                                           modifiers);
+            }
+            break;
+        case Gdk.Key.Page_Down:
+        case Gdk.Key.KP_Page_Down:
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Down,
+                                                           modifiers);
+            } else {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Page_Down,
+                                                           modifiers);
+            }
+            break;
+        case Gdk.Key.Page_Up:
+        case Gdk.Key.KP_Page_Up:
+            if (m_is_wayland) {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Up,
+                                                           modifiers);
+            } else {
+                show_candidate = key_press_cursor_vertical(Gdk.Key.Page_Up,
+                                                           modifiers);
+            }
+            break;
+        case Gdk.Key.Home:
+        case Gdk.Key.KP_Home:
+            show_candidate = key_press_cursor_home_end(Gdk.Key.Home, modifiers);
+            break;
+        case Gdk.Key.End:
+        case Gdk.Key.KP_End:
+            show_candidate = key_press_cursor_home_end(Gdk.Key.End, modifiers);
+            break;
+        default:
+            if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
+                show_candidate = key_press_control_keyval(keyval, modifiers);
+                break;
+            }
+            unichar ch = IBus.keyval_to_unicode(keyval);
+            if (ch.iscntrl())
+                return true;
+            string str = ch.to_string();
+            m_preedit.append_text(str);
+            string annotation = m_preedit.get_text();
+            m_emojier.set_annotation(annotation);
+            m_preedit.set_emoji("");
+            show_candidate = is_emoji_lookup_table();
+            break;
+        }
+        show_preedit_and_candidate(show_candidate);
+        return true;
+    }
+
+    public override void commit_text_received(IBus.Text text) {
+        unowned string? str = text.text;
+        if (str == null)
+            return;
+        /* Do not call convert_preedit_text() because it depends on
+         * each IME whether process_key_event() receives Shift-space or not.
+         */
+        m_preedit.append_text(str);
+        m_preedit.set_emoji("");
+        string annotation = m_preedit.get_text();
+        m_emojier.set_annotation(annotation);
+        show_preedit_and_candidate(false);
+    }
+
+    public override void page_up_lookup_table() {
+        bool show_candidate = key_press_cursor_vertical(Gdk.Key.Up, 0);
+        show_preedit_and_candidate(show_candidate);
+    }
+
+    public override void page_down_lookup_table() {
+        bool show_candidate = key_press_cursor_vertical(Gdk.Key.Down, 0);
+        show_preedit_and_candidate(show_candidate);
+    }
+
+    public override void cursor_up_lookup_table() {
+        bool show_candidate = key_press_cursor_horizontal(Gdk.Key.Left, 0);
+        show_preedit_and_candidate(show_candidate);
+    }
+
+    public override void cursor_down_lookup_table() {
+        bool show_candidate = key_press_cursor_horizontal(Gdk.Key.Right, 0);
+        show_preedit_and_candidate(show_candidate);
+    }
+
+    public override void candidate_clicked_lookup_table(uint index,
+                                                        uint button,
+                                                        uint state) {
+        if (button == IBusEmojier.BUTTON_CLOSE_BUTTON) {
+            m_enable_extension = false;
+            hide_emoji_lookup_table();
+            m_preedit.hide();
+            IBus.ExtensionEvent event = new IBus.ExtensionEvent(
+                    "name", m_extension_name,
+                    "is-enabled", false,
+                    "is-extension", true);
+            panel_extension(event);
             return;
         }
-        Gdk.EventType event_type;
-        if (xevent.get_event_type() == IBus.XEventType.KEY_PRESS) {
-            event_type = Gdk.EventType.KEY_PRESS;
-        } else if (xevent.get_event_type() == IBus.XEventType.KEY_RELEASE) {
-            event_type = Gdk.EventType.KEY_RELEASE;
+        if (m_emojier == null)
+            return;
+        bool show_candidate = false;
+        uint ncandidates = m_emojier.get_number_of_candidates();
+        if (ncandidates > 0 && ncandidates >= index) {
+            m_emojier.set_cursor_pos(index);
+            show_candidate = m_emojier.has_variants(index);
+            m_preedit.set_emoji(m_emojier.get_current_candidate());
         } else {
-            warning ("Not supported type %d".printf(xevent.get_event_type()));
             return;
         }
-        Gdk.Event event = new Gdk.Event(event_type);
-        uint32 time = xevent.get_time();
-        if (time == 0)
-            time = Gtk.get_current_event_time();
-        event.key.time = time;
-        X.Window xid = xevent.get_window();
-        Gdk.Display? display = Gdk.Display.get_default();
-        Gdk.Window? window = null;
-        if (window == null && xid != 0) {
-            window = Gdk.X11.Window.lookup_for_display(
-                    display as Gdk.X11.Display, xid);
-        }
-        if (window == null && xid != 0) {
-            window = new Gdk.X11.Window.foreign_for_display(
-                    display as Gdk.X11.Display, xid);
-        }
-        if (window == null) {
-            window = Gdk.get_default_root_window();
-            window.ref();
-        }
-        event.key.window = window;
-        handle_emoji_typing(event);
+        if (!show_candidate) {
+            IBus.Text text = m_preedit.get_commit_text();
+            commit_text_update_favorites(text);
+            hide_emoji_lookup_table();
+            return;
+        }
+        show_preedit_and_candidate(show_candidate);
     }
 }

From 7cef5bf572596361bc502e8fa917569676a80372 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 20 Jun 2018 19:01:59 +0900
Subject: [PATCH 485/816] setup: Replace emoji font with Unicode font

Now the font settings of emoji is configurable in the session base
but not the application base and the current font setting on ibus-setup
effects on Unicode characters.
Also fixed the progress bar on Unicode candidate table.
---
 setup/setup.ui       |   4 +-
 src/tests/runtest    |   2 +-
 ui/gtk3/emojier.vala | 213 ++++++++++++++++++++++++-------------------
 3 files changed, 120 insertions(+), 99 deletions(-)

diff --git a/setup/setup.ui b/setup/setup.ui
index f1beb1de0..9d9d7ee97 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1010,9 +1010,9 @@
                           <object class="GtkLabel" id="label_emoji_font">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Set a font of emoji candidates on the emoji dialog</property>
+                            <property name="tooltip_text" translatable="yes">Set a font of Unicode candidates on the emoji dialog</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Emoji font:</property>
+                            <property name="label" translatable="yes">Unicode font:</property>
                             <property name="justify">right</property>
                           </object>
                           <packing>
diff --git a/src/tests/runtest b/src/tests/runtest
index b6b845d63..5c1630831 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -142,7 +142,7 @@ run_test_case()
         --daemonize \
         --cache=none \
         --panel=disable \
-        --panel-extension=disable \
+        --emoji-extension=disable \
         --config=default \
         --verbose;
 
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index cd98c9d78..7beb6f0a5 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -253,6 +253,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private static string m_current_lang_id;
     private static string m_emoji_font_family;
     private static int m_emoji_font_size;
+    private static bool m_emoji_font_changed = false;
     private static string[] m_favorites;
     private static string[] m_favorite_annotations;
     private static int m_emoji_max_seq_len;
@@ -348,88 +349,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         add_action(action);
         if (m_current_lang_id == null)
             m_current_lang_id = "en";
-        if (m_emoji_font_family == null)
+        if (m_emoji_font_family == null) {
             m_emoji_font_family = "Monospace";
-        if (m_emoji_font_size == 0)
+            m_emoji_font_changed = true;
+        }
+        if (m_emoji_font_size == 0) {
             m_emoji_font_size = 16;
+            m_emoji_font_changed = true;
+        }
         if (m_favorites == null)
             m_favorites = {};
         if (m_favorite_annotations == null)
             m_favorite_annotations = {};
 
-        Gdk.Display display = Gdk.Display.get_default();
-        Gdk.Screen screen = (display != null) ?
-                display.get_default_screen() : null;
-
-        if (screen == null) {
-            warning("Could not open display.");
-            return;
-        }
-        // Set en locale because de_DE's decimal_point is ',' instead of '.'
-        string? backup_locale =
-            Intl.setlocale(LocaleCategory.NUMERIC, null).dup();
-        if (Intl.setlocale(LocaleCategory.NUMERIC, "en_US.UTF-8") == null) {
-          if (Intl.setlocale(LocaleCategory.NUMERIC, "C.UTF-8") == null) {
-              if (Intl.setlocale(LocaleCategory.NUMERIC, "C") == null) {
-                  warning("You don't install either en_US.UTF-8 or C.UTF-8 " +
-                          "or C locale");
-              }
-          }
-        }
-        m_rgba = new ThemedRGBA(this);
-        uint bg_red = (uint)(m_rgba.normal_bg.red * 255);
-        uint bg_green = (uint)(m_rgba.normal_bg.green * 255);
-        uint bg_blue = (uint)(m_rgba.normal_bg.blue * 255);
-        double bg_alpha = m_rgba.normal_bg.alpha;
-        string data =
-                "#IBusEmojierWhiteLabel { background-color: " +
-                        "rgba(%u, %u, %u, %lf); ".printf(
-                        bg_red, bg_green, bg_blue, bg_alpha) +
-                "font-family: %s; font-size: %dpt; ".printf(
-                        m_emoji_font_family, m_emoji_font_size) +
-                "border-width: 4px; border-radius: 3px; } ";
-
-        uint fg_red = (uint)(m_rgba.selected_fg.red * 255);
-        uint fg_green = (uint)(m_rgba.selected_fg.green * 255);
-        uint fg_blue = (uint)(m_rgba.selected_fg.blue * 255);
-        double fg_alpha = m_rgba.selected_fg.alpha;
-        bg_red = (uint)(m_rgba.selected_bg.red * 255);
-        bg_green = (uint)(m_rgba.selected_bg.green * 255);
-        bg_blue = (uint)(m_rgba.selected_bg.blue * 255);
-        bg_alpha = m_rgba.selected_bg.alpha;
-        data += "#IBusEmojierSelectedLabel { color: " +
-                        "rgba(%u, %u, %u, %lf); ".printf(
-                        fg_red, fg_green, fg_blue, fg_alpha) +
-                "font-family: %s; font-size: %dpt; ".printf(
-                        m_emoji_font_family, m_emoji_font_size) +
-                "background-color: " +
-                        "rgba(%u, %u, %u, %lf); ".printf(
-                        bg_red, bg_green, bg_blue, bg_alpha) +
-                "border-width: 4px; border-radius: 3px; }";
-        data += "#IBusEmojierGoldLabel { color: " +
-                        "rgba(%u, %u, %u, %lf); ".printf(
-                        fg_red, fg_green, fg_blue, fg_alpha) +
-                "font-family: %s; font-size: %dpt; ".printf(
-                        m_emoji_font_family, m_emoji_font_size) +
-                "background-color: #b09c5f; " +
-                "border-width: 4px; border-radius: 3px; }";
-
-        Gtk.CssProvider css_provider = new Gtk.CssProvider();
-        try {
-            css_provider.load_from_data(data, -1);
-        } catch (GLib.Error e) {
-            warning("Failed css_provider_from_data: %s", e.message);
-            return;
-        }
-        if (backup_locale != null)
-            Intl.setlocale(LocaleCategory.NUMERIC, backup_locale);
-        else
-            Intl.setlocale(LocaleCategory.NUMERIC, "");
-
-        Gtk.StyleContext.add_provider_for_screen(
-                screen,
-                css_provider,
-                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        set_css_data();
 
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
@@ -795,6 +728,84 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private void set_css_data() {
+        Gdk.Display display = Gdk.Display.get_default();
+        Gdk.Screen screen = (display != null) ?
+                display.get_default_screen() : null;
+
+        if (screen == null) {
+            warning("Could not open display.");
+            return;
+        }
+        // Set en locale because de_DE's decimal_point is ',' instead of '.'
+        string? backup_locale =
+            Intl.setlocale(LocaleCategory.NUMERIC, null).dup();
+        if (Intl.setlocale(LocaleCategory.NUMERIC, "en_US.UTF-8") == null) {
+          if (Intl.setlocale(LocaleCategory.NUMERIC, "C.UTF-8") == null) {
+              if (Intl.setlocale(LocaleCategory.NUMERIC, "C") == null) {
+                  warning("You don't install either en_US.UTF-8 or C.UTF-8 " +
+                          "or C locale");
+              }
+          }
+        }
+        if (m_rgba == null)
+            m_rgba = new ThemedRGBA(this);
+        uint bg_red = (uint)(m_rgba.normal_bg.red * 255);
+        uint bg_green = (uint)(m_rgba.normal_bg.green * 255);
+        uint bg_blue = (uint)(m_rgba.normal_bg.blue * 255);
+        double bg_alpha = m_rgba.normal_bg.alpha;
+        string data =
+                "#IBusEmojierWhiteLabel { background-color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        bg_red, bg_green, bg_blue, bg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
+                "border-width: 4px; border-radius: 3px; } ";
+
+        uint fg_red = (uint)(m_rgba.selected_fg.red * 255);
+        uint fg_green = (uint)(m_rgba.selected_fg.green * 255);
+        uint fg_blue = (uint)(m_rgba.selected_fg.blue * 255);
+        double fg_alpha = m_rgba.selected_fg.alpha;
+        bg_red = (uint)(m_rgba.selected_bg.red * 255);
+        bg_green = (uint)(m_rgba.selected_bg.green * 255);
+        bg_blue = (uint)(m_rgba.selected_bg.blue * 255);
+        bg_alpha = m_rgba.selected_bg.alpha;
+        data += "#IBusEmojierSelectedLabel { color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        fg_red, fg_green, fg_blue, fg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
+                "background-color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        bg_red, bg_green, bg_blue, bg_alpha) +
+                "border-width: 4px; border-radius: 3px; }";
+        data += "#IBusEmojierGoldLabel { color: " +
+                        "rgba(%u, %u, %u, %lf); ".printf(
+                        fg_red, fg_green, fg_blue, fg_alpha) +
+                "font-family: %s; font-size: %dpt; ".printf(
+                        m_emoji_font_family, m_emoji_font_size) +
+                "background-color: #b09c5f; " +
+                "border-width: 4px; border-radius: 3px; }";
+
+        Gtk.CssProvider css_provider = new Gtk.CssProvider();
+        try {
+            css_provider.load_from_data(data, -1);
+        } catch (GLib.Error e) {
+            warning("Failed css_provider_from_data: %s", e.message);
+            return;
+        }
+        if (backup_locale != null)
+            Intl.setlocale(LocaleCategory.NUMERIC, backup_locale);
+        else
+            Intl.setlocale(LocaleCategory.NUMERIC, "");
+
+        Gtk.StyleContext.add_provider_for_screen(
+                screen,
+                css_provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+
     private void set_fixed_size() {
         resize(20, 1);
     }
@@ -1038,7 +1049,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             m_lookup_table.append_candidate(text);
         }
         m_backward = block_name;
-        m_annotation = m_lookup_table.get_candidate(0).text;
+        if (m_lookup_table.get_number_of_candidates() > 0)
+            m_annotation = m_lookup_table.get_candidate(0).text;
     }
 
 
@@ -1385,6 +1397,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private void show_candidate_panel() {
         remove_all_children();
         set_fixed_size();
+        if (m_emoji_font_changed) {
+            set_css_data();
+            m_emoji_font_changed = false;
+        }
         uint page_size = m_lookup_table.get_page_size();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
         uint cursor = m_lookup_table.get_cursor_pos();
@@ -1488,32 +1504,33 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
             m_candidates += label;
         }
-        if (n > 0) {
-            m_candidate_panel_is_visible = true;
-            if (!m_is_up_side_down) {
-                show_arrow_buttons();
-                if (backward_button != null) {
-                    m_vbox.add(backward_button);
-                    backward_button.show_all();
-                }
+        m_candidate_panel_is_visible = true;
+        if (!m_is_up_side_down) {
+            show_arrow_buttons();
+            if (backward_button != null) {
+                m_vbox.add(backward_button);
+                backward_button.show_all();
+            }
+            if (n > 0) {
                 m_vbox.add(grid);
                 grid.show_all();
                 show_description();
-                if (!m_loaded_unicode)
-                    show_unicode_progress_bar();
             }
-            if (m_is_up_side_down) {
-                if (!m_loaded_unicode)
-                    show_unicode_progress_bar();
+            if (!m_loaded_unicode)
+                show_unicode_progress_bar();
+        } else {
+            if (!m_loaded_unicode)
+                show_unicode_progress_bar();
+            if (n > 0) {
                 show_description();
                 m_vbox.add(grid);
                 grid.show_all();
-                if (backward_button != null) {
-                    m_vbox.add(backward_button);
-                    backward_button.show_all();
-                }
-                show_arrow_buttons();
             }
+            if (backward_button != null) {
+                m_vbox.add(backward_button);
+                backward_button.show_all();
+            }
+            show_arrow_buttons();
         }
     }
 
@@ -2618,11 +2635,15 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         Pango.FontDescription font_desc =
                 Pango.FontDescription.from_string(emoji_font);
         string font_family = font_desc.get_family();
-        if (font_family != null)
+        if (font_family != null) {
             m_emoji_font_family = font_family;
+            m_emoji_font_changed = true;
+        }
         int font_size = font_desc.get_size() / Pango.SCALE;
-        if (font_size != 0)
+        if (font_size != 0) {
             m_emoji_font_size = font_size;
+            m_emoji_font_changed = true;
+        }
     }
 
 

From c8a99943caa1adace0affc78ed5dbde3896f39c7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 27 Jun 2018 12:04:40 +0900
Subject: [PATCH 486/816] Update translations

Update po/ca.po po/da.po po/es.po po/fr.po po/hu.po po/ja.po po/nl.po
       po/pl.po po/sv.po po/uk.po po/vi.po po/zh_TW.po
---
 po/ca.po    |  454 +++++----
 po/da.po    |  338 ++++---
 po/es.po    |  343 ++++---
 po/fr.po    |  678 +++++++------
 po/hu.po    |  919 +++++++++--------
 po/ja.po    |  336 ++++---
 po/nl.po    |  895 +++++++++--------
 po/pl.po    |  346 ++++---
 po/sv.po    |  900 +++++++++--------
 po/uk.po    |  347 ++++---
 po/vi.po    | 2769 +++++++++++++++++++++++++++++++++++++++++++++++----
 po/zh_TW.po |  895 +++++++++--------
 12 files changed, 6186 insertions(+), 3034 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index d2e0fffbf..473336db8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,21 +11,22 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017. #zanata
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-05-05 04:00+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -242,30 +243,40 @@ msgid "Input Method"
 msgstr "Mètode d'entrada"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Les tecles de la drecera de teclat per mostrar el diàleg d'emojis"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Tria de l'emoji:"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Estableix la lletra dels emojis al diàleg d'emojis"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Lletra de l'emoji:"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Estableix l'idioma de les anotacions dels emojis al diàleg d'emojis"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Idioma d'anotació de l'emoji:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -273,7 +284,7 @@ msgstr ""
 "Fes coincidir parcialment les anotacions dels emojis amb la següent condició "
 "i més que el nombre de caràcters:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -281,47 +292,47 @@ msgstr ""
 "Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
 "comptes de la coincidència exacta"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Coincidència del prefix"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Coincidència del sufix"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Coincidència conté"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utilitza la disposició de teclat del sistema (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposició del teclat</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Paràmetres del mètode d'entrada global</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -337,19 +348,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Inicia l'IBus en entrar"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Inici</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Quant a"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -407,6 +418,8 @@ msgstr "Les disposicions llatines no tenen ASCII"
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
+"La disposició dels EUA és un annex de les disposicions llatines. Es pot "
+"ometre la variant."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -580,24 +593,32 @@ msgid "Custom font name for language panel"
 msgstr "Lletra personalitzada per al quadre d'idiomes"
 
 #: ../data/ibus.schemas.in.h:50
-msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "La drecera de teclat per activar o desactivar el tecleig d'emojis"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "El nom de la lletra personalitzada per als caràcters emoji al diàleg dels "
 "emojis"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Idioma predeterminat per al diccionari emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -605,11 +626,11 @@ msgstr ""
 "Trieu l'idioma predeterminat per ls diccionaris dels emojis al diàleg "
 "d'emojis. El valor $lang s'aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "llista d'emojis preferits al diàleg dels emojis"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -617,20 +638,20 @@ msgstr ""
 "Podeu visualitzar els emojis preferits a la llista d'emojis, si aquesta "
 "llista té qualsevol caràcter."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "llista d'anotacions dels emojis preferits al diàleg dels emojis"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "En aquesta llista podeu assignar una anotació per a un emoji preferit."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Si les anotacions dels emojis poden coincidir parcialment o no"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -638,12 +659,12 @@ msgstr ""
 "Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
 "comptes de la coincidència exacta, o no."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Coincidència de les anotacions dels emojis amb la llargada especificada"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -651,44 +672,67 @@ msgstr ""
 "Coincidència parcial de les anotacions dels emojis amb el nombre de "
 "caràcters especificat en comptes de la coincidència exacta."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Trieu una condició per coincidir parcialment amb les anotacions dels emojis"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Incrusta el text pre-editat"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Utilitza el mètode d'entrada global"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Habilita els mètodes d'entrada per defecte"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
 "d'entrada"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva els prefixes"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
@@ -709,12 +753,12 @@ msgid "Select a language"
 msgstr "Selecciona un idioma"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_D'acord"
 
@@ -787,17 +831,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
 "l'anterior mètode d'entrada"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -812,18 +856,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "commutació dels mètodes d'entrada"
 
@@ -1914,140 +1958,140 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Àrea d'ús privat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "Ideogrames de compatibilitat CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Formes de presentació alfabètica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Formes de presentació àrab - A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Selectors de variació"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Formes verticals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Combinació de mitges marques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "Formes de compatibilitat CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Variants de formes petites"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Formes de presentació àrab - B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Formes d'amplada mitjana i completa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Especials"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Conjunt de síl·labes lineal B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Ideogrames B lineals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Nombres egeus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Nombres grecs antics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Símbols antics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Disc de Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lici"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Cari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2061,7 +2105,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Cursiva antiga"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2082,35 +2126,35 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugarític"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Persa antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2145,14 +2189,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Conjunt de síl·labes xipriotes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Arameu imperial"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2180,14 +2224,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Fenici"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lidi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2208,21 +2252,21 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Àrab del sud antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Àrab del nord antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2236,21 +2280,21 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avèstic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Inscripcions Parthian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Inscripcions Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2264,7 +2308,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Turc antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2292,7 +2336,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2460,14 +2504,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Cuneïforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Nombres i puntuació coniforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2481,7 +2525,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Jeroglífics egipcis"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2586,42 +2630,42 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Símbols musicals bizantins"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Símbols musicals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Notació musical grega antiga"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Símbols tai xuan jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Palets xinesos per comptar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Símbols matemàtics alfanumèrics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2663,14 +2707,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Fitxes del Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Fitxes del dòmino"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2684,14 +2728,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Suplement alfanumèric tancat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Suplement ideogràfic tancat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2754,21 +2798,21 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Extensió B d'ideogrames unificats CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Extensió C d'ideogrames unificats CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Extensió D d'ideogrames unificats CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2796,271 +2840,293 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Suplement de selectors de variació"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Àrea A d'ús privat suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Àrea B d'ús privat suplementari"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Mostra tan sols el nom del motor"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "No es pot connectar a IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No s'ha establert cap motor.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "S'ha produït un error en establir el motor global.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "S'ha produït un error en obtenir el motor global.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Llegeix la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Llegeix el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "La memòria cau del registre no és vàlida.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Escriu la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Escriu el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "S'està restablint..."
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Fet"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Estableix o obté el motor"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Surt de l'ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Mostra els motors disponibles"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(No implementat)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Reinicia el dimoni d'ibus"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Mostra la versió"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostra el contingut de la memòria cau del registre"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Crea la memòria cau del registre"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Mostra l'adreça D-Bus de l'ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Mostra els valors de configuració"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Restableix els valors de configuració"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Desa l'emoji del diàleg al porta-retalls"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostra aquesta informació"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Ús: %s ORDRE [OPCIÓ...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Ordres:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s no és una ordre reconeguda!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Mostra les variants dels emojis"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menú"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Preferits"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Altres"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Tria de l'emoji"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Teclegeu l'anotació o trieu l'emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Av Pàg"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Re Pàg"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Mostra les variants dels emojis"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menú"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "Posició del codi: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Té variants d'emoji"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Descripció: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Sense"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotacions: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Nom: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
+msgstr "Àlies: %s"
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Tria de l'emoji"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "S'ha cancel·lat per triar un emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "S'ha copiat un emoji al vostre porta-retalls."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr ""
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Les anotacions dels emonjis poden coincidir parcialment"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Coincideix amb la llargada de l'enter especificat"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Coincideix amb la condició de l'enter especificat"
 
@@ -3093,11 +3159,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Surt"
 
diff --git a/po/da.po b/po/da.po
index f4916888f..54c7f322c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,20 +8,21 @@
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# scootergrisen <scootergrisen@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"PO-Revision-Date: 2018-03-07 04:56+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -225,30 +226,40 @@ msgid "Input Method"
 msgstr "Inputmetode"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Genvejstasten til at vise emoji-dialogen"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Valg af emoji:"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Sæt en skrifttype af emoji-kandidater i emoji-dialogen"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emoji-skrifttype:"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Sæt et sprog af emoji-kandidater i emoji-dialogen"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Emoji annoteringssprog:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -256,7 +267,7 @@ msgstr ""
 "Match emoji-annoteringer delvist med følgende betingelse og flere end "
 "antallet af tegn:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -264,47 +275,47 @@ msgstr ""
 "Hvorvidt emoji-annonteringer kan matches med en delvis streng i stedet for "
 "det præcise match"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Præfiks match"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Suffiks match"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Indeholdende match"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Brug systemets tastaturlayout"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Brug systemets tastaturlayout (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tastaturlayout</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Del den samme inputmetode i alle programmer"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Indstillinger for global inputmetode</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -320,19 +331,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Start ibus ved login"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Opstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Om"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Luk"
 
@@ -556,22 +567,30 @@ msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-genvejstaster for gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Genvejstasterne til at slå emoji-indtastning til eller fra"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Tilpasset skrifttypenavn for emoji-tegn i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Standardsprog for emojiordbog"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -579,30 +598,30 @@ msgstr ""
 "Vælg et standardsprog af emoji-ordbøger i emoji-dialogen. Værdien $lang "
 "anvendes på /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "farvorit emojiliste i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 "Du kan vise farvorit emojierne i emojiliste hvis denne liste har nogen tegn."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit emoji-annonteringsliste i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tildele en annotering til en favorit-emoji i denne liste."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Hvorvidt emoji-annonteringer kan matches delvist eller ej"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -610,11 +629,11 @@ msgstr ""
 "Hvorvidt emoji-annoteringer kan matches med en delvis streng i stedet for "
 "det præcise match eller ej."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji-annoteringer med den angivne længde"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -622,11 +641,11 @@ msgstr ""
 "Match emoji-annoteringer delvist med flere end det angivne antal tegn i "
 "stedet for det præcise match."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Vælg en betingelse til delvist at matche emoji-annonteringer"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -634,32 +653,55 @@ msgstr ""
 "Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 ="
 "= Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Indbyg forudredigeret tekst"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Aktivér inputmetode som standard"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 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:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf bevar navnepræfiks"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Præfiks af DConf-taster til stop af navnekonvertering"
 
@@ -680,12 +722,12 @@ msgid "Select a language"
 msgstr "Vælg et sprog"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Annullér"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
@@ -758,15 +800,15 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Tryk venligst på en tast (eller en tastekombination)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Brug genvej med skift for at skifte til forrige inputmetode"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus-dæmonen kører. Vil du starte den?"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -781,18 +823,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus-dæmon kunne ikke startes på %d sekunder"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vælg tastaturgenveje til %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "skifter inputmetoder"
 
@@ -2674,7 +2716,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "Emotikoner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2788,248 +2830,270 @@ msgstr ""
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Vis kun motornavn"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan ikke oprette forbindelse til IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "sprog: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Ingen motor er sat.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Sætning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Hentning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Læs systemets registreringsmellemlager."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Læs den registreringsmellemlageret FIL."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Registreringsmellemlageret er ugyldigt.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Skriv systemets registreringsmellemlager."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Skriv den registreringsmellemlageret FIL."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Nulstiller…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Færdig"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Sæt eller hent motor"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Forlad ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Vis tilgængelige motorer"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(ikke implementeret)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Genstart ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Vis version"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Vis indholdet af registreringsmellemlager"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Opret registreringsmellemlager"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print D-Bus-adressen af ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Vis konfigurationsværdierne"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Nulstil konfigurationsværdierne"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Gem emoji i dialog til udklipsholder "
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Vis denne information"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Kommandoer:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s er ukendt kommando!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Vis emoji-varianter"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menu"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Farvoritter"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Andre"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Valg af emoji"
+msgstr "Åbn valg af unicode"
 
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Skriv annotering eller vælg emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "Bring valg af emoji tilbage"
 
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Vis emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Indlæser en unicode-ordbog:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodepunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annoteringer: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Navn: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Valg af emoji"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Valg af unicode"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Annulleret for at vælge en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierede en emoji til dit skrivebord."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "SKRIFTTYPE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "SPROG"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annoteringer kan matches delvist"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Match med længen af det angive heltal"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Match med betingelsen af det angive heltal"
 
@@ -3061,11 +3125,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Afslut"
 
diff --git a/po/es.po b/po/es.po
index 5835446f2..1984dd14a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -26,16 +26,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-06-25 10:45+0000\n"
+"Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -255,31 +255,44 @@ msgid "Input Method"
 msgstr "Métodos de Entrada"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Atajo de teclado para mostrar el diálogo de emoji"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Los atajos de teclado para activar las conversiones de las anotaciones de "
+"emoji o nombre Unicode"
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Selección de emoji:"
+msgid "Emoji annotation:"
+msgstr "Anotación emoji:"
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Fuente a usar para los emoji candidatos en el cuadro de emoji."
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"Los atajos de teclado para activar las conversiones de los códigos Unicode"
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Fuente para emoji:"
+msgid "Unicode code point:"
+msgstr "Código Unicode:"
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Fuente a usar para los candidatos Unicode en el cuadro de emoji."
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "Fuente Unicode:"
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr ""
 "Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Idioma para las anotaciones de emoji:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -287,7 +300,7 @@ msgstr ""
 "Realizar búsqueda parcial en las anotaciones de emoji con la siguiente "
 "condición y más que un mínimo de caracteres:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -295,47 +308,47 @@ msgstr ""
 "Si se puede obtener una coincidencia parcial en lugar de exacta en la "
 "búsqueda de anotaciones de emoji."
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Comienza con el texto"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Acaba con el texto"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Contiene el texto"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Usar la distribución del teclado del sistema"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar la distribución del teclado del sistema (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Distribución del teclado</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuraciones globales de método de entrada</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -351,19 +364,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Iniciar ibus al ingresar"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Inicio</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Acerca de"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -595,23 +608,31 @@ msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Atajos de teclado Unicode para gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "Los atajos de teclado para activar y desactivar la escritura Unicode"
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Atajos de teclado de emoji para gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Idioma predeterminado para el diccionario de emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -619,11 +640,11 @@ msgstr ""
 "Elija un idioma predeterminado para el diccionario de emoji. Su valor "
 "($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista de emoji favoritos en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -631,20 +652,20 @@ msgstr ""
 "Puede mostrar sus emoji favoritos en la lista de emoji si los incluye en "
 "esta lista."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista de anotaciones de emoji favoritos en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Puede poner anotaciones a sus emoji favoritos en esta lista."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -652,13 +673,13 @@ msgstr ""
 "Si se puede obtener una coincidencia parcial en la búsqueda de anotaciones "
 "de emoji en lugar de una exacta."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
 "indicada"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -666,12 +687,12 @@ msgstr ""
 "Obtener coincidencias parciales en lugar de exactas en las anotaciones de "
 "emoji que tengan más que el número de caracteres indicado "
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Elija una condición para las coincidencias parciales de anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -680,33 +701,62 @@ msgstr ""
 "anotaciones de emoji: 0 == inicio del texto, 1 == final del texto, 2 == "
 "contiene el texto."
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr "Cargar los datos de emoji al inicio"
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"Cargar los datos de emoji al inicio. Se necesitan alrededor de 10MB. Si está "
+"desactivado, se cargarán al abrir el cuadro de selección de emoji."
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr "Cargar los datos de Unicode al inicio"
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"Cargar los datos de Unicode al inicio. Se necesitan alrededor de 15MB. Si "
+"está desactivado, se cargarán al abrir el cuadro de selección de emoji. Los "
+"datos de Unicode sólo se cargarán después de los de emoji, incluso cuando "
+"esta opción esté activa."
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada por defecto"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Habilitar método de entrada por defecto cuando la aplicación consigue el "
 "foco de entrada"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -727,12 +777,12 @@ msgid "Select a language"
 msgstr "Elija un idioma"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -805,15 +855,15 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 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:507
+#: ../setup/main.py:515
 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:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -828,18 +878,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, 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:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "cambiando métodos de entrada"
 
@@ -2835,250 +2885,275 @@ msgstr "Área suplementaria de uso privado A"
 msgid "Supplementary Private Use Area-B"
 msgstr "Área suplementaria de uso privado B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lea el cache del registro del sistema."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lea el ARCHIVO de caché del registro."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "El caché del registro es inválido.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Escriba al caché del registro del sistema."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr "Usar rutas de esquema del motor en lugar del núcleo ibus."
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Restableciendo..."
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Hecho"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Mostrar los valores de la configuración"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Restablecer los valores de la configuración"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Guardar emoji del diálogo en el portapapeles."
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMANDO [OPCIÓN...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Mostrar variantes de emoji"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menú"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Otros"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr "Abrir selección Unicode"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Selección de emoji"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Escriba el texto o elija un emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Selección Unicode"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr "Volver a la selección emoji"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "Cargando un diccionario Unicode:"
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Siguiente"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Anterior"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Mostrar variantes de emoji"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menú"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr "Pulse para ver mensaje de aviso"
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Cargando un diccionario Unicode:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto de código: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Tiene variantes emoji"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Ninguna"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotaciones: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Selección de emoji"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Selección Unicode"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+"No se pudo obtener la aplicación de texto actual, por favor devuélvala el "
+"foco (por ejemplo, pulse escape varias veces para salir del modo emoji, haga "
+"clic en el escritorio y de nuevo en su aplicación."
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Cancelada la selección de emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Se copió un emoji al portapapeles."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FUENTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
 ""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "IDIOMA"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Buscar coincidencias con la longtud indicada"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Buscar coincidencias con la condición indicada por el código"
 
@@ -3106,11 +3181,11 @@ msgstr "Créditos de Traducción"
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Salir"
 
diff --git a/po/fr.po b/po/fr.po
index f4813032e..7d76464e3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # French translation of ibus.
-# Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -18,21 +18,22 @@
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-03-04 10:35+0000\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -248,31 +249,41 @@ msgid "Input Method"
 msgstr "Méthode d’entrée"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Les raccourcis pour afficher la boite de dialogue des émoticônes"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Choix d’émoticônes :"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Police des émoticônes :"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr ""
 "Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Langue d’annotations des émoticônes :"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -280,7 +291,7 @@ msgstr ""
 "Correspondances partielles d’annotations des émoticônes ayant les conditions "
 "suivantes et plus que le nombre de caractères  :"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -288,47 +299,47 @@ msgstr ""
 "Si les annotations peuvent correspondre à une chaîne partielle plutôt qu’une "
 "correspondance exacte"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Correspondance de préfixe"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Correspondance de suffixe"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Correspondance de contenu"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Émoticône"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Disposition du clavier</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 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:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -344,19 +355,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Démarrer IBus lors de la connexion"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Démarrage</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "À propos"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -589,25 +600,33 @@ msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour la barre de langues"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourcis clavier des émoticônes pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 "Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nom de la police personnalisée pour les caractères d’émoticônes dans la "
 "boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Langue par défaut pour le dictionnaire des émoticônes"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -616,11 +635,11 @@ msgstr ""
 "boite de dialogue. La valeur $Lang est appliquée à /usr/share/ibus/dicts/"
 "emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "liste des émoticônes favorites dans la boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -628,23 +647,23 @@ msgstr ""
 "Vous pouvez afficher les émoticônes favorites dans la liste des émoticônes "
 "si celle-ci contient des caractères."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 "liste des annotations d’émoticônes favorites dans la boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "Vous pouvez assigner une annotation pour une émoticône favorite dans cette "
 "liste."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre partiellement ou non"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -652,11 +671,11 @@ msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
 "partielle plutôt qu’à la chaîne complète"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Correspondance d’annotations d’émoticônes ayant la longueur spécifiée"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -664,12 +683,12 @@ msgstr ""
 "Correspondances partielles avec plus que le nombre de caractères spécifié "
 "plutôt qu'une correspondance exacte."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Choisir une condition de correspondance partielle d'annotations d'émoticônes"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -678,33 +697,56 @@ msgstr ""
 "partielle d'annotations d'émoticônes : 0 == correspondance de préfixe, 1 == "
 "correspondance de suffixe, 2 == correspondance de contenu"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d’édition"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 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:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Utiliser la méthode d’éntrée globale"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d’entrée"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 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"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -725,12 +767,12 @@ msgid "Select a language"
 msgstr "Sélectionner la langue"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "A_nnuler"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_Valider"
 
@@ -803,16 +845,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 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"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 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:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -828,18 +870,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, 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:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Sélection du raccourci clavier pour %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "Changement de méthode d’entrée"
 
@@ -880,1197 +922,1197 @@ msgstr "Voyages & lieux"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Latin de base"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Supplément Latin-1"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latin étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latin étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "Extensions à l'API"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Diacritiques sans chasse combinés avec une espace"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Marques diacritiques combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Grec et copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cyrillique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Supplément cyrillique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Arménien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hébreu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Syriaque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Supplément arabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritain"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandéen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Supplément Syriaque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arable étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Télougou"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thaïlandais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibétain"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Géorgien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangeul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Éthiopien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Supplément éthiopien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Syllabaire autochtone canadien unifié"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Runique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Syllabaires canadiens autochtones unifiés étendus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Nouveau Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Symboles khmers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Bouguinais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Marques diacritiques combinantes étendues"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Cyrillique étendu-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Supplément sundanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Extensions védiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Extensions phonétiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Extensions phonétiques suppléments"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Supplément marques diacritiques combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latin étendu additionnel"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Grec étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Ponctuation générale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Exposants et indices"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Symboles monétaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Marques diacritiques combinantes pour symboles"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Symboles Letterlike"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Formes numérales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Flèches"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Opérateurs mathématiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Divers techniques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Contrôler des photos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Reconnaissance optique de caractères"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Alphanumériques cerclés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Dessiner des boîtes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Éléments blocs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Formes géométriques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Symboles divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Casseaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Divers symboles mathématiques-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Flèches-A supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Motifs en braille"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Flèches-B supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Symboles mathématiques-B divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Opérateurs mathématiques supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Symboles et flèches divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latin étendu-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Supplément géorgien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Éthiopien étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Cyrillique étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Ponctuation complémentaire"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "Radicaux suppléments CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Radicaux Kangxi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Caractères de description idéographique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "Symboles et ponctuation CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Compatibilité Hangeul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "Traits CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Extensions Katakana phonétiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Lettres et mois CJC cerclés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "Compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Symboles hexagrammes Yì Jīng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "Idéographes unifiés CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Syllables Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Radicaux Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Cyrillique étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamoun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Lettres modificatives de ton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latin étendu-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Sylotî nâgrî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Formes numériques communes indiennes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurachtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangeul Jamo étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Javanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Myanmar étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Myanmar étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Extensions meetei mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Éthiopien étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latin étendu-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Supplément cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Syllabes hangeul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangeul Jamo étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "Substituts hauts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Substituts d’utilisation privé hauts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Substituts bas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Zone à usage privé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "Idéographes de compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Formes de présentation alphabétique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Formes A de présentation arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Sélecteurs de variante"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Formes verticales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Demi-signes combinatoires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "Formes de compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Petites variantes de forme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Formes B de présentation arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Formes de demi et pleine chasse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Caractères spéciaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Syllabaire linéaire B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Idéogrammes du linéaire B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Nombres égéens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Nombres grecs anciens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Symboles anciens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Disque de Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lycien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Carien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Nombres epact coptes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2835,250 +2877,272 @@ msgstr ""
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion à IBus impossible.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Aucun moteur n’est configuré.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lire le cache du registre système."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lire le fichier FILE du cache du registre système."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Le cache du registre est invalide.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Enregistrer le cache du registre système."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Enregistrer le fichier FILE du cache du registre."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Réinitialisation…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Effectuée"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Définir ou obtenir le moteur"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Quitter ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Afficher les moteurs disponibles"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Non implémenté)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Redémarrer ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Afficher le contenu du cache du registre"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Créer le cache du registre"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Afficher l’adresse D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Afficher les valeurs de configuration"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Réinitialiser les valeurs de configuration"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Afficher cette information"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s n’est pas une commande connue !\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Montrer les variantes d’émoticônes"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menu"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Autres"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Choix d’émoticônes"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Saisir une annotation ou choisir une émoticône"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Montrer les variantes d’émoticônes"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Aucune"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Choix d’émoticônes"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue."
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Faire correspondre avec la longueur de l’entier indiqué"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Faire correspondre avec la condition de l’entier indiqué"
 
@@ -3106,11 +3170,11 @@ msgstr "Julien Humbert <julroy67@gmail.com>"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Quitter"
 
diff --git a/po/hu.po b/po/hu.po
index 2631e319c..0c3bba5a2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,21 +9,21 @@
 # Sulyok Péter <peti@fedoraproject.org>, 2009
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Meskó Balázs <meskobalazs@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"PO-Revision-Date: 2018-03-17 10:41+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -239,31 +239,40 @@ msgid "Input Method"
 msgstr "Beviteli mód"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Az emodzsi párbeszédablak gyorsbillentyűje"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Emodzsi választás:"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
+msgid "The shortcut keys to enable Unicode code point conversions"
 msgstr ""
-"Emodzsi jelöltekből álló betűkészlet beállítása az emodzsi párbeszédablakon"
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emodzsi betűkészlet:"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Emodzsi annotációk nyelvének beállítása az emodzsi párbeszédablakon"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Emodzsi annotációk nyelve:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -271,7 +280,7 @@ msgstr ""
 "Az emodzsi annotációk részleges illesztése a következő feltétel szerint, ha "
 "több mint ennyi karakter lett megadva:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -279,47 +288,47 @@ msgstr ""
 "Ha az emodzsi annotációkat részleges szövegre kell illeszteni, pontos "
 "egyezés helyett"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Előtag illeszkedés"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Utótag illeszkedés"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Tartalmazó illeszkedés"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emodzsi"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Rendszer billentyűzetkiosztásának használata"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Billentyűzetkiosztás</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
-msgstr "<b>Globális beviteli mód beállítások</b>"
+msgstr "<b>Globális bevitelimód-beállítások</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Speciális"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -335,19 +344,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Az IBus indítása bejelentkezéskor"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Indulás</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Névjegy"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -402,8 +411,7 @@ msgstr "Latin kiosztások, amelyekben nincs ASCII"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr ""
-"USA kiosztás a Latin kiosztások mögé fűzve. A változat nem kihagyható."
+msgstr "USA kiosztás a Latin kiosztások mögé fűzve. A változat elhagyható."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -531,13 +539,13 @@ msgid ""
 "to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
-"Az XKB ikon az elrendezési karakterláncot mutatja, és a karakterlánc egy "
-"RGBA értékkel jelenik meg. Az RGA érték a következők egyike lehet. 1. egy "
-"X11 színnév, 2. egy hexadecimális érték, „#rrggbb” formában, ahol az „r”, "
-"„g” és „b” a vörös, zöld és kék színek értékei hexadecimális számjegyekkel, "
-"3. egy RGB szín „rgb(r,g,b,a)” alakban, ahol az „r”, „g” és „b” egész számok "
-"0 és 255 között, vagy százalékos értékek 0% és 100% között, az „a” pedig az "
-"alfa lebegőpontos értéke 0 és 1 között."
+"Az XKB ikon a kiosztási karakterláncot mutatja, és a karakterlánc  RGBA "
+"értékként jelenik meg. Az RGA érték a következők egyike lehet. 1. egy X11 "
+"színnév, 2. egy hexadecimális érték „#rrggbb” formában, ahol az „r”, „g” és "
+"„b” a vörös, zöld és kék színek értékei hexadecimális számjegyekkel, 3. egy "
+"RGB szín „rgb(r,g,b,a)” vagy 4. egy RGBA szín „rgba(r,g,b,a)” alakban, ahol "
+"az „r”, „g” és „b” egész számok 0 és 255 között, vagy százalékos értékek 0% "
+"és 100% között, az „a” pedig az alfa lebegőpontos értéke 0 és 1 között."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
@@ -572,22 +580,30 @@ msgid "Custom font name for language panel"
 msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emodzsi gyorsbillentyűket a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Gyorsbillentyűk az emodzsi bevitel ki- vagy bekapcsolásához"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr "Egyéni emodzsi betűkészlet neve az emodzsi párbeszédablakhoz"
+msgstr "Egyéni emodzsi betűkészlet neve az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Emodzsi szótár alapértelmezett neve"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -596,30 +612,30 @@ msgstr ""
 "alapértelmezett nyelvét. A $lang érték ebbe lesz behelyettesítve: /usr/share/"
 "ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "kedvenc emodzsik listája az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 "Megjelenítheti a kedvenc emodzsijait a listában, ha vannak ilyen karakterek"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "kedvenc emodzsik annotációinak listája az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Annotációkat adhat hozzá a kedvenc, listában szereplő emodzsijainak."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Az emodzsi annotációkra lehet-e részlegesen illeszteni"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -627,11 +643,11 @@ msgstr ""
 "Illeszthetőek-e részleges karakterláncokra az emodzsi annotációk, a pontos "
 "egyezés helyett"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Illesztés a megadott hosszúságú emodzsi annotációkra"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -639,11 +655,11 @@ msgstr ""
 "Az emodzsi annotációk részleges illesztése, a pontos egyezés helyett, ha "
 "több mint ennyi karakter lett megadva"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Válasszon egy feltételt az emodzsi annotációk részleges illesztéséhez"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -652,33 +668,56 @@ msgstr ""
 "részleges illesztéséhez: 0 == szó elejére illesztés, 1 == szó végére "
 "illesztés, 2 == tartalmazási illesztés"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Előszerkesztett szöveg beágyazása"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Globális beviteli mód használata"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Beviteli mód engedélyezése alapértelmezésben"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 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"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "A DConf megőrzi a név előtagokat"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 "A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
@@ -700,12 +739,12 @@ msgid "Select a language"
 msgstr "Válasszon nyelvet"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "Mé_gse"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
@@ -778,17 +817,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli "
 "módra"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Az IBus démon nem fut. Elindítja?"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -803,18 +842,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Az IBus démon nem indítható el %d másodpercen belül."
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s gyorsbillentyűjének kiválasztása"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "beviteli módok váltása"
 
@@ -855,2203 +894,2225 @@ msgstr "Utazás és helyek"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Alap latin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latin-1 kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latin bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latin bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA kiegészítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Térköz módosító betűk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Egyesítő diakritikus jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Görög és kopt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cirill"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Cirill kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Örmény"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Héber"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Szír"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arab kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Szamaritánus "
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandeus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Szír kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arab bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Dévanágari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengáli"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gudzsaráti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Orija"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malajálam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Szingaléz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibeti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Burmai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Grúz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Etióp"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Etióp kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cseroki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Egyesített kanadai őslakos szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Rúnák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Egyesített kanadai őslakos szótagírás bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Új Tai Lü"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Khmer szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginéz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Egyesítő diakritikus jelek bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinéz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Szundai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Cirill bővített – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Szundai kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Védikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Fonetikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Fonetikus bővítések kiegészítése"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Egyesítő diakritikus jelek kiegészítése"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latin további bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Görög bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Általános központozás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Alsó és felső index"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Pénznemek szimbólumai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Egyesítő diakritikus jelek szimbólumokhoz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Betűszerű szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Számalakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Nyilak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Matematikai operátorok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Egyéb műszaki jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Vezérlőkarakterek jelei"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optikai karakterfelismerés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Közrezárt alfanumerikus karakterek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Dobozrajzolás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Blokkelemek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometriai alakzatok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Egyéb szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Ábrácskák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Kiegészítő matematikai szimbólumok – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Kiegészítő nyilak A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Braille-jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Kiegészítő nyilak B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Kiegészítő matematikai szimbólumok – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Kiegészítő matematikai operátorok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Egyéb szimbólumok és nyilak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolita"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latin bővített – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Kopt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Grúz kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Etióp bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Cirill bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Központozási kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK radikális kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kang-hszi radikálisok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Képírásjel leíró karakterek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK szimbólumok és központozás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul jamo kompatibilitás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK vonalak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Katakana fonetikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Közrezárt CJK betűk és hónapok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK kompatibilitás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Ji csing hexagram szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "CJK egyesített képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi szótagok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi radikálisok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Cirill bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Módosító hangjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latin bővített – D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Általános indiai számalakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Dévanágari bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul jamo bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Jávai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Burmai bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Bburmai bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meetei Mayek kiegészítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Etióp bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latin bővített – E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cseroki kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangul szótagok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul jamo bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "Felső pótlások"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Felső pótlások személyes használatra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Alsó pótlások"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Személyes használatra kijelölt tartomány"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK kompatibilitási képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alfabetikus megjelenítési alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arab megjelenítési alakok – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Változatválasztók"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Függőleges alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Egyesítő féljelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK kompatibilitási alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Kisalakú változatok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arab megjelenítési alakok – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Fél- és teljes szélességű alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Különleges"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Lineáris B szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Lineáris B képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Égei számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Ógörög számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Ősi szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Phaisztoszi korong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lükiai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Kariai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Kopt epact számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Régi itáliai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "Gót"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "Régi permi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugariti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Óperzsa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shaw-féle ábécé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Kaukázusi albaniai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "Lineáris A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Ciprióta szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Birodalmi arámi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmürai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabateus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Föníciai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lüd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroita hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroita dőlt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharosti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Régi déli arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Régi északi arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "Manicheai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avesztán"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Feliratos pártus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Feliratos pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Zsoltáros pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Régi török"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Székely–magyar rovásírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Rumi számszimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Sinhala archaikus számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongol kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar-féle négyzet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram-féle gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Ékírásos szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Kora dinasztiai ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Egyiptomi hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anatóliai hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Ideografikus szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "Tangut komponensek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Gyorsírás formátum vezérlők"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Bizánci zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Ógörög zenei jelölés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai Xuan Jing szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Számolórúd számjegyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Matematikai alfanumerikus szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Sutton-féle jelnyelv"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolita kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arab matematikai ábécészimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Madzsong kövek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Dominók"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "Játékkártyák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Közrezárt alfanumerikus kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Közrezárt képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Egyéb szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "Emotikonok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Díszítő apróságok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Közlekedési és térkép szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Alkímiai szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Geometriai alakzatok bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Kiegészítő nyilak C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Kiegészítő szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "CJK egyesített képírásjel kiegészítés – F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "CJK kompatibilitási képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Címkék"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Variációválasztó kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Kiegészítő személyes használatú terület A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Kiegészítő személyes használatú terület B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevének listázása"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Nem lehet csatlakozni a IBushoz.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nincs alrendszer beállítva.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer beállítása.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer lekérése.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának olvasása."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának olvasása."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "A regisztrációs gyorsítótár érvénytelen.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának írása."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának írása."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Visszaállítás…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Kész"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Alrendszer beállítása vagy lekérése"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Kilépés az ibus-daemon-ból"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Elérhető alrendszerek megjelenítése"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Nincs megvalósítva)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Az ibus-daemon újraindítása"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Verzió megjelenítése"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "A regisztrációs gyorsítótár tartalmának megjelenítése"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Regisztrációs gyorsítótár létrehozása"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Az ibus-daemon D-Bus címének kiírása"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Beállítási értékek megjelenítése"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "A beállítási értékek visszaállítása"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Ezen információk megjelenítése"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Használat: %s PARANCS [KAPCSOLÓK…]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s: ismeretlen parancs!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Emodzsi változatok megjelenítése"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menü"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Többi"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Emodzsi választás"
+msgstr "Unicode választás megnyitása"
 
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Írja be az annotációt, vagy válasszon emodzsit"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Emodzsi választás visszahozása"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Emodzsi változatok megjelenítése"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menü"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Unicode szótár betöltése:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódpont: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Vannak emodzsi változatai"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Nincs"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotációk: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Név: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
+msgstr "Álnév: %s"
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Emodzsi választás"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Unicode választás"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Emodzsi kiválasztás megszakítva."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Emodzsi vágólapra másolva."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "„BETŰKÉSZLET” az emodzsi választó párbeszédablakon"
+msgstr "„BETŰKÉSZLET” az emodzsiválasztó párbeszédablakon"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "BETŰKÉSZLET"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„NYELV”  az emodzsi párbeszédablak annotációhoz. Például „en”"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "NYELV"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Az emodzsi annotációkra lehet részlegesen illeszteni"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Illesztés a megadott egész számmal egyező hosszra"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Illesztés a megadott egész szám feltételével"
 
@@ -3089,11 +3150,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Kilépés"
 
diff --git a/po/ja.po b/po/ja.po
index 195893e5d..1e7475ca4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,16 +19,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"PO-Revision-Date: 2018-06-21 08:19+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -231,82 +231,92 @@ msgid "Input Method"
 msgstr "入力メソッド"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "絵文字ダイアログを表示するためのショートカットキー"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "絵文字ルビまたは Unicode 名の変換を可能にするショートカットキー"
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "絵文字の選択:"
+msgid "Emoji annotation:"
+msgstr "絵文字ルビ:"
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "絵文字ダイアログ上の絵文字候補のフォントを設定します"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Unicode コードポイント変換を可能にするショートかっトーキー"
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "絵文字フォント:"
+msgid "Unicode code point:"
+msgstr "Unicode コードポイント:"
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "絵文字ダイアログ上の Unicode 候補のフォントを設定"
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "Unicode フォント:"
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字ルビの言語を設定します"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "絵文字ルビの言語:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr "絵文字ルビを次の条件と文字数以上で部分一致させる:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることが可能かどうか"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "文頭一致"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "文末一致"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "文中一致"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "絵文字"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "システムのキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムのキーボード (XKB) レイアウトを使用する"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>グローバル入力メソッドの設定</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -322,19 +332,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "ログイン時に IBus を起動"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>スタートアップ</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "情報"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -543,22 +553,30 @@ msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse のための Unicode ショートカットキー"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "Unicode 入力の有効と無効を切り替えるためのショートカットキー"
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のための絵文字ショートカットキー"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "絵文字入力の有効と無効を切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "絵文字辞書用のデフォルトの言語"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -566,79 +584,107 @@ msgstr ""
 "絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang は、/usr/share/ibus/dicts/emoji-$lang."
 "dict に適用されます。"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入り絵文字リスト"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入りの絵文字ルビリスト"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "このリストの中にお気に入りの絵文字用のルビを指定できます。"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "絵文字ルビを部分一致させることを可能にするか否か"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "指定した長さで絵文字ルビを一致させる"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "絵文字ルビを部分一致させる条件を選ぶ"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr "絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文末一致、2 == 文中一致"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr "起動時に絵文字データを読み込む"
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"true の場合、起動時に絵文字データを読み込みます。約 10 MBメモリーがデータを読み込むために必要になります。false "
+"の場合、初めて絵文字ダイアログを開く時に絵文字データを読み込みます。"
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr "起動時に Unicode データを読み込む"
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"true の場合、起動時に Unicode データを読み込みます。約 15 MB メモリーがデータを読み込むために必要になります。false "
+"の場合、初めて絵文字ダイアログを開く時に Unicode データを読み込みます。true の場合、常に絵文字データが読み込まれた後で、Unicode "
+"データが読み込まれます。"
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "前編集テキストを組み込む"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "グローバル入力メソッドを使用する"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "デフォルトで入力メソッドを有効にする"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf により名前のプレフィックスを維持する"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
 
@@ -659,12 +705,12 @@ msgid "Select a language"
 msgstr "言語の選択"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "OK(_O)"
 
@@ -736,15 +782,15 @@ msgstr "キーもしくはキーの組み合わせを入力してください。
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンが実行されていません。起動しますか？"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -759,18 +805,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "入力メソッドの切り替え中"
 
@@ -2770,248 +2816,272 @@ msgstr "補助私用領域 A"
 msgid "Supplementary Private Use Area-B"
 msgstr "補助私用領域 B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "エンジン名のみ表示"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "IBus に接続できません。\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "エンジンが設定されていません。\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "システムレジストリーキャッシュを読み込みます。"
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "レジストリーキャッシュは無効です。\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "システムレジストリーキャッシュを書き込みます。"
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr "ibus コアの代わりにエンジンのスキーマパスを使用し、コンマで区切られた値が可能です。"
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "初期化中…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "完了"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "設定値を表示する"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "設定値を初期化する"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "ダイアログ上の絵文字をクリップボードに保存する"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "使い方: %s コマンド [オプション...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "絵文字異形を表示する"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "メニュー"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "その他"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr "Unicode の選択を開く"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "絵文字の選択"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "ルビを入力するか絵文字を選択してください"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Unicode の選択"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr "絵文字の選択に戻る"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "Unicode の辞書を読み込んでいます:"
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "絵文字異形を表示する"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr "閉じる"
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "メニュー"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr "警告メッセージを閲覧するためにクリックしてください"
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Unicode の辞書を読み込んでいます:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "なし"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr "別名: %s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "絵文字の選択"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Unicode の選択"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+"現在のテキストアプリケーションを取得するのに失敗しました。アプリケーションを再フォーカスさせてください。例えば、Esc "
+"キーを数回入力して絵文字入力モードを開放し、デスクトップをクリックして、テキストアプリケーションを再度クリックしてください。"
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "絵文字の選択を取り消しました。"
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "クリップボードに絵文字をコピーしました。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "フォント"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "言語"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "指定した数字をもつ長さで一致させる"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
@@ -3043,11 +3113,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "終了"
 
diff --git a/po/nl.po b/po/nl.po
index 65d8fd047..69b84a769 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,16 +15,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-04-13 04:08+0000\n"
+"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -240,30 +240,40 @@ msgid "Input Method"
 msgstr "Invoermethode"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "De sneltoetsen voor het tonen van de emoji dialoog"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Emoji keuze:"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Zet een lettertype met emoji kandidaten op de emoji dialoog"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emoji lettertype:"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Zet een taal met emoji annotaties op de emoji dialoog"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Emoji annotatietaal:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -271,7 +281,7 @@ msgstr ""
 "Match emoji annotaties gedeeltelijk met de volgende conditie en meer dan het "
 "aantal karakters:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -279,47 +289,47 @@ msgstr ""
 "Als emoji annotaties gematched kunnen worden met een gedeeltelijke string in "
 "plaats van de exacte match"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Voorvoegsel match"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Achtervoegsel match"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Inhoudelijke match"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Toetsenbordindeling</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globale invoermethode instellingen</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -335,19 +345,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Start ibus bij inloggen"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Opstarten</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Over"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Sl_uiten"
 
@@ -580,22 +590,30 @@ msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji sneltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "De sneltoetsen om emoji typen aan of uit te zetten"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Aangepaste lettertype naam voor emoji karakters op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Standaard taal voor emoji woordenboek"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -603,11 +621,11 @@ msgstr ""
 "Kies een standaard taal met emoji woordenboeken op de emoji dialoog. De "
 "waarde $lang wordt toepast in /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "favoriete emoji lijst op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -615,20 +633,20 @@ msgstr ""
 "Je kunt de favoritee emojis op emoji lijst tonen als deze lijst karakters "
 "heeft."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favoriete emoji annotatielijst op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "Je kunt in deze lijst een annotatie toekennen aan een favoriete emoji."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Worden emoji annotaties wel of niet gedeeltelijk gematched"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -636,11 +654,11 @@ msgstr ""
 "Worden emoji annotaties wel of niet gematched met een gedeeltelijke string "
 "in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji annotaties met de gespecificeerde lengte"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -648,11 +666,11 @@ msgstr ""
 "Match emoji annotaties gedeeltelijk met meer dan het gespecificeerde aantal "
 "karakters in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Kies een conditie om emoji annotaties gedeeltelijk te matchen"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -661,31 +679,54 @@ msgstr ""
 "matchen: 0 == Voorvoegsel match, 1 == Achtervoegel match, 2 == Inhoudelijke "
 "match"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Voeg pre-edit tekst in"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Voeg pre-edit tekst in in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Gebruik globale invoermethode"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Zet invoer-methode standaard aan"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf behoud van naam voorvoegsels"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
 
@@ -706,12 +747,12 @@ msgid "Select a language"
 msgstr "Selecteer een taal"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_Ok"
 
@@ -784,17 +825,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 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:507
+#: ../setup/main.py:515
 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:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -809,18 +850,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, 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:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
@@ -868,2196 +909,2218 @@ msgstr "Basis Latijn"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latijns-1 supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latijns uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latijns uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA-uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Letterafstand veranderen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Diakritische kenmerken combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Grieks en Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cyrillisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Cyrillisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armeens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebreeuws"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Syrisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arabisch supllement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Syrisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arabisch uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Singalees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Laotiaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Ethiopisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Ethiopisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Verenigde Canadese Aboriginal syllabics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongools"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Verenigde Canadese Aboriginal syllabisch uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Nieuw Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Khmer symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginese"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Diakritische tekens voor symbolen combineren uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanese"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Cyrillisch uitgebreid-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Soendanees supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Vedic uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Fonetische uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Fonetische uitbreidingen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Diakritische tekens voor symbolen combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latijns uitbreidingen extra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Griekse uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Aalgemene interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Superscripts en subscripts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Valutasymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Diakritische tekens voor symbolen combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Letterachtige symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Nummerformulieren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Pijlen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Wiskundige operators"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Diversen technisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Controle afbeeldingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optische tekenherkenning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Ingesloten alfanumeriek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Vak tekening"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Vak elementen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometrische vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Diverse symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Diverse wiskundige symbolen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Aanvullende pijlen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Braille patronen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Aanvullende pijlen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Diverse wiskundige symbolen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Aanvullende wiskundige operators"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Diverse symbolen en pijlen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latijns uitgebreid-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Gregoriaans supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Ethiopische uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Cyrillisch uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Aanvullende interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK radicalen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kangxi radicalen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Ideografische beschrijvingkarakters"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK symbolen en interpumctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul-compatibiliteit Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK-slagen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Katakana fonetische extensies"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Ingesloten CJK letters en maanden"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK compatibiliteit"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Yijing Hexagram-symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "CJK uniforme ideografen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi lettergrepen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi radicalen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Cyrillisch uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Modificatie toon letters"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latijns uitgebreid-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Gemeenschappelijke Indic nummerformaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul Jamo uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Javaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Myanmar uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Myanmar uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meetei Mayek uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Ethiopische uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latijns uitgebreid-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokee-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangul lettergrepen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul Jamo uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "Hoge surrogaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Surrogaten met een hoog privégebruik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Lage surrogaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Privé-gebruik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK compatibiliteit ideografen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alfabetische presentatievormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arabische presentatievormen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Variatie selectoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Verticale vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Combinatie van halve cijfers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK compatibiliteit vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Kleine vormvarianten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arabische presentatievormen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Halfbreedte en volledige breedte vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Bijzonderheden"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Lineaire B syllabarie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Lineaire B ideogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Egeïsche getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Oud Griekse getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Oude symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Phaistos schijf"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lycian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Carian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Koptische Epact-getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Oud Italiaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "Gotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "Oud Permisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugaritisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Oud Perzisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Kaukasische Albanees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "Lineaire A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Cypriotisch syllabary"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Imperiaal Aramees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmyrene"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabatees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Fenicisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lydian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroïtische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroïtisch  cursief"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Oud Zuid-Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Oud Noord-Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "Manichaean"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Inscriptioneel Parthian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Inscriptioneel Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Psalter Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Oud-Turks"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Oud-Hongaars"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Rumi numerieke symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Archaïsche getallen van Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongools supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Cuneiform getallen en interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Vroeg-dynastic Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Egyptische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anatolische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Ideografische symbolen en interpunktie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "Tangut onderdelen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Steno formaatcontrole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Byzantijnse muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Oude Griekse muzieknotatie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai Xuan Jing symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Telpaal cijfers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Wiskundige alfanumerieke symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Sutton tekenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolitisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arabische wiskundige alfabetische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Mahjong stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Domino stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "Speelkaarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Ingesloten alfanumeriek supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Ingesloten ideografisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Diverse symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "Emoticons"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Ornamentele dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Transport- en kaartsymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Alchemistische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Geometrische vormen uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Supplementaire pijlen-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Supplementaire symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "CJK uniforme ideografen extensie F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "CJK compatibiliteit ideografen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Variatie selectoren supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Supplementair privé gebruiksgebied-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Supplementair privé gebruiksgebied-B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lees de systeem registry cache."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lees het registry cache BESTAND."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "De registry cache is ongeldig.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Schrijf de systeem registry cache."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Herstellen…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Klaar"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Toon de configuratiewaarden"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Herstel de configuratiewaarden"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Sla emoji op dialoog  op naar clipboard "
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Toon emoji varianten"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menu"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Andere"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Emoji keuze"
+msgstr "Open Unicode keuze"
 
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Typeannotatie of kies emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Bring de emoji keuze terug"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Pagina naar beneden"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Pagina omhoog"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Toon emoji varianten"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Een Unicode woordenboek wordt geladen:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Code punt: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Heeft emoji varianten"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Geen"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotaties: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Naam: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Emoji keuze"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Unicode keuze"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Annuleer het kiezen van een emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Een emoji naar je clipboard gecopieerd."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" voor emoji karakters op emoji dialoog"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"TAAL\" voor annotaties op emoji dialoog. B.v. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "TAAL"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Match met de lengte van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Match met de conditie van het gespecificeerde geheel getal"
 
@@ -3085,11 +3148,11 @@ msgstr "Geert Warrink"
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Afsluiten"
 
diff --git a/po/pl.po b/po/pl.po
index 70060b2c9..0a99867eb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-06-21 03:28+0000\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -239,30 +239,40 @@ msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Klawisze skrótów do wyświetlenia okna emoji"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "Klawisze skrótów do włączania konwersji uwag emoji lub nazw unikodu"
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Wybór emoji:"
+msgid "Emoji annotation:"
+msgstr "Uwaga emoji:"
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Ustawienie czcionki dla kandydatów emoji w oknie emoji"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Klawisze skrótów do włączania konwersji kodów znaków unikodu"
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Czcionka emoji:"
+msgid "Unicode code point:"
+msgstr "Kod znaku unikodu:"
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Ustawienie czcionki kandydatów unikodu w oknie emoji"
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "Czcionka unikodu:"
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Ustawienie języka uwag emoji w oknie emoji"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Język uwag emoji:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -270,7 +280,7 @@ msgstr ""
 "Częściowe dopasowywanie uwag emoji o tym warunku i więcej niż tej liczbie "
 "znaków:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -278,47 +288,47 @@ msgstr ""
 "Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
 "z dokładnym dopasowaniem"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Dopasowanie przedrostka"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Dopasowanie przyrostka"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Dopasowanie w środku"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Systemowe ustawienia układu klawiatury"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Systemowy układ klawiatury (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Ta sama metoda wprowadzania we wszystkich aplikacjach"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -334,19 +344,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Uruchamianie IBus podczas logowania"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Uruchamianie</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "O programie"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -402,7 +412,7 @@ msgstr "Układy łacińskie niemające ASCII"
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Układ US jest dołączany do układów Łacińskich. Można pominąć „variant”."
+"Układ US jest dołączany do układów łacińskich. Można pominąć „variant”."
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -577,22 +587,30 @@ msgid "Custom font name for language panel"
 msgstr "Nazwa niestandardowej czcionki dla panelu języków"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Klawisze skrótów unikodu dla gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "Klawisze skrótów do włączania lub wyłączania pisania unikodu"
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu emoji dla „gtk_accelerator_parse”"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania wpisywania emoji"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nazwa niestandardowej czcionki dla znaków emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Domyślny język dla słownika emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -600,29 +618,29 @@ msgstr ""
 "Wybór domyślnego języka słowników emoji w oknie emoji. Wartość $lang jest "
 "zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista ulubionych emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista ulubionych uwag emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Można przydzielić uwagę do ulubionej emoji na tej liście."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -630,11 +648,11 @@ msgstr ""
 "Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
 "z dokładnym dopasowaniem."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Dopasowywanie uwag emoji o podanej długości"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -642,11 +660,11 @@ msgstr ""
 "Częściowe dopasowywanie uwag emoji o więcej niż tej liczbie znaków, zamiast "
 "dokładnego dopasowywania."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Warunek częściowego dopasowywania uwag emoji"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -655,33 +673,64 @@ msgstr ""
 "0 == dopasowywanie przedrostka, 1 == dopasowywanie przyrostka, 2 == "
 "dopasowywanie w środku"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr "Wczytywanie danych emoji podczas uruchamiania"
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"Jeśli jest ustawione na wartość „true”, to wczytuje dane emoji podczas "
+"uruchamiania. Wymaga około 10 MB pamięci. Jeśli jest ustawione na wartość "
+"„false”, to wczytuje dane emoji podczas otwierania okna emoji."
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr "Wczytywanie danych unikodu podczas uruchamiania"
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"Jeśli jest ustawione na wartość „true”, to wczytuje dane unikodu podczas "
+"uruchamiania. Wymaga około 15 MB pamięci. Jeśli jest ustawione na wartość "
+"„false”, to wczytuje dane unikodu podczas otwierania okna emoji. Dane "
+"unikodu są zawsze wczytywane po wczytaniu danych emoji, nawet jeśli "
+"ustawiono na wartość „true”."
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Globalna metoda wprowadzania"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
 "wprowadzania"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
@@ -701,12 +750,12 @@ msgid "Select a language"
 msgstr "Wybierz język"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
@@ -779,16 +828,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Skrót z klawiszem Shift do przełączania do poprzedniej metody wprowadzania"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 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:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -803,18 +852,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Nie można uruchomić usługi IBus od %d s"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -2810,248 +2859,275 @@ msgstr "Dodatkowy obszar prywatnego użytku A"
 msgid "Supplementary Private Use Area-B"
 msgstr "Dodatkowy obszar prywatnego użytku B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Nie można połączyć z usługą IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Odczytuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Zapisuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+"Używa ścieżek schematu mechanizmu zamiast rdzenia IBus, które mogą być "
+"wartościami oddzielonymi przecinkami."
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Przywracanie…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Wyświetla wartości konfiguracji"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Przywraca wartości konfiguracji"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Zapisuje emoji w oknie do schowka "
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Wyświetlanie wariantów emoji"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menu"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Inne"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr "Otwórz wybór unikodu"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Wybór emoji"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Proszę wpisać uwagę lub wybrać emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Wybór unikodu"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr "Wróć do wyboru emoji"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "Wczytywanie słownika unikodu:"
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Wyświetlanie wariantów emoji"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Menu"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr "Kliknięcie wyświetli komunikat ostrzeżenia"
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Wczytywanie słownika unikodu:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Brak"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr "Nazwa: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Wybór emoji"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Wybór unikodu"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+"Uzyskanie obecnej aplikacji tekstowej się nie powiodło. Proszę ponownie ją "
+"aktywować. Można np. nacisnąć klawisz Esc kilka razy, aby zwolnić tryb "
+"pisania emoji, albo kliknąć pulpit i kliknąć aplikację tekstową jeszcze raz."
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Anulowano, aby wybrać emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Skopiowano emoji do schowka."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "CZCIONKA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "JĘZYK"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 
@@ -3080,11 +3156,11 @@ msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2018"
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Zakończ"
 
diff --git a/po/sv.po b/po/sv.po
index 507c3774d..d7593bea4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,20 +6,21 @@
 # Translators:
 # Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-05-10 10:16+0000\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../setup/setup.ui.h:1
@@ -230,30 +231,40 @@ msgid "Input Method"
 msgstr "Inmatningsmetod"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Kortkommandot för att visa emoji-dialogen"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Emoji-val:"
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Ange ett typsnitt för emoji-kandidater i emoji-dialogen"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emoji-typsnitt:"
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Ange ett språk för emoji-annotationer i emoji-dialogen"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Språk för emoji-annotationer:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -261,7 +272,7 @@ msgstr ""
 "Matcha emoji-annotationer partiellt med följande villkor och mer än antalet "
 "tecken:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -269,47 +280,47 @@ msgstr ""
 "Om emoji-annotationer kan matchas med en partiell sträng istället för en "
 "exakt matchning"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Prefixmatchning"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Suffixmatchning"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Innehållsmatchning"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Emoji"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Använd systemets tangentbordslayout"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Använd systemets (XKB) tangentbordslayout"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Tangentbordslayout</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Dela samma inmatningsmetod mellan alla program"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Inställningar för global inmatningsmetod</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -325,19 +336,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Starta ibus vid inloggning"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Uppstart</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Om"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Stäng"
 
@@ -560,22 +571,30 @@ msgid "Custom font name for language panel"
 msgstr "Anpassat typsnittsnamn till språkpanelen"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-kortkommando för gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Kortkommandot för att slå på och av emoji-inmatning"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Anpassat typsnitt för emoji-tecken i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Standardspråk för emoji-ordlista"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -583,11 +602,11 @@ msgstr ""
 "Välj ett standardspråk med emoji-ordlistor i emoji-dialogen.  Värdet $lang "
 "används i /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "favorit-emoji-lista i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -595,19 +614,19 @@ msgstr ""
 "Du kan visa favorit-emoji:erna i emoji-listan om denna lista har några "
 "tecken."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit-emoji-annoteringslista i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tilldela en annotering för en favorit-emoji i denna lista."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Huruvida emoji-annotationer kan matchas partiellt eller inte"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -615,11 +634,11 @@ msgstr ""
 "Huruvida emoji-annotationer kan matchas med en partiell sträng istället för "
 "den exakta matchningen eller inte."
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Matcha emoji-annotationer med den angivna längden"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -627,11 +646,11 @@ msgstr ""
 "Matcha emoji-annotationer partiellt med mer än det angivna antalet tecken "
 "istället för den exakta matchningen."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Välj ett villkor för att matcha emoji-annotationer partiellt"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -639,32 +658,55 @@ msgstr ""
 "Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 =="
 " prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Bädda in förredigerad text"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Bädda in förredigerad text i programfönstret"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Använd den globala inmatningsmetoden"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Aktivera inmatningsmetoden som standard"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Aktivera inmatningsmetoden som standard när programmet får inmatningsfokus"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf namnbevarandeprefix"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefix av DConf-tangenter för att förhindra namnkonvertering"
 
@@ -684,12 +726,12 @@ msgid "Select a language"
 msgstr "Välj ett språk"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
@@ -762,16 +804,16 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Tryck en tangent (eller tangentkombination)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Använd kortkommandot med skift för att byta till föregående inmatningsmetod"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus-demonen kör inte.  Vill du starta den?"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -786,18 +828,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus-demonen kunde inte startas på %d sekunder"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Välj snabbkommando för %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "byter inmatningsmetoder"
 
@@ -838,2203 +880,2225 @@ msgstr "Resor & platser"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Grundläggande latinskt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latin-1-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latin utökad-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latinskt utökad-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Modifieringsbokstäver för blanksteg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Kombinerande diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Grekiska och koptiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrilliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Kyrilliska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armeniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebreiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Syriska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arabiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandeiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Syriska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arabiska utökat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamilska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thailändska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Etiopiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Etiopiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Enhetliga kanadensiska aboriginstavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongoliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Enhetliga kanadensiska aboriginstavelser, utökad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Ny tai lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Khmer-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Kombinerande utökade diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Kyrillisk utökad-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Sundanesiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Vediska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Fonetiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Tillägg för fonetiska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Tillägg för kombinerande diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Ytterligare utökade latinska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Utökade grekiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Allmänna skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Upphöjda och nedsänkta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Valutasymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Kombinerande diakritiska symbolmarkörer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Bokstavsliknande symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Pilar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Matematiska operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Diverse tekniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Kontrollbilder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optisk teckenigenkänning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Inneslutna alfanumeriska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Lådritning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Blockelement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometriska former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Diverse symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Diverse matematiska symboler-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Piltillägg-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Punktskriftsmönster"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Piltillägg-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Diverse matematiska symboler-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Matematiska operatortillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Diverse symboler och pilar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Utökat latin-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Georgiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Utökad etiopisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Kyrillisk utökad-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Tillägg till skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK-ordstamstillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kangxi-ordstammar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Tecken för ideografisk beskrivning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK-symboler och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul-kompatibilitet Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Utökad bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK-streck"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Fonetiska katakana-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Inneslutna CJK-bokstäver och -månader"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK-kompatibilitet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Yijing-hexagramsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "Enhetliga CJK-ideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi-ordstammar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Kyrillisk utökad-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Modifieringsbokstäver för toner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Utökat latin-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Vanliga indiska talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari utökad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Utökad Hangul Jamo-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Javanesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Utökad Myanmar-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Utökad Myanmar-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meetei Mayek-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Utökad etiopisk-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Utökat latin-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokesiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangul-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Utökad Hangul Jamo-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "Höga surrogat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Höga surrogat för privat användning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Låga surrogat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Område för privat användning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alfabetiska presentationsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arabiska presentationsformer-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Variationsväljare"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Vertikala former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Kombineringshalvmarkörer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK-kompatibilitetsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Små formvarianter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arabiska presentationsformer-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Halvbredds- och helbreddsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Specialtecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Linjär B-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Linjär B-ideogram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Egeiska tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Gammalgrekiska tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Antika symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Phaistos-skiva"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lykiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Kariska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Koptiska epact-nummer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Fornitaliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "Gotiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "Fornpermiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugaritiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Gammalpersiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shaviska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmaniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Kaukasisk albanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "Linjär A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Cypriotiska stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Senarameiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmyrenska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabatéiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "Hatranska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Phoenicisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lydian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroitiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroitiska kursiv"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Fornsydarabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Fornnordarabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "Manikeiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Inskriptionell parthiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Inskriptionell pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Psaltaren-pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Fornturkiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Fornungerska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Numeriska Rumi-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Singalesiska arkaiska nummer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "Khojkiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "Sindhiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongoliska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar-kvadratskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Kilskrift-tal och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Tidig dynastisk kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Egyptiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anatoliska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "Mru"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassaiska vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahaw mong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Ideografiska symboler och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Utökad Kana-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "Duployé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Formateringskontroll för Stenografi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Bysantinska musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Gammalgrekisk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Talstav"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Matematiska alfanumeriska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Suttons teckningsskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolitiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arabiska matematiska alfabetiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Mahjong-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Domino-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "Spelkort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Inneslutna alfanumeriska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Inneslutna ideografiska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Diverse symboler och piktogram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "Humörsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Dekorativa Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Transport- och kartsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Alkemiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Utökade geometriska former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Piltillägg-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Symbol- och piktogramtillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "Enhetliga CJK-ideograftillägg F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "CJK-kompatibilitetideografstillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Taggar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Variationsväljartillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Tillägg till privat användningsområde-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Tillägg till privat användningsområde-B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Lista endast maskinnamn"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan inte ansluta till IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "språk: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Ingen maskin är satt.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Att sätta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Att hämta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Läs systemregistercachen."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Läs registercachen i FIL."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Registercachen är felaktig.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Skriv systemregistercachen."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Skriv registercachen till FIL."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Återställer …"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Klart"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Sätt eller hämta maskin"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Avsluta ibus-demonen"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Visa tillgängliga maskiner"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Inte implementerat)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Starta om ibus-demonen"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Visa versionen"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Vissa innehållet i registercachen"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Skapa en registercache"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Skriv ut D-Bus-adressen till ibus-demonen"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Visa konfigurationsvärdena"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Återställ konfigurationsvärdena"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Spara emoji i dialogen till urklipp"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Visa denna information"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Användning: %s KOMMANDO [FLAGGA …]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Kommandon:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s är ett okänt kommando!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Visa emoji-varianter"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Meny"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Annat"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Emoji-val"
+msgstr "Öppna Unicode-val"
 
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Ange annotation eller välj emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Ta tillbaks emoji-val"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "Bläddra upp"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Visa emoji-varianter"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Meny"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Laddar en Unicode-ordbok"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodpunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Namn: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
+msgstr "Alias: %s"
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Emoji-val"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Unicode-val"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Avbröt att välja en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "SPRÅK"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annotationer kan matcha partiellt"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Matcha med längden på det angivna heltalet"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Matcha med villkoret för det angivna heltalet"
 
@@ -3062,11 +3126,11 @@ msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Starta om"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3074,4 +3138,4 @@ msgstr "Avsluta"
 #. * Otherwise the msgstr is "default:LTR".
 #: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
-msgstr "standard:LTR"
+msgstr "default:LTR"
diff --git a/po/uk.po b/po/uk.po
index 0fc8b1831..aa628ec0a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 12:43-0500\n"
+"PO-Revision-Date: 2018-06-21 12:54+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -240,30 +240,43 @@ msgid "Input Method"
 msgstr "Спосіб введення"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Клавіатурне скорочення для показу діалогового вікна емодзі"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Клавіатурне скорочення для вмикання перетворень анотацій емодзі або назв "
+"символів Unicode"
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Вибір емодзі:"
+msgid "Emoji annotation:"
+msgstr "Анотація емодзі:"
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Встановити шрифт варіантів емодзі у вікні емодзі"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"Клавіатурне скорочення для вмикання перетворень позицій у таблиці Unicode"
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Шрифт емодзі:"
+msgid "Unicode code point:"
+msgstr "Позиція у таблиці Unicode:"
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Встановити шрифт варіантів емодзі у Unicode у вікні емодзі"
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "Шрифт Unicode:"
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "Встановити мову анотацій емодзі у вікні емодзі"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Мова анотацій емодзі:"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
@@ -271,7 +284,7 @@ msgstr ""
 "Встановлювати відповідність емодзі за анотаціями з вказаною умовою та збігом "
 "понад таку кількість символів:"
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
@@ -279,47 +292,47 @@ msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
 "не повним збігом"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "Відповідність за префіксом"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "Відповідність за суфіксом"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "Відповідність за вмістом"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "Емодзі"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Розкладка клавіатури</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Загальні параметри способів введення</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -335,19 +348,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Запускати ibus при вході"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Запуск</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Інформація"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -578,22 +591,31 @@ msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Клавіатурне скорочення Unicode для gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+"Клавіатурне скорочення для вмикання і вимикання введення символів Unicode"
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Клавіатурне скорочення емодзі для gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання введення емодзі"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Назва нетипового шрифту для символів емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "Типова мова словника емодзі"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -601,11 +623,11 @@ msgstr ""
 "Виберіть типову мову словників емодзі у вікні емодзі. Значення $lang "
 "застосовується до /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "Список улюблених емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -613,19 +635,19 @@ msgstr ""
 "Ви зможете переглянути улюблені емодзі у списку емодзі, якщо у цьому списку "
 "є якісь символи."
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "список анотацій до улюблених емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Ви можете додавати анотації до улюблених емодзі у цьому списку."
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Визначає, чи може бути встановлено часткову відповідність"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -633,11 +655,11 @@ msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
 "не повним збігом"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -645,11 +667,11 @@ msgstr ""
 "Встановлювати часткову відповідність анотацій до емодзі, якщо збігається "
 "вказана кількість символів, але відповідність не є повною."
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Вибрати умову часткової відповідності анотацій до емодзі"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -658,32 +680,63 @@ msgstr ""
 "анотаціями до емодзі: 0 == відповідність за префіксом, 1 == відповідність за "
 "суфіксом, 2 == відповідність за вмістом"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr "Завантажувати дані емодзі під час запуску програми"
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"Якщо true, завантаження даних емодзі під час запуску увімкнено. Для "
+"завантаження даних потрібно приблизно 10 МБ пам'яті. Якщо false, дані емодзі "
+"буде завантажено під час відкриття діалогового вікна емодзі на початку."
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr "Завантажувати дані Unicode під час запуску"
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"Якщо true, завантаження даних Unicode емодзі під час запуску увімкнено. Для "
+"завантаження даних потрібно приблизно 10 МБ пам'яті. Якщо false, дані "
+"Unicode буде завантажено під час відкриття діалогового вікна емодзі на "
+"початку. Дані Unicode завжди завантажуватимуться після даних емодзі, навіть "
+"якщо встановлено значення true."
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Вбудувати попередньо створений текст"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Використовувати загальний спосіб введення"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "Типово увімкнути спосіб введення"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "Збереження DConf префіксів назв"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префікси ключів DConf для припинення перетворення назв"
 
@@ -703,12 +756,12 @@ msgid "Select a language"
 msgstr "Виберіть мову"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "_Скасувати"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "_Гаразд"
 
@@ -781,17 +834,17 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 "Використовувати комбінацію з Shift для перемикання на попередній спосіб "
 "введення"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -807,18 +860,18 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -2814,249 +2867,277 @@ msgstr "Додаткова область приватного використ
 msgid "Supplementary Private Use Area-B"
 msgstr "Додаткова область приватного використання B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "Показати лише список рушіїв"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Не вдалося встановити зв’язок з IBus.\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "мова: %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Рушій не встановлено.\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Читати дані з загальносистемного кешу регістру."
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Читати дані з кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Кеш регістру є некоректним.\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Записати дані до загальносистемного кешу регістру."
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+"Використовувати шляхи бази даних рушія замість ядра ibus. Шляхи слід "
+"вказувати у форматі списку значень, відокремлених комами."
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "Скидаємо…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "Виконано"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Показати значення налаштувань"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Скинути значення налаштувань до початкових"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Зберегти емодзі з вікна до буфера обміну даними"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Показувати варіанти емодзі"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Меню"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "Улюблені"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "Інше"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr "Відкрити вибір Unicode"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Вибір емодзі"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "Введіть анотацію або виберіть емодзі"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Вибір Unicode"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr "Повернути вибір емоційок"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "Завантаження словника Unicode:"
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "Показувати варіанти емодзі"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr "Закрити"
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "Меню"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr "Натисніть, щоб переглянути попередження"
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "Завантаження словника Unicode:"
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "Немає"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr "Назва: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "Вибір емодзі"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Вибір Unicode"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+"Не вдалося отримати дані поточної програми для роботи з текстом. Будь ласка, "
+"повторно встановіть фокус на вікно програми. Наприклад, натисніть клавішу "
+"Esc декілька разів, щоб вимкнути режим введення емодзі, клацніть на "
+"стільниці, а потім клацніть у вікні вашої програми для роботи з текстом."
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Скасовано вибір емодзі."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Скопійовано емодзі до вашого буфера обміну даними."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "МОВА"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Відповідність за вказаною довжиною рядка"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
@@ -3084,11 +3165,11 @@ msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Вийти"
 
diff --git a/po/vi.po b/po/vi.po
index 7020fdba4..da2563db7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,23 +1,27 @@
-# translation of ibus.pot to Vietnamese
 # Vietnamese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Lê Quốc Tuấn <mr.lequoctuan@gmail.com>, 2009
+# Đoàn Hoà Khiêm <doankhiem.crazy@gmail.com>, 2018
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:49+0000\n"
-"Last-Translator: Lê Quốc Tuấn <mr.lequoctuan@gmail.com>\n"
-"Language-Team: Vietnamese\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-06-21 07:54+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Vietnamese\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -49,11 +53,11 @@ msgstr "Tùy biến"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "Không hiển thị"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "Tự động ẩn"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -83,7 +87,7 @@ msgstr "Kiểu gõ trước:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
 
@@ -93,11 +97,11 @@ msgstr "Bật hoặc tắt:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "Bật:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "Tắt:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -117,17 +121,17 @@ msgstr "Thiết lập việc ẩn hay hiển thị thanh ngôn ngữ"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "Hiển thị bảng thuộc tính:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "Vị trí thanh ngôn ngữ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "Hiển thị biểu tượng trên khay hệ thống"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "Hiển thị tên kiểu gõ trên thanh ngôn ngữ"
 
@@ -156,7 +160,8 @@ msgid "General"
 msgstr "Chung"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "Thê_m"
 
@@ -178,7 +183,8 @@ msgstr "_Lên"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
+msgstr ""
+"Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
@@ -186,7 +192,8 @@ msgstr "_Xuống"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
+msgstr ""
+"Di chuyển kiểu gõ đã chọn xuống dưới trong những kiểu gõ cho phép sử dụng"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
@@ -202,7 +209,7 @@ msgstr "Tù_y thích"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr ""
+msgstr "Hiển thị thiết lập cho kiểu gõ đã chọn"
 
 #: ../setup/setup.ui.h:47
 msgid ""
@@ -212,35 +219,97 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "Kiểu gõ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji annotation:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Unicode code point:"
+msgstr ""
+
+#: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:61
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:62
+msgid "Emoji"
+msgstr ""
+
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "Dùng kiểu bố trí bàn phím của hệ thống"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "Dùng kiểu bố trí bàn phím hệ thống (XKB)"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>Bố trí bàn phím</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "Chia sẻ cùng kiểu gõ cho tất cả các ứng dụng"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "Chọn một kiểu gõ"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -248,194 +317,350 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>Bộ gõ thông minh</small>\nTrang chủ: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Bộ gõ thông minh</small>\n"
+"Trang chủ: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "Khởi động ibus khi đăng nhập"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>Khởi động</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "Giới thiệu"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "Đón_g"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "Nạp trước các kiểu gõ"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "Nạp trước các kiểu gõ khi khởi động ibus"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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 ""
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
-msgstr "Phím tắt kích hoạt"
-
 #: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Latin layouts which have no ASCII"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
+msgid "Use xmodmap"
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:15
-msgid "The shortcut keys for turning input method off"
+msgid "Trigger shortcut keys"
+msgstr "Phím tắt kích hoạt"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
+msgid "Enable shortcut keys"
+msgstr "Bật các phím tắt"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for turning input method on"
+msgstr "Phím tắt để bật kiểu gõ"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Disable shortcut keys"
+msgstr "Tắt các phím tắt"
+
+#: ../data/ibus.schemas.in.h:21
+msgid "The shortcut keys for turning input method off"
+msgstr "Phím tắt để tắt kiểu gõ"
+
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "Phím tắt cho kiểu gõ kế tiếp"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "Phím tắt cho kiểu gõ trước"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
+msgstr "Phím tắt để chuyển sang kiểu gõ trước"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "Tự động ẩn"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "Vị trí thanh ngôn ngữ:"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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 "Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
+msgstr ""
+"Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = "
+"góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
 
-#: ../data/ibus.schemas.in.h:24
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "Hướng của bảng tra cứu"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Hướng của bảng tra cứu. 0 = Ngang, 1 = Dọc"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "Hiển thị tên kiểu gõ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "Dùng phông chữ tùy biến"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "Tùy biến phông"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "Tùy biến phông cho thanh ngôn ngữ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:66
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "Nhúng văn bản tiền soạn thảo"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "Nhúng văn bản tiền soạn thảo trong cửa sổ ứng dụng"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "Dùng chung kiểu gõ cho toàn hệ thống"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
-msgstr ""
+msgstr "Bật kiểu gõ theo mặc định"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -443,251 +668,2431 @@ msgstr ""
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "Khác"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
+msgid "_Cancel"
+msgstr "_Thôi"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Ngôn ngữ: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Bố trí bàn phím: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Tác giả: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Mô tả:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Chọn một kiểu gõ"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr ""
+msgstr "Thiết lập các tuỳ chọn IBus"
 
 #: ../setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Những phím tắt"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Mã phím:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Phím bổ sung:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "Á_p dụng"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Xoá"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím).\nHộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
+msgstr ""
+"Vui lòng nhấn một phím (hoặc tổ hợp phím).\n"
+"Hộp thoại này sẽ được đóng lại khi bạn thả phím ấn."
 
-#: ../setup/keyboardshortcut.py:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Thôi"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_OK"
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: ../setup/main.py:329
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "IBus daemon đang không chạy. Bạn có muốn khởi động nó không?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:536
 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 không thể khởi động! Nếu bạn không thể sử dụng IBus, hãy thêm các dòng "
+"dưới đây vào tệp tin $HOME/.bashrc của bạn; sau đó hãy đăng nhập lại vào màn "
+"hình làm việc.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:364
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus daemon không thể khởi động trong %d giây"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Chọn phím tắt để %s"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:564
 msgid "switching input methods"
+msgstr "chuyển các kiểu gõ"
+
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
 msgstr ""
 
-#: ../tools/main.vala:42
-msgid "List engine name only"
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
 msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
-msgid "Can't connect to IBus.\n"
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
 msgstr ""
 
-#: ../tools/main.vala:84
-#, c-format
-msgid "language: %s\n"
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
 msgstr ""
 
-#: ../tools/main.vala:152
-#, c-format
-msgid "No engine is set.\n"
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
 msgstr ""
 
-#: ../tools/main.vala:160
-#, c-format
-msgid "Set global engine failed.\n"
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
 msgstr ""
 
-#: ../tools/main.vala:165
-#, c-format
-msgid "Get global engine failed.\n"
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
 msgstr ""
 
-#: ../tools/main.vala:204
-msgid "Read the system registry cache."
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
 msgstr ""
 
-#: ../tools/main.vala:206
-msgid "Read the registry cache FILE."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
-msgid "The registry cache is invalid.\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
 msgstr ""
 
-#: ../tools/main.vala:244
-msgid "Write the system registry cache."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
 msgstr ""
 
-#: ../tools/main.vala:246
-msgid "Write the registry cache FILE."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
 msgstr ""
 
-#: ../tools/main.vala:293
-msgid "Set or get engine"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
 msgstr ""
 
-#: ../tools/main.vala:294
-msgid "Exit ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
 msgstr ""
 
-#: ../tools/main.vala:295
-msgid "Show available engines"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
 msgstr ""
 
-#: ../tools/main.vala:296
-msgid "(Not implemented)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
 msgstr ""
 
-#: ../tools/main.vala:297
-msgid "Restart ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
 msgstr ""
 
-#: ../tools/main.vala:298
-msgid "Show version"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
 msgstr ""
 
-#: ../tools/main.vala:299
-msgid "Show the content of registry cache"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
 msgstr ""
 
-#: ../tools/main.vala:300
-msgid "Create registry cache"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
 msgstr ""
 
-#: ../tools/main.vala:301
-msgid "Print the D-Bus address of ibus-daemon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
 msgstr ""
 
-#: ../tools/main.vala:302
-msgid "Show this information"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
 msgstr ""
 
-#: ../tools/main.vala:308
-#, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
 msgstr ""
 
-#: ../tools/main.vala:309
-#, c-format
-msgid "Commands:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
 msgstr ""
 
-#: ../tools/main.vala:338
-#, c-format
-msgid "%s is unknown command!\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
-msgid "Super+space is now the default hotkey."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr "Không thể kết nối với IBus.\n"
+
+#: ../tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr "ngôn ngữ: %s\n"
+
+#: ../tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:237 ../tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:257
+msgid "Write the system registry cache."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ../tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: ../tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: ../tools/main.vala:444
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr "Thoát ibus-daemon"
+
+#: ../tools/main.vala:446
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:447
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:448
+msgid "Restart ibus-daemon"
+msgstr "Khởi động lại ibus-daemon"
+
+#: ../tools/main.vala:449
+msgid "Show version"
+msgstr "Hiển thị phiên bản"
+
+#: ../tools/main.vala:450
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:451
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:452
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: ../tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:458
+msgid "Show this information"
+msgstr "Hiển thị thông tin này"
+
+#: ../tools/main.vala:464
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "Sử dụng: %s LỆNH [TUỲ CHỌN...]\n"
+"\n"
+
+#: ../tools/main.vala:465
+msgid "Commands:\n"
+msgstr "Lệnh:\n"
+
+#: ../tools/main.vala:494
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:244
+msgid "Favorites"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Others"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:246
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:371
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:965
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1067
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1078
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1383
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1389
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1556
+msgid "None"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1580
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1606
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1614
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:710
+msgid "IBus Update"
+msgstr "Cập nhật IBus"
+
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
+msgid "Super+space is now the default hotkey."
+msgstr "Super + space bây giờ là phím nóng mặc định."
+
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
-msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
+msgstr ""
+"Lê Quốc Tuấn <mr.lequoctuan@gmail.com>, 2009\n"
+"Đoàn Hoà Khiêm <doankhiem.crazy@gmail.com>, 2018"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "Tùy thích"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "Khởi động lại"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "Thoát"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4e1eb123f..295b67e50 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,24 +10,24 @@
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
-# Caius "kaio" Chance <caius.chance@gmail.com>, 2017. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2018. #zanata
+# Peter Pan <pan93412@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-06-08 02:11+0000\n"
+"Last-Translator: Peter Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
-"Language: zh-TW\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.4.5\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -229,82 +229,92 @@ msgid "Input Method"
 msgstr "輸入法"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "顯示繪文字對話窗的快捷鍵"
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "繪文字選擇："
+msgid "Emoji annotation:"
+msgstr ""
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "設定候選繪文字的字型"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "繪文字字型："
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr ""
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "設定繪文字對話窗中的繪文字註釋語言"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "繪文字註釋語言："
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr "部分繪文字註解符合下列條件以及至少字數："
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr "是否繪文字註解可以用部分字串符合取代精確符合"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
 msgstr "前綴符合"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
 msgstr "後綴符合"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr "內含符合"
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
 msgstr "繪文字"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系統鍵盤配置"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系統鍵盤 (XKB) 配置"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "在所有應用程式共用同一個輸入法"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "進階"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -320,19 +330,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "在登入時啟動 iBus"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>啟動</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "關於"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -537,101 +547,132 @@ msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse 的繪文字快捷鍵"
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "開啟繪文字輸入或關閉的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "繪文字對話窗當中繪文字字元的自訂字型名稱"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "繪文字字典的預設語言"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 "請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "繪文字對話窗中的喜愛繪文字清單"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "您可以在繪文字清單中顯示喜愛的繪文字，若有列出任何字元的話。"
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "繪文字對話盒中喜愛的繪文字註解列表"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "您可以為清單中喜愛的繪文字指派註解。"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "是否可以只部分符合繪文字註解"
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr "比對時是否可以只有部分字串符合繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr "以指定長度符合繪文字註解"
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "以超過指定字數符合部分繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "選擇部分符合繪文字註解的條件"
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr "選擇下列部分符合繪文字註解的條件之一：0 == 前綴符合，1 == 後綴符合, 2 == 內含符合"
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "在應用程式視窗中內嵌預先編輯文字"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "使用全域輸入法"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "預設啟用輸入法"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名稱前綴"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
@@ -651,12 +692,12 @@ msgid "Select a language"
 msgstr "選取語言"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -728,15 +769,15 @@ msgstr "請按鍵盤按鍵 (或是按鍵組合)\n"
 msgid "Please press a key (or a key combination)"
 msgstr "請按鍵盤按鍵 (或是按鍵組合)"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -750,18 +791,18 @@ msgstr ""
 "export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 幕後程式無法在 %d 秒後啟動"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "為 %s 選取鍵盤快捷鍵"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "切換輸入法"
 
@@ -802,2203 +843,2225 @@ msgstr "旅行與地點"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "基本拉丁字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "拉丁字-1 補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "拉丁字擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "拉丁字擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA 國際音標擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "佔位修飾字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "組合式變音標記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "希臘字與科普特字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "西里爾字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "西里爾字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "阿美尼亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "希伯來文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "敘利亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "阿拉伯文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "塔納文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "Nko 西非書面文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "撒馬利亞字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "曼達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "敘利亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "阿拉伯文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "天城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "孟加拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "果魯穆其語"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "古吉拉特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "泰米爾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "泰盧固文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "馬拉亞拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "僧伽羅文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "寮文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "藏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "緬甸文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "喬治亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "韓文字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "衣索比亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "衣索比亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "切羅基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "統一加拿大原住民音節"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "歐甘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "盧恩文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "哈努諾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "布希德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "塔格巴努亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "高棉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "蒙古文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "統一加拿大原住民音節擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "林布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "傣哪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "新傣仂文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "高棉符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "布吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "老傣文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "組合式變音標記擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "巴厘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "巽他文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "巴塔克文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "雷布查文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "桑塔利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "西里爾字擴充-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "巽他文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "吠陀梵文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "音標擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "音標擴充補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "組合式變音標記補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "拉丁字擴充增補"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "希臘字擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "一般標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "上標和下標"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "貨幣符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "符號的組合式變音標記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "類文字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "數字形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "箭頭"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "數學運算子"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "零雜技術符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "控制圖案"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "光學字元辨識"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "括圈字母數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "方塊繪製"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "區塊元件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "幾何形狀"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "零雜符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "裝飾符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "零雜數學用符號-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "補充箭號-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "盲人點字樣式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "補充箭號-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "雜合數學用符號-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "補充數學運算符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "混合符號與鍵號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "格拉哥里字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "拉丁字擴充-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "科普特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "喬治亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "提非納格字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "衣索比亞文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "西里爾字擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "補充標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "中日韓部首補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "康熙部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "表意文字描述字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "中日韓符號和標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "平假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "片假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "注音符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "韓文相容字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "日本漢文訓點號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "注音符號擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "中日韓筆劃部件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "片假名注音擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "括圈中日韓文字和月份"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "中日韓相容字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "易經六十四卦象符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "中日韓統一表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "彝文音節字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "彝文字根"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "老傈僳文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "瓦伊文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "西里爾字擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "巴蒙文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "聲調修飾符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "拉丁字擴充-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "錫爾赫特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "常用印度數字圖樣"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "八思巴文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "索拉什特拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "天城文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "克耶文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "勒姜文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "韓文字母擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "爪哇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "緬甸文擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "占文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "緬甸文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "傣端文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "曼尼普爾文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "衣索比亞文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "拉丁字擴充-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "切羅基文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "曼尼普爾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "韓文音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "韓文字母擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "高段代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "高段私用代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "低段代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "私用區塊"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "中日韓相容表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "字母表現形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "阿拉伯文表現形式-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "字形變體選取符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "直書形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "組合式半形符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "中日韓相容形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "小寫形式變體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "阿拉伯文表現形式-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "半寬與全寬形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "特殊區域"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "線形 B 音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "線形 B 表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "愛琴海數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "古希臘數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "古代符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "費斯托斯泥圓盤文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "呂基亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "卡里亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "科普特潤餘數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "古意大利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "歌德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "古彼爾姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "烏加里特楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "古波斯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "猶他大學音標"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "肅伯納字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "奥斯曼亞字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "歐塞奇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "艾爾巴桑文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "高加索阿爾巴尼亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "線形文字 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "塞浦路斯音節字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "規範阿拉米文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "帕爾邁拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "納巴泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "哈坦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "腓尼基字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "呂底亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "麥羅埃文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "麥羅埃文通俗體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "佉盧字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "古南阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "古北阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "摩尼教文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "帕提亞文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "巴列維文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "詩篇巴列維文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "古突厥文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "古匈牙利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "魯米數字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "婆羅米字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "凱提字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "索朗桑朋文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "查克馬文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "馬哈佳尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "夏拉達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "古僧伽羅文數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "可吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "穆爾坦尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "庫達瓦迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "帕拉瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "紐瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "特忽塔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "悉曇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "莫迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "蒙古文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "塔克里文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "阿洪姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "瓦蘭齊地文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "札那巴札爾方塊字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "索永布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "包欽浩文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "比奇舒奇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "象雄文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "馬薩拉姆共地文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "楔形數字和標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "古王國時期楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "古埃及聖書字碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "安那托利亞文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "巴蒙文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "蒙羅文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "巴撒符文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "救世苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "柏格理苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "表意文字符號和標點"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "西夏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "西夏文部件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "假名補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "假名擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "女書文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "杜普雷速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "速記格式控制符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "拜占庭音樂符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "音樂符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "古希臘音樂譜記號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "太玄經符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "算籌記數式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "數學用字母數字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "薩頓手語符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "格拉哥里字母補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "門德語奇卡奎文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "阿德拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "阿拉伯文數學用字母符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "麻將牌面"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "西洋骨牌牌面"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "撲克牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "括圈字母數字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "括圈表意文字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "雜合符號和象形圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "表情圖示"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "裝飾雜錦圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "運輸和地圖符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "煉金術符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "幾何圖形擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "補充箭頭-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "補充符號與象形圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "中日韓統一表意文字擴充 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "中日韓相容表意文字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "標籤"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "字形變體選取符補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "補充私用區-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "補充私用區-B"
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "無法連接 IBus。\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "寫入註冊快取 FILE。"
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "重設中…"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "設定引擎或取得引擎"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(尚未實作)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "顯示版本"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "建立註冊快取"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "顯示組態值"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "重設組態值"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "將對話窗中的繪文字儲存到剪貼簿"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "顯示此資訊"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "指令：\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "顯示繪文字變化"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "選單"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "喜愛"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr "其他"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr "開啟 Unicode 選擇"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "繪文字選擇"
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "請輸入註釋或選擇繪文字"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Unicode 選擇"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr "返回繪文字選擇"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "載入 Unicode 字典："
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "上一頁"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "下一頁"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr "顯示繪文字變化"
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "選單"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "載入 Unicode 字典："
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr "碼點：%s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr "有繪文字變化"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "無"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "註釋：%s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr "名稱：%s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr "別名：%s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "繪文字選擇"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "Unicode 選擇"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "已取消繪文字的選擇。"
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "已將繪文字複製到您的剪貼簿。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "繪文字對話盒之繪文字字元用「FONT」字型"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "繪文字對話盒的「LANG」語言註解。例：「en」"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "可以部分符合繪文字註解"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "符合指定整數長度"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "符合指定整數的條件"
 
@@ -3028,11 +3091,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "結束"
 

From f9e30359d328054793e1e225dcf2fe537e6c8c48 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 27 Jun 2018 12:11:41 +0900
Subject: [PATCH 487/816] ibusenginesimple: Enable preedit for compose keys

BUG=https://github.com/ibus/ibus/issues/1935
---
 src/ibusenginesimple.c | 166 ++++++++++++++++++++++++++++-------------
 1 file changed, 115 insertions(+), 51 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 94ce53b70..61dfb89f2 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -189,11 +189,12 @@ ibus_engine_simple_reset (IBusEngine *engine)
         priv->tentative_match = 0;
         priv->tentative_match_len = 0;
         ibus_engine_hide_preedit_text ((IBusEngine *)simple);
-    }
-    if (priv->tentative_emoji || priv->in_emoji_sequence) {
+    } else if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
         g_clear_pointer (&priv->tentative_emoji, g_free);
         ibus_engine_hide_preedit_text ((IBusEngine *)simple);
+    } else if (!priv->in_hex_sequence && !priv->in_emoji_sequence) {
+        ibus_engine_hide_preedit_text ((IBusEngine *)simple);
     }
 }
 
@@ -209,18 +210,78 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
         priv->in_hex_sequence = FALSE;
         priv->tentative_match = 0;
         priv->tentative_match_len = 0;
-        ibus_engine_simple_update_preedit_text (simple);
     }
     if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
         g_clear_pointer (&priv->tentative_emoji, g_free);
-        ibus_engine_simple_update_preedit_text (simple);
     }
-
     ibus_engine_commit_text ((IBusEngine *)simple,
             ibus_text_new_from_unichar (ch));
 }
 
+#define COMPOSE_KEYSYM_TO_UNICHAR(keysym, unichar) {                    \
+
+static gunichar
+ibus_keysym_to_unicode (guint16 keysym) {
+#define CASE(keysym_suffix, unicode) \
+        case IBUS_KEY_dead_##keysym_suffix: return unicode
+    switch (keysym) {
+    CASE(a, 0x03041);
+    CASE(A, 0x03042);
+    CASE(i, 0x03043);
+    CASE(I, 0x03044);
+    CASE(u, 0x03045);
+    CASE(U, 0x03046);
+    CASE(e, 0x03047);
+    CASE(E, 0x03048);
+    CASE(o, 0x03049);
+    CASE(O, 0x0304a);
+    CASE(abovecomma,                    0x0313);
+    CASE(abovedot,                      0x0307);
+    CASE(abovereversedcomma,            0x0314);
+    CASE(abovering,                     0x030a);
+    CASE(acute,                         0x0301);
+    CASE(belowbreve,                    0x032e);
+    CASE(belowcircumflex,               0x032d);
+    CASE(belowcomma,                    0x0326);
+    CASE(belowdiaeresis,                0x0324);
+    CASE(belowdot,                      0x0323);
+    CASE(belowmacron,                   0x0331);
+    CASE(belowring,                     0x030a);
+    CASE(belowtilde,                    0x0330);
+    CASE(breve,                         0x0306);
+    CASE(capital_schwa,                 0x018f);
+    CASE(caron,                         0x030c);
+    CASE(cedilla,                       0x0327);
+    CASE(circumflex,                    0x0302);
+    CASE(currency,                      0x00a4);
+    // IBUS_KEY_dead_dasia == IBUS_KEY_dead_abovereversedcomma
+    CASE(diaeresis,                     0x0308);
+    CASE(doubleacute,                   0x030b);
+    CASE(doublegrave,                   0x030f);
+    CASE(grave,                         0x0300);
+    CASE(greek,                         0x03b1);
+    CASE(hook,                          0x0309);
+    CASE(horn,                          0x031b);
+    CASE(invertedbreve,                 0x032f);
+    CASE(iota,                          0x0345);
+    CASE(macron,                        0x0304);
+    CASE(ogonek,                        0x0328);
+    // IBUS_KEY_dead_perispomeni == IBUS_KEY_dead_tilde
+    // IBUS_KEY_dead_psili == IBUS_KEY_dead_abovecomma
+    CASE(semivoiced_sound,              0x309a);
+    CASE(small_schwa,                   0x1d4a);
+    CASE(stroke,                        0x29f8);
+    CASE(tilde,                         0x0303);
+    CASE(voiced_sound,                  0x3099);
+    case IBUS_KEY_Multi_key:
+        return 0x2384;
+    default:;
+    }
+    return 0x0;
+#undef CASE
+}
+
 static void
 ibus_engine_simple_commit_str (IBusEngineSimple *simple,
                                const gchar      *str)
@@ -278,8 +339,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
             g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
         else
             g_assert (len <= EMOJI_SOURCE_LEN + 1);
-    }
-    else if (priv->tentative_match) {
+    } else if (priv->tentative_match) {
         outbuf[len++] = priv->tentative_match;
     } else if (priv->tentative_emoji && *priv->tentative_emoji) {
         IBusText *text = ibus_text_new_from_string (priv->tentative_emoji);
@@ -288,6 +348,24 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
                 IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
         ibus_engine_update_preedit_text ((IBusEngine *)simple, text, len, TRUE);
         return;
+    } else {
+        int hexchars = 0;
+        while (priv->compose_buffer[hexchars] != 0) {
+            guint16 keysym= priv->compose_buffer[hexchars];
+            gunichar unichar = ibus_keysym_to_unicode (keysym);
+            if (unichar > 0)
+                outbuf[len] = unichar;
+            else
+                outbuf[len] = ibus_keyval_to_unicode (keysym);
+            if (!outbuf[len]) {
+                g_warning (
+                        "Not found alternative character of compose key 0x%X",
+                        priv->compose_buffer[hexchars]);
+            }
+            ++len;
+            ++hexchars;
+        }
+        g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
     }
 
     outbuf[len] = L'\0';
@@ -569,8 +647,9 @@ check_table (IBusEngineSimple       *simple,
         }
 
         ibus_engine_simple_commit_char (simple, value);
-        // g_debug ("U+%04X\n", value);
         priv->compose_buffer[0] = 0;
+        ibus_engine_simple_update_preedit_text (simple);
+        // g_debug ("U+%04X\n", value);
     }
     return TRUE;
 }
@@ -768,44 +847,10 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
         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);    /* Also used with perispomeni, 0x342. */
-        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);         /* Equivalent to psili */
-        CASE (abovereversedcomma, 0x0314); /* Equivalent to dasia */
-        CASE (horn, 0x031B);    /* Legacy use for psili, 0x313 (or 0x343). */
-        CASE (belowdot, 0x0323);
-        CASE (cedilla, 0x0327);
-        CASE (ogonek, 0x0328);    /* Legacy use for dasia, 0x314.*/
-        CASE (iota, 0x0345);
-        CASE (voiced_sound, 0x3099);    /* Per Markus Kuhn keysyms.txt file. */
-        CASE (semivoiced_sound, 0x309A);    /* Per Markus Kuhn keysyms.txt file. */
-
-        /* 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]);
+        combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i]);
+        if (!combination_buffer[i+1]) {
+            combination_buffer[i+1] =
+                    ibus_keyval_to_unicode (compose_buffer[i]);
         }
         i--;
     }
@@ -853,6 +898,7 @@ no_sequence_matches (IBusEngineSimple *simple,
 
         ibus_engine_simple_commit_char (simple, priv->tentative_match);
         priv->compose_buffer[0] = 0;
+        ibus_engine_simple_update_preedit_text (simple);
 
         for (i=0; i < n_compose - len - 1; i++) {
             ibus_engine_simple_process_key_event (
@@ -872,20 +918,21 @@ no_sequence_matches (IBusEngineSimple *simple,
         if (n_compose > 1) {
             /* Invalid sequence */
             // FIXME beep_window (event->window);
+            ibus_engine_simple_update_preedit_text (simple);
             return TRUE;
         }
 
+        ibus_engine_simple_update_preedit_text (simple);
         ch = ibus_keyval_to_unicode (keyval);
         /* IBUS_CHANGE: RH#769133
          * Since we use ibus xkb engines as the disable state,
          * do not commit the characters locally without in_hex_sequence. */
         if (ch != 0 && !g_unichar_iscntrl (ch) &&
             priv->in_hex_sequence) {
-            ibus_engine_simple_commit_char (simple, ch);
             return TRUE;
-        }
-        else
+        } else {
             return FALSE;
+        }
     }
     return FALSE;
 }
@@ -1027,6 +1074,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             if (priv->tentative_match &&
                 g_unichar_validate (priv->tentative_match)) {
                 ibus_engine_simple_commit_char (simple, priv->tentative_match);
+                ibus_engine_simple_update_preedit_text (simple);
             } else if (n_compose == 0) {
                 priv->modifiers_dropped = TRUE;
             } else {
@@ -1176,12 +1224,21 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
         return TRUE;
     }
+    if (!priv->in_hex_sequence && !priv->in_emoji_sequence && is_backspace) {
+        if (n_compose > 0) {
+            n_compose--;
+            priv->compose_buffer[n_compose] = 0;
+            ibus_engine_simple_update_preedit_text (simple);
+            return TRUE;
+        }
+    }
 
     /* Check for hex sequence restart */
     if (priv->in_hex_sequence && have_hex_mods && is_hex_start) {
         if (priv->tentative_match &&
             g_unichar_validate (priv->tentative_match)) {
             ibus_engine_simple_commit_char (simple, priv->tentative_match);
+            ibus_engine_simple_update_preedit_text (simple);
         }
         else {
             /* invalid hex sequence */
@@ -1283,6 +1340,12 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             return TRUE;
         }
     } else {
+        if (is_escape) {
+            if (n_compose > 0) {
+                ibus_engine_simple_reset (engine);
+                return TRUE;
+            }
+        }
         SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
                                          n_compose,
                                          keyval);
@@ -1302,6 +1365,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                     ibus_engine_simple_commit_char (simple,
                             priv->tentative_match);
                     priv->compose_buffer[0] = 0;
+                    ibus_engine_simple_update_preedit_text (simple);
                 } else {
                     // FIXME
                     /* invalid hex sequence */
@@ -1417,9 +1481,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             if (compose_finish) {
                 ibus_engine_simple_commit_char (simple, output_char);
                 priv->compose_buffer[0] = 0;
-            } else {
-                ibus_engine_simple_update_preedit_text (simple);
             }
+            ibus_engine_simple_update_preedit_text (simple);
             return TRUE;
         }
 
@@ -1430,6 +1493,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                 ibus_engine_simple_commit_char (simple, output_char);
                 priv->compose_buffer[0] = 0;
             }
+            ibus_engine_simple_update_preedit_text (simple);
             return TRUE;
         }
     }

From 3a68ded197b3ad2e45ac08fe52c0514aff987367 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Jun 2018 16:02:32 +0900
Subject: [PATCH 488/816] ibusenginesimple: Do not show combined character on
 compose preedit

Some applications could combine their committed string with compose
character on preedit. E.g. dead_grave after 'e' on firefox

BUG=https://github.com/ibus/ibus/issues/1935
---
 src/ibusenginesimple.c | 119 ++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 56 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 61dfb89f2..68d6fb1eb 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -219,67 +219,73 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
             ibus_text_new_from_unichar (ch));
 }
 
-#define COMPOSE_KEYSYM_TO_UNICHAR(keysym, unichar) {                    \
-
 static gunichar
-ibus_keysym_to_unicode (guint16 keysym) {
-#define CASE(keysym_suffix, unicode) \
+ibus_keysym_to_unicode (guint16  keysym,
+                        gboolean combining) {
+#define CASE(keysym_suffix, unicode)                                    \
         case IBUS_KEY_dead_##keysym_suffix: return unicode
+#define CASE_COMBINE(keysym_suffix, combined_unicode, isolated_unicode) \
+        case IBUS_KEY_dead_##keysym_suffix:                             \
+            if (combining)                                              \
+                return combined_unicode;                                \
+            else                                                        \
+                return isolated_unicode
     switch (keysym) {
-    CASE(a, 0x03041);
-    CASE(A, 0x03042);
-    CASE(i, 0x03043);
-    CASE(I, 0x03044);
-    CASE(u, 0x03045);
-    CASE(U, 0x03046);
-    CASE(e, 0x03047);
-    CASE(E, 0x03048);
-    CASE(o, 0x03049);
-    CASE(O, 0x0304a);
-    CASE(abovecomma,                    0x0313);
-    CASE(abovedot,                      0x0307);
-    CASE(abovereversedcomma,            0x0314);
-    CASE(abovering,                     0x030a);
-    CASE(acute,                         0x0301);
-    CASE(belowbreve,                    0x032e);
-    CASE(belowcircumflex,               0x032d);
-    CASE(belowcomma,                    0x0326);
-    CASE(belowdiaeresis,                0x0324);
-    CASE(belowdot,                      0x0323);
-    CASE(belowmacron,                   0x0331);
-    CASE(belowring,                     0x030a);
-    CASE(belowtilde,                    0x0330);
-    CASE(breve,                         0x0306);
-    CASE(capital_schwa,                 0x018f);
-    CASE(caron,                         0x030c);
-    CASE(cedilla,                       0x0327);
-    CASE(circumflex,                    0x0302);
-    CASE(currency,                      0x00a4);
+    CASE (a, 0x03041);
+    CASE (A, 0x03042);
+    CASE (i, 0x03043);
+    CASE (I, 0x03044);
+    CASE (u, 0x03045);
+    CASE (U, 0x03046);
+    CASE (e, 0x03047);
+    CASE (E, 0x03048);
+    CASE (o, 0x03049);
+    CASE (O, 0x0304A);
+    CASE         (abovecomma,                   0x0313);
+    CASE_COMBINE (abovedot,                     0x0307, 0x02D9);
+    CASE         (abovereversedcomma,           0x0314);
+    CASE_COMBINE (abovering,                    0x030A, 0x02DA);
+    CASE_COMBINE (acute,                        0x0301, 0x00B4);
+    CASE         (belowbreve,                   0x032E);
+    CASE_COMBINE (belowcircumflex,              0x032D, 0xA788);
+    CASE_COMBINE (belowcomma,                   0x0326, 0x002C);
+    CASE         (belowdiaeresis,               0x0324);
+    CASE_COMBINE (belowdot,                     0x0323, 0x002E);
+    CASE_COMBINE (belowmacron,                  0x0331, 0x02CD);
+    CASE_COMBINE (belowring,                    0x030A, 0x02F3);
+    CASE_COMBINE (belowtilde,                   0x0330, 0x02F7);
+    CASE_COMBINE (breve,                        0x0306, 0x02D8);
+    CASE_COMBINE (capital_schwa,                0x018F, 0x04D8);
+    CASE_COMBINE (caron,                        0x030C, 0x02C7);
+    CASE_COMBINE (cedilla,                      0x0327, 0x00B8);
+    CASE_COMBINE (circumflex,                   0x0302, 0x005E);
+    CASE         (currency,                     0x00A4);
     // IBUS_KEY_dead_dasia == IBUS_KEY_dead_abovereversedcomma
-    CASE(diaeresis,                     0x0308);
-    CASE(doubleacute,                   0x030b);
-    CASE(doublegrave,                   0x030f);
-    CASE(grave,                         0x0300);
-    CASE(greek,                         0x03b1);
-    CASE(hook,                          0x0309);
-    CASE(horn,                          0x031b);
-    CASE(invertedbreve,                 0x032f);
-    CASE(iota,                          0x0345);
-    CASE(macron,                        0x0304);
-    CASE(ogonek,                        0x0328);
+    CASE_COMBINE (diaeresis,                    0x0308, 0x00A8);
+    CASE_COMBINE (doubleacute,                  0x030B, 0x02DD);
+    CASE_COMBINE (doublegrave,                  0x030F, 0x02F5);
+    CASE_COMBINE (grave,                        0x0300, 0x0060);
+    CASE         (greek,                        0x03BC);
+    CASE         (hook,                         0x0309);
+    CASE         (horn,                         0x031B);
+    CASE         (invertedbreve,                0x032F);
+    CASE_COMBINE (iota,                         0x0345, 0x037A);
+    CASE_COMBINE (macron,                       0x0304, 0x00AF);
+    CASE_COMBINE (ogonek,                       0x0328, 0x02DB);
     // IBUS_KEY_dead_perispomeni == IBUS_KEY_dead_tilde
     // IBUS_KEY_dead_psili == IBUS_KEY_dead_abovecomma
-    CASE(semivoiced_sound,              0x309a);
-    CASE(small_schwa,                   0x1d4a);
-    CASE(stroke,                        0x29f8);
-    CASE(tilde,                         0x0303);
-    CASE(voiced_sound,                  0x3099);
+    CASE_COMBINE (semivoiced_sound,             0x309A, 0x309C);
+    CASE_COMBINE (small_schwa,                  0x1D4A, 0x04D9);
+    CASE         (stroke,                       0x002F);
+    CASE_COMBINE (tilde,                        0x0303, 0x007E);
+    CASE_COMBINE (voiced_sound,                 0x3099, 0x309B);
     case IBUS_KEY_Multi_key:
         return 0x2384;
     default:;
     }
     return 0x0;
 #undef CASE
+#undef CASE_COMBINE
 }
 
 static void
@@ -352,7 +358,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
         int hexchars = 0;
         while (priv->compose_buffer[hexchars] != 0) {
             guint16 keysym= priv->compose_buffer[hexchars];
-            gunichar unichar = ibus_keysym_to_unicode (keysym);
+            gunichar unichar = ibus_keysym_to_unicode (keysym, FALSE);
             if (unichar > 0)
                 outbuf[len] = unichar;
             else
@@ -847,13 +853,14 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
         combination_buffer[n_compose] = 0;
         i--;
         while (i >= 0) {
-        combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i]);
-        if (!combination_buffer[i+1]) {
-            combination_buffer[i+1] =
-                    ibus_keyval_to_unicode (compose_buffer[i]);
+            combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i],
+                                                              TRUE);
+            if (!combination_buffer[i+1]) {
+                combination_buffer[i+1] =
+                        ibus_keyval_to_unicode (compose_buffer[i]);
+            }
+            i--;
         }
-        i--;
-    }
 
         /* If the buffer normalizes to a single character,
          * then modify the order of combination_buffer accordingly, if necessary,

From caffeaeee5be121713104fba331b9cf30726aa91 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Jun 2018 16:06:52 +0900
Subject: [PATCH 489/816] panelbinding: Fix SEGV in
 panel_binding_parse_accelerator

panel_binding_parse_accelerator() could return NULL of the unowned
IBus.ProcessKeyEventData with gcc optimization.
Since Vala does not provice a static local variable, the variable is
moved to the class member to fix this SEGV.
Also fixed an infinite loop to show a compose preedit in xterm.
Also a NULL preedit is fixed in the first emoji candidate from the
emoji category window.
---
 bus/inputcontext.c        |  9 +++++++++
 bus/panelproxy.c          | 38 ++++++++++++++++++++++++++++++++++++--
 ui/gtk3/panelbinding.vala | 28 ++++++++++++++++------------
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index bf9eafcff..98639a246 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -1730,6 +1730,15 @@ bus_input_context_hide_auxiliary_text (BusInputContext *context)
     }
 }
 
+/**
+ * bus_input_context_update_lookup_table:
+ * @context: #BusInputContext
+ * @table: #IBusLookupTable
+ * @visible: %TRUE if the lookup table is visible, otherwise %FALSE.
+ * @is_extension: %TRUE if the lookup table is called by a panel extension.
+ *                %FALSE if it's called by an engine.
+ * I.e. is_extension_lookup_table means the owner of the lookup table.
+ */
 void
 bus_input_context_update_lookup_table (BusInputContext *context,
                                        IBusLookupTable *table,
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 1c0fcca26..3e6d5be2a 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -743,6 +743,16 @@ _context_update_preedit_text_cb (BusInputContext *context,
 
     g_return_if_fail (panel->focused_context == context);
 
+    /* The callback is called with X11 applications but
+     * the callback is not called for extensions and panel
+     * extensions are always calls by
+     * bus_panel_proxy_update_preedit_text() directly
+     * because panel extensions foward UpdatePreeditText to
+     * UpdatePreeditTextReceived and it can be an infinite
+     * loop.
+     */
+    if (panel->panel_type != PANEL_TYPE_PANEL)
+        return;
     bus_panel_proxy_update_preedit_text (panel,
                                          text,
                                          cursor_pos,
@@ -847,8 +857,31 @@ _context_set_content_type_cb (BusInputContext *context,
         bus_panel_proxy_##name (panel);                         \
     }
 
-DEFINE_FUNCTION (show_preedit_text)
-DEFINE_FUNCTION (hide_preedit_text)
+#define DEFINE_FUNCTION_NO_EXTENSION(name)                      \
+    static void _context_##name##_cb (BusInputContext *context, \
+                                      BusPanelProxy   *panel)   \
+    {                                                           \
+        g_assert (BUS_IS_INPUT_CONTEXT (context));              \
+        g_assert (BUS_IS_PANEL_PROXY (panel));                  \
+                                                                \
+        g_return_if_fail (panel->focused_context == context);   \
+                                                                \
+        /* The callback is called with X11 applications but     \
+         * the callback is not called for extensions and panel  \
+         * extensions are always calls by                       \
+         * bus_panel_proxy_update_preedit_text() directly       \
+         * because panel extensions foward UpdatePreeditText to \
+         * UpdatePreeditTextReceived and it can be an infinite  \
+         * loop.                                                \
+         */                                                     \
+        if (panel->panel_type != PANEL_TYPE_PANEL)              \
+            return;                                             \
+        bus_panel_proxy_##name (panel);                         \
+    }
+
+
+DEFINE_FUNCTION_NO_EXTENSION (show_preedit_text)
+DEFINE_FUNCTION_NO_EXTENSION (hide_preedit_text)
 DEFINE_FUNCTION (show_auxiliary_text)
 DEFINE_FUNCTION (hide_auxiliary_text)
 DEFINE_FUNCTION (show_lookup_table)
@@ -860,6 +893,7 @@ DEFINE_FUNCTION (cursor_down_lookup_table)
 DEFINE_FUNCTION (state_changed)
 
 #undef DEFINE_FUNCTION
+#undef DEFINE_FUNCTION_NO_EXTENSION
 
 static const struct {
     gchar *name;
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 52b78c17f..95115b138 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -227,6 +227,8 @@ class PanelBinding : IBus.PanelService {
     private bool m_enable_extension;
     private string m_extension_name = "";
     private Preedit m_preedit;
+    private IBus.ProcessKeyEventData m_key_event_data =
+            IBus.ProcessKeyEventData();
 
     public PanelBinding(IBus.Bus bus,
                         Gtk.Application application) {
@@ -311,24 +313,24 @@ class PanelBinding : IBus.PanelService {
     }
 
 
-    private unowned
-    IBus.ProcessKeyEventData? parse_accelerator(string accelerator) {
-        IBus.ProcessKeyEventData key = {};
+    // Returning unowned IBus.KeyEventData causes NULL with gcc optimization
+    // and use m_key_event_data.
+    private void parse_accelerator(string accelerator) {
+        m_key_event_data = {};
         uint keysym = 0;
         IBus.ModifierType modifiers = 0;
         IBus.accelerator_parse(accelerator,
                 out keysym, out modifiers);
         if (keysym == 0U && modifiers == 0) {
             warning("Failed to parse shortcut key '%s'".printf(accelerator));
-            return null;
+            return;
         }
         if ((modifiers & IBus.ModifierType.SUPER_MASK) != 0) {
             modifiers ^= IBus.ModifierType.SUPER_MASK;
             modifiers |= IBus.ModifierType.MOD4_MASK;
         }
-        key.keyval = keysym;
-        key.state = modifiers;
-        return key;
+        m_key_event_data.keyval = keysym;
+        m_key_event_data.state = modifiers;
     }
 
 
@@ -337,8 +339,8 @@ class PanelBinding : IBus.PanelService {
         IBus.ProcessKeyEventData key;
         string[] accelerators = m_settings_emoji.get_strv("hotkey");
         foreach (var accelerator in accelerators) {
-            key = parse_accelerator(accelerator);
-            emoji_keys += key;
+            parse_accelerator(accelerator);
+            emoji_keys += m_key_event_data;
         }
 
         /* Since {} is not allocated, parse_accelerator() should be unowned. */
@@ -348,8 +350,8 @@ class PanelBinding : IBus.PanelService {
         IBus.ProcessKeyEventData[] unicode_keys = {};
         accelerators = m_settings_emoji.get_strv("unicode-hotkey");
         foreach (var accelerator in accelerators) {
-            key = parse_accelerator(accelerator);
-            unicode_keys += key;
+            parse_accelerator(accelerator);
+            unicode_keys += m_key_event_data;
         }
         key = {};
         unicode_keys += key;
@@ -544,8 +546,10 @@ class PanelBinding : IBus.PanelService {
     private bool key_press_enter() {
         if (m_extension_name != "unicode" && is_emoji_lookup_table()) {
             // Check if variats exist
-            if (m_emojier.key_press_enter())
+            if (m_emojier.key_press_enter()) {
+                convert_preedit_text();
                 return true;
+            }
         }
         IBus.Text text = m_preedit.get_commit_text();
         commit_text_update_favorites(text);

From 6b47e41d66497dd35752a89ea80e4bac55b64e45 Mon Sep 17 00:00:00 2001
From: Takuro Ashie <ashie@clear-code.com>
Date: Fri, 20 Jul 2018 12:30:09 +0900
Subject: [PATCH 490/816] Remove a misleading "const" modifier of a return
 value

ibus_key_event_to_string() uses g_string_free(str, FALSE) to return
a string so that users must free it. To clarify it, the const
modifier should be removed.
---
 src/ibuskeynames.c | 2 +-
 src/ibusshare.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ibuskeynames.c b/src/ibuskeynames.c
index fe7836ee4..c36651278 100644
--- a/src/ibuskeynames.c
+++ b/src/ibuskeynames.c
@@ -124,7 +124,7 @@ modifier_name[] = {
     NULL,        // 31
 };
 
-const gchar *
+gchar *
 ibus_key_event_to_string (guint keyval,
                           guint modifiers)
 {
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 4f5a306bf..d70af29f3 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -326,7 +326,7 @@ void             ibus_free_strv         (gchar          **strv)
  *
  * Returns: The name of a key symbol and modifier.
  */
-const gchar     *ibus_key_event_to_string
+gchar           *ibus_key_event_to_string
                                         (guint           keyval,
                                          guint           modifiers);
 

From 0dde239a3c786dcc479e3103ccd49938fcb47191 Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Tue, 24 Jul 2018 15:20:51 +0900
Subject: [PATCH 491/816] bus: warn deprecated --mem-profile option

Since GLib 2.46, memory profiling feature does not work anymore.

GLib 2.46 or later means that Ubuntu 16.04 or later. Ubuntu
14.04 (trusty) are still supported as LTS phase, but it seems that
GLib is old enough (2.40) to drop support.

As a result:

  * older than GLib 2.46: Just drop support
  * GLib 2.46 or later: Show a warning message if --mem-profile is
    used.
---
 bus/main.c   | 15 +--------------
 configure.ac |  4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/bus/main.c b/bus/main.c
index 2fb37b69b..6f1f39cad 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -160,18 +160,6 @@ daemon (gint nochdir, gint noclose)
 }
 #endif
 
-/*
- * _sig_usr2_handler:
- * @sig: the signal number, which is usually SIGUSR2.
- *
- * A signal handler for SIGUSR2 signal. Dump a summary of memory usage to stderr.
- */
-static void
-_sig_usr2_handler (int sig)
-{
-    g_mem_profile ();
-}
-
 gint
 main (gint argc, gchar **argv)
 {
@@ -196,8 +184,7 @@ main (gint argc, gchar **argv)
     }
 
     if (g_mempro) {
-        g_mem_set_vtable (glib_mem_profiler_table);
-        signal (SIGUSR2, _sig_usr2_handler);
+        g_warning ("--mem-profile no longer works with the GLib 2.46 or later");
     }
 
     /* check uid */
diff --git a/configure.ac b/configure.ac
index f332a775a..8e01c2663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,12 +52,12 @@ m4_define([ibus_binary_version],
           [ibus_major_version.ibus_abi_current_minus_age.ibus_abi_age.ibus_abi_revision])
 
 # Required versions of other packages.
-m4_define([glib_required_version], [2.36.0])
+m4_define([glib_required_version], [2.46.0])
 
 # VALA_TARGET_GLIB_VERSION is used by valac --ccode --target-glib .
 # VALA_TARGET_GLIB_VERSION and glib_required_version will be different
 # in the future.
-VALA_TARGET_GLIB_VERSION=2.36
+VALA_TARGET_GLIB_VERSION=2.46
 AC_SUBST(VALA_TARGET_GLIB_VERSION)
 
 # Init automake.

From 8d302c853f4e88f81652e0aeeca86ff1b5779ecb Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 24 Jul 2018 16:04:31 +0900
Subject: [PATCH 492/816] RHEL code reviews

---
 client/x11/main.c             |  4 ++--
 setup/enginetreeview.py       | 10 ++--------
 setup/ibus-setup.in           |  5 ++---
 src/emoji-parser.c            |  8 +++++---
 src/ibusbus.c                 |  9 ++++++---
 src/ibuscomposetable.c        |  4 ++--
 src/ibusenginesimple.c        | 22 +++++++++++++++++-----
 src/ibushotkey.c              |  5 +++--
 src/ibuskeymap.c              | 10 ++++++----
 src/ibuskeynames.c            |  3 +--
 src/ibusregistry.c            |  4 ++--
 src/ibusservice.c             | 13 +++++++++----
 src/ibusxml.c                 |  9 ++++++---
 src/unicode-parser.c          |  3 ++-
 util/IMdkit/FrameMgr.c        |  7 +++++++
 util/IMdkit/IMConn.c          |  6 ++++--
 util/IMdkit/i18nClbk.c        | 10 ++++++++++
 util/IMdkit/i18nIc.c          | 11 +++++++++--
 util/IMdkit/i18nMethod.c      |  4 ++++
 util/IMdkit/i18nOffsetCache.c | 21 +++++++++++++++++----
 util/IMdkit/i18nPtHdr.c       | 28 +++++++++++++++++++++++-----
 util/IMdkit/i18nUtil.c        | 12 +++++++++---
 util/IMdkit/i18nX.c           | 10 ++++++++--
 23 files changed, 156 insertions(+), 62 deletions(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 159f43031..3bea94b77 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus
  * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
@@ -196,7 +196,7 @@ _xim_preedit_callback_draw (XIMS xims, X11IC *x11ic, const gchar *preedit_string
         }
     }
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; feedback && i < len; i++) {
         feedback[i] = 0;
     }
 
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 4de4a516f..aea84593c 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2014-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -91,7 +92,6 @@ def __init__(self):
         renderer.set_property("text-column", 0)
         renderer.set_property("has-entry", False)
         renderer.set_property("editable", True)
-        renderer.connect("changed", self.__engine_layout_changed_cb)
 
         column = Gtk.TreeViewColumn(_("Kbd"))
         column.set_expand(False)
@@ -167,12 +167,6 @@ def __layout_cell_data_cb(self, celllayout, renderer, model, it, data):
         renderer.set_property("text", layout)
         renderer.set_property("weight", Pango.Weight.NORMAL)
 
-    def __engine_layout_changed_cb(self, combo, path, it):
-        return
-        i = self.__model.get_iter(path)
-        layout = combo.get_property("model").get_value(it, 0)
-        self.__model.set_value(i, 1, layout)
-
     def do_get_property(self, prop):
         if prop.name == "active-engine":
             it = self.get_selected_iter()
diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
index e0ed9ff5a..bb5c85cf5 100644
--- a/setup/ibus-setup.in
+++ b/setup/ibus-setup.in
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -21,8 +22,6 @@
 # USA
 
 prefix=@prefix@
-exec_prefix=@exec_prefix@
-datarootdir=@datarootdir@
 libexecdir=@libexecdir@
 export IBUS_PREFIX=@prefix@
 export IBUS_DATAROOTDIR=@datarootdir@
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index 0f7c8cfb1..b8f4dcf16 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -466,7 +466,8 @@ unicode_annotations_parse_xml_file (const gchar  *filename,
     g_return_val_if_fail (list != NULL, FALSE);
 
     if (!g_file_get_contents (filename, &content, &length, &error)) {
-        g_warning ("Failed to load %s: %s", filename, error->message);
+        g_warning ("Failed to load %s: %s", filename,
+                   error ? error->message : "");
         goto failed_to_parse_unicode_annotations;
     }
 
@@ -611,7 +612,7 @@ unicode_emoji_test_parse_line (const gchar *line,
             int i;
             gchar *amp;
             segments = g_strsplit(data->subcategory, "-", -1);
-            for (i = 0; segments[i]; i++) {
+            for (i = 0; segments && segments[i]; i++) {
                 if ((amp = strchr (segments[i], '&')) != NULL) {
                     if (amp - segments[i] <= 1) {
                         g_warning ("Wrong ampersand");
@@ -665,7 +666,8 @@ unicode_emoji_test_parse_file (const gchar *filename,
     g_return_val_if_fail (list != NULL, FALSE);
 
     if (!g_file_get_contents (filename, &content, &length, &error)) {
-        g_warning ("Failed to load %s: %s", filename, error->message);
+        g_warning ("Failed to load %s: %s",
+                   filename, error ? error->message : "");
         goto failed_to_parse_unicode_emoji_test;
     }
     head = end = content;
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 98820e8a9..30c2e3213 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
  */
 
 #include "ibusbus.h"
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -565,7 +566,9 @@ ibus_bus_init (IBusBus *bus)
             return;
         }
         if (buf.st_mode != (S_IFDIR | S_IRWXU)) {
-            g_chmod (path, 0700);
+            errno = 0;
+            if (g_chmod (path, 0700))
+                g_warning ("chmod failed: %s", errno ? g_strerror (errno) : "");
         }
     }
 
@@ -673,7 +676,7 @@ ibus_bus_constructor (GType                  type,
             ibus_bus_connect (_bus);
     }
     else {
-        object = g_object_ref (_bus);
+        object = g_object_ref (G_OBJECT (_bus));
     }
 
     return object;
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index d473f5819..b843e7e10 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -532,7 +532,7 @@ ibus_compose_table_serialize (IBusComposeTable *compose_table)
 
     variant_data = g_variant_new_fixed_array (G_VARIANT_TYPE_UINT16,
                                               compose_table->data,
-                                              index_stride * n_seqs,
+                                              (gsize)index_stride * n_seqs,
                                               sizeof (guint16));
     if (variant_data == NULL) {
         g_warning ("Could not change compose data to GVariant.");
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 68d6fb1eb..aae6b8df1 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014-2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -814,9 +814,21 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
         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;
+            gint j = i % (n_compose - 1) + 1;
+            gint k = (i+1) % (n_compose - 1) + 1;
+            if (j >= IBUS_MAX_COMPOSE_LEN) {
+                g_warning ("j >= IBUS_MAX_COMPOSE_LEN for " \
+                           "combination_buffer_temp");
+                break;
+            }
+            if (k >= IBUS_MAX_COMPOSE_LEN) {
+                g_warning ("k >= IBUS_MAX_COMPOSE_LEN for " \
+                           "combination_buffer_temp");
+                break;
+            }
+            temp_swap = combination_buffer_temp[j];
+            combination_buffer_temp[j] = combination_buffer_temp[k];
+            combination_buffer_temp[k] = temp_swap;
         }
         else
             break;
@@ -1067,7 +1079,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     gboolean compose_finish;
     gunichar output_char;
 
-    while (priv->compose_buffer[n_compose] != 0 && n_compose < EMOJI_SOURCE_LEN)
+    while (n_compose < EMOJI_SOURCE_LEN && priv->compose_buffer[n_compose] != 0)
         n_compose++;
     if (n_compose >= EMOJI_SOURCE_LEN) {
         g_warning ("copmose table buffer is full.");
diff --git a/src/ibushotkey.c b/src/ibushotkey.c
index 0cdfa78b4..00d502fc0 100644
--- a/src/ibushotkey.c
+++ b/src/ibushotkey.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -453,7 +454,7 @@ ibus_hotkey_profile_remove_hotkey (IBusHotkeyProfile *profile,
             break;
     }
 
-    g_assert (p2->event == event);
+    g_assert (p2 && p2->event == event);
 
     p2->hotkeys = g_list_remove (p2->hotkeys, p1);
     if (p2->hotkeys == NULL) {
diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
index d7428c5da..27a56754b 100644
--- a/src/ibuskeymap.c
+++ b/src/ibuskeymap.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -72,7 +73,7 @@ static gboolean
 ibus_keymap_parse_line (gchar  *str,
                         KEYMAP  keymap)
 {
-    gchar *p1, *p2;
+    gchar *p1, *p2, ch;
     gint i;
     guint keycode;
     guint keysym;
@@ -139,11 +140,12 @@ ibus_keymap_parse_line (gchar  *str,
     if (keysym == IBUS_KEY_VoidSymbol)
         return FALSE;
 
+    /* Do not assign *p1 to g_ascii_isalpha() directly for the syntax check */
     if (i == 0 &&
         strncmp (p2, "addupper", sizeof ("addupper") - 1) == 0 &&
-        g_ascii_isalpha (*p1)) {
+        (ch = *p1) && g_ascii_isalpha (ch)) {
         gchar buf[] = "a";
-        buf[0] = g_ascii_toupper(*p1);
+        buf[0] = g_ascii_toupper(ch);
         keymap[keycode][0] = keymap[keycode][3] = keysym;
         keymap[keycode][1] = keymap[keycode][2] = ibus_keyval_from_name (buf);
 
diff --git a/src/ibuskeynames.c b/src/ibuskeynames.c
index c36651278..085055987 100644
--- a/src/ibuskeynames.c
+++ b/src/ibuskeynames.c
@@ -192,8 +192,7 @@ ibus_key_event_from_string (const gchar *string,
     if (*keyval != IBUS_KEY_VoidSymbol)
         retval = TRUE;
 _out:
-    if (tokens)
-        g_strfreev (tokens);
+    g_strfreev (tokens);
     return retval;
 }
 
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index dfda2af33..b0483998c 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -472,7 +472,7 @@ ibus_registry_save_cache_file (IBusRegistry *registry,
     }
 
     if (g_str_has_prefix (filename, g_get_user_cache_dir ())) {
-        g_chmod (filename, 0644);
+        g_warn_if_fail (!g_chmod (filename, 0644));
     }
 
     return TRUE;
diff --git a/src/ibusservice.c b/src/ibusservice.c
index 2199d61db..8023527b1 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -500,12 +501,14 @@ ibus_service_register (IBusService     *service,
                        GDBusConnection *connection,
                        GError         **error)
 {
+    GArray *array = NULL;
+    GArray *interfaces;
+    GDBusInterfaceInfo **p;
+
     g_return_val_if_fail (IBUS_IS_SERVICE (service), FALSE);
     g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    GArray *array = NULL;
-
     if (g_hash_table_lookup (service->priv->table, connection)) {
         if (error) {
             *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_OBJECT_PATH_IN_USE,
@@ -515,7 +518,9 @@ ibus_service_register (IBusService     *service,
         goto error_out;
     }
 
-    GDBusInterfaceInfo **p = (GDBusInterfaceInfo **)IBUS_SERVICE_GET_CLASS (service)->interfaces->data;
+    interfaces = IBUS_SERVICE_GET_CLASS (service)->interfaces;
+    g_assert (interfaces);
+    p = (GDBusInterfaceInfo **)interfaces->data;
     if (*p == NULL) {
         if (error) {
             *error = g_error_new (G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
diff --git a/src/ibusxml.c b/src/ibusxml.c
index 5cacc5af3..266a82076 100644
--- a/src/ibusxml.c
+++ b/src/ibusxml.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -240,8 +241,10 @@ ibus_xml_parse_file (const gchar *filename)
         return node;
     } while (0);
 
-    g_warning ("Parse %s failed: %s", filename, error->message);
-    g_error_free (error);
+    if (error) {
+        g_warning ("Parse %s failed: %s", filename, error->message);
+        g_error_free (error);
+    }
     g_markup_parse_context_free (context);
     return NULL;
 }
diff --git a/src/unicode-parser.c b/src/unicode-parser.c
index e98c6d5fa..0e4fe8b7c 100644
--- a/src/unicode-parser.c
+++ b/src/unicode-parser.c
@@ -281,7 +281,8 @@ ucd_parse_file (const gchar *filename,
     g_return_val_if_fail (list != NULL, FALSE);
 
     if (!g_file_get_contents (filename, &content, &length, &error)) {
-        g_warning ("Failed to load %s: %s", filename, error->message);
+        g_warning ("Failed to load %s: %s",
+                   filename, error ? error->message : "");
         goto failed_to_parse_ucd_names_list;
     }
     head = end = content;
diff --git a/util/IMdkit/FrameMgr.c b/util/IMdkit/FrameMgr.c
index 9b4979480..084b88107 100644
--- a/util/IMdkit/FrameMgr.c
+++ b/util/IMdkit/FrameMgr.c
@@ -27,6 +27,7 @@ SOFTWARE.
 ******************************************************************/
 
 #include <X11/Xlibint.h>
+#include <assert.h>
 #include <stdlib.h>
 #include "FrameMgr.h"
 
@@ -989,6 +990,7 @@ static XimFrameType FrameInstGetNextType(FrameInst fi, XimFrameTypeInfo info)
             while (number > 0)
             {
                 i = _FrameInstDecrement (fi->template, i);
+                assert (i >= 0);
                 size += _FrameInstGetItemSize (fi, i);
                 number--;
             }
@@ -1138,6 +1140,7 @@ static XimFrameType FrameInstPeekNextType (FrameInst fi, XimFrameTypeInfo info)
             while (number > 0)
             {
                 i = _FrameInstDecrement (fi->template, i);
+                assert (i >= 0);
                 size += _FrameInstGetItemSize (fi, i);
                 number--;
             }
@@ -1356,6 +1359,7 @@ static FmStatus FrameInstSetSize (FrameInst fi, int num)
 	    break;
         }
         /*endswitch*/
+        assert (i >= 0);
         i = _FrameInstIncrement(fi->template, i);
     }
     /*endwhile*/
@@ -1457,6 +1461,7 @@ static FmStatus FrameInstSetIterCount (FrameInst fi, int num)
 	    break;
         }
         /*endswitch*/
+        assert (i >= 0);
         i = _FrameInstIncrement (fi->template, i);
     }
     /*endwhile*/
@@ -1474,6 +1479,7 @@ static int FrameInstGetTotalSize (FrameInst fi)
     while (fi->template[i].type != EOL)
     {
         size += _FrameInstGetItemSize (fi, i);
+        assert (i >= 0);
         i = _FrameInstIncrement (fi->template, i);
     }
     /*endwhile*/
@@ -2419,6 +2425,7 @@ static int _FrameInstGetItemSize (FrameInst fi, int cur_no)
             size = 0;
             while (number > 0)
             {
+                assert (i >= 0);
                 i = _FrameInstDecrement (fi->template, i);
                 size += _FrameInstGetItemSize (fi, i);
                 number--;
diff --git a/util/IMdkit/IMConn.c b/util/IMdkit/IMConn.c
index 6d3658938..8e8b8ece3 100644
--- a/util/IMdkit/IMConn.c
+++ b/util/IMdkit/IMConn.c
@@ -83,7 +83,7 @@ static char *_FindModifiers (XIMArg *args)
 {
     char *modifiers;
 
-    while (args->name)
+    while (args && args->name)
     {
 	if (strcmp (args->name, IMModifiers) == 0)
 	{
@@ -144,8 +144,10 @@ XIMS IMOpenIM (Display *display, ...)
     modifiers = _FindModifiers (args);
 
     ims = _GetIMS (modifiers);
-    if (ims == (XIMS) NULL)
+    if (ims == (XIMS) NULL) {
+        XFree (args);
         return (XIMS) NULL;
+    }
     /*endif*/
     
     ims->core.display = display;
diff --git a/util/IMdkit/i18nClbk.c b/util/IMdkit/i18nClbk.c
index b3edf3ad5..f55f970f4 100644
--- a/util/IMdkit/i18nClbk.c
+++ b/util/IMdkit/i18nClbk.c
@@ -55,6 +55,7 @@ int _Xi18nGeometryCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -97,6 +98,7 @@ int _Xi18nPreeditStartCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage(ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -159,6 +161,7 @@ int _Xi18nPreeditDrawCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -212,6 +215,7 @@ int _Xi18nPreeditCaretCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -256,6 +260,7 @@ int _Xi18nPreeditDoneCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -297,6 +302,7 @@ int _Xi18nStatusStartCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -363,6 +369,7 @@ int _Xi18nStatusDrawCallback (XIMS ims, IMProtocol *call_data)
         if (!reply)
         {
             _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+            FrameMgrFree (fm);
             return False;
         }
         /*endif*/
@@ -390,6 +397,7 @@ int _Xi18nStatusDrawCallback (XIMS ims, IMProtocol *call_data)
         if (!reply)
         {
             _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+            FrameMgrFree (fm);
             return False;
         }
         /*endif*/
@@ -435,6 +443,7 @@ int _Xi18nStatusDoneCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -479,6 +488,7 @@ int _Xi18nStringConversionCallback (XIMS ims, IMProtocol *call_data)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
diff --git a/util/IMdkit/i18nIc.c b/util/IMdkit/i18nIc.c
index 874459868..289837a64 100644
--- a/util/IMdkit/i18nIc.c
+++ b/util/IMdkit/i18nIc.c
@@ -475,8 +475,10 @@ static XICAttribute *CreateNestedList (CARD16 attr_id,
     /*endif*/
     memset (nest_list, 0, sizeof (XICAttribute));
     nest_list->value = (void *) malloc (value_length);
-    if (nest_list->value == NULL)
+    if (nest_list->value == NULL) {
+        XFree (nest_list);
         return NULL;
+    }
     /*endif*/
     memset (nest_list->value, 0, value_length);
 
@@ -816,6 +818,7 @@ void _Xi18nChangeIC (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -973,8 +976,10 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *call_data, unsigned char *p)
     getic->ic_attr = ic_attr;
     if (i18n_core->address.improto)
     {
-        if (!(i18n_core->address.improto (ims, call_data)))
+        if (!(i18n_core->address.improto (ims, call_data))) {
+            XFree (attrID_list);
             return;
+        }
         /*endif*/
 	if (_Xi18nNeedSwap (i18n_core, connect_id))
 	  SwapAttributes(getic->ic_attr, getic->ic_attr_num);
@@ -1020,6 +1025,8 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *call_data, unsigned char *p)
     if (reply == NULL)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        XFree (attrID_list);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
diff --git a/util/IMdkit/i18nMethod.c b/util/IMdkit/i18nMethod.c
index 203f83157..36dd28ac7 100644
--- a/util/IMdkit/i18nMethod.c
+++ b/util/IMdkit/i18nMethod.c
@@ -895,6 +895,7 @@ static Status xi18n_forwardEvent (XIMS ims, XPointer xp)
                            0,
                            0,
                            0);
+        FrameMgrFree (fm);
         return False;
     }
     /*endif*/
@@ -964,6 +965,7 @@ static Status xi18n_commit (XIMS ims, XPointer xp)
                                0,
                                0,
                                0);
+            FrameMgrFree (fm);
             return False;
         }
         /*endif*/
@@ -997,6 +999,7 @@ static Status xi18n_commit (XIMS ims, XPointer xp)
                                0,
                                0,
                                0);
+            FrameMgrFree (fm);
             return False;
         }
         /*endif*/
@@ -1132,6 +1135,7 @@ static int xi18n_syncXlib (XIMS ims, XPointer xp)
     reply = (unsigned char *) malloc (total_size);
     if (!reply) {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return False;
     }
     memset (reply, 0, total_size);
diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
index c952d5b45..d53790516 100644
--- a/util/IMdkit/i18nOffsetCache.c
+++ b/util/IMdkit/i18nOffsetCache.c
@@ -27,9 +27,11 @@
  */
 
 #include <X11/Xlib.h>
+#include <assert.h>
 #include <stddef.h>
 #include "IMdkit.h"
 #include "Xi18n.h"
+#include "Xi18n.h"
 
 /*
  * The XIM specification does not limit the number of window properties
@@ -52,9 +54,11 @@ void _Xi18nInitOffsetCache (Xi18nOffsetCache *offset_cache)
 unsigned long _Xi18nLookupPropertyOffset (Xi18nOffsetCache *offset_cache,
                                           Atom key)
 {
-    Xi18nAtomOffsetPair *data = offset_cache->data;
+    Xi18nAtomOffsetPair *data;
     size_t i;
 
+    assert (offset_cache);
+    data = offset_cache->data;
     for (i = 0; i < offset_cache->size; ++i) {
         if (data[i].key == key) {
             return data[i].offset;
@@ -70,6 +74,7 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
     Xi18nAtomOffsetPair *data = offset_cache->data;
     size_t i;
 
+    assert (data != NULL);
     for (i = 0; i < offset_cache->size; ++i) {
         if (data[i].key == key) {
             data[i].offset = offset;
@@ -79,11 +84,19 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
 
     if (++offset_cache->size > offset_cache->capacity) {
         offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
-        offset_cache->data = data = (Xi18nAtomOffsetPair *) realloc (data,
+        offset_cache->data = (Xi18nAtomOffsetPair *) realloc (data,
                 offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
+        if (offset_cache->data == NULL) {
+            offset_cache->data = data;
+            --offset_cache->size;
+        }
+        data = offset_cache->data;
     }
 
-    data[i].key = key;
-    data[i].offset = offset;
+    assert (data != NULL);
+    if (offset_cache->size > 0) {
+        data[i].key = key;
+        data[i].offset = offset;
+    }
 }
 
diff --git a/util/IMdkit/i18nPtHdr.c b/util/IMdkit/i18nPtHdr.c
index 2e6735419..eaeeee1cc 100644
--- a/util/IMdkit/i18nPtHdr.c
+++ b/util/IMdkit/i18nPtHdr.c
@@ -110,6 +110,7 @@ static void ConnectMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -230,6 +231,7 @@ static void OpenMessageProc(XIMS ims, IMProtocol *call_data, unsigned char *p)
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -312,6 +314,7 @@ static void CloseMessageProc (XIMS ims,
                            0,
                            0,
                            0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -513,6 +516,10 @@ static void QueryExtensionMessageProc (XIMS ims,
                            0,
                            0,
                            0);
+        FrameMgrFree (fm);
+        for (i = 0;  i < reply_number;  i++)
+            XFree (ext_list[i].name);
+        XFree ((char *) ext_list);
         return;
     }
     /*endif*/
@@ -610,8 +617,10 @@ static void GetIMValueFromName (Xi18n i18n_core,
 
             total_size = FrameMgrGetTotalSize (fm);
             data = (unsigned char *) malloc (total_size);
-            if (!data)
+            if (!data) {
+                FrameMgrFree (fm);
                 return;
+            }
             /*endif*/
             memset (data, 0, total_size);
             FrameMgrSetBuffer (fm, data);
@@ -666,11 +675,12 @@ static XIMAttribute *MakeIMAttributeList (Xi18n i18n_core,
         /*endfor*/
     }
     /*endfor*/
-    attrib_list = (XIMAttribute *) malloc (sizeof (XIMAttribute)*list_num);
+    attrib_list =
+            (XIMAttribute *) malloc (sizeof (XIMAttribute)*(list_num + 1));
     if (!attrib_list)
         return NULL;
     /*endif*/
-    memset (attrib_list, 0, sizeof (XIMAttribute)*list_num);
+    memset (attrib_list, 0, sizeof (XIMAttribute)*(list_num + 1));
     number_ret = list_num;
     list_num = 0;
     for (i = 0;  i < *number;  i++)
@@ -805,6 +815,10 @@ static void GetIMValuesMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
+        for (i = 0; i < iter_count; i++)
+            XFree(im_attribute_list[i].value);
+        XFree (im_attribute_list);
         return;
     }
     /*endif*/
@@ -961,6 +975,7 @@ static void DestroyICMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -1026,6 +1041,7 @@ static void ResetICMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -1072,7 +1088,7 @@ static int WireEventToEvent (Xi18n i18n_core,
     /* get & set serial */
     FrameMgrGetToken(fm, c16);
     ev->xany.serial = (unsigned long)c16;
-    ev->xany.serial |= serial << 16;
+    ev->xany.serial |= ((unsigned long)serial) << 16;
     ev->xany.send_event = False;
     ev->xany.display = i18n_core->address.dpy;
 
@@ -1308,6 +1324,7 @@ static void TriggerNotifyMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -1443,7 +1460,7 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
     if (byte_length > 0)
     {
         enc_nego->encodinginfo = (XIMStr *) malloc (sizeof (XIMStr)*10);
-        memset (enc_nego->encoding, 0, sizeof (XIMStr)*10);
+        memset (enc_nego->encodinginfo, 0, sizeof (XIMStr)*10);
         i = 0;
         while (FrameMgrIsIterLoopEnd (fm, &status) == False)
         {
@@ -1488,6 +1505,7 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
diff --git a/util/IMdkit/i18nUtil.c b/util/IMdkit/i18nUtil.c
index 6557bd1a8..109dcdf96 100644
--- a/util/IMdkit/i18nUtil.c
+++ b/util/IMdkit/i18nUtil.c
@@ -148,6 +148,7 @@ void _Xi18nSendMessage (XIMS ims,
     if (reply_hdr == NULL)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        FrameMgrFree (fm);
         return;
     }
     /*endif*/
@@ -163,7 +164,8 @@ void _Xi18nSendMessage (XIMS ims,
     replyp = reply;
     memmove (reply, reply_hdr, header_size);
     replyp += header_size;
-    memmove (replyp, data, length);
+    if (length > 0 && data != NULL)
+        memmove (replyp, data, length);
 
     i18n_core->methods.send (ims, connect_id, reply, reply_length);
 
@@ -202,8 +204,10 @@ void _Xi18nSendTriggerKey (XIMS ims, CARD16 connect_id)
     total_size = FrameMgrGetTotalSize (fm);
 
     reply = (unsigned char *) malloc (total_size);
-    if (!reply)
+    if (!reply) {
+        FrameMgrFree (fm);
         return;
+    }
     /*endif*/
     memset (reply, 0, total_size);
     FrameMgrSetBuffer (fm, reply);
@@ -257,8 +261,10 @@ void _Xi18nSetEventMask (XIMS ims,
 
     total_size = FrameMgrGetTotalSize (fm);
     reply = (unsigned char *) malloc (total_size);
-    if (!reply)
+    if (!reply) {
+        FrameMgrFree (fm);
         return;
+    }
     /*endif*/
     memset (reply, 0, total_size);
     FrameMgrSetBuffer (fm, reply);
diff --git a/util/IMdkit/i18nX.c b/util/IMdkit/i18nX.c
index 8385aba94..5e5c15fa6 100644
--- a/util/IMdkit/i18nX.c
+++ b/util/IMdkit/i18nX.c
@@ -31,6 +31,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
 ******************************************************************/
 
+#include <assert.h>
 #include <stddef.h>
 #include <limits.h>
 #include <X11/Xlib.h>
@@ -92,6 +93,7 @@ static unsigned char *ReadXIMMessage (XIMS ims,
         client = client->next;
     }
 
+    assert (client);
     if (ev->format == 8) {
         /* ClientMessage only */
         XimProtoHdr *hdr = (XimProtoHdr *) ev->data.b;
@@ -158,6 +160,7 @@ static unsigned char *ReadXIMMessage (XIMS ims,
         /* The property data is retrieved in 32-bit chunks */
         long_begin = offset / 4;
         long_end = (end + 3) / 4;
+        assert (x_client);
         return_code = XGetWindowProperty (i18n_core->address.dpy,
                                           x_client->accept_win,
                                           atom,
@@ -276,11 +279,11 @@ static Bool Xi18nXEnd(XIMS ims)
 static char *MakeNewAtom (CARD16 connect_id, char *atomName)
 {
     static int sequence = 0;
-    
     sprintf (atomName,
              "_server%d_%d",
              connect_id,
-             ((sequence > 20)  ?  (sequence = 0)  :  sequence++));
+             ((sequence > 20)  ?  (sequence = 0)  :  (0x1f & sequence)));
+    sequence++;
     return atomName;
 }
 
@@ -418,13 +421,16 @@ static Bool Xi18nXWait (XIMS ims,
                 &&
                 (hdr->minor_opcode == minor_opcode))
             {
+                XFree (packet);
                 return True;
             }
             else if (hdr->major_opcode == XIM_ERROR)
             {
+                XFree (packet);
                 return False;
             }
             /*endif*/
+            XFree (packet);
         }
         /*endif*/
     }

From be7554cea294aa13a65895b66b26e5f1fa4a1897 Mon Sep 17 00:00:00 2001
From: Ryutaroh Matsumoto
 <36657667+ryutaroh-matsumoto@users.noreply.github.com>
Date: Thu, 2 Aug 2018 08:10:04 +0900
Subject: [PATCH 493/816] option --monitor-timeout should be removed

ibus-daemon(1) has explanation of --monitor-timeout, but main.c does not accept it and make an error.
---
 bus/ibus-daemon.1.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bus/ibus-daemon.1.in b/bus/ibus-daemon.1.in
index 2dc982b27..a3d0d03aa 100644
--- a/bus/ibus-daemon.1.in
+++ b/bus/ibus-daemon.1.in
@@ -62,9 +62,6 @@ auto, refresh, none is available.
 \fB\-o\fR, \fB\-\-timeout\fR=\fItimeout\fR [default is 2000]
 dbus reply timeout in milliseconds.
 .TP
-\fB\-j\fR, \fB\-\-monitor\-timeout\fR=\fItimeout\fR [default is 0]
-timeout of poll changes of engines in seconds. 0 to disable it.
-.TP
 \fB\-m\fR, \fB\-\-mem\-profile\fR
 enable memory profile, send SIGUSR2 to print out the memory profile.
 .TP

From 5f44e7307771685c70202f996e39e9aa68d48d2e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Aug 2018 14:58:10 +0900
Subject: [PATCH 494/816] data/dconf: Add man pages of 00-upstream-settings(5)
 and ibus(5)

Also delete --mem-profile option in ibus-daemon(1)
---
 bus/ibus-daemon.1.in                 |  3 --
 data/dconf/00-upstream-settings.5.in | 40 ++++++++++++++++++++++
 data/dconf/Makefile.am               | 50 ++++++++++++++++++----------
 data/dconf/ibus.5.in                 | 39 ++++++++++++++++++++++
 ui/gtk3/ibus-emoji.7.in              |  6 ++--
 5 files changed, 114 insertions(+), 24 deletions(-)
 create mode 100644 data/dconf/00-upstream-settings.5.in
 create mode 100644 data/dconf/ibus.5.in

diff --git a/bus/ibus-daemon.1.in b/bus/ibus-daemon.1.in
index a3d0d03aa..ed975aedc 100644
--- a/bus/ibus-daemon.1.in
+++ b/bus/ibus-daemon.1.in
@@ -62,9 +62,6 @@ auto, refresh, none is available.
 \fB\-o\fR, \fB\-\-timeout\fR=\fItimeout\fR [default is 2000]
 dbus reply timeout in milliseconds.
 .TP
-\fB\-m\fR, \fB\-\-mem\-profile\fR
-enable memory profile, send SIGUSR2 to print out the memory profile.
-.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 verbose.
 
diff --git a/data/dconf/00-upstream-settings.5.in b/data/dconf/00-upstream-settings.5.in
new file mode 100644
index 000000000..b7a56fda6
--- /dev/null
+++ b/data/dconf/00-upstream-settings.5.in
@@ -0,0 +1,40 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2018.
+.\"
+.TH 00\-UPSTREAM\-SETTINGS "5" "August 2018" "@VERSION@" "User Commands"
+.SH NAME
+.B 00\-upstream\-settings
+\- dconf configuration file
+
+.SH SYNOPSIS
+.B /etc/dconf/db/ibus.d/00\-upstream\-settings
+
+.SH DESCRIPTION
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.
+
+.PP
+.B 00\-upstream\-settings
+is a text configuration file of dconf and can be converted to
+/etc/dconf/db/ibus by
+.B dconf update
+command with a write privilege in /etc/dconf/db. /etc/dconf/db/ibus is a
+database file of dconf and saves the IBus default settings. The saved keys
+and values can be readed by dconf command.
+
+.PP
+.RS 4
+.nf
+env DCONF_PROFILE=ibus dconf list /desktop/ibus/
+.RE
+
+.SH BUGS
+If you find a bug, please report it at https://github.com/ibus/ibus/issues
+
+.SH "SEE ALSO"
+.BR dconf (1)
+.BR ibus (5)
diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index 7f0d0fd8a..433d9937f 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (c) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (c) 2007-2011 Red Hat, Inc.
+# Copyright (c) 2007-2018 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
@@ -28,22 +28,6 @@ dist_gsettingsconvert_DATA = ibus.convert
 @GSETTINGS_RULES@
 @INTLTOOL_XML_NOMERGE_RULE@
 
-EXTRA_DIST = \
-	$(gsettings_schemas_in_files) \
-	make-dconf-override-db.sh \
-	profile/ibus \
-	00-upstream-settings \
-	$(NULL)
-
-CLEANFILES = \
-	$(gsettings_SCHEMAS) \
-	$(NULL)
-
-MAINTAINERCLEANFILES = \
-	$(gsettings_schemas_in_files) \
-	00-upstream-settings \
-	$(NULL)
-
 dconfprofiledir = $(sysconfdir)/dconf/profile
 dconfprofile_DATA = profile/ibus
 
@@ -60,9 +44,39 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
 	$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
 		{ rc=$$?; $(RM) -rf $@; exit $$rc; }
 
+man_5_in_files = 00-upstream-settings.5.in ibus.5.in
+man_5_files = $(man_5_in_files:.5.in=.5)
+man_5_DATA =$(man_5_files:.5=.5.gz)
+man_5dir = $(mandir)/man5
+%.5: %.5.in
+	$(AM_V_GEN) sed \
+	    -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+	    mv $@.tmp $@
+%.5.gz: %.5
+	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
 install-data-hook:
 	if test -z "$(DESTDIR)"; then \
-		dconf update; \
+	    dconf update; \
 	fi
 
+EXTRA_DIST = \
+    $(gsettings_schemas_in_files) \
+    $(man_5_in_files) \
+    make-dconf-override-db.sh \
+    profile/ibus \
+    00-upstream-settings \
+    $(NULL)
+
+CLEANFILES = \
+    $(gsettings_SCHEMAS) \
+    $(man_5_DATA) \
+    $(man_5_files) \
+    $(NULL)
+
+MAINTAINERCLEANFILES = \
+    $(gsettings_schemas_in_files) \
+    00-upstream-settings \
+    $(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/dconf/ibus.5.in b/data/dconf/ibus.5.in
new file mode 100644
index 000000000..d959c7e35
--- /dev/null
+++ b/data/dconf/ibus.5.in
@@ -0,0 +1,39 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2018.
+.\"
+.TH IBUS "5" "August 2018" "@VERSION@" "User Commands"
+.SH NAME
+.B IBUS
+\- dconf database file for IBus
+
+.SH SYNOPSIS
+.B /etc/dconf/db/ibus
+
+.SH DESCRIPTION
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.
+
+.PP
+.B /etc/dconf/db/ibus
+is a database file dconf and saves the IBus default settings. It can be
+generated from /etc/dconf/db/ibus.d/00\-upstream\-settings by
+.B dconf update
+command with a write privilege in /etc/dconf/db. The saved keys
+and values can be readed by dconf command.
+
+.PP
+.RS 4
+.nf
+env DCONF_PROFILE=ibus dconf list /desktop/ibus/
+.RE
+
+.SH BUGS
+If you find a bug, please report it at https://github.com/ibus/ibus/issues
+
+.SH "SEE ALSO"
+.BR dconf (1)
+.BR 00\-upstream\-settings (5)
diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index 3a2db2c04..b8b43574c 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -1,10 +1,10 @@
 .\" This file is distributed under the same license as the ibus
 .\" package.
-.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017-2018.
 .\"
-.TH "IBUS EMOJI" 1 "May 2017" "@VERSION@" "User Commands"
+.TH "IBUS EMOJI" 1 "August 2018" "@VERSION@" "User Commands"
 .SH NAME
-.B ibus emoji utility
+.B ibus-emoji
 \- Call the IBus emoji utility by
 .B IBus Emojier
 

From f328fd67f479faa46ca87bf3c85eed7080ec5ec0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Aug 2018 12:33:44 +0900
Subject: [PATCH 495/816] client/gtk2: Add IBUS_DISCARD_PASSWORD for firefox
 and chrome

popup window in firefox is closed in Xorg GNOME when password entry
is focus on. It's caused by gnome-shell [1].
Now IBUS_DISCARD_PASSWORD and IBUS_DISCARD_PASSWORD_APPS enviroment
variables are implemented in IBus GTK clients as a workaround.

env IBUS_DISCARD_PASSWORD=1 firefox
or
export IBUS_DISCARD_PASSWORD_APPS='firefox,.*chrome.*'

can discard typing characters on the password entries.

[1] https://gitlab.gnome.org/GNOME/gnome-shell/issues/391

BUG=https://github.com/ibus/ibus/issues/2002
---
 client/gtk2/ibusimcontext.c | 77 ++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 19 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index a806382d5..e4de52d93 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -91,6 +91,9 @@ static guint    _key_snooper_id = 0;
 
 static gboolean _use_sync_mode = FALSE;
 
+static const gchar *_discard_password_apps  = "";
+static gboolean _use_discard_password = FALSE;
+
 static GtkIMContext *_focus_im_context = NULL;
 static IBusInputContext *_fake_context = NULL;
 static GdkWindow *_input_window = NULL;
@@ -157,7 +160,7 @@ static gboolean _slave_delete_surrounding_cb
                                              IBusIMContext      *context);
 static void     _request_surrounding_text   (IBusIMContext      *context);
 static void     _create_fake_input_context  (void);
-static void     _set_content_type           (IBusIMContext      *context);
+static gboolean _set_content_type           (IBusIMContext      *context);
 
 
 
@@ -383,7 +386,7 @@ _request_surrounding_text (IBusIMContext *context)
     }
 }
 
-static void
+static gboolean
 _set_content_type (IBusIMContext *context)
 {
 #if GTK_CHECK_VERSION (3, 6, 0)
@@ -396,11 +399,18 @@ _set_content_type (IBusIMContext *context)
                       "input-hints", &hints,
                       NULL);
 
+        if (_use_discard_password) {
+            if (purpose == GTK_INPUT_PURPOSE_PASSWORD ||
+                purpose == GTK_INPUT_PURPOSE_PIN) {
+                return FALSE;
+            }
+        }
         ibus_input_context_set_content_type (context->ibuscontext,
                                              purpose,
                                              hints);
     }
 #endif
+    return TRUE;
 }
 
 
@@ -608,24 +618,45 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     _use_key_snooper = !_get_boolean_env ("IBUS_DISABLE_SNOOPER",
                                           !(ENABLE_SNOOPER));
     _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
+    _use_discard_password = _get_boolean_env ("IBUS_DISCARD_PASSWORD", FALSE);
+
+#define CHECK_APP_IN_CSV_ENV_VARIABLES(retval,                          \
+                                       env_apps,                        \
+                                       fallback_apps,                   \
+                                       value_if_found)                  \
+{                                                                       \
+    const gchar * prgname = g_get_prgname ();                           \
+    gchar **p;                                                          \
+    gchar ** apps;                                                      \
+    if (g_getenv ((#env_apps))) {                                       \
+        fallback_apps = g_getenv (#env_apps);                           \
+    }                                                                   \
+    apps = g_strsplit ((fallback_apps), ",", 0);                        \
+    for (p = apps; *p != NULL; p++) {                                   \
+        if (g_regex_match_simple (*p, prgname, 0, 0)) {                 \
+            retval = (value_if_found);                                  \
+            break;                                                      \
+        }                                                               \
+    }                                                                   \
+    g_strfreev (apps);                                                  \
+}
 
     /* env IBUS_DISABLE_SNOOPER does not exist */
     if (_use_key_snooper) {
         /* disable snooper if app is in _no_snooper_apps */
-        const gchar * prgname = g_get_prgname ();
-        if (g_getenv ("IBUS_NO_SNOOPER_APPS")) {
-            _no_snooper_apps = g_getenv ("IBUS_NO_SNOOPER_APPS");
-        }
-        gchar **p;
-        gchar ** apps = g_strsplit (_no_snooper_apps, ",", 0);
-        for (p = apps; *p != NULL; p++) {
-            if (g_regex_match_simple (*p, prgname, 0, 0)) {
-                _use_key_snooper = FALSE;
-                break;
-            }
-        }
-        g_strfreev (apps);
+        CHECK_APP_IN_CSV_ENV_VARIABLES (_use_key_snooper,
+                                        IBUS_NO_SNOOPER_APPS,
+                                        _no_snooper_apps,
+                                        FALSE);
     }
+    if (!_use_discard_password) {
+        CHECK_APP_IN_CSV_ENV_VARIABLES (_use_discard_password,
+                                        IBUS_DISCARD_PASSWORD_APPS,
+                                        _discard_password_apps,
+                                        TRUE);
+    }
+
+#undef CHECK_APP_IN_CSV_ENV_VARIABLES
 
     /* init bus object */
     if (_bus == NULL) {
@@ -926,7 +957,10 @@ ibus_im_context_focus_in (GtkIMContext *context)
 
     ibusimcontext->has_focus = TRUE;
     if (ibusimcontext->ibuscontext) {
-        _set_content_type (ibusimcontext);
+        if (!_set_content_type (ibusimcontext)) {
+            ibusimcontext->has_focus = FALSE;
+            return;
+        }
         ibus_input_context_focus_in (ibusimcontext->ibuscontext);
     }
 
@@ -958,9 +992,14 @@ ibus_im_context_focus_out (GtkIMContext *context)
         return;
     }
 
-    g_object_remove_weak_pointer ((GObject *) context,
-                                  (gpointer *) &_focus_im_context);
-    _focus_im_context = NULL;
+    /* If _use_discard_password is TRUE or GtkEntry has no visibility,
+     * _focus_im_context is NULL.
+     */
+    if (_focus_im_context) {
+        g_object_remove_weak_pointer ((GObject *) context,
+                                      (gpointer *) &_focus_im_context);
+        _focus_im_context = NULL;
+    }
 
     ibusimcontext->has_focus = FALSE;
     if (ibusimcontext->ibuscontext) {

From dc5e7eeba30d0bc2327ffa562cdf6ca0ae23aecc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Aug 2018 15:26:42 +0900
Subject: [PATCH 496/816] ui/gtk3: Show previous emojis with "history"
 annotation

---
 ui/gtk3/emojier.vala | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 7beb6f0a5..85dcdceba 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1294,8 +1294,14 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             return;
         }
         string? unicode_point = check_unicode_point(annotation);
-        GLib.SList<string>? total_emojis =
-            lookup_emojis_from_annotation(annotation);
+        GLib.SList<string>? total_emojis = null;
+        if (annotation.ascii_casecmp("history") == 0) {
+            for (int i = 0; i < m_favorites.length; i++) {
+                total_emojis.append(m_favorites[i].dup());
+            }
+        }
+        if (total_emojis == null)
+            total_emojis = lookup_emojis_from_annotation(annotation);
         if (total_emojis == null) {
             /* Users can type title strings against lower case.
              * E.g. "Smile" against "smile"

From 428e64eac8f7dc3ff60234435fe5f34d50126432 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Aug 2018 15:59:06 +0900
Subject: [PATCH 497/816] src: Describe "default" layout in
 ibus_engine_desc_new()

BUG=https://github.com/ibus/ibus/issues/2011
---
 src/ibusenginedesc.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h
index 45ec06bff..00a98e415 100644
--- a/src/ibusenginedesc.h
+++ b/src/ibusenginedesc.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2011-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -107,6 +108,10 @@ GType            ibus_engine_desc_get_type      (void);
  * @layout: Keyboard layout
  *
  * Creates a new #IBusEngineDesc.
+ * If layout is "default", the engine inherits the current layout and
+ * does not change the layout. The layouts "default" and "" are same.
+ * E.g. If you switch JP XKB engine and an input method engine (IME),
+ * the IME inherits the JP layout.
  *
  * Returns: A newly allocated IBusEngineDesc.
  */
@@ -128,6 +133,10 @@ IBusEngineDesc  *ibus_engine_desc_new           (const gchar    *name,
  * 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)
+ * If layout is "default", the engine inherits the current layout and
+ * does not change the layout. The layouts "default" and "" are same.
+ * E.g. If you switch JP XKB engine and an input method engine (IME),
+ * the IME inherits the JP layout.
  *
  * Returns: A newly allocated IBusEngineDesc.
  */

From 269570867793df64aaefcac1963f2e973c1fb8ef Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 7 Aug 2018 16:34:18 +0900
Subject: [PATCH 498/816] src/tests: Fix make check to link src/libibus.so

---
 bus/Makefile.am       |  1 +
 bus/panelproxy.c      |  1 -
 src/tests/Makefile.am | 96 ++++++++++++++++++++++++++++---------------
 src/tests/runtest     | 20 +++++++++
 4 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index dda79eac8..bdae5c923 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -122,6 +122,7 @@ TESTS_ENVIRONMENT = \
     top_srcdir=$(top_srcdir) \
     builddir=$(builddir) \
     srcdir=$(srcdir) \
+    LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$(top_builddir)/src" \
     DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
     $(NULL)
 
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 3e6d5be2a..024a451c6 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -1086,7 +1086,6 @@ bus_panel_proxy_candidate_clicked_lookup_table (BusPanelProxy *panel,
                                                 guint          button,
                                                 guint          state)
 {
-    gboolean use_extension = TRUE;
     g_assert (BUS_IS_PANEL_PROXY (panel));
 
     g_dbus_proxy_call ((GDBusProxy *)panel,
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 5f21ebcd3..fc85f3f2e 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -23,43 +23,74 @@
 
 NULL =
 
-DEPS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+LIBIBUS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+GSCHEMA_XML = $(top_builddir)/data/dconf/org.freedesktop.ibus.gschema.xml
+IBUS_DAEMON = $(top_builddir)/bus/ibus-daemon
+ENGINE_XML = $(top_builddir)/engine/simple.xml
+CONFIG_XML = $(top_builddir)/conf/memconf/memconf.xml
+IM_IBUS = $(top_builddir)/client/gtk3/im-ibus.la
+
+BUILT_SOURCES = \
+    $(LIBIBUS) \
+    $(GSCHEMA_XML) \
+    $(IBUS_DAEMON) \
+    $(ENGINE_XML) \
+    $(CONFIG_XML) \
+    $(NULL)
+
+$(GSCHEMA_XML):
+	$(MAKE) -C $(top_builddir)/data
+
+$(IBUS_DAEMON):
+	$(MAKE) -C $(top_builddir)/bus
+
+$(ENGINE_XML):
+	$(MAKE) -C $(top_builddir)/engine
+
+# memconf.xml is not built with configure --disable-memconf
+$(CONFIG_XML):
+	$(MAKE) -C $(top_builddir)/conf/memconf
+	$(MAKE) -C $(top_builddir)/conf/memconf memconf.xml
+
+$(IM_IBUS):
+	$(MAKE) -C $(top_builddir)/client/gtk3
 
 AM_CPPFLAGS = \
-	-g                                      \
-	@GLIB2_CFLAGS@                          \
-	@GIO2_CFLAGS@                           \
-	-DIBUS_DISABLE_DEPRECATION_WARNINGS     \
-	-I$(top_srcdir)/src                     \
-	-I$(top_builddir)/src                   \
-	$(NULL)
-
-prog_ldadd = 			\
-	@GLIB2_LIBS@        \
-	@GIO2_LIBS@			\
-	$(top_builddir)/src/libibus-@IBUS_API_VERSION@.la	\
-	$(NULL)
+    -g                                      \
+    @GLIB2_CFLAGS@                          \
+    @GIO2_CFLAGS@                           \
+    -DIBUS_DISABLE_DEPRECATION_WARNINGS     \
+    -I$(top_srcdir)/src                     \
+    -I$(top_builddir)/src                   \
+    $(NULL)
+
+prog_ldadd =\
+    @GLIB2_LIBS@                                                        \
+    @GIO2_LIBS@                                                         \
+    $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la                   \
+    $(NULL)
 
 noinst_PROGRAMS = $(TESTS)
 TESTS = \
-	ibus-bus                        \
-	ibus-config                     \
-	ibus-configservice              \
-	ibus-factory                    \
-	ibus-inputcontext               \
-	ibus-inputcontext-create        \
-	ibus-keynames                   \
-	ibus-registry                   \
-	ibus-serializable               \
-	ibus-share                      \
-	ibus-util                       \
-	$(NULL)
+    ibus-bus                        \
+    ibus-config                     \
+    ibus-configservice              \
+    ibus-factory                    \
+    ibus-inputcontext               \
+    ibus-inputcontext-create        \
+    ibus-keynames                   \
+    ibus-registry                   \
+    ibus-serializable               \
+    ibus-share                      \
+    ibus-util                       \
+    $(NULL)
 
 if ENABLE_ENGINE
 TESTS += ibus-engine-switch
 endif
 
 if ENABLE_GTK3
+BUILT_SOURCES += $(IM_IBUS)
 TESTS += ibus-compose
 if ENABLE_XTEST
 TESTS += ibus-keypress
@@ -67,12 +98,13 @@ endif
 endif
 
 TESTS_ENVIRONMENT = \
-	top_builddir=$(top_builddir) \
-	top_srcdir=$(top_srcdir) \
-	builddir=$(builddir) \
-	srcdir=$(srcdir) \
-	DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
-	$(NULL)
+    top_builddir=$(top_builddir) \
+    top_srcdir=$(top_srcdir) \
+    builddir=$(builddir) \
+    srcdir=$(srcdir) \
+    LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$(top_builddir)/src" \
+    DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
+    $(NULL)
 
 LOG_COMPILER = $(srcdir)/runtest
 
diff --git a/src/tests/runtest b/src/tests/runtest
index 5c1630831..ee60f2e2c 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -36,6 +36,12 @@ ibus-keypress
 test-stress
 "
 IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
+GTK_QUERY_MODULE=gtk-query-immodules-3.0-32
+MACHINE=`uname -m`
+
+if test x"$MACHINE" = xx86_64 ; then
+    GTK_QUERY_MODULE=gtk-query-immodules-3.0-64
+fi
 
 retval=0
 
@@ -114,6 +120,7 @@ run_test_case()
     done
 
     if test $need_bus = yes; then
+        # func_copy_component replaces s/$top_srcdir/%top_builddir/
         func_copy_component "../$top_srcdir/engine/simple.xml"
         func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
 
@@ -123,6 +130,19 @@ run_test_case()
         IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
         export IBUS_ADDRESS_FILE
 
+        if test -f "../$top_builddir/client/gtk3/.libs/im-ibus.so" ; then
+            IM_IBUS_SO="../$top_builddir/client/gtk3/.libs/im-ibus.so"
+        elif test -f "../$top_builddir/client/gtk3/im-ibus.so" ; then
+            IM_IBUS_SO="../$top_builddir/client/gtk3/im-ibus.so"
+        else
+            echo "NOT FOUND $top_builddir/client/gtk3/im-ibus.so"
+            exit -1
+        fi
+
+        GTK_IM_MODULE_FILE=$PWD/imcache
+        export GTK_IM_MODULE_FILE
+        $GTK_QUERY_MODULE "$IM_IBUS_SO" > $GTK_IM_MODULE_FILE
+
         cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
         glib-compile-schemas $PWD
         if test $? -ne 0 ; then

From 5db6e7b40e7937a306411b152a1e39525351d988 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 7 Aug 2018 20:33:26 +0900
Subject: [PATCH 499/816] src/tests: Ask --enable-memconf in make check instead
 of build order

---
 Makefile.am           |  1 +
 src/tests/Makefile.am | 33 +--------------------------------
 src/tests/runtest     |  4 ++++
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f427f4d06..cf7460d60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,6 +92,7 @@ install-data-hook:
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--disable-schemas-install \
+	--enable-memconf \
 	$(NULL)
 
 dist-hook:
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index fc85f3f2e..c5fef3c86 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -23,37 +23,7 @@
 
 NULL =
 
-LIBIBUS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
-GSCHEMA_XML = $(top_builddir)/data/dconf/org.freedesktop.ibus.gschema.xml
-IBUS_DAEMON = $(top_builddir)/bus/ibus-daemon
-ENGINE_XML = $(top_builddir)/engine/simple.xml
-CONFIG_XML = $(top_builddir)/conf/memconf/memconf.xml
-IM_IBUS = $(top_builddir)/client/gtk3/im-ibus.la
-
-BUILT_SOURCES = \
-    $(LIBIBUS) \
-    $(GSCHEMA_XML) \
-    $(IBUS_DAEMON) \
-    $(ENGINE_XML) \
-    $(CONFIG_XML) \
-    $(NULL)
-
-$(GSCHEMA_XML):
-	$(MAKE) -C $(top_builddir)/data
-
-$(IBUS_DAEMON):
-	$(MAKE) -C $(top_builddir)/bus
-
-$(ENGINE_XML):
-	$(MAKE) -C $(top_builddir)/engine
-
-# memconf.xml is not built with configure --disable-memconf
-$(CONFIG_XML):
-	$(MAKE) -C $(top_builddir)/conf/memconf
-	$(MAKE) -C $(top_builddir)/conf/memconf memconf.xml
-
-$(IM_IBUS):
-	$(MAKE) -C $(top_builddir)/client/gtk3
+DEPS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
 AM_CPPFLAGS = \
     -g                                      \
@@ -90,7 +60,6 @@ TESTS += ibus-engine-switch
 endif
 
 if ENABLE_GTK3
-BUILT_SOURCES += $(IM_IBUS)
 TESTS += ibus-compose
 if ENABLE_XTEST
 TESTS += ibus-keypress
diff --git a/src/tests/runtest b/src/tests/runtest
index ee60f2e2c..d7f96ea36 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -120,6 +120,10 @@ run_test_case()
     done
 
     if test $need_bus = yes; then
+        if test ! -f "../$top_builddir/conf/memconf/ibus-memconf" ; then
+            echo "NOT FOUNND ibus-memconf. Need configure --enable-memconf"
+            exit -1
+        fi
         # func_copy_component replaces s/$top_srcdir/%top_builddir/
         func_copy_component "../$top_srcdir/engine/simple.xml"
         func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"

From b94e8f2d993f2f24e9e977227eaae7d335fc478f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 7 Aug 2018 20:33:32 +0900
Subject: [PATCH 500/816] src: Replace deprecated BOOL with BOOLEAN for
 glib-genmarshal

---
 bus/ibusimpl.c          | 20 --------------------
 bus/inputcontext.c      |  2 +-
 bus/marshalers.list     |  2 +-
 src/ibusemojigen.h      |  2 +-
 src/ibusengine.c        | 13 +------------
 src/ibusmarshalers.list | 20 ++++++++++----------
 src/ibuspanelservice.c  |  2 +-
 7 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index ec1caea8f..80f3acfbb 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -430,26 +430,6 @@ _panel_update_auxiliary_text_received_cb (BusPanelProxy *panel,
             ibus->panel, text, visible);
 }
 
-static void
-_panel_show_lookup_table_received_cb (BusPanelProxy *panel,
-                                      BusIBusImpl   *ibus)
-{
-    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
-
-    if (ibus->panel)
-        bus_panel_proxy_show_lookup_table (ibus->panel);
-}
-
-static void
-_panel_hide_lookup_table_received_cb (BusPanelProxy *panel,
-                                      BusIBusImpl   *ibus)
-{
-    g_return_if_fail (BUS_IS_IBUS_IMPL (ibus));
-
-    if (ibus->panel)
-        bus_panel_proxy_hide_lookup_table (ibus->panel);
-}
-
 static void
 _registry_changed_cb (IBusRegistry *registry,
                       BusIBusImpl  *ibus)
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 98639a246..4f98b849c 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -353,7 +353,7 @@ bus_input_context_class_init (BusInputContextClass *class)
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            bus_marshal_BOOL__UINT_UINT_UINT,
+            bus_marshal_BOOLEAN__UINT_UINT_UINT,
             G_TYPE_BOOLEAN,
             3,
             G_TYPE_UINT,
diff --git a/bus/marshalers.list b/bus/marshalers.list
index 437c6feea..31e6c433f 100644
--- a/bus/marshalers.list
+++ b/bus/marshalers.list
@@ -1,4 +1,4 @@
-BOOL:UINT,UINT,UINT
+BOOLEAN:UINT,UINT,UINT
 OBJECT:STRING
 VOID:INT,UINT
 VOID:INT,INT,INT,INT
diff --git a/src/ibusemojigen.h b/src/ibusemojigen.h
index 74a60157b..30bb12e57 100644
--- a/src/ibusemojigen.h
+++ b/src/ibusemojigen.h
@@ -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) 2016-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ibusengine.c b/src/ibusengine.c
index a3ccd7ddb..7fb4e8563 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -185,7 +185,6 @@ static void      ibus_engine_dbus_property_changed
                                              (IBusEngine         *engine,
                                               const gchar        *property_name,
                                               GVariant           *value);
-static void      ibus_engine_keybinding_free (IBusEngine         *engine);
 
 
 G_DEFINE_TYPE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
@@ -387,7 +386,7 @@ ibus_engine_class_init (IBusEngineClass *class)
             G_SIGNAL_RUN_LAST,
             G_STRUCT_OFFSET (IBusEngineClass, process_key_event),
             g_signal_accumulator_true_handled, NULL,
-            _ibus_marshal_BOOL__UINT_UINT_UINT,
+            _ibus_marshal_BOOLEAN__UINT_UINT_UINT,
             G_TYPE_BOOLEAN,
             3,
             G_TYPE_UINT,
@@ -1585,16 +1584,6 @@ ibus_engine_dbus_property_changed (IBusEngine  *engine,
     g_object_unref (message);
 }
 
-static void
-ibus_engine_keybinding_free (IBusEngine *engine)
-{
-    IBusEnginePrivate *priv;
-
-    g_return_if_fail (IBUS_IS_ENGINE (engine));
-
-    priv = engine->priv;
-}
-
 IBusEngine *
 ibus_engine_new (const gchar     *engine_name,
                  const gchar     *object_path,
diff --git a/src/ibusmarshalers.list b/src/ibusmarshalers.list
index 8d91937e0..aa9ea82ac 100644
--- a/src/ibusmarshalers.list
+++ b/src/ibusmarshalers.list
@@ -1,23 +1,23 @@
-VOID:NONE
+VOID:VOID
 VOID:OBJECT
 VOID:POINTER
 VOID:STRING
 VOID:STRING,INT
 VOID:STRING,UINT
-BOOL:POINTER
-BOOL:POINTER,POINTER
-BOOL:UINT,UINT
-BOOL:UINT,UINT,UINT
-BOOL:ULONG
+BOOLEAN:POINTER
+BOOLEAN:POINTER,POINTER
+BOOLEAN:UINT,UINT
+BOOLEAN:UINT,UINT,UINT
+BOOLEAN:ULONG
 VOID:INT,INT,INT,INT
 VOID:UINT,UINT
 VOID:INT,UINT
 VOID:UINT,UINT,UINT
-VOID:OBJECT,UINT,BOOL
-VOID:OBJECT,UINT,BOOL,UINT
+VOID:OBJECT,UINT,BOOLEAN
+VOID:OBJECT,UINT,BOOLEAN,UINT
 VOID:OBJECT,UINT,UINT
-VOID:OBJECT,BOOL
-VOID:BOXED,BOOL
+VOID:OBJECT,BOOLEAN
+VOID:BOXED,BOOLEAN
 VOID:BOXED
 VOID:STRING,STRING,VARIANT
 VOID:STRING,STRING,STRING
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 71028ebf3..9d87e19bd 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -991,7 +991,7 @@ ibus_panel_service_class_init (IBusPanelServiceClass *class)
             G_SIGNAL_RUN_LAST,
             G_STRUCT_OFFSET (IBusPanelServiceClass, process_key_event),
             g_signal_accumulator_true_handled, NULL,
-            _ibus_marshal_BOOL__UINT_UINT_UINT,
+            _ibus_marshal_BOOLEAN__UINT_UINT_UINT,
             G_TYPE_BOOLEAN,
             3,
             G_TYPE_UINT,

From 999aee3f4bd99fb01f21f5e99d92d02e06a927d2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 8 Aug 2018 15:39:13 +0900
Subject: [PATCH 501/816] po: Update translations

Update po/hu.po po/nl.po
---
 po/hu.po | 42 +++++++++++++++++++++++++++++-------------
 po/nl.po | 41 ++++++++++++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 0c3bba5a2..b5e9934b8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -18,12 +18,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-03-17 10:41+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-06-28 06:24+0000\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.5.0\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -243,26 +243,29 @@ msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
 msgstr ""
+"Gyorsbillentyű az emodzsi annotációk vagy a Unicode nevek átalakításának "
+"engedélyezéséhez"
 
 #: ../setup/setup.ui.h:50
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emodzsi annotáció:"
 
 #: ../setup/setup.ui.h:51
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "Gyorsbillentyű az Unicode kódpont-átalakítások engedélyezéséhez"
 
 #: ../setup/setup.ui.h:52
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode kódpont:"
 
 #: ../setup/setup.ui.h:53
 msgid "Set a font of Unicode candidates on the emoji dialog"
 msgstr ""
+"Unicode jelöltekből álló betűkészlet beállítása az emodzsi párbeszédablakon"
 
 #: ../setup/setup.ui.h:54
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode betűkészlet:"
 
 #: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -581,11 +584,11 @@ msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Unicode gyorsbillentyű a  gtk_accelerator_parse részére"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "Gyorsbillentyű az Unicode bevitel ki- vagy bekapcsolásához"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -670,7 +673,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:67
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Emodzsi adatok betöltése indításkor"
 
 #: ../data/ibus.schemas.in.h:68
 msgid ""
@@ -678,10 +681,13 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Emodzsi adatok betöltése indításkor, ha igaz. Körülbelül 10 MB memória "
+"szükséges az adatok betöltéséhez. Ha hamis, akkor az emodzsi adatok a "
+"párbeszédablak megnyitásakor lesznek betöltve."
 
 #: ../data/ibus.schemas.in.h:69
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Unicode adatok betöltése indításkor"
 
 #: ../data/ibus.schemas.in.h:70
 msgid ""
@@ -690,6 +696,10 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Unicode adatok betöltése indításkor, ha igaz. Körülbelül 15 MB memória "
+"szükséges az adatok betöltéséhez. Ha hamis, akkor a Unicode adatok a "
+"párbeszédablak megnyitásakor lesznek betöltve. A Unicode adatok mindenképpen "
+"az emodzsi adatok után lesznek betöltve, akkor is ha igaz."
 
 #: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
@@ -2899,6 +2909,8 @@ msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"A motor séma útvonalainak használata az ibus mag helyett, mely vesszővel "
+"elválasztott értékekből állhat."
 
 #: ../tools/main.vala:381
 msgid "Resetting…"
@@ -3010,7 +3022,7 @@ msgstr "Emodzsi változatok megjelenítése"
 
 #: ../ui/gtk3/emojier.vala:1082
 msgid "Close"
-msgstr ""
+msgstr "Bezárás"
 
 #: ../ui/gtk3/emojier.vala:1088
 msgid "Menu"
@@ -3018,7 +3030,7 @@ msgstr "Menü"
 
 #: ../ui/gtk3/emojier.vala:1099
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Kattintson a figyelmeztető üzenet megtekintéséhez."
 
 #: ../ui/gtk3/emojier.vala:1143
 msgid "Loading a Unicode dictionary:"
@@ -3073,6 +3085,10 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Nem sikerült lekérni a jelenlegi szöveges alkalmazást. Hozza újra fókuszba "
+"az alkalmazást. Például nyomja meg többször az Esc gombot az emodzsi beírási "
+"módból kilépéshez, kattintson az asztalra, majd újra a szöveges alkalmazásra."
+""
 
 #: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
diff --git a/po/nl.po b/po/nl.po
index 69b84a769..739a88dde 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -19,12 +19,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-04-13 04:08+0000\n"
+"PO-Revision-Date: 2018-07-16 03:25+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.5.0\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -244,26 +244,28 @@ msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
 msgstr ""
+"De sneltoetsen voor het aanzetten van conversies van emoji annotaties of "
+"Unicode"
 
 #: ../setup/setup.ui.h:50
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emoji annotatie:"
 
 #: ../setup/setup.ui.h:51
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "De sneltoetsen voor het aanzetten van Unicode code punt conversies"
 
 #: ../setup/setup.ui.h:52
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode code punt:"
 
 #: ../setup/setup.ui.h:53
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "Stel een lettertype van Unicode kandidaten in op de emoji dialoog"
 
 #: ../setup/setup.ui.h:54
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode lettertype:"
 
 #: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -591,11 +593,11 @@ msgstr "Aangepaste lettertype naam voor taal-paneel"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Unicode sneltoetsen voor gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "De sneltoetsen voor het aan of uit zetten van Unicode typen"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -681,7 +683,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:67
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Laad de emoji data tijdens het opstarten"
 
 #: ../data/ibus.schemas.in.h:68
 msgid ""
@@ -689,10 +691,13 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Laad de emoji data tijden het opstarten indien waar. Er is ongeveer 10MB "
+"geheugen nodig om de data te laden. Laad de emoji data bij het openen van "
+"het begin van de emoji dialoog indien onwaar."
 
 #: ../data/ibus.schemas.in.h:69
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Laad de Unicode data tijdens het opstarten"
 
 #: ../data/ibus.schemas.in.h:70
 msgid ""
@@ -701,6 +706,10 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Laad de Unicode data tijden het opstarten indien waar. Er is ongeveer 15MB "
+"geheugen nodig om de data te laden. Laad de Unicode data bij het openen van "
+"het begin van de emoji dialoog indien onwaar. De Unicode data wordt altijd "
+"geladen na het laden van de emoji data zelfs bij waar. "
 
 #: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
@@ -2907,6 +2916,8 @@ msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Gebruik engine schemapaden in plaats van ibus core, welde door komma's "
+"gescheiden waardes kunnen zijn."
 
 #: ../tools/main.vala:381
 msgid "Resetting…"
@@ -3018,7 +3029,7 @@ msgstr "Toon emoji varianten"
 
 #: ../ui/gtk3/emojier.vala:1082
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: ../ui/gtk3/emojier.vala:1088
 msgid "Menu"
@@ -3026,7 +3037,7 @@ msgstr "Menu"
 
 #: ../ui/gtk3/emojier.vala:1099
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Klik om een waarschuwingsboodschap te bekijken"
 
 #: ../ui/gtk3/emojier.vala:1143
 msgid "Loading a Unicode dictionary:"
@@ -3081,6 +3092,10 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Het verkrijgen van de huidige teksttoepassing mislukte. Stel de focus op je "
+"toepassing opnieuw in. Bijvoorbeeld, druk meerdere keren op de Esc toets "
+"voor het vrijgeven van de emoji type modus, klik op je bureaublad en klik "
+"opnieuw op de teksttoepassing."
 
 #: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."

From fd9d4a927d91eb0c1349f001a4a773900357cbc7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 8 Aug 2018 15:41:41 +0900
Subject: [PATCH 502/816] Release 1.5.19

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8e01c2663..091e20f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [18])
+m4_define([ibus_micro_version], [19])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From aa0f4252ff965729b871c91b4ed089bf98963c0b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 10 Aug 2018 15:43:58 +0900
Subject: [PATCH 503/816] ui/gtk3: Check if gdk-wayland is installed

BUG=https://github.com/ibus/ibus/issues/2035
---
 configure.ac              | 10 ++++++++++
 ui/gtk3/Makefile.am       |  5 ++++-
 ui/gtk3/panelbinding.vala |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 091e20f2c..4b6a7a212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,12 +237,21 @@ if test x"$enable_gtk3" = x"yes"; then
     PKG_CHECK_MODULES(GTK3, [
         gtk+-3.0
     ])
+    PKG_CHECK_EXISTS([gdk-wayland-3.0],
+        [enable_gdk3_wayland=yes],
+        [enable_gdk3_wayland=no]
+    )
 
     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
 else
     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
+    enable_gdk3_wayland=no
+fi
+if test x"$enable_gdk3_wayland" != x"yes"; then
+    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
 fi
+AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"])
 
 if test x"$enable_xim" = x"yes"; then
     # Check for x11
@@ -785,6 +794,7 @@ Build options:
   Build gtk3 immodule           $enable_gtk3
   Build XIM agent server        $enable_xim
   Build wayland support         $enable_wayland
+  Build gdk3 wayland support    $enable_gdk3_wayland
   Build appindicator support    $enable_appindicator
   Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index aaba7a4d8..6ebc96ce8 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
 	--pkg=ibus-1.0 \
 	--pkg=config \
 	--pkg=xi \
-	--pkg=gdk-wayland \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
 AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
 endif
 
+if ENABLE_GDK3_WAYLAND
+AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
+endif
+
 libexec_PROGRAMS = ibus-ui-gtk3
 
 ibus_ui_gtk3_SOURCES = \
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 95115b138..981b55097 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService {
         GLib.Object(connection : bus.get_connection(),
                     object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
 
+#if USE_GDK_WAYLAND
         Type instance_type = Gdk.Display.get_default().get_type();
         Type wayland_type = typeof(GdkWayland.Display);
         m_is_wayland = instance_type.is_a(wayland_type);
+#else
+        m_is_wayland = false;
+        warning("Checking Wayland is disabled");
+#endif
 
         m_bus = bus;
         m_application = application;

From 7edaefdc1d80aefdbbc2dc52526c20715759da83 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 22 Aug 2018 17:20:53 +0900
Subject: [PATCH 504/816] ui/gtk3: Do not clear unicode data when emoji
 annotation lang is changed

---
 ui/gtk3/emojier.vala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 85dcdceba..637ae0490 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -440,13 +440,17 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         m_emoji_to_emoji_variants_dict =
                 new GLib.HashTable<string, GLib.SList<string>>(GLib.str_hash,
                                                                GLib.str_equal);
-        m_unicode_to_data_dict =
+        if (m_unicode_to_data_dict == null) {
+            m_unicode_to_data_dict =
                 new GLib.HashTable<unichar, IBus.UnicodeData>(
                         GLib.direct_hash,
                         GLib.direct_equal);
-        m_name_to_unicodes_dict =
+        }
+        if (m_name_to_unicodes_dict == null) {
+            m_name_to_unicodes_dict =
                 new GLib.HashTable<string, GLib.SList<unichar>>(GLib.str_hash,
                                                                 GLib.str_equal);
+        }
     }
 
 

From 28d22176aee6be97d88dd6c60fa5395c79563ec0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 30 Aug 2018 12:57:33 +0900
Subject: [PATCH 505/816] ui/gtk3: Fix SEGV when type ASCII on emojier

Emojier still included Gtk.Entry, accepted key events in Wayland,
reset the lookup table and it caused SEGV because IBus.Text
is NULL in the lookup table in Emojier.get_current_candidate().
Now Gtk.Entry is deleted completely.

BUG=rhbz#1618682
---
 ui/gtk3/emojier.vala | 139 +------------------------------------------
 1 file changed, 1 insertion(+), 138 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 637ae0490..0f4558006 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -283,7 +283,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
     private ThemedRGBA m_rgba;
     private Gtk.Box m_vbox;
-    private EEntry m_entry;
     /* If emojier is emoji category list or Unicode category list,
      * m_annotation is "" and preedit is also "".
      * If emojier is candidate mode, m_annotation is an annotation and
@@ -367,23 +366,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         m_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         add(m_vbox);
 
-        m_entry = new EEntry();
-        m_entry.set_placeholder_text(_("Type annotation or choose emoji"));
-        //m_vbox.add(m_entry);
-        m_entry.changed.connect(() => {
-            update_candidate_window();
-        });
-        m_entry.icon_release.connect((icon_pos, event) => {
-            hide_candidate_panel();
-        });
-
-        /* Set the accessible role of the label to a status bar so it
-         * will emit name changed events that can be used by screen
-         * readers.
-         */
-        Atk.Object obj = m_entry.get_accessible();
-        obj.set_role (Atk.Role.STATUSBAR);
-
         // The constructor of IBus.LookupTable does not support more than
         // 16 pages.
         m_lookup_table = new IBus.LookupTable(1, 0, true, true);
@@ -1806,18 +1788,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 m_lookup_table.cursor_up();
             else if (keyval == Gdk.Key.Right)
                 m_lookup_table.cursor_down();
-        } else if (m_entry.get_text().length > 0) {
-            int step = 0;
-            if (keyval == Gdk.Key.Left)
-                step = -1;
-            else if (keyval == Gdk.Key.Right)
-                step = 1;
-            GLib.Signal.emit_by_name(
-                    m_entry, "move-cursor",
-                    Gtk.MovementStep.VISUAL_POSITIONS,
-                    step,
-                    (modifiers & Gdk.ModifierType.SHIFT_MASK) != 0
-                            ? true : false);
         } else {
             // For Gdk.Key.f and Gdk.Key.b
             if (keyval == Gdk.Key.Left)
@@ -1880,20 +1850,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
             return true;
         }
-        if (m_entry.get_text().length > 0) {
-            int step = 0;
-            if (keyval == Gdk.Key.Home)
-                step = -1;
-            else if (keyval == Gdk.Key.End)
-                step = 1;
-            GLib.Signal.emit_by_name(
-                    m_entry, "move-cursor",
-                    Gtk.MovementStep.DISPLAY_LINE_ENDS,
-                    step,
-                    (modifiers & Gdk.ModifierType.SHIFT_MASK) != 0
-                            ? true : false);
-            return true;
-        }
         return category_list_cursor_move(keyval);
     }
 
@@ -1941,28 +1897,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private void entry_enter_keyval(uint keyval) {
-        unichar ch = IBus.keyval_to_unicode(keyval);
-        if (ch.iscntrl())
-            return;
-        string str = ch.to_string();
-
-        // what gtk_entry_commit_cb() do
-        if (m_entry.get_selection_bounds(null, null)) {
-            m_entry.delete_selection();
-        } else {
-            if (m_entry.get_overwrite_mode()) {
-               uint text_length = m_entry.get_buffer().get_length();
-               if (m_entry.cursor_position < text_length)
-                   m_entry.delete_from_cursor(Gtk.DeleteType.CHARS, 1);
-            }
-        }
-        int pos = m_entry.get_position();
-        m_entry.insert_text(str, -1, ref pos);
-        m_entry.set_position(pos);
-    }
-
-
     private Gdk.Rectangle get_monitor_geometry() {
         Gdk.Rectangle monitor_area = { 0, };
 
@@ -2245,10 +2179,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         /* Let gtk recalculate the window size. */
         resize(1, 1);
 
-        m_entry.set_text("");
-
         show_category_list();
-        m_entry.set_activates_default(true);
         show_all();
 
         /* Some window managers, e.g. MATE, GNOME, Plasma desktops,
@@ -2289,13 +2220,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         m_loop.run();
         m_loop = null;
 
-        // Need focus-out on Gtk.Entry to send the emoji to applications.
-        Gdk.Event fevent = new Gdk.Event(Gdk.EventType.FOCUS_CHANGE);
-        fevent.focus_change.in = 0;
-        fevent.focus_change.window  = get_window();
-        m_entry.send_focus_change(fevent);
-        fevent.focus_change.window  = null;
-
         hide();
         // Make sure the switcher is hidden before returning from this function.
         while (Gtk.events_pending())
@@ -2357,36 +2281,9 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 hide();
             }
             return true;
-        case Gdk.Key.BackSpace:
-            if (m_entry.get_text().length > 0) {
-                if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
-                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
-                                             Gtk.DeleteType.WORD_ENDS, -1);
-                } else {
-                    GLib.Signal.emit_by_name(m_entry, "backspace");
-                }
-                return true;
-            }
-            break;
-        case Gdk.Key.Delete:
-        case Gdk.Key.KP_Delete:
-            if (m_entry.get_text().length > 0) {
-                if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
-                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
-                                             Gtk.DeleteType.WORD_ENDS, 1);
-                } else {
-                    GLib.Signal.emit_by_name(m_entry, "delete-from-cursor",
-                                             Gtk.DeleteType.CHARS, 1);
-                }
-                return true;
-            }
-            break;
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
-            if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
-                if (m_entry.get_text().length > 0)
-                    entry_enter_keyval(keyval);
-            } else if (m_candidate_panel_is_visible) {
+            if (m_candidate_panel_is_visible) {
                 enter_notify_disable_with_timer();
                 m_lookup_table.cursor_down();
                 show_candidate_panel();
@@ -2436,10 +2333,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             key_press_cursor_home_end(Gdk.Key.End, modifiers);
             show_all();
             return true;
-        case Gdk.Key.Insert:
-        case Gdk.Key.KP_Insert:
-            GLib.Signal.emit_by_name(m_entry, "toggle-overwrite");
-            return true;
         }
 
         if ((modifiers & Gdk.ModifierType.CONTROL_MASK) != 0) {
@@ -2470,27 +2363,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 key_press_cursor_home_end(Gdk.Key.End, modifiers);
                 show_all();
                 return true;
-            case Gdk.Key.u:
-                if (m_entry.get_text().length > 0) {
-                    GLib.Signal.emit_by_name(m_entry,
-                                             "delete-from-cursor",
-                                             Gtk.DeleteType.PARAGRAPH_ENDS,
-                                             -1);
-                    return true;
-                }
-                break;
-            case Gdk.Key.a:
-                if (m_entry.get_text().length > 0) {
-                    m_entry.select_region(0, -1);
-                    return true;
-                }
-                break;
-            case Gdk.Key.x:
-                if (m_entry.get_text().length > 0) {
-                    GLib.Signal.emit_by_name(m_entry, "cut-clipboard");
-                    return true;
-                }
-                break;
             case Gdk.Key.C:
             case Gdk.Key.c:
                 if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
@@ -2503,19 +2375,11 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                         clipboard.store();
                         return true;
                     }
-                } else if (m_entry.get_text().length > 0) {
-                    GLib.Signal.emit_by_name(m_entry, "copy-clipboard");
-                    return true;
                 }
                 break;
-            case Gdk.Key.v:
-                GLib.Signal.emit_by_name(m_entry, "paste-clipboard");
-                return true;
             }
             return false;
         }
-
-        entry_enter_keyval(keyval);
         return true;
     }
 
@@ -2595,7 +2459,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
         uint32 timestamp = event.get_time();
         present_with_time(timestamp);
-        m_entry.set_activates_default(true);
     }
 
 

From e6badb494e0a31b7aca3a5078a5dc5b27b83390d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 30 Aug 2018 12:57:46 +0900
Subject: [PATCH 506/816] ui/gtk3: Support Shift-Space to insert a Space on
 Emojier preedit

Implemented Shift-Space on preedit since Shift-Space had worked on
Emojier's GtkEntry in the previous release.
---
 ui/gtk3/panelbinding.vala | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 981b55097..4ebff8dac 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -548,6 +548,19 @@ class PanelBinding : IBus.PanelService {
     }
 
 
+    private bool key_press_keyval(uint keyval) {
+        unichar ch = IBus.keyval_to_unicode(keyval);
+        if (ch.iscntrl())
+                return false;
+        string str = ch.to_string();
+        m_preedit.append_text(str);
+        string annotation = m_preedit.get_text();
+        m_emojier.set_annotation(annotation);
+        m_preedit.set_emoji("");
+        return true;
+    }
+
+
     private bool key_press_enter() {
         if (m_extension_name != "unicode" && is_emoji_lookup_table()) {
             // Check if variats exist
@@ -899,6 +912,12 @@ class PanelBinding : IBus.PanelService {
             break;
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
+            if ((modifiers & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                if (!key_press_keyval(keyval))
+                    return true;
+                show_candidate = is_emoji_lookup_table();
+                break;
+            }
             show_candidate = key_press_space();
             if (m_extension_name == "unicode") {
                 key_press_enter();
@@ -979,14 +998,8 @@ class PanelBinding : IBus.PanelService {
                 show_candidate = key_press_control_keyval(keyval, modifiers);
                 break;
             }
-            unichar ch = IBus.keyval_to_unicode(keyval);
-            if (ch.iscntrl())
+            if (!key_press_keyval(keyval))
                 return true;
-            string str = ch.to_string();
-            m_preedit.append_text(str);
-            string annotation = m_preedit.get_text();
-            m_emojier.set_annotation(annotation);
-            m_preedit.set_emoji("");
             show_candidate = is_emoji_lookup_table();
             break;
         }

From 809d880337e75b7cee429292a238bf53899bef6a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 30 Aug 2018 12:58:57 +0900
Subject: [PATCH 507/816] ui/gtk3: Do not move Emojier popup with the active
 candidate in Xorg

Probably I think it's not useful to change the popup position frequently.
The popup size is always slightly changed with the emoji annotation length.
---
 ui/gtk3/emojier.vala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 0f4558006..9811fde57 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1944,7 +1944,15 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             x = 0;
 
         bool changed = false;
-        if (window_right_bottom.y > monitor_bottom) {
+        // Do not up side down frequently.
+        // The first pos does not show the lookup table yet but the
+        // preedit only and the second pos shows the lookup table.
+        if (m_lookup_table.get_cursor_pos() != 1) {
+            if (m_is_up_side_down)
+                y = m_cursor_location.y - allocation.height;
+            else
+                y = cursor_right_bottom.y;
+        } else if (window_right_bottom.y > monitor_bottom) {
             y = m_cursor_location.y - allocation.height;
             // Do not up side down in Wayland
             if (m_input_context_path == "") {

From 1c6565e205528a45e88a84ba2a328f9035875c8d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 14 Sep 2018 16:15:41 +0900
Subject: [PATCH 508/816] ui/gtk3: Fix SEGV when commit an emoji on Emojier in
 Wayland

Just pressing Space key without emoji annotations can launch Emojier
popup and the popup takes a focus in Wayland and the chosen emoji is
output when the original text application gets the focus after Emojier
popup release the focus. Emojier disabled Ctrl-Shift-e after got the focus.
But currently GNOME Wayland has a bug not to send focus-in until a
key press or mouse click happens [1] and Emojier causes a SEGV.
Now Emojier disables Ctrl-Shift-e immediately when an emoji is chosen
whether focus-in comes or not and fixes the SEGV.

[1] https://gitlab.gnome.org/GNOME/gnome-shell/issues/573

BUG=rhbz#1625187
---
 ui/gtk3/emojier.vala      | 63 +++++++-------------------------------
 ui/gtk3/emojierapp.vala   |  2 +-
 ui/gtk3/panelbinding.vala | 64 ++++++++++++++++++++++++++-------------
 3 files changed, 55 insertions(+), 74 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 9811fde57..e23ef8892 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -21,17 +21,6 @@
  */
 
 public class IBusEmojier : Gtk.ApplicationWindow {
-    private class EEntry : Gtk.SearchEntry {
-        public EEntry() {
-            GLib.Object(
-                name : "IBusEmojierEntry",
-                margin_start : 6,
-                margin_end : 6,
-                margin_top : 6,
-                margin_bottom : 6
-            );
-        }
-    }
     private class EListBox : Gtk.ListBox {
         public EListBox() {
             GLib.Object(
@@ -330,6 +319,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private uint m_redraw_window_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
+    public signal void commit_text(string text);
 
     public IBusEmojier() {
         GLib.Object(
@@ -380,12 +370,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             adjust_window_position();
         });
 
-        candidate_clicked.connect((i, b, s) => {
-            if (m_input_context_path != "")
-                candidate_panel_select_index(i, b);
-        });
-
-
         if (m_annotation_to_emojis_dict == null) {
             reload_emoji_dict();
         }
@@ -1641,34 +1625,6 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    private void candidate_panel_select_index(uint index,
-                                              uint button) {
-        if (button == BUTTON_CLOSE_BUTTON) {
-            hide();
-            if (m_candidate_panel_mode &&
-                m_lookup_table.get_number_of_candidates() > 0) {
-                // Call remove_all_children() instead of show_category_list()
-                // so that show_category_list do not remove children with
-                // PageUp/PageDown.
-                remove_all_children();
-            }
-            m_result = "";
-            return;
-        }
-        string text = m_lookup_table.get_candidate(index).text;
-        unowned GLib.SList<string>? emojis =
-                m_emoji_to_emoji_variants_dict.lookup(text);
-        if (m_show_emoji_variant && emojis != null &&
-            m_backward_index < 0) {
-            show_emoji_variants(emojis);
-            show_all();
-        } else {
-            m_result = text;
-            hide();
-        }
-    }
-
-
     private void candidate_panel_cursor_down() {
         enter_notify_disable_with_timer();
         uint ncandidates = m_lookup_table.get_number_of_candidates();
@@ -1762,7 +1718,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    public bool has_variants(uint index) {
+    public bool has_variants(uint index,
+                             bool need_commit_signal) {
         if (index >= m_lookup_table.get_number_of_candidates())
             return false;
         string text = m_lookup_table.get_candidate(index).text;
@@ -1773,6 +1730,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             show_emoji_variants(emojis);
             return true;
         }
+        if (m_input_context_path != "")
+            m_result = text;
+        if (need_commit_signal)
+            commit_text(text);
         return false;
     }
 
@@ -1881,10 +1842,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
-    public bool key_press_enter() {
+    public bool key_press_enter(bool need_commit_signal) {
         if (m_candidate_panel_is_visible) {
             uint index = m_lookup_table.get_cursor_pos();
-            return has_variants(index);
+            return has_variants(index, need_commit_signal);
         } else if (m_category_active_index >= 0) {
             Gtk.ListBoxRow gtkrow = m_list_box.get_selected_row();
             EBoxRow row = gtkrow as EBoxRow;
@@ -2282,12 +2243,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             return true;
         case Gdk.Key.Return:
         case Gdk.Key.KP_Enter:
-            if (key_press_enter()) {
+            if (key_press_enter(true))
                 show_all();
-            } else {
-                m_result = get_current_candidate();
+            else
                 hide();
-            }
             return true;
         case Gdk.Key.space:
         case Gdk.Key.KP_Space:
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 787d448f3..fab99d9ee 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -65,7 +65,7 @@ public class EmojiApplication : Gtk.Application {
         uint ncandidates = m_emojier.get_number_of_candidates();
         if (ncandidates > 0 && ncandidates >= index) {
             m_emojier.set_cursor_pos(index);
-            show_candidate = m_emojier.has_variants(index);
+            show_candidate = m_emojier.has_variants(index, false);
         } else {
             return;
         }
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 4ebff8dac..01c43b0d1 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -447,13 +447,19 @@ class PanelBinding : IBus.PanelService {
     }
 
 
-    private void commit_text_update_favorites(IBus.Text text) {
+    private void commit_text_update_favorites(IBus.Text text,
+                                              bool      disable_extension) {
         commit_text(text);
-        IBus.ExtensionEvent event = new IBus.ExtensionEvent(
+
+        // If disable_extension is false, the extension event is already
+        // sent before the focus-in is received.
+        if (disable_extension) {
+            IBus.ExtensionEvent event = new IBus.ExtensionEvent(
                     "name", m_extension_name,
                     "is-enabled", false,
                     "is-extension", true);
-        panel_extension(event);
+            panel_extension(event);
+        }
         string committed_string = text.text;
         string preedit_string = m_preedit.get_text();
         m_preedit.hide();
@@ -482,7 +488,7 @@ class PanelBinding : IBus.PanelService {
             prev_context_path != "" &&
             prev_context_path == m_current_context_path) {
             IBus.Text text = new IBus.Text.from_string(selected_string);
-            commit_text_update_favorites(text);
+            commit_text_update_favorites(text, false);
             m_emojier.reset();
             return true;
         }
@@ -564,13 +570,13 @@ class PanelBinding : IBus.PanelService {
     private bool key_press_enter() {
         if (m_extension_name != "unicode" && is_emoji_lookup_table()) {
             // Check if variats exist
-            if (m_emojier.key_press_enter()) {
+            if (m_emojier.key_press_enter(false)) {
                 convert_preedit_text();
                 return true;
             }
         }
         IBus.Text text = m_preedit.get_commit_text();
-        commit_text_update_favorites(text);
+        commit_text_update_favorites(text, true);
         return false;
     }
 
@@ -712,15 +718,10 @@ class PanelBinding : IBus.PanelService {
     }
 
 
-    private bool is_visible_wayland_lookup_table() {
-        return m_wayland_lookup_table_is_visible;
-    }
-
-
     private void hide_emoji_lookup_table() {
         if (m_emojier == null)
             return;
-        if (m_is_wayland)
+        if (m_wayland_lookup_table_is_visible)
             hide_wayland_lookup_table();
         else
             m_emojier.hide();
@@ -747,7 +748,7 @@ class PanelBinding : IBus.PanelService {
 
     private bool is_emoji_lookup_table() {
         if (m_is_wayland)
-            return is_visible_wayland_lookup_table();
+            return m_wayland_lookup_table_is_visible;
         else
             return m_emojier.get_visible();
     }
@@ -788,7 +789,8 @@ class PanelBinding : IBus.PanelService {
          */
         if (!input_context_path.has_suffix("InputContext_1")) {
             m_real_current_context_path = m_current_context_path;
-            this.emojier_focus_commit();
+            if (m_is_wayland)
+                this.emojier_focus_commit();
         }
     }
 
@@ -822,8 +824,18 @@ class PanelBinding : IBus.PanelService {
             // For title handling in gnome-shell
             m_application.add_window(m_emojier);
             m_emojier.candidate_clicked.connect((i, b, s) => {
+                candidate_clicked_lookup_table_real(i, b, s, true);
+            });
+            m_emojier.commit_text.connect((s) => {
                 if (!m_is_wayland)
-                    candidate_clicked_lookup_table(i, b, s);
+                    return;
+                // Currently emojier has a focus but the text input focus
+                // does not and commit the text later.
+                IBus.ExtensionEvent close_event = new IBus.ExtensionEvent(
+                        "name", m_extension_name,
+                        "is-enabled", false,
+                        "is-extension", true);
+                panel_extension(close_event);
             });
         }
         m_emojier.reset();
@@ -1041,9 +1053,10 @@ class PanelBinding : IBus.PanelService {
         show_preedit_and_candidate(show_candidate);
     }
 
-    public override void candidate_clicked_lookup_table(uint index,
-                                                        uint button,
-                                                        uint state) {
+    private void candidate_clicked_lookup_table_real(uint index,
+                                                     uint button,
+                                                     uint state,
+                                                     bool is_emojier) {
         if (button == IBusEmojier.BUTTON_CLOSE_BUTTON) {
             m_enable_extension = false;
             hide_emoji_lookup_table();
@@ -1061,17 +1074,26 @@ class PanelBinding : IBus.PanelService {
         uint ncandidates = m_emojier.get_number_of_candidates();
         if (ncandidates > 0 && ncandidates >= index) {
             m_emojier.set_cursor_pos(index);
-            show_candidate = m_emojier.has_variants(index);
-            m_preedit.set_emoji(m_emojier.get_current_candidate());
+            bool need_commit_signal = m_is_wayland && is_emojier;
+            show_candidate = m_emojier.has_variants(index, need_commit_signal);
+            if (!m_is_wayland)
+                m_preedit.set_emoji(m_emojier.get_current_candidate());
         } else {
             return;
         }
         if (!show_candidate) {
             IBus.Text text = m_preedit.get_commit_text();
-            commit_text_update_favorites(text);
             hide_emoji_lookup_table();
+            if (!is_emojier || !m_is_wayland)
+                commit_text_update_favorites(text, true);
             return;
         }
         show_preedit_and_candidate(show_candidate);
     }
+
+    public override void candidate_clicked_lookup_table(uint index,
+                                                        uint button,
+                                                        uint state) {
+        candidate_clicked_lookup_table_real(index, button, state, false);
+    }
 }

From 6e315973f48574f7dcede1f1e8ca116e6a953ade Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 25 Sep 2018 15:42:20 +0900
Subject: [PATCH 509/816] ui/gtk3: Fix g_return_val_if_fail in
 ibus_emojier_clamp_page

BUG=https://github.com/ibus/ibus/issues/2042
---
 ui/gtk3/emojier.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index e23ef8892..0b9b54a93 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -810,7 +810,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         row.get_allocation(out alloc);
         var adjustment = m_scrolled_window.get_vadjustment();
         adjustment.clamp_page(alloc.y, alloc.y + alloc.height);
-        return_val_if_fail(m_category_active_index >= 0, false);
+        return_if_fail(m_category_active_index >= 0);
         m_lookup_table.set_cursor_pos((uint)m_category_active_index);
     }
 

From 41c866868a25ec00482a000a18ac1ff3af1c494c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 3 Oct 2018 16:30:26 +0900
Subject: [PATCH 510/816] src: Update translatable strings in ibusunicodegen.h

---
 src/ibusunicodegen.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
index c613b81b1..9952fe0a8 100644
--- a/src/ibusunicodegen.h
+++ b/src/ibusunicodegen.h
@@ -279,6 +279,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Cyrillic Extended-C"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Georgian Extended"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -835,10 +839,22 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Old Hungarian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Hanifi Rohingya"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Rumi Numeral Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Sogdian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Sogdian"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -911,6 +927,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Ahom"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Dogra"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -939,6 +959,14 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Masaram Gondi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Gunjala Gondi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Makasar"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -975,6 +1003,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Pahawh Hmong"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Medefaidrin"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1023,6 +1055,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Ancient Greek Musical Notation"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Mayan Numerals"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1051,6 +1087,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Adlam"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Indic Siyaq Numbers"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1107,6 +1147,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Supplemental Symbols and Pictographs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Chess Symbols"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */

From a8e8b694dcb52e4beb367dff1e8ecaaca4f63c00 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 3 Oct 2018 17:01:59 +0900
Subject: [PATCH 511/816] data/dconf: Delete dconf dependencies

gsettings-schema-convert has not worked with python3 since GConf
has been deprecated since 2011 so we cannot disable python2
in canse GConf is enabled.
I don't wish to maintain both ibus.schemas.in and
org.freedesktop.ibus.gschema.xml.in and now decide to delete
whole the GConf builds.
gsettings is now stable and can be used instead.
ibus-dconf will be deperecated in the near future.

BUG=https://bugzilla.gnome.org/show_bug.cgi?id=759334
---
 conf/Makefile.am                              |   9 +-
 configure.ac                                  |  29 ---
 data/Makefile.am                              |  25 +-
 data/dconf/Makefile.am                        |   6 -
 .../dconf/org.freedesktop.ibus.gschema.xml.in | 225 ++++++++++++++++++
 5 files changed, 227 insertions(+), 67 deletions(-)
 create mode 100644 data/dconf/org.freedesktop.ibus.gschema.xml.in

diff --git a/conf/Makefile.am b/conf/Makefile.am
index efa864990..26f6e2aba 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2018 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
@@ -20,12 +20,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 # USA
 
-if ENABLE_GCONF
-GCONF_DIR = \
-	gconf \
-	$(NULL)
-endif
-
 MEMCONF_DIR = \
 	memconf \
 	$(NULL)
@@ -38,7 +32,6 @@ endif
 
 SUBDIRS = \
 	$(DCONF_DIR) \
-	$(GCONF_DIR) \
 	$(MEMCONF_DIR) \
 	$(NULL)
 
diff --git a/configure.ac b/configure.ac
index 4b6a7a212..0e9337a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,33 +339,6 @@ PKG_CHECK_MODULES(DBUS, [
     dbus-1
 ])
 
-# --enable-gconf option.
-AC_ARG_ENABLE(gconf,
-    AS_HELP_STRING([--enable-gconf],
-                   [Use GConf code]),
-    [enable_gconf=$enableval],
-    [enable_gconf=no]
-)
-AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
-
-if test x"$enable_gconf" = x"yes"; then
-    # check gconf
-    PKG_CHECK_MODULES(GCONF,
-        [gconf-2.0 >= 2.12],
-    )
-
-    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-    if test x"$GCONFTOOL" = xno; then
-        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-    fi
-
-    AM_GCONF_SOURCE_2
-    # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
-else
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-    enable_gconf="no (disabled, use --enable-gconf to enable)"
-fi
-
 # --enable-memconf option.
 AC_ARG_ENABLE(memconf,
     AS_HELP_STRING([--enable-memconf],
@@ -771,7 +744,6 @@ bindings/Makefile
 bindings/pygobject/Makefile
 bindings/vala/Makefile
 conf/Makefile
-conf/gconf/Makefile
 conf/dconf/Makefile
 conf/memconf/Makefile
 tools/Makefile
@@ -798,7 +770,6 @@ Build options:
   Build appindicator support    $enable_appindicator
   Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library
-  Build gconf modules           $enable_gconf
   Build memconf modules         $enable_memconf
   Build dconf modules           $enable_dconf
   Build introspection           $found_introspection
diff --git a/data/Makefile.am b/data/Makefile.am
index d9d613fe5..2533f444c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2007-2018 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
@@ -30,27 +30,4 @@ if ENABLE_DCONF
 SUBDIRS += dconf
 endif
 
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = ibus.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schemas_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
-				--makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
-		done \
-	fi
-endif
-
-EXTRA_DIST = \
-	$(schemas_in_files) \
-	$(NULL)
-
-DISTCLEANFILES = \
-	$(schemas_DATA) \
-	$(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index 433d9937f..4ac1e3a60 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -34,11 +34,6 @@ dconfprofile_DATA = profile/ibus
 dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
 dconfdb_DATA = 00-upstream-settings
 
-org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
-	$(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
-		--schema-id "org.freedesktop.ibus" \
-		--output $@ $<
-
 00-upstream-settings: $(srcdir)/make-dconf-override-db.sh | $(gsettings_SCHEMAS)
 	@$(MKDIR_P) db
 	$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
@@ -75,7 +70,6 @@ CLEANFILES = \
     $(NULL)
 
 MAINTAINERCLEANFILES = \
-    $(gsettings_schemas_in_files) \
     00-upstream-settings \
     $(NULL)
 
diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml.in b/data/dconf/org.freedesktop.ibus.gschema.xml.in
new file mode 100644
index 000000000..cbe7118eb
--- /dev/null
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml.in
@@ -0,0 +1,225 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.freedesktop.ibus" path="/desktop/ibus/">
+    <child name="general" schema="org.freedesktop.ibus.general"/>
+    <child name="panel" schema="org.freedesktop.ibus.panel"/>
+  </schema>
+  <schema id="org.freedesktop.ibus.general" path="/desktop/ibus/general/">
+    <key name="preload-engines" type="as">
+      <default>[]</default>
+      <summary>Preload engines</summary>
+      <description>Preload engines during ibus starts up</description>
+    </key>
+    <key name="engines-order" type="as">
+      <default>[]</default>
+      <summary>Engines order</summary>
+      <description>Saved engines order in input method list</description>
+    </key>
+    <key name="switcher-delay-time" type="i">
+      <default>400</default>
+      <summary>Popup delay milliseconds for IME switcher window</summary>
+      <description>Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not show the window and switch prev/next engines.</description>
+    </key>
+    <key name="version" type="s">
+      <default>''</default>
+      <summary>Saved version number</summary>
+      <description>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.</description>
+    </key>
+    <key name="xkb-latin-layouts" type="as">
+      <default>[ 'ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua' ]</default>
+      <summary>Latin layouts which have no ASCII</summary>
+      <description>US layout is appended to the Latin layouts. variant can be omitted.</description>
+    </key>
+    <key name="use-xmodmap" type="b">
+      <default>true</default>
+      <summary>Use xmodmap</summary>
+      <description>Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched.</description>
+    </key>
+    <key name="use-system-keyboard-layout" type="b">
+      <default>false</default>
+      <summary>Use system keyboard layout</summary>
+      <description>Use system keyboard (XKB) layout</description>
+    </key>
+    <key name="embed-preedit-text" type="b">
+      <default>true</default>
+      <summary>Embed Preedit Text</summary>
+      <description>Embed Preedit Text in Application Window</description>
+    </key>
+    <key name="use-global-engine" type="b">
+      <default>true</default>
+      <summary>Use global input method</summary>
+      <description>Share the same input method among all applications</description>
+    </key>
+    <key name="enable-by-default" type="b">
+      <default>false</default>
+      <summary>Enable input method by default</summary>
+      <description>Enable input method by default when the application gets input focus</description>
+    </key>
+    <key name="dconf-preserve-name-prefixes" type="as">
+      <default>[ '/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul' ]</default>
+      <summary>DConf preserve name prefixes</summary>
+      <description>Prefixes of DConf keys to stop name conversion</description>
+    </key>
+    <child name="hotkey" schema="org.freedesktop.ibus.general.hotkey"/>
+  </schema>
+  <schema id="org.freedesktop.ibus.general.hotkey" path="/desktop/ibus/general/hotkey/">
+    <key name="trigger" type="as">
+      <default>[ 'Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R' ]</default>
+      <summary>Trigger shortcut keys</summary>
+      <description>The shortcut keys for turning input method on or off</description>
+    </key>
+    <key name="triggers" type="as">
+      <default>[ '&lt;Super&gt;space' ]</default>
+      <summary>Trigger shortcut keys for gtk_accelerator_parse</summary>
+      <description>The shortcut keys for turning input method on or off</description>
+    </key>
+    <key name="enable-unconditional" type="as">
+      <default>[]</default>
+      <summary>Enable shortcut keys</summary>
+      <description>The shortcut keys for turning input method on</description>
+    </key>
+    <key name="disable-unconditional" type="as">
+      <default>[]</default>
+      <summary>Disable shortcut keys</summary>
+      <description>The shortcut keys for turning input method off</description>
+    </key>
+    <key name="next-engine" type="as">
+      <default>[ 'Alt+Shift_L' ]</default>
+      <summary>Next engine shortcut keys</summary>
+      <description>The shortcut keys for switching to the next input method in the list</description>
+    </key>
+    <key name="next-engine-in-menu" type="as">
+      <default>[ 'Alt+Shift_L' ]</default>
+      <summary>Next engine shortcut keys</summary>
+      <description>The shortcut keys for switching to the next input method in the list</description>
+    </key>
+    <key name="prev-engine" type="as">
+      <default>[]</default>
+      <summary>Prev engine shortcut keys</summary>
+      <description>The shortcut keys for switching to the previous input method</description>
+    </key>
+    <key name="previous-engine" type="as">
+      <default>[]</default>
+      <summary>Prev engine shortcut keys</summary>
+      <description>The shortcut keys for switching to the previous input method</description>
+    </key>
+  </schema>
+  <schema id="org.freedesktop.ibus.panel" path="/desktop/ibus/panel/">
+    <key name="show" type="i">
+      <default>0</default>
+      <summary>Auto hide</summary>
+      <description>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</description>
+    </key>
+    <key name="x" type="i">
+      <default>-1</default>
+      <summary>Language panel position</summary>
+    </key>
+    <key name="y" type="i">
+      <default>-1</default>
+      <summary>Language panel position</summary>
+    </key>
+    <key name="follow-input-cursor-when-always-shown" type="b">
+      <default>false</default>
+      <summary>Follow the input cursor in case the panel is always shown</summary>
+      <description>If true, the panel follows the input cursor in case the panel is always shown. If false, the panel is shown at a fixed location.</description>
+    </key>
+    <key name="auto-hide-timeout" type="i">
+      <default>10000</default>
+      <summary>The milliseconds to show property panel</summary>
+      <description>The milliseconds to show property panel after focus-in or properties are changed.</description>
+    </key>
+    <key name="lookup-table-orientation" type="i">
+      <default>1</default>
+      <summary>Orientation of lookup table</summary>
+      <description>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</description>
+    </key>
+    <key name="show-icon-on-systray" type="b">
+      <default>true</default>
+      <summary>Show icon on system tray</summary>
+      <description>Show icon on system tray</description>
+    </key>
+    <key name="show-im-name" type="b">
+      <default>false</default>
+      <summary>Show input method name</summary>
+      <description>Show input method name on language bar</description>
+    </key>
+    <key name="xkb-icon-rgba" type="s">
+      <default>'#415099'</default>
+      <summary>RGBA value of XKB icon</summary>
+      <description>XKB icon shows the layout string and the string is rendered with the RGBA value. The RGBA value can be 1. a color name from X11, 2. a hex value in form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or percentage values in the range 0% to 100%, and 'a' is a floating point value in the range 0 to 1 of the alpha.</description>
+    </key>
+    <key name="property-icon-delay-time" type="i">
+      <default>500</default>
+      <summary>The milliseconds to show the panel icon for a property</summary>
+      <description>The milliseconds to show the panel icon from the engine icon to a property icon whenever engines are switched if the property is specified by the value of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the property icon is shown immediately.</description>
+    </key>
+    <key name="use-custom-font" type="b">
+      <default>false</default>
+      <summary>Use custom font</summary>
+      <description>Use custom font name for language panel</description>
+    </key>
+    <key name="custom-font" type="s">
+      <default>'Sans 10'</default>
+      <summary>Custom font</summary>
+      <description>Custom font name for language panel</description>
+    </key>
+    <child name="emoji" schema="org.freedesktop.ibus.panel.emoji"/>
+  </schema>
+  <schema id="org.freedesktop.ibus.panel.emoji" path="/desktop/ibus/panel/emoji/">
+    <key name="unicode-hotkey" type="as">
+      <default>[ '&lt;Control&gt;&lt;Shift&gt;u' ]</default>
+      <summary>Unicode shortcut keys for gtk_accelerator_parse</summary>
+      <description>The shortcut keys for turning Unicode typing on or off</description>
+    </key>
+    <key name="hotkey" type="as">
+      <default>[ '&lt;Control&gt;&lt;Shift&gt;e' ]</default>
+      <summary>Emoji shortcut keys for gtk_accelerator_parse</summary>
+      <description>The shortcut keys for turning emoji typing on or off</description>
+    </key>
+    <key name="font" type="s">
+      <default>'Monospace 16'</default>
+      <summary>Custom font</summary>
+      <description>Custom font name for emoji characters on emoji dialog</description>
+    </key>
+    <key name="lang" type="s">
+      <default>'en'</default>
+      <summary>Default language for emoji dictionary</summary>
+      <description>Choose a default language of emoji dictionaries on the emoji dialog. The value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict</description>
+    </key>
+    <key name="favorites" type="as">
+      <default>[]</default>
+      <summary>favorite emoji list on emoji dialog</summary>
+      <description>You can show the favorite emojis on emoji list if this list has any characters.</description>
+    </key>
+    <key name="favorite-annotations" type="as">
+      <default>[]</default>
+      <summary>favorite emoji annotation list on emoji dialog</summary>
+      <description>You can assign an annotation for a favorite emoji in this list.</description>
+    </key>
+    <key name="has-partial-match" type="b">
+      <default>false</default>
+      <summary>Whether emoji annotations can be match partially or not</summary>
+      <description>Whether emoji annotations can be matched with a partial string instead of the exact match or not.</description>
+    </key>
+    <key name="partial-match-length" type="i">
+      <default>3</default>
+      <summary>Match emoji annotations with the specified length</summary>
+      <description>Match emoji annotations partially with more than the specified number of characters instead of the exact match.</description>
+    </key>
+    <key name="partial-match-condition" type="i">
+      <default>0</default>
+      <summary>Choose a condition to match emoji annotations partially</summary>
+      <description>Choose one of the following conditions to match emoji annotations partially: 0 == Prefix match, 1 == Suffix match, 2 == Containing match</description>
+    </key>
+    <key name="load-emoji-at-startup" type="b">
+      <default>true</default>
+      <summary>Load the emoji data at the time of startup</summary>
+      <description>Load the emoji data at the time of startup if true. About 10MB memory is needed to load the data. Load the emoji data when open the emoji dialog at the beginning if false.</description>
+    </key>
+    <key name="load-unicode-at-startup" type="b">
+      <default>false</default>
+      <summary>Load the Unicode data at the time of startup</summary>
+      <description>Load the Unicode data at the time of startup if true. About 15MB memory is needed to load the data. Load the Unicode data when open the emoji dialog at the beginning if false. The Unicode data is always loaded after the emoji data is loaded even if true.</description>
+    </key>
+  </schema>
+</schemalist>

From 74a00cc93ba99367e175ad3d3415e585d453d17f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 16 Oct 2018 18:17:41 +0900
Subject: [PATCH 512/816] data/dconf: Rename
 org.freedesktop.ibus.gschema.xml[.in]

---
 data/dconf/Makefile.am                                     | 7 ++-----
 ...bus.gschema.xml.in => org.freedesktop.ibus.gschema.xml} | 0
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename data/dconf/{org.freedesktop.ibus.gschema.xml.in => org.freedesktop.ibus.gschema.xml} (100%)

diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index 4ac1e3a60..5360f033a 100644
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -21,12 +21,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 # USA
 
-gsettings_schemas_in_files = org.freedesktop.ibus.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
+gsettings_SCHEMAS = org.freedesktop.ibus.gschema.xml
 gsettingsconvertdir = $(datadir)/GConf/gsettings
 dist_gsettingsconvert_DATA = ibus.convert
 @GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
 
 dconfprofiledir = $(sysconfdir)/dconf/profile
 dconfprofile_DATA = profile/ibus
@@ -56,7 +54,7 @@ install-data-hook:
 	fi
 
 EXTRA_DIST = \
-    $(gsettings_schemas_in_files) \
+    $(gsettings_SCHEMAS) \
     $(man_5_in_files) \
     make-dconf-override-db.sh \
     profile/ibus \
@@ -64,7 +62,6 @@ EXTRA_DIST = \
     $(NULL)
 
 CLEANFILES = \
-    $(gsettings_SCHEMAS) \
     $(man_5_DATA) \
     $(man_5_files) \
     $(NULL)
diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml.in b/data/dconf/org.freedesktop.ibus.gschema.xml
similarity index 100%
rename from data/dconf/org.freedesktop.ibus.gschema.xml.in
rename to data/dconf/org.freedesktop.ibus.gschema.xml

From a6710817b3d29d6a522f108f96ffe64d2f5367fe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 16 Oct 2018 19:46:01 +0900
Subject: [PATCH 513/816] Gettext migration for gschema.xml file

https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
---
 bindings/vala/config.vapi                     |  2 +-
 configure.ac                                  |  9 ++-
 data/dconf/org.freedesktop.ibus.gschema.xml   |  2 +-
 po/Makevars                                   |  8 ++-
 po/POTFILES.in                                | 10 +--
 setup/Makefile.am                             | 14 ++--
 ...us-setup.desktop.in => ibus-setup.desktop} |  0
 src/ibusutil.c                                |  2 +-
 src/keyname-table.h                           | 70 +------------------
 tools/main.vala                               |  2 +-
 ui/gtk3/Makefile.am                           | 20 +++---
 ui/gtk3/application.vala                      |  3 +-
 ui/gtk3/emojierapp.vala                       |  3 +-
 ui/gtk3/extension.vala                        |  3 +-
 ...p.in.in => ibus-extension-gtk3.desktop.in} |  0
 ...sktop.in.in => ibus-ui-emojier.desktop.in} |  0
 16 files changed, 40 insertions(+), 108 deletions(-)
 rename setup/{ibus-setup.desktop.in => ibus-setup.desktop} (100%)
 rename ui/gtk3/{ibus-extension-gtk3.desktop.in.in => ibus-extension-gtk3.desktop.in} (100%)
 rename ui/gtk3/{ibus-ui-emojier.desktop.in.in => ibus-ui-emojier.desktop.in} (100%)

diff --git a/bindings/vala/config.vapi b/bindings/vala/config.vapi
index e3c43dfb9..45ab61b09 100644
--- a/bindings/vala/config.vapi
+++ b/bindings/vala/config.vapi
@@ -9,5 +9,5 @@ namespace Config
     public const string PKGDATADIR;
     public const string LIBEXECDIR;
     public const string GETTEXT_PACKAGE;
-    public const string GLIB_LOCALE_DIR;
+    public const string LOCALEDIR;
 }
diff --git a/configure.ac b/configure.ac
index 0e9337a7d..26a048c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,9 +111,8 @@ GETTEXT_PACKAGE=ibus10
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for out gettext translation domains.])
-GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR)
-GLIB_LOCALE_DIR=$localedir
-AC_SUBST(GLIB_LOCALE_DIR)
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir",
+                   [Define the location where the catalogs will be installed])
 
 # For dislpay date.
 m4_define(ibus_datedisplay,
@@ -131,14 +130,14 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
 # i18n stuff
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 # Define PACKAGE_VERSION_* variables.
 AM_DISABLE_STATIC
 AC_ISC_POSIX
 AC_HEADER_STDC
 LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
 
 # Check functions.
 AC_CHECK_FUNCS(daemon)
diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index cbe7118eb..8724a8ba6 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
   <schema id="org.freedesktop.ibus" path="/desktop/ibus/">
     <child name="general" schema="org.freedesktop.ibus.general"/>
diff --git a/po/Makevars b/po/Makevars
index 3e56bea1d..8cf0b78aa 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,9 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+# The last argument --keyword without keyword prevents xgettext from
+# extracting translatable strings from "Icon" in *.desktop files.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Name --keyword=Comment --keyword --add-comments
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
@@ -39,3 +41,7 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
+PO_DEPENDS_ON_POT = "no"
+DIST_DEPENDS_ON_UPDAE_PO = "no"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c81292d2b..b3b71e812 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
-[type: gettext/glade]setup/setup.ui
 bus/dbusimpl.c
 bus/engineproxy.c
 bus/inputcontext.c
 bus/panelproxy.c
-data/ibus.schemas.in
+data/dconf/org.freedesktop.ibus.gschema.xml
 ibus/__init__.py
 ibus/_config.py.in
 ibus/_gtk.py
@@ -36,9 +35,10 @@ setup/engineabout.py
 setup/enginecombobox.py
 setup/enginedialog.py
 setup/enginetreeview.py
-setup/ibus-setup.desktop.in
+setup/ibus-setup.desktop
 setup/keyboardshortcut.py
 setup/main.py
+setup/setup.ui
 src/ibusbus.c
 src/ibusconfig.c
 src/ibusemojigen.h
@@ -61,8 +61,8 @@ ui/gtk3/candidatepanel.vala
 ui/gtk3/emojier.vala
 ui/gtk3/emojierapp.vala
 ui/gtk3/handle.vala
-ui/gtk3/ibus-extension-gtk3.desktop.in.in
-ui/gtk3/ibus-ui-emojier.desktop.in.in
+ui/gtk3/ibus-extension-gtk3.desktop.in
+ui/gtk3/ibus-ui-emojier.desktop.in
 ui/gtk3/iconwidget.vala
 ui/gtk3/keybindingmanager.vala
 ui/gtk3/panel.vala
diff --git a/setup/Makefile.am b/setup/Makefile.am
index b7dd75548..17d80c512 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2017 Red Hat, Inc.
+# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2018 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
@@ -40,10 +40,8 @@ ibussetup_DATA = \
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
 
-desktop_in_files = ibus-setup.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA = ibus-setup.desktop
 desktopdir = $(datadir)/applications
-@INTLTOOL_DESKTOP_RULE@
 
 man_one_in_files = ibus-setup.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
@@ -67,11 +65,7 @@ EXTRA_DIST = \
 	$(man_one_in_files) \
 	ibus-setup.in \
 	setup.ui \
-	ibus-setup.desktop.in \
-	$(NULL)
-
-DISTCLEANFILES = \
-	$(desktop_DATA) \
+	ibus-setup.desktop \
 	$(NULL)
 
 test:
diff --git a/setup/ibus-setup.desktop.in b/setup/ibus-setup.desktop
similarity index 100%
rename from setup/ibus-setup.desktop.in
rename to setup/ibus-setup.desktop
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 3c6f92477..15e36f803 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -99,7 +99,7 @@ _load_lang()
     struct stat buf;
 
 #ifdef ENABLE_NLS
-    bindtextdomain ("iso_639", GLIB_LOCALE_DIR);
+    bindtextdomain ("iso_639", LOCALEDIR);
     bind_textdomain_codeset ("iso_639", "UTF-8");
 #endif
 
diff --git a/src/keyname-table.h b/src/keyname-table.h
index 5d1332263..f84ecdc3a 100644
--- a/src/keyname-table.h
+++ b/src/keyname-table.h
@@ -6830,6 +6830,9 @@ static const gdk_key gdk_keys_by_name[] = {
 #if 0
 
 /*
+ * xgettext extracts strings in '#if 0' against intltool and I deleted
+ * all the translatable strings here.
+ *
  * Translators, the strings in the “keyboard label” context are
  * display names for keyboard keys. Some of them have prefixes like
  * XF86 or ISO_ - these should be removed in the translation. Similarly,
@@ -6840,72 +6843,5 @@ static const gdk_key gdk_keys_by_name[] = {
  * Scroll_lock   - Scroll lock
  * KP_Space      - Space (keypad)
  */
-NC_("keyboard label", "BackSpace")
-NC_("keyboard label", "Tab")
-NC_("keyboard label", "Return")
-NC_("keyboard label", "Pause")
-NC_("keyboard label", "Scroll_Lock")
-NC_("keyboard label", "Sys_Req")
-NC_("keyboard label", "Escape")
-NC_("keyboard label", "Multi_key")
-NC_("keyboard label", "Home")
-NC_("keyboard label", "Left")
-NC_("keyboard label", "Up")
-NC_("keyboard label", "Right")
-NC_("keyboard label", "Down")
-NC_("keyboard label", "Page_Up")
-NC_("keyboard label", "Page_Down")
-NC_("keyboard label", "End")
-NC_("keyboard label", "Begin")
-NC_("keyboard label", "Print")
-NC_("keyboard label", "Insert")
-NC_("keyboard label", "Num_Lock")
-/* Translators: KP_ means 'key pad' here */
-NC_("keyboard label", "KP_Space")
-NC_("keyboard label", "KP_Tab")
-NC_("keyboard label", "KP_Enter")
-NC_("keyboard label", "KP_Home")
-NC_("keyboard label", "KP_Left")
-NC_("keyboard label", "KP_Up")
-NC_("keyboard label", "KP_Right")
-NC_("keyboard label", "KP_Down")
-NC_("keyboard label", "KP_Page_Up")
-NC_("keyboard label", "KP_Prior")
-NC_("keyboard label", "KP_Page_Down")
-NC_("keyboard label", "KP_Next")
-NC_("keyboard label", "KP_End")
-NC_("keyboard label", "KP_Begin")
-NC_("keyboard label", "KP_Insert")
-NC_("keyboard label", "KP_Delete")
-NC_("keyboard label", "Delete")
-NC_("keyboard label", "MonBrightnessUp")
-NC_("keyboard label", "MonBrightnessDown")
-NC_("keyboard label", "KbdBrightnessUp")
-NC_("keyboard label", "KbdBrightnessDown")
-NC_("keyboard label", "AudioMute")
-NC_("keyboard label", "AudioMicMute")
-NC_("keyboard label", "AudioLowerVolume")
-NC_("keyboard label", "AudioRaiseVolume")
-NC_("keyboard label", "AudioPlay")
-NC_("keyboard label", "AudioStop")
-NC_("keyboard label", "AudioNext")
-NC_("keyboard label", "AudioPrev")
-NC_("keyboard label", "AudioRecord")
-NC_("keyboard label", "AudioPause")
-NC_("keyboard label", "AudioRewind")
-NC_("keyboard label", "AudioMedia")
-NC_("keyboard label", "ScreenSaver")
-NC_("keyboard label", "Battery")
-NC_("keyboard label", "Launch1")
-NC_("keyboard label", "Forward")
-NC_("keyboard label", "Back")
-NC_("keyboard label", "Sleep")
-NC_("keyboard label", "Hibernate")
-NC_("keyboard label", "WLAN")
-NC_("keyboard label", "WebCam")
-NC_("keyboard label", "Display")
-NC_("keyboard label", "TouchpadToggle")
-NC_("keyboard label", "WakeUp")
-NC_("keyboard label", "Suspend")
 
 #endif
diff --git a/tools/main.vala b/tools/main.vala
index 6e201f300..bf9c0fc95 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -472,7 +472,7 @@ void print_usage(FileStream stream) {
 
 public int main(string[] argv) {
     GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
-    GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.GLIB_LOCALE_DIR);
+    GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
     GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
     GLib.Intl.textdomain(Config.GETTEXT_PACKAGE);
 
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 6ebc96ce8..e40971f13 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -165,8 +165,8 @@ EXTRA_DIST =                            \
     gtkpanel.xml.in                     \
     notification-item.xml               \
     notification-watcher.xml            \
-    ibus-ui-emojier.desktop.in.in       \
-    ibus-extension-gtk3.desktop.in.in   \
+    ibus-ui-emojier.desktop.in          \
+    ibus-extension-gtk3.desktop.in      \
     panelbinding.vala                   \
     $(NULL)
 
@@ -265,32 +265,32 @@ man_sevendir = $(mandir)/man7
 %.7.gz: %.7
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
-desktop_in_in_files = \
-    ibus-ui-emojier.desktop.in.in \
-    ibus-extension-gtk3.desktop.in.in \
+desktop_in_files = \
+    ibus-ui-emojier.desktop.in \
+    ibus-extension-gtk3.desktop.in \
     $(NULL)
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_notrans_files = $(desktop_in_files:.desktop.in=.desktop)
 desktop_DATA = \
     org.freedesktop.IBus.Panel.Emojier.desktop \
     org.freedesktop.IBus.Panel.Extension.Gtk3.desktop \
     $(NULL)
 desktopdir = $(datadir)/applications
-%.desktop.in: %.desktop.in.in
+%.desktop: %.desktop.in
 	$(AM_V_GEN) sed \
 		-e 's|^_Name=|Name=|g' \
 		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
                 mv $@.tmp $@
 	$(NULL)
-org.freedesktop.IBus.Panel.Emojier.desktop: ibus-ui-emojier.desktop.in
+org.freedesktop.IBus.Panel.Emojier.desktop: ibus-ui-emojier.desktop
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 	$(NULL)
-org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop.in
+org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 	$(NULL)
 
 CLEANFILES += \
     $(desktop_DATA) \
-    $(desktop_in_files) \
+    $(desktop_notrans_files) \
     $(man_seven_DATA) \
     $(man_seven_files) \
     $(NULL)
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index 806b4b224..cc9ee54c9 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -26,8 +26,7 @@ class Application {
     private Panel m_panel;
 
     public Application(string[] argv) {
-        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
-                                 Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
         GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         IBus.init();
         Gtk.init(ref argv);
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index fab99d9ee..e83319895 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -227,8 +227,7 @@ public class EmojiApplication : Gtk.Application {
 
 
     public static int main (string[] args) {
-        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
-                                 Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
         GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         GLib.Intl.textdomain(Config.GETTEXT_PACKAGE);
 
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index c729fd7e0..ea3cd4647 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -28,8 +28,7 @@ class ExtensionGtk : Gtk.Application {
     public ExtensionGtk(string[] args) {
         Object(application_id: "org.freedesktop.IBus.Panel.Extension.Gtk3",
                flags: ApplicationFlags.FLAGS_NONE);
-        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE,
-                                 Config.GLIB_LOCALE_DIR);
+        GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
         GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
         IBus.init();
         Gtk.init(ref args);
diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in.in b/ui/gtk3/ibus-extension-gtk3.desktop.in
similarity index 100%
rename from ui/gtk3/ibus-extension-gtk3.desktop.in.in
rename to ui/gtk3/ibus-extension-gtk3.desktop.in
diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in.in b/ui/gtk3/ibus-ui-emojier.desktop.in
similarity index 100%
rename from ui/gtk3/ibus-ui-emojier.desktop.in.in
rename to ui/gtk3/ibus-ui-emojier.desktop.in

From c1b55431c076dfa3fc26a3a998bfcf729e9ba602 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 26 Oct 2018 18:44:35 +0900
Subject: [PATCH 514/816] src/tests: Fix make check in Fedora 29

ibus-bus and ibus-compose failed in Fedora 29.

1. In ibus-bus with runtest, ibus-daemon failed to restart in
start_exit_async() because it seems to have conflicting IO with runtest
and ibus-daemon failed to close a file descriptor in _restart_server().
The solution is to add a sleep in start_exit_async().
Also added ibus_get_address() in test_async_apis_finish() to check
if ibus-daemon finished to restart.

2. In ibus-compose, the GTK application could not get the ibus module.
The solution is to export GTK_IM_MODULE=ibus.

3. Added DISABLE_DAEMONIZE_IN_TESTS to get error messages in ibus-daemon.
% make DISABLE_DAEMONIZE_IN_TESTS=1 check
---
 bus/Makefile.am       |  1 +
 src/tests/Makefile.am |  1 +
 src/tests/ibus-bus.c  | 15 ++++++++++++++-
 src/tests/runtest     | 24 +++++++++++++++++-------
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index bdae5c923..4383a8740 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -124,6 +124,7 @@ TESTS_ENVIRONMENT = \
     srcdir=$(srcdir) \
     LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$(top_builddir)/src" \
     DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
+    DISABLE_DAEMONIZE_IN_TESTS="$(DISABLE_DAEMONIZE_IN_TESTS)" \
     $(NULL)
 
 LOG_COMPILER = $(top_srcdir)/src/tests/runtest
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index c5fef3c86..e337a59b0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -73,6 +73,7 @@ TESTS_ENVIRONMENT = \
     srcdir=$(srcdir) \
     LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$(top_builddir)/src" \
     DISABLE_GUI_TESTS="$(DISABLE_GUI_TESTS)" \
+    DISABLE_DAEMONIZE_IN_TESTS="$(DISABLE_DAEMONIZE_IN_TESTS)" \
     $(NULL)
 
 LOG_COMPILER = $(srcdir)/runtest
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 7fa1bc4a1..0bf9e6129 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -820,6 +820,14 @@ finish_exit_async (GObject *source_object,
 static void
 start_exit_async (void)
 {
+    /* When `./runtest ibus-bus` runs, ibus-daemon sometimes failed to
+     * restart because closing a file descriptor was failed in
+     * bus/server.c:_restart_server() with a following error:
+     *     "inotify read(): Bad file descriptor"
+     * Now g_usleep() is added here to write down the buffer and not to
+     * fail to restart ibus-daemon.
+     */
+    g_usleep (G_USEC_PER_SEC);
     ibus_bus_exit_async (bus,
                          TRUE, /* restart */
                          -1, /* timeout */
@@ -831,6 +839,9 @@ start_exit_async (void)
 static gboolean
 test_async_apis_finish (gpointer user_data)
 {
+    /* INFO: g_warning() causes SEGV with runtest script */
+    if (ibus_get_address () == NULL)
+        g_warning ("ibus-daemon does not restart yet from start_exit_async().");
     ibus_quit ();
     return FALSE;
 }
@@ -906,7 +917,9 @@ call_next_async_function (void)
     };
     static guint index = 0;
 
-    // Use g_timeout_add to make sure test_async_apis finishes even if async_functions is empty.
+    /* Use g_timeout_add to make sure test_async_apis finishes even if
+     * async_functions is empty.
+     */
     if (index >= G_N_ELEMENTS (async_functions))
         g_timeout_add (1, test_async_apis_finish, NULL);
     else
diff --git a/src/tests/runtest b/src/tests/runtest
index d7f96ea36..ab39e9f28 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -22,6 +22,7 @@
 : ${builddir:=.}
 : ${srcdir:=.}
 : ${DISABLE_GUI_TESTS:=''}
+: ${DISABLE_DAEMONIZE_IN_TESTS:=''}
 
 BUS_REQUIRED_TESTS="
 ibus-bus
@@ -162,16 +163,25 @@ run_test_case()
         export GSETTINGS_SCHEMA_DIR=$PWD
 
         # Start ibus-daemon.
-        ../$top_builddir/bus/ibus-daemon \
-        --daemonize \
-        --cache=none \
-        --panel=disable \
-        --emoji-extension=disable \
-        --config=default \
-        --verbose;
+        DAEMON_ARGS='
+            --cache=none
+            --panel=disable
+            --emoji-extension=disable
+            --config=default
+            --verbose
+        '
+        if test x"$DISABLE_DAEMONIZE_IN_TESTS" = x ; then
+            ../$top_builddir/bus/ibus-daemon \
+                $DAEMON_ARGS --daemonize;
+        else
+            ../$top_builddir/bus/ibus-daemon \
+                $DAEMON_ARGS &
+        fi
 
         # Wait until all necessary components are up.
         sleep 1
+
+        export GTK_IM_MODULE=ibus
     fi
 
     "../$tst" ${1+"$@"}

From aa24a526dd7dec9a719e063fb35da90afb5dc5bf Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 26 Oct 2018 19:01:19 +0900
Subject: [PATCH 515/816] src/tests: Fix the location of
 org.freedesktop.ibus.gschema.xml

The location has been changed since xgettext migration.
---
 src/tests/runtest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/runtest b/src/tests/runtest
index ab39e9f28..4e980c712 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -103,8 +103,8 @@ for t in $DISABLE_GUI_TESTS; do
 done
 
 # IBusEngine has GSettings
-if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then
-    echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE"
+if test ! -f "$top_srcdir/data/dconf/$IBUS_SCHEMA_FILE" ; then
+    echo "NOT FOUND $top_srcdir/data/dconf/$IBUS_SCHEMA_FILE"
     exit -1
 fi
 
@@ -148,7 +148,7 @@ run_test_case()
         export GTK_IM_MODULE_FILE
         $GTK_QUERY_MODULE "$IM_IBUS_SO" > $GTK_IM_MODULE_FILE
 
-        cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
+        cp "../$top_srcdir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
         glib-compile-schemas $PWD
         if test $? -ne 0 ; then
             echo "FAILED glib-compile-schemas"

From 3914d3a2b1aeda8779b2d8a9d91088802530b3a9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 30 Oct 2018 11:54:52 +0900
Subject: [PATCH 516/816] data/dconf: Add comments in
 org.freedesktop.ibus.gschema.xml

---
 data/dconf/org.freedesktop.ibus.gschema.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 8724a8ba6..5938d3b8f 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -7,7 +7,9 @@
   <schema id="org.freedesktop.ibus.general" path="/desktop/ibus/general/">
     <key name="preload-engines" type="as">
       <default>[]</default>
+      <!-- Translators: Here “Preload” is a verb" -->
       <summary>Preload engines</summary>
+      <!-- Translators: Tooltip for the button “Preload Engines” -->
       <description>Preload engines during ibus starts up</description>
     </key>
     <key name="engines-order" type="as">

From b6086665bcf12914e6e1ac99b606dc6dee363f26 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 30 Oct 2018 11:57:19 +0900
Subject: [PATCH 517/816] data/dconf: Fix a typo

---
 data/dconf/org.freedesktop.ibus.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 5938d3b8f..7ae8f0f62 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -7,7 +7,7 @@
   <schema id="org.freedesktop.ibus.general" path="/desktop/ibus/general/">
     <key name="preload-engines" type="as">
       <default>[]</default>
-      <!-- Translators: Here “Preload” is a verb" -->
+      <!-- Translators: Here “Preload” is a verb -->
       <summary>Preload engines</summary>
       <!-- Translators: Tooltip for the button “Preload Engines” -->
       <description>Preload engines during ibus starts up</description>

From 3172c3b23faefe76b3b7adfc75f9be34a0fb2e02 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 31 Oct 2018 17:42:38 +0900
Subject: [PATCH 518/816] RHEL code reviews

---
 src/ibuskeymap.c          | 2 +-
 src/ibuspanelservice.c    | 6 +++++-
 src/tests/ibus-keypress.c | 2 +-
 util/IMdkit/FrameMgr.c    | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
index 27a56754b..5abfb99a7 100644
--- a/src/ibuskeymap.c
+++ b/src/ibuskeymap.c
@@ -143,7 +143,7 @@ ibus_keymap_parse_line (gchar  *str,
     /* Do not assign *p1 to g_ascii_isalpha() directly for the syntax check */
     if (i == 0 &&
         strncmp (p2, "addupper", sizeof ("addupper") - 1) == 0 &&
-        (ch = *p1) && g_ascii_isalpha (ch)) {
+        (ch = *p1) && (ch >= 0) && g_ascii_isalpha (ch)) {
         gchar buf[] = "a";
         buf[0] = g_ascii_toupper(ch);
         keymap[keycode][0] = keymap[keycode][3] = keysym;
diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
index 9d87e19bd..984cc890b 100644
--- a/src/ibuspanelservice.c
+++ b/src/ibuspanelservice.c
@@ -1615,7 +1615,11 @@ ibus_panel_service_panel_extension_register_keys (IBusPanelService   *panel,
     va_start (var_args, first_property_name);
     do {
         keys = va_arg (var_args, IBusProcessKeyEventData *);
-        g_return_if_fail (keys != NULL);
+        if (keys == NULL) {
+            va_end (var_args);
+            g_warning ("Failed to va_arg for IBusProcessKeyEventData");
+            return;
+        }
         g_variant_builder_init (&child, G_VARIANT_TYPE ("av"));
         for (; keys; keys++) {
             if (keys->keyval == 0 && keys->keycode == 0 && keys->state == 0)
diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
index 3486523b1..179202268 100644
--- a/src/tests/ibus-keypress.c
+++ b/src/tests/ibus-keypress.c
@@ -173,7 +173,7 @@ set_engine_cb (GObject      *object,
     IBusBus *bus = IBUS_BUS (object);
     GtkWidget *entry = GTK_WIDGET (data);
     GdkDisplay *display;
-    Display *xdisplay;
+    Display *xdisplay = NULL;
     GError *error = NULL;
     int i, j;
 
diff --git a/util/IMdkit/FrameMgr.c b/util/IMdkit/FrameMgr.c
index 084b88107..0e91b78ee 100644
--- a/util/IMdkit/FrameMgr.c
+++ b/util/IMdkit/FrameMgr.c
@@ -1414,6 +1414,7 @@ static int FrameInstGetSize (FrameInst fi)
 	    break;
         }
         /*endswitch*/
+        assert (i >= 0);
         i = _FrameInstIncrement (fi->template, i);
     }
     /*endwhile*/

From a40631e166137c9042a68c2d76844e7afc53d388 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 9 Nov 2018 14:49:44 +0900
Subject: [PATCH 519/816] Detect mouse click to commit Hangul preedit

If preedit text is not committed with the mouse click, preedit text
is moved to the new cursor position in Hangul typing.
Since set_cursor_location() is received before the reset() signal is
sent to ibus-daemon and commit_text() signal is received from
ibus-daemon, UpdatePreeditTextWithMode D-Bus method is newly added
and now ibus clients commit the preedit.

BUG=https://github.com/ibus/ibus/issues/1980
---
 bus/ibusimpl.c              |  11 ++++
 bus/inputcontext.c          | 108 ++++++++++++++++++++++++-------
 bus/inputcontext.h          |  19 +++++-
 client/gtk2/ibusimcontext.c |  95 +++++++++++++++++++++++++---
 src/ibusinputcontext.c      | 122 ++++++++++++++++++++++++++++++++----
 src/ibusinputcontext.h      |  27 +++++++-
 6 files changed, 338 insertions(+), 44 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 80f3acfbb..bbbb57702 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -815,6 +815,17 @@ bus_ibus_impl_set_focused_context (BusIBusImpl     *ibus,
             engine = bus_input_context_get_engine (ibus->focused_context);
             if (engine) {
                 g_object_ref (engine);
+                /* _ic_focus_in() can be called before _ic_focus_out() is
+                 * called under the async processes of two ibus clients.
+                 * E.g. gedit is a little slower v.s. a simple GtkTextView
+                 * application is the fastest when you click a Hangul
+                 * preedit text between the applications.
+                 * preedit will be committed with focus-out in the ibus client
+                 * likes ibus-im.so
+                 * so do not commit preedit here in focus-in event.
+                 */
+                bus_input_context_clear_preedit_text (ibus->focused_context,
+                                                      FALSE);
                 bus_input_context_set_engine (ibus->focused_context, NULL);
                 bus_input_context_set_emoji_extension (ibus->focused_context,
                                                        NULL);
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 4f98b849c..1b8e7adbb 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -73,6 +73,7 @@ struct _BusInputContext {
     guint     preedit_cursor_pos;
     gboolean  preedit_visible;
     guint     preedit_mode;
+    gboolean  client_commit_preedit;
 
     /* auxiliary text */
     IBusText *auxiliary_text;
@@ -212,6 +213,9 @@ static IBusPropList    *props_empty = NULL;
 static const gchar introspection_xml[] =
     "<node>"
     "  <interface name='org.freedesktop.IBus.InputContext'>"
+    /* properties */
+    "    <property name='ContentType' type='(uu)' access='write' />"
+    "    <property name='ClientCommitPreedit' type='(b)' access='write' />\n"
     /* methods */
     "    <method name='ProcessKeyEvent'>"
     "      <arg direction='in'  type='u' name='keyval' />"
@@ -273,6 +277,12 @@ static const gchar introspection_xml[] =
     "      <arg type='u' name='cursor_pos' />"
     "      <arg type='b' name='visible' />"
     "    </signal>"
+    "    <signal name='UpdatePreeditTextWithMode'>"
+    "      <arg type='v' name='text' />"
+    "      <arg type='u' name='cursor_pos' />"
+    "      <arg type='b' name='visible' />"
+    "      <arg type='u' name='mode' />"
+    "    </signal>"
     "    <signal name='ShowPreeditText'/>"
     "    <signal name='HidePreeditText'/>"
     "    <signal name='UpdateAuxiliaryText'>"
@@ -297,9 +307,6 @@ static const gchar introspection_xml[] =
     "    <signal name='UpdateProperty'>"
     "      <arg type='v' name='prop' />"
     "    </signal>"
-
-    /* properties */
-    "    <property name='ContentType' type='(uu)' access='write' />"
     "  </interface>"
     "</node>";
 
@@ -1069,6 +1076,12 @@ _ic_reset (BusInputContext       *context,
            GDBusMethodInvocation *invocation)
 {
     if (context->engine) {
+        if (context->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+            if (context->client_commit_preedit)
+               bus_input_context_clear_preedit_text (context, FALSE);
+            else
+               bus_input_context_clear_preedit_text (context, TRUE);
+        }
         bus_engine_proxy_reset (context->engine);
     }
     g_dbus_method_invocation_return_value (invocation, NULL);
@@ -1354,6 +1367,13 @@ _ic_set_content_type (BusInputContext *context,
     }
 }
 
+static void
+_ic_set_client_commit_preedit (BusInputContext *context,
+                               GVariant        *value)
+{
+    g_variant_get (value, "(b)", &context->client_commit_preedit);
+}
+
 static gboolean
 bus_input_context_service_set_property (IBusService     *service,
                                         GDBusConnection *connection,
@@ -1379,9 +1399,14 @@ bus_input_context_service_set_property (IBusService     *service,
     if (!bus_input_context_service_authorized_method (service, connection))
         return FALSE;
 
+    g_return_val_if_fail (BUS_IS_INPUT_CONTEXT (service), FALSE);
+
     if (g_strcmp0 (property_name, "ContentType") == 0) {
-        BusInputContext *context = (BusInputContext *) service;
-        _ic_set_content_type (context, value);
+        _ic_set_content_type (BUS_INPUT_CONTEXT (service), value);
+        return TRUE;
+    }
+    if (g_strcmp0 (property_name, "ClientCommitPreedit") == 0) {
+        _ic_set_client_commit_preedit (BUS_INPUT_CONTEXT (service), value);
         return TRUE;
     }
 
@@ -1453,22 +1478,44 @@ bus_input_context_focus_in (BusInputContext *context)
 
 /**
  * bus_input_context_clear_preedit_text:
+ * @context: A #BusInputContext
+ * @with_signal: %FALSE if the preedit is already updated in ibus clients
+ *               likes ibus-im.so. Otherwise %TRUE.
  *
- * Clear context->preedit_text. If the preedit mode is IBUS_ENGINE_PREEDIT_COMMIT, commit it before clearing.
+ * Clear context->preedit_text. If the preedit mode is
+ * IBUS_ENGINE_PREEDIT_COMMIT, commit it before clearing.
  */
-static void
-bus_input_context_clear_preedit_text (BusInputContext *context)
+void
+bus_input_context_clear_preedit_text (BusInputContext *context,
+                                      gboolean         with_signal)
 {
+    IBusText *preedit_text;
+    guint     preedit_mode;
+    gboolean  preedit_visible;
+
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    if (context->preedit_visible &&
-        context->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
-        bus_input_context_commit_text (context, context->preedit_text);
+    if (!with_signal) {
+        g_object_unref (context->preedit_text);
+        context->preedit_mode = IBUS_ENGINE_PREEDIT_CLEAR;
+        context->preedit_text = (IBusText *) g_object_ref_sink (text_empty);
+        context->preedit_cursor_pos = 0;
+        context->preedit_visible = FALSE;
+        return;
     }
 
-    /* always clear preedit text */
+    /* always clear preedit text to reset the cursor position in the
+     * client application before commit the preeit text. */
+    preedit_text = g_object_ref (context->preedit_text);
+    preedit_mode = context->preedit_mode;
+    preedit_visible = context->preedit_visible;
     bus_input_context_update_preedit_text (context,
         text_empty, 0, FALSE, IBUS_ENGINE_PREEDIT_CLEAR, TRUE);
+
+    if (preedit_visible && preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+        bus_input_context_commit_text (context, preedit_text);
+    }
+    g_object_unref (preedit_text);
 }
 
 void
@@ -1479,7 +1526,10 @@ bus_input_context_focus_out (BusInputContext *context)
     if (!context->has_focus)
         return;
 
-    bus_input_context_clear_preedit_text (context);
+    if (context->client_commit_preedit)
+        bus_input_context_clear_preedit_text (context, FALSE);
+    else
+        bus_input_context_clear_preedit_text (context, TRUE);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
     bus_input_context_update_lookup_table (context,
                                            lookup_table_empty,
@@ -2338,7 +2388,7 @@ bus_input_context_disable (BusInputContext *context)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    bus_input_context_clear_preedit_text (context);
+    bus_input_context_clear_preedit_text (context, TRUE);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
     bus_input_context_update_lookup_table (context,
                                            lookup_table_empty,
@@ -2385,7 +2435,7 @@ bus_input_context_unset_engine (BusInputContext *context)
 {
     g_assert (BUS_IS_INPUT_CONTEXT (context));
 
-    bus_input_context_clear_preedit_text (context);
+    bus_input_context_clear_preedit_text (context, TRUE);
     bus_input_context_update_auxiliary_text (context, text_empty, FALSE);
     bus_input_context_update_lookup_table (context,
                                            lookup_table_empty,
@@ -2807,14 +2857,26 @@ bus_input_context_update_preedit_text (BusInputContext *context,
     } else if (PREEDIT_CONDITION) {
         GVariant *variant = ibus_serializable_serialize (
                 (IBusSerializable *)context->preedit_text);
-        bus_input_context_emit_signal (context,
-                                       "UpdatePreeditText",
-                                       g_variant_new (
-                                               "(vub)",
-                                               variant,
-                                               context->preedit_cursor_pos,
-                                               extension_visible),
-                                       NULL);
+        if (context->client_commit_preedit) {
+            bus_input_context_emit_signal (
+                    context,
+                    "UpdatePreeditTextWithMode",
+                    g_variant_new ("(vubu)",
+                                   variant,
+                                   context->preedit_cursor_pos,
+                                   extension_visible,
+                                   context->preedit_mode),
+                    NULL);
+        } else {
+            bus_input_context_emit_signal (
+                    context,
+                    "UpdatePreeditText",
+                    g_variant_new ("(vub)",
+                                   variant,
+                                   context->preedit_cursor_pos,
+                                   extension_visible),
+                    NULL);
+        }
     } else {
         g_signal_emit (context,
                        context_signals[UPDATE_PREEDIT_TEXT],
diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index a46d5c062..7105fff87 100644
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2014 Red Hat, Inc.
+ * Copyright (C) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -377,5 +377,20 @@ void                 bus_input_context_update_lookup_table
 void                 bus_input_context_panel_extension_received
                                                 (BusInputContext    *context,
                                                  IBusExtensionEvent *event);
+
+/**
+ * bus_input_context_clear_preedit_text:
+ *
+ * Clear context->preedit_text. If the preedit mode is
+ * IBUS_ENGINE_PREEDIT_COMMIT and with_signal is %TRUE, commit it before
+ * clearing.
+ * If with_signal is %FALSE, this just clears the preedit coditions
+ * and the actual preedit is handled in ibus clients.
+ */
+void                 bus_input_context_clear_preedit_text
+                                                (BusInputContext    *context,
+                                                 gboolean
+                                                                   with_signal);
+
 G_END_DECLS
 #endif
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index e4de52d93..73a0eaec6 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2017 Red Hat, Inc.
+ * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -61,6 +61,7 @@ struct _IBusIMContext {
     PangoAttrList   *preedit_attrs;
     gint             preedit_cursor_pos;
     gboolean         preedit_visible;
+    guint            preedit_mode;
 
     GdkRectangle     cursor_area;
     gboolean         has_focus;
@@ -132,8 +133,14 @@ static void     ibus_im_context_set_surrounding
                                              gint           len,
                                              gint           cursor_index);
 
-
 /* static methods*/
+static void     _ibus_context_update_preedit_text_cb
+                                           (IBusInputContext   *ibuscontext,
+                                            IBusText           *text,
+                                            gint                cursor_pos,
+                                            gboolean            visible,
+                                            guint               mode,
+                                            IBusIMContext      *ibusimcontext);
 static void     _create_input_context       (IBusIMContext      *context);
 static gboolean _set_cursor_location_internal
                                             (IBusIMContext      *context);
@@ -744,6 +751,7 @@ ibus_im_context_init (GObject *obj)
     ibusimcontext->preedit_attrs = NULL;
     ibusimcontext->preedit_cursor_pos = 0;
     ibusimcontext->preedit_visible = FALSE;
+    ibusimcontext->preedit_mode = IBUS_ENGINE_PREEDIT_CLEAR;
 
     // Init cursor area
     ibusimcontext->cursor_area.x = -1;
@@ -854,6 +862,24 @@ ibus_im_context_finalize (GObject *obj)
     G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+static void
+ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
+{
+    g_assert (ibusimcontext->ibuscontext);
+    if (ibusimcontext->preedit_visible &&
+        ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+        gchar *preedit_string = g_strdup (ibusimcontext->preedit_string);
+        _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,
+                                              ibus_text_new_from_string (""),
+                                              0,
+                                              FALSE,
+                                              IBUS_ENGINE_PREEDIT_CLEAR,
+                                              ibusimcontext);
+        g_signal_emit (ibusimcontext, _signal_commit_id, 0, preedit_string);
+        g_free (preedit_string);
+    }
+}
+
 static gboolean
 ibus_im_context_filter_keypress (GtkIMContext *context,
                                  GdkEventKey  *event)
@@ -1003,6 +1029,7 @@ ibus_im_context_focus_out (GtkIMContext *context)
 
     ibusimcontext->has_focus = FALSE;
     if (ibusimcontext->ibuscontext) {
+        ibus_im_context_clear_preedit_text (ibusimcontext);
         ibus_input_context_focus_out (ibusimcontext->ibuscontext);
     }
 
@@ -1022,6 +1049,12 @@ ibus_im_context_reset (GtkIMContext *context)
     IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
 
     if (ibusimcontext->ibuscontext) {
+        /* Commented out ibus_im_context_clear_preedit_text().
+         * Hangul needs to receive the reset callback with button press
+         * but other IMEs should avoid to receive the reset callback
+         * so the signal would need to be customized with GtkSetting.
+         * IBus uses button-press-event instead.
+         */
         ibus_input_context_reset (ibusimcontext->ibuscontext);
     }
     gtk_im_context_reset (ibusimcontext->slave);
@@ -1068,21 +1101,67 @@ ibus_im_context_get_preedit_string (GtkIMContext   *context,
 }
 
 
+static gboolean
+ibus_im_context_button_press_event_cb (GtkWidget      *widget,
+                                       GdkEventButton *event,
+                                       IBusIMContext  *ibusimcontext)
+{
+    if (event->button != 1)
+        return FALSE;
+
+    if (ibusimcontext->preedit_visible &&
+        ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+        ibus_im_context_clear_preedit_text (ibusimcontext);
+        if (ibusimcontext->ibuscontext)
+            ibus_input_context_reset (ibusimcontext->ibuscontext);
+    }
+    return FALSE;
+}
+
 static void
 ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
 {
+    IBusIMContext *ibusimcontext;
+#if !GTK_CHECK_VERSION (3, 93, 0)
+    GtkWidget *widget;
+#endif
+
     IDEBUG ("%s", __FUNCTION__);
 
-    IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
+    ibusimcontext = IBUS_IM_CONTEXT (context);
 
     if (ibusimcontext->client_window) {
+#if !GTK_CHECK_VERSION (3, 93, 0)
+        gdk_window_get_user_data (ibusimcontext->client_window,
+                                  (gpointer *)&widget);
+        /* firefox needs GtkWidget instead of GtkWindow */
+        if (GTK_IS_WIDGET (widget)) {
+            g_signal_handlers_disconnect_by_func (
+                    widget,
+                    (GCallback)ibus_im_context_button_press_event_cb,
+                    ibusimcontext);
+        }
+#endif
         g_object_unref (ibusimcontext->client_window);
         ibusimcontext->client_window = NULL;
     }
 
-    if (client != NULL)
+    if (client != NULL) {
         ibusimcontext->client_window = g_object_ref (client);
+#if !GTK_CHECK_VERSION (3, 93, 0)
+        gdk_window_get_user_data (ibusimcontext->client_window,
+                                  (gpointer *)&widget);
 
+        /* firefox needs GtkWidget instead of GtkWindow */
+        if (GTK_IS_WIDGET (widget)) {
+            g_signal_connect (
+                    widget,
+                    "button-press-event",
+                    G_CALLBACK (ibus_im_context_button_press_event_cb),
+                    ibusimcontext);
+        }
+#endif
+    }
     if (ibusimcontext->slave)
         gtk_im_context_set_client_window (ibusimcontext->slave, client);
 }
@@ -1530,6 +1609,7 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
                                       IBusText          *text,
                                       gint               cursor_pos,
                                       gboolean           visible,
+                                      guint              mode,
                                       IBusIMContext     *ibusimcontext)
 {
     IDEBUG ("%s", __FUNCTION__);
@@ -1586,6 +1666,7 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
 
     flag = ibusimcontext->preedit_visible != visible;
     ibusimcontext->preedit_visible = visible;
+    ibusimcontext->preedit_mode = mode;
 
     if (ibusimcontext->preedit_visible) {
         if (flag) {
@@ -1676,7 +1757,7 @@ _create_input_context_done (IBusBus       *bus,
         g_error_free (error);
     }
     else {
-
+        ibus_input_context_set_client_commit_preedit (context, TRUE);
         ibusimcontext->ibuscontext = context;
 
         g_signal_connect (ibusimcontext->ibuscontext,
@@ -1692,7 +1773,7 @@ _create_input_context_done (IBusBus       *bus,
                           G_CALLBACK (_ibus_context_delete_surrounding_text_cb),
                           ibusimcontext);
         g_signal_connect (ibusimcontext->ibuscontext,
-                          "update-preedit-text",
+                          "update-preedit-text-with-mode",
                           G_CALLBACK (_ibus_context_update_preedit_text_cb),
                           ibusimcontext);
         g_signal_connect (ibusimcontext->ibuscontext,
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index ae7048ad9..a809ef08f 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -39,6 +40,7 @@ enum {
     FORWARD_KEY_EVENT,
     DELETE_SURROUNDING_TEXT,
     UPDATE_PREEDIT_TEXT,
+    UPDATE_PREEDIT_TEXT_WITH_MODE,
     SHOW_PREEDIT_TEXT,
     HIDE_PREEDIT_TEXT,
     UPDATE_AUXILIARY_TEXT,
@@ -217,6 +219,34 @@ ibus_input_context_class_init (IBusInputContextClass *class)
             G_TYPE_UINT,
             G_TYPE_BOOLEAN);
 
+    /**
+     * IBusInputContext::update-preedit-text-with-mode:
+     * @context: An IBusInputContext.
+     * @text: Text to be updated.
+     * @cursor_pos: Cursor position.
+     * @visible: Whether the update is visible.
+     * @mode: Preedit mode.
+     *
+     * Emitted to update preedit text with the mode.
+     *
+     * (Note: The text object is floating, and it will be released after the
+     *  signal. If signal handler wants to keep the object, the handler should
+     *  use g_object_ref_sink() to get the ownership of the object.)
+     */
+    context_signals[UPDATE_PREEDIT_TEXT_WITH_MODE] =
+        g_signal_new (I_("update-preedit-text-with-mode"),
+            G_TYPE_FROM_CLASS (class),
+            G_SIGNAL_RUN_LAST,
+            0,
+            NULL, NULL,
+            _ibus_marshal_VOID__OBJECT_UINT_BOOLEAN_UINT,
+            G_TYPE_NONE,
+            4,
+            IBUS_TYPE_TEXT,
+            G_TYPE_UINT,
+            G_TYPE_BOOLEAN,
+            G_TYPE_UINT);
+
     /**
      * IBusInputContext::show-preedit-text:
      * @context: An IBusInputContext.
@@ -542,6 +572,28 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
             g_object_unref (text);
         return;
     }
+    if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
+        GVariant *variant = NULL;
+        gint32 cursor_pos;
+        gboolean visible;
+        guint mode = 0;
+        g_variant_get (parameters,
+                       "(vubu)", &variant, &cursor_pos, &visible, &mode);
+        IBusText *text = IBUS_TEXT (ibus_serializable_deserialize (variant));
+        g_variant_unref (variant);
+
+        g_signal_emit (context,
+                       context_signals[UPDATE_PREEDIT_TEXT_WITH_MODE],
+                       0,
+                       text,
+                       cursor_pos,
+                       visible,
+                       mode);
+
+        if (g_object_is_floating (text))
+            g_object_unref (text);
+        return;
+    }
 
     /* lookup signal in table */
     gint i;
@@ -1043,10 +1095,11 @@ ibus_input_context_set_surrounding_text (IBusInputContext   *context,
                                          guint32             cursor_pos,
                                          guint32             anchor_pos)
 {
+    IBusInputContextPrivate *priv;
+
     g_assert (IBUS_IS_INPUT_CONTEXT (context));
     g_assert (IBUS_IS_TEXT (text));
 
-    IBusInputContextPrivate *priv;
     priv = IBUS_INPUT_CONTEXT_GET_PRIVATE (context);
 
     if (cursor_pos != priv->surrounding_cursor_pos ||
@@ -1090,12 +1143,15 @@ ibus_input_context_set_content_type (IBusInputContext *context,
                                      guint             purpose,
                                      guint             hints)
 {
+    GVariant *cached_content_type;
+    GVariant *content_type;
+
     g_assert (IBUS_IS_INPUT_CONTEXT (context));
 
-    GVariant *cached_content_type =
+    cached_content_type =
         g_dbus_proxy_get_cached_property ((GDBusProxy *) context,
                                           "ContentType");
-    GVariant *content_type = g_variant_new ("(uu)", purpose, hints);
+    content_type = g_variant_new ("(uu)", purpose, hints);
 
     g_variant_ref_sink (content_type);
     if (cached_content_type == NULL ||
@@ -1142,18 +1198,22 @@ ibus_input_context_get_engine_async_finish (IBusInputContext   *context,
                                             GAsyncResult       *res,
                                             GError            **error)
 {
+    GVariant *variant;
+    GVariant *engine_desc_variant;
+    IBusEngineDesc *desc;
+
     g_assert (IBUS_IS_INPUT_CONTEXT (context));
     g_assert (G_IS_ASYNC_RESULT (res));
     g_assert (error == NULL || *error == NULL);
 
-    GVariant *variant = g_dbus_proxy_call_finish ((GDBusProxy *) context,
-                                                   res, error);
+    variant = g_dbus_proxy_call_finish ((GDBusProxy *) context, res, error);
     if (variant == NULL) {
         return NULL;
     }
 
-    GVariant *engine_desc_variant = g_variant_get_child_value (variant, 0);
-    IBusEngineDesc *desc = IBUS_ENGINE_DESC (ibus_serializable_deserialize (engine_desc_variant));
+    engine_desc_variant = g_variant_get_child_value (variant, 0);
+    desc = IBUS_ENGINE_DESC (
+            ibus_serializable_deserialize (engine_desc_variant));
     g_variant_unref (engine_desc_variant);
     g_variant_unref (variant);
 
@@ -1163,9 +1223,13 @@ ibus_input_context_get_engine_async_finish (IBusInputContext   *context,
 IBusEngineDesc *
 ibus_input_context_get_engine (IBusInputContext *context)
 {
-    g_assert (IBUS_IS_INPUT_CONTEXT (context));
     GVariant *result = NULL;
     GError *error = NULL;
+    GVariant *engine_desc_variant;
+    IBusEngineDesc *desc;
+
+    g_assert (IBUS_IS_INPUT_CONTEXT (context));
+
     result = g_dbus_proxy_call_sync ((GDBusProxy *) context,
                                      "GetEngine",               /* method_name */
                                      NULL,                      /* parameters */
@@ -1189,8 +1253,9 @@ ibus_input_context_get_engine (IBusInputContext *context)
         return NULL;
     }
 
-    GVariant *engine_desc_variant = g_variant_get_child_value (result, 0);
-    IBusEngineDesc *desc = IBUS_ENGINE_DESC (ibus_serializable_deserialize (engine_desc_variant));
+    engine_desc_variant = g_variant_get_child_value (result, 0);
+    desc = IBUS_ENGINE_DESC (
+            ibus_serializable_deserialize (engine_desc_variant));
     g_variant_unref (engine_desc_variant);
     g_variant_unref (result);
 
@@ -1214,6 +1279,41 @@ ibus_input_context_set_engine (IBusInputContext *context,
                        );
 }
 
+void
+ibus_input_context_set_client_commit_preedit (IBusInputContext *context,
+                                              gboolean          client_commit)
+{
+    GVariant *cached_content_type;
+    GVariant *var_client_commit;
+
+    g_assert (IBUS_IS_INPUT_CONTEXT (context));
+
+    cached_content_type =
+        g_dbus_proxy_get_cached_property ((GDBusProxy *) context,
+                                          "ClientCommitPreedit");
+    var_client_commit = g_variant_new ("(b)", client_commit);
+
+    g_variant_ref_sink (var_client_commit);
+    if (cached_content_type == NULL) {
+        g_dbus_proxy_call ((GDBusProxy *) context,
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new ("(ssv)",
+                                          IBUS_INTERFACE_INPUT_CONTEXT,
+                                          "ClientCommitPreedit",
+                                          var_client_commit),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           NULL, /* cancellable */
+                           NULL, /* callback */
+                           NULL  /* user_data */
+                           );
+    }
+
+    if (cached_content_type != NULL)
+        g_variant_unref (cached_content_type);
+    g_variant_unref (var_client_commit);
+}
+
 #define DEFINE_FUNC(name, Name)                                         \
     void                                                                \
     ibus_input_context_##name (IBusInputContext *context)               \
diff --git a/src/ibusinputcontext.h b/src/ibusinputcontext.h
index a77cf92f3..099921489 100644
--- a/src/ibusinputcontext.h
+++ b/src/ibusinputcontext.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -498,5 +499,29 @@ void         ibus_input_context_set_content_type
                                              guint               purpose,
                                              guint               hints);
 
+/**
+ * ibus_input_context_set_client_commit_preedit:
+ * @context: An #IBusInputContext.
+ * @client_commit: %TRUE if your input context commits pre-edit texts
+ *     with Space or Enter key events or mouse click events. %FALSE if
+ *     ibus-daemon commits pre-edit texts with those events.
+ *     The default is %FALSE. The behavior is decided with
+ *     ibus_engine_update_preedit_text_with_mode() to commit, clear or
+ *     keep the pre-edit text and this API is important in ibus-hangul.
+ *
+ * Set whether #IBusInputContext commits pre-edit texts or not.
+ * If %TRUE, 'update-preedit-text-with-mode' signal is emitted
+ * instead of 'update-preedit-text' signal.
+ * If your client receives the 'update-preedit-text-with-mode' signal,
+ * the client needs to implement commit_text() of pre-edit text when
+ * GtkIMContextClass.focus_out() is called in case an IME desires that
+ * behavior but it depends on each IME.
+ *
+ * See also ibus_engine_update_preedit_text_with_mode().
+ */
+void         ibus_input_context_set_client_commit_preedit (
+                                             IBusInputContext   *context,
+                                             gboolean            client_commit);
+
 G_END_DECLS
 #endif

From 7b3b8c8b0c6a41ab524e0be9474825da9cba96ac Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 13 Nov 2018 14:27:52 +0900
Subject: [PATCH 520/816] client/gtk2: Do not delete IBUS_CAP_SURROUNDING_TEXT

retrieve-surrounding signal could be failed with the first typing
on firefox. It could be a bug in firefox but now IBusIMContext does not
delete IBUS_CAP_SURROUNDING_TEXT in the capabilities as a workaround
when retrieve-surrounding signal is failed.
Also added retrieve-surrounding signal after some committing text.

BUG=https://github.com/ibus/ibus/issues/2054
---
 client/gtk2/ibusimcontext.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 73a0eaec6..82af51a1b 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -298,6 +298,7 @@ ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
         IBusText *text = ibus_text_new_from_unichar (ch);
         g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
         g_object_unref (text);
+        _request_surrounding_text (ibusimcontext);
         return TRUE;
     }
    return FALSE;
@@ -386,9 +387,12 @@ _request_surrounding_text (IBusIMContext *context)
         g_signal_emit (context, _signal_retrieve_surrounding_id, 0,
                        &return_value);
         if (!return_value) {
-            context->caps &= ~IBUS_CAP_SURROUNDING_TEXT;
-            ibus_input_context_set_capabilities (context->ibuscontext,
-                                                 context->caps);
+            /* #2054 firefox::IMContextWrapper::GetCurrentParagraph() could
+             * fail with the first typing on firefox but it succeeds with
+             * the second typing.
+             */
+            g_warning ("%s has no capability of surrounding-text feature",
+                       g_get_prgname ());
         }
     }
 }
@@ -877,6 +881,7 @@ ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
                                               ibusimcontext);
         g_signal_emit (ibusimcontext, _signal_commit_id, 0, preedit_string);
         g_free (preedit_string);
+        _request_surrounding_text (ibusimcontext);
     }
 }
 

From 639960a827811200caaccb5afaee7d7b133e4876 Mon Sep 17 00:00:00 2001
From: ZhaoQiang <zhaoqiang@gnome.org>
Date: Mon, 3 Dec 2018 18:11:32 +0900
Subject: [PATCH 521/816] src: Fix typos in comment lines

BUG=https://github.com/ibus/ibus/pull/2059
---
 src/ibusbus.c          | 2 +-
 src/ibushotkey.c       | 2 +-
 src/ibusserializable.c | 2 +-
 src/ibusservice.c      | 2 +-
 src/tests/ibus-bus.c   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index 30c2e3213..090548514 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -970,7 +970,7 @@ ibus_bus_create_input_context_async (IBusBus            *bus,
     task = g_task_new (bus, cancellable, callback, user_data);
     g_task_set_source_tag (task, ibus_bus_create_input_context_async);
 
-    /* do not use ibus_bus_call_async, instread use g_dbus_connection_call
+    /* do not use ibus_bus_call_async, instead use g_dbus_connection_call
      * directly, because we need two async steps for create an IBusInputContext.
      * 1. Call CreateInputContext to request ibus-daemon create a remote IC.
      * 2. New local IBusInputContext proxy of the remote IC
diff --git a/src/ibushotkey.c b/src/ibushotkey.c
index 00d502fc0..249ed5d21 100644
--- a/src/ibushotkey.c
+++ b/src/ibushotkey.c
@@ -151,7 +151,7 @@ ibus_hotkey_profile_get_type (void)
         (GBaseInitFunc)     NULL,
         (GBaseFinalizeFunc) NULL,
         (GClassInitFunc)    ibus_hotkey_profile_class_init,
-        NULL,               /* class finialize */
+        NULL,               /* class finalize */
         NULL,               /* class data */
         sizeof (IBusHotkeyProfile),
         0,
diff --git a/src/ibusserializable.c b/src/ibusserializable.c
index a377b6139..a8d4dd65c 100644
--- a/src/ibusserializable.c
+++ b/src/ibusserializable.c
@@ -61,7 +61,7 @@ ibus_serializable_get_type (void)
         (GBaseInitFunc)     ibus_serializable_base_init,
         (GBaseFinalizeFunc) ibus_serializable_base_fini,
         (GClassInitFunc)    ibus_serializable_class_init,
-        NULL,               /* class finialize */
+        NULL,               /* class finalize */
         NULL,               /* class data */
         sizeof (IBusSerializable),
         0,
diff --git a/src/ibusservice.c b/src/ibusservice.c
index 8023527b1..eb370e8ba 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -144,7 +144,7 @@ ibus_service_get_type (void)
         (GBaseInitFunc)     ibus_service_base_init,
         (GBaseFinalizeFunc) ibus_service_base_fini,
         (GClassInitFunc)    ibus_service_class_init,
-        NULL,               /* class finialize */
+        NULL,               /* class finalize */
         NULL,               /* class data */
         sizeof (IBusService),
         0,
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 0bf9e6129..24b151e3e 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -310,7 +310,7 @@ test_create_input_context_async (void)
     g_main_loop_run (loop);
     g_main_loop_unref (loop);
 
-    /* ceate four IC, and cancel two */
+    /* create four IC, and cancel two */
     create_input_context_count = 4;
     loop = g_main_loop_new (NULL, TRUE);
     cancellable = g_cancellable_new ();

From 4c40afba9c862b4f6651b1b971553e5e89e83343 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Dec 2018 16:53:57 +0900
Subject: [PATCH 522/816] client/gtk2: Always reset and clear preedit on mouse
 click

Thinking about the reset signal again, now I think it's good to emit
the reset signal and clear the preedit on mouse click for any engines
besides Hangul because the behavior could be handled by each engine
with the reset signal.

BUG=https://github.com/ibus/ibus/issues/1980
---
 client/gtk2/ibusimcontext.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 82af51a1b..ed7fea6e6 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -869,16 +869,19 @@ ibus_im_context_finalize (GObject *obj)
 static void
 ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
 {
+    gchar *preedit_string = NULL;
     g_assert (ibusimcontext->ibuscontext);
     if (ibusimcontext->preedit_visible &&
         ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
-        gchar *preedit_string = g_strdup (ibusimcontext->preedit_string);
-        _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,
-                                              ibus_text_new_from_string (""),
-                                              0,
-                                              FALSE,
-                                              IBUS_ENGINE_PREEDIT_CLEAR,
-                                              ibusimcontext);
+        preedit_string = g_strdup (ibusimcontext->preedit_string);
+    }
+    _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,
+                                          ibus_text_new_from_string (""),
+                                          0,
+                                          FALSE,
+                                          IBUS_ENGINE_PREEDIT_CLEAR,
+                                          ibusimcontext);
+    if (preedit_string) {
         g_signal_emit (ibusimcontext, _signal_commit_id, 0, preedit_string);
         g_free (preedit_string);
         _request_surrounding_text (ibusimcontext);
@@ -1114,12 +1117,9 @@ ibus_im_context_button_press_event_cb (GtkWidget      *widget,
     if (event->button != 1)
         return FALSE;
 
-    if (ibusimcontext->preedit_visible &&
-        ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
-        ibus_im_context_clear_preedit_text (ibusimcontext);
-        if (ibusimcontext->ibuscontext)
-            ibus_input_context_reset (ibusimcontext->ibuscontext);
-    }
+    ibus_im_context_clear_preedit_text (ibusimcontext);
+    if (ibusimcontext->ibuscontext)
+        ibus_input_context_reset (ibusimcontext->ibuscontext);
     return FALSE;
 }
 

From ba41173c45a4ba6e047f94ac53474433c7643591 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 7 Dec 2018 17:38:09 +0900
Subject: [PATCH 523/816] src: Show compose preedit with custom compose file

IBusEngineSimple is fixed for custom compose files
 - Show preeedit with custom compose file
 - Tentative compose preedit can be deleted by Backspace

BUG=https://github.com/ibus/ibus/issues/2058
---
 src/ibusenginesimple.c | 93 ++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index aae6b8df1..ba9d92b67 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -357,7 +357,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
     } else {
         int hexchars = 0;
         while (priv->compose_buffer[hexchars] != 0) {
-            guint16 keysym= priv->compose_buffer[hexchars];
+            guint16 keysym = priv->compose_buffer[hexchars];
             gunichar unichar = ibus_keysym_to_unicode (keysym, FALSE);
             if (unichar > 0)
                 outbuf[len] = unichar;
@@ -620,6 +620,8 @@ check_table (IBusEngineSimple       *simple,
 
     guint16 *prev_seq;
 
+    priv->tentative_match = 0;
+    priv->tentative_match_len = 0;
     /* Back up to the first sequence that matches to make sure
      * we find the exact match if their is one.
      */
@@ -654,9 +656,9 @@ check_table (IBusEngineSimple       *simple,
 
         ibus_engine_simple_commit_char (simple, value);
         priv->compose_buffer[0] = 0;
-        ibus_engine_simple_update_preedit_text (simple);
         // g_debug ("U+%04X\n", value);
     }
+    ibus_engine_simple_update_preedit_text (simple);
     return TRUE;
 }
 
@@ -1057,6 +1059,51 @@ ibus_engine_simple_set_number_on_lookup_table (IBusEngineSimple *simple,
     ibus_engine_simple_update_preedit_text (simple);
 }
 
+static gboolean
+ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
+                                            gint              n_compose)
+{
+    IBusEngineSimplePrivate *priv = simple->priv;
+    gboolean compose_finish;
+    gunichar output_char;
+    GSList *list = global_tables;
+
+    while (list) {
+        if (check_table (simple,
+            (IBusComposeTable *)list->data,
+            n_compose)) {
+            return TRUE;
+        }
+        list = list->next;
+    }
+
+    if (ibus_check_compact_table (&ibus_compose_table_compact,
+                                  priv->compose_buffer,
+                                  n_compose,
+                                  &compose_finish,
+                                  &output_char)) {
+        if (compose_finish) {
+            ibus_engine_simple_commit_char (simple, output_char);
+            priv->compose_buffer[0] = 0;
+        }
+        ibus_engine_simple_update_preedit_text (simple);
+        return TRUE;
+    }
+
+    if (ibus_check_algorithmically (priv->compose_buffer,
+                                    n_compose,
+                                    &output_char)) {
+        if (output_char) {
+            ibus_engine_simple_commit_char (simple, output_char);
+            priv->compose_buffer[0] = 0;
+        }
+        ibus_engine_simple_update_preedit_text (simple);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static gboolean
 ibus_engine_simple_process_key_event (IBusEngine *engine,
                                       guint       keyval,
@@ -1076,8 +1123,6 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     guint hex_keyval;
     guint printable_keyval;
     gint i;
-    gboolean compose_finish;
-    gunichar output_char;
 
     while (n_compose < EMOJI_SOURCE_LEN && priv->compose_buffer[n_compose] != 0)
         n_compose++;
@@ -1247,7 +1292,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         if (n_compose > 0) {
             n_compose--;
             priv->compose_buffer[n_compose] = 0;
-            ibus_engine_simple_update_preedit_text (simple);
+            priv->tentative_match = 0;
+            ibus_engine_simple_check_all_compose_table (simple, n_compose);
             return TRUE;
         }
     }
@@ -1479,42 +1525,9 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
             return TRUE;
         }
-    }
-    else {
-        GSList *list = global_tables;
-        while (list) {
-            if (check_table (simple,
-                             (IBusComposeTable *)list->data,
-                             n_compose)) {
-                // g_debug("check_table returns true");
-                return TRUE;
-            }
-            list = list->next;
-        }
-
-        if (ibus_check_compact_table (&ibus_compose_table_compact,
-                                      priv->compose_buffer,
-                                      n_compose,
-                                      &compose_finish,
-                                      &output_char)) {
-            if (compose_finish) {
-                ibus_engine_simple_commit_char (simple, output_char);
-                priv->compose_buffer[0] = 0;
-            }
-            ibus_engine_simple_update_preedit_text (simple);
-            return TRUE;
-        }
-
-        if (ibus_check_algorithmically (priv->compose_buffer,
-                                        n_compose,
-                                        &output_char)) {
-            if (output_char) {
-                ibus_engine_simple_commit_char (simple, output_char);
-                priv->compose_buffer[0] = 0;
-            }
-            ibus_engine_simple_update_preedit_text (simple);
+    } else {
+        if (ibus_engine_simple_check_all_compose_table (simple, n_compose))
             return TRUE;
-        }
     }
 
     /* The current compose_buffer doesn't match anything */

From 28b0744ad141bd76281025e9d0857d2182bc2a65 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 10 Dec 2018 13:21:42 +0900
Subject: [PATCH 524/816] src: Clear preedit in IBusEngineSimple with focus
 changes

BUG=https://github.com/ibus/ibus/issues/2063
---
 src/ibusenginesimple.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index ba9d92b67..7615f121b 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -105,6 +105,8 @@ static GSList *global_tables;
 
 /* functions prototype */
 static void     ibus_engine_simple_destroy      (IBusEngineSimple   *simple);
+static void     ibus_engine_simple_focus_in     (IBusEngine         *engine);
+static void     ibus_engine_simple_focus_out    (IBusEngine         *engine);
 static void     ibus_engine_simple_reset        (IBusEngine         *engine);
 static gboolean ibus_engine_simple_process_key_event
                                                 (IBusEngine         *engine,
@@ -136,6 +138,8 @@ ibus_engine_simple_class_init (IBusEngineSimpleClass *class)
     ibus_object_class->destroy =
         (IBusObjectDestroyFunc) ibus_engine_simple_destroy;
 
+    engine_class->focus_in  = ibus_engine_simple_focus_in;
+    engine_class->focus_out = ibus_engine_simple_focus_out;
     engine_class->reset     = ibus_engine_simple_reset;
     engine_class->process_key_event
                             = ibus_engine_simple_process_key_event;
@@ -176,6 +180,19 @@ ibus_engine_simple_destroy (IBusEngineSimple *simple)
         IBUS_OBJECT (simple));
 }
 
+static void
+ibus_engine_simple_focus_in (IBusEngine *engine)
+{
+    IBUS_ENGINE_CLASS (ibus_engine_simple_parent_class)->focus_in (engine);
+}
+
+static void
+ibus_engine_simple_focus_out (IBusEngine *engine)
+{
+    ibus_engine_simple_reset (engine);
+    IBUS_ENGINE_CLASS (ibus_engine_simple_parent_class)->focus_out (engine);
+}
+
 static void
 ibus_engine_simple_reset (IBusEngine *engine)
 {
@@ -188,14 +205,14 @@ ibus_engine_simple_reset (IBusEngine *engine)
         priv->in_hex_sequence = FALSE;
         priv->tentative_match = 0;
         priv->tentative_match_len = 0;
-        ibus_engine_hide_preedit_text ((IBusEngine *)simple);
     } else if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
         g_clear_pointer (&priv->tentative_emoji, g_free);
-        ibus_engine_hide_preedit_text ((IBusEngine *)simple);
     } else if (!priv->in_hex_sequence && !priv->in_emoji_sequence) {
-        ibus_engine_hide_preedit_text ((IBusEngine *)simple);
+        priv->tentative_match = 0;
+        priv->tentative_match_len = 0;
     }
+    ibus_engine_hide_preedit_text ((IBusEngine *)simple);
 }
 
 static void

From c7d8771cb9fc652cb638aa7cb8e10ea6b889509e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 11 Dec 2018 19:16:10 +0900
Subject: [PATCH 525/816] client/gtk2: Fix SEGV on mouse clicks when
 ibus-daemon not running

---
 client/gtk2/ibusimcontext.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index ed7fea6e6..ab7ff88a4 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1117,9 +1117,10 @@ ibus_im_context_button_press_event_cb (GtkWidget      *widget,
     if (event->button != 1)
         return FALSE;
 
-    ibus_im_context_clear_preedit_text (ibusimcontext);
-    if (ibusimcontext->ibuscontext)
+    if (ibusimcontext->ibuscontext) {
+        ibus_im_context_clear_preedit_text (ibusimcontext);
         ibus_input_context_reset (ibusimcontext->ibuscontext);
+    }
     return FALSE;
 }
 

From a78e7f8deb51f01125325da868c8fc75f0436b3e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Dec 2018 20:10:34 +0900
Subject: [PATCH 526/816] configure: Generate ibus_localedir variable

---
 configure.ac     |  3 ++-
 m4/ibuslocale.m4 | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 m4/ibuslocale.m4

diff --git a/configure.ac b/configure.ac
index 26a048c83..8fc76239a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,8 @@ GETTEXT_PACKAGE=ibus10
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for out gettext translation domains.])
-AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir",
+DEFINE_IBUS_LOCALEDIR
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$ibus_localedir",
                    [Define the location where the catalogs will be installed])
 
 # For dislpay date.
diff --git a/m4/ibuslocale.m4 b/m4/ibuslocale.m4
new file mode 100644
index 000000000..d0f45cfb7
--- /dev/null
+++ b/m4/ibuslocale.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([DEFINE_IBUS_LOCALEDIR], [
+ibus_save_prefix="$prefix"
+ibus_save_datarootdir="$datarootdir"
+ibus_save_datadir="$datadir"
+ibus_save_localedir="$localedir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+datarootdir=`eval echo "$datarootdir"`
+datadir=`eval echo "$datadir"`
+test "x$localedir" = xNONE && localedir="${datadir}/locale"
+ibus_localedir=`eval echo "$localedir"`
+localedir="$ibus_save_localedir"
+datadir="$ibus_save_datadir"
+datarootdir="$ibus_save_datarootdir"
+prefix="$ibus_save_prefix"
+])

From 1cd5254811259befe50c8bd81584d1bfe2c63ed0 Mon Sep 17 00:00:00 2001
From: glasseyes <dglassey@gmail.com>
Date: Mon, 17 Dec 2018 20:20:11 +0900
Subject: [PATCH 527/816] src: use iso 639-3 to have names for more languages

Keyman and others support them so they shouldn't be in "Other"

BUG=https://github.com/ibus/ibus/issues/2064
---
 ibus/lang.py   |  8 ++++----
 src/ibusutil.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ibus/lang.py b/ibus/lang.py
index 3b3f552f9..64324bd8e 100644
--- a/ibus/lang.py
+++ b/ibus/lang.py
@@ -36,7 +36,7 @@ def get_language_name(_locale):
     lang = lang.lower()
     if lang in __languages_dict:
         lang = __languages_dict[lang]
-        lang = gettext.dgettext("iso_639", lang)
+        lang = gettext.dgettext("iso_639-3", lang)
     else:
         lang = _(u"Other")
         lang = gettext.dgettext("ibus", lang)
@@ -46,7 +46,7 @@ def __start_element(name, attrs):
     global __languages_dict
     try:
         name = attrs[u"name"]
-        for attr_name in (u"iso_639_2B_code", u"iso_639_2T_code", u"iso_639_1_code"):
+        for attr_name in (u"id", u"part1_code", u"part2_code"):
             if attr_name in attrs:
                 attr_value = attrs[attr_name]
                 __languages_dict[attr_value] = name
@@ -62,12 +62,12 @@ def __char_data(data):
 def __load_lang():
     import os
     import _config
-    iso_639_xml = os.path.join(_config.ISOCODES_PREFIX, "share/xml/iso-codes/iso_639.xml")
+    iso_639_3_xml = os.path.join(_config.ISOCODES_PREFIX, "share/xml/iso-codes/iso_639-3.xml")
     p = xml.parsers.expat.ParserCreate()
     p.StartElementHandler = __start_element
     p.EndElementHandler = __end_element
     p.CharacterDataHandler = __char_data
-    p.ParseFile(file(iso_639_xml))
+    p.ParseFile(file(iso_639_3_xml))
 
 __load_lang()
 
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 15e36f803..fd1da006c 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -45,7 +45,7 @@ _iso_codes_parse_xml_node (XMLNode          *node)
     GList *p;
     g_assert (node);
 
-    if (G_UNLIKELY (g_strcmp0 (node->name, "iso_639_entries") != 0)) {
+    if (G_UNLIKELY (g_strcmp0 (node->name, "iso_639_3_entries") != 0)) {
         return FALSE;
     }
 
@@ -57,9 +57,9 @@ _iso_codes_parse_xml_node (XMLNode          *node)
             const gchar *key;
             gchar *value;
         } entries[] = {
-            { "iso_639_2B_code", NULL },
-            { "iso_639_2T_code", NULL },
-            { "iso_639_1_code", NULL },
+            { "id", NULL },
+            { "part1_code", NULL },
+            { "part2_code", NULL },
         };
 
         if (sub_node->attributes == NULL) {
@@ -99,14 +99,14 @@ _load_lang()
     struct stat buf;
 
 #ifdef ENABLE_NLS
-    bindtextdomain ("iso_639", LOCALEDIR);
-    bind_textdomain_codeset ("iso_639", "UTF-8");
+    bindtextdomain ("iso_639-3", LOCALEDIR);
+    bind_textdomain_codeset ("iso_639-3", "UTF-8");
 #endif
 
     __languages_dict = g_hash_table_new_full (g_str_hash,
             g_str_equal, g_free, g_free);
     filename = g_build_filename (ISOCODES_PREFIX,
-                                 "share/xml/iso-codes/iso_639.xml",
+                                 "share/xml/iso-codes/iso_639-3.xml",
                                  NULL);
     if (g_stat (filename, &buf) != 0) {
         g_warning ("Can not get stat of file %s", filename);
@@ -157,7 +157,7 @@ ibus_get_language_name (const gchar *_locale)
     if (g_strcmp0 (retval, "Other") == 0)
         return dgettext (GETTEXT_PACKAGE, N_("Other"));
     else
-        return dgettext ("iso_639", retval);
+        return dgettext ("iso_639-3", retval);
 #else
     return retval;
 #endif

From 7b9c034f570bb1bf89569a01b98d6771b1596722 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 17 Dec 2018 20:26:32 +0900
Subject: [PATCH 528/816] m4: Add ibuslocale.m4 to Makefile.am

---
 m4/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 57e008079..dcf84ac35 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2018 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
@@ -22,6 +22,7 @@
 
 EXTRA_DIST = \
     as-version.m4 \
+    ibuslocale.m4 \
     vapigen.m4 \
     $(NULL)
 

From 9ae2d4658fff3d1e7262fb4fb7ca9ce1af0a27ec Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 20 Dec 2018 16:40:31 +0900
Subject: [PATCH 529/816] client/gtk2: Use button-press-event only with
 IBUS_ENGINE_PREEDIT_COMMIT

BUG=https://github.com/ibus/ibus/issues/1980
---
 client/gtk2/ibusimcontext.c | 66 ++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index ab7ff88a4..f9310867c 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -72,6 +72,8 @@ struct _IBusIMContext {
     /* cancellable */
     GCancellable    *cancellable;
     GQueue          *events_queue;
+
+    gboolean use_button_press_event;
 };
 
 struct _IBusIMContextClass {
@@ -1109,6 +1111,7 @@ ibus_im_context_get_preedit_string (GtkIMContext   *context,
 }
 
 
+#if !GTK_CHECK_VERSION (3, 93, 0)
 static gboolean
 ibus_im_context_button_press_event_cb (GtkWidget      *widget,
                                        GdkEventButton *event,
@@ -1124,13 +1127,37 @@ ibus_im_context_button_press_event_cb (GtkWidget      *widget,
     return FALSE;
 }
 
+static void
+_connect_button_press_event (IBusIMContext *ibusimcontext,
+                             gboolean       do_connect)
+{
+    GtkWidget *widget = NULL;
+
+    g_assert (ibusimcontext->client_window);
+    gdk_window_get_user_data (ibusimcontext->client_window,
+                              (gpointer *)&widget);
+    /* firefox needs GtkWidget instead of GtkWindow */
+    if (GTK_IS_WIDGET (widget)) {
+        if (do_connect) {
+            g_signal_connect (
+                    widget,
+                    "button-press-event",
+                    G_CALLBACK (ibus_im_context_button_press_event_cb),
+                    ibusimcontext);
+        } else {
+            g_signal_handlers_disconnect_by_func (
+                    widget,
+                    G_CALLBACK (ibus_im_context_button_press_event_cb),
+                    ibusimcontext);
+        }
+    }
+}
+#endif
+
 static void
 ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
 {
     IBusIMContext *ibusimcontext;
-#if !GTK_CHECK_VERSION (3, 93, 0)
-    GtkWidget *widget;
-#endif
 
     IDEBUG ("%s", __FUNCTION__);
 
@@ -1138,15 +1165,8 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
 
     if (ibusimcontext->client_window) {
 #if !GTK_CHECK_VERSION (3, 93, 0)
-        gdk_window_get_user_data (ibusimcontext->client_window,
-                                  (gpointer *)&widget);
-        /* firefox needs GtkWidget instead of GtkWindow */
-        if (GTK_IS_WIDGET (widget)) {
-            g_signal_handlers_disconnect_by_func (
-                    widget,
-                    (GCallback)ibus_im_context_button_press_event_cb,
-                    ibusimcontext);
-        }
+        if (ibusimcontext->use_button_press_event)
+            _connect_button_press_event (ibusimcontext, FALSE);
 #endif
         g_object_unref (ibusimcontext->client_window);
         ibusimcontext->client_window = NULL;
@@ -1155,17 +1175,8 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
     if (client != NULL) {
         ibusimcontext->client_window = g_object_ref (client);
 #if !GTK_CHECK_VERSION (3, 93, 0)
-        gdk_window_get_user_data (ibusimcontext->client_window,
-                                  (gpointer *)&widget);
-
-        /* firefox needs GtkWidget instead of GtkWindow */
-        if (GTK_IS_WIDGET (widget)) {
-            g_signal_connect (
-                    widget,
-                    "button-press-event",
-                    G_CALLBACK (ibus_im_context_button_press_event_cb),
-                    ibusimcontext);
-        }
+        if (ibusimcontext->use_button_press_event)
+            _connect_button_press_event (ibusimcontext, TRUE);
 #endif
     }
     if (ibusimcontext->slave)
@@ -1631,6 +1642,15 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
         ibusimcontext->preedit_attrs = NULL;
     }
 
+    if (!ibusimcontext->use_button_press_event &&
+        mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+#if !GTK_CHECK_VERSION (3, 93, 0)
+        if (ibusimcontext->client_window)
+            _connect_button_press_event (ibusimcontext, TRUE);
+#endif
+        ibusimcontext->use_button_press_event = TRUE;
+    }
+
     str = text->text;
     ibusimcontext->preedit_string = g_strdup (str);
     if (text->attrs) {

From 4ef976a8b934bf76cfd855013b766f6492dc9e8a Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@daitauha.fr>
Date: Mon, 7 Jan 2019 21:15:35 +0900
Subject: [PATCH 530/816] introspection: Tell the GI scanner to include the C
 headers

This adds the following line to the generated gir file:

    <c:include name="ibus.h"/>

This is important, for example for Rust bindings generated from the
gtk-rs tooling.

BUG=https://github.com/ibus/ibus/pull/2071
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8fc76239a..77823c3c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,7 +315,7 @@ GOBJECT_INTROSPECTION_CHECK([0.6.8])
 
 IBUS_GIR_SCANNERFLAGS=
 if test x"$found_introspection" = x"yes" ; then
-    IBUS_GIR_SCANNERFLAGS="--warn-all --identifier-prefix=IBus --symbol-prefix=ibus"
+    IBUS_GIR_SCANNERFLAGS="--warn-all --identifier-prefix=IBus --symbol-prefix=ibus --c-include=ibus.h"
     PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.6],
                      [gir_symbol_prefix=yes],
                      [gir_symbol_prefix=no])

From 0fd043c3b4c90855bfb4fceed4bf2f3c3635a041 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 Jan 2019 12:02:32 +0900
Subject: [PATCH 531/816] portal: Update APIs for Hangul preedit in Flatpak

BUG=https://github.com/ibus/ibus/issues/1980
---
 portal/org.freedesktop.IBus.Portal.xml |  9 ++++++++-
 portal/portal.c                        | 18 +++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/portal/org.freedesktop.IBus.Portal.xml b/portal/org.freedesktop.IBus.Portal.xml
index afce4daa7..376ad424d 100644
--- a/portal/org.freedesktop.IBus.Portal.xml
+++ b/portal/org.freedesktop.IBus.Portal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (C) 2017 Red Hat, Inc.
+ Copyright (C) 2017-2019 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
@@ -97,6 +97,12 @@
       <arg type='u' name='cursor_pos' />
       <arg type='b' name='visible' />
     </signal>
+    <signal name='UpdatePreeditTextWithMode'>
+      <arg type='v' name='text' />
+      <arg type='u' name='cursor_pos' />
+      <arg type='b' name='visible' />
+      <arg type='u' name='mode' />
+    </signal>
     <signal name='ShowPreeditText'/>
     <signal name='HidePreeditText'/>
     <signal name='UpdateAuxiliaryText'>
@@ -123,6 +129,7 @@
     </signal>
 
     <property name='ContentType' type='(uu)' access='write' />
+    <property name='ClientCommitPreedit' type='(b)' access='write' />
   </interface>
 
   <interface name='org.freedesktop.IBus.Service'>
diff --git a/portal/portal.c b/portal/portal.c
index cb24d257b..e78bc92f8 100644
--- a/portal/portal.c
+++ b/portal/portal.c
@@ -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) 2017 Red Hat, Inc.
+ * Copyright (C) 2017-2019 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
@@ -67,6 +67,7 @@ struct _IBusPortalClass
 enum
 {
     PROP_CONTENT_TYPE = 1,
+    PROP_CLIENT_COMMIT_PREEDIT,
     N_PROPERTIES
 };
 
@@ -315,6 +316,20 @@ ibus_portal_context_set_property (IBusPortalContext *portal_context,
                            NULL  /* user_data */
                            );
         break;
+    case PROP_CLIENT_COMMIT_PREEDIT:
+        g_dbus_proxy_call (G_DBUS_PROXY (portal_context->context),
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new ("(ssv)",
+                                          IBUS_INTERFACE_INPUT_CONTEXT,
+                                          "ClientCommitPreedit",
+                                          g_value_get_variant (value)),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           NULL, /* cancellable */
+                           NULL, /* callback */
+                           NULL  /* user_data */
+                           );
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (portal_context, prop_id, pspec);
     }
@@ -328,6 +343,7 @@ ibus_portal_context_get_property (IBusPortalContext *portal_context,
 {
     switch (prop_id) {
     case PROP_CONTENT_TYPE:
+    case PROP_CLIENT_COMMIT_PREEDIT:
         g_warning ("No support for setting content type");
         break;
     default:

From 60e246ef1593f599e2103070f8fa02649d60ada1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 Jan 2019 12:02:35 +0900
Subject: [PATCH 532/816] test: Add flatpak-builder file for
 org.freedesktop.Platform

---
 test/org.test.IBus.json  |  6 +++---
 test/org.test2.IBus.json | 43 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 test/org.test2.IBus.json

diff --git a/test/org.test.IBus.json b/test/org.test.IBus.json
index dc3caa62c..8bc28bf94 100644
--- a/test/org.test.IBus.json
+++ b/test/org.test.IBus.json
@@ -32,11 +32,11 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/alexlarsson/ibus",
-                    "branch": "ibus-portal"
+                    "url": "https://github.com/ibus/ibus.git",
+                    "branch": "master"
                 }
             ],
-            "config-opts": ["--disable-emoji-dict", "--disable-dconf"],
+            "config-opts": ["--disable-emoji-dict", "--disable-dconf", "--disable-gtk2", "--disable-libnotify", "--disable-unicode-dict", "--disable-ui"],
             "post-install": ["gtk-query-immodules-3.0 /app/lib/gtk-3.0/3.0.0/immodules/im-ibus.so > /app/lib/gtk-3.0/3.0.0/immodules.cache"]
         }
     ]
diff --git a/test/org.test2.IBus.json b/test/org.test2.IBus.json
new file mode 100644
index 000000000..1861a7b2f
--- /dev/null
+++ b/test/org.test2.IBus.json
@@ -0,0 +1,43 @@
+{
+    "app-id": "org.test2.IBus",
+    "runtime": "org.freedesktop.Platform",
+    "runtime-version": "18.08",
+    "sdk": "org.freedesktop.Sdk",
+    "command": "/usr/bin/zenity",
+    "finish-args": [
+        /* X11 + XShm access */
+        "--share=ipc", "--socket=x11",
+        /* Wayland access */
+        "--socket=wayland",
+        /* Needed for dconf to work */
+        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--env=GTK_IM_MODULE_FILE=/usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules.cache"
+    ],
+    "build-options" : {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": ["/include", "/lib/pkgconfig",
+                "/share/pkgconfig", "/share/aclocal",
+                "/man", "/share/man", "/share/gtk-doc",
+                "/share/vala",
+                "*.la", "*.a"],
+    "modules": [
+        {
+            "name": "ibus",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/ibus/ibus.git",
+                    "branch": "master"
+                }
+            ],
+            "config-opts": ["--disable-emoji-dict", "--disable-dconf", "--disable-gtk2", "--disable-libnotify", "--disable-unicode-dict", "--disable-ui"],
+            "post-install": ["gtk-query-immodules-3.0 /usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules/im-ibus.so > /usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules.cache"]
+        }
+    ]
+}

From be7fb813e530442897a9f9130b8a26380e5a12a1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 8 Jan 2019 12:02:37 +0900
Subject: [PATCH 533/816] client/gtk2: Fix Atom and Slack for Flatpak

Seems Atom, slack, com.visualstudio.code does not enable
gtk_key_snooper_install() and this issue causes to call
gtk_im_context_filter_keypress instead of calling ibus APIs.

BUG=https://github.com/ibus/ibus/issues/1991
---
 client/gtk2/ibusimcontext.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index f9310867c..264a747ab 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -565,6 +565,10 @@ daemon_name_appeared (GDBusConnection *connection,
                       const gchar     *owner,
                       gpointer         data)
 {
+    if (!g_strcmp0 (ibus_bus_get_service_name (_bus), IBUS_SERVICE_PORTAL)) {
+        _daemon_is_running = TRUE;
+        return;
+    }
     /* If ibus-daemon is running and run ssh -X localhost,
      * daemon_name_appeared() is called but ibus_get_address() == NULL
      * because the hostname and display number are different between

From 0f5084e07c215d74adc4eeeda40b374855cce59a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 11 Jan 2019 12:56:42 +0900
Subject: [PATCH 534/816] src/ibuscomposetable: Replace assert with warning for
 .XCompose

BUG=rhbz#1470673
---
 src/ibuscomposetable.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index b843e7e10..1c0ece412 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -98,14 +98,16 @@ parse_compose_value (IBusComposeData  *compose_data,
         uch = words[1][1];
 
         /* The escaped string "\"" is separated with '\\' and '"'. */
-        if (uch == '\0' && words[2][0] == '"')
+        if (uch == '\0' && words[2][0] == '"') {
             uch = '"';
         /* The escaped octal */
-        else if (uch >= '0' && uch <= '8')
+        } else if (uch >= '0' && uch <= '8') {
             uch = g_ascii_strtoll(words[1] + 1, NULL, 8);
         /* If we need to handle other escape sequences. */
-        else if (uch != '\\')
-            g_assert_not_reached ();
+        } else if (uch != '\\') {
+            g_warning ("Invalid backslash: %s: %s", val, line);
+            goto fail;
+        }
     }
 
     if (g_utf8_get_char (g_utf8_next_char (words[1])) > 0) {

From 4d7c1e00e15921a0448947961183c1c124b6b49f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 29 Jan 2019 17:57:16 +0900
Subject: [PATCH 535/816] Delete weak pointer in GList.SList for vala 0.43.4

Vala 0.43.4 does not allow to convert a weak pointer to the full one in SList.

emojier.vala:424.36-425.73: error: Assignment: Cannot convert from
`GLib.SList<weak IBus.EmojiData>' to `GLib.SList<IBus.EmojiData>?'
emojier.vala:636.9-637.69: error: Assignment: Cannot convert from
`GLib.SList<weak IBus.UnicodeBlock>' to `GLib.SList<IBus.UnicodeBlock>'
panel.vala:526.36-526.65: error: Assignment: Cannot convert from
`GLib.List<weak IBus.EngineDesc>' to `GLib.List<IBus.EngineDesc>?'
---
 src/ibusbus.h        | 11 ++++++-----
 src/ibusemoji.h      |  6 +++---
 src/ibusunicode.h    |  8 ++++----
 ui/gtk3/emojier.vala | 24 ++++++++++++++++--------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/ibusbus.h b/src/ibusbus.h
index dff3dfb70..fddcf5b2a 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -692,7 +693,7 @@ gboolean     ibus_bus_register_component_async_finish
  *
  * List engines synchronously.
  *
- * Returns: (transfer container) (element-type IBusEngineDesc):
+ * Returns: (transfer full) (element-type IBusEngineDesc):
  *         A List of engines.
  */
 GList       *ibus_bus_list_engines      (IBusBus        *bus);
@@ -725,7 +726,7 @@ void         ibus_bus_list_engines_async
  *
  * Finishes an operation started with ibus_bus_list_engines_async().
  *
- * Returns: (transfer container) (element-type IBusEngineDesc):
+ * Returns: (transfer full) (element-type IBusEngineDesc):
  *         A List of engines.
  */
 GList       *ibus_bus_list_engines_async_finish
@@ -740,7 +741,7 @@ GList       *ibus_bus_list_engines_async_finish
  *
  * List active engines synchronously.
  *
- * Returns: (transfer container) (element-type IBusEngineDesc):
+ * Returns: (transfer full) (element-type IBusEngineDesc):
  *        A List of active engines.
  *
  * Deprecated: 1.5.3: Read dconf value
@@ -782,7 +783,7 @@ void         ibus_bus_list_active_engines_async
  *
  * Finishes an operation started with ibus_bus_list_active_engines_async().
  *
- * Returns: (transfer container) (element-type IBusEngineDesc):
+ * Returns: (transfer full) (element-type IBusEngineDesc):
  *         A List of active engines.
  *
  * Deprecated: 1.5.3: Read dconf value
diff --git a/src/ibusemoji.h b/src/ibusemoji.h
index 4edee7268..5e9fbcf4a 100644
--- a/src/ibusemoji.h
+++ b/src/ibusemoji.h
@@ -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) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2017 Red Hat, Inc.
+ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017-2019 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
@@ -209,7 +209,7 @@ void            ibus_emoji_data_save            (const gchar    *path,
  * ibus_emoji_data_load:
  * @path: A path of the saved dictionary file.
  *
- * Returns: (element-type IBusEmojiData) (transfer container):
+ * Returns: (element-type IBusEmojiData) (transfer full):
  * An #IBusEmojiData list loaded from the saved cache file.
  */
 GSList *        ibus_emoji_data_load            (const gchar    *path);
diff --git a/src/ibusunicode.h b/src/ibusunicode.h
index 99de94516..473bdb197 100644
--- a/src/ibusunicode.h
+++ b/src/ibusunicode.h
@@ -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) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2019 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
@@ -201,7 +201,7 @@ void              ibus_unicode_data_save      (const gchar        *path,
  *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
  *    with that signal by 100 times. Otherwise %NULL.
  *
- * Returns: (element-type IBusUnicodeData) (transfer container):
+ * Returns: (element-type IBusUnicodeData) (transfer full):
  * An #IBusUnicodeData list loaded from the saved cache file.
  */
 GSList *          ibus_unicode_data_load      (const gchar        *path,
@@ -290,7 +290,7 @@ void              ibus_unicode_block_save     (const gchar        *path,
  * ibus_unicode_block_load:
  * @path: A path of the saved dictionary file.
  *
- * Returns: (element-type IBusUnicodeBlock) (transfer container):
+ * Returns: (element-type IBusUnicodeBlock) (transfer full):
  * An #IBusUnicodeBlock list loaded from the saved cache file.
  */
 GSList *          ibus_unicode_block_load     (const gchar        *path);
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 0b9b54a93..aedeb4cb5 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -882,8 +882,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             update_unicode_blocks();
             return;
         } else {
-            unowned GLib.SList<unowned string> emojis =
-                    m_category_to_emojis_dict.lookup(category);
+            // Use copy_deep() since vala 0.43.4 does not allow to assign
+            // a weak pointer to the full one in SList:
+            // emojier.vala:885.48-886.62: error: Assignment: Cannot convert
+            // from `GLib.SList<string>' to `GLib.SList<weak string>?'
+            GLib.SList<string> emojis =
+                    m_category_to_emojis_dict.lookup(category).copy_deep(
+                            GLib.strdup);
             m_lookup_table.clear();
             m_candidate_panel_mode = true;
             foreach (unowned string emoji in emojis) {
@@ -1547,8 +1552,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             m_vbox.add(widget);
             widget.show_all();
         }
-        unowned GLib.SList<unowned string>? annotations =
-                data.get_annotations();
+        GLib.SList<string> annotations =
+                data.get_annotations().copy_deep(GLib.strdup);
         var buff = new GLib.StringBuilder();
         int i = 0;
         foreach (unowned string annotation in annotations) {
@@ -2001,17 +2006,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                     ) as IBus.EmojiData;
                 m_emoji_to_data_dict.insert(favorite, new_data);
             } else {
-                unowned GLib.SList<string> annotations = data.get_annotations();
+                GLib.SList<string> annotations =
+                        data.get_annotations().copy_deep(GLib.strdup);
                 if (annotations.find_custom(annotation, GLib.strcmp) == null) {
                     annotations.append(annotation);
-                    data.set_annotations(annotations.copy());
+                    data.set_annotations(annotations.copy_deep(GLib.strdup));
                 }
             }
             unowned GLib.SList<string> emojis =
                     m_annotation_to_emojis_dict.lookup(annotation);
             if (emojis.find_custom(favorite, GLib.strcmp) == null) {
                 emojis.append(favorite);
-                m_annotation_to_emojis_dict.replace(annotation, emojis.copy());
+                m_annotation_to_emojis_dict.replace(
+                        annotation,
+                        emojis.copy_deep(GLib.strdup));
             }
         }
     }

From 4592ce512fd830e646beec0f7aa21add739bb6fa Mon Sep 17 00:00:00 2001
From: bmansurov <45986298+bmansurov@users.noreply.github.com>
Date: Tue, 29 Jan 2019 18:02:04 +0900
Subject: [PATCH 536/816] engine: Add Uzbek layouts

BUG=https://github.com/ibus/ibus/pull/2069
---
 engine/simple.xml.in | 83 +++++++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 24 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index f35d7a58f..4445c2545 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -680,32 +680,67 @@
 			<longname>Ukrainian</longname>
 			<description>Ukrainian</description>
                         <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:gb:extd:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>gb</layout>
-			<layout_variant>extd</layout_variant>
-			<longname>English (UK, extended WinKeys)</longname>
-			<description>English (UK, extended WinKeys)</description>
+                        <rank>99</rank>
+                </engine>
+                <engine>
+                        <name>xkb:uz::uzb</name>
+                        <language>uz</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>uz</layout>
+                        <longname>Uzbek</longname>
+                        <description>Uzbek</description>
                         <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:gb:dvorak:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>gb</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>English (UK, Dvorak)</longname>
-			<description>English (UK, Dvorak)</description>
+                        <rank>99</rank>
+                </engine>
+                <engine>
+                        <name>xkb:uz:cyrillic:uzb</name>
+                        <language>uz</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>uz</layout>
+                        <layout_variant>cyrillic</layout_variant>
+                        <longname>Uzbek Cyrillic</longname>
+                        <description>Uzbek Cyrillic</description>
                         <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
+                        <rank>1</rank>
+                </engine>
+                <engine>
+                        <name>xkb:uz:latin:uzb</name>
+                        <language>uz</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>uz</layout>
+                        <layout_variant>latin</layout_variant>
+                        <longname>Uzbek Latin</longname>
+                        <description>Uzbek Latin</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
+                <engine>
+                        <name>xkb:gb:extd:eng</name>
+                        <language>en</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>gb</layout>
+                        <layout_variant>extd</layout_variant>
+                        <longname>English (UK, extended WinKeys)</longname>
+                        <description>English (UK, extended WinKeys)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
+                <engine>
+                        <name>xkb:gb:dvorak:eng</name>
+                        <language>en</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>gb</layout>
+                        <layout_variant>dvorak</layout_variant>
+                        <longname>English (UK, Dvorak)</longname>
+                        <description>English (UK, Dvorak)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
                 <engine>
                         <name>xkb:my::msa</name>
                         <language>ms</language>

From 7a38e4d18ea4023f01948c6ce2fe303dbe4b3bd9 Mon Sep 17 00:00:00 2001
From: Anton Mikhalev <compromisedbeacon+gh@gmail.com>
Date: Mon, 4 Feb 2019 16:07:02 +0900
Subject: [PATCH 537/816] bus: Allow using non-abstract UNIX domain sockets

Previously, it was not possible to access ibus daemon from a separate
network namespace because its socket resided in an abstract namespace,
which is not shareable between network namespaces.

Passing --address=unix:path=/run/user/1000/ibus to ibus-daemon allows
clients running in containerized environment to communicate with daemon
as long as /run/user/1000 is mounted within container.

BUG=https://github.com/ibus/ibus/pull/2077
---
 bus/server.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index e28982741..3a626230a 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -144,9 +144,10 @@ bus_server_init (void)
     /* init server */
     GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
     gchar *guid = g_dbus_generate_guid ();
-    if (!g_str_has_prefix (g_address, "unix:tmpdir=")) {
-        g_error ("Your socket address does not have the format unix:tmpdir=$DIR; %s",
-                 g_address);
+    if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
+        !g_str_has_prefix (g_address, "unix:path=")) {
+        g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
+                 "or unix:path=$FILE; %s", g_address);
     }
     server =  g_dbus_server_new_sync (
                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */

From 64f4e412d005d15a944ae92f78923371676a5be1 Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Mon, 4 Feb 2019 16:15:28 +0900
Subject: [PATCH 538/816] client/x11: typo: sevrer to server

BUG=https://github.com/ibus/ibus/pull/2078
---
 client/x11/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/x11/main.c b/client/x11/main.c
index 3bea94b77..a1879346b 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -1114,7 +1114,7 @@ _print_usage (FILE *fp, gchar *name)
     fprintf (fp,
         "Usage:\n"
         " %s --help               Show this message\n"
-        "    --server-name= -n    Setup xim sevrer name\n"
+        "    --server-name= -n    Setup xim server name\n"
         "    --locale= -l         Setup support locales\n"
         "    --locale-append= -a  Append locales into the default support locales\n"
         "    --kill-daemon -k     Kill ibus daemon when exit\n"

From 4d3a8ff3d0bf69508551e65ae2dae676919a728d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 13 Feb 2019 16:00:42 +0900
Subject: [PATCH 539/816] Delete Super-space notification

I'd assume most IBus 1.5.2 users are migrated to the latest 1.5.z now
but the notification dialog gives much attention and could be deprecated.

BUG=https://github.com/ibus/ibus/issues/2080
---
 configure.ac        | 20 ++------------------
 ui/gtk3/Makefile.am | 19 ++-----------------
 ui/gtk3/panel.vala  | 28 +---------------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/configure.ac b/configure.ac
index 77823c3c2..0790d9944 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2019 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
@@ -588,21 +588,6 @@ if test x"$enable_engine" = x"yes"; then
     enable_engine="yes (enabled, use --disable-engine to disable)"
 fi
 
-# --disable-libnotify
-AC_ARG_ENABLE(libnotify,
-    AS_HELP_STRING([--disable-libnotify],
-                   [Disable to link libnotify]),
-    [enable_libnotify=$enableval],
-    [enable_libnotify=yes]
-)
-AM_CONDITIONAL([ENABLE_LIBNOTIFY], [test x"$enable_libnotify" = x"yes"])
-if test x"$enable_libnotify" = x"yes"; then
-    PKG_CHECK_MODULES(LIBNOTIFY, [
-        libnotify >= 0.7
-    ])
-    enable_libnotify="yes (enabled, use --disable-libnotify to disable)"
-fi
-
 PKG_CHECK_MODULES(XTEST,
     [x11 xtst],
     [enable_xtest=yes],
@@ -782,7 +767,6 @@ Build options:
   No snooper regexes            "$NO_SNOOPER_APPS"
   Panel icon                    "$IBUS_ICON_KEYBOARD"
   Enable surrounding-text       $enable_surrounding_text
-  Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
   Unicode Emoji directory       $UNICODE_EMOJI_DIR
   CLDR annotation directory     $EMOJI_ANNOTATION_DIR
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index e40971f13..d0fa7c583 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2015-2019 Takao Fujwiara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2019 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
@@ -81,21 +81,6 @@ AM_VALAFLAGS = \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
-if ENABLE_LIBNOTIFY
-AM_CFLAGS += \
-	@LIBNOTIFY_CFLAGS@ \
-	$(NULL)
-
-AM_LDADD += \
-	@LIBNOTIFY_LIBS@ \
-	$(NULL)
-
-AM_VALAFLAGS += \
-	--pkg=libnotify \
-	-D ENABLE_LIBNOTIFY \
-	$(NULL)
-endif
-
 if ENABLE_APPINDICATOR
 AM_VALAFLAGS += --define=INDICATOR
 endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 4c3b00ca9..2054658e0 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2019 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -700,29 +700,6 @@ class Panel : IBus.PanelService {
         return -1;
     }
 
-    private void update_version_1_5_3() {
-#if ENABLE_LIBNOTIFY
-        if (!Notify.is_initted()) {
-            Notify.init ("ibus");
-        }
-
-        var notification = new Notify.Notification(
-                _("IBus Update"),
-                _("Super+space is now the default hotkey."),
-                "ibus");
-        notification.set_timeout(30 * 1000);
-        notification.set_category("hotkey");
-
-        try {
-            notification.show();
-        } catch (GLib.Error e){
-            warning ("Notification is failed for IBus 1.5.3: %s", e.message);
-        }
-#else
-        warning(_("Super+space is now the default hotkey."));
-#endif
-    }
-
     private void update_version_1_5_8() {
         inited_engines_order = false;
     }
@@ -731,9 +708,6 @@ class Panel : IBus.PanelService {
         string prev_version = m_settings_general.get_string("version");
         string current_version = null;
 
-        if (compare_versions(prev_version, "1.5.3") < 0)
-            update_version_1_5_3();
-
         if (compare_versions(prev_version, "1.5.8") < 0)
             update_version_1_5_8();
 

From 6aab10f2e5a8e10dac9b007eff19b26990461790 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 Feb 2019 17:37:39 +0900
Subject: [PATCH 540/816] ui/gtk3: Fix assert with 16 candidates

BUG=https://github.com/ibus/ibus/issues/2076
---
 ui/gtk3/candidatearea.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index f590cf3aa..781ecd1ed 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -109,7 +109,7 @@ class CandidateArea : Gtk.Box {
         m_focus_candidate = focus_candidate;
         m_show_cursor = show_cursor;
 
-        assert(candidates.length < 16);
+        assert(candidates.length <= 16);
         for (int i = 0 ; i < 16 ; i++) {
             Gtk.Label label = m_candidates[i];
             bool visible = false;

From b30eb5de95413c3977899fdddd04de6872dae991 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 22 Feb 2019 18:40:14 +0900
Subject: [PATCH 541/816] Delete underscore in _Name in *.desktop for gettext
 migration

---
 po/Makevars                            |  2 +-
 setup/Makefile.am                      | 26 +++++++++++++++-----------
 setup/ibus-setup.desktop               |  4 ++--
 ui/gtk3/Makefile.am                    |  1 -
 ui/gtk3/ibus-extension-gtk3.desktop.in |  2 +-
 ui/gtk3/ibus-ui-emojier.desktop.in     |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/po/Makevars b/po/Makevars
index 8cf0b78aa..d3fbeab2c 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = $(shell grep "GETTEXT_PACKAGE.*=" $(top_srcdir)/configure.ac | sed -e 's/\(.*\)=[ 	]*\(.*\)/\2/')
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 17d80c512..cb4dd8d10 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -40,8 +40,11 @@ ibussetup_DATA = \
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
 
-desktop_DATA = ibus-setup.desktop
+desktop_notrans_files = ibus-setup.desktop
+desktop_DATA = org.freedesktop.IBus.Setup.desktop
 desktopdir = $(datadir)/applications
+org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man_one_in_files = ibus-setup.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
@@ -55,18 +58,19 @@ man_onedir = $(mandir)/man1
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
 CLEANFILES = \
-	$(man_one_DATA) \
-	$(man_one_files) \
-	*.pyc \
-	ibus-setup \
-	$(NULL)
+    $(desktop_DATA) \
+    $(man_one_DATA) \
+    $(man_one_files) \
+    *.pyc \
+    ibus-setup \
+    $(NULL)
 
 EXTRA_DIST = \
-	$(man_one_in_files) \
-	ibus-setup.in \
-	setup.ui \
-	ibus-setup.desktop \
-	$(NULL)
+    $(desktop_notrans_files) \
+    $(man_one_in_files) \
+    ibus-setup.in \
+    setup.ui \
+    $(NULL)
 
 test:
 	$(ENV_IBUS_TEST) \
diff --git a/setup/ibus-setup.desktop b/setup/ibus-setup.desktop
index 864b026ec..0608a68f0 100644
--- a/setup/ibus-setup.desktop
+++ b/setup/ibus-setup.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=IBus Preferences
-_Comment=Set IBus Preferences
+Name=IBus Preferences
+Comment=Set IBus Preferences
 Exec=ibus-setup
 Icon=ibus-setup
 Terminal=false
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index d0fa7c583..60205aa52 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -262,7 +262,6 @@ desktop_DATA = \
 desktopdir = $(datadir)/applications
 %.desktop: %.desktop.in
 	$(AM_V_GEN) sed \
-		-e 's|^_Name=|Name=|g' \
 		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
                 mv $@.tmp $@
 	$(NULL)
diff --git a/ui/gtk3/ibus-extension-gtk3.desktop.in b/ui/gtk3/ibus-extension-gtk3.desktop.in
index a119ec8e9..5e0e910d3 100644
--- a/ui/gtk3/ibus-extension-gtk3.desktop.in
+++ b/ui/gtk3/ibus-extension-gtk3.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Emoji Choice
+Name=Emoji Choice
 Icon=ibus
 Exec=@libexecdir@/ibus-extension-gtk3
 Type=Application
diff --git a/ui/gtk3/ibus-ui-emojier.desktop.in b/ui/gtk3/ibus-ui-emojier.desktop.in
index 6d9422d5b..f65fe3d81 100644
--- a/ui/gtk3/ibus-ui-emojier.desktop.in
+++ b/ui/gtk3/ibus-ui-emojier.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Emoji Choice
+Name=Emoji Choice
 Icon=ibus
 Exec=ibus emoji
 Type=Application

From f5b282e8d2c82156738599ce00e148f512692531 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 27 Feb 2019 12:02:11 +0900
Subject: [PATCH 542/816] src/ibusemojigen.h: Updated translatable emoji
 categories

---
 src/ibusemojigen.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ibusemojigen.h b/src/ibusemojigen.h
index 30bb12e57..172d892cc 100644
--- a/src/ibusemojigen.h
+++ b/src/ibusemojigen.h
@@ -29,10 +29,12 @@ include <glib/gi18n.h>
 const static char *unicode_emoji_categories[] = {
     N_("Activities"),
     N_("Animals & Nature"),
+    N_("Component"),
     N_("Flags"),
     N_("Food & Drink"),
     N_("Objects"),
-    N_("Smileys & People"),
+    N_("People & Body"),
+    N_("Smileys & Emotion"),
     N_("Symbols"),
     N_("Travel & Places"),
 };

From 8375f391e1b9bfc048ff14fd458f689d853064ac Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 28 Feb 2019 15:26:11 +0900
Subject: [PATCH 543/816] ui/gtk3: Do not add emojis in compose category to
 emoji variants

Any emojis in compose category have variants and should be shown by default.
---
 bindings/vala/IBus-1.0-custom.vala |  4 ++
 ui/gtk3/emojier.vala               | 74 ++++++++++++++++++++++++++----
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/bindings/vala/IBus-1.0-custom.vala b/bindings/vala/IBus-1.0-custom.vala
index 7d34a8bd3..ec46fc903 100644
--- a/bindings/vala/IBus-1.0-custom.vala
+++ b/bindings/vala/IBus-1.0-custom.vala
@@ -17,4 +17,8 @@ namespace IBus {
 	public class PanelService : IBus.Service {
                 public void panel_extension_register_keys(string first_property_name, ...);
 	}
+        public class EmojiData : IBus.Serializable {
+		[CCode (cname = "ibus_emoji_data_new", has_construct_function = true)]
+		public EmojiData (string first_property_name, ...);
+	}
 }
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index aedeb4cb5..fc15cffec 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -389,6 +389,14 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             }
             make_emoji_dict(m_current_lang_id);
         }
+        add_variants_to_component();
+
+        GLib.List<unowned string> annotations =
+                m_annotation_to_emojis_dict.get_keys();
+        foreach (unowned string annotation in annotations) {
+            if (m_emoji_max_seq_len < annotation.length)
+                m_emoji_max_seq_len = annotation.length;
+        }
         update_favorite_emoji_dict();
     }
 
@@ -430,11 +438,54 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             update_annotation_to_emojis_dict(data);
             update_category_to_emojis_dict(data, lang);
         }
-        GLib.List<unowned string> annotations =
-                m_annotation_to_emojis_dict.get_keys();
-        foreach (unowned string annotation in annotations) {
-            if (m_emoji_max_seq_len < annotation.length)
-                m_emoji_max_seq_len = annotation.length;
+    }
+
+
+    private static void add_variants_to_component() {
+        string category = "Component";
+        unowned GLib.SList<string> hits =
+                m_category_to_emojis_dict.lookup(category);
+        if (hits == null) {
+            category = "component";
+            hits = m_category_to_emojis_dict.lookup(category);
+        }
+        if (hits == null)
+            return;
+        GLib.SList<IBus.EmojiData> emoji_list =
+                new GLib.SList<IBus.EmojiData>();
+        GLib.SList<string> annotations = new GLib.SList<string>();
+        annotations.append("zero");
+        IBus.EmojiData _data;
+        _data = new IBus.EmojiData("emoji", "\u200d",
+                                   "annotations", annotations,
+                                   "description",
+                                   "ZERO WIDTH JOINER",
+                                   "category", category);
+        emoji_list.append(_data);
+        annotations = null;
+        annotations.append("text");
+        annotations.append("variation");
+        annotations.append("selector");
+        _data = new IBus.EmojiData("emoji", "\ufe0e",
+                                   "annotations", annotations,
+                                   "description",
+                                   "VARIATION SELECTOR-15",
+                                   "category", category);
+        emoji_list.append(_data);
+        annotations = null;
+        annotations.append("emoji");
+        annotations.append("variation");
+        annotations.append("selector");
+        _data = new IBus.EmojiData("emoji", "\ufe0f",
+                                   "annotations", annotations,
+                                   "description",
+                                   "VARIATION SELECTOR-16",
+                                   "category", category);
+        emoji_list.append(_data);
+        foreach (IBus.EmojiData data in emoji_list) {
+            update_emoji_to_data_dict(data, "en");
+            update_annotation_to_emojis_dict(data);
+            update_category_to_emojis_dict(data, "en");
         }
     }
 
@@ -583,10 +634,12 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             category = EMOJI_CATEGORY_OTHERS;
         if (lang == "en") {
             bool has_variant = false;
-            foreach (unichar ch in EMOJI_VARIANT_LIST) {
-                if (emoji.index_of_char(ch) >= 0) {
-                    has_variant = true;
-                    break;
+            if (category.ascii_casecmp("component") != 0) {
+                foreach (unichar ch in EMOJI_VARIANT_LIST) {
+                    if (emoji.index_of_char(ch) >= 0) {
+                        has_variant = true;
+                        break;
+                    }
                 }
             }
             // If emoji includes variants (skin colors and items),
@@ -606,7 +659,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 if (variants.find_custom(emoji, GLib.strcmp) == null) {
                     if (variants == null)
                         variants.append(base_emoji);
-                    variants.append(emoji);
+                    if (base_emoji != emoji)
+                        variants.append(emoji);
                     m_emoji_to_emoji_variants_dict.replace(
                             base_emoji,
                             variants.copy_deep(GLib.strdup));

From b1dd51c1935303dcf4f100f0a40d3d31177cfaa6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 1 Mar 2019 17:09:17 +0900
Subject: [PATCH 544/816] Update translations

Update po/da.po po/fr.po po/hu.po po/ja.po po/nl.po po/pa.po po/pl.po
       po/sv.po po/uk.po po/zh_CN.po po/zh_TW.po
---
 po/da.po    |  615 ++++++------
 po/fr.po    | 2120 ++++++++++++++++++++-------------------
 po/hu.po    | 1902 ++++++++++++++++++-----------------
 po/ja.po    | 1898 ++++++++++++++++++-----------------
 po/nl.po    | 1900 ++++++++++++++++++-----------------
 po/pa.po    | 2757 +++++++++++++++++++++++++++++++++++++++++++++++----
 po/pl.po    | 1944 +++++++++++++++++++-----------------
 po/sv.po    |   41 +-
 po/uk.po    | 1901 ++++++++++++++++++-----------------
 po/zh_CN.po |  426 ++++----
 po/zh_TW.po |   53 +-
 11 files changed, 9261 insertions(+), 6296 deletions(-)

diff --git a/po/da.po b/po/da.po
index 54c7f322c..b7ea6e1c9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # Danish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -17,12 +17,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-03-07 04:56+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-09-22 05:53+0000\n"
+"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -118,7 +118,7 @@ msgstr "Orientering for kandidater:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Angiv adfæren for hvordan IBus skal vises eller sprogpanelet"
+msgstr "Angiv opførsel for hvordan IBus skal vises eller sprogpanelet"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
@@ -230,26 +230,28 @@ msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
 msgstr ""
+"Genvejstasterne til at aktivere samtaler med emoji-annoteringer eller "
+"unicode-navne"
 
 #: ../setup/setup.ui.h:50
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emoji-annotering:"
 
 #: ../setup/setup.ui.h:51
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "Genvejstasterne til at aktivere unicode-kodepunktssamtaler"
 
 #: ../setup/setup.ui.h:52
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode-kodepunkt:"
 
 #: ../setup/setup.ui.h:53
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "Sæt en skrifttype af unicode-kandidater i emoji-dialogen"
 
 #: ../setup/setup.ui.h:54
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode-skrifttype:"
 
 #: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -459,7 +461,7 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"Opførsel for egenskabspanelt. 0 = Vis ikke, 1 = Skjul automatisk, 2 = Vis "
+"Opførsel for egenskabspanelet. 0 = Vis ikke, 1 = Skjul automatisk, 2 = Vis "
 "altid"
 
 #: ../data/ibus.schemas.in.h:28
@@ -568,11 +570,11 @@ msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Unicode-genvejstaster til gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "Genvejstasterne til at slå Unicode-skrivning til eller fra"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -600,14 +602,14 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
-msgstr "farvorit emojiliste i emoji-dialog"
+msgstr "favorit emojiliste i emoji-dialog"
 
 #: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
-"Du kan vise farvorit emojierne i emojiliste hvis denne liste har nogen tegn."
+"Du kan vise favorit emojierne i emojiliste hvis denne liste har nogen tegn."
 
 #: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
@@ -655,7 +657,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:67
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Indlæs emoji-dataene ved opstart"
 
 #: ../data/ibus.schemas.in.h:68
 msgid ""
@@ -663,10 +665,13 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Indlæs emoji-dataene ved opstart hvis sand. Det behøves omkring 10 MB "
+"hukommelse for at indlæse dataene. Indlæs emoji-dataene når emoji-dialogen "
+"åbnes ved begyndelsen hvis falsk."
 
 #: ../data/ibus.schemas.in.h:69
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Indlæs unicode-dataene ved opstart"
 
 #: ../data/ibus.schemas.in.h:70
 msgid ""
@@ -675,6 +680,10 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Indlæs unicode-dataene ved opstart hvis sand. Det behøves omkring 15 MB "
+"hukommelse for at indlæse dataene. Indlæs unicode-dataene når emoji-dialogen "
+"åbnes ved begyndelsen hvis falsk. Unicode-dataene indlæses altid efter emoji-"
+"dataene indlæses selv hvis sand."
 
 #: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
@@ -724,7 +733,7 @@ msgstr "Vælg et sprog"
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
-msgstr "_Annullér"
+msgstr "_Annuller"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
 #: ../setup/main.py:561
@@ -875,1841 +884,1841 @@ msgstr "Rejse og steder"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Grundlæggende latinsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latin-1 supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latinsk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latinsk udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA-udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Mellemrumsændringer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Kombinerende diakritiske tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Græsk og koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrillisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Kyrillisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armensk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebraisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Syrisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arabisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Syrisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arabisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamilsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Ethiopisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Etiopisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Forenede canadisk-indiansk stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongolsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Forenede canadisk-indianske stavelser, udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Ny Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Khmer-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Kombinerede diakritiske tegn udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Kyrillisk udvidet-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Sudanesisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Vediske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Supplement til fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Supplement til kombination af diakritiske tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latisk ekstra udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Græsk udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Generel tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Hævede og sænkede tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Valutasymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Kombinerende diakritiske tegn til symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Bogstavlignende symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Pile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Matematiske operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Diverse teknisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Kontrolbilleder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optisk tegngenkendelse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Indrammede alfanumeriske"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Rammetegning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Blokelementer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometriske former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Diverse symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Tingester"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Diverse matematiske symboler-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Ekstra pile-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Braille-mønstre"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Ekstra pile-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Diverse matematiske symboler-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Ekstra matematiske operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Diverse symboler og pile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latinsk udvidet-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Georgisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Etiopisk udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Kyrillisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Supplerende tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK-radikaler-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kangxi-radikaler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Ideografiske beskrivelsestegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK-symboler og punktueringer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul kompatibilitets-Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK-streger"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Katakana-fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Indrammede CJK-bogstaver og -måneder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK-kompatibilitet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "CJK-forenede ideografer-udvidelse A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Yijing-hexagramsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "CJK-forenede ideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi-radikaler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Kyrillisk udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Toneændringstegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latinsk udvidet-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Almindelige indiske talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul Jamo udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Javanesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Myanmar udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Myanmar udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meetei Mayek udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Etiopisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latinsk udvidet-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokee-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangul-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul Jamo udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "Høje surrogater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Høje surrogater til privat brug"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Lave surrogater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Område til privat brug"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alfabetiske præsentationsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arabiske præsentationsformer-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Variationsvælgere"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Vertikale former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Kombinerende halvtegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK-kombatibilitetsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Små former-varianter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arabiske præsentationsformer-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Halvbredde og fuldbredde former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Specialtegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Linear B-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Linear B-ideogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Aegæiske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Oldgræske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Oldtidssymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Festosdiskossen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lykisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Karisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Koptisk epact-numre"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Olditalisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "Gotisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "Oldpermisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugaritisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Oldpersisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shaviansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Kaukasisk Albansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "Linear A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Cypriske stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Fyrstetidsaramæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmyrisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabatæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Fønikisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lydisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroitiske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroitisk skrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Oldsydarabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Oldnordarabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "Manikæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avestisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Inskriptions-parthisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Inskriptions-pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Psalter Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Oldtyrkisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Oldungarsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Rumi numeriske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "Bramisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Sinhala-arkaiske numre"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongolsk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar kvadratisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Kileskriftstal og tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Tidlig dynastisk kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Ægyptiske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anatoliske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Ideografiske symboler og tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Forkortede formatteringskontroltegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Byzantiske musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Oldgræsk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Kinesisk stregtalsystem"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Matematiske alfanumeriske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Sutton tegnsprogskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolitisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arabiske matematiske alfabetiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Mahjong-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Domino-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "Spillekort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Indrammet alfanumerisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Indrammet ideografisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Diverse symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2723,112 +2732,112 @@ msgstr "Emotikoner"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Pyntedingbatter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Transport- og kortsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Alkymisymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Geometriske former udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Ekstra pile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Supplerende symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Forenede CJK-ideografer, udvidelse B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Forenede CJK-ideografer, udvidelse C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Forenede CJK-ideografer, udvidelse D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Forenede CJK-ideografer, udvidelse E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "CJK-forenede ideografer-udvidelse F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "Supplerende CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Mærkater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Variationsvælgere-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Ekstra privat brug-område-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Ekstra privat brug-område-B"
 
 #: ../tools/main.vala:51
 msgid "List engine name only"
@@ -2880,6 +2889,8 @@ msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Brug motorskema-stier i stedet for ibus-kerne, hvilket kan være "
+"kommaseparerede værdier."
 
 #: ../tools/main.vala:381
 msgid "Resetting…"
@@ -2959,7 +2970,7 @@ msgstr "%s er ukendt kommando!\n"
 
 #: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
-msgstr "Farvoritter"
+msgstr "Favoritter"
 
 #: ../ui/gtk3/emojier.vala:245
 msgid "Others"
@@ -2991,7 +3002,7 @@ msgstr "Vis emoji-varianter"
 
 #: ../ui/gtk3/emojier.vala:1082
 msgid "Close"
-msgstr ""
+msgstr "Luk"
 
 #: ../ui/gtk3/emojier.vala:1088
 msgid "Menu"
@@ -2999,7 +3010,7 @@ msgstr "Menu"
 
 #: ../ui/gtk3/emojier.vala:1099
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Klik for at vise en advarselsmeddelelse"
 
 #: ../ui/gtk3/emojier.vala:1143
 msgid "Loading a Unicode dictionary:"
@@ -3054,6 +3065,10 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Kunne ikke hente det nuværende tekstprogram. Giv venligst fokus til dit "
+"program igen. Tryk f.eks. på Esc-tasten flere gange for at slippe fri fra "
+"emoji-indtastningstilstanden, klik på dit skrivebord og klik på "
+"tekstprogrammet igen."
 
 #: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
diff --git a/po/fr.po b/po/fr.po
index 7d76464e3..a388d7bae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # French translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -19,398 +19,65 @@
 # José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2018. #zanata
+# elmerys <contact@zle.fr>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2019. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-03-04 10:35+0000\n"
+"PO-Revision-Date: 2019-02-27 09:32+0000\n"
 "Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 4.4.5\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horizontale"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Verticale"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Coin supérieur gauche"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Coin supérieur droit"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Coin inférieur gauche"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Coin inférieur droit"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Personnalisée"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Ne pas afficher"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Cacher automatiquement"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Toujours afficher"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Préférences de IBus"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Méthode d’entrée suivante :"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Méthode d’entrée précédente :"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Raccourcis claviers pour activer ou désactiver les méthodes d’entrées"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Activer / désactiver :"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Activer :"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Désactiver :"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Raccourcis clavier</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Permet de choisir l’orientation de la liste des candidats"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientation de la liste des candidats :"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Permet de choisir l’affichage de la barre de langues d’ibus"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Afficher le panneau de propriétés :"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Afficher la barre de langues :"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-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:38
-msgid "Show input method name on language bar"
-msgstr "Afficher le nom de la méthode d’entrée sur la barre de langues"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Insérer le texte en cours d’édition dans la fenêtre de l’application"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Utiliser une police personnalisée :"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Police et Style</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Général"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Enlever"
-
-#: ../setup/setup.ui.h:38
-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"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Monter"
-
-#: ../setup/setup.ui.h:40
-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"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Descendre"
-
-#: ../setup/setup.ui.h:42
-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"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "À _propos"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Afficher les informations de la méthode d’entrée sélectionnée"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Préférences"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Afficher le paramétrage de la méthode d’entrée sélectectionnée"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>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.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Méthode d’entrée"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr ""
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr ""
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr ""
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-"Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Langue d’annotations des émoticônes :"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Correspondances partielles d’annotations des émoticônes ayant les conditions "
-"suivantes et plus que le nombre de caractères  :"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Si les annotations peuvent correspondre à une chaîne partielle plutôt qu’une "
-"correspondance exacte"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Correspondance de préfixe"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Correspondance de suffixe"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Correspondance de contenu"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Émoticône"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Utiliser la disposition clavier système"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Utiliser la disposition clavier système (XKB)"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposition du clavier</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-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:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Avancé"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d’accueil : https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Démarrer IBus lors de la connexion"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Démarrage</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "À propos"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Fermer"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Précharger les moteurs"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Précharger les moteurs au démarrage d’ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Ordre des moteurs"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "L’ordre des moteurs enregistrés dans la liste des méthodes d’entrées"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 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"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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 &lt; délai en millisecondes. 0 &gt; ne pas "
-"afficher la fenêtre et permuter avec le moteur précédent ou suivant."
+"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:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Numéro de version enregistré"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -418,73 +85,124 @@ 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Dispositions latines ne disposant pas d’ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "La disposition US est ajoutée aux dispositions Latines. Les variantes "
 "peuvent être omises."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Utiliser xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Lancer xmodmap si le fichier .xmodmap ou .Xmodmap existe lors d’un "
 "basculement de moteur ibus"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Utiliser la disposition clavier système"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Utiliser la disposition clavier système (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Insérer le texte en cours d’édition"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Insérer le texte en cours d’édition dans la fenêtre de l’application"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Utiliser la méthode d’éntrée globale"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Partager la même méthode d’entrée pour toutes les applications"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Par défaut, activer la méthode d’entrée"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+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"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "Préservation des préfixes de nom DConf"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Raccourci clavier déclencheur"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Raccourcis claviers pour activer ou désactiver les méthodes d’entrées"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourci clavier déclencheur pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Activer les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 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:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Désactiver les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Les raccourcis clavier pour désactiver  la méthode d’entrée"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Raccourci clavier pour passer au moteur suivant"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Raccourci clavier pour revenir au moteur précédent"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 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:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Masquage automatique"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -492,24 +210,16 @@ msgstr ""
 "Comportement du panneau de propriétés. 0 = Ne pas afficher, 1 = Cacher "
 "automatiquement, 2 = Toujours afficher"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Position de la barre de langues"
 
-#: ../data/ibus.schemas.in.h:29
-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é"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Suivre le curseur d’insertion lorsque le panneau est toujours affiché"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -517,11 +227,11 @@ msgstr ""
 "Si activé, le panneau suit le curseur d’insertion lorsque le panneau est "
 "toujours affiché. Sinon, le panneau est affiché à une position fixe."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Temps en millisecondes pour afficher le panneau de propriétés"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -529,24 +239,33 @@ msgstr ""
 "Temps en millisecondes pour afficher le panneau de propriétés après prise du "
 "focus ou changement des propriétés."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 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:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Afficher l’icône dans la boîte à miniatures"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Afficher le nom de la méthode d’entrée"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Afficher le nom de la méthode d’entrée sur la barre de langues"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Valeur RGBA de l’icône XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -566,12 +285,12 @@ msgstr ""
 "soit un pourcentage compris entre 0 et 100 %, et « a » la valeur alpha, est "
 "un nombre à virgule flottante compris entre 0 et 1."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 "Temps en millisecondes pour afficher l’icône de panneau d’une propriété"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -583,50 +302,53 @@ msgstr ""
 "key dans IBusEngineDesc. Si la valeur est 0, sans délai et l’icône de "
 "propriété est montrée immédiatement."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langues"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour la barre de langues"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Touches de raccourcis Unicodes pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
+"Les touches de raccourcis pour activer ou désactiver la frappe en mode "
+"Unicode "
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourcis clavier des émoticônes pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 "Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nom de la police personnalisée pour les caractères d’émoticônes dans la "
 "boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Langue par défaut pour le dictionnaire des émoticônes"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -635,11 +357,11 @@ msgstr ""
 "boite de dialogue. La valeur $Lang est appliquée à /usr/share/ibus/dicts/"
 "emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "liste des émoticônes favorites dans la boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -647,23 +369,23 @@ msgstr ""
 "Vous pouvez afficher les émoticônes favorites dans la liste des émoticônes "
 "si celle-ci contient des caractères."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 "liste des annotations d’émoticônes favorites dans la boite de dialogue"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "Vous pouvez assigner une annotation pour une émoticône favorite dans cette "
 "liste."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre partiellement ou non"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -671,86 +393,65 @@ msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
 "partielle plutôt qu’à la chaîne complète"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Correspondance d’annotations d’émoticônes ayant la longueur spécifiée"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 "Correspondances partielles avec plus que le nombre de caractères spécifié "
-"plutôt qu'une correspondance exacte."
+"plutôt qu’une correspondance exacte."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
-"Choisir une condition de correspondance partielle d'annotations d'émoticônes"
+"Choisir une condition de correspondance partielle d’annotations d’émoticônes"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 "Choisissez une des conditions suivantes pour pour la correspondance "
-"partielle d'annotations d'émoticônes : 0 == correspondance de préfixe, 1 == "
+"partielle d’annotations d’émoticônes : 0 == correspondance de préfixe, 1 == "
 "correspondance de suffixe, 2 == correspondance de contenu"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Charge les données relatives aux émoticônes au démarrage."
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Charge les données relatives aux émoticônes au démarrage si la condition est "
+"remplie. 10Mb de mémoire sont nécessaires pour charger ces données. Sinon, "
+"les données des émoticônes sont chargées lors de l’ouverture de la boite de "
+"dialogue des émoticônes."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Charge les données Unicode au démarrage"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Charge les données Unicode au démarrage si la condition est remplie. 15Mb de "
+"mémoire sont nécessaires pour charger ces données. Sinon, les données "
+"Unicode sont chargées lors de l’ouverture de la boite de dialogue des "
+"émoticônes. Même dans le cas où la condition est remplie, les données "
+"Unicode sont toujours chargées après les données des émoticônes. "
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Insérer le texte en cours d’édition"
-
-#: ../data/ibus.schemas.in.h:72
-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:73
-msgid "Use global input method"
-msgstr "Utiliser la méthode d’éntrée globale"
-
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Par défaut, activer la méthode d’entrée"
-
-#: ../data/ibus.schemas.in.h:76
-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"
-
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "Préservation des préfixes de nom DConf"
-
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
-
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
@@ -758,2428 +459,2821 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:158
 msgid "Other"
 msgstr "Autre"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "Sélectionner la langue"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
 msgstr "Plus..."
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "À propos"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Fermer"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Langue : %s\n"
 
-#: ../setup/engineabout.py:75
+#: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposition du clavier : %s\n"
 
-#: ../setup/engineabout.py:78
+#: setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Auteur : %s\n"
 
-#: ../setup/engineabout.py:81
+#: setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Description :\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d’entrée"
 
-#: ../setup/enginetreeview.py:96
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Ajouter"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Méthode d’entrée"
+
+#: setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Préférences de IBus"
+
+#: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
 msgstr "Définir les préférences de IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Raccourci clavier"
 
-#: ../setup/keyboardshortcut.py:67
+#: setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Touche :"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modificateurs :"
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modificateurs :"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "A_ppliquer"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Supprimer"
+
+#: setup/keyboardshortcut.py:252
+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."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
+
+#: setup/main.py:121 setup/main.py:588
+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"
+
+#: setup/main.py:515
+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:536
+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"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: setup/main.py:550
+#, 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:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Sélection du raccourci clavier pour %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "Changement de méthode d’entrée"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontale"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Verticale"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Coin supérieur gauche"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Coin supérieur droit"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Coin inférieur gauche"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Coin inférieur droit"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Personnalisée"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Ne pas afficher"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Cacher automatiquement"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Toujours afficher"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Méthode d’entrée suivante :"
+
+#: setup/setup.ui:127
+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"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Méthode d’entrée précédente :"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Activer / désactiver :"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Activer :"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Désactiver :"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Raccourcis clavier</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Permet de choisir l’orientation de la liste des candidats"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientation de la liste des candidats :"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Permet de choisir l’affichage de la barre de langues d’ibus"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Afficher le panneau de propriétés :"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Afficher la barre de langues :"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Afficher le nom de la méthode d’entrée sur la barre de langue lorsque la "
+"case est cochée"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Insérer le texte en cours d’édition dans la fenêtre de l’application"
+
+#: setup/setup.ui:513
+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"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Utiliser une police personnalisée :"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Police et Style</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Général"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Enlever"
+
+#: setup/setup.ui:689
+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"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Monter"
+
+#: setup/setup.ui:707
+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"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Descendre"
+
+#: setup/setup.ui:725
+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"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "À _propos"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Afficher les informations de la méthode d’entrée sélectionnée"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Afficher le paramétrage de la méthode d’entrée sélectectionnée"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>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.</i></small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Les touches de raccourcis pour activer les conversions des annotations "
+"d’émoticônes ou des noms Unicode"
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Annotation des émoticônes:"
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"Les touches de raccourcis pour activer les conversions en point de code "
+"Unicode"
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Point de code Unicode:"
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Police de caractère Unicode:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+"Défini la langue pour les annotations d’émoticônes dans la boite de dialogue"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "A_ppliquer"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Langue d’annotations des émoticônes :"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Supprimer"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Correspondances partielles d’annotations des émoticônes ayant les conditions "
+"suivantes et plus que le nombre de caractères  :"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 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."
+"Si les annotations peuvent correspondre à une chaîne partielle plutôt qu’une "
+"correspondance exacte"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Correspondance de préfixe"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-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"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Correspondance de suffixe"
 
-#: ../setup/main.py:515
-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/setup.ui:1130
+msgid "Containing match"
+msgstr "Correspondance de contenu"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Émoticône"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposition du clavier</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avancé"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Page d’accueil : https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Sélection du raccourci clavier pour %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Démarrer IBus lors de la connexion"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "Changement de méthode d’entrée"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Démarrage</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Activités"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Animaux & nature"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Composant"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Nourriture & boisson"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objets"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Frimousses & personnes"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Personnes & parties du corps"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Frimousses & émotion"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symboles"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Voyages & lieux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Latin de base"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Supplément Latin-1"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latin étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latin étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr "Extensions à l'API"
+msgstr "Extensions à l’API"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Diacritiques sans chasse combinés avec une espace"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Marques diacritiques combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Grec et copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Supplément cyrillique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Arménien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hébreu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syriaque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Supplément arabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritain"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandéen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Supplément Syriaque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arable étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Télougou"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thaïlandais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibétain"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Géorgien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangeul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Éthiopien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Supplément éthiopien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Syllabaire autochtone canadien unifié"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Runique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Syllabaires canadiens autochtones unifiés étendus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Nouveau Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Symboles khmers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Bouguinais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Marques diacritiques combinantes étendues"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Cyrillique étendu-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Géorgien étendu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Supplément sundanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Extensions védiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Extensions phonétiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr "Extensions phonétiques suppléments"
+msgstr "Supplément d’extensions phonétiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Supplément marques diacritiques combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Latin étendu additionnel"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Grec étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Ponctuation générale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Exposants et indices"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Symboles monétaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Marques diacritiques combinantes pour symboles"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Symboles Letterlike"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Formes numérales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Flèches"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Opérateurs mathématiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Divers techniques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Contrôler des photos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Reconnaissance optique de caractères"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Alphanumériques cerclés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Dessiner des boîtes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Éléments blocs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Formes géométriques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Symboles divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Casseaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Divers symboles mathématiques-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Flèches-A supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Motifs en braille"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Flèches-B supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Symboles mathématiques-B divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr "Opérateurs mathématiques supplémentaires"
+msgstr "Supplément opérateurs mathématiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Symboles et flèches divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolitique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Latin étendu-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Supplément géorgien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Éthiopien étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Cyrillique étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Ponctuation complémentaire"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr "Radicaux suppléments CJC"
+msgstr "Supplément Radicaux CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Radicaux Kangxi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Caractères de description idéographique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "Symboles et ponctuation CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Compatibilité Hangeul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "Traits CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Extensions Katakana phonétiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Lettres et mois CJC cerclés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "Compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Idéographes unifiés CJC Extension A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Symboles hexagrammes Yì Jīng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "Idéographes unifiés CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Syllables Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Radicaux Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Cyrillique étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamoun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Lettres modificatives de ton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Latin étendu-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Sylotî nâgrî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Formes numériques communes indiennes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurachtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari étendu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangeul Jamo étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javanais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Myanmar étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Myanmar étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Extensions meetei mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Éthiopien étendu-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Latin étendu-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Supplément cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Syllabes hangeul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangeul Jamo étendu-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Substituts hauts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Substituts d’utilisation privé hauts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Substituts bas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Zone à usage privé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "Idéographes de compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Formes de présentation alphabétique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Formes A de présentation arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Sélecteurs de variante"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Formes verticales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Demi-signes combinatoires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "Formes de compatibilité CJC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Petites variantes de forme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Formes B de présentation arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Formes de demi et pleine chasse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Caractères spéciaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Syllabaire linéaire B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Idéogrammes du linéaire B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Nombres égéens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Nombres grecs anciens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Symboles anciens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Disque de Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lycien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Carien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Nombres epact coptes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr ""
+msgstr "Vieux italique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "Gothique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "Permien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ougqritique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
-msgstr ""
+msgstr "Vieux perse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
-msgstr ""
+msgstr "Shavien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Albanais du Caucase"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "Linéaire A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Syllabaire Chypriote "
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Araméen impérial"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmyrène"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabatéen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
-msgstr ""
+msgstr "Phénicien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
-msgstr ""
+msgstr "Lydien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Hiéroglyphes Méroïtique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Cursive Méroïtique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Arabe ancien du Sud"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Arabe ancien du Nord"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
-msgstr ""
+msgstr "Manichéen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
-msgstr ""
+msgstr "Avestique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Parthe des inscriptions"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Pehelevi des inscriptions"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Pehelevi des psautiers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
-msgstr ""
+msgstr "Turc Ancien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Hongrois Ancien"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi Rohingya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Symboles numériques Rûmî"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Sogdiane ancien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdiane"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaïthî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Nombre archaïque Cingalais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
-msgstr ""
+msgstr "Khojkï"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Supplément Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
-msgstr ""
+msgstr "Takrî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "Dogri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "Gong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "Maka"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
-msgstr ""
+msgstr "Cunéiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Nombres cunéiformes et ponctuation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Cunéiforme dynastique archaïque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Hiéroglyphes égyptiens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Hiéroglyphes hittites"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Supplément Bamoun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "Medf"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Symboles et ponctuation idéographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
-msgstr ""
+msgstr "Tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
-msgstr ""
+msgstr "Composants tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Supplément Kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana étendu A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
-msgstr ""
+msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Réglages du format abrégé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Symboles musicaux byzantins"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Symboles musicaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Notation musicale grecque ancienne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "Chiffres mayas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Symboles Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Chiffres-bâtonnets chinois"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Symboles mathématiques alphanumériques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "SignWriting de Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Supplément Glagolitique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Écriture mendé Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "Nombres hindous Siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Symboles mathématiques alphanumériques arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Tuiles de mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Dominos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
-msgstr ""
+msgstr "Cartes à jouer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Supplément alphanumérique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Supplément idéographique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Symboles et pictogrammes divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
-msgstr ""
+msgstr "Émoticônes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Casseaux ornementaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Symboles du transport et cartographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Symboles alchimiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Formes géométriques étendues"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Flèches-C supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Symboles et pictogrammes supplémentaires"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "Symboles d'échecs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "Idéographes unifiés CJC Extension F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "Idéographes de compatibilité CJK supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
-msgstr ""
+msgstr "Balises"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Suppléments de sélecteurs de variante"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Area-A Zone à usage privé supplémentaire"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Area-B Zone à usage privé supplémentaire"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion à IBus impossible.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Aucun moteur n’est configuré.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lire le cache du registre système."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lire le fichier FILE du cache du registre système."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Le cache du registre est invalide.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Enregistrer le cache du registre système."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Enregistrer le fichier FILE du cache du registre."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Utilisez les chemins de schéma du processeur au lieu du noyau ibus, qui "
+"peuvent être des valeurs séparées par des virgules."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Réinitialisation…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Effectuée"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Définir ou obtenir le moteur"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Quitter ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Afficher les moteurs disponibles"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Non implémenté)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Redémarrer ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Afficher le contenu du cache du registre"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Créer le cache du registre"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Afficher l’adresse D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Afficher les valeurs de configuration"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Réinitialiser les valeurs de configuration"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Afficher cette information"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s n’est pas une commande connue !\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Autres"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "Ouvrir un choix Unicode"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Saisir une annotation ou choisir une émoticône"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Rétablir le choix emoji"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "Montrer les variantes d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Cliquez pour voir le message d’avertissement"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "Chargement d’un dictionnaire Unicode :"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "Aucune"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Nom : %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
-msgstr ""
+msgstr "Alias : %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Choix d’émoticônes"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Choix Unicode"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Impossible d’obtenir l’application texte actuelle. Veuillez sélectionner à "
+"nouveau votre application. Par exemple, appuyez plusieurs fois sur la touche "
+"Échap pour relâcher le mode de saisie emoji, cliquez sur votre bureau et "
+"cliquez à nouveau sur votre application texte."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue."
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Faire correspondre avec la longueur de l’entier indiqué"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Faire correspondre avec la condition de l’entier indiqué"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Mise à jour de IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+espace est maintenant le raccourci par défaut."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Quitter"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/hu.po b/po/hu.po
index b5e9934b8..46a87db1b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,397 +10,60 @@
 # Zoltan Hoppár <hopparz@gmail.com>, 2012-2013
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2018. #zanata
+# Meskó Balázs <meskobalazs@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-28 06:24+0000\n"
+"PO-Revision-Date: 2019-02-28 02:45+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.5.0\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Vízszintes"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Függőleges"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Bal felső sarok"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Jobb felső sarok"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Bal alsó sarok"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Jobb alsó sarok"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Egyéni"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Ne mutassa"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Automatikus elrejtés"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Mindig"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus beállítások"
-
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Gyorsbillentyűk a következő beviteli módra váltáshoz"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Következő beviteli mód:"
-
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Gyorsbillentyűk az előző beviteli módra való váltáshoz"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Előző beviteli mód:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Engedélyezés vagy tiltás:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Engedélyezés:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Letiltás:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Gyorsbillentyűk</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Jelöltek tájolásának beállítása a keresési táblában"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Jelöltek tájolása:"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"Az ibus viselkedésének megadása, hogyan jelenítse meg vagy rejtse el a "
-"nyelvi sávot"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Tulajdonságpanel megjelenítése:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Nyelvi panel elhelyezése:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Ikon megjelenítése az értesítési területen"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Beviteli mód nevének megjelenítése a nyelvi eszköztáron"
-
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"A beviteli mód nevének megjelenítése a nyelvi eszköztáron, ha be van jelölve "
-"a mező"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Előszerkesztett szöveg beágyazása az alkalmazás ablakába"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Egyéni betűkészlet használata:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Betűkészlet és stílus</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Általános"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "Hozzá_adás"
-
-#: ../setup/setup.ui.h:36
-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"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Eltávolítás"
-
-#: ../setup/setup.ui.h:38
-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"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Fel"
-
-#: ../setup/setup.ui.h:40
-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"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Le"
-
-#: ../setup/setup.ui.h:42
-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"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Névjegy"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Információk megjelenítése a kiválasztott beviteli módról"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "B_eállítások"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Az aktív beviteli mód a fenti listában szereplők közül állítható "
-"be, a gyorsbillentyűk megnyomásával, vagy a panel ikonra kattintva.</i></"
-"small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Beviteli mód"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-"Gyorsbillentyű az emodzsi annotációk vagy a Unicode nevek átalakításának "
-"engedélyezéséhez"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Emodzsi annotáció:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Gyorsbillentyű az Unicode kódpont-átalakítások engedélyezéséhez"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode kódpont:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
-"Unicode jelöltekből álló betűkészlet beállítása az emodzsi párbeszédablakon"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode betűkészlet:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Emodzsi annotációk nyelvének beállítása az emodzsi párbeszédablakon"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Emodzsi annotációk nyelve:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Az emodzsi annotációk részleges illesztése a következő feltétel szerint, ha "
-"több mint ennyi karakter lett megadva:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Ha az emodzsi annotációkat részleges szövegre kell illeszteni, pontos "
-"egyezés helyett"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Előtag illeszkedés"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Utótag illeszkedés"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Tartalmazó illeszkedés"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emodzsi"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Rendszer billentyűzetkiosztásának használata"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Billentyűzetkiosztás</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globális bevitelimód-beállítások</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Speciális"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Az intelligens beviteli busz</small>\n"
-"Honlap: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Az IBus indítása bejelentkezéskor"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Indulás</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Névjegy"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Bezárás"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Alrendszerek előtöltése"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Alrendszerek előtöltése  az ibus indításakor"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Alrendszerek sorrendje"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Mentett alrendszerek sorrendje a beviteli módok listájában"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Felugró ablak késleltetése az IME váltóablaknál"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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ésleltetését az IME váltóablaknál. Az "
-"alapértelmezett 400.0  =  Azonnal megjelenik.  0 &lt; Késleltetés "
-"ezredmásodpercben. 0 &gt; Nem jeleníti meg az ablakot, és átvált a következő/"
+"alapértelmezett 400.0  =  Ablak azonnali megjelenítése.  0 < Késleltetés "
+"ezredmásodpercben. 0 > Nem jeleníti meg az ablakot, és átvált a következő/"
 "előző alrendszerre."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Mentett verziószám"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -408,70 +71,122 @@ msgstr ""
 "A mentett verziószám arra lesz használva, hogy ellenőrizve legyen az "
 "előzőleg telepített ibus, és az ibus jelenlegi verziója közti különbség."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Latin kiosztások, amelyekben nincs ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "USA kiosztás a Latin kiosztások mögé fűzve. A változat elhagyható."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Xmodmap használata"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Az xmodmap futtatása, ha létezik .xmodmap vagy .Xmodmap fájl az ibus "
 "alrendszerváltáskor."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Rendszer billentyűzetkiosztásának használata"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "A rendszer billentyűzetkiosztásának (XKB) használata"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Előszerkesztett szöveg beágyazása"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Globális beviteli mód használata"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Azonos beviteli mód megosztása minden alkalmazás közt"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Beviteli mód engedélyezése alapértelmezésben"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+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"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "A DConf megőrzi a név előtagokat"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+"A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Gyorsbillentyűk aktiválása"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Aktiválja a gyorsbillentyűket a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Gyorsbillentyűk engedélyezése"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "A beviteli mód bekapcsolásához használt gyorsbillentyűk"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Gyorsbillentyűk letiltása"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "A beviteli mód kikapcsolásához használt gyorsbillentyűk"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Következő alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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ásához használt gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Előző alrendszer gyorsbillentyűi"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "A lista előző beviteli módjára váltásához használt gyorsbillentyű"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Automatikus elrejtés"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -479,23 +194,16 @@ msgstr ""
 "A tulajdonságpanel viselkedése. 0 = Nem jelenik meg, 1 = Automatikus "
 "elrejtés, 2 = Mindig látszik"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Nyelvi panel pozíciója"
 
-#: ../data/ibus.schemas.in.h:29
-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 nyelvi 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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "A bemeneti kurzor követése, ha a panel mindig megjelenik"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -503,11 +211,11 @@ msgstr ""
 "Ha igaz, akkor a panel követi a bemeneti kurzort abban az esetben, ha a "
 "panel mindig megjelenik. Ha hamis, akkor a panel egy fix helyen jelenik meg."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "A tulajdonságpanel megjelenítési ideje ezredmásodpercben"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -515,24 +223,33 @@ msgstr ""
 "Hány ezredmásodpercig jelenjen meg a tulajdonságpanel a fókuszálás, vagy a "
 "tulajdonságok változása után."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Kikeresési tábla tájolása"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Kikeresési tábla tájolása. 0 = vízszintes, 1 = függőleges"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Ikon megjelenítése az értesítési területen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Beviteli mód nevének megjelenítése"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Beviteli mód nevének megjelenítése a nyelvi eszköztáron"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Az XKB ikon RGBA értéke"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -550,11 +267,11 @@ msgstr ""
 "az „r”, „g” és „b” egész számok 0 és 255 között, vagy százalékos értékek 0% "
 "és 100% között, az „a” pedig az alfa lebegőpontos értéke 0 és 1 között."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "A panel ikon megjelenítési ideje egy tulajdonsághoz ezredmásodpercben"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -566,47 +283,48 @@ msgstr ""
 "van megadva az IBusEngineDesc-ben. Ha az érték 0, akkor nincs késleltetés, "
 "és a tulajdonságikon azonnal megjelenik."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Egyéni betűkészlet használata"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Egyéni betűkészlet használata a nyelv panelen"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Egyéni betűkészlet"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode gyorsbillentyű a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Gyorsbillentyű az Unicode bevitel ki- vagy bekapcsolásához"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emodzsi gyorsbillentyűket a  gtk_accelerator_parse részére"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Gyorsbillentyűk az emodzsi bevitel ki- vagy bekapcsolásához"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Egyéni emodzsi betűkészlet neve az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Emodzsi szótár alapértelmezett neve"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -615,30 +333,30 @@ msgstr ""
 "alapértelmezett nyelvét. A $lang érték ebbe lesz behelyettesítve: /usr/share/"
 "ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "kedvenc emodzsik listája az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 "Megjelenítheti a kedvenc emodzsijait a listában, ha vannak ilyen karakterek"
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "kedvenc emodzsik annotációinak listája az emodzsi párbeszédablakon"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Annotációkat adhat hozzá a kedvenc, listában szereplő emodzsijainak."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Az emodzsi annotációkra lehet-e részlegesen illeszteni"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -646,11 +364,11 @@ msgstr ""
 "Illeszthetőek-e részleges karakterláncokra az emodzsi annotációk, a pontos "
 "egyezés helyett"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Illesztés a megadott hosszúságú emodzsi annotációkra"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -658,11 +376,11 @@ msgstr ""
 "Az emodzsi annotációk részleges illesztése, a pontos egyezés helyett, ha "
 "több mint ennyi karakter lett megadva"
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Válasszon egy feltételt az emodzsi annotációk részleges illesztéséhez"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -671,11 +389,11 @@ msgstr ""
 "részleges illesztéséhez: 0 == szó elejére illesztés, 1 == szó végére "
 "illesztés, 2 == tartalmazási illesztés"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Emodzsi adatok betöltése indításkor"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -685,11 +403,11 @@ msgstr ""
 "szükséges az adatok betöltéséhez. Ha hamis, akkor az emodzsi adatok a "
 "párbeszédablak megnyitásakor lesznek betöltve."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Unicode adatok betöltése indításkor"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -701,2210 +419,2577 @@ msgstr ""
 "párbeszédablak megnyitásakor lesznek betöltve. A Unicode adatok mindenképpen "
 "az emodzsi adatok után lesznek betöltve, akkor is ha igaz."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Előszerkesztett szöveg beágyazása"
+#: ibus/_config.py.in:41
+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."
+
+#: ibus/lang.py:41 src/ibusutil.c:158
+msgid "Other"
+msgstr "Egyéb"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Válasszon nyelvet"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "Mé_gse"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Tovább…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Névjegy"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Bezárás"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Nyelv: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Billentyűzetkiosztás: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Szerző: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Leírás:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Válasszon beviteli módot"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "Hozzá_adás"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Beviteli mód"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Bill."
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus beállítások"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus beállítások megadása"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Gyorsbillentyűk"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Billentyűkód:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Módosítók:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Alkalmaz"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Törlés"
+
+#: setup/keyboardshortcut.py:252
+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).\n"
+"Az ablak a billentyű felengedésekor bezáródik."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli "
+"módra"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Az IBus démon nem fut. Elindítja?"
+
+#: setup/main.py:536
+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 ""
+"Az IBus elindult. Ha nem tudja használni az IBust, adja a következő sorokat "
+"a $HOME/.bashrc fájlhoz; majd jelentkezzen be újra.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: setup/main.py:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Az IBus démon nem indítható el %d másodpercen belül."
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s gyorsbillentyűjének kiválasztása"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "beviteli módok váltása"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Vízszintes"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Függőleges"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Bal felső sarok"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Jobb felső sarok"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Bal alsó sarok"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Jobb alsó sarok"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Egyéni"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Ne mutassa"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Automatikus elrejtés"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Mindig"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Gyorsbillentyűk a következő beviteli módra váltáshoz"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Következő beviteli mód:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Gyorsbillentyűk az előző beviteli módra való váltáshoz"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Előző beviteli mód:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Engedélyezés vagy tiltás:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Engedélyezés:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Letiltás:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Gyorsbillentyűk</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Jelöltek tájolásának beállítása a keresési táblában"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Jelöltek tájolása:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+"Az ibus viselkedésének megadása, hogyan jelenítse meg vagy rejtse el a "
+"nyelvi sávot"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Tulajdonságpanel megjelenítése:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Nyelvi panel elhelyezése:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"A beviteli mód nevének megjelenítése a nyelvi eszköztáron, ha be van jelölve "
+"a mező"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Előszerkesztett szöveg beágyazása az alkalmazás ablakába"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Előszerkesztett szöveg beágyazása az alkalmazásablakba"
+#: setup/setup.ui:513
+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"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Globális beviteli mód használata"
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Egyéni betűkészlet használata:"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Beviteli mód engedélyezése alapértelmezésben"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Betűkészlet és stílus</b>"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Általános"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
 msgstr ""
-"Beviteli mód engedélyezése alapértelmezésben, amikor az alkalmazás beviteli "
-"fókuszba kerül"
+"A kiválasztott beviteli mód hozzáadása az engedélyezett beviteli módokhoz"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "A DConf megőrzi a név előtagokat"
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Eltávolítás"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
+"A kiválasztott beviteli mód eltávolítása az engedélyezett beviteli módok "
+"közül"
 
-#: ../ibus/_config.py.in:41
-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."
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Fel"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Egyéb"
+#: setup/setup.ui:707
+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"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Válasszon nyelvet"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Le"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "Mé_gse"
+#: setup/setup.ui:725
+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"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_OK"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Névjegy"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Tovább…"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Információk megjelenítése a kiválasztott beviteli módról"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Nyelv: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "B_eállítások"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Billentyűzetkiosztás: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Jelenítse meg a kiválasztott beviteli mód beállításait"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Szerző: %s\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Az aktív beviteli mód a fenti listában szereplők közül állítható "
+"be, a gyorsbillentyűk megnyomásával, vagy a panel ikonra kattintva.</i></"
+"small>"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Leírás:\n"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Gyorsbillentyű az emodzsi annotációk vagy a Unicode nevek átalakításának "
+"engedélyezéséhez"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Válasszon beviteli módot"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emodzsi annotáció:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Bill."
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Gyorsbillentyű az Unicode kódpont-átalakítások engedélyezéséhez"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus beállítások megadása"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode kódpont:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Gyorsbillentyűk"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+"Unicode jelöltekből álló betűkészlet beállítása az emodzsi párbeszédablakon"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Billentyűkód:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode betűkészlet:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Módosítók:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Emodzsi annotációk nyelvének beállítása az emodzsi párbeszédablakon"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Alkalmaz"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Emodzsi annotációk nyelve:"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Törlés"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Az emodzsi annotációk részleges illesztése a következő feltétel szerint, ha "
+"több mint ennyi karakter lett megadva:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\n"
-"Az ablak a billentyű felengedésekor bezáródik."
+"Ha az emodzsi annotációkat részleges szövegre kell illeszteni, pontos "
+"egyezés helyett"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Előtag illeszkedés"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
-"Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli "
-"módra"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Utótag illeszkedés"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Az IBus démon nem fut. Elindítja?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Tartalmazó illeszkedés"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emodzsi"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Billentyűzetkiosztás</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globális bevitelimód-beállítások</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Speciális"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Az IBus elindult. Ha nem tudja használni az IBust, adja a következő sorokat "
-"a $HOME/.bashrc fájlhoz; majd jelentkezzen be újra.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-
-#. Translators: %d == 5 currently
-#: ../setup/main.py:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Az IBus démon nem indítható el %d másodpercen belül."
+"<big><b>IBus</b></big>\n"
+"<small>Az intelligens beviteli busz</small>\n"
+"Honlap: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s gyorsbillentyűjének kiválasztása"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Az IBus indítása bejelentkezéskor"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "beviteli módok váltása"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Indulás</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Tevékenységek"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Állatok és természet"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Összetevő"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Zászlók"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Étel és ital"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Tárgyak"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Hangulatjelek és emberek"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Emberek és test"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Hangulatjelek és érzelmek"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Szimbólumok"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Utazás és helyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Alap latin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Latin-1 kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latin bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latin bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA kiegészítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Térköz módosító betűk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Egyesítő diakritikus jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Görög és kopt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Cirill"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Cirill kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Örmény"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Héber"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Szír"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Arab kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Szamaritánus "
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandeus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Szír kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arab bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Dévanágari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengáli"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gudzsaráti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Orija"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malajálam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Szingaléz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibeti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Burmai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Grúz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangul jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Etióp"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Etióp kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cseroki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Egyesített kanadai őslakos szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Rúnák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Egyesített kanadai őslakos szótagírás bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Új Tai Lü"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Khmer szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginéz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Egyesítő diakritikus jelek bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinéz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Szundai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Cirill bővített – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Grúz bővített"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Szundai kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Védikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Fonetikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Fonetikus bővítések kiegészítése"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Egyesítő diakritikus jelek kiegészítése"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Latin további bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Görög bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Általános központozás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Alsó és felső index"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Pénznemek szimbólumai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Egyesítő diakritikus jelek szimbólumokhoz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Betűszerű szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Számalakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Nyilak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Matematikai operátorok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Egyéb műszaki jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Vezérlőkarakterek jelei"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optikai karakterfelismerés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Közrezárt alfanumerikus karakterek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Dobozrajzolás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Blokkelemek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Geometriai alakzatok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Egyéb szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Ábrácskák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Kiegészítő matematikai szimbólumok – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Kiegészítő nyilak A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Braille-jelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Kiegészítő nyilak B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Kiegészítő matematikai szimbólumok – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Kiegészítő matematikai operátorok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Egyéb szimbólumok és nyilak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolita"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Latin bővített – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Kopt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Grúz kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Etióp bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Cirill bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Központozási kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK radikális kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kang-hszi radikálisok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Képírásjel leíró karakterek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK szimbólumok és központozás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangul jamo kompatibilitás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK vonalak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Katakana fonetikus bővítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Közrezárt CJK betűk és hónapok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK kompatibilitás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK egyesített képírásjel kiegészítés – F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Ji csing hexagram szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "CJK egyesített képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi szótagok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi radikálisok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Cirill bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Módosító hangjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Latin bővített – D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Általános indiai számalakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Dévanágari bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangul jamo bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Jávai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Burmai bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Bburmai bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meetei Mayek kiegészítések"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Etióp bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Latin bővített – E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cseroki kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangul szótagok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangul jamo bővített – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Felső pótlások"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Felső pótlások személyes használatra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Alsó pótlások"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Személyes használatra kijelölt tartomány"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK kompatibilitási képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alfabetikus megjelenítési alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arab megjelenítési alakok – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Változatválasztók"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Függőleges alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Egyesítő féljelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK kompatibilitási alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Kisalakú változatok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arab megjelenítési alakok – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Fél- és teljes szélességű alakok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Különleges"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Lineáris B szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Lineáris B képírásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Égei számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Ógörög számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Ősi szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Phaisztoszi korong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lükiai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Kariai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Kopt epact számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Régi itáliai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gót"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Régi permi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugariti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Óperzsa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shaw-féle ábécé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Kaukázusi albaniai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Lineáris A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Ciprióta szótagírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Birodalmi arámi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmürai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabateus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Föníciai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lüd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroita hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroita dőlt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharosti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Régi déli arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Régi északi arab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manicheai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avesztán"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Feliratos pártus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Feliratos pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Zsoltáros pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Régi török"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Székely–magyar rovásírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi rohingja"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Rumi számszimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Régi szogd"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Szogd"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
 msgstr "Sinhala archaikus számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
 msgstr "Mongol kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
 msgstr "Zanabazar-féle négyzet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
 msgstr "Masaram-féle gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "Gunjalai gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "Makasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
 msgstr "Ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Ékírásos szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
 msgstr "Kora dinasztiai ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyiptomi hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatóliai hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
 msgstr "Bamum kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografikus szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
 msgstr "Tangut komponensek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
 msgstr "Kana kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
 msgstr "Kana bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
 msgstr "Gyorsírás formátum vezérlők"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
 msgstr "Bizánci zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
 msgstr "Zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
 msgstr "Ógörög zenei jelölés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "Maja számjegyek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
 msgstr "Számolórúd számjegyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematikai alfanumerikus szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
 msgstr "Sutton-féle jelnyelv"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
 msgstr "Glagolita kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "Indiai siyaq számjegyek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arab matematikai ábécészimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
 msgstr "Madzsong kövek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
 msgstr "Dominók"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
 msgstr "Játékkártyák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Közrezárt alfanumerikus kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
 msgstr "Közrezárt képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Egyéb szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
 msgstr "Emotikonok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
 msgstr "Díszítő apróságok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
 msgstr "Közlekedési és térkép szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
 msgstr "Alkímiai szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
 msgstr "Geometriai alakzatok bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
 msgstr "Kiegészítő nyilak C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Kiegészítő szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "Sakk szimbólumok"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK egyesített képírásjel kiegészítés – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK egyesített képírásjel kiegészítés – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK egyesített képírásjel kiegészítés – D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK egyesített képírásjel kiegészítés – E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK egyesített képírásjel kiegészítés – F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK kompatibilitási képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
 msgstr "Címkék"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
 msgstr "Variációválasztó kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
 msgstr "Kiegészítő személyes használatú terület A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
 msgstr "Kiegészítő személyes használatú terület B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Csak az alrendszerek nevének listázása"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Nem lehet csatlakozni a IBushoz.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "nyelv: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nincs alrendszer beállítva.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer beállítása.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Nem sikerült az általános alrendszer lekérése.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának olvasása."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának olvasása."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "A regisztrációs gyorsítótár érvénytelen.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "A rendszer regisztrációs gyorsítótárának írása."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "A rendszer regisztrációs FÁJLjának írása."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2912,174 +2997,169 @@ msgstr ""
 "A motor séma útvonalainak használata az ibus mag helyett, mely vesszővel "
 "elválasztott értékekből állhat."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Visszaállítás…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Kész"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Alrendszer beállítása vagy lekérése"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Kilépés az ibus-daemon-ból"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Elérhető alrendszerek megjelenítése"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Nincs megvalósítva)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Az ibus-daemon újraindítása"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Verzió megjelenítése"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "A regisztrációs gyorsítótár tartalmának megjelenítése"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Regisztrációs gyorsítótár létrehozása"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Az ibus-daemon D-Bus címének kiírása"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Beállítási értékek megjelenítése"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "A beállítási értékek visszaállítása"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Ezen információk megjelenítése"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Használat: %s PARANCS [KAPCSOLÓK…]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Parancsok:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s: ismeretlen parancs!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Többi"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Unicode választás megnyitása"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Írja be az annotációt, vagy válasszon emodzsit"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
 msgstr "Emodzsi választás visszahozása"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "Emodzsi változatok megjelenítése"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "Menü"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
 msgstr "Kattintson a figyelmeztető üzenet megtekintéséhez."
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode szótár betöltése:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódpont: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "Vannak emodzsi változatai"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "Nincs"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotációk: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
 msgstr "Álnév: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Emodzsi választás"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
 msgstr "Unicode választás"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3090,65 +3170,57 @@ msgstr ""
 "módból kilépéshez, kattintson az asztalra, majd újra a szöveges alkalmazásra."
 ""
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Emodzsi kiválasztás megszakítva."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Emodzsi vágólapra másolva."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„BETŰKÉSZLET” az emodzsiválasztó párbeszédablakon"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "BETŰKÉSZLET"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„NYELV”  az emodzsi párbeszédablak annotációhoz. Például „en”"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "NYELV"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Az emodzsi annotációkra lehet részlegesen illeszteni"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Illesztés a megadott egész számmal egyező hosszra"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Illesztés a megadott egész szám feltételével"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus panel"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus frissítés"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Most már a Super+Szóköz az alapértelmezett gyorsbillentyű."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 2012.\n"
@@ -3162,20 +3234,20 @@ msgstr ""
 "  Token https://launchpad.net/~kozmad\n"
 "  fergekolferol https://launchpad.net/~ferge-kolferol"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/ja.po b/po/ja.po
index 1e7475ca4..c1df19c08 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # Japanese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,497 +15,233 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-21 08:19+0000\n"
+"PO-Revision-Date: 2019-02-27 04:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.4.5\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 "Do not show"
-msgstr "表示しない"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>キーボードショートカット</b>"
-
-#: ../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 property panel:"
-msgstr "プロパティーパネルを表示する:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "言語パネルの位置"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "システムトレイにアイコンを表示する"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>フォントとスタイル</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "一般"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "追加(_A)"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "選択した入力メソッドを有効な入力メソッドへ追加します"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "削除(_R)"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "選択した入力メソッドを有効な入力メソッドから削除します"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "上へ(_U)"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "有効な入力メソッド一覧内で選択した入力メソッドを上へ移動させます"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "下へ(_D)"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "有効な入力メソッド一覧内で選択した入力メソッドを下へ移動させます"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "情報(_A)"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "選択した入力メソッドの情報を表示します"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "設定(_P)"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "選択した入力メソッドの設定を表示します"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</"
-"i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "入力メソッド"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "絵文字ルビまたは Unicode 名の変換を可能にするショートカットキー"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "絵文字ルビ:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Unicode コードポイント変換を可能にするショートかっトーキー"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode コードポイント:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "絵文字ダイアログ上の Unicode 候補のフォントを設定"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode フォント:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "絵文字ダイアログ上の絵文字ルビの言語を設定します"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "絵文字ルビの言語:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr "絵文字ルビを次の条件と文字数以上で部分一致させる:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることが可能かどうか"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "文頭一致"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "文末一致"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "文中一致"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "絵文字"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "システムのキーボードレイアウトを使用する"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "システムのキーボード (XKB) レイアウトを使用する"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>キーボードレイアウト</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>グローバル入力メソッドの設定</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "詳細"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>インテリジェントなインプットバス</small>\n"
-"ホームページ: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "ログイン時に IBus を起動"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>スタートアップ</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "情報"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "閉じる(_C)"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "プリロードエンジン"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "ibus 起動時のプリロードエンジン"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "エンジンの順序"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "入力メソッドの一覧の中から保存されたエンジンの順序"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 切り替えウィンドウのポップアップ遅延時間 (ミリ秒単位)"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
 "IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デフォルトは 400 ミリ秒です。「0 ="
-"」ならウィンドウが直ちに表示されます。「0 &lt;」にすると指定したミリ秒数遅延します。「0 "
-"&gt;」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
+"」ならウィンドウが直ちに表示されます。「0 <」にすると指定したミリ秒数遅延します。「0 "
+">」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "保存されているバージョン番号"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "ASCII を持たないラテンレイアウト"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US レイアウトはラテンレイアウトに追加されます。variant は省略可能です。"
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "xmodmap を使用する"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr "ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば xmodmap を実行します。"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "システムのキーボードレイアウトを使用する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "システムのキーボード (XKB) レイアウトを使用する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "前編集テキストを組み込む"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "グローバル入力メソッドを使用する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "すべてのアプリケーション間で同じ入力メソッドを共有する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "デフォルトで入力メソッドを有効にする"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf により名前のプレフィックスを維持する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "トリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "入力メソッドをオンまたはオフするためのショートカットキー"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のためのトリガーショートカットキー"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "ショートカットキーを有効にする"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "入力メソッドをオンに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "ショートカットキーを無効にする"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "入力メソッドをオフに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "次のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "一覧内の次の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "前のエンジンへのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "一覧内のひとつ前の入力メソッドに切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "自動的に隠す"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "言語パネルの位置"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "パネルが常に表示されている場合に入力カーソルに従う"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。false ならば、パネルは固定位置に表示されます。"
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "プロパティーパネルを表示するミリ秒"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミリ秒。"
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "検索テーブルの向き"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "検索テーブルの向きです。0 = 横、1 = 縦"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "システムトレイにアイコンを表示する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "入力メソッド名を表示する"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "言語バーに入力メソッド名を表示する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "XKB アイコンの RGBA 値"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -521,11 +257,11 @@ msgstr ""
 "0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 "
 "までの範囲内の浮動小数値のこと。"
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "プロパティー用にパネルアイコンを表示する遅延時間 (ミリ秒単位)"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -536,47 +272,48 @@ msgstr ""
 "の値に指定されている場合、エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にそのプロパティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が "
 "0 の場合、遅延無くプロパティーアイコンが即時に表示される。"
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "カスタムフォント"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のための Unicode ショートカットキー"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Unicode 入力の有効と無効を切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のための絵文字ショートカットキー"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "絵文字入力の有効と無効を切り替えるためのショートカットキー"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用のカスタムフォント名"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "絵文字辞書用のデフォルトの言語"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -584,1041 +321,1321 @@ msgstr ""
 "絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang は、/usr/share/ibus/dicts/emoji-$lang."
 "dict に適用されます。"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入り絵文字リスト"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入りの絵文字ルビリスト"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "このリストの中にお気に入りの絵文字用のルビを指定できます。"
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "絵文字ルビを部分一致させることを可能にするか否か"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "指定した長さで絵文字ルビを一致させる"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "絵文字ルビを部分一致させる条件を選ぶ"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr "絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文末一致、2 == 文中一致"
 
-#: ../data/ibus.schemas.in.h:67
-msgid "Load the emoji data at the time of startup"
-msgstr "起動時に絵文字データを読み込む"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr "起動時に絵文字データを読み込む"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"true の場合、起動時に絵文字データを読み込みます。約 10 MBメモリーがデータを読み込むために必要になります。false "
+"の場合、初めて絵文字ダイアログを開く時に絵文字データを読み込みます。"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr "起動時に Unicode データを読み込む"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"true の場合、起動時に Unicode データを読み込みます。約 15 MB メモリーがデータを読み込むために必要になります。false "
+"の場合、初めて絵文字ダイアログを開く時に Unicode データを読み込みます。true の場合、常に絵文字データが読み込まれた後で、Unicode "
+"データが読み込まれます。"
+
+#: ibus/_config.py.in:41
+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."
+
+#: ibus/lang.py:41 src/ibusutil.c:158
+msgid "Other"
+msgstr "その他"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "言語の選択"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "OK(_O)"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "さらに…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "情報"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "言語: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "キーボードレイアウト: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "説明:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "入力メソッドの選択"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "追加(_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "入力メソッド"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus の設定"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus を設定します"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "キーボードショートカット"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "キーコード:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "修飾キー:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "適用(_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "削除(_D)"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "キーもしくはキーの組み合わせを入力してください"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus デーモンが実行されていません。起動しますか？"
+
+#: setup/main.py:536
+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 は起動されています。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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s のキーボードショートカットを選択"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "入力メソッドの切り替え中"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "横"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "縦"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "左上"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "右上"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "左下"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "右下"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "カスタム"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "表示しない"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "自動的に隠す"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "常に表示する"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "一覧内の次の入力メソッドに切り替えるためのショートカットキー"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "次の入力メソッド:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "一覧内のひとつ前の入力メソッドに切り替えるためのショートカットキー"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "ひとつ前の入力メソッド:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "切り替え"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "有効:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "無効:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>キーボードショートカット</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ルックアップテーブルの中で候補ウィンドウの向きを設定します"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "候補ウィンドウの向き:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "言語バーをどのように表示するもしくは隠すかの ibus の動作を設定します"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "プロパティーパネルを表示する:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "言語パネルの位置"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "チェックボックスにチェック付けると、言語バーに入力メソッド名が表示されます"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "アプリケーションウィンドウに前編集テキストを組み込む"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "アプリケーションウィンドウに入力メソッドのプリエディットテキストを組み込みます"
 
-#: ../data/ibus.schemas.in.h:68
-msgid ""
-"Load the emoji data at the time of startup if true. About 10MB memory is "
-"needed to load the data. Load the emoji data when open the emoji dialog at "
-"the beginning if false."
-msgstr ""
-"true の場合、起動時に絵文字データを読み込みます。約 10 MBメモリーがデータを読み込むために必要になります。false "
-"の場合、初めて絵文字ダイアログを開く時に絵文字データを読み込みます。"
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "カスタムフォントを使う:"
 
-#: ../data/ibus.schemas.in.h:69
-msgid "Load the Unicode data at the time of startup"
-msgstr "起動時に Unicode データを読み込む"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>フォントとスタイル</b>"
 
-#: ../data/ibus.schemas.in.h:70
-msgid ""
-"Load the Unicode data at the time of startup if true. About 15MB memory is "
-"needed to load the data. Load the Unicode data when open the emoji dialog at "
-"the beginning if false. The Unicode data is always loaded after the emoji "
-"data is loaded even if true."
-msgstr ""
-"true の場合、起動時に Unicode データを読み込みます。約 15 MB メモリーがデータを読み込むために必要になります。false "
-"の場合、初めて絵文字ダイアログを開く時に Unicode データを読み込みます。true の場合、常に絵文字データが読み込まれた後で、Unicode "
-"データが読み込まれます。"
+#: setup/setup.ui:579
+msgid "General"
+msgstr "一般"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "前編集テキストを組み込む"
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "選択した入力メソッドを有効な入力メソッドへ追加します"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "アプリケーションウィンドウに前編集テキストを組み込みます"
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "削除(_R)"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "グローバル入力メソッドを使用する"
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "選択した入力メソッドを有効な入力メソッドから削除します"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "デフォルトで入力メソッドを有効にする"
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "上へ(_U)"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "有効な入力メソッド一覧内で選択した入力メソッドを上へ移動させます"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf により名前のプレフィックスを維持する"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "下へ(_D)"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "名前の変換を阻止する DConf キーのプレフィックスです"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "有効な入力メソッド一覧内で選択した入力メソッドを下へ移動させます"
 
-#: ../ibus/_config.py.in:41
-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."
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "情報(_A)"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "その他"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "選択した入力メソッドの情報を表示します"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "言語の選択"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "設定(_P)"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "選択した入力メソッドの設定を表示します"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "OK(_O)"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</"
+"i></small>"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "さらに…"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "絵文字ルビまたは Unicode 名の変換を可能にするショートカットキー"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "言語: %s\n"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "絵文字ルビ:"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "キーボードレイアウト: %s\n"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Unicode コードポイント変換を可能にするショートかっトーキー"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者: %s\n"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode コードポイント:"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "説明:\n"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "絵文字ダイアログ上の Unicode 候補のフォントを設定"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "入力メソッドの選択"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode フォント:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "絵文字ダイアログ上の絵文字ルビの言語を設定します"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus を設定します"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "絵文字ルビの言語:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "キーボードショートカット"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr "絵文字ルビを次の条件と文字数以上で部分一致させる:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "キーコード:"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることが可能かどうか"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "修飾キー:"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "文頭一致"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "適用(_A)"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "文末一致"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "削除(_D)"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "文中一致"
 
-#: ../setup/keyboardshortcut.py:252
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr "キーもしくはキーの組み合わせを入力してください。\n"
-"キーを離すとダイアログを閉じます。"
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "絵文字"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "キーもしくはキーの組み合わせを入力してください"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>キーボードレイアウト</b>"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>グローバル入力メソッドの設定</b>"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus デーモンが実行されていません。起動しますか？"
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "詳細"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
+"<big><b>IBus</b></big>\n"
+"<small>インテリジェントなインプットバス</small>\n"
+"ホームページ: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s のキーボードショートカットを選択"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "ログイン時に IBus を起動"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "入力メソッドの切り替え中"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>スタートアップ</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "活動"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "動物と自然"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "構成要素"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "国旗"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "食べ物と飲み物"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "物体"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "スマイリーと人々"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "人と体"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "顔文字と感情"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "記号"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "旅行と場所"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "基本ラテン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "ラテン1補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "ラテン文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "ラテン文字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA 拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "前進を伴う修飾文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "ダイアクリティカルマーク (合成可能)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "ギリシア文字及びコプト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "キリール文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "キリール文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "アルメニア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "ヘブライ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "アラビア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "シリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "アラビア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "ターナ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "ンコ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "サマリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "マンダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "シリア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "アラビア文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "デーヴァナーガリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "ベンガル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "グルムキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "グジャラート文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "オリヤー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "タミル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "テルグ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "カンナダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "マラヤーラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "シンハラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "タイ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "ラオス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "チベット文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "ミャンマー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "グルジア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "ハングル字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "エチオピア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "エチオピア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "チェロキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "統合カナダ先住民音節"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "オガム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "ルーン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "タガログ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "ハヌノオ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "ブヒッド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "タグバヌア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "クメール文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "モンゴル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "統合カナダ先住民音節拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "リンブ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "タイ ロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "新タイ ロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "クメール文字用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "ブギス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "ラーンナー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "ダイアクリティカルマーク (合成可能) 拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "バリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "スンダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "バタク文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "レプチャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "オル・チキ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "キリール文字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "グルジア文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "スンダ文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "ヴェーダ文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "音声記号拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "音声記号拡張補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "ダイアクリティカルマーク (合成可能) 補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "ラテン文字拡張追加"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "ギリシア文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "一般句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "上付き・下付き"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "通貨記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "記号用ダイアクリティカルマーク (合成可能)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "文字様記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "数字に準じるもの"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "矢印"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "数学記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "その他の技術用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "制御機能用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "光学的文字認識、OCR"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "囲み英数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "けい線素片"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "ブロック要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "幾何学模様"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "その他の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "装飾記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "その他の数学記号 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "補助矢印 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "点字図形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "補助矢印 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "その他の数学記号 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "補助数学記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "その他の記号及び矢印"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "グラゴル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "ラテン文字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "コプト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "グルジア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "ティフナグ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "エチオピア文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "キリール文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "補助句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK 部首補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "康熙部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "漢字構成記述文字、IDC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "平仮名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "片仮名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "注音字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "ハングル互換字母"
 
@@ -1627,182 +1644,182 @@ msgstr "ハングル互換字母"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "漢文用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "注音字母拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK の筆画"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "片仮名拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "囲み CJK 文字・月"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK 互換用文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK 統合漢字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "易経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "CJK 統合漢字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "イ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "イ文字部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "リス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "ヴァイ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "キリール文字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "バムン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "声調修飾文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "ラテン文字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "シロティナグリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "共通インド数字に準じるもの"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "パスパ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "サウラーシュトラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "デーヴァナーガリー文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "カヤー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "ルジャン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "ハングル字母拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "ジャワ文字"
 
@@ -1810,77 +1827,77 @@ msgstr "ジャワ文字"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "ミャンマー文字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "チャム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "ミャンマー文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "タイ・ヴェト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "マニプリ文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "エチオピア文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "ラテン文字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "チェロキー文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "マニプリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "ハングル音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "ハングル字母拡張 B"
 
@@ -1888,1153 +1905,1218 @@ msgstr "ハングル字母拡張 B"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "上位代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "上位私用代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "下位代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "私用領域"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK 互換漢字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "アルファベット表示形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "アラビア表示形 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "字形選択子"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "縦書き形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "半記号 (合成可能)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK 互換形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "小字形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "アラビア表示形 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "半角・全角形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "特殊用途文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "線文字 B 音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "線文字 B 表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "エーゲ数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "古代ギリシア数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "古代記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "ファイストスの円盤の文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "リキア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "カリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "コプト・エパクト数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "古代イタリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "ゴート文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "古代ペルム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "ウガリト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "古代ペルシャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "デザレット文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "シェイヴィアン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "オスマニア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "オセージ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "エルバサン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "カフカース・アルバニア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "線文字 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "キプロス音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "アラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "パラミラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "ナバテア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "ハトラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "フェニキア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "リディア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "メロエ記念碑文体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "メロエ草書体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "カローシュティー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "古典南アラビア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "古典北アラビア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "マニ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "アヴェスター文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "碑文パルティア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "碑文パフラヴィー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "聖詠パフラヴィー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "古テュルク文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "ロヴァーシュ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "ハニーフィー・ロヒンギャ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "ルーミー数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "旧ソグド文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "ソグド文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
 msgstr "ブラーフミー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
 msgstr "カイティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
 msgstr "ソラ・ソンペン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
 msgstr "チャクマ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
 msgstr "マハージャニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
 msgstr "シャラダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
 msgstr "シンハラ旧数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
 msgstr "ホジャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
 msgstr "ムルターニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
 msgstr "フダーワーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
 msgstr "グランタ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
 msgstr "ネワ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
 msgstr "ティルフータ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
 msgstr "悉曇文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
 msgstr "モーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
 msgstr "モンゴル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
 msgstr "タクリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
 msgstr "アーホム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "ドーグリー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
 msgstr "ワラング・クシティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
 msgstr "ザナバザル方形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
 msgstr "ソヨンボ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
 msgstr "パウ・チン・ハウ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
 msgstr "バイクシュキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
 msgstr "マルチェン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
 msgstr "マサラム・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "グンジャラ・ゴーンディー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "マカサル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
 msgstr "くさび形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "くさび形文字の数字及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
 msgstr "シュメール楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
 msgstr "ヒエログリフ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
 msgstr "アナトリア・ヒエログリフ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
 msgstr "バムン文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
 msgstr "ムロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
 msgstr "バサ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
 msgstr "パハウ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "メデファイドリン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
 msgstr "ポラード文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
 msgstr "漢字の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
 msgstr "西夏文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
 msgstr "西南文字の構成要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
 msgstr "仮名文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
 msgstr "仮名文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
 msgstr "女書"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
 msgstr "デュプロワイエ式速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
 msgstr "速記書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
 msgstr "ビザンチン音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
 msgstr "音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
 msgstr "古代ギリシア音符記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "マヤ数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
 msgstr "太玄経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
 msgstr "算木用数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
 msgstr "サットン手話表記法"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
 msgstr "グラゴル文文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
 msgstr "メンデ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
 msgstr "アドラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "インド・シヤク数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "アラビア数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
 msgstr "麻雀牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
 msgstr "ドミノ牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
 msgstr "トランプ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "囲み英数字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
 msgstr "囲み表意文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "その他の記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
 msgstr "顔文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
 msgstr "オーナメント"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
 msgstr "交通と地図の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
 msgstr "錬金術記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
 msgstr "幾何学模様拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
 msgstr "補助矢印 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
 msgstr "補助記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "チェス記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK 統合漢字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK 統合漢字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK 統合漢字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK 統合漢字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK 統合漢字拡張 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK 互換漢字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
 msgstr "字形選択子補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
 msgstr "補助私用領域 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
 msgstr "補助私用領域 B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "エンジン名のみ表示"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "IBus に接続できません。\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "言語: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "エンジンが設定されていません。\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "グローバルエンジンの設定に失敗しました。\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "グローバルエンジンの取得に失敗しました。\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "システムレジストリーキャッシュを読み込みます。"
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を読み込みます。"
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "レジストリーキャッシュは無効です。\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "システムレジストリーキャッシュを書き込みます。"
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込みます。"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr "ibus コアの代わりにエンジンのスキーマパスを使用し、コンマで区切られた値が可能です。"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "初期化中…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "完了"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "設定値を表示する"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "設定値を初期化する"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "ダイアログ上の絵文字をクリップボードに保存する"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "使い方: %s コマンド [オプション...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "その他"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Unicode の選択を開く"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "ルビを入力するか絵文字を選択してください"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
 msgstr "絵文字の選択に戻る"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "絵文字異形を表示する"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
 msgstr "閉じる"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "メニュー"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
 msgstr "警告メッセージを閲覧するためにクリックしてください"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode の辞書を読み込んでいます:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "なし"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
 msgstr "別名: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
 msgstr "Unicode の選択"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3043,65 +3125,57 @@ msgstr ""
 "現在のテキストアプリケーションを取得するのに失敗しました。アプリケーションを再フォーカスさせてください。例えば、Esc "
 "キーを数回入力して絵文字入力モードを開放し、デスクトップをクリックして、テキストアプリケーションを再度クリックしてください。"
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "絵文字の選択を取り消しました。"
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "クリップボードに絵文字をコピーしました。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "フォント"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "言語"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "指定した数字をもつ長さで一致させる"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus の更新"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space が現在のデフォルトのホットキーです。"
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -3109,20 +3183,20 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "終了"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/nl.po b/po/nl.po
index 739a88dde..b12ff2ab6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,396 +11,60 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Geert Warrink <geert.warrink@onsnet.nu>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Geert Warrink <geert.warrink@onsnet.nu>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-07-16 03:25+0000\n"
+"PO-Revision-Date: 2019-02-27 09:25+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.5.0\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horizontaal"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Verticaal"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Linksboven"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Rechtsboven"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Linksonder"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Rechtsonder"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Aangepast"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Toon dit niet"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Automatisch verbergen"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Altijd"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus voorkeuren"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Volgende invoermethode:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Vorige invoermethode:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Aan- of uitzetten:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Aanzetten:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Uitzetten:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Sneltoetsen</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Stel de oriëntatie in van de kandidaten in de opzoektabel"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Kandidaten oriëntatie:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Toon eigenschapspaneel"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Taal panel positie:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Toon icoon op systeemvak"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Toon naam van invoermethode op taalbalk"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Insluiten van pre-edit tekst in toepassingsvenster"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Gebruik aangepast lettertype:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Lettertype en stijl</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Algemeen"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Toevoegen"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Verwijderen"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Omhoog"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Verplaats de geselecteerde invoermethode omhoog in de aangezette "
-"invoermethoden lijst"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "O_mlaag"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Verplaats de geselecteerde invoermethode omlaag in de aangezette "
-"invoermethoden lijst"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "I_nfo"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Toon informatie over de geselecteerde invoermethode"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Voorkeuren"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Toon instelling van de geselecteerde invoermethode"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>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.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Invoermethode"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-"De sneltoetsen voor het aanzetten van conversies van emoji annotaties of "
-"Unicode"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Emoji annotatie:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "De sneltoetsen voor het aanzetten van Unicode code punt conversies"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode code punt:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Stel een lettertype van Unicode kandidaten in op de emoji dialoog"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode lettertype:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Zet een taal met emoji annotaties op de emoji dialoog"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Emoji annotatietaal:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Match emoji annotaties gedeeltelijk met de volgende conditie en meer dan het "
-"aantal karakters:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Als emoji annotaties gematched kunnen worden met een gedeeltelijke string in "
-"plaats van de exacte match"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Voorvoegsel match"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Achtervoegsel match"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Inhoudelijke match"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Gebruik systeem toetsenbordindeling"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Gebruik systeem toetsenbord (XKB) indeling"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Toetsenbordindeling</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Deel dezelfde input-methode voor alle toepassingen"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globale invoermethode instellingen</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<bib><b>IBus</b></big>\n"
-"<small>De intelligente invoer bus</small>\n"
-"Homepagina: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Start ibus bij inloggen"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Opstarten</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Over"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "Sl_uiten"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Engines voor-laden"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Engines voor-laden tijdens opstarten van ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Machine volgorde"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Opgeslagen machine volgorde in invoermethode lijst"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Pop-up vertraging milliseconden voor IME omschakelvenster"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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 &lt; Vertraging in "
-"milliseconden. 0 &gt; Laat het venster niet zien  en schakel vorige/volgende "
+"Stel pop-up vertraging in op milliseconden 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:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Versienummer opgeslagen"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -409,74 +73,123 @@ msgstr ""
 "verschil tussen de versie van de vorige geïnstalleerde ibus en die van de "
 "huidige ibus. "
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Latin indelingen hebben geen ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "US indeling is toegevoegd aan de Latin indelingen. variant kan weggelaten "
 "worden."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Gebruik xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Voer xmodmap uit als .xmodmap of .Xmodmap bestaat als ibus engines worden "
 "omgeschakeld."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Gebruik systeem toetsenbordindeling"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Gebruik systeem toetsenbord (XKB) indeling"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Voeg pre-edit tekst in"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Voeg pre-edit tekst in in toepassingsvenster"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Gebruik globale invoermethode"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Deel dezelfde input-methode voor alle toepassingen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Zet invoer-methode standaard aan"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf behoud van naam voorvoegsels"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Trigger sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "De sneltoetsen om invoermethode aan of uit te zetten"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activeer snelkoppeltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Zet sneltoetsen aan"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "De sneltoetsen om invoermethode aan te zetten"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Zet sneltoetsen uit"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "De sneltoetsen om invoermethode uit te zetten"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Volgende engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Vorige engine sneltoetsen"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "De sneltoetsen voor het omschakelen naar de vorige invoermethode"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Automatisch verbergen"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -484,23 +197,16 @@ msgstr ""
 "Het gedrag van eigenschapspaneel. 0 = Toon dit niet, 1 = Automatisch "
 "verbergen, 2 = Toon het altijd"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Taal-paneel positie"
 
-#: ../data/ibus.schemas.in.h:29
-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"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Volg de input cursor als het paneel altijd getoond wordt"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -509,11 +215,11 @@ msgstr ""
 "getoond wordt. Als dit onwaar is wordt het paneel op een gefixeerde locatie "
 "getoond."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Het aanral milliseconden om het eigenschapspaneel te tonen "
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -521,24 +227,33 @@ msgstr ""
 "Het aantal milliseconden om het eigenschapspaneel te tonen nadat focus of "
 "eigenschappen veranderd zijn."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Oriëntatie van opzoektabel"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Oriëntatie van opzoektabel. 0 = horizontaal, 1 = verticaal"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Toon icoon op systeemvak"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Toon naam van invoermethode"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Toon naam van invoermethode op taalbalk"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "RGBA waarde van XKB icoon"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -557,12 +272,12 @@ msgstr ""
 "reeks van 0% tot 100%, en 'a' een waarde met drijvende komma is in de reeks "
 "van 0 tot 1 van alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 "Het aantal milliseconden om het paneelicoon van een eigenschap te tonen"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -575,47 +290,48 @@ msgstr ""
 "waarde 0 is, is er geen delay en wordt de eigenschapicoon onmiddellijk "
 "getoond."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Gebruik aangepast lettertype"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Gebruik aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Aangepaste lettertype"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Aangepaste lettertype naam voor taal-paneel"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode sneltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "De sneltoetsen voor het aan of uit zetten van Unicode typen"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji sneltoetsen voor gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "De sneltoetsen om emoji typen aan of uit te zetten"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Aangepaste lettertype naam voor emoji karakters op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Standaard taal voor emoji woordenboek"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -623,11 +339,11 @@ msgstr ""
 "Kies een standaard taal met emoji woordenboeken op de emoji dialoog. De "
 "waarde $lang wordt toepast in /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "favoriete emoji lijst op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -635,20 +351,20 @@ msgstr ""
 "Je kunt de favoritee emojis op emoji lijst tonen als deze lijst karakters "
 "heeft."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favoriete emoji annotatielijst op de emoji dialoog"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "Je kunt in deze lijst een annotatie toekennen aan een favoriete emoji."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Worden emoji annotaties wel of niet gedeeltelijk gematched"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -656,11 +372,11 @@ msgstr ""
 "Worden emoji annotaties wel of niet gematched met een gedeeltelijke string "
 "in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji annotaties met de gespecificeerde lengte"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -668,11 +384,11 @@ msgstr ""
 "Match emoji annotaties gedeeltelijk met meer dan het gespecificeerde aantal "
 "karakters in plaats van de exacte match."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Kies een conditie om emoji annotaties gedeeltelijk te matchen"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -681,11 +397,11 @@ msgstr ""
 "matchen: 0 == Voorvoegsel match, 1 == Achtervoegel match, 2 == Inhoudelijke "
 "match"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Laad de emoji data tijdens het opstarten"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -695,11 +411,11 @@ msgstr ""
 "geheugen nodig om de data te laden. Laad de emoji data bij het openen van "
 "het begin van de emoji dialoog indien onwaar."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Laad de Unicode data tijdens het opstarten"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -711,2207 +427,2576 @@ msgstr ""
 "het begin van de emoji dialoog indien onwaar. De Unicode data wordt altijd "
 "geladen na het laden van de emoji data zelfs bij waar. "
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Voeg pre-edit tekst in"
+#: ibus/_config.py.in:41
+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."
+
+#: ibus/lang.py:41 src/ibusutil.c:158
+msgid "Other"
+msgstr "Andere"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selecteer een taal"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_Ok"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Meer…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Over"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "Sl_uiten"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Taal: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Toetsenbordindeling: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Auteur: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beschrijving:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Selecteer een invoermethode"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Invoermethode"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Toetsenbord"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus voorkeuren"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Stel IBus voorkeuren in"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Sneltoetsen"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Toetscode:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modificatietoetsen:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "Toe_passen"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Verwijderen"
+
+#: setup/keyboardshortcut.py:252
+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).\n"
+"De dialoog wordt afgesloten als de toets losgelaten wordt."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Druk op een toets (of een toetsencombinatie)"
+
+#: setup/main.py:121 setup/main.py:588
+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:515
+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:536
+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 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:550
+#, 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:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selecteer sneltoets voor %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "bezig met omschakelen van invoermethodes "
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontaal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Verticaal"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Linksboven"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Rechtsboven"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Linksonder"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Rechtsonder"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Aangepast"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Toon dit niet"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Automatisch verbergen"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Altijd"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Volgende invoermethode:"
+
+#: setup/setup.ui:127
+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"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Vorige invoermethode:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Aan- of uitzetten:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Aanzetten:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Uitzetten:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Sneltoetsen</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Stel de oriëntatie in van de kandidaten in de opzoektabel"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Kandidaten oriëntatie:"
+
+#: setup/setup.ui:407
+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"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Toon eigenschapspaneel"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Taal panel positie:"
+
+#: setup/setup.ui:494
+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"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Voeg pre-edit tekst in in toepassingsvenster"
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Insluiten van pre-edit tekst in toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Gebruik globale invoermethode"
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+"Sluit de pre-edit tekst van invoermethode in in het toepassingsvenster"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Zet invoer-methode standaard aan"
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Gebruik aangepast lettertype:"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr "Zet invoer-methode standaard aan als de toepassing input focus krijgt"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Lettertype en stijl</b>"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf behoud van naam voorvoegsels"
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Algemeen"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Voorvoegsels van DConf sleutels voor het stoppen van naamconversie"
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden"
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Verwijderen"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+"Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Andere"
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Omhoog"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Selecteer een taal"
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Verplaats de geselecteerde invoermethode omhoog in de aangezette "
+"invoermethoden lijst"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Annuleren"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "O_mlaag"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_Ok"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Verplaats de geselecteerde invoermethode omlaag in de aangezette "
+"invoermethoden lijst"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Meer…"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "I_nfo"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Taal: %s\n"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Toon informatie over de geselecteerde invoermethode"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Toetsenbordindeling: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Voorkeuren"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Auteur: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Toon instelling van de geselecteerde invoermethode"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Beschrijving:\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>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.</i></small>"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Selecteer een invoermethode"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"De sneltoetsen voor het aanzetten van conversies van emoji annotaties of "
+"Unicode"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Toetsenbord"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emoji annotatie:"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Stel IBus voorkeuren in"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "De sneltoetsen voor het aanzetten van Unicode code punt conversies"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Sneltoetsen"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode code punt:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Toetscode:"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Stel een lettertype van Unicode kandidaten in op de emoji dialoog"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modificatietoetsen:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode lettertype:"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "Toe_passen"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Zet een taal met emoji annotaties op de emoji dialoog"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Verwijderen"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Emoji annotatietaal:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1062
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
 msgstr ""
-"Druk op een toets (of een toetsencombinatie).\n"
-"De dialoog wordt afgesloten als de toets losgelaten wordt."
-
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Druk op een toets (of een toetsencombinatie)"
+"Match emoji annotaties gedeeltelijk met de volgende conditie en meer dan het "
+"aantal karakters:"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Gebruik snelkoppeling met Shift voor het omschakelen naar de vorige "
-"invoermethode"
+"Als emoji annotaties gematched kunnen worden met een gedeeltelijke string in "
+"plaats van de exacte match"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "De IBus daemon draait niet. Wil je het starten?"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Voorvoegsel match"
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Achtervoegsel match"
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Inhoudelijke match"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Toetsenbordindeling</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globale invoermethode instellingen</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Geavanceerd"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
+"<bib><b>IBus</b></big>\n"
+"<small>De intelligente invoer bus</small>\n"
+"Homepagina: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selecteer sneltoets voor %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Start ibus bij inloggen"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "bezig met omschakelen van invoermethodes "
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Opstarten</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Activiteiten"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Dieren & Natuur"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Onderdeel"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Vlaggen"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Voedsel & Drank"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objecten"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Smileys & Mensen"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Mensen & Lichaam"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Smileys & Emotie"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symbolen"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Reizen & Plaatsen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Basis Latijn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Latijns-1 supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latijns uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latijns uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA-uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Letterafstand veranderen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Diakritische kenmerken combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Grieks en Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Cyrillisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Armeens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syrisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Arabisch supllement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Syrisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arabisch uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengalees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Singalees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Laotiaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibetaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Georgisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Ethiopisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Ethiopisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Verenigde Canadese Aboriginal syllabics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongools"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Verenigde Canadese Aboriginal syllabisch uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Nieuw Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Khmer symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginese"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Diakritische tekens voor symbolen combineren uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundanese"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Cyrillisch uitgebreid-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Georgisch uitgebreid"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Soendanees supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Vedic uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Fonetische uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Fonetische uitbreidingen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Diakritische tekens voor symbolen combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Latijns uitbreidingen extra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Griekse uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Aalgemene interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Superscripts en subscripts"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Valutasymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Diakritische tekens voor symbolen combineren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Letterachtige symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Nummerformulieren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Pijlen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Wiskundige operators"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Diversen technisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Controle afbeeldingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optische tekenherkenning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Ingesloten alfanumeriek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Vak tekening"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Vak elementen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Geometrische vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Diverse symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Diverse wiskundige symbolen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Aanvullende pijlen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Braille patronen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Aanvullende pijlen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Diverse wiskundige symbolen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Aanvullende wiskundige operators"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Diverse symbolen en pijlen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolitisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Latijns uitgebreid-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Gregoriaans supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Ethiopische uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Cyrillisch uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Aanvullende interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK radicalen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kangxi radicalen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Ideografische beschrijvingkarakters"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK symbolen en interpumctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangul-compatibiliteit Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK-slagen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Katakana fonetische extensies"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Ingesloten CJK letters en maanden"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK compatibiliteit"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK uniforme ideografen extensie A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Yijing Hexagram-symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "CJK uniforme ideografen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi lettergrepen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi radicalen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Cyrillisch uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Modificatie toon letters"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Latijns uitgebreid-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Gemeenschappelijke Indic nummerformaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangul Jamo uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Myanmar uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Myanmar uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meetei Mayek uitbreidingen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Ethiopische uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Latijns uitgebreid-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cherokee-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangul lettergrepen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangul Jamo uitgebreid-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Hoge surrogaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Surrogaten met een hoog privégebruik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Lage surrogaten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Privé-gebruik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK compatibiliteit ideografen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alfabetische presentatievormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arabische presentatievormen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Variatie selectoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Verticale vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Combinatie van halve cijfers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK compatibiliteit vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Kleine vormvarianten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arabische presentatievormen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Halfbreedte en volledige breedte vormen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Bijzonderheden"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Lineaire B syllabarie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Lineaire B ideogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Egeïsche getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Oud Griekse getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Oude symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Phaistos schijf"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lycian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Carian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Koptische Epact-getallen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Oud Italiaans"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Oud Permisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugaritisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Oud Perzisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Kaukasische Albanees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Lineaire A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Cypriotisch syllabary"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Imperiaal Aramees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmyrene"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabatees"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Fenicisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lydian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroïtische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroïtisch  cursief"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Oud Zuid-Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Oud Noord-Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manichaean"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Inscriptioneel Parthian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Inscriptioneel Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Psalter Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Oud-Turks"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Oud-Hongaars"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi Rohingya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Rumi numerieke symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Old Sogdian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
 msgstr "Archaïsche getallen van Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
 msgstr "Mongools supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
 msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "Gunjala Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "Makasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
 msgstr "Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cuneiform getallen en interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
 msgstr "Vroeg-dynastic Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyptische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatolische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
 msgstr "Bamum supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografische symbolen en interpunktie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
 msgstr "Tangut onderdelen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
 msgstr "Kana supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
 msgstr "Kana uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
 msgstr "Steno formaatcontrole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantijnse muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
 msgstr "Muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
 msgstr "Oude Griekse muzieknotatie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "Mayan Numerals"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
 msgstr "Telpaal cijfers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Wiskundige alfanumerieke symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
 msgstr "Sutton tekenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "Indic Siyaq Nummers"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabische wiskundige alfabetische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
 msgstr "Mahjong stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
 msgstr "Domino stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
 msgstr "Speelkaarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Ingesloten alfanumeriek supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
 msgstr "Ingesloten ideografisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
 msgstr "Emoticons"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
 msgstr "Ornamentele dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
 msgstr "Transport- en kaartsymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
 msgstr "Alchemistische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
 msgstr "Geometrische vormen uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
 msgstr "Supplementaire pijlen-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Supplementaire symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "Schaaksymbolen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK uniforme ideografen extensie B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK uniforme ideografen extensie C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK uniforme ideografen extensie D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK uniforme ideografen extensie E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK uniforme ideografen extensie F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK compatibiliteit ideografen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
 msgstr "Variatie selectoren supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
 msgstr "Supplementair privé gebruiksgebied-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
 msgstr "Supplementair privé gebruiksgebied-B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Toon alleen machinenamen"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan niet met IBus verbinden.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "taal:%s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Er is geen machine ingesteld.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Instellen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Verkrijgen van globale machine is mislukt.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lees de systeem registry cache."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lees het registry cache BESTAND."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "De registry cache is ongeldig.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Schrijf de systeem registry cache."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2919,174 +3004,169 @@ msgstr ""
 "Gebruik engine schemapaden in plaats van ibus core, welde door komma's "
 "gescheiden waardes kunnen zijn."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Herstellen…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Klaar"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Toon de configuratiewaarden"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Herstel de configuratiewaarden"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Sla emoji op dialoog  op naar clipboard "
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Andere"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Open Unicode keuze"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Typeannotatie of kies emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
 msgstr "Bring de emoji keuze terug"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "Pagina naar beneden"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "Pagina omhoog"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "Toon emoji varianten"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
 msgstr "Klik om een waarschuwingsboodschap te bekijken"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
 msgstr "Een Unicode woordenboek wordt geladen:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "Code punt: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "Heeft emoji varianten"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "Geen"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotaties: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Emoji keuze"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
 msgstr "Unicode keuze"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3097,82 +3177,74 @@ msgstr ""
 "voor het vrijgeven van de emoji type modus, klik op je bureaublad en klik "
 "opnieuw op de teksttoepassing."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Annuleer het kiezen van een emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Een emoji naar je clipboard gecopieerd."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" voor emoji karakters op emoji dialoog"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"TAAL\" voor annotaties op emoji dialoog. B.v. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "TAAL"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji annotaties kunnen gedeeltelijk gematched worden"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Match met de lengte van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Match met de conditie van het gespecificeerde geheel getal"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus Paneel"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus update"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+spatie is nu de standaard snelkoppeling."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Opnieuw starten"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pa.po b/po/pa.po
index fce19094c..8fa91cd22 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Panjabi
 # Panjabi translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,19 +12,24 @@
 # Jaswinder Singh <jsingh@redhat.com>, 2009-2010
 # Jaswinder Singh <phulewala.j@gmail.com>, 2011,2013
 # Jaswinder Singh <phulewala.j@gmail.com>, 2011,2013
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# A S Alam <aalam@fedoraproject.org>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# A S Alam <aalam@fedoraproject.org>, 2019. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
-"Last-Translator: asaini <asaini@redhat.com>\n"
-"Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2019-01-26 07:40+0000\n"
+"Last-Translator: A S Alam <aalam@fedoraproject.org>\n"
+"Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 4.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -56,11 +61,11 @@ msgstr "ਪਸੰਦ"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "ਨਾ ਦਿਖਾਓ"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "ਆਪਣੇ ਆਪ ਲੁਕਾਓ"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -90,7 +95,7 @@ msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
@@ -124,17 +129,17 @@ msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "ਵਿਸ਼ੇਸ਼ਤਾ ਪੈਨਲ ਦਿਖਾਓ:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
 msgid "Show icon on system tray"
 msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
 msgid "Show input method name on language bar"
 msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
@@ -163,7 +168,8 @@ msgid "General"
 msgstr "ਆਮ"
 
 #. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
+#: ../setup/keyboardshortcut.py:124
 msgid "_Add"
 msgstr "ਸ਼ਾਮਲ(_A)"
 
@@ -219,35 +225,97 @@ msgid ""
 msgstr ""
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
 msgid "Input Method"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:49
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+
+#: ../setup/setup.ui.h:50
+msgid "Emoji annotation:"
+msgstr ""
+
+#: ../setup/setup.ui.h:51
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: ../setup/setup.ui.h:52
+msgid "Unicode code point:"
+msgstr "ਯੂਨੀਕੋਡ ਕੋਡ ਬਿੰਦੂ:"
+
+#: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "ਯੂਨੀਕੋਡ ਫ਼ੋਂਟ:"
+
+#: ../setup/setup.ui.h:55
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: ../setup/setup.ui.h:56
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: ../setup/setup.ui.h:57
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: ../setup/setup.ui.h:58
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: ../setup/setup.ui.h:59
+msgid "Prefix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:60
+msgid "Suffix match"
+msgstr ""
+
+#: ../setup/setup.ui.h:61
+msgid "Containing match"
+msgstr ""
+
+#: ../setup/setup.ui.h:62
+msgid "Emoji"
+msgstr "ਇਮੋਜ਼ੀ"
+
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ"
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
 
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
 
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -255,194 +323,355 @@ msgid ""
 "\n"
 "\n"
 "\n"
-msgstr "<big><b>IBus</b></big>\n<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\nਮੁੱਖ ਸਫ਼ਾ: https://github.com/ibus/ibus/wiki\n\n\n\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
+"ਮੁੱਖ ਸਫ਼ਾ: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/setup.ui.h:62
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ibus ਚਲਾਓ"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>ਸ਼ੁਰੂ</b>"
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: ../data/ibus.schemas.in.h:1
+#. Translators: Here “Preload” is a verb
+#: ../data/ibus.schemas.in.h:2
 msgid "Preload engines"
 msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
 
-#: ../data/ibus.schemas.in.h:2
+#. Translators: Tooltip for the button “Preload Engines”
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines during ibus starts up"
 msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ ਕੀਤੇ ਇੰਜਣ"
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
 msgstr "ਇੰਜਣ ਕ੍ਰਮ"
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਸੂਚੀ ਵਿੱਚ ਸੰਭਾਲੇ ਇੰਜਣਾਂ ਦਾ ਕ੍ਰਮ"
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "ਮਿਲੀਸਕਿੰਟ 'ਚ ਸ਼ੁਰੂਆਤੀ ਦੇਰੀ"
 
-#: ../data/ibus.schemas.in.h:6
+#: ../data/ibus.schemas.in.h:8
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is "
-"400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Delay milliseconds. 0 &gt; Do not show the window and switch prev/next engines."
+"Set popup delay milliseconds to show IME switcher window. The default is 400."
+" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; Delay milliseconds. 0 &gt; Do not "
+"show the window and switch prev/next engines."
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
 msgstr "ਸੰਭਾਲਿਆ ਸੰਸਕਰਣ ਨੰਬਰ"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h: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
+#: ../data/ibus.schemas.in.h:11
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:13
+msgid "Use xmodmap"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:14
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਟਰਿੱਗਰ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:20
 msgid "Disable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਬੰਦ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:21
 msgid "The shortcut keys for turning input method off"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:22
 msgid "Next engine shortcut keys"
 msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
 msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:27
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:29
 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
+#: ../data/ibus.schemas.in.h:30
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:31
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:32
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:33
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:34
 msgid "Orientation of lookup table"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:39
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:41
+#, no-c-format
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:43
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:47
 msgid "Use custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:48
 msgid "Custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:52
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:53
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:54
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:55
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:56
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:57
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:58
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:59
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:60
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:61
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:62
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:63
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:64
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:65
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:66
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
 
-#: ../data/ibus.schemas.in.h:41
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
 
-#: ../data/ibus.schemas.in.h:43
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:44
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
 
-#: ../data/ibus.schemas.in.h:45
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf ਨਾਂ ਅਗੇਤਰ ਰੱਖਦਾ ਹੈ"
 
-#: ../data/ibus.schemas.in.h:46
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
 
@@ -450,36 +679,56 @@ msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ 
 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
+#: ../ibus/lang.py:41 ../src/ibusutil.c:158
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../setup/engineabout.py:68
+#: ../setup/emojilang.py:67
+msgid "Select a language"
+msgstr "ਭਾਸ਼ਾ ਚੁਣੋ"
+
+#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_C)"
+
+#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
+#: ../setup/main.py:561
+msgid "_OK"
+msgstr "ਠੀਕ ਹੈ(_O)"
+
+#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+msgid "More…"
+msgstr "...ਹੋਰ"
+
+#: ../setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "ਭਾਸ਼ਾ: %s\n"
 
-#: ../setup/engineabout.py:71
+#: ../setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n"
 
-#: ../setup/engineabout.py:74
+#: ../setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "ਲੇਖਕ: %s\n"
 
-#: ../setup/engineabout.py:77
+#: ../setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "ਵੇਰਵਾ:\n"
 
-#: ../setup/enginecombobox.py:139
+#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
 
-#: ../setup/enginetreeview.py:94
+#: ../setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -491,210 +740,2370 @@ msgstr "IBus ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
 msgid "Keyboard shortcuts"
 msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
-#: ../setup/keyboardshortcut.py:66
+#: ../setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "ਕੀ ਕੋਡ:"
 
-#: ../setup/keyboardshortcut.py:81
+#: ../setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "ਮੋਡੀਫਾਇਰ:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:133
+#: ../setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "ਲਾਗੂ ਕਰੋ(_A)"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:139
+#: ../setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
-#: ../setup/keyboardshortcut.py:254
+#: ../setup/keyboardshortcut.py:252
 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:256
+#: ../setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "ਰੱਦ ਕਰੋ(_C)"
-
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "ਠੀਕ ਹੈ(_O)"
-
-#: ../setup/main.py:102 ../setup/main.py:395
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲੇ ਇੰਪੁੱਟ ਢੰਗ ਤੇ ਜਾਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਬਟਨ"
 
-#: ../setup/main.py:329
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ਡੈਮਨ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../setup/main.py:350
+#: ../setup/main.py:536
 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:364
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../setup/main.py:376
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
-#: ../setup/main.py:377
+#. Translators: Title of the window
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਨਾ"
 
-#: ../tools/main.vala:42
-msgid "List engine name only"
-msgstr "ਸਿਰਫ ਇੰਜਣ ਨਾਂ ਵੇਖਾਓ"
+#: ../src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "ਸਰਗਰਮੀਆਂ"
+
+#: ../src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "ਜਾਨਵਰ ਤੇ ਕੁਦਰਤ"
+
+#: ../src/ibusemojigen.h:32
+msgid "Flags"
+msgstr "ਝੰਡੇ"
+
+#: ../src/ibusemojigen.h:33
+msgid "Food & Drink"
+msgstr "ਖਾਣ-ਪੀਣ"
+
+#: ../src/ibusemojigen.h:34
+msgid "Objects"
+msgstr "ਚੀਜ਼ਾਂ"
+
+#: ../src/ibusemojigen.h:35
+msgid "Smileys & People"
+msgstr "ਸਮਾਈਲੀ ਤੇ ਲੋਕ"
+
+#: ../src/ibusemojigen.h:36
+msgid "Symbols"
+msgstr "ਚਿੰਨ੍ਹ"
+
+#: ../src/ibusemojigen.h:37
+msgid "Travel & Places"
+msgstr "ਯਾਤਰਾ ਤੇ ਥਾਵਾਂ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "ਮੁਢਲੀ ਲਾਤੀਨੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
-msgid "Can't connect to IBus.\n"
-msgstr "IBus ਨਾਲ ਨਹੀਂ ਜੁੜ ਸਕਿਆ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
 
-#: ../tools/main.vala:84
-#, c-format
-msgid "language: %s\n"
-msgstr "ਭਾਸ਼ਾ: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
 
-#: ../tools/main.vala:152
-#, c-format
-msgid "No engine is set.\n"
-msgstr "ਕੋਈ ਇੰਜਣ ਸੈੱਟ ਨਹੀਂ ਹੈ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
 
-#: ../tools/main.vala:160
-#, c-format
-msgid "Set global engine failed.\n"
-msgstr "ਗਲੋਬਲ ਇੰਜਣ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
 
-#: ../tools/main.vala:165
-#, c-format
-msgid "Get global engine failed.\n"
-msgstr "ਗਲੋਬਲ ਇੰਜਣ ਫੇਲ ਹੋਇਆ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
 
-#: ../tools/main.vala:204
-msgid "Read the system registry cache."
-msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਪੜ੍ਹੋ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
 
-#: ../tools/main.vala:206
-msgid "Read the registry cache FILE."
-msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਈਲ ਪੜ੍ਹੋ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
-msgid "The registry cache is invalid.\n"
-msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਅਯੋਗ ਹੈ।\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:244
-msgid "Write the system registry cache."
-msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਲਿਖੋ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
 
-#: ../tools/main.vala:246
-msgid "Write the registry cache FILE."
-msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਾਈਲ ਲਿਖੋ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
 
-#: ../tools/main.vala:293
-msgid "Set or get engine"
-msgstr "ਇੰਜਣ ਸੈੱਟ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "ਅਰਬੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "ਸੀਰੀਅਕ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
 
-#: ../tools/main.vala:294
-msgid "Exit ibus-daemon"
-msgstr "ibus-daemon ਤੋਂ ਬਾਹਰ ਆਓ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
 
-#: ../tools/main.vala:295
-msgid "Show available engines"
-msgstr "ਉਪਲੱਬਧ ਇੰਜਣ ਵਿਖਾਓ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
 
-#: ../tools/main.vala:296
-msgid "(Not implemented)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "ਦੇਵਨਾਗਰੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "ਬੰਗਾਲੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "ਗੁਰਮੁਖੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "ਗੁਜਰਾਤੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "ਓੜੀਆ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "ਤਾਮਿਲ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr "ਤੇਲਗੂ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "ਕੰਨੜ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "ਮਲਿਆਲਮ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "ਸਿੰਹਾਲਾ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "ਥਾਈ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "ਲਾਓ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "ਤਿੱਬਤੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "ਮਿਆਮਾਰ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "ਜਾਰਜੀਅਨ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:285
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:289
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:293
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:297
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:301
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:305
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:309
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:313
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:317
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:321
+msgid "Currency Symbols"
+msgstr "ਮੁਦਰਾ ਚਿੰਨ੍ਹ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:325
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:329
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:333
+msgid "Number Forms"
+msgstr "ਨੰਬਰ ਰੂਪ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:337
+msgid "Arrows"
+msgstr "ਤੀਰ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:341
+msgid "Mathematical Operators"
+msgstr "ਗਣਿਤ ਕਾਰਵਾਈਆਂ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:345
+msgid "Miscellaneous Technical"
+msgstr "ਫੁਟਕਲ ਤਕਨੀਕੀ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:349
+msgid "Control Pictures"
+msgstr "ਕੰਟਰੋਲ ਤਸਵੀਰਾਂ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:353
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:357
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:361
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:365
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:369
+msgid "Geometric Shapes"
+msgstr "ਜਾਇਮਿਤੀ ਸ਼ਕਲਾਂ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:373
+msgid "Miscellaneous Symbols"
+msgstr "ਫੁਟਕਲ ਚਿੰਨ੍ਹ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:377
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:381
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:385
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:389
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:393
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:397
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:401
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:405
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:409
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:413
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:417
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:421
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:425
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:429
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:433
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:437
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:441
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:445
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:449
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:453
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:457
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:461
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:465
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:469
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:473
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:477
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:481
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:485
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:489
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:493
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:497
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:501
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:505
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:509
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:513
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:517
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:521
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:525
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:529
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:533
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:537
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:541
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:545
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:549
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:553
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:557
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:561
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:565
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:569
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:573
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:577
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:581
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:585
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:589
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:593
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:597
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:601
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:605
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:609
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:613
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:617
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:621
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:625
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:629
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:633
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:637
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:641
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:645
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:649
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:653
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:657
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:661
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:665
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:669
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:673
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:677
+msgid "Specials"
+msgstr "ਖਾਸ"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:681
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:685
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:689
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:693
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:697
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:701
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:705
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:709
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:713
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:717
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:721
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:725
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:729
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:733
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:737
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:741
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:745
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:749
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:753
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:757
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:761
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:765
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:769
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:773
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:777
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:781
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:785
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:789
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:793
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:797
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:801
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:805
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:809
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:813
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:817
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:821
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:825
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:829
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:833
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:837
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:841
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:845
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:849
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:853
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:857
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:861
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:865
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:869
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:873
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:877
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:881
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:885
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:889
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:893
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:897
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:901
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:905
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:909
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:913
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:917
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:921
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:925
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:929
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:933
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:937
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:941
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:945
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:949
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:953
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:957
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:961
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:965
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:969
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:973
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:977
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:981
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:985
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:989
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:993
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:997
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1001
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1005
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1009
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1013
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1017
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1021
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1025
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1029
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1033
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1037
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1041
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1045
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1049
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1053
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1057
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1061
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1065
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1069
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1073
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1077
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1081
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1085
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1089
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1093
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1097
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1101
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1105
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1109
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1113
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1117
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1121
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1125
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1129
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1133
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1137
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1141
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1145
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: ../src/ibusunicodegen.h:1149
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: ../tools/main.vala:51
+msgid "List engine name only"
+msgstr "ਸਿਰਫ ਇੰਜਣ ਨਾਂ ਵੇਖਾਓ"
+
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr "IBus ਨਾਲ ਨਹੀਂ ਜੁੜ ਸਕਿਆ।\n"
+
+#: ../tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr "ਭਾਸ਼ਾ: %s\n"
+
+#: ../tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr "ਕੋਈ ਇੰਜਣ ਸੈੱਟ ਨਹੀਂ ਹੈ।\n"
+
+#: ../tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr "ਗਲੋਬਲ ਇੰਜਣ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।\n"
+
+#: ../tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr "ਗਲੋਬਲ ਇੰਜਣ ਫੇਲ ਹੋਇਆ।\n"
+
+#: ../tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਪੜ੍ਹੋ।"
+
+#: ../tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਈਲ ਪੜ੍ਹੋ।"
+
+#: ../tools/main.vala:237 ../tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਅਯੋਗ ਹੈ।\n"
+
+#: ../tools/main.vala:257
+msgid "Write the system registry cache."
+msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਲਿਖੋ।"
+
+#: ../tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਾਈਲ ਲਿਖੋ।"
+
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
+msgid "Resetting…"
+msgstr "...ਮੁੜ-ਸੈਟ ਕਰ ਰਿਹਾ ਹੈ"
+
+#: ../tools/main.vala:399
+msgid "Done"
+msgstr "ਮੁਕੰਮਲ"
+
+#: ../tools/main.vala:444
+msgid "Set or get engine"
+msgstr "ਇੰਜਣ ਸੈੱਟ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"
+
+#: ../tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon ਤੋਂ ਬਾਹਰ ਆਓ"
+
+#: ../tools/main.vala:446
+msgid "Show available engines"
+msgstr "ਉਪਲੱਬਧ ਇੰਜਣ ਵਿਖਾਓ"
+
+#: ../tools/main.vala:447
+msgid "(Not implemented)"
 msgstr "(ਲਾਗੂ ਨਹੀਂ ਕੀਤੀ ਹੋਈ)"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "ਸੰਸਕਰਣ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਦੇ ਅੰਸ਼ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਬਣਾਓ।"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon ਦਾ D-Bus ਪਤਾ ਛਾਪੋ"
 
-#: ../tools/main.vala:302
+#: ../tools/main.vala:453
+msgid "Show the configuration values"
+msgstr "ਸੰਰਚਨਾ ਮੁੱਲ ਦਿਖਾਓ"
+
+#: ../tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr "ਸੰਰਚਨਾ ਮੁੱਲ ਮੁੜ-ਸੈਟ ਕਰੋ"
+
+#: ../tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "ਇਹ ਜਾਣਕਾਰੀ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:464
 #, c-format
-msgid ""
-"Usage: %s COMMAND [OPTION...]\n"
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "ਕਮਾਂਡ:\n"
 
-#: ../tools/main.vala:338
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ਅਣਜਾਣ ਕਮਾਂਡ ਹੈ!\n"
 
-#: ../ui/gtk3/panel.vala:425
+#: ../ui/gtk3/emojier.vala:244
+msgid "Favorites"
+msgstr "ਮਨਪਸੰਦ"
+
+#: ../ui/gtk3/emojier.vala:245
+msgid "Others"
+msgstr "ਹੋਰ"
+
+#: ../ui/gtk3/emojier.vala:246
+msgid "Open Unicode choice"
+msgstr "ਯੂਨੀਕੋਡ ਚੋਣ ਖੋਲ੍ਹੋ"
+
+#: ../ui/gtk3/emojier.vala:371
+msgid "Type annotation or choose emoji"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:965
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1067
+msgid "Page Down"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1078
+msgid "Page Up"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr "ਮੇਨੂ"
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr "ਚੇਤਾਵਨੀ ਸੁਨੇਹਾ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr "ਯੂਨੀਕੋਡ ਸ਼ਬਦ-ਕੋਸ਼ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
+
+#: ../ui/gtk3/emojier.vala:1383
+#, c-format
+msgid "Code point: %s"
+msgstr "ਕੋਡ ਬਿੰਦੂ: %s"
+
+#: ../ui/gtk3/emojier.vala:1389
+msgid "Has emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#, c-format
+msgid "Description: %s"
+msgstr "ਵਰਣਨ: %s"
+
+#: ../ui/gtk3/emojier.vala:1556
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../ui/gtk3/emojier.vala:1580
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1606
+#, c-format
+msgid "Name: %s"
+msgstr "ਨਾਂ: %s"
+
+#: ../ui/gtk3/emojier.vala:1614
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr "ਇਮੋਜ਼ੀ ਚੋਣ"
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr "ਯੂਨੀਕੋਡ ਚੋਣ"
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ../ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr "ਫ਼ੌਂਟ"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ../ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr "IBus ਪੈਨਲ"
+
+#: ../ui/gtk3/panel.vala:710
 msgid "IBus Update"
 msgstr "IBus ਅੱਪਡੇਟ"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space ਹੁਣ ਮੂਲ ਹੌਟ-ਕੀ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:707
+#: ../ui/gtk3/panel.vala:1121
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:711
+#: ../ui/gtk3/panel.vala:1125
 msgid "translator-credits"
-msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\nhttp://www.satluj.com/"
+msgstr ""
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\n"
+"ਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\n"
+"http://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:732
+#: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
-#: ../ui/gtk3/panel.vala:742
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
 
-#: ../ui/gtk3/panel.vala:746
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index 0a99867eb..079446f19 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,466 +12,186 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Piotr Drąg <piotrdrag@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-21 03:28+0000\n"
+"PO-Revision-Date: 2019-02-27 06:17+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.6.2\n"
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Poziomo"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Pionowo"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Górny lewy róg"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Górny prawy róg"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Dolny lewy róg"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Dolny prawy róg"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Niestandardowa"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Bez wyświetlania"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Automatyczne ukrywanie"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Zawsze"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Preferencje usługi IBus"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Następna metoda wprowadzania:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Poprzednia metoda wprowadzania:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Włączenie lub wyłączenie:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Włączone:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Wyłączone:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Skróty klawiszowe</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientacja kandydatów:"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi IBus"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Wyświetlanie panelu właściwości:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Pozycja panelu języków:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Ikona w obszarze powiadamiania"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Nazwa metody wprowadzania na panelu języków"
-
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Nazwa metody wprowadzania na panelu języków podczas zaznaczania pola wyboru"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania w oknie "
-"aplikacji"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Niestandardowa czcionka:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Czcionka i styl</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Ogólne"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Dodaje wybraną metodę wprowadzania do włączonych metod wprowadzania"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Usuń"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Usuwa zaznaczoną metodę wprowadzania z włączonych metod wprowadzania"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "W _górę"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Przenosi w górę zaznaczoną metodę wprowadzania we włączonych metodach "
-"wprowadzania"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "W _dół"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Przenosi w dół zaznaczoną metodę wprowadzania we włączonych metodach "
-"wprowadzania"
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "Wcześniejsze wczytanie mechanizmów"
 
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_O programie"
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi IBus"
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Wyświetla informacje o wybranej metodzie wprowadzania"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "Kolejność mechanizmów"
 
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "P_referencje"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
 
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Wyświetla ustawienia zaznaczonej metody wprowadzania"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
 
-#: ../setup/setup.ui.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
-"<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>"
+"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 ""
-"<small><i>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.</i></small>"
+"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."
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Metoda wprowadzania"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "Zapisany numer wersji"
 
-#: ../setup/setup.ui.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "Klawisze skrótów do włączania konwersji uwag emoji lub nazw unikodu"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Uwaga emoji:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Klawisze skrótów do włączania konwersji kodów znaków unikodu"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Kod znaku unikodu:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Ustawienie czcionki kandydatów unikodu w oknie emoji"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Czcionka unikodu:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Ustawienie języka uwag emoji w oknie emoji"
+"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."
 
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Język uwag emoji:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr "Układy łacińskie niemające ASCII"
 
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Częściowe dopasowywanie uwag emoji o tym warunku i więcej niż tej liczbie "
-"znaków:"
+"Układ US jest dołączany do układów łacińskich. Można pominąć „variant”."
 
-#: ../setup/setup.ui.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "Użycie xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
-"z dokładnym dopasowaniem"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Dopasowanie przedrostka"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Dopasowanie przyrostka"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Dopasowanie w środku"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
+"Wykonuje xmodmap, jeśli istnieje .xmodmap lub .Xmodmap, kiedy mechanizmy "
+"IBus są przełączane."
 
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
 msgstr "Systemowe ustawienia układu klawiatury"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
 msgid "Use system keyboard (XKB) layout"
 msgstr "Systemowy układ klawiatury (XKB)"
 
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Układ klawiatury</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Ta sama metoda wprowadzania we wszystkich aplikacjach"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteligentna magistrala wprowadzania</small>\n"
-"Strona domowa: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Uruchamianie IBus podczas logowania"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Uruchamianie</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "O programie"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "Za_mknij"
-
-#. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines"
-msgstr "Wcześniejsze wczytanie mechanizmów"
-
-#. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
-msgid "Preload engines during ibus starts up"
-msgstr "Wcześniejsze wczytanie mechanizmów podczas uruchamiania usługi IBus"
-
-#: ../data/ibus.schemas.in.h:5
-msgid "Engines order"
-msgstr "Kolejność mechanizmów"
-
-#: ../data/ibus.schemas.in.h:6
-msgid "Saved engines order in input method list"
-msgstr "Kolejność zapisanych mechanizmów na liście metod wprowadzania"
-
-#: ../data/ibus.schemas.in.h:7
-msgid "Popup delay milliseconds for IME switcher window"
-msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu"
 
-#: ../data/ibus.schemas.in.h:8
-msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; 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 &lt; "
-"milisekundy opóźnienia. 0 &gt; Bez wyświetlania okna i przełączania na "
-"następny/poprzedni mechanizm."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Saved version number"
-msgstr "Zapisany numer wersji"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Globalna metoda wprowadzania"
 
-#: ../data/ibus.schemas.in.h: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 ""
-"Zapisany numer wersji będzie używany do sprawdzania różnicy między wersją "
-"poprzednio zainstalowanego IBus a obecnego."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Ta sama metoda wprowadzania we wszystkich aplikacjach"
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Latin layouts which have no ASCII"
-msgstr "Układy łacińskie niemające ASCII"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Domyślne włączanie metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the Latin layouts. variant can be omitted."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
 msgstr ""
-"Układ US jest dołączany do układów łacińskich. Można pominąć „variant”."
+"Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
+"wprowadzania"
 
-#: ../data/ibus.schemas.in.h:13
-msgid "Use xmodmap"
-msgstr "Użycie xmodmap"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf zachowuje przedrostki nazw"
 
-#: ../data/ibus.schemas.in.h:14
-msgid ""
-"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
-"Wykonuje xmodmap, jeśli istnieje .xmodmap lub .Xmodmap, kiedy mechanizmy "
-"IBus są przełączane."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Klawisze skrótów przełącznika"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu dla „gtk_accelerator_parse”"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Skróty klawiszowe włączania"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "Skróty klawiszowe do włączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Skróty klawiszowe wyłączania"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Skróty klawiszowe do wyłączania metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Klawisze skrótów następnego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 "Klawisze skrótów do przełączania na następną metodę wprowadzania na liście"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Klawisze skrótów poprzedniego mechanizmu"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 "Klawisze skrótów do przełączania na poprzednią metodę wprowadzania na liście"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Automatyczne ukrywanie"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -479,24 +199,17 @@ msgstr ""
 "Zachowanie panela właściwości. 0 = bez wyświetlania, 1 = automatycznie "
 "ukrywany, 2 = zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Pozycja panela języków"
 
-#: ../data/ibus.schemas.in.h:29
-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 = niestandardowa"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 "Podążanie za kursorem wprowadzania, kiedy panel jest zawsze wyświetlany"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -505,11 +218,11 @@ msgstr ""
 "wprowadzania, kiedy panel jest zawsze wyświetlany. Jeśli jest ustawione na "
 "wartość „false”, to panel jest wyświetlany w stałym położeniu."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Milisekundy do wyświetlenia panelu właściwości"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -517,24 +230,33 @@ msgstr ""
 "Milisekundy do wyświetlenia panelu właściwości po zmianie aktywności lub "
 "właściwości."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientacja tablicy wyszukiwania"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientacja tablicy wyszukiwania. 0 = pozioma, 1 = pionowa"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Ikona w obszarze powiadamiania"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Wyświetlanie nazwy metody wprowadzania"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Nazwa metody wprowadzania na panelu języków"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Wartość RGBA ikony XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -553,11 +275,11 @@ msgstr ""
 "procentowymi w zakresie od 0% do 100%, a „a” jest wartością "
 "zmiennoprzecinkową w zakresie od 0 do 1 alfy."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Milisekundy do wyświetlenia ikony panelu dla właściwości"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -570,47 +292,48 @@ msgstr ""
 "wynosi 0, to nie będzie żadnego opóźnienia i ikona zostanie wyświetlona od "
 "razu."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Niestandardowa czcionka"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Niestandardowa czcionka dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Nazwa niestandardowej czcionki"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Nazwa niestandardowej czcionki dla panelu języków"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisze skrótów unikodu dla gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania pisania unikodu"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu emoji dla „gtk_accelerator_parse”"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania wpisywania emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nazwa niestandardowej czcionki dla znaków emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Domyślny język dla słownika emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -618,29 +341,29 @@ msgstr ""
 "Wybór domyślnego języka słowników emoji w oknie emoji. Wartość $lang jest "
 "zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista ulubionych emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista ulubionych uwag emoji w oknie emoji"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Można przydzielić uwagę do ulubionej emoji na tej liście."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -648,11 +371,11 @@ msgstr ""
 "Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
 "z dokładnym dopasowaniem."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Dopasowywanie uwag emoji o podanej długości"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -660,11 +383,11 @@ msgstr ""
 "Częściowe dopasowywanie uwag emoji o więcej niż tej liczbie znaków, zamiast "
 "dokładnego dopasowywania."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Warunek częściowego dopasowywania uwag emoji"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -673,11 +396,11 @@ msgstr ""
 "0 == dopasowywanie przedrostka, 1 == dopasowywanie przyrostka, 2 == "
 "dopasowywanie w środku"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Wczytywanie danych emoji podczas uruchamiania"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -687,2224 +410,2586 @@ msgstr ""
 "uruchamiania. Wymaga około 10 MB pamięci. Jeśli jest ustawione na wartość "
 "„false”, to wczytuje dane emoji podczas otwierania okna emoji."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Wczytywanie danych unikodu podczas uruchamiania"
 
-#: ../data/ibus.schemas.in.h:70
-msgid ""
-"Load the Unicode data at the time of startup if true. About 15MB memory is "
-"needed to load the data. Load the Unicode data when open the emoji dialog at "
-"the beginning if false. The Unicode data is always loaded after the emoji "
-"data is loaded even if true."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"Jeśli jest ustawione na wartość „true”, to wczytuje dane unikodu podczas "
+"uruchamiania. Wymaga około 15 MB pamięci. Jeśli jest ustawione na wartość "
+"„false”, to wczytuje dane unikodu podczas otwierania okna emoji. Dane "
+"unikodu są zawsze wczytywane po wczytaniu danych emoji, nawet jeśli "
+"ustawiono na wartość „true”."
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 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:158
+msgid "Other"
+msgstr "Inne"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Wybierz język"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Więcej…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "O programie"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "Za_mknij"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Język: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Układ klawiatury: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Opis:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Wybór metody wprowadzania"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Dodaj"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Metoda wprowadzania"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "KBD"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferencje usługi IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Ustawianie preferencji usługi IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Skróty klawiszowe"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Kod klawisza:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modyfikatory:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Zastosuj"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Usuń"
+
+#: setup/keyboardshortcut.py:252
+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).\n"
+"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Skrót z klawiszem Shift do przełączania do poprzedniej metody wprowadzania"
+
+#: setup/main.py:515
+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:536
+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 ""
+"Usługa IBus została uruchomiona. 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Nie można uruchomić usługi IBus od %d s"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Wybór skrótu klawiszowego dla %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "przełączanie metod wprowadzania"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Poziomo"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Pionowo"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Górny lewy róg"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Górny prawy róg"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Dolny lewy róg"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Dolny prawy róg"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Niestandardowa"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Bez wyświetlania"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Automatyczne ukrywanie"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Zawsze"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Następna metoda wprowadzania:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Klawisz skrótu do przełączenia na poprzednią metodę wprowadzania na liście"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Poprzednia metoda wprowadzania:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Włączenie lub wyłączenie:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Włączone:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Wyłączone:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Skróty klawiszowe</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientacja kandydatów:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Ustawienie wyświetlania lub ukrywania panela języków usługi IBus"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Wyświetlanie panelu właściwości:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Pozycja panelu języków:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Nazwa metody wprowadzania na panelu języków podczas zaznaczania pola wyboru"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
 msgstr ""
-"Jeśli jest ustawione na wartość „true”, to wczytuje dane unikodu podczas "
-"uruchamiania. Wymaga około 15 MB pamięci. Jeśli jest ustawione na wartość "
-"„false”, to wczytuje dane unikodu podczas otwierania okna emoji. Dane "
-"unikodu są zawsze wczytywane po wczytaniu danych emoji, nawet jeśli "
-"ustawiono na wartość „true”."
+"Osadzanie wcześniej wprowadzonego tekstu metody wprowadzania w oknie "
+"aplikacji"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu"
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Niestandardowa czcionka:"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Osadzanie wcześniej wprowadzonego tekstu w oknie aplikacji"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Czcionka i styl</b>"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Globalna metoda wprowadzania"
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Ogólne"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Domyślne włączanie metody wprowadzania"
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Dodaje wybraną metodę wprowadzania do włączonych metod wprowadzania"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Usuń"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Usuwa zaznaczoną metodę wprowadzania z włączonych metod wprowadzania"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "W _górę"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
-"Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność "
+"Przenosi w górę zaznaczoną metodę wprowadzania we włączonych metodach "
 "wprowadzania"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf zachowuje przedrostki nazw"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "W _dół"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Przedrostki kluczy DConf zatrzymujące konwersję nazw"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Przenosi w dół zaznaczoną metodę wprowadzania we włączonych metodach "
+"wprowadzania"
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007-2010 Peng Huang\n"
-"Copyright © 2007-2010 Red Hat, Inc."
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_O programie"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Inne"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Wyświetla informacje o wybranej metodzie wprowadzania"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Wybierz język"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "P_referencje"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Anuluj"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Wyświetla ustawienia zaznaczonej metody wprowadzania"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_OK"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>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.</i></small>"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Więcej…"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "Klawisze skrótów do włączania konwersji uwag emoji lub nazw unikodu"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Język: %s\n"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Uwaga emoji:"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Układ klawiatury: %s\n"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Klawisze skrótów do włączania konwersji kodów znaków unikodu"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Kod znaku unikodu:"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Opis:\n"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Ustawienie czcionki kandydatów unikodu w oknie emoji"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Wybór metody wprowadzania"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Czcionka unikodu:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "KBD"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Ustawienie języka uwag emoji w oknie emoji"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Ustawianie preferencji usługi IBus"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Język uwag emoji:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Skróty klawiszowe"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Częściowe dopasowywanie uwag emoji o tym warunku i więcej niż tej liczbie "
+"znaków:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Kod klawisza:"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
+"z dokładnym dopasowaniem"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modyfikatory:"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Dopasowanie przedrostka"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Zastosuj"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Dopasowanie przyrostka"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Usuń"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Dopasowanie w środku"
 
-#: ../setup/keyboardshortcut.py:252
-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).\n"
-"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Układ klawiatury</b>"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
-"Skrót z klawiszem Shift do przełączania do poprzedniej metody wprowadzania"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Usługa IBus nie jest uruchomiona. Uruchomić ją?"
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Zaawansowane"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"Usługa IBus została uruchomiona. 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Nie można uruchomić usługi IBus od %d s"
+"<big><b>IBus</b></big>\n"
+"<small>Inteligentna magistrala wprowadzania</small>\n"
+"Strona domowa: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Wybór skrótu klawiszowego dla %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Uruchamianie IBus podczas logowania"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "przełączanie metod wprowadzania"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Uruchamianie</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Sport"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Zwierzęta i przyroda"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Składnik"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Flagi"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Jedzenie i napoje"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Rzeczy"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Buźki i ludzie"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Osoby i ciało"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Uśmieszki i emotikony"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symbole"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Podróże i miejsca"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Podstawowy łaciński"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Uzupełnienie Latin-1"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Rozszerzony łaciński A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Rozszerzony łaciński B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "Rozszerzenia IPA"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Oddzielone litery modyfikujące"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Składające znaki diakrytyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Grecki i koptyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Uzupełnienie cyrylicy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Ormiański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebrajski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syryjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Uzupełnienie arabskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "N’Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samarytański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandejski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Uzupełnienie syryjskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Rozszerzony arabski A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Dewanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengalski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gudżarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Orija"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamilski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malajalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Syngaleski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Tajski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Laotański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tybetański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Birmański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Gruziński"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Dzamo hangyl"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Etiopski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Uzupełnienie etiopskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Czirokeski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Ujednolicony sylabariusz rdzennych Kanadyjczyków"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogamiczny"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runiczny"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmerski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Rozszerzony ujednolicony sylabariusz rdzennych Kanadyjczyków"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Nowy tai le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Symbole khmerskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Bugiński"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Rozszerzone składające znaki diakrytyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balijski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundajski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepczowski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Rozszerzona cyrylica C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Rozszerzony gruziński"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Uzupełnienie sundajskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Rozszerzenia wed"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Rozszerzenia fonetyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Uzupełnienie rozszerzeń fonetycznych"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Uzupełnienie składających znaków diakrytycznych"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Łaciński rozszerzony dodatkowy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Grecki rozszerzony"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Ogólne znaki interpunkcyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Indeksy górne i dolne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Symbole walutowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Składające znaki diakrytyczne dla symboli"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Symbole literopodobne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Formy liczbowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Strzałki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Operatory matematyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Różne znaki techniczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Obrazy znaków sterujących"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optyczne rozpoznawanie znaków"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Otoczone symbole alfanumeryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Rysowanie ramek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Elementy blokowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Kształty geometryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Różnorodne symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Ozdoby drukarskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Różne symbole matematyczne A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Dodatkowe strzałki A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Pismo Braille’a"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Dodatkowe strzałki B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Różne symbole matematyczne B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Dodatkowe operatory matematyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Różne symbole i strzałki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Głagolica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Rozszerzony łaciński C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Koptyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Uzupełnienie gruzińskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Rozszerzony etiopski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Rozszerzona cyrylica A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Dodatkowe znaki interpunkcyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "Radykały CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Radykały Kangxi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Znaki opisu ideograficznego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "Symbole i znaki interpunkcyjne CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Dzamo zgodności dla hangyl"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Rozszerzone bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "Kreski CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Rozszerzenia fonetyczne katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Otoczone litery i miesiące CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "Znaki zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Rozszerzenie A ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Heksagramy Yijing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "Ujednolicone ideogramy CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Sylaby Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Radykały Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Wai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Rozszerzona cyrylica B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Modyfikujące litery tonów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Rozszerzony łaciński D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Wspólne indyjskie formy liczbowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-Pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Rozszerzone dewanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Rozszerzony dzamo hangyl A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Jawajski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Rozszerzony birmański B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Czamski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Rozszerzony birmański A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Rozszerzenia Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Rozszerzony etiopski A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Rozszerzony łaciński E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Uzupełnienie czirokeskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Sylaby Hangyl"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Rozszerzony dzamo hangyl B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Starsze surogaty"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Starsze surogaty prywatnego użytku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Młodsze surogaty"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Obszar prywatnego użytku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "Ideogramy zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alfabetyczne formy prezentacyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arabskie formy prezentacyjne A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Przełączniki wariantów glifów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Formy pionowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Składające półznaki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "Formy zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Różne małe formy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arabskie formy prezentacyjne B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Formy połowy i pełnej szerokości"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Specjalne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Sylabariusz pisma linearnego B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Ideogramy pisma linearnego B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Cyfry egejskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Starożytne cyfry greckie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Symbole starożytne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Dysk z Fajstos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Licyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Karyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Koptyjskie cyfry epakta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Staroitalski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gocki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Staropermski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugarycki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Staroperski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Alfabet Shawa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Kaukasko-albański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Linearne A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Sylabariusz cypryjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Aramejski imperialny"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmyreński"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabatejski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Fenicki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lidyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Hieroglify meroickie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Kursywa meroicka"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Charosti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Południowoarabski epigraficzny"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Północnoarabski epigraficzny"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manichejski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Awestyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Inskrypcyjny partyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Inskrypcyjny pahlawi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Psałterzowy pahlawi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Staroturecki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Starowęgierski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Rohingya hanifi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Symbole numeryczne rumi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Starosogdyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
 msgstr "Sorang sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
 msgstr "Czakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
 msgstr "Mahajański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
 msgstr "Śarada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
 msgstr "Archaiczne cyfry syngaleskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
 msgstr "Chodżycki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
 msgstr "Uzupełnienie mongolskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
 msgstr "Varang kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
 msgstr "Kwadratowe Zanabazara"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
 msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
 msgstr "Gondi masarama"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "Gondi gunjala"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "Makasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
 msgstr "Pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cyfry i interpunkcja pisma klinowego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
 msgstr "Wczesnodynastyczne pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
 msgstr "Hieroglify egipskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
 msgstr "Hieroglify anatolijskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
 msgstr "Uzupełnienie bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
 msgstr "Bassa vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
 msgstr "Pahawh hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideograficzne symbole i znaki interpunkcyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
 msgstr "Tangucki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
 msgstr "Składniki tanguckie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
 msgstr "Uzupełnienie kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
 msgstr "Rozszerzony kana A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
 msgstr "Nüshu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
 msgstr "Stenografia Duployé’a"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
 msgstr "Modyfikatory formatu stenograficznego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
 msgstr "Bizantyjskie symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
 msgstr "Symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
 msgstr "Starożytna grecka notacja muzyczna"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "Cyfry Majów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symbole Tai xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
 msgstr "Cyfry w chińskim zapisie pałeczkowym"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematyczne symbole alfanumeryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
 msgstr "Sutton SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
 msgstr "Uzupełnienie głagolicy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
 msgstr "Pismo ki-ka-ku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "Indyjskie cyfry siyaq"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabskie matematyczne symbole alfabetyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
 msgstr "Klocki Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
 msgstr "Klocki domina"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
 msgstr "Karty do gry"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Uzupełnienie otoczonych symboli alfanumerycznych"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
 msgstr "Uzupełnienie otoczonych ideogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Różne symbole i piktogramy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
 msgstr "Emotikony"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
 msgstr "Ozdoby drukarskie Dingbat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
 msgstr "Symbole transportowe i dla map"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
 msgstr "Symbole alchemiczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
 msgstr "Rozszerzone kształty geometryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
 msgstr "Uzupełnienie strzałek C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Uzupełnienie symboli i piktogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "Symbole szachowe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Rozszerzenie B ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Rozszerzenie C ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Rozszerzenie D ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Rozszerzenie E ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Rozszerzenie F ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Dodatkowe ideogramy zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
 msgstr "Dodatkowe przełączniki wariantów glifów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
 msgstr "Dodatkowy obszar prywatnego użytku A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
 msgstr "Dodatkowy obszar prywatnego użytku B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Wyświetla tylko nazwę mechanizmu"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Nie można połączyć z usługą IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "język: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nie ustawiono żadnego mechanizmu.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Ustawienie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Uzyskanie globalnego mechanizmu się nie powiodło.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Odczytuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Odczytuje PLIK pamięci podręcznej rejestru."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Pamięć podręczna rejestru jest nieprawidłowa.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Zapisuje pamięć podręczną rejestru systemu."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2912,174 +2997,169 @@ msgstr ""
 "Używa ścieżek schematu mechanizmu zamiast rdzenia IBus, które mogą być "
 "wartościami oddzielonymi przecinkami."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Przywracanie…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Wyświetla wartości konfiguracji"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Przywraca wartości konfiguracji"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Zapisuje emoji w oknie do schowka "
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Inne"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Otwórz wybór unikodu"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Proszę wpisać uwagę lub wybrać emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
 msgstr "Wróć do wyboru emoji"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "Wyświetlanie wariantów emoji"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
 msgstr "Kliknięcie wyświetli komunikat ostrzeżenia"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
 msgstr "Wczytywanie słownika unikodu:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "Brak"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
 msgstr "Nazwa: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
 msgstr "Wybór unikodu"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3089,83 +3169,75 @@ msgstr ""
 "aktywować. Można np. nacisnąć klawisz Esc kilka razy, aby zwolnić tryb "
 "pisania emoji, albo kliknąć pulpit i kliknąć aplikację tekstową jeszcze raz."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Anulowano, aby wybrać emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Skopiowano emoji do schowka."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "CZCIONKA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "JĘZYK"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Aktualizacja IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2018"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/sv.po b/po/sv.po
index d7593bea4..3ec90e683 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,11 +16,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-05-10 10:16+0000\n"
+"PO-Revision-Date: 2018-08-17 06:36+0000\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.6.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../setup/setup.ui.h:1
@@ -234,27 +234,27 @@ msgstr "Inmatningsmetod"
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
-msgstr ""
+msgstr "Kortkommandot för att aktivera emoji-annoteringar eller Unicode-namn"
 
 #: ../setup/setup.ui.h:50
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emoji-annoteringar:"
 
 #: ../setup/setup.ui.h:51
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "Kortkommandon för att aktivera konverteringar av Unicode-kodpunkter"
 
 #: ../setup/setup.ui.h:52
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode-kodpunkter:"
 
 #: ../setup/setup.ui.h:53
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "Ange ett typsnitt för Unicode-kandidater i emoji-dialogen"
 
 #: ../setup/setup.ui.h:54
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode-typsnitt:"
 
 #: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -572,11 +572,11 @@ msgstr "Anpassat typsnittsnamn till språkpanelen"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Unicode-kortkommandon för gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "Kortkommandot för att slå på och av Unicode-inmatning"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -660,7 +660,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:67
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Läs in emoji-data vid uppstartstillfället"
 
 #: ../data/ibus.schemas.in.h:68
 msgid ""
@@ -668,10 +668,13 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Läs in emoji-data vid uppstartstillfället om sant.  Ungefär 10 MB minne "
+"behövs för att läsa in datan.  Läs emoji-datan när emoji-dialogen öppnas i "
+"början om falskt."
 
 #: ../data/ibus.schemas.in.h:69
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Läs in Unicode-data vid uppstartstillfället"
 
 #: ../data/ibus.schemas.in.h:70
 msgid ""
@@ -680,6 +683,10 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Läs in Unicode-data vid uppstartstillfället om sant.  Ungefär 15 MB minne "
+"behövs för att läsa in datan.  Läs Unicode-datan när emoji-dialogen öppnas i "
+"början om falskt.  Unicode-datan läses alltid in efter emoji-datan läses in "
+"även om sant."
 
 #: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
@@ -2885,6 +2892,8 @@ msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Använd motorschemasökvägar istället för ibus-kärnan, vilket kan vara "
+"kommaseparerade värden."
 
 #: ../tools/main.vala:381
 msgid "Resetting…"
@@ -2996,7 +3005,7 @@ msgstr "Visa emoji-varianter"
 
 #: ../ui/gtk3/emojier.vala:1082
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #: ../ui/gtk3/emojier.vala:1088
 msgid "Menu"
@@ -3004,7 +3013,7 @@ msgstr "Meny"
 
 #: ../ui/gtk3/emojier.vala:1099
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Klicka för att visa ett varningsmeddelande"
 
 #: ../ui/gtk3/emojier.vala:1143
 msgid "Loading a Unicode dictionary:"
@@ -3059,6 +3068,10 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Misslyckades att få det aktuella textprogrammet.  Fokusera om ditt program.  "
+"T.ex. tryck Esc-tangenten flera gånger för att släppa emoji-"
+"inskrivningsläget, klicka på ditt skrivbord och klicka på ditt textprogram "
+"igen."
 
 #: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
diff --git a/po/uk.po b/po/uk.po
index aa628ec0a..3a0f9aa94 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,397 +11,61 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Yuri Chornoivan <yurchor@ukr.net>, 2018. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.19\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-02-27 12:10+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-21 12:54+0000\n"
+"PO-Revision-Date: 2019-02-27 03:02+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 4.4.5\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 "Do not show"
-msgstr "Не показувати"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Клавіатурні скорочення</b>"
-
-#: ../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 property panel:"
-msgstr "Показ панелі властивостей:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Розташування мовної панелі:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Показувати піктограму у системному лотку"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>Шрифт і стиль</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Загальне"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Додати"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Додати позначений спосіб введення до списку увімкнених способів введення"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "В_илучити"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Вилучити позначений спосіб введення зі списку увімкнених способів введення"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "В_гору"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Пересунути вгору позначений спосіб введення у списку увімкнених способів "
-"введення"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "В_низ"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Пересунути нижче позначений спосіб введення у списку увімкнених способів "
-"введення"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Про програму"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Показати відомості щодо вибраного способу введення"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Параметри"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Показати панель налаштовування позначеного способу введення"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище "
-"списку натисканням клавіатурного скорочення або піктограми на панелі.</i></"
-"small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Спосіб введення"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-"Клавіатурне скорочення для вмикання перетворень анотацій емодзі або назв "
-"символів Unicode"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Анотація емодзі:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-"Клавіатурне скорочення для вмикання перетворень позицій у таблиці Unicode"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Позиція у таблиці Unicode:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Встановити шрифт варіантів емодзі у Unicode у вікні емодзі"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Шрифт Unicode:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Встановити мову анотацій емодзі у вікні емодзі"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Мова анотацій емодзі:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Встановлювати відповідність емодзі за анотаціями з вказаною умовою та збігом "
-"понад таку кількість символів:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
-"не повним збігом"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Відповідність за префіксом"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Відповідність за суфіксом"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Відповідність за вмістом"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Емодзі"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Використовувати розкладку клавіатури системи"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Використовувати розкладку клавіатури системи (XKB)"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Розкладка клавіатури</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Використовувати один спосіб введення для всіх програм"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Загальні параметри способів введення</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Додатково"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Інтелектуальний канал введення</small>\n"
-"Домашня сторінка: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Запускати ibus при вході"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Запуск</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Інформація"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Закрити"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Попередньо завантажувати рушії"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Попередньо завантажувати рушії під час запуску ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Порядок рушіїв"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Збережений порядок рушіїв у списку способів введення"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Затримка появи контекстного вікна для перемикача способів введення"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
 "Встановити затримку появи контекстного вікна перемикача способів введення у "
-"мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 &lt; — затримка "
-"у мілісекундах. 0 &gt; — не показувати вікно і перемикатися на попередній "
-"або наступний рушій."
+"мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 < — затримка у "
+"мілісекундах. 0 > — не показувати вікно і перемикатися на попередній або "
+"наступний рушій."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Збережений номер версії"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -409,73 +73,123 @@ msgstr ""
 "Збережений номер версії буде використано для визначення відмінностей між "
 "попередньою встановленою версією ibus та поточною версією ibus."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Розкладки латиниці, у яких немає символів ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "Американська розкладка додається до латинських розкладок, варіант можна "
 "пропустити."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Використовувати xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Запускати xmodmap, якщо є .xmodmap або .Xmodmap під час перемикання рушіїв "
 "ibus."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Використовувати розкладку клавіатури системи"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Використовувати розкладку клавіатури системи (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Вбудувати попередньо створений текст"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Вбудувати попередньо створений текст у вікно програми"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Використовувати загальний спосіб введення"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Використовувати один спосіб введення для всіх програм"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Типово увімкнути спосіб введення"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Типово увімкнути спосіб введення, коли програма отримує фокус введення"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "Збереження DConf префіксів назв"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Префікси ключів DConf для припинення перетворення назв"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Клавіатурні скорочення-перемикачі"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Клавіатурне скорочення для вмикання і вимикання способів введення"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Комбінації клавіш для перемикання gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Увімкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "Клавіатурне скорочення для вмикання способів введення"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Вимкнути клавіатурні скорочення"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Клавіатурне скорочення для вимикання способів введення"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Скорочення для наступного рушія"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Скорочення для попереднього рушія"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Автоматично ховати"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -483,24 +197,16 @@ msgstr ""
 "Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 ="
 " завжди показувати"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Розташування мовної панелі"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Слідувати за курсором введення, якщо панель показано завжди"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -509,11 +215,11 @@ msgstr ""
 "панель працює у режимі безумовного показу. Якщо має значення «false», панель "
 "буде показано у фіксованій позиції."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Тривалість показу панелі властивостей у мілісекундах"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -521,24 +227,33 @@ msgstr ""
 "Тривалість показу панелі властивостей (у мілісекундах) після фокусування або "
 "зміни властивостей."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Орієнтація таблиці пошуку"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Орієнтація таблиці пошуку. 0 = горизонтально, 1 = вертикально"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Показувати піктограму у системному лотку"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Показувати назву способу введення"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Показувати назву способу введення на мовній панелі"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Значення RGBA для піктограми XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -557,12 +272,12 @@ msgstr ""
 "значеннями від 0% до 100%, а «п» є значенням з рухомою крапкою для "
 "прозорості у діапазоні від 0 до 1."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 "Час у мілісекундах для приготування показу піктограми панелі для властивості"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -574,48 +289,49 @@ msgstr ""
 "властивість задається значенням icon-prop-key у IBusEngineDesc. Якщо вказано "
 "значення 0, затримки не буде і піктограму властивості буде показано негайно."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Використовувати нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Клавіатурне скорочення Unicode для gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 "Клавіатурне скорочення для вмикання і вимикання введення символів Unicode"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Клавіатурне скорочення емодзі для gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання введення емодзі"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Назва нетипового шрифту для символів емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Типова мова словника емодзі"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -623,11 +339,11 @@ msgstr ""
 "Виберіть типову мову словників емодзі у вікні емодзі. Значення $lang "
 "застосовується до /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "Список улюблених емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -635,19 +351,19 @@ msgstr ""
 "Ви зможете переглянути улюблені емодзі у списку емодзі, якщо у цьому списку "
 "є якісь символи."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "список анотацій до улюблених емодзі у вікні емодзі"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Ви можете додавати анотації до улюблених емодзі у цьому списку."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Визначає, чи може бути встановлено часткову відповідність"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -655,11 +371,11 @@ msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
 "не повним збігом"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -667,11 +383,11 @@ msgstr ""
 "Встановлювати часткову відповідність анотацій до емодзі, якщо збігається "
 "вказана кількість символів, але відповідність не є повною."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Вибрати умову часткової відповідності анотацій до емодзі"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -680,11 +396,11 @@ msgstr ""
 "анотаціями до емодзі: 0 == відповідність за префіксом, 1 == відповідність за "
 "суфіксом, 2 == відповідність за вмістом"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Завантажувати дані емодзі під час запуску програми"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -694,11 +410,11 @@ msgstr ""
 "завантаження даних потрібно приблизно 10 МБ пам'яті. Якщо false, дані емодзі "
 "буде завантажено під час відкриття діалогового вікна емодзі на початку."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Завантажувати дані Unicode під час запуску"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -711,2208 +427,2576 @@ msgstr ""
 "початку. Дані Unicode завжди завантажуватимуться після даних емодзі, навіть "
 "якщо встановлено значення true."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Вбудувати попередньо створений текст"
+#: ibus/_config.py.in:41
+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"
+
+#: ibus/lang.py:41 src/ibusutil.c:158
+msgid "Other"
+msgstr "Інше"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Виберіть мову"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_Гаразд"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Більше…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Інформація"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Закрити"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Мова: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Розкладка клавіатури: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Автор: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Опис:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Виберіть спосіб введення"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Додати"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Спосіб введення"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Налаштування IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Налаштувати IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Клавіатурні скорочення"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Код клавіші:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Модифікатори:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "Заст_осувати"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "В_илучити"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Використовувати комбінацію з Shift для перемикання на попередній спосіб "
+"введення"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
+
+#: setup/main.py:536
+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 запущено! Якщо ви не можете скористатися 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Виберіть клавіатурне скорочення для дії %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "перемикання способів введення"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Горизонтально"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Вертикально"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "У верхньому лівому куті"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "У верхньому правому куті"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "У нижньому лівому куті"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "У нижньому правому куті"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Нетиповий"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Не показувати"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Автоматично ховати"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Завжди"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Наступний спосіб введення:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Клавіатурне скорочення для перемикання на попередній спосіб введення у "
+"списку"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Попередній спосіб введення:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Увімкнення або вимикання:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Увімкнути:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Вимкнути:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Клавіатурні скорочення</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Встановити орієнтацію варіантів у таблиці пошуку"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Орієнтація варіантів:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Визначає поведінку ibus: спосіб показу або приховування мовної панелі"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Показ панелі властивостей:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Розташування мовної панелі:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Показати назву способу введення на мовній панелі, якщо позначено цей пункт"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
 msgstr "Вбудувати попередньо створений текст у вікно програми"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Використовувати загальний спосіб введення"
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+"Вбудувати попередньо створений текст способу введення у вікно програми"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Типово увімкнути спосіб введення"
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Нетиповий шрифт:"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Шрифт і стиль</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Загальне"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
 msgstr ""
-"Типово увімкнути спосіб введення, коли програма отримує фокус введення"
+"Додати позначений спосіб введення до списку увімкнених способів введення"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "Збереження DConf префіксів назв"
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "В_илучити"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Префікси ключів DConf для припинення перетворення назв"
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Вилучити позначений спосіб введення зі списку увімкнених способів введення"
 
-#: ../ibus/_config.py.in:41
-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"
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "В_гору"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Інше"
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Пересунути вгору позначений спосіб введення у списку увімкнених способів "
+"введення"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Виберіть мову"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "В_низ"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Скасувати"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Пересунути нижче позначений спосіб введення у списку увімкнених способів "
+"введення"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_Гаразд"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Про програму"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Більше…"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Показати відомості щодо вибраного способу введення"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Мова: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Параметри"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Розкладка клавіатури: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Показати панель налаштовування позначеного способу введення"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Автор: %s\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Активний спосіб введення можна перемкнути у межах визначеного вище "
+"списку натисканням клавіатурного скорочення або піктограми на панелі.</i></"
+"small>"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Опис:\n"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Клавіатурне скорочення для вмикання перетворень анотацій емодзі або назв "
+"символів Unicode"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Виберіть спосіб введення"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Анотація емодзі:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"Клавіатурне скорочення для вмикання перетворень позицій у таблиці Unicode"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Налаштувати IBus"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Позиція у таблиці Unicode:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Клавіатурні скорочення"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Встановити шрифт варіантів емодзі у Unicode у вікні емодзі"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Код клавіші:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Шрифт Unicode:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Модифікатори:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Встановити мову анотацій емодзі у вікні емодзі"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "Заст_осувати"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Мова анотацій емодзі:"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "В_илучити"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Встановлювати відповідність емодзі за анотаціями з вказаною умовою та збігом "
+"понад таку кількість символів:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Будь ласка, натисніть клавішу (або комбінацію клавіш).\n"
-"Діалогове вікно буде закрито після відпускання клавіші."
+"Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
+"не повним збігом"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Відповідність за префіксом"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
-"Використовувати комбінацію з Shift для перемикання на попередній спосіб "
-"введення"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Відповідність за суфіксом"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Відповідність за вмістом"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Емодзі"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Розкладка клавіатури</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Загальні параметри способів введення</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Додатково"
+
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
+"<big><b>IBus</b></big>\n"
+"<small>Інтелектуальний канал введення</small>\n"
+"Домашня сторінка: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Виберіть клавіатурне скорочення для дії %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Запускати ibus при вході"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "перемикання способів введення"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Запуск</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Діяльність"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Тварини і природа"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Компонент"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Прапори"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Їжа і питво"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Об’єкти"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Емоційки і люди"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Люди і тіло"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Смайлики та емоції"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Символи"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Подорожі і місця"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Основні латинські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Додаткові Latin-1"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Латинь розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Латинь розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "Розширена IPA"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Знаки інтервалів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Об’єднання діакритичних знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Грецькі і коптські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Кирилиця"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Додаткова кирилиця"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Вірменська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Іврит"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Арабська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Сирійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Додаткові арабські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Таана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "Н’Ко"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Самаритянська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Мандейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Додаткові сирійські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Арабська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Деванагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Бенгальська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Гурмухі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Гуджараті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Орія"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Тамільська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Телугу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Каннада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Малаялам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Сингальська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Тайська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Лаоська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Тибетська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "М’янмська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Грузинська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Хангиль-чжамо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Ефіопська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Додаткові ефіопські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Черокі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Уніфіковані силабічні канадських аборигенів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Огам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Рунічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Тагалог"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Хануну"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Бухід"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Таґбанва"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Кхмерська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Монгольська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Уніфіковані силабічні канадських аборигенів (додаткові)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Лімбу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Тай лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Нова тай лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Кхмерські символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Бугійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Тай-тхем"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Розширення об’єднання діакритичних знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Балійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Сунданська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Батак"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Лепча"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ол-чикі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Кирилиця розширена-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Грузинська розширена"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Розширена суданська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Ведичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Фонетичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Додаткові фонетичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Додаткові об’єднання діакритичних знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Латинські додаткові розширені"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Розширена грецька"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Загальна пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Верхні і нижні індекси"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Символи грошових одиниць"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Об’єднання діакритичних знаків і символів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Схожі на літери символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Форми чисел"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Стрілки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Математичні оператори"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Різні технічні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Малюнки керування"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Оптичне розпізнавання знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Буквено-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Для малювання рамок"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Блокові елементи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Різні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Різні математичні символи-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Додаткові стрілки-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Шаблони Брайля"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Додаткові стрілки-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Різні математичні символи-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Додаткові математичні дії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Різні символи і стрілки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Глаголиця"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Латинь розширена-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Коптська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Додаткові грузинські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Тіфінаг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Розширена ефіопська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Розширена кирилиця-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Додаткова пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "Додатки радикалів ієрогліфів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Радикали кандзі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Символи-ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "Ієрогліфічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Хірагана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Катакана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Бопомофо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Сумісні корейські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Канбун"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Додаткові бопомофо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "Ієрогліфічні штрихи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Фонетичні розширення катакани"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Вкладені ієрогліфи і назви місяців"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "Сумісність з ієрогліфами"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Ієрогліфічні ідеограми, додаток A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Символи гексаграм «Книги перетворень»"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "Універсальні ідеографічні ієрогліфи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Склади Ї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Радикалі Ї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Лісу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Вай"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Кирилиця розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Символи зміни тону"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Латинь розширена-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Силоті нагрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Загальні індійські форми чисел"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Фагс-па"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Саураштра"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Розширена деванагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Кая-лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Реджан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Корейска розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Яванська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "М’янмська розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Тьям"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "М’янмська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Тай-в’єт"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Маніпурі розширена"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Ефіопська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Латинь розширена-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Додаткові черокі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Маніпурі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Склади хангиля"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Корейська розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Верхні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Верхні приватні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Нижні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Область приватного використання"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "Сумісні ієрогліфічні ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Форми відтворення абеток"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Форми відображення арабської A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Вибір варіантів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Вертикальні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Комбіновані позначки половинок"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "Сумісні ієрогліфічні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Варіанти малих форм"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Форми відображення арабської B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Форми півширини та повної ширини"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Спеціальні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Лінійна писемність B, склади"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Лінійна писемність B, ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Егейські числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Давньогрецькі числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Давні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Фестський диск"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Лікійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Карійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Коптські місячні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Давня італійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Готичні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Давня пермська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Угаритська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Давня перська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Дезерет"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Шавіан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Османья"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Осейдж"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Ельбасан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Кавказька албанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Лінійна писемність A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Кіпріотська складова"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "імперська арамейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Пальмірська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Набатейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Хатран"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Фінікійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Лідійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Мероїтська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Мероїтська, скоропис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Кхароштхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Давня південноарабська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Давня північноарабська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Маніхейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Авестанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Інскрипційна парфянська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Інскрипційна пехлеві"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Псалтирська пехлеві"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Давня турецька"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Давня угорська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Ганіфі рохінджа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Числові символи румі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Давня согдійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Согдійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
 msgid "Brahmi"
 msgstr "Брахмійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:865
 msgid "Kaithi"
 msgstr "Кайтхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:869
 msgid "Sora Sompeng"
 msgstr "Соранг сомпенг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:873
 msgid "Chakma"
 msgstr "Чакма"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:877
 msgid "Mahajani"
 msgstr "Махаджані"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Sharada"
 msgstr "Шарада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Sinhala Archaic Numbers"
 msgstr "Сингальські архаїчні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Khojki"
 msgstr "Ходжкі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Multani"
 msgstr "Мултанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Khudawadi"
 msgstr "Худабадська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Grantha"
 msgstr "Грантха"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Newa"
 msgstr "Неварська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Tirhuta"
 msgstr "Тірхута"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Siddham"
 msgstr "Сіддхам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Modi"
 msgstr "Моді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Mongolian Supplement"
 msgstr "Додаткові монгольські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Takri"
 msgstr "Такрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Ahom"
 msgstr "Ахом"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
+msgid "Dogra"
+msgstr "Доґра"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
 msgid "Warang Citi"
 msgstr "Варанг-кшиті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:941
 msgid "Zanabazar Square"
 msgstr "Квадратний Занабазара"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:945
 msgid "Soyombo"
 msgstr "Сойомбо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:949
 msgid "Pau Cin Hau"
 msgstr "Пау Цин Хау"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:953
 msgid "Bhaiksuki"
 msgstr "Бхайксукі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:957
 msgid "Marchen"
 msgstr "Марчен"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:961
 msgid "Masaram Gondi"
 msgstr "Масарам гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:965
+msgid "Gunjala Gondi"
+msgstr "Гунджала гонді"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Makasar"
+msgstr "Макасар"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
 msgid "Cuneiform"
 msgstr "Клинопис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:977
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Клинописні числа і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:981
 msgid "Early Dynastic Cuneiform"
 msgstr "Клинопис ранньої династії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:985
 msgid "Egyptian Hieroglyphs"
 msgstr "Єгипетська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:989
 msgid "Anatolian Hieroglyphs"
 msgstr "Анатолійьска ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:993
 msgid "Bamum Supplement"
 msgstr "Розширений бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:997
 msgid "Mro"
 msgstr "Мро"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1001
 msgid "Bassa Vah"
 msgstr "Басса-вах"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1005
 msgid "Pahawh Hmong"
 msgstr "Пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1009
+msgid "Medefaidrin"
+msgstr "Медефайдрін"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
 msgid "Miao"
 msgstr "Мяо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1017
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ідеографічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1021
 msgid "Tangut"
 msgstr "Тангутська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1025
 msgid "Tangut Components"
 msgstr "Компоненти тангутської"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1029
 msgid "Kana Supplement"
 msgstr "Додаткова кана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1033
 msgid "Kana Extended-A"
 msgstr "Кана розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1037
 msgid "Nushu"
 msgstr "Нюй-шу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1041
 msgid "Duployan"
 msgstr "Система Дюполоє"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1045
 msgid "Shorthand Format Controls"
 msgstr "Керування форматами скоропису"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1049
 msgid "Byzantine Musical Symbols"
 msgstr "Візантійські музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1053
 msgid "Musical Symbols"
 msgstr "Музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1057
 msgid "Ancient Greek Musical Notation"
 msgstr "Давньогрецькі символи запису музики"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1061
+msgid "Mayan Numerals"
+msgstr "Цифри майя"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
 msgid "Tai Xuan Jing Symbols"
 msgstr "Символи Тай Хуан Жинь"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1069
 msgid "Counting Rod Numerals"
 msgstr "Числа з паличок для лічби"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1073
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Математичні буквено-цифрові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1077
 msgid "Sutton SignWriting"
 msgstr "Жестова писемність Саттон"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1081
 msgid "Glagolitic Supplement"
 msgstr "Додаткові глаголиці"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1085
 msgid "Mende Kikakui"
 msgstr "Менде кікауї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1089
 msgid "Adlam"
 msgstr "Адлам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1093
+msgid "Indic Siyaq Numbers"
+msgstr "Індійські числа сіяк"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Арабські математичні символи абетки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1101
 msgid "Mahjong Tiles"
 msgstr "Плитки маджонґ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1105
 msgid "Domino Tiles"
 msgstr "Плитки доміно"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1109
 msgid "Playing Cards"
 msgstr "Ігрові карти"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1113
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Додаткові буквенно-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1117
 msgid "Enclosed Ideographic Supplement"
 msgstr "Додаткові ідеографічні у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1121
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Різні символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1125
 msgid "Emoticons"
 msgstr "Емоційки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1129
 msgid "Ornamental Dingbats"
 msgstr "Орнаментальні декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1133
 msgid "Transport and Map Symbols"
 msgstr "Транспортні і картографічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1137
 msgid "Alchemical Symbols"
 msgstr "Алхімічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1141
 msgid "Geometric Shapes Extended"
 msgstr "Розширені геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1145
 msgid "Supplemental Arrows-C"
 msgstr "Додаткові стрілки-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1149
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Додаткові символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1153
+msgid "Chess Symbols"
+msgstr "Шахові символи"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Уніфіковані ієрогліфічні ідеограми, додаток B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1161
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Ієрогліфічні ідеограми, додаток C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1165
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Ієрогліфічні ідеограми, додаток D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1169
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Ієрогліфічні ідеограми, додаток E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1173
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Ієрогліфічні ідеограми, додаток F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1177
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Додаткові ієрогліфічні ідеограми для сумісності"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
 msgid "Tags"
 msgstr "Мітки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1185
 msgid "Variation Selectors Supplement"
 msgstr "Додаткові символи зміни"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1189
 msgid "Supplementary Private Use Area-A"
 msgstr "Додаткова область приватного використання A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1193
 msgid "Supplementary Private Use Area-B"
 msgstr "Додаткова область приватного використання B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Показати лише список рушіїв"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Не вдалося встановити зв’язок з IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "мова: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Рушій не встановлено.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Спроба встановлення загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Спроба отримання назви загального рушія зазнала невдачі.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Читати дані з загальносистемного кешу регістру."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Читати дані з кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Кеш регістру є некоректним.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Записати дані до загальносистемного кешу регістру."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2920,174 +3004,169 @@ msgstr ""
 "Використовувати шляхи бази даних рушія замість ядра ibus. Шляхи слід "
 "вказувати у форматі списку значень, відокремлених комами."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Скидаємо…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Виконано"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Показати значення налаштувань"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Скинути значення налаштувань до початкових"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Зберегти емодзі з вікна до буфера обміну даними"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Улюблені"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Інше"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Відкрити вибір Unicode"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Введіть анотацію або виберіть емодзі"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:940
 msgid "Bring back emoji choice"
 msgstr "Повернути вибір емоційок"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1042
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1053
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1056
 msgid "Show emoji variants"
 msgstr "Показувати варіанти емодзі"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1057
 msgid "Close"
 msgstr "Закрити"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1063
 msgid "Menu"
 msgstr "Меню"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1074
 msgid "Click to view a warning message"
 msgstr "Натисніть, щоб переглянути попередження"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1118
 msgid "Loading a Unicode dictionary:"
 msgstr "Завантаження словника Unicode:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1364
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1370
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1537
 msgid "None"
 msgstr "Немає"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1561
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1587
 #, c-format
 msgid "Name: %s"
 msgstr "Назва: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1595
 #, c-format
 msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2087
 msgid "Unicode Choice"
 msgstr "Вибір Unicode"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2375
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3098,83 +3177,75 @@ msgstr ""
 "Esc декілька разів, щоб вимкнути режим введення емодзі, клацніть на "
 "стільниці, а потім клацніть у вікні вашої програми для роботи з текстом."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Скасовано вибір емодзі."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Скопійовано емодзі до вашого буфера обміну даними."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "МОВА"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Відповідність за вказаною довжиною рядка"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Оновлення IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Вийти"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ad6b49b4a..3a3694cf8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,21 +14,22 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Jerry Lee <lchopn@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# Tian Shixiong <tiansworld@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2018-06-21 16:24+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2018-09-12 02:51+0000\n"
+"Last-Translator: Tian Shixiong <tiansworld@fedoraproject.org>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
-"Language: zh-CN\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.6\n"
+"X-Generator: Zanata 4.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -229,82 +230,93 @@ msgid "Input Method"
 msgstr "输入法"
 
 #: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "用于显示 emoji 面板的快捷键"
+#, fuzzy
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "启用在表情符号注释或 Unicode 名称间转换的快捷键"
 
 #: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr ""
+msgid "Emoji annotation:"
+msgstr "表情符号注释"
 
 #: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "设置 emoji 面板中 emoji 候选字的字体"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
 #: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emoji 字体："
+msgid "Unicode code point:"
+msgstr ""
 
 #: ../setup/setup.ui.h:53
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "设置表情符号对话框中 Unicode 候选字的字体"
+
+#: ../setup/setup.ui.h:54
+msgid "Unicode font:"
+msgstr "Unicode 字体"
+
+#: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr "设置 emoji 面板中 emoji 释文的语言"
 
-#: ../setup/setup.ui.h:54
+#: ../setup/setup.ui.h:56
 msgid "Emoji annotation language:"
 msgstr "Emoji 释文语言："
 
-#: ../setup/setup.ui.h:55
+#: ../setup/setup.ui.h:57
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
 
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:58
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:59
 msgid "Prefix match"
-msgstr ""
+msgstr "字首匹配"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:60
 msgid "Suffix match"
-msgstr ""
+msgstr "字尾匹配"
 
-#: ../setup/setup.ui.h:59
+#: ../setup/setup.ui.h:61
 msgid "Containing match"
 msgstr ""
 
-#: ../setup/setup.ui.h:60
+#: ../setup/setup.ui.h:62
 msgid "Emoji"
-msgstr ""
+msgstr "表情符号"
 
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
+#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
+#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/setup.ui.h:63
+#: ../setup/setup.ui.h:65
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>键盘布局</b>"
 
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
+#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
-#: ../setup/setup.ui.h:65
+#: ../setup/setup.ui.h:67
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全局输入法设置</b>"
 
-#: ../setup/setup.ui.h:66
+#: ../setup/setup.ui.h:68
 msgid "Advanced"
 msgstr "高级"
 
-#: ../setup/setup.ui.h:67
+#: ../setup/setup.ui.h:69
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -320,19 +332,19 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../setup/setup.ui.h:74
+#: ../setup/setup.ui.h:76
 msgid "Start ibus on login"
 msgstr "登录时运行 IBus"
 
-#: ../setup/setup.ui.h:75
+#: ../setup/setup.ui.h:77
 msgid "<b>Startup</b>"
 msgstr "<b>启动</b>"
 
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
+#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
 msgid "About"
 msgstr "关于"
 
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
+#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -378,8 +390,9 @@ msgid ""
 msgstr "已保存的版本号将被用作检查之前安装的 ibus 版本和当前版本间的区别。"
 
 #: ../data/ibus.schemas.in.h:11
+#, fuzzy
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "无 ASCII 码的拉丁字符布局"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
@@ -535,100 +548,133 @@ msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
 #: ../data/ibus.schemas.in.h:50
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "用于 gtk_accelerator_parse 的 Unicode 快捷键"
+
+#: ../data/ibus.schemas.in.h:51
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "开启或关闭 Unicode 输入的快捷键"
+
+#: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:51
+#: ../data/ibus.schemas.in.h:53
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:52
+#: ../data/ibus.schemas.in.h:54
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr ""
+msgstr "表情符号对话框中用于表情符号的自定义字体名称"
 
-#: ../data/ibus.schemas.in.h:53
+#: ../data/ibus.schemas.in.h:55
 msgid "Default language for emoji dictionary"
 msgstr "emoji 字典的默认语言"
 
-#: ../data/ibus.schemas.in.h:54
+#: ../data/ibus.schemas.in.h:56
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:55
+#: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji list on emoji dialog"
 msgstr "emoji 面板中的最喜爱的 emoji 列表"
 
-#: ../data/ibus.schemas.in.h:56
+#: ../data/ibus.schemas.in.h:58
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:57
+#: ../data/ibus.schemas.in.h:59
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
+msgstr "表情符号对话框中的最喜爱表情符号注释列表"
 
-#: ../data/ibus.schemas.in.h:58
+#: ../data/ibus.schemas.in.h:60
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr ""
+msgstr "您可在此列表中为喜欢的表情符号添加注释。"
 
-#: ../data/ibus.schemas.in.h:59
+#: ../data/ibus.schemas.in.h:61
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:60
+#: ../data/ibus.schemas.in.h:62
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: ../data/ibus.schemas.in.h:63
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: ../data/ibus.schemas.in.h:64
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: ../data/ibus.schemas.in.h:65
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:64
+#: ../data/ibus.schemas.in.h:66
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:65
+#: ../data/ibus.schemas.in.h:67
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:68
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:69
+msgid "Load the Unicode data at the time of startup"
+msgstr "在启动时加载 Unicode 数据"
+
+#: ../data/ibus.schemas.in.h:70
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果设为“False”，则当打开表情符号对话框时加载 "
+"Unicode 数据。Unicode 数据总是会在表情符号数据加载之后加载，即使设置为“True”也是如此。"
+
+#: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:66
+#: ../data/ibus.schemas.in.h:72
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:67
+#: ../data/ibus.schemas.in.h:73
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:69
+#: ../data/ibus.schemas.in.h:75
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:70
+#: ../data/ibus.schemas.in.h:76
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:71
+#: ../data/ibus.schemas.in.h:77
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:72
+#: ../data/ibus.schemas.in.h:78
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -645,15 +691,15 @@ msgstr "其他"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "选择语言"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: ../setup/main.py:561
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -725,15 +771,15 @@ msgstr "请按一个键盘按键（或者一个组合按键）\n"
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/main.py:121 ../setup/main.py:580
+#: ../setup/main.py:121 ../setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:507
+#: ../setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:528
+#: ../setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -747,87 +793,87 @@ msgstr ""
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:542
+#: ../setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:554
+#: ../setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
 #. Translators: Title of the window
-#: ../setup/main.py:556
+#: ../setup/main.py:564
 msgid "switching input methods"
 msgstr "切换输入法"
 
 #: ../src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "活动"
 
 #: ../src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "动物和自然"
 
 #: ../src/ibusemojigen.h:32
 msgid "Flags"
-msgstr ""
+msgstr "旗帜"
 
 #: ../src/ibusemojigen.h:33
 msgid "Food & Drink"
-msgstr ""
+msgstr "食物饮料"
 
 #: ../src/ibusemojigen.h:34
 msgid "Objects"
-msgstr ""
+msgstr "实体"
 
 #: ../src/ibusemojigen.h:35
 msgid "Smileys & People"
-msgstr ""
+msgstr "笑脸和人物"
 
 #: ../src/ibusemojigen.h:36
 msgid "Symbols"
-msgstr ""
+msgstr "符号"
 
 #: ../src/ibusemojigen.h:37
 msgid "Travel & Places"
-msgstr ""
+msgstr "交通工具和场所"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "基本拉丁语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "拉丁-1 补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "拉丁语扩展-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "拉丁语扩展-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA 扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -848,42 +894,42 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "希腊和古埃及语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "西里尔语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "西里尔语补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "亚美尼亚语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "希伯来语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "阿拉伯语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1135,7 +1181,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "蒙语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1275,35 +1321,35 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "拉丁语扩展附加"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "希腊语扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "通用标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "上标和下标"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "货币符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1317,42 +1363,42 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "类似字母的符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "数字形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "箭头"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "数学运算符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "各种技术类符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "控制图"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1387,14 +1433,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "几何形状"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "其它各种符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1534,7 +1580,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "汉、日、韩语符号和标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1583,7 +1629,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "汉、日、韩语笔画"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2754,248 +2800,270 @@ msgstr ""
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:54
+#: ../tools/main.vala:51
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
 
-#: ../tools/main.vala:96
+#: ../tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:164
+#: ../tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:172
+#: ../tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:177
+#: ../tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:220
+#: ../tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "读取系统注册缓存。"
 
-#: ../tools/main.vala:222
+#: ../tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "读取注册缓存 FILE。"
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: ../tools/main.vala:237 ../tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "注册缓存无效。\n"
 
-#: ../tools/main.vala:260
+#: ../tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "写入系统注册缓存。"
 
-#: ../tools/main.vala:262
+#: ../tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "写入注册缓存 FILE。"
 
-#: ../tools/main.vala:314
+#: ../tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: ../tools/main.vala:381
 msgid "Resetting…"
 msgstr "正在重置"
 
-#: ../tools/main.vala:328
+#: ../tools/main.vala:399
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:373
+#: ../tools/main.vala:444
 msgid "Set or get engine"
 msgstr "设定或获取引擎"
 
-#: ../tools/main.vala:374
+#: ../tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "退出 ibus-daemon"
 
-#: ../tools/main.vala:375
+#: ../tools/main.vala:446
 msgid "Show available engines"
 msgstr "显示可用引擎"
 
-#: ../tools/main.vala:376
+#: ../tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(暂不可用)"
 
-#: ../tools/main.vala:377
+#: ../tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "重启 ibus-daemon"
 
-#: ../tools/main.vala:378
+#: ../tools/main.vala:449
 msgid "Show version"
 msgstr "显示版本号"
 
-#: ../tools/main.vala:379
+#: ../tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "显示注册缓存内容。"
 
-#: ../tools/main.vala:380
+#: ../tools/main.vala:451
 msgid "Create registry cache"
 msgstr "创建注册缓存"
 
-#: ../tools/main.vala:381
+#: ../tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
 
-#: ../tools/main.vala:382
+#: ../tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "显示配置值"
 
-#: ../tools/main.vala:383
+#: ../tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "重置配置"
 
-#: ../tools/main.vala:385
+#: ../tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "将面板中的 emoji 保存到剪贴板"
 
-#: ../tools/main.vala:387
+#: ../tools/main.vala:458
 msgid "Show this information"
 msgstr "显示本信息"
 
-#: ../tools/main.vala:393
+#: ../tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s 命令 [选项...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: ../tools/main.vala:465
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:423
+#: ../tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:273
+#: ../ui/gtk3/emojier.vala:244
 msgid "Favorites"
 msgstr "最爱"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ../ui/gtk3/emojier.vala:245
 msgid "Others"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:275
+#: ../ui/gtk3/emojier.vala:246
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:451
+#: ../ui/gtk3/emojier.vala:371
 msgid "Type annotation or choose emoji"
 msgstr "键入释文或是选择 emoji"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ../ui/gtk3/emojier.vala:965
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ../ui/gtk3/emojier.vala:1067
 msgid "Page Down"
 msgstr "下一页"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ../ui/gtk3/emojier.vala:1078
 msgid "Page Up"
 msgstr "上一页"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ../ui/gtk3/emojier.vala:1081
+msgid "Show emoji variants"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1082
+msgid "Close"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1088
+msgid "Menu"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1099
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1143
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:1383
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ../ui/gtk3/emojier.vala:1389
 msgid "Has emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ../ui/gtk3/emojier.vala:1556
 msgid "None"
 msgstr "无"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ../ui/gtk3/emojier.vala:1580
 #, c-format
 msgid "Annotations: %s"
 msgstr "释义：%s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ../ui/gtk3/emojier.vala:1606
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ../ui/gtk3/emojier.vala:1614
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ../ui/gtk3/emojier.vala:2164
+#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
+#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+msgid "Emoji Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2166
+msgid "Unicode Choice"
+msgstr ""
+
+#: ../ui/gtk3/emojier.vala:2526
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "已取消选择一个 emoji"
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ../ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "已将 emoji 复制到你的剪贴板"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ../ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ../ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr ""
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ../ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ../ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ../ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ../ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ../ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
@@ -3025,11 +3093,11 @@ msgstr ""
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ../ui/gtk3/panel.vala:1170
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ../ui/gtk3/panel.vala:1174
 msgid "Quit"
 msgstr "退出"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 295b67e50..6f3d8878a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -22,12 +22,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-08 02:11+0000\n"
-"Last-Translator: Peter Pan <pan93412@gmail.com>\n"
+"PO-Revision-Date: 2018-10-08 01:50+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.4.5\n"
+"X-Generator: Zanata 4.6.2\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -232,27 +232,27 @@ msgstr "輸入法"
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
-msgstr ""
+msgstr "啟用 Emoji 符號或 Unicode 名稱轉換的快捷鍵"
 
 #: ../setup/setup.ui.h:50
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emoji 符號："
 
 #: ../setup/setup.ui.h:51
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "啟用 Unicode 碼位轉換的快捷鍵"
 
 #: ../setup/setup.ui.h:52
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode 碼位："
 
 #: ../setup/setup.ui.h:53
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "設定 Emoji 對話框上的 Unicode 候選字型"
 
 #: ../setup/setup.ui.h:54
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode 字體："
 
 #: ../setup/setup.ui.h:55
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -548,11 +548,11 @@ msgstr "為語言面板自訂字型"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse 的 Unicode 快捷鍵"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "開啟或關閉 Unicode 輸入的快捷鍵"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -627,7 +627,7 @@ msgstr "選擇下列部分符合繪文字註解的條件之一：0 == 前綴符
 
 #: ../data/ibus.schemas.in.h:67
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "每次開啟時載入 Emoji 資料"
 
 #: ../data/ibus.schemas.in.h:68
 msgid ""
@@ -635,10 +635,12 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"如果為 True 則在每次開啟時載入 Emoji 資料，載入資料大約需要 10MB 的記憶體大小。當設定為 False 時則在第一次開啟 Emoji "
+"對話框時載入 Emoji 資料。"
 
 #: ../data/ibus.schemas.in.h:69
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "每次開啟時載入 Unicode 資料"
 
 #: ../data/ibus.schemas.in.h:70
 msgid ""
@@ -647,6 +649,8 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"如果為 True 則在每次開啟時載入 Unicode 資料。載入資料需要大約 15MB 大小的記憶體。如果設定為 False 則在第一次開啟 Emoji "
+"對話框時載入 Unicode 資料，就算設定為 True，Unicode 資料永遠都會在 Emoji 資料載入後才載入。"
 
 #: ../data/ibus.schemas.in.h:71
 msgid "Embed Preedit Text"
@@ -680,8 +684,8 @@ msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 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:158
 msgid "Other"
@@ -1004,7 +1008,7 @@ msgstr "孟加拉文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr "果魯穆其語"
+msgstr "古爾穆基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1018,7 +1022,7 @@ msgstr "古吉拉特文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr "Oriya"
+msgstr "歐利亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1039,7 +1043,7 @@ msgstr "泰盧固文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "卡納達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1144,7 +1148,7 @@ msgstr "盧恩文字"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr "Tagalog"
+msgstr "他加祿文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2215,7 +2219,7 @@ msgstr "摩尼教文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr "Avestan"
+msgstr "阿維斯陀文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2847,7 +2851,7 @@ msgstr "寫入註冊快取 FILE。"
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
-msgstr ""
+msgstr "使用引擎基模位置取代 ibus 核心，可以透過逗號分割字串。"
 
 #: ../tools/main.vala:381
 msgid "Resetting…"
@@ -2959,7 +2963,7 @@ msgstr "顯示繪文字變化"
 
 #: ../ui/gtk3/emojier.vala:1082
 msgid "Close"
-msgstr ""
+msgstr "關閉"
 
 #: ../ui/gtk3/emojier.vala:1088
 msgid "Menu"
@@ -2967,7 +2971,7 @@ msgstr "選單"
 
 #: ../ui/gtk3/emojier.vala:1099
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "點擊顯示警告訊息"
 
 #: ../ui/gtk3/emojier.vala:1143
 msgid "Loading a Unicode dictionary:"
@@ -3022,6 +3026,7 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出 Emoji 輸入模式後，按一下桌面再重按您的文字應用程式一次。"
 
 #: ../ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."

From 407756521617f8514b65ddfa35512183fd22d38d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 1 Mar 2019 17:54:39 +0900
Subject: [PATCH 545/816] Release 1.5.20

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0790d9944..9518e8088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [19])
+m4_define([ibus_micro_version], [20])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 026b19ef169dd9612d8a4a1ee34f7c42e7215c9a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 13 Mar 2019 19:16:17 +0900
Subject: [PATCH 546/816] setup: Enable to run ibus-setup with a different
 python

BUG=https://github.com/ibus/ibus/issues/2086
---
 setup/ibus-setup.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
index bb5c85cf5..4a6830af7 100644
--- a/setup/ibus-setup.in
+++ b/setup/ibus-setup.in
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2018 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@
 export IBUS_DATAROOTDIR=@datarootdir@
 export IBUS_LOCALEDIR=@localedir@
 export IBUS_LIBEXECDIR=${libexecdir}
-exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@
+exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@
 

From 2825bfc13618d382444aa1f87be22cd86e9bba29 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 13 Mar 2019 19:35:19 +0900
Subject: [PATCH 547/816] src: Update ibusunicodegen.h for Unicode UCD 12.0

---
 src/ibusunicodegen.h | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
index 9952fe0a8..6a60a5a9a 100644
--- a/src/ibusunicodegen.h
+++ b/src/ibusunicodegen.h
@@ -855,6 +855,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Sogdian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Elymaic"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -935,6 +939,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Warang Citi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Nandinagari"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -967,6 +975,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Makasar"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tamil Supplement"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -983,6 +995,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Egyptian Hieroglyphs"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Egyptian Hieroglyph Format Controls"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1031,6 +1047,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Kana Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Small Kana Extension"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1079,6 +1099,14 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Glagolitic Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Nyiakeng Puachue Hmong"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Wancho"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1091,6 +1119,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Indic Siyaq Numbers"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ottoman Siyaq Numbers"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1151,6 +1183,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Chess Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Symbols and Pictographs Extended-A"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */

From 6099a45f2e734458202383fdf157aea95b1f35a5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 13 Mar 2019 19:36:05 +0900
Subject: [PATCH 548/816] build: Delete built sources with MAINTAINERCLEANFILES

BUG=https://github.com/ibus/ibus/issues/2082
---
 src/Makefile.am     | 9 ++++++++-
 ui/gtk3/Makefile.am | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a62e0f01..a8e3d07da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -256,6 +256,10 @@ dicts/emoji-en.dict: emoji-parser
 	    echo "WARNING: Not found $(EMOJI_ANNOTATION_DIR)/en.xml" 1>&2; \
 	fi; \
 	for f in $(LANG_FILES) ; do \
+	    if test -f dicts/emoji-$$f.dict; then \
+	        echo "Already exists dicts/emoji-$$f.dict"; \
+	        continue; \
+	    fi; \
 	    if test -f \
 	    "$(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml" ; then \
 	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml"; \
@@ -279,6 +283,9 @@ dicts/emoji-en.dict: emoji-parser
 	    echo "Generated $$plus_comment dicts/emoji-$$f.dict"; \
 	done
 
+ibusemojigen.h: dicts/emoji-en.dict
+	$(NULL)
+
 install-data-hook: $(dict_DATA)
 	@$(NORMAL_INSTALL)
 	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 60205aa52..667d51c60 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -130,6 +130,8 @@ CLEANFILES =            \
     gtkpanel.xml        \
     $(NULL)
 
+MAINTAINERCLEANFILES =
+
 emoji_headers =         \
     ibusemojidialog.h   \
     $(NULL)
@@ -192,6 +194,8 @@ emojierapp.o: $(srcdir)/emojierapp.c
 	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
 	$(NULL)
 
+MAINTAINERCLEANFILES += emojierapp.c
+
 component_DATA += gtkextension.xml
 CLEANFILES += gtkextension.xml
 libexec_PROGRAMS += ibus-extension-gtk3
@@ -240,6 +244,8 @@ panelbinding.o: $(srcdir)/panelbinding.c
 	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
 	$(NULL)
 
+MAINTAINERCLEANFILES += extension.c panelbinding.c
+
 man_seven_files = $(man_seven_in_files:.7.in=.7)
 man_seven_DATA =$(man_seven_files:.7=.7.gz)
 man_sevendir = $(mandir)/man7

From b497de5bc6525769e03b65c73fc991d4aa006223 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 20 Mar 2019 17:44:26 +0900
Subject: [PATCH 549/816] test: Set GTK_IM_MODULE in test-console.sh

---
 src/tests/Makefile.am |  4 ++--
 test/test-console.sh  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index e337a59b0..e2ff5ea72 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2018 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ TESTS_ENVIRONMENT = \
 
 LOG_COMPILER = $(srcdir)/runtest
 
-EXTRA_DIST = runtest
+EXTRA_DIST = runtest ibus-compose.env
 
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
diff --git a/test/test-console.sh b/test/test-console.sh
index 7199f7a76..490048b41 100755
--- a/test/test-console.sh
+++ b/test/test-console.sh
@@ -100,6 +100,17 @@ _EOF
         mkdir -p $HOME/.config
         touch $HOME/.config/gnome-initial-setup-done
     fi
+
+    # Prevent from launching a XDG dialog
+    XDG_LOCALE_FILE="$HOME/.config/user-dirs.locale"
+    if test -f $XDG_LOCALE_FILE ; then
+        XDG_LANG_ORIG=`cat $XDG_LOCALE_FILE`
+        XDG_LANG_NEW=`echo $LANG | sed -e 's/\(.*\)\..*/\1/'`
+        if [ "$XDG_LANG_ORIG" != "$XDG_LANG_NEW" ] ; then
+            echo "Overriding XDG locale $XDG_LANG_ORIG with $XDG_LANG_NEW"
+            echo "$XDG_LANG_NEW" > $XDG_LOCALE_FILE
+        fi
+    fi
 }
 
 run_dbus_daemon()
@@ -177,6 +188,7 @@ run_test_suite()
     pass=0
     fail=0
 
+    export GTK_IM_MODULE=ibus
     if test -f $TEST_LOG ; then
         rm $TEST_LOG
     fi

From 1cb5032e85d85f496e349236d1b74f17fb8db966 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 23 Apr 2019 15:40:45 +0900
Subject: [PATCH 550/816] configure: Move ibus-setup from configure.ac to
 Makefile.am

@localedir@ can be extracted to ${datarootdir}/locale and
it needs datarootdir=/usr/share in case configure.ac is used
and deleting the datarootdir line caused a regression.
All variables can be extracted in Makefile.am with sed.
---
 configure.ac      |  1 -
 setup/Makefile.am | 13 +++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9518e8088..7503f3e82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -724,7 +724,6 @@ ibus/interface/Makefile
 ui/Makefile
 ui/gtk3/Makefile
 setup/Makefile
-setup/ibus-setup
 bindings/Makefile
 bindings/pygobject/Makefile
 bindings/vala/Makefile
diff --git a/setup/Makefile.am b/setup/Makefile.am
index cb4dd8d10..34c8f1360 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2019 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
@@ -40,6 +40,15 @@ ibussetup_DATA = \
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
 
+ibus-setup: ibus-setup.in
+	$(AM_V_GEN) sed -e "s|\@datarootdir\@|$(datarootdir)|g" \
+	                -e "s|\@localedir\@|$(localedir)|g" \
+	                -e "s|\@libexecdir\@|$(libexecdir)|g" \
+	                -e "s|\@prefix\@|$(prefix)|g" \
+	                -e "s|\@PYTHON\@|$(PYTHON)|g" \
+	$< > $@.tmp && \
+	mv $@.tmp $@
+
 desktop_notrans_files = ibus-setup.desktop
 desktop_DATA = org.freedesktop.IBus.Setup.desktop
 desktopdir = $(datadir)/applications

From cc849c20d4dff31f6f88f93789790759bf087b77 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 23 Apr 2019 17:56:20 +0900
Subject: [PATCH 551/816] NEWS: Add shortlog

Update Makefile.am to insert shortlog in NEWS
Update po/Makevars to add multiple COPYRIGHT_HOLDER
---
 Makefile.am | 7 +++++--
 po/Makevars | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cf7460d60..9ff786dc3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2017 Red Hat, Inc.
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2019 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
@@ -103,6 +103,9 @@ dist-hook:
 "$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \
 		echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \
 		echo "" >> $(distdir)/NEWS; \
+		git shortlog $$IBUS_PREV_VERSION...$(IBUS_VERSION) \
+		        >> $(distdir)/NEWS; \
+		echo "" >> $(distdir)/NEWS; \
 		git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \
 		        --pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \
 	fi
diff --git a/po/Makevars b/po/Makevars
index d3fbeab2c..1d16cc98b 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,7 +20,8 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Peng Huang <shawn.p.huang@gmail.com>
+COPYRIGHT_HOLDER = Peng Huang <shawn.p.huang@gmail.com> \
+Takao Fujiwara <takao.fujiwara1@gmail.com>
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:

From 1c54fea645b2ec3a385d492e4ca30a70dbb87c3a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 23 Apr 2019 18:44:45 +0900
Subject: [PATCH 552/816] data/its: Add ibus.its for IME's component files

IBusEngineDesc has translatable strings in longname and
description tags and they needs to be extracted by xgettext.

After you install the ibus.[its|loc] to /usr/share/gettext/its,
each engine's component file needs to renamed with
'.inputMethod.xml' in the source directory suffix. E.g.
Rename 'anthy.xml' to 'anthy.inputMethod.xml' and write the file
path to the engine's POTFILES.in
---
 configure.ac         |  1 +
 data/Makefile.am     |  3 ++-
 data/its/Makefile.am | 29 +++++++++++++++++++++++++++++
 data/its/ibus.its    | 14 ++++++++++++++
 data/its/ibus.loc    |  7 +++++++
 5 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 data/its/Makefile.am
 create mode 100644 data/its/ibus.its
 create mode 100644 data/its/ibus.loc

diff --git a/configure.ac b/configure.ac
index 7503f3e82..b5a87b56b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -711,6 +711,7 @@ util/IMdkit/Makefile
 data/Makefile
 data/annotations/Makefile
 data/icons/Makefile
+data/its/Makefile
 data/keymaps/Makefile
 data/dconf/Makefile
 docs/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 2533f444c..aa3ee4665 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2007-2019 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,7 @@
 SUBDIRS = \
 	annotations \
 	icons \
+	its \
 	keymaps \
 	$(NULL)
 
diff --git a/data/its/Makefile.am b/data/its/Makefile.am
new file mode 100644
index 000000000..07c8a96d5
--- /dev/null
+++ b/data/its/Makefile.am
@@ -0,0 +1,29 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2019 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
+# 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
+
+itsdir = $(datadir)/gettext/its
+its_DATA = \
+    ibus.its \
+    ibus.loc \
+    $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/its/ibus.its b/data/its/ibus.its
new file mode 100644
index 000000000..30d8d4e27
--- /dev/null
+++ b/data/its/ibus.its
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           version="2.0">
+  <its:translateRule selector="/component" translate="no"/>
+  <its:translateRule selector="/engines" translate="no"/>
+  <its:translateRule selector="//engine" translate="no"/>
+  <its:translateRule selector="//longname |
+                               //description"
+                     translate="yes"/>
+  <its:translateRule selector="//longname[@translatable = 'no']"
+                     translate="no"/>
+  <its:translateRule selector="//description[@translatable = 'no']"
+                     translate="no"/>
+</its:rules>
diff --git a/data/its/ibus.loc b/data/its/ibus.loc
new file mode 100644
index 000000000..5a73798b6
--- /dev/null
+++ b/data/its/ibus.loc
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="IBusEngineDesc" pattern="*.inputMethod.xml">
+    <documentRule localName="engines" target="ibus.its"/>
+    <documentRule localName="component" target="ibus.its"/>
+  </locatingRule>
+</locatingRules>

From 91a256163427f04eb7763196b4ffe553911d2e01 Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@users.noreply.github.com>
Date: Tue, 7 May 2019 19:42:28 +0900
Subject: [PATCH 553/816] bus: Indistinguishable address of ibus-daemon

BUG=https://github.com/ibus/ibus/issues/2095
---
 bus/global.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/global.c b/bus/global.c
index f147cd6fe..2ba8b2a71 100644
--- a/bus/global.c
+++ b/bus/global.c
@@ -24,7 +24,7 @@
 #include "global.h"
 
 gchar **g_argv = NULL;
-gchar *g_address = "unix:tmpdir=/tmp";
+gchar *g_address = "unix:tmpdir=/tmp/ibus";
 gchar *g_cache = "auto";
 gboolean g_mempro = FALSE;
 gboolean g_verbose = FALSE;

From 05a10950d635602fb3fcf4ed0021aa0b15dbd698 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 15:49:09 +0900
Subject: [PATCH 554/816] src: Make ISO 639 language names with title

Danish translations are small in iso-codes-iso-639-2-da.po for the
genral usage but the users ask the title format on UI.
Now ibus_get_language_name() and ibus_get_untranslated_language_name()
return the dynamic allocation instead of the static characters
to make the capital character.

BUG=https://github.com/ibus/ibus/issues/2079
---
 src/ibusutil.c | 63 ++++++++++++++++++++++++++++++++++++++++++--------
 src/ibusutil.h |  8 +++----
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/ibusutil.c b/src/ibusutil.c
index fd1da006c..9d003e2ee 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -125,8 +125,8 @@ _load_lang()
     ibus_xml_free (node);
 }
 
-const gchar *
-ibus_get_untranslated_language_name (const gchar *_locale)
+const static gchar *
+ibus_get_untranslated_raw_language_name (const gchar *_locale)
 {
     const gchar *retval;
     gchar *p = NULL;
@@ -148,19 +148,64 @@ ibus_get_untranslated_language_name (const gchar *_locale)
         return "Other";
 }
 
-const gchar *
+static char *
+get_first_item_in_semicolon_list (const char *list)
+{
+        char **items;
+        char  *item;
+
+        items = g_strsplit (list, "; ", 2);
+
+        item = g_strdup (items[0]);
+        g_strfreev (items);
+
+        return item;
+}
+
+static char *
+capitalize_utf8_string (const char *str)
+{
+    char first[8] = { 0 };
+
+    if (!str)
+        return NULL;
+
+    g_unichar_to_utf8 (g_unichar_totitle (g_utf8_get_char (str)), first);
+
+    return g_strconcat (first, g_utf8_offset_to_pointer (str, 1), NULL);
+}
+
+gchar *
+ibus_get_untranslated_language_name (const gchar *_locale)
+{
+    const gchar *raw = ibus_get_untranslated_raw_language_name (_locale);
+    gchar *tmp = get_first_item_in_semicolon_list (raw);
+    gchar *retval = capitalize_utf8_string (tmp);
+    g_free (tmp);
+    return retval;
+}
+
+gchar *
 ibus_get_language_name (const gchar *_locale)
 {
-    const gchar *retval = ibus_get_untranslated_language_name (_locale);
+    const gchar *raw = ibus_get_untranslated_raw_language_name (_locale);
+    const gchar *translation = NULL;
+    gchar *tmp;
+    gchar *retval;
 
 #ifdef ENABLE_NLS
-    if (g_strcmp0 (retval, "Other") == 0)
-        return dgettext (GETTEXT_PACKAGE, N_("Other"));
+    if (g_strcmp0 (raw, "Other") == 0)
+        return g_strdup (dgettext (GETTEXT_PACKAGE, N_("Other")));
     else
-        return dgettext ("iso_639-3", retval);
+        translation = dgettext ("iso_639-3", raw);
 #else
-    return retval;
+    translation = raw;
 #endif
+
+    tmp = get_first_item_in_semicolon_list (translation);
+    retval = capitalize_utf8_string (tmp);
+    g_free (tmp);
+    return retval;
 }
 
 void
diff --git a/src/ibusutil.h b/src/ibusutil.h
index 226dd7a88..795365f69 100644
--- a/src/ibusutil.h
+++ b/src/ibusutil.h
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2016 Red Hat, Inc.
+ * Copyright (C) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2018 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
@@ -42,7 +42,7 @@
  *
  * Returns: untranslated language name
  */
-const gchar *    ibus_get_untranslated_language_name
+gchar *          ibus_get_untranslated_language_name
                                                 (const gchar    *_locale);
 
 /**
@@ -51,6 +51,6 @@ const gchar *    ibus_get_untranslated_language_name
  *
  * Returns: translated language name
  */
-const gchar *    ibus_get_language_name         (const gchar    *_locale);
+gchar *          ibus_get_language_name         (const gchar    *_locale);
 
 #endif

From cebe7a9553de69943b955ec99285f74961c9ee4e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 15:49:21 +0900
Subject: [PATCH 555/816] client/gtk2: Keep preedit cursor_pos and visible in
 clearing preedit text

Clear the preedit_string but keep the preedit_cursor_pos and
preedit_visible because a time lag could happen, firefox commit
the preedit text before the preedit text is cleared and it cause
a double commits of the Hangul preedit in firefox if the preedit
would be located on the URL bar and click on anywhere of firefox
out of the URL bar.
---
 client/gtk2/ibusimcontext.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 264a747ab..5e3457baa 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -881,10 +881,18 @@ ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
         ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
         preedit_string = g_strdup (ibusimcontext->preedit_string);
     }
+
+    /* Clear the preedit_string but keep the preedit_cursor_pos and
+     * preedit_visible because a time lag could happen, firefox commit
+     * the preedit text before the preedit text is cleared and it cause
+     * a double commits of the Hangul preedit in firefox if the preedit
+     * would be located on the URL bar and click on anywhere of firefox
+     * out of the URL bar.
+     */
     _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,
                                           ibus_text_new_from_string (""),
-                                          0,
-                                          FALSE,
+                                          ibusimcontext->preedit_cursor_pos,
+                                          ibusimcontext->preedit_visible,
                                           IBUS_ENGINE_PREEDIT_CLEAR,
                                           ibusimcontext);
     if (preedit_string) {

From d25489ae53f061101e9f380196d393136bb4f0ec Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 16:20:55 +0900
Subject: [PATCH 556/816] src: Copy compose-parse.py from gtk

---
 src/compose-parse.py | 971 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 971 insertions(+)
 create mode 100755 src/compose-parse.py

diff --git a/src/compose-parse.py b/src/compose-parse.py
new file mode 100755
index 000000000..9a6513a70
--- /dev/null
+++ b/src/compose-parse.py
@@ -0,0 +1,971 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# compose-parse.py, version 1.4
+#
+# multifunction script that helps manage the compose sequence table in GTK+ (gtk/gtkimcontextsimple.c)
+# the script produces statistics and information about the whole process, run with --help for more.
+#
+# You may need to switch your python installation to utf-8, if you get 'ascii' codec errors.
+#
+# Complain to Simos Xenitellis (simos@gnome.org, http://simos.info/blog) for this craft.
+
+from re			import findall, match, split, sub
+from string		import atoi
+from unicodedata	import normalize
+from urllib 		import urlretrieve
+from os.path		import isfile, getsize
+from copy 		import copy
+
+import sys
+import getopt
+
+# We grab files off the web, left and right.
+URL_COMPOSE = 'http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre'
+URL_KEYSYMSTXT = "http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt"
+URL_GDKKEYSYMSH = "http://git.gnome.org/browse/gtk%2B/plain/gdk/gdkkeysyms.h"
+URL_UNICODEDATATXT = 'http://www.unicode.org/Public/6.0.0/ucd/UnicodeData.txt'
+FILENAME_COMPOSE_SUPPLEMENTARY = 'gtk-compose-lookaside.txt'
+
+# We currently support keysyms of size 2; once upstream xorg gets sorted, 
+# we might produce some tables with size 2 and some with size 4.
+SIZEOFINT = 2
+
+# Current max compose sequence length; in case it gets increased.
+WIDTHOFCOMPOSETABLE = 5
+
+keysymdatabase = {}
+keysymunicodedatabase = {}
+unicodedatabase = {}
+
+headerfile_start = """/* GTK - The GIMP Tool Kit
+ * Copyright (C) 2007, 2008 GNOME Foundation
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896
+ * using the input files
+ *  Input   : http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre
+ *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
+ *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
+ *
+ * This table is optimised for space and requires special handling to access the content.
+ * This table is used solely by http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtkimcontextsimple.c
+ * 
+ * The resulting file is placed at http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtkimcontextsimpleseqs.h
+ * This file is described in bug report http://bugzilla.gnome.org/show_bug.cgi?id=321896
+ */
+
+/*
+ * Modified by the GTK+ Team and others 2007, 2008.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_IM_CONTEXT_SIMPLE_SEQS_H__
+#define __GTK_IM_CONTEXT_SIMPLE_SEQS_H__
+
+/* === These are the original comments of the file; we keep for historical purposes ===
+ *
+ * The following table was generated from the X compose tables include with
+ * XFree86 4.0 using a set of Perl scripts. Contact Owen Taylor <otaylor@redhat.com>
+ * to obtain the relevant perl scripts.
+ *
+ * The following compose letter letter sequences confliced
+ *   Dstroke/dstroke and ETH/eth; resolved to Dstroke (Croation, Vietnamese, Lappish), over
+ *                                ETH (Icelandic, Faroese, old English, IPA)  [ D- -D d- -d ]
+ *   Amacron/amacron and ordfeminine; resolved to ordfeminine                 [ _A A_ a_ _a ]
+ *   Amacron/amacron and Atilde/atilde; resolved to atilde                    [ -A A- a- -a ]
+ *   Omacron/Omacron and masculine; resolved to masculine                     [ _O O_ o_ _o ]
+ *   Omacron/omacron and Otilde/atilde; resolved to otilde                    [ -O O- o- -o ]
+ *
+ * [ Amacron and Omacron are in Latin-4 (Baltic). ordfeminine and masculine are used for
+ *   spanish. atilde and otilde are used at least for Portuguese ]
+ *
+ *   at and Aring; resolved to Aring                                          [ AA ]
+ *   guillemotleft and caron; resolved to guillemotleft                       [ << ]
+ *   ogonek and cedilla; resolved to cedilla                                  [ ,, ]
+ *
+ * This probably should be resolved by first checking an additional set of compose tables
+ * that depend on the locale or selected input method.
+ */
+
+static const guint16 gtk_compose_seqs_compact[] = {"""
+
+headerfile_end = """};
+
+#endif /* __GTK_IM_CONTEXT_SIMPLE_SEQS_H__ */
+"""
+
+def stringtohex(str): return atoi(str, 16)
+
+def factorial(n): 
+	if n <= 1:
+		return 1
+	else:
+		return n * factorial(n-1)
+
+def uniq(*args) :
+	""" Performs a uniq operation on a list or lists """
+    	theInputList = []
+    	for theList in args:
+    	   theInputList += theList
+    	theFinalList = []
+    	for elem in theInputList:
+		if elem not in theFinalList:
+          		theFinalList.append(elem)
+    	return theFinalList
+
+
+
+def all_permutations(seq):
+	""" Borrowed from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252178 """
+	""" Produces all permutations of the items of a list """
+    	if len(seq) <=1:
+    	    yield seq
+    	else:
+    	    for perm in all_permutations(seq[1:]):
+    	        for i in range(len(perm)+1):
+    	            #nb str[0:1] works in both string and list contexts
+        	        yield perm[:i] + seq[0:1] + perm[i:]
+
+def usage():
+	print """compose-parse available parameters:
+	-h, --help		this craft
+	-s, --statistics	show overall statistics (both algorithmic, non-algorithmic)
+	-a, --algorithmic	show sequences saved with algorithmic optimisation
+	-g, --gtk		show entries that go to GTK+
+	-u, --unicodedatatxt	show compose sequences derived from UnicodeData.txt (from unicode.org)
+	-v, --verbose		show verbose output
+        -p, --plane1		show plane1 compose sequences
+	-n, --numeric		when used with --gtk, create file with numeric values only
+	-e, --gtk-expanded	when used with --gtk, create file that repeats first column; not usable in GTK+
+
+	Default is to show statistics.
+	"""
+
+try: 
+	opts, args = getopt.getopt(sys.argv[1:], "pvgashune", ["help", "algorithmic", "statistics", "unicodedatatxt", 
+		"stats", "gtk", "verbose", "plane1", "numeric", "gtk-expanded"])
+except: 
+	usage()
+	sys.exit(2)
+
+opt_statistics = False
+opt_algorithmic = False
+opt_gtk = False
+opt_unicodedatatxt = False
+opt_verbose = False
+opt_plane1 = False
+opt_numeric = False
+opt_gtkexpanded = False
+
+for o, a in opts:
+	if o in ("-h", "--help"):
+		usage()
+		sys.exit()
+	if o in ("-s", "--statistics"):
+		opt_statistics = True
+	if o in ("-a", "--algorithmic"):
+		opt_algorithmic = True
+	if o in ("-g", "--gtk"):
+		opt_gtk = True	
+	if o in ("-u", "--unicodedatatxt"):
+		opt_unicodedatatxt = True
+	if o in ("-v", "--verbose"):
+		opt_verbose = True
+	if o in ("-p", "--plane1"):
+		opt_plane1 = True
+	if o in ("-n", "--numeric"):
+		opt_numeric = True
+	if o in ("-e", "--gtk-expanded"):
+		opt_gtkexpanded = True
+
+if not opt_algorithmic and not opt_gtk and not opt_unicodedatatxt:
+	opt_statistics = True
+
+def download_hook(blocks_transferred, block_size, file_size):
+	""" A download hook to provide some feedback when downloading """
+	if blocks_transferred == 0:
+		if file_size > 0:
+			if opt_verbose:
+				print "Downloading", file_size, "bytes: ",
+		else:	
+			if opt_verbose:
+				print "Downloading: ",
+	sys.stdout.write('#')
+	sys.stdout.flush()
+
+
+def download_file(url):
+	""" Downloads a file provided a URL. Returns the filename. """
+	""" Borks on failure """
+	localfilename = url.split('/')[-1]
+        if not isfile(localfilename) or getsize(localfilename) <= 0:
+		if opt_verbose:
+			print "Downloading ", url, "..."
+		try: 
+			urlretrieve(url, localfilename, download_hook)
+		except IOError, (errno, strerror):
+			print "I/O error(%s): %s" % (errno, strerror)
+			sys.exit(-1)
+		except:
+			print "Unexpected error: ", sys.exc_info()[0]
+			sys.exit(-1)
+		print " done."
+        else:
+		if opt_verbose:
+                	print "Using cached file for ", url
+	return localfilename
+
+def process_gdkkeysymsh():
+	""" Opens the gdkkeysyms.h file from GTK+/gdk/gdkkeysyms.h """
+	""" Fills up keysymdb with contents """
+	filename_gdkkeysymsh = download_file(URL_GDKKEYSYMSH)
+	try: 
+		gdkkeysymsh = open(filename_gdkkeysymsh, 'r')
+	except IOError, (errno, strerror):
+		print "I/O error(%s): %s" % (errno, strerror)
+		sys.exit(-1)
+	except:
+		print "Unexpected error: ", sys.exc_info()[0]
+		sys.exit(-1)
+
+	""" Parse the gdkkeysyms.h file and place contents in  keysymdb """
+	linenum_gdkkeysymsh = 0
+	keysymdb = {}
+	for line in gdkkeysymsh.readlines():
+		linenum_gdkkeysymsh += 1
+		line = line.strip()
+		if line == "" or not match('^#define GDK_KEY_', line):
+			continue
+		components = split('\s+', line)
+		if len(components) < 3:
+			print "Invalid line %(linenum)d in %(filename)s: %(line)s"\
+			% {'linenum': linenum_gdkkeysymsh, 'filename': filename_gdkkeysymsh, 'line': line}
+			print "Was expecting 3 items in the line"
+			sys.exit(-1)
+		if not match('^GDK_KEY_', components[1]):
+			print "Invalid line %(linenum)d in %(filename)s: %(line)s"\
+			% {'linenum': linenum_gdkkeysymsh, 'filename': filename_gdkkeysymsh, 'line': line}
+			print "Was expecting a keysym starting with GDK_KEY_"
+			sys.exit(-1)
+		if match('^0x[0-9a-fA-F]+$', components[2]):
+			unival = long(components[2][2:], 16)
+			if unival == 0:
+				continue
+			keysymdb[components[1][8:]] = unival
+		else:
+			print "Invalid line %(linenum)d in %(filename)s: %(line)s"\
+			% {'linenum': linenum_gdkkeysymsh, 'filename': filename_gdkkeysymsh, 'line': line}
+			print "Was expecting a hexadecimal number at the end of the line"
+			sys.exit(-1)
+	gdkkeysymsh.close()
+
+	""" Patch up the keysymdb with some of our own stuff """
+
+	""" This is for a missing keysym from the currently upstream file """
+	###keysymdb['dead_stroke'] = 0x338
+
+	""" This is for a missing keysym from the currently upstream file """
+	###keysymdb['dead_belowring'] = 0x323
+	###keysymdb['dead_belowmacron'] = 0x331
+	###keysymdb['dead_belowcircumflex'] = 0x32d
+	###keysymdb['dead_belowtilde'] = 0x330
+	###keysymdb['dead_belowbreve'] = 0x32e
+	###keysymdb['dead_belowdiaeresis'] = 0x324
+
+	""" This is^Wwas preferential treatment for Greek """
+	# keysymdb['dead_tilde'] = 0x342  		
+	""" This is^was preferential treatment for Greek """
+	#keysymdb['combining_tilde'] = 0x342	
+
+	""" Fixing VoidSymbol """
+	keysymdb['VoidSymbol'] = 0xFFFF
+
+	return keysymdb
+
+def process_keysymstxt():
+	""" Grabs and opens the keysyms.txt file that Markus Kuhn maintains """
+	""" This file keeps a record between keysyms <-> unicode chars """
+	filename_keysymstxt = download_file(URL_KEYSYMSTXT)
+	try: 
+		keysymstxt = open(filename_keysymstxt, 'r')
+	except IOError, (errno, strerror):
+		print "I/O error(%s): %s" % (errno, strerror)
+		sys.exit(-1)
+	except:
+		print "Unexpected error: ", sys.exc_info()[0]
+		sys.exit(-1)
+
+	""" Parse the keysyms.txt file and place content in  keysymdb """
+	linenum_keysymstxt = 0
+	keysymdb = {}
+	for line in keysymstxt.readlines():
+		linenum_keysymstxt += 1
+		line = line.strip()
+		if line == "" or match('^#', line):
+			continue
+		components = split('\s+', line)
+		if len(components) < 5:
+			print "Invalid line %(linenum)d in %(filename)s: %(line)s'"\
+			% {'linenum': linenum_keysymstxt, 'filename': filename_keysymstxt, 'line': line}
+			print "Was expecting 5 items in the line"
+			sys.exit(-1)
+		if match('^U[0-9a-fA-F]+$', components[1]):
+			unival = long(components[1][1:], 16)
+		if unival == 0:
+			continue
+		keysymdb[components[4]] = unival
+	keysymstxt.close()
+
+	""" Patch up the keysymdb with some of our own stuff """
+	""" This is for a missing keysym from the currently upstream file """
+	keysymdb['dead_belowring'] = 0x323
+	keysymdb['dead_belowmacron'] = 0x331
+	keysymdb['dead_belowcircumflex'] = 0x32d
+	keysymdb['dead_belowtilde'] = 0x330
+	keysymdb['dead_belowbreve'] = 0x32e
+	keysymdb['dead_belowdiaeresis'] = 0x324
+
+	""" This is preferential treatment for Greek """
+	""" => we get more savings if used for Greek """
+	# keysymdb['dead_tilde'] = 0x342  		
+	""" This is preferential treatment for Greek """
+	# keysymdb['combining_tilde'] = 0x342	
+
+	""" This is for a missing keysym from Markus Kuhn's db """
+	keysymdb['dead_stroke'] = 0x338
+	""" This is for a missing keysym from Markus Kuhn's db """
+	keysymdb['Oslash'] = 0x0d8		
+	""" This is for a missing keysym from Markus Kuhn's db """
+	keysymdb['Ssharp'] = 0x1e9e
+
+	""" This is for a missing (recently added) keysym """
+	keysymdb['dead_psili'] = 0x313		
+	""" This is for a missing (recently added) keysym """
+	keysymdb['dead_dasia'] = 0x314		
+
+	""" Allows to import Multi_key sequences """
+	keysymdb['Multi_key'] = 0xff20
+
+        keysymdb['zerosubscript'] = 0x2080
+        keysymdb['onesubscript'] = 0x2081
+        keysymdb['twosubscript'] = 0x2082
+        keysymdb['threesubscript'] = 0x2083
+        keysymdb['foursubscript'] = 0x2084
+        keysymdb['fivesubscript'] = 0x2085
+        keysymdb['sixsubscript'] = 0x2086
+        keysymdb['sevensubscript'] = 0x2087
+        keysymdb['eightsubscript'] = 0x2088
+        keysymdb['ninesubscript'] = 0x2089
+        keysymdb['dead_doublegrave'] = 0x030F
+        keysymdb['dead_invertedbreve'] = 0x0311
+        keysymdb['dead_belowcomma'] = 0xfe6e
+        keysymdb['dead_currency'] = 0xfe6f
+        keysymdb['dead_greek'] = 0xfe8c
+
+	return keysymdb
+
+def keysymvalue(keysym, file = "n/a", linenum = 0):
+	""" Extracts a value from the keysym """
+	""" Find the value of keysym, using the data from keysyms """
+	""" Use file and linenum to when reporting errors """
+	if keysym == "":
+		return 0
+       	if keysymdatabase.has_key(keysym):
+               	return keysymdatabase[keysym]
+       	elif keysym[0] == 'U' and match('[0-9a-fA-F]+$', keysym[1:]):
+               	return atoi(keysym[1:], 16)
+       	elif keysym[:2] == '0x' and match('[0-9a-fA-F]+$', keysym[2:]):
+		return atoi(keysym[2:], 16)
+	else:
+        	print 'keysymvalue: UNKNOWN{%(keysym)s}' % { "keysym": keysym }
+               	#return -1
+		sys.exit(-1)
+
+def keysymunicodevalue(keysym, file = "n/a", linenum = 0):
+	""" Extracts a value from the keysym """
+	""" Find the value of keysym, using the data from keysyms """
+	""" Use file and linenum to when reporting errors """
+	if keysym == "":
+		return 0
+       	if keysymunicodedatabase.has_key(keysym):
+               	return keysymunicodedatabase[keysym]
+       	elif keysym[0] == 'U' and match('[0-9a-fA-F]+$', keysym[1:]):
+               	return atoi(keysym[1:], 16)
+       	elif keysym[:2] == '0x' and match('[0-9a-fA-F]+$', keysym[2:]):
+		return atoi(keysym[2:], 16)
+	else:
+        	print 'keysymunicodevalue: UNKNOWN{%(keysym)s}' % { "keysym": keysym }
+               	sys.exit(-1)
+
+def rename_combining(seq):
+	filtered_sequence = []
+	for ks in seq:
+		if findall('^combining_', ks):
+			ks = sub('^combining_', 'dead_', ks)
+                if ks == 'dead_double_grave':
+                        ks = 'dead_doublegrave'
+                if ks == 'dead_inverted_breve':
+                        ks = 'dead_invertedbreve'
+		filtered_sequence.append(ks)
+	return filtered_sequence
+
+
+keysymunicodedatabase = process_keysymstxt()
+keysymdatabase = process_gdkkeysymsh()
+
+""" Grab and open the compose file from upstream """
+filename_compose = download_file(URL_COMPOSE)
+try: 
+	composefile = open(filename_compose, 'r')
+except IOError, (errno, strerror):
+	print "I/O error(%s): %s" % (errno, strerror)
+	sys.exit(-1)
+except:
+	print "Unexpected error: ", sys.exc_info()[0]
+	sys.exit(-1)
+
+""" Look if there is a lookaside (supplementary) compose file in the current
+    directory, and if so, open, then merge with upstream Compose file.
+"""
+xorg_compose_sequences_raw = []
+for seq in composefile.readlines():
+        xorg_compose_sequences_raw.append(seq)
+
+try:
+        composefile_lookaside = open(FILENAME_COMPOSE_SUPPLEMENTARY, 'r')
+        for seq in composefile_lookaside.readlines():
+                xorg_compose_sequences_raw.append(seq)
+except IOError, (errno, strerror):
+        if opt_verbose:
+                print "I/O error(%s): %s" % (errno, strerror)
+                print "Did not find lookaside compose file. Continuing..."
+except:
+        print "Unexpected error: ", sys.exc_info()[0]
+        sys.exit(-1)
+
+""" Parse the compose file in  xorg_compose_sequences"""
+xorg_compose_sequences = []
+xorg_compose_sequences_algorithmic = []
+linenum_compose = 0
+comment_nest_depth = 0
+for line in xorg_compose_sequences_raw:
+	linenum_compose += 1
+	line = line.strip()
+	if match("^XCOMM", line) or match("^#", line):
+		continue
+
+	line = sub(r"\/\*([^\*]*|[\*][^/])\*\/", "", line)
+
+	comment_start = line.find("/*")
+
+	if comment_start >= 0:
+		if comment_nest_depth == 0:
+			line = line[:comment_start]
+		else:
+			line = ""
+
+		comment_nest_depth += 1
+	else:
+		comment_end = line.find("*/")
+
+		if comment_end >= 0:
+			comment_nest_depth -= 1
+
+		if comment_nest_depth < 0:
+			print "Invalid comment %(linenum_compose)d in %(filename)s: \
+			Closing '*/' without opening '/*'" % { "linenum_compose": linenum_compose, "filename": filename_compose }
+			exit(-1)
+
+		if comment_nest_depth > 0:
+			line = ""
+		else:
+			line = line[comment_end + 2:]
+
+	if line is "":
+		continue
+
+	#line = line[:-1]
+	components = split(':', line, 1)
+	if len(components) != 2:
+		print "Invalid line %(linenum_compose)d in %(filename)s: No sequence\
+		/value pair found" % { "linenum_compose": linenum_compose, "filename": filename_compose }
+		exit(-1)
+	(seq, val ) = split(':', line, 1)
+	seq = seq.strip()
+	val = val.strip()
+	raw_sequence = findall('\w+', seq)
+	values = split('\s+', val)
+	unichar_temp = split('"', values[0])
+	unichar_utf8 = unichar_temp[1]
+	if len(values) == 1:
+		continue
+	codepointstr = values[1]
+	if values[1] == '#':
+		# No codepoints that are >1 characters yet.
+		continue
+	if raw_sequence[0][0] == 'U' and match('[0-9a-fA-F]+$', raw_sequence[0][1:]):
+		raw_sequence[0] = '0x' + raw_sequence[0][1:]
+	if  match('^U[0-9a-fA-F]+$', codepointstr):
+		codepoint = long(codepointstr[1:], 16)
+	elif keysymunicodedatabase.has_key(codepointstr):
+		#if keysymdatabase[codepointstr] != keysymunicodedatabase[codepointstr]:
+			#print "DIFFERENCE: 0x%(a)X 0x%(b)X" % { "a": keysymdatabase[codepointstr], "b": keysymunicodedatabase[codepointstr]},
+			#print raw_sequence, codepointstr
+		codepoint = keysymunicodedatabase[codepointstr]
+	else:
+		unichar = unicode(unichar_utf8, 'utf-8')
+		codepoint = ord(unichar)
+	sequence = rename_combining(raw_sequence)
+	reject_this = False
+	for i in sequence:
+		if keysymvalue(i) > 0xFFFF:
+			reject_this = True
+			if opt_plane1:
+				print sequence
+			break
+		if keysymvalue(i) < 0:
+			reject_this = True
+			break
+	if reject_this:
+		continue
+	if "U0342" in sequence or \
+		"U0313" in sequence or \
+		"U0314" in sequence or \
+		"0x0313" in sequence or \
+		"0x0342" in sequence or \
+		"0x0314" in sequence:
+		continue
+	if codepoint > 0xFFFF:
+                if opt_verbose:
+		    print "Ignore the line greater than guint16:\n%s" % line
+		continue
+	#for i in range(len(sequence)):
+	#	if sequence[i] == "0x0342":
+	#		sequence[i] = "dead_tilde"
+	if "Multi_key" not in sequence:
+		""" Ignore for now >0xFFFF keysyms """
+		if codepoint < 0xFFFF:
+			original_sequence = copy(sequence)
+			stats_sequence = copy(sequence)
+			base = sequence.pop()
+			basechar = keysymvalue(base, filename_compose, linenum_compose)
+			
+			if basechar < 0xFFFF:
+				counter = 1
+				unisequence = []
+				not_normalised = True
+				skipping_this = False
+				for i in range(0, len(sequence)):
+					""" If the sequence has dead_tilde and is for Greek, we don't do algorithmically 
+					    because of lack of dead_perispomeni (i.e. conflict)
+					"""
+					bc = basechar
+					"""if sequence[-1] == "dead_tilde" and (bc >= 0x370 and bc <= 0x3ff) or (bc >= 0x1f00 and bc <= 0x1fff):
+						skipping_this = True
+						break
+					if sequence[-1] == "dead_horn" and (bc >= 0x370 and bc <= 0x3ff) or (bc >= 0x1f00 and bc <= 0x1fff):
+						skipping_this = True
+						break
+					if sequence[-1] == "dead_ogonek" and (bc >= 0x370 and bc <= 0x3ff) or (bc >= 0x1f00 and bc <= 0x1fff):
+						skipping_this = True
+						break
+					if sequence[-1] == "dead_psili":
+						sequence[i] = "dead_horn"
+					if sequence[-1] == "dead_dasia":
+						sequence[-1] = "dead_ogonek"
+					"""
+					unisequence.append(unichr(keysymunicodevalue(sequence.pop(), filename_compose, linenum_compose)))
+					
+				if skipping_this:
+					unisequence = []
+				for perm in all_permutations(unisequence):
+					# print counter, original_sequence, unichr(basechar) + "".join(perm)
+					# print counter, map(unichr, perm)
+					normalized = normalize('NFC', unichr(basechar) + "".join(perm))
+					if len(normalized) == 1:
+						# print 'Base: %(base)s [%(basechar)s], produces [%(unichar)s] (0x%(codepoint)04X)' \
+						# % { "base": base, "basechar": unichr(basechar), "unichar": unichar, "codepoint": codepoint },
+						# print "Normalized: [%(normalized)s] SUCCESS %(c)d" % { "normalized": normalized, "c": counter }
+						stats_sequence_data = map(keysymunicodevalue, stats_sequence)
+						stats_sequence_data.append(normalized)
+						xorg_compose_sequences_algorithmic.append(stats_sequence_data)
+						not_normalised = False
+						break;
+					counter += 1
+				if not_normalised:
+					original_sequence.append(codepoint)
+					xorg_compose_sequences.append(original_sequence)
+					""" print xorg_compose_sequences[-1] """
+					
+			else:
+				print "Error in base char !?!"
+				exit(-2)
+		else:
+			print "OVER", sequence
+			exit(-1)
+	else:
+		sequence.append(codepoint)
+		xorg_compose_sequences.append(sequence)
+		""" print xorg_compose_sequences[-1] """
+
+def sequence_cmp(x, y):
+	if keysymvalue(x[0]) > keysymvalue(y[0]):
+		return 1
+	elif keysymvalue(x[0]) < keysymvalue(y[0]):
+		return -1
+	elif len(x) > len(y):
+		return 1
+	elif len(x) < len(y):
+		return -1
+	elif keysymvalue(x[1]) > keysymvalue(y[1]):
+		return 1
+	elif keysymvalue(x[1]) < keysymvalue(y[1]):
+		return -1
+	elif len(x) < 4:
+		return 0
+	elif keysymvalue(x[2]) > keysymvalue(y[2]):
+		return 1
+	elif keysymvalue(x[2]) < keysymvalue(y[2]):
+		return -1
+	elif len(x) < 5:
+		return 0
+	elif keysymvalue(x[3]) > keysymvalue(y[3]):
+		return 1
+	elif keysymvalue(x[3]) < keysymvalue(y[3]):
+		return -1
+	elif len(x) < 6:
+		return 0
+	elif keysymvalue(x[4]) > keysymvalue(y[4]):
+		return 1
+	elif keysymvalue(x[4]) < keysymvalue(y[4]):
+		return -1
+	else:
+		return 0
+
+def sequence_unicode_cmp(x, y):
+	if keysymunicodevalue(x[0]) > keysymunicodevalue(y[0]):
+		return 1
+	elif keysymunicodevalue(x[0]) < keysymunicodevalue(y[0]):
+		return -1
+	elif len(x) > len(y):
+		return 1
+	elif len(x) < len(y):
+		return -1
+	elif keysymunicodevalue(x[1]) > keysymunicodevalue(y[1]):
+		return 1
+	elif keysymunicodevalue(x[1]) < keysymunicodevalue(y[1]):
+		return -1
+	elif len(x) < 4:
+		return 0
+	elif keysymunicodevalue(x[2]) > keysymunicodevalue(y[2]):
+		return 1
+	elif keysymunicodevalue(x[2]) < keysymunicodevalue(y[2]):
+		return -1
+	elif len(x) < 5:
+		return 0
+	elif keysymunicodevalue(x[3]) > keysymunicodevalue(y[3]):
+		return 1
+	elif keysymunicodevalue(x[3]) < keysymunicodevalue(y[3]):
+		return -1
+	elif len(x) < 6:
+		return 0
+	elif keysymunicodevalue(x[4]) > keysymunicodevalue(y[4]):
+		return 1
+	elif keysymunicodevalue(x[4]) < keysymunicodevalue(y[4]):
+		return -1
+	else:
+		return 0
+
+def sequence_algorithmic_cmp(x, y):
+	if len(x) < len(y):
+		return -1
+	elif len(x) > len(y):
+		return 1
+	else:
+		for i in range(len(x)):
+			if x[i] < y[i]:
+				return -1
+			elif x[i] > y[i]:
+				return 1
+	return 0
+
+
+xorg_compose_sequences.sort(sequence_cmp)
+
+xorg_compose_sequences_uniqued = []
+first_time = True
+item = None
+for next_item in xorg_compose_sequences:
+	if first_time:
+		first_time = False
+		item = next_item
+	if sequence_unicode_cmp(item, next_item) != 0:
+		xorg_compose_sequences_uniqued.append(item)
+	item = next_item
+
+xorg_compose_sequences = copy(xorg_compose_sequences_uniqued)
+
+counter_multikey = 0
+for item in xorg_compose_sequences:
+	if findall('Multi_key', "".join(item[:-1])) != []:
+		counter_multikey += 1
+
+xorg_compose_sequences_algorithmic.sort(sequence_algorithmic_cmp)
+xorg_compose_sequences_algorithmic_uniqued = uniq(xorg_compose_sequences_algorithmic)
+
+firstitem = ""
+num_first_keysyms = 0
+zeroes = 0
+num_entries = 0
+num_algorithmic_greek = 0
+for sequence in xorg_compose_sequences:
+	if keysymvalue(firstitem) != keysymvalue(sequence[0]): 
+		firstitem = sequence[0]
+		num_first_keysyms += 1
+	zeroes += 6 - len(sequence) + 1
+	num_entries += 1
+
+for sequence in xorg_compose_sequences_algorithmic_uniqued:
+	ch = ord(sequence[-1:][0])
+	if ch >= 0x370 and ch <= 0x3ff or ch >= 0x1f00 and ch <= 0x1fff:
+		num_algorithmic_greek += 1
+		
+
+if opt_algorithmic:
+	for sequence in xorg_compose_sequences_algorithmic_uniqued:
+		letter = "".join(sequence[-1:])
+		print '0x%(cp)04X, %(uni)s, seq: [ <0x%(base)04X>,' % { 'cp': ord(unicode(letter)), 'uni': letter.encode('utf-8'), 'base': sequence[-2] },
+		for elem in sequence[:-2]:
+			print "<0x%(keysym)04X>," % { 'keysym': elem },
+		""" Yeah, verified... We just want to keep the output similar to -u, so we can compare/sort easily """
+		print "], recomposed as", letter.encode('utf-8'), "verified"
+
+def num_of_keysyms(seq):
+	return len(seq) - 1
+
+def convert_UnotationToHex(arg):
+	if isinstance(arg, str):
+		if match('^U[0-9A-F][0-9A-F][0-9A-F][0-9A-F]$', arg):
+			return sub('^U', '0x', arg)
+	return arg
+
+def addprefix_GDK(arg):
+	if match('^0x', arg):
+		return '%(arg)s, ' % { 'arg': arg }
+	elif match('^U[0-9A-F][0-9A-F][0-9A-F][0-9A-F]$', arg.upper()):
+                keysym = ''
+                for k, c in keysymunicodedatabase.items():
+                    if c == keysymvalue(arg):
+                        keysym = k
+                        break
+                if keysym != '':
+		    return 'GDK_KEY_%(arg)s, ' % { 'arg': keysym }
+                else:
+		    return '0x%(arg)04X, ' % { 'arg': keysymvalue(arg) }
+	else:
+		return 'GDK_KEY_%(arg)s, ' % { 'arg': arg }
+
+if opt_gtk:
+	first_keysym = ""
+	sequence = []
+	compose_table = []
+	ct_second_part = []
+	ct_sequence_width = 2
+	start_offset = num_first_keysyms * (WIDTHOFCOMPOSETABLE+1)
+	we_finished = False
+	counter = 0
+
+	sequence_iterator = iter(xorg_compose_sequences)
+	sequence = sequence_iterator.next()
+	while True:
+		first_keysym = sequence[0]					# Set the first keysym
+		compose_table.append([first_keysym, 0, 0, 0, 0, 0])
+		while sequence[0] == first_keysym:
+			compose_table[counter][num_of_keysyms(sequence)-1] += 1
+			try:
+				sequence = sequence_iterator.next()
+			except StopIteration:
+				we_finished = True
+				break
+		if we_finished:
+			break
+		counter += 1
+
+	ct_index = start_offset
+	for line_num in range(len(compose_table)):
+		for i in range(WIDTHOFCOMPOSETABLE):
+			occurrences = compose_table[line_num][i+1]
+			compose_table[line_num][i+1] = ct_index
+			ct_index += occurrences * (i+2)
+
+	for sequence in xorg_compose_sequences:
+		ct_second_part.append(map(convert_UnotationToHex, sequence))
+
+	print headerfile_start
+	for i in compose_table:
+		if opt_gtkexpanded:
+			print "0x%(ks)04X," % { "ks": keysymvalue(i[0]) },
+			print '%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i[1:])) }
+		elif not match('^0x', i[0]):
+			print 'GDK_KEY_%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
+		else:
+			print '%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
+	for i in ct_second_part:
+		if opt_numeric:
+			for ks in i[1:][:-1]:
+				print '0x%(seq)04X, ' % { 'seq': keysymvalue(ks) },
+			print '0x%(cp)04X, ' % { 'cp':i[-1] }
+			"""
+			for ks in i[:-1]:
+				print '0x%(seq)04X, ' % { 'seq': keysymvalue(ks) },
+			print '0x%(cp)04X, ' % { 'cp':i[-1] }
+			"""
+		elif opt_gtkexpanded:
+			print '%(seq)s0x%(cp)04X, ' % { 'seq': "".join(map(addprefix_GDK, i[:-1])), 'cp':i[-1] }
+		else:
+			print '%(seq)s0x%(cp)04X, ' % { 'seq': "".join(map(addprefix_GDK, i[:-1][1:])), 'cp':i[-1] }
+	print headerfile_end 
+
+def redecompose(codepoint):
+	(name, decomposition, combiningclass) = unicodedatabase[codepoint]
+	if decomposition[0] == '' or decomposition[0] == '0':
+		return [codepoint]
+	if match('<\w+>', decomposition[0]):
+		numdecomposition = map(stringtohex, decomposition[1:])
+		return map(redecompose, numdecomposition)
+	numdecomposition = map(stringtohex, decomposition)
+	return map(redecompose, numdecomposition)
+
+def process_unicodedata_file(verbose = False):
+	""" Grab from wget http://www.unicode.org/Public/UNIDATA/UnicodeData.txt """
+	filename_unicodedatatxt = download_file(URL_UNICODEDATATXT)
+	try: 
+		unicodedatatxt = open(filename_unicodedatatxt, 'r')
+	except IOError, (errno, strerror):
+		print "I/O error(%s): %s" % (errno, strerror)
+		sys.exit(-1)
+	except:
+		print "Unexpected error: ", sys.exc_info()[0]
+		sys.exit(-1)
+	for line in unicodedatatxt.readlines():
+		if line[0] == "" or line[0] == '#':
+			continue
+		line = line[:-1]
+		uniproperties = split(';', line)
+		codepoint = stringtohex(uniproperties[0])
+		""" We don't do Plane 1 or CJK blocks. The latter require reading additional files. """
+		if codepoint > 0xFFFF or (codepoint >= 0x4E00 and codepoint <= 0x9FFF) or (codepoint >= 0xF900 and codepoint <= 0xFAFF): 
+			continue
+		name = uniproperties[1]
+		category = uniproperties[2]
+		combiningclass = uniproperties[3]
+		decomposition = uniproperties[5]
+		unicodedatabase[codepoint] = [name, split('\s+', decomposition), combiningclass]
+	
+	counter_combinations = 0
+	counter_combinations_greek = 0
+	counter_entries = 0
+	counter_entries_greek = 0
+
+	for item in unicodedatabase.keys():
+		(name, decomposition, combiningclass) = unicodedatabase[item]
+		if decomposition[0] == '':
+			continue
+			print name, "is empty"
+		elif match('<\w+>', decomposition[0]):
+			continue
+			print name, "has weird", decomposition[0]
+		else:
+			sequence = map(stringtohex, decomposition)
+			chrsequence = map(unichr, sequence)
+			normalized = normalize('NFC', "".join(chrsequence))
+			
+			""" print name, sequence, "Combining: ", "".join(chrsequence), normalized, len(normalized),  """
+			decomposedsequence = []
+			for subseq in map(redecompose, sequence):
+				for seqitem in subseq:
+					if isinstance(seqitem, list):
+						for i in seqitem:
+							if isinstance(i, list):
+								for j in i:
+									decomposedsequence.append(j)
+							else:
+								decomposedsequence.append(i)
+					else:
+						decomposedsequence.append(seqitem)
+			recomposedchar = normalize('NFC', "".join(map(unichr, decomposedsequence)))
+			if len(recomposedchar) == 1 and len(decomposedsequence) > 1:
+				counter_entries += 1
+				counter_combinations += factorial(len(decomposedsequence)-1)
+				ch = item
+				if ch >= 0x370 and ch <= 0x3ff or ch >= 0x1f00 and ch <= 0x1fff:
+					counter_entries_greek += 1
+					counter_combinations_greek += factorial(len(decomposedsequence)-1)
+				if verbose:
+					print "0x%(cp)04X, %(uni)c, seq:" % { 'cp':item, 'uni':unichr(item) },
+					print "[",
+					for elem in decomposedsequence:
+						print '<0x%(hex)04X>,' % { 'hex': elem },
+					print "], recomposed as", recomposedchar,
+					if unichr(item) == recomposedchar:
+						print "verified"
+	
+	if verbose == False:
+		print "Unicode statistics from UnicodeData.txt"
+		print "Number of entries that can be algorithmically produced     :", counter_entries
+		print "  of which are for Greek                                   :", counter_entries_greek
+		print "Number of compose sequence combinations requiring          :", counter_combinations
+		print "  of which are for Greek                                   :", counter_combinations_greek
+		print "Note: We do not include partial compositions, "
+		print "thus the slight discrepancy in the figures"
+		print
+
+if opt_unicodedatatxt:
+	process_unicodedata_file(True)
+
+if opt_statistics:
+	print
+	print "Total number of compose sequences (from file)              :", len(xorg_compose_sequences) + len(xorg_compose_sequences_algorithmic)
+	print "  of which can be expressed algorithmically                :", len(xorg_compose_sequences_algorithmic)
+	print "  of which cannot be expressed algorithmically             :", len(xorg_compose_sequences) 
+	print "    of which have Multi_key                                :", counter_multikey
+	print 
+	print "Algorithmic (stats for Xorg Compose file)"
+	print "Number of sequences off due to algo from file (len(array)) :", len(xorg_compose_sequences_algorithmic)
+	print "Number of sequences off due to algo (uniq(sort(array)))    :", len(xorg_compose_sequences_algorithmic_uniqued)
+	print "  of which are for Greek                                   :", num_algorithmic_greek
+	print 
+	process_unicodedata_file()
+	print "Not algorithmic (stats from Xorg Compose file)"
+	print "Number of sequences                                        :", len(xorg_compose_sequences) 
+	print "Flat array looks like                                      :", len(xorg_compose_sequences), "rows of 6 integers (2 bytes per int, or 12 bytes per row)"
+	print "Flat array would have taken up (in bytes)                  :", num_entries * 2 * 6, "bytes from the GTK+ library"
+	print "Number of items in flat array                              :", len(xorg_compose_sequences) * 6
+	print "  of which are zeroes                                      :", zeroes, "or ", (100 * zeroes) / (len(xorg_compose_sequences) * 6), " per cent"
+	print "Number of different first items                            :", num_first_keysyms
+	print "Number of max bytes (if using flat array)                  :", num_entries * 2 * 6
+	print "Number of savings                                          :", zeroes * 2 - num_first_keysyms * 2 * 5
+	print 
+	print "Memory needs if both algorithmic+optimised table in latest Xorg compose file"
+	print "                                                           :", num_entries * 2 * 6 - zeroes * 2 + num_first_keysyms * 2 * 5
+	print
+	print "Existing (old) implementation in GTK+"
+	print "Number of sequences in old gtkimcontextsimple.c            :", 691
+	print "The existing (old) implementation in GTK+ takes up         :", 691 * 2 * 12, "bytes"

From 224716570c73115560000286d95894f5806f1e42 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 16:36:19 +0900
Subject: [PATCH 557/816] src: s/GDK_KEY/IBUS_KEY/ in compose-parse.py

---
 src/compose-parse.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compose-parse.py b/src/compose-parse.py
index 9a6513a70..2dfd789e6 100755
--- a/src/compose-parse.py
+++ b/src/compose-parse.py
@@ -776,11 +776,11 @@ def addprefix_GDK(arg):
                         keysym = k
                         break
                 if keysym != '':
-		    return 'GDK_KEY_%(arg)s, ' % { 'arg': keysym }
+		    return 'IBUS_KEY_%(arg)s, ' % { 'arg': keysym }
                 else:
 		    return '0x%(arg)04X, ' % { 'arg': keysymvalue(arg) }
 	else:
-		return 'GDK_KEY_%(arg)s, ' % { 'arg': arg }
+		return 'IBUS_KEY_%(arg)s, ' % { 'arg': arg }
 
 if opt_gtk:
 	first_keysym = ""
@@ -824,7 +824,7 @@ def addprefix_GDK(arg):
 			print "0x%(ks)04X," % { "ks": keysymvalue(i[0]) },
 			print '%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i[1:])) }
 		elif not match('^0x', i[0]):
-			print 'GDK_KEY_%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
+			print 'IBUS_KEY_%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
 		else:
 			print '%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
 	for i in ct_second_part:

From 651c997a2fc50b9dadc51d0f14f31e40f0cc05fc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 16:58:54 +0900
Subject: [PATCH 558/816] src: Support 32bit and multiple output characters in
 compose-parse.py

---
 src/compose-parse.py | 314 ++++++++++++++++++++++++++++---------------
 1 file changed, 205 insertions(+), 109 deletions(-)

diff --git a/src/compose-parse.py b/src/compose-parse.py
index 2dfd789e6..b90e16d0c 100755
--- a/src/compose-parse.py
+++ b/src/compose-parse.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# compose-parse.py, version 1.4
+# compose-parse.py, version 1.5
 #
 # multifunction script that helps manage the compose sequence table in GTK+ (gtk/gtkimcontextsimple.c)
 # the script produces statistics and information about the whole process, run with --help for more.
@@ -111,6 +111,14 @@
 #endif /* __GTK_IM_CONTEXT_SIMPLE_SEQS_H__ */
 """
 
+declare_compose_sequence_32bit_first = """};
+
+static const guint16 gtk_compose_seqs_compact_32bit_first[] = {"""
+
+declare_compose_sequence_32bit_second = """};
+
+static const guint32 gtk_compose_seqs_compact_32bit_second[] = {"""
+
 def stringtohex(str): return atoi(str, 16)
 
 def factorial(n): 
@@ -462,6 +470,7 @@ def rename_combining(seq):
 
 """ Parse the compose file in  xorg_compose_sequences"""
 xorg_compose_sequences = []
+xorg_compose_sequences_32bit = []
 xorg_compose_sequences_algorithmic = []
 linenum_compose = 0
 comment_nest_depth = 0
@@ -514,24 +523,32 @@ def rename_combining(seq):
 	values = split('\s+', val)
 	unichar_temp = split('"', values[0])
 	unichar_utf8 = unichar_temp[1]
-	if len(values) == 1:
-		continue
-	codepointstr = values[1]
-	if values[1] == '#':
-		# No codepoints that are >1 characters yet.
-		continue
+	# The line of "U17ff" in Compose.pre includes a unichar only
+	codepointstr = values[1] if len(values) > 1 else ''
+	codepoint = 0
+	codepoints = []
+	enable_32bit = False
 	if raw_sequence[0][0] == 'U' and match('[0-9a-fA-F]+$', raw_sequence[0][1:]):
 		raw_sequence[0] = '0x' + raw_sequence[0][1:]
 	if  match('^U[0-9a-fA-F]+$', codepointstr):
 		codepoint = long(codepointstr[1:], 16)
+		if codepoint > 0xFFFF:
+			codepoints.append(codepoint)
+			codepoint = 0
+			enable_32bit = True
 	elif keysymunicodedatabase.has_key(codepointstr):
 		#if keysymdatabase[codepointstr] != keysymunicodedatabase[codepointstr]:
 			#print "DIFFERENCE: 0x%(a)X 0x%(b)X" % { "a": keysymdatabase[codepointstr], "b": keysymunicodedatabase[codepointstr]},
 			#print raw_sequence, codepointstr
 		codepoint = keysymunicodedatabase[codepointstr]
 	else:
-		unichar = unicode(unichar_utf8, 'utf-8')
-		codepoint = ord(unichar)
+		unichars = unicode(unichar_utf8, 'utf-8')
+		if len(unichars) > 1 or ord(unichars[0]) > 0xFFFF:
+			enable_32bit = True
+			for unichar in unichars:
+				codepoints.append(ord(unichar))
+		else:
+			codepoint = ord(unichars[0]);
 	sequence = rename_combining(raw_sequence)
 	reject_this = False
 	for i in sequence:
@@ -552,16 +569,8 @@ def rename_combining(seq):
 		"0x0342" in sequence or \
 		"0x0314" in sequence:
 		continue
-	if codepoint > 0xFFFF:
-                if opt_verbose:
-		    print "Ignore the line greater than guint16:\n%s" % line
-		continue
-	#for i in range(len(sequence)):
-	#	if sequence[i] == "0x0342":
-	#		sequence[i] = "dead_tilde"
 	if "Multi_key" not in sequence:
-		""" Ignore for now >0xFFFF keysyms """
-		if codepoint < 0xFFFF:
+		if True:
 			original_sequence = copy(sequence)
 			stats_sequence = copy(sequence)
 			base = sequence.pop()
@@ -610,88 +619,75 @@ def rename_combining(seq):
 						break;
 					counter += 1
 				if not_normalised:
-					original_sequence.append(codepoint)
-					xorg_compose_sequences.append(original_sequence)
-					""" print xorg_compose_sequences[-1] """
+					if enable_32bit:
+						for cp in codepoints:
+							original_sequence.append(cp)
+						length = len(codepoints)
+						original_sequence.append(length)
+						xorg_compose_sequences_32bit.append(original_sequence)
+					else:
+						original_sequence.append(codepoint)
+						original_sequence.append(1)
+						xorg_compose_sequences.append(original_sequence)
 					
 			else:
 				print "Error in base char !?!"
 				exit(-2)
-		else:
-			print "OVER", sequence
-			exit(-1)
 	else:
-		sequence.append(codepoint)
-		xorg_compose_sequences.append(sequence)
-		""" print xorg_compose_sequences[-1] """
+		if enable_32bit:
+			for cp in codepoints:
+				sequence.append(cp)
+			length = len(codepoints)
+			sequence.append(length)
+			xorg_compose_sequences_32bit.append(sequence)
+		else:
+			sequence.append(codepoint)
+			sequence.append(1)
+			xorg_compose_sequences.append(sequence)
 
 def sequence_cmp(x, y):
+	length_x = len(x) - x[-1] - 1
+	length_y = len(y) - y[-1] - 1
 	if keysymvalue(x[0]) > keysymvalue(y[0]):
 		return 1
 	elif keysymvalue(x[0]) < keysymvalue(y[0]):
 		return -1
-	elif len(x) > len(y):
+	elif length_x > length_y:
 		return 1
-	elif len(x) < len(y):
+	elif length_x < length_y:
 		return -1
 	elif keysymvalue(x[1]) > keysymvalue(y[1]):
 		return 1
 	elif keysymvalue(x[1]) < keysymvalue(y[1]):
 		return -1
-	elif len(x) < 4:
-		return 0
-	elif keysymvalue(x[2]) > keysymvalue(y[2]):
-		return 1
-	elif keysymvalue(x[2]) < keysymvalue(y[2]):
-		return -1
-	elif len(x) < 5:
-		return 0
-	elif keysymvalue(x[3]) > keysymvalue(y[3]):
-		return 1
-	elif keysymvalue(x[3]) < keysymvalue(y[3]):
-		return -1
-	elif len(x) < 6:
-		return 0
-	elif keysymvalue(x[4]) > keysymvalue(y[4]):
-		return 1
-	elif keysymvalue(x[4]) < keysymvalue(y[4]):
-		return -1
-	else:
-		return 0
+        for i in range(2, length_x):
+		if keysymvalue(x[i]) > keysymvalue(y[i]):
+			return 1
+		elif keysymvalue(x[i]) < keysymvalue(y[i]):
+			return -1
+	return 0
 
 def sequence_unicode_cmp(x, y):
+	length_x = len(x) - x[-1] - 1
+	length_y = len(y) - y[-1] - 1
 	if keysymunicodevalue(x[0]) > keysymunicodevalue(y[0]):
 		return 1
 	elif keysymunicodevalue(x[0]) < keysymunicodevalue(y[0]):
 		return -1
-	elif len(x) > len(y):
+	elif length_x > length_y:
 		return 1
-	elif len(x) < len(y):
+	elif length_x < length_y:
 		return -1
 	elif keysymunicodevalue(x[1]) > keysymunicodevalue(y[1]):
 		return 1
 	elif keysymunicodevalue(x[1]) < keysymunicodevalue(y[1]):
 		return -1
-	elif len(x) < 4:
-		return 0
-	elif keysymunicodevalue(x[2]) > keysymunicodevalue(y[2]):
-		return 1
-	elif keysymunicodevalue(x[2]) < keysymunicodevalue(y[2]):
-		return -1
-	elif len(x) < 5:
-		return 0
-	elif keysymunicodevalue(x[3]) > keysymunicodevalue(y[3]):
-		return 1
-	elif keysymunicodevalue(x[3]) < keysymunicodevalue(y[3]):
-		return -1
-	elif len(x) < 6:
-		return 0
-	elif keysymunicodevalue(x[4]) > keysymunicodevalue(y[4]):
-		return 1
-	elif keysymunicodevalue(x[4]) < keysymunicodevalue(y[4]):
-		return -1
-	else:
-		return 0
+        for i in range(2, length_x):
+		if keysymunicodevalue(x[i]) > keysymunicodevalue(y[i]):
+			return 1
+		elif keysymunicodevalue(x[i]) < keysymunicodevalue(y[i]):
+			return -1
+	return 0
 
 def sequence_algorithmic_cmp(x, y):
 	if len(x) < len(y):
@@ -708,23 +704,46 @@ def sequence_algorithmic_cmp(x, y):
 
 
 xorg_compose_sequences.sort(sequence_cmp)
+xorg_compose_sequences_32bit.sort(sequence_cmp)
 
-xorg_compose_sequences_uniqued = []
-first_time = True
-item = None
-for next_item in xorg_compose_sequences:
-	if first_time:
-		first_time = False
+def num_of_keysyms(seq):
+	value_length = seq[-1]
+	return len(seq) - value_length - 1
+
+
+def check_max_width_of_compose_table(compose_sequences):
+	for sequence in xorg_compose_sequences:
+		num = num_of_keysyms(sequence)
+		global WIDTHOFCOMPOSETABLE
+		if num > WIDTHOFCOMPOSETABLE:
+			print("Extend the sequence length: %s" % num)
+			WIDTHOFCOMPOSETABLE = num
+
+def make_compose_sequences_unique(compose_sequences):
+	xorg_compose_sequences_uniqued = []
+	first_time = True
+	item = None
+	for next_item in compose_sequences:
+		if first_time:
+			first_time = False
+			item = next_item
+			xorg_compose_sequences_uniqued.append(next_item)
+		if sequence_unicode_cmp(item, next_item) != 0:
+			xorg_compose_sequences_uniqued.append(next_item)
 		item = next_item
-	if sequence_unicode_cmp(item, next_item) != 0:
-		xorg_compose_sequences_uniqued.append(item)
-	item = next_item
 
-xorg_compose_sequences = copy(xorg_compose_sequences_uniqued)
+	return copy(xorg_compose_sequences_uniqued)
+
+check_max_width_of_compose_table(xorg_compose_sequences)
+check_max_width_of_compose_table(xorg_compose_sequences_32bit)
+
+xorg_compose_sequences = make_compose_sequences_unique(xorg_compose_sequences)
+xorg_compose_sequences_32bit = make_compose_sequences_unique(xorg_compose_sequences_32bit)
 
 counter_multikey = 0
-for item in xorg_compose_sequences:
-	if findall('Multi_key', "".join(item[:-1])) != []:
+for item in xorg_compose_sequences + xorg_compose_sequences_32bit:
+	length = item[-1]
+	if findall('Multi_key', "".join(item[:len(item) - length - 1])) != []:
 		counter_multikey += 1
 
 xorg_compose_sequences_algorithmic.sort(sequence_algorithmic_cmp)
@@ -732,16 +751,25 @@ def sequence_algorithmic_cmp(x, y):
 
 firstitem = ""
 num_first_keysyms = 0
+num_first_keysyms_32bit = 0
 zeroes = 0
 num_entries = 0
 num_algorithmic_greek = 0
 for sequence in xorg_compose_sequences:
-	if keysymvalue(firstitem) != keysymvalue(sequence[0]): 
+	if keysymvalue(firstitem) != keysymvalue(sequence[0]):
 		firstitem = sequence[0]
 		num_first_keysyms += 1
-	zeroes += 6 - len(sequence) + 1
+	# max length of sequences + length of unichar(== 1) - length of the
+        # current sequence + common offset (== 1)
+	zeroes += WIDTHOFCOMPOSETABLE - num_of_keysyms(sequence)
 	num_entries += 1
 
+firstitem = ""
+for sequence in xorg_compose_sequences_32bit:
+	if keysymvalue(firstitem) != keysymvalue(sequence[0]):
+		firstitem = sequence[0]
+		num_first_keysyms_32bit += 1
+
 for sequence in xorg_compose_sequences_algorithmic_uniqued:
 	ch = ord(sequence[-1:][0])
 	if ch >= 0x370 and ch <= 0x3ff or ch >= 0x1f00 and ch <= 0x1fff:
@@ -757,9 +785,6 @@ def sequence_algorithmic_cmp(x, y):
 		""" Yeah, verified... We just want to keep the output similar to -u, so we can compare/sort easily """
 		print "], recomposed as", letter.encode('utf-8'), "verified"
 
-def num_of_keysyms(seq):
-	return len(seq) - 1
-
 def convert_UnotationToHex(arg):
 	if isinstance(arg, str):
 		if match('^U[0-9A-F][0-9A-F][0-9A-F][0-9A-F]$', arg):
@@ -782,21 +807,23 @@ def addprefix_GDK(arg):
 	else:
 		return 'IBUS_KEY_%(arg)s, ' % { 'arg': arg }
 
-if opt_gtk:
+def make_compose_table(compose_sequences,
+                       compose_table,
+                       ct_second_part,
+                       start_offset,
+                       is_32bit):
 	first_keysym = ""
 	sequence = []
-	compose_table = []
-	ct_second_part = []
-	ct_sequence_width = 2
-	start_offset = num_first_keysyms * (WIDTHOFCOMPOSETABLE+1)
 	we_finished = False
 	counter = 0
 
-	sequence_iterator = iter(xorg_compose_sequences)
+	sequence_iterator = iter(compose_sequences)
 	sequence = sequence_iterator.next()
 	while True:
 		first_keysym = sequence[0]					# Set the first keysym
-		compose_table.append([first_keysym, 0, 0, 0, 0, 0])
+		compose_table_sequence = [first_keysym] + \
+			map(lambda x: 0, range(WIDTHOFCOMPOSETABLE))
+		compose_table.append(compose_table_sequence)
 		while sequence[0] == first_keysym:
 			compose_table[counter][num_of_keysyms(sequence)-1] += 1
 			try:
@@ -813,12 +840,21 @@ def addprefix_GDK(arg):
 		for i in range(WIDTHOFCOMPOSETABLE):
 			occurrences = compose_table[line_num][i+1]
 			compose_table[line_num][i+1] = ct_index
-			ct_index += occurrences * (i+2)
+			# If not 32bit, i + 1 is the next index in for loop
+			# and i + 2 is the next index + unichar size (== 1)
+			# If 32bit, i + 1 is the next index in for loop
+			# and i + 3 is the next index + unichar index size
+			# (== 1) + unichar length size (== 1)
+			if is_32bit:
+				ct_index += occurrences * (i+3)
+			else:
+				ct_index += occurrences * (i+2)
 
-	for sequence in xorg_compose_sequences:
+	for sequence in compose_sequences:
 		ct_second_part.append(map(convert_UnotationToHex, sequence))
 
-	print headerfile_start
+
+def print_compose_table_keysyms(compose_table):
 	for i in compose_table:
 		if opt_gtkexpanded:
 			print "0x%(ks)04X," % { "ks": keysymvalue(i[0]) },
@@ -827,22 +863,80 @@ def addprefix_GDK(arg):
 			print 'IBUS_KEY_%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
 		else:
 			print '%(str)s' % { 'str': "".join(map(lambda x : str(x) + ", ", i)) }
-	for i in ct_second_part:
+
+
+def print_compose_table_values(ct_second_part, is_32bit, is_second):
+	i = 0
+	for s in ct_second_part:
+		length = s[-1]
+		seq_length = len(s) - length - 1
 		if opt_numeric:
-			for ks in i[1:][:-1]:
-				print '0x%(seq)04X, ' % { 'seq': keysymvalue(ks) },
-			print '0x%(cp)04X, ' % { 'cp':i[-1] }
-			"""
-			for ks in i[:-1]:
-				print '0x%(seq)04X, ' % { 'seq': keysymvalue(ks) },
-			print '0x%(cp)04X, ' % { 'cp':i[-1] }
-			"""
+			if not is_32bit or not is_second:
+				for ks in s[:seq_length][1:]:
+					print '0x%(seq)04X,' % { 'seq': keysymvalue(ks) },
+			if is_32bit and not is_second:
+				print '%(i)d, %(l)d,' % { 'i':i, 'l':length }
+			if not is_32bit or is_second:
+				for v in range(seq_length, seq_length + length):
+					print '0x%(cp)04X,' % { 'cp':s[v] },
+				print ''
 		elif opt_gtkexpanded:
-			print '%(seq)s0x%(cp)04X, ' % { 'seq': "".join(map(addprefix_GDK, i[:-1])), 'cp':i[-1] }
+			if not is_32bit or not is_second:
+				print '%(seq)s' % { 'seq': "".join(map(addprefix_GDK, s[:seq_length][1:])) },
+			if is_32bit and not is_second:
+				print '%(i)d, %(l)d,' % { 'i':i, 'l':length }
+			if not is_32bit or is_second:
+				for v in range(seq_length, seq_length + length):
+					print '0x%(cp)04X,' % { 'cp':s[v] },
+				print ''
 		else:
-			print '%(seq)s0x%(cp)04X, ' % { 'seq': "".join(map(addprefix_GDK, i[:-1][1:])), 'cp':i[-1] }
+			if not is_32bit or not is_second:
+				print '%(seq)s' % { 'seq': "".join(map(addprefix_GDK, s[:seq_length][1:])) },
+			if is_32bit and not is_second:
+				print '%(i)d, %(l)d,' % { 'i':i, 'l':length }
+			if not is_32bit or is_second:
+				for v in range(seq_length, seq_length + length):
+					print '0x%(cp)04X,' % { 'cp':s[v] },
+				print ''
+		i += length
+
+
+def compose_gtk():
+	compose_table = []
+	compose_table_32bit = []
+	ct_second_part = []
+	ct_second_part_32bit = []
+	start_offset = num_first_keysyms * (WIDTHOFCOMPOSETABLE+1)
+
+	make_compose_table(xorg_compose_sequences,
+	                   compose_table,
+	                   ct_second_part,
+	                   start_offset,
+	                   False)
+	print headerfile_start
+	print_compose_table_keysyms(compose_table)
+	print_compose_table_values(ct_second_part, False, False)
+	if len(xorg_compose_sequences_32bit) == 0:
+		print headerfile_end
+		return
+	print declare_compose_sequence_32bit_first
+	start_offset = num_first_keysyms_32bit * (WIDTHOFCOMPOSETABLE+1)
+	make_compose_table(xorg_compose_sequences_32bit,
+	                   compose_table_32bit,
+	                   ct_second_part_32bit,
+	                   start_offset,
+	                   True)
+	print_compose_table_keysyms(compose_table_32bit)
+	print_compose_table_values(ct_second_part_32bit, True, False)
+	print declare_compose_sequence_32bit_second
+	print_compose_table_values(ct_second_part_32bit, True, True)
 	print headerfile_end 
 
+
+if opt_gtk:
+	compose_gtk()
+
+
 def redecompose(codepoint):
 	(name, decomposition, combiningclass) = unicodedatabase[codepoint]
 	if decomposition[0] == '' or decomposition[0] == '0':
@@ -960,6 +1054,8 @@ def process_unicodedata_file(verbose = False):
 	print "Number of items in flat array                              :", len(xorg_compose_sequences) * 6
 	print "  of which are zeroes                                      :", zeroes, "or ", (100 * zeroes) / (len(xorg_compose_sequences) * 6), " per cent"
 	print "Number of different first items                            :", num_first_keysyms
+	print "Number of different first items 32bit                      :", num_first_keysyms_32bit
+	print "Number of max keysym sequences                             :", WIDTHOFCOMPOSETABLE
 	print "Number of max bytes (if using flat array)                  :", num_entries * 2 * 6
 	print "Number of savings                                          :", zeroes * 2 - num_first_keysyms * 2 * 5
 	print 

From b59f7f823b7b2051e4ca31834f9299a72f01b339 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 9 May 2019 17:02:21 +0900
Subject: [PATCH 559/816] src: Support 32bit and multiple compose outputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compose file in en_US.UTF-8 now includes wide codepoints more than
U+FFFF likes '<Multi_key> <F> <U> : "🖕"  U1F595' but the current
gtk_compose_seqs_compact[] is a guint16 array.
To support 32bit and multiple compose outputs, the array is now
separated to 16bit and 32bit arrays and 32bit array is also
separated to gtk_compose_seqs_compact_32bit_first[] for 16bit
key sequences and gtk_compose_seqs_compact_32bit_second[] for
32bit output values.

BUG=https://github.com/ibus/ibus/issues/2074
---
 src/gtkimcontextsimpleseqs.h  | 9912 +++++++++++++++++----------------
 src/ibuscomposetable.h        |   13 +-
 src/ibusenginesimple.c        |  166 +-
 src/ibusenginesimpleprivate.h |    8 +-
 4 files changed, 5380 insertions(+), 4719 deletions(-)

diff --git a/src/gtkimcontextsimpleseqs.h b/src/gtkimcontextsimpleseqs.h
index 632391a15..ffa5f1256 100644
--- a/src/gtkimcontextsimpleseqs.h
+++ b/src/gtkimcontextsimpleseqs.h
@@ -94,4680 +94,5244 @@ IBUS_KEY_dead_belowdiaeresis, 3705, 3705, 3708, 3708, 3708,
 IBUS_KEY_dead_belowcomma, 3708, 3722, 3722, 3722, 3722, 
 IBUS_KEY_dead_currency, 3722, 3820, 3826, 3826, 3826, 
 IBUS_KEY_dead_greek, 3826, 3928, 3952, 3952, 3952, 
-IBUS_KEY_Multi_key, 3952, 3952, 10348, 14044, 15919, 
-IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_space, 0x0060, 
-IBUS_KEY_V, 0x01DB, 
-IBUS_KEY_v, 0x01DC, 
-IBUS_KEY_nobreakspace, 0x0300, 
-IBUS_KEY_Abreve, 0x1EB0, 
-IBUS_KEY_abreve, 0x1EB1, 
-IBUS_KEY_Emacron, 0x1E14, 
-IBUS_KEY_emacron, 0x1E15, 
-IBUS_KEY_Omacron, 0x1E50, 
-IBUS_KEY_omacron, 0x1E51, 
-IBUS_KEY_Cyrillic_ie, 0x0450, 
-IBUS_KEY_Cyrillic_i, 0x045D, 
-IBUS_KEY_Cyrillic_IE, 0x0400, 
-IBUS_KEY_Cyrillic_I, 0x040D, 
-IBUS_KEY_Greek_iotadieresis, 0x1FD2, 
-IBUS_KEY_Greek_upsilondieresis, 0x1FE2, 
-IBUS_KEY_Greek_ALPHA, 0x1FBA, 
-IBUS_KEY_Greek_EPSILON, 0x1FC8, 
-IBUS_KEY_Greek_ETA, 0x1FCA, 
-IBUS_KEY_Greek_IOTA, 0x1FDA, 
-IBUS_KEY_Greek_OMICRON, 0x1FF8, 
-IBUS_KEY_Greek_UPSILON, 0x1FEA, 
-IBUS_KEY_Greek_OMEGA, 0x1FFA, 
-IBUS_KEY_Greek_alpha, 0x1F70, 
-IBUS_KEY_Greek_epsilon, 0x1F72, 
-IBUS_KEY_Greek_eta, 0x1F74, 
-IBUS_KEY_Greek_iota, 0x1F76, 
-IBUS_KEY_Greek_omicron, 0x1F78, 
-IBUS_KEY_Greek_upsilon, 0x1F7A, 
-IBUS_KEY_Greek_omega, 0x1F7C, 
-IBUS_KEY_dead_grave, 0x0060, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x1FD2, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x1FE2, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6A, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F02, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F12, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F22, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F32, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F42, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F52, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F62, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6B, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F03, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F13, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F23, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F33, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F43, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F53, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F63, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01DB, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01DC, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x1FD2, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x1FE2, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6B, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F03, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F13, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F23, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F33, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F43, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F53, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F63, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6A, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F02, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F12, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F22, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F32, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F42, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F52, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F62, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDC, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEA, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDD, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EEB, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A, 0x1EB0, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a, 0x1EB1, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA6, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC0, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED2, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC1, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED3, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E14, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E50, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E15, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E51, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A, 0x1EB0, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a, 0x1EB1, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_E, 0x1E14, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_O, 0x1E50, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_e, 0x1E15, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_o, 0x1E51, 
-IBUS_KEY_space, 0x0027, 
-IBUS_KEY_V, 0x01D7, 
-IBUS_KEY_v, 0x01D8, 
-IBUS_KEY_nobreakspace, 0x0301, 
-IBUS_KEY_Abreve, 0x1EAE, 
-IBUS_KEY_abreve, 0x1EAF, 
-IBUS_KEY_Emacron, 0x1E16, 
-IBUS_KEY_emacron, 0x1E17, 
-IBUS_KEY_Utilde, 0x1E78, 
-IBUS_KEY_omacron, 0x1E53, 
-IBUS_KEY_utilde, 0x1E79, 
-IBUS_KEY_Cyrillic_ghe, 0x0453, 
-IBUS_KEY_Cyrillic_ka, 0x045C, 
-IBUS_KEY_Cyrillic_GHE, 0x0403, 
-IBUS_KEY_Cyrillic_KA, 0x040C, 
-IBUS_KEY_Greek_iotadieresis, 0x0390, 
-IBUS_KEY_Greek_upsilondieresis, 0x03B0, 
-IBUS_KEY_Greek_ALPHA, 0x0386, 
-IBUS_KEY_Greek_EPSILON, 0x0388, 
-IBUS_KEY_Greek_ETA, 0x0389, 
-IBUS_KEY_Greek_IOTA, 0x038A, 
-IBUS_KEY_Greek_OMICRON, 0x038C, 
-IBUS_KEY_Greek_UPSILON, 0x038E, 
-IBUS_KEY_Greek_OMEGA, 0x038F, 
-IBUS_KEY_Greek_alpha, 0x03AC, 
-IBUS_KEY_Greek_epsilon, 0x03AD, 
-IBUS_KEY_Greek_eta, 0x03AE, 
-IBUS_KEY_Greek_iota, 0x03AF, 
-IBUS_KEY_Greek_omicron, 0x03CC, 
-IBUS_KEY_Greek_upsilon, 0x03CD, 
-IBUS_KEY_Greek_omega, 0x03CE, 
-IBUS_KEY_dead_acute, 0x00B4, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0x0385, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_dead_stroke, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_dead_stroke, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_I, 0x1E2E, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D7, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_i, 0x1E2F, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D8, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDA, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EE8, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDB, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EE9, 
-IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EBE, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED0, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EBF, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED1, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_Multi_key, IBUS_KEY_o, IBUS_KEY_A, 0x01FA, 
-IBUS_KEY_Multi_key, IBUS_KEY_o, IBUS_KEY_a, 0x01FB, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4C, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_U, 0x1E78, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x1E4D, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_u, 0x1E79, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_Multi_key, IBUS_KEY_KP_Divide, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_Multi_key, IBUS_KEY_KP_Divide, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_space, 0x005E, 
-IBUS_KEY_parenleft, 0x207D, 
-IBUS_KEY_parenright, 0x207E, 
-IBUS_KEY_plus, 0x207A, 
-IBUS_KEY_minus, 0x207B, 
-IBUS_KEY_0, 0x2070, 
-IBUS_KEY_1, 0x00B9, 
-IBUS_KEY_2, 0x00B2, 
-IBUS_KEY_3, 0x00B3, 
-IBUS_KEY_4, 0x2074, 
-IBUS_KEY_5, 0x2075, 
-IBUS_KEY_6, 0x2076, 
-IBUS_KEY_7, 0x2077, 
-IBUS_KEY_8, 0x2078, 
-IBUS_KEY_9, 0x2079, 
-IBUS_KEY_equal, 0x207C, 
-IBUS_KEY_nobreakspace, 0x0302, 
-IBUS_KEY_Agrave, 0x1EA6, 
-IBUS_KEY_Aacute, 0x1EA4, 
-IBUS_KEY_Atilde, 0x1EAA, 
-IBUS_KEY_Egrave, 0x1EC0, 
-IBUS_KEY_Eacute, 0x1EBE, 
-IBUS_KEY_Ograve, 0x1ED2, 
-IBUS_KEY_Oacute, 0x1ED0, 
-IBUS_KEY_Otilde, 0x1ED6, 
-IBUS_KEY_agrave, 0x1EA7, 
-IBUS_KEY_aacute, 0x1EA5, 
-IBUS_KEY_atilde, 0x1EAB, 
-IBUS_KEY_egrave, 0x1EC1, 
-IBUS_KEY_eacute, 0x1EBF, 
-IBUS_KEY_ograve, 0x1ED3, 
-IBUS_KEY_oacute, 0x1ED1, 
-IBUS_KEY_otilde, 0x1ED7, 
-0x2212, 0x207B, 
-0x4E00, 0x3192, 
-0x4E01, 0x319C, 
-0x4E09, 0x3194, 
-0x4E0A, 0x3196, 
-0x4E0B, 0x3198, 
-0x4E19, 0x319B, 
-0x4E2D, 0x3197, 
-0x4E59, 0x319A, 
-0x4E8C, 0x3193, 
-0x4EBA, 0x319F, 
-0x56DB, 0x3195, 
-0x5730, 0x319E, 
-0x5929, 0x319D, 
-0x7532, 0x3199, 
-IBUS_KEY_dead_circumflex, 0x005E, 
-IBUS_KEY_KP_Space, 0x00B2, 
-IBUS_KEY_KP_Add, 0x207A, 
-IBUS_KEY_KP_0, 0x2070, 
-IBUS_KEY_KP_1, 0x00B9, 
-IBUS_KEY_KP_2, 0x00B2, 
-IBUS_KEY_KP_3, 0x00B3, 
-IBUS_KEY_KP_4, 0x2074, 
-IBUS_KEY_KP_5, 0x2075, 
-IBUS_KEY_KP_6, 0x2076, 
-IBUS_KEY_KP_7, 0x2077, 
-IBUS_KEY_KP_8, 0x2078, 
-IBUS_KEY_KP_9, 0x2079, 
-IBUS_KEY_KP_Equal, 0x207C, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_A, 0x1EAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_E, 0x1EC6, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_O, 0x1ED8, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_a, 0x1EAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_e, 0x1EC7, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_o, 0x1ED9, 
-IBUS_KEY_Multi_key, IBUS_KEY_S, IBUS_KEY_M, 0x2120, 
-IBUS_KEY_Multi_key, IBUS_KEY_S, IBUS_KEY_m, 0x2120, 
-IBUS_KEY_Multi_key, IBUS_KEY_T, IBUS_KEY_M, 0x2122, 
-IBUS_KEY_Multi_key, IBUS_KEY_T, IBUS_KEY_m, 0x2122, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_a, 0x00AA, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_h, 0x02B0, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_i, 0x2071, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_j, 0x02B2, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_l, 0x02E1, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_n, 0x207F, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o, 0x00BA, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_r, 0x02B3, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_s, 0x02E2, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_w, 0x02B7, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_x, 0x02E3, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_y, 0x02B8, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0263, 0x02E0, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0266, 0x02B1, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0279, 0x02B4, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x027B, 0x02B5, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0281, 0x02B6, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0295, 0x02E4, 
-IBUS_KEY_Multi_key, IBUS_KEY_s, IBUS_KEY_M, 0x2120, 
-IBUS_KEY_Multi_key, IBUS_KEY_s, IBUS_KEY_m, 0x2120, 
-IBUS_KEY_Multi_key, IBUS_KEY_t, IBUS_KEY_M, 0x2122, 
-IBUS_KEY_Multi_key, IBUS_KEY_t, IBUS_KEY_m, 0x2122, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_a, 0x00AA, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_h, 0x02B0, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_i, 0x2071, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_j, 0x02B2, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_l, 0x02E1, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_n, 0x207F, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_o, 0x00BA, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_r, 0x02B3, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_s, 0x02E2, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_w, 0x02B7, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_x, 0x02E3, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_y, 0x02B8, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0263, 0x02E0, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0266, 0x02B1, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0279, 0x02B4, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x027B, 0x02B5, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0281, 0x02B6, 
-IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0295, 0x02E4, 
-IBUS_KEY_space, 0x007E, 
-IBUS_KEY_less, 0x2272, 
-IBUS_KEY_equal, 0x2243, 
-IBUS_KEY_greater, 0x2273, 
-IBUS_KEY_nobreakspace, 0x0303, 
-IBUS_KEY_Oacute, 0x1E4C, 
-IBUS_KEY_Odiaeresis, 0x1E4E, 
-IBUS_KEY_Uacute, 0x1E78, 
-IBUS_KEY_oacute, 0x1E4D, 
-IBUS_KEY_odiaeresis, 0x1E4F, 
-IBUS_KEY_uacute, 0x1E79, 
-IBUS_KEY_Abreve, 0x1EB4, 
-IBUS_KEY_abreve, 0x1EB5, 
-IBUS_KEY_Omacron, 0x022C, 
-IBUS_KEY_omacron, 0x022D, 
-IBUS_KEY_Greek_iotadieresis, 0x1FD7, 
-IBUS_KEY_Greek_upsilondieresis, 0x1FE7, 
-IBUS_KEY_Greek_alpha, 0x1FB6, 
-IBUS_KEY_Greek_eta, 0x1FC6, 
-IBUS_KEY_Greek_iota, 0x1FD6, 
-IBUS_KEY_Greek_upsilon, 0x1FE6, 
-IBUS_KEY_Greek_omega, 0x1FF6, 
-0x1F00, 0x1F06, 
-0x1F01, 0x1F07, 
-0x1F08, 0x1F0E, 
-0x1F09, 0x1F0F, 
-0x1F20, 0x1F26, 
-0x1F21, 0x1F27, 
-0x1F28, 0x1F2E, 
-0x1F29, 0x1F2F, 
-0x1F30, 0x1F36, 
-0x1F31, 0x1F37, 
-0x1F38, 0x1F3E, 
-0x1F39, 0x1F3F, 
-0x1F50, 0x1F56, 
-0x1F51, 0x1F57, 
-0x1F59, 0x1F5F, 
-0x1F60, 0x1F66, 
-0x1F61, 0x1F67, 
-0x1F68, 0x1F6E, 
-0x1F69, 0x1F6F, 
-IBUS_KEY_dead_tilde, 0x007E, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x1FD7, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x1FE7, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0E, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2E, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3E, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6E, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F06, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F26, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F36, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F56, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F66, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0F, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2F, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3F, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5F, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6F, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F07, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F27, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F37, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F57, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F67, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x1FD7, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x1FE7, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0F, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2F, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3F, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5F, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6F, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F07, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F27, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F37, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F57, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F67, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0E, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2E, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3E, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6E, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F06, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F26, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F36, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F56, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F66, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EE0, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEE, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EE1, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EEF, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A, 0x1EB4, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a, 0x1EB5, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EAA, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC4, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED6, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EAB, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC5, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED7, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A, 0x1EB4, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a, 0x1EB5, 
-IBUS_KEY_space, 0x00AF, 
-IBUS_KEY_V, 0x01D5, 
-IBUS_KEY_v, 0x01D6, 
-IBUS_KEY_nobreakspace, 0x0304, 
-IBUS_KEY_Egrave, 0x1E14, 
-IBUS_KEY_Eacute, 0x1E16, 
-IBUS_KEY_Ograve, 0x1E50, 
-IBUS_KEY_Oacute, 0x1E52, 
-IBUS_KEY_egrave, 0x1E15, 
-IBUS_KEY_eacute, 0x1E17, 
-IBUS_KEY_ograve, 0x1E51, 
-IBUS_KEY_oacute, 0x1E53, 
-IBUS_KEY_Cyrillic_i, 0x04E3, 
-IBUS_KEY_Cyrillic_u, 0x04EF, 
-IBUS_KEY_Cyrillic_I, 0x04E2, 
-IBUS_KEY_Cyrillic_U, 0x04EE, 
-IBUS_KEY_Greek_ALPHA, 0x1FB9, 
-IBUS_KEY_Greek_IOTA, 0x1FD9, 
-IBUS_KEY_Greek_UPSILON, 0x1FE9, 
-IBUS_KEY_Greek_alpha, 0x1FB1, 
-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, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_r, 0x1E5D, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_A, 0x01DE, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_O, 0x022A, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D5, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_a, 0x01DF, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_o, 0x022B, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D6, 
-IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_A, 0x01E0, 
-IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_O, 0x0230, 
-IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_a, 0x01E1, 
-IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_o, 0x0231, 
-IBUS_KEY_Multi_key, IBUS_KEY_semicolon, IBUS_KEY_O, 0x01EC, 
-IBUS_KEY_Multi_key, IBUS_KEY_semicolon, IBUS_KEY_o, 0x01ED, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x022C, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x022D, 
-IBUS_KEY_space, 0x02D8, 
-IBUS_KEY_nobreakspace, 0x0306, 
-IBUS_KEY_Agrave, 0x1EB0, 
-IBUS_KEY_Aacute, 0x1EAE, 
-IBUS_KEY_Atilde, 0x1EB4, 
-IBUS_KEY_agrave, 0x1EB1, 
-IBUS_KEY_aacute, 0x1EAF, 
-IBUS_KEY_atilde, 0x1EB5, 
-IBUS_KEY_Cyrillic_a, 0x04D1, 
-IBUS_KEY_Cyrillic_ie, 0x04D7, 
-IBUS_KEY_Cyrillic_i, 0x0439, 
-IBUS_KEY_Cyrillic_u, 0x045E, 
-IBUS_KEY_Cyrillic_zhe, 0x04C2, 
-IBUS_KEY_Cyrillic_A, 0x04D0, 
-IBUS_KEY_Cyrillic_IE, 0x04D6, 
-IBUS_KEY_Cyrillic_I, 0x0419, 
-IBUS_KEY_Cyrillic_U, 0x040E, 
-IBUS_KEY_Cyrillic_ZHE, 0x04C1, 
-IBUS_KEY_Greek_ALPHA, 0x1FB8, 
-IBUS_KEY_Greek_IOTA, 0x1FD8, 
-IBUS_KEY_Greek_UPSILON, 0x1FE8, 
-IBUS_KEY_Greek_alpha, 0x1FB0, 
-IBUS_KEY_Greek_iota, 0x1FD0, 
-IBUS_KEY_Greek_upsilon, 0x1FE0, 
-IBUS_KEY_dead_breve, 0x02D8, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_A, 0x1EB6, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_a, 0x1EB7, 
-IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_space, 0x02D9, 
-IBUS_KEY_L, 0x013F, 
-IBUS_KEY_i, 0x0131, 
-IBUS_KEY_j, 0x0237, 
-IBUS_KEY_l, 0x0140, 
-IBUS_KEY_nobreakspace, 0x0307, 
-IBUS_KEY_Sacute, 0x1E64, 
-IBUS_KEY_Scaron, 0x1E66, 
-IBUS_KEY_sacute, 0x1E65, 
-IBUS_KEY_scaron, 0x1E67, 
-IBUS_KEY_Amacron, 0x01E0, 
-IBUS_KEY_Omacron, 0x0230, 
-IBUS_KEY_amacron, 0x01E1, 
-IBUS_KEY_omacron, 0x0231, 
-IBUS_KEY_dead_abovedot, 0x02D9, 
-IBUS_KEY_dead_stroke, IBUS_KEY_j, 0x025F, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_S, 0x1E68, 
-IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_s, 0x1E69, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_S, 0x1E64, 
-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, 
-IBUS_KEY_apostrophe, 0x0344, 
-IBUS_KEY_nobreakspace, 0x0308, 
-IBUS_KEY_acute, 0x0344, 
-IBUS_KEY_Iacute, 0x1E2E, 
-IBUS_KEY_Ugrave, 0x01DB, 
-IBUS_KEY_Uacute, 0x01D7, 
-IBUS_KEY_iacute, 0x1E2F, 
-IBUS_KEY_ugrave, 0x01DC, 
-IBUS_KEY_uacute, 0x01D8, 
-0x01D3, 0x01D9, 
-0x01D4, 0x01DA, 
-IBUS_KEY_Amacron, 0x01DE, 
-IBUS_KEY_Umacron, 0x1E7A, 
-IBUS_KEY_amacron, 0x01DF, 
-IBUS_KEY_omacron, 0x022B, 
-IBUS_KEY_umacron, 0x1E7B, 
-IBUS_KEY_Ukrainian_i, 0x0457, 
-IBUS_KEY_Ukrainian_I, 0x0407, 
-IBUS_KEY_Cyrillic_a, 0x04D3, 
-IBUS_KEY_Cyrillic_ie, 0x0451, 
-IBUS_KEY_Cyrillic_i, 0x04E5, 
-IBUS_KEY_Cyrillic_o, 0x04E7, 
-IBUS_KEY_Cyrillic_u, 0x04F1, 
-IBUS_KEY_Cyrillic_zhe, 0x04DD, 
-IBUS_KEY_Cyrillic_yeru, 0x04F9, 
-IBUS_KEY_Cyrillic_ze, 0x04DF, 
-IBUS_KEY_Cyrillic_e, 0x04ED, 
-IBUS_KEY_Cyrillic_che, 0x04F5, 
-IBUS_KEY_Cyrillic_A, 0x04D2, 
-IBUS_KEY_Cyrillic_IE, 0x0401, 
-IBUS_KEY_Cyrillic_I, 0x04E4, 
-IBUS_KEY_Cyrillic_O, 0x04E6, 
-IBUS_KEY_Cyrillic_U, 0x04F0, 
-IBUS_KEY_Cyrillic_ZHE, 0x04DC, 
-IBUS_KEY_Cyrillic_YERU, 0x04F8, 
-IBUS_KEY_Cyrillic_ZE, 0x04DE, 
-IBUS_KEY_Cyrillic_E, 0x04EC, 
-IBUS_KEY_Cyrillic_CHE, 0x04F4, 
-IBUS_KEY_Greek_IOTA, 0x03AA, 
-IBUS_KEY_Greek_UPSILON, 0x03AB, 
-IBUS_KEY_Greek_iota, 0x03CA, 
-IBUS_KEY_Greek_upsilon, 0x03CB, 
-IBUS_KEY_dead_diaeresis, 0x00A8, 
-IBUS_KEY_dead_acute, IBUS_KEY_space, 0x0385, 
-IBUS_KEY_dead_acute, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_dead_acute, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_dead_belowdiaeresis, IBUS_KEY_equal, 0x2A77, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_U, 0x1E7A, 
-IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_u, 0x1E7B, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x1E4F, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_U, 0x1E7A, 
-IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_u, 0x1E7B, 
-IBUS_KEY_space, 0x00B0, 
-IBUS_KEY_nobreakspace, 0x030A, 
-IBUS_KEY_Aacute, 0x01FA, 
-IBUS_KEY_aacute, 0x01FB, 
-IBUS_KEY_dead_abovering, 0x00B0, 
-IBUS_KEY_space, 0x02DD, 
-IBUS_KEY_nobreakspace, 0x030B, 
-IBUS_KEY_Cyrillic_u, 0x04F3, 
-IBUS_KEY_Cyrillic_U, 0x04F2, 
-IBUS_KEY_dead_doubleacute, 0x02DD, 
-IBUS_KEY_space, 0x02C7, 
-IBUS_KEY_parenleft, 0x208D, 
-IBUS_KEY_parenright, 0x208E, 
-IBUS_KEY_plus, 0x208A, 
-IBUS_KEY_minus, 0x208B, 
-IBUS_KEY_0, 0x2080, 
-IBUS_KEY_1, 0x2081, 
-IBUS_KEY_2, 0x2082, 
-IBUS_KEY_3, 0x2083, 
-IBUS_KEY_4, 0x2084, 
-IBUS_KEY_5, 0x2085, 
-IBUS_KEY_6, 0x2086, 
-IBUS_KEY_7, 0x2087, 
-IBUS_KEY_8, 0x2088, 
-IBUS_KEY_9, 0x2089, 
-IBUS_KEY_equal, 0x208C, 
-IBUS_KEY_V, 0x01D9, 
-IBUS_KEY_v, 0x01DA, 
-IBUS_KEY_nobreakspace, 0x030C, 
-0x01F2, 0x01C5, 
-IBUS_KEY_dead_caron, 0x02C7, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D9, 
-IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01DA, 
-IBUS_KEY_space, 0x00B8, 
-IBUS_KEY_nobreakspace, 0x0327, 
-IBUS_KEY_cent, 0x20B5, 
-IBUS_KEY_Cacute, 0x1E08, 
-IBUS_KEY_cacute, 0x1E09, 
-IBUS_KEY_dead_cedilla, 0x00B8, 
-IBUS_KEY_dead_currency, IBUS_KEY_C, 0x20B5, 
-IBUS_KEY_dead_currency, IBUS_KEY_c, 0x20B5, 
-IBUS_KEY_space, 0x02DB, 
-IBUS_KEY_nobreakspace, 0x0328, 
-IBUS_KEY_Omacron, 0x01EC, 
-IBUS_KEY_omacron, 0x01ED, 
-IBUS_KEY_dead_ogonek, 0x02DB, 
-IBUS_KEY_space, 0x037A, 
-IBUS_KEY_Greek_alphaaccent, 0x1FB4, 
-IBUS_KEY_Greek_etaaccent, 0x1FC4, 
-IBUS_KEY_Greek_omegaaccent, 0x1FF4, 
-IBUS_KEY_Greek_ALPHA, 0x1FBC, 
-IBUS_KEY_Greek_ETA, 0x1FCC, 
-IBUS_KEY_Greek_OMEGA, 0x1FFC, 
-IBUS_KEY_Greek_alpha, 0x1FB3, 
-IBUS_KEY_Greek_eta, 0x1FC3, 
-IBUS_KEY_Greek_omega, 0x1FF3, 
-IBUS_KEY_dead_iota, 0x037A, 
-IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0x1FB2, 
-IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0x1FC2, 
-IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0x1FF2, 
-IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0x1FB7, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0x1FC7, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0x1FF7, 
-IBUS_KEY_dead_tilde, 0x1F00, 0x1F86, 
-IBUS_KEY_dead_tilde, 0x1F01, 0x1F87, 
-IBUS_KEY_dead_tilde, 0x1F08, 0x1F8E, 
-IBUS_KEY_dead_tilde, 0x1F09, 0x1F8F, 
-IBUS_KEY_dead_tilde, 0x1F20, 0x1F96, 
-IBUS_KEY_dead_tilde, 0x1F21, 0x1F97, 
-IBUS_KEY_dead_tilde, 0x1F28, 0x1F9E, 
-IBUS_KEY_dead_tilde, 0x1F29, 0x1F9F, 
-IBUS_KEY_dead_tilde, 0x1F60, 0x1FA6, 
-IBUS_KEY_dead_tilde, 0x1F61, 0x1FA7, 
-IBUS_KEY_dead_tilde, 0x1F68, 0x1FAE, 
-IBUS_KEY_dead_tilde, 0x1F69, 0x1FAF, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F88, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F98, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FA8, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F80, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F90, 
-IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA0, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F89, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F99, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FA9, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F81, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F91, 
-IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA1, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F00, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F01, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F08, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F09, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F20, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F21, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F28, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F29, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F60, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F61, 0x1FA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F68, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F69, 0x1FAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F89, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F99, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FA9, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F81, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F91, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA1, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F88, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F98, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FA8, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F80, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F90, 
-IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA0, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0x1FB2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0x1FC2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0x1FF2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F00, 0x1F82, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F01, 0x1F83, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F08, 0x1F8A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F09, 0x1F8B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F20, 0x1F92, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F21, 0x1F93, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F28, 0x1F9A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F29, 0x1F9B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F60, 0x1FA2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F61, 0x1FA3, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F68, 0x1FAA, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F69, 0x1FAB, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0x1FB7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0x1FC7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0x1FF7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F00, 0x1F86, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F01, 0x1F87, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F08, 0x1F8E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F09, 0x1F8F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F20, 0x1F96, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F21, 0x1F97, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F28, 0x1F9E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F29, 0x1F9F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F60, 0x1FA6, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F61, 0x1FA7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F68, 0x1FAE, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F69, 0x1FAF, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F00, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F01, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F08, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F09, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F20, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F21, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F28, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F29, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F60, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F61, 0x1FA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F68, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F69, 0x1FAD, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_kana_WO, 0x30FA, 
-IBUS_KEY_kana_U, 0x30F4, 
-IBUS_KEY_kana_KA, 0x30AC, 
-IBUS_KEY_kana_KI, 0x30AE, 
-IBUS_KEY_kana_KU, 0x30B0, 
-IBUS_KEY_kana_KE, 0x30B2, 
-IBUS_KEY_kana_KO, 0x30B4, 
-IBUS_KEY_kana_SA, 0x30B6, 
-IBUS_KEY_kana_SHI, 0x30B8, 
-IBUS_KEY_kana_SU, 0x30BA, 
-IBUS_KEY_kana_SE, 0x30BC, 
-IBUS_KEY_kana_SO, 0x30BE, 
-IBUS_KEY_kana_TA, 0x30C0, 
-IBUS_KEY_kana_CHI, 0x30C2, 
-IBUS_KEY_kana_TSU, 0x30C5, 
-IBUS_KEY_kana_TE, 0x30C7, 
-IBUS_KEY_kana_TO, 0x30C9, 
-IBUS_KEY_kana_HA, 0x30D0, 
-IBUS_KEY_kana_HI, 0x30D3, 
-IBUS_KEY_kana_FU, 0x30D6, 
-IBUS_KEY_kana_HE, 0x30D9, 
-IBUS_KEY_kana_HO, 0x30DC, 
-IBUS_KEY_kana_WA, 0x30F7, 
-IBUS_KEY_kana_HA, 0x30D1, 
-IBUS_KEY_kana_HI, 0x30D4, 
-IBUS_KEY_kana_FU, 0x30D7, 
-IBUS_KEY_kana_HE, 0x30DA, 
-IBUS_KEY_kana_HO, 0x30DD, 
-IBUS_KEY_space, 0x0323, 
-IBUS_KEY_plus, 0x2A25, 
-IBUS_KEY_minus, 0x2A2A, 
-IBUS_KEY_equal, 0x2A66, 
-IBUS_KEY_nobreakspace, 0x0323, 
-IBUS_KEY_Abreve, 0x1EB6, 
-IBUS_KEY_abreve, 0x1EB7, 
-IBUS_KEY_dead_belowdot, 0x0323, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EE2, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EF0, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EE3, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EF1, 
-IBUS_KEY_space, 0x0309, 
-IBUS_KEY_B, 0x0181, 
-IBUS_KEY_C, 0x0187, 
-IBUS_KEY_D, 0x018A, 
-IBUS_KEY_F, 0x0191, 
-IBUS_KEY_G, 0x0193, 
-IBUS_KEY_K, 0x0198, 
-IBUS_KEY_M, 0x2C6E, 
-IBUS_KEY_N, 0x019D, 
-IBUS_KEY_P, 0x01A4, 
-IBUS_KEY_T, 0x01AC, 
-IBUS_KEY_V, 0x01B2, 
-IBUS_KEY_W, 0x2C72, 
-IBUS_KEY_Z, 0x0224, 
-IBUS_KEY_b, 0x0253, 
-IBUS_KEY_c, 0x0188, 
-IBUS_KEY_d, 0x0257, 
-IBUS_KEY_f, 0x0192, 
-IBUS_KEY_g, 0x0260, 
-IBUS_KEY_h, 0x0266, 
-IBUS_KEY_k, 0x0199, 
-IBUS_KEY_m, 0x0271, 
-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, 
-IBUS_KEY_w, 0x2C73, 
-IBUS_KEY_z, 0x0225, 
-IBUS_KEY_nobreakspace, 0x0309, 
-IBUS_KEY_Abreve, 0x1EB2, 
-IBUS_KEY_abreve, 0x1EB3, 
-0x0256, 0x1D91, 
-0x025C, 0x025D, 
-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, 
-IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EED, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A, 0x1EB2, 
-IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a, 0x1EB3, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA8, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC2, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED4, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA9, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC3, 
-IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED5, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A, 0x1EB2, 
-IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a, 0x1EB3, 
-IBUS_KEY_space, 0x031B, 
-IBUS_KEY_nobreakspace, 0x031B, 
-IBUS_KEY_Utilde, 0x1EEE, 
-IBUS_KEY_utilde, 0x1EEF, 
-IBUS_KEY_dead_horn, 0x031B, 
-IBUS_KEY_space, 0x002F, 
-IBUS_KEY_2, 0x01BB, 
-IBUS_KEY_A, 0x023A, 
-IBUS_KEY_B, 0x0243, 
-IBUS_KEY_C, 0x023B, 
-IBUS_KEY_D, 0x0110, 
-IBUS_KEY_E, 0x0246, 
-IBUS_KEY_G, 0x01E4, 
-IBUS_KEY_H, 0x0126, 
-IBUS_KEY_I, 0x0197, 
-IBUS_KEY_J, 0x0248, 
-IBUS_KEY_L, 0x0141, 
-IBUS_KEY_O, 0x00D8, 
-IBUS_KEY_P, 0x2C63, 
-IBUS_KEY_R, 0x024C, 
-IBUS_KEY_T, 0x0166, 
-IBUS_KEY_U, 0x0244, 
-IBUS_KEY_Y, 0x024E, 
-IBUS_KEY_Z, 0x01B5, 
-IBUS_KEY_a, 0x2C65, 
-IBUS_KEY_b, 0x0180, 
-IBUS_KEY_c, 0x023C, 
-IBUS_KEY_d, 0x0111, 
-IBUS_KEY_e, 0x0247, 
-IBUS_KEY_g, 0x01E5, 
-IBUS_KEY_h, 0x0127, 
-IBUS_KEY_i, 0x0268, 
-IBUS_KEY_j, 0x0249, 
-IBUS_KEY_l, 0x0142, 
-IBUS_KEY_o, 0x00F8, 
-IBUS_KEY_p, 0x1D7D, 
-IBUS_KEY_r, 0x024D, 
-IBUS_KEY_t, 0x0167, 
-IBUS_KEY_u, 0x0289, 
-IBUS_KEY_y, 0x024F, 
-IBUS_KEY_z, 0x01B6, 
-IBUS_KEY_nobreakspace, 0x0338, 
-IBUS_KEY_Oacute, 0x01FE, 
-IBUS_KEY_oacute, 0x01FF, 
-0x0237, 0x025F, 
-0x0269, 0x1D7C, 
-IBUS_KEY_lessthanequal, 0x2270, 
-IBUS_KEY_greaterthanequal, 0x2271, 
-IBUS_KEY_dead_stroke, 0x002F, 
-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_ALPHA, 0x1F08, 
-IBUS_KEY_Greek_EPSILON, 0x1F18, 
-IBUS_KEY_Greek_ETA, 0x1F28, 
-IBUS_KEY_Greek_IOTA, 0x1F38, 
-IBUS_KEY_Greek_OMICRON, 0x1F48, 
-IBUS_KEY_Greek_OMEGA, 0x1F68, 
-IBUS_KEY_Greek_alpha, 0x1F00, 
-IBUS_KEY_Greek_epsilon, 0x1F10, 
-IBUS_KEY_Greek_eta, 0x1F20, 
-IBUS_KEY_Greek_iota, 0x1F30, 
-IBUS_KEY_Greek_omicron, 0x1F40, 
-IBUS_KEY_Greek_rho, 0x1FE4, 
-IBUS_KEY_Greek_upsilon, 0x1F50, 
-IBUS_KEY_Greek_omega, 0x1F60, 
-IBUS_KEY_Greek_ALPHA, 0x1F09, 
-IBUS_KEY_Greek_EPSILON, 0x1F19, 
-IBUS_KEY_Greek_ETA, 0x1F29, 
-IBUS_KEY_Greek_IOTA, 0x1F39, 
-IBUS_KEY_Greek_OMICRON, 0x1F49, 
-IBUS_KEY_Greek_RHO, 0x1FEC, 
-IBUS_KEY_Greek_UPSILON, 0x1F59, 
-IBUS_KEY_Greek_OMEGA, 0x1F69, 
-IBUS_KEY_Greek_alpha, 0x1F01, 
-IBUS_KEY_Greek_epsilon, 0x1F11, 
-IBUS_KEY_Greek_eta, 0x1F21, 
-IBUS_KEY_Greek_iota, 0x1F31, 
-IBUS_KEY_Greek_omicron, 0x1F41, 
-IBUS_KEY_Greek_rho, 0x1FE5, 
-IBUS_KEY_Greek_upsilon, 0x1F51, 
-IBUS_KEY_Greek_omega, 0x1F61, 
-IBUS_KEY_bar, 0x2AF0, 
-IBUS_KEY_plus, 0x2A26, 
-IBUS_KEY_dead_diaeresis, IBUS_KEY_equal, 0x2A77, 
-IBUS_KEY_space, 0x002C, 
-IBUS_KEY_S, 0x0218, 
-IBUS_KEY_T, 0x021A, 
-IBUS_KEY_s, 0x0219, 
-IBUS_KEY_t, 0x021B, 
-IBUS_KEY_nobreakspace, 0x0326, 
-IBUS_KEY_dead_belowcomma, 0x002C, 
-IBUS_KEY_space, 0x00A4, 
-IBUS_KEY_A, 0x20B3, 
-IBUS_KEY_B, 0x20B1, 
-IBUS_KEY_C, 0x20A1, 
-IBUS_KEY_D, 0x20AF, 
-IBUS_KEY_E, 0x20A0, 
-IBUS_KEY_F, 0x20A3, 
-IBUS_KEY_G, 0x20B2, 
-IBUS_KEY_H, 0x20B4, 
-IBUS_KEY_I, 0x17DB, 
-IBUS_KEY_K, 0x20AD, 
-IBUS_KEY_L, 0x20A4, 
-IBUS_KEY_M, 0x2133, 
-IBUS_KEY_N, 0x20A6, 
-IBUS_KEY_O, 0x0AF1, 
-IBUS_KEY_P, 0x20A7, 
-IBUS_KEY_R, 0x20A8, 
-IBUS_KEY_S, 0x0024, 
-IBUS_KEY_T, 0x20AE, 
-IBUS_KEY_U, 0x5713, 
-IBUS_KEY_W, 0x20A9, 
-IBUS_KEY_Y, 0x5186, 
-IBUS_KEY_a, 0x060B, 
-IBUS_KEY_b, 0x0E3F, 
-IBUS_KEY_c, 0x00A2, 
-IBUS_KEY_d, 0x20AB, 
-IBUS_KEY_e, 0x20AC, 
-IBUS_KEY_f, 0x0192, 
-IBUS_KEY_g, 0x20B2, 
-IBUS_KEY_h, 0x20B4, 
-IBUS_KEY_i, 0xFDFC, 
-IBUS_KEY_k, 0x20AD, 
-IBUS_KEY_l, 0x00A3, 
-IBUS_KEY_m, 0x20A5, 
-IBUS_KEY_n, 0x20A6, 
-IBUS_KEY_o, 0x0BF9, 
-IBUS_KEY_p, 0x20B0, 
-IBUS_KEY_r, 0x20A2, 
-IBUS_KEY_s, 0x20AA, 
-IBUS_KEY_t, 0x09F3, 
-IBUS_KEY_u, 0x5143, 
-IBUS_KEY_w, 0x20A9, 
-IBUS_KEY_y, 0x00A5, 
-IBUS_KEY_nobreakspace, 0x00A4, 
-IBUS_KEY_Ccedilla, 0x20B5, 
-IBUS_KEY_THORN, 0x09F2, 
-IBUS_KEY_ccedilla, 0x20B5, 
-IBUS_KEY_thorn, 0x09F2, 
-IBUS_KEY_dead_currency, 0x00A4, 
-IBUS_KEY_dead_cedilla, IBUS_KEY_C, 0x20B5, 
-IBUS_KEY_dead_cedilla, IBUS_KEY_c, 0x20B5, 
-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_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_dead_stroke, IBUS_KEY_r, 0x03FC, 
-IBUS_KEY_space, IBUS_KEY_space, 0x00A0, 
-IBUS_KEY_space, IBUS_KEY_apostrophe, 0x0027, 
-IBUS_KEY_space, IBUS_KEY_parenleft, 0x02D8, 
-IBUS_KEY_space, IBUS_KEY_comma, 0x00B8, 
-IBUS_KEY_space, IBUS_KEY_minus, 0x007E, 
-IBUS_KEY_space, IBUS_KEY_period, 0x2008, 
-IBUS_KEY_space, IBUS_KEY_less, 0x02C7, 
-IBUS_KEY_space, IBUS_KEY_greater, 0x005E, 
-IBUS_KEY_space, IBUS_KEY_asciicircum, 0x005E, 
-IBUS_KEY_space, IBUS_KEY_grave, 0x0060, 
-IBUS_KEY_space, IBUS_KEY_asciitilde, 0x007E, 
-IBUS_KEY_exclam, IBUS_KEY_exclam, 0x00A1, 
-IBUS_KEY_exclam, IBUS_KEY_question, 0x203D, 
-IBUS_KEY_exclam, IBUS_KEY_A, 0x1EA0, 
-IBUS_KEY_exclam, IBUS_KEY_B, 0x1E04, 
-IBUS_KEY_exclam, IBUS_KEY_D, 0x1E0C, 
-IBUS_KEY_exclam, IBUS_KEY_E, 0x1EB8, 
-IBUS_KEY_exclam, IBUS_KEY_H, 0x1E24, 
-IBUS_KEY_exclam, IBUS_KEY_I, 0x1ECA, 
-IBUS_KEY_exclam, IBUS_KEY_K, 0x1E32, 
-IBUS_KEY_exclam, IBUS_KEY_L, 0x1E36, 
-IBUS_KEY_exclam, IBUS_KEY_M, 0x1E42, 
-IBUS_KEY_exclam, IBUS_KEY_N, 0x1E46, 
-IBUS_KEY_exclam, IBUS_KEY_O, 0x1ECC, 
-IBUS_KEY_exclam, IBUS_KEY_R, 0x1E5A, 
-IBUS_KEY_exclam, IBUS_KEY_S, 0x1E62, 
-IBUS_KEY_exclam, IBUS_KEY_T, 0x1E6C, 
-IBUS_KEY_exclam, IBUS_KEY_U, 0x1EE4, 
-IBUS_KEY_exclam, IBUS_KEY_V, 0x1E7E, 
-IBUS_KEY_exclam, IBUS_KEY_W, 0x1E88, 
-IBUS_KEY_exclam, IBUS_KEY_Y, 0x1EF4, 
-IBUS_KEY_exclam, IBUS_KEY_Z, 0x1E92, 
-IBUS_KEY_exclam, IBUS_KEY_asciicircum, 0x00A6, 
-IBUS_KEY_exclam, IBUS_KEY_a, 0x1EA1, 
-IBUS_KEY_exclam, IBUS_KEY_b, 0x1E05, 
-IBUS_KEY_exclam, IBUS_KEY_d, 0x1E0D, 
-IBUS_KEY_exclam, IBUS_KEY_e, 0x1EB9, 
-IBUS_KEY_exclam, IBUS_KEY_h, 0x1E25, 
-IBUS_KEY_exclam, IBUS_KEY_i, 0x1ECB, 
-IBUS_KEY_exclam, IBUS_KEY_k, 0x1E33, 
-IBUS_KEY_exclam, IBUS_KEY_l, 0x1E37, 
-IBUS_KEY_exclam, IBUS_KEY_m, 0x1E43, 
-IBUS_KEY_exclam, IBUS_KEY_n, 0x1E47, 
-IBUS_KEY_exclam, IBUS_KEY_o, 0x1ECD, 
-IBUS_KEY_exclam, IBUS_KEY_r, 0x1E5B, 
-IBUS_KEY_exclam, IBUS_KEY_s, 0x1E63, 
-IBUS_KEY_exclam, IBUS_KEY_t, 0x1E6D, 
-IBUS_KEY_exclam, IBUS_KEY_u, 0x1EE5, 
-IBUS_KEY_exclam, IBUS_KEY_v, 0x1E7F, 
-IBUS_KEY_exclam, IBUS_KEY_w, 0x1E89, 
-IBUS_KEY_exclam, IBUS_KEY_y, 0x1EF5, 
-IBUS_KEY_exclam, IBUS_KEY_z, 0x1E93, 
-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_less, 0x201C, 
-IBUS_KEY_quotedbl, IBUS_KEY_greater, 0x201D, 
-IBUS_KEY_quotedbl, IBUS_KEY_A, 0x00C4, 
-IBUS_KEY_quotedbl, IBUS_KEY_E, 0x00CB, 
-IBUS_KEY_quotedbl, IBUS_KEY_H, 0x1E26, 
-IBUS_KEY_quotedbl, IBUS_KEY_I, 0x00CF, 
-IBUS_KEY_quotedbl, IBUS_KEY_O, 0x00D6, 
-IBUS_KEY_quotedbl, IBUS_KEY_U, 0x00DC, 
-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_a, 0x00E4, 
-IBUS_KEY_quotedbl, IBUS_KEY_e, 0x00EB, 
-IBUS_KEY_quotedbl, IBUS_KEY_h, 0x1E27, 
-IBUS_KEY_quotedbl, IBUS_KEY_i, 0x00EF, 
-IBUS_KEY_quotedbl, IBUS_KEY_o, 0x00F6, 
-IBUS_KEY_quotedbl, IBUS_KEY_t, 0x1E97, 
-IBUS_KEY_quotedbl, IBUS_KEY_u, 0x00FC, 
-IBUS_KEY_quotedbl, IBUS_KEY_w, 0x1E85, 
-IBUS_KEY_quotedbl, IBUS_KEY_x, 0x1E8D, 
-IBUS_KEY_quotedbl, IBUS_KEY_y, 0x00FF, 
-IBUS_KEY_quotedbl, IBUS_KEY_acute, 0x0344, 
-IBUS_KEY_quotedbl, IBUS_KEY_Otilde, 0x1E4E, 
-IBUS_KEY_quotedbl, IBUS_KEY_otilde, 0x1E4F, 
-IBUS_KEY_quotedbl, 0x03D2, 0x03D4, 
-IBUS_KEY_quotedbl, IBUS_KEY_Umacron, 0x1E7A, 
-IBUS_KEY_quotedbl, IBUS_KEY_umacron, 0x1E7B, 
-IBUS_KEY_quotedbl, 0x04D8, 0x04DA, 
-IBUS_KEY_quotedbl, 0x04D9, 0x04DB, 
-IBUS_KEY_quotedbl, 0x04E8, 0x04EA, 
-IBUS_KEY_quotedbl, 0x04E9, 0x04EB, 
-IBUS_KEY_quotedbl, IBUS_KEY_Ukrainian_i, 0x0457, 
-IBUS_KEY_quotedbl, IBUS_KEY_Ukrainian_I, 0x0407, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_a, 0x04D3, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ie, 0x0451, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_i, 0x04E5, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_o, 0x04E7, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_u, 0x04F1, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_zhe, 0x04DD, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_yeru, 0x04F9, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ze, 0x04DF, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_e, 0x04ED, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_che, 0x04F5, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_A, 0x04D2, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_IE, 0x0401, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_I, 0x04E4, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_O, 0x04E6, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_U, 0x04F0, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ZHE, 0x04DC, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_YERU, 0x04F8, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ZE, 0x04DE, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_E, 0x04EC, 
-IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_CHE, 0x04F4, 
-IBUS_KEY_quotedbl, IBUS_KEY_Greek_IOTA, 0x03AA, 
-IBUS_KEY_quotedbl, IBUS_KEY_Greek_UPSILON, 0x03AB, 
-IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x03CA, 
-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, 
-IBUS_KEY_apostrophe, IBUS_KEY_comma, 0x201A, 
-IBUS_KEY_apostrophe, IBUS_KEY_less, 0x2018, 
-IBUS_KEY_apostrophe, IBUS_KEY_greater, 0x2019, 
-IBUS_KEY_apostrophe, IBUS_KEY_A, 0x00C1, 
-IBUS_KEY_apostrophe, IBUS_KEY_C, 0x0106, 
-IBUS_KEY_apostrophe, IBUS_KEY_E, 0x00C9, 
-IBUS_KEY_apostrophe, IBUS_KEY_G, 0x01F4, 
-IBUS_KEY_apostrophe, IBUS_KEY_I, 0x00CD, 
-IBUS_KEY_apostrophe, IBUS_KEY_K, 0x1E30, 
-IBUS_KEY_apostrophe, IBUS_KEY_L, 0x0139, 
-IBUS_KEY_apostrophe, IBUS_KEY_M, 0x1E3E, 
-IBUS_KEY_apostrophe, IBUS_KEY_N, 0x0143, 
-IBUS_KEY_apostrophe, IBUS_KEY_O, 0x00D3, 
-IBUS_KEY_apostrophe, IBUS_KEY_P, 0x1E54, 
-IBUS_KEY_apostrophe, IBUS_KEY_R, 0x0154, 
-IBUS_KEY_apostrophe, IBUS_KEY_S, 0x015A, 
-IBUS_KEY_apostrophe, IBUS_KEY_U, 0x00DA, 
-IBUS_KEY_apostrophe, IBUS_KEY_W, 0x1E82, 
-IBUS_KEY_apostrophe, IBUS_KEY_Y, 0x00DD, 
-IBUS_KEY_apostrophe, IBUS_KEY_Z, 0x0179, 
-IBUS_KEY_apostrophe, IBUS_KEY_a, 0x00E1, 
-IBUS_KEY_apostrophe, IBUS_KEY_c, 0x0107, 
-IBUS_KEY_apostrophe, IBUS_KEY_e, 0x00E9, 
-IBUS_KEY_apostrophe, IBUS_KEY_g, 0x01F5, 
-IBUS_KEY_apostrophe, IBUS_KEY_i, 0x00ED, 
-IBUS_KEY_apostrophe, IBUS_KEY_k, 0x1E31, 
-IBUS_KEY_apostrophe, IBUS_KEY_l, 0x013A, 
-IBUS_KEY_apostrophe, IBUS_KEY_m, 0x1E3F, 
-IBUS_KEY_apostrophe, IBUS_KEY_n, 0x0144, 
-IBUS_KEY_apostrophe, IBUS_KEY_o, 0x00F3, 
-IBUS_KEY_apostrophe, IBUS_KEY_p, 0x1E55, 
-IBUS_KEY_apostrophe, IBUS_KEY_r, 0x0155, 
-IBUS_KEY_apostrophe, IBUS_KEY_s, 0x015B, 
-IBUS_KEY_apostrophe, IBUS_KEY_u, 0x00FA, 
-IBUS_KEY_apostrophe, IBUS_KEY_w, 0x1E83, 
-IBUS_KEY_apostrophe, IBUS_KEY_y, 0x00FD, 
-IBUS_KEY_apostrophe, IBUS_KEY_z, 0x017A, 
-IBUS_KEY_apostrophe, IBUS_KEY_Acircumflex, 0x1EA4, 
-IBUS_KEY_apostrophe, IBUS_KEY_Aring, 0x01FA, 
-IBUS_KEY_apostrophe, IBUS_KEY_AE, 0x01FC, 
-IBUS_KEY_apostrophe, IBUS_KEY_Ccedilla, 0x1E08, 
-IBUS_KEY_apostrophe, IBUS_KEY_Ecircumflex, 0x1EBE, 
-IBUS_KEY_apostrophe, IBUS_KEY_Idiaeresis, 0x1E2E, 
-IBUS_KEY_apostrophe, IBUS_KEY_Ocircumflex, 0x1ED0, 
-IBUS_KEY_apostrophe, IBUS_KEY_Otilde, 0x1E4C, 
-IBUS_KEY_apostrophe, IBUS_KEY_Ooblique, 0x01FE, 
-IBUS_KEY_apostrophe, IBUS_KEY_Udiaeresis, 0x01D7, 
-IBUS_KEY_apostrophe, IBUS_KEY_acircumflex, 0x1EA5, 
-IBUS_KEY_apostrophe, IBUS_KEY_aring, 0x01FB, 
-IBUS_KEY_apostrophe, IBUS_KEY_ae, 0x01FD, 
-IBUS_KEY_apostrophe, IBUS_KEY_ccedilla, 0x1E09, 
-IBUS_KEY_apostrophe, IBUS_KEY_ecircumflex, 0x1EBF, 
-IBUS_KEY_apostrophe, IBUS_KEY_idiaeresis, 0x1E2F, 
-IBUS_KEY_apostrophe, IBUS_KEY_ocircumflex, 0x1ED1, 
-IBUS_KEY_apostrophe, IBUS_KEY_otilde, 0x1E4D, 
-IBUS_KEY_apostrophe, IBUS_KEY_oslash, 0x01FF, 
-IBUS_KEY_apostrophe, IBUS_KEY_udiaeresis, 0x01D8, 
-IBUS_KEY_apostrophe, IBUS_KEY_Abreve, 0x1EAE, 
-IBUS_KEY_apostrophe, IBUS_KEY_abreve, 0x1EAF, 
-IBUS_KEY_apostrophe, IBUS_KEY_Emacron, 0x1E16, 
-IBUS_KEY_apostrophe, IBUS_KEY_emacron, 0x1E17, 
-IBUS_KEY_apostrophe, IBUS_KEY_Omacron, 0x1E52, 
-IBUS_KEY_apostrophe, IBUS_KEY_Utilde, 0x1E78, 
-IBUS_KEY_apostrophe, IBUS_KEY_omacron, 0x1E53, 
-IBUS_KEY_apostrophe, IBUS_KEY_utilde, 0x1E79, 
-IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ghe, 0x0453, 
-IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ka, 0x045C, 
-IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_GHE, 0x0403, 
-IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_KA, 0x040C, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_iotadieresis, 0x0390, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilondieresis, 0x03B0, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA, 0x0386, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_EPSILON, 0x0388, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA, 0x0389, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_IOTA, 0x038A, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMICRON, 0x038C, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_UPSILON, 0x038E, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA, 0x038F, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0x03AC, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_epsilon, 0x03AD, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0x03AE, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota, 0x03AF, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_omicron, 0x03CC, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon, 0x03CD, 
-IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0x03CE, 
-IBUS_KEY_apostrophe, 0x1F00, 0x1F04, 
-IBUS_KEY_apostrophe, 0x1F01, 0x1F05, 
-IBUS_KEY_apostrophe, 0x1F08, 0x1F0C, 
-IBUS_KEY_apostrophe, 0x1F09, 0x1F0D, 
-IBUS_KEY_apostrophe, 0x1F10, 0x1F14, 
-IBUS_KEY_apostrophe, 0x1F11, 0x1F15, 
-IBUS_KEY_apostrophe, 0x1F18, 0x1F1C, 
-IBUS_KEY_apostrophe, 0x1F19, 0x1F1D, 
-IBUS_KEY_apostrophe, 0x1F20, 0x1F24, 
-IBUS_KEY_apostrophe, 0x1F21, 0x1F25, 
-IBUS_KEY_apostrophe, 0x1F28, 0x1F2C, 
-IBUS_KEY_apostrophe, 0x1F29, 0x1F2D, 
-IBUS_KEY_apostrophe, 0x1F30, 0x1F34, 
-IBUS_KEY_apostrophe, 0x1F31, 0x1F35, 
-IBUS_KEY_apostrophe, 0x1F38, 0x1F3C, 
-IBUS_KEY_apostrophe, 0x1F39, 0x1F3D, 
-IBUS_KEY_apostrophe, 0x1F40, 0x1F44, 
-IBUS_KEY_apostrophe, 0x1F41, 0x1F45, 
-IBUS_KEY_apostrophe, 0x1F48, 0x1F4C, 
-IBUS_KEY_apostrophe, 0x1F49, 0x1F4D, 
-IBUS_KEY_apostrophe, 0x1F50, 0x1F54, 
-IBUS_KEY_apostrophe, 0x1F51, 0x1F55, 
-IBUS_KEY_apostrophe, 0x1F59, 0x1F5D, 
-IBUS_KEY_apostrophe, 0x1F60, 0x1F64, 
-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, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F09, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F19, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F29, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F39, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F49, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_RHO, 0x1FEC, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F59, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F69, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F01, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F11, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F21, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F31, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F41, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_rho, 0x1FE5, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F51, 
-IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F61, 
-IBUS_KEY_parenright, IBUS_KEY_parenright, 0x005D, 
-IBUS_KEY_parenright, IBUS_KEY_minus, 0x007D, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F08, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F18, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F28, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F38, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F48, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F68, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F00, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F10, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F20, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F30, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F40, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_rho, 0x1FE4, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F50, 
-IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F60, 
-IBUS_KEY_asterisk, IBUS_KEY_0, 0x00B0, 
-IBUS_KEY_asterisk, IBUS_KEY_A, 0x00C5, 
-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, 
-IBUS_KEY_plus, IBUS_KEY_U, 0x01AF, 
-IBUS_KEY_plus, IBUS_KEY_o, 0x01A1, 
-IBUS_KEY_plus, IBUS_KEY_u, 0x01B0, 
-IBUS_KEY_comma, IBUS_KEY_space, 0x00B8, 
-IBUS_KEY_comma, IBUS_KEY_quotedbl, 0x201E, 
-IBUS_KEY_comma, IBUS_KEY_apostrophe, 0x201A, 
-IBUS_KEY_comma, IBUS_KEY_comma, 0x00B8, 
-IBUS_KEY_comma, IBUS_KEY_minus, 0x00AC, 
-IBUS_KEY_comma, IBUS_KEY_A, 0x0104, 
-IBUS_KEY_comma, IBUS_KEY_C, 0x00C7, 
-IBUS_KEY_comma, IBUS_KEY_D, 0x1E10, 
-IBUS_KEY_comma, IBUS_KEY_E, 0x0118, 
-IBUS_KEY_comma, IBUS_KEY_G, 0x0122, 
-IBUS_KEY_comma, IBUS_KEY_H, 0x1E28, 
-IBUS_KEY_comma, IBUS_KEY_I, 0x012E, 
-IBUS_KEY_comma, IBUS_KEY_K, 0x0136, 
-IBUS_KEY_comma, IBUS_KEY_L, 0x013B, 
-IBUS_KEY_comma, IBUS_KEY_N, 0x0145, 
-IBUS_KEY_comma, IBUS_KEY_O, 0x01EA, 
-IBUS_KEY_comma, IBUS_KEY_R, 0x0156, 
-IBUS_KEY_comma, IBUS_KEY_S, 0x015E, 
-IBUS_KEY_comma, IBUS_KEY_T, 0x0162, 
-IBUS_KEY_comma, IBUS_KEY_U, 0x0172, 
-IBUS_KEY_comma, IBUS_KEY_a, 0x0105, 
-IBUS_KEY_comma, IBUS_KEY_c, 0x00E7, 
-IBUS_KEY_comma, IBUS_KEY_d, 0x1E11, 
-IBUS_KEY_comma, IBUS_KEY_e, 0x0119, 
-IBUS_KEY_comma, IBUS_KEY_g, 0x0123, 
-IBUS_KEY_comma, IBUS_KEY_h, 0x1E29, 
-IBUS_KEY_comma, IBUS_KEY_i, 0x012F, 
-IBUS_KEY_comma, IBUS_KEY_k, 0x0137, 
-IBUS_KEY_comma, IBUS_KEY_l, 0x013C, 
-IBUS_KEY_comma, IBUS_KEY_n, 0x0146, 
-IBUS_KEY_comma, IBUS_KEY_o, 0x01EB, 
-IBUS_KEY_comma, IBUS_KEY_r, 0x0157, 
-IBUS_KEY_comma, IBUS_KEY_s, 0x015F, 
-IBUS_KEY_comma, IBUS_KEY_t, 0x0163, 
-IBUS_KEY_comma, IBUS_KEY_u, 0x0173, 
-IBUS_KEY_minus, IBUS_KEY_space, 0x007E, 
-IBUS_KEY_minus, IBUS_KEY_parenleft, 0x007B, 
-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, 0x0100, 
-IBUS_KEY_minus, IBUS_KEY_D, 0x0110, 
-IBUS_KEY_minus, IBUS_KEY_E, 0x0112, 
-IBUS_KEY_minus, IBUS_KEY_I, 0x012A, 
-IBUS_KEY_minus, IBUS_KEY_L, 0x00A3, 
-IBUS_KEY_minus, IBUS_KEY_O, 0x014C, 
-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, 
-IBUS_KEY_minus, IBUS_KEY_e, 0x0113, 
-IBUS_KEY_minus, IBUS_KEY_i, 0x012B, 
-IBUS_KEY_minus, IBUS_KEY_l, 0x00A3, 
-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, 
-IBUS_KEY_period, IBUS_KEY_A, 0x0226, 
-IBUS_KEY_period, IBUS_KEY_B, 0x1E02, 
-IBUS_KEY_period, IBUS_KEY_C, 0x010A, 
-IBUS_KEY_period, IBUS_KEY_D, 0x1E0A, 
-IBUS_KEY_period, IBUS_KEY_E, 0x0116, 
-IBUS_KEY_period, IBUS_KEY_F, 0x1E1E, 
-IBUS_KEY_period, IBUS_KEY_G, 0x0120, 
-IBUS_KEY_period, IBUS_KEY_H, 0x1E22, 
-IBUS_KEY_period, IBUS_KEY_I, 0x0130, 
-IBUS_KEY_period, IBUS_KEY_M, 0x1E40, 
-IBUS_KEY_period, IBUS_KEY_N, 0x1E44, 
-IBUS_KEY_period, IBUS_KEY_O, 0x022E, 
-IBUS_KEY_period, IBUS_KEY_P, 0x1E56, 
-IBUS_KEY_period, IBUS_KEY_R, 0x1E58, 
-IBUS_KEY_period, IBUS_KEY_S, 0x1E60, 
-IBUS_KEY_period, IBUS_KEY_T, 0x1E6A, 
-IBUS_KEY_period, IBUS_KEY_W, 0x1E86, 
-IBUS_KEY_period, IBUS_KEY_X, 0x1E8A, 
-IBUS_KEY_period, IBUS_KEY_Y, 0x1E8E, 
-IBUS_KEY_period, IBUS_KEY_Z, 0x017B, 
-IBUS_KEY_period, IBUS_KEY_asciicircum, 0x00B7, 
-IBUS_KEY_period, IBUS_KEY_a, 0x0227, 
-IBUS_KEY_period, IBUS_KEY_b, 0x1E03, 
-IBUS_KEY_period, IBUS_KEY_c, 0x010B, 
-IBUS_KEY_period, IBUS_KEY_d, 0x1E0B, 
-IBUS_KEY_period, IBUS_KEY_e, 0x0117, 
-IBUS_KEY_period, IBUS_KEY_f, 0x1E1F, 
-IBUS_KEY_period, IBUS_KEY_g, 0x0121, 
-IBUS_KEY_period, IBUS_KEY_h, 0x1E23, 
-IBUS_KEY_period, IBUS_KEY_i, 0x0131, 
-IBUS_KEY_period, IBUS_KEY_m, 0x1E41, 
-IBUS_KEY_period, IBUS_KEY_n, 0x1E45, 
-IBUS_KEY_period, IBUS_KEY_o, 0x022F, 
-IBUS_KEY_period, IBUS_KEY_p, 0x1E57, 
-IBUS_KEY_period, IBUS_KEY_r, 0x1E59, 
-IBUS_KEY_period, IBUS_KEY_s, 0x1E61, 
-IBUS_KEY_period, IBUS_KEY_t, 0x1E6B, 
-IBUS_KEY_period, IBUS_KEY_w, 0x1E87, 
-IBUS_KEY_period, IBUS_KEY_x, 0x1E8B, 
-IBUS_KEY_period, IBUS_KEY_y, 0x1E8F, 
-IBUS_KEY_period, IBUS_KEY_z, 0x017C, 
-IBUS_KEY_period, 0x017F, 0x1E9B, 
-IBUS_KEY_period, IBUS_KEY_Sacute, 0x1E64, 
-IBUS_KEY_period, IBUS_KEY_Scaron, 0x1E66, 
-IBUS_KEY_period, IBUS_KEY_sacute, 0x1E65, 
-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, 
-IBUS_KEY_slash, IBUS_KEY_C, 0x20A1, 
-IBUS_KEY_slash, IBUS_KEY_D, 0x0110, 
-IBUS_KEY_slash, IBUS_KEY_G, 0x01E4, 
-IBUS_KEY_slash, IBUS_KEY_H, 0x0126, 
-IBUS_KEY_slash, IBUS_KEY_I, 0x0197, 
-IBUS_KEY_slash, IBUS_KEY_L, 0x0141, 
-IBUS_KEY_slash, IBUS_KEY_O, 0x00D8, 
-IBUS_KEY_slash, IBUS_KEY_T, 0x0166, 
-IBUS_KEY_slash, IBUS_KEY_Z, 0x01B5, 
-IBUS_KEY_slash, IBUS_KEY_asciicircum, 0x007C, 
-IBUS_KEY_slash, IBUS_KEY_b, 0x0180, 
-IBUS_KEY_slash, IBUS_KEY_c, 0x00A2, 
-IBUS_KEY_slash, IBUS_KEY_d, 0x0111, 
-IBUS_KEY_slash, IBUS_KEY_g, 0x01E5, 
-IBUS_KEY_slash, IBUS_KEY_h, 0x0127, 
-IBUS_KEY_slash, IBUS_KEY_i, 0x0268, 
-IBUS_KEY_slash, IBUS_KEY_l, 0x0142, 
-IBUS_KEY_slash, IBUS_KEY_m, 0x20A5, 
-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, 
-IBUS_KEY_slash, 0x04AF, 0x04B1, 
-IBUS_KEY_slash, IBUS_KEY_Cyrillic_ghe, 0x0493, 
-IBUS_KEY_slash, IBUS_KEY_Cyrillic_ka, 0x049F, 
-IBUS_KEY_slash, IBUS_KEY_Cyrillic_GHE, 0x0492, 
-IBUS_KEY_slash, IBUS_KEY_Cyrillic_KA, 0x049E, 
-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_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_asciicircum, 0x00B9, 
-IBUS_KEY_2, IBUS_KEY_3, 0x2154, 
-IBUS_KEY_2, IBUS_KEY_5, 0x2156, 
-IBUS_KEY_2, IBUS_KEY_asciicircum, 0x00B2, 
-IBUS_KEY_3, IBUS_KEY_4, 0x00BE, 
-IBUS_KEY_3, IBUS_KEY_5, 0x2157, 
-IBUS_KEY_3, IBUS_KEY_8, 0x215C, 
-IBUS_KEY_3, IBUS_KEY_asciicircum, 0x00B3, 
-IBUS_KEY_4, IBUS_KEY_5, 0x2158, 
-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_S, 0x0218, 
-IBUS_KEY_semicolon, IBUS_KEY_T, 0x021A, 
-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, 
-IBUS_KEY_semicolon, IBUS_KEY_o, 0x01EB, 
-IBUS_KEY_semicolon, IBUS_KEY_s, 0x0219, 
-IBUS_KEY_semicolon, IBUS_KEY_t, 0x021B, 
-IBUS_KEY_semicolon, IBUS_KEY_u, 0x0173, 
-IBUS_KEY_less, IBUS_KEY_space, 0x02C7, 
-IBUS_KEY_less, IBUS_KEY_quotedbl, 0x201C, 
-IBUS_KEY_less, IBUS_KEY_apostrophe, 0x2018, 
-IBUS_KEY_less, IBUS_KEY_minus, 0x2190, 
-IBUS_KEY_less, IBUS_KEY_slash, 0x005C, 
-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, 
-IBUS_KEY_less, IBUS_KEY_L, 0x013D, 
-IBUS_KEY_less, IBUS_KEY_N, 0x0147, 
-IBUS_KEY_less, IBUS_KEY_R, 0x0158, 
-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, 
-IBUS_KEY_less, IBUS_KEY_l, 0x013E, 
-IBUS_KEY_less, IBUS_KEY_n, 0x0148, 
-IBUS_KEY_less, IBUS_KEY_r, 0x0159, 
-IBUS_KEY_less, IBUS_KEY_s, 0x0161, 
-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_greater, 0x21D2, 
-IBUS_KEY_equal, IBUS_KEY_C, 0x20AC, 
-IBUS_KEY_equal, IBUS_KEY_E, 0x20AC, 
-IBUS_KEY_equal, IBUS_KEY_L, 0x20A4, 
-IBUS_KEY_equal, IBUS_KEY_N, 0x20A6, 
-IBUS_KEY_equal, IBUS_KEY_O, 0x0150, 
-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_o, 0x0151, 
-IBUS_KEY_equal, IBUS_KEY_u, 0x0171, 
-IBUS_KEY_equal, IBUS_KEY_y, 0x00A5, 
-IBUS_KEY_equal, 0x0338, 0x2260, 
-IBUS_KEY_equal, IBUS_KEY_Cyrillic_u, 0x04F3, 
-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, 
-IBUS_KEY_greater, IBUS_KEY_E, 0x00CA, 
-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, 
-IBUS_KEY_question, IBUS_KEY_E, 0x1EBA, 
-IBUS_KEY_question, IBUS_KEY_I, 0x1EC8, 
-IBUS_KEY_question, IBUS_KEY_O, 0x1ECE, 
-IBUS_KEY_question, IBUS_KEY_U, 0x1EE6, 
-IBUS_KEY_question, IBUS_KEY_Y, 0x1EF6, 
-IBUS_KEY_question, IBUS_KEY_a, 0x1EA3, 
-IBUS_KEY_question, IBUS_KEY_e, 0x1EBB, 
-IBUS_KEY_question, IBUS_KEY_i, 0x1EC9, 
-IBUS_KEY_question, IBUS_KEY_o, 0x1ECF, 
-IBUS_KEY_question, IBUS_KEY_u, 0x1EE7, 
-IBUS_KEY_question, IBUS_KEY_y, 0x1EF7, 
-IBUS_KEY_question, IBUS_KEY_Acircumflex, 0x1EA8, 
-IBUS_KEY_question, IBUS_KEY_Ecircumflex, 0x1EC2, 
-IBUS_KEY_question, IBUS_KEY_Ocircumflex, 0x1ED4, 
-IBUS_KEY_question, IBUS_KEY_acircumflex, 0x1EA9, 
-IBUS_KEY_question, IBUS_KEY_ecircumflex, 0x1EC3, 
-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, 
-IBUS_KEY_A, IBUS_KEY_asterisk, 0x00C5, 
-IBUS_KEY_A, IBUS_KEY_comma, 0x0104, 
-IBUS_KEY_A, IBUS_KEY_minus, 0x0100, 
-IBUS_KEY_A, IBUS_KEY_semicolon, 0x0104, 
-IBUS_KEY_A, IBUS_KEY_greater, 0x00C2, 
-IBUS_KEY_A, IBUS_KEY_A, 0x00C5, 
-IBUS_KEY_A, IBUS_KEY_E, 0x00C6, 
-IBUS_KEY_A, IBUS_KEY_T, 0x0040, 
-IBUS_KEY_A, IBUS_KEY_asciicircum, 0x00C2, 
-IBUS_KEY_A, IBUS_KEY_underscore, 0x0100, 
-IBUS_KEY_A, IBUS_KEY_grave, 0x00C0, 
-IBUS_KEY_A, IBUS_KEY_asciitilde, 0x00C3, 
-IBUS_KEY_A, IBUS_KEY_diaeresis, 0x00C4, 
-IBUS_KEY_A, IBUS_KEY_acute, 0x00C1, 
-IBUS_KEY_B, IBUS_KEY_period, 0x1E02, 
-IBUS_KEY_C, IBUS_KEY_apostrophe, 0x0106, 
-IBUS_KEY_C, IBUS_KEY_comma, 0x00C7, 
-IBUS_KEY_C, IBUS_KEY_period, 0x010A, 
-IBUS_KEY_C, IBUS_KEY_slash, 0x20A1, 
-IBUS_KEY_C, IBUS_KEY_less, 0x010C, 
-IBUS_KEY_C, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_C, IBUS_KEY_E, 0x20A0, 
-IBUS_KEY_C, IBUS_KEY_O, 0x00A9, 
-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, 
-IBUS_KEY_D, IBUS_KEY_H, 0x00D0, 
-IBUS_KEY_E, IBUS_KEY_quotedbl, 0x00CB, 
-IBUS_KEY_E, IBUS_KEY_apostrophe, 0x00C9, 
-IBUS_KEY_E, IBUS_KEY_comma, 0x0118, 
-IBUS_KEY_E, IBUS_KEY_minus, 0x0112, 
-IBUS_KEY_E, IBUS_KEY_period, 0x0116, 
-IBUS_KEY_E, IBUS_KEY_semicolon, 0x0118, 
-IBUS_KEY_E, IBUS_KEY_less, 0x011A, 
-IBUS_KEY_E, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_E, IBUS_KEY_greater, 0x00CA, 
-IBUS_KEY_E, IBUS_KEY_asciicircum, 0x00CA, 
-IBUS_KEY_E, IBUS_KEY_underscore, 0x0112, 
-IBUS_KEY_E, IBUS_KEY_grave, 0x00C8, 
-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_semicolon, 0x012E, 
-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, 
-IBUS_KEY_K, IBUS_KEY_comma, 0x0136, 
-IBUS_KEY_L, IBUS_KEY_apostrophe, 0x0139, 
-IBUS_KEY_L, IBUS_KEY_comma, 0x013B, 
-IBUS_KEY_L, IBUS_KEY_minus, 0x00A3, 
-IBUS_KEY_L, IBUS_KEY_slash, 0x0141, 
-IBUS_KEY_L, IBUS_KEY_less, 0x013D, 
-IBUS_KEY_L, IBUS_KEY_equal, 0x20A4, 
-IBUS_KEY_L, IBUS_KEY_V, 0x007C, 
-IBUS_KEY_M, IBUS_KEY_period, 0x1E40, 
-IBUS_KEY_N, IBUS_KEY_apostrophe, 0x0143, 
-IBUS_KEY_N, IBUS_KEY_comma, 0x0145, 
-IBUS_KEY_N, IBUS_KEY_less, 0x0147, 
-IBUS_KEY_N, IBUS_KEY_equal, 0x20A6, 
-IBUS_KEY_N, IBUS_KEY_G, 0x014A, 
-IBUS_KEY_N, IBUS_KEY_O, 0x2116, 
-IBUS_KEY_N, IBUS_KEY_o, 0x2116, 
-IBUS_KEY_N, IBUS_KEY_asciitilde, 0x00D1, 
-IBUS_KEY_O, IBUS_KEY_quotedbl, 0x00D6, 
-IBUS_KEY_O, IBUS_KEY_apostrophe, 0x00D3, 
-IBUS_KEY_O, IBUS_KEY_comma, 0x01EA, 
-IBUS_KEY_O, IBUS_KEY_minus, 0x014C, 
-IBUS_KEY_O, IBUS_KEY_slash, 0x00D8, 
-IBUS_KEY_O, IBUS_KEY_semicolon, 0x01EA, 
-IBUS_KEY_O, IBUS_KEY_greater, 0x00D4, 
-IBUS_KEY_O, IBUS_KEY_A, 0x24B6, 
-IBUS_KEY_O, IBUS_KEY_C, 0x00A9, 
-IBUS_KEY_O, IBUS_KEY_E, 0x0152, 
-IBUS_KEY_O, IBUS_KEY_R, 0x00AE, 
-IBUS_KEY_O, IBUS_KEY_S, 0x00A7, 
-IBUS_KEY_O, IBUS_KEY_X, 0x00A4, 
-IBUS_KEY_O, IBUS_KEY_asciicircum, 0x00D4, 
-IBUS_KEY_O, IBUS_KEY_underscore, 0x014C, 
-IBUS_KEY_O, IBUS_KEY_grave, 0x00D2, 
-IBUS_KEY_O, IBUS_KEY_c, 0x00A9, 
-IBUS_KEY_O, IBUS_KEY_r, 0x00AE, 
-IBUS_KEY_O, IBUS_KEY_x, 0x00A4, 
-IBUS_KEY_O, IBUS_KEY_asciitilde, 0x00D5, 
-IBUS_KEY_O, IBUS_KEY_diaeresis, 0x00D6, 
-IBUS_KEY_O, IBUS_KEY_acute, 0x00D3, 
-IBUS_KEY_P, IBUS_KEY_exclam, 0x00B6, 
-IBUS_KEY_P, IBUS_KEY_period, 0x1E56, 
-IBUS_KEY_P, IBUS_KEY_P, 0x00B6, 
-IBUS_KEY_P, IBUS_KEY_t, 0x20A7, 
-IBUS_KEY_R, IBUS_KEY_apostrophe, 0x0154, 
-IBUS_KEY_R, IBUS_KEY_comma, 0x0156, 
-IBUS_KEY_R, IBUS_KEY_less, 0x0158, 
-IBUS_KEY_R, IBUS_KEY_O, 0x00AE, 
-IBUS_KEY_R, IBUS_KEY_s, 0x20A8, 
-IBUS_KEY_S, IBUS_KEY_exclam, 0x00A7, 
-IBUS_KEY_S, IBUS_KEY_apostrophe, 0x015A, 
-IBUS_KEY_S, IBUS_KEY_comma, 0x015E, 
-IBUS_KEY_S, IBUS_KEY_period, 0x1E60, 
-IBUS_KEY_S, IBUS_KEY_semicolon, 0x0218, 
-IBUS_KEY_S, IBUS_KEY_less, 0x0160, 
-IBUS_KEY_S, IBUS_KEY_M, 0x2120, 
-IBUS_KEY_S, IBUS_KEY_O, 0x00A7, 
-IBUS_KEY_S, IBUS_KEY_S, 0x1E9E, 
-IBUS_KEY_S, IBUS_KEY_m, 0x2120, 
-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, 
-IBUS_KEY_T, IBUS_KEY_semicolon, 0x021A, 
-IBUS_KEY_T, IBUS_KEY_less, 0x0164, 
-IBUS_KEY_T, IBUS_KEY_H, 0x00DE, 
-IBUS_KEY_T, IBUS_KEY_M, 0x2122, 
-IBUS_KEY_T, IBUS_KEY_m, 0x2122, 
-IBUS_KEY_U, IBUS_KEY_quotedbl, 0x00DC, 
-IBUS_KEY_U, IBUS_KEY_apostrophe, 0x00DA, 
-IBUS_KEY_U, IBUS_KEY_asterisk, 0x016E, 
-IBUS_KEY_U, IBUS_KEY_comma, 0x0172, 
-IBUS_KEY_U, IBUS_KEY_minus, 0x016A, 
-IBUS_KEY_U, IBUS_KEY_semicolon, 0x0172, 
-IBUS_KEY_U, IBUS_KEY_greater, 0x00DB, 
-IBUS_KEY_U, IBUS_KEY_A, 0x0102, 
-IBUS_KEY_U, IBUS_KEY_E, 0x0114, 
-IBUS_KEY_U, IBUS_KEY_G, 0x011E, 
-IBUS_KEY_U, IBUS_KEY_I, 0x012C, 
-IBUS_KEY_U, IBUS_KEY_O, 0x014E, 
-IBUS_KEY_U, IBUS_KEY_U, 0x016C, 
-IBUS_KEY_U, IBUS_KEY_asciicircum, 0x00DB, 
-IBUS_KEY_U, IBUS_KEY_underscore, 0x016A, 
-IBUS_KEY_U, IBUS_KEY_grave, 0x00D9, 
-IBUS_KEY_U, IBUS_KEY_a, 0x0103, 
-IBUS_KEY_U, IBUS_KEY_e, 0x0115, 
-IBUS_KEY_U, IBUS_KEY_g, 0x011F, 
-IBUS_KEY_U, IBUS_KEY_i, 0x012D, 
-IBUS_KEY_U, IBUS_KEY_o, 0x014F, 
-IBUS_KEY_U, IBUS_KEY_u, 0x016D, 
-IBUS_KEY_U, IBUS_KEY_asciitilde, 0x0168, 
-IBUS_KEY_U, IBUS_KEY_diaeresis, 0x00DC, 
-IBUS_KEY_U, IBUS_KEY_acute, 0x00DA, 
-IBUS_KEY_U, 0x0228, 0x1E1C, 
-IBUS_KEY_U, 0x0229, 0x1E1D, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_a, 0x04D1, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_ie, 0x04D7, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_i, 0x0439, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_u, 0x045E, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_zhe, 0x04C2, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_A, 0x04D0, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_IE, 0x04D6, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_I, 0x0419, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_U, 0x040E, 
-IBUS_KEY_U, IBUS_KEY_Cyrillic_ZHE, 0x04C1, 
-IBUS_KEY_U, IBUS_KEY_Greek_ALPHA, 0x1FB8, 
-IBUS_KEY_U, IBUS_KEY_Greek_IOTA, 0x1FD8, 
-IBUS_KEY_U, IBUS_KEY_Greek_UPSILON, 0x1FE8, 
-IBUS_KEY_U, IBUS_KEY_Greek_alpha, 0x1FB0, 
-IBUS_KEY_U, IBUS_KEY_Greek_iota, 0x1FD0, 
-IBUS_KEY_U, IBUS_KEY_Greek_upsilon, 0x1FE0, 
-IBUS_KEY_U, 0x1EA0, 0x1EB6, 
-IBUS_KEY_U, 0x1EA1, 0x1EB7, 
-IBUS_KEY_V, IBUS_KEY_L, 0x007C, 
-IBUS_KEY_W, IBUS_KEY_equal, 0x20A9, 
-IBUS_KEY_W, IBUS_KEY_asciicircum, 0x0174, 
-IBUS_KEY_X, IBUS_KEY_O, 0x00A4, 
-IBUS_KEY_X, IBUS_KEY_o, 0x00A4, 
-IBUS_KEY_Y, IBUS_KEY_quotedbl, 0x0178, 
-IBUS_KEY_Y, IBUS_KEY_apostrophe, 0x00DD, 
-IBUS_KEY_Y, IBUS_KEY_minus, 0x00A5, 
-IBUS_KEY_Y, IBUS_KEY_equal, 0x00A5, 
-IBUS_KEY_Y, IBUS_KEY_asciicircum, 0x0176, 
-IBUS_KEY_Y, IBUS_KEY_diaeresis, 0x0178, 
-IBUS_KEY_Y, IBUS_KEY_acute, 0x00DD, 
-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, 
-IBUS_KEY_asciicircum, IBUS_KEY_plus, 0x207A, 
-IBUS_KEY_asciicircum, IBUS_KEY_minus, 0x00AF, 
-IBUS_KEY_asciicircum, IBUS_KEY_period, 0x00B7, 
-IBUS_KEY_asciicircum, IBUS_KEY_slash, 0x007C, 
-IBUS_KEY_asciicircum, IBUS_KEY_0, 0x2070, 
-IBUS_KEY_asciicircum, IBUS_KEY_1, 0x00B9, 
-IBUS_KEY_asciicircum, IBUS_KEY_2, 0x00B2, 
-IBUS_KEY_asciicircum, IBUS_KEY_3, 0x00B3, 
-IBUS_KEY_asciicircum, IBUS_KEY_4, 0x2074, 
-IBUS_KEY_asciicircum, IBUS_KEY_5, 0x2075, 
-IBUS_KEY_asciicircum, IBUS_KEY_6, 0x2076, 
-IBUS_KEY_asciicircum, IBUS_KEY_7, 0x2077, 
-IBUS_KEY_asciicircum, IBUS_KEY_8, 0x2078, 
-IBUS_KEY_asciicircum, IBUS_KEY_9, 0x2079, 
-IBUS_KEY_asciicircum, IBUS_KEY_equal, 0x207C, 
-IBUS_KEY_asciicircum, IBUS_KEY_A, 0x00C2, 
-IBUS_KEY_asciicircum, IBUS_KEY_C, 0x0108, 
-IBUS_KEY_asciicircum, IBUS_KEY_E, 0x00CA, 
-IBUS_KEY_asciicircum, IBUS_KEY_G, 0x011C, 
-IBUS_KEY_asciicircum, IBUS_KEY_H, 0x0124, 
-IBUS_KEY_asciicircum, IBUS_KEY_I, 0x00CE, 
-IBUS_KEY_asciicircum, IBUS_KEY_J, 0x0134, 
-IBUS_KEY_asciicircum, IBUS_KEY_O, 0x00D4, 
-IBUS_KEY_asciicircum, IBUS_KEY_S, 0x015C, 
-IBUS_KEY_asciicircum, IBUS_KEY_U, 0x00DB, 
-IBUS_KEY_asciicircum, IBUS_KEY_W, 0x0174, 
-IBUS_KEY_asciicircum, IBUS_KEY_Y, 0x0176, 
-IBUS_KEY_asciicircum, IBUS_KEY_Z, 0x1E90, 
-IBUS_KEY_asciicircum, IBUS_KEY_a, 0x00E2, 
-IBUS_KEY_asciicircum, IBUS_KEY_c, 0x0109, 
-IBUS_KEY_asciicircum, IBUS_KEY_e, 0x00EA, 
-IBUS_KEY_asciicircum, IBUS_KEY_g, 0x011D, 
-IBUS_KEY_asciicircum, IBUS_KEY_h, 0x0125, 
-IBUS_KEY_asciicircum, IBUS_KEY_i, 0x00EE, 
-IBUS_KEY_asciicircum, IBUS_KEY_j, 0x0135, 
-IBUS_KEY_asciicircum, IBUS_KEY_o, 0x00F4, 
-IBUS_KEY_asciicircum, IBUS_KEY_s, 0x015D, 
-IBUS_KEY_asciicircum, IBUS_KEY_u, 0x00FB, 
-IBUS_KEY_asciicircum, IBUS_KEY_w, 0x0175, 
-IBUS_KEY_asciicircum, IBUS_KEY_y, 0x0177, 
-IBUS_KEY_asciicircum, IBUS_KEY_z, 0x1E91, 
-IBUS_KEY_asciicircum, 0x1EA0, 0x1EAC, 
-IBUS_KEY_asciicircum, 0x1EA1, 0x1EAD, 
-IBUS_KEY_asciicircum, 0x1EB8, 0x1EC6, 
-IBUS_KEY_asciicircum, 0x1EB9, 0x1EC7, 
-IBUS_KEY_asciicircum, 0x1ECC, 0x1ED8, 
-IBUS_KEY_asciicircum, 0x1ECD, 0x1ED9, 
-IBUS_KEY_asciicircum, 0x2212, 0x207B, 
-IBUS_KEY_asciicircum, 0x4E00, 0x3192, 
-IBUS_KEY_asciicircum, 0x4E01, 0x319C, 
-IBUS_KEY_asciicircum, 0x4E09, 0x3194, 
-IBUS_KEY_asciicircum, 0x4E0A, 0x3196, 
-IBUS_KEY_asciicircum, 0x4E0B, 0x3198, 
-IBUS_KEY_asciicircum, 0x4E19, 0x319B, 
-IBUS_KEY_asciicircum, 0x4E2D, 0x3197, 
-IBUS_KEY_asciicircum, 0x4E59, 0x319A, 
-IBUS_KEY_asciicircum, 0x4E8C, 0x3193, 
-IBUS_KEY_asciicircum, 0x4EBA, 0x319F, 
-IBUS_KEY_asciicircum, 0x56DB, 0x3195, 
-IBUS_KEY_asciicircum, 0x5730, 0x319E, 
-IBUS_KEY_asciicircum, 0x5929, 0x319D, 
-IBUS_KEY_asciicircum, 0x7532, 0x3199, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_Space, 0x00B2, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_Add, 0x207A, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_0, 0x2070, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_1, 0x00B9, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_2, 0x00B2, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_3, 0x00B3, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_4, 0x2074, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_5, 0x2075, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_6, 0x2076, 
-IBUS_KEY_asciicircum, IBUS_KEY_KP_7, 0x2077, 
-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, 
-IBUS_KEY_underscore, IBUS_KEY_0, 0x2080, 
-IBUS_KEY_underscore, IBUS_KEY_1, 0x2081, 
-IBUS_KEY_underscore, IBUS_KEY_2, 0x2082, 
-IBUS_KEY_underscore, IBUS_KEY_3, 0x2083, 
-IBUS_KEY_underscore, IBUS_KEY_4, 0x2084, 
-IBUS_KEY_underscore, IBUS_KEY_5, 0x2085, 
-IBUS_KEY_underscore, IBUS_KEY_6, 0x2086, 
-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, 
-IBUS_KEY_underscore, IBUS_KEY_I, 0x012A, 
-IBUS_KEY_underscore, IBUS_KEY_O, 0x014C, 
-IBUS_KEY_underscore, IBUS_KEY_U, 0x016A, 
-IBUS_KEY_underscore, IBUS_KEY_Y, 0x0232, 
-IBUS_KEY_underscore, IBUS_KEY_asciicircum, 0x00AF, 
-IBUS_KEY_underscore, IBUS_KEY_underscore, 0x00AF, 
-IBUS_KEY_underscore, IBUS_KEY_a, 0x0101, 
-IBUS_KEY_underscore, IBUS_KEY_e, 0x0113, 
-IBUS_KEY_underscore, IBUS_KEY_g, 0x1E21, 
-IBUS_KEY_underscore, IBUS_KEY_i, 0x012B, 
-IBUS_KEY_underscore, IBUS_KEY_o, 0x014D, 
-IBUS_KEY_underscore, IBUS_KEY_u, 0x016B, 
-IBUS_KEY_underscore, IBUS_KEY_y, 0x0233, 
-IBUS_KEY_underscore, IBUS_KEY_Adiaeresis, 0x01DE, 
-IBUS_KEY_underscore, IBUS_KEY_AE, 0x01E2, 
-IBUS_KEY_underscore, IBUS_KEY_Otilde, 0x022C, 
-IBUS_KEY_underscore, IBUS_KEY_Odiaeresis, 0x022A, 
-IBUS_KEY_underscore, IBUS_KEY_Udiaeresis, 0x01D5, 
-IBUS_KEY_underscore, IBUS_KEY_adiaeresis, 0x01DF, 
-IBUS_KEY_underscore, IBUS_KEY_ae, 0x01E3, 
-IBUS_KEY_underscore, IBUS_KEY_otilde, 0x022D, 
-IBUS_KEY_underscore, IBUS_KEY_odiaeresis, 0x022B, 
-IBUS_KEY_underscore, IBUS_KEY_udiaeresis, 0x01D6, 
-IBUS_KEY_underscore, 0x01EA, 0x01EC, 
-IBUS_KEY_underscore, 0x01EB, 0x01ED, 
-IBUS_KEY_underscore, 0x0226, 0x01E0, 
-IBUS_KEY_underscore, 0x0227, 0x01E1, 
-IBUS_KEY_underscore, 0x022E, 0x0230, 
-IBUS_KEY_underscore, 0x022F, 0x0231, 
-IBUS_KEY_underscore, IBUS_KEY_Cyrillic_i, 0x04E3, 
-IBUS_KEY_underscore, IBUS_KEY_Cyrillic_u, 0x04EF, 
-IBUS_KEY_underscore, IBUS_KEY_Cyrillic_I, 0x04E2, 
-IBUS_KEY_underscore, IBUS_KEY_Cyrillic_U, 0x04EE, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_ALPHA, 0x1FB9, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_IOTA, 0x1FD9, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_UPSILON, 0x1FE9, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_alpha, 0x1FB1, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_iota, 0x1FD1, 
-IBUS_KEY_underscore, IBUS_KEY_Greek_upsilon, 0x1FE1, 
-IBUS_KEY_underscore, 0x1E36, 0x1E38, 
-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, 
-IBUS_KEY_underscore, IBUS_KEY_KP_1, 0x2081, 
-IBUS_KEY_underscore, IBUS_KEY_KP_2, 0x2082, 
-IBUS_KEY_underscore, IBUS_KEY_KP_3, 0x2083, 
-IBUS_KEY_underscore, IBUS_KEY_KP_4, 0x2084, 
-IBUS_KEY_underscore, IBUS_KEY_KP_5, 0x2085, 
-IBUS_KEY_underscore, IBUS_KEY_KP_6, 0x2086, 
-IBUS_KEY_underscore, IBUS_KEY_KP_7, 0x2087, 
-IBUS_KEY_underscore, IBUS_KEY_KP_8, 0x2088, 
-IBUS_KEY_underscore, IBUS_KEY_KP_9, 0x2089, 
-IBUS_KEY_underscore, IBUS_KEY_KP_Equal, 0x208C, 
-IBUS_KEY_grave, IBUS_KEY_space, 0x0060, 
-IBUS_KEY_grave, IBUS_KEY_A, 0x00C0, 
-IBUS_KEY_grave, IBUS_KEY_E, 0x00C8, 
-IBUS_KEY_grave, IBUS_KEY_I, 0x00CC, 
-IBUS_KEY_grave, IBUS_KEY_N, 0x01F8, 
-IBUS_KEY_grave, IBUS_KEY_O, 0x00D2, 
-IBUS_KEY_grave, IBUS_KEY_U, 0x00D9, 
-IBUS_KEY_grave, IBUS_KEY_W, 0x1E80, 
-IBUS_KEY_grave, IBUS_KEY_Y, 0x1EF2, 
-IBUS_KEY_grave, IBUS_KEY_a, 0x00E0, 
-IBUS_KEY_grave, IBUS_KEY_e, 0x00E8, 
-IBUS_KEY_grave, IBUS_KEY_i, 0x00EC, 
-IBUS_KEY_grave, IBUS_KEY_n, 0x01F9, 
-IBUS_KEY_grave, IBUS_KEY_o, 0x00F2, 
-IBUS_KEY_grave, IBUS_KEY_u, 0x00F9, 
-IBUS_KEY_grave, IBUS_KEY_w, 0x1E81, 
-IBUS_KEY_grave, IBUS_KEY_y, 0x1EF3, 
-IBUS_KEY_grave, IBUS_KEY_Acircumflex, 0x1EA6, 
-IBUS_KEY_grave, IBUS_KEY_Ecircumflex, 0x1EC0, 
-IBUS_KEY_grave, IBUS_KEY_Ocircumflex, 0x1ED2, 
-IBUS_KEY_grave, IBUS_KEY_Udiaeresis, 0x01DB, 
-IBUS_KEY_grave, IBUS_KEY_acircumflex, 0x1EA7, 
-IBUS_KEY_grave, IBUS_KEY_ecircumflex, 0x1EC1, 
-IBUS_KEY_grave, IBUS_KEY_ocircumflex, 0x1ED3, 
-IBUS_KEY_grave, IBUS_KEY_udiaeresis, 0x01DC, 
-IBUS_KEY_grave, IBUS_KEY_Abreve, 0x1EB0, 
-IBUS_KEY_grave, IBUS_KEY_abreve, 0x1EB1, 
-IBUS_KEY_grave, IBUS_KEY_Emacron, 0x1E14, 
-IBUS_KEY_grave, IBUS_KEY_emacron, 0x1E15, 
-IBUS_KEY_grave, IBUS_KEY_Omacron, 0x1E50, 
-IBUS_KEY_grave, IBUS_KEY_omacron, 0x1E51, 
-IBUS_KEY_grave, IBUS_KEY_Cyrillic_ie, 0x0450, 
-IBUS_KEY_grave, IBUS_KEY_Cyrillic_i, 0x045D, 
-IBUS_KEY_grave, IBUS_KEY_Cyrillic_IE, 0x0400, 
-IBUS_KEY_grave, IBUS_KEY_Cyrillic_I, 0x040D, 
-IBUS_KEY_grave, IBUS_KEY_Greek_iotadieresis, 0x1FD2, 
-IBUS_KEY_grave, IBUS_KEY_Greek_upsilondieresis, 0x1FE2, 
-IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA, 0x1FBA, 
-IBUS_KEY_grave, IBUS_KEY_Greek_EPSILON, 0x1FC8, 
-IBUS_KEY_grave, IBUS_KEY_Greek_ETA, 0x1FCA, 
-IBUS_KEY_grave, IBUS_KEY_Greek_IOTA, 0x1FDA, 
-IBUS_KEY_grave, IBUS_KEY_Greek_OMICRON, 0x1FF8, 
-IBUS_KEY_grave, IBUS_KEY_Greek_UPSILON, 0x1FEA, 
-IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA, 0x1FFA, 
-IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0x1F70, 
-IBUS_KEY_grave, IBUS_KEY_Greek_epsilon, 0x1F72, 
-IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0x1F74, 
-IBUS_KEY_grave, IBUS_KEY_Greek_iota, 0x1F76, 
-IBUS_KEY_grave, IBUS_KEY_Greek_omicron, 0x1F78, 
-IBUS_KEY_grave, IBUS_KEY_Greek_upsilon, 0x1F7A, 
-IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0x1F7C, 
-IBUS_KEY_grave, 0x1F00, 0x1F02, 
-IBUS_KEY_grave, 0x1F01, 0x1F03, 
-IBUS_KEY_grave, 0x1F08, 0x1F0A, 
-IBUS_KEY_grave, 0x1F09, 0x1F0B, 
-IBUS_KEY_grave, 0x1F10, 0x1F12, 
-IBUS_KEY_grave, 0x1F11, 0x1F13, 
-IBUS_KEY_grave, 0x1F18, 0x1F1A, 
-IBUS_KEY_grave, 0x1F19, 0x1F1B, 
-IBUS_KEY_grave, 0x1F20, 0x1F22, 
-IBUS_KEY_grave, 0x1F21, 0x1F23, 
-IBUS_KEY_grave, 0x1F28, 0x1F2A, 
-IBUS_KEY_grave, 0x1F29, 0x1F2B, 
-IBUS_KEY_grave, 0x1F30, 0x1F32, 
-IBUS_KEY_grave, 0x1F31, 0x1F33, 
-IBUS_KEY_grave, 0x1F38, 0x1F3A, 
-IBUS_KEY_grave, 0x1F39, 0x1F3B, 
-IBUS_KEY_grave, 0x1F40, 0x1F42, 
-IBUS_KEY_grave, 0x1F41, 0x1F43, 
-IBUS_KEY_grave, 0x1F48, 0x1F4A, 
-IBUS_KEY_grave, 0x1F49, 0x1F4B, 
-IBUS_KEY_grave, 0x1F50, 0x1F52, 
-IBUS_KEY_grave, 0x1F51, 0x1F53, 
-IBUS_KEY_grave, 0x1F59, 0x1F5B, 
-IBUS_KEY_grave, 0x1F60, 0x1F62, 
-IBUS_KEY_grave, 0x1F61, 0x1F63, 
-IBUS_KEY_grave, 0x1F68, 0x1F6A, 
-IBUS_KEY_grave, 0x1F69, 0x1F6B, 
-IBUS_KEY_a, IBUS_KEY_quotedbl, 0x00E4, 
-IBUS_KEY_a, IBUS_KEY_apostrophe, 0x00E1, 
-IBUS_KEY_a, IBUS_KEY_parenleft, 0x0103, 
-IBUS_KEY_a, IBUS_KEY_asterisk, 0x00E5, 
-IBUS_KEY_a, IBUS_KEY_comma, 0x0105, 
-IBUS_KEY_a, IBUS_KEY_minus, 0x0101, 
-IBUS_KEY_a, IBUS_KEY_semicolon, 0x0105, 
-IBUS_KEY_a, IBUS_KEY_greater, 0x00E2, 
-IBUS_KEY_a, IBUS_KEY_asciicircum, 0x00E2, 
-IBUS_KEY_a, IBUS_KEY_underscore, 0x0101, 
-IBUS_KEY_a, IBUS_KEY_grave, 0x00E0, 
-IBUS_KEY_a, IBUS_KEY_a, 0x00E5, 
-IBUS_KEY_a, IBUS_KEY_e, 0x00E6, 
-IBUS_KEY_a, IBUS_KEY_asciitilde, 0x00E3, 
-IBUS_KEY_a, IBUS_KEY_diaeresis, 0x00E4, 
-IBUS_KEY_a, IBUS_KEY_acute, 0x00E1, 
-IBUS_KEY_b, IBUS_KEY_period, 0x1E03, 
-IBUS_KEY_b, IBUS_KEY_A, 0x0102, 
-IBUS_KEY_b, IBUS_KEY_E, 0x0114, 
-IBUS_KEY_b, IBUS_KEY_G, 0x011E, 
-IBUS_KEY_b, IBUS_KEY_I, 0x012C, 
-IBUS_KEY_b, IBUS_KEY_O, 0x014E, 
-IBUS_KEY_b, IBUS_KEY_U, 0x016C, 
-IBUS_KEY_b, IBUS_KEY_a, 0x0103, 
-IBUS_KEY_b, IBUS_KEY_e, 0x0115, 
-IBUS_KEY_b, IBUS_KEY_g, 0x011F, 
-IBUS_KEY_b, IBUS_KEY_i, 0x012D, 
-IBUS_KEY_b, IBUS_KEY_o, 0x014F, 
-IBUS_KEY_b, IBUS_KEY_u, 0x016D, 
-IBUS_KEY_b, 0x0228, 0x1E1C, 
-IBUS_KEY_b, 0x0229, 0x1E1D, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_a, 0x04D1, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_ie, 0x04D7, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_i, 0x0439, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_u, 0x045E, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_zhe, 0x04C2, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_A, 0x04D0, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_IE, 0x04D6, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_I, 0x0419, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_U, 0x040E, 
-IBUS_KEY_b, IBUS_KEY_Cyrillic_ZHE, 0x04C1, 
-IBUS_KEY_b, IBUS_KEY_Greek_ALPHA, 0x1FB8, 
-IBUS_KEY_b, IBUS_KEY_Greek_IOTA, 0x1FD8, 
-IBUS_KEY_b, IBUS_KEY_Greek_UPSILON, 0x1FE8, 
-IBUS_KEY_b, IBUS_KEY_Greek_alpha, 0x1FB0, 
-IBUS_KEY_b, IBUS_KEY_Greek_iota, 0x1FD0, 
-IBUS_KEY_b, IBUS_KEY_Greek_upsilon, 0x1FE0, 
-IBUS_KEY_b, 0x1EA0, 0x1EB6, 
-IBUS_KEY_b, 0x1EA1, 0x1EB7, 
-IBUS_KEY_c, IBUS_KEY_apostrophe, 0x0107, 
-IBUS_KEY_c, IBUS_KEY_comma, 0x00E7, 
-IBUS_KEY_c, IBUS_KEY_period, 0x010B, 
-IBUS_KEY_c, IBUS_KEY_slash, 0x00A2, 
-IBUS_KEY_c, IBUS_KEY_less, 0x010D, 
-IBUS_KEY_c, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_c, IBUS_KEY_A, 0x01CD, 
-IBUS_KEY_c, IBUS_KEY_C, 0x010C, 
-IBUS_KEY_c, IBUS_KEY_D, 0x010E, 
-IBUS_KEY_c, IBUS_KEY_E, 0x011A, 
-IBUS_KEY_c, IBUS_KEY_G, 0x01E6, 
-IBUS_KEY_c, IBUS_KEY_H, 0x021E, 
-IBUS_KEY_c, IBUS_KEY_I, 0x01CF, 
-IBUS_KEY_c, IBUS_KEY_K, 0x01E8, 
-IBUS_KEY_c, IBUS_KEY_L, 0x013D, 
-IBUS_KEY_c, IBUS_KEY_N, 0x0147, 
-IBUS_KEY_c, IBUS_KEY_O, 0x01D1, 
-IBUS_KEY_c, IBUS_KEY_R, 0x0158, 
-IBUS_KEY_c, IBUS_KEY_S, 0x0160, 
-IBUS_KEY_c, IBUS_KEY_T, 0x0164, 
-IBUS_KEY_c, IBUS_KEY_U, 0x01D3, 
-IBUS_KEY_c, IBUS_KEY_Z, 0x017D, 
-IBUS_KEY_c, IBUS_KEY_a, 0x01CE, 
-IBUS_KEY_c, IBUS_KEY_c, 0x010D, 
-IBUS_KEY_c, IBUS_KEY_d, 0x010F, 
-IBUS_KEY_c, IBUS_KEY_e, 0x011B, 
-IBUS_KEY_c, IBUS_KEY_g, 0x01E7, 
-IBUS_KEY_c, IBUS_KEY_h, 0x021F, 
-IBUS_KEY_c, IBUS_KEY_i, 0x01D0, 
-IBUS_KEY_c, IBUS_KEY_j, 0x01F0, 
-IBUS_KEY_c, IBUS_KEY_k, 0x01E9, 
-IBUS_KEY_c, IBUS_KEY_l, 0x013E, 
-IBUS_KEY_c, IBUS_KEY_n, 0x0148, 
-IBUS_KEY_c, IBUS_KEY_o, 0x01D2, 
-IBUS_KEY_c, IBUS_KEY_r, 0x0159, 
-IBUS_KEY_c, IBUS_KEY_s, 0x0161, 
-IBUS_KEY_c, IBUS_KEY_t, 0x0165, 
-IBUS_KEY_c, IBUS_KEY_u, 0x01D4, 
-IBUS_KEY_c, IBUS_KEY_z, 0x017E, 
-IBUS_KEY_c, IBUS_KEY_bar, 0x00A2, 
-IBUS_KEY_c, IBUS_KEY_Udiaeresis, 0x01D9, 
-IBUS_KEY_c, IBUS_KEY_udiaeresis, 0x01DA, 
-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, 
-IBUS_KEY_e, IBUS_KEY_minus, 0x0113, 
-IBUS_KEY_e, IBUS_KEY_period, 0x0117, 
-IBUS_KEY_e, IBUS_KEY_semicolon, 0x0119, 
-IBUS_KEY_e, IBUS_KEY_less, 0x011B, 
-IBUS_KEY_e, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_e, IBUS_KEY_greater, 0x00EA, 
-IBUS_KEY_e, IBUS_KEY_asciicircum, 0x00EA, 
-IBUS_KEY_e, IBUS_KEY_underscore, 0x0113, 
-IBUS_KEY_e, IBUS_KEY_grave, 0x00E8, 
-IBUS_KEY_e, IBUS_KEY_e, 0x0259, 
-IBUS_KEY_e, IBUS_KEY_diaeresis, 0x00EB, 
-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, 
-IBUS_KEY_k, IBUS_KEY_comma, 0x0137, 
-IBUS_KEY_k, IBUS_KEY_k, 0x0138, 
-IBUS_KEY_l, IBUS_KEY_apostrophe, 0x013A, 
-IBUS_KEY_l, IBUS_KEY_comma, 0x013C, 
-IBUS_KEY_l, IBUS_KEY_minus, 0x00A3, 
-IBUS_KEY_l, IBUS_KEY_slash, 0x0142, 
-IBUS_KEY_l, IBUS_KEY_less, 0x013E, 
-IBUS_KEY_l, IBUS_KEY_v, 0x007C, 
-IBUS_KEY_m, IBUS_KEY_period, 0x1E41, 
-IBUS_KEY_m, IBUS_KEY_slash, 0x20A5, 
-IBUS_KEY_m, IBUS_KEY_u, 0x00B5, 
-IBUS_KEY_n, IBUS_KEY_apostrophe, 0x0144, 
-IBUS_KEY_n, IBUS_KEY_comma, 0x0146, 
-IBUS_KEY_n, IBUS_KEY_less, 0x0148, 
-IBUS_KEY_n, IBUS_KEY_g, 0x014B, 
-IBUS_KEY_n, IBUS_KEY_asciitilde, 0x00F1, 
-IBUS_KEY_o, IBUS_KEY_quotedbl, 0x00F6, 
-IBUS_KEY_o, IBUS_KEY_apostrophe, 0x00F3, 
-IBUS_KEY_o, IBUS_KEY_comma, 0x01EB, 
-IBUS_KEY_o, IBUS_KEY_minus, 0x014D, 
-IBUS_KEY_o, IBUS_KEY_slash, 0x00F8, 
-IBUS_KEY_o, IBUS_KEY_semicolon, 0x01EB, 
-IBUS_KEY_o, IBUS_KEY_greater, 0x00F4, 
-IBUS_KEY_o, IBUS_KEY_A, 0x00C5, 
-IBUS_KEY_o, IBUS_KEY_C, 0x00A9, 
-IBUS_KEY_o, IBUS_KEY_R, 0x00AE, 
-IBUS_KEY_o, IBUS_KEY_U, 0x016E, 
-IBUS_KEY_o, IBUS_KEY_X, 0x00A4, 
-IBUS_KEY_o, IBUS_KEY_asciicircum, 0x00F4, 
-IBUS_KEY_o, IBUS_KEY_underscore, 0x014D, 
-IBUS_KEY_o, IBUS_KEY_grave, 0x00F2, 
-IBUS_KEY_o, IBUS_KEY_a, 0x00E5, 
-IBUS_KEY_o, IBUS_KEY_c, 0x00A9, 
-IBUS_KEY_o, IBUS_KEY_e, 0x0153, 
-IBUS_KEY_o, IBUS_KEY_o, 0x00B0, 
-IBUS_KEY_o, IBUS_KEY_r, 0x00AE, 
-IBUS_KEY_o, IBUS_KEY_s, 0x00A7, 
-IBUS_KEY_o, IBUS_KEY_u, 0x016F, 
-IBUS_KEY_o, IBUS_KEY_w, 0x1E98, 
-IBUS_KEY_o, IBUS_KEY_x, 0x00A4, 
-IBUS_KEY_o, IBUS_KEY_y, 0x1E99, 
-IBUS_KEY_o, IBUS_KEY_asciitilde, 0x00F5, 
-IBUS_KEY_o, IBUS_KEY_diaeresis, 0x00F6, 
-IBUS_KEY_o, IBUS_KEY_acute, 0x00F3, 
-IBUS_KEY_p, IBUS_KEY_exclam, 0x00B6, 
-IBUS_KEY_p, IBUS_KEY_period, 0x1E57, 
-IBUS_KEY_r, IBUS_KEY_apostrophe, 0x0155, 
-IBUS_KEY_r, IBUS_KEY_comma, 0x0157, 
-IBUS_KEY_r, IBUS_KEY_less, 0x0159, 
-IBUS_KEY_s, IBUS_KEY_exclam, 0x00A7, 
-IBUS_KEY_s, IBUS_KEY_apostrophe, 0x015B, 
-IBUS_KEY_s, IBUS_KEY_comma, 0x015F, 
-IBUS_KEY_s, IBUS_KEY_period, 0x1E61, 
-IBUS_KEY_s, IBUS_KEY_semicolon, 0x0219, 
-IBUS_KEY_s, IBUS_KEY_less, 0x0161, 
-IBUS_KEY_s, IBUS_KEY_M, 0x2120, 
-IBUS_KEY_s, IBUS_KEY_m, 0x2120, 
-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, 
-IBUS_KEY_t, IBUS_KEY_semicolon, 0x021B, 
-IBUS_KEY_t, IBUS_KEY_less, 0x0165, 
-IBUS_KEY_t, IBUS_KEY_M, 0x2122, 
-IBUS_KEY_t, IBUS_KEY_h, 0x00FE, 
-IBUS_KEY_t, IBUS_KEY_m, 0x2122, 
-IBUS_KEY_u, IBUS_KEY_quotedbl, 0x00FC, 
-IBUS_KEY_u, IBUS_KEY_apostrophe, 0x00FA, 
-IBUS_KEY_u, IBUS_KEY_asterisk, 0x016F, 
-IBUS_KEY_u, IBUS_KEY_comma, 0x0173, 
-IBUS_KEY_u, IBUS_KEY_minus, 0x016B, 
-IBUS_KEY_u, IBUS_KEY_slash, 0x00B5, 
-IBUS_KEY_u, IBUS_KEY_semicolon, 0x0173, 
-IBUS_KEY_u, IBUS_KEY_greater, 0x00FB, 
-IBUS_KEY_u, IBUS_KEY_A, 0x0102, 
-IBUS_KEY_u, IBUS_KEY_U, 0x016C, 
-IBUS_KEY_u, IBUS_KEY_asciicircum, 0x00FB, 
-IBUS_KEY_u, IBUS_KEY_underscore, 0x016B, 
-IBUS_KEY_u, IBUS_KEY_grave, 0x00F9, 
-IBUS_KEY_u, IBUS_KEY_a, 0x0103, 
-IBUS_KEY_u, IBUS_KEY_u, 0x016D, 
-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, 
-IBUS_KEY_w, IBUS_KEY_asciicircum, 0x0175, 
-IBUS_KEY_x, IBUS_KEY_O, 0x00A4, 
-IBUS_KEY_x, IBUS_KEY_o, 0x00A4, 
-IBUS_KEY_x, IBUS_KEY_x, 0x00D7, 
-IBUS_KEY_y, IBUS_KEY_quotedbl, 0x00FF, 
-IBUS_KEY_y, IBUS_KEY_apostrophe, 0x00FD, 
-IBUS_KEY_y, IBUS_KEY_minus, 0x00A5, 
-IBUS_KEY_y, IBUS_KEY_equal, 0x00A5, 
-IBUS_KEY_y, IBUS_KEY_asciicircum, 0x0177, 
-IBUS_KEY_y, IBUS_KEY_diaeresis, 0x00FF, 
-IBUS_KEY_y, IBUS_KEY_acute, 0x00FD, 
-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, 
-IBUS_KEY_asciitilde, IBUS_KEY_N, 0x00D1, 
-IBUS_KEY_asciitilde, IBUS_KEY_O, 0x00D5, 
-IBUS_KEY_asciitilde, IBUS_KEY_U, 0x0168, 
-IBUS_KEY_asciitilde, IBUS_KEY_V, 0x1E7C, 
-IBUS_KEY_asciitilde, IBUS_KEY_Y, 0x1EF8, 
-IBUS_KEY_asciitilde, IBUS_KEY_a, 0x00E3, 
-IBUS_KEY_asciitilde, IBUS_KEY_e, 0x1EBD, 
-IBUS_KEY_asciitilde, IBUS_KEY_i, 0x0129, 
-IBUS_KEY_asciitilde, IBUS_KEY_n, 0x00F1, 
-IBUS_KEY_asciitilde, IBUS_KEY_o, 0x00F5, 
-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, 
-IBUS_KEY_asciitilde, IBUS_KEY_acircumflex, 0x1EAB, 
-IBUS_KEY_asciitilde, IBUS_KEY_ecircumflex, 0x1EC5, 
-IBUS_KEY_asciitilde, IBUS_KEY_ocircumflex, 0x1ED7, 
-IBUS_KEY_asciitilde, IBUS_KEY_Abreve, 0x1EB4, 
-IBUS_KEY_asciitilde, IBUS_KEY_abreve, 0x1EB5, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_iotadieresis, 0x1FD7, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilondieresis, 0x1FE7, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0x1FB6, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0x1FC6, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_iota, 0x1FD6, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilon, 0x1FE6, 
-IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0x1FF6, 
-IBUS_KEY_asciitilde, 0x1F00, 0x1F06, 
-IBUS_KEY_asciitilde, 0x1F01, 0x1F07, 
-IBUS_KEY_asciitilde, 0x1F08, 0x1F0E, 
-IBUS_KEY_asciitilde, 0x1F09, 0x1F0F, 
-IBUS_KEY_asciitilde, 0x1F20, 0x1F26, 
-IBUS_KEY_asciitilde, 0x1F21, 0x1F27, 
-IBUS_KEY_asciitilde, 0x1F28, 0x1F2E, 
-IBUS_KEY_asciitilde, 0x1F29, 0x1F2F, 
-IBUS_KEY_asciitilde, 0x1F30, 0x1F36, 
-IBUS_KEY_asciitilde, 0x1F31, 0x1F37, 
-IBUS_KEY_asciitilde, 0x1F38, 0x1F3E, 
-IBUS_KEY_asciitilde, 0x1F39, 0x1F3F, 
-IBUS_KEY_asciitilde, 0x1F50, 0x1F56, 
-IBUS_KEY_asciitilde, 0x1F51, 0x1F57, 
-IBUS_KEY_asciitilde, 0x1F59, 0x1F5F, 
-IBUS_KEY_asciitilde, 0x1F60, 0x1F66, 
-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, 
-IBUS_KEY_diaeresis, IBUS_KEY_O, 0x00D6, 
-IBUS_KEY_diaeresis, IBUS_KEY_U, 0x00DC, 
-IBUS_KEY_diaeresis, IBUS_KEY_Y, 0x0178, 
-IBUS_KEY_diaeresis, IBUS_KEY_grave, 0x1FED, 
-IBUS_KEY_diaeresis, IBUS_KEY_a, 0x00E4, 
-IBUS_KEY_diaeresis, IBUS_KEY_e, 0x00EB, 
-IBUS_KEY_diaeresis, IBUS_KEY_i, 0x00EF, 
-IBUS_KEY_diaeresis, IBUS_KEY_o, 0x00F6, 
-IBUS_KEY_diaeresis, IBUS_KEY_u, 0x00FC, 
-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, 
-IBUS_KEY_macron, IBUS_KEY_A, 0x0100, 
-IBUS_KEY_macron, IBUS_KEY_E, 0x0112, 
-IBUS_KEY_macron, IBUS_KEY_G, 0x1E20, 
-IBUS_KEY_macron, IBUS_KEY_I, 0x012A, 
-IBUS_KEY_macron, IBUS_KEY_O, 0x014C, 
-IBUS_KEY_macron, IBUS_KEY_U, 0x016A, 
-IBUS_KEY_macron, IBUS_KEY_Y, 0x0232, 
-IBUS_KEY_macron, IBUS_KEY_a, 0x0101, 
-IBUS_KEY_macron, IBUS_KEY_e, 0x0113, 
-IBUS_KEY_macron, IBUS_KEY_g, 0x1E21, 
-IBUS_KEY_macron, IBUS_KEY_i, 0x012B, 
-IBUS_KEY_macron, IBUS_KEY_o, 0x014D, 
-IBUS_KEY_macron, IBUS_KEY_u, 0x016B, 
-IBUS_KEY_macron, IBUS_KEY_y, 0x0233, 
-IBUS_KEY_macron, IBUS_KEY_Adiaeresis, 0x01DE, 
-IBUS_KEY_macron, IBUS_KEY_AE, 0x01E2, 
-IBUS_KEY_macron, IBUS_KEY_Otilde, 0x022C, 
-IBUS_KEY_macron, IBUS_KEY_Odiaeresis, 0x022A, 
-IBUS_KEY_macron, IBUS_KEY_Udiaeresis, 0x01D5, 
-IBUS_KEY_macron, IBUS_KEY_adiaeresis, 0x01DF, 
-IBUS_KEY_macron, IBUS_KEY_ae, 0x01E3, 
-IBUS_KEY_macron, IBUS_KEY_otilde, 0x022D, 
-IBUS_KEY_macron, IBUS_KEY_odiaeresis, 0x022B, 
-IBUS_KEY_macron, IBUS_KEY_udiaeresis, 0x01D6, 
-IBUS_KEY_macron, 0x01EA, 0x01EC, 
-IBUS_KEY_macron, 0x01EB, 0x01ED, 
-IBUS_KEY_macron, 0x0226, 0x01E0, 
-IBUS_KEY_macron, 0x0227, 0x01E1, 
-IBUS_KEY_macron, 0x022E, 0x0230, 
-IBUS_KEY_macron, 0x022F, 0x0231, 
-IBUS_KEY_macron, IBUS_KEY_Cyrillic_i, 0x04E3, 
-IBUS_KEY_macron, IBUS_KEY_Cyrillic_u, 0x04EF, 
-IBUS_KEY_macron, IBUS_KEY_Cyrillic_I, 0x04E2, 
-IBUS_KEY_macron, IBUS_KEY_Cyrillic_U, 0x04EE, 
-IBUS_KEY_macron, IBUS_KEY_Greek_ALPHA, 0x1FB9, 
-IBUS_KEY_macron, IBUS_KEY_Greek_IOTA, 0x1FD9, 
-IBUS_KEY_macron, IBUS_KEY_Greek_UPSILON, 0x1FE9, 
-IBUS_KEY_macron, IBUS_KEY_Greek_alpha, 0x1FB1, 
-IBUS_KEY_macron, IBUS_KEY_Greek_iota, 0x1FD1, 
-IBUS_KEY_macron, IBUS_KEY_Greek_upsilon, 0x1FE1, 
-IBUS_KEY_macron, 0x1E36, 0x1E38, 
-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, 
-IBUS_KEY_acute, IBUS_KEY_G, 0x01F4, 
-IBUS_KEY_acute, IBUS_KEY_I, 0x00CD, 
-IBUS_KEY_acute, IBUS_KEY_K, 0x1E30, 
-IBUS_KEY_acute, IBUS_KEY_L, 0x0139, 
-IBUS_KEY_acute, IBUS_KEY_M, 0x1E3E, 
-IBUS_KEY_acute, IBUS_KEY_N, 0x0143, 
-IBUS_KEY_acute, IBUS_KEY_O, 0x00D3, 
-IBUS_KEY_acute, IBUS_KEY_P, 0x1E54, 
-IBUS_KEY_acute, IBUS_KEY_R, 0x0154, 
-IBUS_KEY_acute, IBUS_KEY_S, 0x015A, 
-IBUS_KEY_acute, IBUS_KEY_U, 0x00DA, 
-IBUS_KEY_acute, IBUS_KEY_W, 0x1E82, 
-IBUS_KEY_acute, IBUS_KEY_Y, 0x00DD, 
-IBUS_KEY_acute, IBUS_KEY_Z, 0x0179, 
-IBUS_KEY_acute, IBUS_KEY_a, 0x00E1, 
-IBUS_KEY_acute, IBUS_KEY_c, 0x0107, 
-IBUS_KEY_acute, IBUS_KEY_e, 0x00E9, 
-IBUS_KEY_acute, IBUS_KEY_g, 0x01F5, 
-IBUS_KEY_acute, IBUS_KEY_i, 0x00ED, 
-IBUS_KEY_acute, IBUS_KEY_k, 0x1E31, 
-IBUS_KEY_acute, IBUS_KEY_l, 0x013A, 
-IBUS_KEY_acute, IBUS_KEY_m, 0x1E3F, 
-IBUS_KEY_acute, IBUS_KEY_n, 0x0144, 
-IBUS_KEY_acute, IBUS_KEY_o, 0x00F3, 
-IBUS_KEY_acute, IBUS_KEY_p, 0x1E55, 
-IBUS_KEY_acute, IBUS_KEY_r, 0x0155, 
-IBUS_KEY_acute, IBUS_KEY_s, 0x015B, 
-IBUS_KEY_acute, IBUS_KEY_u, 0x00FA, 
-IBUS_KEY_acute, IBUS_KEY_w, 0x1E83, 
-IBUS_KEY_acute, IBUS_KEY_y, 0x00FD, 
-IBUS_KEY_acute, IBUS_KEY_z, 0x017A, 
-IBUS_KEY_acute, IBUS_KEY_Acircumflex, 0x1EA4, 
-IBUS_KEY_acute, IBUS_KEY_Aring, 0x01FA, 
-IBUS_KEY_acute, IBUS_KEY_AE, 0x01FC, 
-IBUS_KEY_acute, IBUS_KEY_Ccedilla, 0x1E08, 
-IBUS_KEY_acute, IBUS_KEY_Ecircumflex, 0x1EBE, 
-IBUS_KEY_acute, IBUS_KEY_Idiaeresis, 0x1E2E, 
-IBUS_KEY_acute, IBUS_KEY_Ocircumflex, 0x1ED0, 
-IBUS_KEY_acute, IBUS_KEY_Otilde, 0x1E4C, 
-IBUS_KEY_acute, IBUS_KEY_Ooblique, 0x01FE, 
-IBUS_KEY_acute, IBUS_KEY_Udiaeresis, 0x01D7, 
-IBUS_KEY_acute, IBUS_KEY_acircumflex, 0x1EA5, 
-IBUS_KEY_acute, IBUS_KEY_aring, 0x01FB, 
-IBUS_KEY_acute, IBUS_KEY_ae, 0x01FD, 
-IBUS_KEY_acute, IBUS_KEY_ccedilla, 0x1E09, 
-IBUS_KEY_acute, IBUS_KEY_ecircumflex, 0x1EBF, 
-IBUS_KEY_acute, IBUS_KEY_idiaeresis, 0x1E2F, 
-IBUS_KEY_acute, IBUS_KEY_ocircumflex, 0x1ED1, 
-IBUS_KEY_acute, IBUS_KEY_otilde, 0x1E4D, 
-IBUS_KEY_acute, IBUS_KEY_oslash, 0x01FF, 
-IBUS_KEY_acute, IBUS_KEY_udiaeresis, 0x01D8, 
-IBUS_KEY_acute, IBUS_KEY_Abreve, 0x1EAE, 
-IBUS_KEY_acute, IBUS_KEY_abreve, 0x1EAF, 
-IBUS_KEY_acute, IBUS_KEY_Emacron, 0x1E16, 
-IBUS_KEY_acute, IBUS_KEY_emacron, 0x1E17, 
-IBUS_KEY_acute, IBUS_KEY_Omacron, 0x1E52, 
-IBUS_KEY_acute, IBUS_KEY_Utilde, 0x1E78, 
-IBUS_KEY_acute, IBUS_KEY_omacron, 0x1E53, 
-IBUS_KEY_acute, IBUS_KEY_utilde, 0x1E79, 
-IBUS_KEY_acute, IBUS_KEY_Cyrillic_ghe, 0x0453, 
-IBUS_KEY_acute, IBUS_KEY_Cyrillic_ka, 0x045C, 
-IBUS_KEY_acute, IBUS_KEY_Cyrillic_GHE, 0x0403, 
-IBUS_KEY_acute, IBUS_KEY_Cyrillic_KA, 0x040C, 
-IBUS_KEY_acute, IBUS_KEY_Greek_iotadieresis, 0x0390, 
-IBUS_KEY_acute, IBUS_KEY_Greek_upsilondieresis, 0x03B0, 
-IBUS_KEY_acute, IBUS_KEY_Greek_ALPHA, 0x0386, 
-IBUS_KEY_acute, IBUS_KEY_Greek_EPSILON, 0x0388, 
-IBUS_KEY_acute, IBUS_KEY_Greek_ETA, 0x0389, 
-IBUS_KEY_acute, IBUS_KEY_Greek_IOTA, 0x038A, 
-IBUS_KEY_acute, IBUS_KEY_Greek_OMICRON, 0x038C, 
-IBUS_KEY_acute, IBUS_KEY_Greek_UPSILON, 0x038E, 
-IBUS_KEY_acute, IBUS_KEY_Greek_OMEGA, 0x038F, 
-IBUS_KEY_acute, IBUS_KEY_Greek_alpha, 0x03AC, 
-IBUS_KEY_acute, IBUS_KEY_Greek_epsilon, 0x03AD, 
-IBUS_KEY_acute, IBUS_KEY_Greek_eta, 0x03AE, 
-IBUS_KEY_acute, IBUS_KEY_Greek_iota, 0x03AF, 
-IBUS_KEY_acute, IBUS_KEY_Greek_omicron, 0x03CC, 
-IBUS_KEY_acute, IBUS_KEY_Greek_upsilon, 0x03CD, 
-IBUS_KEY_acute, IBUS_KEY_Greek_omega, 0x03CE, 
-IBUS_KEY_acute, 0x1F00, 0x1F04, 
-IBUS_KEY_acute, 0x1F01, 0x1F05, 
-IBUS_KEY_acute, 0x1F08, 0x1F0C, 
-IBUS_KEY_acute, 0x1F09, 0x1F0D, 
-IBUS_KEY_acute, 0x1F10, 0x1F14, 
-IBUS_KEY_acute, 0x1F11, 0x1F15, 
-IBUS_KEY_acute, 0x1F18, 0x1F1C, 
-IBUS_KEY_acute, 0x1F19, 0x1F1D, 
-IBUS_KEY_acute, 0x1F20, 0x1F24, 
-IBUS_KEY_acute, 0x1F21, 0x1F25, 
-IBUS_KEY_acute, 0x1F28, 0x1F2C, 
-IBUS_KEY_acute, 0x1F29, 0x1F2D, 
-IBUS_KEY_acute, 0x1F30, 0x1F34, 
-IBUS_KEY_acute, 0x1F31, 0x1F35, 
-IBUS_KEY_acute, 0x1F38, 0x1F3C, 
-IBUS_KEY_acute, 0x1F39, 0x1F3D, 
-IBUS_KEY_acute, 0x1F40, 0x1F44, 
-IBUS_KEY_acute, 0x1F41, 0x1F45, 
-IBUS_KEY_acute, 0x1F48, 0x1F4C, 
-IBUS_KEY_acute, 0x1F49, 0x1F4D, 
-IBUS_KEY_acute, 0x1F50, 0x1F54, 
-IBUS_KEY_acute, 0x1F51, 0x1F55, 
-IBUS_KEY_acute, 0x1F59, 0x1F5D, 
-IBUS_KEY_acute, 0x1F60, 0x1F64, 
-IBUS_KEY_acute, 0x1F61, 0x1F65, 
-IBUS_KEY_acute, 0x1F68, 0x1F6C, 
-IBUS_KEY_acute, 0x1F69, 0x1F6D, 
-IBUS_KEY_cedilla, IBUS_KEY_C, 0x00C7, 
-IBUS_KEY_cedilla, IBUS_KEY_D, 0x1E10, 
-IBUS_KEY_cedilla, IBUS_KEY_E, 0x0228, 
-IBUS_KEY_cedilla, IBUS_KEY_G, 0x0122, 
-IBUS_KEY_cedilla, IBUS_KEY_H, 0x1E28, 
-IBUS_KEY_cedilla, IBUS_KEY_K, 0x0136, 
-IBUS_KEY_cedilla, IBUS_KEY_L, 0x013B, 
-IBUS_KEY_cedilla, IBUS_KEY_N, 0x0145, 
-IBUS_KEY_cedilla, IBUS_KEY_R, 0x0156, 
-IBUS_KEY_cedilla, IBUS_KEY_S, 0x015E, 
-IBUS_KEY_cedilla, IBUS_KEY_T, 0x0162, 
-IBUS_KEY_cedilla, IBUS_KEY_c, 0x00E7, 
-IBUS_KEY_cedilla, IBUS_KEY_d, 0x1E11, 
-IBUS_KEY_cedilla, IBUS_KEY_e, 0x0229, 
-IBUS_KEY_cedilla, IBUS_KEY_g, 0x0123, 
-IBUS_KEY_cedilla, IBUS_KEY_h, 0x1E29, 
-IBUS_KEY_cedilla, IBUS_KEY_k, 0x0137, 
-IBUS_KEY_cedilla, IBUS_KEY_l, 0x013C, 
-IBUS_KEY_cedilla, IBUS_KEY_n, 0x0146, 
-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, 
-0x05B7, 0x05F2, 0xFB1F, 
-0x05B7, IBUS_KEY_hebrew_aleph, 0xFB2E, 
-0x05B8, IBUS_KEY_hebrew_aleph, 0xFB2F, 
-0x05B9, IBUS_KEY_hebrew_waw, 0xFB4B, 
-0x05BC, IBUS_KEY_hebrew_aleph, 0xFB30, 
-0x05BC, IBUS_KEY_hebrew_beth, 0xFB31, 
-0x05BC, IBUS_KEY_hebrew_gimmel, 0xFB32, 
-0x05BC, IBUS_KEY_hebrew_daleth, 0xFB33, 
-0x05BC, IBUS_KEY_hebrew_he, 0xFB34, 
-0x05BC, IBUS_KEY_hebrew_waw, 0xFB35, 
-0x05BC, IBUS_KEY_hebrew_zayin, 0xFB36, 
-0x05BC, IBUS_KEY_hebrew_teth, 0xFB38, 
-0x05BC, IBUS_KEY_hebrew_yod, 0xFB39, 
-0x05BC, IBUS_KEY_hebrew_finalkaph, 0xFB3A, 
-0x05BC, IBUS_KEY_hebrew_kaph, 0xFB3B, 
-0x05BC, IBUS_KEY_hebrew_lamed, 0xFB3C, 
-0x05BC, IBUS_KEY_hebrew_mem, 0xFB3E, 
-0x05BC, IBUS_KEY_hebrew_nun, 0xFB40, 
-0x05BC, IBUS_KEY_hebrew_samekh, 0xFB41, 
-0x05BC, IBUS_KEY_hebrew_finalpe, 0xFB43, 
-0x05BC, IBUS_KEY_hebrew_pe, 0xFB44, 
-0x05BC, IBUS_KEY_hebrew_zadi, 0xFB46, 
-0x05BC, IBUS_KEY_hebrew_qoph, 0xFB47, 
-0x05BC, IBUS_KEY_hebrew_resh, 0xFB48, 
-0x05BC, IBUS_KEY_hebrew_shin, 0xFB49, 
-0x05BC, IBUS_KEY_hebrew_taw, 0xFB4A, 
-0x05BF, IBUS_KEY_hebrew_beth, 0xFB4C, 
-0x05BF, IBUS_KEY_hebrew_kaph, 0xFB4D, 
-0x05BF, IBUS_KEY_hebrew_pe, 0xFB4E, 
-0x05C1, IBUS_KEY_hebrew_shin, 0xFB2A, 
-0x05C1, 0xFB49, 0xFB2C, 
-0x05C2, IBUS_KEY_hebrew_shin, 0xFB2B, 
-0x05C2, 0xFB49, 0xFB2D, 
-0x0653, IBUS_KEY_Arabic_alef, 0x0622, 
-0x0654, IBUS_KEY_Arabic_alef, 0x0623, 
-0x0654, IBUS_KEY_Arabic_waw, 0x0624, 
-0x0654, IBUS_KEY_Arabic_yeh, 0x0626, 
-0x0654, 0x06C1, 0x06C2, 
-0x0654, 0x06D2, 0x06D3, 
-0x0654, 0x06D5, 0x06C0, 
-0x0655, IBUS_KEY_Arabic_alef, 0x0625, 
-IBUS_KEY_Cyrillic_pe, IBUS_KEY_Cyrillic_a, 0x00A7, 
-IBUS_KEY_Cyrillic_IE, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_Cyrillic_EN, IBUS_KEY_Cyrillic_o, 0x2116, 
-IBUS_KEY_Cyrillic_EN, IBUS_KEY_Cyrillic_O, 0x2116, 
-IBUS_KEY_Cyrillic_ES, IBUS_KEY_equal, 0x20AC, 
-IBUS_KEY_Greek_ALPHA, IBUS_KEY_apostrophe, 0x0386, 
-IBUS_KEY_Greek_EPSILON, IBUS_KEY_apostrophe, 0x0388, 
-IBUS_KEY_Greek_ETA, IBUS_KEY_apostrophe, 0x0389, 
-IBUS_KEY_Greek_IOTA, IBUS_KEY_quotedbl, 0x03AA, 
-IBUS_KEY_Greek_IOTA, IBUS_KEY_apostrophe, 0x038A, 
-IBUS_KEY_Greek_OMICRON, IBUS_KEY_apostrophe, 0x038C, 
-IBUS_KEY_Greek_UPSILON, IBUS_KEY_quotedbl, 0x03AB, 
-IBUS_KEY_Greek_UPSILON, IBUS_KEY_apostrophe, 0x038E, 
-IBUS_KEY_Greek_OMEGA, IBUS_KEY_apostrophe, 0x038F, 
-IBUS_KEY_Greek_alpha, IBUS_KEY_apostrophe, 0x03AC, 
-IBUS_KEY_Greek_epsilon, IBUS_KEY_apostrophe, 0x03AD, 
-IBUS_KEY_Greek_eta, IBUS_KEY_apostrophe, 0x03AE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_quotedbl, 0x03CA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_alphaaccent, 0x1FB4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_etaaccent, 0x1FC4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_omegaaccent, 0x1FF4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_ALPHA, 0x1FBC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_ETA, 0x1FCC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_OMEGA, 0x1FFC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_alpha, 0x1FB3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_eta, 0x1FC3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_Greek_omega, 0x1FF3, 
-IBUS_KEY_Greek_iota, 0x1F00, 0x1F80, 
-IBUS_KEY_Greek_iota, 0x1F01, 0x1F81, 
-IBUS_KEY_Greek_iota, 0x1F02, 0x1F82, 
-IBUS_KEY_Greek_iota, 0x1F03, 0x1F83, 
-IBUS_KEY_Greek_iota, 0x1F04, 0x1F84, 
-IBUS_KEY_Greek_iota, 0x1F05, 0x1F85, 
-IBUS_KEY_Greek_iota, 0x1F06, 0x1F86, 
-IBUS_KEY_Greek_iota, 0x1F07, 0x1F87, 
-IBUS_KEY_Greek_iota, 0x1F08, 0x1F88, 
-IBUS_KEY_Greek_iota, 0x1F09, 0x1F89, 
-IBUS_KEY_Greek_iota, 0x1F0A, 0x1F8A, 
-IBUS_KEY_Greek_iota, 0x1F0B, 0x1F8B, 
-IBUS_KEY_Greek_iota, 0x1F0C, 0x1F8C, 
-IBUS_KEY_Greek_iota, 0x1F0D, 0x1F8D, 
-IBUS_KEY_Greek_iota, 0x1F0E, 0x1F8E, 
-IBUS_KEY_Greek_iota, 0x1F0F, 0x1F8F, 
-IBUS_KEY_Greek_iota, 0x1F20, 0x1F90, 
-IBUS_KEY_Greek_iota, 0x1F21, 0x1F91, 
-IBUS_KEY_Greek_iota, 0x1F22, 0x1F92, 
-IBUS_KEY_Greek_iota, 0x1F23, 0x1F93, 
-IBUS_KEY_Greek_iota, 0x1F24, 0x1F94, 
-IBUS_KEY_Greek_iota, 0x1F25, 0x1F95, 
-IBUS_KEY_Greek_iota, 0x1F26, 0x1F96, 
-IBUS_KEY_Greek_iota, 0x1F27, 0x1F97, 
-IBUS_KEY_Greek_iota, 0x1F28, 0x1F98, 
-IBUS_KEY_Greek_iota, 0x1F29, 0x1F99, 
-IBUS_KEY_Greek_iota, 0x1F2A, 0x1F9A, 
-IBUS_KEY_Greek_iota, 0x1F2B, 0x1F9B, 
-IBUS_KEY_Greek_iota, 0x1F2C, 0x1F9C, 
-IBUS_KEY_Greek_iota, 0x1F2D, 0x1F9D, 
-IBUS_KEY_Greek_iota, 0x1F2E, 0x1F9E, 
-IBUS_KEY_Greek_iota, 0x1F2F, 0x1F9F, 
-IBUS_KEY_Greek_iota, 0x1F60, 0x1FA0, 
-IBUS_KEY_Greek_iota, 0x1F61, 0x1FA1, 
-IBUS_KEY_Greek_iota, 0x1F62, 0x1FA2, 
-IBUS_KEY_Greek_iota, 0x1F63, 0x1FA3, 
-IBUS_KEY_Greek_iota, 0x1F64, 0x1FA4, 
-IBUS_KEY_Greek_iota, 0x1F65, 0x1FA5, 
-IBUS_KEY_Greek_iota, 0x1F66, 0x1FA6, 
-IBUS_KEY_Greek_iota, 0x1F67, 0x1FA7, 
-IBUS_KEY_Greek_iota, 0x1F68, 0x1FA8, 
-IBUS_KEY_Greek_iota, 0x1F69, 0x1FA9, 
-IBUS_KEY_Greek_iota, 0x1F6A, 0x1FAA, 
-IBUS_KEY_Greek_iota, 0x1F6B, 0x1FAB, 
-IBUS_KEY_Greek_iota, 0x1F6C, 0x1FAC, 
-IBUS_KEY_Greek_iota, 0x1F6D, 0x1FAD, 
-IBUS_KEY_Greek_iota, 0x1F6E, 0x1FAE, 
-IBUS_KEY_Greek_iota, 0x1F6F, 0x1FAF, 
-IBUS_KEY_Greek_iota, 0x1F70, 0x1FB2, 
-IBUS_KEY_Greek_iota, 0x1F74, 0x1FC2, 
-IBUS_KEY_Greek_iota, 0x1F7C, 0x1FF2, 
-IBUS_KEY_Greek_iota, 0x1FB6, 0x1FB7, 
-IBUS_KEY_Greek_iota, 0x1FC6, 0x1FC7, 
-IBUS_KEY_Greek_iota, 0x1FF6, 0x1FF7, 
-IBUS_KEY_Greek_omicron, IBUS_KEY_apostrophe, 0x03CC, 
-IBUS_KEY_Greek_upsilon, IBUS_KEY_quotedbl, 0x03CB, 
-IBUS_KEY_Greek_upsilon, IBUS_KEY_apostrophe, 0x03CD, 
-IBUS_KEY_Greek_omega, IBUS_KEY_apostrophe, 0x03CE, 
-IBUS_KEY_lessthanequal, 0x0338, 0x2270, 
-IBUS_KEY_greaterthanequal, 0x0338, 0x2271, 
-IBUS_KEY_approximate, 0x0338, 0x2247, 
-IBUS_KEY_identical, 0x0338, 0x2262, 
-IBUS_KEY_includedin, 0x0338, 0x2284, 
-IBUS_KEY_includes, 0x0338, 0x2285, 
-0x093C, 0x0915, 0x0958, 
-0x093C, 0x0916, 0x0959, 
-0x093C, 0x0917, 0x095A, 
-0x093C, 0x091C, 0x095B, 
-0x093C, 0x0921, 0x095C, 
-0x093C, 0x0922, 0x095D, 
-0x093C, 0x0928, 0x0929, 
-0x093C, 0x092B, 0x095E, 
-0x093C, 0x092F, 0x095F, 
-0x093C, 0x0930, 0x0931, 
-0x093C, 0x0933, 0x0934, 
-0x09BC, 0x09A1, 0x09DC, 
-0x09BC, 0x09A2, 0x09DD, 
-0x09BC, 0x09AF, 0x09DF, 
-0x09C7, 0x09BE, 0x09CB, 
-0x09C7, 0x09D7, 0x09CC, 
-0x0A3C, 0x0A16, 0x0A59, 
-0x0A3C, 0x0A17, 0x0A5A, 
-0x0A3C, 0x0A1C, 0x0A5B, 
-0x0A3C, 0x0A2B, 0x0A5E, 
-0x0A3C, 0x0A32, 0x0A33, 
-0x0A3C, 0x0A38, 0x0A36, 
-0x0B3C, 0x0B21, 0x0B5C, 
-0x0B3C, 0x0B22, 0x0B5D, 
-0x0B47, 0x0B3E, 0x0B4B, 
-0x0B47, 0x0B56, 0x0B48, 
-0x0B47, 0x0B57, 0x0B4C, 
-IBUS_KEY_leftcaret, 0x0338, 0x226E, 
-IBUS_KEY_rightcaret, 0x0338, 0x226F, 
-IBUS_KEY_underbar, IBUS_KEY_parenleft, 0x208D, 
-IBUS_KEY_underbar, IBUS_KEY_parenright, 0x208E, 
-IBUS_KEY_underbar, IBUS_KEY_plus, 0x208A, 
-IBUS_KEY_underbar, IBUS_KEY_0, 0x2080, 
-IBUS_KEY_underbar, IBUS_KEY_1, 0x2081, 
-IBUS_KEY_underbar, IBUS_KEY_2, 0x2082, 
-IBUS_KEY_underbar, IBUS_KEY_3, 0x2083, 
-IBUS_KEY_underbar, IBUS_KEY_4, 0x2084, 
-IBUS_KEY_underbar, IBUS_KEY_5, 0x2085, 
-IBUS_KEY_underbar, IBUS_KEY_6, 0x2086, 
-IBUS_KEY_underbar, IBUS_KEY_7, 0x2087, 
-IBUS_KEY_underbar, IBUS_KEY_8, 0x2088, 
-IBUS_KEY_underbar, IBUS_KEY_9, 0x2089, 
-IBUS_KEY_underbar, IBUS_KEY_equal, 0x208C, 
-0x0BC6, 0x0BBE, 0x0BCA, 
-0x0BC6, 0x0BD7, 0x0BCC, 
-IBUS_KEY_underbar, 0x2212, 0x208B, 
-IBUS_KEY_underbar, IBUS_KEY_KP_Space, 0x2082, 
-IBUS_KEY_underbar, IBUS_KEY_KP_Add, 0x208A, 
-IBUS_KEY_underbar, IBUS_KEY_KP_0, 0x2080, 
-IBUS_KEY_underbar, IBUS_KEY_KP_1, 0x2081, 
-IBUS_KEY_underbar, IBUS_KEY_KP_2, 0x2082, 
-IBUS_KEY_underbar, IBUS_KEY_KP_3, 0x2083, 
-IBUS_KEY_underbar, IBUS_KEY_KP_4, 0x2084, 
-IBUS_KEY_underbar, IBUS_KEY_KP_5, 0x2085, 
-IBUS_KEY_underbar, IBUS_KEY_KP_6, 0x2086, 
-IBUS_KEY_underbar, IBUS_KEY_KP_7, 0x2087, 
-IBUS_KEY_underbar, IBUS_KEY_KP_8, 0x2088, 
-IBUS_KEY_underbar, IBUS_KEY_KP_9, 0x2089, 
-IBUS_KEY_underbar, IBUS_KEY_KP_Equal, 0x208C, 
-0x0BC7, 0x0BBE, 0x0BCB, 
-0x0BD7, 0x0B92, 0x0B94, 
-IBUS_KEY_rightshoe, 0x0338, 0x2285, 
-IBUS_KEY_leftshoe, 0x0338, 0x2284, 
-IBUS_KEY_righttack, 0x0338, 0x22AC, 
-0x0C46, 0x0C56, 0x0C48, 
-0x0CBF, 0x0CD5, 0x0CC0, 
-0x0CC6, 0x0CC2, 0x0CCA, 
-0x0CC6, 0x0CD5, 0x0CC7, 
-0x0CC6, 0x0CD6, 0x0CC8, 
-0x0CCA, 0x0CD5, 0x0CCB, 
-0x0D46, 0x0D3E, 0x0D4A, 
-0x0D46, 0x0D57, 0x0D4C, 
-0x0D47, 0x0D3E, 0x0D4B, 
-0x0DD9, 0x0DCA, 0x0DDA, 
-0x0DD9, 0x0DCF, 0x0DDC, 
-0x0DD9, 0x0DDF, 0x0DDE, 
-0x0DDC, 0x0DCA, 0x0DDD, 
-0x0F71, 0x0F72, 0x0F73, 
-0x0F71, 0x0F74, 0x0F75, 
-0x0F71, 0x0F80, 0x0F81, 
-0x0F90, 0x0FB5, 0x0FB9, 
-0x0F92, 0x0FB7, 0x0F93, 
-0x0F9C, 0x0FB7, 0x0F9D, 
-0x0FA1, 0x0FB7, 0x0FA2, 
-0x0FA6, 0x0FB7, 0x0FA7, 
-0x0FAB, 0x0FB7, 0x0FAC, 
-0x0FB2, 0x0F80, 0x0F76, 
-0x0FB3, 0x0F80, 0x0F78, 
-0x0FB5, 0x0F40, 0x0F69, 
-0x0FB7, 0x0F42, 0x0F43, 
-0x0FB7, 0x0F4C, 0x0F4D, 
-0x0FB7, 0x0F51, 0x0F52, 
-0x0FB7, 0x0F56, 0x0F57, 
-0x0FB7, 0x0F5B, 0x0F5C, 
-0x102E, 0x1025, 0x1026, 
-0x1100, 0x1100, 0x1101, 
-0x1102, 0x1100, 0x1113, 
-0x1102, 0x1102, 0x1114, 
-0x1102, 0x1103, 0x1115, 
-0x1102, 0x1107, 0x1116, 
-0x1103, 0x1100, 0x1117, 
-0x1103, 0x1103, 0x1104, 
-0x1105, 0x1102, 0x1118, 
-0x1105, 0x1105, 0x1119, 
-0x1105, 0x110B, 0x111B, 
-0x1105, 0x1112, 0x111A, 
-0x1106, 0x1107, 0x111C, 
-0x1106, 0x110B, 0x111D, 
-0x1107, 0x1100, 0x111E, 
-0x1107, 0x1102, 0x111F, 
-0x1107, 0x1103, 0x1120, 
-0x1107, 0x1107, 0x1108, 
-0x1107, 0x1109, 0x1121, 
-0x1107, 0x110A, 0x1125, 
-0x1107, 0x110B, 0x112B, 
-0x1107, 0x110C, 0x1127, 
-0x1107, 0x110E, 0x1128, 
-0x1107, 0x1110, 0x1129, 
-0x1107, 0x1111, 0x112A, 
-0x1107, 0x112B, 0x112C, 
-0x1107, 0x112D, 0x1122, 
-0x1107, 0x112F, 0x1123, 
-0x1107, 0x1132, 0x1124, 
-0x1107, 0x1136, 0x1126, 
-0x1108, 0x110B, 0x112C, 
-0x1109, 0x1100, 0x112D, 
-0x1109, 0x1102, 0x112E, 
-0x1109, 0x1103, 0x112F, 
-0x1109, 0x1105, 0x1130, 
-0x1109, 0x1106, 0x1131, 
-0x1109, 0x1107, 0x1132, 
-0x1109, 0x1109, 0x110A, 
-0x1109, 0x110A, 0x1134, 
-0x1109, 0x110B, 0x1135, 
-0x1109, 0x110C, 0x1136, 
-0x1109, 0x110E, 0x1137, 
-0x1109, 0x110F, 0x1138, 
-0x1109, 0x1110, 0x1139, 
-0x1109, 0x1111, 0x113A, 
-0x1109, 0x1112, 0x113B, 
-0x1109, 0x111E, 0x1133, 
-0x110A, 0x1109, 0x1134, 
-0x110B, 0x1100, 0x1141, 
-0x110B, 0x1103, 0x1142, 
-0x110B, 0x1106, 0x1143, 
-0x110B, 0x1107, 0x1144, 
-0x110B, 0x1109, 0x1145, 
-0x110B, 0x110B, 0x1147, 
-0x110B, 0x110C, 0x1148, 
-0x110B, 0x110E, 0x1149, 
-0x110B, 0x1110, 0x114A, 
-0x110B, 0x1111, 0x114B, 
-0x110B, 0x1140, 0x1146, 
-0x110C, 0x110B, 0x114D, 
-0x110C, 0x110C, 0x110D, 
-0x110E, 0x110F, 0x1152, 
-0x110E, 0x1112, 0x1153, 
-0x1111, 0x1107, 0x1156, 
-0x1111, 0x110B, 0x1157, 
-0x1112, 0x1112, 0x1158, 
-0x1121, 0x1100, 0x1122, 
-0x1121, 0x1103, 0x1123, 
-0x1121, 0x1107, 0x1124, 
-0x1121, 0x1109, 0x1125, 
-0x1121, 0x110C, 0x1126, 
-0x1132, 0x1100, 0x1133, 
-0x113C, 0x113C, 0x113D, 
-0x113E, 0x113E, 0x113F, 
-0x114E, 0x114E, 0x114F, 
-0x1150, 0x1150, 0x1151, 
-0x1161, 0x1169, 0x1176, 
-0x1161, 0x116E, 0x1177, 
-0x1161, 0x1175, 0x1162, 
-0x1163, 0x1169, 0x1178, 
-0x1163, 0x116D, 0x1179, 
-0x1163, 0x1175, 0x1164, 
-0x1165, 0x1169, 0x117A, 
-0x1165, 0x116E, 0x117B, 
-0x1165, 0x1173, 0x117C, 
-0x1165, 0x1175, 0x1166, 
-0x1167, 0x1169, 0x117D, 
-0x1167, 0x116E, 0x117E, 
-0x1167, 0x1175, 0x1168, 
-0x1169, 0x1161, 0x116A, 
-0x1169, 0x1162, 0x116B, 
-0x1169, 0x1165, 0x117F, 
-0x1169, 0x1166, 0x1180, 
-0x1169, 0x1168, 0x1181, 
-0x1169, 0x1169, 0x1182, 
-0x1169, 0x116E, 0x1183, 
-0x1169, 0x1175, 0x116C, 
-0x116A, 0x1175, 0x116B, 
-0x116D, 0x1163, 0x1184, 
-0x116D, 0x1164, 0x1185, 
-0x116D, 0x1167, 0x1186, 
-0x116D, 0x1169, 0x1187, 
-0x116D, 0x1175, 0x1188, 
-0x116E, 0x1161, 0x1189, 
-0x116E, 0x1162, 0x118A, 
-0x116E, 0x1165, 0x116F, 
-0x116E, 0x1166, 0x1170, 
-0x116E, 0x1168, 0x118C, 
-0x116E, 0x116E, 0x118D, 
-0x116E, 0x1175, 0x1171, 
-0x116E, 0x117C, 0x118B, 
-0x116F, 0x1173, 0x118B, 
-0x116F, 0x1175, 0x1170, 
-0x1172, 0x1161, 0x118E, 
-0x1172, 0x1165, 0x118F, 
-0x1172, 0x1166, 0x1190, 
-0x1172, 0x1167, 0x1191, 
-0x1172, 0x1168, 0x1192, 
-0x1172, 0x116E, 0x1193, 
-0x1172, 0x1175, 0x1194, 
-0x1173, 0x116E, 0x1195, 
-0x1173, 0x1173, 0x1196, 
-0x1173, 0x1175, 0x1174, 
-0x1174, 0x116E, 0x1197, 
-0x1175, 0x1161, 0x1198, 
-0x1175, 0x1163, 0x1199, 
-0x1175, 0x1169, 0x119A, 
-0x1175, 0x116E, 0x119B, 
-0x1175, 0x1173, 0x119C, 
-0x1175, 0x119E, 0x119D, 
-0x119E, 0x1165, 0x119F, 
-0x119E, 0x116E, 0x11A0, 
-0x119E, 0x1175, 0x11A1, 
-0x119E, 0x119E, 0x11A2, 
-0x11A8, 0x11A8, 0x11A9, 
-0x11A8, 0x11AF, 0x11C3, 
-0x11A8, 0x11BA, 0x11AA, 
-0x11A8, 0x11E7, 0x11C4, 
-0x11AA, 0x11A8, 0x11C4, 
-0x11AB, 0x11A8, 0x11C5, 
-0x11AB, 0x11AE, 0x11C6, 
-0x11AB, 0x11BA, 0x11C7, 
-0x11AB, 0x11BD, 0x11AC, 
-0x11AB, 0x11C0, 0x11C9, 
-0x11AB, 0x11C2, 0x11AD, 
-0x11AB, 0x11EB, 0x11C8, 
-0x11AE, 0x11A8, 0x11CA, 
-0x11AE, 0x11AF, 0x11CB, 
-0x11AF, 0x11A8, 0x11B0, 
-0x11AF, 0x11AA, 0x11CC, 
-0x11AF, 0x11AB, 0x11CD, 
-0x11AF, 0x11AE, 0x11CE, 
-0x11AF, 0x11AF, 0x11D0, 
-0x11AF, 0x11B7, 0x11B1, 
-0x11AF, 0x11B8, 0x11B2, 
-0x11AF, 0x11B9, 0x11D3, 
-0x11AF, 0x11BA, 0x11B3, 
-0x11AF, 0x11BB, 0x11D6, 
-0x11AF, 0x11BF, 0x11D8, 
-0x11AF, 0x11C0, 0x11B4, 
-0x11AF, 0x11C1, 0x11B5, 
-0x11AF, 0x11C2, 0x11B6, 
-0x11AF, 0x11DA, 0x11D1, 
-0x11AF, 0x11DD, 0x11D2, 
-0x11AF, 0x11E5, 0x11D4, 
-0x11AF, 0x11E6, 0x11D5, 
-0x11AF, 0x11EB, 0x11D7, 
-0x11AF, 0x11F9, 0x11D9, 
-0x11B0, 0x11BA, 0x11CC, 
-0x11B1, 0x11A8, 0x11D1, 
-0x11B1, 0x11BA, 0x11D2, 
-0x11B2, 0x11BA, 0x11D3, 
-0x11B2, 0x11BC, 0x11D5, 
-0x11B2, 0x11C2, 0x11D4, 
-0x11B3, 0x11BA, 0x11D6, 
-0x11B7, 0x11A8, 0x11DA, 
-0x11B7, 0x11AF, 0x11DB, 
-0x11B7, 0x11B8, 0x11DC, 
-0x11B7, 0x11BA, 0x11DD, 
-0x11B7, 0x11BB, 0x11DE, 
-0x11B7, 0x11BC, 0x11E2, 
-0x11B7, 0x11BE, 0x11E0, 
-0x11B7, 0x11C2, 0x11E1, 
-0x11B7, 0x11EB, 0x11DF, 
-0x11B8, 0x11AF, 0x11E3, 
-0x11B8, 0x11BA, 0x11B9, 
-0x11B8, 0x11BC, 0x11E6, 
-0x11B8, 0x11C1, 0x11E4, 
-0x11B8, 0x11C2, 0x11E5, 
-0x11BA, 0x11A8, 0x11E7, 
-0x11BA, 0x11AE, 0x11E8, 
-0x11BA, 0x11AF, 0x11E9, 
-0x11BA, 0x11B8, 0x11EA, 
-0x11BA, 0x11BA, 0x11BB, 
-0x11BC, 0x11A8, 0x11EC, 
-0x11BC, 0x11A9, 0x11ED, 
-0x11BC, 0x11BC, 0x11EE, 
-0x11BC, 0x11BF, 0x11EF, 
-0x11C1, 0x11B8, 0x11F3, 
-0x11C1, 0x11BC, 0x11F4, 
-0x11C2, 0x11AB, 0x11F5, 
-0x11C2, 0x11AF, 0x11F6, 
-0x11C2, 0x11B7, 0x11F7, 
-0x11C2, 0x11B8, 0x11F8, 
-0x11CE, 0x11C2, 0x11CF, 
-0x11DD, 0x11BA, 0x11DE, 
-0x11EC, 0x11A8, 0x11ED, 
-0x11F0, 0x11BA, 0x11F1, 
-0x11F0, 0x11EB, 0x11F2, 
-0x1FBF, IBUS_KEY_apostrophe, 0x1FCE, 
-0x1FBF, IBUS_KEY_grave, 0x1FCD, 
-0x1FBF, IBUS_KEY_asciitilde, 0x1FCF, 
-0x1FBF, IBUS_KEY_acute, 0x1FCE, 
-0x1FBF, IBUS_KEY_dead_grave, 0x1FCD, 
-0x1FBF, IBUS_KEY_dead_acute, 0x1FCE, 
-0x1FBF, IBUS_KEY_dead_tilde, 0x1FCF, 
-0x1FFE, IBUS_KEY_apostrophe, 0x1FDE, 
-0x1FFE, IBUS_KEY_grave, 0x1FDD, 
-0x1FFE, IBUS_KEY_asciitilde, 0x1FDF, 
-0x1FFE, IBUS_KEY_acute, 0x1FDE, 
-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, 
-0x2277, 0x0338, 0x2279, 
-0x227A, 0x0338, 0x2280, 
-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, 
-0x22B2, 0x0338, 0x22EA, 
-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, 
-IBUS_KEY_KP_Divide, IBUS_KEY_H, 0x0126, 
-IBUS_KEY_KP_Divide, IBUS_KEY_I, 0x0197, 
-IBUS_KEY_KP_Divide, IBUS_KEY_L, 0x0141, 
-IBUS_KEY_KP_Divide, IBUS_KEY_O, 0x00D8, 
-IBUS_KEY_KP_Divide, IBUS_KEY_T, 0x0166, 
-IBUS_KEY_KP_Divide, IBUS_KEY_Z, 0x01B5, 
-IBUS_KEY_KP_Divide, IBUS_KEY_b, 0x0180, 
-IBUS_KEY_KP_Divide, IBUS_KEY_d, 0x0111, 
-IBUS_KEY_KP_Divide, IBUS_KEY_g, 0x01E5, 
-IBUS_KEY_KP_Divide, IBUS_KEY_h, 0x0127, 
-IBUS_KEY_KP_Divide, IBUS_KEY_i, 0x0268, 
-IBUS_KEY_KP_Divide, IBUS_KEY_l, 0x0142, 
-IBUS_KEY_KP_Divide, IBUS_KEY_o, 0x00F8, 
-IBUS_KEY_KP_Divide, IBUS_KEY_t, 0x0167, 
-IBUS_KEY_KP_Divide, IBUS_KEY_z, 0x01B6, 
-IBUS_KEY_KP_Divide, 0x0294, 0x02A1, 
-IBUS_KEY_KP_Divide, 0x04AE, 0x04B0, 
-IBUS_KEY_KP_Divide, 0x04AF, 0x04B1, 
-IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_ghe, 0x0493, 
-IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_ka, 0x049F, 
-IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_GHE, 0x0492, 
-IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_KA, 0x049E, 
-IBUS_KEY_KP_Divide, IBUS_KEY_leftarrow, 0x219A, 
-IBUS_KEY_KP_Divide, IBUS_KEY_rightarrow, 0x219B, 
-IBUS_KEY_KP_Divide, 0x2194, 0x21AE, 
-IBUS_KEY_KP_Equal, 0x0338, 0x2260, 
-IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_O, 0x1EE2, 
-IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_U, 0x1EF0, 
-IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_o, 0x1EE3, 
-IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_u, 0x1EF1, 
-IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EE2, 
-IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EF0, 
-IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EE3, 
-IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EF1, 
-IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_U, 0x1E7A, 
-IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_u, 0x1E7B, 
-IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4E, 
-IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x1E4F, 
-IBUS_KEY_quotedbl, IBUS_KEY_macron, IBUS_KEY_U, 0x1E7A, 
-IBUS_KEY_quotedbl, IBUS_KEY_macron, IBUS_KEY_u, 0x1E7B, 
-IBUS_KEY_quotedbl, IBUS_KEY_dead_tilde, IBUS_KEY_O, 0x1E4E, 
-IBUS_KEY_quotedbl, IBUS_KEY_dead_tilde, IBUS_KEY_o, 0x1E4F, 
-IBUS_KEY_quotedbl, IBUS_KEY_dead_macron, IBUS_KEY_U, 0x1E7A, 
-IBUS_KEY_quotedbl, IBUS_KEY_dead_macron, IBUS_KEY_u, 0x1E7B, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_space, 0x0385, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_I, 0x1E2E, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D7, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_i, 0x1E2F, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D8, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDA, 
-IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_U, 0x1EE8, 
-IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDB, 
-IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_u, 0x1EE9, 
-IBUS_KEY_apostrophe, IBUS_KEY_slash, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_apostrophe, IBUS_KEY_slash, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA4, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EBE, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED0, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA5, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EBF, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED1, 
-IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_apostrophe, IBUS_KEY_b, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_apostrophe, IBUS_KEY_b, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4C, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_U, 0x1E78, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x1E4D, 
-IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_u, 0x1E79, 
-IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_apostrophe, IBUS_KEY_cedilla, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_apostrophe, IBUS_KEY_cedilla, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_A, 0x1EA4, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0x1EBE, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_O, 0x1ED0, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_a, 0x1EA5, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_e, 0x1EBF, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_o, 0x1ED1, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_O, 0x1E4C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_U, 0x1E78, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_o, 0x1E4D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_u, 0x1E79, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_breve, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_breve, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_I, 0x1E2E, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01D7, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_i, 0x1E2F, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01D8, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_abovering, IBUS_KEY_A, 0x01FA, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_abovering, IBUS_KEY_a, 0x01FB, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_cedilla, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_cedilla, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EDA, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EE8, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EDB, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EE9, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_apostrophe, IBUS_KEY_KP_Divide, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_apostrophe, IBUS_KEY_KP_Divide, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_parenleft, IBUS_KEY_0, IBUS_KEY_parenright, 0x24EA, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_parenright, 0x2460, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_parenright, 0x2461, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_parenright, 0x2462, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_parenright, 0x2463, 
-IBUS_KEY_parenleft, IBUS_KEY_5, IBUS_KEY_parenright, 0x2464, 
-IBUS_KEY_parenleft, IBUS_KEY_6, IBUS_KEY_parenright, 0x2465, 
-IBUS_KEY_parenleft, IBUS_KEY_7, IBUS_KEY_parenright, 0x2466, 
-IBUS_KEY_parenleft, IBUS_KEY_8, IBUS_KEY_parenright, 0x2467, 
-IBUS_KEY_parenleft, IBUS_KEY_9, IBUS_KEY_parenright, 0x2468, 
-IBUS_KEY_parenleft, IBUS_KEY_A, IBUS_KEY_parenright, 0x24B6, 
-IBUS_KEY_parenleft, IBUS_KEY_B, IBUS_KEY_parenright, 0x24B7, 
-IBUS_KEY_parenleft, IBUS_KEY_C, IBUS_KEY_parenright, 0x24B8, 
-IBUS_KEY_parenleft, IBUS_KEY_D, IBUS_KEY_parenright, 0x24B9, 
-IBUS_KEY_parenleft, IBUS_KEY_E, IBUS_KEY_parenright, 0x24BA, 
-IBUS_KEY_parenleft, IBUS_KEY_F, IBUS_KEY_parenright, 0x24BB, 
-IBUS_KEY_parenleft, IBUS_KEY_G, IBUS_KEY_parenright, 0x24BC, 
-IBUS_KEY_parenleft, IBUS_KEY_H, IBUS_KEY_parenright, 0x24BD, 
-IBUS_KEY_parenleft, IBUS_KEY_I, IBUS_KEY_parenright, 0x24BE, 
-IBUS_KEY_parenleft, IBUS_KEY_J, IBUS_KEY_parenright, 0x24BF, 
-IBUS_KEY_parenleft, IBUS_KEY_K, IBUS_KEY_parenright, 0x24C0, 
-IBUS_KEY_parenleft, IBUS_KEY_L, IBUS_KEY_parenright, 0x24C1, 
-IBUS_KEY_parenleft, IBUS_KEY_M, IBUS_KEY_parenright, 0x24C2, 
-IBUS_KEY_parenleft, IBUS_KEY_N, IBUS_KEY_parenright, 0x24C3, 
-IBUS_KEY_parenleft, IBUS_KEY_O, IBUS_KEY_parenright, 0x24C4, 
-IBUS_KEY_parenleft, IBUS_KEY_P, IBUS_KEY_parenright, 0x24C5, 
-IBUS_KEY_parenleft, IBUS_KEY_Q, IBUS_KEY_parenright, 0x24C6, 
-IBUS_KEY_parenleft, IBUS_KEY_R, IBUS_KEY_parenright, 0x24C7, 
-IBUS_KEY_parenleft, IBUS_KEY_S, IBUS_KEY_parenright, 0x24C8, 
-IBUS_KEY_parenleft, IBUS_KEY_T, IBUS_KEY_parenright, 0x24C9, 
-IBUS_KEY_parenleft, IBUS_KEY_U, IBUS_KEY_parenright, 0x24CA, 
-IBUS_KEY_parenleft, IBUS_KEY_V, IBUS_KEY_parenright, 0x24CB, 
-IBUS_KEY_parenleft, IBUS_KEY_W, IBUS_KEY_parenright, 0x24CC, 
-IBUS_KEY_parenleft, IBUS_KEY_X, IBUS_KEY_parenright, 0x24CD, 
-IBUS_KEY_parenleft, IBUS_KEY_Y, IBUS_KEY_parenright, 0x24CE, 
-IBUS_KEY_parenleft, IBUS_KEY_Z, IBUS_KEY_parenright, 0x24CF, 
-IBUS_KEY_parenleft, IBUS_KEY_a, IBUS_KEY_parenright, 0x24D0, 
-IBUS_KEY_parenleft, IBUS_KEY_b, IBUS_KEY_parenright, 0x24D1, 
-IBUS_KEY_parenleft, IBUS_KEY_c, IBUS_KEY_parenright, 0x24D2, 
-IBUS_KEY_parenleft, IBUS_KEY_d, IBUS_KEY_parenright, 0x24D3, 
-IBUS_KEY_parenleft, IBUS_KEY_e, IBUS_KEY_parenright, 0x24D4, 
-IBUS_KEY_parenleft, IBUS_KEY_f, IBUS_KEY_parenright, 0x24D5, 
-IBUS_KEY_parenleft, IBUS_KEY_g, IBUS_KEY_parenright, 0x24D6, 
-IBUS_KEY_parenleft, IBUS_KEY_h, IBUS_KEY_parenright, 0x24D7, 
-IBUS_KEY_parenleft, IBUS_KEY_i, IBUS_KEY_parenright, 0x24D8, 
-IBUS_KEY_parenleft, IBUS_KEY_j, IBUS_KEY_parenright, 0x24D9, 
-IBUS_KEY_parenleft, IBUS_KEY_k, IBUS_KEY_parenright, 0x24DA, 
-IBUS_KEY_parenleft, IBUS_KEY_l, IBUS_KEY_parenright, 0x24DB, 
-IBUS_KEY_parenleft, IBUS_KEY_m, IBUS_KEY_parenright, 0x24DC, 
-IBUS_KEY_parenleft, IBUS_KEY_n, IBUS_KEY_parenright, 0x24DD, 
-IBUS_KEY_parenleft, IBUS_KEY_o, IBUS_KEY_parenright, 0x24DE, 
-IBUS_KEY_parenleft, IBUS_KEY_p, IBUS_KEY_parenright, 0x24DF, 
-IBUS_KEY_parenleft, IBUS_KEY_q, IBUS_KEY_parenright, 0x24E0, 
-IBUS_KEY_parenleft, IBUS_KEY_r, IBUS_KEY_parenright, 0x24E1, 
-IBUS_KEY_parenleft, IBUS_KEY_s, IBUS_KEY_parenright, 0x24E2, 
-IBUS_KEY_parenleft, IBUS_KEY_t, IBUS_KEY_parenright, 0x24E3, 
-IBUS_KEY_parenleft, IBUS_KEY_u, IBUS_KEY_parenright, 0x24E4, 
-IBUS_KEY_parenleft, IBUS_KEY_v, IBUS_KEY_parenright, 0x24E5, 
-IBUS_KEY_parenleft, IBUS_KEY_w, IBUS_KEY_parenright, 0x24E6, 
-IBUS_KEY_parenleft, IBUS_KEY_x, IBUS_KEY_parenright, 0x24E7, 
-IBUS_KEY_parenleft, IBUS_KEY_y, IBUS_KEY_parenright, 0x24E8, 
-IBUS_KEY_parenleft, IBUS_KEY_z, IBUS_KEY_parenright, 0x24E9, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_WO, IBUS_KEY_parenright, 0x32FE, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_A, IBUS_KEY_parenright, 0x32D0, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_I, IBUS_KEY_parenright, 0x32D1, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_U, IBUS_KEY_parenright, 0x32D2, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_E, IBUS_KEY_parenright, 0x32D3, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_O, IBUS_KEY_parenright, 0x32D4, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_KA, IBUS_KEY_parenright, 0x32D5, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_KI, IBUS_KEY_parenright, 0x32D6, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_KU, IBUS_KEY_parenright, 0x32D7, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_KE, IBUS_KEY_parenright, 0x32D8, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_KO, IBUS_KEY_parenright, 0x32D9, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_SA, IBUS_KEY_parenright, 0x32DA, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_SHI, IBUS_KEY_parenright, 0x32DB, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_SU, IBUS_KEY_parenright, 0x32DC, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_SE, IBUS_KEY_parenright, 0x32DD, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_SO, IBUS_KEY_parenright, 0x32DE, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_TA, IBUS_KEY_parenright, 0x32DF, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_CHI, IBUS_KEY_parenright, 0x32E0, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_TSU, IBUS_KEY_parenright, 0x32E1, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_TE, IBUS_KEY_parenright, 0x32E2, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_TO, IBUS_KEY_parenright, 0x32E3, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_NA, IBUS_KEY_parenright, 0x32E4, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_NI, IBUS_KEY_parenright, 0x32E5, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_NU, IBUS_KEY_parenright, 0x32E6, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_NE, IBUS_KEY_parenright, 0x32E7, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_NO, IBUS_KEY_parenright, 0x32E8, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_HA, IBUS_KEY_parenright, 0x32E9, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_HI, IBUS_KEY_parenright, 0x32EA, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_FU, IBUS_KEY_parenright, 0x32EB, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_HE, IBUS_KEY_parenright, 0x32EC, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_HO, IBUS_KEY_parenright, 0x32ED, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_MA, IBUS_KEY_parenright, 0x32EE, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_MI, IBUS_KEY_parenright, 0x32EF, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_MU, IBUS_KEY_parenright, 0x32F0, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_ME, IBUS_KEY_parenright, 0x32F1, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_MO, IBUS_KEY_parenright, 0x32F2, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_YA, IBUS_KEY_parenright, 0x32F3, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_YU, IBUS_KEY_parenright, 0x32F4, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_YO, IBUS_KEY_parenright, 0x32F5, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_RA, IBUS_KEY_parenright, 0x32F6, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_RI, IBUS_KEY_parenright, 0x32F7, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_RU, IBUS_KEY_parenright, 0x32F8, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_RE, IBUS_KEY_parenright, 0x32F9, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_RO, IBUS_KEY_parenright, 0x32FA, 
-IBUS_KEY_parenleft, IBUS_KEY_kana_WA, IBUS_KEY_parenright, 0x32FB, 
-IBUS_KEY_parenleft, 0x1100, IBUS_KEY_parenright, 0x3260, 
-IBUS_KEY_parenleft, 0x1102, IBUS_KEY_parenright, 0x3261, 
-IBUS_KEY_parenleft, 0x1103, IBUS_KEY_parenright, 0x3262, 
-IBUS_KEY_parenleft, 0x1105, IBUS_KEY_parenright, 0x3263, 
-IBUS_KEY_parenleft, 0x1106, IBUS_KEY_parenright, 0x3264, 
-IBUS_KEY_parenleft, 0x1107, IBUS_KEY_parenright, 0x3265, 
-IBUS_KEY_parenleft, 0x1109, IBUS_KEY_parenright, 0x3266, 
-IBUS_KEY_parenleft, 0x110B, IBUS_KEY_parenright, 0x3267, 
-IBUS_KEY_parenleft, 0x110C, IBUS_KEY_parenright, 0x3268, 
-IBUS_KEY_parenleft, 0x110E, IBUS_KEY_parenright, 0x3269, 
-IBUS_KEY_parenleft, 0x110F, IBUS_KEY_parenright, 0x326A, 
-IBUS_KEY_parenleft, 0x1110, IBUS_KEY_parenright, 0x326B, 
-IBUS_KEY_parenleft, 0x1111, IBUS_KEY_parenright, 0x326C, 
-IBUS_KEY_parenleft, 0x1112, IBUS_KEY_parenright, 0x326D, 
-IBUS_KEY_parenleft, 0x30F0, IBUS_KEY_parenright, 0x32FC, 
-IBUS_KEY_parenleft, 0x30F1, IBUS_KEY_parenright, 0x32FD, 
-IBUS_KEY_parenleft, 0x4E00, IBUS_KEY_parenright, 0x3280, 
-IBUS_KEY_parenleft, 0x4E03, IBUS_KEY_parenright, 0x3286, 
-IBUS_KEY_parenleft, 0x4E09, IBUS_KEY_parenright, 0x3282, 
-IBUS_KEY_parenleft, 0x4E0A, IBUS_KEY_parenright, 0x32A4, 
-IBUS_KEY_parenleft, 0x4E0B, IBUS_KEY_parenright, 0x32A6, 
-IBUS_KEY_parenleft, 0x4E2D, IBUS_KEY_parenright, 0x32A5, 
-IBUS_KEY_parenleft, 0x4E5D, IBUS_KEY_parenright, 0x3288, 
-IBUS_KEY_parenleft, 0x4E8C, IBUS_KEY_parenright, 0x3281, 
-IBUS_KEY_parenleft, 0x4E94, IBUS_KEY_parenright, 0x3284, 
-IBUS_KEY_parenleft, 0x4F01, IBUS_KEY_parenright, 0x32AD, 
-IBUS_KEY_parenleft, 0x4F11, IBUS_KEY_parenright, 0x32A1, 
-IBUS_KEY_parenleft, 0x512A, IBUS_KEY_parenright, 0x329D, 
-IBUS_KEY_parenleft, 0x516B, IBUS_KEY_parenright, 0x3287, 
-IBUS_KEY_parenleft, 0x516D, IBUS_KEY_parenright, 0x3285, 
-IBUS_KEY_parenleft, 0x5199, IBUS_KEY_parenright, 0x32A2, 
-IBUS_KEY_parenleft, 0x52B4, IBUS_KEY_parenright, 0x3298, 
-IBUS_KEY_parenleft, 0x533B, IBUS_KEY_parenright, 0x32A9, 
-IBUS_KEY_parenleft, 0x5341, IBUS_KEY_parenright, 0x3289, 
-IBUS_KEY_parenleft, 0x5354, IBUS_KEY_parenright, 0x32AF, 
-IBUS_KEY_parenleft, 0x5370, IBUS_KEY_parenright, 0x329E, 
-IBUS_KEY_parenleft, 0x53F3, IBUS_KEY_parenright, 0x32A8, 
-IBUS_KEY_parenleft, 0x540D, IBUS_KEY_parenright, 0x3294, 
-IBUS_KEY_parenleft, 0x56DB, IBUS_KEY_parenright, 0x3283, 
-IBUS_KEY_parenleft, 0x571F, IBUS_KEY_parenright, 0x328F, 
-IBUS_KEY_parenleft, 0x591C, IBUS_KEY_parenright, 0x32B0, 
-IBUS_KEY_parenleft, 0x5973, IBUS_KEY_parenright, 0x329B, 
-IBUS_KEY_parenleft, 0x5B66, IBUS_KEY_parenright, 0x32AB, 
-IBUS_KEY_parenleft, 0x5B97, IBUS_KEY_parenright, 0x32AA, 
-IBUS_KEY_parenleft, 0x5DE6, IBUS_KEY_parenright, 0x32A7, 
-IBUS_KEY_parenleft, 0x65E5, IBUS_KEY_parenright, 0x3290, 
-IBUS_KEY_parenleft, 0x6708, IBUS_KEY_parenright, 0x328A, 
-IBUS_KEY_parenleft, 0x6709, IBUS_KEY_parenright, 0x3292, 
-IBUS_KEY_parenleft, 0x6728, IBUS_KEY_parenright, 0x328D, 
-IBUS_KEY_parenleft, 0x682A, IBUS_KEY_parenright, 0x3291, 
-IBUS_KEY_parenleft, 0x6B63, IBUS_KEY_parenright, 0x32A3, 
-IBUS_KEY_parenleft, 0x6C34, IBUS_KEY_parenright, 0x328C, 
-IBUS_KEY_parenleft, 0x6CE8, IBUS_KEY_parenright, 0x329F, 
-IBUS_KEY_parenleft, 0x706B, IBUS_KEY_parenright, 0x328B, 
-IBUS_KEY_parenleft, 0x7279, IBUS_KEY_parenright, 0x3295, 
-IBUS_KEY_parenleft, 0x7537, IBUS_KEY_parenright, 0x329A, 
-IBUS_KEY_parenleft, 0x76E3, IBUS_KEY_parenright, 0x32AC, 
-IBUS_KEY_parenleft, 0x793E, IBUS_KEY_parenright, 0x3293, 
-IBUS_KEY_parenleft, 0x795D, IBUS_KEY_parenright, 0x3297, 
-IBUS_KEY_parenleft, 0x79D8, IBUS_KEY_parenright, 0x3299, 
-IBUS_KEY_parenleft, 0x8CA1, IBUS_KEY_parenright, 0x3296, 
-IBUS_KEY_parenleft, 0x8CC7, IBUS_KEY_parenright, 0x32AE, 
-IBUS_KEY_parenleft, 0x9069, IBUS_KEY_parenright, 0x329C, 
-IBUS_KEY_parenleft, 0x91D1, IBUS_KEY_parenright, 0x328E, 
-IBUS_KEY_parenleft, 0x9805, IBUS_KEY_parenright, 0x32A0, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x2461, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x24EA, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x2460, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x2461, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x2462, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x2463, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x2464, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x2465, 
-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, 
-IBUS_KEY_period, IBUS_KEY_exclam, IBUS_KEY_S, 0x1E68, 
-IBUS_KEY_period, IBUS_KEY_exclam, IBUS_KEY_s, 0x1E69, 
-IBUS_KEY_period, IBUS_KEY_apostrophe, IBUS_KEY_S, 0x1E64, 
-IBUS_KEY_period, IBUS_KEY_apostrophe, IBUS_KEY_s, 0x1E65, 
-IBUS_KEY_period, IBUS_KEY_acute, IBUS_KEY_S, 0x1E64, 
-IBUS_KEY_period, IBUS_KEY_acute, IBUS_KEY_s, 0x1E65, 
-IBUS_KEY_period, IBUS_KEY_dead_acute, IBUS_KEY_S, 0x1E64, 
-IBUS_KEY_period, IBUS_KEY_dead_acute, IBUS_KEY_s, 0x1E65, 
-IBUS_KEY_period, IBUS_KEY_dead_caron, IBUS_KEY_S, 0x1E66, 
-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, 
-IBUS_KEY_question, IBUS_KEY_plus, IBUS_KEY_u, 0x1EED, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA8, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC2, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED4, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA9, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC3, 
-IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED5, 
-IBUS_KEY_question, IBUS_KEY_b, IBUS_KEY_A, 0x1EB2, 
-IBUS_KEY_question, IBUS_KEY_b, IBUS_KEY_a, 0x1EB3, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_A, 0x1EA8, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0x1EC2, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_O, 0x1ED4, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_a, 0x1EA9, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_e, 0x1EC3, 
-IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_o, 0x1ED5, 
-IBUS_KEY_question, IBUS_KEY_dead_breve, IBUS_KEY_A, 0x1EB2, 
-IBUS_KEY_question, IBUS_KEY_dead_breve, IBUS_KEY_a, 0x1EB3, 
-IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EDE, 
-IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EEC, 
-IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EDF, 
-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_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, 
-IBUS_KEY_U, IBUS_KEY_dead_cedilla, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_U, IBUS_KEY_dead_belowdot, IBUS_KEY_A, 0x1EB6, 
-IBUS_KEY_U, IBUS_KEY_dead_belowdot, IBUS_KEY_a, 0x1EB7, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_A, 0x1EAC, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_E, 0x1EC6, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_O, 0x1ED8, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_a, 0x1EAD, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_e, 0x1EC7, 
-IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_o, 0x1ED9, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_a, 0x00AA, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_h, 0x02B0, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_i, 0x2071, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_j, 0x02B2, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_l, 0x02E1, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_n, 0x207F, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_o, 0x00BA, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_r, 0x02B3, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_s, 0x02E2, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_w, 0x02B7, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_x, 0x02E3, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_y, 0x02B8, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0263, 0x02E0, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0266, 0x02B1, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0279, 0x02B4, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x027B, 0x02B5, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0281, 0x02B6, 
-IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0295, 0x02E4, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_a, 0x00AA, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_h, 0x02B0, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_i, 0x2071, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_j, 0x02B2, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_l, 0x02E1, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_n, 0x207F, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_o, 0x00BA, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_r, 0x02B3, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_s, 0x02E2, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_w, 0x02B7, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_x, 0x02E3, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_y, 0x02B8, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0263, 0x02E0, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0266, 0x02B1, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0279, 0x02B4, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x027B, 0x02B5, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0281, 0x02B6, 
-IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0295, 0x02E4, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_A, 0x1EAC, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_E, 0x1EC6, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_O, 0x1ED8, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_a, 0x1EAD, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_e, 0x1EC7, 
-IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_o, 0x1ED9, 
-IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_L, 0x1E38, 
-IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_R, 0x1E5C, 
-IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_l, 0x1E39, 
-IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_r, 0x1E5D, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_A, 0x01DE, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_O, 0x022A, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D5, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_a, 0x01DF, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_o, 0x022B, 
-IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D6, 
-IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_A, 0x01E0, 
-IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_O, 0x0230, 
-IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_a, 0x01E1, 
-IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_o, 0x0231, 
-IBUS_KEY_underscore, IBUS_KEY_semicolon, IBUS_KEY_O, 0x01EC, 
-IBUS_KEY_underscore, IBUS_KEY_semicolon, IBUS_KEY_o, 0x01ED, 
-IBUS_KEY_underscore, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x022C, 
-IBUS_KEY_underscore, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x022D, 
-IBUS_KEY_underscore, IBUS_KEY_dead_tilde, IBUS_KEY_O, 0x022C, 
-IBUS_KEY_underscore, IBUS_KEY_dead_tilde, IBUS_KEY_o, 0x022D, 
-IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_A, 0x01E0, 
-IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_O, 0x0230, 
-IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_a, 0x01E1, 
-IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_o, 0x0231, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_A, 0x01DE, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_O, 0x022A, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01D5, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_a, 0x01DF, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_o, 0x022B, 
-IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01D6, 
-IBUS_KEY_underscore, IBUS_KEY_dead_ogonek, IBUS_KEY_O, 0x01EC, 
-IBUS_KEY_underscore, IBUS_KEY_dead_ogonek, IBUS_KEY_o, 0x01ED, 
-IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_L, 0x1E38, 
-IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_R, 0x1E5C, 
-IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_l, 0x1E39, 
-IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_r, 0x1E5D, 
-IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01DB, 
-IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01DC, 
-IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x1FD2, 
-IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x1FE2, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6B, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F03, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F13, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F23, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F33, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F43, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F53, 
-IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F63, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6A, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F02, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F12, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F22, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F32, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F42, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F52, 
-IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F62, 
-IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDC, 
-IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEA, 
-IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDD, 
-IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_u, 0x1EEB, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA6, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC0, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED2, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA7, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC1, 
-IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED3, 
-IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E14, 
-IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E50, 
-IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E15, 
-IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E51, 
-IBUS_KEY_grave, IBUS_KEY_b, IBUS_KEY_A, 0x1EB0, 
-IBUS_KEY_grave, IBUS_KEY_b, IBUS_KEY_a, 0x1EB1, 
-IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_E, 0x1E14, 
-IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_O, 0x1E50, 
-IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_e, 0x1E15, 
-IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_o, 0x1E51, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_A, 0x1EA6, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0x1EC0, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_O, 0x1ED2, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_a, 0x1EA7, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_e, 0x1EC1, 
-IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_o, 0x1ED3, 
-IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_E, 0x1E14, 
-IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_O, 0x1E50, 
-IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_e, 0x1E15, 
-IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_o, 0x1E51, 
-IBUS_KEY_grave, IBUS_KEY_dead_breve, IBUS_KEY_A, 0x1EB0, 
-IBUS_KEY_grave, IBUS_KEY_dead_breve, IBUS_KEY_a, 0x1EB1, 
-IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01DB, 
-IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01DC, 
-IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x1FD2, 
-IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x1FE2, 
-IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EDC, 
-IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EEA, 
-IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EDD, 
-IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EEB, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6A, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F02, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F12, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F22, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F32, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F42, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F52, 
-IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F62, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6B, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F03, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F13, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F23, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F33, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F43, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F53, 
-IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F63, 
-IBUS_KEY_b, IBUS_KEY_exclam, IBUS_KEY_A, 0x1EB6, 
-IBUS_KEY_b, IBUS_KEY_exclam, IBUS_KEY_a, 0x1EB7, 
-IBUS_KEY_b, IBUS_KEY_comma, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_b, IBUS_KEY_comma, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_b, IBUS_KEY_cedilla, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_b, IBUS_KEY_cedilla, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_b, IBUS_KEY_dead_cedilla, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_b, IBUS_KEY_dead_cedilla, IBUS_KEY_e, 0x1E1D, 
-IBUS_KEY_b, IBUS_KEY_dead_belowdot, IBUS_KEY_A, 0x1EB6, 
-IBUS_KEY_b, IBUS_KEY_dead_belowdot, IBUS_KEY_a, 0x1EB7, 
-IBUS_KEY_c, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D9, 
-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_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, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2F, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3F, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5F, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6F, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F07, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F27, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F37, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F57, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F67, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0E, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2E, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3E, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6E, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F06, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F26, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F36, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F56, 
-IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F66, 
-IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_O, 0x1EE0, 
-IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEE, 
-IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_o, 0x1EE1, 
-IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_u, 0x1EEF, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EAA, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC4, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED6, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EAB, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC5, 
-IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED7, 
-IBUS_KEY_asciitilde, IBUS_KEY_b, IBUS_KEY_A, 0x1EB4, 
-IBUS_KEY_asciitilde, IBUS_KEY_b, IBUS_KEY_a, 0x1EB5, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_A, 0x1EAA, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0x1EC4, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_O, 0x1ED6, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_a, 0x1EAB, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_e, 0x1EC5, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_o, 0x1ED7, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_breve, IBUS_KEY_A, 0x1EB4, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_breve, IBUS_KEY_a, 0x1EB5, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x1FD7, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x1FE7, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EE0, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EEE, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EE1, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EEF, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0E, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2E, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3E, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6E, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F06, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F26, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F36, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F56, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F66, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0F, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2F, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3F, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5F, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6F, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F07, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F27, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F37, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F57, 
-IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F67, 
-IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_L, 0x1E38, 
-IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_R, 0x1E5C, 
-IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_l, 0x1E39, 
-IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_r, 0x1E5D, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_A, 0x01DE, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_O, 0x022A, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D5, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_a, 0x01DF, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_o, 0x022B, 
-IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D6, 
-IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_A, 0x01E0, 
-IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_O, 0x0230, 
-IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_a, 0x01E1, 
-IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_o, 0x0231, 
-IBUS_KEY_macron, IBUS_KEY_semicolon, IBUS_KEY_O, 0x01EC, 
-IBUS_KEY_macron, IBUS_KEY_semicolon, IBUS_KEY_o, 0x01ED, 
-IBUS_KEY_macron, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x022C, 
-IBUS_KEY_macron, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x022D, 
-IBUS_KEY_macron, IBUS_KEY_dead_tilde, IBUS_KEY_O, 0x022C, 
-IBUS_KEY_macron, IBUS_KEY_dead_tilde, IBUS_KEY_o, 0x022D, 
-IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_A, 0x01E0, 
-IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_O, 0x0230, 
-IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_a, 0x01E1, 
-IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_o, 0x0231, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_A, 0x01DE, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_O, 0x022A, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01D5, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_a, 0x01DF, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_o, 0x022B, 
-IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01D6, 
-IBUS_KEY_macron, IBUS_KEY_dead_ogonek, IBUS_KEY_O, 0x01EC, 
-IBUS_KEY_macron, IBUS_KEY_dead_ogonek, IBUS_KEY_o, 0x01ED, 
-IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_L, 0x1E38, 
-IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_R, 0x1E5C, 
-IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_l, 0x1E39, 
-IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_r, 0x1E5D, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_I, 0x1E2E, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01D7, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_i, 0x1E2F, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01D8, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDA, 
-IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_U, 0x1EE8, 
-IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDB, 
-IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_u, 0x1EE9, 
-IBUS_KEY_acute, IBUS_KEY_comma, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_acute, IBUS_KEY_comma, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_acute, IBUS_KEY_slash, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_acute, IBUS_KEY_slash, IBUS_KEY_o, 0x01FF, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA4, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EBE, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED0, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA5, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EBF, 
-IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED1, 
-IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_acute, IBUS_KEY_b, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_acute, IBUS_KEY_b, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_O, 0x1E4C, 
-IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_U, 0x1E78, 
-IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_o, 0x1E4D, 
-IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_u, 0x1E79, 
-IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_acute, IBUS_KEY_cedilla, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_acute, IBUS_KEY_cedilla, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_A, 0x1EA4, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0x1EBE, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_O, 0x1ED0, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_a, 0x1EA5, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_e, 0x1EBF, 
-IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_o, 0x1ED1, 
-IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_O, 0x1E4C, 
-IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_U, 0x1E78, 
-IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_o, 0x1E4D, 
-IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_u, 0x1E79, 
-IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_E, 0x1E16, 
-IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_O, 0x1E52, 
-IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_e, 0x1E17, 
-IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_o, 0x1E53, 
-IBUS_KEY_acute, IBUS_KEY_dead_breve, IBUS_KEY_A, 0x1EAE, 
-IBUS_KEY_acute, IBUS_KEY_dead_breve, IBUS_KEY_a, 0x1EAF, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_I, 0x1E2E, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01D7, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_i, 0x1E2F, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01D8, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x0390, 
-IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x03B0, 
-IBUS_KEY_acute, IBUS_KEY_dead_abovering, IBUS_KEY_A, 0x01FA, 
-IBUS_KEY_acute, IBUS_KEY_dead_abovering, IBUS_KEY_a, 0x01FB, 
-IBUS_KEY_acute, IBUS_KEY_dead_cedilla, IBUS_KEY_C, 0x1E08, 
-IBUS_KEY_acute, IBUS_KEY_dead_cedilla, IBUS_KEY_c, 0x1E09, 
-IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_O, 0x1EDA, 
-IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_U, 0x1EE8, 
-IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_o, 0x1EDB, 
-IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EE9, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6C, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F04, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F14, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F24, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F34, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F44, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F54, 
-IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F64, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6D, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F05, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F15, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F25, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F35, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F45, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F55, 
-IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F65, 
-IBUS_KEY_acute, IBUS_KEY_KP_Divide, IBUS_KEY_O, 0x01FE, 
-IBUS_KEY_acute, IBUS_KEY_KP_Divide, IBUS_KEY_o, 0x01FF, 
-0x05C1, 0x05BC, IBUS_KEY_hebrew_shin, 0xFB2C, 
-0x05C2, 0x05BC, IBUS_KEY_hebrew_shin, 0xFB2D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F00, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F01, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F08, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F09, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F20, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F21, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F28, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F29, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F60, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F61, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F68, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F69, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F89, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F99, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FA9, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F81, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F91, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA1, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F88, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F98, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FA8, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F80, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F90, 
-IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA0, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0x1FB2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0x1FC2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0x1FF2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F00, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F01, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F08, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F09, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F20, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F21, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F28, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F29, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F60, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F61, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F68, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F69, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0x1FB7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0x1FC7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0x1FF7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F00, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F01, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F08, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F09, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F20, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F21, 0x1F97, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F28, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F29, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F60, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F61, 0x1FA7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F68, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F69, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F00, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F01, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F08, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F09, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F20, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F21, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F28, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F29, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F60, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F61, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F68, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F69, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0x1FB2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0x1FC2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0x1FF2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F00, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F01, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F08, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F09, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F20, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F21, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F28, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F29, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F60, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F61, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F68, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F69, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0x1FB4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0x1FC4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0x1FF4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F00, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F01, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F08, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F09, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F20, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F21, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F28, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F29, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F60, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F61, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F68, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F69, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0x1FB7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0x1FC7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0x1FF7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F00, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F01, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F08, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F09, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F20, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F21, 0x1F97, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F28, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F29, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F60, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F61, 0x1FA7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F68, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F69, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F88, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F98, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FA8, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F80, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F90, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA0, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F89, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F99, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FA9, 
-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, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_3, IBUS_KEY_parenright, 0x246C, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_4, IBUS_KEY_parenright, 0x246D, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_5, IBUS_KEY_parenright, 0x246E, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_6, IBUS_KEY_parenright, 0x246F, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_7, IBUS_KEY_parenright, 0x2470, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_8, IBUS_KEY_parenright, 0x2471, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_9, IBUS_KEY_parenright, 0x2472, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x246B, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x2469, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x246A, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x246B, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x246C, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x246D, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x246E, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x246F, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x2470, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x2471, 
-IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x2472, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_0, IBUS_KEY_parenright, 0x325A, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_1, IBUS_KEY_parenright, 0x325B, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_2, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_3, IBUS_KEY_parenright, 0x325D, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_4, IBUS_KEY_parenright, 0x325E, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_5, IBUS_KEY_parenright, 0x325F, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_6, IBUS_KEY_parenright, 0x32B1, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_7, IBUS_KEY_parenright, 0x32B2, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_8, IBUS_KEY_parenright, 0x32B3, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_9, IBUS_KEY_parenright, 0x32B4, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x325A, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x325B, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x325D, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x325E, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x325F, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x32B1, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x32B2, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x32B3, 
-IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x32B4, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_0, IBUS_KEY_parenright, 0x32B5, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_1, IBUS_KEY_parenright, 0x32B6, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_2, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_3, IBUS_KEY_parenright, 0x32B8, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_4, IBUS_KEY_parenright, 0x32B9, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_5, IBUS_KEY_parenright, 0x32BA, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_6, IBUS_KEY_parenright, 0x32BB, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_7, IBUS_KEY_parenright, 0x32BC, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_8, IBUS_KEY_parenright, 0x32BD, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_9, IBUS_KEY_parenright, 0x32BE, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x32B5, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x32B6, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x32B8, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x32B9, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x32BA, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x32BB, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x32BC, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x32BD, 
-IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x32BE, 
-IBUS_KEY_parenleft, IBUS_KEY_5, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x32BF, 
-IBUS_KEY_parenleft, 0x1100, 0x1161, IBUS_KEY_parenright, 0x326E, 
-IBUS_KEY_parenleft, 0x1102, 0x1161, IBUS_KEY_parenright, 0x326F, 
-IBUS_KEY_parenleft, 0x1103, 0x1161, IBUS_KEY_parenright, 0x3270, 
-IBUS_KEY_parenleft, 0x1105, 0x1161, IBUS_KEY_parenright, 0x3271, 
-IBUS_KEY_parenleft, 0x1106, 0x1161, IBUS_KEY_parenright, 0x3272, 
-IBUS_KEY_parenleft, 0x1107, 0x1161, IBUS_KEY_parenright, 0x3273, 
-IBUS_KEY_parenleft, 0x1109, 0x1161, IBUS_KEY_parenright, 0x3274, 
-IBUS_KEY_parenleft, 0x110B, 0x1161, IBUS_KEY_parenright, 0x3275, 
-IBUS_KEY_parenleft, 0x110C, 0x1161, IBUS_KEY_parenright, 0x3276, 
-IBUS_KEY_parenleft, 0x110E, 0x1161, IBUS_KEY_parenright, 0x3277, 
-IBUS_KEY_parenleft, 0x110F, 0x1161, IBUS_KEY_parenright, 0x3278, 
-IBUS_KEY_parenleft, 0x1110, 0x1161, IBUS_KEY_parenright, 0x3279, 
-IBUS_KEY_parenleft, 0x1111, 0x1161, IBUS_KEY_parenright, 0x327A, 
-IBUS_KEY_parenleft, 0x1112, 0x1161, IBUS_KEY_parenright, 0x327B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_0, IBUS_KEY_parenright, 0x2469, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_1, IBUS_KEY_parenright, 0x246A, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_2, IBUS_KEY_parenright, 0x246B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_3, IBUS_KEY_parenright, 0x246C, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_4, IBUS_KEY_parenright, 0x246D, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_5, IBUS_KEY_parenright, 0x246E, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_6, IBUS_KEY_parenright, 0x246F, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_7, IBUS_KEY_parenright, 0x2470, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_8, IBUS_KEY_parenright, 0x2471, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_9, IBUS_KEY_parenright, 0x2472, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x246B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x2469, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x246A, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x246B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x246C, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x246D, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x246E, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x246F, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x2470, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x2471, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x2472, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x2473, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x3251, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x3252, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x3253, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x3254, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x3255, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x3256, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x3257, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x3258, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x3259, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_0, IBUS_KEY_parenright, 0x325A, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_1, IBUS_KEY_parenright, 0x325B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_2, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_3, IBUS_KEY_parenright, 0x325D, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_4, IBUS_KEY_parenright, 0x325E, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_5, IBUS_KEY_parenright, 0x325F, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_6, IBUS_KEY_parenright, 0x32B1, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_7, IBUS_KEY_parenright, 0x32B2, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_8, IBUS_KEY_parenright, 0x32B3, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_9, IBUS_KEY_parenright, 0x32B4, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x325A, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x325B, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x325C, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x325D, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x325E, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x325F, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x32B1, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x32B2, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x32B3, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x32B4, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_0, IBUS_KEY_parenright, 0x32B5, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_1, IBUS_KEY_parenright, 0x32B6, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_2, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_3, IBUS_KEY_parenright, 0x32B8, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_4, IBUS_KEY_parenright, 0x32B9, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_5, IBUS_KEY_parenright, 0x32BA, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_6, IBUS_KEY_parenright, 0x32BB, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_7, IBUS_KEY_parenright, 0x32BC, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_8, IBUS_KEY_parenright, 0x32BD, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_9, IBUS_KEY_parenright, 0x32BE, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_Space, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x32B5, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_1, IBUS_KEY_parenright, 0x32B6, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_2, IBUS_KEY_parenright, 0x32B7, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_3, IBUS_KEY_parenright, 0x32B8, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_4, IBUS_KEY_parenright, 0x32B9, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_5, IBUS_KEY_parenright, 0x32BA, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_6, IBUS_KEY_parenright, 0x32BB, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x32BC, 
-IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x32BD, 
-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, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9A, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAA, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F82, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F92, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA2, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9B, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAB, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F83, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F93, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA3, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9C, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAC, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F84, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F94, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA4, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9D, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F85, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F95, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA5, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F97, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1FA7, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F8E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F9E, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1FAE, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F86, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F96, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1FA6, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F8F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F9F, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1FAF, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F87, 
-IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F97, 
+IBUS_KEY_Multi_key, 3952, 3952, 10495, 14203, 16083, 
+IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_space,  0x0060, 
+IBUS_KEY_V,  0x01DB, 
+IBUS_KEY_v,  0x01DC, 
+IBUS_KEY_nobreakspace,  0x0300, 
+IBUS_KEY_Abreve,  0x1EB0, 
+IBUS_KEY_abreve,  0x1EB1, 
+IBUS_KEY_Emacron,  0x1E14, 
+IBUS_KEY_emacron,  0x1E15, 
+IBUS_KEY_Omacron,  0x1E50, 
+IBUS_KEY_omacron,  0x1E51, 
+IBUS_KEY_Cyrillic_ie,  0x0450, 
+IBUS_KEY_Cyrillic_i,  0x045D, 
+IBUS_KEY_Cyrillic_IE,  0x0400, 
+IBUS_KEY_Cyrillic_I,  0x040D, 
+IBUS_KEY_Greek_iotadieresis,  0x1FD2, 
+IBUS_KEY_Greek_upsilondieresis,  0x1FE2, 
+IBUS_KEY_Greek_ALPHA,  0x1FBA, 
+IBUS_KEY_Greek_EPSILON,  0x1FC8, 
+IBUS_KEY_Greek_ETA,  0x1FCA, 
+IBUS_KEY_Greek_IOTA,  0x1FDA, 
+IBUS_KEY_Greek_OMICRON,  0x1FF8, 
+IBUS_KEY_Greek_UPSILON,  0x1FEA, 
+IBUS_KEY_Greek_OMEGA,  0x1FFA, 
+IBUS_KEY_Greek_alpha,  0x1F70, 
+IBUS_KEY_Greek_epsilon,  0x1F72, 
+IBUS_KEY_Greek_eta,  0x1F74, 
+IBUS_KEY_Greek_iota,  0x1F76, 
+IBUS_KEY_Greek_omicron,  0x1F78, 
+IBUS_KEY_Greek_upsilon,  0x1F7A, 
+IBUS_KEY_Greek_omega,  0x1F7C, 
+IBUS_KEY_dead_grave,  0x0060, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x1FD2, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x1FE2, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON,  0x1F1A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON,  0x1F4A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6A, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F02, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon,  0x1F12, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F22, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F32, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron,  0x1F42, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F52, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F62, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON,  0x1F1B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON,  0x1F4B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6B, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F03, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon,  0x1F13, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F23, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F33, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron,  0x1F43, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F53, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F63, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01DB, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01DC, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x1FD2, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x1FE2, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F1B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F4B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6B, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F03, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F13, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F23, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F33, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F43, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F53, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F63, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F1A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F4A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6A, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F02, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F12, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F22, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F32, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F42, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F52, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F62, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O,  0x1EDC, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U,  0x1EEA, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o,  0x1EDD, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u,  0x1EEB, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A,  0x1EB0, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a,  0x1EB1, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA6, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC0, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED2, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC1, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED3, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_E,  0x1E14, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O,  0x1E50, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_e,  0x1E15, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o,  0x1E51, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A,  0x1EB0, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a,  0x1EB1, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_E,  0x1E14, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_O,  0x1E50, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_e,  0x1E15, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_o,  0x1E51, 
+IBUS_KEY_space,  0x0027, 
+IBUS_KEY_V,  0x01D7, 
+IBUS_KEY_v,  0x01D8, 
+IBUS_KEY_nobreakspace,  0x0301, 
+IBUS_KEY_Abreve,  0x1EAE, 
+IBUS_KEY_abreve,  0x1EAF, 
+IBUS_KEY_Emacron,  0x1E16, 
+IBUS_KEY_emacron,  0x1E17, 
+IBUS_KEY_Utilde,  0x1E78, 
+IBUS_KEY_omacron,  0x1E53, 
+IBUS_KEY_utilde,  0x1E79, 
+IBUS_KEY_Cyrillic_ghe,  0x0453, 
+IBUS_KEY_Cyrillic_ka,  0x045C, 
+IBUS_KEY_Cyrillic_GHE,  0x0403, 
+IBUS_KEY_Cyrillic_KA,  0x040C, 
+IBUS_KEY_Greek_iotadieresis,  0x0390, 
+IBUS_KEY_Greek_upsilondieresis,  0x03B0, 
+IBUS_KEY_Greek_ALPHA,  0x0386, 
+IBUS_KEY_Greek_EPSILON,  0x0388, 
+IBUS_KEY_Greek_ETA,  0x0389, 
+IBUS_KEY_Greek_IOTA,  0x038A, 
+IBUS_KEY_Greek_OMICRON,  0x038C, 
+IBUS_KEY_Greek_UPSILON,  0x038E, 
+IBUS_KEY_Greek_OMEGA,  0x038F, 
+IBUS_KEY_Greek_alpha,  0x03AC, 
+IBUS_KEY_Greek_epsilon,  0x03AD, 
+IBUS_KEY_Greek_eta,  0x03AE, 
+IBUS_KEY_Greek_iota,  0x03AF, 
+IBUS_KEY_Greek_omicron,  0x03CC, 
+IBUS_KEY_Greek_upsilon,  0x03CD, 
+IBUS_KEY_Greek_omega,  0x03CE, 
+IBUS_KEY_dead_acute,  0x00B4, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_space,  0x0385, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_dead_stroke, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_dead_stroke, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_I,  0x1E2E, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D7, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_i,  0x1E2F, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D8, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O,  0x1EDA, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U,  0x1EE8, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o,  0x1EDB, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u,  0x1EE9, 
+IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EBE, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED0, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EBF, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED1, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_Multi_key, IBUS_KEY_o, IBUS_KEY_A,  0x01FA, 
+IBUS_KEY_Multi_key, IBUS_KEY_o, IBUS_KEY_a,  0x01FB, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x1E4C, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_U,  0x1E78, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x1E4D, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_u,  0x1E79, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_Multi_key, IBUS_KEY_KP_Divide, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_Multi_key, IBUS_KEY_KP_Divide, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_space,  0x005E, 
+IBUS_KEY_parenleft,  0x207D, 
+IBUS_KEY_parenright,  0x207E, 
+IBUS_KEY_plus,  0x207A, 
+IBUS_KEY_minus,  0x207B, 
+IBUS_KEY_0,  0x2070, 
+IBUS_KEY_1,  0x00B9, 
+IBUS_KEY_2,  0x00B2, 
+IBUS_KEY_3,  0x00B3, 
+IBUS_KEY_4,  0x2074, 
+IBUS_KEY_5,  0x2075, 
+IBUS_KEY_6,  0x2076, 
+IBUS_KEY_7,  0x2077, 
+IBUS_KEY_8,  0x2078, 
+IBUS_KEY_9,  0x2079, 
+IBUS_KEY_equal,  0x207C, 
+IBUS_KEY_nobreakspace,  0x0302, 
+IBUS_KEY_Agrave,  0x1EA6, 
+IBUS_KEY_Aacute,  0x1EA4, 
+IBUS_KEY_Atilde,  0x1EAA, 
+IBUS_KEY_Egrave,  0x1EC0, 
+IBUS_KEY_Eacute,  0x1EBE, 
+IBUS_KEY_Ograve,  0x1ED2, 
+IBUS_KEY_Oacute,  0x1ED0, 
+IBUS_KEY_Otilde,  0x1ED6, 
+IBUS_KEY_agrave,  0x1EA7, 
+IBUS_KEY_aacute,  0x1EA5, 
+IBUS_KEY_atilde,  0x1EAB, 
+IBUS_KEY_egrave,  0x1EC1, 
+IBUS_KEY_eacute,  0x1EBF, 
+IBUS_KEY_ograve,  0x1ED3, 
+IBUS_KEY_oacute,  0x1ED1, 
+IBUS_KEY_otilde,  0x1ED7, 
+0x2212,  0x207B, 
+0x4E00,  0x3192, 
+0x4E01,  0x319C, 
+0x4E09,  0x3194, 
+0x4E0A,  0x3196, 
+0x4E0B,  0x3198, 
+0x4E19,  0x319B, 
+0x4E2D,  0x3197, 
+0x4E59,  0x319A, 
+0x4E8C,  0x3193, 
+0x4EBA,  0x319F, 
+0x56DB,  0x3195, 
+0x5730,  0x319E, 
+0x5929,  0x319D, 
+0x7532,  0x3199, 
+IBUS_KEY_dead_circumflex,  0x005E, 
+IBUS_KEY_KP_Space,  0x00B2, 
+IBUS_KEY_KP_Add,  0x207A, 
+IBUS_KEY_KP_0,  0x2070, 
+IBUS_KEY_KP_1,  0x00B9, 
+IBUS_KEY_KP_2,  0x00B2, 
+IBUS_KEY_KP_3,  0x00B3, 
+IBUS_KEY_KP_4,  0x2074, 
+IBUS_KEY_KP_5,  0x2075, 
+IBUS_KEY_KP_6,  0x2076, 
+IBUS_KEY_KP_7,  0x2077, 
+IBUS_KEY_KP_8,  0x2078, 
+IBUS_KEY_KP_9,  0x2079, 
+IBUS_KEY_KP_Equal,  0x207C, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_A,  0x1EAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_E,  0x1EC6, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_O,  0x1ED8, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_a,  0x1EAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_e,  0x1EC7, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_o,  0x1ED9, 
+IBUS_KEY_Multi_key, IBUS_KEY_S, IBUS_KEY_M,  0x2120, 
+IBUS_KEY_Multi_key, IBUS_KEY_S, IBUS_KEY_m,  0x2120, 
+IBUS_KEY_Multi_key, IBUS_KEY_T, IBUS_KEY_M,  0x2122, 
+IBUS_KEY_Multi_key, IBUS_KEY_T, IBUS_KEY_m,  0x2122, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_a,  0x00AA, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_h,  0x02B0, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_i,  0x2071, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_j,  0x02B2, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_l,  0x02E1, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_n,  0x207F, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o,  0x00BA, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_r,  0x02B3, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_s,  0x02E2, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_w,  0x02B7, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_x,  0x02E3, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_y,  0x02B8, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0263,  0x02E0, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0266,  0x02B1, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0279,  0x02B4, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x027B,  0x02B5, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0281,  0x02B6, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, 0x0295,  0x02E4, 
+IBUS_KEY_Multi_key, IBUS_KEY_s, IBUS_KEY_M,  0x2120, 
+IBUS_KEY_Multi_key, IBUS_KEY_s, IBUS_KEY_m,  0x2120, 
+IBUS_KEY_Multi_key, IBUS_KEY_t, IBUS_KEY_M,  0x2122, 
+IBUS_KEY_Multi_key, IBUS_KEY_t, IBUS_KEY_m,  0x2122, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_a,  0x00AA, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_h,  0x02B0, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_i,  0x2071, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_j,  0x02B2, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_l,  0x02E1, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_n,  0x207F, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_o,  0x00BA, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_r,  0x02B3, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_s,  0x02E2, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_w,  0x02B7, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_x,  0x02E3, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, IBUS_KEY_y,  0x02B8, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0263,  0x02E0, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0266,  0x02B1, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0279,  0x02B4, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x027B,  0x02B5, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0281,  0x02B6, 
+IBUS_KEY_Multi_key, IBUS_KEY_underbar, 0x0295,  0x02E4, 
+IBUS_KEY_space,  0x007E, 
+IBUS_KEY_less,  0x2272, 
+IBUS_KEY_equal,  0x2243, 
+IBUS_KEY_greater,  0x2273, 
+IBUS_KEY_nobreakspace,  0x0303, 
+IBUS_KEY_Oacute,  0x1E4C, 
+IBUS_KEY_Odiaeresis,  0x1E4E, 
+IBUS_KEY_Uacute,  0x1E78, 
+IBUS_KEY_oacute,  0x1E4D, 
+IBUS_KEY_odiaeresis,  0x1E4F, 
+IBUS_KEY_uacute,  0x1E79, 
+IBUS_KEY_Abreve,  0x1EB4, 
+IBUS_KEY_abreve,  0x1EB5, 
+IBUS_KEY_Omacron,  0x022C, 
+IBUS_KEY_omacron,  0x022D, 
+IBUS_KEY_Greek_iotadieresis,  0x1FD7, 
+IBUS_KEY_Greek_upsilondieresis,  0x1FE7, 
+IBUS_KEY_Greek_alpha,  0x1FB6, 
+IBUS_KEY_Greek_eta,  0x1FC6, 
+IBUS_KEY_Greek_iota,  0x1FD6, 
+IBUS_KEY_Greek_upsilon,  0x1FE6, 
+IBUS_KEY_Greek_omega,  0x1FF6, 
+0x1F00,  0x1F06, 
+0x1F01,  0x1F07, 
+0x1F08,  0x1F0E, 
+0x1F09,  0x1F0F, 
+0x1F20,  0x1F26, 
+0x1F21,  0x1F27, 
+0x1F28,  0x1F2E, 
+0x1F29,  0x1F2F, 
+0x1F30,  0x1F36, 
+0x1F31,  0x1F37, 
+0x1F38,  0x1F3E, 
+0x1F39,  0x1F3F, 
+0x1F50,  0x1F56, 
+0x1F51,  0x1F57, 
+0x1F59,  0x1F5F, 
+0x1F60,  0x1F66, 
+0x1F61,  0x1F67, 
+0x1F68,  0x1F6E, 
+0x1F69,  0x1F6F, 
+IBUS_KEY_dead_tilde,  0x007E, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x1FD7, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x1FE7, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0E, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2E, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3E, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6E, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F06, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F26, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F36, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F56, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F66, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0F, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2F, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3F, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5F, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6F, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F07, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F27, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F37, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F57, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F67, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x1FD7, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x1FE7, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0F, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2F, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3F, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5F, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6F, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F07, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F27, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F37, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F57, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F67, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0E, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2E, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3E, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6E, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F06, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F26, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F36, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F56, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F66, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O,  0x1EE0, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U,  0x1EEE, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o,  0x1EE1, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u,  0x1EEF, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A,  0x1EB4, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a,  0x1EB5, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EAA, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC4, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED6, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EAB, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC5, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED7, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A,  0x1EB4, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a,  0x1EB5, 
+IBUS_KEY_space,  0x00AF, 
+IBUS_KEY_V,  0x01D5, 
+IBUS_KEY_v,  0x01D6, 
+IBUS_KEY_nobreakspace,  0x0304, 
+IBUS_KEY_Egrave,  0x1E14, 
+IBUS_KEY_Eacute,  0x1E16, 
+IBUS_KEY_Ograve,  0x1E50, 
+IBUS_KEY_Oacute,  0x1E52, 
+IBUS_KEY_egrave,  0x1E15, 
+IBUS_KEY_eacute,  0x1E17, 
+IBUS_KEY_ograve,  0x1E51, 
+IBUS_KEY_oacute,  0x1E53, 
+IBUS_KEY_Cyrillic_i,  0x04E3, 
+IBUS_KEY_Cyrillic_u,  0x04EF, 
+IBUS_KEY_Cyrillic_I,  0x04E2, 
+IBUS_KEY_Cyrillic_U,  0x04EE, 
+IBUS_KEY_Greek_ALPHA,  0x1FB9, 
+IBUS_KEY_Greek_IOTA,  0x1FD9, 
+IBUS_KEY_Greek_UPSILON,  0x1FE9, 
+IBUS_KEY_Greek_alpha,  0x1FB1, 
+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, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_r,  0x1E5D, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_A,  0x01DE, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_O,  0x022A, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D5, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_a,  0x01DF, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_o,  0x022B, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D6, 
+IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_A,  0x01E0, 
+IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_O,  0x0230, 
+IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_a,  0x01E1, 
+IBUS_KEY_Multi_key, IBUS_KEY_period, IBUS_KEY_o,  0x0231, 
+IBUS_KEY_Multi_key, IBUS_KEY_semicolon, IBUS_KEY_O,  0x01EC, 
+IBUS_KEY_Multi_key, IBUS_KEY_semicolon, IBUS_KEY_o,  0x01ED, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x022C, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x022D, 
+IBUS_KEY_space,  0x02D8, 
+IBUS_KEY_nobreakspace,  0x0306, 
+IBUS_KEY_Agrave,  0x1EB0, 
+IBUS_KEY_Aacute,  0x1EAE, 
+IBUS_KEY_Atilde,  0x1EB4, 
+IBUS_KEY_agrave,  0x1EB1, 
+IBUS_KEY_aacute,  0x1EAF, 
+IBUS_KEY_atilde,  0x1EB5, 
+IBUS_KEY_Cyrillic_a,  0x04D1, 
+IBUS_KEY_Cyrillic_ie,  0x04D7, 
+IBUS_KEY_Cyrillic_i,  0x0439, 
+IBUS_KEY_Cyrillic_u,  0x045E, 
+IBUS_KEY_Cyrillic_zhe,  0x04C2, 
+IBUS_KEY_Cyrillic_A,  0x04D0, 
+IBUS_KEY_Cyrillic_IE,  0x04D6, 
+IBUS_KEY_Cyrillic_I,  0x0419, 
+IBUS_KEY_Cyrillic_U,  0x040E, 
+IBUS_KEY_Cyrillic_ZHE,  0x04C1, 
+IBUS_KEY_Greek_ALPHA,  0x1FB8, 
+IBUS_KEY_Greek_IOTA,  0x1FD8, 
+IBUS_KEY_Greek_UPSILON,  0x1FE8, 
+IBUS_KEY_Greek_alpha,  0x1FB0, 
+IBUS_KEY_Greek_iota,  0x1FD0, 
+IBUS_KEY_Greek_upsilon,  0x1FE0, 
+IBUS_KEY_dead_breve,  0x02D8, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_A,  0x1EB6, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_a,  0x1EB7, 
+IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E,  0x1E1C, 
+IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_E,  0x1E1C, 
+IBUS_KEY_Multi_key, IBUS_KEY_cedilla, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_space,  0x02D9, 
+IBUS_KEY_L,  0x013F, 
+IBUS_KEY_i,  0x0131, 
+IBUS_KEY_j,  0x0237, 
+IBUS_KEY_l,  0x0140, 
+IBUS_KEY_nobreakspace,  0x0307, 
+IBUS_KEY_Sacute,  0x1E64, 
+IBUS_KEY_Scaron,  0x1E66, 
+IBUS_KEY_sacute,  0x1E65, 
+IBUS_KEY_scaron,  0x1E67, 
+IBUS_KEY_Amacron,  0x01E0, 
+IBUS_KEY_Omacron,  0x0230, 
+IBUS_KEY_amacron,  0x01E1, 
+IBUS_KEY_omacron,  0x0231, 
+IBUS_KEY_dead_abovedot,  0x02D9, 
+IBUS_KEY_dead_stroke, IBUS_KEY_j,  0x025F, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_S,  0x1E68, 
+IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_s,  0x1E69, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_S,  0x1E64, 
+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, 
+IBUS_KEY_apostrophe,  0x0344, 
+IBUS_KEY_nobreakspace,  0x0308, 
+IBUS_KEY_acute,  0x0344, 
+IBUS_KEY_Iacute,  0x1E2E, 
+IBUS_KEY_Ugrave,  0x01DB, 
+IBUS_KEY_Uacute,  0x01D7, 
+IBUS_KEY_iacute,  0x1E2F, 
+IBUS_KEY_ugrave,  0x01DC, 
+IBUS_KEY_uacute,  0x01D8, 
+0x01D3,  0x01D9, 
+0x01D4,  0x01DA, 
+IBUS_KEY_Amacron,  0x01DE, 
+IBUS_KEY_Umacron,  0x1E7A, 
+IBUS_KEY_amacron,  0x01DF, 
+IBUS_KEY_omacron,  0x022B, 
+IBUS_KEY_umacron,  0x1E7B, 
+IBUS_KEY_Ukrainian_i,  0x0457, 
+IBUS_KEY_Ukrainian_I,  0x0407, 
+IBUS_KEY_Cyrillic_a,  0x04D3, 
+IBUS_KEY_Cyrillic_ie,  0x0451, 
+IBUS_KEY_Cyrillic_i,  0x04E5, 
+IBUS_KEY_Cyrillic_o,  0x04E7, 
+IBUS_KEY_Cyrillic_u,  0x04F1, 
+IBUS_KEY_Cyrillic_zhe,  0x04DD, 
+IBUS_KEY_Cyrillic_yeru,  0x04F9, 
+IBUS_KEY_Cyrillic_ze,  0x04DF, 
+IBUS_KEY_Cyrillic_e,  0x04ED, 
+IBUS_KEY_Cyrillic_che,  0x04F5, 
+IBUS_KEY_Cyrillic_A,  0x04D2, 
+IBUS_KEY_Cyrillic_IE,  0x0401, 
+IBUS_KEY_Cyrillic_I,  0x04E4, 
+IBUS_KEY_Cyrillic_O,  0x04E6, 
+IBUS_KEY_Cyrillic_U,  0x04F0, 
+IBUS_KEY_Cyrillic_ZHE,  0x04DC, 
+IBUS_KEY_Cyrillic_YERU,  0x04F8, 
+IBUS_KEY_Cyrillic_ZE,  0x04DE, 
+IBUS_KEY_Cyrillic_E,  0x04EC, 
+IBUS_KEY_Cyrillic_CHE,  0x04F4, 
+IBUS_KEY_Greek_IOTA,  0x03AA, 
+IBUS_KEY_Greek_UPSILON,  0x03AB, 
+IBUS_KEY_Greek_iota,  0x03CA, 
+IBUS_KEY_Greek_upsilon,  0x03CB, 
+IBUS_KEY_dead_diaeresis,  0x00A8, 
+IBUS_KEY_dead_acute, IBUS_KEY_space,  0x0385, 
+IBUS_KEY_dead_acute, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_dead_acute, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_dead_belowdiaeresis, IBUS_KEY_equal,  0x2A77, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_U,  0x1E7A, 
+IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_u,  0x1E7B, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x1E4E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x1E4F, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_U,  0x1E7A, 
+IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_u,  0x1E7B, 
+IBUS_KEY_space,  0x00B0, 
+IBUS_KEY_nobreakspace,  0x030A, 
+IBUS_KEY_Aacute,  0x01FA, 
+IBUS_KEY_aacute,  0x01FB, 
+IBUS_KEY_dead_abovering,  0x00B0, 
+IBUS_KEY_space,  0x02DD, 
+IBUS_KEY_nobreakspace,  0x030B, 
+IBUS_KEY_Cyrillic_u,  0x04F3, 
+IBUS_KEY_Cyrillic_U,  0x04F2, 
+IBUS_KEY_dead_doubleacute,  0x02DD, 
+IBUS_KEY_space,  0x02C7, 
+IBUS_KEY_parenleft,  0x208D, 
+IBUS_KEY_parenright,  0x208E, 
+IBUS_KEY_plus,  0x208A, 
+IBUS_KEY_minus,  0x208B, 
+IBUS_KEY_0,  0x2080, 
+IBUS_KEY_1,  0x2081, 
+IBUS_KEY_2,  0x2082, 
+IBUS_KEY_3,  0x2083, 
+IBUS_KEY_4,  0x2084, 
+IBUS_KEY_5,  0x2085, 
+IBUS_KEY_6,  0x2086, 
+IBUS_KEY_7,  0x2087, 
+IBUS_KEY_8,  0x2088, 
+IBUS_KEY_9,  0x2089, 
+IBUS_KEY_equal,  0x208C, 
+IBUS_KEY_V,  0x01D9, 
+IBUS_KEY_v,  0x01DA, 
+IBUS_KEY_nobreakspace,  0x030C, 
+0x01F2,  0x01C5, 
+IBUS_KEY_dead_caron,  0x02C7, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D9, 
+IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01DA, 
+IBUS_KEY_space,  0x00B8, 
+IBUS_KEY_nobreakspace,  0x0327, 
+IBUS_KEY_cent,  0x20B5, 
+IBUS_KEY_Cacute,  0x1E08, 
+IBUS_KEY_cacute,  0x1E09, 
+IBUS_KEY_dead_cedilla,  0x00B8, 
+IBUS_KEY_dead_currency, IBUS_KEY_C,  0x20B5, 
+IBUS_KEY_dead_currency, IBUS_KEY_c,  0x20B5, 
+IBUS_KEY_space,  0x02DB, 
+IBUS_KEY_nobreakspace,  0x0328, 
+IBUS_KEY_Omacron,  0x01EC, 
+IBUS_KEY_omacron,  0x01ED, 
+IBUS_KEY_dead_ogonek,  0x02DB, 
+IBUS_KEY_space,  0x037A, 
+IBUS_KEY_Greek_alphaaccent,  0x1FB4, 
+IBUS_KEY_Greek_etaaccent,  0x1FC4, 
+IBUS_KEY_Greek_omegaaccent,  0x1FF4, 
+IBUS_KEY_Greek_ALPHA,  0x1FBC, 
+IBUS_KEY_Greek_ETA,  0x1FCC, 
+IBUS_KEY_Greek_OMEGA,  0x1FFC, 
+IBUS_KEY_Greek_alpha,  0x1FB3, 
+IBUS_KEY_Greek_eta,  0x1FC3, 
+IBUS_KEY_Greek_omega,  0x1FF3, 
+IBUS_KEY_dead_iota,  0x037A, 
+IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha,  0x1FB2, 
+IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta,  0x1FC2, 
+IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega,  0x1FF2, 
+IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha,  0x1FB7, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta,  0x1FC7, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega,  0x1FF7, 
+IBUS_KEY_dead_tilde, 0x1F00,  0x1F86, 
+IBUS_KEY_dead_tilde, 0x1F01,  0x1F87, 
+IBUS_KEY_dead_tilde, 0x1F08,  0x1F8E, 
+IBUS_KEY_dead_tilde, 0x1F09,  0x1F8F, 
+IBUS_KEY_dead_tilde, 0x1F20,  0x1F96, 
+IBUS_KEY_dead_tilde, 0x1F21,  0x1F97, 
+IBUS_KEY_dead_tilde, 0x1F28,  0x1F9E, 
+IBUS_KEY_dead_tilde, 0x1F29,  0x1F9F, 
+IBUS_KEY_dead_tilde, 0x1F60,  0x1FA6, 
+IBUS_KEY_dead_tilde, 0x1F61,  0x1FA7, 
+IBUS_KEY_dead_tilde, 0x1F68,  0x1FAE, 
+IBUS_KEY_dead_tilde, 0x1F69,  0x1FAF, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F88, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F98, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FA8, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F80, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F90, 
+IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA0, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F89, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F99, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FA9, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F81, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F91, 
+IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA1, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F00,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F01,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F08,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F09,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F20,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F21,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F28,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F29,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F60,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F61,  0x1FA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F68,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x1F69,  0x1FAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F89, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F99, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FA9, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F81, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F91, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA1, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F88, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F98, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FA8, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F80, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F90, 
+IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA0, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,  0x1FB2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_eta,  0x1FC2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_Greek_omega,  0x1FF2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F00,  0x1F82, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F01,  0x1F83, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F08,  0x1F8A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F09,  0x1F8B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F20,  0x1F92, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F21,  0x1F93, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F28,  0x1F9A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F29,  0x1F9B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F60,  0x1FA2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F61,  0x1FA3, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F68,  0x1FAA, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, 0x1F69,  0x1FAB, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,  0x1FB7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,  0x1FC7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,  0x1FF7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F00,  0x1F86, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F01,  0x1F87, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F08,  0x1F8E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F09,  0x1F8F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F20,  0x1F96, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F21,  0x1F97, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F28,  0x1F9E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F29,  0x1F9F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F60,  0x1FA6, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F61,  0x1FA7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F68,  0x1FAE, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, 0x1F69,  0x1FAF, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F00,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F01,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F08,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F09,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F20,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F21,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F28,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F29,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F60,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F61,  0x1FA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F68,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x1F69,  0x1FAD, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_dead_grave, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_dead_acute, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_dead_tilde, IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_kana_WO,  0x30FA, 
+IBUS_KEY_kana_U,  0x30F4, 
+IBUS_KEY_kana_KA,  0x30AC, 
+IBUS_KEY_kana_KI,  0x30AE, 
+IBUS_KEY_kana_KU,  0x30B0, 
+IBUS_KEY_kana_KE,  0x30B2, 
+IBUS_KEY_kana_KO,  0x30B4, 
+IBUS_KEY_kana_SA,  0x30B6, 
+IBUS_KEY_kana_SHI,  0x30B8, 
+IBUS_KEY_kana_SU,  0x30BA, 
+IBUS_KEY_kana_SE,  0x30BC, 
+IBUS_KEY_kana_SO,  0x30BE, 
+IBUS_KEY_kana_TA,  0x30C0, 
+IBUS_KEY_kana_CHI,  0x30C2, 
+IBUS_KEY_kana_TSU,  0x30C5, 
+IBUS_KEY_kana_TE,  0x30C7, 
+IBUS_KEY_kana_TO,  0x30C9, 
+IBUS_KEY_kana_HA,  0x30D0, 
+IBUS_KEY_kana_HI,  0x30D3, 
+IBUS_KEY_kana_FU,  0x30D6, 
+IBUS_KEY_kana_HE,  0x30D9, 
+IBUS_KEY_kana_HO,  0x30DC, 
+IBUS_KEY_kana_WA,  0x30F7, 
+IBUS_KEY_kana_HA,  0x30D1, 
+IBUS_KEY_kana_HI,  0x30D4, 
+IBUS_KEY_kana_FU,  0x30D7, 
+IBUS_KEY_kana_HE,  0x30DA, 
+IBUS_KEY_kana_HO,  0x30DD, 
+IBUS_KEY_space,  0x0323, 
+IBUS_KEY_plus,  0x2A25, 
+IBUS_KEY_minus,  0x2A2A, 
+IBUS_KEY_equal,  0x2A66, 
+IBUS_KEY_nobreakspace,  0x0323, 
+IBUS_KEY_Abreve,  0x1EB6, 
+IBUS_KEY_abreve,  0x1EB7, 
+IBUS_KEY_dead_belowdot,  0x0323, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O,  0x1EE2, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U,  0x1EF0, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o,  0x1EE3, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u,  0x1EF1, 
+IBUS_KEY_space,  0x0309, 
+IBUS_KEY_B,  0x0181, 
+IBUS_KEY_C,  0x0187, 
+IBUS_KEY_D,  0x018A, 
+IBUS_KEY_F,  0x0191, 
+IBUS_KEY_G,  0x0193, 
+IBUS_KEY_K,  0x0198, 
+IBUS_KEY_M,  0x2C6E, 
+IBUS_KEY_N,  0x019D, 
+IBUS_KEY_P,  0x01A4, 
+IBUS_KEY_T,  0x01AC, 
+IBUS_KEY_V,  0x01B2, 
+IBUS_KEY_W,  0x2C72, 
+IBUS_KEY_Z,  0x0224, 
+IBUS_KEY_b,  0x0253, 
+IBUS_KEY_c,  0x0188, 
+IBUS_KEY_d,  0x0257, 
+IBUS_KEY_f,  0x0192, 
+IBUS_KEY_g,  0x0260, 
+IBUS_KEY_h,  0x0266, 
+IBUS_KEY_k,  0x0199, 
+IBUS_KEY_m,  0x0271, 
+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, 
+IBUS_KEY_w,  0x2C73, 
+IBUS_KEY_z,  0x0225, 
+IBUS_KEY_nobreakspace,  0x0309, 
+IBUS_KEY_Abreve,  0x1EB2, 
+IBUS_KEY_abreve,  0x1EB3, 
+0x0256,  0x1D91, 
+0x025C,  0x025D, 
+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, 
+IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u,  0x1EED, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A,  0x1EB2, 
+IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a,  0x1EB3, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA8, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC2, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED4, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA9, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC3, 
+IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED5, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A,  0x1EB2, 
+IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a,  0x1EB3, 
+IBUS_KEY_space,  0x031B, 
+IBUS_KEY_nobreakspace,  0x031B, 
+IBUS_KEY_Utilde,  0x1EEE, 
+IBUS_KEY_utilde,  0x1EEF, 
+IBUS_KEY_dead_horn,  0x031B, 
+IBUS_KEY_space,  0x002F, 
+IBUS_KEY_2,  0x01BB, 
+IBUS_KEY_A,  0x023A, 
+IBUS_KEY_B,  0x0243, 
+IBUS_KEY_C,  0x023B, 
+IBUS_KEY_D,  0x0110, 
+IBUS_KEY_E,  0x0246, 
+IBUS_KEY_G,  0x01E4, 
+IBUS_KEY_H,  0x0126, 
+IBUS_KEY_I,  0x0197, 
+IBUS_KEY_J,  0x0248, 
+IBUS_KEY_L,  0x0141, 
+IBUS_KEY_O,  0x00D8, 
+IBUS_KEY_P,  0x2C63, 
+IBUS_KEY_R,  0x024C, 
+IBUS_KEY_T,  0x0166, 
+IBUS_KEY_U,  0x0244, 
+IBUS_KEY_Y,  0x024E, 
+IBUS_KEY_Z,  0x01B5, 
+IBUS_KEY_a,  0x2C65, 
+IBUS_KEY_b,  0x0180, 
+IBUS_KEY_c,  0x023C, 
+IBUS_KEY_d,  0x0111, 
+IBUS_KEY_e,  0x0247, 
+IBUS_KEY_g,  0x01E5, 
+IBUS_KEY_h,  0x0127, 
+IBUS_KEY_i,  0x0268, 
+IBUS_KEY_j,  0x0249, 
+IBUS_KEY_l,  0x0142, 
+IBUS_KEY_o,  0x00F8, 
+IBUS_KEY_p,  0x1D7D, 
+IBUS_KEY_r,  0x024D, 
+IBUS_KEY_t,  0x0167, 
+IBUS_KEY_u,  0x0289, 
+IBUS_KEY_y,  0x024F, 
+IBUS_KEY_z,  0x01B6, 
+IBUS_KEY_nobreakspace,  0x0338, 
+IBUS_KEY_Oacute,  0x01FE, 
+IBUS_KEY_oacute,  0x01FF, 
+0x0237,  0x025F, 
+0x0269,  0x1D7C, 
+IBUS_KEY_lessthanequal,  0x2270, 
+IBUS_KEY_greaterthanequal,  0x2271, 
+IBUS_KEY_dead_stroke,  0x002F, 
+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_ALPHA,  0x1F08, 
+IBUS_KEY_Greek_EPSILON,  0x1F18, 
+IBUS_KEY_Greek_ETA,  0x1F28, 
+IBUS_KEY_Greek_IOTA,  0x1F38, 
+IBUS_KEY_Greek_OMICRON,  0x1F48, 
+IBUS_KEY_Greek_OMEGA,  0x1F68, 
+IBUS_KEY_Greek_alpha,  0x1F00, 
+IBUS_KEY_Greek_epsilon,  0x1F10, 
+IBUS_KEY_Greek_eta,  0x1F20, 
+IBUS_KEY_Greek_iota,  0x1F30, 
+IBUS_KEY_Greek_omicron,  0x1F40, 
+IBUS_KEY_Greek_rho,  0x1FE4, 
+IBUS_KEY_Greek_upsilon,  0x1F50, 
+IBUS_KEY_Greek_omega,  0x1F60, 
+IBUS_KEY_Greek_ALPHA,  0x1F09, 
+IBUS_KEY_Greek_EPSILON,  0x1F19, 
+IBUS_KEY_Greek_ETA,  0x1F29, 
+IBUS_KEY_Greek_IOTA,  0x1F39, 
+IBUS_KEY_Greek_OMICRON,  0x1F49, 
+IBUS_KEY_Greek_RHO,  0x1FEC, 
+IBUS_KEY_Greek_UPSILON,  0x1F59, 
+IBUS_KEY_Greek_OMEGA,  0x1F69, 
+IBUS_KEY_Greek_alpha,  0x1F01, 
+IBUS_KEY_Greek_epsilon,  0x1F11, 
+IBUS_KEY_Greek_eta,  0x1F21, 
+IBUS_KEY_Greek_iota,  0x1F31, 
+IBUS_KEY_Greek_omicron,  0x1F41, 
+IBUS_KEY_Greek_rho,  0x1FE5, 
+IBUS_KEY_Greek_upsilon,  0x1F51, 
+IBUS_KEY_Greek_omega,  0x1F61, 
+IBUS_KEY_bar,  0x2AF0, 
+IBUS_KEY_plus,  0x2A26, 
+IBUS_KEY_dead_diaeresis, IBUS_KEY_equal,  0x2A77, 
+IBUS_KEY_space,  0x002C, 
+IBUS_KEY_S,  0x0218, 
+IBUS_KEY_T,  0x021A, 
+IBUS_KEY_s,  0x0219, 
+IBUS_KEY_t,  0x021B, 
+IBUS_KEY_nobreakspace,  0x0326, 
+IBUS_KEY_dead_belowcomma,  0x002C, 
+IBUS_KEY_space,  0x00A4, 
+IBUS_KEY_A,  0x20B3, 
+IBUS_KEY_B,  0x20B1, 
+IBUS_KEY_C,  0x20A1, 
+IBUS_KEY_D,  0x20AF, 
+IBUS_KEY_E,  0x20A0, 
+IBUS_KEY_F,  0x20A3, 
+IBUS_KEY_G,  0x20B2, 
+IBUS_KEY_H,  0x20B4, 
+IBUS_KEY_I,  0x17DB, 
+IBUS_KEY_K,  0x20AD, 
+IBUS_KEY_L,  0x20A4, 
+IBUS_KEY_M,  0x2133, 
+IBUS_KEY_N,  0x20A6, 
+IBUS_KEY_O,  0x0AF1, 
+IBUS_KEY_P,  0x20A7, 
+IBUS_KEY_R,  0x20A8, 
+IBUS_KEY_S,  0x0024, 
+IBUS_KEY_T,  0x20AE, 
+IBUS_KEY_U,  0x5713, 
+IBUS_KEY_W,  0x20A9, 
+IBUS_KEY_Y,  0x5186, 
+IBUS_KEY_a,  0x060B, 
+IBUS_KEY_b,  0x0E3F, 
+IBUS_KEY_c,  0x00A2, 
+IBUS_KEY_d,  0x20AB, 
+IBUS_KEY_e,  0x20AC, 
+IBUS_KEY_f,  0x0192, 
+IBUS_KEY_g,  0x20B2, 
+IBUS_KEY_h,  0x20B4, 
+IBUS_KEY_i,  0xFDFC, 
+IBUS_KEY_k,  0x20AD, 
+IBUS_KEY_l,  0x00A3, 
+IBUS_KEY_m,  0x20A5, 
+IBUS_KEY_n,  0x20A6, 
+IBUS_KEY_o,  0x0BF9, 
+IBUS_KEY_p,  0x20B0, 
+IBUS_KEY_r,  0x20A2, 
+IBUS_KEY_s,  0x20AA, 
+IBUS_KEY_t,  0x09F3, 
+IBUS_KEY_u,  0x5143, 
+IBUS_KEY_w,  0x20A9, 
+IBUS_KEY_y,  0x00A5, 
+IBUS_KEY_nobreakspace,  0x00A4, 
+IBUS_KEY_Ccedilla,  0x20B5, 
+IBUS_KEY_THORN,  0x09F2, 
+IBUS_KEY_ccedilla,  0x20B5, 
+IBUS_KEY_thorn,  0x09F2, 
+IBUS_KEY_dead_currency,  0x00A4, 
+IBUS_KEY_dead_cedilla, IBUS_KEY_C,  0x20B5, 
+IBUS_KEY_dead_cedilla, IBUS_KEY_c,  0x20B5, 
+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_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_dead_stroke, IBUS_KEY_r,  0x03FC, 
+IBUS_KEY_space, IBUS_KEY_space,  0x00A0, 
+IBUS_KEY_space, IBUS_KEY_apostrophe,  0x0027, 
+IBUS_KEY_space, IBUS_KEY_parenleft,  0x02D8, 
+IBUS_KEY_space, IBUS_KEY_comma,  0x00B8, 
+IBUS_KEY_space, IBUS_KEY_minus,  0x007E, 
+IBUS_KEY_space, IBUS_KEY_period,  0x2008, 
+IBUS_KEY_space, IBUS_KEY_less,  0x02C7, 
+IBUS_KEY_space, IBUS_KEY_greater,  0x005E, 
+IBUS_KEY_space, IBUS_KEY_asciicircum,  0x005E, 
+IBUS_KEY_space, IBUS_KEY_grave,  0x0060, 
+IBUS_KEY_space, IBUS_KEY_asciitilde,  0x007E, 
+IBUS_KEY_exclam, IBUS_KEY_exclam,  0x00A1, 
+IBUS_KEY_exclam, IBUS_KEY_question,  0x203D, 
+IBUS_KEY_exclam, IBUS_KEY_A,  0x1EA0, 
+IBUS_KEY_exclam, IBUS_KEY_B,  0x1E04, 
+IBUS_KEY_exclam, IBUS_KEY_D,  0x1E0C, 
+IBUS_KEY_exclam, IBUS_KEY_E,  0x1EB8, 
+IBUS_KEY_exclam, IBUS_KEY_H,  0x1E24, 
+IBUS_KEY_exclam, IBUS_KEY_I,  0x1ECA, 
+IBUS_KEY_exclam, IBUS_KEY_K,  0x1E32, 
+IBUS_KEY_exclam, IBUS_KEY_L,  0x1E36, 
+IBUS_KEY_exclam, IBUS_KEY_M,  0x1E42, 
+IBUS_KEY_exclam, IBUS_KEY_N,  0x1E46, 
+IBUS_KEY_exclam, IBUS_KEY_O,  0x1ECC, 
+IBUS_KEY_exclam, IBUS_KEY_P,  0x00B6, 
+IBUS_KEY_exclam, IBUS_KEY_R,  0x1E5A, 
+IBUS_KEY_exclam, IBUS_KEY_S,  0x1E62, 
+IBUS_KEY_exclam, IBUS_KEY_T,  0x1E6C, 
+IBUS_KEY_exclam, IBUS_KEY_U,  0x1EE4, 
+IBUS_KEY_exclam, IBUS_KEY_V,  0x1E7E, 
+IBUS_KEY_exclam, IBUS_KEY_W,  0x1E88, 
+IBUS_KEY_exclam, IBUS_KEY_Y,  0x1EF4, 
+IBUS_KEY_exclam, IBUS_KEY_Z,  0x1E92, 
+IBUS_KEY_exclam, IBUS_KEY_asciicircum,  0x00A6, 
+IBUS_KEY_exclam, IBUS_KEY_a,  0x1EA1, 
+IBUS_KEY_exclam, IBUS_KEY_b,  0x1E05, 
+IBUS_KEY_exclam, IBUS_KEY_d,  0x1E0D, 
+IBUS_KEY_exclam, IBUS_KEY_e,  0x1EB9, 
+IBUS_KEY_exclam, IBUS_KEY_h,  0x1E25, 
+IBUS_KEY_exclam, IBUS_KEY_i,  0x1ECB, 
+IBUS_KEY_exclam, IBUS_KEY_k,  0x1E33, 
+IBUS_KEY_exclam, IBUS_KEY_l,  0x1E37, 
+IBUS_KEY_exclam, IBUS_KEY_m,  0x1E43, 
+IBUS_KEY_exclam, IBUS_KEY_n,  0x1E47, 
+IBUS_KEY_exclam, IBUS_KEY_o,  0x1ECD, 
+IBUS_KEY_exclam, IBUS_KEY_p,  0x00B6, 
+IBUS_KEY_exclam, IBUS_KEY_r,  0x1E5B, 
+IBUS_KEY_exclam, IBUS_KEY_s,  0x1E63, 
+IBUS_KEY_exclam, IBUS_KEY_t,  0x1E6D, 
+IBUS_KEY_exclam, IBUS_KEY_u,  0x1EE5, 
+IBUS_KEY_exclam, IBUS_KEY_v,  0x1E7F, 
+IBUS_KEY_exclam, IBUS_KEY_w,  0x1E89, 
+IBUS_KEY_exclam, IBUS_KEY_y,  0x1EF5, 
+IBUS_KEY_exclam, IBUS_KEY_z,  0x1E93, 
+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_less,  0x201C, 
+IBUS_KEY_quotedbl, IBUS_KEY_greater,  0x201D, 
+IBUS_KEY_quotedbl, IBUS_KEY_A,  0x00C4, 
+IBUS_KEY_quotedbl, IBUS_KEY_E,  0x00CB, 
+IBUS_KEY_quotedbl, IBUS_KEY_H,  0x1E26, 
+IBUS_KEY_quotedbl, IBUS_KEY_I,  0x00CF, 
+IBUS_KEY_quotedbl, IBUS_KEY_O,  0x00D6, 
+IBUS_KEY_quotedbl, IBUS_KEY_U,  0x00DC, 
+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_a,  0x00E4, 
+IBUS_KEY_quotedbl, IBUS_KEY_e,  0x00EB, 
+IBUS_KEY_quotedbl, IBUS_KEY_h,  0x1E27, 
+IBUS_KEY_quotedbl, IBUS_KEY_i,  0x00EF, 
+IBUS_KEY_quotedbl, IBUS_KEY_o,  0x00F6, 
+IBUS_KEY_quotedbl, IBUS_KEY_t,  0x1E97, 
+IBUS_KEY_quotedbl, IBUS_KEY_u,  0x00FC, 
+IBUS_KEY_quotedbl, IBUS_KEY_w,  0x1E85, 
+IBUS_KEY_quotedbl, IBUS_KEY_x,  0x1E8D, 
+IBUS_KEY_quotedbl, IBUS_KEY_y,  0x00FF, 
+IBUS_KEY_quotedbl, IBUS_KEY_acute,  0x0344, 
+IBUS_KEY_quotedbl, IBUS_KEY_Otilde,  0x1E4E, 
+IBUS_KEY_quotedbl, IBUS_KEY_otilde,  0x1E4F, 
+IBUS_KEY_quotedbl, 0x03D2,  0x03D4, 
+IBUS_KEY_quotedbl, IBUS_KEY_Umacron,  0x1E7A, 
+IBUS_KEY_quotedbl, IBUS_KEY_umacron,  0x1E7B, 
+IBUS_KEY_quotedbl, 0x04D8,  0x04DA, 
+IBUS_KEY_quotedbl, 0x04D9,  0x04DB, 
+IBUS_KEY_quotedbl, 0x04E8,  0x04EA, 
+IBUS_KEY_quotedbl, 0x04E9,  0x04EB, 
+IBUS_KEY_quotedbl, IBUS_KEY_Ukrainian_i,  0x0457, 
+IBUS_KEY_quotedbl, IBUS_KEY_Ukrainian_I,  0x0407, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_a,  0x04D3, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ie,  0x0451, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_i,  0x04E5, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_o,  0x04E7, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_u,  0x04F1, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_zhe,  0x04DD, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_yeru,  0x04F9, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ze,  0x04DF, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_e,  0x04ED, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_che,  0x04F5, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_A,  0x04D2, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_IE,  0x0401, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_I,  0x04E4, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_O,  0x04E6, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_U,  0x04F0, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ZHE,  0x04DC, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_YERU,  0x04F8, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_ZE,  0x04DE, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_E,  0x04EC, 
+IBUS_KEY_quotedbl, IBUS_KEY_Cyrillic_CHE,  0x04F4, 
+IBUS_KEY_quotedbl, IBUS_KEY_Greek_IOTA,  0x03AA, 
+IBUS_KEY_quotedbl, IBUS_KEY_Greek_UPSILON,  0x03AB, 
+IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x03CA, 
+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, 
+IBUS_KEY_apostrophe, IBUS_KEY_comma,  0x201A, 
+IBUS_KEY_apostrophe, IBUS_KEY_less,  0x2018, 
+IBUS_KEY_apostrophe, IBUS_KEY_greater,  0x2019, 
+IBUS_KEY_apostrophe, IBUS_KEY_A,  0x00C1, 
+IBUS_KEY_apostrophe, IBUS_KEY_C,  0x0106, 
+IBUS_KEY_apostrophe, IBUS_KEY_E,  0x00C9, 
+IBUS_KEY_apostrophe, IBUS_KEY_G,  0x01F4, 
+IBUS_KEY_apostrophe, IBUS_KEY_I,  0x00CD, 
+IBUS_KEY_apostrophe, IBUS_KEY_K,  0x1E30, 
+IBUS_KEY_apostrophe, IBUS_KEY_L,  0x0139, 
+IBUS_KEY_apostrophe, IBUS_KEY_M,  0x1E3E, 
+IBUS_KEY_apostrophe, IBUS_KEY_N,  0x0143, 
+IBUS_KEY_apostrophe, IBUS_KEY_O,  0x00D3, 
+IBUS_KEY_apostrophe, IBUS_KEY_P,  0x1E54, 
+IBUS_KEY_apostrophe, IBUS_KEY_R,  0x0154, 
+IBUS_KEY_apostrophe, IBUS_KEY_S,  0x015A, 
+IBUS_KEY_apostrophe, IBUS_KEY_U,  0x00DA, 
+IBUS_KEY_apostrophe, IBUS_KEY_W,  0x1E82, 
+IBUS_KEY_apostrophe, IBUS_KEY_Y,  0x00DD, 
+IBUS_KEY_apostrophe, IBUS_KEY_Z,  0x0179, 
+IBUS_KEY_apostrophe, IBUS_KEY_a,  0x00E1, 
+IBUS_KEY_apostrophe, IBUS_KEY_c,  0x0107, 
+IBUS_KEY_apostrophe, IBUS_KEY_e,  0x00E9, 
+IBUS_KEY_apostrophe, IBUS_KEY_g,  0x01F5, 
+IBUS_KEY_apostrophe, IBUS_KEY_i,  0x00ED, 
+IBUS_KEY_apostrophe, IBUS_KEY_k,  0x1E31, 
+IBUS_KEY_apostrophe, IBUS_KEY_l,  0x013A, 
+IBUS_KEY_apostrophe, IBUS_KEY_m,  0x1E3F, 
+IBUS_KEY_apostrophe, IBUS_KEY_n,  0x0144, 
+IBUS_KEY_apostrophe, IBUS_KEY_o,  0x00F3, 
+IBUS_KEY_apostrophe, IBUS_KEY_p,  0x1E55, 
+IBUS_KEY_apostrophe, IBUS_KEY_r,  0x0155, 
+IBUS_KEY_apostrophe, IBUS_KEY_s,  0x015B, 
+IBUS_KEY_apostrophe, IBUS_KEY_u,  0x00FA, 
+IBUS_KEY_apostrophe, IBUS_KEY_w,  0x1E83, 
+IBUS_KEY_apostrophe, IBUS_KEY_y,  0x00FD, 
+IBUS_KEY_apostrophe, IBUS_KEY_z,  0x017A, 
+IBUS_KEY_apostrophe, IBUS_KEY_Acircumflex,  0x1EA4, 
+IBUS_KEY_apostrophe, IBUS_KEY_Aring,  0x01FA, 
+IBUS_KEY_apostrophe, IBUS_KEY_AE,  0x01FC, 
+IBUS_KEY_apostrophe, IBUS_KEY_Ccedilla,  0x1E08, 
+IBUS_KEY_apostrophe, IBUS_KEY_Ecircumflex,  0x1EBE, 
+IBUS_KEY_apostrophe, IBUS_KEY_Idiaeresis,  0x1E2E, 
+IBUS_KEY_apostrophe, IBUS_KEY_Ocircumflex,  0x1ED0, 
+IBUS_KEY_apostrophe, IBUS_KEY_Otilde,  0x1E4C, 
+IBUS_KEY_apostrophe, IBUS_KEY_Ooblique,  0x01FE, 
+IBUS_KEY_apostrophe, IBUS_KEY_Udiaeresis,  0x01D7, 
+IBUS_KEY_apostrophe, IBUS_KEY_acircumflex,  0x1EA5, 
+IBUS_KEY_apostrophe, IBUS_KEY_aring,  0x01FB, 
+IBUS_KEY_apostrophe, IBUS_KEY_ae,  0x01FD, 
+IBUS_KEY_apostrophe, IBUS_KEY_ccedilla,  0x1E09, 
+IBUS_KEY_apostrophe, IBUS_KEY_ecircumflex,  0x1EBF, 
+IBUS_KEY_apostrophe, IBUS_KEY_idiaeresis,  0x1E2F, 
+IBUS_KEY_apostrophe, IBUS_KEY_ocircumflex,  0x1ED1, 
+IBUS_KEY_apostrophe, IBUS_KEY_otilde,  0x1E4D, 
+IBUS_KEY_apostrophe, IBUS_KEY_oslash,  0x01FF, 
+IBUS_KEY_apostrophe, IBUS_KEY_udiaeresis,  0x01D8, 
+IBUS_KEY_apostrophe, IBUS_KEY_Abreve,  0x1EAE, 
+IBUS_KEY_apostrophe, IBUS_KEY_abreve,  0x1EAF, 
+IBUS_KEY_apostrophe, IBUS_KEY_Emacron,  0x1E16, 
+IBUS_KEY_apostrophe, IBUS_KEY_emacron,  0x1E17, 
+IBUS_KEY_apostrophe, IBUS_KEY_Omacron,  0x1E52, 
+IBUS_KEY_apostrophe, IBUS_KEY_Utilde,  0x1E78, 
+IBUS_KEY_apostrophe, IBUS_KEY_omacron,  0x1E53, 
+IBUS_KEY_apostrophe, IBUS_KEY_utilde,  0x1E79, 
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ghe,  0x0453, 
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ka,  0x045C, 
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_GHE,  0x0403, 
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_KA,  0x040C, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_iotadieresis,  0x0390, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilondieresis,  0x03B0, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA,  0x0386, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_EPSILON,  0x0388, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA,  0x0389, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_IOTA,  0x038A, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMICRON,  0x038C, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_UPSILON,  0x038E, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA,  0x038F, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,  0x03AC, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_epsilon,  0x03AD, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,  0x03AE, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota,  0x03AF, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_omicron,  0x03CC, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon,  0x03CD, 
+IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,  0x03CE, 
+IBUS_KEY_apostrophe, 0x1F00,  0x1F04, 
+IBUS_KEY_apostrophe, 0x1F01,  0x1F05, 
+IBUS_KEY_apostrophe, 0x1F08,  0x1F0C, 
+IBUS_KEY_apostrophe, 0x1F09,  0x1F0D, 
+IBUS_KEY_apostrophe, 0x1F10,  0x1F14, 
+IBUS_KEY_apostrophe, 0x1F11,  0x1F15, 
+IBUS_KEY_apostrophe, 0x1F18,  0x1F1C, 
+IBUS_KEY_apostrophe, 0x1F19,  0x1F1D, 
+IBUS_KEY_apostrophe, 0x1F20,  0x1F24, 
+IBUS_KEY_apostrophe, 0x1F21,  0x1F25, 
+IBUS_KEY_apostrophe, 0x1F28,  0x1F2C, 
+IBUS_KEY_apostrophe, 0x1F29,  0x1F2D, 
+IBUS_KEY_apostrophe, 0x1F30,  0x1F34, 
+IBUS_KEY_apostrophe, 0x1F31,  0x1F35, 
+IBUS_KEY_apostrophe, 0x1F38,  0x1F3C, 
+IBUS_KEY_apostrophe, 0x1F39,  0x1F3D, 
+IBUS_KEY_apostrophe, 0x1F40,  0x1F44, 
+IBUS_KEY_apostrophe, 0x1F41,  0x1F45, 
+IBUS_KEY_apostrophe, 0x1F48,  0x1F4C, 
+IBUS_KEY_apostrophe, 0x1F49,  0x1F4D, 
+IBUS_KEY_apostrophe, 0x1F50,  0x1F54, 
+IBUS_KEY_apostrophe, 0x1F51,  0x1F55, 
+IBUS_KEY_apostrophe, 0x1F59,  0x1F5D, 
+IBUS_KEY_apostrophe, 0x1F60,  0x1F64, 
+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, 
+IBUS_KEY_parenleft, IBUS_KEY_A,  0x0102, 
+IBUS_KEY_parenleft, IBUS_KEY_G,  0x011E, 
+IBUS_KEY_parenleft, IBUS_KEY_a,  0x0103, 
+IBUS_KEY_parenleft, IBUS_KEY_c,  0x00A9, 
+IBUS_KEY_parenleft, IBUS_KEY_g,  0x011F, 
+IBUS_KEY_parenleft, IBUS_KEY_r,  0x00AE, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F09, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F19, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F29, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F39, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F49, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_RHO,  0x1FEC, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F59, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F69, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F01, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F11, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F21, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F31, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F41, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_rho,  0x1FE5, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F51, 
+IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F61, 
+IBUS_KEY_parenright, IBUS_KEY_parenright,  0x005D, 
+IBUS_KEY_parenright, IBUS_KEY_minus,  0x007D, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F08, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F18, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F28, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F38, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F48, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F68, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F00, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F10, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F20, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F30, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F40, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_rho,  0x1FE4, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F50, 
+IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F60, 
+IBUS_KEY_asterisk, IBUS_KEY_0,  0x00B0, 
+IBUS_KEY_asterisk, IBUS_KEY_A,  0x00C5, 
+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, 
+IBUS_KEY_plus, IBUS_KEY_U,  0x01AF, 
+IBUS_KEY_plus, IBUS_KEY_o,  0x01A1, 
+IBUS_KEY_plus, IBUS_KEY_u,  0x01B0, 
+IBUS_KEY_comma, IBUS_KEY_space,  0x00B8, 
+IBUS_KEY_comma, IBUS_KEY_quotedbl,  0x201E, 
+IBUS_KEY_comma, IBUS_KEY_apostrophe,  0x201A, 
+IBUS_KEY_comma, IBUS_KEY_comma,  0x00B8, 
+IBUS_KEY_comma, IBUS_KEY_minus,  0x00AC, 
+IBUS_KEY_comma, IBUS_KEY_A,  0x0104, 
+IBUS_KEY_comma, IBUS_KEY_C,  0x00C7, 
+IBUS_KEY_comma, IBUS_KEY_D,  0x1E10, 
+IBUS_KEY_comma, IBUS_KEY_E,  0x0118, 
+IBUS_KEY_comma, IBUS_KEY_G,  0x0122, 
+IBUS_KEY_comma, IBUS_KEY_H,  0x1E28, 
+IBUS_KEY_comma, IBUS_KEY_I,  0x012E, 
+IBUS_KEY_comma, IBUS_KEY_K,  0x0136, 
+IBUS_KEY_comma, IBUS_KEY_L,  0x013B, 
+IBUS_KEY_comma, IBUS_KEY_N,  0x0145, 
+IBUS_KEY_comma, IBUS_KEY_O,  0x01EA, 
+IBUS_KEY_comma, IBUS_KEY_R,  0x0156, 
+IBUS_KEY_comma, IBUS_KEY_S,  0x015E, 
+IBUS_KEY_comma, IBUS_KEY_T,  0x0162, 
+IBUS_KEY_comma, IBUS_KEY_U,  0x0172, 
+IBUS_KEY_comma, IBUS_KEY_a,  0x0105, 
+IBUS_KEY_comma, IBUS_KEY_c,  0x00E7, 
+IBUS_KEY_comma, IBUS_KEY_d,  0x1E11, 
+IBUS_KEY_comma, IBUS_KEY_e,  0x0119, 
+IBUS_KEY_comma, IBUS_KEY_g,  0x0123, 
+IBUS_KEY_comma, IBUS_KEY_h,  0x1E29, 
+IBUS_KEY_comma, IBUS_KEY_i,  0x012F, 
+IBUS_KEY_comma, IBUS_KEY_k,  0x0137, 
+IBUS_KEY_comma, IBUS_KEY_l,  0x013C, 
+IBUS_KEY_comma, IBUS_KEY_n,  0x0146, 
+IBUS_KEY_comma, IBUS_KEY_o,  0x01EB, 
+IBUS_KEY_comma, IBUS_KEY_r,  0x0157, 
+IBUS_KEY_comma, IBUS_KEY_s,  0x015F, 
+IBUS_KEY_comma, IBUS_KEY_t,  0x0163, 
+IBUS_KEY_comma, IBUS_KEY_u,  0x0173, 
+IBUS_KEY_minus, IBUS_KEY_space,  0x007E, 
+IBUS_KEY_minus, IBUS_KEY_parenleft,  0x007B, 
+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,  0x0100, 
+IBUS_KEY_minus, IBUS_KEY_D,  0x0110, 
+IBUS_KEY_minus, IBUS_KEY_E,  0x0112, 
+IBUS_KEY_minus, IBUS_KEY_I,  0x012A, 
+IBUS_KEY_minus, IBUS_KEY_L,  0x00A3, 
+IBUS_KEY_minus, IBUS_KEY_N,  0x00D1, 
+IBUS_KEY_minus, IBUS_KEY_O,  0x014C, 
+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, 
+IBUS_KEY_minus, IBUS_KEY_e,  0x0113, 
+IBUS_KEY_minus, IBUS_KEY_i,  0x012B, 
+IBUS_KEY_minus, IBUS_KEY_l,  0x00A3, 
+IBUS_KEY_minus, IBUS_KEY_n,  0x00F1, 
+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, 
+IBUS_KEY_period, IBUS_KEY_A,  0x0226, 
+IBUS_KEY_period, IBUS_KEY_B,  0x1E02, 
+IBUS_KEY_period, IBUS_KEY_C,  0x010A, 
+IBUS_KEY_period, IBUS_KEY_D,  0x1E0A, 
+IBUS_KEY_period, IBUS_KEY_E,  0x0116, 
+IBUS_KEY_period, IBUS_KEY_F,  0x1E1E, 
+IBUS_KEY_period, IBUS_KEY_G,  0x0120, 
+IBUS_KEY_period, IBUS_KEY_H,  0x1E22, 
+IBUS_KEY_period, IBUS_KEY_I,  0x0130, 
+IBUS_KEY_period, IBUS_KEY_M,  0x1E40, 
+IBUS_KEY_period, IBUS_KEY_N,  0x1E44, 
+IBUS_KEY_period, IBUS_KEY_O,  0x022E, 
+IBUS_KEY_period, IBUS_KEY_P,  0x1E56, 
+IBUS_KEY_period, IBUS_KEY_R,  0x1E58, 
+IBUS_KEY_period, IBUS_KEY_S,  0x1E60, 
+IBUS_KEY_period, IBUS_KEY_T,  0x1E6A, 
+IBUS_KEY_period, IBUS_KEY_W,  0x1E86, 
+IBUS_KEY_period, IBUS_KEY_X,  0x1E8A, 
+IBUS_KEY_period, IBUS_KEY_Y,  0x1E8E, 
+IBUS_KEY_period, IBUS_KEY_Z,  0x017B, 
+IBUS_KEY_period, IBUS_KEY_asciicircum,  0x00B7, 
+IBUS_KEY_period, IBUS_KEY_a,  0x0227, 
+IBUS_KEY_period, IBUS_KEY_b,  0x1E03, 
+IBUS_KEY_period, IBUS_KEY_c,  0x010B, 
+IBUS_KEY_period, IBUS_KEY_d,  0x1E0B, 
+IBUS_KEY_period, IBUS_KEY_e,  0x0117, 
+IBUS_KEY_period, IBUS_KEY_f,  0x1E1F, 
+IBUS_KEY_period, IBUS_KEY_g,  0x0121, 
+IBUS_KEY_period, IBUS_KEY_h,  0x1E23, 
+IBUS_KEY_period, IBUS_KEY_i,  0x0131, 
+IBUS_KEY_period, IBUS_KEY_m,  0x1E41, 
+IBUS_KEY_period, IBUS_KEY_n,  0x1E45, 
+IBUS_KEY_period, IBUS_KEY_o,  0x022F, 
+IBUS_KEY_period, IBUS_KEY_p,  0x1E57, 
+IBUS_KEY_period, IBUS_KEY_r,  0x1E59, 
+IBUS_KEY_period, IBUS_KEY_s,  0x1E61, 
+IBUS_KEY_period, IBUS_KEY_t,  0x1E6B, 
+IBUS_KEY_period, IBUS_KEY_w,  0x1E87, 
+IBUS_KEY_period, IBUS_KEY_x,  0x1E8B, 
+IBUS_KEY_period, IBUS_KEY_y,  0x1E8F, 
+IBUS_KEY_period, IBUS_KEY_z,  0x017C, 
+IBUS_KEY_period, 0x017F,  0x1E9B, 
+IBUS_KEY_period, IBUS_KEY_Sacute,  0x1E64, 
+IBUS_KEY_period, IBUS_KEY_Scaron,  0x1E66, 
+IBUS_KEY_period, IBUS_KEY_sacute,  0x1E65, 
+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, 
+IBUS_KEY_slash, IBUS_KEY_C,  0x20A1, 
+IBUS_KEY_slash, IBUS_KEY_D,  0x0110, 
+IBUS_KEY_slash, IBUS_KEY_G,  0x01E4, 
+IBUS_KEY_slash, IBUS_KEY_H,  0x0126, 
+IBUS_KEY_slash, IBUS_KEY_I,  0x0197, 
+IBUS_KEY_slash, IBUS_KEY_L,  0x0141, 
+IBUS_KEY_slash, IBUS_KEY_O,  0x00D8, 
+IBUS_KEY_slash, IBUS_KEY_T,  0x0166, 
+IBUS_KEY_slash, IBUS_KEY_U,  0x00B5, 
+IBUS_KEY_slash, IBUS_KEY_Z,  0x01B5, 
+IBUS_KEY_slash, IBUS_KEY_asciicircum,  0x007C, 
+IBUS_KEY_slash, IBUS_KEY_b,  0x0180, 
+IBUS_KEY_slash, IBUS_KEY_c,  0x00A2, 
+IBUS_KEY_slash, IBUS_KEY_d,  0x0111, 
+IBUS_KEY_slash, IBUS_KEY_g,  0x01E5, 
+IBUS_KEY_slash, IBUS_KEY_h,  0x0127, 
+IBUS_KEY_slash, IBUS_KEY_i,  0x0268, 
+IBUS_KEY_slash, IBUS_KEY_l,  0x0142, 
+IBUS_KEY_slash, IBUS_KEY_m,  0x20A5, 
+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, 
+IBUS_KEY_slash, 0x04AF,  0x04B1, 
+IBUS_KEY_slash, IBUS_KEY_Cyrillic_ghe,  0x0493, 
+IBUS_KEY_slash, IBUS_KEY_Cyrillic_ka,  0x049F, 
+IBUS_KEY_slash, IBUS_KEY_Cyrillic_GHE,  0x0492, 
+IBUS_KEY_slash, IBUS_KEY_Cyrillic_KA,  0x049E, 
+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, 
+IBUS_KEY_0, IBUS_KEY_asciicircum,  0x00B0, 
+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, 
+IBUS_KEY_2, IBUS_KEY_3,  0x2154, 
+IBUS_KEY_2, IBUS_KEY_5,  0x2156, 
+IBUS_KEY_2, IBUS_KEY_S,  0x00B2, 
+IBUS_KEY_2, IBUS_KEY_asciicircum,  0x00B2, 
+IBUS_KEY_2, IBUS_KEY_s,  0x00B2, 
+IBUS_KEY_3, IBUS_KEY_4,  0x00BE, 
+IBUS_KEY_3, IBUS_KEY_5,  0x2157, 
+IBUS_KEY_3, IBUS_KEY_8,  0x215C, 
+IBUS_KEY_3, IBUS_KEY_S,  0x00B3, 
+IBUS_KEY_3, IBUS_KEY_asciicircum,  0x00B3, 
+IBUS_KEY_3, IBUS_KEY_s,  0x00B3, 
+IBUS_KEY_4, IBUS_KEY_5,  0x2158, 
+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_S,  0x0218, 
+IBUS_KEY_semicolon, IBUS_KEY_T,  0x021A, 
+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, 
+IBUS_KEY_semicolon, IBUS_KEY_o,  0x01EB, 
+IBUS_KEY_semicolon, IBUS_KEY_s,  0x0219, 
+IBUS_KEY_semicolon, IBUS_KEY_t,  0x021B, 
+IBUS_KEY_semicolon, IBUS_KEY_u,  0x0173, 
+IBUS_KEY_less, IBUS_KEY_space,  0x02C7, 
+IBUS_KEY_less, IBUS_KEY_quotedbl,  0x201C, 
+IBUS_KEY_less, IBUS_KEY_apostrophe,  0x2018, 
+IBUS_KEY_less, IBUS_KEY_minus,  0x2190, 
+IBUS_KEY_less, IBUS_KEY_slash,  0x005C, 
+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, 
+IBUS_KEY_less, IBUS_KEY_L,  0x013D, 
+IBUS_KEY_less, IBUS_KEY_N,  0x0147, 
+IBUS_KEY_less, IBUS_KEY_R,  0x0158, 
+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, 
+IBUS_KEY_less, IBUS_KEY_l,  0x013E, 
+IBUS_KEY_less, IBUS_KEY_n,  0x0148, 
+IBUS_KEY_less, IBUS_KEY_r,  0x0159, 
+IBUS_KEY_less, IBUS_KEY_s,  0x0161, 
+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_greater,  0x21D2, 
+IBUS_KEY_equal, IBUS_KEY_C,  0x20AC, 
+IBUS_KEY_equal, IBUS_KEY_E,  0x20AC, 
+IBUS_KEY_equal, IBUS_KEY_L,  0x20A4, 
+IBUS_KEY_equal, IBUS_KEY_N,  0x20A6, 
+IBUS_KEY_equal, IBUS_KEY_O,  0x0150, 
+IBUS_KEY_equal, IBUS_KEY_R,  0x20B9, 
+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, 
+IBUS_KEY_equal, IBUS_KEY_r,  0x20B9, 
+IBUS_KEY_equal, IBUS_KEY_u,  0x0171, 
+IBUS_KEY_equal, IBUS_KEY_y,  0x00A5, 
+IBUS_KEY_equal, 0x0338,  0x2260, 
+IBUS_KEY_equal, IBUS_KEY_Cyrillic_u,  0x04F3, 
+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, 
+IBUS_KEY_greater, IBUS_KEY_E,  0x00CA, 
+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, 
+IBUS_KEY_question, IBUS_KEY_E,  0x1EBA, 
+IBUS_KEY_question, IBUS_KEY_I,  0x1EC8, 
+IBUS_KEY_question, IBUS_KEY_O,  0x1ECE, 
+IBUS_KEY_question, IBUS_KEY_U,  0x1EE6, 
+IBUS_KEY_question, IBUS_KEY_Y,  0x1EF6, 
+IBUS_KEY_question, IBUS_KEY_a,  0x1EA3, 
+IBUS_KEY_question, IBUS_KEY_e,  0x1EBB, 
+IBUS_KEY_question, IBUS_KEY_i,  0x1EC9, 
+IBUS_KEY_question, IBUS_KEY_o,  0x1ECF, 
+IBUS_KEY_question, IBUS_KEY_u,  0x1EE7, 
+IBUS_KEY_question, IBUS_KEY_y,  0x1EF7, 
+IBUS_KEY_question, IBUS_KEY_Acircumflex,  0x1EA8, 
+IBUS_KEY_question, IBUS_KEY_Ecircumflex,  0x1EC2, 
+IBUS_KEY_question, IBUS_KEY_Ocircumflex,  0x1ED4, 
+IBUS_KEY_question, IBUS_KEY_acircumflex,  0x1EA9, 
+IBUS_KEY_question, IBUS_KEY_ecircumflex,  0x1EC3, 
+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, 
+IBUS_KEY_A, IBUS_KEY_asterisk,  0x00C5, 
+IBUS_KEY_A, IBUS_KEY_comma,  0x0104, 
+IBUS_KEY_A, IBUS_KEY_minus,  0x0100, 
+IBUS_KEY_A, IBUS_KEY_semicolon,  0x0104, 
+IBUS_KEY_A, IBUS_KEY_greater,  0x00C2, 
+IBUS_KEY_A, IBUS_KEY_A,  0x00C5, 
+IBUS_KEY_A, IBUS_KEY_E,  0x00C6, 
+IBUS_KEY_A, IBUS_KEY_T,  0x0040, 
+IBUS_KEY_A, IBUS_KEY_asciicircum,  0x00C2, 
+IBUS_KEY_A, IBUS_KEY_underscore,  0x0100, 
+IBUS_KEY_A, IBUS_KEY_grave,  0x00C0, 
+IBUS_KEY_A, IBUS_KEY_asciitilde,  0x00C3, 
+IBUS_KEY_A, IBUS_KEY_diaeresis,  0x00C4, 
+IBUS_KEY_A, IBUS_KEY_acute,  0x00C1, 
+IBUS_KEY_B, IBUS_KEY_period,  0x1E02, 
+IBUS_KEY_C, IBUS_KEY_apostrophe,  0x0106, 
+IBUS_KEY_C, IBUS_KEY_comma,  0x00C7, 
+IBUS_KEY_C, IBUS_KEY_period,  0x010A, 
+IBUS_KEY_C, IBUS_KEY_slash,  0x20A1, 
+IBUS_KEY_C, IBUS_KEY_0,  0x00A9, 
+IBUS_KEY_C, IBUS_KEY_less,  0x010C, 
+IBUS_KEY_C, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_C, IBUS_KEY_E,  0x20A0, 
+IBUS_KEY_C, IBUS_KEY_O,  0x00A9, 
+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, 
+IBUS_KEY_D, IBUS_KEY_H,  0x00D0, 
+IBUS_KEY_E, IBUS_KEY_quotedbl,  0x00CB, 
+IBUS_KEY_E, IBUS_KEY_apostrophe,  0x00C9, 
+IBUS_KEY_E, IBUS_KEY_comma,  0x0118, 
+IBUS_KEY_E, IBUS_KEY_minus,  0x0112, 
+IBUS_KEY_E, IBUS_KEY_period,  0x0116, 
+IBUS_KEY_E, IBUS_KEY_semicolon,  0x0118, 
+IBUS_KEY_E, IBUS_KEY_less,  0x011A, 
+IBUS_KEY_E, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_E, IBUS_KEY_greater,  0x00CA, 
+IBUS_KEY_E, IBUS_KEY_asciicircum,  0x00CA, 
+IBUS_KEY_E, IBUS_KEY_underscore,  0x0112, 
+IBUS_KEY_E, IBUS_KEY_grave,  0x00C8, 
+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_semicolon,  0x012E, 
+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, 
+IBUS_KEY_K, IBUS_KEY_comma,  0x0136, 
+IBUS_KEY_L, IBUS_KEY_apostrophe,  0x0139, 
+IBUS_KEY_L, IBUS_KEY_comma,  0x013B, 
+IBUS_KEY_L, IBUS_KEY_minus,  0x00A3, 
+IBUS_KEY_L, IBUS_KEY_slash,  0x0141, 
+IBUS_KEY_L, IBUS_KEY_less,  0x013D, 
+IBUS_KEY_L, IBUS_KEY_equal,  0x20A4, 
+IBUS_KEY_L, IBUS_KEY_V,  0x007C, 
+IBUS_KEY_M, IBUS_KEY_period,  0x1E40, 
+IBUS_KEY_N, IBUS_KEY_apostrophe,  0x0143, 
+IBUS_KEY_N, IBUS_KEY_comma,  0x0145, 
+IBUS_KEY_N, IBUS_KEY_minus,  0x00D1, 
+IBUS_KEY_N, IBUS_KEY_less,  0x0147, 
+IBUS_KEY_N, IBUS_KEY_equal,  0x20A6, 
+IBUS_KEY_N, IBUS_KEY_G,  0x014A, 
+IBUS_KEY_N, IBUS_KEY_O,  0x2116, 
+IBUS_KEY_N, IBUS_KEY_o,  0x2116, 
+IBUS_KEY_N, IBUS_KEY_asciitilde,  0x00D1, 
+IBUS_KEY_O, IBUS_KEY_quotedbl,  0x00D6, 
+IBUS_KEY_O, IBUS_KEY_apostrophe,  0x00D3, 
+IBUS_KEY_O, IBUS_KEY_comma,  0x01EA, 
+IBUS_KEY_O, IBUS_KEY_minus,  0x014C, 
+IBUS_KEY_O, IBUS_KEY_slash,  0x00D8, 
+IBUS_KEY_O, IBUS_KEY_semicolon,  0x01EA, 
+IBUS_KEY_O, IBUS_KEY_greater,  0x00D4, 
+IBUS_KEY_O, IBUS_KEY_A,  0x24B6, 
+IBUS_KEY_O, IBUS_KEY_C,  0x00A9, 
+IBUS_KEY_O, IBUS_KEY_E,  0x0152, 
+IBUS_KEY_O, IBUS_KEY_R,  0x00AE, 
+IBUS_KEY_O, IBUS_KEY_S,  0x00A7, 
+IBUS_KEY_O, IBUS_KEY_X,  0x00A4, 
+IBUS_KEY_O, IBUS_KEY_asciicircum,  0x00D4, 
+IBUS_KEY_O, IBUS_KEY_underscore,  0x014C, 
+IBUS_KEY_O, IBUS_KEY_grave,  0x00D2, 
+IBUS_KEY_O, IBUS_KEY_c,  0x00A9, 
+IBUS_KEY_O, IBUS_KEY_r,  0x00AE, 
+IBUS_KEY_O, IBUS_KEY_x,  0x00A4, 
+IBUS_KEY_O, IBUS_KEY_asciitilde,  0x00D5, 
+IBUS_KEY_O, IBUS_KEY_diaeresis,  0x00D6, 
+IBUS_KEY_O, IBUS_KEY_acute,  0x00D3, 
+IBUS_KEY_P, IBUS_KEY_exclam,  0x00B6, 
+IBUS_KEY_P, IBUS_KEY_period,  0x1E56, 
+IBUS_KEY_P, IBUS_KEY_P,  0x00B6, 
+IBUS_KEY_P, IBUS_KEY_t,  0x20A7, 
+IBUS_KEY_R, IBUS_KEY_apostrophe,  0x0154, 
+IBUS_KEY_R, IBUS_KEY_comma,  0x0156, 
+IBUS_KEY_R, IBUS_KEY_less,  0x0158, 
+IBUS_KEY_R, IBUS_KEY_equal,  0x20B9, 
+IBUS_KEY_R, IBUS_KEY_O,  0x00AE, 
+IBUS_KEY_R, IBUS_KEY_o,  0x00AE, 
+IBUS_KEY_R, IBUS_KEY_s,  0x20A8, 
+IBUS_KEY_S, IBUS_KEY_exclam,  0x00A7, 
+IBUS_KEY_S, IBUS_KEY_apostrophe,  0x015A, 
+IBUS_KEY_S, IBUS_KEY_comma,  0x015E, 
+IBUS_KEY_S, IBUS_KEY_period,  0x1E60, 
+IBUS_KEY_S, IBUS_KEY_0,  0x00A7, 
+IBUS_KEY_S, IBUS_KEY_1,  0x00B9, 
+IBUS_KEY_S, IBUS_KEY_2,  0x00B2, 
+IBUS_KEY_S, IBUS_KEY_3,  0x00B3, 
+IBUS_KEY_S, IBUS_KEY_semicolon,  0x0218, 
+IBUS_KEY_S, IBUS_KEY_less,  0x0160, 
+IBUS_KEY_S, IBUS_KEY_M,  0x2120, 
+IBUS_KEY_S, IBUS_KEY_O,  0x00A7, 
+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, 
+IBUS_KEY_T, IBUS_KEY_semicolon,  0x021A, 
+IBUS_KEY_T, IBUS_KEY_less,  0x0164, 
+IBUS_KEY_T, IBUS_KEY_H,  0x00DE, 
+IBUS_KEY_T, IBUS_KEY_M,  0x2122, 
+IBUS_KEY_T, IBUS_KEY_m,  0x2122, 
+IBUS_KEY_U, IBUS_KEY_quotedbl,  0x00DC, 
+IBUS_KEY_U, IBUS_KEY_apostrophe,  0x00DA, 
+IBUS_KEY_U, IBUS_KEY_asterisk,  0x016E, 
+IBUS_KEY_U, IBUS_KEY_comma,  0x0172, 
+IBUS_KEY_U, IBUS_KEY_minus,  0x016A, 
+IBUS_KEY_U, IBUS_KEY_slash,  0x00B5, 
+IBUS_KEY_U, IBUS_KEY_semicolon,  0x0172, 
+IBUS_KEY_U, IBUS_KEY_greater,  0x00DB, 
+IBUS_KEY_U, IBUS_KEY_A,  0x0102, 
+IBUS_KEY_U, IBUS_KEY_E,  0x0114, 
+IBUS_KEY_U, IBUS_KEY_G,  0x011E, 
+IBUS_KEY_U, IBUS_KEY_I,  0x012C, 
+IBUS_KEY_U, IBUS_KEY_O,  0x014E, 
+IBUS_KEY_U, IBUS_KEY_U,  0x016C, 
+IBUS_KEY_U, IBUS_KEY_asciicircum,  0x00DB, 
+IBUS_KEY_U, IBUS_KEY_underscore,  0x016A, 
+IBUS_KEY_U, IBUS_KEY_grave,  0x00D9, 
+IBUS_KEY_U, IBUS_KEY_a,  0x0103, 
+IBUS_KEY_U, IBUS_KEY_e,  0x0115, 
+IBUS_KEY_U, IBUS_KEY_g,  0x011F, 
+IBUS_KEY_U, IBUS_KEY_i,  0x012D, 
+IBUS_KEY_U, IBUS_KEY_o,  0x014F, 
+IBUS_KEY_U, IBUS_KEY_u,  0x016D, 
+IBUS_KEY_U, IBUS_KEY_asciitilde,  0x0168, 
+IBUS_KEY_U, IBUS_KEY_diaeresis,  0x00DC, 
+IBUS_KEY_U, IBUS_KEY_acute,  0x00DA, 
+IBUS_KEY_U, 0x0228,  0x1E1C, 
+IBUS_KEY_U, 0x0229,  0x1E1D, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_a,  0x04D1, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_ie,  0x04D7, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_i,  0x0439, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_u,  0x045E, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_zhe,  0x04C2, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_A,  0x04D0, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_IE,  0x04D6, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_I,  0x0419, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_U,  0x040E, 
+IBUS_KEY_U, IBUS_KEY_Cyrillic_ZHE,  0x04C1, 
+IBUS_KEY_U, IBUS_KEY_Greek_ALPHA,  0x1FB8, 
+IBUS_KEY_U, IBUS_KEY_Greek_IOTA,  0x1FD8, 
+IBUS_KEY_U, IBUS_KEY_Greek_UPSILON,  0x1FE8, 
+IBUS_KEY_U, IBUS_KEY_Greek_alpha,  0x1FB0, 
+IBUS_KEY_U, IBUS_KEY_Greek_iota,  0x1FD0, 
+IBUS_KEY_U, IBUS_KEY_Greek_upsilon,  0x1FE0, 
+IBUS_KEY_U, 0x1EA0,  0x1EB6, 
+IBUS_KEY_U, 0x1EA1,  0x1EB7, 
+IBUS_KEY_V, IBUS_KEY_L,  0x007C, 
+IBUS_KEY_W, IBUS_KEY_equal,  0x20A9, 
+IBUS_KEY_W, IBUS_KEY_asciicircum,  0x0174, 
+IBUS_KEY_X, IBUS_KEY_0,  0x00A4, 
+IBUS_KEY_X, IBUS_KEY_O,  0x00A4, 
+IBUS_KEY_X, IBUS_KEY_o,  0x00A4, 
+IBUS_KEY_Y, IBUS_KEY_quotedbl,  0x0178, 
+IBUS_KEY_Y, IBUS_KEY_apostrophe,  0x00DD, 
+IBUS_KEY_Y, IBUS_KEY_minus,  0x00A5, 
+IBUS_KEY_Y, IBUS_KEY_equal,  0x00A5, 
+IBUS_KEY_Y, IBUS_KEY_asciicircum,  0x0176, 
+IBUS_KEY_Y, IBUS_KEY_diaeresis,  0x0178, 
+IBUS_KEY_Y, IBUS_KEY_acute,  0x00DD, 
+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, 
+IBUS_KEY_asciicircum, IBUS_KEY_plus,  0x207A, 
+IBUS_KEY_asciicircum, IBUS_KEY_minus,  0x00AF, 
+IBUS_KEY_asciicircum, IBUS_KEY_period,  0x00B7, 
+IBUS_KEY_asciicircum, IBUS_KEY_slash,  0x007C, 
+IBUS_KEY_asciicircum, IBUS_KEY_0,  0x2070, 
+IBUS_KEY_asciicircum, IBUS_KEY_1,  0x00B9, 
+IBUS_KEY_asciicircum, IBUS_KEY_2,  0x00B2, 
+IBUS_KEY_asciicircum, IBUS_KEY_3,  0x00B3, 
+IBUS_KEY_asciicircum, IBUS_KEY_4,  0x2074, 
+IBUS_KEY_asciicircum, IBUS_KEY_5,  0x2075, 
+IBUS_KEY_asciicircum, IBUS_KEY_6,  0x2076, 
+IBUS_KEY_asciicircum, IBUS_KEY_7,  0x2077, 
+IBUS_KEY_asciicircum, IBUS_KEY_8,  0x2078, 
+IBUS_KEY_asciicircum, IBUS_KEY_9,  0x2079, 
+IBUS_KEY_asciicircum, IBUS_KEY_equal,  0x207C, 
+IBUS_KEY_asciicircum, IBUS_KEY_A,  0x00C2, 
+IBUS_KEY_asciicircum, IBUS_KEY_C,  0x0108, 
+IBUS_KEY_asciicircum, IBUS_KEY_E,  0x00CA, 
+IBUS_KEY_asciicircum, IBUS_KEY_G,  0x011C, 
+IBUS_KEY_asciicircum, IBUS_KEY_H,  0x0124, 
+IBUS_KEY_asciicircum, IBUS_KEY_I,  0x00CE, 
+IBUS_KEY_asciicircum, IBUS_KEY_J,  0x0134, 
+IBUS_KEY_asciicircum, IBUS_KEY_O,  0x00D4, 
+IBUS_KEY_asciicircum, IBUS_KEY_S,  0x015C, 
+IBUS_KEY_asciicircum, IBUS_KEY_U,  0x00DB, 
+IBUS_KEY_asciicircum, IBUS_KEY_W,  0x0174, 
+IBUS_KEY_asciicircum, IBUS_KEY_Y,  0x0176, 
+IBUS_KEY_asciicircum, IBUS_KEY_Z,  0x1E90, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore,  0x00AF, 
+IBUS_KEY_asciicircum, IBUS_KEY_a,  0x00E2, 
+IBUS_KEY_asciicircum, IBUS_KEY_c,  0x0109, 
+IBUS_KEY_asciicircum, IBUS_KEY_e,  0x00EA, 
+IBUS_KEY_asciicircum, IBUS_KEY_g,  0x011D, 
+IBUS_KEY_asciicircum, IBUS_KEY_h,  0x0125, 
+IBUS_KEY_asciicircum, IBUS_KEY_i,  0x00EE, 
+IBUS_KEY_asciicircum, IBUS_KEY_j,  0x0135, 
+IBUS_KEY_asciicircum, IBUS_KEY_o,  0x00F4, 
+IBUS_KEY_asciicircum, IBUS_KEY_s,  0x015D, 
+IBUS_KEY_asciicircum, IBUS_KEY_u,  0x00FB, 
+IBUS_KEY_asciicircum, IBUS_KEY_w,  0x0175, 
+IBUS_KEY_asciicircum, IBUS_KEY_y,  0x0177, 
+IBUS_KEY_asciicircum, IBUS_KEY_z,  0x1E91, 
+IBUS_KEY_asciicircum, 0x1EA0,  0x1EAC, 
+IBUS_KEY_asciicircum, 0x1EA1,  0x1EAD, 
+IBUS_KEY_asciicircum, 0x1EB8,  0x1EC6, 
+IBUS_KEY_asciicircum, 0x1EB9,  0x1EC7, 
+IBUS_KEY_asciicircum, 0x1ECC,  0x1ED8, 
+IBUS_KEY_asciicircum, 0x1ECD,  0x1ED9, 
+IBUS_KEY_asciicircum, 0x2212,  0x207B, 
+IBUS_KEY_asciicircum, 0x4E00,  0x3192, 
+IBUS_KEY_asciicircum, 0x4E01,  0x319C, 
+IBUS_KEY_asciicircum, 0x4E09,  0x3194, 
+IBUS_KEY_asciicircum, 0x4E0A,  0x3196, 
+IBUS_KEY_asciicircum, 0x4E0B,  0x3198, 
+IBUS_KEY_asciicircum, 0x4E19,  0x319B, 
+IBUS_KEY_asciicircum, 0x4E2D,  0x3197, 
+IBUS_KEY_asciicircum, 0x4E59,  0x319A, 
+IBUS_KEY_asciicircum, 0x4E8C,  0x3193, 
+IBUS_KEY_asciicircum, 0x4EBA,  0x319F, 
+IBUS_KEY_asciicircum, 0x56DB,  0x3195, 
+IBUS_KEY_asciicircum, 0x5730,  0x319E, 
+IBUS_KEY_asciicircum, 0x5929,  0x319D, 
+IBUS_KEY_asciicircum, 0x7532,  0x3199, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_Space,  0x00B2, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_Add,  0x207A, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_0,  0x2070, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_1,  0x00B9, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_2,  0x00B2, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_3,  0x00B3, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_4,  0x2074, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_5,  0x2075, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_6,  0x2076, 
+IBUS_KEY_asciicircum, IBUS_KEY_KP_7,  0x2077, 
+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, 
+IBUS_KEY_underscore, IBUS_KEY_0,  0x2080, 
+IBUS_KEY_underscore, IBUS_KEY_1,  0x2081, 
+IBUS_KEY_underscore, IBUS_KEY_2,  0x2082, 
+IBUS_KEY_underscore, IBUS_KEY_3,  0x2083, 
+IBUS_KEY_underscore, IBUS_KEY_4,  0x2084, 
+IBUS_KEY_underscore, IBUS_KEY_5,  0x2085, 
+IBUS_KEY_underscore, IBUS_KEY_6,  0x2086, 
+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, 
+IBUS_KEY_underscore, IBUS_KEY_I,  0x012A, 
+IBUS_KEY_underscore, IBUS_KEY_O,  0x014C, 
+IBUS_KEY_underscore, IBUS_KEY_U,  0x016A, 
+IBUS_KEY_underscore, IBUS_KEY_Y,  0x0232, 
+IBUS_KEY_underscore, IBUS_KEY_asciicircum,  0x00AF, 
+IBUS_KEY_underscore, IBUS_KEY_underscore,  0x00AF, 
+IBUS_KEY_underscore, IBUS_KEY_a,  0x0101, 
+IBUS_KEY_underscore, IBUS_KEY_e,  0x0113, 
+IBUS_KEY_underscore, IBUS_KEY_g,  0x1E21, 
+IBUS_KEY_underscore, IBUS_KEY_i,  0x012B, 
+IBUS_KEY_underscore, IBUS_KEY_o,  0x014D, 
+IBUS_KEY_underscore, IBUS_KEY_u,  0x016B, 
+IBUS_KEY_underscore, IBUS_KEY_y,  0x0233, 
+IBUS_KEY_underscore, IBUS_KEY_Adiaeresis,  0x01DE, 
+IBUS_KEY_underscore, IBUS_KEY_AE,  0x01E2, 
+IBUS_KEY_underscore, IBUS_KEY_Otilde,  0x022C, 
+IBUS_KEY_underscore, IBUS_KEY_Odiaeresis,  0x022A, 
+IBUS_KEY_underscore, IBUS_KEY_Udiaeresis,  0x01D5, 
+IBUS_KEY_underscore, IBUS_KEY_adiaeresis,  0x01DF, 
+IBUS_KEY_underscore, IBUS_KEY_ae,  0x01E3, 
+IBUS_KEY_underscore, IBUS_KEY_otilde,  0x022D, 
+IBUS_KEY_underscore, IBUS_KEY_odiaeresis,  0x022B, 
+IBUS_KEY_underscore, IBUS_KEY_udiaeresis,  0x01D6, 
+IBUS_KEY_underscore, 0x01EA,  0x01EC, 
+IBUS_KEY_underscore, 0x01EB,  0x01ED, 
+IBUS_KEY_underscore, 0x0226,  0x01E0, 
+IBUS_KEY_underscore, 0x0227,  0x01E1, 
+IBUS_KEY_underscore, 0x022E,  0x0230, 
+IBUS_KEY_underscore, 0x022F,  0x0231, 
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_i,  0x04E3, 
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_u,  0x04EF, 
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_I,  0x04E2, 
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_U,  0x04EE, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_ALPHA,  0x1FB9, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_IOTA,  0x1FD9, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_UPSILON,  0x1FE9, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_alpha,  0x1FB1, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_iota,  0x1FD1, 
+IBUS_KEY_underscore, IBUS_KEY_Greek_upsilon,  0x1FE1, 
+IBUS_KEY_underscore, 0x1E36,  0x1E38, 
+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, 
+IBUS_KEY_underscore, IBUS_KEY_KP_1,  0x2081, 
+IBUS_KEY_underscore, IBUS_KEY_KP_2,  0x2082, 
+IBUS_KEY_underscore, IBUS_KEY_KP_3,  0x2083, 
+IBUS_KEY_underscore, IBUS_KEY_KP_4,  0x2084, 
+IBUS_KEY_underscore, IBUS_KEY_KP_5,  0x2085, 
+IBUS_KEY_underscore, IBUS_KEY_KP_6,  0x2086, 
+IBUS_KEY_underscore, IBUS_KEY_KP_7,  0x2087, 
+IBUS_KEY_underscore, IBUS_KEY_KP_8,  0x2088, 
+IBUS_KEY_underscore, IBUS_KEY_KP_9,  0x2089, 
+IBUS_KEY_underscore, IBUS_KEY_KP_Equal,  0x208C, 
+IBUS_KEY_grave, IBUS_KEY_space,  0x0060, 
+IBUS_KEY_grave, IBUS_KEY_A,  0x00C0, 
+IBUS_KEY_grave, IBUS_KEY_E,  0x00C8, 
+IBUS_KEY_grave, IBUS_KEY_I,  0x00CC, 
+IBUS_KEY_grave, IBUS_KEY_N,  0x01F8, 
+IBUS_KEY_grave, IBUS_KEY_O,  0x00D2, 
+IBUS_KEY_grave, IBUS_KEY_U,  0x00D9, 
+IBUS_KEY_grave, IBUS_KEY_W,  0x1E80, 
+IBUS_KEY_grave, IBUS_KEY_Y,  0x1EF2, 
+IBUS_KEY_grave, IBUS_KEY_a,  0x00E0, 
+IBUS_KEY_grave, IBUS_KEY_e,  0x00E8, 
+IBUS_KEY_grave, IBUS_KEY_i,  0x00EC, 
+IBUS_KEY_grave, IBUS_KEY_n,  0x01F9, 
+IBUS_KEY_grave, IBUS_KEY_o,  0x00F2, 
+IBUS_KEY_grave, IBUS_KEY_u,  0x00F9, 
+IBUS_KEY_grave, IBUS_KEY_w,  0x1E81, 
+IBUS_KEY_grave, IBUS_KEY_y,  0x1EF3, 
+IBUS_KEY_grave, IBUS_KEY_Acircumflex,  0x1EA6, 
+IBUS_KEY_grave, IBUS_KEY_Ecircumflex,  0x1EC0, 
+IBUS_KEY_grave, IBUS_KEY_Ocircumflex,  0x1ED2, 
+IBUS_KEY_grave, IBUS_KEY_Udiaeresis,  0x01DB, 
+IBUS_KEY_grave, IBUS_KEY_acircumflex,  0x1EA7, 
+IBUS_KEY_grave, IBUS_KEY_ecircumflex,  0x1EC1, 
+IBUS_KEY_grave, IBUS_KEY_ocircumflex,  0x1ED3, 
+IBUS_KEY_grave, IBUS_KEY_udiaeresis,  0x01DC, 
+IBUS_KEY_grave, IBUS_KEY_Abreve,  0x1EB0, 
+IBUS_KEY_grave, IBUS_KEY_abreve,  0x1EB1, 
+IBUS_KEY_grave, IBUS_KEY_Emacron,  0x1E14, 
+IBUS_KEY_grave, IBUS_KEY_emacron,  0x1E15, 
+IBUS_KEY_grave, IBUS_KEY_Omacron,  0x1E50, 
+IBUS_KEY_grave, IBUS_KEY_omacron,  0x1E51, 
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_ie,  0x0450, 
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_i,  0x045D, 
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_IE,  0x0400, 
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_I,  0x040D, 
+IBUS_KEY_grave, IBUS_KEY_Greek_iotadieresis,  0x1FD2, 
+IBUS_KEY_grave, IBUS_KEY_Greek_upsilondieresis,  0x1FE2, 
+IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA,  0x1FBA, 
+IBUS_KEY_grave, IBUS_KEY_Greek_EPSILON,  0x1FC8, 
+IBUS_KEY_grave, IBUS_KEY_Greek_ETA,  0x1FCA, 
+IBUS_KEY_grave, IBUS_KEY_Greek_IOTA,  0x1FDA, 
+IBUS_KEY_grave, IBUS_KEY_Greek_OMICRON,  0x1FF8, 
+IBUS_KEY_grave, IBUS_KEY_Greek_UPSILON,  0x1FEA, 
+IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA,  0x1FFA, 
+IBUS_KEY_grave, IBUS_KEY_Greek_alpha,  0x1F70, 
+IBUS_KEY_grave, IBUS_KEY_Greek_epsilon,  0x1F72, 
+IBUS_KEY_grave, IBUS_KEY_Greek_eta,  0x1F74, 
+IBUS_KEY_grave, IBUS_KEY_Greek_iota,  0x1F76, 
+IBUS_KEY_grave, IBUS_KEY_Greek_omicron,  0x1F78, 
+IBUS_KEY_grave, IBUS_KEY_Greek_upsilon,  0x1F7A, 
+IBUS_KEY_grave, IBUS_KEY_Greek_omega,  0x1F7C, 
+IBUS_KEY_grave, 0x1F00,  0x1F02, 
+IBUS_KEY_grave, 0x1F01,  0x1F03, 
+IBUS_KEY_grave, 0x1F08,  0x1F0A, 
+IBUS_KEY_grave, 0x1F09,  0x1F0B, 
+IBUS_KEY_grave, 0x1F10,  0x1F12, 
+IBUS_KEY_grave, 0x1F11,  0x1F13, 
+IBUS_KEY_grave, 0x1F18,  0x1F1A, 
+IBUS_KEY_grave, 0x1F19,  0x1F1B, 
+IBUS_KEY_grave, 0x1F20,  0x1F22, 
+IBUS_KEY_grave, 0x1F21,  0x1F23, 
+IBUS_KEY_grave, 0x1F28,  0x1F2A, 
+IBUS_KEY_grave, 0x1F29,  0x1F2B, 
+IBUS_KEY_grave, 0x1F30,  0x1F32, 
+IBUS_KEY_grave, 0x1F31,  0x1F33, 
+IBUS_KEY_grave, 0x1F38,  0x1F3A, 
+IBUS_KEY_grave, 0x1F39,  0x1F3B, 
+IBUS_KEY_grave, 0x1F40,  0x1F42, 
+IBUS_KEY_grave, 0x1F41,  0x1F43, 
+IBUS_KEY_grave, 0x1F48,  0x1F4A, 
+IBUS_KEY_grave, 0x1F49,  0x1F4B, 
+IBUS_KEY_grave, 0x1F50,  0x1F52, 
+IBUS_KEY_grave, 0x1F51,  0x1F53, 
+IBUS_KEY_grave, 0x1F59,  0x1F5B, 
+IBUS_KEY_grave, 0x1F60,  0x1F62, 
+IBUS_KEY_grave, 0x1F61,  0x1F63, 
+IBUS_KEY_grave, 0x1F68,  0x1F6A, 
+IBUS_KEY_grave, 0x1F69,  0x1F6B, 
+IBUS_KEY_a, IBUS_KEY_quotedbl,  0x00E4, 
+IBUS_KEY_a, IBUS_KEY_apostrophe,  0x00E1, 
+IBUS_KEY_a, IBUS_KEY_parenleft,  0x0103, 
+IBUS_KEY_a, IBUS_KEY_asterisk,  0x00E5, 
+IBUS_KEY_a, IBUS_KEY_comma,  0x0105, 
+IBUS_KEY_a, IBUS_KEY_minus,  0x0101, 
+IBUS_KEY_a, IBUS_KEY_semicolon,  0x0105, 
+IBUS_KEY_a, IBUS_KEY_greater,  0x00E2, 
+IBUS_KEY_a, IBUS_KEY_asciicircum,  0x00E2, 
+IBUS_KEY_a, IBUS_KEY_underscore,  0x0101, 
+IBUS_KEY_a, IBUS_KEY_grave,  0x00E0, 
+IBUS_KEY_a, IBUS_KEY_a,  0x00E5, 
+IBUS_KEY_a, IBUS_KEY_e,  0x00E6, 
+IBUS_KEY_a, IBUS_KEY_asciitilde,  0x00E3, 
+IBUS_KEY_a, IBUS_KEY_diaeresis,  0x00E4, 
+IBUS_KEY_a, IBUS_KEY_acute,  0x00E1, 
+IBUS_KEY_b, IBUS_KEY_period,  0x1E03, 
+IBUS_KEY_b, IBUS_KEY_A,  0x0102, 
+IBUS_KEY_b, IBUS_KEY_E,  0x0114, 
+IBUS_KEY_b, IBUS_KEY_G,  0x011E, 
+IBUS_KEY_b, IBUS_KEY_I,  0x012C, 
+IBUS_KEY_b, IBUS_KEY_O,  0x014E, 
+IBUS_KEY_b, IBUS_KEY_U,  0x016C, 
+IBUS_KEY_b, IBUS_KEY_a,  0x0103, 
+IBUS_KEY_b, IBUS_KEY_e,  0x0115, 
+IBUS_KEY_b, IBUS_KEY_g,  0x011F, 
+IBUS_KEY_b, IBUS_KEY_i,  0x012D, 
+IBUS_KEY_b, IBUS_KEY_o,  0x014F, 
+IBUS_KEY_b, IBUS_KEY_u,  0x016D, 
+IBUS_KEY_b, 0x0228,  0x1E1C, 
+IBUS_KEY_b, 0x0229,  0x1E1D, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_a,  0x04D1, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_ie,  0x04D7, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_i,  0x0439, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_u,  0x045E, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_zhe,  0x04C2, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_A,  0x04D0, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_IE,  0x04D6, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_I,  0x0419, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_U,  0x040E, 
+IBUS_KEY_b, IBUS_KEY_Cyrillic_ZHE,  0x04C1, 
+IBUS_KEY_b, IBUS_KEY_Greek_ALPHA,  0x1FB8, 
+IBUS_KEY_b, IBUS_KEY_Greek_IOTA,  0x1FD8, 
+IBUS_KEY_b, IBUS_KEY_Greek_UPSILON,  0x1FE8, 
+IBUS_KEY_b, IBUS_KEY_Greek_alpha,  0x1FB0, 
+IBUS_KEY_b, IBUS_KEY_Greek_iota,  0x1FD0, 
+IBUS_KEY_b, IBUS_KEY_Greek_upsilon,  0x1FE0, 
+IBUS_KEY_b, 0x1EA0,  0x1EB6, 
+IBUS_KEY_b, 0x1EA1,  0x1EB7, 
+IBUS_KEY_c, IBUS_KEY_apostrophe,  0x0107, 
+IBUS_KEY_c, IBUS_KEY_comma,  0x00E7, 
+IBUS_KEY_c, IBUS_KEY_period,  0x010B, 
+IBUS_KEY_c, IBUS_KEY_slash,  0x00A2, 
+IBUS_KEY_c, IBUS_KEY_0,  0x00A9, 
+IBUS_KEY_c, IBUS_KEY_less,  0x010D, 
+IBUS_KEY_c, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_c, IBUS_KEY_A,  0x01CD, 
+IBUS_KEY_c, IBUS_KEY_C,  0x010C, 
+IBUS_KEY_c, IBUS_KEY_D,  0x010E, 
+IBUS_KEY_c, IBUS_KEY_E,  0x011A, 
+IBUS_KEY_c, IBUS_KEY_G,  0x01E6, 
+IBUS_KEY_c, IBUS_KEY_H,  0x021E, 
+IBUS_KEY_c, IBUS_KEY_I,  0x01CF, 
+IBUS_KEY_c, IBUS_KEY_K,  0x01E8, 
+IBUS_KEY_c, IBUS_KEY_L,  0x013D, 
+IBUS_KEY_c, IBUS_KEY_N,  0x0147, 
+IBUS_KEY_c, IBUS_KEY_O,  0x01D1, 
+IBUS_KEY_c, IBUS_KEY_R,  0x0158, 
+IBUS_KEY_c, IBUS_KEY_S,  0x0160, 
+IBUS_KEY_c, IBUS_KEY_T,  0x0164, 
+IBUS_KEY_c, IBUS_KEY_U,  0x01D3, 
+IBUS_KEY_c, IBUS_KEY_Z,  0x017D, 
+IBUS_KEY_c, IBUS_KEY_a,  0x01CE, 
+IBUS_KEY_c, IBUS_KEY_c,  0x010D, 
+IBUS_KEY_c, IBUS_KEY_d,  0x010F, 
+IBUS_KEY_c, IBUS_KEY_e,  0x011B, 
+IBUS_KEY_c, IBUS_KEY_g,  0x01E7, 
+IBUS_KEY_c, IBUS_KEY_h,  0x021F, 
+IBUS_KEY_c, IBUS_KEY_i,  0x01D0, 
+IBUS_KEY_c, IBUS_KEY_j,  0x01F0, 
+IBUS_KEY_c, IBUS_KEY_k,  0x01E9, 
+IBUS_KEY_c, IBUS_KEY_l,  0x013E, 
+IBUS_KEY_c, IBUS_KEY_n,  0x0148, 
+IBUS_KEY_c, IBUS_KEY_o,  0x01D2, 
+IBUS_KEY_c, IBUS_KEY_r,  0x0159, 
+IBUS_KEY_c, IBUS_KEY_s,  0x0161, 
+IBUS_KEY_c, IBUS_KEY_t,  0x0165, 
+IBUS_KEY_c, IBUS_KEY_u,  0x01D4, 
+IBUS_KEY_c, IBUS_KEY_z,  0x017E, 
+IBUS_KEY_c, IBUS_KEY_bar,  0x00A2, 
+IBUS_KEY_c, IBUS_KEY_Udiaeresis,  0x01D9, 
+IBUS_KEY_c, IBUS_KEY_udiaeresis,  0x01DA, 
+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, 
+IBUS_KEY_e, IBUS_KEY_minus,  0x0113, 
+IBUS_KEY_e, IBUS_KEY_period,  0x0117, 
+IBUS_KEY_e, IBUS_KEY_semicolon,  0x0119, 
+IBUS_KEY_e, IBUS_KEY_less,  0x011B, 
+IBUS_KEY_e, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_e, IBUS_KEY_greater,  0x00EA, 
+IBUS_KEY_e, IBUS_KEY_asciicircum,  0x00EA, 
+IBUS_KEY_e, IBUS_KEY_underscore,  0x0113, 
+IBUS_KEY_e, IBUS_KEY_grave,  0x00E8, 
+IBUS_KEY_e, IBUS_KEY_e,  0x0259, 
+IBUS_KEY_e, IBUS_KEY_diaeresis,  0x00EB, 
+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, 
+IBUS_KEY_k, IBUS_KEY_comma,  0x0137, 
+IBUS_KEY_k, IBUS_KEY_k,  0x0138, 
+IBUS_KEY_l, IBUS_KEY_apostrophe,  0x013A, 
+IBUS_KEY_l, IBUS_KEY_comma,  0x013C, 
+IBUS_KEY_l, IBUS_KEY_minus,  0x00A3, 
+IBUS_KEY_l, IBUS_KEY_slash,  0x0142, 
+IBUS_KEY_l, IBUS_KEY_less,  0x013E, 
+IBUS_KEY_l, IBUS_KEY_equal,  0x00A3, 
+IBUS_KEY_l, IBUS_KEY_v,  0x007C, 
+IBUS_KEY_m, IBUS_KEY_period,  0x1E41, 
+IBUS_KEY_m, IBUS_KEY_slash,  0x20A5, 
+IBUS_KEY_m, IBUS_KEY_u,  0x00B5, 
+IBUS_KEY_n, IBUS_KEY_apostrophe,  0x0144, 
+IBUS_KEY_n, IBUS_KEY_comma,  0x0146, 
+IBUS_KEY_n, IBUS_KEY_minus,  0x00F1, 
+IBUS_KEY_n, IBUS_KEY_less,  0x0148, 
+IBUS_KEY_n, IBUS_KEY_g,  0x014B, 
+IBUS_KEY_n, IBUS_KEY_asciitilde,  0x00F1, 
+IBUS_KEY_o, IBUS_KEY_quotedbl,  0x00F6, 
+IBUS_KEY_o, IBUS_KEY_apostrophe,  0x00F3, 
+IBUS_KEY_o, IBUS_KEY_comma,  0x01EB, 
+IBUS_KEY_o, IBUS_KEY_minus,  0x014D, 
+IBUS_KEY_o, IBUS_KEY_slash,  0x00F8, 
+IBUS_KEY_o, IBUS_KEY_semicolon,  0x01EB, 
+IBUS_KEY_o, IBUS_KEY_greater,  0x00F4, 
+IBUS_KEY_o, IBUS_KEY_A,  0x00C5, 
+IBUS_KEY_o, IBUS_KEY_C,  0x00A9, 
+IBUS_KEY_o, IBUS_KEY_R,  0x00AE, 
+IBUS_KEY_o, IBUS_KEY_U,  0x016E, 
+IBUS_KEY_o, IBUS_KEY_X,  0x00A4, 
+IBUS_KEY_o, IBUS_KEY_asciicircum,  0x00F4, 
+IBUS_KEY_o, IBUS_KEY_underscore,  0x014D, 
+IBUS_KEY_o, IBUS_KEY_grave,  0x00F2, 
+IBUS_KEY_o, IBUS_KEY_a,  0x00E5, 
+IBUS_KEY_o, IBUS_KEY_c,  0x00A9, 
+IBUS_KEY_o, IBUS_KEY_e,  0x0153, 
+IBUS_KEY_o, IBUS_KEY_o,  0x00B0, 
+IBUS_KEY_o, IBUS_KEY_r,  0x00AE, 
+IBUS_KEY_o, IBUS_KEY_s,  0x00A7, 
+IBUS_KEY_o, IBUS_KEY_u,  0x016F, 
+IBUS_KEY_o, IBUS_KEY_w,  0x1E98, 
+IBUS_KEY_o, IBUS_KEY_x,  0x00A4, 
+IBUS_KEY_o, IBUS_KEY_y,  0x1E99, 
+IBUS_KEY_o, IBUS_KEY_asciitilde,  0x00F5, 
+IBUS_KEY_o, IBUS_KEY_diaeresis,  0x00F6, 
+IBUS_KEY_o, IBUS_KEY_acute,  0x00F3, 
+IBUS_KEY_p, IBUS_KEY_exclam,  0x00B6, 
+IBUS_KEY_p, IBUS_KEY_period,  0x1E57, 
+IBUS_KEY_r, IBUS_KEY_apostrophe,  0x0155, 
+IBUS_KEY_r, IBUS_KEY_comma,  0x0157, 
+IBUS_KEY_r, IBUS_KEY_less,  0x0159, 
+IBUS_KEY_r, IBUS_KEY_equal,  0x20B9, 
+IBUS_KEY_s, IBUS_KEY_exclam,  0x00A7, 
+IBUS_KEY_s, IBUS_KEY_apostrophe,  0x015B, 
+IBUS_KEY_s, IBUS_KEY_comma,  0x015F, 
+IBUS_KEY_s, IBUS_KEY_period,  0x1E61, 
+IBUS_KEY_s, IBUS_KEY_0,  0x00A7, 
+IBUS_KEY_s, IBUS_KEY_1,  0x00B9, 
+IBUS_KEY_s, IBUS_KEY_2,  0x00B2, 
+IBUS_KEY_s, IBUS_KEY_3,  0x00B3, 
+IBUS_KEY_s, IBUS_KEY_semicolon,  0x0219, 
+IBUS_KEY_s, IBUS_KEY_less,  0x0161, 
+IBUS_KEY_s, IBUS_KEY_M,  0x2120, 
+IBUS_KEY_s, IBUS_KEY_m,  0x2120, 
+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, 
+IBUS_KEY_t, IBUS_KEY_semicolon,  0x021B, 
+IBUS_KEY_t, IBUS_KEY_less,  0x0165, 
+IBUS_KEY_t, IBUS_KEY_M,  0x2122, 
+IBUS_KEY_t, IBUS_KEY_h,  0x00FE, 
+IBUS_KEY_t, IBUS_KEY_m,  0x2122, 
+IBUS_KEY_u, IBUS_KEY_quotedbl,  0x00FC, 
+IBUS_KEY_u, IBUS_KEY_apostrophe,  0x00FA, 
+IBUS_KEY_u, IBUS_KEY_asterisk,  0x016F, 
+IBUS_KEY_u, IBUS_KEY_comma,  0x0173, 
+IBUS_KEY_u, IBUS_KEY_minus,  0x016B, 
+IBUS_KEY_u, IBUS_KEY_slash,  0x00B5, 
+IBUS_KEY_u, IBUS_KEY_semicolon,  0x0173, 
+IBUS_KEY_u, IBUS_KEY_greater,  0x00FB, 
+IBUS_KEY_u, IBUS_KEY_A,  0x0102, 
+IBUS_KEY_u, IBUS_KEY_U,  0x016C, 
+IBUS_KEY_u, IBUS_KEY_asciicircum,  0x00FB, 
+IBUS_KEY_u, IBUS_KEY_underscore,  0x016B, 
+IBUS_KEY_u, IBUS_KEY_grave,  0x00F9, 
+IBUS_KEY_u, IBUS_KEY_a,  0x0103, 
+IBUS_KEY_u, IBUS_KEY_u,  0x016D, 
+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, 
+IBUS_KEY_w, IBUS_KEY_asciicircum,  0x0175, 
+IBUS_KEY_x, IBUS_KEY_0,  0x00A4, 
+IBUS_KEY_x, IBUS_KEY_O,  0x00A4, 
+IBUS_KEY_x, IBUS_KEY_o,  0x00A4, 
+IBUS_KEY_x, IBUS_KEY_x,  0x00D7, 
+IBUS_KEY_y, IBUS_KEY_quotedbl,  0x00FF, 
+IBUS_KEY_y, IBUS_KEY_apostrophe,  0x00FD, 
+IBUS_KEY_y, IBUS_KEY_minus,  0x00A5, 
+IBUS_KEY_y, IBUS_KEY_equal,  0x00A5, 
+IBUS_KEY_y, IBUS_KEY_asciicircum,  0x0177, 
+IBUS_KEY_y, IBUS_KEY_diaeresis,  0x00FF, 
+IBUS_KEY_y, IBUS_KEY_acute,  0x00FD, 
+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, 
+IBUS_KEY_asciitilde, IBUS_KEY_N,  0x00D1, 
+IBUS_KEY_asciitilde, IBUS_KEY_O,  0x00D5, 
+IBUS_KEY_asciitilde, IBUS_KEY_U,  0x0168, 
+IBUS_KEY_asciitilde, IBUS_KEY_V,  0x1E7C, 
+IBUS_KEY_asciitilde, IBUS_KEY_Y,  0x1EF8, 
+IBUS_KEY_asciitilde, IBUS_KEY_a,  0x00E3, 
+IBUS_KEY_asciitilde, IBUS_KEY_e,  0x1EBD, 
+IBUS_KEY_asciitilde, IBUS_KEY_i,  0x0129, 
+IBUS_KEY_asciitilde, IBUS_KEY_n,  0x00F1, 
+IBUS_KEY_asciitilde, IBUS_KEY_o,  0x00F5, 
+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, 
+IBUS_KEY_asciitilde, IBUS_KEY_acircumflex,  0x1EAB, 
+IBUS_KEY_asciitilde, IBUS_KEY_ecircumflex,  0x1EC5, 
+IBUS_KEY_asciitilde, IBUS_KEY_ocircumflex,  0x1ED7, 
+IBUS_KEY_asciitilde, IBUS_KEY_Abreve,  0x1EB4, 
+IBUS_KEY_asciitilde, IBUS_KEY_abreve,  0x1EB5, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_iotadieresis,  0x1FD7, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilondieresis,  0x1FE7, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,  0x1FB6, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,  0x1FC6, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_iota,  0x1FD6, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilon,  0x1FE6, 
+IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,  0x1FF6, 
+IBUS_KEY_asciitilde, 0x1F00,  0x1F06, 
+IBUS_KEY_asciitilde, 0x1F01,  0x1F07, 
+IBUS_KEY_asciitilde, 0x1F08,  0x1F0E, 
+IBUS_KEY_asciitilde, 0x1F09,  0x1F0F, 
+IBUS_KEY_asciitilde, 0x1F20,  0x1F26, 
+IBUS_KEY_asciitilde, 0x1F21,  0x1F27, 
+IBUS_KEY_asciitilde, 0x1F28,  0x1F2E, 
+IBUS_KEY_asciitilde, 0x1F29,  0x1F2F, 
+IBUS_KEY_asciitilde, 0x1F30,  0x1F36, 
+IBUS_KEY_asciitilde, 0x1F31,  0x1F37, 
+IBUS_KEY_asciitilde, 0x1F38,  0x1F3E, 
+IBUS_KEY_asciitilde, 0x1F39,  0x1F3F, 
+IBUS_KEY_asciitilde, 0x1F50,  0x1F56, 
+IBUS_KEY_asciitilde, 0x1F51,  0x1F57, 
+IBUS_KEY_asciitilde, 0x1F59,  0x1F5F, 
+IBUS_KEY_asciitilde, 0x1F60,  0x1F66, 
+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, 
+IBUS_KEY_diaeresis, IBUS_KEY_O,  0x00D6, 
+IBUS_KEY_diaeresis, IBUS_KEY_U,  0x00DC, 
+IBUS_KEY_diaeresis, IBUS_KEY_Y,  0x0178, 
+IBUS_KEY_diaeresis, IBUS_KEY_grave,  0x1FED, 
+IBUS_KEY_diaeresis, IBUS_KEY_a,  0x00E4, 
+IBUS_KEY_diaeresis, IBUS_KEY_e,  0x00EB, 
+IBUS_KEY_diaeresis, IBUS_KEY_i,  0x00EF, 
+IBUS_KEY_diaeresis, IBUS_KEY_o,  0x00F6, 
+IBUS_KEY_diaeresis, IBUS_KEY_u,  0x00FC, 
+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, 
+IBUS_KEY_macron, IBUS_KEY_A,  0x0100, 
+IBUS_KEY_macron, IBUS_KEY_E,  0x0112, 
+IBUS_KEY_macron, IBUS_KEY_G,  0x1E20, 
+IBUS_KEY_macron, IBUS_KEY_I,  0x012A, 
+IBUS_KEY_macron, IBUS_KEY_O,  0x014C, 
+IBUS_KEY_macron, IBUS_KEY_U,  0x016A, 
+IBUS_KEY_macron, IBUS_KEY_Y,  0x0232, 
+IBUS_KEY_macron, IBUS_KEY_a,  0x0101, 
+IBUS_KEY_macron, IBUS_KEY_e,  0x0113, 
+IBUS_KEY_macron, IBUS_KEY_g,  0x1E21, 
+IBUS_KEY_macron, IBUS_KEY_i,  0x012B, 
+IBUS_KEY_macron, IBUS_KEY_o,  0x014D, 
+IBUS_KEY_macron, IBUS_KEY_u,  0x016B, 
+IBUS_KEY_macron, IBUS_KEY_y,  0x0233, 
+IBUS_KEY_macron, IBUS_KEY_Adiaeresis,  0x01DE, 
+IBUS_KEY_macron, IBUS_KEY_AE,  0x01E2, 
+IBUS_KEY_macron, IBUS_KEY_Otilde,  0x022C, 
+IBUS_KEY_macron, IBUS_KEY_Odiaeresis,  0x022A, 
+IBUS_KEY_macron, IBUS_KEY_Udiaeresis,  0x01D5, 
+IBUS_KEY_macron, IBUS_KEY_adiaeresis,  0x01DF, 
+IBUS_KEY_macron, IBUS_KEY_ae,  0x01E3, 
+IBUS_KEY_macron, IBUS_KEY_otilde,  0x022D, 
+IBUS_KEY_macron, IBUS_KEY_odiaeresis,  0x022B, 
+IBUS_KEY_macron, IBUS_KEY_udiaeresis,  0x01D6, 
+IBUS_KEY_macron, 0x01EA,  0x01EC, 
+IBUS_KEY_macron, 0x01EB,  0x01ED, 
+IBUS_KEY_macron, 0x0226,  0x01E0, 
+IBUS_KEY_macron, 0x0227,  0x01E1, 
+IBUS_KEY_macron, 0x022E,  0x0230, 
+IBUS_KEY_macron, 0x022F,  0x0231, 
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_i,  0x04E3, 
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_u,  0x04EF, 
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_I,  0x04E2, 
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_U,  0x04EE, 
+IBUS_KEY_macron, IBUS_KEY_Greek_ALPHA,  0x1FB9, 
+IBUS_KEY_macron, IBUS_KEY_Greek_IOTA,  0x1FD9, 
+IBUS_KEY_macron, IBUS_KEY_Greek_UPSILON,  0x1FE9, 
+IBUS_KEY_macron, IBUS_KEY_Greek_alpha,  0x1FB1, 
+IBUS_KEY_macron, IBUS_KEY_Greek_iota,  0x1FD1, 
+IBUS_KEY_macron, IBUS_KEY_Greek_upsilon,  0x1FE1, 
+IBUS_KEY_macron, 0x1E36,  0x1E38, 
+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, 
+IBUS_KEY_acute, IBUS_KEY_G,  0x01F4, 
+IBUS_KEY_acute, IBUS_KEY_I,  0x00CD, 
+IBUS_KEY_acute, IBUS_KEY_K,  0x1E30, 
+IBUS_KEY_acute, IBUS_KEY_L,  0x0139, 
+IBUS_KEY_acute, IBUS_KEY_M,  0x1E3E, 
+IBUS_KEY_acute, IBUS_KEY_N,  0x0143, 
+IBUS_KEY_acute, IBUS_KEY_O,  0x00D3, 
+IBUS_KEY_acute, IBUS_KEY_P,  0x1E54, 
+IBUS_KEY_acute, IBUS_KEY_R,  0x0154, 
+IBUS_KEY_acute, IBUS_KEY_S,  0x015A, 
+IBUS_KEY_acute, IBUS_KEY_U,  0x00DA, 
+IBUS_KEY_acute, IBUS_KEY_W,  0x1E82, 
+IBUS_KEY_acute, IBUS_KEY_Y,  0x00DD, 
+IBUS_KEY_acute, IBUS_KEY_Z,  0x0179, 
+IBUS_KEY_acute, IBUS_KEY_a,  0x00E1, 
+IBUS_KEY_acute, IBUS_KEY_c,  0x0107, 
+IBUS_KEY_acute, IBUS_KEY_e,  0x00E9, 
+IBUS_KEY_acute, IBUS_KEY_g,  0x01F5, 
+IBUS_KEY_acute, IBUS_KEY_i,  0x00ED, 
+IBUS_KEY_acute, IBUS_KEY_k,  0x1E31, 
+IBUS_KEY_acute, IBUS_KEY_l,  0x013A, 
+IBUS_KEY_acute, IBUS_KEY_m,  0x1E3F, 
+IBUS_KEY_acute, IBUS_KEY_n,  0x0144, 
+IBUS_KEY_acute, IBUS_KEY_o,  0x00F3, 
+IBUS_KEY_acute, IBUS_KEY_p,  0x1E55, 
+IBUS_KEY_acute, IBUS_KEY_r,  0x0155, 
+IBUS_KEY_acute, IBUS_KEY_s,  0x015B, 
+IBUS_KEY_acute, IBUS_KEY_u,  0x00FA, 
+IBUS_KEY_acute, IBUS_KEY_w,  0x1E83, 
+IBUS_KEY_acute, IBUS_KEY_y,  0x00FD, 
+IBUS_KEY_acute, IBUS_KEY_z,  0x017A, 
+IBUS_KEY_acute, IBUS_KEY_Acircumflex,  0x1EA4, 
+IBUS_KEY_acute, IBUS_KEY_Aring,  0x01FA, 
+IBUS_KEY_acute, IBUS_KEY_AE,  0x01FC, 
+IBUS_KEY_acute, IBUS_KEY_Ccedilla,  0x1E08, 
+IBUS_KEY_acute, IBUS_KEY_Ecircumflex,  0x1EBE, 
+IBUS_KEY_acute, IBUS_KEY_Idiaeresis,  0x1E2E, 
+IBUS_KEY_acute, IBUS_KEY_Ocircumflex,  0x1ED0, 
+IBUS_KEY_acute, IBUS_KEY_Otilde,  0x1E4C, 
+IBUS_KEY_acute, IBUS_KEY_Ooblique,  0x01FE, 
+IBUS_KEY_acute, IBUS_KEY_Udiaeresis,  0x01D7, 
+IBUS_KEY_acute, IBUS_KEY_acircumflex,  0x1EA5, 
+IBUS_KEY_acute, IBUS_KEY_aring,  0x01FB, 
+IBUS_KEY_acute, IBUS_KEY_ae,  0x01FD, 
+IBUS_KEY_acute, IBUS_KEY_ccedilla,  0x1E09, 
+IBUS_KEY_acute, IBUS_KEY_ecircumflex,  0x1EBF, 
+IBUS_KEY_acute, IBUS_KEY_idiaeresis,  0x1E2F, 
+IBUS_KEY_acute, IBUS_KEY_ocircumflex,  0x1ED1, 
+IBUS_KEY_acute, IBUS_KEY_otilde,  0x1E4D, 
+IBUS_KEY_acute, IBUS_KEY_oslash,  0x01FF, 
+IBUS_KEY_acute, IBUS_KEY_udiaeresis,  0x01D8, 
+IBUS_KEY_acute, IBUS_KEY_Abreve,  0x1EAE, 
+IBUS_KEY_acute, IBUS_KEY_abreve,  0x1EAF, 
+IBUS_KEY_acute, IBUS_KEY_Emacron,  0x1E16, 
+IBUS_KEY_acute, IBUS_KEY_emacron,  0x1E17, 
+IBUS_KEY_acute, IBUS_KEY_Omacron,  0x1E52, 
+IBUS_KEY_acute, IBUS_KEY_Utilde,  0x1E78, 
+IBUS_KEY_acute, IBUS_KEY_omacron,  0x1E53, 
+IBUS_KEY_acute, IBUS_KEY_utilde,  0x1E79, 
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_ghe,  0x0453, 
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_ka,  0x045C, 
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_GHE,  0x0403, 
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_KA,  0x040C, 
+IBUS_KEY_acute, IBUS_KEY_Greek_iotadieresis,  0x0390, 
+IBUS_KEY_acute, IBUS_KEY_Greek_upsilondieresis,  0x03B0, 
+IBUS_KEY_acute, IBUS_KEY_Greek_ALPHA,  0x0386, 
+IBUS_KEY_acute, IBUS_KEY_Greek_EPSILON,  0x0388, 
+IBUS_KEY_acute, IBUS_KEY_Greek_ETA,  0x0389, 
+IBUS_KEY_acute, IBUS_KEY_Greek_IOTA,  0x038A, 
+IBUS_KEY_acute, IBUS_KEY_Greek_OMICRON,  0x038C, 
+IBUS_KEY_acute, IBUS_KEY_Greek_UPSILON,  0x038E, 
+IBUS_KEY_acute, IBUS_KEY_Greek_OMEGA,  0x038F, 
+IBUS_KEY_acute, IBUS_KEY_Greek_alpha,  0x03AC, 
+IBUS_KEY_acute, IBUS_KEY_Greek_epsilon,  0x03AD, 
+IBUS_KEY_acute, IBUS_KEY_Greek_eta,  0x03AE, 
+IBUS_KEY_acute, IBUS_KEY_Greek_iota,  0x03AF, 
+IBUS_KEY_acute, IBUS_KEY_Greek_omicron,  0x03CC, 
+IBUS_KEY_acute, IBUS_KEY_Greek_upsilon,  0x03CD, 
+IBUS_KEY_acute, IBUS_KEY_Greek_omega,  0x03CE, 
+IBUS_KEY_acute, 0x1F00,  0x1F04, 
+IBUS_KEY_acute, 0x1F01,  0x1F05, 
+IBUS_KEY_acute, 0x1F08,  0x1F0C, 
+IBUS_KEY_acute, 0x1F09,  0x1F0D, 
+IBUS_KEY_acute, 0x1F10,  0x1F14, 
+IBUS_KEY_acute, 0x1F11,  0x1F15, 
+IBUS_KEY_acute, 0x1F18,  0x1F1C, 
+IBUS_KEY_acute, 0x1F19,  0x1F1D, 
+IBUS_KEY_acute, 0x1F20,  0x1F24, 
+IBUS_KEY_acute, 0x1F21,  0x1F25, 
+IBUS_KEY_acute, 0x1F28,  0x1F2C, 
+IBUS_KEY_acute, 0x1F29,  0x1F2D, 
+IBUS_KEY_acute, 0x1F30,  0x1F34, 
+IBUS_KEY_acute, 0x1F31,  0x1F35, 
+IBUS_KEY_acute, 0x1F38,  0x1F3C, 
+IBUS_KEY_acute, 0x1F39,  0x1F3D, 
+IBUS_KEY_acute, 0x1F40,  0x1F44, 
+IBUS_KEY_acute, 0x1F41,  0x1F45, 
+IBUS_KEY_acute, 0x1F48,  0x1F4C, 
+IBUS_KEY_acute, 0x1F49,  0x1F4D, 
+IBUS_KEY_acute, 0x1F50,  0x1F54, 
+IBUS_KEY_acute, 0x1F51,  0x1F55, 
+IBUS_KEY_acute, 0x1F59,  0x1F5D, 
+IBUS_KEY_acute, 0x1F60,  0x1F64, 
+IBUS_KEY_acute, 0x1F61,  0x1F65, 
+IBUS_KEY_acute, 0x1F68,  0x1F6C, 
+IBUS_KEY_acute, 0x1F69,  0x1F6D, 
+IBUS_KEY_cedilla, IBUS_KEY_C,  0x00C7, 
+IBUS_KEY_cedilla, IBUS_KEY_D,  0x1E10, 
+IBUS_KEY_cedilla, IBUS_KEY_E,  0x0228, 
+IBUS_KEY_cedilla, IBUS_KEY_G,  0x0122, 
+IBUS_KEY_cedilla, IBUS_KEY_H,  0x1E28, 
+IBUS_KEY_cedilla, IBUS_KEY_K,  0x0136, 
+IBUS_KEY_cedilla, IBUS_KEY_L,  0x013B, 
+IBUS_KEY_cedilla, IBUS_KEY_N,  0x0145, 
+IBUS_KEY_cedilla, IBUS_KEY_R,  0x0156, 
+IBUS_KEY_cedilla, IBUS_KEY_S,  0x015E, 
+IBUS_KEY_cedilla, IBUS_KEY_T,  0x0162, 
+IBUS_KEY_cedilla, IBUS_KEY_c,  0x00E7, 
+IBUS_KEY_cedilla, IBUS_KEY_d,  0x1E11, 
+IBUS_KEY_cedilla, IBUS_KEY_e,  0x0229, 
+IBUS_KEY_cedilla, IBUS_KEY_g,  0x0123, 
+IBUS_KEY_cedilla, IBUS_KEY_h,  0x1E29, 
+IBUS_KEY_cedilla, IBUS_KEY_k,  0x0137, 
+IBUS_KEY_cedilla, IBUS_KEY_l,  0x013C, 
+IBUS_KEY_cedilla, IBUS_KEY_n,  0x0146, 
+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, 
+0x05B7, 0x05F2,  0xFB1F, 
+0x05B7, IBUS_KEY_hebrew_aleph,  0xFB2E, 
+0x05B8, IBUS_KEY_hebrew_aleph,  0xFB2F, 
+0x05B9, IBUS_KEY_hebrew_waw,  0xFB4B, 
+0x05BC, IBUS_KEY_hebrew_aleph,  0xFB30, 
+0x05BC, IBUS_KEY_hebrew_bet,  0xFB31, 
+0x05BC, IBUS_KEY_hebrew_gimel,  0xFB32, 
+0x05BC, IBUS_KEY_hebrew_dalet,  0xFB33, 
+0x05BC, IBUS_KEY_hebrew_he,  0xFB34, 
+0x05BC, IBUS_KEY_hebrew_waw,  0xFB35, 
+0x05BC, IBUS_KEY_hebrew_zain,  0xFB36, 
+0x05BC, IBUS_KEY_hebrew_tet,  0xFB38, 
+0x05BC, IBUS_KEY_hebrew_yod,  0xFB39, 
+0x05BC, IBUS_KEY_hebrew_finalkaph,  0xFB3A, 
+0x05BC, IBUS_KEY_hebrew_kaph,  0xFB3B, 
+0x05BC, IBUS_KEY_hebrew_lamed,  0xFB3C, 
+0x05BC, IBUS_KEY_hebrew_mem,  0xFB3E, 
+0x05BC, IBUS_KEY_hebrew_nun,  0xFB40, 
+0x05BC, IBUS_KEY_hebrew_samech,  0xFB41, 
+0x05BC, IBUS_KEY_hebrew_finalpe,  0xFB43, 
+0x05BC, IBUS_KEY_hebrew_pe,  0xFB44, 
+0x05BC, IBUS_KEY_hebrew_zade,  0xFB46, 
+0x05BC, IBUS_KEY_hebrew_kuf,  0xFB47, 
+0x05BC, IBUS_KEY_hebrew_resh,  0xFB48, 
+0x05BC, IBUS_KEY_hebrew_shin,  0xFB49, 
+0x05BC, IBUS_KEY_hebrew_taf,  0xFB4A, 
+0x05BF, IBUS_KEY_hebrew_bet,  0xFB4C, 
+0x05BF, IBUS_KEY_hebrew_kaph,  0xFB4D, 
+0x05BF, IBUS_KEY_hebrew_pe,  0xFB4E, 
+0x05C1, IBUS_KEY_hebrew_shin,  0xFB2A, 
+0x05C1, 0xFB49,  0xFB2C, 
+0x05C2, IBUS_KEY_hebrew_shin,  0xFB2B, 
+0x05C2, 0xFB49,  0xFB2D, 
+0x0653, IBUS_KEY_Arabic_alef,  0x0622, 
+0x0654, IBUS_KEY_Arabic_alef,  0x0623, 
+0x0654, IBUS_KEY_Arabic_waw,  0x0624, 
+0x0654, IBUS_KEY_Arabic_yeh,  0x0626, 
+0x0654, 0x06C1,  0x06C2, 
+0x0654, 0x06D2,  0x06D3, 
+0x0654, 0x06D5,  0x06C0, 
+0x0655, IBUS_KEY_Arabic_alef,  0x0625, 
+IBUS_KEY_Cyrillic_pe, IBUS_KEY_Cyrillic_a,  0x00A7, 
+IBUS_KEY_Cyrillic_IE, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_Cyrillic_EN, IBUS_KEY_Cyrillic_o,  0x2116, 
+IBUS_KEY_Cyrillic_EN, IBUS_KEY_Cyrillic_O,  0x2116, 
+IBUS_KEY_Cyrillic_ES, IBUS_KEY_equal,  0x20AC, 
+IBUS_KEY_Greek_ALPHA, IBUS_KEY_apostrophe,  0x0386, 
+IBUS_KEY_Greek_EPSILON, IBUS_KEY_apostrophe,  0x0388, 
+IBUS_KEY_Greek_ETA, IBUS_KEY_apostrophe,  0x0389, 
+IBUS_KEY_Greek_IOTA, IBUS_KEY_quotedbl,  0x03AA, 
+IBUS_KEY_Greek_IOTA, IBUS_KEY_apostrophe,  0x038A, 
+IBUS_KEY_Greek_OMICRON, IBUS_KEY_apostrophe,  0x038C, 
+IBUS_KEY_Greek_UPSILON, IBUS_KEY_quotedbl,  0x03AB, 
+IBUS_KEY_Greek_UPSILON, IBUS_KEY_apostrophe,  0x038E, 
+IBUS_KEY_Greek_OMEGA, IBUS_KEY_apostrophe,  0x038F, 
+IBUS_KEY_Greek_alpha, IBUS_KEY_apostrophe,  0x03AC, 
+IBUS_KEY_Greek_epsilon, IBUS_KEY_apostrophe,  0x03AD, 
+IBUS_KEY_Greek_eta, IBUS_KEY_apostrophe,  0x03AE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_quotedbl,  0x03CA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe,  0x03AF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_alphaaccent,  0x1FB4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_etaaccent,  0x1FC4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_omegaaccent,  0x1FF4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_ALPHA,  0x1FBC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_ETA,  0x1FCC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_OMEGA,  0x1FFC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_alpha,  0x1FB3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_eta,  0x1FC3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_Greek_omega,  0x1FF3, 
+IBUS_KEY_Greek_iota, 0x1F00,  0x1F80, 
+IBUS_KEY_Greek_iota, 0x1F01,  0x1F81, 
+IBUS_KEY_Greek_iota, 0x1F02,  0x1F82, 
+IBUS_KEY_Greek_iota, 0x1F03,  0x1F83, 
+IBUS_KEY_Greek_iota, 0x1F04,  0x1F84, 
+IBUS_KEY_Greek_iota, 0x1F05,  0x1F85, 
+IBUS_KEY_Greek_iota, 0x1F06,  0x1F86, 
+IBUS_KEY_Greek_iota, 0x1F07,  0x1F87, 
+IBUS_KEY_Greek_iota, 0x1F08,  0x1F88, 
+IBUS_KEY_Greek_iota, 0x1F09,  0x1F89, 
+IBUS_KEY_Greek_iota, 0x1F0A,  0x1F8A, 
+IBUS_KEY_Greek_iota, 0x1F0B,  0x1F8B, 
+IBUS_KEY_Greek_iota, 0x1F0C,  0x1F8C, 
+IBUS_KEY_Greek_iota, 0x1F0D,  0x1F8D, 
+IBUS_KEY_Greek_iota, 0x1F0E,  0x1F8E, 
+IBUS_KEY_Greek_iota, 0x1F0F,  0x1F8F, 
+IBUS_KEY_Greek_iota, 0x1F20,  0x1F90, 
+IBUS_KEY_Greek_iota, 0x1F21,  0x1F91, 
+IBUS_KEY_Greek_iota, 0x1F22,  0x1F92, 
+IBUS_KEY_Greek_iota, 0x1F23,  0x1F93, 
+IBUS_KEY_Greek_iota, 0x1F24,  0x1F94, 
+IBUS_KEY_Greek_iota, 0x1F25,  0x1F95, 
+IBUS_KEY_Greek_iota, 0x1F26,  0x1F96, 
+IBUS_KEY_Greek_iota, 0x1F27,  0x1F97, 
+IBUS_KEY_Greek_iota, 0x1F28,  0x1F98, 
+IBUS_KEY_Greek_iota, 0x1F29,  0x1F99, 
+IBUS_KEY_Greek_iota, 0x1F2A,  0x1F9A, 
+IBUS_KEY_Greek_iota, 0x1F2B,  0x1F9B, 
+IBUS_KEY_Greek_iota, 0x1F2C,  0x1F9C, 
+IBUS_KEY_Greek_iota, 0x1F2D,  0x1F9D, 
+IBUS_KEY_Greek_iota, 0x1F2E,  0x1F9E, 
+IBUS_KEY_Greek_iota, 0x1F2F,  0x1F9F, 
+IBUS_KEY_Greek_iota, 0x1F60,  0x1FA0, 
+IBUS_KEY_Greek_iota, 0x1F61,  0x1FA1, 
+IBUS_KEY_Greek_iota, 0x1F62,  0x1FA2, 
+IBUS_KEY_Greek_iota, 0x1F63,  0x1FA3, 
+IBUS_KEY_Greek_iota, 0x1F64,  0x1FA4, 
+IBUS_KEY_Greek_iota, 0x1F65,  0x1FA5, 
+IBUS_KEY_Greek_iota, 0x1F66,  0x1FA6, 
+IBUS_KEY_Greek_iota, 0x1F67,  0x1FA7, 
+IBUS_KEY_Greek_iota, 0x1F68,  0x1FA8, 
+IBUS_KEY_Greek_iota, 0x1F69,  0x1FA9, 
+IBUS_KEY_Greek_iota, 0x1F6A,  0x1FAA, 
+IBUS_KEY_Greek_iota, 0x1F6B,  0x1FAB, 
+IBUS_KEY_Greek_iota, 0x1F6C,  0x1FAC, 
+IBUS_KEY_Greek_iota, 0x1F6D,  0x1FAD, 
+IBUS_KEY_Greek_iota, 0x1F6E,  0x1FAE, 
+IBUS_KEY_Greek_iota, 0x1F6F,  0x1FAF, 
+IBUS_KEY_Greek_iota, 0x1F70,  0x1FB2, 
+IBUS_KEY_Greek_iota, 0x1F74,  0x1FC2, 
+IBUS_KEY_Greek_iota, 0x1F7C,  0x1FF2, 
+IBUS_KEY_Greek_iota, 0x1FB6,  0x1FB7, 
+IBUS_KEY_Greek_iota, 0x1FC6,  0x1FC7, 
+IBUS_KEY_Greek_iota, 0x1FF6,  0x1FF7, 
+IBUS_KEY_Greek_omicron, IBUS_KEY_apostrophe,  0x03CC, 
+IBUS_KEY_Greek_upsilon, IBUS_KEY_quotedbl,  0x03CB, 
+IBUS_KEY_Greek_upsilon, IBUS_KEY_apostrophe,  0x03CD, 
+IBUS_KEY_Greek_omega, IBUS_KEY_apostrophe,  0x03CE, 
+IBUS_KEY_lessthanequal, 0x0338,  0x2270, 
+IBUS_KEY_greaterthanequal, 0x0338,  0x2271, 
+IBUS_KEY_approximate, 0x0338,  0x2247, 
+IBUS_KEY_identical, 0x0338,  0x2262, 
+IBUS_KEY_includedin, 0x0338,  0x2284, 
+IBUS_KEY_includes, 0x0338,  0x2285, 
+0x093C, 0x0915,  0x0958, 
+0x093C, 0x0916,  0x0959, 
+0x093C, 0x0917,  0x095A, 
+0x093C, 0x091C,  0x095B, 
+0x093C, 0x0921,  0x095C, 
+0x093C, 0x0922,  0x095D, 
+0x093C, 0x0928,  0x0929, 
+0x093C, 0x092B,  0x095E, 
+0x093C, 0x092F,  0x095F, 
+0x093C, 0x0930,  0x0931, 
+0x093C, 0x0933,  0x0934, 
+0x09BC, 0x09A1,  0x09DC, 
+0x09BC, 0x09A2,  0x09DD, 
+0x09BC, 0x09AF,  0x09DF, 
+0x09C7, 0x09BE,  0x09CB, 
+0x09C7, 0x09D7,  0x09CC, 
+0x0A3C, 0x0A16,  0x0A59, 
+0x0A3C, 0x0A17,  0x0A5A, 
+0x0A3C, 0x0A1C,  0x0A5B, 
+0x0A3C, 0x0A2B,  0x0A5E, 
+0x0A3C, 0x0A32,  0x0A33, 
+0x0A3C, 0x0A38,  0x0A36, 
+0x0B3C, 0x0B21,  0x0B5C, 
+0x0B3C, 0x0B22,  0x0B5D, 
+0x0B47, 0x0B3E,  0x0B4B, 
+0x0B47, 0x0B56,  0x0B48, 
+0x0B47, 0x0B57,  0x0B4C, 
+IBUS_KEY_leftcaret, 0x0338,  0x226E, 
+IBUS_KEY_rightcaret, 0x0338,  0x226F, 
+IBUS_KEY_underbar, IBUS_KEY_parenleft,  0x208D, 
+IBUS_KEY_underbar, IBUS_KEY_parenright,  0x208E, 
+IBUS_KEY_underbar, IBUS_KEY_plus,  0x208A, 
+IBUS_KEY_underbar, IBUS_KEY_0,  0x2080, 
+IBUS_KEY_underbar, IBUS_KEY_1,  0x2081, 
+IBUS_KEY_underbar, IBUS_KEY_2,  0x2082, 
+IBUS_KEY_underbar, IBUS_KEY_3,  0x2083, 
+IBUS_KEY_underbar, IBUS_KEY_4,  0x2084, 
+IBUS_KEY_underbar, IBUS_KEY_5,  0x2085, 
+IBUS_KEY_underbar, IBUS_KEY_6,  0x2086, 
+IBUS_KEY_underbar, IBUS_KEY_7,  0x2087, 
+IBUS_KEY_underbar, IBUS_KEY_8,  0x2088, 
+IBUS_KEY_underbar, IBUS_KEY_9,  0x2089, 
+IBUS_KEY_underbar, IBUS_KEY_equal,  0x208C, 
+0x0BC6, 0x0BBE,  0x0BCA, 
+0x0BC6, 0x0BD7,  0x0BCC, 
+IBUS_KEY_underbar, 0x2212,  0x208B, 
+IBUS_KEY_underbar, IBUS_KEY_KP_Space,  0x2082, 
+IBUS_KEY_underbar, IBUS_KEY_KP_Add,  0x208A, 
+IBUS_KEY_underbar, IBUS_KEY_KP_0,  0x2080, 
+IBUS_KEY_underbar, IBUS_KEY_KP_1,  0x2081, 
+IBUS_KEY_underbar, IBUS_KEY_KP_2,  0x2082, 
+IBUS_KEY_underbar, IBUS_KEY_KP_3,  0x2083, 
+IBUS_KEY_underbar, IBUS_KEY_KP_4,  0x2084, 
+IBUS_KEY_underbar, IBUS_KEY_KP_5,  0x2085, 
+IBUS_KEY_underbar, IBUS_KEY_KP_6,  0x2086, 
+IBUS_KEY_underbar, IBUS_KEY_KP_7,  0x2087, 
+IBUS_KEY_underbar, IBUS_KEY_KP_8,  0x2088, 
+IBUS_KEY_underbar, IBUS_KEY_KP_9,  0x2089, 
+IBUS_KEY_underbar, IBUS_KEY_KP_Equal,  0x208C, 
+0x0BC7, 0x0BBE,  0x0BCB, 
+0x0BD7, 0x0B92,  0x0B94, 
+IBUS_KEY_rightshoe, 0x0338,  0x2285, 
+IBUS_KEY_leftshoe, 0x0338,  0x2284, 
+IBUS_KEY_righttack, 0x0338,  0x22AC, 
+0x0C46, 0x0C56,  0x0C48, 
+0x0CBF, 0x0CD5,  0x0CC0, 
+0x0CC6, 0x0CC2,  0x0CCA, 
+0x0CC6, 0x0CD5,  0x0CC7, 
+0x0CC6, 0x0CD6,  0x0CC8, 
+0x0CCA, 0x0CD5,  0x0CCB, 
+0x0D46, 0x0D3E,  0x0D4A, 
+0x0D46, 0x0D57,  0x0D4C, 
+0x0D47, 0x0D3E,  0x0D4B, 
+0x0DD9, 0x0DCA,  0x0DDA, 
+0x0DD9, 0x0DCF,  0x0DDC, 
+0x0DD9, 0x0DDF,  0x0DDE, 
+0x0DDC, 0x0DCA,  0x0DDD, 
+0x0F71, 0x0F72,  0x0F73, 
+0x0F71, 0x0F74,  0x0F75, 
+0x0F71, 0x0F80,  0x0F81, 
+0x0F90, 0x0FB5,  0x0FB9, 
+0x0F92, 0x0FB7,  0x0F93, 
+0x0F9C, 0x0FB7,  0x0F9D, 
+0x0FA1, 0x0FB7,  0x0FA2, 
+0x0FA6, 0x0FB7,  0x0FA7, 
+0x0FAB, 0x0FB7,  0x0FAC, 
+0x0FB2, 0x0F80,  0x0F76, 
+0x0FB3, 0x0F80,  0x0F78, 
+0x0FB5, 0x0F40,  0x0F69, 
+0x0FB7, 0x0F42,  0x0F43, 
+0x0FB7, 0x0F4C,  0x0F4D, 
+0x0FB7, 0x0F51,  0x0F52, 
+0x0FB7, 0x0F56,  0x0F57, 
+0x0FB7, 0x0F5B,  0x0F5C, 
+0x102E, 0x1025,  0x1026, 
+0x1100, 0x1100,  0x1101, 
+0x1102, 0x1100,  0x1113, 
+0x1102, 0x1102,  0x1114, 
+0x1102, 0x1103,  0x1115, 
+0x1102, 0x1107,  0x1116, 
+0x1103, 0x1100,  0x1117, 
+0x1103, 0x1103,  0x1104, 
+0x1105, 0x1102,  0x1118, 
+0x1105, 0x1105,  0x1119, 
+0x1105, 0x110B,  0x111B, 
+0x1105, 0x1112,  0x111A, 
+0x1106, 0x1107,  0x111C, 
+0x1106, 0x110B,  0x111D, 
+0x1107, 0x1100,  0x111E, 
+0x1107, 0x1102,  0x111F, 
+0x1107, 0x1103,  0x1120, 
+0x1107, 0x1107,  0x1108, 
+0x1107, 0x1109,  0x1121, 
+0x1107, 0x110A,  0x1125, 
+0x1107, 0x110B,  0x112B, 
+0x1107, 0x110C,  0x1127, 
+0x1107, 0x110E,  0x1128, 
+0x1107, 0x1110,  0x1129, 
+0x1107, 0x1111,  0x112A, 
+0x1107, 0x112B,  0x112C, 
+0x1107, 0x112D,  0x1122, 
+0x1107, 0x112F,  0x1123, 
+0x1107, 0x1132,  0x1124, 
+0x1107, 0x1136,  0x1126, 
+0x1108, 0x110B,  0x112C, 
+0x1109, 0x1100,  0x112D, 
+0x1109, 0x1102,  0x112E, 
+0x1109, 0x1103,  0x112F, 
+0x1109, 0x1105,  0x1130, 
+0x1109, 0x1106,  0x1131, 
+0x1109, 0x1107,  0x1132, 
+0x1109, 0x1109,  0x110A, 
+0x1109, 0x110A,  0x1134, 
+0x1109, 0x110B,  0x1135, 
+0x1109, 0x110C,  0x1136, 
+0x1109, 0x110E,  0x1137, 
+0x1109, 0x110F,  0x1138, 
+0x1109, 0x1110,  0x1139, 
+0x1109, 0x1111,  0x113A, 
+0x1109, 0x1112,  0x113B, 
+0x1109, 0x111E,  0x1133, 
+0x110A, 0x1109,  0x1134, 
+0x110B, 0x1100,  0x1141, 
+0x110B, 0x1103,  0x1142, 
+0x110B, 0x1106,  0x1143, 
+0x110B, 0x1107,  0x1144, 
+0x110B, 0x1109,  0x1145, 
+0x110B, 0x110B,  0x1147, 
+0x110B, 0x110C,  0x1148, 
+0x110B, 0x110E,  0x1149, 
+0x110B, 0x1110,  0x114A, 
+0x110B, 0x1111,  0x114B, 
+0x110B, 0x1140,  0x1146, 
+0x110C, 0x110B,  0x114D, 
+0x110C, 0x110C,  0x110D, 
+0x110E, 0x110F,  0x1152, 
+0x110E, 0x1112,  0x1153, 
+0x1111, 0x1107,  0x1156, 
+0x1111, 0x110B,  0x1157, 
+0x1112, 0x1112,  0x1158, 
+0x1121, 0x1100,  0x1122, 
+0x1121, 0x1103,  0x1123, 
+0x1121, 0x1107,  0x1124, 
+0x1121, 0x1109,  0x1125, 
+0x1121, 0x110C,  0x1126, 
+0x1132, 0x1100,  0x1133, 
+0x113C, 0x113C,  0x113D, 
+0x113E, 0x113E,  0x113F, 
+0x114E, 0x114E,  0x114F, 
+0x1150, 0x1150,  0x1151, 
+0x1161, 0x1169,  0x1176, 
+0x1161, 0x116E,  0x1177, 
+0x1161, 0x1175,  0x1162, 
+0x1163, 0x1169,  0x1178, 
+0x1163, 0x116D,  0x1179, 
+0x1163, 0x1175,  0x1164, 
+0x1165, 0x1169,  0x117A, 
+0x1165, 0x116E,  0x117B, 
+0x1165, 0x1173,  0x117C, 
+0x1165, 0x1175,  0x1166, 
+0x1167, 0x1169,  0x117D, 
+0x1167, 0x116E,  0x117E, 
+0x1167, 0x1175,  0x1168, 
+0x1169, 0x1161,  0x116A, 
+0x1169, 0x1162,  0x116B, 
+0x1169, 0x1165,  0x117F, 
+0x1169, 0x1166,  0x1180, 
+0x1169, 0x1168,  0x1181, 
+0x1169, 0x1169,  0x1182, 
+0x1169, 0x116E,  0x1183, 
+0x1169, 0x1175,  0x116C, 
+0x116A, 0x1175,  0x116B, 
+0x116D, 0x1163,  0x1184, 
+0x116D, 0x1164,  0x1185, 
+0x116D, 0x1167,  0x1186, 
+0x116D, 0x1169,  0x1187, 
+0x116D, 0x1175,  0x1188, 
+0x116E, 0x1161,  0x1189, 
+0x116E, 0x1162,  0x118A, 
+0x116E, 0x1165,  0x116F, 
+0x116E, 0x1166,  0x1170, 
+0x116E, 0x1168,  0x118C, 
+0x116E, 0x116E,  0x118D, 
+0x116E, 0x1175,  0x1171, 
+0x116E, 0x117C,  0x118B, 
+0x116F, 0x1173,  0x118B, 
+0x116F, 0x1175,  0x1170, 
+0x1172, 0x1161,  0x118E, 
+0x1172, 0x1165,  0x118F, 
+0x1172, 0x1166,  0x1190, 
+0x1172, 0x1167,  0x1191, 
+0x1172, 0x1168,  0x1192, 
+0x1172, 0x116E,  0x1193, 
+0x1172, 0x1175,  0x1194, 
+0x1173, 0x116E,  0x1195, 
+0x1173, 0x1173,  0x1196, 
+0x1173, 0x1175,  0x1174, 
+0x1174, 0x116E,  0x1197, 
+0x1175, 0x1161,  0x1198, 
+0x1175, 0x1163,  0x1199, 
+0x1175, 0x1169,  0x119A, 
+0x1175, 0x116E,  0x119B, 
+0x1175, 0x1173,  0x119C, 
+0x1175, 0x119E,  0x119D, 
+0x119E, 0x1165,  0x119F, 
+0x119E, 0x116E,  0x11A0, 
+0x119E, 0x1175,  0x11A1, 
+0x119E, 0x119E,  0x11A2, 
+0x11A8, 0x11A8,  0x11A9, 
+0x11A8, 0x11AF,  0x11C3, 
+0x11A8, 0x11BA,  0x11AA, 
+0x11A8, 0x11E7,  0x11C4, 
+0x11AA, 0x11A8,  0x11C4, 
+0x11AB, 0x11A8,  0x11C5, 
+0x11AB, 0x11AE,  0x11C6, 
+0x11AB, 0x11BA,  0x11C7, 
+0x11AB, 0x11BD,  0x11AC, 
+0x11AB, 0x11C0,  0x11C9, 
+0x11AB, 0x11C2,  0x11AD, 
+0x11AB, 0x11EB,  0x11C8, 
+0x11AE, 0x11A8,  0x11CA, 
+0x11AE, 0x11AF,  0x11CB, 
+0x11AF, 0x11A8,  0x11B0, 
+0x11AF, 0x11AA,  0x11CC, 
+0x11AF, 0x11AB,  0x11CD, 
+0x11AF, 0x11AE,  0x11CE, 
+0x11AF, 0x11AF,  0x11D0, 
+0x11AF, 0x11B7,  0x11B1, 
+0x11AF, 0x11B8,  0x11B2, 
+0x11AF, 0x11B9,  0x11D3, 
+0x11AF, 0x11BA,  0x11B3, 
+0x11AF, 0x11BB,  0x11D6, 
+0x11AF, 0x11BF,  0x11D8, 
+0x11AF, 0x11C0,  0x11B4, 
+0x11AF, 0x11C1,  0x11B5, 
+0x11AF, 0x11C2,  0x11B6, 
+0x11AF, 0x11DA,  0x11D1, 
+0x11AF, 0x11DD,  0x11D2, 
+0x11AF, 0x11E5,  0x11D4, 
+0x11AF, 0x11E6,  0x11D5, 
+0x11AF, 0x11EB,  0x11D7, 
+0x11AF, 0x11F9,  0x11D9, 
+0x11B0, 0x11BA,  0x11CC, 
+0x11B1, 0x11A8,  0x11D1, 
+0x11B1, 0x11BA,  0x11D2, 
+0x11B2, 0x11BA,  0x11D3, 
+0x11B2, 0x11BC,  0x11D5, 
+0x11B2, 0x11C2,  0x11D4, 
+0x11B3, 0x11BA,  0x11D6, 
+0x11B7, 0x11A8,  0x11DA, 
+0x11B7, 0x11AF,  0x11DB, 
+0x11B7, 0x11B8,  0x11DC, 
+0x11B7, 0x11BA,  0x11DD, 
+0x11B7, 0x11BB,  0x11DE, 
+0x11B7, 0x11BC,  0x11E2, 
+0x11B7, 0x11BE,  0x11E0, 
+0x11B7, 0x11C2,  0x11E1, 
+0x11B7, 0x11EB,  0x11DF, 
+0x11B8, 0x11AF,  0x11E3, 
+0x11B8, 0x11BA,  0x11B9, 
+0x11B8, 0x11BC,  0x11E6, 
+0x11B8, 0x11C1,  0x11E4, 
+0x11B8, 0x11C2,  0x11E5, 
+0x11BA, 0x11A8,  0x11E7, 
+0x11BA, 0x11AE,  0x11E8, 
+0x11BA, 0x11AF,  0x11E9, 
+0x11BA, 0x11B8,  0x11EA, 
+0x11BA, 0x11BA,  0x11BB, 
+0x11BC, 0x11A8,  0x11EC, 
+0x11BC, 0x11A9,  0x11ED, 
+0x11BC, 0x11BC,  0x11EE, 
+0x11BC, 0x11BF,  0x11EF, 
+0x11C1, 0x11B8,  0x11F3, 
+0x11C1, 0x11BC,  0x11F4, 
+0x11C2, 0x11AB,  0x11F5, 
+0x11C2, 0x11AF,  0x11F6, 
+0x11C2, 0x11B7,  0x11F7, 
+0x11C2, 0x11B8,  0x11F8, 
+0x11CE, 0x11C2,  0x11CF, 
+0x11DD, 0x11BA,  0x11DE, 
+0x11EC, 0x11A8,  0x11ED, 
+0x11F0, 0x11BA,  0x11F1, 
+0x11F0, 0x11EB,  0x11F2, 
+0x1FBF, IBUS_KEY_apostrophe,  0x1FCE, 
+0x1FBF, IBUS_KEY_grave,  0x1FCD, 
+0x1FBF, IBUS_KEY_asciitilde,  0x1FCF, 
+0x1FBF, IBUS_KEY_acute,  0x1FCE, 
+0x1FBF, IBUS_KEY_dead_grave,  0x1FCD, 
+0x1FBF, IBUS_KEY_dead_acute,  0x1FCE, 
+0x1FBF, IBUS_KEY_dead_tilde,  0x1FCF, 
+0x1FFE, IBUS_KEY_apostrophe,  0x1FDE, 
+0x1FFE, IBUS_KEY_grave,  0x1FDD, 
+0x1FFE, IBUS_KEY_asciitilde,  0x1FDF, 
+0x1FFE, IBUS_KEY_acute,  0x1FDE, 
+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, 
+0x2277, 0x0338,  0x2279, 
+0x227A, 0x0338,  0x2280, 
+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, 
+0x22B2, 0x0338,  0x22EA, 
+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, 
+IBUS_KEY_KP_Divide, IBUS_KEY_H,  0x0126, 
+IBUS_KEY_KP_Divide, IBUS_KEY_I,  0x0197, 
+IBUS_KEY_KP_Divide, IBUS_KEY_L,  0x0141, 
+IBUS_KEY_KP_Divide, IBUS_KEY_O,  0x00D8, 
+IBUS_KEY_KP_Divide, IBUS_KEY_T,  0x0166, 
+IBUS_KEY_KP_Divide, IBUS_KEY_Z,  0x01B5, 
+IBUS_KEY_KP_Divide, IBUS_KEY_b,  0x0180, 
+IBUS_KEY_KP_Divide, IBUS_KEY_d,  0x0111, 
+IBUS_KEY_KP_Divide, IBUS_KEY_g,  0x01E5, 
+IBUS_KEY_KP_Divide, IBUS_KEY_h,  0x0127, 
+IBUS_KEY_KP_Divide, IBUS_KEY_i,  0x0268, 
+IBUS_KEY_KP_Divide, IBUS_KEY_l,  0x0142, 
+IBUS_KEY_KP_Divide, IBUS_KEY_o,  0x00F8, 
+IBUS_KEY_KP_Divide, IBUS_KEY_t,  0x0167, 
+IBUS_KEY_KP_Divide, IBUS_KEY_z,  0x01B6, 
+IBUS_KEY_KP_Divide, 0x0294,  0x02A1, 
+IBUS_KEY_KP_Divide, 0x04AE,  0x04B0, 
+IBUS_KEY_KP_Divide, 0x04AF,  0x04B1, 
+IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_ghe,  0x0493, 
+IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_ka,  0x049F, 
+IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_GHE,  0x0492, 
+IBUS_KEY_KP_Divide, IBUS_KEY_Cyrillic_KA,  0x049E, 
+IBUS_KEY_KP_Divide, IBUS_KEY_leftarrow,  0x219A, 
+IBUS_KEY_KP_Divide, IBUS_KEY_rightarrow,  0x219B, 
+IBUS_KEY_KP_Divide, 0x2194,  0x21AE, 
+IBUS_KEY_KP_Equal, 0x0338,  0x2260, 
+IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_O,  0x1EE2, 
+IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_U,  0x1EF0, 
+IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_o,  0x1EE3, 
+IBUS_KEY_exclam, IBUS_KEY_plus, IBUS_KEY_u,  0x1EF1, 
+IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EE2, 
+IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EF0, 
+IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EE3, 
+IBUS_KEY_exclam, IBUS_KEY_dead_horn, IBUS_KEY_u,  0x1EF1, 
+IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_space,  0x0385, 
+IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_U,  0x1E7A, 
+IBUS_KEY_quotedbl, IBUS_KEY_underscore, IBUS_KEY_u,  0x1E7B, 
+IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x1E4E, 
+IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x1E4F, 
+IBUS_KEY_quotedbl, IBUS_KEY_macron, IBUS_KEY_U,  0x1E7A, 
+IBUS_KEY_quotedbl, IBUS_KEY_macron, IBUS_KEY_u,  0x1E7B, 
+IBUS_KEY_quotedbl, IBUS_KEY_dead_tilde, IBUS_KEY_O,  0x1E4E, 
+IBUS_KEY_quotedbl, IBUS_KEY_dead_tilde, IBUS_KEY_o,  0x1E4F, 
+IBUS_KEY_quotedbl, IBUS_KEY_dead_macron, IBUS_KEY_U,  0x1E7A, 
+IBUS_KEY_quotedbl, IBUS_KEY_dead_macron, IBUS_KEY_u,  0x1E7B, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_space,  0x0385, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_I,  0x1E2E, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D7, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_i,  0x1E2F, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D8, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_apostrophe, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_O,  0x1EDA, 
+IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_U,  0x1EE8, 
+IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_o,  0x1EDB, 
+IBUS_KEY_apostrophe, IBUS_KEY_plus, IBUS_KEY_u,  0x1EE9, 
+IBUS_KEY_apostrophe, IBUS_KEY_slash, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_apostrophe, IBUS_KEY_slash, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA4, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EBE, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED0, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA5, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EBF, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED1, 
+IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_apostrophe, IBUS_KEY_underscore, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_apostrophe, IBUS_KEY_b, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_apostrophe, IBUS_KEY_b, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x1E4C, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_U,  0x1E78, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x1E4D, 
+IBUS_KEY_apostrophe, IBUS_KEY_asciitilde, IBUS_KEY_u,  0x1E79, 
+IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_apostrophe, IBUS_KEY_macron, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_apostrophe, IBUS_KEY_cedilla, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_apostrophe, IBUS_KEY_cedilla, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_A,  0x1EA4, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_E,  0x1EBE, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_O,  0x1ED0, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_a,  0x1EA5, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_e,  0x1EBF, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_circumflex, IBUS_KEY_o,  0x1ED1, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_O,  0x1E4C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_U,  0x1E78, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_o,  0x1E4D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_tilde, IBUS_KEY_u,  0x1E79, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_macron, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_breve, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_breve, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_I,  0x1E2E, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_U,  0x01D7, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_i,  0x1E2F, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_u,  0x01D8, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_abovering, IBUS_KEY_A,  0x01FA, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_abovering, IBUS_KEY_a,  0x01FB, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_cedilla, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_cedilla, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EDA, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EE8, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EDB, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_horn, IBUS_KEY_u,  0x1EE9, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_apostrophe, IBUS_KEY_KP_Divide, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_apostrophe, IBUS_KEY_KP_Divide, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_parenleft, IBUS_KEY_0, IBUS_KEY_parenright,  0x24EA, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_parenright,  0x2460, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_parenright,  0x2461, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_parenright,  0x2462, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_parenright,  0x2463, 
+IBUS_KEY_parenleft, IBUS_KEY_5, IBUS_KEY_parenright,  0x2464, 
+IBUS_KEY_parenleft, IBUS_KEY_6, IBUS_KEY_parenright,  0x2465, 
+IBUS_KEY_parenleft, IBUS_KEY_7, IBUS_KEY_parenright,  0x2466, 
+IBUS_KEY_parenleft, IBUS_KEY_8, IBUS_KEY_parenright,  0x2467, 
+IBUS_KEY_parenleft, IBUS_KEY_9, IBUS_KEY_parenright,  0x2468, 
+IBUS_KEY_parenleft, IBUS_KEY_A, IBUS_KEY_parenright,  0x24B6, 
+IBUS_KEY_parenleft, IBUS_KEY_B, IBUS_KEY_parenright,  0x24B7, 
+IBUS_KEY_parenleft, IBUS_KEY_C, IBUS_KEY_parenright,  0x24B8, 
+IBUS_KEY_parenleft, IBUS_KEY_D, IBUS_KEY_parenright,  0x24B9, 
+IBUS_KEY_parenleft, IBUS_KEY_E, IBUS_KEY_parenright,  0x24BA, 
+IBUS_KEY_parenleft, IBUS_KEY_F, IBUS_KEY_parenright,  0x24BB, 
+IBUS_KEY_parenleft, IBUS_KEY_G, IBUS_KEY_parenright,  0x24BC, 
+IBUS_KEY_parenleft, IBUS_KEY_H, IBUS_KEY_parenright,  0x24BD, 
+IBUS_KEY_parenleft, IBUS_KEY_I, IBUS_KEY_parenright,  0x24BE, 
+IBUS_KEY_parenleft, IBUS_KEY_J, IBUS_KEY_parenright,  0x24BF, 
+IBUS_KEY_parenleft, IBUS_KEY_K, IBUS_KEY_parenright,  0x24C0, 
+IBUS_KEY_parenleft, IBUS_KEY_L, IBUS_KEY_parenright,  0x24C1, 
+IBUS_KEY_parenleft, IBUS_KEY_M, IBUS_KEY_parenright,  0x24C2, 
+IBUS_KEY_parenleft, IBUS_KEY_N, IBUS_KEY_parenright,  0x24C3, 
+IBUS_KEY_parenleft, IBUS_KEY_O, IBUS_KEY_parenright,  0x24C4, 
+IBUS_KEY_parenleft, IBUS_KEY_P, IBUS_KEY_parenright,  0x24C5, 
+IBUS_KEY_parenleft, IBUS_KEY_Q, IBUS_KEY_parenright,  0x24C6, 
+IBUS_KEY_parenleft, IBUS_KEY_R, IBUS_KEY_parenright,  0x24C7, 
+IBUS_KEY_parenleft, IBUS_KEY_S, IBUS_KEY_parenright,  0x24C8, 
+IBUS_KEY_parenleft, IBUS_KEY_T, IBUS_KEY_parenright,  0x24C9, 
+IBUS_KEY_parenleft, IBUS_KEY_U, IBUS_KEY_parenright,  0x24CA, 
+IBUS_KEY_parenleft, IBUS_KEY_V, IBUS_KEY_parenright,  0x24CB, 
+IBUS_KEY_parenleft, IBUS_KEY_W, IBUS_KEY_parenright,  0x24CC, 
+IBUS_KEY_parenleft, IBUS_KEY_X, IBUS_KEY_parenright,  0x24CD, 
+IBUS_KEY_parenleft, IBUS_KEY_Y, IBUS_KEY_parenright,  0x24CE, 
+IBUS_KEY_parenleft, IBUS_KEY_Z, IBUS_KEY_parenright,  0x24CF, 
+IBUS_KEY_parenleft, IBUS_KEY_a, IBUS_KEY_parenright,  0x24D0, 
+IBUS_KEY_parenleft, IBUS_KEY_b, IBUS_KEY_parenright,  0x24D1, 
+IBUS_KEY_parenleft, IBUS_KEY_c, IBUS_KEY_parenright,  0x24D2, 
+IBUS_KEY_parenleft, IBUS_KEY_d, IBUS_KEY_parenright,  0x24D3, 
+IBUS_KEY_parenleft, IBUS_KEY_e, IBUS_KEY_parenright,  0x24D4, 
+IBUS_KEY_parenleft, IBUS_KEY_f, IBUS_KEY_parenright,  0x24D5, 
+IBUS_KEY_parenleft, IBUS_KEY_g, IBUS_KEY_parenright,  0x24D6, 
+IBUS_KEY_parenleft, IBUS_KEY_h, IBUS_KEY_parenright,  0x24D7, 
+IBUS_KEY_parenleft, IBUS_KEY_i, IBUS_KEY_parenright,  0x24D8, 
+IBUS_KEY_parenleft, IBUS_KEY_j, IBUS_KEY_parenright,  0x24D9, 
+IBUS_KEY_parenleft, IBUS_KEY_k, IBUS_KEY_parenright,  0x24DA, 
+IBUS_KEY_parenleft, IBUS_KEY_l, IBUS_KEY_parenright,  0x24DB, 
+IBUS_KEY_parenleft, IBUS_KEY_m, IBUS_KEY_parenright,  0x24DC, 
+IBUS_KEY_parenleft, IBUS_KEY_n, IBUS_KEY_parenright,  0x24DD, 
+IBUS_KEY_parenleft, IBUS_KEY_o, IBUS_KEY_parenright,  0x24DE, 
+IBUS_KEY_parenleft, IBUS_KEY_p, IBUS_KEY_parenright,  0x24DF, 
+IBUS_KEY_parenleft, IBUS_KEY_q, IBUS_KEY_parenright,  0x24E0, 
+IBUS_KEY_parenleft, IBUS_KEY_r, IBUS_KEY_parenright,  0x24E1, 
+IBUS_KEY_parenleft, IBUS_KEY_s, IBUS_KEY_parenright,  0x24E2, 
+IBUS_KEY_parenleft, IBUS_KEY_t, IBUS_KEY_parenright,  0x24E3, 
+IBUS_KEY_parenleft, IBUS_KEY_u, IBUS_KEY_parenright,  0x24E4, 
+IBUS_KEY_parenleft, IBUS_KEY_v, IBUS_KEY_parenright,  0x24E5, 
+IBUS_KEY_parenleft, IBUS_KEY_w, IBUS_KEY_parenright,  0x24E6, 
+IBUS_KEY_parenleft, IBUS_KEY_x, IBUS_KEY_parenright,  0x24E7, 
+IBUS_KEY_parenleft, IBUS_KEY_y, IBUS_KEY_parenright,  0x24E8, 
+IBUS_KEY_parenleft, IBUS_KEY_z, IBUS_KEY_parenright,  0x24E9, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_WO, IBUS_KEY_parenright,  0x32FE, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_A, IBUS_KEY_parenright,  0x32D0, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_I, IBUS_KEY_parenright,  0x32D1, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_U, IBUS_KEY_parenright,  0x32D2, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_E, IBUS_KEY_parenright,  0x32D3, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_O, IBUS_KEY_parenright,  0x32D4, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_KA, IBUS_KEY_parenright,  0x32D5, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_KI, IBUS_KEY_parenright,  0x32D6, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_KU, IBUS_KEY_parenright,  0x32D7, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_KE, IBUS_KEY_parenright,  0x32D8, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_KO, IBUS_KEY_parenright,  0x32D9, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_SA, IBUS_KEY_parenright,  0x32DA, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_SHI, IBUS_KEY_parenright,  0x32DB, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_SU, IBUS_KEY_parenright,  0x32DC, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_SE, IBUS_KEY_parenright,  0x32DD, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_SO, IBUS_KEY_parenright,  0x32DE, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_TA, IBUS_KEY_parenright,  0x32DF, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_CHI, IBUS_KEY_parenright,  0x32E0, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_TSU, IBUS_KEY_parenright,  0x32E1, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_TE, IBUS_KEY_parenright,  0x32E2, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_TO, IBUS_KEY_parenright,  0x32E3, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_NA, IBUS_KEY_parenright,  0x32E4, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_NI, IBUS_KEY_parenright,  0x32E5, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_NU, IBUS_KEY_parenright,  0x32E6, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_NE, IBUS_KEY_parenright,  0x32E7, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_NO, IBUS_KEY_parenright,  0x32E8, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_HA, IBUS_KEY_parenright,  0x32E9, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_HI, IBUS_KEY_parenright,  0x32EA, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_FU, IBUS_KEY_parenright,  0x32EB, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_HE, IBUS_KEY_parenright,  0x32EC, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_HO, IBUS_KEY_parenright,  0x32ED, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_MA, IBUS_KEY_parenright,  0x32EE, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_MI, IBUS_KEY_parenright,  0x32EF, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_MU, IBUS_KEY_parenright,  0x32F0, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_ME, IBUS_KEY_parenright,  0x32F1, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_MO, IBUS_KEY_parenright,  0x32F2, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_YA, IBUS_KEY_parenright,  0x32F3, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_YU, IBUS_KEY_parenright,  0x32F4, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_YO, IBUS_KEY_parenright,  0x32F5, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_RA, IBUS_KEY_parenright,  0x32F6, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_RI, IBUS_KEY_parenright,  0x32F7, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_RU, IBUS_KEY_parenright,  0x32F8, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_RE, IBUS_KEY_parenright,  0x32F9, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_RO, IBUS_KEY_parenright,  0x32FA, 
+IBUS_KEY_parenleft, IBUS_KEY_kana_WA, IBUS_KEY_parenright,  0x32FB, 
+IBUS_KEY_parenleft, 0x1100, IBUS_KEY_parenright,  0x3260, 
+IBUS_KEY_parenleft, 0x1102, IBUS_KEY_parenright,  0x3261, 
+IBUS_KEY_parenleft, 0x1103, IBUS_KEY_parenright,  0x3262, 
+IBUS_KEY_parenleft, 0x1105, IBUS_KEY_parenright,  0x3263, 
+IBUS_KEY_parenleft, 0x1106, IBUS_KEY_parenright,  0x3264, 
+IBUS_KEY_parenleft, 0x1107, IBUS_KEY_parenright,  0x3265, 
+IBUS_KEY_parenleft, 0x1109, IBUS_KEY_parenright,  0x3266, 
+IBUS_KEY_parenleft, 0x110B, IBUS_KEY_parenright,  0x3267, 
+IBUS_KEY_parenleft, 0x110C, IBUS_KEY_parenright,  0x3268, 
+IBUS_KEY_parenleft, 0x110E, IBUS_KEY_parenright,  0x3269, 
+IBUS_KEY_parenleft, 0x110F, IBUS_KEY_parenright,  0x326A, 
+IBUS_KEY_parenleft, 0x1110, IBUS_KEY_parenright,  0x326B, 
+IBUS_KEY_parenleft, 0x1111, IBUS_KEY_parenright,  0x326C, 
+IBUS_KEY_parenleft, 0x1112, IBUS_KEY_parenright,  0x326D, 
+IBUS_KEY_parenleft, 0x30F0, IBUS_KEY_parenright,  0x32FC, 
+IBUS_KEY_parenleft, 0x30F1, IBUS_KEY_parenright,  0x32FD, 
+IBUS_KEY_parenleft, 0x4E00, IBUS_KEY_parenright,  0x3280, 
+IBUS_KEY_parenleft, 0x4E03, IBUS_KEY_parenright,  0x3286, 
+IBUS_KEY_parenleft, 0x4E09, IBUS_KEY_parenright,  0x3282, 
+IBUS_KEY_parenleft, 0x4E0A, IBUS_KEY_parenright,  0x32A4, 
+IBUS_KEY_parenleft, 0x4E0B, IBUS_KEY_parenright,  0x32A6, 
+IBUS_KEY_parenleft, 0x4E2D, IBUS_KEY_parenright,  0x32A5, 
+IBUS_KEY_parenleft, 0x4E5D, IBUS_KEY_parenright,  0x3288, 
+IBUS_KEY_parenleft, 0x4E8C, IBUS_KEY_parenright,  0x3281, 
+IBUS_KEY_parenleft, 0x4E94, IBUS_KEY_parenright,  0x3284, 
+IBUS_KEY_parenleft, 0x4F01, IBUS_KEY_parenright,  0x32AD, 
+IBUS_KEY_parenleft, 0x4F11, IBUS_KEY_parenright,  0x32A1, 
+IBUS_KEY_parenleft, 0x512A, IBUS_KEY_parenright,  0x329D, 
+IBUS_KEY_parenleft, 0x516B, IBUS_KEY_parenright,  0x3287, 
+IBUS_KEY_parenleft, 0x516D, IBUS_KEY_parenright,  0x3285, 
+IBUS_KEY_parenleft, 0x5199, IBUS_KEY_parenright,  0x32A2, 
+IBUS_KEY_parenleft, 0x52B4, IBUS_KEY_parenright,  0x3298, 
+IBUS_KEY_parenleft, 0x533B, IBUS_KEY_parenright,  0x32A9, 
+IBUS_KEY_parenleft, 0x5341, IBUS_KEY_parenright,  0x3289, 
+IBUS_KEY_parenleft, 0x5354, IBUS_KEY_parenright,  0x32AF, 
+IBUS_KEY_parenleft, 0x5370, IBUS_KEY_parenright,  0x329E, 
+IBUS_KEY_parenleft, 0x53F3, IBUS_KEY_parenright,  0x32A8, 
+IBUS_KEY_parenleft, 0x540D, IBUS_KEY_parenright,  0x3294, 
+IBUS_KEY_parenleft, 0x56DB, IBUS_KEY_parenright,  0x3283, 
+IBUS_KEY_parenleft, 0x571F, IBUS_KEY_parenright,  0x328F, 
+IBUS_KEY_parenleft, 0x591C, IBUS_KEY_parenright,  0x32B0, 
+IBUS_KEY_parenleft, 0x5973, IBUS_KEY_parenright,  0x329B, 
+IBUS_KEY_parenleft, 0x5B66, IBUS_KEY_parenright,  0x32AB, 
+IBUS_KEY_parenleft, 0x5B97, IBUS_KEY_parenright,  0x32AA, 
+IBUS_KEY_parenleft, 0x5DE6, IBUS_KEY_parenright,  0x32A7, 
+IBUS_KEY_parenleft, 0x65E5, IBUS_KEY_parenright,  0x3290, 
+IBUS_KEY_parenleft, 0x6708, IBUS_KEY_parenright,  0x328A, 
+IBUS_KEY_parenleft, 0x6709, IBUS_KEY_parenright,  0x3292, 
+IBUS_KEY_parenleft, 0x6728, IBUS_KEY_parenright,  0x328D, 
+IBUS_KEY_parenleft, 0x682A, IBUS_KEY_parenright,  0x3291, 
+IBUS_KEY_parenleft, 0x6B63, IBUS_KEY_parenright,  0x32A3, 
+IBUS_KEY_parenleft, 0x6C34, IBUS_KEY_parenright,  0x328C, 
+IBUS_KEY_parenleft, 0x6CE8, IBUS_KEY_parenright,  0x329F, 
+IBUS_KEY_parenleft, 0x706B, IBUS_KEY_parenright,  0x328B, 
+IBUS_KEY_parenleft, 0x7279, IBUS_KEY_parenright,  0x3295, 
+IBUS_KEY_parenleft, 0x7537, IBUS_KEY_parenright,  0x329A, 
+IBUS_KEY_parenleft, 0x76E3, IBUS_KEY_parenright,  0x32AC, 
+IBUS_KEY_parenleft, 0x793E, IBUS_KEY_parenright,  0x3293, 
+IBUS_KEY_parenleft, 0x795D, IBUS_KEY_parenright,  0x3297, 
+IBUS_KEY_parenleft, 0x79D8, IBUS_KEY_parenright,  0x3299, 
+IBUS_KEY_parenleft, 0x8CA1, IBUS_KEY_parenright,  0x3296, 
+IBUS_KEY_parenleft, 0x8CC7, IBUS_KEY_parenright,  0x32AE, 
+IBUS_KEY_parenleft, 0x9069, IBUS_KEY_parenright,  0x329C, 
+IBUS_KEY_parenleft, 0x91D1, IBUS_KEY_parenright,  0x328E, 
+IBUS_KEY_parenleft, 0x9805, IBUS_KEY_parenright,  0x32A0, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x2461, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x24EA, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x2460, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x2461, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x2462, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x2463, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x2464, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x2465, 
+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, 
+IBUS_KEY_period, IBUS_KEY_exclam, IBUS_KEY_S,  0x1E68, 
+IBUS_KEY_period, IBUS_KEY_exclam, IBUS_KEY_s,  0x1E69, 
+IBUS_KEY_period, IBUS_KEY_apostrophe, IBUS_KEY_S,  0x1E64, 
+IBUS_KEY_period, IBUS_KEY_apostrophe, IBUS_KEY_s,  0x1E65, 
+IBUS_KEY_period, IBUS_KEY_acute, IBUS_KEY_S,  0x1E64, 
+IBUS_KEY_period, IBUS_KEY_acute, IBUS_KEY_s,  0x1E65, 
+IBUS_KEY_period, IBUS_KEY_dead_acute, IBUS_KEY_S,  0x1E64, 
+IBUS_KEY_period, IBUS_KEY_dead_acute, IBUS_KEY_s,  0x1E65, 
+IBUS_KEY_period, IBUS_KEY_dead_caron, IBUS_KEY_S,  0x1E66, 
+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, 
+IBUS_KEY_question, IBUS_KEY_plus, IBUS_KEY_u,  0x1EED, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA8, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC2, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED4, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA9, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC3, 
+IBUS_KEY_question, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED5, 
+IBUS_KEY_question, IBUS_KEY_b, IBUS_KEY_A,  0x1EB2, 
+IBUS_KEY_question, IBUS_KEY_b, IBUS_KEY_a,  0x1EB3, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_A,  0x1EA8, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_E,  0x1EC2, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_O,  0x1ED4, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_a,  0x1EA9, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_e,  0x1EC3, 
+IBUS_KEY_question, IBUS_KEY_dead_circumflex, IBUS_KEY_o,  0x1ED5, 
+IBUS_KEY_question, IBUS_KEY_dead_breve, IBUS_KEY_A,  0x1EB2, 
+IBUS_KEY_question, IBUS_KEY_dead_breve, IBUS_KEY_a,  0x1EB3, 
+IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EDE, 
+IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EEC, 
+IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EDF, 
+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_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, 
+IBUS_KEY_U, IBUS_KEY_dead_cedilla, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_U, IBUS_KEY_dead_belowdot, IBUS_KEY_A,  0x1EB6, 
+IBUS_KEY_U, IBUS_KEY_dead_belowdot, IBUS_KEY_a,  0x1EB7, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_A,  0x1EAC, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_E,  0x1EC6, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_O,  0x1ED8, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_a,  0x1EAD, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_e,  0x1EC7, 
+IBUS_KEY_asciicircum, IBUS_KEY_exclam, IBUS_KEY_o,  0x1ED9, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_a,  0x00AA, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_h,  0x02B0, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_i,  0x2071, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_j,  0x02B2, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_l,  0x02E1, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_n,  0x207F, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_o,  0x00BA, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_r,  0x02B3, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_s,  0x02E2, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_w,  0x02B7, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_x,  0x02E3, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, IBUS_KEY_y,  0x02B8, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0263,  0x02E0, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0266,  0x02B1, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0279,  0x02B4, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x027B,  0x02B5, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0281,  0x02B6, 
+IBUS_KEY_asciicircum, IBUS_KEY_underscore, 0x0295,  0x02E4, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_a,  0x00AA, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_h,  0x02B0, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_i,  0x2071, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_j,  0x02B2, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_l,  0x02E1, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_n,  0x207F, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_o,  0x00BA, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_r,  0x02B3, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_s,  0x02E2, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_w,  0x02B7, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_x,  0x02E3, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, IBUS_KEY_y,  0x02B8, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0263,  0x02E0, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0266,  0x02B1, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0279,  0x02B4, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x027B,  0x02B5, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0281,  0x02B6, 
+IBUS_KEY_asciicircum, IBUS_KEY_underbar, 0x0295,  0x02E4, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_A,  0x1EAC, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_E,  0x1EC6, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_O,  0x1ED8, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_a,  0x1EAD, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_e,  0x1EC7, 
+IBUS_KEY_asciicircum, IBUS_KEY_dead_belowdot, IBUS_KEY_o,  0x1ED9, 
+IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_L,  0x1E38, 
+IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_R,  0x1E5C, 
+IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_l,  0x1E39, 
+IBUS_KEY_underscore, IBUS_KEY_exclam, IBUS_KEY_r,  0x1E5D, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_A,  0x01DE, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_O,  0x022A, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D5, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_a,  0x01DF, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_o,  0x022B, 
+IBUS_KEY_underscore, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D6, 
+IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_A,  0x01E0, 
+IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_O,  0x0230, 
+IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_a,  0x01E1, 
+IBUS_KEY_underscore, IBUS_KEY_period, IBUS_KEY_o,  0x0231, 
+IBUS_KEY_underscore, IBUS_KEY_semicolon, IBUS_KEY_O,  0x01EC, 
+IBUS_KEY_underscore, IBUS_KEY_semicolon, IBUS_KEY_o,  0x01ED, 
+IBUS_KEY_underscore, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x022C, 
+IBUS_KEY_underscore, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x022D, 
+IBUS_KEY_underscore, IBUS_KEY_dead_tilde, IBUS_KEY_O,  0x022C, 
+IBUS_KEY_underscore, IBUS_KEY_dead_tilde, IBUS_KEY_o,  0x022D, 
+IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_A,  0x01E0, 
+IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_O,  0x0230, 
+IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_a,  0x01E1, 
+IBUS_KEY_underscore, IBUS_KEY_dead_abovedot, IBUS_KEY_o,  0x0231, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_A,  0x01DE, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_O,  0x022A, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_U,  0x01D5, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_a,  0x01DF, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_o,  0x022B, 
+IBUS_KEY_underscore, IBUS_KEY_dead_diaeresis, IBUS_KEY_u,  0x01D6, 
+IBUS_KEY_underscore, IBUS_KEY_dead_ogonek, IBUS_KEY_O,  0x01EC, 
+IBUS_KEY_underscore, IBUS_KEY_dead_ogonek, IBUS_KEY_o,  0x01ED, 
+IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_L,  0x1E38, 
+IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_R,  0x1E5C, 
+IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_l,  0x1E39, 
+IBUS_KEY_underscore, IBUS_KEY_dead_belowdot, IBUS_KEY_r,  0x1E5D, 
+IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01DB, 
+IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01DC, 
+IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x1FD2, 
+IBUS_KEY_grave, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x1FE2, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F1B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F4B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6B, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F03, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F13, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F23, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F33, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F43, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F53, 
+IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F63, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F1A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F4A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6A, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F02, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F12, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F22, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F32, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F42, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F52, 
+IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F62, 
+IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_O,  0x1EDC, 
+IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_U,  0x1EEA, 
+IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_o,  0x1EDD, 
+IBUS_KEY_grave, IBUS_KEY_plus, IBUS_KEY_u,  0x1EEB, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA6, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC0, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED2, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA7, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC1, 
+IBUS_KEY_grave, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED3, 
+IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_E,  0x1E14, 
+IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_O,  0x1E50, 
+IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_e,  0x1E15, 
+IBUS_KEY_grave, IBUS_KEY_underscore, IBUS_KEY_o,  0x1E51, 
+IBUS_KEY_grave, IBUS_KEY_b, IBUS_KEY_A,  0x1EB0, 
+IBUS_KEY_grave, IBUS_KEY_b, IBUS_KEY_a,  0x1EB1, 
+IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_E,  0x1E14, 
+IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_O,  0x1E50, 
+IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_e,  0x1E15, 
+IBUS_KEY_grave, IBUS_KEY_macron, IBUS_KEY_o,  0x1E51, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_A,  0x1EA6, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_E,  0x1EC0, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_O,  0x1ED2, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_a,  0x1EA7, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_e,  0x1EC1, 
+IBUS_KEY_grave, IBUS_KEY_dead_circumflex, IBUS_KEY_o,  0x1ED3, 
+IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_E,  0x1E14, 
+IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_O,  0x1E50, 
+IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_e,  0x1E15, 
+IBUS_KEY_grave, IBUS_KEY_dead_macron, IBUS_KEY_o,  0x1E51, 
+IBUS_KEY_grave, IBUS_KEY_dead_breve, IBUS_KEY_A,  0x1EB0, 
+IBUS_KEY_grave, IBUS_KEY_dead_breve, IBUS_KEY_a,  0x1EB1, 
+IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_U,  0x01DB, 
+IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_u,  0x01DC, 
+IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x1FD2, 
+IBUS_KEY_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x1FE2, 
+IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EDC, 
+IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EEA, 
+IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EDD, 
+IBUS_KEY_grave, IBUS_KEY_dead_horn, IBUS_KEY_u,  0x1EEB, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON,  0x1F1A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON,  0x1F4A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6A, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F02, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon,  0x1F12, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F22, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F32, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron,  0x1F42, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F52, 
+IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F62, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON,  0x1F1B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON,  0x1F4B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6B, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F03, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon,  0x1F13, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F23, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F33, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron,  0x1F43, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F53, 
+IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F63, 
+IBUS_KEY_b, IBUS_KEY_exclam, IBUS_KEY_A,  0x1EB6, 
+IBUS_KEY_b, IBUS_KEY_exclam, IBUS_KEY_a,  0x1EB7, 
+IBUS_KEY_b, IBUS_KEY_comma, IBUS_KEY_E,  0x1E1C, 
+IBUS_KEY_b, IBUS_KEY_comma, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_b, IBUS_KEY_cedilla, IBUS_KEY_E,  0x1E1C, 
+IBUS_KEY_b, IBUS_KEY_cedilla, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_b, IBUS_KEY_dead_cedilla, IBUS_KEY_E,  0x1E1C, 
+IBUS_KEY_b, IBUS_KEY_dead_cedilla, IBUS_KEY_e,  0x1E1D, 
+IBUS_KEY_b, IBUS_KEY_dead_belowdot, IBUS_KEY_A,  0x1EB6, 
+IBUS_KEY_b, IBUS_KEY_dead_belowdot, IBUS_KEY_a,  0x1EB7, 
+IBUS_KEY_c, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D9, 
+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_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, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2F, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3F, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5F, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6F, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F07, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F27, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F37, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F57, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F67, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0E, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2E, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3E, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6E, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F06, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F26, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F36, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F56, 
+IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F66, 
+IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_O,  0x1EE0, 
+IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_U,  0x1EEE, 
+IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_o,  0x1EE1, 
+IBUS_KEY_asciitilde, IBUS_KEY_plus, IBUS_KEY_u,  0x1EEF, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EAA, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EC4, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED6, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EAB, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EC5, 
+IBUS_KEY_asciitilde, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED7, 
+IBUS_KEY_asciitilde, IBUS_KEY_b, IBUS_KEY_A,  0x1EB4, 
+IBUS_KEY_asciitilde, IBUS_KEY_b, IBUS_KEY_a,  0x1EB5, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_A,  0x1EAA, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_E,  0x1EC4, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_O,  0x1ED6, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_a,  0x1EAB, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_e,  0x1EC5, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_circumflex, IBUS_KEY_o,  0x1ED7, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_breve, IBUS_KEY_A,  0x1EB4, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_breve, IBUS_KEY_a,  0x1EB5, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x1FD7, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x1FE7, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EE0, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EEE, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EE1, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_horn, IBUS_KEY_u,  0x1EEF, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0E, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2E, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3E, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6E, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F06, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F26, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F36, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F56, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F66, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0F, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2F, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3F, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5F, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6F, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F07, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F27, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F37, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F57, 
+IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F67, 
+IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_L,  0x1E38, 
+IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_R,  0x1E5C, 
+IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_l,  0x1E39, 
+IBUS_KEY_macron, IBUS_KEY_exclam, IBUS_KEY_r,  0x1E5D, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_A,  0x01DE, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_O,  0x022A, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D5, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_a,  0x01DF, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_o,  0x022B, 
+IBUS_KEY_macron, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D6, 
+IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_A,  0x01E0, 
+IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_O,  0x0230, 
+IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_a,  0x01E1, 
+IBUS_KEY_macron, IBUS_KEY_period, IBUS_KEY_o,  0x0231, 
+IBUS_KEY_macron, IBUS_KEY_semicolon, IBUS_KEY_O,  0x01EC, 
+IBUS_KEY_macron, IBUS_KEY_semicolon, IBUS_KEY_o,  0x01ED, 
+IBUS_KEY_macron, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x022C, 
+IBUS_KEY_macron, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x022D, 
+IBUS_KEY_macron, IBUS_KEY_dead_tilde, IBUS_KEY_O,  0x022C, 
+IBUS_KEY_macron, IBUS_KEY_dead_tilde, IBUS_KEY_o,  0x022D, 
+IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_A,  0x01E0, 
+IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_O,  0x0230, 
+IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_a,  0x01E1, 
+IBUS_KEY_macron, IBUS_KEY_dead_abovedot, IBUS_KEY_o,  0x0231, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_A,  0x01DE, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_O,  0x022A, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_U,  0x01D5, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_a,  0x01DF, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_o,  0x022B, 
+IBUS_KEY_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_u,  0x01D6, 
+IBUS_KEY_macron, IBUS_KEY_dead_ogonek, IBUS_KEY_O,  0x01EC, 
+IBUS_KEY_macron, IBUS_KEY_dead_ogonek, IBUS_KEY_o,  0x01ED, 
+IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_L,  0x1E38, 
+IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_R,  0x1E5C, 
+IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_l,  0x1E39, 
+IBUS_KEY_macron, IBUS_KEY_dead_belowdot, IBUS_KEY_r,  0x1E5D, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_I,  0x1E2E, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_U,  0x01D7, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_i,  0x1E2F, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_u,  0x01D8, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_acute, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_O,  0x1EDA, 
+IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_U,  0x1EE8, 
+IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_o,  0x1EDB, 
+IBUS_KEY_acute, IBUS_KEY_plus, IBUS_KEY_u,  0x1EE9, 
+IBUS_KEY_acute, IBUS_KEY_comma, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_acute, IBUS_KEY_comma, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_acute, IBUS_KEY_slash, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_acute, IBUS_KEY_slash, IBUS_KEY_o,  0x01FF, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_A,  0x1EA4, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_E,  0x1EBE, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_O,  0x1ED0, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_a,  0x1EA5, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_e,  0x1EBF, 
+IBUS_KEY_acute, IBUS_KEY_asciicircum, IBUS_KEY_o,  0x1ED1, 
+IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_acute, IBUS_KEY_underscore, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_acute, IBUS_KEY_b, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_acute, IBUS_KEY_b, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_O,  0x1E4C, 
+IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_U,  0x1E78, 
+IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_o,  0x1E4D, 
+IBUS_KEY_acute, IBUS_KEY_asciitilde, IBUS_KEY_u,  0x1E79, 
+IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_acute, IBUS_KEY_macron, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_acute, IBUS_KEY_cedilla, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_acute, IBUS_KEY_cedilla, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_A,  0x1EA4, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_E,  0x1EBE, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_O,  0x1ED0, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_a,  0x1EA5, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_e,  0x1EBF, 
+IBUS_KEY_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_o,  0x1ED1, 
+IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_O,  0x1E4C, 
+IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_U,  0x1E78, 
+IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_o,  0x1E4D, 
+IBUS_KEY_acute, IBUS_KEY_dead_tilde, IBUS_KEY_u,  0x1E79, 
+IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_E,  0x1E16, 
+IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_O,  0x1E52, 
+IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_e,  0x1E17, 
+IBUS_KEY_acute, IBUS_KEY_dead_macron, IBUS_KEY_o,  0x1E53, 
+IBUS_KEY_acute, IBUS_KEY_dead_breve, IBUS_KEY_A,  0x1EAE, 
+IBUS_KEY_acute, IBUS_KEY_dead_breve, IBUS_KEY_a,  0x1EAF, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_I,  0x1E2E, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_U,  0x01D7, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_i,  0x1E2F, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_u,  0x01D8, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota,  0x0390, 
+IBUS_KEY_acute, IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon,  0x03B0, 
+IBUS_KEY_acute, IBUS_KEY_dead_abovering, IBUS_KEY_A,  0x01FA, 
+IBUS_KEY_acute, IBUS_KEY_dead_abovering, IBUS_KEY_a,  0x01FB, 
+IBUS_KEY_acute, IBUS_KEY_dead_cedilla, IBUS_KEY_C,  0x1E08, 
+IBUS_KEY_acute, IBUS_KEY_dead_cedilla, IBUS_KEY_c,  0x1E09, 
+IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_O,  0x1EDA, 
+IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_U,  0x1EE8, 
+IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_o,  0x1EDB, 
+IBUS_KEY_acute, IBUS_KEY_dead_horn, IBUS_KEY_u,  0x1EE9, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F0C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON,  0x1F1C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F2C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA,  0x1F3C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON,  0x1F4C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1F6C, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F04, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon,  0x1F14, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F24, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota,  0x1F34, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron,  0x1F44, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon,  0x1F54, 
+IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1F64, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F0D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON,  0x1F1D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F2D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA,  0x1F3D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON,  0x1F4D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON,  0x1F5D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1F6D, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F05, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon,  0x1F15, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F25, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota,  0x1F35, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron,  0x1F45, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon,  0x1F55, 
+IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1F65, 
+IBUS_KEY_acute, IBUS_KEY_KP_Divide, IBUS_KEY_O,  0x01FE, 
+IBUS_KEY_acute, IBUS_KEY_KP_Divide, IBUS_KEY_o,  0x01FF, 
+0x05C1, 0x05BC, IBUS_KEY_hebrew_shin,  0xFB2C, 
+0x05C2, 0x05BC, IBUS_KEY_hebrew_shin,  0xFB2D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F00,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F01,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F08,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F09,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F20,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F21,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F28,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F29,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F60,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F61,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F68,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, 0x1F69,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F89, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F99, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FA9, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F81, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F91, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA1, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F88, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F98, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FA8, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F80, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F90, 
+IBUS_KEY_Greek_iota, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA0, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,  0x1FB2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_eta,  0x1FC2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_Greek_omega,  0x1FF2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F00,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F01,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F08,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F09,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F20,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F21,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F28,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F29,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F60,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F61,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F68,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, 0x1F69,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,  0x1FB7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,  0x1FC7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,  0x1FF7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F00,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F01,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F08,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F09,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F20,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F21,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F28,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F29,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F60,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F61,  0x1FA7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F68,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, 0x1F69,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F00,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F01,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F08,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F09,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F20,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F21,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F28,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F29,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F60,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F61,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F68,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, 0x1F69,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha,  0x1FB2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta,  0x1FC2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega,  0x1FF2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F00,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F01,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F08,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F09,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F20,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F21,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F28,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F29,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F60,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F61,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F68,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, 0x1F69,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha,  0x1FB4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta,  0x1FC4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega,  0x1FF4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F00,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F01,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F08,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F09,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F20,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F21,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F28,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F29,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F60,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F61,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F68,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, 0x1F69,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha,  0x1FB7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta,  0x1FC7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega,  0x1FF7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F00,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F01,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F08,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F09,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F20,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F21,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F28,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F29,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F60,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F61,  0x1FA7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F68,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, 0x1F69,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F88, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F98, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FA8, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F80, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F90, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA0, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F89, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F99, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FA9, 
+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, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_3, IBUS_KEY_parenright,  0x246C, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_4, IBUS_KEY_parenright,  0x246D, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_5, IBUS_KEY_parenright,  0x246E, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_6, IBUS_KEY_parenright,  0x246F, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_7, IBUS_KEY_parenright,  0x2470, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_8, IBUS_KEY_parenright,  0x2471, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_9, IBUS_KEY_parenright,  0x2472, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x246B, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x2469, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x246A, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x246B, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x246C, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x246D, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x246E, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x246F, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x2470, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x2471, 
+IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x2472, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_2, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_0, IBUS_KEY_parenright,  0x325A, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_1, IBUS_KEY_parenright,  0x325B, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_2, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_3, IBUS_KEY_parenright,  0x325D, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_4, IBUS_KEY_parenright,  0x325E, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_5, IBUS_KEY_parenright,  0x325F, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_6, IBUS_KEY_parenright,  0x32B1, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_7, IBUS_KEY_parenright,  0x32B2, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_8, IBUS_KEY_parenright,  0x32B3, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_9, IBUS_KEY_parenright,  0x32B4, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x325A, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x325B, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x325D, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x325E, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x325F, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x32B1, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x32B2, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x32B3, 
+IBUS_KEY_parenleft, IBUS_KEY_3, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x32B4, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_0, IBUS_KEY_parenright,  0x32B5, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_1, IBUS_KEY_parenright,  0x32B6, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_2, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_3, IBUS_KEY_parenright,  0x32B8, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_4, IBUS_KEY_parenright,  0x32B9, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_5, IBUS_KEY_parenright,  0x32BA, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_6, IBUS_KEY_parenright,  0x32BB, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_7, IBUS_KEY_parenright,  0x32BC, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_8, IBUS_KEY_parenright,  0x32BD, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_9, IBUS_KEY_parenright,  0x32BE, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x32B5, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x32B6, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x32B8, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x32B9, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x32BA, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x32BB, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x32BC, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x32BD, 
+IBUS_KEY_parenleft, IBUS_KEY_4, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x32BE, 
+IBUS_KEY_parenleft, IBUS_KEY_5, IBUS_KEY_0, IBUS_KEY_parenright,  0x32BF, 
+IBUS_KEY_parenleft, 0x1100, 0x1161, IBUS_KEY_parenright,  0x326E, 
+IBUS_KEY_parenleft, 0x1102, 0x1161, IBUS_KEY_parenright,  0x326F, 
+IBUS_KEY_parenleft, 0x1103, 0x1161, IBUS_KEY_parenright,  0x3270, 
+IBUS_KEY_parenleft, 0x1105, 0x1161, IBUS_KEY_parenright,  0x3271, 
+IBUS_KEY_parenleft, 0x1106, 0x1161, IBUS_KEY_parenright,  0x3272, 
+IBUS_KEY_parenleft, 0x1107, 0x1161, IBUS_KEY_parenright,  0x3273, 
+IBUS_KEY_parenleft, 0x1109, 0x1161, IBUS_KEY_parenright,  0x3274, 
+IBUS_KEY_parenleft, 0x110B, 0x1161, IBUS_KEY_parenright,  0x3275, 
+IBUS_KEY_parenleft, 0x110C, 0x1161, IBUS_KEY_parenright,  0x3276, 
+IBUS_KEY_parenleft, 0x110E, 0x1161, IBUS_KEY_parenright,  0x3277, 
+IBUS_KEY_parenleft, 0x110F, 0x1161, IBUS_KEY_parenright,  0x3278, 
+IBUS_KEY_parenleft, 0x1110, 0x1161, IBUS_KEY_parenright,  0x3279, 
+IBUS_KEY_parenleft, 0x1111, 0x1161, IBUS_KEY_parenright,  0x327A, 
+IBUS_KEY_parenleft, 0x1112, 0x1161, IBUS_KEY_parenright,  0x327B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_Space, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_0, IBUS_KEY_parenright,  0x2469, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_1, IBUS_KEY_parenright,  0x246A, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_2, IBUS_KEY_parenright,  0x246B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_3, IBUS_KEY_parenright,  0x246C, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_4, IBUS_KEY_parenright,  0x246D, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_5, IBUS_KEY_parenright,  0x246E, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_6, IBUS_KEY_parenright,  0x246F, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_7, IBUS_KEY_parenright,  0x2470, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_8, IBUS_KEY_parenright,  0x2471, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_9, IBUS_KEY_parenright,  0x2472, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x246B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x2469, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x246A, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x246B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x246C, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x246D, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x246E, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x246F, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x2470, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x2471, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_1, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x2472, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x2473, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x3251, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x3252, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x3253, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x3254, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x3255, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x3256, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x3257, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x3258, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_2, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x3259, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_0, IBUS_KEY_parenright,  0x325A, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_1, IBUS_KEY_parenright,  0x325B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_2, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_3, IBUS_KEY_parenright,  0x325D, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_4, IBUS_KEY_parenright,  0x325E, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_5, IBUS_KEY_parenright,  0x325F, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_6, IBUS_KEY_parenright,  0x32B1, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_7, IBUS_KEY_parenright,  0x32B2, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_8, IBUS_KEY_parenright,  0x32B3, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_9, IBUS_KEY_parenright,  0x32B4, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x325A, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x325B, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x325C, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x325D, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x325E, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x325F, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x32B1, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x32B2, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x32B3, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_3, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x32B4, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_0, IBUS_KEY_parenright,  0x32B5, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_1, IBUS_KEY_parenright,  0x32B6, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_2, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_3, IBUS_KEY_parenright,  0x32B8, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_4, IBUS_KEY_parenright,  0x32B9, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_5, IBUS_KEY_parenright,  0x32BA, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_6, IBUS_KEY_parenright,  0x32BB, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_7, IBUS_KEY_parenright,  0x32BC, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_8, IBUS_KEY_parenright,  0x32BD, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_9, IBUS_KEY_parenright,  0x32BE, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_Space, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_0, IBUS_KEY_parenright,  0x32B5, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_1, IBUS_KEY_parenright,  0x32B6, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_2, IBUS_KEY_parenright,  0x32B7, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_3, IBUS_KEY_parenright,  0x32B8, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_4, IBUS_KEY_parenright,  0x32B9, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_5, IBUS_KEY_parenright,  0x32BA, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_6, IBUS_KEY_parenright,  0x32BB, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_7, IBUS_KEY_parenright,  0x32BC, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_8, IBUS_KEY_parenright,  0x32BD, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_9, IBUS_KEY_parenright,  0x32BE, 
+IBUS_KEY_parenleft, IBUS_KEY_KP_5, IBUS_KEY_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, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_asciitilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9A, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAA, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F82, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F92, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA2, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9B, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAB, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F83, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F93, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA3, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9C, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAC, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F84, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F94, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA4, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9D, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAD, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F85, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F95, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA5, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega,  0x1FA7, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_parenright, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA,  0x1F8E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA,  0x1F9E, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA,  0x1FAE, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha,  0x1F86, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta,  0x1F96, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega,  0x1FA6, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA,  0x1F8F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA,  0x1F9F, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA,  0x1FAF, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha,  0x1F87, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta,  0x1F97, 
+IBUS_KEY_Greek_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega,  0x1FA7, 
+};
+
+static const guint16 gtk_compose_seqs_compact_32bit_first[] = {
+IBUS_KEY_dead_grave, 54, 123, 187, 187, 187, 
+IBUS_KEY_dead_acute, 187, 268, 316, 316, 316, 
+IBUS_KEY_dead_circumflex, 316, 388, 388, 388, 388, 
+IBUS_KEY_dead_tilde, 388, 406, 406, 406, 406, 
+IBUS_KEY_dead_macron, 406, 466, 466, 466, 466, 
+IBUS_KEY_dead_caron, 466, 502, 502, 502, 502, 
+IBUS_KEY_dead_doublegrave, 502, 538, 538, 538, 538, 
+IBUS_KEY_dead_invertedbreve, 538, 574, 574, 574, 574, 
+IBUS_KEY_Multi_key, 574, 574, 850, 920, 926, 
+IBUS_KEY_M,  0, 2,
+IBUS_KEY_m,  2, 2,
+0x0186,  4, 2,
+0x018E,  6, 2,
+0x0190,  8, 2,
+0x0196,  10, 2,
+0x01B1,  12, 2,
+0x01B2,  14, 2,
+0x01DD,  16, 2,
+0x0254,  18, 2,
+0x025B,  20, 2,
+0x0269,  22, 2,
+0x028A,  24, 2,
+0x028B,  26, 2,
+IBUS_KEY_ENG,  28, 2,
+IBUS_KEY_Cyrillic_a,  30, 2,
+IBUS_KEY_Cyrillic_o,  32, 2,
+IBUS_KEY_Cyrillic_er,  34, 2,
+IBUS_KEY_Cyrillic_u,  36, 2,
+IBUS_KEY_Cyrillic_A,  38, 2,
+IBUS_KEY_Cyrillic_O,  40, 2,
+IBUS_KEY_Cyrillic_ER,  42, 2,
+IBUS_KEY_Cyrillic_U,  44, 2,
+IBUS_KEY_dead_tilde, IBUS_KEY_A,  46, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_E,  49, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_I,  52, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_O,  55, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_U,  58, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_a,  61, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_e,  64, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_i,  67, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_o,  70, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_u,  73, 3,
+IBUS_KEY_dead_tilde, 0x0186,  76, 3,
+IBUS_KEY_dead_tilde, 0x018E,  79, 3,
+IBUS_KEY_dead_tilde, 0x0190,  82, 3,
+IBUS_KEY_dead_tilde, 0x01DD,  85, 3,
+IBUS_KEY_dead_tilde, 0x0254,  88, 3,
+IBUS_KEY_dead_tilde, 0x025B,  91, 3,
+IBUS_KEY_J,  94, 2,
+IBUS_KEY_j,  96, 2,
+0x0186,  98, 2,
+0x018E,  100, 2,
+0x0190,  102, 2,
+0x0196,  104, 2,
+0x01B1,  106, 2,
+0x01B2,  108, 2,
+0x01DD,  110, 2,
+0x0254,  112, 2,
+0x025B,  114, 2,
+0x0269,  116, 2,
+0x028A,  118, 2,
+0x028B,  120, 2,
+IBUS_KEY_ENG,  122, 2,
+IBUS_KEY_Cyrillic_a,  124, 2,
+IBUS_KEY_Cyrillic_ie,  126, 2,
+IBUS_KEY_Cyrillic_i,  128, 2,
+IBUS_KEY_Cyrillic_o,  130, 2,
+IBUS_KEY_Cyrillic_er,  132, 2,
+IBUS_KEY_Cyrillic_u,  134, 2,
+IBUS_KEY_Cyrillic_A,  136, 2,
+IBUS_KEY_Cyrillic_IE,  138, 2,
+IBUS_KEY_Cyrillic_I,  140, 2,
+IBUS_KEY_Cyrillic_O,  142, 2,
+IBUS_KEY_Cyrillic_ER,  144, 2,
+IBUS_KEY_Cyrillic_U,  146, 2,
+IBUS_KEY_dead_tilde, IBUS_KEY_A,  148, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_E,  151, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_I,  154, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_a,  157, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_e,  160, 3,
+IBUS_KEY_dead_tilde, IBUS_KEY_i,  163, 3,
+IBUS_KEY_dead_tilde, 0x0186,  166, 3,
+IBUS_KEY_dead_tilde, 0x018E,  169, 3,
+IBUS_KEY_dead_tilde, 0x0190,  172, 3,
+IBUS_KEY_dead_tilde, 0x01DD,  175, 3,
+IBUS_KEY_dead_tilde, 0x0254,  178, 3,
+IBUS_KEY_dead_tilde, 0x025B,  181, 3,
+0x0186,  184, 2,
+0x018E,  186, 2,
+0x0190,  188, 2,
+0x0196,  190, 2,
+0x01B1,  192, 2,
+0x01B2,  194, 2,
+0x01DD,  196, 2,
+0x0254,  198, 2,
+0x025B,  200, 2,
+0x0269,  202, 2,
+0x028A,  204, 2,
+0x028B,  206, 2,
+IBUS_KEY_Cyrillic_a,  208, 2,
+IBUS_KEY_Cyrillic_ie,  210, 2,
+IBUS_KEY_Cyrillic_i,  212, 2,
+IBUS_KEY_Cyrillic_o,  214, 2,
+IBUS_KEY_Cyrillic_er,  216, 2,
+IBUS_KEY_Cyrillic_u,  218, 2,
+IBUS_KEY_Cyrillic_A,  220, 2,
+IBUS_KEY_Cyrillic_IE,  222, 2,
+IBUS_KEY_Cyrillic_I,  224, 2,
+IBUS_KEY_Cyrillic_O,  226, 2,
+IBUS_KEY_Cyrillic_ER,  228, 2,
+IBUS_KEY_Cyrillic_U,  230, 2,
+0x0186,  232, 2,
+0x018E,  234, 2,
+0x0190,  236, 2,
+0x01DD,  238, 2,
+0x0254,  240, 2,
+0x025B,  242, 2,
+0x0186,  244, 2,
+0x018E,  246, 2,
+0x0190,  248, 2,
+0x0196,  250, 2,
+0x01B1,  252, 2,
+0x01B2,  254, 2,
+0x01DD,  256, 2,
+0x0254,  258, 2,
+0x025B,  260, 2,
+0x0269,  262, 2,
+0x028A,  264, 2,
+0x028B,  266, 2,
+IBUS_KEY_Cyrillic_a,  268, 2,
+IBUS_KEY_Cyrillic_ie,  270, 2,
+IBUS_KEY_Cyrillic_o,  272, 2,
+IBUS_KEY_Cyrillic_er,  274, 2,
+IBUS_KEY_Cyrillic_A,  276, 2,
+IBUS_KEY_Cyrillic_IE,  278, 2,
+IBUS_KEY_Cyrillic_O,  280, 2,
+IBUS_KEY_Cyrillic_ER,  282, 2,
+0x0186,  284, 2,
+0x018E,  286, 2,
+0x0190,  288, 2,
+0x0196,  290, 2,
+0x01B1,  292, 2,
+0x01B2,  294, 2,
+0x01DD,  296, 2,
+0x0254,  298, 2,
+0x025B,  300, 2,
+0x0269,  302, 2,
+0x028A,  304, 2,
+0x028B,  306, 2,
+IBUS_KEY_Cyrillic_a,  308, 2,
+IBUS_KEY_Cyrillic_ie,  310, 2,
+IBUS_KEY_Cyrillic_i,  312, 2,
+IBUS_KEY_Cyrillic_o,  314, 2,
+IBUS_KEY_Cyrillic_er,  316, 2,
+IBUS_KEY_Cyrillic_u,  318, 2,
+IBUS_KEY_Cyrillic_A,  320, 2,
+IBUS_KEY_Cyrillic_IE,  322, 2,
+IBUS_KEY_Cyrillic_I,  324, 2,
+IBUS_KEY_Cyrillic_O,  326, 2,
+IBUS_KEY_Cyrillic_ER,  328, 2,
+IBUS_KEY_Cyrillic_U,  330, 2,
+IBUS_KEY_Cyrillic_a,  332, 2,
+IBUS_KEY_Cyrillic_ie,  334, 2,
+IBUS_KEY_Cyrillic_i,  336, 2,
+IBUS_KEY_Cyrillic_o,  338, 2,
+IBUS_KEY_Cyrillic_er,  340, 2,
+IBUS_KEY_Cyrillic_u,  342, 2,
+IBUS_KEY_Cyrillic_A,  344, 2,
+IBUS_KEY_Cyrillic_IE,  346, 2,
+IBUS_KEY_Cyrillic_I,  348, 2,
+IBUS_KEY_Cyrillic_O,  350, 2,
+IBUS_KEY_Cyrillic_ER,  352, 2,
+IBUS_KEY_Cyrillic_U,  354, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_J,  356, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_j,  358, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_a,  360, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ie,  362, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_i,  364, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_o,  366, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_er,  368, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_u,  370, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_A,  372, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_IE,  374, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_I,  376, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_O,  378, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_ER,  380, 2,
+IBUS_KEY_apostrophe, IBUS_KEY_Cyrillic_U,  382, 2,
+IBUS_KEY_F, IBUS_KEY_U,  384, 1,
+IBUS_KEY_J, IBUS_KEY_apostrophe,  385, 2,
+IBUS_KEY_J, IBUS_KEY_acute,  387, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_a,  389, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_ie,  391, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_i,  393, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_o,  395, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_er,  397, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_u,  399, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_A,  401, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_IE,  403, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_I,  405, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_O,  407, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_ER,  409, 2,
+IBUS_KEY_asciicircum, IBUS_KEY_Cyrillic_U,  411, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_a,  413, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_ie,  415, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_o,  417, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_er,  419, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_A,  421, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_IE,  423, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_O,  425, 2,
+IBUS_KEY_underscore, IBUS_KEY_Cyrillic_ER,  427, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_a,  429, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_o,  431, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_er,  433, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_u,  435, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_A,  437, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_O,  439, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_ER,  441, 2,
+IBUS_KEY_grave, IBUS_KEY_Cyrillic_U,  443, 2,
+IBUS_KEY_j, IBUS_KEY_apostrophe,  445, 2,
+IBUS_KEY_j, IBUS_KEY_acute,  447, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_a,  449, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_ie,  451, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_o,  453, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_er,  455, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_A,  457, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_IE,  459, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_O,  461, 2,
+IBUS_KEY_macron, IBUS_KEY_Cyrillic_ER,  463, 2,
+IBUS_KEY_acute, IBUS_KEY_J,  465, 2,
+IBUS_KEY_acute, IBUS_KEY_j,  467, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_a,  469, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_ie,  471, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_i,  473, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_o,  475, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_er,  477, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_u,  479, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_A,  481, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_IE,  483, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_I,  485, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_O,  487, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_ER,  489, 2,
+IBUS_KEY_acute, IBUS_KEY_Cyrillic_U,  491, 2,
+IBUS_KEY_backslash, IBUS_KEY_o, IBUS_KEY_slash,  493, 1,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_a,  494, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_ie,  496, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_i,  498, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_o,  500, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_er,  502, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_u,  504, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_A,  506, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_IE,  508, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_I,  510, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_O,  512, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_ER,  514, 2,
+IBUS_KEY_grave, IBUS_KEY_grave, IBUS_KEY_Cyrillic_U,  516, 2,
+IBUS_KEY_p, IBUS_KEY_o, IBUS_KEY_o,  518, 1,
+IBUS_KEY_L, IBUS_KEY_L, IBUS_KEY_A, IBUS_KEY_P,  519, 1,
+};
+
+static const guint32 gtk_compose_seqs_compact_32bit_second[] = {
+0x004D, 0x0300, 
+0x006D, 0x0300, 
+0x0186, 0x0300, 
+0x018E, 0x0300, 
+0x0190, 0x0300, 
+0x0196, 0x0300, 
+0x01B1, 0x0300, 
+0x01B2, 0x0300, 
+0x01DD, 0x0300, 
+0x0254, 0x0300, 
+0x025B, 0x0300, 
+0x0269, 0x0300, 
+0x028A, 0x0300, 
+0x028B, 0x0300, 
+0x014A, 0x0300, 
+0x0430, 0x0300, 
+0x043E, 0x0300, 
+0x0440, 0x0300, 
+0x0443, 0x0300, 
+0x0410, 0x0300, 
+0x041E, 0x0300, 
+0x0420, 0x0300, 
+0x0423, 0x0300, 
+0x0041, 0x0303, 0x0300, 
+0x0045, 0x0303, 0x0300, 
+0x0049, 0x0303, 0x0300, 
+0x004F, 0x0303, 0x0300, 
+0x0055, 0x0303, 0x0300, 
+0x0061, 0x0303, 0x0300, 
+0x0065, 0x0303, 0x0300, 
+0x0069, 0x0303, 0x0300, 
+0x006F, 0x0303, 0x0300, 
+0x0075, 0x0303, 0x0300, 
+0x0186, 0x0303, 0x0300, 
+0x018E, 0x0303, 0x0300, 
+0x0190, 0x0303, 0x0300, 
+0x01DD, 0x0303, 0x0300, 
+0x0254, 0x0303, 0x0300, 
+0x025B, 0x0303, 0x0300, 
+0x004A, 0x0301, 
+0x006A, 0x0301, 
+0x0186, 0x0301, 
+0x018E, 0x0301, 
+0x0190, 0x0301, 
+0x0196, 0x0301, 
+0x01B1, 0x0301, 
+0x01B2, 0x0301, 
+0x01DD, 0x0301, 
+0x0254, 0x0301, 
+0x025B, 0x0301, 
+0x0269, 0x0301, 
+0x028A, 0x0301, 
+0x028B, 0x0301, 
+0x014A, 0x0301, 
+0x0430, 0x0301, 
+0x0435, 0x0301, 
+0x0438, 0x0301, 
+0x043E, 0x0301, 
+0x0440, 0x0301, 
+0x0443, 0x0301, 
+0x0410, 0x0301, 
+0x0415, 0x0301, 
+0x0418, 0x0301, 
+0x041E, 0x0301, 
+0x0420, 0x0301, 
+0x0423, 0x0301, 
+0x0041, 0x0303, 0x0301, 
+0x0045, 0x0303, 0x0301, 
+0x0049, 0x0303, 0x0301, 
+0x0061, 0x0303, 0x0301, 
+0x0065, 0x0303, 0x0301, 
+0x0069, 0x0303, 0x0301, 
+0x0186, 0x0303, 0x0301, 
+0x018E, 0x0303, 0x0301, 
+0x0190, 0x0303, 0x0301, 
+0x01DD, 0x0303, 0x0301, 
+0x0254, 0x0303, 0x0301, 
+0x025B, 0x0303, 0x0301, 
+0x0186, 0x0302, 
+0x018E, 0x0302, 
+0x0190, 0x0302, 
+0x0196, 0x0302, 
+0x01B1, 0x0302, 
+0x01B2, 0x0302, 
+0x01DD, 0x0302, 
+0x0254, 0x0302, 
+0x025B, 0x0302, 
+0x0269, 0x0302, 
+0x028A, 0x0302, 
+0x028B, 0x0302, 
+0x0430, 0x0302, 
+0x0435, 0x0302, 
+0x0438, 0x0302, 
+0x043E, 0x0302, 
+0x0440, 0x0302, 
+0x0443, 0x0302, 
+0x0410, 0x0302, 
+0x0415, 0x0302, 
+0x0418, 0x0302, 
+0x041E, 0x0302, 
+0x0420, 0x0302, 
+0x0423, 0x0302, 
+0x0186, 0x0303, 
+0x018E, 0x0303, 
+0x0190, 0x0303, 
+0x01DD, 0x0303, 
+0x0254, 0x0303, 
+0x025B, 0x0303, 
+0x0186, 0x0304, 
+0x018E, 0x0304, 
+0x0190, 0x0304, 
+0x0196, 0x0304, 
+0x01B1, 0x0304, 
+0x01B2, 0x0304, 
+0x01DD, 0x0304, 
+0x0254, 0x0304, 
+0x025B, 0x0304, 
+0x0269, 0x0304, 
+0x028A, 0x0304, 
+0x028B, 0x0304, 
+0x0430, 0x0304, 
+0x0435, 0x0304, 
+0x043E, 0x0304, 
+0x0440, 0x0304, 
+0x0410, 0x0304, 
+0x0415, 0x0304, 
+0x041E, 0x0304, 
+0x0420, 0x0304, 
+0x0186, 0x030C, 
+0x018E, 0x030C, 
+0x0190, 0x030C, 
+0x0196, 0x030C, 
+0x01B1, 0x030C, 
+0x01B2, 0x030C, 
+0x01DD, 0x030C, 
+0x0254, 0x030C, 
+0x025B, 0x030C, 
+0x0269, 0x030C, 
+0x028A, 0x030C, 
+0x028B, 0x030C, 
+0x0430, 0x030F, 
+0x0435, 0x030F, 
+0x0438, 0x030F, 
+0x043E, 0x030F, 
+0x0440, 0x030F, 
+0x0443, 0x030F, 
+0x0410, 0x030F, 
+0x0415, 0x030F, 
+0x0418, 0x030F, 
+0x041E, 0x030F, 
+0x0420, 0x030F, 
+0x0423, 0x030F, 
+0x0430, 0x0311, 
+0x0435, 0x0311, 
+0x0438, 0x0311, 
+0x043E, 0x0311, 
+0x0440, 0x0311, 
+0x0443, 0x0311, 
+0x0410, 0x0311, 
+0x0415, 0x0311, 
+0x0418, 0x0311, 
+0x041E, 0x0311, 
+0x0420, 0x0311, 
+0x0423, 0x0311, 
+0x004A, 0x0301, 
+0x006A, 0x0301, 
+0x0430, 0x0301, 
+0x0435, 0x0301, 
+0x0438, 0x0301, 
+0x043E, 0x0301, 
+0x0440, 0x0301, 
+0x0443, 0x0301, 
+0x0410, 0x0301, 
+0x0415, 0x0301, 
+0x0418, 0x0301, 
+0x041E, 0x0301, 
+0x0420, 0x0301, 
+0x0423, 0x0301, 
+0x1F595, 
+0x004A, 0x0301, 
+0x004A, 0x0301, 
+0x0430, 0x0302, 
+0x0435, 0x0302, 
+0x0438, 0x0302, 
+0x043E, 0x0302, 
+0x0440, 0x0302, 
+0x0443, 0x0302, 
+0x0410, 0x0302, 
+0x0415, 0x0302, 
+0x0418, 0x0302, 
+0x041E, 0x0302, 
+0x0420, 0x0302, 
+0x0423, 0x0302, 
+0x0430, 0x0304, 
+0x0435, 0x0304, 
+0x043E, 0x0304, 
+0x0440, 0x0304, 
+0x0410, 0x0304, 
+0x0415, 0x0304, 
+0x041E, 0x0304, 
+0x0420, 0x0304, 
+0x0430, 0x0300, 
+0x043E, 0x0300, 
+0x0440, 0x0300, 
+0x0443, 0x0300, 
+0x0410, 0x0300, 
+0x041E, 0x0300, 
+0x0420, 0x0300, 
+0x0423, 0x0300, 
+0x006A, 0x0301, 
+0x006A, 0x0301, 
+0x0430, 0x0304, 
+0x0435, 0x0304, 
+0x043E, 0x0304, 
+0x0440, 0x0304, 
+0x0410, 0x0304, 
+0x0415, 0x0304, 
+0x041E, 0x0304, 
+0x0420, 0x0304, 
+0x004A, 0x0301, 
+0x006A, 0x0301, 
+0x0430, 0x0301, 
+0x0435, 0x0301, 
+0x0438, 0x0301, 
+0x043E, 0x0301, 
+0x0440, 0x0301, 
+0x0443, 0x0301, 
+0x0410, 0x0301, 
+0x0415, 0x0301, 
+0x0418, 0x0301, 
+0x041E, 0x0301, 
+0x0420, 0x0301, 
+0x0423, 0x0301, 
+0x1F64C, 
+0x0430, 0x030F, 
+0x0435, 0x030F, 
+0x0438, 0x030F, 
+0x043E, 0x030F, 
+0x0440, 0x030F, 
+0x0443, 0x030F, 
+0x0410, 0x030F, 
+0x0415, 0x030F, 
+0x0418, 0x030F, 
+0x041E, 0x030F, 
+0x0420, 0x030F, 
+0x0423, 0x030F, 
+0x1F4A9, 
+0x1F596, 
 };
 
 #endif /* __GTK_IM_CONTEXT_SIMPLE_SEQS_H__ */
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 8346df6d2..4bf892114 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,8 @@ G_BEGIN_DECLS
 
 typedef struct _IBusComposeTable IBusComposeTable;
 typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
+typedef struct _IBusComposeTableCompactEx IBusComposeTableCompactEx;
+typedef struct _IBusComposeTableCompactPrivate IBusComposeTableCompactPrivate;
 
 struct _IBusComposeTable
 {
@@ -47,6 +49,15 @@ struct _IBusComposeTableCompact
     gint n_index_stride;
 };
 
+struct _IBusComposeTableCompactEx
+{
+    const guint16 *data;
+    gint max_seq_len;
+    gint n_index_size;
+    gint n_index_stride;
+    IBusComposeTableCompactPrivate *priv;
+};
+
 IBusComposeTable *ibus_compose_table_new_with_file (const gchar *compose_file);
 GSList           *ibus_compose_table_list_add_array
                                                    (GSList
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 7615f121b..fa4ddf5f6 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014-2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -89,16 +89,36 @@ struct _IBusEngineSimplePrivate {
     gboolean            lookup_table_visible;
 };
 
+struct _IBusComposeTableCompactPrivate
+{
+    const guint32 *data2;
+};
+
 /* From the values below, the value 30 means the number of different first keysyms
  * that exist in the Compose file (from Xorg). When running compose-parse.py without
  * parameters, you get the count that you can put here. Needed when updating the
  * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
+ * Assign the value of "Number of different first items" of compose-parse.py
+ * to n_seqs in IBusComposeTableCompact
  */
-const IBusComposeTableCompact ibus_compose_table_compact = {
+const IBusComposeTableCompactPrivate ibus_compose_table_compact_32bit_priv = {
+    gtk_compose_seqs_compact_32bit_second
+};
+
+const IBusComposeTableCompactEx ibus_compose_table_compact = {
     gtk_compose_seqs_compact,
     5,
     30,
-    6
+    6,
+    NULL
+};
+
+const IBusComposeTableCompactEx ibus_compose_table_compact_32bit = {
+    gtk_compose_seqs_compact_32bit_first,
+    5,
+    9,
+    6,
+    &ibus_compose_table_compact_32bit_priv 
 };
 
 static GSList *global_tables;
@@ -320,12 +340,10 @@ ibus_engine_simple_commit_str (IBusEngineSimple *simple,
         priv->in_hex_sequence = FALSE;
         priv->tentative_match = 0;
         priv->tentative_match_len = 0;
-        ibus_engine_simple_update_preedit_text (simple);
     }
     if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
         g_clear_pointer (&priv->tentative_emoji, g_free);
-        ibus_engine_simple_update_preedit_text (simple);
     }
 
     ibus_engine_commit_text ((IBusEngine *)simple,
@@ -680,11 +698,11 @@ check_table (IBusEngineSimple       *simple,
 }
 
 gboolean
-ibus_check_compact_table (const IBusComposeTableCompact *table,
-                          guint16                       *compose_buffer,
-                          gint                           n_compose,
-                          gboolean                      *compose_finish,
-                          gunichar                      *output_char)
+ibus_check_compact_table (const IBusComposeTableCompactEx *table,
+                          guint16                         *compose_buffer,
+                          gint                             n_compose,
+                          gboolean                        *compose_finish,
+                          gunichar                       **output_chars)
 {
     gint row_stride;
     guint16 *seq_index;
@@ -693,8 +711,8 @@ ibus_check_compact_table (const IBusComposeTableCompact *table,
 
     if (compose_finish)
         *compose_finish = FALSE;
-    if (output_char)
-        *output_char = 0;
+    if (output_chars)
+        *output_chars = NULL;
 
     CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
 
@@ -730,41 +748,81 @@ ibus_check_compact_table (const IBusComposeTableCompact *table,
     // g_debug ("compact: %04x ", *seq_index);
     seq = NULL;
 
-    for (i = n_compose - 1; i < table->max_seq_len; i++) {
-        row_stride = i + 1;
+    if (table->priv) {
+        for (i = n_compose - 1; i < table->max_seq_len; i++) {
+            row_stride = i + 2;
 
-        if (seq_index[i + 1] - seq_index[i] > 0) {
-            seq = bsearch (compose_buffer + 1,
+            if (seq_index[i + 1] - seq_index[i] > 0) {
+                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) {
+                    if (i == n_compose - 1)
+                        break;
+                    else
+                        return TRUE;
+                }
+            }
+        }
+        if (!seq) {
+            return FALSE;
+        } else {
+            int index = seq[row_stride - 2];
+            int length = seq[row_stride - 1];
+            int j;
+            if (compose_finish)
+                *compose_finish = TRUE;
+            if (output_chars) {
+                *output_chars = g_new (gunichar, length + 1);
+                for (j = 0; j < length; j++)
+                    (*output_chars)[j] = table->priv->data2[index + j];
+                (*output_chars)[length] = 0;
+            }
 
-            if (seq) {
-                if (i == n_compose - 1)
-                    break;
-                else
-                    return TRUE;
+            // g_debug ("U+%04X\n", value);
+            return TRUE;
+        }
+    } else {
+        for (i = n_compose - 1; i < table->max_seq_len; i++) {
+            row_stride = i + 1;
+
+            if (seq_index[i + 1] - seq_index[i] > 0) {
+                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);
+
+                if (seq) {
+                    if (i == n_compose - 1)
+                        break;
+                    else
+                        return TRUE;
+                }
             }
         }
-    }
+        if (!seq) {
+            return FALSE;
+        } else {
+            if (compose_finish)
+                *compose_finish = TRUE;
+            if (output_chars) {
+                *output_chars = g_new (gunichar, 2);
+                (*output_chars)[0] = seq[row_stride - 1];
+                (*output_chars)[1] = 0;
+            }
 
-    if (!seq) {
-        // g_debug ("no\n");
-        return FALSE;
+            // g_debug ("U+%04X\n", value);
+            return TRUE;
+        }
     }
-    else {
-        if (compose_finish)
-            *compose_finish = TRUE;
-        if (output_char)
-            *output_char = seq[row_stride - 1];
 
-        // g_debug ("U+%04X\n", value);
-        return TRUE;
-    }
+    g_assert_not_reached ();
 }
 
+
 /* Checks if a keysym is a dead key. Dead key keysym values are defined in
  * ../gdk/gdkkeysyms.h and the first is GDK_KEY_dead_grave. As X.Org is updated,
  * more dead keys are added and we need to update the upper limit.
@@ -949,8 +1007,8 @@ no_sequence_matches (IBusEngineSimple *simple,
                 (IBusEngine *)simple, keyval, keycode, modifiers);
     } else if (priv->tentative_emoji && *priv->tentative_emoji) {
         ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
-        g_clear_pointer (&priv->tentative_emoji, g_free);
         priv->compose_buffer[0] = 0;
+        ibus_engine_simple_update_preedit_text (simple);
     } else {
         priv->compose_buffer[0] = 0;
         if (n_compose > 1) {
@@ -1083,6 +1141,9 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
     IBusEngineSimplePrivate *priv = simple->priv;
     gboolean compose_finish;
     gunichar output_char;
+    gunichar *output_chars = NULL;
+    gchar *output_str = NULL;
+    GError *error = NULL;
     GSList *list = global_tables;
 
     while (list) {
@@ -1098,15 +1159,37 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
                                   priv->compose_buffer,
                                   n_compose,
                                   &compose_finish,
-                                  &output_char)) {
+                                  &output_chars)) {
         if (compose_finish) {
-            ibus_engine_simple_commit_char (simple, output_char);
+            ibus_engine_simple_commit_char (simple, *output_chars);
+            g_free (output_chars);
             priv->compose_buffer[0] = 0;
         }
         ibus_engine_simple_update_preedit_text (simple);
         return TRUE;
     }
-
+    if (ibus_check_compact_table (&ibus_compose_table_compact_32bit,
+                                  priv->compose_buffer,
+                                  n_compose,
+                                  &compose_finish,
+                                  &output_chars)) {
+        if (compose_finish) {
+            output_str = g_ucs4_to_utf8 (output_chars, -1, NULL, NULL, &error);
+            if (output_str) {
+                ibus_engine_simple_commit_str (simple, output_str);
+                g_free (output_str);
+                g_free (output_chars);
+            } else {
+                g_warning ("Failed to output multiple characters: %s",
+                           error->message);
+                g_error_free (error);
+            }
+            priv->compose_buffer[0] = 0;
+        }
+        
+        ibus_engine_simple_update_preedit_text (simple);
+        return TRUE;
+    }
     if (ibus_check_algorithmically (priv->compose_buffer,
                                     n_compose,
                                     &output_char)) {
@@ -1177,7 +1260,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             (keyval == IBUS_KEY_Control_L || keyval == IBUS_KEY_Control_R)) {
             if (priv->tentative_emoji && *priv->tentative_emoji) {
                 ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
-                g_clear_pointer (&priv->tentative_emoji, g_free);
+                priv->compose_buffer[0] = 0;
+                ibus_engine_simple_update_preedit_text (simple);
             } else if (n_compose == 0) {
                 priv->modifiers_dropped = TRUE;
             } else {
@@ -1335,7 +1419,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     if (priv->in_emoji_sequence && have_hex_mods && is_emoji_start) {
         if (priv->tentative_emoji && *priv->tentative_emoji) {
             ibus_engine_simple_commit_str (simple, priv->tentative_emoji);
-            g_clear_pointer (&priv->tentative_emoji, g_free);
+            priv->compose_buffer[0] = 0;
+            ibus_engine_simple_update_preedit_text (simple);
         }
         else {
             if (n_compose > 0) {
@@ -1531,6 +1616,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
                     ibus_engine_simple_commit_str (simple,
                             priv->tentative_emoji);
                     priv->compose_buffer[0] = 0;
+                    ibus_engine_simple_update_preedit_text (simple);
                 } else {
                     g_clear_pointer (&priv->tentative_emoji, g_free);
                     priv->in_emoji_sequence = FALSE;
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index cac404b11..c86c53244 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -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) 2016 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,17 +26,17 @@
 
 G_BEGIN_DECLS
 
-extern const IBusComposeTableCompact ibus_compose_table_compact;
+extern const IBusComposeTableCompactEx ibus_compose_table_compact;
 
 gboolean ibus_check_algorithmically (const guint16              *compose_buffer,
                                      gint                        n_compose,
                                      gunichar                   *output);
-gboolean ibus_check_compact_table   (const IBusComposeTableCompact
+gboolean ibus_check_compact_table   (const IBusComposeTableCompactEx
                                                                 *table,
                                      guint16                    *compose_buffer,
                                      gint                        n_compose,
                                      gboolean                   *compose_finish,
-                                     gunichar                   *output_char);
+                                     gunichar                  **output_chars);
 
 G_END_DECLS
 

From 5b6ad433f79c2e4781688d4985a15836d81f0a72 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 24 May 2019 14:34:05 +0900
Subject: [PATCH 560/816] src: Enable multiple compose output and long key
 sequences in user comopse

Curently the max key sequences of user compose keys depends on the
max key sequences of system compose keys, IBUS_MAX_COMPOSE_LEN.
This change will have the max key sequences by user compose table
and also will separate the user compose table with 16bit compose table
and 32bit one to follow another change of system compose table to be able
to output multiple compose outputs and 32bit compose ones likes emoji
charaters.

BUG=https://github.com/ibus/ibus/issues/1990
---
 src/ibuscomposetable.c        | 639 ++++++++++++++++++++++------------
 src/ibuscomposetable.h        |  20 +-
 src/ibusenginesimple.c        |  87 +++--
 src/ibusenginesimple.h        |   4 +-
 src/ibusenginesimpleprivate.h |   9 +
 5 files changed, 512 insertions(+), 247 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 1c0ece412..4ac54e25d 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -35,22 +35,25 @@
 #include "ibusenginesimpleprivate.h"
 
 #define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
-#define IBUS_COMPOSE_TABLE_VERSION (2)
+#define IBUS_COMPOSE_TABLE_VERSION (3)
 
 typedef struct {
   gunichar     *sequence;
-  gunichar      value[2];
+  gunichar     *values;
   gchar        *comment;
 } IBusComposeData;
 
+
 static void
 ibus_compose_data_free (IBusComposeData *compose_data)
 {
     g_free (compose_data->sequence);
+    g_free (compose_data->values);
     g_free (compose_data->comment);
     g_slice_free (IBusComposeData, compose_data);
 }
 
+
 static void
 ibus_compose_list_element_free (IBusComposeData *compose_data,
                                 gpointer         data)
@@ -58,6 +61,18 @@ ibus_compose_list_element_free (IBusComposeData *compose_data,
     ibus_compose_data_free (compose_data);
 }
 
+
+static guint
+unichar_length (gunichar *uni_array)
+{
+    guint i = 0;
+    g_return_val_if_fail (uni_array, 0);
+    while (uni_array[i])
+        ++i;
+    return i;
+}
+
+
 static gboolean
 is_codepoint (const gchar *str)
 {
@@ -75,63 +90,85 @@ is_codepoint (const gchar *str)
     return TRUE;
 }
 
+
 static gboolean
 parse_compose_value (IBusComposeData  *compose_data,
                      const gchar      *val,
                      const gchar      *line)
 {
-    gchar **words = g_strsplit (val, "\"", 3);
-    gunichar uch;
+    gchar *head, *end, *p;
+    gchar *ustr = NULL;
+    gunichar *uchars = NULL, *up;
+    GError *error = NULL;
+    int n_uchars = 0;
 
-    if (g_strv_length (words) < 3) {
+    if (!(head = strchr (val, '\"'))) {
         g_warning ("Need to double-quote the value: %s: %s", val, line);
         goto fail;
     }
-
-    uch = g_utf8_get_char (words[1]);
-
-    if (uch == 0) {
-        g_warning ("Invalid value: %s: %s", val, line);
+    ++head;
+    p = head;
+    while ((*p != '\0') && (end = strchr (p, '\"'))) {
+        if (*(end - 1) == '\\' && *(end - 2) == '\\')
+            break;
+        if (*(end - 1) != '\\')
+            break;
+        p = end + 1;
+    }
+    if (end == NULL || *p == '\0') {
+        g_warning ("Need to double-quote the value: %s: %s", val, line);
         goto fail;
     }
-    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, NULL, 8);
-        /* If we need to handle other escape sequences. */
-        } else if (uch != '\\') {
-            g_warning ("Invalid backslash: %s: %s", val, line);
+    ustr = g_strndup (head, end - head);
+    p = ustr + 1;
+    /* The escaped octal */
+    if (*ustr == '\\' && *p >= '0' && *p <= '8') {
+        compose_data->values = g_new (gunichar, 2);
+        compose_data->values[0] = g_ascii_strtoll(p, NULL, 8);
+        compose_data->values[1] = 0;
+    } else {
+        if (!(uchars = g_utf8_to_ucs4 (ustr, -1, NULL, NULL, &error)) ||
+            !uchars[0]) {
+            g_warning ("Invalid Unicode: %s: %s in %s:",
+                       error->message, ustr, line);
+            g_error_free (error);
             goto fail;
         }
-    }
 
-    if (g_utf8_get_char (g_utf8_next_char (words[1])) > 0) {
-        g_warning ("GTK+ supports to output one char only: %s: %s", val, line);
-        goto fail;
+        for (up = uchars; *up; up++) {
+            if (*up == '\\') {
+                ++up;
+                if (*up != '"' && *up != '\\') {
+                    g_warning ("Invalid backslash: %s: %s", val, line);
+                    goto fail;
+                }
+            }
+            if (!compose_data->values) {
+                compose_data->values = g_new (gunichar, 2);
+            } else {
+                compose_data->values = g_renew (gunichar,
+                                                compose_data->values,
+                                                n_uchars + 1);
+            }
+            compose_data->values[n_uchars++] = *up;
+        }
+        compose_data->values[n_uchars] = 0;
     }
 
-    compose_data->value[1] = uch;
-
-    if (uch == '"')
-        compose_data->comment = g_strdup (g_strstrip (words[2] + 1));
-    else
-        compose_data->comment = g_strdup (g_strstrip (words[2]));
-
-    g_strfreev (words);
+    g_free (ustr);
+    g_free (uchars);
+    compose_data->comment = g_strdup (g_strstrip (end + 1));
 
     return TRUE;
 
 fail:
-    g_strfreev (words);
+    g_free (ustr);
+    g_free (uchars);
     return FALSE;
 }
 
-static gboolean
+
+static int
 parse_compose_sequence (IBusComposeData *compose_data,
                         const gchar     *seq,
                         const gchar     *line)
@@ -161,20 +198,20 @@ parse_compose_sequence (IBusComposeData *compose_data,
 
         match = g_strndup (start, end - start);
 
-        if (compose_data->sequence == NULL)
-            compose_data->sequence = g_malloc (sizeof (gunichar) * 2);
-        else
-            compose_data->sequence = g_realloc (compose_data->sequence,
-                                                sizeof (gunichar) * (n + 2));
+        if (compose_data->sequence == NULL) {
+            compose_data->sequence = g_new (gunichar, 2);
+        } else {
+            compose_data->sequence = g_renew (gunichar,
+                                              compose_data->sequence,
+                                              n + 2);
+        }
 
         if (is_codepoint (match)) {
             codepoint = (gunichar) g_ascii_strtoll (match + 1, NULL, 16);
             compose_data->sequence[n] = codepoint;
-            compose_data->sequence[n + 1] = 0;
         } else {
             codepoint = (gunichar) ibus_keyval_from_name (match);
             compose_data->sequence[n] = codepoint;
-            compose_data->sequence[n + 1] = 0;
         }
 
         if (codepoint == IBUS_KEY_VoidSymbol)
@@ -182,27 +219,35 @@ parse_compose_sequence (IBusComposeData *compose_data,
         g_free (match);
         n++;
     }
+    if (compose_data->sequence)
+        compose_data->sequence[n] = 0;
 
     g_strfreev (words);
     if (0 == n || n >= IBUS_MAX_COMPOSE_LEN) {
         g_warning ("The max number of sequences is %d: %s",
                    IBUS_MAX_COMPOSE_LEN, line);
-        return FALSE;
+        return -1;
     }
 
-    return TRUE;
+    return n;
 
 fail:
     g_strfreev (words);
-    return FALSE;
+    return -1;
 }
 
+
 static void
 parse_compose_line (GList       **compose_list,
-                    const gchar  *line)
+                    const gchar  *line,
+                    int          *compose_len)
 {
     gchar **components = NULL;
     IBusComposeData *compose_data = NULL;
+    int l;
+
+    g_assert (compose_len);
+    *compose_len = 0;
 
     if (line[0] == '\0' || line[0] == '#')
         return;
@@ -219,11 +264,12 @@ parse_compose_line (GList       **compose_list,
 
     compose_data = g_slice_new0 (IBusComposeData);
 
-    if (!parse_compose_sequence (compose_data,
-                                 g_strstrip (components[0]),
-                                 line)) {
+    if ((l = parse_compose_sequence (compose_data,
+                                     g_strstrip (components[0]),
+                                     line)) < 1) {
         goto fail;
     }
+    *compose_len = l;
 
     if (!parse_compose_value (compose_data, g_strstrip (components[1]), line))
         goto fail;
@@ -240,16 +286,21 @@ parse_compose_line (GList       **compose_list,
         ibus_compose_data_free (compose_data);
 }
 
+
 static GList *
-ibus_compose_list_parse_file (const gchar *compose_file)
+ibus_compose_list_parse_file (const gchar *compose_file,
+                              int         *max_compose_len)
 {
     gchar *contents = NULL;
     gchar **lines = NULL;
     gsize length = 0;
     GError *error = NULL;
     GList *compose_list = NULL;
+    int compose_len = 0;
     int i;
 
+    g_assert (max_compose_len);
+
     if (!g_file_get_contents (compose_file, &contents, &length, &error)) {
         g_error ("%s", error->message);
         g_error_free (error);
@@ -258,33 +309,43 @@ ibus_compose_list_parse_file (const gchar *compose_file)
 
     lines = g_strsplit (contents, "\n", -1);
     g_free (contents);
-    for (i = 0; lines[i] != NULL; i++)
-        parse_compose_line (&compose_list, lines[i]);
+    for (i = 0; lines[i] != NULL; i++) {
+        parse_compose_line (&compose_list, lines[i], &compose_len);
+        if (*max_compose_len < compose_len)
+            *max_compose_len = compose_len;
+    }
     g_strfreev (lines);
 
     return compose_list;
 }
 
+
 static GList *
-ibus_compose_list_check_duplicated (GList *compose_list)
+ibus_compose_list_check_duplicated (GList *compose_list,
+                                    int    max_compose_len)
 {
     GList *list;
+    static guint16 *keysyms;
     GList *removed_list = NULL;
     IBusComposeData *compose_data;
+    gboolean is_32bit;
+
+    keysyms = g_new (guint16, max_compose_len + 1);
 
     for (list = compose_list; list != NULL; list = list->next) {
-        static guint16 keysyms[IBUS_MAX_COMPOSE_LEN + 1];
         int i;
         int n_compose = 0;
         gboolean compose_finish;
-        gunichar output_char;
+        gunichar *output_chars = NULL;
+        gunichar output_char = 0;
+        guint n_outputs;
 
         compose_data = list->data;
 
-        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++)
+        for (i = 0; i < max_compose_len + 1; i++)
             keysyms[i] = 0;
 
-        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++) {
+        for (i = 0; i < max_compose_len + 1; i++) {
             gunichar codepoint = compose_data->sequence[i];
             keysyms[i] = (guint16) codepoint;
 
@@ -294,18 +355,41 @@ ibus_compose_list_check_duplicated (GList *compose_list)
             n_compose++;
         }
 
-        if (ibus_check_compact_table (&ibus_compose_table_compact,
+        n_outputs = unichar_length (compose_data->values);
+        is_32bit = (n_outputs > 1) ? TRUE :
+                (compose_data->values[0] >= 0xFFFF) ? TRUE : FALSE;
+        if (!is_32bit &&
+            ibus_check_compact_table (&ibus_compose_table_compact,
                                       keysyms,
                                       n_compose,
                                       &compose_finish,
-                                      &output_char) && compose_finish) {
-            if (compose_data->value[1] == output_char)
+                                      &output_chars) && compose_finish) {
+            if (compose_data->values[0] == *output_chars)
                 removed_list = g_list_append (removed_list, compose_data);
+            g_free (output_chars);
+        } else if (is_32bit &&
+                   ibus_check_compact_table (&ibus_compose_table_compact_32bit,
+                                             keysyms,
+                                             n_compose,
+                                             &compose_finish,
+                                             &output_chars) && compose_finish) {
+            
+            if (n_outputs == unichar_length (output_chars)) {
+                int j = 0;
+                while (compose_data->values[j] && j < n_outputs) {
+                    if (compose_data->values[j] != output_chars[j])
+                        break;
+                    ++j;
+                }
+                if (j == n_outputs)
+                    removed_list = g_list_append (removed_list, compose_data);
+            }
+            g_free (output_chars);
 
         } else if (ibus_check_algorithmically (keysyms,
                                                n_compose,
                                                &output_char)) {
-            if (compose_data->value[1] == output_char)
+            if (compose_data->values[0] == output_char)
                 removed_list = g_list_append (removed_list, compose_data);
         }
     }
@@ -317,85 +401,11 @@ ibus_compose_list_check_duplicated (GList *compose_list)
     }
 
     g_list_free (removed_list);
+    g_free (keysyms);
 
     return compose_list;
 }
 
-static GList *
-ibus_compose_list_check_uint16 (GList *compose_list)
-{
-    GList *list;
-    GList *removed_list = NULL;
-    IBusComposeData *compose_data;
-
-    for (list = compose_list; list != NULL; list = list->next) {
-        int i;
-
-        compose_data = list->data;
-        for (i = 0; i < IBUS_MAX_COMPOSE_LEN; i++) {
-            gunichar codepoint = compose_data->sequence[i];
-
-            if (codepoint == 0)
-                break;
-
-            if (codepoint > 0xffff) {
-                removed_list = g_list_append (removed_list, compose_data);
-                break;
-            }
-        }
-    }
-
-    for (list = removed_list; list != NULL; list = list->next) {
-        compose_data = list->data;
-        compose_list = g_list_remove (compose_list, compose_data);
-        ibus_compose_data_free (compose_data);
-    }
-
-    g_list_free (removed_list);
-
-    return compose_list;
-}
-
-static GList *
-ibus_compose_list_format_for_gtk (GList *compose_list,
-                                  int   *p_max_compose_len,
-                                  int   *p_n_index_stride)
-{
-    GList *list;
-    IBusComposeData *compose_data;
-    int max_compose_len = 0;
-    int i;
-    gunichar codepoint;
-
-    for (list = compose_list; list != NULL; list = list->next) {
-        compose_data = list->data;
-
-        for (i = 0; i < IBUS_MAX_COMPOSE_LEN + 1; i++) {
-            codepoint = compose_data->sequence[i];
-            if (codepoint == 0) {
-                if (max_compose_len < i)
-                    max_compose_len = i;
-                break;
-            }
-        }
-    }
-
-    if (p_max_compose_len)
-        *p_max_compose_len = max_compose_len;
-    if (p_n_index_stride)
-        *p_n_index_stride = max_compose_len + 2;
-
-    for (list = compose_list; list != NULL; list = list->next) {
-        compose_data = list->data;
-        codepoint = compose_data->value[1];
-        if (codepoint > 0xffff) {
-            compose_data->value[0] = codepoint / 0x10000;
-            compose_data->value[1] = codepoint - codepoint / 0x10000 * 0x10000;
-        }
-    }
-
-    return compose_list;
-}
 
 static gint
 ibus_compose_data_compare (gpointer a,
@@ -416,6 +426,7 @@ ibus_compose_data_compare (gpointer a,
     return 0;
 }
 
+
 static void
 ibus_compose_list_print (GList *compose_list,
                          int    max_compose_len,
@@ -425,9 +436,6 @@ ibus_compose_list_print (GList *compose_list,
     int i, j;
     IBusComposeData *compose_data;
     int total_size = 0;
-    gunichar upper;
-    gunichar lower;
-    const gchar *comment;
     const gchar *keyval;
 
     for (list = compose_list; list != NULL; list = list->next) {
@@ -452,14 +460,10 @@ ibus_compose_list_print (GList *compose_list,
             else
                 g_printf ("%s, ", keyval ? keyval : "(null)");
         }
-        upper = compose_data->value[0];
-        lower = compose_data->value[1];
-        comment = compose_data->comment;
-
-        if (list == g_list_last (compose_list))
-            g_printf ("    %#06X, %#06X  /* %s */\n", upper, lower, comment);
-        else
-            g_printf ("    %#06X, %#06X, /* %s */\n", upper, lower, comment);
+        g_printf ("    ");
+        for (i = 0; compose_data->values[i]; ++i)
+            g_printf ("%#06X, ", compose_data->values[i]);
+        g_printf (" /* %s */,\n", compose_data->comment);
 
         total_size += n_index_stride;
     }
@@ -468,6 +472,7 @@ ibus_compose_list_print (GList *compose_list,
                 total_size, max_compose_len, n_index_stride);
 }
 
+
 /* Implemented from g_str_hash() */
 static guint32
 ibus_compose_table_data_hash (gconstpointer v,
@@ -487,6 +492,7 @@ ibus_compose_table_data_hash (gconstpointer v,
     return h;
 }
 
+
 static gchar *
 ibus_compose_hash_get_cache_path (guint32 hash)
 {
@@ -511,67 +517,151 @@ ibus_compose_hash_get_cache_path (guint32 hash)
     return path;
 }
 
+
 static GVariant *
-ibus_compose_table_serialize (IBusComposeTable *compose_table)
+ibus_compose_table_serialize (IBusComposeTableEx *compose_table)
 {
     const gchar *header = IBUS_COMPOSE_TABLE_MAGIC;
     const guint16 version = IBUS_COMPOSE_TABLE_VERSION;
     guint16 max_seq_len;
     guint16 index_stride;
     guint16 n_seqs;
-    GVariant *variant_data;
+    guint16 n_seqs_32bit = 0;
+    guint16 second_size = 0;
+    GVariant *variant_data = NULL;
+    GVariant *variant_data_32bit_first = NULL;
+    GVariant *variant_data_32bit_second = NULL;
     GVariant *variant_table;
 
     g_return_val_if_fail (compose_table != NULL, NULL);
-    g_return_val_if_fail (compose_table->data != NULL, NULL);
 
     max_seq_len = compose_table->max_seq_len;
     index_stride = max_seq_len + 2;
     n_seqs = compose_table->n_seqs;
 
-    g_return_val_if_fail (max_seq_len > 0, NULL);
-    g_return_val_if_fail (n_seqs > 0, NULL);
+    g_return_val_if_fail (max_seq_len, NULL);
 
-    variant_data = g_variant_new_fixed_array (G_VARIANT_TYPE_UINT16,
-                                              compose_table->data,
-                                              (gsize)index_stride * n_seqs,
-                                              sizeof (guint16));
-    if (variant_data == NULL) {
-        g_warning ("Could not change compose data to GVariant.");
-        return NULL;
+    if (n_seqs) {
+        g_return_val_if_fail (compose_table->data, NULL);
+
+        variant_data = g_variant_new_fixed_array (G_VARIANT_TYPE_UINT16,
+                                                  compose_table->data,
+                                                  (gsize)index_stride * n_seqs,
+                                                  sizeof (guint16));
+        if (!variant_data) {
+            g_warning ("Could not change compose data to GVariant.");
+            return NULL;
+        }
+    } else {
+        variant_data = g_variant_new_fixed_array (
+                G_VARIANT_TYPE_UINT16,
+                NULL,
+                0,
+                sizeof (guint16));
+        g_assert (variant_data);
+    }
+    if (compose_table->priv) {
+        n_seqs_32bit = compose_table->priv->first_n_seqs;
+        second_size = compose_table->priv->second_size;
+    }
+    if (!n_seqs && !n_seqs_32bit) {
+        g_warning ("ComposeTable has not key sequences.");
+        goto out_serialize;
+    } else if (n_seqs_32bit && !second_size) {
+        g_warning ("Compose key sequences are loaded but the values could " \
+                   "not be loaded.");
+        goto out_serialize;
+    } else if (!n_seqs_32bit && second_size) {
+        g_warning ("Compose values are loaded but the key sequences could " \
+                   "not be loaded.");
+        goto out_serialize;
+    } else if (n_seqs_32bit && second_size) {
+        if (!compose_table->priv->data_first) {
+            g_warning ("data_first is NULL");
+            goto out_serialize;
+        }
+        if (!compose_table->priv->data_second) {
+            g_warning ("data_second is NULL");
+            goto out_serialize;
+        }
+        variant_data_32bit_first = g_variant_new_fixed_array (
+                G_VARIANT_TYPE_UINT16,
+                compose_table->priv->data_first,
+                (gsize)index_stride * n_seqs_32bit,
+                sizeof (guint16));
+        variant_data_32bit_second = g_variant_new_fixed_array (
+                G_VARIANT_TYPE_UINT32,
+                compose_table->priv->data_second,
+                compose_table->priv->second_size,
+                sizeof (guint32));
+        if (!variant_data_32bit_first || !variant_data_32bit_second) {
+            g_warning ("Could not change 32bit compose data to GVariant.");
+            goto out_serialize;
+        }
+    } else {
+        variant_data_32bit_first = g_variant_new_fixed_array (
+                G_VARIANT_TYPE_UINT16,
+                NULL,
+                0,
+                sizeof (guint16));
+        variant_data_32bit_second = g_variant_new_fixed_array (
+                G_VARIANT_TYPE_UINT32,
+                NULL,
+                0,
+                sizeof (guint32));
+        g_assert (variant_data_32bit_first && variant_data_32bit_second);
     }
-    variant_table = g_variant_new ("(sqqqv)",
+    variant_table = g_variant_new ("(sqqqqqvvv)",
                                    header,
                                    version,
                                    max_seq_len,
                                    n_seqs,
-                                   variant_data);
+                                   n_seqs_32bit,
+                                   second_size,
+                                   variant_data,
+                                   variant_data_32bit_first,
+                                   variant_data_32bit_second);
     return g_variant_ref_sink (variant_table);
+
+out_serialize:
+    g_clear_pointer (&variant_data, g_variant_unref);
+    g_clear_pointer (&variant_data_32bit_first, g_variant_unref);
+    g_clear_pointer (&variant_data_32bit_second, g_variant_unref);
+    return NULL;
 }
 
+
 static gint
 ibus_compose_table_find (gconstpointer data1,
                          gconstpointer data2)
 {
-    const IBusComposeTable *compose_table = (const IBusComposeTable *) data1;
+    const IBusComposeTableEx *compose_table =
+            (const IBusComposeTableEx *) data1;
     guint32 hash = (guint32) GPOINTER_TO_INT (data2);
     return compose_table->id != hash;
 }
 
-static IBusComposeTable *
+
+static IBusComposeTableEx *
 ibus_compose_table_deserialize (const gchar *contents,
                                 gsize        length)
 {
-    IBusComposeTable *retval = NULL;
+    IBusComposeTableEx *retval = NULL;
     GVariantType *type;
     GVariant *variant_data = NULL;
+    GVariant *variant_data_32bit_first = NULL;
+    GVariant *variant_data_32bit_second = NULL;
     GVariant *variant_table = NULL;
     const gchar *header = NULL;
     guint16 version = 0;
     guint16 max_seq_len = 0;
     guint16 n_seqs = 0;
+    guint16 n_seqs_32bit = 0;
+    guint16 second_size = 0;
     guint16 index_stride;
     gconstpointer data = NULL;
+    gconstpointer data_32bit_first = NULL;
+    gconstpointer data_32bit_second = NULL;
     gsize data_length = 0;
 
     g_return_val_if_fail (contents != NULL, NULL);
@@ -587,7 +677,7 @@ ibus_compose_table_deserialize (const gchar *contents,
                                              NULL);
     g_variant_type_free (type);
 
-    if (variant_table == NULL) {
+    if (!variant_table) {
         g_warning ("cache is broken.");
         goto out_load_cache;
     }
@@ -611,7 +701,7 @@ ibus_compose_table_deserialize (const gchar *contents,
     g_variant_unref (variant_table);
     variant_table = NULL;
 
-    type = g_variant_type_new ("(sqqqv)");
+    type = g_variant_type_new ("(sqqqqqvvv)");
     variant_table = g_variant_new_from_data (type,
                                              contents,
                                              length,
@@ -620,58 +710,117 @@ ibus_compose_table_deserialize (const gchar *contents,
                                              NULL);
     g_variant_type_free (type);
 
-    if (variant_table == NULL) {
+    if (!variant_table) {
         g_warning ("cache is broken.");
         goto out_load_cache;
     }
 
     g_variant_ref_sink (variant_table);
-    g_variant_get (variant_table, "(&sqqqv)",
+    g_variant_get (variant_table, "(&sqqqqqvvv)",
                    NULL,
                    NULL,
                    &max_seq_len,
                    &n_seqs,
-                   &variant_data);
-
-    if (max_seq_len == 0 || n_seqs == 0) {
-        g_warning ("cache size is not correct %d %d", max_seq_len, n_seqs);
+                   &n_seqs_32bit,
+                   &second_size,
+                   &variant_data,
+                   &variant_data_32bit_first,
+                   &variant_data_32bit_second);
+
+    if (max_seq_len == 0 || (n_seqs == 0 && n_seqs_32bit == 0)) {
+        g_warning ("cache size is not correct %d %d %d",
+                   max_seq_len, n_seqs, n_seqs_32bit);
         goto out_load_cache;
     }
 
-    data = g_variant_get_fixed_array (variant_data,
-                                      &data_length,
-                                      sizeof (guint16));
+    if (n_seqs && variant_data) {
+        data = g_variant_get_fixed_array (variant_data,
+                                          &data_length,
+                                          sizeof (guint16));
+    }
     index_stride = max_seq_len + 2;
 
-    if (data == NULL) {
-        g_warning ("cache data is null.");
-        goto out_load_cache;
-    }
-    if (data_length != (gsize) index_stride * n_seqs) {
+    if (data_length != (gsize)index_stride * n_seqs) {
         g_warning ("cache size is not correct %d %d %lu",
                    max_seq_len, n_seqs, data_length);
         goto out_load_cache;
     }
 
-    retval = g_new0 (IBusComposeTable, 1);
-    retval->data = g_new (guint16, data_length);
-    memcpy (retval->data, data, data_length * sizeof (guint16));
+    retval = g_new0 (IBusComposeTableEx, 1);
+    if (data_length) {
+        retval->data = g_new (guint16, data_length);
+        memcpy (retval->data, data, data_length * sizeof (guint16));
+    }
     retval->max_seq_len = max_seq_len;
     retval->n_seqs = n_seqs;
 
+    if (n_seqs_32bit && !second_size) {
+        g_warning ("32bit key sequences are loaded but the values " \
+                   "could not be loaded.");
+        goto out_load_cache;
+    }
+    if (!n_seqs_32bit && second_size) {
+        g_warning ("32bit key sequences could not loaded but the values " \
+                   "are loaded.");
+        goto out_load_cache;
+    }
+
+    data_length = 0;
+    if (n_seqs_32bit && variant_data_32bit_first) {
+        data_32bit_first = g_variant_get_fixed_array (variant_data_32bit_first,
+                                                      &data_length,
+                                                      sizeof (guint16));
+        if (data_length != (gsize) index_stride * n_seqs_32bit) {
+            g_warning ("32bit cache size is not correct %d %d %lu",
+                       max_seq_len, n_seqs_32bit, data_length);
+            goto out_load_cache;
+        }
+    }
+    if (!data && !data_32bit_first) {
+        g_warning ("cache data is null.");
+        goto out_load_cache;
+    }
+    if (data_length) {
+        retval->priv = g_new0 (IBusComposeTablePrivate, 1);
+        retval->priv->data_first = g_new (guint16, data_length);
+        memcpy (retval->priv->data_first,
+                data_32bit_first, data_length * sizeof (guint16));
+        retval->priv->first_n_seqs = n_seqs_32bit;
+    }
+
+    data_length = 0;
+    if (second_size && variant_data_32bit_second) {
+        data_32bit_second = g_variant_get_fixed_array (
+                variant_data_32bit_second,
+                &data_length,
+                sizeof (guint32));
+        if (data_length != (gsize) second_size) {
+            g_warning ("32bit cache size is not correct %d %d",
+                       max_seq_len, second_size);
+            goto out_load_cache;
+        }
+    }
+    if (data_length) {
+        retval->priv->data_second = g_new (guint32, data_length);
+        memcpy (retval->priv->data_second,
+                data_32bit_second, data_length * sizeof (guint32));
+        retval->priv->second_size = second_size;
+    }
+
 
 out_load_cache:
-    if (variant_data)
-        g_variant_unref (variant_data);
-    if (variant_table)
-        g_variant_unref (variant_table);
+    g_clear_pointer (&variant_data, g_variant_unref);
+    g_clear_pointer (&variant_data_32bit_first, g_variant_unref);
+    g_clear_pointer (&variant_data_32bit_second, g_variant_unref);
+    g_clear_pointer (&variant_table, g_variant_unref);
     return retval;
 }
 
-static IBusComposeTable *
+
+static IBusComposeTableEx *
 ibus_compose_table_load_cache (const gchar *compose_file)
 {
-    IBusComposeTable *retval = NULL;
+    IBusComposeTableEx *retval = NULL;
     guint32 hash;
     gchar *path = NULL;
     gchar *contents = NULL;
@@ -712,8 +861,9 @@ ibus_compose_table_load_cache (const gchar *compose_file)
     return retval;
 }
 
+
 static void
-ibus_compose_table_save_cache (IBusComposeTable *compose_table)
+ibus_compose_table_save_cache (IBusComposeTableEx *compose_table)
 {
     gchar *path = NULL;
     GVariant *variant_table = NULL;
@@ -742,67 +892,119 @@ ibus_compose_table_save_cache (IBusComposeTable *compose_table)
     g_free (path);
 }
 
-static IBusComposeTable *
+
+static IBusComposeTableEx *
 ibus_compose_table_new_with_list (GList   *compose_list,
                                   int      max_compose_len,
                                   int      n_index_stride,
                                   guint32  hash)
 {
-    guint length;
-    guint n = 0;
+    gsize s_size_total, s_size_16bit, v_size_32bit, v_index_32bit;
+    guint n = 0, m = 0;
     int i, j;
     guint16 *ibus_compose_seqs = NULL;
+    guint16 *ibus_compose_seqs_32bit_first = NULL;
+    guint32 *ibus_compose_seqs_32bit_second = NULL;
     GList *list;
-    IBusComposeData *compose_data;
-    IBusComposeTable *retval = NULL;
+    IBusComposeData *compose_data = NULL;
+    IBusComposeTableEx *retval = NULL;
 
     g_return_val_if_fail (compose_list != NULL, NULL);
 
-    length = g_list_length (compose_list);
+    s_size_total = g_list_length (compose_list);
+    s_size_16bit = s_size_total;
+    v_size_32bit = 0;
+
+    for (list = compose_list; list != NULL; list = list->next) {
+        compose_data = list->data;
+        if (unichar_length (compose_data->values) > 1 ||
+            compose_data->values[0] >= 0xFFFF) {
+            --s_size_16bit;
+            v_size_32bit += unichar_length (compose_data->values);
+        }
+    }
 
-    ibus_compose_seqs = g_new0 (guint16, length * n_index_stride);
+    if (s_size_16bit)
+        ibus_compose_seqs = g_new (guint16, s_size_16bit * n_index_stride);
+    if (s_size_total > s_size_16bit) {
+        ibus_compose_seqs_32bit_first =
+                g_new (guint16,
+                       (s_size_total - s_size_16bit) * n_index_stride);
+        ibus_compose_seqs_32bit_second = g_new (guint32, v_size_32bit);
+    }
 
+    v_index_32bit = 0;
     for (list = compose_list; list != NULL; list = list->next) {
+        gboolean is_32bit = FALSE;
         compose_data = list->data;
+
+        is_32bit = unichar_length (compose_data->values) > 1 ? TRUE :
+                compose_data->values[0] >= 0xFFFF ? TRUE : FALSE;
         for (i = 0; i < max_compose_len; i++) {
             if (compose_data->sequence[i] == 0) {
-                for (j = i; j < max_compose_len; j++)
-                    ibus_compose_seqs[n++] = 0;
+                for (j = i; j < max_compose_len; j++) {
+                    if (is_32bit)
+                        ibus_compose_seqs_32bit_first[m++] = 0;
+                    else
+                        ibus_compose_seqs[n++] = 0;
+                }
                 break;
             }
-            ibus_compose_seqs[n++] = (guint16) compose_data->sequence[i];
+            if (is_32bit) {
+                ibus_compose_seqs_32bit_first[m++] =
+                        (guint16) compose_data->sequence[i];
+            } else {
+                ibus_compose_seqs[n++] = (guint16) compose_data->sequence[i];
+            }
+        }
+        if (is_32bit) {
+            for (j = 0; compose_data->values[j]; j++) {
+                ibus_compose_seqs_32bit_second[v_index_32bit + j] =
+                        compose_data->values[j];
+            }
+            ibus_compose_seqs_32bit_first[m++] = j;
+            ibus_compose_seqs_32bit_first[m++] = v_index_32bit;
+            v_index_32bit += j;
+        } else {
+            ibus_compose_seqs[n++] = (guint16) compose_data->values[0];
+            ibus_compose_seqs[n++] = 0;
         }
-        ibus_compose_seqs[n++] = (guint16) compose_data->value[0];
-        ibus_compose_seqs[n++] = (guint16) compose_data->value[1];
     }
 
-    retval = g_new0 (IBusComposeTable, 1);
+    retval = g_new0 (IBusComposeTableEx, 1);
     retval->data = ibus_compose_seqs;
     retval->max_seq_len = max_compose_len;
-    retval->n_seqs = length;
+    retval->n_seqs = s_size_16bit;
     retval->id = hash;
+    if (s_size_total > s_size_16bit) {
+        retval->priv = g_new0 (IBusComposeTablePrivate, 1);
+        retval->priv->data_first = ibus_compose_seqs_32bit_first;
+        retval->priv->data_second = ibus_compose_seqs_32bit_second;
+        retval->priv->first_n_seqs = s_size_total - s_size_16bit;
+        retval->priv->second_size = v_size_32bit;
+    }
 
     return retval;
 }
 
-IBusComposeTable *
+
+IBusComposeTableEx *
 ibus_compose_table_new_with_file (const gchar *compose_file)
 {
     GList *compose_list = NULL;
-    IBusComposeTable *compose_table;
+    IBusComposeTableEx *compose_table;
     int max_compose_len = 0;
     int n_index_stride = 0;
 
     g_assert (compose_file != NULL);
 
-    compose_list = ibus_compose_list_parse_file (compose_file);
+    compose_list = ibus_compose_list_parse_file (compose_file,
+                                                 &max_compose_len);
     if (compose_list == NULL)
         return NULL;
-    compose_list = ibus_compose_list_check_duplicated (compose_list);
-    compose_list = ibus_compose_list_check_uint16 (compose_list);
-    compose_list = ibus_compose_list_format_for_gtk (compose_list,
-                                                     &max_compose_len,
-                                                     &n_index_stride);
+    n_index_stride = max_compose_len + 2;
+    compose_list = ibus_compose_list_check_duplicated (compose_list,
+                                                       max_compose_len);
     compose_list = g_list_sort_with_data (
             compose_list,
             (GCompareDataFunc) ibus_compose_data_compare,
@@ -814,9 +1016,8 @@ ibus_compose_table_new_with_file (const gchar *compose_file)
         return NULL;
     }
 
-    if (g_getenv ("IBUS_COMPOSE_TABLE_PRINT") != NULL) {
+    if (g_getenv ("IBUS_COMPOSE_TABLE_PRINT") != NULL)
         ibus_compose_list_print (compose_list, max_compose_len, n_index_stride);
-    }
 
     compose_table = ibus_compose_table_new_with_list (
             compose_list,
@@ -830,6 +1031,7 @@ ibus_compose_table_new_with_file (const gchar *compose_file)
     return compose_table;
 }
 
+
 /* if ibus_compose_seqs[N - 1] is an outputed compose character,
  * ibus_compose_seqs[N * 2 - 1] is also an outputed compose character.
  * and ibus_compose_seqs[0] to ibus_compose_seqs[0 + N - 3] are the
@@ -845,7 +1047,7 @@ ibus_compose_table_list_add_array (GSList        *compose_tables,
                                    gint           n_seqs)
 {
     guint32 hash;
-    IBusComposeTable *compose_table;
+    IBusComposeTableEx *compose_table;
     int n_index_stride = max_seq_len + 2;
     int length = n_index_stride * n_seqs;
     int i;
@@ -866,7 +1068,7 @@ ibus_compose_table_list_add_array (GSList        *compose_tables,
     for (i = 0; i < length; i++)
         ibus_compose_seqs[i] = data[i];
 
-    compose_table = g_new (IBusComposeTable, 1);
+    compose_table = g_new (IBusComposeTableEx, 1);
     compose_table->data = ibus_compose_seqs;
     compose_table->max_seq_len = max_seq_len;
     compose_table->n_seqs = n_seqs;
@@ -875,12 +1077,13 @@ ibus_compose_table_list_add_array (GSList        *compose_tables,
     return g_slist_prepend (compose_tables, compose_table);
 }
 
+
 GSList *
 ibus_compose_table_list_add_file (GSList      *compose_tables,
                                   const gchar *compose_file)
 {
     guint32 hash;
-    IBusComposeTable *compose_table;
+    IBusComposeTableEx *compose_table;
 
     g_return_val_if_fail (compose_file != NULL, compose_tables);
 
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 4bf892114..777c5f420 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -29,6 +29,8 @@
 G_BEGIN_DECLS
 
 typedef struct _IBusComposeTable IBusComposeTable;
+typedef struct _IBusComposeTableEx IBusComposeTableEx;
+typedef struct _IBusComposeTablePrivate IBusComposeTablePrivate;
 typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
 typedef struct _IBusComposeTableCompactEx IBusComposeTableCompactEx;
 typedef struct _IBusComposeTableCompactPrivate IBusComposeTableCompactPrivate;
@@ -41,6 +43,15 @@ struct _IBusComposeTable
     guint32 id;
 };
 
+struct _IBusComposeTableEx
+{
+    IBusComposeTablePrivate *priv;
+    guint16 *data;
+    gint max_seq_len;
+    gint n_seqs;
+    guint32 id;
+};
+
 struct _IBusComposeTableCompact
 {
     const guint16 *data;
@@ -51,22 +62,23 @@ struct _IBusComposeTableCompact
 
 struct _IBusComposeTableCompactEx
 {
+    IBusComposeTableCompactPrivate *priv;
     const guint16 *data;
     gint max_seq_len;
     gint n_index_size;
     gint n_index_stride;
-    IBusComposeTableCompactPrivate *priv;
 };
 
-IBusComposeTable *ibus_compose_table_new_with_file (const gchar *compose_file);
-GSList           *ibus_compose_table_list_add_array
+IBusComposeTableEx *
+                  ibus_compose_table_new_with_file (const gchar *compose_file);
+GSList *          ibus_compose_table_list_add_array
                                                    (GSList
                                                                 *compose_tables,
                                                     const guint16
                                                                 *data,
                                                     gint         max_seq_len,
                                                     gint         n_seqs);
-GSList           *ibus_compose_table_list_add_file (GSList
+GSList *          ibus_compose_table_list_add_file (GSList
                                                                 *compose_tables,
                                                     const gchar *compose_file);
 
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index fa4ddf5f6..2242203c3 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -101,24 +101,24 @@ struct _IBusComposeTableCompactPrivate
  * Assign the value of "Number of different first items" of compose-parse.py
  * to n_seqs in IBusComposeTableCompact
  */
-const IBusComposeTableCompactPrivate ibus_compose_table_compact_32bit_priv = {
+IBusComposeTableCompactPrivate ibus_compose_table_compact_32bit_priv = {
     gtk_compose_seqs_compact_32bit_second
 };
 
 const IBusComposeTableCompactEx ibus_compose_table_compact = {
+    NULL,
     gtk_compose_seqs_compact,
     5,
     30,
-    6,
-    NULL
+    6
 };
 
 const IBusComposeTableCompactEx ibus_compose_table_compact_32bit = {
+    &ibus_compose_table_compact_32bit_priv,
     gtk_compose_seqs_compact_32bit_first,
     5,
     9,
-    6,
-    &ibus_compose_table_compact_32bit_priv 
+    6
 };
 
 static GSList *global_tables;
@@ -630,13 +630,15 @@ compare_seq (const void *key, const void *value)
 
 
 static gboolean
-check_table (IBusEngineSimple       *simple,
-             const IBusComposeTable *table,
-             gint                    n_compose)
+check_table (IBusEngineSimple         *simple,
+             const IBusComposeTableEx *table,
+             gint                      n_compose,
+             gboolean                  is_32bit)
 {
-    // g_debug("check_table");
     IBusEngineSimplePrivate *priv = simple->priv;
     gint row_stride = table->max_seq_len + 2;
+    guint16 *data_first;
+    int n_seqs;
     guint16 *seq;
 
     g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
@@ -645,8 +647,17 @@ check_table (IBusEngineSimple       *simple,
     if (n_compose > table->max_seq_len)
         return FALSE;
 
+    if (is_32bit) {
+        if (!table->priv)
+            return FALSE;
+        data_first = table->priv->data_first;
+        n_seqs = table->priv->first_n_seqs;
+    } else {
+        data_first = table->data;
+        n_seqs = table->n_seqs;
+    }
     seq = bsearch (priv->compose_buffer,
-                   table->data, table->n_seqs,
+                   data_first, n_seqs,
                    sizeof (guint16) * row_stride,
                    compare_seq);
 
@@ -660,7 +671,7 @@ check_table (IBusEngineSimple       *simple,
     /* Back up to the first sequence that matches to make sure
      * we find the exact match if their is one.
      */
-    while (seq > table->data) {
+    while (seq > data_first) {
         prev_seq = seq - row_stride;
         if (compare_seq (priv->compose_buffer, prev_seq) != 0) {
             break;
@@ -671,14 +682,25 @@ check_table (IBusEngineSimple       *simple,
     /* complete sequence */
     if (n_compose == table->max_seq_len || seq[n_compose] == 0) {
         guint16 *next_seq;
-        gunichar value =
-            0x10000 * seq[table->max_seq_len] + seq[table->max_seq_len + 1];
+        gunichar value = 0;
+        int num = 0;
+        int index = 0;
+        gchar *output_str = NULL;
+        GError *error = NULL;
+
+        if (is_32bit) {
+            num = seq[table->max_seq_len];
+            index = seq[table->max_seq_len + 1];
+            value =  table->priv->data_second[index];
+        } else {
+            value = seq[table->max_seq_len];
+        }
 
         /* We found a tentative match. See if there are any longer
          * sequences containing this subsequence
          */
         next_seq = seq + row_stride;
-        if (next_seq < table->data + row_stride * table->n_seqs) {
+        if (next_seq < data_first + row_stride * n_seqs) {
             if (compare_seq (priv->compose_buffer, next_seq) == 0) {
                 priv->tentative_match = value;
                 priv->tentative_match_len = n_compose;
@@ -689,9 +711,21 @@ check_table (IBusEngineSimple       *simple,
             }
         }
 
-        ibus_engine_simple_commit_char (simple, value);
+        if (is_32bit) {
+            output_str = g_ucs4_to_utf8 (table->priv->data_second + index,
+                                         num, NULL, NULL, &error);
+            if (output_str) {
+                ibus_engine_simple_commit_str(simple, output_str);
+                g_free (output_str);
+            } else {
+                g_warning ("Failed to output multiple characters: %s",
+                           error->message);
+                g_error_free (error);
+            }
+        } else {
+            ibus_engine_simple_commit_char (simple, value);
+        }
         priv->compose_buffer[0] = 0;
-        // g_debug ("U+%04X\n", value);
     }
     ibus_engine_simple_update_preedit_text (simple);
     return TRUE;
@@ -754,10 +788,10 @@ ibus_check_compact_table (const IBusComposeTableCompactEx *table,
 
             if (seq_index[i + 1] - seq_index[i] > 0) {
                 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);
+                               table->data + seq_index[i],
+                               (seq_index[i + 1] - seq_index[i]) / row_stride,
+                               sizeof (guint16) * row_stride,
+                               compare_seq);
                 if (seq) {
                     if (i == n_compose - 1)
                         break;
@@ -1148,8 +1182,15 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
 
     while (list) {
         if (check_table (simple,
-            (IBusComposeTable *)list->data,
-            n_compose)) {
+            (IBusComposeTableEx *)list->data,
+            n_compose,
+            FALSE)) {
+            return TRUE;
+        }
+        if (check_table (simple,
+            (IBusComposeTableEx *)list->data,
+            n_compose,
+            TRUE)) {
             return TRUE;
         }
         list = list->next;
@@ -1178,12 +1219,12 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
             if (output_str) {
                 ibus_engine_simple_commit_str (simple, output_str);
                 g_free (output_str);
-                g_free (output_chars);
             } else {
                 g_warning ("Failed to output multiple characters: %s",
                            error->message);
                 g_error_free (error);
             }
+            g_free (output_chars);
             priv->compose_buffer[0] = 0;
         }
         
diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index a5ef34fb3..bd385e5b9 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@
 
 G_BEGIN_DECLS
 
-#define IBUS_MAX_COMPOSE_LEN 7
+#define IBUS_MAX_COMPOSE_LEN 0xFF
 
 /*
  * Type macros.
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index c86c53244..508d9344e 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -27,6 +27,15 @@
 G_BEGIN_DECLS
 
 extern const IBusComposeTableCompactEx ibus_compose_table_compact;
+extern const IBusComposeTableCompactEx ibus_compose_table_compact_32bit;
+
+struct _IBusComposeTablePrivate
+{
+    guint16 *data_first;
+    guint32 *data_second;
+    gsize first_n_seqs;
+    gsize second_size;
+};
 
 gboolean ibus_check_algorithmically (const guint16              *compose_buffer,
                                      gint                        n_compose,

From 82a728de97308f6ce36c814e30a292f96e76cc13 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 29 May 2019 17:37:35 +0900
Subject: [PATCH 561/816] src: Change a fixed compose buffer to a variable one

Now the long key sequence of the compose key is supported in both
system compose and user compose but the internal compose buffer is
still a fixed size. The compose buffer size will be a variable size
and the initial size will be 20 with this change.
---
 src/ibusenginesimple.c | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 2242203c3..0604693d0 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -44,29 +44,31 @@
 #include <stdlib.h>
 
 #define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
-#define EMOJI_SOURCE_LEN 100
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
 #define SET_COMPOSE_BUFFER_ELEMENT_NEXT(buffer, index, value) {         \
-    if ((index) < EMOJI_SOURCE_LEN) {                                   \
+    if ((index) >= COMPOSE_BUFFER_SIZE &&                               \
+        COMPOSE_BUFFER_SIZE < IBUS_MAX_COMPOSE_LEN) {                   \
+        COMPOSE_BUFFER_SIZE = ((index) + 10) < IBUS_MAX_COMPOSE_LEN     \
+                              ? ((index) + 10) : IBUS_MAX_COMPOSE_LEN;  \
+        (buffer) = g_renew (guint16, (buffer), COMPOSE_BUFFER_SIZE + 1);\
+    }                                                                   \
+    if ((index) < COMPOSE_BUFFER_SIZE) {                                \
         (buffer)[(index)] = (value);                                    \
         (index) += 1;                                                   \
     }                                                                   \
 }
 
 #define SET_COMPOSE_BUFFER_ELEMENT_END(buffer, index, value) {          \
-    if ((index) >= EMOJI_SOURCE_LEN) {                                  \
-        (index) = EMOJI_SOURCE_LEN;                                     \
-        (buffer)[EMOJI_SOURCE_LEN - 1] = (value);                       \
-    } else {                                                            \
-        (buffer)[(index)] = (value);                                    \
-    }                                                                   \
+    if ((index) > COMPOSE_BUFFER_SIZE)                                  \
+        (index) = COMPOSE_BUFFER_SIZE;                                  \
+    (buffer)[(index)] = (value);                                        \
 }
 
 #define CHECK_COMPOSE_BUFFER_LENGTH(index) {                            \
-    if ((index) > EMOJI_SOURCE_LEN)                                     \
-        (index) = EMOJI_SOURCE_LEN;                                     \
+    if ((index) > COMPOSE_BUFFER_SIZE)                                  \
+        (index) = COMPOSE_BUFFER_SIZE;                                  \
 }
 
 typedef struct {
@@ -75,7 +77,7 @@ typedef struct {
 } IBusEngineDict;
 
 struct _IBusEngineSimplePrivate {
-    guint16             compose_buffer[EMOJI_SOURCE_LEN];
+    guint16            *compose_buffer;
     gunichar            tentative_match;
     gchar              *tentative_emoji;
     gint                tentative_match_len;
@@ -121,6 +123,7 @@ const IBusComposeTableCompactEx ibus_compose_table_compact_32bit = {
     6
 };
 
+guint COMPOSE_BUFFER_SIZE = 20;
 static GSList *global_tables;
 
 /* functions prototype */
@@ -175,6 +178,7 @@ static void
 ibus_engine_simple_init (IBusEngineSimple *simple)
 {
     simple->priv = IBUS_ENGINE_SIMPLE_GET_PRIVATE (simple);
+    simple->priv->compose_buffer = g_new (guint16, COMPOSE_BUFFER_SIZE + 1);
     simple->priv->hex_mode_enabled =
         g_getenv("IBUS_ENABLE_CTRL_SHIFT_U") != NULL ||
         g_getenv("IBUS_ENABLE_CONTROL_SHIFT_U") != NULL;
@@ -193,7 +197,8 @@ ibus_engine_simple_destroy (IBusEngineSimple *simple)
         priv->emoji_dict = NULL;
     }
 
-    g_clear_pointer (&priv->lookup_table, g_object_unref);
+    g_clear_object (&priv->lookup_table);
+    g_clear_pointer (&priv->compose_buffer, g_free);
     g_clear_pointer (&priv->tentative_emoji, g_free);
 
     IBUS_OBJECT_CLASS(ibus_engine_simple_parent_class)->destroy (
@@ -356,7 +361,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
 
-    gunichar outbuf[EMOJI_SOURCE_LEN + 1];
+    gunichar outbuf[COMPOSE_BUFFER_SIZE + 1];
     int len = 0;
 
     if (priv->in_hex_sequence || priv->in_emoji_sequence) {
@@ -376,10 +381,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
             ++hexchars;
         }
 
-        if (priv->in_hex_sequence)
-            g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
-        else
-            g_assert (len <= EMOJI_SOURCE_LEN + 1);
+        g_assert (len <= COMPOSE_BUFFER_SIZE);
     } else if (priv->tentative_match) {
         outbuf[len++] = priv->tentative_match;
     } else if (priv->tentative_emoji && *priv->tentative_emoji) {
@@ -406,7 +408,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
             ++len;
             ++hexchars;
         }
-        g_assert (len <= IBUS_MAX_COMPOSE_LEN + 1);
+        g_assert (len <= IBUS_MAX_COMPOSE_LEN);
     }
 
     outbuf[len] = L'\0';
@@ -1265,11 +1267,11 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     guint printable_keyval;
     gint i;
 
-    while (n_compose < EMOJI_SOURCE_LEN && priv->compose_buffer[n_compose] != 0)
+    while (n_compose <= COMPOSE_BUFFER_SIZE && priv->compose_buffer[n_compose] != 0)
         n_compose++;
-    if (n_compose >= EMOJI_SOURCE_LEN) {
+    if (n_compose > COMPOSE_BUFFER_SIZE) {
         g_warning ("copmose table buffer is full.");
-        n_compose = EMOJI_SOURCE_LEN - 1;
+        n_compose = COMPOSE_BUFFER_SIZE;
     }
 
     if (modifiers & IBUS_RELEASE_MASK) {
@@ -1348,8 +1350,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     /* gtkimcontextsimple causes a buffer overflow in priv->compose_buffer.
      * Add the check code here.
      */
-    if ((n_compose >= IBUS_MAX_COMPOSE_LEN && priv->in_hex_sequence) ||
-        (n_compose >= EMOJI_SOURCE_LEN && priv->in_emoji_sequence)) {
+    if (n_compose > COMPOSE_BUFFER_SIZE &&
+        (priv->in_hex_sequence || priv->in_emoji_sequence)) {
         if (is_backspace) {
             priv->compose_buffer[--n_compose] = 0;
         }

From 80254484071eb57e1152579b60ec8a95522ebc22 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 24 Jun 2019 17:28:55 +0900
Subject: [PATCH 562/816] src: s/iso_639-3/iso_639_3/ in
 ibus_get_language_name()

iso-codes 3.66 has iso_639_3.xml only but 3.67 has both iso_639_3.xml
and iso_639-3.xml. RHEL 7 uses iso-codes 3.46.

BUG=https://github.com/ibus/ibus/issues/2101
---
 ibus/lang.py   |  6 +++---
 src/ibusutil.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ibus/lang.py b/ibus/lang.py
index 64324bd8e..238a91725 100644
--- a/ibus/lang.py
+++ b/ibus/lang.py
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2019 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
@@ -36,7 +36,7 @@ def get_language_name(_locale):
     lang = lang.lower()
     if lang in __languages_dict:
         lang = __languages_dict[lang]
-        lang = gettext.dgettext("iso_639-3", lang)
+        lang = gettext.dgettext("iso_639_3", lang)
     else:
         lang = _(u"Other")
         lang = gettext.dgettext("ibus", lang)
@@ -62,7 +62,7 @@ def __char_data(data):
 def __load_lang():
     import os
     import _config
-    iso_639_3_xml = os.path.join(_config.ISOCODES_PREFIX, "share/xml/iso-codes/iso_639-3.xml")
+    iso_639_3_xml = os.path.join(_config.ISOCODES_PREFIX, "share/xml/iso-codes/iso_639_3.xml")
     p = xml.parsers.expat.ParserCreate()
     p.StartElementHandler = __start_element
     p.EndElementHandler = __end_element
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 9d003e2ee..88c054a24 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2010-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -99,14 +99,14 @@ _load_lang()
     struct stat buf;
 
 #ifdef ENABLE_NLS
-    bindtextdomain ("iso_639-3", LOCALEDIR);
-    bind_textdomain_codeset ("iso_639-3", "UTF-8");
+    bindtextdomain ("iso_639_3", LOCALEDIR);
+    bind_textdomain_codeset ("iso_639_3", "UTF-8");
 #endif
 
     __languages_dict = g_hash_table_new_full (g_str_hash,
             g_str_equal, g_free, g_free);
     filename = g_build_filename (ISOCODES_PREFIX,
-                                 "share/xml/iso-codes/iso_639-3.xml",
+                                 "share/xml/iso-codes/iso_639_3.xml",
                                  NULL);
     if (g_stat (filename, &buf) != 0) {
         g_warning ("Can not get stat of file %s", filename);
@@ -197,7 +197,7 @@ ibus_get_language_name (const gchar *_locale)
     if (g_strcmp0 (raw, "Other") == 0)
         return g_strdup (dgettext (GETTEXT_PACKAGE, N_("Other")));
     else
-        translation = dgettext ("iso_639-3", raw);
+        translation = dgettext ("iso_639_3", raw);
 #else
     translation = raw;
 #endif

From 69e443c07f944b3137aada31dcdbcb49728ff805 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 28 Jun 2019 20:43:36 +0900
Subject: [PATCH 563/816] bus: Disable panel extension for gnome-initial-setup
 user

gnome-initial-setup user is executed before the post setup is finished
after the installation is finished.
---
 bus/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bus/main.c b/bus/main.c
index 6f1f39cad..3223d541e 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -49,6 +49,7 @@ static gchar *desktop = "gnome";
 
 static gchar *panel_extension_disable_users[] = {
     "gdm",
+    "gnome-initial-setup",
     "liveuser"
 };
 

From ac492f31b435b9464d591094d470bc94027168e8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 28 Jun 2019 21:15:07 +0900
Subject: [PATCH 564/816] src/tests: Fix ibus-compose for IBusComposeTableEx

Recently IBusComposeTablEx has been integrated and the return value of
ibus_compose_table_new_with_file() is also changed and ibus-compose
needs to be updated.

Clear IBusComposeTablePrivate in ibus_compose_table_list_add_array()
for the ibus-compose testing.

Clear compose_buffer in IBusEngineSimple.

Use g_get_language_names_with_category instead() of g_get_locale_variants().

Add ibus-compose.emoji for the tests of long compose sequences and
multiple compose output characters.

IBUS_COMPOSE_CACHE_DIR variable is added for the temporary caches.
---
 src/ibuscomposetable.c       |  15 ++--
 src/ibuscomposetable.h       |   4 +
 src/ibusenginesimple.c       |  14 ++-
 src/tests/Makefile.am        |   2 +-
 src/tests/ibus-compose.c     | 163 +++++++++++++++++++++++++++--------
 src/tests/ibus-compose.emoji |  11 +++
 src/tests/ibus-compose.env   |   1 +
 src/tests/runtest            |   4 +-
 test/test-console.sh         |   7 +-
 9 files changed, 174 insertions(+), 47 deletions(-)
 create mode 100644 src/tests/ibus-compose.emoji

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 4ac54e25d..5fd37f10c 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -497,13 +497,18 @@ static gchar *
 ibus_compose_hash_get_cache_path (guint32 hash)
 {
     gchar *basename = NULL;
+    const gchar *cache_dir;
     gchar *dir = NULL;
     gchar *path = NULL;
 
     basename = g_strdup_printf ("%08x.cache", hash);
 
-    dir = g_build_filename (g_get_user_cache_dir (),
-                            "ibus", "compose", NULL);
+    if ((cache_dir = g_getenv ("IBUS_COMPOSE_CACHE_DIR"))) {
+        dir = g_strdup (cache_dir);
+    } else {
+        dir = g_build_filename (g_get_user_cache_dir (),
+                                "ibus", "compose", NULL);
+    }
     path = g_build_filename (dir, basename, NULL);
     if (g_mkdir_with_parents (dir, 0755) != 0) {
         g_warning ("Failed to mkdir %s", dir);
@@ -817,7 +822,7 @@ ibus_compose_table_deserialize (const gchar *contents,
 }
 
 
-static IBusComposeTableEx *
+IBusComposeTableEx *
 ibus_compose_table_load_cache (const gchar *compose_file)
 {
     IBusComposeTableEx *retval = NULL;
@@ -862,7 +867,7 @@ ibus_compose_table_load_cache (const gchar *compose_file)
 }
 
 
-static void
+void
 ibus_compose_table_save_cache (IBusComposeTableEx *compose_table)
 {
     gchar *path = NULL;
@@ -1068,7 +1073,7 @@ ibus_compose_table_list_add_array (GSList        *compose_tables,
     for (i = 0; i < length; i++)
         ibus_compose_seqs[i] = data[i];
 
-    compose_table = g_new (IBusComposeTableEx, 1);
+    compose_table = g_new0 (IBusComposeTableEx, 1);
     compose_table->data = ibus_compose_seqs;
     compose_table->max_seq_len = max_seq_len;
     compose_table->n_seqs = n_seqs;
diff --git a/src/ibuscomposetable.h b/src/ibuscomposetable.h
index 777c5f420..b60e53fe3 100644
--- a/src/ibuscomposetable.h
+++ b/src/ibuscomposetable.h
@@ -71,6 +71,10 @@ struct _IBusComposeTableCompactEx
 
 IBusComposeTableEx *
                   ibus_compose_table_new_with_file (const gchar *compose_file);
+IBusComposeTableEx *
+                  ibus_compose_table_load_cache    (const gchar *compose_file);
+void              ibus_compose_table_save_cache    (IBusComposeTableEx
+                                                                *compose_table);
 GSList *          ibus_compose_table_list_add_array
                                                    (GSList
                                                                 *compose_tables,
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 0604693d0..b623e149e 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -178,7 +178,7 @@ static void
 ibus_engine_simple_init (IBusEngineSimple *simple)
 {
     simple->priv = IBUS_ENGINE_SIMPLE_GET_PRIVATE (simple);
-    simple->priv->compose_buffer = g_new (guint16, COMPOSE_BUFFER_SIZE + 1);
+    simple->priv->compose_buffer = g_new0(guint16, COMPOSE_BUFFER_SIZE + 1);
     simple->priv->hex_mode_enabled =
         g_getenv("IBUS_ENABLE_CTRL_SHIFT_U") != NULL ||
         g_getenv("IBUS_ENABLE_CONTROL_SHIFT_U") != NULL;
@@ -1747,9 +1747,14 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
     gboolean retval = TRUE;
     gchar *path = NULL;
     const gchar *home;
+#if GLIB_CHECK_VERSION (2, 58, 0)
+    const gchar * const *langs;
+    const gchar * const *lang = NULL;
+#else
     const gchar *_locale;
     gchar **langs = NULL;
     gchar **lang = NULL;
+#endif
     gchar * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL };
     gchar * const *sys_lang = NULL;
 
@@ -1787,6 +1792,9 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
         g_free (path);
         path = NULL;
 
+#if GLIB_CHECK_VERSION (2, 58, 0)
+        langs = g_get_language_names_with_category ("LC_CTYPE");
+#else
         _locale = g_getenv ("LC_CTYPE");
         if (_locale == NULL)
             _locale = g_getenv ("LANG");
@@ -1795,6 +1803,7 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
 
         /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=751826 */
         langs = g_get_locale_variants (_locale);
+#endif
 
         for (lang = langs; *lang; lang++) {
             if (g_str_has_prefix (*lang, "en_US"))
@@ -1821,7 +1830,9 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             path = NULL;
         }
 
+#if !GLIB_CHECK_VERSION (2, 58, 0)
         g_strfreev (langs);
+#endif
 
         if (path != NULL)
             ibus_engine_simple_add_compose_file (simple, path);
@@ -1853,3 +1864,4 @@ ibus_engine_simple_add_compose_file (IBusEngineSimple *simple,
                                                       compose_file);
     return TRUE;
 }
+
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index e2ff5ea72..a58504a35 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -78,7 +78,7 @@ TESTS_ENVIRONMENT = \
 
 LOG_COMPILER = $(srcdir)/runtest
 
-EXTRA_DIST = runtest ibus-compose.env
+EXTRA_DIST = runtest ibus-compose.emoji ibus-compose.env
 
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index aabb36ac8..e1911b326 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -1,37 +1,36 @@
 #include <gtk/gtk.h>
 #include "ibus.h"
 #include "ibuscomposetable.h"
+#include "ibusenginesimpleprivate.h"
 
 #define GREEN "\033[0;32m"
 #define RED   "\033[0;31m"
 #define NC    "\033[0m"
 
 IBusBus *m_bus;
-IBusComposeTable *m_compose_table;
+gchar *m_compose_file;
+IBusComposeTableEx *m_compose_table;
 IBusEngine *m_engine;
+gchar *m_srcdir;
 int m_retval;
 
 static gboolean window_focus_in_event_cb (GtkWidget     *entry,
                                           GdkEventFocus *event,
                                           gpointer       data);
 
-static IBusEngine *
-create_engine_cb (IBusFactory *factory, const gchar *name, gpointer data)
+
+static gchar *
+get_compose_path ()
 {
-    static int i = 1;
-    gchar *engine_path =
-            g_strdup_printf ("/org/freedesktop/IBus/engine/simpletest/%d",
-                             i++);
-    gchar *compose_path = NULL;
     const gchar * const *langs;
     const gchar * const *l;
+    gchar *compose_path = NULL;
 
-    m_engine = ibus_engine_new_with_type (IBUS_TYPE_ENGINE_SIMPLE,
-                                          name,
-                                          engine_path,
-                                          ibus_bus_get_connection (m_bus));
-    g_free (engine_path);
+#if GLIB_CHECK_VERSION (2, 58, 0)
+    langs = g_get_language_names_with_category ("LC_CTYPE");
+#else
     langs = g_get_language_names ();
+#endif
     for (l = langs; *l; l++) {
         if (g_str_has_prefix (*l, "en_US"))
             break;
@@ -46,18 +45,39 @@ create_engine_cb (IBusFactory *factory, const gchar *name, gpointer data)
         g_free (compose_path);
         compose_path = NULL;
     }
+
+    return compose_path;
+}
+
+
+static IBusEngine *
+create_engine_cb (IBusFactory *factory,
+                  const gchar *name,
+                  gpointer     data)
+{
+    static int i = 1;
+    gchar *engine_path =
+            g_strdup_printf ("/org/freedesktop/IBus/engine/simpletest/%d",
+                             i++);
+    gchar *compose_path;
+
+    m_engine = ibus_engine_new_with_type (IBUS_TYPE_ENGINE_SIMPLE,
+                                          name,
+                                          engine_path,
+                                          ibus_bus_get_connection (m_bus));
+    g_free (engine_path);
+    if (m_compose_file)
+        compose_path = g_build_filename (m_srcdir, m_compose_file, NULL);
+    else
+        compose_path = get_compose_path ();
     if (compose_path != NULL) {
-        m_compose_table = ibus_compose_table_new_with_file (compose_path);
+        ibus_engine_simple_add_compose_file (IBUS_ENGINE_SIMPLE (m_engine),
+                                             compose_path);
+        m_compose_table = ibus_compose_table_load_cache (compose_path);
         if (m_compose_table == NULL)
             g_warning ("Your locale uses en_US compose table.");
-        else
-            ibus_engine_simple_add_table (IBUS_ENGINE_SIMPLE (m_engine),
-                                          m_compose_table->data,
-                                          m_compose_table->max_seq_len,
-                                          m_compose_table->n_seqs);
-    } else {
-        g_warning ("Your locale uses en_US compose file.");
     }
+    g_free (compose_path);
     return m_engine;
 }
 
@@ -118,6 +138,7 @@ set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
     GError *error = NULL;
     int i, j;
     int index_stride;
+    IBusComposeTablePrivate *priv;
 
     if (!ibus_bus_set_global_engine_async_finish (bus, res, &error)) {
         g_warning ("set engine failed: %s", error->message);
@@ -149,6 +170,27 @@ set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
                                    keyval, keycode, modifiers, &retval);
         }
     }
+    priv = m_compose_table->priv;
+    if (priv) {
+        for (i = 0;
+             i < (priv->first_n_seqs * index_stride);
+             i += index_stride) {
+            for (j = i; j < i + (index_stride - 1); j++) {
+                guint keyval = priv->data_first[j];
+                guint keycode = 0;
+                guint modifiers = 0;
+                gboolean retval;
+
+                if (keyval == 0)
+                    break;
+                g_signal_emit_by_name (m_engine, "process-key-event",
+                                       keyval, keycode, modifiers, &retval);
+                modifiers |= IBUS_RELEASE_MASK;
+                g_signal_emit_by_name (m_engine, "process-key-event",
+                                       keyval, keycode, modifiers, &retval);
+            }
+        }
+    }
 
     g_signal_handlers_disconnect_by_func (entry, 
                                           G_CALLBACK (window_focus_in_event_cb),
@@ -183,41 +225,87 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
     static int n_loop = 0;
 #endif
     static guint stride = 0;
+    static gboolean enable_32bit = FALSE;
     guint i;
     int seq;
     gunichar code = g_utf8_get_char (chars);
     const gchar *test;
     GtkEntry *entry = GTK_ENTRY (data);
+    IBusComposeTablePrivate *priv;
 
     g_assert (m_compose_table != NULL);
 
+    priv = m_compose_table->priv;
+
 #if !GTK_CHECK_VERSION (3, 22, 16)
     if (n_loop % 2 == 1) {
         n_loop = 0;
         return;
     }
 #endif
-    i = stride + (m_compose_table->max_seq_len + 2) - 1;
-    seq = (i + 1) / (m_compose_table->max_seq_len + 2);
-    if (m_compose_table->data[i] == code) {
-        test = GREEN "PASS" NC;
+    i = stride + (m_compose_table->max_seq_len + 2) - 2;
+    seq = (i + 2) / (m_compose_table->max_seq_len + 2);
+    if (!enable_32bit) {
+        if (m_compose_table->data[i] == code) {
+            test = GREEN "PASS" NC;
+        } else {
+            test = RED "FAIL" NC;
+            m_retval = -1;
+        }
+        g_print ("%05d/%05d %s expected: %04X typed: %04X\n",
+                 seq,
+                 m_compose_table->n_seqs,
+                 test,
+                 m_compose_table->data[i],
+                 code);
     } else {
-        test = RED "FAIL" NC;
-        m_retval = -1;
+        const gchar *p = chars;
+        guint num = priv->data_first[i];
+        guint index = priv->data_first[i + 1];
+        guint j = 0;
+        gboolean valid_output = TRUE;
+        if (seq == 2)
+            g_print ("test\n");
+        for (j = 0; j < num; j++) {
+            if (priv->data_second[index + j] != code) {
+                valid_output = FALSE;
+                break;
+            }
+            p = g_utf8_next_char (p);
+            code = g_utf8_get_char (p);
+        }
+        if (valid_output) {
+            test = GREEN "PASS" NC;
+        } else {
+            test = RED "FAIL" NC;
+            m_retval = -1;
+        }
+        g_print ("%05d/%05ld %s expected: %04X[%d] typed: %04X\n",
+                 seq,
+                 priv->first_n_seqs,
+                 test,
+                 valid_output ? priv->data_second[index]
+                         : priv->data_second[index + j],
+                 valid_output ? index + num : index + j,
+                 valid_output ? g_utf8_get_char (chars) : code);
     }
-    g_print ("%05d/%05d %s expected: %04X typed: %04X\n",
-             seq,
-             m_compose_table->n_seqs,
-             test,
-             m_compose_table->data[i],
-             code);
-
-    if (seq == m_compose_table->n_seqs) {
+
+    stride += m_compose_table->max_seq_len + 2;
+
+    if (!enable_32bit && seq == m_compose_table->n_seqs) {
+        if (priv) {
+            enable_32bit = TRUE;
+            stride = 0;
+        } else {
+            gtk_main_quit ();
+            return;
+        }
+    }
+    if (enable_32bit && seq == priv->first_n_seqs) {
         gtk_main_quit ();
         return;
     }
 
-    stride += m_compose_table->max_seq_len + 2;
 #if !GTK_CHECK_VERSION (3, 22, 16)
     n_loop++;
 #endif
@@ -248,6 +336,9 @@ main (int argc, char *argv[])
     ibus_init ();
     gtk_init (&argc, &argv);
 
+    m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
+    m_compose_file = g_strdup (g_getenv ("COMPOSE_FILE"));
+
     if (!register_ibus_engine ())
         return -1;
 
diff --git a/src/tests/ibus-compose.emoji b/src/tests/ibus-compose.emoji
new file mode 100644
index 000000000..7fbf82cfb
--- /dev/null
+++ b/src/tests/ibus-compose.emoji
@@ -0,0 +1,11 @@
+<Multi_key> <Multi_key> <l> <e> <o>             : "♌"  U264C   # LEO
+<Multi_key> <Multi_key> <v> <i> <r> <g> <o>     : "♍"  U264D   # VIRGO
+<Multi_key> <Multi_key> <I> <n> <t>             : "∫"
+<Multi_key> <Multi_key> <I> <I> <n> <t>         : "∬"
+<Multi_key> <Multi_key> <I> <I> <n> <o>         : "🗼"
+<Multi_key> <Multi_key> <I> <I> <n> <p>         : "(゜∀゜)"
+<Multi_key> <Multi_key> <I> <I> <n> <q>         : "*・゜゜・*:.。..。.:*・゜(n‘Д‘)η゜・*:.。. .。.:*・ ゜゜・* !!!!!"
+<Multi_key> <Multi_key> <I> <I> <I> <n> <t>     : "∭"
+<Multi_key> <Multi_key> <o> <I> <n> <t>         : "∮"
+<Multi_key> <Multi_key> <o> <I> <I> <n> <t>     : "∯"
+<Multi_key> <Multi_key> <o> <I> <I> <I> <n> <t> : "∰"
diff --git a/src/tests/ibus-compose.env b/src/tests/ibus-compose.env
index 734ab8fa8..a9e289e4f 100644
--- a/src/tests/ibus-compose.env
+++ b/src/tests/ibus-compose.env
@@ -1,3 +1,4 @@
 LANG=el_GR.UTF-8
 LANG=fi_FI.UTF-8
 LANG=pt_BR.UTF-8
+LANG=en_US.UTF-8 COMPOSE_FILE=ibus-compose.emoji
diff --git a/src/tests/runtest b/src/tests/runtest
index 4e980c712..35ccc5a0d 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -184,7 +184,9 @@ run_test_case()
         export GTK_IM_MODULE=ibus
     fi
 
-    "../$tst" ${1+"$@"}
+    export IBUS_COMPOSE_CACHE_DIR=$PWD
+
+    "../$tst" ../$top_srcdir/src/tests ${1+"$@"}
 
     retval=`expr $retval \| $?`
 
diff --git a/test/test-console.sh b/test/test-console.sh
index 490048b41..9e6896349 100755
--- a/test/test-console.sh
+++ b/test/test-console.sh
@@ -4,7 +4,7 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2018 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -189,6 +189,7 @@ run_test_suite()
     fail=0
 
     export GTK_IM_MODULE=ibus
+    export IBUS_COMPOSE_CACHE_DIR=$PWD
     if test -f $TEST_LOG ; then
         rm $TEST_LOG
     fi
@@ -198,7 +199,7 @@ run_test_suite()
             ENVS="`cat $SRCDIR/${tst}.env`"
         fi
         if test x"$ENVS" = x ; then
-            $BUILDDIR/$tst >&${tst}.log
+            $BUILDDIR/$tst $SRCDIR >&${tst}.log
             retval=$?
             read pass fail << EOF
             `count_case_result $retval $pass $fail`
@@ -213,7 +214,7 @@ EOF
                     continue
                 fi
                 export $e
-                $BUILDDIR/$tst >&${tst}.${i}.log
+                $BUILDDIR/$tst $SRCDIR >&${tst}.${i}.log
                 retval=$?
                 read pass fail << EOF
                 `count_case_result $retval $pass $fail`

From 76dec798d5cf6cdaa96c3373f9c0e1cd13eb31f5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 28 Jun 2019 21:28:32 +0900
Subject: [PATCH 565/816] src/tests: Use GTest for ibus-compose

---
 src/tests/ibus-compose.c | 45 ++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index e1911b326..09c687c2a 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -12,7 +12,6 @@ gchar *m_compose_file;
 IBusComposeTableEx *m_compose_table;
 IBusEngine *m_engine;
 gchar *m_srcdir;
-int m_retval;
 
 static gboolean window_focus_in_event_cb (GtkWidget     *entry,
                                           GdkEventFocus *event,
@@ -124,8 +123,7 @@ register_ibus_engine ()
 static gboolean
 finit (gpointer data)
 {
-    m_retval = -1;
-    g_warning ("time out");
+    g_test_incomplete ("time out");
     gtk_main_quit ();
     return FALSE;
 }
@@ -141,7 +139,9 @@ set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
     IBusComposeTablePrivate *priv;
 
     if (!ibus_bus_set_global_engine_async_finish (bus, res, &error)) {
-        g_warning ("set engine failed: %s", error->message);
+        gchar *msg = g_strdup_printf ("set engine failed: %s", error->message);
+        g_test_incomplete (msg);
+        g_free (msg);
         g_error_free (error);
         return;
     }
@@ -250,7 +250,7 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
             test = GREEN "PASS" NC;
         } else {
             test = RED "FAIL" NC;
-            m_retval = -1;
+            g_test_fail ();
         }
         g_print ("%05d/%05d %s expected: %04X typed: %04X\n",
                  seq,
@@ -278,7 +278,7 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
             test = GREEN "PASS" NC;
         } else {
             test = RED "FAIL" NC;
-            m_retval = -1;
+            g_test_fail ();
         }
         g_print ("%05d/%05ld %s expected: %04X[%d] typed: %04X\n",
                  seq,
@@ -330,20 +330,39 @@ create_window ()
     gtk_widget_show_all (window);
 }
 
+static void
+test_compose (void)
+{
+    if (!register_ibus_engine ()) {
+        g_test_fail ();
+        return;
+    }
+
+    create_window ();
+    gtk_main ();
+
+}
+
 int
 main (int argc, char *argv[])
 {
+    const gchar *test_name;
+    gchar *test_path;
+
     ibus_init ();
+    g_test_init (&argc, &argv, NULL);
     gtk_init (&argc, &argv);
 
     m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
     m_compose_file = g_strdup (g_getenv ("COMPOSE_FILE"));
+#if GLIB_CHECK_VERSION (2, 58, 0)
+    test_name = g_get_language_names_with_category ("LC_CTYPE")[0];
+#else
+    test_name = g_getenv ("LANG");
+#endif
+    test_path = g_build_filename ("/ibus-compose", test_name, NULL);
+    g_test_add_func (test_path, test_compose);
+    g_free (test_path);
 
-    if (!register_ibus_engine ())
-        return -1;
-
-    create_window ();
-    gtk_main ();
-
-    return m_retval;
+    return g_test_run ();
 }

From 6bdc692e0dc72a9afae5407983859e88c16b4971 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 10 Jul 2019 18:18:04 +0900
Subject: [PATCH 566/816] src: Support common_name in ISO 639

Nowadays "Bangla" is preferred to "Bengali" for BN language code
and iso_639*.xml describes it in "common_name" tag.

BUG=https://github.com/ibus/ibus/issues/2104
---
 src/ibusutil.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/ibusutil.c b/src/ibusutil.c
index 88c054a24..701984c70 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -53,6 +53,7 @@ _iso_codes_parse_xml_node (XMLNode          *node)
         XMLNode *sub_node = (XMLNode *)p->data;
         gchar **attributes = NULL;
         int i, j;
+        gboolean has_common_name = FALSE;
         struct {
             const gchar *key;
             gchar *value;
@@ -68,14 +69,24 @@ _iso_codes_parse_xml_node (XMLNode          *node)
 
         attributes = sub_node->attributes;
         for (i = 0; attributes[i]; i += 2) {
-            if (g_strcmp0 (attributes[i], "name") == 0) {
+            if (!g_strcmp0 (attributes[i], "common_name")) {
                 for (j = 0; j < G_N_ELEMENTS (entries); j++) {
                     if (entries[j].value == NULL)
                         continue;
-                    g_hash_table_insert (__languages_dict,
-                                         (gpointer) g_strdup (entries[j].value),
-                                         (gpointer) g_strdup (attributes[i + 1]));
-                    entries[j].value = NULL;
+                    g_hash_table_replace (__languages_dict,
+                                          g_strdup (entries[j].value),
+                                          g_strdup (attributes[i + 1]));
+                }
+                has_common_name = TRUE;
+            } else if (!g_strcmp0 (attributes[i], "name")) {
+                if (has_common_name)
+                    continue;
+                for (j = 0; j < G_N_ELEMENTS (entries); j++) {
+                    if (entries[j].value == NULL)
+                        continue;
+                    g_hash_table_replace (__languages_dict,
+                                          g_strdup (entries[j].value),
+                                          g_strdup (attributes[i + 1]));
                 }
             } else {
                 for (j = 0; j < G_N_ELEMENTS (entries); j++) {

From af00f4156b5c79c526eab18c49da80affd41ebee Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Jul 2019 21:12:38 +0900
Subject: [PATCH 567/816] src/tests: Install IBus tests into
 gnome-desktop-testing

---
 configure.ac                      | 13 +++++++++++
 src/tests/Makefile.am             | 39 ++++++++++++++++++++++++++++++-
 src/tests/ibus-compose-locales.in | 23 ++++++++++++++++++
 src/tests/ibus-compose.c          | 10 ++++++--
 src/tests/meta.test.in            |  4 ++++
 src/tests/runtest                 |  4 ++--
 6 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100755 src/tests/ibus-compose-locales.in
 create mode 100644 src/tests/meta.test.in

diff --git a/configure.ac b/configure.ac
index b5a87b56b..f1df3ac1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,6 +595,18 @@ PKG_CHECK_MODULES(XTEST,
 )
 AM_CONDITIONAL([ENABLE_XTEST], [test x"$enable_xtest" = x"yes"])
 
+# --enable-install-tests
+AC_ARG_ENABLE(install-tests,
+    AS_HELP_STRING([--enable-install-tests],
+                   [Enable to install tests]),
+    [enable_install_tests=$enableval],
+    [enable_install_tests=no]
+)
+AM_CONDITIONAL([ENABLE_INSTALL_TESTS], [test x"$enable_install_tests" = x"yes"])
+if test x"$enable_install_tests" = x"no"; then
+    enable_install_tests="no (disabled, use --enable-install-tests to enable)"
+fi
+
 
 # --disable-emoji-dict option.
 AC_ARG_ENABLE(emoji-dict,
@@ -773,5 +785,6 @@ Build options:
   Enable Unicode dict           $enable_unicode_dict
   UCD directory                 $UCD_DIR
   Run test cases                $enable_tests
+  Install tests                 $enable_install_tests
 ])
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index a58504a35..ff31111b0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -78,7 +78,44 @@ TESTS_ENVIRONMENT = \
 
 LOG_COMPILER = $(srcdir)/runtest
 
-EXTRA_DIST = runtest ibus-compose.emoji ibus-compose.env
+if ENABLE_INSTALL_TESTS
+test_metas_in = meta.test.in
+test_execs = $(TESTS:ibus-compose=ibus-compose-locales)
+test_metas = $(addsuffix .test, $(test_execs))
+test_sources_DATA = \
+    $(test_metas) \
+    ibus-compose.emoji \
+    ibus-compose.env \
+    $(NULL)
+test_sourcesdir = $(datadir)/installed-tests/ibus
+
+test_execs_PROGRAMS = $(TESTS)
+if ENABLE_GTK3
+test_execs_SCRIPTS = ibus-compose-locales
+endif
+test_execsdir = $(libexecdir)/installed-tests/ibus
+endif
+
+$(test_metas): $(test_metas_in) $(test_programs)
+	f=`echo $@ | sed -e 's/\.test//'`; \
+	TEST_EXEC=$(test_execsdir)/$$f; \
+	sed -e "s|@TEST_EXEC[@]|$$TEST_EXEC|g" $(test_metas_in) > $@.tmp; \
+	mv $@.tmp $@; \
+	$(NULL)
+
+ibus-compose-locales: ibus-compose-locales.in
+	SRCDIR=$(test_sourcesdir); \
+	sed -e "s|@SRCDIR[@]|$$SRCDIR|g" $< > $@.tmp; \
+	mv $@.tmp $@; \
+	$(NULL)
+
+EXTRA_DIST = \
+    $(test_metas_in) \
+    runtest \
+    ibus-compose.emoji \
+    ibus-compose.env \
+    ibus-compose-locales.in \
+    $(NULL)
 
 ibus_bus_SOURCES = ibus-bus.c
 ibus_bus_LDADD = $(prog_ldadd)
diff --git a/src/tests/ibus-compose-locales.in b/src/tests/ibus-compose-locales.in
new file mode 100755
index 000000000..8d2384d1d
--- /dev/null
+++ b/src/tests/ibus-compose-locales.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+SRCDIR=@SRCDIR@
+BUILDDIR=`dirname $0`
+
+
+export IBUS_COMPOSE_CACHE_DIR=$PWD
+
+for var in `cat $SRCDIR/ibus-compose.env`
+do
+    IS_COMMENT=`echo "$var" | grep "^#"`
+    if [ "x$IS_COMMENT" != x ] ; then
+        continue
+    fi
+    env $var $BUILDDIR/ibus-compose $SRCDIR $@
+
+    CACHE_FILES=`ls *.cache`
+    if [ x"$CACHE_FILES" != x ] ; then
+        echo "Clean $CACHE_FILES"
+        rm $CACHE_FILES
+    fi
+done
+
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index 09c687c2a..c8d3c126c 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -264,8 +264,6 @@ window_inserted_text_cb (GtkEntryBuffer *buffer,
         guint index = priv->data_first[i + 1];
         guint j = 0;
         gboolean valid_output = TRUE;
-        if (seq == 2)
-            g_print ("test\n");
         for (j = 0; j < num; j++) {
             if (priv->data_second[index + j] != code) {
                 valid_output = FALSE;
@@ -351,6 +349,14 @@ main (int argc, char *argv[])
 
     ibus_init ();
     g_test_init (&argc, &argv, NULL);
+    /* FIXME:
+     * IBusIMContext opens GtkIMContextSimple as the slave and
+     * GtkIMContextSimple opens the compose table on el_GR.UTF-8, and the
+     * multiple outputs in el_GR's compose causes a warning in gtkcomposetable 
+     * and the warning always causes a fatal in GTest:
+     " "GTK+ supports to output one char only: "
+     */
+    g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
     gtk_init (&argc, &argv);
 
     m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
diff --git a/src/tests/meta.test.in b/src/tests/meta.test.in
new file mode 100644
index 000000000..ae2b29911
--- /dev/null
+++ b/src/tests/meta.test.in
@@ -0,0 +1,4 @@
+[Test]
+Type=session
+Exec=@TEST_EXEC@ --tap
+Output=TAP
diff --git a/src/tests/runtest b/src/tests/runtest
index 35ccc5a0d..1fcc92830 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -200,7 +200,7 @@ if test -f $envfile ; then
     ENVS="`cat $envfile`"
 fi;
 if test x"$ENVS" = x ; then
-    run_test_case
+    run_test_case $@
 else
     LANG_backup=$LANG
     i=1
@@ -212,7 +212,7 @@ else
         export $e
         echo "Run `func_basename $tst` on $e"
         echo "======================="
-        run_test_case
+        run_test_case $@
         echo ""
         i=`expr $i + 1`
     done

From 2a4f9518d42b618d8111fa5f9f885757524758a0 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Jul 2019 21:12:40 +0900
Subject: [PATCH 568/816] src/tests: Rename test-console.sh to
 ibus-desktop-testing-runner

---
 src/tests/Makefile.am                                    | 9 +++++++++
 .../tests/ibus-desktop-testing-runner.in                 | 0
 2 files changed, 9 insertions(+)
 rename test/test-console.sh => src/tests/ibus-desktop-testing-runner.in (100%)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index ff31111b0..b9aad29a7 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -79,6 +79,7 @@ TESTS_ENVIRONMENT = \
 LOG_COMPILER = $(srcdir)/runtest
 
 if ENABLE_INSTALL_TESTS
+bin_SCRIPTS = ibus-desktop-testing-runner
 test_metas_in = meta.test.in
 test_execs = $(TESTS:ibus-compose=ibus-compose-locales)
 test_metas = $(addsuffix .test, $(test_execs))
@@ -109,12 +110,20 @@ ibus-compose-locales: ibus-compose-locales.in
 	mv $@.tmp $@; \
 	$(NULL)
 
+    ibus-desktop-testing-runner.in \
+ibus-desktop-testing-runner: ibus-desktop-testing-runner.in
+	SRCDIR=$(test_sourcesdir); \
+	sed -e "s|@SRCDIR[@]|$$SRCDIR|g" $< > $@.tmp; \
+	mv $@.tmp $@; \
+	$(NULL)
+
 EXTRA_DIST = \
     $(test_metas_in) \
     runtest \
     ibus-compose.emoji \
     ibus-compose.env \
     ibus-compose-locales.in \
+    ibus-desktop-testing-runner.in \
     $(NULL)
 
 ibus_bus_SOURCES = ibus-bus.c
diff --git a/test/test-console.sh b/src/tests/ibus-desktop-testing-runner.in
similarity index 100%
rename from test/test-console.sh
rename to src/tests/ibus-desktop-testing-runner.in

From fa081ac8ea37d2feb7c7f395ad66e7381b4cb65b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 12 Jul 2019 21:20:32 +0900
Subject: [PATCH 569/816] src/tests: Use gnome-desktop-testing-runner

---
 src/tests/Makefile.am                    |   4 +-
 src/tests/ibus-desktop-testing-runner.in | 154 ++++++++++++++++++-----
 2 files changed, 123 insertions(+), 35 deletions(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index b9aad29a7..913e42fb0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -105,8 +105,8 @@ $(test_metas): $(test_metas_in) $(test_programs)
 	$(NULL)
 
 ibus-compose-locales: ibus-compose-locales.in
-	SRCDIR=$(test_sourcesdir); \
-	sed -e "s|@SRCDIR[@]|$$SRCDIR|g" $< > $@.tmp; \
+	INSTALLEDDIR=$(datadir)/installed-tests; \
+	sed -e "s|@INSTALLEDDIR[@]|$$INSTALLEDDIR|g" $< > $@.tmp; \
 	mv $@.tmp $@; \
 	$(NULL)
 
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 9e6896349..a90c13784 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -2,7 +2,7 @@
 # -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 # vim:set noet ts=4:
 #
-# ibus-anthy - The Anthy engine for IBus
+# ibus - The Input Bus
 #
 # Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2018 Red Hat, Inc.
@@ -33,16 +33,32 @@ VERSION=0.1
 DISPLAY=:99.0
 BUILDDIR="."
 SRCDIR="."
-TEST_LOG=test-suite.log
+TEST_LOG="test-suite.log"
+RESULT_LOG=""
 HAVE_GRAPHICS=1
 DESKTOP_COMMAND="gnome-session"
 PID_XORG=0
 PID_GNOME_SESSION=0
+TESTING_RUNNER="default"
 TESTS=""
 GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0m'
 
+print_log()
+{
+    if [ x"$RESULT_LOG" != x ] ; then
+        # avoid 'echo -e' before call 'sed'.
+        if [ x"$1" = x'-e' ] ; then
+            shift
+        fi
+        NO_ESCAPE=`echo $@ | sed -e 's/\\\033\\[0;3.m//g' -e 's/\\\033\\[0m//g'`
+        echo $NO_ESCAPE >> $RESULT_LOG
+    else
+        echo $@
+    fi
+}
+
 usage()
 {
     echo -e \
@@ -57,13 +73,19 @@ usage()
 "-c, --no-graphics                Use Xvfb instead of Xorg\n"                  \
 "-d, --desktop=DESKTOP            Run DESTKTOP. The default is gnome-session\n" \
 "-t, --tests=\"TESTS...\"           Run TESTS programs which is separated by space\n" \
+"-r, --runner=RUNNER              Run TESTS programs with a test RUNNER.\n"    \
+"                                 RUNNDER = gnome or default.\n"               \
+"                                 default is an embedded runner.\n"            \
+"-o, --output=OUTPUT_FILE         OUtput the log to OUTPUT_FILE\n"             \
+"-O, --result=RESULT_FILE         OUtput the result to RESULT_FILE\n"          \
 ""
 }
 
 parse_args()
 {
     # This is GNU getopt. "sudo port getopt" in BSD?
-    ARGS=`getopt -o hvb:s:cd:t: --long help,version,builddir:,srcdir:,no-graphics,desktop:,tests:\
+    ARGS=`getopt -o hvb:s:cd:t:r:o:O: --long \
+          help,version,builddir:,srcdir:,no-graphics,desktop:,tests:,runner:,output:,result:\
         -- "$@"`;
     eval set -- "$ARGS"
     while [ 1 ] ; do
@@ -75,6 +97,9 @@ parse_args()
         -c | --no-graphics ) HAVE_GRAPHICS=0; shift;;
         -d | --desktop )     DESKTOP_COMMAND="$2"; shift 2;;
         -t | --tests )       TESTS="$2"; shift 2;;
+        -r | --runner )      TESTING_RUNNER="$2"; shift 2;;
+        -o | --output )      TEST_LOG="$2"; shift 2;;
+        -O | --result )      RESULT_LOG="$2"; shift 2;;
         -- )                 shift; break;;
         * )                  usage; exit 1;;
         esac
@@ -83,18 +108,31 @@ parse_args()
 
 init_desktop()
 {
+    if [ "$RESULT_LOG" != "" ] ; then
+        rm $RESULT_LOG
+    fi
+    if [ "$TEST_LOG" = "" ] ; then
+        print_log -e "${RED}FAIL${NC}: ${RED}ERROR${NC}: a log file is required to get return value with 'read' command"
+        abrt
+    else
+        rm $TEST_LOG
+    fi
     if test x$FORCE_TEST != x ; then
         RUN_ARGS="$RUN_ARGS --force"
     fi
 
     if test ! -f $HOME/.config/gnome-initial-setup-done ; then
+        IS_SYSTEM_ACCOUNT=false
+        if [ "$USER" = "root" ] ; then
+            IS_SYSTEM_ACCOUNT=true
+        fi
         if test ! -f /var/lib/AccountsService/users/$USER ; then
             mkdir -p /var/lib/AccountsService/users
             cat >> /var/lib/AccountsService/users/$USER << _EOF
 [User]
 Language=ja_JP.UTF-8
 XSession=gnome
-SystemAccount=false
+SystemAccount=$IS_SYSTEM_ACCOUNT
 _EOF
         fi
         mkdir -p $HOME/.config
@@ -167,71 +205,120 @@ echo_case_result()
 {
     retval=$1
     tst=$2
-    log=$3
-    subtst=${4:-''}
+    subtst=${3:-''}
 
     if test $retval -eq  0 ; then
-        echo -e "${GREEN}PASS${NC}: $tst $subtst"
+        print_log -e "${GREEN}PASS${NC}: $tst $subtst"
     else
-        echo -e "${RED}FAIL${NC}: $tst $subtst"
-        echo "FAIL: $tst $subtst" >> $TEST_LOG
-        echo "======================" >> $TEST_LOG
-        echo "" >> $TEST_LOG
-        cat "$log" >> $TEST_LOG
-        echo "" >> $TEST_LOG
+        print_log -e "${RED}FAIL${NC}: $tst $subtst"
+        print_log "======================"
+        print_log ""
     fi
 }
 
-run_test_suite()
+run_direct_test_cases()
 {
-    cd `dirname $0`
     pass=0
     fail=0
-
-    export GTK_IM_MODULE=ibus
-    export IBUS_COMPOSE_CACHE_DIR=$PWD
-    if test -f $TEST_LOG ; then
-        rm $TEST_LOG
-    fi
     for tst in $TESTS; do
         ENVS=
         if test -f $SRCDIR/${tst}.env ; then
             ENVS="`cat $SRCDIR/${tst}.env`"
         fi
         if test x"$ENVS" = x ; then
-            $BUILDDIR/$tst $SRCDIR >&${tst}.log
+            $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
             retval=$?
             read pass fail << EOF
             `count_case_result $retval $pass $fail`
 EOF
-            echo_case_result $retval $tst ${tst}.log
+            echo_case_result $retval $tst
+            CACHE_FILES=`ls *.cache`
+            if [ x"$CACHE_FILES" != x ] ; then
+                print_log "Clean $CACHE_FILES"
+                rm $CACHE_FILES
+            fi
         else
             LANG_backup=$LANG
             i=1
             for e in $ENVS; do
-                first=`echo "$e" | cut -c1-1`
+                first=`echo "$e" | grep '^#'`
                 if test x"$first" = x"#" ; then
                     continue
                 fi
                 export $e
-                $BUILDDIR/$tst $SRCDIR >&${tst}.${i}.log
+                $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
                 retval=$?
                 read pass fail << EOF
                 `count_case_result $retval $pass $fail`
 EOF
-                echo_case_result $retval $tst ${tst}.${i}.log $e
+                echo_case_result $retval $tst $e
+                CACHE_FILES=`ls *.cache`
+                if [ x"$CACHE_FILES" != x ] ; then
+                    print_log "Clean $CACHE_FILES"
+                    rm $CACHE_FILES
+                fi
                 i=`expr $i + 1`
             done
             export LANG=$LANG_backup
         fi
     done
+    echo $pass $fail
+}
+
+run_gnome_desktop_testing_runner()
+{
+    pass=0
+    fail=0
+    if [ x"$TESTS" = x ] ; then
+        TESTS='ibus'
+    fi
+    for tst in $TESTS; do
+        tst_dir="@INSTALLEDDIR@/$tst"
+        if [ ! -d "$tst_dir" ] ; then
+            print_log -e "${RED}FAIL${NC}: Not found %tst_dir"
+            fail=1
+            continue
+        fi
+        gnome-desktop-testing-runner $tst 2>>$TEST_LOG 1>>$TEST_LOG
+        retval=$?
+        read pass fail << EOF
+        `count_case_result $retval $pass $fail`
+EOF
+    done
+    echo $pass $fail
+}
+
+run_test_suite()
+{
+    pass=0
+    fail=0
+    export GTK_IM_MODULE=ibus
+    export IBUS_COMPOSE_CACHE_DIR=$PWD
+    if [ x"$TESTING_RUNNER" = x ] ; then
+        TESTING_RUNNER="default"
+    fi
+    case $TESTING_RUNNER in
+    default)
+        # Get only the last value with do-while.
+        read pass fail << EOF_RUNNER
+        `run_direct_test_cases`
+EOF_RUNNER
+        ;;
+    gnome)
+        read pass fail << EOF_RUNNER
+        `run_gnome_desktop_testing_runner`
+EOF_RUNNER
+        ;;
+    esac
     echo ""
-    echo -e "# ${GREEN}PASS${NC}: $pass"
-    echo -e "# ${RED}FAIL${NC}: $fail"
-    if test -f ${TEST_LOG} ; then
-        echo ""
-        echo -e "${RED}See ${TEST_LOG}$NC"
+    if [ $pass -ne 0 ] ; then
+        print_log -e "${GREEN}PASS${NC}: $pass"
     fi
+    if [ $fail -ne 0 ] ; then
+        print_log -e "${RED}FAIL${NC}: $fail"
+    fi
+    echo ""
+    echo "See ${TEST_LOG}"
 }
 
 finit()
@@ -240,14 +327,15 @@ finit()
         ibus exit
     fi
     kill $PID_GNOME_SESSION $PID_XORG
+    echo "Finished $PROGNAME testing"
 }
 
 main()
 {
     parse_args $@
     init_desktop
-    run_dbus_daemon
-    run_desktop
+    run_dbus_daemon 2>>$TEST_LOG 1>>$TEST_LOG
+    run_desktop 2>>$TEST_LOG 1>>$TEST_LOG
     run_test_suite
     finit
 }

From 85b647a1c57c206779eb0b4b15a734c1b1f29c10 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 24 Jul 2019 17:27:37 +0900
Subject: [PATCH 570/816] src/tests: Fix IBus test cases for
 gnome-desktop-testing

- dconf/config.c: Replaced dconf_client_write_fast() with
  dconf_client_write_sync() because
  dconf_client_write_fast() does not syn the data when
  ibus_config_get_values() is called immediately after
  ibus_config_set_value() is called.

- ibus-compose-locales.in returns the return value of ibus-compose

- ibus-compose: Set $NO_AT_BRIDGE to suppress a AT_SPI warning
  and call g_log_set_always_fatal() because GtkIMContextSimple
  does not support multiple compose outputs yet and the API can
  suppress a warning.

- ibus-config: Delete async watch testings which causes several errors
  with gnome-shell testing and the testing is now deprecated and
  GSettings is recommended.

- ibus-desktop-testing-runner.in: Support --output=log:stdout to
  cat the log to stdout and Use dbus-launch --exit-with-session instead of
  --sh-syntax and count PASS of test cases instead of PASS of
  gnome-desktop-testing and always run ibus exit and kill
  gnome-shell-calendar-server

- ibus-engine-switch.c: Set xkb:jp::jpn if gnome-shell sets xkb:us::eng

- ibus-inputcontext.c: Use ibus_bus_get_global_engine() instead of
  ibus_bus_list_active_engines() since ibus_bus_list_active_engines()
  does not work with gnome-shell and the API is now deprecated.

- ibus-keypress.c: Set $NO_AT_BRIDGE to suppress a AT_SPI warning
---
 conf/dconf/config.c                      |  14 +-
 src/tests/Makefile.am                    |  19 +-
 src/tests/ibus-compose-locales.in        |   4 +-
 src/tests/ibus-compose.c                 |  10 +-
 src/tests/ibus-config.c                  | 283 -----------------------
 src/tests/ibus-desktop-testing-runner.in |  77 +++---
 src/tests/ibus-engine-switch.c           |  34 ++-
 src/tests/ibus-inputcontext.c            |  29 +--
 src/tests/ibus-keypress.c                |   4 +
 9 files changed, 126 insertions(+), 348 deletions(-)

diff --git a/conf/dconf/config.c b/conf/dconf/config.c
index 500ea1d8f..30ac137d4 100644
--- a/conf/dconf/config.c
+++ b/conf/dconf/config.c
@@ -335,7 +335,19 @@ ibus_config_dconf_set_value (IBusConfigService *config,
     }
 
 #ifdef DCONF_0_13_4
-    retval = dconf_client_write_fast (client, gkey, value, error);
+    /* Use dconf_client_write_sync() instead of dconf_client_write_fast()
+     * because dconf_client_write_fast() does not sync the data when
+     * ibus_config_get_values() is called immediately after
+     * ibus_config_set_value() is called.
+     * We won't add a new API for the sync only since IBusConfig is
+     * now deprecated and GSettings is recommended.
+     */
+    retval = dconf_client_write_sync (client,
+                                      gkey,
+                                      value,
+                                      NULL,
+                                      NULL,
+                                      error);
 #else
     retval = dconf_client_write (client,
                                  gkey,
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 913e42fb0..2e75932c5 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -55,6 +55,8 @@ TESTS = \
     ibus-util                       \
     $(NULL)
 
+CLEANFILES =
+
 if ENABLE_ENGINE
 TESTS += ibus-engine-switch
 endif
@@ -90,9 +92,17 @@ test_sources_DATA = \
     $(NULL)
 test_sourcesdir = $(datadir)/installed-tests/ibus
 
+CLEANFILES += \
+    $(test_metas) \
+    ibus-desktop-testing-runner \
+    $(NULL)
+
 test_execs_PROGRAMS = $(TESTS)
 if ENABLE_GTK3
 test_execs_SCRIPTS = ibus-compose-locales
+CLEANFILES += \
+    ibus-compose-locales \
+    $(NULL)
 endif
 test_execsdir = $(libexecdir)/installed-tests/ibus
 endif
@@ -105,15 +115,14 @@ $(test_metas): $(test_metas_in) $(test_programs)
 	$(NULL)
 
 ibus-compose-locales: ibus-compose-locales.in
-	INSTALLEDDIR=$(datadir)/installed-tests; \
-	sed -e "s|@INSTALLEDDIR[@]|$$INSTALLEDDIR|g" $< > $@.tmp; \
+	SRCDIR=$(test_sourcesdir); \
+	sed -e "s|@SRCDIR[@]|$$SRCDIR|g" $< > $@.tmp; \
 	mv $@.tmp $@; \
 	$(NULL)
 
-    ibus-desktop-testing-runner.in \
 ibus-desktop-testing-runner: ibus-desktop-testing-runner.in
-	SRCDIR=$(test_sourcesdir); \
-	sed -e "s|@SRCDIR[@]|$$SRCDIR|g" $< > $@.tmp; \
+	INSTALLEDDIR=$(datadir)/installed-tests; \
+	sed -e "s|@INSTALLEDDIR[@]|$$INSTALLEDDIR|g" $< > $@.tmp; \
 	mv $@.tmp $@; \
 	$(NULL)
 
diff --git a/src/tests/ibus-compose-locales.in b/src/tests/ibus-compose-locales.in
index 8d2384d1d..fad029656 100755
--- a/src/tests/ibus-compose-locales.in
+++ b/src/tests/ibus-compose-locales.in
@@ -6,6 +6,7 @@ BUILDDIR=`dirname $0`
 
 export IBUS_COMPOSE_CACHE_DIR=$PWD
 
+retval=0
 for var in `cat $SRCDIR/ibus-compose.env`
 do
     IS_COMMENT=`echo "$var" | grep "^#"`
@@ -13,6 +14,7 @@ do
         continue
     fi
     env $var $BUILDDIR/ibus-compose $SRCDIR $@
+    retval=`expr $retval + $?`
 
     CACHE_FILES=`ls *.cache`
     if [ x"$CACHE_FILES" != x ] ; then
@@ -20,4 +22,4 @@ do
         rm $CACHE_FILES
     fi
 done
-
+exit $retval
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index c8d3c126c..db3594773 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -344,20 +344,26 @@ test_compose (void)
 int
 main (int argc, char *argv[])
 {
+    GLogLevelFlags flags;
     const gchar *test_name;
     gchar *test_path;
 
     ibus_init ();
+    /* Avoid a warning of "AT-SPI: Could not obtain desktop path or name"
+     * with gtk_main().
+     */
+    g_setenv ("NO_AT_BRIDGE", "1", TRUE);
     g_test_init (&argc, &argv, NULL);
     /* FIXME:
      * IBusIMContext opens GtkIMContextSimple as the slave and
      * GtkIMContextSimple opens the compose table on el_GR.UTF-8, and the
-     * multiple outputs in el_GR's compose causes a warning in gtkcomposetable 
+     * multiple outputs in el_GR's compose causes a warning in gtkcomposetable
      * and the warning always causes a fatal in GTest:
      " "GTK+ supports to output one char only: "
      */
-    g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+    flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
     gtk_init (&argc, &argv);
+    g_log_set_always_fatal (flags);
 
     m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
     m_compose_file = g_strdup (g_getenv ("COMPOSE_FILE"));
diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index c6141ab55..9b925ad9e 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -133,254 +133,6 @@ test_config_set_get (void)
     g_object_unref (config);
 }
 
-typedef struct {
-    GMainLoop *loop;
-    guint timeout_id;
-    gchar *section;
-    gchar *name;
-} WatchData;
-
-typedef struct {
-    gchar *section;
-    gchar *name;
-} WatchKey;
-
-typedef struct {
-    WatchKey *watched;          /* watched keys (null-terminated) */
-    WatchKey *changed;          /* changed keys (null-terminated) */
-    WatchKey *notified;         /* notified keys (same length as
-                                   changed, not null-terminated) */
-} WatchTestData;
-
-static WatchKey default_watched[] = {
-    { NULL }
-};
-static WatchKey default_changed[] = {
-    { "test/s1", "n1" },
-    { "test/s1", "n2" },
-    { "test/s2", "n1" },
-    { "test/s2", "n2" },
-    { NULL }
-};
-static WatchKey default_notified[] = {
-    { "test/s1", "n1" },
-    { "test/s1", "n2" },
-    { "test/s2", "n1" },
-    { "test/s2", "n2" }
-};
-static WatchTestData default_data = {
-    default_watched,
-    default_changed,
-    default_notified
-};
-
-static WatchKey section_watched[] = {
-    { "test/s1", NULL },
-    { NULL }
-};
-static WatchKey section_notified[] = {
-    { "test/s1", "n1" },
-    { "test/s1", "n2" },
-    { NULL, NULL },
-    { NULL, NULL },
-};
-static WatchTestData section_data = {
-    section_watched,
-    default_changed,
-    section_notified
-};
-
-static WatchKey section_multiple_watched[] = {
-    { "test/s1", NULL },
-    { "test/s2", NULL },
-    { NULL }
-};
-static WatchKey section_multiple_notified[] = {
-    { "test/s1", "n1" },
-    { "test/s1", "n2" },
-    { "test/s2", "n1" },
-    { "test/s2", "n2" },
-};
-static WatchTestData section_multiple_data = {
-    section_multiple_watched,
-    default_changed,
-    section_multiple_notified
-};
-
-static WatchKey section_name_watched[] = {
-    { "test/s1", "n1" },
-    { NULL }
-};
-static WatchKey section_name_notified[] = {
-    { "test/s1", "n1" },
-    { NULL, NULL },
-    { NULL, NULL },
-    { NULL, NULL },
-};
-static WatchTestData section_name_data = {
-    section_name_watched,
-    default_changed,
-    section_name_notified
-};
-
-static WatchKey section_name_multiple_watched[] = {
-    { "test/s1", "n1" },
-    { "test/s2", "n2" },
-    { NULL }
-};
-static WatchKey section_name_multiple_notified[] = {
-    { "test/s1", "n1" },
-    { NULL, NULL },
-    { NULL, NULL },
-    { "test/s2", "n2" },
-};
-static WatchTestData section_name_multiple_data = {
-    section_name_multiple_watched,
-    default_changed,
-    section_name_multiple_notified
-};
-
-typedef struct {
-    IBusConfig *config;
-    WatchData data;
-} WatchFixture;
-
-static void
-value_changed_cb (IBusConfig  *config,
-                  const gchar *section,
-                  const gchar *name,
-                  GVariant    *value,
-                  gpointer     user_data)
-{
-    WatchData *data = (WatchData *) user_data;
-
-    data->section = g_strdup (section);
-    data->name = g_strdup (name);
-
-    g_main_loop_quit (data->loop);
-}
-
-static gboolean
-timeout_cb (gpointer user_data)
-{
-    WatchData *data = (WatchData *) user_data;
-    g_main_loop_quit (data->loop);
-    data->timeout_id = 0;
-    return FALSE;
-}
-
-static void
-change_and_test (IBusConfig  *config,
-                 const gchar *section,
-                 const gchar *name,
-                 const gchar *expected_section,
-                 const gchar *expected_name,
-                 WatchData   *data)
-{
-    gboolean retval;
-    GVariant *var;
-
-    data->section = NULL;
-    data->name = NULL;
-
-    /* Unset won't notify value-changed signal. */
-    var = ibus_config_get_values (config, section);
-    if (var != NULL) {
-        GVariant *value = g_variant_lookup_value (var, name,
-                                                  G_VARIANT_TYPE_VARIANT);
-        if (value != NULL) {
-            ibus_config_unset (config, section, name);
-            g_variant_unref (value);
-        }
-        g_variant_unref (var);
-    }
-
-    data->timeout_id = g_timeout_add (1, timeout_cb, data);
-    g_main_loop_run (data->loop);
-    if (data->timeout_id != 0) {
-        g_source_remove (data->timeout_id);
-    }
-
-    retval = ibus_config_set_value (config, section, name,
-                                    g_variant_new_int32 (1));
-    g_assert (retval);
-
-    data->timeout_id = g_timeout_add (1, timeout_cb, data);
-    g_main_loop_run (data->loop);
-    if (data->timeout_id != 0) {
-        g_source_remove (data->timeout_id);
-    }
-
-    g_assert_cmpstr (data->section, ==, expected_section);
-    g_assert_cmpstr (data->name, ==, expected_name);
-
-    g_free (data->section);
-    g_free (data->name);
-}
-
-static void
-watch_fixture_setup (WatchFixture *fixture, gconstpointer user_data)
-{
-    fixture->config = ibus_config_new (ibus_bus_get_connection (bus),
-                                       NULL,
-                                       NULL);
-    g_assert (fixture->config);
-
-    fixture->data.loop = g_main_loop_new (NULL, FALSE);
-    g_signal_connect (fixture->config, "value-changed",
-                      G_CALLBACK (value_changed_cb), &fixture->data);
-}
-
-static void
-watch_fixture_teardown (WatchFixture *fixture, gconstpointer user_data)
-{
-    g_main_loop_unref (fixture->data.loop);
-
-    ibus_proxy_destroy (IBUS_PROXY (fixture->config));
-    g_object_unref (fixture->config);
-}
-
-static void
-test_config_watch (WatchFixture *fixture, gconstpointer user_data)
-{
-    const WatchTestData *data = user_data;
-    gint i;
-
-    for (i = 0; data->watched[i].section != NULL; i++) {
-        ibus_config_watch (fixture->config,
-                           data->watched[i].section,
-                           data->watched[i].name);
-    }
-    for (i = 0; data->changed[i].section != NULL; i++) {
-        change_and_test (fixture->config,
-                         data->changed[i].section,
-                         data->changed[i].name,
-                         data->notified[i].section,
-                         data->notified[i].name,
-                         &fixture->data);
-    }
-    for (i = 0; data->watched[i].section != NULL; i++) {
-        ibus_config_unwatch (fixture->config,
-                             data->watched[i].section,
-                             data->watched[i].name);
-    }
-    if (i > 0) {
-        /* Check if the above unwatch takes effect. */
-        for (i = 0; data->changed[i].section != NULL; i++) {
-            change_and_test (fixture->config,
-                             data->changed[i].section,
-                             data->changed[i].name,
-                             NULL,
-                             NULL,
-                             &fixture->data);
-        }
-    } else {
-        /* Since we reuse single D-Bus connection, we need to remove the
-           default match rule for the next ibus_config_new() call.  */
-        ibus_config_unwatch (fixture->config, NULL, NULL);
-    }
-}
-
 gint
 main (gint    argc,
       gchar **argv)
@@ -390,41 +142,6 @@ main (gint    argc,
     g_test_init (&argc, &argv, NULL);
     bus = ibus_bus_new ();
 
-    g_test_add ("/ibus/config-watch/default",
-                WatchFixture,
-                &default_data,
-                watch_fixture_setup,
-                test_config_watch,
-                watch_fixture_teardown);
-
-    g_test_add ("/ibus/config-watch/section",
-                WatchFixture,
-                &section_data,
-                watch_fixture_setup,
-                test_config_watch,
-                watch_fixture_teardown);
-
-    g_test_add ("/ibus/config-watch/section-multiple",
-                WatchFixture,
-                &section_multiple_data,
-                watch_fixture_setup,
-                test_config_watch,
-                watch_fixture_teardown);
-
-    g_test_add ("/ibus/config-watch/section-name",
-                WatchFixture,
-                &section_name_data,
-                watch_fixture_setup,
-                test_config_watch,
-                watch_fixture_teardown);
-
-    g_test_add ("/ibus/config-watch/section-name-multiple",
-                WatchFixture,
-                &section_name_multiple_data,
-                watch_fixture_setup,
-                test_config_watch,
-                watch_fixture_teardown);
-
     g_test_add_func ("/ibus/create-config-async", test_create_config_async);
     g_test_add_func ("/ibus/config-set-get", test_config_set_get);
 
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index a90c13784..b7a722856 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -34,9 +34,10 @@ DISPLAY=:99.0
 BUILDDIR="."
 SRCDIR="."
 TEST_LOG="test-suite.log"
+TEST_LOG_STDOUT=0
 RESULT_LOG=""
 HAVE_GRAPHICS=1
-DESKTOP_COMMAND="gnome-session"
+DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
 PID_XORG=0
 PID_GNOME_SESSION=0
 TESTING_RUNNER="default"
@@ -109,19 +110,26 @@ parse_args()
 init_desktop()
 {
     if [ "$RESULT_LOG" != "" ] ; then
-        rm $RESULT_LOG
+        if [ -f $RESULT_LOG ] ; then
+            rm $RESULT_LOG
+        fi
+    fi
+    HAS_STDOUT=`echo "$TEST_LOG" | grep ':stdout'`
+    if [ x"$HAS_STDOUT" != x ] ; then
+        TEST_LOG=`echo "$TEST_LOG" | sed -e 's|:stdout||'`
+        TEST_LOG_STDOUT=1
     fi
     if [ "$TEST_LOG" = "" ] ; then
         print_log -e "${RED}FAIL${NC}: ${RED}ERROR${NC}: a log file is required to get return value with 'read' command"
-        abrt
-    else
+        exit -1
+    elif [ -f $TEST_LOG ] ; then
         rm $TEST_LOG
     fi
-    if test x$FORCE_TEST != x ; then
+    if [ x$FORCE_TEST != x ] ; then
         RUN_ARGS="$RUN_ARGS --force"
     fi
 
-    if test ! -f $HOME/.config/gnome-initial-setup-done ; then
+    if [ ! -f $HOME/.config/gnome-initial-setup-done ] ; then
         IS_SYSTEM_ACCOUNT=false
         if [ "$USER" = "root" ] ; then
             IS_SYSTEM_ACCOUNT=true
@@ -141,7 +149,7 @@ _EOF
 
     # Prevent from launching a XDG dialog
     XDG_LOCALE_FILE="$HOME/.config/user-dirs.locale"
-    if test -f $XDG_LOCALE_FILE ; then
+    if [ -f $XDG_LOCALE_FILE ] ; then
         XDG_LANG_ORIG=`cat $XDG_LOCALE_FILE`
         XDG_LANG_NEW=`echo $LANG | sed -e 's/\(.*\)\..*/\1/'`
         if [ "$XDG_LANG_ORIG" != "$XDG_LANG_NEW" ] ; then
@@ -153,19 +161,8 @@ _EOF
 
 run_dbus_daemon()
 {
-    a=`ps -ef | grep dbus-daemon | grep "\-\-system" | grep -v session | grep -v grep`
-    if test x"$a" = x ; then
-        eval `dbus-launch --sh-syntax`
-    fi
-    SUSER=`echo "$USER" | cut -c 1-7`
-    a=`ps -ef | grep dbus-daemon | grep "$SUSER" | grep -v gdm | grep session | grep -v grep`
-    if test x"$a" = x ; then
-        systemctl --user start dbus
-        export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/bus
-    fi
-    systemctl --user status dbus | col -b
-    ps -ef | grep dbus-daemon | grep "$SUSER" | grep -v gdm | egrep 'session|system' | grep -v grep
-    systemctl --user show-environment | col -b
+    # Use dbus-launch --exit-with-session later instead of --sh-syntax
+    export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/bus
 }
 
 run_desktop()
@@ -181,7 +178,8 @@ run_desktop()
     $DESKTOP_COMMAND &
     PID_GNOME_SESSION=$!
     sleep 30
-    if test "$DESKTOP_COMMAND" != "gnome-session" ; then
+    HAS_GNOME=`echo $DESKTOP_COMMAND | grep gnome-session`
+    if [ x"$HAS_GNOME" = x ] ; then
         ibus-daemon --daemonize --verbose
         sleep 1
     fi
@@ -285,6 +283,16 @@ run_gnome_desktop_testing_runner()
         `count_case_result $retval $pass $fail`
 EOF
     done
+    child_pass=`grep '^PASS:' $TEST_LOG | wc -l`
+    child_fail=`grep '^FAIL:' $TEST_LOG | wc -l`
+    if [ $child_pass -ne 0 -o $child_fail -ne 0 ] ; then
+        pass=$child_pass
+        if [ $child_fail -ne 0 ] ; then
+            fail=`expr $child_fail / 2`
+        else
+            fail=0
+        fi
+    fi
     echo $pass $fail
 }
 
@@ -311,22 +319,29 @@ EOF_RUNNER
         ;;
     esac
     echo ""
-    if [ $pass -ne 0 ] ; then
-        print_log -e "${GREEN}PASS${NC}: $pass"
-    fi
-    if [ $fail -ne 0 ] ; then
-        print_log -e "${RED}FAIL${NC}: $fail"
-    fi
+    print_log -e "${GREEN}PASS${NC}: $pass"
+    print_log -e "${RED}FAIL${NC}: $fail"
     echo ""
-    echo "See ${TEST_LOG}"
+    if [ $TEST_LOG_STDOUT -eq 1 ] ; then
+        cat $TEST_LOG
+    else
+        echo "See $TEST_LOG"
+    fi
 }
 
 finit()
 {
-    if test "$DESKTOP_COMMAND" != "gnome-session" ; then
-        ibus exit
-    fi
+    echo "Killing left gnome-session and Xorg"
     kill $PID_GNOME_SESSION $PID_XORG
+    ibus exit
+    SUSER=`echo "$USER" | cut -c 1-7`
+    LEFT_CALENDAR=`ps -ef | grep gnome-shell-calendar-server | grep $SUSER | grep -v grep`
+    if [ x"$LEFT_CALENDAR" != x ] ; then
+        echo "Killing left gnome-shell-calendar-server"
+        echo "$LEFT_CALENDAR"
+        echo "$LEFT_CALENDAR" | awk '{print $2}' | xargs kill
+    fi
+
     echo "Finished $PROGNAME testing"
 }
 
diff --git a/src/tests/ibus-engine-switch.c b/src/tests/ibus-engine-switch.c
index 5c2bd5167..a1eeba2a3 100644
--- a/src/tests/ibus-engine-switch.c
+++ b/src/tests/ibus-engine-switch.c
@@ -13,17 +13,25 @@ static const gchar *engine_names[] = {
     AFTER_ENGINE
 };
 
+static const gchar *engine_names2[] = {
+    AFTER_ENGINE,
+    BEFORE_ENGINE
+};
+
 static void
-change_global_engine (void)
+change_global_engine (gboolean reverse)
 {
     gint i;
 
     for (i = 0; i < G_N_ELEMENTS (engine_names); i++) {
-        ibus_bus_set_global_engine (bus, engine_names[i]);
+        const gchar *engine_name = engine_names[i];
+        if (reverse)
+            engine_name = engine_names2[i];
+        ibus_bus_set_global_engine (bus, engine_name);
         IBusEngineDesc *engine_desc = ibus_bus_get_global_engine (bus);
         g_assert_cmpstr (ibus_engine_desc_get_name (engine_desc),
                          ==,
-                         engine_names[i]);
+                         engine_name);
         g_object_unref (G_OBJECT (engine_desc));
     }
 }
@@ -46,6 +54,7 @@ typedef struct {
     gint count;
     guint timeout_id;
     guint idle_id;
+    gboolean reverse;
 } GlobalEngineChangedData;
 
 static void
@@ -70,7 +79,7 @@ static gboolean
 change_global_engine_cb (gpointer user_data)
 {
     GlobalEngineChangedData *data = (GlobalEngineChangedData *) user_data;
-    change_global_engine ();
+    change_global_engine (data->reverse);
     data->idle_id = 0;
     return FALSE;
 }
@@ -78,12 +87,25 @@ change_global_engine_cb (gpointer user_data)
 static void
 test_global_engine (void)
 {
+    GLogLevelFlags flags;
+    IBusEngineDesc *desc;
     GlobalEngineChangedData data;
     guint handler_id;
 
     if (!ibus_bus_get_use_global_engine (bus))
         return;
 
+    /* "No global engine." warning is not critical message. */
+    flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+    desc = ibus_bus_get_global_engine (bus);
+    g_log_set_always_fatal (flags);
+    if (desc &&
+        !g_strcmp0 (BEFORE_ENGINE, ibus_engine_desc_get_name (desc))) {
+        data.reverse = TRUE;
+    } else {
+        data.reverse = FALSE;
+    }
+
     data.count = 0;
 
     handler_id = g_signal_connect (bus,
@@ -141,7 +163,7 @@ test_context_engine_set_by_global (void)
     /* ibus_bus_set_global_engine() changes focused context engine. */
     ibus_input_context_focus_in (context);
 
-    change_global_engine ();
+    change_global_engine (FALSE);
 
     /* ibus_input_context_set_engine() does not take effect when
        global engine is used. */
@@ -170,7 +192,7 @@ test_context_engine_set_by_focus (void)
 
     ibus_input_context_focus_in (context);
 
-    change_global_engine ();
+    change_global_engine (FALSE);
 
     /* When focus is lost, context engine is set to "dummy". */
     ibus_input_context_focus_in (another_context);
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index fab183aa9..ed04bd64e 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -37,18 +37,6 @@ fatal_handler(const gchar *log_domain,
     return TRUE;
 }
 
-static gchar *
-get_last_engine_id (const GList *engines)
-{
-    const char *result = NULL;
-    for (; engines; engines = g_list_next (engines)) {
-        IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data);
-        g_assert (engine_desc);
-        result = ibus_engine_desc_get_name (engine_desc);
-    }
-    return g_strdup (result);
-}
-
 static void
 call_basic_ipcs (IBusInputContext *context)
 {
@@ -68,18 +56,23 @@ call_basic_ipcs (IBusInputContext *context)
 static void
 test_input_context (void)
 {
-    GList *engines;
-    gchar *active_engine_name = NULL;
     IBusInputContext *context;
+    GLogLevelFlags flags;
     IBusEngineDesc *engine_desc;
+    gchar *active_engine_name = NULL;
     gchar *current_ic;
 
     context = ibus_bus_create_input_context (bus, "test");
     call_basic_ipcs (context);
 
-    engines = ibus_bus_list_active_engines (bus);
-    if (engines != NULL) {
-        active_engine_name = get_last_engine_id (engines);
+    /* "No global engine." warning is not critical message. */
+    flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+    engine_desc = ibus_bus_get_global_engine (bus);
+    g_log_set_always_fatal (flags);
+    if (engine_desc != NULL) {
+        active_engine_name = g_strdup (ibus_engine_desc_get_name(engine_desc));
+        g_object_unref (engine_desc);
+        engine_desc = NULL;
     } else {
         active_engine_name = g_strdup ("dummy");
     }
@@ -111,8 +104,6 @@ test_input_context (void)
     g_object_unref (context);
 
     g_free (active_engine_name);
-    g_list_foreach (engines, (GFunc) g_object_unref, NULL);
-    g_list_free (engines);
 }
 
 static void
diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
index 179202268..dd1b0042d 100644
--- a/src/tests/ibus-keypress.c
+++ b/src/tests/ibus-keypress.c
@@ -288,6 +288,10 @@ int
 main (int argc, char *argv[])
 {
     ibus_init ();
+    /* Avoid a warning of "AT-SPI: Could not obtain desktop path or name"
+     * with gtk_main().
+     */
+    g_setenv ("NO_AT_BRIDGE", "1", TRUE);
     g_test_init (&argc, &argv, NULL);
     gtk_init (&argc, &argv);
 

From 05d03b9c89d5c4eeed2d437d41fb963439fdd472 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 25 Jul 2019 13:17:29 +0900
Subject: [PATCH 571/816] Update translations

Update po/da.po po/fr.po po/hu.po po/id.po po/ja.po po/nl.po po/pa.po
       po/pl.po po/pt_BR.po po/sv.po po/uk.po po/zh_TW.po
---
 po/LINGUAS  |    1 +
 po/da.po    | 1963 ++++++++++++++++++++++++++-----------------------
 po/fr.po    |  273 ++++---
 po/hu.po    |  287 +++++---
 po/id.po    |  735 +++++++++++++++++++
 po/ja.po    |  273 ++++---
 po/nl.po    |  273 ++++---
 po/pa.po    | 1918 +++++++++++++++++++++++++-----------------------
 po/pl.po    |  273 ++++---
 po/pt_BR.po | 2016 ++++++++++++++++++++++++++++-----------------------
 po/sv.po    | 1961 ++++++++++++++++++++++++++-----------------------
 po/uk.po    |  273 ++++---
 po/zh_TW.po | 1921 +++++++++++++++++++++++++-----------------------
 13 files changed, 7009 insertions(+), 5158 deletions(-)
 create mode 100644 po/id.po

diff --git a/po/LINGUAS b/po/LINGUAS
index ba00b8988..8e2704486 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -19,6 +19,7 @@ he
 hi
 hu
 ia
+id
 it
 ja
 kn
diff --git a/po/da.po b/po/da.po
index b7ea6e1c9..84925242c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,387 +5,62 @@
 #
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2009,2011
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # scootergrisen <scootergrisen@gmail.com>, 2018. #zanata
+# scootergrisen <scootergrisen@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-09-22 05:53+0000\n"
+"PO-Revision-Date: 2019-06-22 05:37+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Vandret"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Lodret"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Øverste venstre hjørne"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Øverste højre hjørne"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Nederste venstre hjørne"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Nederste højre hjørne"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Tilpasset"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Vis ikke"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Skjul automatisk"
-
-#: ../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 "IBus-præferencer"
-
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Genvejstaster for skift til den næste inputmetode i listen"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Næste inputmetode:"
-
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Genvejstaster for skift til den forrige inputmetode i listen"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Forrige inputmetode:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Genvejstasterne for at tænde og slukke inputmetode"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Aktivér eller deaktivér:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Aktivér:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Deaktivér:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastaturgenveje</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Angiv orientering af kandidater i opslagstabel"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientering for kandidater:"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Angiv opførsel for hvordan IBus skal vises eller sprogpanelet"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Vis egenskabspanel:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Placering af sprogpanel:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Vis ikon i systembakke"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Vis navn på inputmetode i sprogpanel"
-
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "Vis inputmetodens navn i sprogpanelet når tjek-boksen er vinget af"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Indlejr forudredigeret tekst i programvindue"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Indlejr forudredigeret tekst for inputmetode i programvinduet"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Brug tilpasset skrifttype:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Skrifttype og stil</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Generelt"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Tilføj"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Tilføj de valgte inputmetoder i de aktiverede inputmetoder"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Fjern"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Fjern den valgte inputmetode fra de aktiverede inputmetoder"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Op"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Flyt den valgte inputmetode op i listen over aktiverede inputmetode"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Ned"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Flyt den valgte inputmetode i de aktiverede inputmetoder ned"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Om"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Vis information om den valgte inputmetode"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Præferencer"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Vis opsætning for den valgte input-metode"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Den aktive inputmetode kan skiftes til en anden i listen ovenfor, "
-"ved at trykke på tastaturgenvejene eller ved at klikke på panelikonet.</i></"
-"small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Inputmetode"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-"Genvejstasterne til at aktivere samtaler med emoji-annoteringer eller "
-"unicode-navne"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Emoji-annotering:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Genvejstasterne til at aktivere unicode-kodepunktssamtaler"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode-kodepunkt:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Sæt en skrifttype af unicode-kandidater i emoji-dialogen"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode-skrifttype:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Sæt et sprog af emoji-kandidater i emoji-dialogen"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Emoji annoteringssprog:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Match emoji-annoteringer delvist med følgende betingelse og flere end "
-"antallet af tegn:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Hvorvidt emoji-annonteringer kan matches med en delvis streng i stedet for "
-"det præcise match"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Præfiks match"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Suffiks match"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Indeholdende match"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Brug systemets tastaturlayout"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Brug systemets tastaturlayout (XKB)"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastaturlayout</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Del den samme inputmetode i alle programmer"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Indstillinger for global inputmetode</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligente inputbus</small>\n"
-"Hjemmeside: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Start ibus ved login"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Opstart</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Om"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Luk"
-
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Forindlæs motorer"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Forindlæs motorer under opstarten af IBus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Rækkefølge for motorer"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr "Gemte rækkefølge på motorer i inputmetodeliste"
+msgstr "Gemte rækkefølge på motorer i indtastningsmetodeliste"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Pop op-forsinkelse i millisekunder for IME-skifter-vindue"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
 "Sæt pop op-forsinkelse millisekunder som IME-skifter-vindue skal vises. "
-"Standarden er 400. 0 = Vis vinduet med det samme. 0 &lt; Forsinkelse "
-"millisekunder. 0 &gt; Vis ikke vinduet og skift til forrige/næste motorer."
+"Standarden er 400. 0 = Vis vinduet med det samme. 0 < Forsinkelse "
+"millisekunder. 0 > Vis ikke vinduet og skift til forrige/næste motorer."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Gemt versionsnummer"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -393,70 +68,121 @@ msgstr ""
 "Det gemte versionnummer vil blive brugt til at tjekke forskellen mellem "
 "versionen af den tidligere installerede ibus og en af den nuværende ibus."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Latinske layout som ikke har nogen ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US-layout tilføjes til de Latinske layouts. Variant kan udelades."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Brug xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Kør xmodmap hvis .xmodmap eller .Xmodmap findes når der skiftes ibus-motorer."
 ""
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Brug systemets tastaturlayout"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Brug systemets tastaturlayout (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Indbyg forudredigeret tekst"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Indlejr forudredigeret tekst i programvindue"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Brug global indtastningsmetode"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Brug den samme indtastningsmetode i alle programmer"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Aktivér indtastningsmetode som standard"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Aktivér indtastningsmetode som standard når programmet modtager "
+"indtastningsfokus"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf bevar navnepræfiks"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Præfiks af DConf-taster til stop af navnekonvertering"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Udløs tastaturgenveje"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Genvejstasterne for at tænde og slukke indtastningsmetode"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Udløs tastaturgenveje for gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Aktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
-msgstr "Genvejstasterne for at tænde inputmetode"
+msgstr "Genvejstasterne for at tænde indtastningsmetode"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Deaktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr "Genvejstasterne for slukning af inputmetode"
+msgstr "Genvejstasterne for slukning af indtastningsmetode"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Genvejstaster for næste motor"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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"
+msgstr "Genvejstasterne for at skrive til næste indtastningsmetode i listen"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Genvejstaster for forrige motor"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "Genvejstasterne for at skifte til forrige inputmetode"
+msgstr "Genvejstasterne for at skifte til forrige indtastningsmetode"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Skjul automatisk"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -464,24 +190,16 @@ msgstr ""
 "Opførsel for egenskabspanelet. 0 = Vis ikke, 1 = Skjul automatisk, 2 = Vis "
 "altid"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Placering for sprogpanel"
 
-#: ../data/ibus.schemas.in.h:29
-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 = "
-"Tilpasset"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Følg inputmarkøren hvis panelet altid vises"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -489,11 +207,11 @@ msgstr ""
 "Hvis sand, følger panelet inputmarkøren hvis panelet altid vises. Hvis "
 "falsk, vises panelet på en fastsat placering."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Millisekunder som egenskabspanelet skal vises i"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -501,24 +219,33 @@ msgstr ""
 "Millisekunderne som egenskabspanelet skal vises i efter fokus-ind eller "
 "egenskaber ændres."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientering af opslagstabel"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Vis ikon i systembakke"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
-msgstr "Vis navn på inputmetode"
+msgstr "Vis navn på indtastningsmetode"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Vis navn på indtastningsmetode i sprogpanel"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "RGBA-værdi for XKB-ikon"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -536,11 +263,11 @@ msgstr ""
 "eller procentværdier fra 0% til 100%, og 'a' hvis det er en kommatalværdi "
 "fra 0 til 1 af alfaen."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Millisekunder som panelikonet for en egenskab skal vises i"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -552,47 +279,48 @@ msgstr ""
 "IBusEngineDesc. Hvis værdien er 0, er der ingen forsinkelsestid og "
 "egenskabsikonet vises med det samme."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Brug tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode-genvejstaster til gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Genvejstasterne til at slå Unicode-skrivning til eller fra"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-genvejstaster for gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Genvejstasterne til at slå emoji-indtastning til eller fra"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Tilpasset skrifttypenavn for emoji-tegn i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Standardsprog for emojiordbog"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -600,30 +328,30 @@ msgstr ""
 "Vælg et standardsprog af emoji-ordbøger i emoji-dialogen. Værdien $lang "
 "anvendes på /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "favorit emojiliste i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 "Du kan vise favorit emojierne i emojiliste hvis denne liste har nogen tegn."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit emoji-annonteringsliste i emoji-dialog"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tildele en annotering til en favorit-emoji i denne liste."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Hvorvidt emoji-annonteringer kan matches delvist eller ej"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -631,11 +359,11 @@ msgstr ""
 "Hvorvidt emoji-annoteringer kan matches med en delvis streng i stedet for "
 "det præcise match eller ej."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji-annoteringer med den angivne længde"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -643,11 +371,11 @@ msgstr ""
 "Match emoji-annoteringer delvist med flere end det angivne antal tegn i "
 "stedet for det præcise match."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Vælg en betingelse til delvist at matche emoji-annonteringer"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -655,11 +383,11 @@ msgstr ""
 "Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 ="
 "= Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Indlæs emoji-dataene ved opstart"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -669,11 +397,11 @@ msgstr ""
 "hukommelse for at indlæse dataene. Indlæs emoji-dataene når emoji-dialogen "
 "åbnes ved begyndelsen hvis falsk."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Indlæs unicode-dataene ved opstart"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -685,2206 +413,2632 @@ msgstr ""
 "åbnes ved begyndelsen hvis falsk. Unicode-dataene indlæses altid efter emoji-"
 "dataene indlæses selv hvis sand."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Indbyg forudredigeret tekst"
+#: ibus/_config.py.in:41
+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."
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "Andre"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Vælg et sprog"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Annuller"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mere…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Om"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Luk"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Sprog: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturlayout: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Forfatter: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beskrivelse:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Vælg en indtastningsmetode"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Tilføj"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Indtastningsmetode"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus-præferencer"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Angiv IBus-præferencer"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Tastaturgenveje"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Nøglekode:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Kombinationstaster:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Anvend"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Slet"
+
+#: setup/keyboardshortcut.py:252
+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."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Tryk venligst på en tast (eller en tastekombination)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "Brug genvej med skift for at skifte til forrige indtastningsmetode"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-dæmonen kører. Vil du starte den?"
+
+#: setup/main.py:536
+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 er blevet startet! Hvis du ikke kan bruge IBus, så tilføj følgende "
+"linjer til din $HOME/.bashrc; og så log ind på dit skrivebord igen.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: setup/main.py:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus-dæmon kunne ikke startes på %d sekunder"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Vælg tastaturgenveje til %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "skifter indtastningsmetoder"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Vandret"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Lodret"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Øverste venstre hjørne"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Øverste højre hjørne"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Nederste venstre hjørne"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Nederste højre hjørne"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Vis ikke"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Skjul automatisk"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Altid"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Genvejstaster for skift til den næste indtastningsmetode i listen"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Næste indtastningsmetode:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Genvejstaster for skift til den forrige indtastningsmetode i listen"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Forrige indtastningsmetode:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Aktivér eller deaktivér:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Aktivér:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Deaktivér:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastaturgenveje</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Angiv orientering af kandidater i opslagstabel"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientering for kandidater:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Angiv opførsel for hvordan IBus skal vises eller sprogpanelet"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Vis egenskabspanel:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Placering af sprogpanel:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Vis indtastningsmetodens navn i sprogpanelet når tjek-boksen er vinget af"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Brug global inputmetode"
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Indlejr forudredigeret tekst for indtastningsmetode i programvinduet"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Brug tilpasset skrifttype:"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Aktivér inputmetode som standard"
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Skrifttype og stil</b>"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Generelt"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf bevar navnepræfiks"
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Tilføj den valgte indtastningsmetode i de aktiverede indtastningsmetoder"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Præfiks af DConf-taster til stop af navnekonvertering"
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Fjern"
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
-"Ophavsret (c) 2007-2010 Peng Huang\n"
-"Ophavsret (c) 2007-2010 Red Hat, Inc."
+"Fjern den valgte indtastningsmetode fra de aktiverede indtastningsmetoder"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Andre"
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Op"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Vælg et sprog"
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Flyt den valgte indtastningsmetode op i listen over aktiverede "
+"indtastningsmetoder"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Annuller"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Ned"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_OK"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Flyt den valgte indtastningsmetode ned i listen over aktiverede "
+"indtastningsmetoder"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Mere…"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Om"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Sprog: %s\n"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Vis information om den valgte indtastningsmetode"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastaturlayout: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Præferencer"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Forfatter: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Vis opsætning for den valgte indtastningsmetode"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Beskrivelse:\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Den aktive indtastningsmetode kan skiftes til en anden i listen "
+"ovenfor, ved at trykke på tastaturgenvejene eller ved at klikke på "
+"panelikonet.</i></small>"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Vælg en inputmetode"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Genvejstasterne til at aktivere samtaler med emoji-annoteringer eller "
+"unicode-navne"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emoji-annotering:"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Angiv IBus-præferencer"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Genvejstasterne til at aktivere konvertering af unicode-kodepunkt"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Tastaturgenveje"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode-kodepunkt:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Nøglekode:"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Sæt en skrifttype af unicode-kandidater i emoji-dialogen"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Kombinationstaster:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode-skrifttype:"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Anvend"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Sæt et sprog af emoji-kandidater i emoji-dialogen"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Slet"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Emoji-annoteringssprog:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1062
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
 msgstr ""
-"Tryk venligst på en tast (eller en tastekombination).\n"
-"Dialogen bliver lukket, når tasten slippes."
+"Match emoji-annoteringer delvist med følgende betingelse og flere end "
+"antallet af tegn:"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Tryk venligst på en tast (eller en tastekombination)"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Hvorvidt emoji-annonteringer kan matches med en delvis streng i stedet for "
+"det præcise match"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "Brug genvej med skift for at skifte til forrige inputmetode"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Præfiks match"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-dæmonen kører. Vil du starte den?"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Suffiks match"
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Indeholdende match"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturlayout</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Indstillinger for global indtastningsmetode</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"IBus er blevet startet! Hvis du ikke kan bruge IBus, så tilføj følgende "
-"linjer til din $HOME/.bashrc; og så log ind på dit skrivebord igen.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-
-#. Translators: %d == 5 currently
-#: ../setup/main.py:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-dæmon kunne ikke startes på %d sekunder"
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligente indtastningsbus</small>\n"
+"Hjemmeside: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Vælg tastaturgenveje til %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Start ibus ved login"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "skifter inputmetoder"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Opstart</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Aktiviteter"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Dyr og natur"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Komponent"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Flag"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Mad og drikke"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objekter"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Smileyer og mennesker"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Personer og kroppe"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Smileyer og emotikoner"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symboler"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr "Rejse og steder"
+msgstr "Rejser og steder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Grundlæggende latinsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Latin-1 supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latinsk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latinsk udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA-udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Mellemrumsændringer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Kombinerende diakritiske tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Græsk og koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Kyrillisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Armensk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebraisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syrisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Arabisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Syrisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arabisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamilsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibetansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Georgisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Ethiopisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Etiopisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Forenede canadisk-indiansk stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongolsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Forenede canadisk-indianske stavelser, udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Ny Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Khmer-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Kombinerede diakritiske tegn udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundanesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Kyrillisk udvidet-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Georgisk udvidet"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Sudanesisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Vediske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Supplement til fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Supplement til kombination af diakritiske tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Latisk ekstra udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Græsk udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Generel tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Hævede og sænkede tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Valutasymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Kombinerende diakritiske tegn til symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Bogstavlignende symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Pile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Matematiske operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Diverse teknisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Kontrolbilleder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optisk tegngenkendelse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Indrammede alfanumeriske"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Rammetegning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Blokelementer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Geometriske former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Diverse symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Tingester"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Diverse matematiske symboler-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Ekstra pile-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Braille-mønstre"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Ekstra pile-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Diverse matematiske symboler-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Ekstra matematiske operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Diverse symboler og pile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolitisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Latinsk udvidet-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Georgisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Etiopisk udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Kyrillisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Supplerende tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK-radikaler-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kangxi-radikaler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Ideografiske beskrivelsestegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK-symboler og punktueringer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangul kompatibilitets-Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK-streger"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Katakana-fonetiske udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Indrammede CJK-bogstaver og -måneder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK-kompatibilitet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK-forenede ideografer-udvidelse A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Yijing-hexagramsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "CJK-forenede ideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi-radikaler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Kyrillisk udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Toneændringstegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Latinsk udvidet-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Almindelige indiske talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangul Jamo udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javanesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Myanmar udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Myanmar udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meetei Mayek udvidelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Etiopisk udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Latinsk udvidet-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cherokee-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangul-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangul Jamo udvidet-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Høje surrogater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Høje surrogater til privat brug"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Lave surrogater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Område til privat brug"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alfabetiske præsentationsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arabiske præsentationsformer-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Variationsvælgere"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Vertikale former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Kombinerende halvtegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK-kombatibilitetsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Små former-varianter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arabiske præsentationsformer-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Halvbredde og fuldbredde former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Specialtegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Linear B-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Linear B-ideogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Aegæiske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Oldgræske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Oldtidssymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Festosdiskossen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lykisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Karisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr "Koptisk epact-numre"
+msgstr "Koptisk epact tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Olditalisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gotisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Oldpermisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugaritisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Oldpersisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shaviansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Kaukasisk Albansk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Linear A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Cypriske stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Fyrstetidsaramæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmyrisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabatæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Fønikisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lydisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroitiske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroitisk skrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Oldsydarabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Oldnordarabisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manikæisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avestisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Inskriptions-parthisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Inskriptions-pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Psalter Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Oldtyrkisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Oldungarsk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi rohingya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Rumi numeriske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Oldsogdian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Elym"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Bramisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
-msgstr "Sinhala-arkaiske numre"
+msgstr "Sinhala-arkaiske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongolsk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nand"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar kvadratisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "Gunjala gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "Makasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Tamilsk supplement"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr "Kileskriftstal og tegnsætning"
+msgstr "Kileskriftstal og -tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Tidlig dynastisk kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Ægyptiske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Ægyptiske hieroglyffer formatteringskontroltegn"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatoliske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Bamum-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografiske symboler og tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Små kana udvidelse"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Forkortede formatteringskontroltegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantiske musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Oldgræsk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr "Maya talsystem"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Kinesisk stregtalsystem"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematiske alfanumeriske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Sutton tegnsprogskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr "Indisk siyaq tal"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Ottomanske siyaq tal"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabiske matematiske alfabetiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Mahjong-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Domino-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Spillekort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Indrammet alfanumerisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Indrammet ideografisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Emotikoner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Pyntedingbatter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Transport- og kortsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Alkymisymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Geometriske former udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Ekstra pile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Supplerende symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "Skaksymboler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Symboler og piktogrammer udvidet-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Forenede CJK-ideografer, udvidelse B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Forenede CJK-ideografer, udvidelse C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Forenede CJK-ideografer, udvidelse D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Forenede CJK-ideografer, udvidelse E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK-forenede ideografer-udvidelse F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Supplerende CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Mærkater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Variationsvælgere-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Ekstra privat brug-område-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Ekstra privat brug-område-B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Vis kun motornavn"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan ikke oprette forbindelse til IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "sprog: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Ingen motor er sat.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Sætning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Hentning af global motor mislykkedes.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Læs systemets registreringsmellemlager."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Læs den registreringsmellemlageret FIL."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Registreringsmellemlageret er ugyldigt.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Skriv systemets registreringsmellemlager."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Skriv den registreringsmellemlageret FIL."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2892,174 +3046,169 @@ msgstr ""
 "Brug motorskema-stier i stedet for ibus-kerne, hvilket kan være "
 "kommaseparerede værdier."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Nulstiller…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Færdig"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Sæt eller hent motor"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Forlad ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Vis tilgængelige motorer"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(ikke implementeret)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Genstart ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Vis version"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Vis indholdet af registreringsmellemlager"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Opret registreringsmellemlager"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print D-Bus-adressen af ibus-daemon"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Vis konfigurationsværdierne"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Nulstil konfigurationsværdierne"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Gem emoji i dialog til udklipsholder "
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Vis denne information"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Kommandoer:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s er ukendt kommando!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Andre"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Åbn valg af unicode"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Skriv annotering eller vælg emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
-msgstr "Bring valg af emoji tilbage"
+msgstr "Tilbage til valg af emoji"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Vis emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Luk"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menu"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Klik for at vise en advarselsmeddelelse"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Indlæser en unicode-ordbog:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodepunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annoteringer: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Valg af emoji"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Valg af unicode"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3070,65 +3219,57 @@ msgstr ""
 "emoji-indtastningstilstanden, klik på dit skrivebord og klik på "
 "tekstprogrammet igen."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Annulleret for at vælge en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierede en emoji til dit skrivebord."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "SKRIFTTYPE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "SPROG"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annoteringer kan matches delvist"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Match med længen af det angive heltal"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Match med betingelsen af det angive heltal"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus-opdatering"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+mellemrum er nu standardhotkeyen."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus er en intelligent inputbus til Linux/Unix."
+msgstr "IBus er en intelligent indtastningsbus til Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
@@ -3136,20 +3277,20 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Afslut"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/fr.po b/po/fr.po
index a388d7bae..f3356343b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,13 +25,13 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-27 09:32+0000\n"
+"PO-Revision-Date: 2019-05-15 11:32+0000\n"
 "Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
@@ -459,7 +459,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Autre"
 
@@ -2394,587 +2394,650 @@ msgstr "Sogdiane"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Élymaïque"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaïthî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Nombre archaïque Cingalais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojkï"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Supplément Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takrî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "Dogri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "Gong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "Maka"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Supplément Tamoul"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Cunéiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Nombres cunéiformes et ponctuation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Cunéiforme dynastique archaïque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Hiéroglyphes égyptiens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Réglages du format hiéroglyphes égyptiens"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Hiéroglyphes hittites"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Supplément Bamoun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "Medf"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Symboles et ponctuation idéographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Composants tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Supplément Kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana étendu A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Extension de petits Kana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Réglages du format abrégé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Symboles musicaux byzantins"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Symboles musicaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Notation musicale grecque ancienne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "Chiffres mayas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symboles Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Chiffres-bâtonnets chinois"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Symboles mathématiques alphanumériques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "SignWriting de Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Supplément Glagolitique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wantcho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Écriture mendé Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "Nombres hindous Siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Nombres ottomans Siyaq"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Symboles mathématiques alphanumériques arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Tuiles de mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Dominos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Cartes à jouer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Supplément alphanumérique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Supplément idéographique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Symboles et pictogrammes divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Émoticônes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Casseaux ornementaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Symboles du transport et cartographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Symboles alchimiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Formes géométriques étendues"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Flèches-C supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Symboles et pictogrammes supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "Symboles d'échecs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Symboles et pictogrammes étendus-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Idéographes unifiés CJC Extension B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Idéographes unifiés CJC Extension C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Idéographes unifiés CJC Extension D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Idéographes unifiés CJC Extension E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Idéographes unifiés CJC Extension F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Idéographes de compatibilité CJK supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Suppléments de sélecteurs de variante"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Area-A Zone à usage privé supplémentaire"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Area-B Zone à usage privé supplémentaire"
 
@@ -3119,81 +3182,81 @@ msgstr "Autres"
 msgid "Open Unicode choice"
 msgstr "Ouvrir un choix Unicode"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Rétablir le choix emoji"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Montrer les variantes d’émoticônes"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Fermer"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Cliquez pour voir le message d’avertissement"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Chargement d’un dictionnaire Unicode :"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Aucune"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias : %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Choix d’émoticônes"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Choix Unicode"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/hu.po b/po/hu.po
index 46a87db1b..9657f4b62 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
 # Hungarian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,13 +13,13 @@
 # Meskó Balázs <meskobalazs@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-28 02:45+0000\n"
+"PO-Revision-Date: 2019-04-27 11:04+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
 "Language: hu\n"
@@ -427,7 +427,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Egyéb"
 
@@ -2360,587 +2360,650 @@ msgstr "Szogd"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
-msgid "Brahmi"
-msgstr "Brahmi"
+msgid "Elymaic"
+msgstr "Elámi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr "Bráhmi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
-msgstr "Sora Sompeng"
+msgstr "Szora szompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
-msgstr "Chakma"
+msgstr "Csakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
-msgstr "Sinhala archaikus számok"
+msgstr "Szinhala archaikus számok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
-msgstr "Khojki"
+msgstr "Khodzski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
-msgstr "Siddham"
+msgstr "Sziddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongol kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinágari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar-féle négyzet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram-féle gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "Gunjalai gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Tamil kiegészítés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Ékírásos szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Kora dinasztiai ékírás"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyiptomi hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Egyiptomi hieroglifa formátumvezérlők"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatóliai hieroglifák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Bamum kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografikus szimbólumok és írásjelek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Tangut komponensek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana bővített – A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Kis kana bővítés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Gyorsírás formátum vezérlők"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Bizánci zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Zenei szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Ógörög zenei jelölés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "Maja számjegyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Számolórúd számjegyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematikai alfanumerikus szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Sutton-féle jelnyelv"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolita kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "Indiai siyaq számjegyek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Oszmán siyaq számjegyek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arab matematikai ábécészimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Madzsong kövek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Dominók"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Játékkártyák"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Közrezárt alfanumerikus kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Közrezárt képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Egyéb szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Emotikonok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Díszítő apróságok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Közlekedési és térkép szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Alkímiai szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Geometriai alakzatok bővített"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Kiegészítő nyilak C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Kiegészítő szimbólumok és piktogramok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "Sakk szimbólumok"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Szimbólumok és piktogramok bővített – A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK egyesített képírásjel kiegészítés – B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK egyesített képírásjel kiegészítés – C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK egyesített képírásjel kiegészítés – D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK egyesített képírásjel kiegészítés – E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK egyesített képírásjel kiegészítés – F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK kompatibilitási képírásjel kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Címkék"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Variációválasztó kiegészítés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Kiegészítő személyes használatú terület A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Kiegészítő személyes használatú terület B"
 
@@ -3085,81 +3148,81 @@ msgstr "Többi"
 msgid "Open Unicode choice"
 msgstr "Unicode választás megnyitása"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Emodzsi választás visszahozása"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Emodzsi változatok megjelenítése"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Bezárás"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menü"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Kattintson a figyelmeztető üzenet megtekintéséhez."
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode szótár betöltése:"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Kódpont: %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Vannak emodzsi változatai"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Nincs"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotációk: %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Álnév: %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Emodzsi választás"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Unicode választás"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 000000000..af08195d5
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,735 @@
+# translation of ibus.pot to Indonesia 
+# Indonesia translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# Rahman Yusri Aftian <aftian9603@gmail.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2014-02-18 13:46+0900\n"
+"PO-Revision-Date: 2019-07-16 11:19+0700\n"
+"Language-Team: Indonesian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2.1\n"
+"Last-Translator: Rahman Yusri Aftian <aftian9603@gmail.com>\n"
+"Language: id\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "Horisontal"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "Pojok kiri atas"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "Ujung kanan atas"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "Pojok kiri bawah"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "Pojok kanan bawah"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "Custom"
+
+#: ../setup/setup.ui.h:8
+msgid "Do not show"
+msgstr "Jangan ditampilkan"
+
+#: ../setup/setup.ui.h:9
+msgid "Hide automatically"
+msgstr "Otomatis sembunyikan"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Selalu"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "Preferensi IBus"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Tombol pintas untuk beralih ke metode input berikutnya dalam daftar"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "Metode input selanjutnya:"
+
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Tombol pintas untuk beralih ke metode input sebelumnya dalam daftar"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "Metode input sebelumnya:"
+
+#: ../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 "Tombol pintas untuk mengaktifkan atau menonaktifkan metode input"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "Aktifkan atau nonaktifkan:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "Aktifkan:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "Nonaktifkan:"
+
+#: ../setup/setup.ui.h:21
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Keyboard Shortcuts</b>"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Atur orientasi kandidat di tabel pencarian"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "Orientasi kandidat:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Atur perilaku ibus cara menampilkan atau menyembunyikan bilah bahasa"
+
+#: ../setup/setup.ui.h:25
+msgid "Show property panel:"
+msgstr "Tampilkan panel properti:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "Posisi panel bahasa:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+msgid "Show icon on system tray"
+msgstr "Tampilkan ikon pada baki sistem"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+msgid "Show input method name on language bar"
+msgstr "Tampilkan nama metode input pada bilah bahasa"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Tampilkan nama metode input pada bilah bahasa saat mencentang kotak centang"
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "Sematkan teks yang sudah disiapkan di jendela aplikasi"
+
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Sematkan teks metode input yang sudah ada di jendela aplikasi"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "Gunakan font khusus:"
+
+#: ../setup/setup.ui.h:33
+msgid "<b>Font and Style</b>"
+msgstr "<b>Font and Style</b>"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "Umum"
+
+#. add button
+#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
+msgid "_Add"
+msgstr "T_ambah"
+
+#: ../setup/setup.ui.h:36
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Tambahkan metode input yang dipilih ke dalam metode input yang diaktifkan"
+
+#: ../setup/setup.ui.h:37
+msgid "_Remove"
+msgstr "_Hapus"
+
+#: ../setup/setup.ui.h:38
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Hapus metode input yang dipilih dari metode input yang diaktifkan"
+
+#: ../setup/setup.ui.h:39
+msgid "_Up"
+msgstr "_Naik"
+
+#: ../setup/setup.ui.h:40
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Naikkan metode input yang dipilih dalam daftar metode input yang diaktifkan"
+
+#: ../setup/setup.ui.h:41
+msgid "_Down"
+msgstr "_Turun"
+
+#: ../setup/setup.ui.h:42
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Naikkan metode input yang dipilih dalam daftar metode input yang diaktifkan"
+
+#: ../setup/setup.ui.h:43
+msgid "_About"
+msgstr "Ihw_al"
+
+#: ../setup/setup.ui.h:44
+msgid "Show information of the selected input method"
+msgstr "Tampilkan informasi tentang metode input yang dipilih"
+
+#: ../setup/setup.ui.h:45
+msgid "_Preferences"
+msgstr "_Preferensi"
+
+#: ../setup/setup.ui.h:46
+msgid "Show setup of the selected input method"
+msgstr "Tampilkan pengaturan metode input yang dipilih"
+
+#: ../setup/setup.ui.h:47
+msgid ""
+"<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>"
+msgstr ""
+"<small><i> Metode input aktif dapat diubah dari yang dipilih dalam daftar "
+"di atas dengan menekan tombol pintasan keyboard atau mengklik ikon panel. </"
+"i></small>"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
+msgid "Input Method"
+msgstr "Metode Input"
+
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
+msgid "Use system keyboard layout"
+msgstr "Gunakan tata letak keyboard sistem"
+
+#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
+msgid "Use system keyboard (XKB) layout"
+msgstr "Gunakan tata letak keyboard (XKB) sistem"
+
+#: ../setup/setup.ui.h:51
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Keyboard Layout</b>"
+
+#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
+msgid "Share the same input method among all applications"
+msgstr "Bagikan metode input yang sama di antara semua aplikasi"
+
+#: ../setup/setup.ui.h:53
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Pengaturan metode input global</b>"
+
+#: ../setup/setup.ui.h:54
+msgid "Advanced"
+msgstr "Lanjutan"
+
+#: ../setup/setup.ui.h:55
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: ../setup/setup.ui.h:62
+msgid "Start ibus on login"
+msgstr "Mulai ibus saat masuk"
+
+#: ../setup/setup.ui.h:63
+msgid "<b>Startup</b>"
+msgstr "<b>Startup</b>"
+
+#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
+msgid "About"
+msgstr "Ihwal"
+
+#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
+msgid "_Close"
+msgstr "_Keluar"
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr "Sebelum memuat mesin"
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr "Sebelum memuat mesin selama ibus dimulai"
+
+#: ../data/ibus.schemas.in.h:3
+msgid "Engines order"
+msgstr "Urutan mesin"
+
+#: ../data/ibus.schemas.in.h:4
+msgid "Saved engines order in input method list"
+msgstr "Mesin yang disimpan memesan dalam daftar metode input"
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "Popup delay milidetik untuk jendela pengalih 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 &lt; Delay milliseconds. 0 &gt; Do "
+"not show the window and switch prev/next engines."
+msgstr ""
+"Tetapkan milidetik tunda munculan untuk menampilkan jendela pengalih IME. "
+"Standarnya adalah 400. 0 = Tunjukkan jendela dengan segera. 0 &lt; Tunda "
+"milidetik. 0 &gt; Jangan perlihatkan jendela dan alihkan mesin Sebelum/"
+"Sesudah."
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Nomor versi tersimpan"
+
+#: ../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 ""
+"Nomor versi yang disimpan akan digunakan untuk memeriksa perbedaan antara "
+"versi ibus yang diinstal sebelumnya dan salah satu ibus saat ini."
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys"
+msgstr "Kunci pintas pemicu"
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "Kunci pintas pemicu untuk gtk_accelerator_parse"
+
+#: ../data/ibus.schemas.in.h:12
+msgid "Enable shortcut keys"
+msgstr "Aktifkan tombol pintas"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "The shortcut keys for turning input method on"
+msgstr "Tombol pintas untuk mengaktifkan metode input"
+
+#: ../data/ibus.schemas.in.h:14
+msgid "Disable shortcut keys"
+msgstr "Nonaktifkan tombol pintasan"
+
+#: ../data/ibus.schemas.in.h:15
+msgid "The shortcut keys for turning input method off"
+msgstr "Tombol pintas untuk mematikan metode input"
+
+#: ../data/ibus.schemas.in.h:16
+msgid "Next engine shortcut keys"
+msgstr "Tombol pintas mesin berikutnya"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "Tombol pintas untuk beralih ke metode input berikutnya dalam daftar"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Prev engine shortcut keys"
+msgstr "Prev engine shortcut keys"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "Tombol pintas untuk beralih ke metode input sebelumnya"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Auto hide"
+msgstr "Sembunyi otomatis"
+
+#: ../data/ibus.schemas.in.h:21
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"Perilaku panel properti. 0 = Jangan tampilkan, 1 = Sembunyikan otomatis, 2 "
+"= Selalu tampilkan"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Language panel position"
+msgstr "Posisi panel bahasa"
+
+#: ../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 ""
+"Posisi panel bahasa. 0 = Pojok kiri atas, 1 = Pojok kanan atas, 2 = Pojok "
+"kiri bawah, 3 = Pojok kanan bawah, 4 = Kustom"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "Ikuti kursor input jika panel selalu ditampilkan"
+
+#: ../data/ibus.schemas.in.h:25
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+"Jika benar, panel mengikuti kursor input jika panel selalu ditampilkan. "
+"Jika salah, panel ditampilkan di lokasi tetap."
+
+#: ../data/ibus.schemas.in.h:26
+msgid "The milliseconds to show property panel"
+msgstr "Milidetik untuk menampilkan panel properti"
+
+#: ../data/ibus.schemas.in.h:27
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+"Milidetik untuk menampilkan panel properti setelah fokus-masuk atau "
+"properti diubah."
+
+#: ../data/ibus.schemas.in.h:28
+msgid "Orientation of lookup table"
+msgstr "Orientation of lookup table"
+
+#: ../data/ibus.schemas.in.h:29
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "Orientasi tabel pencarian. 0 = Horisontal, 1 = Vertikal"
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Show input method name"
+msgstr "Tampilkan nama metode input"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Use custom font"
+msgstr "Gunakan font khusus"
+
+#: ../data/ibus.schemas.in.h:36
+msgid "Use custom font name for language panel"
+msgstr "Gunakan nama font khusus untuk panel bahasa"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Custom font"
+msgstr "Fonta Khusus"
+
+#: ../data/ibus.schemas.in.h:38
+msgid "Custom font name for language panel"
+msgstr "Nama font khusus untuk panel bahasa"
+
+#: ../data/ibus.schemas.in.h:39
+msgid "Embed Preedit Text"
+msgstr "Sematkan Teks Preedit"
+
+#: ../data/ibus.schemas.in.h:40
+msgid "Embed Preedit Text in Application Window"
+msgstr "Sematkan Teks Preedit di Jendela Aplikasi"
+
+#: ../data/ibus.schemas.in.h:41
+msgid "Use global input method"
+msgstr "Gunakan metode input global"
+
+#: ../data/ibus.schemas.in.h:43
+msgid "Enable input method by default"
+msgstr "Aktifkan metode input secara default"
+
+#: ../data/ibus.schemas.in.h:44
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Aktifkan metode input secara default ketika aplikasi mendapat fokus input"
+
+#: ../data/ibus.schemas.in.h:45
+msgid "DConf preserve name prefixes"
+msgstr "DConf menyimpan awalan nama"
+
+#: ../data/ibus.schemas.in.h:46
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Awalan kunci DConf untuk menghentikan konversi nama"
+
+#: ../ibus/_config.py.in:41
+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."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "Lain"
+
+#: ../setup/engineabout.py:68
+#, python-format
+msgid "Language: %s\n"
+msgstr "Bahasa: %s\n"
+
+#: ../setup/engineabout.py:71
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Keyboard layout: %s\n"
+
+#: ../setup/engineabout.py:74
+#, python-format
+msgid "Author: %s\n"
+msgstr "Pembuat: %s\n"
+
+#: ../setup/engineabout.py:77
+msgid "Description:\n"
+msgstr "Deskripsi:\n"
+
+#: ../setup/enginecombobox.py:139
+msgid "Select an input method"
+msgstr "Pilih metode input"
+
+#: ../setup/enginetreeview.py:94
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "Setel Preferensi IBus"
+
+#: ../setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Pintasan keyboard"
+
+#: ../setup/keyboardshortcut.py:66
+msgid "Key code:"
+msgstr "Kata kunci:"
+
+#: ../setup/keyboardshortcut.py:81
+msgid "Modifiers:"
+msgstr "Pengubah:"
+
+#. apply button
+#: ../setup/keyboardshortcut.py:133
+msgid "_Apply"
+msgstr "Mener_apkan"
+
+#. delete button
+#: ../setup/keyboardshortcut.py:139
+msgid "_Delete"
+msgstr "Men_ghapus"
+
+#: ../setup/keyboardshortcut.py:254
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Silakan tekan tombol (atau kombinasi tombol).\n"
+"Dialog akan ditutup ketika kunci dilepaskan."
+
+#: ../setup/keyboardshortcut.py:256
+msgid "Please press a key (or a key combination)"
+msgstr "Silakan tekan tombol (atau kombinasi tombol)"
+
+#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
+msgid "_Cancel"
+msgstr "Ba_tal"
+
+#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
+msgid "_OK"
+msgstr "_OK"
+
+#: ../setup/main.py:102 ../setup/main.py:395
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Gunakan pintasan dengan shift untuk beralih ke metode input sebelumnya"
+
+#: ../setup/main.py:329
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Daemon IBus tidak berjalan. Apakah Anda ingin memulainya?"
+
+#: ../setup/main.py:350
+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 telah dimulai! Jika Anda tidak dapat menggunakan IBus, tambahkan baris "
+"berikut ke $ HOME / .bashrc Anda; kemudian masuk kembali ke desktop Anda.\n"
+"  ekspor GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS =@im= ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: ../setup/main.py:364
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Daemon IBus tidak dapat dimulai dalam% d detik"
+
+#: ../setup/main.py:376
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Pilih pintasan keyboard untuk %s"
+
+#: ../setup/main.py:377
+msgid "switching input methods"
+msgstr "beralih metode input"
+
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr "Daftar nama mesin saja"
+
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr "Tidak dapat terhubung ke IBus.\n"
+
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr "bahasa: %s\n"
+
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr "Tidak ada mesin yang diatur.\n"
+
+#: ../tools/main.vala:160
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr "Setel mesin global gagal.\n"
+
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr "Dapatkan mesin global gagal.\n"
+
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Baca cache registri sistem."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Baca FILE cache registri."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "Cache registri tidak valid.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Tulis cache registri sistem."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Tulis FILE cache registri."
+
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr "Atur atau dapatkan mesin"
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr "Keluar dari ibus-daemon"
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr "Tampilkan mesin yang tersedia"
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr "(Tidak diterapkan)"
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr "Muat ulang ibus-daemon"
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr "Tampilkan versi"
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr "Tampilkan konten cache registri"
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr "Buat cache registri"
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Cetak alamat D-Bus ibus-daemon"
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr "Perlihatkan informasi ini"
+
+#: ../tools/main.vala:308
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+"Menggunakan: %s COMMAND [OPTION...]\n"
+"\n"
+
+#: ../tools/main.vala:309
+#, c-format
+msgid "Commands:\n"
+msgstr "Perintah:\n"
+
+#: ../tools/main.vala:338
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr "%s perintah tidak dikenal!\n"
+
+#: ../ui/gtk3/panel.vala:425
+msgid "IBus Update"
+msgstr "IBus Update"
+
+#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
+msgid "Super+space is now the default hotkey."
+msgstr "Super + space sekarang merupakan hotkey default."
+
+#: ../ui/gtk3/panel.vala:707
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus adalah bus input cerdas untuk Linux / Unix."
+
+#: ../ui/gtk3/panel.vala:711
+msgid "translator-credits"
+msgstr "kredit-penerjemah"
+
+#: ../ui/gtk3/panel.vala:732
+msgid "Preferences"
+msgstr "Prefensi"
+
+#: ../ui/gtk3/panel.vala:742
+msgid "Restart"
+msgstr "Muat ulang"
+
+#: ../ui/gtk3/panel.vala:746
+msgid "Quit"
+msgstr "Keluar"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ../ui/gtk3/propertypanel.vala:374
+msgid "default:LTR"
+msgstr "default:LTR"
diff --git a/po/ja.po b/po/ja.po
index c1df19c08..152c33fe1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -18,13 +18,13 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-27 04:33+0000\n"
+"PO-Revision-Date: 2019-07-24 03:07+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
@@ -405,7 +405,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "その他"
 
@@ -2319,587 +2319,650 @@ msgstr "ソグド文字"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "エリマイス文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "ブラーフミー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "カイティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "ソラ・ソンペン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "チャクマ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "マハージャニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "シャラダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "シンハラ旧数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "ホジャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "ムルターニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "フダーワーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "グランタ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "ネワ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "ティルフータ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "悉曇文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "モーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "モンゴル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "タクリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "アーホム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "ドーグリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "ワラング・クシティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "ナンディナーガリー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "ザナバザル方形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "ソヨンボ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "パウ・チン・ハウ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "バイクシュキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "マルチェン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "マサラム・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "グンジャラ・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "マカサル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "タミル文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "くさび形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "くさび形文字の数字及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "シュメール楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "ヒエログリフ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "ヒエログリフ文字書式制御記号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "アナトリア・ヒエログリフ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "バムン文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "ムロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "バサ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "パハウ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "メデファイドリン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "ポラード文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "漢字の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "西夏文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "西南文字の構成要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "仮名文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "仮名文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "小書き仮名拡張"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "女書"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "デュプロワイエ式速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "速記書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "ビザンチン音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "古代ギリシア音符記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "マヤ数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "太玄経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "算木用数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "サットン手話表記法"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "グラゴル文文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "ニアケン・プアチェ・フモン文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "ワンチョ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "メンデ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "アドラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "インド・シヤク数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "オスマン・シヤク数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "アラビア数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "麻雀牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "ドミノ牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "トランプ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "囲み英数字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "囲み表意文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "その他の記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "顔文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "オーナメント"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "交通と地図の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "錬金術記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "幾何学模様拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "補助矢印 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "補助記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "チェス記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "記号と絵文字拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK 統合漢字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK 統合漢字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK 統合漢字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK 統合漢字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK 統合漢字拡張 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK 互換漢字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "字形選択子補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "補助私用領域 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "補助私用領域 B"
 
@@ -3042,81 +3105,81 @@ msgstr "その他"
 msgid "Open Unicode choice"
 msgstr "Unicode の選択を開く"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "絵文字の選択に戻る"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "絵文字異形を表示する"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "閉じる"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "メニュー"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "警告メッセージを閲覧するためにクリックしてください"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode の辞書を読み込んでいます:"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "なし"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "別名: %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Unicode の選択"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/nl.po b/po/nl.po
index b12ff2ab6..6abe7afeb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,13 +14,13 @@
 # Geert Warrink <geert.warrink@onsnet.nu>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-27 09:25+0000\n"
+"PO-Revision-Date: 2019-04-16 04:49+0000\n"
 "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
 "Language-Team: Dutch <trans-nl@lists.fedoraproject.org>\n"
 "Language: nl\n"
@@ -435,7 +435,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Andere"
 
@@ -2367,587 +2367,650 @@ msgstr "Sogdian"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Elymaic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Archaïsche getallen van Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongools supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Tamil supplement"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cuneiform getallen en interpunctie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Vroeg-dynastic Cuneiform"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyptische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Egyptische hiëroglief formaat controles"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatolische hiërogliefen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Bamum supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografische symbolen en interpunktie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Tangut onderdelen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana uitgebreid-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Small Kana uitbreiding"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Steno formaatcontrole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantijnse muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Muzikale symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Oude Griekse muzieknotatie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "Mayan Numerals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Telpaal cijfers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Wiskundige alfanumerieke symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Sutton tekenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "Indic Siyaq Nummers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Ottoman Siyaq getallen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabische wiskundige alfabetische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Mahjong stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Domino stenen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Speelkaarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Ingesloten alfanumeriek supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Ingesloten ideografisch supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Emoticons"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Ornamentele dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Transport- en kaartsymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Alchemistische symbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Geometrische vormen uitgebreid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Supplementaire pijlen-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Supplementaire symbolen en pictogrammen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "Schaaksymbolen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Symbolen en Pictogrammen Uitgebreid-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK uniforme ideografen extensie B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK uniforme ideografen extensie C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK uniforme ideografen extensie D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK uniforme ideografen extensie E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK uniforme ideografen extensie F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK compatibiliteit ideografen supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Variatie selectoren supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Supplementair privé gebruiksgebied-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Supplementair privé gebruiksgebied-B"
 
@@ -3092,81 +3155,81 @@ msgstr "Andere"
 msgid "Open Unicode choice"
 msgstr "Open Unicode keuze"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Bring de emoji keuze terug"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Pagina naar beneden"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Pagina omhoog"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Toon emoji varianten"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Sluiten"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Klik om een waarschuwingsboodschap te bekijken"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Een Unicode woordenboek wordt geladen:"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Code punt: %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Heeft emoji varianten"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Geen"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotaties: %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Emoji keuze"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Unicode keuze"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/pa.po b/po/pa.po
index 8fa91cd22..7707bf6e0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -12,378 +12,58 @@
 # Jaswinder Singh <jsingh@redhat.com>, 2009-2010
 # Jaswinder Singh <phulewala.j@gmail.com>, 2011,2013
 # Jaswinder Singh <phulewala.j@gmail.com>, 2011,2013
-# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # A S Alam <aalam@fedoraproject.org>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # A S Alam <aalam@fedoraproject.org>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-01-26 07:40+0000\n"
+"PO-Revision-Date: 2019-05-23 03:58+0000\n"
 "Last-Translator: A S Alam <aalam@fedoraproject.org>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\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 "Do not show"
-msgstr "ਨਾ ਦਿਖਾਓ"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
-
-#: ../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 property panel:"
-msgstr "ਵਿਸ਼ੇਸ਼ਤਾ ਪੈਨਲ ਦਿਖਾਓ:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>ਫੋਂਟ ਅਤੇ ਸਟਾਈਲ</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "ਆਮ"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "ਸ਼ਾਮਲ(_A)"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕੀਤੇ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚੋਂ ਹਟਾਓ"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "ਉੱਤੇ(_U)"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "ਹੇਠਾਂ(_D)"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "ਇਸ ਬਾਰੇ(_A)"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "ਮੇਰੀ ਪਸੰਦ(_P)"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸੈਟਅੱਪ ਵੇਖਾਓ"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr ""
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "ਯੂਨੀਕੋਡ ਕੋਡ ਬਿੰਦੂ:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "ਯੂਨੀਕੋਡ ਫ਼ੋਂਟ:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr ""
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr ""
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "ਇਮੋਜ਼ੀ"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
-"ਮੁੱਖ ਸਫ਼ਾ: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ibus ਚਲਾਓ"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>ਸ਼ੁਰੂ</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "ਇਸ ਬਾਰੇ"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "ਬੰਦ ਕਰੋ(_C)"
-
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ ਕੀਤੇ ਇੰਜਣ"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "ਇੰਜਣ ਕ੍ਰਮ"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਸੂਚੀ ਵਿੱਚ ਸੰਭਾਲੇ ਇੰਜਣਾਂ ਦਾ ਕ੍ਰਮ"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "ਮਿਲੀਸਕਿੰਟ 'ਚ ਸ਼ੁਰੂਆਤੀ ਦੇਰੀ"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "ਸੰਭਾਲਿਆ ਸੰਸਕਰਣ ਨੰਬਰ"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -391,123 +71,174 @@ msgstr ""
 "ਸੰਭਾਲਿਆ ਸੰਸਕਰਣ ਨੰਬਰ ਪੁਰਾਣੇ ਇੰਸਟਾਲ ਕੀਤੇ ਹੋਏ ibus ਅਤੇ ਮੌਜੂਦਾ ibus ਦੇ ਸੰਸਕਰਣ "
 "ਵਿਚਲੇ ਫ਼ਰਕ ਨੂੰ ਜਾਂਚਣ ਲਈ ਵਰਤਿਆ ਜਾਏਗਾ।"
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "Use xmodmap"
-msgstr ""
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "xmodmap ਵਰਤੋਂ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਇੱਕੋ ਇੰਪੁੱਟ ਢੰਗ ਸਾਂਝਾ ਕਰੋ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
 
-#: ../data/ibus.schemas.in.h:14
-msgid ""
-"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr ""
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf ਨਾਂ ਅਗੇਤਰ ਰੱਖਦਾ ਹੈ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "ਟਰਿੱਗਰ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਟਰਿੱਗਰ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਚਾਲੂ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ ਬੰਦ ਕਰੋ"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "ਅਗਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "ਆਟੋਮੈਟਿਕ ਓਹਲੇ"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ਖੋਜ ਟੇਬਲ ਦੀ ਸਥਿਤੀ। 0 = ਲੇਟਵਾਂ, 1 =ਖੜ੍ਹਵਾ"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -518,11 +249,11 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -530,116 +261,117 @@ msgid ""
 "property icon is shown immediately."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "ਮਨਪਸੰਦ ਫੋਂਟ"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨਾਂ"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -647,2463 +379,2861 @@ msgid ""
 "data is loaded even if true."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+#: ibus/_config.py.in:41
+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."
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "ਹੋਰ"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "ਭਾਸ਼ਾ ਚੁਣੋ"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਾਲੂ ਕਰੋ"
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "ਰੱਦ ਕਰੋ(_C)"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr "ਜਦੋਂ ਐਪਲੀਕੇਸ਼ਨ ਇੰਪੁੱਟ ਫੋਕਸ ਲਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਡਿਫਾਲਟ ਹੀ ਚਲਾਉ"
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "ਠੀਕ ਹੈ(_O)"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf ਨਾਂ ਅਗੇਤਰ ਰੱਖਦਾ ਹੈ"
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "...ਹੋਰ"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf ਦੇ ਅਗੇਤਰ ਨਾਂ ਤਬਦੀਲੀ ਰੋਕਣ ਲਈ"
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "ਇਸ ਬਾਰੇ"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "ਭਾਸ਼ਾ: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "ਲੇਖਕ: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "ਵੇਰਵਾ:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus ਪਸੰਦ"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "ਕੀ ਕੋਡ:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "ਮੋਡੀਫਾਇਰ:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "ਲਾਗੂ ਕਰੋ(_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "ਹਟਾਓ(_D)"
 
-#: ../ibus/_config.py.in:41
+#: setup/keyboardshortcut.py:252
 msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n"
+"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਇਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।"
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲੇ ਇੰਪੁੱਟ ਢੰਗ ਤੇ ਜਾਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਬਟਨ"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ਡੈਮਨ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: setup/main.py:536
+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 ਚੱਲ ਪਿਆ ਹੈ! ਜੇ ਤੁਸੀਂ 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਨਾ"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "ਲੇਟਵਾਂ"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "ਖੜ੍ਹਵਾਂ"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "ਪਸੰਦ"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "ਨਾ ਦਿਖਾਓ"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "ਆਪਣੇ ਆਪ ਲੁਕਾਓ"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "ਹਮੇਸ਼ਾ"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "ਚਾਲੂ ਜਾਂ ਬੰਦ:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "ਚਾਲੂ:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "ਬੰਦ:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ਖੋਜ ਟੇਬਲ ਵਿੱਚ ਉਮੀਦਵਾਰ ਦੀ ਸਥਿਤੀ ਸੈੱਟ ਕਰੋ"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "ਉਮੀਦਵਾਰ ਸਥਿਤੀ:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼ਾ ਪੱਟੀ ਕਿਵੇਂ ਵੇਖਾਈ ਜਾਵੇ"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "ਵਿਸ਼ੇਸ਼ਤਾ ਪੈਨਲ ਦਿਖਾਓ:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਸਥਿਤੀ:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ਜਦੋਂ ਚੈੱਕ ਬਾਕਸ ਚੁਣਿਆ ਹੋਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਵੇਖੋ"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਿੰਡੋ ਵਿੱਚ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸ਼ਾਮਿਲ ਕੀਤਾ ਪਹਿਲਾਂ-ਸੋਧ ਟੈਕਸਟ"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>ਫੋਂਟ ਅਤੇ ਸਟਾਈਲ</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "ਆਮ"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਕੀਤੇ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚੋਂ ਹਟਾਓ"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "ਉੱਤੇ(_U)"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "ਹੋਰ"
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "ਭਾਸ਼ਾ ਚੁਣੋ"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "ਹੇਠਾਂ(_D)"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "ਰੱਦ ਕਰੋ(_C)"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "ਠੀਕ ਹੈ(_O)"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "...ਹੋਰ"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "ਭਾਸ਼ਾ: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ(_P)"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਦਾ ਸੈਟਅੱਪ ਵੇਖਾਓ"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "ਲੇਖਕ: %s\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "ਵੇਰਵਾ:\n"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "ਇੱਕ ਇੰਪੁੱਟ ਢੰਗ ਚੁਣੋ"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus ਪਸੰਦ ਸੈੱਟ ਕਰੋ"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "ਯੂਨੀਕੋਡ ਕੋਡ ਬਿੰਦੂ:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "ਕੀ ਕੋਡ:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "ਯੂਨੀਕੋਡ ਫ਼ੋਂਟ:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "ਮੋਡੀਫਾਇਰ:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "ਲਾਗੂ ਕਰੋ(_A)"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "ਹਟਾਓ(_D)"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n"
-"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਇਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲੇ ਇੰਪੁੱਟ ਢੰਗ ਤੇ ਜਾਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਬਟਨ"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus ਡੈਮਨ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "ਇਮੋਜ਼ੀ"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>ਕੀਬੋਰਡ ਲੇਆਉਟ</b>"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਿੰਗ</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
+
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+"<big><b>IBus</b></big>\n"
+"<small>ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ</small>\n"
+"ਮੁੱਖ ਸਫ਼ਾ: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ibus ਚਲਾਓ"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਨਾ"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>ਸ਼ੁਰੂ</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "ਸਰਗਰਮੀਆਂ"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "ਜਾਨਵਰ ਤੇ ਕੁਦਰਤ"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "ਝੰਡੇ"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "ਖਾਣ-ਪੀਣ"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "ਚੀਜ਼ਾਂ"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "ਸਮਾਈਲੀ ਤੇ ਲੋਕ"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "ਚਿੰਨ੍ਹ"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "ਯਾਤਰਾ ਤੇ ਥਾਵਾਂ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "ਮੁਢਲੀ ਲਾਤੀਨੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "ਅਰਬੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "ਸੀਰੀਅਕ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "ਦੇਵਨਾਗਰੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "ਬੰਗਾਲੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "ਗੁਰਮੁਖੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "ਗੁਜਰਾਤੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "ਓੜੀਆ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "ਤਾਮਿਲ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "ਤੇਲਗੂ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "ਕੰਨੜ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "ਮਲਿਆਲਮ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "ਸਿੰਹਾਲਾ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "ਥਾਈ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "ਲਾਓ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "ਤਿੱਬਤੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "ਮਿਆਮਾਰ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "ਜਾਰਜੀਅਨ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "ਮੁਦਰਾ ਚਿੰਨ੍ਹ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "ਨੰਬਰ ਰੂਪ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "ਤੀਰ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "ਗਣਿਤ ਕਾਰਵਾਈਆਂ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "ਫੁਟਕਲ ਤਕਨੀਕੀ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "ਕੰਟਰੋਲ ਤਸਵੀਰਾਂ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "ਜਾਇਮਿਤੀ ਸ਼ਕਲਾਂ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "ਫੁਟਕਲ ਚਿੰਨ੍ਹ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "ਖਾਸ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "ਸਿਰਫ ਇੰਜਣ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "IBus ਨਾਲ ਨਹੀਂ ਜੁੜ ਸਕਿਆ।\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "ਭਾਸ਼ਾ: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "ਕੋਈ ਇੰਜਣ ਸੈੱਟ ਨਹੀਂ ਹੈ।\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "ਗਲੋਬਲ ਇੰਜਣ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "ਗਲੋਬਲ ਇੰਜਣ ਫੇਲ ਹੋਇਆ।\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਪੜ੍ਹੋ।"
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਈਲ ਪੜ੍ਹੋ।"
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਅਯੋਗ ਹੈ।\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "ਸਿਸਟਮ ਰਜਿਸਟਰੀ ਕੈਚੇ ਲਿਖੋ।"
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਫ਼ਾਈਲ ਲਿਖੋ।"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "...ਮੁੜ-ਸੈਟ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "ਮੁਕੰਮਲ"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "ਇੰਜਣ ਸੈੱਟ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon ਤੋਂ ਬਾਹਰ ਆਓ"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "ਉਪਲੱਬਧ ਇੰਜਣ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(ਲਾਗੂ ਨਹੀਂ ਕੀਤੀ ਹੋਈ)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "ਸੰਸਕਰਣ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਦੇ ਅੰਸ਼ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਬਣਾਓ।"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon ਦਾ D-Bus ਪਤਾ ਛਾਪੋ"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "ਸੰਰਚਨਾ ਮੁੱਲ ਦਿਖਾਓ"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "ਸੰਰਚਨਾ ਮੁੱਲ ਮੁੜ-ਸੈਟ ਕਰੋ"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr ""
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "ਇਹ ਜਾਣਕਾਰੀ ਵਿਖਾਓ"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "ਕਮਾਂਡ:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ਅਣਜਾਣ ਕਮਾਂਡ ਹੈ!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "ਮਨਪਸੰਦ"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "ਹੋਰ"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "ਯੂਨੀਕੋਡ ਚੋਣ ਖੋਲ੍ਹੋ"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "ਮੇਨੂ"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "ਚੇਤਾਵਨੀ ਸੁਨੇਹਾ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "ਯੂਨੀਕੋਡ ਸ਼ਬਦ-ਕੋਸ਼ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "ਕੋਡ ਬਿੰਦੂ: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "ਵਰਣਨ: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "ਨਾਂ: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "ਇਮੋਜ਼ੀ ਚੋਣ"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "ਯੂਨੀਕੋਡ ਚੋਣ"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr ""
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "ਫ਼ੌਂਟ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus ਪੈਨਲ"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus ਅੱਪਡੇਟ"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space ਹੁਣ ਮੂਲ ਹੌਟ-ਕੀ ਹੈ।"
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\n"
 "ਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\n"
 "http://www.satluj.com/"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pl.po b/po/pl.po
index 079446f19..6a434ef06 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,13 +15,13 @@
 # Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-27 06:17+0000\n"
+"PO-Revision-Date: 2019-04-18 05:34+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "Language: pl\n"
@@ -434,7 +434,7 @@ msgid ""
 msgstr "Copyright © 2007-2010 Peng Huang\n"
 "Copyright © 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Inne"
 
@@ -2360,587 +2360,650 @@ msgstr "Sogdyjski"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Elamicki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sorang sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Czakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Śarada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Archaiczne cyfry syngaleskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Chodżycki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Uzupełnienie mongolskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Varang kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Kwadratowe Zanabazara"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Gondi masarama"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "Gondi gunjala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Uzupełnienie tamilskiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cyfry i interpunkcja pisma klinowego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Wczesnodynastyczne pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Hieroglify egipskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Modyfikatory formatu hieroglifów egipskich"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Hieroglify anatolijskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Uzupełnienie bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideograficzne symbole i znaki interpunkcyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangucki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Składniki tanguckie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Uzupełnienie kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Rozszerzony kana A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Rozszerzenie małej kany"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nüshu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Stenografia Duployé’a"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Modyfikatory formatu stenograficznego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Bizantyjskie symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Starożytna grecka notacja muzyczna"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "Cyfry Majów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symbole Tai xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Cyfry w chińskim zapisie pałeczkowym"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematyczne symbole alfanumeryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Sutton SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Uzupełnienie głagolicy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng puachue hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Pismo ki-ka-ku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "Indyjskie cyfry siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Osmańskie cyfry siyaq"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabskie matematyczne symbole alfabetyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Klocki Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Klocki domina"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Karty do gry"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Uzupełnienie otoczonych symboli alfanumerycznych"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Uzupełnienie otoczonych ideogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Różne symbole i piktogramy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Emotikony"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Ozdoby drukarskie Dingbat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Symbole transportowe i dla map"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Symbole alchemiczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Rozszerzone kształty geometryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Uzupełnienie strzałek C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Uzupełnienie symboli i piktogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "Symbole szachowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Rozszerzone symbole i piktogramy A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Rozszerzenie B ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Rozszerzenie C ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Rozszerzenie D ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Rozszerzenie E ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Rozszerzenie F ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Dodatkowe ideogramy zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Dodatkowe przełączniki wariantów glifów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Dodatkowy obszar prywatnego użytku A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Dodatkowy obszar prywatnego użytku B"
 
@@ -3085,81 +3148,81 @@ msgstr "Inne"
 msgid "Open Unicode choice"
 msgstr "Otwórz wybór unikodu"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Wróć do wyboru emoji"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Wyświetlanie wariantów emoji"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Zamknij"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Kliknięcie wyświetli komunikat ostrzeżenia"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Wczytywanie słownika unikodu:"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Brak"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Nazwa: %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Wybór unikodu"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fe9074d84..a4af22c7e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # Portuguese (Brazil) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,381 +14,56 @@
 # Jonathan Muttini Topanotti <jontopanotti@gmail.com>, 2017. #zanata
 # Mateus de Melo Santos <mateusms@tutanota.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Cássio Rodrigo Honorato Rodrigues <cassiorhr@outlook.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:23-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2019-07-13 02:07+0000\n"
+"Last-Translator: Cássio Rodrigo Honorato Rodrigues <cassiorhr@outlook.com>\n"
 "Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
-"Language: pt-BR\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.9.6\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horizontal"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertical"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Canto superior esquerdo"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Canto superior direito"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Canto inferior esquerdo"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Canto inferior direito"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Padrão"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Não mostrar"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Ocultar automaticamente"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Preferências do IBus"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Próximo método de entrada:"
-
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Teclas de atalho para alteração ao método de entrada anterior da lista"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Método de entrada anterior:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Ativa ou desativa:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Habilitar:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Desabilitar:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Atalhos do Teclado</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Configure a orientação dos candidatos na tabela de observação"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientação dos candidatos:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Mostrar painel de propriedades:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Posição do Painel de Idioma:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Apresenta um ícone na bandeja do sistema"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Apresenta o nome do método de entrada na barra de idioma"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Embutir texto de pré-edição na janela do aplicativo "
-
-#: ../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"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Usa a fonte padrão:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fonte e Estilo</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Geral"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Adicionar"
-
-#: ../setup/setup.ui.h:36
-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"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../setup/setup.ui.h:38
-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"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "A_cima"
-
-#: ../setup/setup.ui.h:40
-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"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "A_baixo"
-
-#: ../setup/setup.ui.h:42
-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"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Sobre"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Apresente a informação do método de entrada selecionado"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Mostrar configuração do método de entrada selecionado"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>O método de entrada ativo pode ser alternado com os selecionados "
-"na lista acima pressionando as teclas de atalho do teclado ou clicando no "
-"ícone do painel.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Método de Entrada"
-
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "A tecla de atalho para exibição do diálogo emoji"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Escolha do emoji"
-
-#: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Defina uma fonte de candidatos emoji no diálogo emoji"
-
-#: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Fonte do emoji"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Defina um idioma de anotações emoji no diálogo emoji"
-
-#: ../setup/setup.ui.h:54
-msgid "Emoji annotation language:"
-msgstr "Idioma de anotação de emoji:"
-
-#: ../setup/setup.ui.h:55
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-
-#: ../setup/setup.ui.h:56
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-
-#: ../setup/setup.ui.h:57
-msgid "Prefix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:58
-msgid "Suffix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:59
-msgid "Containing match"
-msgstr ""
-
-#: ../setup/setup.ui.h:60
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Usa o desenho do teclado do sistema"
-
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usa o desenho do teclado do sistema (XKB)"
-
-#: ../setup/setup.ui.h:63
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Desenho do Teclado</b>"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
-msgid "Share the same input method among all applications"
-msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configurações de Método de Entrada Global</b> "
-
-#: ../setup/setup.ui.h:66
-msgid "Advanced"
-msgstr "Avançado"
-
-#: ../setup/setup.ui.h:67
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:74
-msgid "Start ibus on login"
-msgstr "Inicie o ibus na conexão "
-
-#: ../setup/setup.ui.h:75
-msgid "<b>Startup</b>"
-msgstr "<b>Inicialização</b>"
-
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
-msgid "About"
-msgstr "Sobre"
-
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Fechar"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Mecanismos de carregamento"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Ordem dos Motores"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Ordem dos motores salvas na lista de método de entrada"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Popup atrasou milisegundos para a janela de alterador IME"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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 &lt; Atrasa "
-"milisegundos. 0 &gt; Não exibe a janela e altera motores anterior/próximo."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Número da versão salvo"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -396,72 +71,123 @@ msgstr ""
 "O número da versão armazenada será utilizado para checar a diferença entre a "
 "versão do ibus instalado anteriormente e o da versão atual do ibus."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Leiautes latinos nos quais não contém ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "Leiaute US é anexado aos leiautes Latinos. variantes podem ser omitidas."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Usar xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Executar xmodmap se .xmodmap ou .Xmodmap existir quando os motorres do ibus "
 "forem trocados."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Usa o desenho do teclado do sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usa o desenho do teclado do sistema (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Embutir Texto de Pré-Edição "
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Use o método de entrada global"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Habilitar método de entrada por padrão"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+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"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "Prefixo de nome de preservação do DConf"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Realiza o trigger nas teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Desencadeia chaves de atalho para o "
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Habilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "As teclas de atalho para ligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Desabilitar teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "As teclas de atalho para desligar o método de entrada"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Próximo mecanismo de teclas de atalho"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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 "
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Visualização do mecanismo das teclas de atalho "
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Ocultar Automaticamente"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -469,24 +195,16 @@ msgstr ""
 "Comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar "
 "automaticamente,  2 = Sempre mostrar"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
-msgstr "Posição do Painel de Idioma"
-
-#: ../data/ibus.schemas.in.h:29
-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 idioma. 0 = Canto esquerdo superior, 1 = Canto "
-"direito superior, 2 = canto esquerdo inferior, 3 = canto direito inferior, 4 "
-"= Padrão "
+msgstr "Posição do Painel de Idioma"
 
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Siga o cursor de entrada no caso do painel estar sendo sempre exibido"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -494,11 +212,11 @@ msgstr ""
 "Se verdadeiro, o painel seguirá o cursor de entrada no caso do painel estar "
 "sendo sempre exibido. Se falso, o painel é exibido em uma localização fixa."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Os milissegundos para exibir as propriedades do painel"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -506,24 +224,33 @@ msgstr ""
 "Os milissegundos para exibir as propriedades do painel após obter foco ou as "
 "propriedades foram alteradas."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientação da tabela de pesquisa"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Apresenta um ícone na bandeja do sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Apresenta o nome do método de entrada"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Apresenta o nome do método de entrada na barra de idioma"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Valor RGBA de um ícone XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -542,11 +269,11 @@ msgstr ""
 "valores em porcentagem entre 0% e 100%, e 'a' é um valor em ponto flutuante "
 "entre 0 e 1 do alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Os milissegundos para exibir o ícone do painel para uma propriedade"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -559,39 +286,48 @@ msgstr ""
 "Se o valor é 0, não há tempo de espera e o ícone da propriedade será exibido "
 "imediatamente."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Usa a fonte padrão"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Usa o nome da fonte padrão para o painel de idioma"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Fonte padrão"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Nome da fonte padrão para o painel de idioma"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Teclas de atalho para gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "As teclas de talho para alternar a digitação do Unicode em on ou off"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Teclas de atalho emoji para o gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "A tecla de atalho para habilitar ou desabilitar a digitação emoji"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nome da fonte customizada para caracteres emoji no diálogo emoji"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Idioma padrão para o dicionário emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -599,11 +335,11 @@ msgstr ""
 "Escolha o idioma padrão para os dicionários emoji no diálogo emoji. O valor "
 "$lang é aplicado em /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista de emoji favoritos no diálogo emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -611,75 +347,68 @@ msgstr ""
 "Você pode exibir os emojis favoritos na lista de emoji se essa lista tiver "
 "algum caractere."
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
+msgstr "Lista de anotações emoji favorita no diálogo emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr ""
+msgstr "Você pode atribuir uma anotação para um emoji favorito nesta lista."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgstr "Se as anotações emoji podem ser combinadas parcialmente ou não. "
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:65
-msgid "Embed Preedit Text"
-msgstr "Embutir Texto de Pré-Edição "
-
-#: ../data/ibus.schemas.in.h:66
-msgid "Embed Preedit Text in Application Window"
-msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
-
-#: ../data/ibus.schemas.in.h:67
-msgid "Use global input method"
-msgstr "Use o método de entrada global"
-
-#: ../data/ibus.schemas.in.h:69
-msgid "Enable input method by default"
-msgstr "Habilitar método de entrada por padrão"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr "Carregar os dados emoji no momento da inicialização"
 
-#: ../data/ibus.schemas.in.h:70
-msgid "Enable input method by default when the application gets input focus"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
 msgstr ""
-"Habilitar método de entrada por padrão quando o aplicativo obtiver o foco de "
-"entradas"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "DConf preserve name prefixes"
-msgstr "Prefixo de nome de preservação do DConf"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr "Carregar os dados Unicode no momento da inicialização"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
 
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
@@ -687,2405 +416,2872 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Outros"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "Selecione uma língua"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
 msgstr "Mais…"
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Sobre"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Fechar"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:75
+#: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Desenho do teclado: %s\n"
 
-#: ../setup/engineabout.py:78
+#: setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:81
+#: setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Descrição:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
 msgid "Select an input method"
 msgstr "Selecione um método de entrada"
 
-#: ../setup/enginetreeview.py:96
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Adicionar"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Método de Entrada"
+
+#: setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferências do IBus"
+
+#: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
 msgstr "Definir Preferências do IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Atalhos do teclado"
 
-#: ../setup/keyboardshortcut.py:67
+#: setup/keyboardshortcut.py:67
 msgid "Key code:"
 msgstr "Código de tecla:"
 
-#: ../setup/keyboardshortcut.py:82
+#: setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:130
+#: setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "E_xcluir"
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Excluir"
+
+#: setup/keyboardshortcut.py:252
+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 teclas).\n"
+"O diálogo será encerrado quando a tecla for liberada."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
+
+#: setup/main.py:121 setup/main.py:588
+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"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
+
+#: setup/main.py:536
+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 ""
+"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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selecione o atalho do teclado para %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "mudando métodos de entrada"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertical"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Canto superior esquerdo"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Canto superior direito"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Canto inferior esquerdo"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Canto inferior direito"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Padrão"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Não mostrar"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Ocultar automaticamente"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Sempre"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Próximo método de entrada:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Teclas de atalho para alteração ao método de entrada anterior da lista"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Método de entrada anterior:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Ativa ou desativa:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Habilitar:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Desabilitar:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Atalhos do Teclado</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Configure a orientação dos candidatos na tabela de observação"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientação dos candidatos:"
+
+#: setup/setup.ui:407
+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"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Mostrar painel de propriedades:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Posição do Painel de Idioma:"
+
+#: setup/setup.ui:494
+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"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Embutir texto de pré-edição na janela do aplicativo "
+
+#: setup/setup.ui:513
+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"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Usa a fonte padrão:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fonte e Estilo</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Geral"
+
+#: setup/setup.ui:671
+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"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Remover"
+
+#: setup/setup.ui:689
+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"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Acima"
+
+#: setup/setup.ui:707
+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"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Abaixo"
+
+#: setup/setup.ui:725
+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"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Sobre"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Apresente a informação do método de entrada selecionado"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Mostrar configuração do método de entrada selecionado"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>O método de entrada ativo pode ser alternado com os selecionados "
+"na lista acima pressionando as teclas de atalho do teclado ou clicando no "
+"ícone do painel.</i></small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"As teclas de atalho para habilitar as conversões das anotações emoji ou "
+"nomes Unicode."
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Anotações emoji:"
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Fonte Unicode:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Defina um idioma de anotações emoji no diálogo emoji"
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Idioma de anotação de emoji:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1062
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
 msgstr ""
-"Por favor pressione uma tecla (ou uma combinação de teclas).\n"
-"O diálogo será encerrado quando a tecla for liberada."
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
 
-#: ../setup/main.py:121 ../setup/main.py:580
-msgid "Use shortcut with shift to switch to the previous input method"
+#: setup/setup.ui:1101
+msgid "Prefix match"
 msgstr ""
-"Utilize o atalho com o alterador para mudar para o método de entrada "
-"anterior"
 
-#: ../setup/main.py:507
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
 
-#: ../setup/main.py:528
-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"
+#: setup/setup.ui:1130
+msgid "Containing match"
 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:542
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
 
-#: ../setup/main.py:554
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selecione o atalho do teclado para %s"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Desenho do Teclado</b>"
 
-#. Translators: Title of the window
-#: ../setup/main.py:556
-msgid "switching input methods"
-msgstr "mudando métodos de entrada"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configurações de Método de Entrada Global</b> "
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avançado"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Inicie o ibus na conexão "
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Inicialização</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Atividades"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "Animais & Natureza"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Componente"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Bandeiras"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
-msgstr ""
+msgstr "Comida & Bebida"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objetos"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Pessoa & Corpo"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
 msgstr ""
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr ""
+msgstr "Viagem & Lugares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Latin Básico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "Extensões IPA"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armênio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebraico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Árabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Siríaco"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Tailandês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Extensões Fonéticas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Extensões Fonéticas Complementares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
-msgstr ""
+msgstr "Pontuação Geral"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
-msgstr ""
+msgstr "Setas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Operadores Matemáticos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Formas Geométricas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Símbolos Variados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Símbolos Matemáticos Variados-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Símbolos Matemáticos Variados-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Operadores Matemáticos Suplementares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Símbolos Variados e Setas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
-msgstr ""
+msgstr "Especiais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Símbolos Antigos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr ""
+msgstr "Antigo Itálico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "Gótico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Números Cuneiforme e Pontuação"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
+msgstr "Hieróglifos Egípcios"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Hieróglifos da Anatólia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Símbolos Diversos e Pictogramas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
-msgstr ""
+msgstr "Emoticons"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Transporte e Símbolos de Mapa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:54
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Somente o Nome do motor da lista"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Não foi possível conectar ao IBus.\n"
 
-#: ../tools/main.vala:96
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:164
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nenhum motor configurado.\n"
 
-#: ../tools/main.vala:172
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Configurar motor global falhou.\n"
 
-#: ../tools/main.vala:177
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Obter motor global falhour.\n"
 
-#: ../tools/main.vala:220
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Ler o cache do registro do sistema."
 
-#: ../tools/main.vala:222
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Ler o ARQUIVO de cache do registro."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "O cache do registro é inválido.\n"
 
-#: ../tools/main.vala:260
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Escrever o cache de registro do sistema."
 
-#: ../tools/main.vala:262
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Escrever o ARQUIVO de cache do registro."
 
-#: ../tools/main.vala:314
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Redefinindo…"
 
-#: ../tools/main.vala:328
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Concluído"
 
-#: ../tools/main.vala:373
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Definir ou obter motor"
 
-#: ../tools/main.vala:374
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Sair do ibus-daemon"
 
-#: ../tools/main.vala:375
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Exibir motores disponíveis"
 
-#: ../tools/main.vala:376
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Não implementado)"
 
-#: ../tools/main.vala:377
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar ibus-daemon"
 
-#: ../tools/main.vala:378
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Mostrar versão"
 
-#: ../tools/main.vala:379
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostrar conteúdo de cachê do registro"
 
-#: ../tools/main.vala:380
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Criar registro de cache"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir o endereço D-Bus do ibus-daemon"
 
-#: ../tools/main.vala:382
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Mostrar valores de configuração"
 
-#: ../tools/main.vala:383
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Redefinir os valores de configuração"
 
-#: ../tools/main.vala:385
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Salvar emoji no diálogo para a área de transferência"
 
-#: ../tools/main.vala:387
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostrar essa informação"
 
-#: ../tools/main.vala:393
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:423
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s é um comando desconhecido!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menu"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Outros"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Escolha do emoji"
-
-#: ../ui/gtk3/emojier.vala:451
-msgid "Type annotation or choose emoji"
-msgstr "Digite a anotação ou escolha o emoji"
-
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:950
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr "Clique para visualizar o aviso"
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr "Carregando um dicionário Unicode"
+
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Ponto de código: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Nenhum"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotações: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Nome: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr "Escolha do emoji"
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Escolha de um emoji cancelada."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji copiado para a sua área de transferência."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" para caracteres  no diálogo emoji"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"LANG\" para anotações em diálogo emoji. V.g. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Painel IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Atualização IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super + espaço agora são as teclas de atalho padrão."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "créditos-tradutor"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Reinicie"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Sair"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "padrão:LTR"
diff --git a/po/sv.po b/po/sv.po
index 3ec90e683..a521c7ab9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # Swedish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -8,387 +8,59 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-08-17 06:36+0000\n"
+"PO-Revision-Date: 2019-06-11 10:11+0000\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
-"X-Generator: Zanata 4.6.0\n"
+"X-Generator: Zanata 4.6.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horisontellt"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertikalt"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Övre vänstra hörnet"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Övre högra hörnet"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Nedre vänstra hörnet"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Nedre högra hörnet"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Anpassat"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Visa inte"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Dölj automatiskt"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Alltid"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus-inställningar"
-
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "Kortkommandot för att byta till nästa inmatningsmetod i listan"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Nästa inmatningsmetod:"
-
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "Kortkommandot för att byta till föregående inmatningsmetod i listan"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Föregående inmatningsmetod:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "…"
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Kortkommandot för att slå på och av inmatningsmetoden"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Aktivera eller avaktivera:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Aktivera:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Avaktivera:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Kortkommandon</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Ange ordningen av kandidater i tabelluppslagning"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Kandidaters riktning:"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Ange beteendet hos ibus hur den visar eller döljer språkpanelen"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Visa egenskapspanel:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Språkpanelens position:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Visa ikonen i aktivitetsfältet"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Visa inmatningsmetodens namn i språkpanelen"
-
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Visa inmatningsmetodens namn i språkpanelen när kryssrytan är iklickad"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Bädda in förredigeringstext i programfönstret"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Bädda in förredigeringstext för inmatningsmetoden i programfönstret"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Använd ett anpassat typsnitt:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Typsnitt och stil</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Allmänt"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Lägg till"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Lägg till den valda inmatningsmetoden till de aktiverade inmatningsmetoderna"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Ta bort"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Ta bort den valda inmatningsmetoden från de aktiverade inmatningsmetoderna"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Upp"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Flytta upp den valda inmatningsmetoden i listan över aktiverade "
-"inmatningsmetoder"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Ner"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Flytta ner den valda inmatningsmetoden i listan över aktiverade "
-"inmatningsmetoder"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Om"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Visa information om den valda inmatningsmetoden"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Inställningar"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Visa uppsättningen av den valda inmatningsmetoden"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Den aktiva inmatningsmetoden kan bytas mellan de valda i listan "
-"ovan genom att trycka snabbkommandot eller klicka i panelikonen.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Inmatningsmetod"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "Kortkommandot för att aktivera emoji-annoteringar eller Unicode-namn"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Emoji-annoteringar:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Kortkommandon för att aktivera konverteringar av Unicode-kodpunkter"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode-kodpunkter:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Ange ett typsnitt för Unicode-kandidater i emoji-dialogen"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode-typsnitt:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Ange ett språk för emoji-annotationer i emoji-dialogen"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Språk för emoji-annotationer:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Matcha emoji-annotationer partiellt med följande villkor och mer än antalet "
-"tecken:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Om emoji-annotationer kan matchas med en partiell sträng istället för en "
-"exakt matchning"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Prefixmatchning"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Suffixmatchning"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Innehållsmatchning"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Använd systemets tangentbordslayout"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Använd systemets (XKB) tangentbordslayout"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tangentbordslayout</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Dela samma inmatningsmetod mellan alla program"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Inställningar för global inmatningsmetod</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligenta inmatningsbussen</small>\n"
-"Hemsida: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Starta ibus vid inloggning"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Uppstart</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Om"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Stäng"
-
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Förhandsladda maskiner"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Förhandsladda maskiner när ibus startas upp"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Maskinordning"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Sparad maskinordning i listan över inmatningsmetoder"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Fördröjning i millisekunder för pop-up-fönster för IME-byte"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
 "Ange fördröjningen i millisekunder för att visa pop-up-fönstret för IME-byte."
-"  Standard är 400.  0 = Visa fönstret omedelbart. 0 &lt; Vänta millisekunder."
-" 0 &gt; Visa inte fönstret och byt till föregående/nästa maskin."
+"  Standard är 400.  0 = Visa fönstret omedelbart. 0 < Vänta millisekunder. 0 "
+"> Visa inte fönstret och byt till föregående/nästa maskin."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Sparade versionsnummer"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -396,69 +68,119 @@ msgstr ""
 "Sparade versionsnummer kommer användas för att kontrollera skillnaden mellan "
 "versionen på den tidigare installerade ibus:en och den nuvarande ibus:en."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Latinsk layout som inte har ASCII"
 
-#: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the Latin layouts. variant can be omitted."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+"USA-layout läggs till till den Latinska layouten, varianten kan utelämnas."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "Använd xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "Kör xmodmap om .xmodmap eller .Xmodmap finns när ibus-maskiner byts."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Använd systemets tangentbordslayout"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Använd systemets (XKB) tangentbordslayout"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Bädda in förredigerad text"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Bädda in förredigerad text i programfönstret"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Använd den globala inmatningsmetoden"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Dela samma inmatningsmetod mellan alla program"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Aktivera inmatningsmetoden som standard"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
 msgstr ""
-"USA-layout läggs till till den Latinska layouten, varianten kan utelämnas."
+"Aktivera inmatningsmetoden som standard när programmet får inmatningsfokus"
 
-#: ../data/ibus.schemas.in.h:13
-msgid "Use xmodmap"
-msgstr "Använd xmodmap"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf namnbevarandeprefix"
 
-#: ../data/ibus.schemas.in.h:14
-msgid ""
-"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "Kör xmodmap om .xmodmap eller .Xmodmap finns när ibus-maskiner byts."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefix av DConf-tangenter för att förhindra namnkonvertering"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Utlös kortkommandon"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Kortkommandot för att slå på och av inmatningsmetoden"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Utlös kortkommando för gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Aktivera kortkommandon"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "Kortkommandot för att slå på inmatningsmetoden"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Avaktivera kortkommandon"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Kortkommandot för att slå av inmatningsmetoden"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Kortkommandon för nästa maskin"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Kortkommandot för att byta till nästa inmatningsmetod i listan"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Kortkommandon för föregående maskin"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Kortkommandot för att byta till föregående inmatningsmetod"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Dölj automatiskt"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -466,23 +188,16 @@ msgstr ""
 "Beteendet hos egenskapspanelen.  0 = Visa inte, 1 = Dölj automatiskt 2 = "
 "Visa alltid"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Språkpanelens position"
 
-#: ../data/ibus.schemas.in.h:29
-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 ""
-"Språkpanelens position. 0 = Övre vänstra hörnet, 1 = Övre högra hörnet, 2 = "
-"Nedre vänstra hörnet, 3 = Nedre högra hörnet, 4 = Anpassat"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Följ inmatningsmarkören i fallet när panelen alltid visas"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -490,11 +205,11 @@ msgstr ""
 "Om sant följer panelen inmatningsmarkören i fallet när panelen alltid visas. "
 " Om falskt visas panelen på en bestämd plats."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Antalet millisekunder att visa egenskapspanelen"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -502,25 +217,34 @@ msgstr ""
 "Antalet millisekunder att visa egenskapspanelen efter infokusering eller att "
 "egenskaperna ändrats."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orienteringen på uppslagningstabellen"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 "Orienteringen på uppslagningstabellen.  0 = horisontellt, 1 = vertikalt"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Visa ikonen i aktivitetsfältet"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Välj namn på inmatningsmetoden"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Visa inmatningsmetodens namn i språkpanelen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "RGBA-värde på XKB-ikonen"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -538,11 +262,11 @@ msgstr ""
 "intervallet 0 till 255 eller procentsatser i intervallet 0% till 100%, och "
 "”a” är ett flyttalsvärde i intervallet 0 till 1 för alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Antalet millisekunder att visa panelikonen för en egenskap"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -554,47 +278,48 @@ msgstr ""
 "key i IBusEngineDesc.  Om värdet är 0, ingen fördröjning och egenskapsikonen "
 "visas omedelbart."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Använd anpassat typsnitt"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Använd det anpassade typsnittsnamnet till språkpanelen"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Anpassat typsnitt"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Anpassat typsnittsnamn till språkpanelen"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode-kortkommandon för gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Kortkommandot för att slå på och av Unicode-inmatning"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-kortkommando för gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Kortkommandot för att slå på och av emoji-inmatning"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Anpassat typsnitt för emoji-tecken i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Standardspråk för emoji-ordlista"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -602,11 +327,11 @@ msgstr ""
 "Välj ett standardspråk med emoji-ordlistor i emoji-dialogen.  Värdet $lang "
 "används i /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "favorit-emoji-lista i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -614,19 +339,19 @@ msgstr ""
 "Du kan visa favorit-emoji:erna i emoji-listan om denna lista har några "
 "tecken."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit-emoji-annoteringslista i emoji-dialogen"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tilldela en annotering för en favorit-emoji i denna lista."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Huruvida emoji-annotationer kan matchas partiellt eller inte"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -634,11 +359,11 @@ msgstr ""
 "Huruvida emoji-annotationer kan matchas med en partiell sträng istället för "
 "den exakta matchningen eller inte."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Matcha emoji-annotationer med den angivna längden"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -646,11 +371,11 @@ msgstr ""
 "Matcha emoji-annotationer partiellt med mer än det angivna antalet tecken "
 "istället för den exakta matchningen."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Välj ett villkor för att matcha emoji-annotationer partiellt"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -658,11 +383,11 @@ msgstr ""
 "Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 =="
 " prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Läs in emoji-data vid uppstartstillfället"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -672,11 +397,11 @@ msgstr ""
 "behövs för att läsa in datan.  Läs emoji-datan när emoji-dialogen öppnas i "
 "början om falskt."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Läs in Unicode-data vid uppstartstillfället"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -688,2206 +413,2629 @@ msgstr ""
 "början om falskt.  Unicode-datan läses alltid in efter emoji-datan läses in "
 "även om sant."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Bädda in förredigerad text"
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright © 2007-2010 Peng Huang\n"
+"Copyright © 2007-2010 Red Hat, Inc."
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Bädda in förredigerad text i programfönstret"
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "Andra"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Använd den globala inmatningsmetoden"
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Välj ett språk"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Aktivera inmatningsmetoden som standard"
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mer …"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Om"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Stäng"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Språk: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tangentbordslayout: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Upphovsman: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beskrivning:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Välj en inmatningsmetod"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Lägg till"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Inmatningsmetod"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus-inställningar"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Sätt IBus-inställningar"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Kortkommandon"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Tangentkod:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modifierare:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Verkställ"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Radera"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Tryck en tangent (eller tangentkombination).\n"
+"Dialogen kommer stängas när tangenten släpps."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Tryck en tangent (eller tangentkombination)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+"Använd kortkommandot med skift för att byta till föregående inmatningsmetod"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-demonen kör inte.  Vill du starta den?"
+
+#: setup/main.py:536
+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 har startats!  Om du inte kan använda IBus, lägg till följande rader i "
+"din $HOME/.bashrc; och logga därefter in igen till ditt skrivbord.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: setup/main.py:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus-demonen kunde inte startas på %d sekunder"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Välj snabbkommando för %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "byter inmatningsmetoder"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horisontellt"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertikalt"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Övre vänstra hörnet"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Övre högra hörnet"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Nedre vänstra hörnet"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Nedre högra hörnet"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Anpassat"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Visa inte"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Dölj automatiskt"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Alltid"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "Kortkommandot för att byta till nästa inmatningsmetod i listan"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Nästa inmatningsmetod:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "Kortkommandot för att byta till föregående inmatningsmetod i listan"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Föregående inmatningsmetod:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Aktivera eller avaktivera:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Aktivera:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Avaktivera:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Kortkommandon</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ange ordningen av kandidater i tabelluppslagning"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Kandidaters riktning:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Ange beteendet hos ibus hur den visar eller döljer språkpanelen"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Visa egenskapspanel:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Språkpanelens position:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Visa inmatningsmetodens namn i språkpanelen när kryssrytan är iklickad"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Bädda in förredigeringstext i programfönstret"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Bädda in förredigeringstext för inmatningsmetoden i programfönstret"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Använd ett anpassat typsnitt:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Typsnitt och stil</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Allmänt"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Lägg till den valda inmatningsmetoden till de aktiverade inmatningsmetoderna"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Ta bort den valda inmatningsmetoden från de aktiverade inmatningsmetoderna"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Upp"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
-"Aktivera inmatningsmetoden som standard när programmet får inmatningsfokus"
+"Flytta upp den valda inmatningsmetoden i listan över aktiverade "
+"inmatningsmetoder"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf namnbevarandeprefix"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Ner"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Prefix av DConf-tangenter för att förhindra namnkonvertering"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Flytta ner den valda inmatningsmetoden i listan över aktiverade "
+"inmatningsmetoder"
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007-2010 Peng Huang\n"
-"Copyright © 2007-2010 Red Hat, Inc."
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Om"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Andra"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Visa information om den valda inmatningsmetoden"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Välj ett språk"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Inställningar"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Visa uppsättningen av den valda inmatningsmetoden"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_OK"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Den aktiva inmatningsmetoden kan bytas mellan de valda i listan "
+"ovan genom att trycka snabbkommandot eller klicka i panelikonen.</i></small>"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Mer …"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "Kortkommandot för att aktivera emoji-annoteringar eller Unicode-namn"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Språk: %s\n"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emoji-annoteringar:"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tangentbordslayout: %s\n"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Kortkommandon för att aktivera konverteringar av Unicode-kodpunkter"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Upphovsman: %s\n"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode-kodpunkter:"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Beskrivning:\n"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Ange ett typsnitt för Unicode-kandidater i emoji-dialogen"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Välj en inmatningsmetod"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode-typsnitt:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Ange ett språk för emoji-annotationer i emoji-dialogen"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Sätt IBus-inställningar"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Språk för emoji-annotationer:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Kortkommandon"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Matcha emoji-annotationer partiellt med följande villkor och mer än antalet "
+"tecken:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Tangentkod:"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Om emoji-annotationer kan matchas med en partiell sträng istället för en "
+"exakt matchning"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modifierare:"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Prefixmatchning"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Verkställ"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Suffixmatchning"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Radera"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Innehållsmatchning"
 
-#: ../setup/keyboardshortcut.py:252
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr ""
-"Tryck en tangent (eller tangentkombination).\n"
-"Dialogen kommer stängas när tangenten släpps."
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Tryck en tangent (eller tangentkombination)"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tangentbordslayout</b>"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
-"Använd kortkommandot med skift för att byta till föregående inmatningsmetod"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Inställningar för global inmatningsmetod</b>"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-demonen kör inte.  Vill du starta den?"
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avancerat"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 msgstr ""
-"IBus har startats!  Om du inte kan använda IBus, lägg till följande rader i "
-"din $HOME/.bashrc; och logga därefter in igen till ditt skrivbord.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-
-#. Translators: %d == 5 currently
-#: ../setup/main.py:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-demonen kunde inte startas på %d sekunder"
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligenta inmatningsbussen</small>\n"
+"Hemsida: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Välj snabbkommando för %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Starta ibus vid inloggning"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "byter inmatningsmetoder"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Uppstart</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Aktiviteter"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Djur & natur"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Komponent"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Flaggor"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Mat & dryck"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Föremål"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Smajlisar & folk"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Folk & kropp"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Smajlisar & känsla"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symboler"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Resor & platser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Grundläggande latinskt"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Latin-1-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latin utökad-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latinskt utökad-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Modifieringsbokstäver för blanksteg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Kombinerande diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Grekiska och koptiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Kyrilliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Kyrilliska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Armeniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebreiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syriska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Arabiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandeiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Syriska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arabiska utökat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamilska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thailändska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibetanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Georgiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Etiopiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Etiopiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cherokesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Enhetliga kanadensiska aboriginstavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongoliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Enhetliga kanadensiska aboriginstavelser, utökad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Ny tai lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Khmer-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Kombinerande utökade diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinesisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundanesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Kyrillisk utökad-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Utökad georgiska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Sundanesiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Vediska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Fonetiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Tillägg för fonetiska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Tillägg för kombinerande diakritiska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Ytterligare utökade latinska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Utökade grekiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Allmänna skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Upphöjda och nedsänkta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Valutasymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Kombinerande diakritiska symbolmarkörer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Bokstavsliknande symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Pilar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Matematiska operatorer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Diverse tekniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Kontrollbilder"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optisk teckenigenkänning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Inneslutna alfanumeriska tecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Lådritning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Blockelement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Geometriska former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Diverse symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Diverse matematiska symboler-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Piltillägg-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Punktskriftsmönster"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Piltillägg-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Diverse matematiska symboler-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Matematiska operatortillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Diverse symboler och pilar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolitisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Utökat latin-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Koptisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Georgiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Utökad etiopisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Kyrillisk utökad-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Tillägg till skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK-ordstamstillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kangxi-ordstammar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Tecken för ideografisk beskrivning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK-symboler och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangul-kompatibilitet Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Utökad bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK-streck"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Fonetiska katakana-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Inneslutna CJK-bokstäver och -månader"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK-kompatibilitet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Enhetliga CJK-ideograftillägg A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Yijing-hexagramsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "Enhetliga CJK-ideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi-ordstammar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Kyrillisk utökad-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Modifieringsbokstäver för toner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Utökat latin-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Vanliga indiska talformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari utökad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Utökad Hangul Jamo-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javanesiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Utökad Myanmar-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Utökad Myanmar-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meetei Mayek-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Utökad etiopisk-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Utökat latin-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cherokesiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangul-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Utökad Hangul Jamo-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Höga surrogat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Höga surrogat för privat användning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Låga surrogat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Område för privat användning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alfabetiska presentationsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arabiska presentationsformer-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Variationsväljare"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Vertikala former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Kombineringshalvmarkörer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK-kompatibilitetsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Små formvarianter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arabiska presentationsformer-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Halvbredds- och helbreddsformer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Specialtecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Linjär B-stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Linjär B-ideogram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Egeiska tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Gammalgrekiska tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Antika symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Phaistos-skiva"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lykiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Kariska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Koptiska epact-nummer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Fornitaliska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gotiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Fornpermiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugaritiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Gammalpersiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shaviska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmaniska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Kaukasisk albanska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Linjär A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Cypriotiska stavelser"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Senarameiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmyrenska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabatéiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatranska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Phoenicisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lydian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroitiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroitiska kursiv"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Fornsydarabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Fornnordarabiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manikeiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Inskriptionell parthiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Inskriptionell pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Psaltaren-pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Fornturkiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Fornungerska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi Rohingya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Numeriska Rumi-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Gammalsogdiska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdiska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Elymaic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Singalesiska arkaiska nummer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojkiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Sindhiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongoliska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar-kvadratskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "Gunjala Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "Makassariska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Tillägg för tamil"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Kilskrift-tal och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Tidig dynastisk kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyptiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Formatstyrning för egyptiska hieroglyfer"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatoliska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Bamum-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mru"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassaiska vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahaw mong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografiska symboler och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Utökad Kana-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Utökning för små kanasymboler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Formateringskontroll för Stenografi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Bysantinska musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Gammalgrekisk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr "Mayasiffror"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Talstav"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematiska alfanumeriska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Suttons teckningsskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolitiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr "Indiska siyaq-siffror"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Ottomanska siyaq-siffror"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabiska matematiska alfabetiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Mahjong-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Domino-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Spelkort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Inneslutna alfanumeriska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Inneslutna ideografiska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symboler och piktogram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Humörsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Dekorativa Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Transport- och kartsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Alkemiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Utökade geometriska former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Piltillägg-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Symbol- och piktogramtillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "Schacksymboler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Symboler och piktogram tillägg-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Enhetliga CJK-ideograftillägg B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Enhetliga CJK-ideograftillägg C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Enhetliga CJK-ideograftillägg D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Enhetliga CJK-ideograftillägg E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Enhetliga CJK-ideograftillägg F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK-kompatibilitetideografstillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Taggar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Variationsväljartillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Tillägg till privat användningsområde-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Tillägg till privat användningsområde-B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Lista endast maskinnamn"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Kan inte ansluta till IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "språk: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Ingen maskin är satt.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Att sätta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Att hämta den globala maskinen misslyckades.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Läs systemregistercachen."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Läs registercachen i FIL."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Registercachen är felaktig.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Skriv systemregistercachen."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Skriv registercachen till FIL."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
@@ -2895,174 +3043,169 @@ msgstr ""
 "Använd motorschemasökvägar istället för ibus-kärnan, vilket kan vara "
 "kommaseparerade värden."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Återställer …"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Klart"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Sätt eller hämta maskin"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Avsluta ibus-demonen"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Visa tillgängliga maskiner"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Inte implementerat)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Starta om ibus-demonen"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Visa versionen"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Vissa innehållet i registercachen"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Skapa en registercache"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Skriv ut D-Bus-adressen till ibus-demonen"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Visa konfigurationsvärdena"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Återställ konfigurationsvärdena"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Spara emoji i dialogen till urklipp"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Visa denna information"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Användning: %s KOMMANDO [FLAGGA …]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Kommandon:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s är ett okänt kommando!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Annat"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Öppna Unicode-val"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Ange annotation eller välj emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Ta tillbaks emoji-val"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Bläddra upp"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Visa emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Stäng"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Meny"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Klicka för att visa ett varningsmeddelande"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Laddar en Unicode-ordbok"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodpunkt: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Ingen"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Unicode-val"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3073,82 +3216,74 @@ msgstr ""
 "inskrivningsläget, klicka på ditt skrivbord och klicka på ditt textprogram "
 "igen."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Avbröt att välja en emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "SPRÅK"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annotationer kan matcha partiellt"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Matcha med längden på det angivna heltalet"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Matcha med villkoret för det angivna heltalet"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus-uppdatering"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+ mellanslag är nu standardsnabbkommando."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Starta om"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Avsluta"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/uk.po b/po/uk.po
index 3a0f9aa94..3b247fc91 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,13 +14,13 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.19\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-02-27 12:10+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-02-27 03:02+0000\n"
+"PO-Revision-Date: 2019-04-17 05:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -434,7 +434,7 @@ msgid ""
 msgstr "© Peng Huang, 2007–2010\n"
 "© Red Hat, Inc., 2007–2010"
 
-#: ibus/lang.py:41 src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "Інше"
 
@@ -2367,587 +2367,650 @@ msgstr "Согдійська"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Елімаїдська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Брахмійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Кайтхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Соранг сомпенг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Чакма"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Махаджані"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Шарада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Сингальські архаїчні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Ходжкі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Мултанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Худабадська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Грантха"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Неварська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Тірхута"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Сіддхам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Моді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Додаткові монгольські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Такрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ахом"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:937
 msgid "Dogra"
 msgstr "Доґра"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Варанг-кшиті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Нандінагарі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Квадратний Занабазара"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Сойомбо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Пау Цин Хау"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Бхайксукі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Марчен"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Масарам гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
 msgstr "Гунджала гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:977
 msgid "Makasar"
 msgstr "Макасар"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Додаткова тамільська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Клинопис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Клинописні числа і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Клинопис ранньої династії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Єгипетська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Керування форматами єгипетських ієрогліфів"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Анатолійьска ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Розширений бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Мро"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Басса-вах"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
 msgstr "Медефайдрін"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Мяо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ідеографічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Тангутська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Компоненти тангутської"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Додаткова кана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Кана розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Мале розширення кани"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Нюй-шу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Система Дюполоє"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Керування форматами скоропису"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Візантійські музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Давньогрецькі символи запису музики"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
 msgstr "Цифри майя"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Символи Тай Хуан Жинь"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Числа з паличок для лічби"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Математичні буквено-цифрові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Жестова писемність Саттон"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Додаткові глаголиці"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Ньякензька пахау-хмонг"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Ванчо"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Менде кікауї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Адлам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
 msgstr "Індійські числа сіяк"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Оттоманські сіякські числа"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Арабські математичні символи абетки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Плитки маджонґ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Плитки доміно"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Ігрові карти"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Додаткові буквенно-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Додаткові ідеографічні у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Різні символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Емоційки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Орнаментальні декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Транспортні і картографічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Алхімічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Розширені геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Додаткові стрілки-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Додаткові символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
 msgstr "Шахові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Символи і піктографи, розширення A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Уніфіковані ієрогліфічні ідеограми, додаток B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Ієрогліфічні ідеограми, додаток C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Ієрогліфічні ідеограми, додаток D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Ієрогліфічні ідеограми, додаток E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Ієрогліфічні ідеограми, додаток F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Додаткові ієрогліфічні ідеограми для сумісності"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Мітки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Додаткові символи зміни"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Додаткова область приватного використання A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Додаткова область приватного використання B"
 
@@ -3092,81 +3155,81 @@ msgstr "Інше"
 msgid "Open Unicode choice"
 msgstr "Відкрити вибір Unicode"
 
-#: ui/gtk3/emojier.vala:940
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Повернути вибір емоційок"
 
-#: ui/gtk3/emojier.vala:1042
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ui/gtk3/emojier.vala:1053
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ui/gtk3/emojier.vala:1056
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Показувати варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1057
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Закрити"
 
-#: ui/gtk3/emojier.vala:1063
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Меню"
 
-#: ui/gtk3/emojier.vala:1074
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Натисніть, щоб переглянути попередження"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Завантаження словника Unicode:"
 
-#: ui/gtk3/emojier.vala:1364
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ui/gtk3/emojier.vala:1370
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1537 ui/gtk3/emojier.vala:1550
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ui/gtk3/emojier.vala:1537
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Немає"
 
-#: ui/gtk3/emojier.vala:1561
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ui/gtk3/emojier.vala:1587
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Назва: %s"
 
-#: ui/gtk3/emojier.vala:1595
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
-#: ui/gtk3/emojier.vala:2085 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ui/gtk3/emojier.vala:2087
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Вибір Unicode"
 
-#: ui/gtk3/emojier.vala:2375
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6f3d8878a..e68d83e45 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,494 +14,229 @@
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2018. #zanata
 # Peter Pan <pan93412@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Peter Pan <pan93412@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-10-08 01:50+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2019-07-04 05:41+0000\n"
+"Last-Translator: Peter Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\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 "Do not show"
-msgstr "不要顯示"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>鍵盤快捷鍵</b>"
-
-#: ../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 property panel:"
-msgstr "顯示屬性面板："
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "語言面板位置："
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "在系統匣顯示圖示"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>字型與風格</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "通用"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "加入(_A)"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "加入選取的輸入法到已啟用的輸入法內"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "從已啟用的輸入法中移除所選的輸入法"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "向上(_U)"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "上移所選取的輸入法"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "向下(_D)"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "下移所選取的輸入法"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "關於(_A)"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "顯示所選取的輸入法資訊"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "偏好設定(_P)"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "顯示選取輸入法的設置"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "輸入法"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "啟用 Emoji 符號或 Unicode 名稱轉換的快捷鍵"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Emoji 符號："
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "啟用 Unicode 碼位轉換的快捷鍵"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Unicode 碼位："
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "設定 Emoji 對話框上的 Unicode 候選字型"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode 字體："
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "設定繪文字對話窗中的繪文字註釋語言"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "繪文字註釋語言："
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr "部分繪文字註解符合下列條件以及至少字數："
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr "是否繪文字註解可以用部分字串符合取代精確符合"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "前綴符合"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "後綴符合"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "內含符合"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "繪文字"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "使用系統鍵盤配置"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "使用系統鍵盤 (XKB) 配置"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>鍵盤配置</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "在所有應用程式共用同一個輸入法"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>全域輸入法設定值</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "進階"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>iBus</b></big>\n"
-"<small>智慧型輸入框架</small>\n"
-"首頁: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "在登入時啟動 iBus"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>啟動</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "關於"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "關閉(_C)"
-
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "預先載入引擎"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "當 iBus 啟動時預先載入引擎"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "引擎順序"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "輸入法清單中儲存的引擎順序"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 切換器視窗彈出延遲的毫秒數"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
-"設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 &lt; 延遲毫秒。0 &gt; 不要顯示視窗直接往前/"
-"往後切換引擎。"
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "儲存的版本號碼"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "無 ASCII 之拉丁鍵盤配置"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US 鍵盤配置附加到拉丁鍵盤配置。variant 可以省略。"
 
-#: ../data/ibus.schemas.in.h:13
-msgid "Use xmodmap"
-msgstr "使用 xmodmap"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "使用 xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "當 ibus 引擎切換之時，若 .xmodmap 或 .Xmodmap 存在的話，則執行 xmodmap。 "
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "使用系統鍵盤配置"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系統鍵盤 (XKB) 配置"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "內嵌預先編輯文字"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "在應用程式視窗中內嵌預先編輯文字"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "使用全域輸入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "在所有應用程式共用同一個輸入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "預設啟用輸入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
 
-#: ../data/ibus.schemas.in.h:14
-msgid ""
-"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "當 ibus 引擎切換之時，若 .xmodmap 或 .Xmodmap 存在的話，則執行 xmodmap。 "
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf 保留名稱前綴"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "DConf 鍵的前綴，用來停止名稱轉換"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "觸發用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "用來開啟或關閉輸入法的快捷鍵"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse 的觸發快捷鍵"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "啟用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "開啟輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "停用快捷鍵"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "關閉輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "「下一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "用來切換到清單內下一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "「上一個引擎」快捷鍵"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "用來切換到清單內上一個輸入法的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "自動隱藏"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "屬性面板的行為。0 = 不要顯示，1 = 自動隱藏，2 = 總是顯示"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "語言面板位置"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "在面板總是顯示的情況下跟隨輸入游標"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "若為真，則面板會在總是顯示的情況下跟隨輸入游標。若為假，則面板會顯示在固定位置上。"
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "顯示屬性面板的毫秒數"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "當焦點落在屬性面板內，或屬性變更時屬性面板的顯示毫秒數。"
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "查選表單表排列方向"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "查詢表單的排列方向。0 = 水平，1 = 垂直"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "在系統匣顯示圖示"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "顯示輸入法名稱"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "在語言列顯示輸入法名稱"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "XKB 圖示的 RGBA 值"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -516,11 +251,11 @@ msgstr ""
 "「rgba(r,g,b,a)」格式的 RGBA 採，其中的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a "
 "則是 0 至 1 之間的浮點 alpha 值。"
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "顯示面板屬性圖示的毫秒數"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -530,106 +265,107 @@ msgstr ""
 "當切換引擎時將面板的引擎圖示改顯示為屬性圖示的毫秒數，若 IBusEngineDesc 中該屬性的 icon-prop-key 值有指定的話。如果值為 "
 "0，則沒有延遲時間，該屬性圖示將立即顯示。"
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "語言面板是否使用自訂字型"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "自訂字型"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "為語言面板自訂字型"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse 的 Unicode 快捷鍵"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "開啟或關閉 Unicode 輸入的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse 的繪文字快捷鍵"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "開啟繪文字輸入或關閉的快捷鍵"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "繪文字對話窗當中繪文字字元的自訂字型名稱"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "繪文字字典的預設語言"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 "請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "繪文字對話窗中的喜愛繪文字清單"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "您可以在繪文字清單中顯示喜愛的繪文字，若有列出任何字元的話。"
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "繪文字對話盒中喜愛的繪文字註解列表"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "您可以為清單中喜愛的繪文字指派註解。"
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "是否可以只部分符合繪文字註解"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr "比對時是否可以只有部分字串符合繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "以指定長度符合繪文字註解"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "以超過指定字數符合部分繪文字註解，而非精確符合。"
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "選擇部分符合繪文字註解的條件"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr "選擇下列部分符合繪文字註解的條件之一：0 == 前綴符合，1 == 後綴符合, 2 == 內含符合"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "每次開啟時載入 Emoji 資料"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -638,11 +374,11 @@ msgstr ""
 "如果為 True 則在每次開啟時載入 Emoji 資料，載入資料大約需要 10MB 的記憶體大小。當設定為 False 時則在第一次開啟 Emoji "
 "對話框時載入 Emoji 資料。"
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "每次開啟時載入 Unicode 資料"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -652,2375 +388,2782 @@ msgstr ""
 "如果為 True 則在每次開啟時載入 Unicode 資料。載入資料需要大約 15MB 大小的記憶體。如果設定為 False 則在第一次開啟 Emoji "
 "對話框時載入 Unicode 資料，就算設定為 True，Unicode 資料永遠都會在 Emoji 資料載入後才載入。"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "內嵌預先編輯文字"
+#: ibus/_config.py.in:41
+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."
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "在應用程式視窗中內嵌預先編輯文字"
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "其他"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "使用全域輸入法"
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "選取語言"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "預設啟用輸入法"
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr "當應用程式取得輸入焦點時，預設將輸入法啟用"
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "確定(_O)"
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf 保留名稱前綴"
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "其他…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "關於"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "語言：%s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "鍵盤配置: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者：%s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "描述：\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "選取輸入法"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "加入(_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "輸入法"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "鍵盤"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "iBus 偏好設定"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "設置 iBus 偏好設定"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "鍵盤快捷鍵"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "按鍵碼："
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "修飾鍵："
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "請按鍵盤按鍵 (或是按鍵組合)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
+
+#: setup/main.py:536
+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 已經啟動！若您無法使用 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus 幕後程式無法在 %d 秒後啟動"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "為 %s 選取鍵盤快捷鍵"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "切換輸入法"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "水平"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "垂直"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "左上角"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "右上角"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "左下角"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "右下角"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "自訂"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "不要顯示"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "自動隱藏"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "總是"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "用來切換到清單內下一個輸入法的快捷鍵"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "下一個輸入法："
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "用來切換到清單內上一個輸入法的快捷鍵"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "上一個輸入法："
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "啟用或停用："
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "啟用："
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "停用："
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>鍵盤快捷鍵</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "設置查詢表單內候選字詞的排列方向"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "候選詞排列方向："
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "設置 iBus 如何顯示或隱藏語言列的行為"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "顯示屬性面板："
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "語言面板位置："
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "當選取時在語言列上輸入法名稱"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "在應用程式視窗內嵌預先編輯文字"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "在應用程式視窗內嵌輸入法的預先編輯文字"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "使用自訂字型："
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>字型與風格</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "通用"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "加入選取的輸入法到已啟用的輸入法內"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "從已啟用的輸入法中移除所選的輸入法"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "上移所選取的輸入法"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "向下(_D)"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf 鍵的前綴，用來停止名稱轉換"
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "下移所選取的輸入法"
 
-#: ../ibus/_config.py.in:41
-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."
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "關於(_A)"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "其他"
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "顯示所選取的輸入法資訊"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "選取語言"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "顯示選取輸入法的設置"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "確定(_O)"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "其他…"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "啟用 Emoji 符號或 Unicode 名稱轉換的快捷鍵"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "語言：%s\n"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emoji 符號："
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "鍵盤配置: %s\n"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "啟用 Unicode 碼位轉換的快捷鍵"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者：%s\n"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode 碼位："
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "描述：\n"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "設定 Emoji 對話框上的 Unicode 候選字型"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "選取輸入法"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode 字體："
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "鍵盤"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "設定繪文字對話窗中的繪文字註釋語言"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "設置 iBus 偏好設定"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "繪文字註釋語言："
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "鍵盤快捷鍵"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr "部分繪文字註解符合下列條件以及至少字數："
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "按鍵碼："
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr "是否繪文字註解可以用部分字串符合取代精確符合"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "修飾鍵："
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "前綴符合"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "套用(_A)"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "後綴符合"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "刪除(_D)"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "內含符合"
 
-#: ../setup/keyboardshortcut.py:252
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr "請按鍵盤按鍵 (或是按鍵組合)\n"
-"當您放開按鍵時，對話框會自動關閉。"
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "繪文字"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "請按鍵盤按鍵 (或是按鍵組合)"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>鍵盤配置</b>"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "使用含 Shift 鍵之快捷鍵來切換至前個輸入法"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>全域輸入法設定值</b>"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus 幕後程式並非執行中。您是否要啟動它？"
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "進階"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 幕後程式無法在 %d 秒後啟動"
+"<big><b>iBus</b></big>\n"
+"<small>智慧型輸入框架</small>\n"
+"首頁: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "為 %s 選取鍵盤快捷鍵"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "在登入時啟動 iBus"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "切換輸入法"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>啟動</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "活動"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "動物與自然"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "元件"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "旗幟"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "食物與飲品"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "物體"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "表情與人物"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "符號"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "旅行與地點"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "基本拉丁字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "拉丁字-1 補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "拉丁字擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "拉丁字擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA 國際音標擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "佔位修飾字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "組合式變音標記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "希臘字與科普特字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "西里爾字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "西里爾字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "阿美尼亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "希伯來文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "敘利亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "阿拉伯文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "塔納文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "Nko 西非書面文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "撒馬利亞字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "曼達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "敘利亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "阿拉伯文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "天城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "孟加拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "古爾穆基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "歐利亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "泰米爾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "泰盧固文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "卡納達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "馬拉亞拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "僧伽羅文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "寮文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "藏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "緬甸文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "喬治亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "韓文字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "衣索比亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "衣索比亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "切羅基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "統一加拿大原住民音節"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "歐甘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "盧恩文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "他加祿文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "哈努諾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "布希德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "塔格巴努亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "高棉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "蒙古文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "統一加拿大原住民音節擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "林布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "傣哪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "新傣仂文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "高棉符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "布吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "老傣文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "組合式變音標記擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "巴厘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "巽他文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "巴塔克文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "雷布查文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "桑塔利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "西里爾字擴充-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "巽他文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "吠陀梵文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "音標擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "音標擴充補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "組合式變音標記補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "拉丁字擴充增補"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "希臘字擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "一般標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "上標和下標"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "貨幣符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "符號的組合式變音標記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "類文字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "數字形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "箭頭"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "數學運算子"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "零雜技術符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "控制圖案"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "光學字元辨識"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "括圈字母數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "方塊繪製"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "區塊元件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "幾何形狀"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "零雜符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "裝飾符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "零雜數學用符號-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "補充箭號-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "盲人點字樣式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "補充箭號-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "雜合數學用符號-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "補充數學運算符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "混合符號與鍵號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "格拉哥里字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "拉丁字擴充-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "科普特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "喬治亞文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "提非納格字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "衣索比亞文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "西里爾字擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "補充標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "中日韓部首補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "康熙部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "表意文字描述字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "中日韓符號和標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "平假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "片假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "注音符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "韓文相容字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "日本漢文訓點號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "注音符號擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "中日韓筆劃部件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "片假名注音擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "括圈中日韓文字和月份"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "中日韓相容字元"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "中日韓統一表意文字擴充 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "易經六十四卦象符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "中日韓統一表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "彝文音節字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "彝文字根"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "老傈僳文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "瓦伊文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "西里爾字擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "巴蒙文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "聲調修飾符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "拉丁字擴充-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "錫爾赫特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "常用印度數字圖樣"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "八思巴文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "索拉什特拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "天城文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "克耶文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "勒姜文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "韓文字母擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "爪哇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "緬甸文擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "占文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "緬甸文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "傣端文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "曼尼普爾文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "衣索比亞文擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "拉丁字擴充-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "切羅基文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "曼尼普爾文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "韓文音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "韓文字母擴充-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "高段代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "高段私用代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "低段代理區"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "私用區塊"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "中日韓相容表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "字母表現形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "阿拉伯文表現形式-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "字形變體選取符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "直書形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "組合式半形符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "中日韓相容形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "小寫形式變體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "阿拉伯文表現形式-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "半寬與全寬形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "特殊區域"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "線形 B 音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "線形 B 表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "愛琴海數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "古希臘數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "古代符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "費斯托斯泥圓盤文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "呂基亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "卡里亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "科普特潤餘數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "古意大利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "歌德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "古彼爾姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "烏加里特楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "古波斯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "猶他大學音標"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "肅伯納字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "奥斯曼亞字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "歐塞奇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "艾爾巴桑文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "高加索阿爾巴尼亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "線形文字 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "塞浦路斯音節字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "規範阿拉米文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "帕爾邁拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "納巴泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "哈坦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "腓尼基字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "呂底亞文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "麥羅埃文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "麥羅埃文通俗體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "佉盧字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "古南阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "古北阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "摩尼教文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "阿維斯陀文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "帕提亞文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "巴列維文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "詩篇巴列維文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "古突厥文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "古匈牙利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "魯米數字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "婆羅米字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "凱提字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "索朗桑朋文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "查克馬文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "馬哈佳尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "夏拉達文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "古僧伽羅文數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "可吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "穆爾坦尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "庫達瓦迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "帕拉瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "紐瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "特忽塔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "悉曇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "莫迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "蒙古文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "塔克里文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "阿洪姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "瓦蘭齊地文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "札那巴札爾方塊字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "索永布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "包欽浩文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "比奇舒奇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "象雄文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "馬薩拉姆共地文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "楔形數字和標點符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "古王國時期楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "古埃及聖書字碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "安那托利亞文碑銘體"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "巴蒙文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "蒙羅文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "巴撒符文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "救世苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "柏格理苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "表意文字符號和標點"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "西夏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "西夏文部件"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "假名補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "假名擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "女書文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "杜普雷速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "速記格式控制符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "拜占庭音樂符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "音樂符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "古希臘音樂譜記號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "太玄經符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "算籌記數式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "數學用字母數字符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "薩頓手語符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "格拉哥里字母補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "門德語奇卡奎文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "阿德拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "阿拉伯文數學用字母符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "麻將牌面"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "西洋骨牌牌面"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "撲克牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "括圈字母數字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "括圈表意文字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "雜合符號和象形圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "表情圖示"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "裝飾雜錦圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "運輸和地圖符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "煉金術符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "幾何圖形擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "補充箭頭-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "補充符號與象形圖"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "中日韓統一表意文字擴充 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "中日韓統一表意文字擴充 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "中日韓統一表意文字擴充 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "中日韓統一表意文字擴充 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "中日韓統一表意文字擴充 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "中日韓相容表意文字補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "標籤"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "字形變體選取符補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "補充私用區-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "補充私用區-B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "僅列出引擎名稱"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "無法連接 IBus。\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "語言：%s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未設定引擎。\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "無法設定全域引擎。\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "無法取得全域引擎。\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "讀取系統註冊快取。"
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "讀取註冊快取 FILE。"
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "註冊快取無效。\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "寫入系統註冊快取。"
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "寫入註冊快取 FILE。"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr "使用引擎基模位置取代 ibus 核心，可以透過逗號分割字串。"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "重設中…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "設定引擎或取得引擎"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "離開 ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "顯示可用的引擎"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(尚未實作)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "重新啟動 ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "顯示版本"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "顯示註冊快取的內容"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "建立註冊快取"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "列印 ibus-daemon 的 D-Bus 位址"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "顯示組態值"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "重設組態值"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "將對話窗中的繪文字儲存到剪貼簿"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "顯示此資訊"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "指令：\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 為未知指令！\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "喜愛"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "其他"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "開啟 Unicode 選擇"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "請輸入註釋或選擇繪文字"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "返回繪文字選擇"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "上一頁"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "下一頁"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "顯示繪文字變化"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "選單"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "點擊顯示警告訊息"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "載入 Unicode 字典："
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "碼點：%s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "有繪文字變化"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "無"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "註釋：%s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "名稱：%s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "別名：%s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "繪文字選擇"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Unicode 選擇"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3028,84 +3171,76 @@ msgid ""
 msgstr ""
 "無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出 Emoji 輸入模式後，按一下桌面再重按您的文字應用程式一次。"
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "已取消繪文字的選擇。"
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "已將繪文字複製到您的剪貼簿。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "繪文字對話盒之繪文字字元用「FONT」字型"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "繪文字對話盒的「LANG」語言註解。例：「en」"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "可以部分符合繪文字註解"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "符合指定整數長度"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "符合指定整數的條件"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus 更新"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "超級鍵+空白鍵為現在的預設熱鍵。"
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-17."
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "結束"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"

From 0c89a7ee33bfe5b403c798e0ddb39e4c05d0d971 Mon Sep 17 00:00:00 2001
From: Hodong Kim <cogniti@gmail.com>
Date: Thu, 25 Jul 2019 14:37:52 +0900
Subject: [PATCH 572/816] client/x11: Update LOCALES_STRING

Update LOCALES_STRING in locales.h from /usr/share/i18n/SUPPORTED on
Debian Buster.

BUG=https://github.com/ibus/ibus/pull/2110
---
 client/x11/locales.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/x11/locales.h b/client/x11/locales.h
index 0155e22ad..61af74fbd 100644
--- a/client/x11/locales.h
+++ b/client/x11/locales.h
@@ -1,2 +1,2 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
-#define LOCALES_STRING "aa,af,am,an,ar,as,ast,az,be,ber,bg,bn,bo,br,bs,byn,C,ca,crh,cs,csb,cy,da,de,dz,el,en,es,et,eu,fa,fi,fil,fo,fr,fur,fy,ga,gd,gez,gl,gu,gv,ha,he,hi,hne,hr,hsb,ht,hu,hy,id,ig,ik,is,it,iu,iw,ja,ka,kk,kl,km,kn,ko,ks,ku,kw,ky,lg,li,lo,lt,lv,mai,mg,mi,mk,ml,mn,mr,ms,mt,nan,nb,nds,ne,nl,nn,no,nr,nso,oc,om,or,pa,pa,pap,pl,pt,ro,ru,rw,sa,sc,sd,se,shs,si,sid,sk,sl,so,sq,sr,ss,st,sv,ta,te,tg,th,ti,tig,tk,tl,tn,tr,ts,tt,ug,uk,ur,uz,ve,vi,wa,wo,xh,yi,yo,zh,zu"
+#define LOCALES_STRING "aa,af,agr,ak,am,an,anp,ar,ayc,az,as,ast,be,bem,ber,bg,bhb,bho,bi,bn,bo,br,brx,bs,byn,C,ca,ce,chr,cmn,crh,cs,csb,cv,cy,da,de,doi,dsb,dv,dz,el,en,eo,es,et,eu,fa,ff,fi,fil,fo,fr,fur,fy,ga,gd,gez,gl,gu,gv,ha,hak,he,hi,hif,hne,hr,hsb,ht,hu,hy,ia,id,ig,ik,is,it,iu,ja,ka,kab,kk,kl,km,kn,ko,kok,ks,ku,kw,ky,lb,lg,li,lij,ln,lo,lt,lv,lzh,mag,mai,mfe,mg,mhr,mi,miq,mjw,mk,ml,mn,mni,mr,ms,mt,my,nan,nb,nds,ne,nhn,niu,nl,nn,no,nr,nso,oc,om,or,os,pa,pap,pl,ps,pt,quz,raj,ro,ru,rw,sa,sah,sat,sc,sd,se,sgs,shn,shs,si,sid,sk,sl,sm,so,sq,sr,ss,st,sv,sw,szl,ta,tcy,te,tg,th,the,ti,tig,tk,tl,tn,to,tpi,tr,ts,tt,ug,uk,unm,ur,uz,ve,vi,wa,wae,wal,wo,xh,yi,yo,yue,yuw,zh,zu"

From f4463c0433c5f48a4fb2830e8c2ae9619fbb18d1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 29 Jul 2019 19:05:43 +0900
Subject: [PATCH 573/816] src/tests: Fix a fatal error with g_warning

I set g_log_set_always_fatal() before gtk_init() in ibus-compose for
a compose warning of GtkIMContextSimple but actually the warning is
output during gtk_main() due to GtkIMContextSimple.set_client_window()
so I moved g_log_set_always_fatal() before gtk_main() in ibus-compose.c.

Also set IFS in ibus-compose-locales to set the delimiter to '\n' for
for-loop arguments.
---
 src/tests/ibus-compose-locales.in |  8 ++++++++
 src/tests/ibus-compose.c          | 21 ++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/tests/ibus-compose-locales.in b/src/tests/ibus-compose-locales.in
index fad029656..f650b5844 100755
--- a/src/tests/ibus-compose-locales.in
+++ b/src/tests/ibus-compose-locales.in
@@ -7,19 +7,27 @@ BUILDDIR=`dirname $0`
 export IBUS_COMPOSE_CACHE_DIR=$PWD
 
 retval=0
+# Let for-loop notice '\n' as a delimiter
+IFS=$'\n'
 for var in `cat $SRCDIR/ibus-compose.env`
 do
+    # Revert IFS to recognize env a=foo b=foo
+    IFS=' '
     IS_COMMENT=`echo "$var" | grep "^#"`
     if [ "x$IS_COMMENT" != x ] ; then
         continue
     fi
+    echo "# Starting $var $BUILDDIR/ibus-compose $SRCDIR $@"
     env $var $BUILDDIR/ibus-compose $SRCDIR $@
     retval=`expr $retval + $?`
+    echo "# Finished $var $BUILDDIR/ibus-compose $SRCDIR $@ with $retval"
 
     CACHE_FILES=`ls *.cache`
     if [ x"$CACHE_FILES" != x ] ; then
         echo "Clean $CACHE_FILES"
         rm $CACHE_FILES
     fi
+    IFS=$'\n'
 done
+IFS=' '
 exit $retval
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index db3594773..4b4c56e7a 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -331,20 +331,28 @@ create_window ()
 static void
 test_compose (void)
 {
+    GLogLevelFlags flags;
     if (!register_ibus_engine ()) {
         g_test_fail ();
         return;
     }
 
     create_window ();
+    /* FIXME:
+     * IBusIMContext opens GtkIMContextSimple as the slave and
+     * GtkIMContextSimple opens the compose table on el_GR.UTF-8, and the
+     * multiple outputs in el_GR's compose causes a warning in gtkcomposetable
+     * and the warning always causes a fatal in GTest:
+     " "GTK+ supports to output one char only: "
+     */
+    flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
     gtk_main ();
-
+    g_log_set_always_fatal (flags);
 }
 
 int
 main (int argc, char *argv[])
 {
-    GLogLevelFlags flags;
     const gchar *test_name;
     gchar *test_path;
 
@@ -354,16 +362,7 @@ main (int argc, char *argv[])
      */
     g_setenv ("NO_AT_BRIDGE", "1", TRUE);
     g_test_init (&argc, &argv, NULL);
-    /* FIXME:
-     * IBusIMContext opens GtkIMContextSimple as the slave and
-     * GtkIMContextSimple opens the compose table on el_GR.UTF-8, and the
-     * multiple outputs in el_GR's compose causes a warning in gtkcomposetable
-     * and the warning always causes a fatal in GTest:
-     " "GTK+ supports to output one char only: "
-     */
-    flags = g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
     gtk_init (&argc, &argv);
-    g_log_set_always_fatal (flags);
 
     m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
     m_compose_file = g_strdup (g_getenv ("COMPOSE_FILE"));

From 7dde99600777f195da614130950ecbd339439d35 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 31 Jul 2019 16:27:49 +0900
Subject: [PATCH 574/816] src/tests: Fix wrong echo with direct runner in
 ibus-desktop-testing-runner

The wrong echo prevent from counting the test results in the direct
testing runner.
---
 src/tests/ibus-desktop-testing-runner.in | 33 +++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index b7a722856..3045d601f 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -153,7 +153,7 @@ _EOF
         XDG_LANG_ORIG=`cat $XDG_LOCALE_FILE`
         XDG_LANG_NEW=`echo $LANG | sed -e 's/\(.*\)\..*/\1/'`
         if [ "$XDG_LANG_ORIG" != "$XDG_LANG_NEW" ] ; then
-            echo "Overriding XDG locale $XDG_LANG_ORIG with $XDG_LANG_NEW"
+            echo "# Overriding XDG locale $XDG_LANG_ORIG with $XDG_LANG_NEW"
             echo "$XDG_LANG_NEW" > $XDG_LOCALE_FILE
         fi
     fi
@@ -206,11 +206,9 @@ echo_case_result()
     subtst=${3:-''}
 
     if test $retval -eq  0 ; then
-        print_log -e "${GREEN}PASS${NC}: $tst $subtst"
+        echo "PASS: $tst $subtst" >>$TEST_LOG
     else
-        print_log -e "${RED}FAIL${NC}: $tst $subtst"
-        print_log "======================"
-        print_log ""
+        echo "FAIL: $tst $subtst" >>$TEST_LOG
     fi
 }
 
@@ -232,32 +230,37 @@ EOF
             echo_case_result $retval $tst
             CACHE_FILES=`ls *.cache`
             if [ x"$CACHE_FILES" != x ] ; then
-                print_log "Clean $CACHE_FILES"
+                echo "# Clean $CACHE_FILES" >>$TEST_LOG
                 rm $CACHE_FILES
             fi
         else
-            LANG_backup=$LANG
             i=1
+            # Let for-loop notice '\n' as a delimiter
+            IFS=$'\n'
             for e in $ENVS; do
+                # Revert IFS to recognize env a=foo b=foo
+                IFS=' '
                 first=`echo "$e" | grep '^#'`
                 if test x"$first" = x"#" ; then
                     continue
                 fi
-                export $e
-                $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
+                echo "# Starting $e $BUILDDIR/$tst $SRCDIR" >>$TEST_LOG
+                env $e $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
                 retval=$?
+                echo "# Finished $e $BUILDDIR/$tst $SRCDIR with $retval" >>$TEST_LOG
                 read pass fail << EOF
                 `count_case_result $retval $pass $fail`
 EOF
                 echo_case_result $retval $tst $e
                 CACHE_FILES=`ls *.cache`
                 if [ x"$CACHE_FILES" != x ] ; then
-                    print_log "Clean $CACHE_FILES"
+                    echo "# Clean $CACHE_FILES" >>$TEST_LOG
                     rm $CACHE_FILES
                 fi
                 i=`expr $i + 1`
+                IFS=$'\n'
             done
-            export LANG=$LANG_backup
+            IFS=' '
         fi
     done
     echo $pass $fail
@@ -325,24 +328,24 @@ EOF_RUNNER
     if [ $TEST_LOG_STDOUT -eq 1 ] ; then
         cat $TEST_LOG
     else
-        echo "See $TEST_LOG"
+        echo "# See $TEST_LOG"
     fi
 }
 
 finit()
 {
-    echo "Killing left gnome-session and Xorg"
+    echo "# Killing left gnome-session and Xorg"
     kill $PID_GNOME_SESSION $PID_XORG
     ibus exit
     SUSER=`echo "$USER" | cut -c 1-7`
     LEFT_CALENDAR=`ps -ef | grep gnome-shell-calendar-server | grep $SUSER | grep -v grep`
     if [ x"$LEFT_CALENDAR" != x ] ; then
-        echo "Killing left gnome-shell-calendar-server"
+        echo "# Killing left gnome-shell-calendar-server"
         echo "$LEFT_CALENDAR"
         echo "$LEFT_CALENDAR" | awk '{print $2}' | xargs kill
     fi
 
-    echo "Finished $PROGNAME testing"
+    echo "# Finished $PROGNAME testing"
 }
 
 main()

From 32572618cdcc36162b5769eb4c71964db9734061 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 6 Aug 2019 18:55:14 +0900
Subject: [PATCH 575/816] bus: Exit ibus-daemon with parent's death

ibus-daemon can be restarted unexpectedly during logging out the session
and double ibus-x11 prevent from enabling XIM in XGetSelectionOwner()
for the "ibus" atom.
ibus-daemon always will exit the process when the parent process dies
to avoid this problem.
---
 bus/main.c   | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |  3 +++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/bus/main.c b/bus/main.c
index 3223d541e..e11a5ebd2 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -33,6 +33,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #include "global.h"
 #include "ibusimpl.h"
 #include "server.h"
@@ -161,6 +165,15 @@ daemon (gint nochdir, gint noclose)
 }
 #endif
 
+#ifdef HAVE_SYS_PRCTL_H
+static void
+_sig_usr1_handler (int sig)
+{
+    g_warning ("The parent process died.");
+    bus_server_quit (FALSE);
+}
+#endif
+
 gint
 main (gint argc, gchar **argv)
 {
@@ -201,7 +214,7 @@ main (gint argc, gchar **argv)
     /* daemonize process */
     if (daemonize) {
         if (daemon (1, 0) != 0) {
-            g_printerr ("Can not daemonize ibus.\n");
+            g_printerr ("Cannot daemonize ibus.\n");
             exit (-1);
         }
     }
@@ -299,6 +312,47 @@ main (gint argc, gchar **argv)
             exit (-1);
     }
 
+    if (!daemonize) {
+        if (getppid () == 1) {
+            g_warning ("The parent process died.");
+            exit (0);
+        }
+#ifdef HAVE_SYS_PRCTL_H
+       /* Currently ibus-x11 detects XIOError and assume the error as the
+        * desktop session is closed and ibus-x11 calls Exit D-Bus method to
+        * exit ibus-daemon. But a few desktop sessions cause XError before
+        * XIOError and GTK does not allow to bind XError by applications and
+        * GTK calls gdk_x_error() with XError.
+        *
+        * E.g. GdkX11Screen calls XGetSelectionOwner() for "_XSETTINGS_S?"
+        * atoms during the logout but the selection owner already becomes
+        * NULL and the NULL window causes XError with
+        * gdk_x11_window_foreign_new_for_display().
+        *
+        * Since ibus-x11 exits with XError before XIOError, gnome-shell
+        * can detects the exit of ibus-daemon a little earlier and
+        * gnome-shell restarts ibus-daemon but gnome-shell dies soon.
+        * Then gnome-shell dies but ibus-daemon is alive, it's a problem.
+        * Because it causes double ibus-x11 of GDM and a login user
+        * and double XSetSelectionOwner() is not allowed for the unique
+        * "ibus" atom and the user cannot use XIM but not GtkIMModule.
+        *
+        * Probably we could fix the ibus process problem if we would fix
+        * XError about the X selection owner or stop to restart ibus-daemon
+        * in gonme-shell when the session is logging out.
+        * Maybe using SessionManager.LogoutRemote() or
+        * global.screen.get_display().get_xdisplay()
+        * But I assume thereare other scenarios to causes the problem.
+        *
+        * And I decided ibus-daemon always exits with the parent's death here
+        * to avoid unexpected ibus restarts during the logout.
+        */
+        if (prctl (PR_SET_PDEATHSIG, SIGUSR1))
+            g_printerr ("Cannot bind SIGUSR1 for parent death\n");
+        else
+            signal (SIGUSR1, _sig_usr1_handler);
+#endif
+    }
     bus_server_run ();
     return 0;
 }
diff --git a/configure.ac b/configure.ac
index f1df3ac1b..fdd316a94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,9 @@ AC_ISC_POSIX
 AC_HEADER_STDC
 LT_INIT
 
+# Check header filess.
+AC_CHECK_HEADERS([sys/prctl.h])
+
 # Check functions.
 AC_CHECK_FUNCS(daemon)
 

From 32645ca8070db1f8b6360b07b229829ed6033437 Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Tue, 6 Aug 2019 19:32:11 +0900
Subject: [PATCH 576/816] Fix typos

BUG=https://github.com/ibus/ibus/pull/2111
BUG=https://github.com/ibus/ibus/pull/2112
---
 bus/main.c             | 2 +-
 src/ibusobservedpath.c | 2 +-
 tools/ibus.1.in        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bus/main.c b/bus/main.c
index e11a5ebd2..e80185b12 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -342,7 +342,7 @@ main (gint argc, gchar **argv)
         * in gonme-shell when the session is logging out.
         * Maybe using SessionManager.LogoutRemote() or
         * global.screen.get_display().get_xdisplay()
-        * But I assume thereare other scenarios to causes the problem.
+        * But I assume there are other scenarios to cause the problem.
         *
         * And I decided ibus-daemon always exits with the parent's death here
         * to avoid unexpected ibus restarts during the logout.
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index 9d45d40ff..cbb846dfc 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -247,7 +247,7 @@ ibus_observed_path_parse_xml_node (IBusObservedPath *path,
     }
 
     if (node->text[0] == '~' && node->text[1] != G_DIR_SEPARATOR) {
-        g_warning ("invalide path \"%s\"", node->text);
+        g_warning ("Invalid path \"%s\"", node->text);
         return FALSE;
     }
 
diff --git a/tools/ibus.1.in b/tools/ibus.1.in
index 9275abb76..525d972e6 100644
--- a/tools/ibus.1.in
+++ b/tools/ibus.1.in
@@ -105,7 +105,7 @@ option. Can choose a language of emoji annotations with
 option. If LANG="en", IBus Emojier loads /usr/share/ibus/dicts/emoji-en.dict .
 .B \-\-partial\-match
 option enables to match annotations with a partial string. These settings
-are avaiable with
+are available with
 .B ibus\-setup (1)
 utility.
 

From 28c10d64d282fa9fbc35a7bc44a096f6137d5e46 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 13 Aug 2019 20:06:51 +0900
Subject: [PATCH 577/816] src/tests: Set XDG_SESSION_TYPE in
 ibus-desktop-testing-runner

mutter 3.33.90 or later exits the session without loginctl.
Now ibus-desktop-testing-runner has XDG_SESSION_TYPE forcibly
not to exit gnome-shell.
---
 src/tests/ibus-desktop-testing-runner.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 3045d601f..141e9b5b9 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -157,6 +157,8 @@ _EOF
             echo "$XDG_LANG_NEW" > $XDG_LOCALE_FILE
         fi
     fi
+    # `su` command does not run loginctl
+    export XDG_SESSION_TYPE='x11'
 }
 
 run_dbus_daemon()
@@ -175,6 +177,7 @@ run_desktop()
     PID_XORG=$!
     sleep 1
     export DISPLAY=$DISPLAY
+    echo "Running $DESKTOP_COMMAND with $USER in `tty`"
     $DESKTOP_COMMAND &
     PID_GNOME_SESSION=$!
     sleep 30

From b75847831958d5fcb822463e6c06bc47ae392d6a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 20 Aug 2019 19:23:49 +0900
Subject: [PATCH 578/816] client/wayland: Update Wayland input-method protocol
 to unstable v1

Weston uses unstable v1 for input-method protocol.
Unfortunately weston-terminal does not enable input method and tested
the protocol with weston-editor:
https://github.com/wayland-project/weston/blob/master/clients/editor.c

BUG=https://github.com/ibus/ibus/issues/2030
---
 client/wayland/Makefile.am                    |  45 +-
 client/wayland/input-method-client-protocol.h | 419 ----------
 client/wayland/input-method-protocol.c        | 115 ---
 ...input-method-unstable-v1-client-protocol.h | 752 ++++++++++++++++++
 .../input-method-unstable-v1-protocol.c       | 114 +++
 client/wayland/main.c                         | 166 ++--
 configure.ac                                  |   5 +
 7 files changed, 979 insertions(+), 637 deletions(-)
 delete mode 100644 client/wayland/input-method-client-protocol.h
 delete mode 100644 client/wayland/input-method-protocol.c
 create mode 100644 client/wayland/input-method-unstable-v1-client-protocol.h
 create mode 100644 client/wayland/input-method-unstable-v1-protocol.c

diff --git a/client/wayland/Makefile.am b/client/wayland/Makefile.am
index 67b104d45..302375462 100644
--- a/client/wayland/Makefile.am
+++ b/client/wayland/Makefile.am
@@ -3,7 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2019 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 License as
@@ -25,38 +26,40 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 libexec_PROGRAMS = ibus-wayland
 
 protocol_sources = \
-	input-method-protocol.c \
-	input-method-client-protocol.h \
-	$(NULL)
+    input-method-unstable-v1-client-protocol.h \
+    input-method-unstable-v1-protocol.c \
+    $(NULL)
 
 ibus_wayland_SOURCES = \
-	$(protocol_sources) \
-	main.c \
-	$(NULL)
+    $(protocol_sources) \
+    main.c \
+    $(NULL)
 
 ibus_wayland_DEPENDENCIES = \
-	$(libibus) \
-	$(NULL)
+    $(libibus) \
+    $(NULL)
 
 ibus_wayland_LDADD = \
-	$(libibus) \
-	$(GIO2_LIBS) \
-	$(WAYLAND_LIBS) \
-	$(NULL)
+    $(libibus) \
+    $(GIO2_LIBS) \
+    $(WAYLAND_LIBS) \
+    $(NULL)
 
 ibus_wayland_CFLAGS = \
-	$(GIO2_CFLAGS) \
-	$(WAYLAND_CFLAGS) \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	$(NULL)
+    $(GIO2_CFLAGS) \
+    $(WAYLAND_CFLAGS) \
+    -I$(top_srcdir)/src \
+    -I$(top_builddir)/src \
+    $(NULL)
 
 $(libibus):
 	(cd $(top_builddir)/src; make)
 
 EXTRA_DIST = \
-	README \
-	$(protocol_sources) \
-	$(NULL)
+    README \
+    $(protocol_sources) \
+    $(NULL)
+
+@wayland_scanner_rules@
 
 -include $(top_srcdir)/git.mk
diff --git a/client/wayland/input-method-client-protocol.h b/client/wayland/input-method-client-protocol.h
deleted file mode 100644
index 05d03a3b4..000000000
--- a/client/wayland/input-method-client-protocol.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* 
- * Copyright © 2012, 2013 Intel Corporation
- * 
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#ifndef INPUT_METHOD_CLIENT_PROTOCOL_H
-#define INPUT_METHOD_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct wl_input_method_context;
-struct wl_input_method;
-struct wl_input_panel;
-struct wl_input_panel_surface;
-
-extern const struct wl_interface wl_input_method_context_interface;
-extern const struct wl_interface wl_input_method_interface;
-extern const struct wl_interface wl_input_panel_interface;
-extern const struct wl_interface wl_input_panel_surface_interface;
-
-/**
- * wl_input_method_context - input method context
- * @surrounding_text: surrounding text event
- * @reset: (none)
- * @content_type: (none)
- * @invoke_action: (none)
- * @commit_state: (none)
- * @preferred_language: (none)
- *
- * Corresponds to a text model on input method side. An input method
- * context is created on text mode activation on the input method side. It
- * allows to receive information about the text model from the application
- * via events. Input method contexts do not keep state after deactivation
- * and should be destroyed after deactivation is handled.
- *
- * Text is generally UTF-8 encoded, indices and lengths are in bytes.
- *
- * Serials are used to synchronize the state between the text input and an
- * input method. New serials are sent by the text input in the commit_state
- * request and are used by the input method to indicate the known text
- * input state in events like preedit_string, commit_string, and keysym.
- * The text input can then ignore events from the input method which are
- * based on an outdated state (for example after a reset).
- */
-struct wl_input_method_context_listener {
-	/**
-	 * surrounding_text - surrounding text event
-	 * @text: (none)
-	 * @cursor: (none)
-	 * @anchor: (none)
-	 *
-	 * The plain surrounding text around the input position. Cursor
-	 * is the position in bytes within the surrounding text relative to
-	 * the beginning of the text. Anchor is the position in bytes of
-	 * the selection anchor within the surrounding text relative to the
-	 * beginning of the text. If there is no selected text anchor is
-	 * the same as cursor.
-	 */
-	void (*surrounding_text)(void *data,
-				 struct wl_input_method_context *wl_input_method_context,
-				 const char *text,
-				 uint32_t cursor,
-				 uint32_t anchor);
-	/**
-	 * reset - (none)
-	 */
-	void (*reset)(void *data,
-		      struct wl_input_method_context *wl_input_method_context);
-	/**
-	 * content_type - (none)
-	 * @hint: (none)
-	 * @purpose: (none)
-	 */
-	void (*content_type)(void *data,
-			     struct wl_input_method_context *wl_input_method_context,
-			     uint32_t hint,
-			     uint32_t purpose);
-	/**
-	 * invoke_action - (none)
-	 * @button: (none)
-	 * @index: (none)
-	 */
-	void (*invoke_action)(void *data,
-			      struct wl_input_method_context *wl_input_method_context,
-			      uint32_t button,
-			      uint32_t index);
-	/**
-	 * commit_state - (none)
-	 * @serial: serial of text input state
-	 */
-	void (*commit_state)(void *data,
-			     struct wl_input_method_context *wl_input_method_context,
-			     uint32_t serial);
-	/**
-	 * preferred_language - (none)
-	 * @language: (none)
-	 */
-	void (*preferred_language)(void *data,
-				   struct wl_input_method_context *wl_input_method_context,
-				   const char *language);
-};
-
-static inline int
-wl_input_method_context_add_listener(struct wl_input_method_context *wl_input_method_context,
-				     const struct wl_input_method_context_listener *listener, void *data)
-{
-	return wl_proxy_add_listener((struct wl_proxy *) wl_input_method_context,
-				     (void (**)(void)) listener, data);
-}
-
-#define WL_INPUT_METHOD_CONTEXT_DESTROY	0
-#define WL_INPUT_METHOD_CONTEXT_COMMIT_STRING	1
-#define WL_INPUT_METHOD_CONTEXT_PREEDIT_STRING	2
-#define WL_INPUT_METHOD_CONTEXT_PREEDIT_STYLING	3
-#define WL_INPUT_METHOD_CONTEXT_PREEDIT_CURSOR	4
-#define WL_INPUT_METHOD_CONTEXT_DELETE_SURROUNDING_TEXT	5
-#define WL_INPUT_METHOD_CONTEXT_CURSOR_POSITION	6
-#define WL_INPUT_METHOD_CONTEXT_MODIFIERS_MAP	7
-#define WL_INPUT_METHOD_CONTEXT_KEYSYM	8
-#define WL_INPUT_METHOD_CONTEXT_GRAB_KEYBOARD	9
-#define WL_INPUT_METHOD_CONTEXT_KEY	10
-#define WL_INPUT_METHOD_CONTEXT_MODIFIERS	11
-#define WL_INPUT_METHOD_CONTEXT_LANGUAGE	12
-#define WL_INPUT_METHOD_CONTEXT_TEXT_DIRECTION	13
-
-static inline void
-wl_input_method_context_set_user_data(struct wl_input_method_context *wl_input_method_context, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_input_method_context, user_data);
-}
-
-static inline void *
-wl_input_method_context_get_user_data(struct wl_input_method_context *wl_input_method_context)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_method_context);
-}
-
-static inline void
-wl_input_method_context_destroy(struct wl_input_method_context *wl_input_method_context)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_DESTROY);
-
-	wl_proxy_destroy((struct wl_proxy *) wl_input_method_context);
-}
-
-static inline void
-wl_input_method_context_commit_string(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *text)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_COMMIT_STRING, serial, text);
-}
-
-static inline void
-wl_input_method_context_preedit_string(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *text, const char *commit)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_PREEDIT_STRING, serial, text, commit);
-}
-
-static inline void
-wl_input_method_context_preedit_styling(struct wl_input_method_context *wl_input_method_context, uint32_t index, uint32_t length, uint32_t style)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_PREEDIT_STYLING, index, length, style);
-}
-
-static inline void
-wl_input_method_context_preedit_cursor(struct wl_input_method_context *wl_input_method_context, int32_t index)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_PREEDIT_CURSOR, index);
-}
-
-static inline void
-wl_input_method_context_delete_surrounding_text(struct wl_input_method_context *wl_input_method_context, int32_t index, uint32_t length)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_DELETE_SURROUNDING_TEXT, index, length);
-}
-
-static inline void
-wl_input_method_context_cursor_position(struct wl_input_method_context *wl_input_method_context, int32_t index, int32_t anchor)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_CURSOR_POSITION, index, anchor);
-}
-
-static inline void
-wl_input_method_context_modifiers_map(struct wl_input_method_context *wl_input_method_context, struct wl_array *map)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_MODIFIERS_MAP, map);
-}
-
-static inline void
-wl_input_method_context_keysym(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_KEYSYM, serial, time, sym, state, modifiers);
-}
-
-static inline struct wl_keyboard *
-wl_input_method_context_grab_keyboard(struct wl_input_method_context *wl_input_method_context)
-{
-	struct wl_proxy *keyboard;
-
-	keyboard = wl_proxy_create((struct wl_proxy *) wl_input_method_context,
-			     &wl_keyboard_interface);
-	if (!keyboard)
-		return NULL;
-
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_GRAB_KEYBOARD, keyboard);
-
-	return (struct wl_keyboard *) keyboard;
-}
-
-static inline void
-wl_input_method_context_key(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t time, uint32_t key, uint32_t state)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_KEY, serial, time, key, state);
-}
-
-static inline void
-wl_input_method_context_modifiers(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_MODIFIERS, serial, mods_depressed, mods_latched, mods_locked, group);
-}
-
-static inline void
-wl_input_method_context_language(struct wl_input_method_context *wl_input_method_context, uint32_t serial, const char *language)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_LANGUAGE, serial, language);
-}
-
-static inline void
-wl_input_method_context_text_direction(struct wl_input_method_context *wl_input_method_context, uint32_t serial, uint32_t direction)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_method_context,
-			 WL_INPUT_METHOD_CONTEXT_TEXT_DIRECTION, serial, direction);
-}
-
-/**
- * wl_input_method - input method
- * @activate: activate event
- * @deactivate: activate event
- *
- * An input method object is responsible to compose text in response to
- * input from hardware or virtual keyboards. There is one input method
- * object per seat. On activate there is a new input method context object
- * created which allows the input method to communicate with the text
- * model.
- */
-struct wl_input_method_listener {
-	/**
-	 * activate - activate event
-	 * @id: (none)
-	 *
-	 * A text model was activated. Creates an input method context
-	 * object which allows communication with the text model.
-	 */
-	void (*activate)(void *data,
-			 struct wl_input_method *wl_input_method,
-			 struct wl_input_method_context *id);
-	/**
-	 * deactivate - activate event
-	 * @context: (none)
-	 *
-	 * The text model corresponding to the context argument was
-	 * deactivated. The input method context should be destroyed after
-	 * deactivation is handled.
-	 */
-	void (*deactivate)(void *data,
-			   struct wl_input_method *wl_input_method,
-			   struct wl_input_method_context *context);
-};
-
-static inline int
-wl_input_method_add_listener(struct wl_input_method *wl_input_method,
-			     const struct wl_input_method_listener *listener, void *data)
-{
-	return wl_proxy_add_listener((struct wl_proxy *) wl_input_method,
-				     (void (**)(void)) listener, data);
-}
-
-static inline void
-wl_input_method_set_user_data(struct wl_input_method *wl_input_method, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_input_method, user_data);
-}
-
-static inline void *
-wl_input_method_get_user_data(struct wl_input_method *wl_input_method)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_method);
-}
-
-static inline void
-wl_input_method_destroy(struct wl_input_method *wl_input_method)
-{
-	wl_proxy_destroy((struct wl_proxy *) wl_input_method);
-}
-
-#define WL_INPUT_PANEL_GET_INPUT_PANEL_SURFACE	0
-
-static inline void
-wl_input_panel_set_user_data(struct wl_input_panel *wl_input_panel, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_input_panel, user_data);
-}
-
-static inline void *
-wl_input_panel_get_user_data(struct wl_input_panel *wl_input_panel)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_panel);
-}
-
-static inline void
-wl_input_panel_destroy(struct wl_input_panel *wl_input_panel)
-{
-	wl_proxy_destroy((struct wl_proxy *) wl_input_panel);
-}
-
-static inline struct wl_input_panel_surface *
-wl_input_panel_get_input_panel_surface(struct wl_input_panel *wl_input_panel, struct wl_surface *surface)
-{
-	struct wl_proxy *id;
-
-	id = wl_proxy_create((struct wl_proxy *) wl_input_panel,
-			     &wl_input_panel_surface_interface);
-	if (!id)
-		return NULL;
-
-	wl_proxy_marshal((struct wl_proxy *) wl_input_panel,
-			 WL_INPUT_PANEL_GET_INPUT_PANEL_SURFACE, id, surface);
-
-	return (struct wl_input_panel_surface *) id;
-}
-
-#ifndef WL_INPUT_PANEL_SURFACE_POSITION_ENUM
-#define WL_INPUT_PANEL_SURFACE_POSITION_ENUM
-enum wl_input_panel_surface_position {
-	WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM = 0,
-};
-#endif /* WL_INPUT_PANEL_SURFACE_POSITION_ENUM */
-
-#define WL_INPUT_PANEL_SURFACE_SET_TOPLEVEL	0
-#define WL_INPUT_PANEL_SURFACE_SET_OVERLAY_PANEL	1
-
-static inline void
-wl_input_panel_surface_set_user_data(struct wl_input_panel_surface *wl_input_panel_surface, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_input_panel_surface, user_data);
-}
-
-static inline void *
-wl_input_panel_surface_get_user_data(struct wl_input_panel_surface *wl_input_panel_surface)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_input_panel_surface);
-}
-
-static inline void
-wl_input_panel_surface_destroy(struct wl_input_panel_surface *wl_input_panel_surface)
-{
-	wl_proxy_destroy((struct wl_proxy *) wl_input_panel_surface);
-}
-
-static inline void
-wl_input_panel_surface_set_toplevel(struct wl_input_panel_surface *wl_input_panel_surface, struct wl_output *output, uint32_t position)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_panel_surface,
-			 WL_INPUT_PANEL_SURFACE_SET_TOPLEVEL, output, position);
-}
-
-static inline void
-wl_input_panel_surface_set_overlay_panel(struct wl_input_panel_surface *wl_input_panel_surface)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_input_panel_surface,
-			 WL_INPUT_PANEL_SURFACE_SET_OVERLAY_PANEL);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/client/wayland/input-method-protocol.c b/client/wayland/input-method-protocol.c
deleted file mode 100644
index 7bd5a9a72..000000000
--- a/client/wayland/input-method-protocol.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* 
- * Copyright © 2012, 2013 Intel Corporation
- * 
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface wl_keyboard_interface;
-extern const struct wl_interface wl_input_method_context_interface;
-extern const struct wl_interface wl_input_method_context_interface;
-extern const struct wl_interface wl_input_panel_surface_interface;
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_output_interface;
-
-static const struct wl_interface *types[] = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	&wl_keyboard_interface,
-	&wl_input_method_context_interface,
-	&wl_input_method_context_interface,
-	&wl_input_panel_surface_interface,
-	&wl_surface_interface,
-	&wl_output_interface,
-	NULL,
-};
-
-static const struct wl_message wl_input_method_context_requests[] = {
-	{ "destroy", "", types + 0 },
-	{ "commit_string", "us", types + 0 },
-	{ "preedit_string", "uss", types + 0 },
-	{ "preedit_styling", "uuu", types + 0 },
-	{ "preedit_cursor", "i", types + 0 },
-	{ "delete_surrounding_text", "iu", types + 0 },
-	{ "cursor_position", "ii", types + 0 },
-	{ "modifiers_map", "a", types + 0 },
-	{ "keysym", "uuuuu", types + 0 },
-	{ "grab_keyboard", "n", types + 5 },
-	{ "key", "uuuu", types + 0 },
-	{ "modifiers", "uuuuu", types + 0 },
-	{ "language", "us", types + 0 },
-	{ "text_direction", "uu", types + 0 },
-};
-
-static const struct wl_message wl_input_method_context_events[] = {
-	{ "surrounding_text", "suu", types + 0 },
-	{ "reset", "", types + 0 },
-	{ "content_type", "uu", types + 0 },
-	{ "invoke_action", "uu", types + 0 },
-	{ "commit_state", "u", types + 0 },
-	{ "preferred_language", "s", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface wl_input_method_context_interface = {
-	"wl_input_method_context", 1,
-	14, wl_input_method_context_requests,
-	6, wl_input_method_context_events,
-};
-
-static const struct wl_message wl_input_method_events[] = {
-	{ "activate", "n", types + 6 },
-	{ "deactivate", "o", types + 7 },
-};
-
-WL_EXPORT const struct wl_interface wl_input_method_interface = {
-	"wl_input_method", 1,
-	0, NULL,
-	2, wl_input_method_events,
-};
-
-static const struct wl_message wl_input_panel_requests[] = {
-	{ "get_input_panel_surface", "no", types + 8 },
-};
-
-WL_EXPORT const struct wl_interface wl_input_panel_interface = {
-	"wl_input_panel", 1,
-	1, wl_input_panel_requests,
-	0, NULL,
-};
-
-static const struct wl_message wl_input_panel_surface_requests[] = {
-	{ "set_toplevel", "ou", types + 10 },
-	{ "set_overlay_panel", "", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface wl_input_panel_surface_interface = {
-	"wl_input_panel_surface", 1,
-	2, wl_input_panel_surface_requests,
-	0, NULL,
-};
-
diff --git a/client/wayland/input-method-unstable-v1-client-protocol.h b/client/wayland/input-method-unstable-v1-client-protocol.h
new file mode 100644
index 000000000..7a7d957fb
--- /dev/null
+++ b/client/wayland/input-method-unstable-v1-client-protocol.h
@@ -0,0 +1,752 @@
+/* Generated by wayland-scanner 1.16.92 */
+
+#ifndef INPUT_METHOD_UNSTABLE_V1_CLIENT_PROTOCOL_H
+#define INPUT_METHOD_UNSTABLE_V1_CLIENT_PROTOCOL_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-client.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @page page_input_method_unstable_v1 The input_method_unstable_v1 protocol
+ * @section page_ifaces_input_method_unstable_v1 Interfaces
+ * - @subpage page_iface_zwp_input_method_context_v1 - input method context
+ * - @subpage page_iface_zwp_input_method_v1 - input method
+ * - @subpage page_iface_zwp_input_panel_v1 - interface for implementing keyboards
+ * - @subpage page_iface_zwp_input_panel_surface_v1 - 
+ * @section page_copyright_input_method_unstable_v1 Copyright
+ * <pre>
+ *
+ * Copyright © 2012, 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * </pre>
+ */
+struct wl_keyboard;
+struct wl_output;
+struct wl_surface;
+struct zwp_input_method_context_v1;
+struct zwp_input_method_v1;
+struct zwp_input_panel_surface_v1;
+struct zwp_input_panel_v1;
+
+/**
+ * @page page_iface_zwp_input_method_context_v1 zwp_input_method_context_v1
+ * @section page_iface_zwp_input_method_context_v1_desc Description
+ *
+ * Corresponds to a text input on the input method side. An input method context
+ * is created on text input activation on the input method side. It allows
+ * receiving information about the text input from the application via events.
+ * Input method contexts do not keep state after deactivation and should be
+ * destroyed after deactivation is handled.
+ *
+ * Text is generally UTF-8 encoded, indices and lengths are in bytes.
+ *
+ * Serials are used to synchronize the state between the text input and
+ * an input method. New serials are sent by the text input in the
+ * commit_state request and are used by the input method to indicate
+ * the known text input state in events like preedit_string, commit_string,
+ * and keysym. The text input can then ignore events from the input method
+ * which are based on an outdated state (for example after a reset).
+ *
+ * Warning! The protocol described in this file is experimental and
+ * backward incompatible changes may be made. Backward compatible changes
+ * may be added together with the corresponding interface version bump.
+ * Backward incompatible changes are done by bumping the version number in
+ * the protocol and interface names and resetting the interface version.
+ * Once the protocol is to be declared stable, the 'z' prefix and the
+ * version number in the protocol and interface names are removed and the
+ * interface version number is reset.
+ * @section page_iface_zwp_input_method_context_v1_api API
+ * See @ref iface_zwp_input_method_context_v1.
+ */
+/**
+ * @defgroup iface_zwp_input_method_context_v1 The zwp_input_method_context_v1 interface
+ *
+ * Corresponds to a text input on the input method side. An input method context
+ * is created on text input activation on the input method side. It allows
+ * receiving information about the text input from the application via events.
+ * Input method contexts do not keep state after deactivation and should be
+ * destroyed after deactivation is handled.
+ *
+ * Text is generally UTF-8 encoded, indices and lengths are in bytes.
+ *
+ * Serials are used to synchronize the state between the text input and
+ * an input method. New serials are sent by the text input in the
+ * commit_state request and are used by the input method to indicate
+ * the known text input state in events like preedit_string, commit_string,
+ * and keysym. The text input can then ignore events from the input method
+ * which are based on an outdated state (for example after a reset).
+ *
+ * Warning! The protocol described in this file is experimental and
+ * backward incompatible changes may be made. Backward compatible changes
+ * may be added together with the corresponding interface version bump.
+ * Backward incompatible changes are done by bumping the version number in
+ * the protocol and interface names and resetting the interface version.
+ * Once the protocol is to be declared stable, the 'z' prefix and the
+ * version number in the protocol and interface names are removed and the
+ * interface version number is reset.
+ */
+extern const struct wl_interface zwp_input_method_context_v1_interface;
+/**
+ * @page page_iface_zwp_input_method_v1 zwp_input_method_v1
+ * @section page_iface_zwp_input_method_v1_desc Description
+ *
+ * An input method object is responsible for composing text in response to
+ * input from hardware or virtual keyboards. There is one input method
+ * object per seat. On activate there is a new input method context object
+ * created which allows the input method to communicate with the text input.
+ * @section page_iface_zwp_input_method_v1_api API
+ * See @ref iface_zwp_input_method_v1.
+ */
+/**
+ * @defgroup iface_zwp_input_method_v1 The zwp_input_method_v1 interface
+ *
+ * An input method object is responsible for composing text in response to
+ * input from hardware or virtual keyboards. There is one input method
+ * object per seat. On activate there is a new input method context object
+ * created which allows the input method to communicate with the text input.
+ */
+extern const struct wl_interface zwp_input_method_v1_interface;
+/**
+ * @page page_iface_zwp_input_panel_v1 zwp_input_panel_v1
+ * @section page_iface_zwp_input_panel_v1_desc Description
+ *
+ * Only one client can bind this interface at a time.
+ * @section page_iface_zwp_input_panel_v1_api API
+ * See @ref iface_zwp_input_panel_v1.
+ */
+/**
+ * @defgroup iface_zwp_input_panel_v1 The zwp_input_panel_v1 interface
+ *
+ * Only one client can bind this interface at a time.
+ */
+extern const struct wl_interface zwp_input_panel_v1_interface;
+/**
+ * @page page_iface_zwp_input_panel_surface_v1 zwp_input_panel_surface_v1
+ * @section page_iface_zwp_input_panel_surface_v1_api API
+ * See @ref iface_zwp_input_panel_surface_v1.
+ */
+/**
+ * @defgroup iface_zwp_input_panel_surface_v1 The zwp_input_panel_surface_v1 interface
+ */
+extern const struct wl_interface zwp_input_panel_surface_v1_interface;
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ * @struct zwp_input_method_context_v1_listener
+ */
+struct zwp_input_method_context_v1_listener {
+	/**
+	 * surrounding text event
+	 *
+	 * The plain surrounding text around the input position. Cursor
+	 * is the position in bytes within the surrounding text relative to
+	 * the beginning of the text. Anchor is the position in bytes of
+	 * the selection anchor within the surrounding text relative to the
+	 * beginning of the text. If there is no selected text then anchor
+	 * is the same as cursor.
+	 */
+	void (*surrounding_text)(void *data,
+				 struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+				 const char *text,
+				 uint32_t cursor,
+				 uint32_t anchor);
+	/**
+	 */
+	void (*reset)(void *data,
+		      struct zwp_input_method_context_v1 *zwp_input_method_context_v1);
+	/**
+	 */
+	void (*content_type)(void *data,
+			     struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+			     uint32_t hint,
+			     uint32_t purpose);
+	/**
+	 */
+	void (*invoke_action)(void *data,
+			      struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+			      uint32_t button,
+			      uint32_t index);
+	/**
+	 * @param serial serial of text input state
+	 */
+	void (*commit_state)(void *data,
+			     struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+			     uint32_t serial);
+	/**
+	 */
+	void (*preferred_language)(void *data,
+				   struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+				   const char *language);
+};
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+static inline int
+zwp_input_method_context_v1_add_listener(struct zwp_input_method_context_v1 *zwp_input_method_context_v1,
+					 const struct zwp_input_method_context_v1_listener *listener, void *data)
+{
+	return wl_proxy_add_listener((struct wl_proxy *) zwp_input_method_context_v1,
+				     (void (**)(void)) listener, data);
+}
+
+#define ZWP_INPUT_METHOD_CONTEXT_V1_DESTROY 0
+#define ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STRING 1
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STRING 2
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STYLING 3
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_CURSOR 4
+#define ZWP_INPUT_METHOD_CONTEXT_V1_DELETE_SURROUNDING_TEXT 5
+#define ZWP_INPUT_METHOD_CONTEXT_V1_CURSOR_POSITION 6
+#define ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_MAP 7
+#define ZWP_INPUT_METHOD_CONTEXT_V1_KEYSYM 8
+#define ZWP_INPUT_METHOD_CONTEXT_V1_GRAB_KEYBOARD 9
+#define ZWP_INPUT_METHOD_CONTEXT_V1_KEY 10
+#define ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS 11
+#define ZWP_INPUT_METHOD_CONTEXT_V1_LANGUAGE 12
+#define ZWP_INPUT_METHOD_CONTEXT_V1_TEXT_DIRECTION 13
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_SURROUNDING_TEXT_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_RESET_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_CONTENT_TYPE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_INVOKE_ACTION_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STATE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREFERRED_LANGUAGE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STRING_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STRING_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STYLING_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_CURSOR_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_DELETE_SURROUNDING_TEXT_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_CURSOR_POSITION_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_MAP_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_KEYSYM_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_GRAB_KEYBOARD_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_KEY_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_LANGUAGE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+#define ZWP_INPUT_METHOD_CONTEXT_V1_TEXT_DIRECTION_SINCE_VERSION 1
+
+/** @ingroup iface_zwp_input_method_context_v1 */
+static inline void
+zwp_input_method_context_v1_set_user_data(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) zwp_input_method_context_v1, user_data);
+}
+
+/** @ingroup iface_zwp_input_method_context_v1 */
+static inline void *
+zwp_input_method_context_v1_get_user_data(struct zwp_input_method_context_v1 *zwp_input_method_context_v1)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) zwp_input_method_context_v1);
+}
+
+static inline uint32_t
+zwp_input_method_context_v1_get_version(struct zwp_input_method_context_v1 *zwp_input_method_context_v1)
+{
+	return wl_proxy_get_version((struct wl_proxy *) zwp_input_method_context_v1);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+static inline void
+zwp_input_method_context_v1_destroy(struct zwp_input_method_context_v1 *zwp_input_method_context_v1)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_DESTROY);
+
+	wl_proxy_destroy((struct wl_proxy *) zwp_input_method_context_v1);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Send the commit string text for insertion to the application.
+ *
+ * The text to commit could be either just a single character after a key
+ * press or the result of some composing (pre-edit). It could be also an
+ * empty text when some text should be removed (see
+ * delete_surrounding_text) or when the input cursor should be moved (see
+ * cursor_position).
+ *
+ * Any previously set composing text will be removed.
+ */
+static inline void
+zwp_input_method_context_v1_commit_string(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *text)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_COMMIT_STRING, serial, text);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Send the pre-edit string text to the application text input.
+ *
+ * The commit text can be used to replace the pre-edit text on reset (for
+ * example on unfocus).
+ *
+ * Previously sent preedit_style and preedit_cursor requests are also
+ * processed by the text_input.
+ */
+static inline void
+zwp_input_method_context_v1_preedit_string(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *text, const char *commit)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STRING, serial, text, commit);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Set the styling information on composing text. The style is applied for
+ * length in bytes from index relative to the beginning of
+ * the composing text (as byte offset). Multiple styles can
+ * be applied to a composing text.
+ *
+ * This request should be sent before sending a preedit_string request.
+ */
+static inline void
+zwp_input_method_context_v1_preedit_styling(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t index, uint32_t length, uint32_t style)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_STYLING, index, length, style);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Set the cursor position inside the composing text (as byte offset)
+ * relative to the start of the composing text.
+ *
+ * When index is negative no cursor should be displayed.
+ *
+ * This request should be sent before sending a preedit_string request.
+ */
+static inline void
+zwp_input_method_context_v1_preedit_cursor(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_PREEDIT_CURSOR, index);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Remove the surrounding text.
+ *
+ * This request will be handled on the text_input side directly following
+ * a commit_string request.
+ */
+static inline void
+zwp_input_method_context_v1_delete_surrounding_text(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index, uint32_t length)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_DELETE_SURROUNDING_TEXT, index, length);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Set the cursor and anchor to a new position. Index is the new cursor
+ * position in bytes (when >= 0 this is relative to the end of the inserted text,
+ * otherwise it is relative to the beginning of the inserted text). Anchor is
+ * the new anchor position in bytes (when >= 0 this is relative to the end of the
+ * inserted text, otherwise it is relative to the beginning of the inserted
+ * text). When there should be no selected text, anchor should be the same
+ * as index.
+ *
+ * This request will be handled on the text_input side directly following
+ * a commit_string request.
+ */
+static inline void
+zwp_input_method_context_v1_cursor_position(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, int32_t index, int32_t anchor)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_CURSOR_POSITION, index, anchor);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+static inline void
+zwp_input_method_context_v1_modifiers_map(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, struct wl_array *map)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS_MAP, map);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Notify when a key event was sent. Key events should not be used for
+ * normal text input operations, which should be done with commit_string,
+ * delete_surrounding_text, etc. The key event follows the wl_keyboard key
+ * event convention. Sym is an XKB keysym, state is a wl_keyboard key_state.
+ */
+static inline void
+zwp_input_method_context_v1_keysym(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_KEYSYM, serial, time, sym, state, modifiers);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Allow an input method to receive hardware keyboard input and process
+ * key events to generate text events (with pre-edit) over the wire. This
+ * allows input methods which compose multiple key events for inputting
+ * text like it is done for CJK languages.
+ */
+static inline struct wl_keyboard *
+zwp_input_method_context_v1_grab_keyboard(struct zwp_input_method_context_v1 *zwp_input_method_context_v1)
+{
+	struct wl_proxy *keyboard;
+
+	keyboard = wl_proxy_marshal_constructor((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_GRAB_KEYBOARD, &wl_keyboard_interface, NULL);
+
+	return (struct wl_keyboard *) keyboard;
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Forward a wl_keyboard::key event to the client that was not processed
+ * by the input method itself. Should be used when filtering key events
+ * with grab_keyboard.  The arguments should be the ones from the
+ * wl_keyboard::key event.
+ *
+ * For generating custom key events use the keysym request instead.
+ */
+static inline void
+zwp_input_method_context_v1_key(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t time, uint32_t key, uint32_t state)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_KEY, serial, time, key, state);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ *
+ * Forward a wl_keyboard::modifiers event to the client that was not
+ * processed by the input method itself.  Should be used when filtering
+ * key events with grab_keyboard. The arguments should be the ones
+ * from the wl_keyboard::modifiers event.
+ */
+static inline void
+zwp_input_method_context_v1_modifiers(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_MODIFIERS, serial, mods_depressed, mods_latched, mods_locked, group);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+static inline void
+zwp_input_method_context_v1_language(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, const char *language)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_LANGUAGE, serial, language);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_context_v1
+ */
+static inline void
+zwp_input_method_context_v1_text_direction(struct zwp_input_method_context_v1 *zwp_input_method_context_v1, uint32_t serial, uint32_t direction)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_method_context_v1,
+			 ZWP_INPUT_METHOD_CONTEXT_V1_TEXT_DIRECTION, serial, direction);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_v1
+ * @struct zwp_input_method_v1_listener
+ */
+struct zwp_input_method_v1_listener {
+	/**
+	 * activate event
+	 *
+	 * A text input was activated. Creates an input method context
+	 * object which allows communication with the text input.
+	 */
+	void (*activate)(void *data,
+			 struct zwp_input_method_v1 *zwp_input_method_v1,
+			 struct zwp_input_method_context_v1 *id);
+	/**
+	 * deactivate event
+	 *
+	 * The text input corresponding to the context argument was
+	 * deactivated. The input method context should be destroyed after
+	 * deactivation is handled.
+	 */
+	void (*deactivate)(void *data,
+			   struct zwp_input_method_v1 *zwp_input_method_v1,
+			   struct zwp_input_method_context_v1 *context);
+};
+
+/**
+ * @ingroup iface_zwp_input_method_v1
+ */
+static inline int
+zwp_input_method_v1_add_listener(struct zwp_input_method_v1 *zwp_input_method_v1,
+				 const struct zwp_input_method_v1_listener *listener, void *data)
+{
+	return wl_proxy_add_listener((struct wl_proxy *) zwp_input_method_v1,
+				     (void (**)(void)) listener, data);
+}
+
+/**
+ * @ingroup iface_zwp_input_method_v1
+ */
+#define ZWP_INPUT_METHOD_V1_ACTIVATE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_method_v1
+ */
+#define ZWP_INPUT_METHOD_V1_DEACTIVATE_SINCE_VERSION 1
+
+
+/** @ingroup iface_zwp_input_method_v1 */
+static inline void
+zwp_input_method_v1_set_user_data(struct zwp_input_method_v1 *zwp_input_method_v1, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) zwp_input_method_v1, user_data);
+}
+
+/** @ingroup iface_zwp_input_method_v1 */
+static inline void *
+zwp_input_method_v1_get_user_data(struct zwp_input_method_v1 *zwp_input_method_v1)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) zwp_input_method_v1);
+}
+
+static inline uint32_t
+zwp_input_method_v1_get_version(struct zwp_input_method_v1 *zwp_input_method_v1)
+{
+	return wl_proxy_get_version((struct wl_proxy *) zwp_input_method_v1);
+}
+
+/** @ingroup iface_zwp_input_method_v1 */
+static inline void
+zwp_input_method_v1_destroy(struct zwp_input_method_v1 *zwp_input_method_v1)
+{
+	wl_proxy_destroy((struct wl_proxy *) zwp_input_method_v1);
+}
+
+#define ZWP_INPUT_PANEL_V1_GET_INPUT_PANEL_SURFACE 0
+
+
+/**
+ * @ingroup iface_zwp_input_panel_v1
+ */
+#define ZWP_INPUT_PANEL_V1_GET_INPUT_PANEL_SURFACE_SINCE_VERSION 1
+
+/** @ingroup iface_zwp_input_panel_v1 */
+static inline void
+zwp_input_panel_v1_set_user_data(struct zwp_input_panel_v1 *zwp_input_panel_v1, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) zwp_input_panel_v1, user_data);
+}
+
+/** @ingroup iface_zwp_input_panel_v1 */
+static inline void *
+zwp_input_panel_v1_get_user_data(struct zwp_input_panel_v1 *zwp_input_panel_v1)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) zwp_input_panel_v1);
+}
+
+static inline uint32_t
+zwp_input_panel_v1_get_version(struct zwp_input_panel_v1 *zwp_input_panel_v1)
+{
+	return wl_proxy_get_version((struct wl_proxy *) zwp_input_panel_v1);
+}
+
+/** @ingroup iface_zwp_input_panel_v1 */
+static inline void
+zwp_input_panel_v1_destroy(struct zwp_input_panel_v1 *zwp_input_panel_v1)
+{
+	wl_proxy_destroy((struct wl_proxy *) zwp_input_panel_v1);
+}
+
+/**
+ * @ingroup iface_zwp_input_panel_v1
+ */
+static inline struct zwp_input_panel_surface_v1 *
+zwp_input_panel_v1_get_input_panel_surface(struct zwp_input_panel_v1 *zwp_input_panel_v1, struct wl_surface *surface)
+{
+	struct wl_proxy *id;
+
+	id = wl_proxy_marshal_constructor((struct wl_proxy *) zwp_input_panel_v1,
+			 ZWP_INPUT_PANEL_V1_GET_INPUT_PANEL_SURFACE, &zwp_input_panel_surface_v1_interface, NULL, surface);
+
+	return (struct zwp_input_panel_surface_v1 *) id;
+}
+
+#ifndef ZWP_INPUT_PANEL_SURFACE_V1_POSITION_ENUM
+#define ZWP_INPUT_PANEL_SURFACE_V1_POSITION_ENUM
+enum zwp_input_panel_surface_v1_position {
+	ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM = 0,
+};
+#endif /* ZWP_INPUT_PANEL_SURFACE_V1_POSITION_ENUM */
+
+#define ZWP_INPUT_PANEL_SURFACE_V1_SET_TOPLEVEL 0
+#define ZWP_INPUT_PANEL_SURFACE_V1_SET_OVERLAY_PANEL 1
+
+
+/**
+ * @ingroup iface_zwp_input_panel_surface_v1
+ */
+#define ZWP_INPUT_PANEL_SURFACE_V1_SET_TOPLEVEL_SINCE_VERSION 1
+/**
+ * @ingroup iface_zwp_input_panel_surface_v1
+ */
+#define ZWP_INPUT_PANEL_SURFACE_V1_SET_OVERLAY_PANEL_SINCE_VERSION 1
+
+/** @ingroup iface_zwp_input_panel_surface_v1 */
+static inline void
+zwp_input_panel_surface_v1_set_user_data(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) zwp_input_panel_surface_v1, user_data);
+}
+
+/** @ingroup iface_zwp_input_panel_surface_v1 */
+static inline void *
+zwp_input_panel_surface_v1_get_user_data(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) zwp_input_panel_surface_v1);
+}
+
+static inline uint32_t
+zwp_input_panel_surface_v1_get_version(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1)
+{
+	return wl_proxy_get_version((struct wl_proxy *) zwp_input_panel_surface_v1);
+}
+
+/** @ingroup iface_zwp_input_panel_surface_v1 */
+static inline void
+zwp_input_panel_surface_v1_destroy(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1)
+{
+	wl_proxy_destroy((struct wl_proxy *) zwp_input_panel_surface_v1);
+}
+
+/**
+ * @ingroup iface_zwp_input_panel_surface_v1
+ *
+ * Set the input_panel_surface type to keyboard.
+ *
+ * A keyboard surface is only shown when a text input is active.
+ */
+static inline void
+zwp_input_panel_surface_v1_set_toplevel(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1, struct wl_output *output, uint32_t position)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_panel_surface_v1,
+			 ZWP_INPUT_PANEL_SURFACE_V1_SET_TOPLEVEL, output, position);
+}
+
+/**
+ * @ingroup iface_zwp_input_panel_surface_v1
+ *
+ * Set the input_panel_surface to be an overlay panel.
+ *
+ * This is shown near the input cursor above the application window when
+ * a text input is active.
+ */
+static inline void
+zwp_input_panel_surface_v1_set_overlay_panel(struct zwp_input_panel_surface_v1 *zwp_input_panel_surface_v1)
+{
+	wl_proxy_marshal((struct wl_proxy *) zwp_input_panel_surface_v1,
+			 ZWP_INPUT_PANEL_SURFACE_V1_SET_OVERLAY_PANEL);
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/client/wayland/input-method-unstable-v1-protocol.c b/client/wayland/input-method-unstable-v1-protocol.c
new file mode 100644
index 000000000..3dad3bc74
--- /dev/null
+++ b/client/wayland/input-method-unstable-v1-protocol.c
@@ -0,0 +1,114 @@
+/* Generated by wayland-scanner 1.16.92 */
+
+/*
+ * Copyright © 2012, 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "wayland-util.h"
+
+extern const struct wl_interface wl_keyboard_interface;
+extern const struct wl_interface wl_output_interface;
+extern const struct wl_interface wl_surface_interface;
+extern const struct wl_interface zwp_input_method_context_v1_interface;
+extern const struct wl_interface zwp_input_panel_surface_v1_interface;
+
+static const struct wl_interface *types[] = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	&wl_keyboard_interface,
+	&zwp_input_method_context_v1_interface,
+	&zwp_input_method_context_v1_interface,
+	&zwp_input_panel_surface_v1_interface,
+	&wl_surface_interface,
+	&wl_output_interface,
+	NULL,
+};
+
+static const struct wl_message zwp_input_method_context_v1_requests[] = {
+	{ "destroy", "", types + 0 },
+	{ "commit_string", "us", types + 0 },
+	{ "preedit_string", "uss", types + 0 },
+	{ "preedit_styling", "uuu", types + 0 },
+	{ "preedit_cursor", "i", types + 0 },
+	{ "delete_surrounding_text", "iu", types + 0 },
+	{ "cursor_position", "ii", types + 0 },
+	{ "modifiers_map", "a", types + 0 },
+	{ "keysym", "uuuuu", types + 0 },
+	{ "grab_keyboard", "n", types + 5 },
+	{ "key", "uuuu", types + 0 },
+	{ "modifiers", "uuuuu", types + 0 },
+	{ "language", "us", types + 0 },
+	{ "text_direction", "uu", types + 0 },
+};
+
+static const struct wl_message zwp_input_method_context_v1_events[] = {
+	{ "surrounding_text", "suu", types + 0 },
+	{ "reset", "", types + 0 },
+	{ "content_type", "uu", types + 0 },
+	{ "invoke_action", "uu", types + 0 },
+	{ "commit_state", "u", types + 0 },
+	{ "preferred_language", "s", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zwp_input_method_context_v1_interface = {
+	"zwp_input_method_context_v1", 1,
+	14, zwp_input_method_context_v1_requests,
+	6, zwp_input_method_context_v1_events,
+};
+
+static const struct wl_message zwp_input_method_v1_events[] = {
+	{ "activate", "n", types + 6 },
+	{ "deactivate", "o", types + 7 },
+};
+
+WL_EXPORT const struct wl_interface zwp_input_method_v1_interface = {
+	"zwp_input_method_v1", 1,
+	0, NULL,
+	2, zwp_input_method_v1_events,
+};
+
+static const struct wl_message zwp_input_panel_v1_requests[] = {
+	{ "get_input_panel_surface", "no", types + 8 },
+};
+
+WL_EXPORT const struct wl_interface zwp_input_panel_v1_interface = {
+	"zwp_input_panel_v1", 1,
+	1, zwp_input_panel_v1_requests,
+	0, NULL,
+};
+
+static const struct wl_message zwp_input_panel_surface_v1_requests[] = {
+	{ "set_toplevel", "ou", types + 10 },
+	{ "set_overlay_panel", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface zwp_input_panel_surface_v1_interface = {
+	"zwp_input_panel_surface_v1", 1,
+	2, zwp_input_panel_surface_v1_requests,
+	0, NULL,
+};
+
diff --git a/client/wayland/main.c b/client/wayland/main.c
index ec7b95a0f..28e62165f 100644
--- a/client/wayland/main.c
+++ b/client/wayland/main.c
@@ -1,8 +1,9 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
+ * Copyright (C) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2013 Intel Corporation
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2013-2019 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 License
@@ -29,12 +30,12 @@
 #include <wayland-client.h>
 #include <xkbcommon/xkbcommon.h>
 
-#include "input-method-client-protocol.h"
+#include "input-method-unstable-v1-client-protocol.h"
 
 struct _IBusWaylandIM
 {
-    struct wl_input_method *input_method;
-    struct wl_input_method_context *context;
+    struct zwp_input_method_v1 *input_method;
+    struct zwp_input_method_context_v1 *context;
     struct wl_keyboard *keyboard;
 
     IBusInputContext *ibuscontext;
@@ -67,7 +68,7 @@ typedef struct _IBusWaylandIM IBusWaylandIM;
 
 struct _IBusWaylandKeyEvent
 {
-    struct wl_input_method_context *context;
+    struct zwp_input_method_context_v1 *context;
     uint32_t serial;
     uint32_t time;
     uint32_t key;
@@ -183,9 +184,9 @@ _context_commit_text_cb (IBusInputContext *context,
                          IBusText         *text,
                          IBusWaylandIM    *wlim)
 {
-    wl_input_method_context_commit_string (wlim->context,
-                                           wlim->serial,
-                                           text->text);
+    zwp_input_method_context_v1_commit_string (wlim->context,
+                                               wlim->serial,
+                                               text->text);
 }
 
 static void
@@ -202,12 +203,12 @@ _context_forward_key_event_cb (IBusInputContext *context,
     else
         state = WL_KEYBOARD_KEY_STATE_PRESSED;
 
-    wl_input_method_context_keysym (wlim->context,
-                                    wlim->serial,
-                                    0,
-                                    keyval,
-                                    state,
-                                    modifiers);
+    zwp_input_method_context_v1_keysym (wlim->context,
+                                        wlim->serial,
+                                        0,
+                                        keyval,
+                                        state,
+                                        modifiers);
 }
 
 static void
@@ -220,22 +221,22 @@ _context_show_preedit_text_cb (IBusInputContext *context,
                                   wlim->preedit_cursor_pos) -
         wlim->preedit_text->text;
 
-    wl_input_method_context_preedit_cursor (wlim->context,
-                                            cursor);
-    wl_input_method_context_preedit_string (wlim->context,
-                                            wlim->serial,
-                                            wlim->preedit_text->text,
-                                            wlim->preedit_text->text);
+    zwp_input_method_context_v1_preedit_cursor (wlim->context,
+                                                cursor);
+    zwp_input_method_context_v1_preedit_string (wlim->context,
+                                                wlim->serial,
+                                                wlim->preedit_text->text,
+                                                wlim->preedit_text->text);
 }
 
 static void
 _context_hide_preedit_text_cb (IBusInputContext *context,
                                IBusWaylandIM    *wlim)
 {
-    wl_input_method_context_preedit_string (wlim->context,
-                                            wlim->serial,
-                                            "",
-                                            "");
+    zwp_input_method_context_v1_preedit_string (wlim->context,
+                                                wlim->serial,
+                                                "",
+                                                "");
 }
 
 static void
@@ -257,11 +258,11 @@ _context_update_preedit_text_cb (IBusInputContext *context,
 }
 
 static void
-handle_surrounding_text (void                           *data,
-                         struct wl_input_method_context *context,
-                         const char                     *text,
-                         uint32_t                        cursor,
-                         uint32_t                        anchor)
+handle_surrounding_text (void                               *data,
+                         struct zwp_input_method_context_v1 *context,
+                         const char                         *text,
+                         uint32_t                            cursor,
+                         uint32_t                            anchor)
 {
 #if ENABLE_SURROUNDING
     IBusWaylandIM *wlim = data;
@@ -283,30 +284,30 @@ handle_surrounding_text (void                           *data,
 
 static void
 handle_reset (void                           *data,
-              struct wl_input_method_context *context)
+              struct zwp_input_method_context_v1 *context)
 {
 }
 
 static void
-handle_content_type (void                           *data,
-                     struct wl_input_method_context *context,
-                     uint32_t                        hint,
-                     uint32_t                        purpose)
+handle_content_type (void                               *data,
+                     struct zwp_input_method_context_v1 *context,
+                     uint32_t                            hint,
+                     uint32_t                            purpose)
 {
 }
 
 static void
-handle_invoke_action (void                           *data,
-                      struct wl_input_method_context *context,
-                      uint32_t                        button,
-                      uint32_t                        index)
+handle_invoke_action (void                               *data,
+                      struct zwp_input_method_context_v1 *context,
+                      uint32_t                            button,
+                      uint32_t                            index)
 {
 }
 
 static void
-handle_commit_state (void                           *data,
-                     struct wl_input_method_context *context,
-                     uint32_t                        serial)
+handle_commit_state (void                               *data,
+                     struct zwp_input_method_context_v1 *context,
+                     uint32_t                            serial)
 {
     IBusWaylandIM *wlim = data;
 
@@ -314,13 +315,13 @@ handle_commit_state (void                           *data,
 }
 
 static void
-handle_preferred_language (void                           *data,
-                           struct wl_input_method_context *context,
-                           const char                     *language)
+handle_preferred_language (void                               *data,
+                           struct zwp_input_method_context_v1 *context,
+                           const char                         *language)
 {
 }
 
-static const struct wl_input_method_context_listener context_listener = {
+static const struct zwp_input_method_context_v1_listener context_listener = {
     handle_surrounding_text,
     handle_reset,
     handle_content_type,
@@ -415,11 +416,11 @@ _process_key_event_done (GObject      *object,
     }
 
     if (!retval) {
-        wl_input_method_context_key (event->context,
-                                     event->serial,
-                                     event->time,
-                                     event->key,
-                                     event->state);
+        zwp_input_method_context_v1_key (event->context,
+                                         event->serial,
+                                         event->time,
+                                         event->key,
+                                         event->state);
     }
 
     g_free (event);
@@ -444,11 +445,11 @@ input_method_keyboard_key (void               *data,
         return;
 
     if (!wlim->ibuscontext) {
-        wl_input_method_context_key (wlim->context,
-                                     serial,
-                                     time,
-                                     key,
-                                     state);
+        zwp_input_method_context_v1_key (wlim->context,
+                                         serial,
+                                         time,
+                                         key,
+                                         state);
         return;
     }
         
@@ -470,11 +471,11 @@ input_method_keyboard_key (void               *data,
                                                   code,
                                                   modifiers);
         if (!retval) {
-            wl_input_method_context_key (wlim->context,
-                                         serial,
-                                         time,
-                                         key,
-                                         state);
+            zwp_input_method_context_v1_key (wlim->context,
+                                             serial,
+                                             time,
+                                             key,
+                                             state);
         }
     } else {
         IBusWaylandKeyEvent *event = g_new (IBusWaylandKeyEvent, 1);
@@ -504,7 +505,7 @@ input_method_keyboard_modifiers (void               *data,
                                  uint32_t            group)
 {
     IBusWaylandIM *wlim = data;
-    struct wl_input_method_context *context = wlim->context;
+    struct zwp_input_method_context_v1 *context = wlim->context;
     xkb_mod_mask_t mask;
 
     xkb_state_update_mask (wlim->state, mods_depressed,
@@ -537,9 +538,9 @@ input_method_keyboard_modifiers (void               *data,
     if (mask & wlim->meta_mask)
         wlim->modifiers |= IBUS_META_MASK;
 
-    wl_input_method_context_modifiers (context, serial,
-                                       mods_depressed, mods_latched,
-                                       mods_locked, group);
+    zwp_input_method_context_v1_modifiers (context, serial,
+                                           mods_depressed, mods_latched,
+                                           mods_locked, group);
 }
 
 static const struct wl_keyboard_listener keyboard_listener = {
@@ -606,25 +607,25 @@ _create_input_context_done (GObject      *object,
 }
 
 static void
-input_method_activate (void                           *data,
-                       struct wl_input_method         *input_method,
-                       struct wl_input_method_context *context)
+input_method_activate (void                               *data,
+                       struct zwp_input_method_v1         *input_method,
+                       struct zwp_input_method_context_v1 *context)
 {
     IBusWaylandIM *wlim = data;
 
     if (wlim->context) {
-        wl_input_method_context_destroy (wlim->context);
+        zwp_input_method_context_v1_destroy (wlim->context);
         wlim->context = NULL;
     }
 
     wlim->serial = 0;
     wlim->context = context;
 
-    wl_input_method_context_add_listener (context, &context_listener, wlim);
-    wlim->keyboard = wl_input_method_context_grab_keyboard (context);
-    wl_keyboard_add_listener(wlim->keyboard,
-                             &keyboard_listener,
-                             wlim);
+    zwp_input_method_context_v1_add_listener (context, &context_listener, wlim);
+    wlim->keyboard = zwp_input_method_context_v1_grab_keyboard (context);
+    wl_keyboard_add_listener (wlim->keyboard,
+                              &keyboard_listener,
+                              wlim);
 
     if (wlim->ibuscontext) {
         g_object_unref (wlim->ibuscontext);
@@ -641,9 +642,9 @@ input_method_activate (void                           *data,
 }
 
 static void
-input_method_deactivate (void                           *data,
-                         struct wl_input_method         *input_method,
-                         struct wl_input_method_context *context)
+input_method_deactivate (void                               *data,
+                         struct zwp_input_method_v1         *input_method,
+                         struct zwp_input_method_context_v1 *context)
 {
     IBusWaylandIM *wlim = data;
 
@@ -666,12 +667,12 @@ input_method_deactivate (void                           *data,
     }
 
     if (wlim->context) {
-        wl_input_method_context_destroy (wlim->context);
+        zwp_input_method_context_v1_destroy (wlim->context);
         wlim->context = NULL;
     }
 }
 
-static const struct wl_input_method_listener input_method_listener = {
+static const struct zwp_input_method_v1_listener input_method_listener = {
     input_method_activate,
     input_method_deactivate
 };
@@ -685,11 +686,12 @@ registry_handle_global (void               *data,
 {
     IBusWaylandIM *wlim = data;
 
-    if (!g_strcmp0 (interface, "wl_input_method")) {
+    if (!g_strcmp0 (interface, "zwp_input_method_v1")) {
         wlim->input_method =
-            wl_registry_bind (registry, name, &wl_input_method_interface, 1);
-        wl_input_method_add_listener (wlim->input_method,
-                                      &input_method_listener, wlim);
+            wl_registry_bind (registry, name,
+                              &zwp_input_method_v1_interface, 1);
+        zwp_input_method_v1_add_listener (wlim->input_method,
+                                          &input_method_listener, wlim);
     }
 }
 
diff --git a/configure.ac b/configure.ac
index fdd316a94..949bb4f3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,6 +289,11 @@ if test x"$enable_wayland" = x"yes"; then
         wayland-client >= 1.2.0
         xkbcommon
     ])
+    m4_ifdef([WAYLAND_SCANNER_RULES],
+             [WAYLAND_PRTCLS_SUBDIR='wayland-protocols/unstable/input-method'
+              AC_SUBST(WAYLAND_PRTCLS_SUBDIR)
+              WAYLAND_SCANNER_RULES(['$(datadir)/$(WAYLAND_PRTCLS_SUBDIR)'])],
+             [AC_SUBST(wayland_scanner_rules)])
 else
     enable_wayland="no (disabled, use --enable-wayland to enable)"
 fi

From ab56a27376f3b153233442c3697ad7d6502ed9fe Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 21 Aug 2019 17:25:41 +0900
Subject: [PATCH 579/816] client/wayland: Connect to "disconnected" signal

ibus-wayland could terminate with "disconnected" signal.
---
 client/wayland/main.c | 11 +++++++++++
 client/x11/main.c     | 11 +++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/wayland/main.c b/client/wayland/main.c
index 28e62165f..d86bab9ef 100644
--- a/client/wayland/main.c
+++ b/client/wayland/main.c
@@ -707,6 +707,15 @@ static const struct wl_registry_listener registry_listener = {
     registry_handle_global_remove
 };
 
+static void
+_bus_disconnected_cb (IBusBus *bus,
+                      gpointer user_data)
+{
+    g_debug ("Connection closed by ibus-daemon\n");
+    g_clear_object (&_bus);
+    ibus_quit ();
+}
+
 gint
 main (gint    argc,
       gchar **argv)
@@ -751,6 +760,8 @@ main (gint    argc,
     g_source_set_can_recurse (source, TRUE);
     g_source_attach (source, NULL);
 
+    g_signal_connect (_bus, "disconnected",
+                      G_CALLBACK (_bus_disconnected_cb), NULL);
     ibus_main ();
 
     return EXIT_SUCCESS;
diff --git a/client/x11/main.c b/client/x11/main.c
index a1879346b..c9ee174d1 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus
  * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
@@ -850,10 +850,9 @@ static void
 _bus_disconnected_cb (IBusBus  *bus,
                       gpointer  user_data)
 {
-    g_warning ("Connection closed by ibus-daemon");
-    g_object_unref (_bus);
-    _bus = NULL;
-    exit(EXIT_SUCCESS);
+    g_debug ("Connection closed by ibus-daemon\n");
+    g_clear_object (&_bus);
+    ibus_quit ();
 }
 
 static void
@@ -1244,7 +1243,7 @@ main (int argc, char **argv)
         atexit (_atexit_cb);
 
     _xim_init_IMdkit ();
-    gtk_main();
+    ibus_main();
 
     exit (EXIT_SUCCESS);
 }

From b07b6b7731c3f9e37433d72be2f6d9f95399ba22 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 22 Aug 2019 18:08:34 +0900
Subject: [PATCH 580/816] Update Translations

Update po/es.po po/tr.po po/zh_CN.po
---
 po/LINGUAS  |    1 +
 po/es.po    | 1974 ++++++++++++++++---------------
 po/tr.po    | 3207 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po | 1966 ++++++++++++++++---------------
 4 files changed, 5315 insertions(+), 1833 deletions(-)
 create mode 100644 po/tr.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 8e2704486..060a82750 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -42,6 +42,7 @@ sv
 ta
 te
 tg
+tr
 uk
 ur
 vi
diff --git a/po/es.po b/po/es.po
index 1984dd14a..4183e9787 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -22,402 +22,60 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-06-25 10:45+0000\n"
+"PO-Revision-Date: 2019-03-02 11:55+0000\n"
 "Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.4.5\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horizontal"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertical"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Esquina superior izquierda"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Esquina superior derecha"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Esquina inferior izquierda"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Esquina inferior derecha"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "No mostrar"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Ocultar automáticamente"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Siempre"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Preferencias de IBus"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Siguiente método de entrada:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Método de entrada anterior:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Atajo de teclado para encender o apagar el método de entrada"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Habilitar o inhabilitar:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Habilitar:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Inhabilitar:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Atajos de teclado</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Establecer la orientación de los candidatos en la tabla de búsqueda"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientación de los candidatos:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Mostrar panel de propiedades:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Posición del panel de idioma:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Mostrar un ícono en la bandeja del sistema"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Insertar texto previamente editado en la ventana de la aplicación"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Usar fuente personalizada:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fuente y Estilo</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "General"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Añadir"
-
-#: ../setup/setup.ui.h:36
-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"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Eliminar el método de entrada seleccionado de los métodos de entrada "
-"habilitados"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Subir"
-
-#: ../setup/setup.ui.h:40
-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"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Bajar"
-
-#: ../setup/setup.ui.h:42
-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"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "Acerca _de"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostrar información sobre el método de entrada seleccionado"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Mostrar la configuración del método de entrada seleccionado"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Puede elegir el método de entrada activo de los seleccionados en "
-"la lista anterior, mediante el atajo de teclado o pulsando en el icono del "
-"panel.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Métodos de Entrada"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-"Los atajos de teclado para activar las conversiones de las anotaciones de "
-"emoji o nombre Unicode"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "Anotación emoji:"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-"Los atajos de teclado para activar las conversiones de los códigos Unicode"
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr "Código Unicode:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Fuente a usar para los candidatos Unicode en el cuadro de emoji."
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Fuente Unicode:"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-"Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Idioma para las anotaciones de emoji:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Realizar búsqueda parcial en las anotaciones de emoji con la siguiente "
-"condición y más que un mínimo de caracteres:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Si se puede obtener una coincidencia parcial en lugar de exacta en la "
-"búsqueda de anotaciones de emoji."
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Comienza con el texto"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Acaba con el texto"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Contiene el texto"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Usar la distribución del teclado del sistema"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usar la distribución del teclado del sistema (XKB)"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Distribución del teclado</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Configuraciones globales de método de entrada</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus de entrada inteligente</small>\n"
-"Sitio web: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Iniciar ibus al ingresar"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Acerca de"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Cerrar"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Precargar máquinas"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Precargar los motores durante el inicio de ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Orden de las máquinas"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Orden de las máquinas guardada en la lista de métodos de entrada"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Retraso en milisegundos de Popup para ventana del interruptor IME"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 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 &lt; Demora en milisegundos. 0 &gt; No muestra la ventana "
-"ni los motores siguientes o anteriores."
+"Establece retraso en milisegundos para mostrar la ventana del selector IME. "
+"El valor 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:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Número de versión guardada"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -425,76 +83,127 @@ 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Disposiciones latinas que no tienen ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "Disposición de los Estados Unidos se anexa a los Disposiciones Latino. "
 "variante puede ser omitida."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Usar xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Ejecutar xmodmap si .xmodmap o .Xmodmap existen cuando los motores ibus son "
 "cambiados."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Usar la distribución del teclado del sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usar la distribución del teclado del sistema (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Insertar texto preeditado"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Utilizar método de entrada global"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Habilitar método de entrada por defecto"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Habilitar método de entrada por defecto cuando la aplicación consigue el "
+"foco de entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf preserva los prefijos de nombres"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Activadora de los Atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Atajo de teclado para encender o apagar el método de entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activador de llaves de atajos para leer gtk_accelerator "
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Habilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 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:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Deshabilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Los atajos de teclado para deshabilitar el método de entrada"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Atajo de teclado para el siguiente motor"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Atajo de teclado para la máquina previa"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 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:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Auto Ocultar"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -502,24 +211,16 @@ msgstr ""
 "La conducta del panel de propiedad,0= No mostrar, 1 = Auto ocultar, 2 = "
 "Mostrar siempre"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Posición del panel de idioma"
 
-#: ../data/ibus.schemas.in.h:29
-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 posición del panel de idioma. 0 = esquina superior izquierda, 1 = esquina "
-"superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior "
-"derecha, 4 = personalizada"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Siga el cursor de entrada en caso de que el panel siempre se muestre"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -527,11 +228,11 @@ msgstr ""
 "Si es verdadero, el panel sigue el cursor de entrada en el caso que siempre "
 "se muestre. Si es falso, el panel se muestra en una ubicación fija."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Los milisegundos para mostrar el panel de propiedad"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -539,24 +240,33 @@ msgstr ""
 "Los milisegundos para mostrar el panel de propiedad después de enfocar o que "
 "las propiedades cambien."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientación de la tabla de búsqueda"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 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:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Mostrar un ícono en la bandeja del sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Mostrar el nombre del método de entrada"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Valor RGBA del ícono XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -574,11 +284,11 @@ msgstr ""
 "255 o valores de porcentaje en el rango de 0% a 100%, y  'a' es un valor de "
 "punto flotante en el rango de 0 a 1 para el alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Los milisegundos para mostrar el icono del panel para una propiedad"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -591,48 +301,49 @@ msgstr ""
 "Si el valor es 0, no hay tiempo de retardo y el icono de la propiedad se "
 "muestra inmediatamente."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Atajos de teclado Unicode para gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura Unicode"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Atajos de teclado de emoji para gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Idioma predeterminado para el diccionario de emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -640,11 +351,11 @@ msgstr ""
 "Elija un idioma predeterminado para el diccionario de emoji. Su valor "
 "($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista de emoji favoritos en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -652,20 +363,20 @@ msgstr ""
 "Puede mostrar sus emoji favoritos en la lista de emoji si los incluye en "
 "esta lista."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista de anotaciones de emoji favoritos en el diálogo de emoji"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Puede poner anotaciones a sus emoji favoritos en esta lista."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -673,13 +384,13 @@ msgstr ""
 "Si se puede obtener una coincidencia parcial en la búsqueda de anotaciones "
 "de emoji en lugar de una exacta."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
 "indicada"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -687,12 +398,12 @@ msgstr ""
 "Obtener coincidencias parciales en lugar de exactas en las anotaciones de "
 "emoji que tengan más que el número de caracteres indicado "
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Elija una condición para las coincidencias parciales de anotaciones de emoji"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -701,11 +412,11 @@ msgstr ""
 "anotaciones de emoji: 0 == inicio del texto, 1 == final del texto, 2 == "
 "contiene el texto."
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
 msgstr "Cargar los datos de emoji al inicio"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -714,11 +425,11 @@ msgstr ""
 "Cargar los datos de emoji al inicio. Se necesitan alrededor de 10MB. Si está "
 "desactivado, se cargarán al abrir el cuadro de selección de emoji."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "Cargar los datos de Unicode al inicio"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -730,2380 +441,2811 @@ msgstr ""
 "datos de Unicode sólo se cargarán después de los de emoji, incluso cuando "
 "esta opción esté activa."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Insertar texto preeditado"
+#: ibus/_config.py.in:41
+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."
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "Otro"
 
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Utilizar método de entrada global"
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Elija un idioma"
 
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Habilitar método de entrada por defecto"
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Más..."
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Acerca de"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Idioma: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Distribución del teclado: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Descripción:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Seleccione un método de entrada"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Añadir"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Métodos de Entrada"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferencias de IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Defina las preferencias de IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Atajos de teclado"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Código clave:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modificadores:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
-"Habilitar método de entrada por defecto cuando la aplicación consigue el "
-"foco de entrada"
+"Por favor, presione una tecla (o una combinación de tecla).\n"
+"El diálogo será cerrado cuando la tecla sea soltada."
 
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf preserva los prefijos de nombres"
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
+#: setup/main.py:121 setup/main.py:588
+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"
 
-#: ../ibus/_config.py.in:41
+#: setup/main.py:515
+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:536
 msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+"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 ""
-"Copyright (c) 2007–2010 Peng Huang\n"
-"Copyright (c) 2007–2010 Red Hat, Inc."
+"¡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:550
+#, 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:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Seleccione la tecla de atajo para %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "cambiando métodos de entrada"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertical"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Esquina superior izquierda"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Esquina superior derecha"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Esquina inferior izquierda"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Esquina inferior derecha"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Personalizado"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "No mostrar"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Ocultar automáticamente"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Siempre"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Siguiente método de entrada:"
+
+#: setup/setup.ui:127
+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"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Método de entrada anterior:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Habilitar o inhabilitar:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Habilitar:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Inhabilitar:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Atajos de teclado</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Establecer la orientación de los candidatos en la tabla de búsqueda"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientación de los candidatos:"
+
+#: setup/setup.ui:407
+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"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Mostrar panel de propiedades:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Posición del panel de idioma:"
+
+#: setup/setup.ui:494
+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"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Insertar texto previamente editado en la ventana de la aplicación"
+
+#: setup/setup.ui:513
+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"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Usar fuente personalizada:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fuente y Estilo</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "General"
+
+#: setup/setup.ui:671
+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"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Quitar"
+
+#: setup/setup.ui:689
+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"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Subir"
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Otro"
+#: setup/setup.ui:707
+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"
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Elija un idioma"
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Bajar"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: setup/setup.ui:725
+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"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "_Aceptar"
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "Acerca _de"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Más..."
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Mostrar información sobre el método de entrada seleccionado"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Idioma: %s\n"
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Preferencias"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Distribución del teclado: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Mostrar la configuración del método de entrada seleccionado"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Puede elegir el método de entrada activo de los seleccionados en "
+"la lista anterior, mediante el atajo de teclado o pulsando en el icono del "
+"panel.</i></small>"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Descripción:\n"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+"Los atajos de teclado para activar las conversiones de las anotaciones de "
+"emoji o nombre Unicode"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Seleccione un método de entrada"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Anotación emoji:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"Los atajos de teclado para activar las conversiones de los códigos Unicode"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Defina las preferencias de IBus"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Código Unicode:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Atajos de teclado"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Fuente a usar para los candidatos Unicode en el cuadro de emoji."
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Código clave:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Fuente Unicode:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modificadores:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+"Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Aplicar"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Idioma para las anotaciones de emoji:"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Eliminar"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Realizar búsqueda parcial en las anotaciones de emoji con la siguiente "
+"condición y más que un mínimo de caracteres:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Por favor, presione una tecla (o una combinación de tecla).\n"
-"El diálogo será cerrado cuando la tecla sea soltada."
+"Si se puede obtener una coincidencia parcial en lugar de exacta en la "
+"búsqueda de anotaciones de emoji."
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Por favor, presione una tecla (o combinación de teclas)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Comienza con el texto"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-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/setup.ui:1115
+msgid "Suffix match"
+msgstr "Acaba con el texto"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "El demonio IBus no se está ejecutando. ¿Desea iniciarlo?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Contiene el texto"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Distribución del teclado</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Configuraciones globales de método de entrada</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "El demonio IBus no se pudo iniciar en %d segundos"
+"<big><b>IBus</b></big>\n"
+"<small>El bus de entrada inteligente</small>\n"
+"Sitio web: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Seleccione la tecla de atajo para %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Iniciar ibus al ingresar"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "cambiando métodos de entrada"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Inicio</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Actividades"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Animales y naturaleza"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Componente"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Banderas"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Comida y bebida"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objetos"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Emoticonos y gente"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Gente y cuerpo"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Emociones"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Viajes y lugares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Latino básico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Latino-1 (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Latino extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Latino extendido-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "Extensiones IPA"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Modificadores del espaciado"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Marcas diacríticas combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Griego y copto"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Cirílico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Cirílico (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Armenio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebreo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Árabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Sirio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Árabe (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "N'Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandeo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Sirio (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Árabe extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengalí"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Tailandés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibetano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Georgiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Etíope"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Etíope (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cheroqui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Silabarios indígenas canadienses"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Rúnico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunóo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Jemer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Silabarios indígenas canadienses extendidos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Nuevo Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Jemer (símbolos)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Marcas diacríticas combinantes extendidas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sondanés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Cirílico extendido-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Georgiano extendido"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Sondanés (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Extensiones vedas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Extensiones fonéticas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Extensiones fonéticas (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Marcas diacríticas combinantes (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Latino extendido adicional"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Griego extendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Puntuación general"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Superíndices y subíndices"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Símbolos monetarios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Marcas diacríticas combinantes para símbolos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Símbolos similares a letras"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Formas numéricas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Flechas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Operadores matemáticos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Técnicos variados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Descriptores de control"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Reconocimiento óptico de caracteres"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Alfanuméricos encerrados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Dibujos de cuadros"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Bloques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Formas geométricas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Símbolos variados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Caracteres gráficos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Símbolos matemáticos variados A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Flechas suplementarias A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Patrones Braille"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Flechas suplementarias B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Símbolos matemáticos variados B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Operadores matemáticos suplementarios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Símbolos y flechas variados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolítico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Latino extendido-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Copto"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Georgiano (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinag"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Etíope extendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Cirílico extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Puntuación (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK, radicales (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kangxi (radicales)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Caracteres ideográficos de descripción"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK, símbolos y puntuación"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Jamo con compatibilidad hangul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo extendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK, trazos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Katakana, extensiones fonéticas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "CJK, letras y meses encerrados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK (compatibilidad)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK, ideogramas unificados extensión A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "Hexagramas del I-Ching"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "CJK, ideogramas unificados"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi, sílabas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi, radicales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Cirílico extendido-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Shümom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Letras modificadoras del tono"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Latino extendido-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Formas numéricas índicas comunes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "'Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari extendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangul Jamo extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javanés"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Myanmar extendido-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Myanmar extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meetei Mayek, extensiones"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Etíope extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Latino extendido-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cheroqui (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangul, sílabas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangul Jamo extendido-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "Subrogaciones altas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "Subrogaciones altas de uso privado"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Subrogaciones bajas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Área de uso privado"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK, ideogramas de compatibilidad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Formas de presentación alfabética"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Formas de presentación árabes-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Selectores de variación"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Formas verticales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Marcas intermedias combinantes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK, formas de compatibilidad"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Variantes de formas pequeñas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Árabe, formas de presentación B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Formas de ancho completo e intermedio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Especiales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Silabario lineal B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Ideogramas lineales B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Números egeos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Números de griego antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Símbolos antiguos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Disco de Festo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Licio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Cario"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Números epact coptos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Italo antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gótico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Pérmico antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugarítico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Persa antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shaviano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Elbasano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Albanocaucásico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Lineal A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Silabario chipriota"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Arameo imperial"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmireno"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabateo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatrano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Fenicio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lidio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroítico, jeroglíficos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroítico, cursiva"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Karosti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Árabe meridional antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Árabe del norte antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Maniqueo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avéstico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Parto, inscripciones"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Pahlaví, inscripciones"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Pahlaví, salmos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Turco antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Húngaro antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi rohinyá"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Numerales rumi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Sogdiano antiguo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdiano"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Sinhala, numerales antiguos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongol (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Zanabazar cuadrada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "Gunjala Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "Macasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Cuneiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cuneiforme, números y puntuación"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Cuneiforme arcaico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Jeroglíficos egipcios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Jeroglíficos anatolios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Shümom (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "Medefidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Pollard Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Símbolos y puntuación ideográfica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Tangut, componentes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Nü shu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Taquigrafía, controles de formato"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Símbolos musicales biznatinos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Símbolos musicales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Notación musical del griego antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr "Numeración maya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Varillas de numeración"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Símbolos matemáticos alfanuméricos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Lengua de signos Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolítico (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Silabario ki-ka-ku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr "Números índicos siyah"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Símbolos alfabéticos matemáticos árabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Fichas de Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Fichas de dominó"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Naipes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Alfanuméricos encerrados (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Ideogramas encerrados (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Símbolos y pictogramas varios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Emoticonos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Pictogramas ornamentales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Símbolos de transporte y mapas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Símbolos alquímicos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Formas geométricas extendidas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Flechas (suplemento-C)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Símbolos y pictogramas (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "Símbolos de ajedrez"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK, ideogramas unificados extensión B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK, ideogramas unificados extensión C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK, ideogramas unificados extensión D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK, ideogramas unificados extensión E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK, ideogramas unificados extensión F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK, ideogramas de compatibilidad (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Selectores de variación (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Área suplementaria de uso privado A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Área suplementaria de uso privado B"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lea el cache del registro del sistema."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lea el ARCHIVO de caché del registro."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "El caché del registro es inválido.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Escriba al caché del registro del sistema."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Escriba al ARCHIVO caché del registro."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr "Usar rutas de esquema del motor en lugar del núcleo ibus."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Restableciendo..."
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Hecho"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Ponga u obtenga una máquina"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Detener el ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Mostrar las máquinas disponibles"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(no implementado)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Reiniciar el ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Mostrar la versión"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostrar el contenido del caché del registro"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Crear el caché del registro"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Mostrar los valores de la configuración"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Restablecer los valores de la configuración"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Guardar emoji del diálogo en el portapapeles."
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostrar esta información"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Uso: %s COMANDO [OPCIÓN...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Otros"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Abrir selección Unicode"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Escriba el texto o elija un emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Volver a la selección emoji"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Siguiente"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Anterior"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Mostrar variantes de emoji"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menú"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
 msgstr "Pulse para ver mensaje de aviso"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
 msgstr "Cargando un diccionario Unicode:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto de código: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Tiene variantes emoji"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Ninguna"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotaciones: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr "Selección de emoji"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr "Selección Unicode"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
@@ -3113,84 +3255,76 @@ msgstr ""
 "foco (por ejemplo, pulse escape varias veces para salir del modo emoji, haga "
 "clic en el escritorio y de nuevo en su aplicación."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Cancelada la selección de emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Se copió un emoji al portapapeles."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FUENTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
 ""
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "IDIOMA"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Buscar coincidencias con la longtud indicada"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Buscar coincidencias con la condición indicada por el código"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Actualización de IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 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:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Créditos de Traducción"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 000000000..98c34e23f
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,3207 @@
+# Turkish translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Serdar Sağlam <teknomobil@msn.com>, 2019. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus 1.5.20\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2019-03-26 06:30+0000\n"
+"Last-Translator: Serdar Sağlam <teknomobil@msn.com>\n"
+"Language-Team: Turkish\n"
+"Language: tr\n"
+"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=(n>1)\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+
+#: ibus/lang.py:41 src/ibusutil.c:198
+msgid "Other"
+msgstr "Diğer"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Bir dil seç"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_İptal"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_Tamam"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Dahası..."
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Hakkında"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Kapat"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Dil: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Klavye düzeni: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Yazar: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Açıklama:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Bir giriş yöntemi seç"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Ekle"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Giriş Yöntemi"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr ""
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus Tercihleri"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Klavye kısayolları"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Anahtar kodu:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Düzenleyiciler:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Uygula"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Sil"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr ""
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr ""
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr ""
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr ""
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr ""
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr ""
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr ""
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr ""
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr ""
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr ""
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr ""
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr ""
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr ""
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr ""
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr ""
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr ""
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr ""
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr ""
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr ""
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Kaldır"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr ""
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr ""
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Hakkında"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Tercihler"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr ""
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr ""
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr ""
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr ""
+
+#: tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:237 tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: tools/main.vala:257
+msgid "Write the system registry cache."
+msgstr ""
+
+#: tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: tools/main.vala:444
+msgid "Set or get engine"
+msgstr ""
+
+#: tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:446
+msgid "Show available engines"
+msgstr ""
+
+#: tools/main.vala:447
+msgid "(Not implemented)"
+msgstr ""
+
+#: tools/main.vala:448
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:449
+msgid "Show version"
+msgstr ""
+
+#: tools/main.vala:450
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: tools/main.vala:451
+msgid "Create registry cache"
+msgstr ""
+
+#: tools/main.vala:452
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
+msgid "Show this information"
+msgstr ""
+
+#: tools/main.vala:464
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: tools/main.vala:465
+msgid "Commands:\n"
+msgstr ""
+
+#: tools/main.vala:494
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1095
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1099
+msgid "translator-credits"
+msgstr "Serdar Sağlam <teknomobil@yandex.com, 2019."
+
+#: ui/gtk3/panel.vala:1118
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ui/gtk3/panel.vala:1144
+msgid "Restart"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1148
+msgid "Quit"
+msgstr "Çık"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
+msgid "default:LTR"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a3694cf8..85a8f1dee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,495 +16,231 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Pany <pany@fedoraproject.org>, 2019. #zanata
+# Tian Shixiong <tiansworld@fedoraproject.org>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-09-12 02:51+0000\n"
+"PO-Revision-Date: 2019-07-26 04:03+0000\n"
 "Last-Translator: Tian Shixiong <tiansworld@fedoraproject.org>\n"
 "Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\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 "Do not show"
-msgstr "不再显示"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>快捷键</b>"
-
-#: ../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 "设置如何显示或隐藏语言栏的方式"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "显示属性栏："
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "语言栏位置："
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "在系统托盘上显示图标"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>字体和风格</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "常规"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "添加(_A)"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "添加选中的输入法到启用输入法列表"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "从启用输入法列表删除选中的输入法"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "向上(_U)"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "上移选中的输入法"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "向下(_D)"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "下移选中的输入法"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "显示选中输入法的信息"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "首选项(_P)"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "显示选中输入法的设置界面"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "输入法"
-
-#: ../setup/setup.ui.h:49
-#, fuzzy
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "启用在表情符号注释或 Unicode 名称间转换的快捷键"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr "表情符号注释"
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr ""
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "设置表情符号对话框中 Unicode 候选字的字体"
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr "Unicode 字体"
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "设置 emoji 面板中 emoji 释文的语言"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Emoji 释文语言："
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "字首匹配"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "字尾匹配"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr ""
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "表情符号"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "使用系统键盘布局"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "使用系统键盘（XKB）布局"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>键盘布局</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "在所有应用程序中共享同一个输入法"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>全局输入法设置</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "高级"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智能输入平台</small>\n"
-"主页：https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "登录时运行 IBus"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>启动</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "关于"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "关闭(_C)"
-
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "预加载引擎"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "IBus 启动时预加载的引擎"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "引擎顺序"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "保存在输入法选单中的引擎顺序"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "输入法切换窗口弹出延时微秒数"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
-"设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 &lt; 延迟微秒数 0 &gt; 当切换上一个/"
-"下一个输入法引擎时不显示窗口。"
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "已储存的版本号"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 #, fuzzy
 msgid "Latin layouts which have no ASCII"
 msgstr "无 ASCII 码的拉丁字符布局"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "使用 xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr "若 .xmodmap 或者 .Xmodmap 存在则当 ibus 框架启动时执行 xmodmap"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "使用系统键盘布局"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系统键盘（XKB）布局"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "内嵌编辑模式"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "在应用程序窗口中启用内嵌编辑模式"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "使用全局输入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "在所有应用程序中共享同一个输入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "默认启动输入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "当应用程序需要使用输入时自动启用输入法"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf 保留名称前缀"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "用来停止名称转换的 DConf 键前缀"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "触发快捷键"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "打开关闭输入法的快捷键"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "为 gtk_accelerator_parse 触发快捷键"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "应用快捷键"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "开启输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "禁用快捷键"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "关闭输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "切换到列表中下一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "上一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "切换到列表中上一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "自动隐藏"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "属性面板的行为。 0 = 不再显示，1 = 自动隐藏，2 = 始终显示"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "在始终显示的情况下面板跟随输入光标"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "若为真，当面板设为始终显示时面板将跟随输入光标。若为假，面板将在固定位置显示。"
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间"
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "在系统托盘上显示图标"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "显示输入法名称"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "语言栏上显示输入法名称"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "XKB 图标的 RGBA 值"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -519,11 +255,12 @@ msgstr ""
 "'rgba(r,g,b,a)' 形式的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 "
 "100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+#, fuzzy
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "显示属性面板的毫秒数"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -531,116 +268,119 @@ msgid ""
 "property icon is shown immediately."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "用于 gtk_accelerator_parse 的 Unicode 快捷键"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "开启或关闭 Unicode 输入的快捷键"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
+msgstr "用于开启或关闭表情输入的快捷键"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "表情符号对话框中用于表情符号的自定义字体名称"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "emoji 字典的默认语言"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
+"在表情输入对话框中选择默认表情输入语言。设定值 $lang 会应用于 /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "emoji 面板中的最喜爱的 emoji 列表"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
-msgstr ""
+msgstr "可在表情符号列表中显示最喜爱的表情符号，但前提是该列表中存在字符。"
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "表情符号对话框中的最喜爱表情符号注释列表"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "您可在此列表中为喜欢的表情符号添加注释。"
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgstr "表情符号注释是否可以部分匹配"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr ""
+msgstr "是否使用部分字符而非完整字符匹配表情注释。"
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "使用特定长度字符匹配表情注释"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr ""
+msgstr "使用超过特定长度字符对表情注释进行匹配，而非完全匹配。"
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "选择一种条件来部分匹配表情注释"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr ""
+msgstr "选择以下条件来部分匹配表情注释：0 == 字首匹配, 1 == 字尾匹配, 2 == 包含匹配"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "在启动时加载 emoji 数据"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"如果设定为真 (True)，则在启动时载入表情数据。大概需要 10MB 内存来载入数据。如果设定为假 (False)，则在打开表情对话框时加载表情数据。"
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
 msgstr "在启动时加载 Unicode 数据"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -650,2459 +390,2859 @@ msgstr ""
 "如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果设为“False”，则当打开表情符号对话框时加载 "
 "Unicode 数据。Unicode 数据总是会在表情符号数据加载之后加载，即使设置为“True”也是如此。"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "内嵌编辑模式"
-
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "在应用程序窗口中启用内嵌编辑模式"
-
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "使用全局输入法"
-
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "默认启动输入法"
-
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr "当应用程序需要使用输入时自动启用输入法"
-
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf 保留名称前缀"
-
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "用来停止名称转换的 DConf 键前缀"
-
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 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."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
 msgstr "其他"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "选择语言"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "更多..."
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "关于"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "语言：%s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "键盘布局：%s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "作者：%s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "描述：\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "选择输入法"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "添加(_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "输入法"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus 首选项"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "设定 IBus 首选项"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "快捷键"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "按键："
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "修饰符："
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "请按一个键盘按键（或者一个组合按键）"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
+
+#: setup/main.py:536
+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 已经启动！如果您无法使用 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus 守护在 %d 秒内无法启动"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "选择 %s 的快捷键"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "切换输入法"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "水平"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "竖直"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "左上角"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "右上角"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "左下角"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "右下角"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "自定义"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "不再显示"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "自动隐藏"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "总是"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "切换下一个输入法快捷键"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "下一输入法："
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "切换上一个输入法快捷键"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "上一输入法："
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "开关："
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "启用："
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "禁用："
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>快捷键</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "设置候选词表方向"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "候选词排列方向："
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "设置如何显示或隐藏语言栏的方式"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "显示属性栏："
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "语言栏位置："
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "选中该项将在语言栏上显示输入法的名字"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "在应用程序窗口中启用内嵌编辑模式"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "在应用程序窗口中启用输入法的内嵌编辑模式"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "使用自定义字体："
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>字体和风格</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "常规"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "添加选中的输入法到启用输入法列表"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "从启用输入法列表删除选中的输入法"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "上移选中的输入法"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "向下(_D)"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "下移选中的输入法"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "关于(_A)"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "显示选中输入法的信息"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "首选项(_P)"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
-msgid "_OK"
-msgstr "确定(_O)"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "显示选中输入法的设置界面"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "更多..."
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "语言：%s\n"
+#: setup/setup.ui:873
+#, fuzzy
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "启用在表情符号注释或 Unicode 名称间转换的快捷键"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "键盘布局：%s\n"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "表情符号注释"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "作者：%s\n"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "描述：\n"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "选择输入法"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "设置表情符号对话框中 Unicode 候选字的字体"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode 字体"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "设定 IBus 首选项"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "设置 emoji 面板中 emoji 释文的语言"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "快捷键"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Emoji 释文语言："
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "按键："
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "修饰符："
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "应用(_A)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "字首匹配"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "删除(_D)"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "字尾匹配"
 
-#: ../setup/keyboardshortcut.py:252
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr "请按一个键盘按键（或者一个组合按键）\n"
-"当您松开任意按键时，对话框会自动关闭。"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "包含匹配"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "请按一个键盘按键（或者一个组合按键）"
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "表情符号"
 
-#: ../setup/main.py:121 ../setup/main.py:588
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>键盘布局</b>"
 
-#: ../setup/main.py:515
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>全局输入法设置</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "高级"
 
-#: ../setup/main.py:536
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:550
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 守护在 %d 秒内无法启动"
+"<big><b>IBus</b></big>\n"
+"<small>智能输入平台</small>\n"
+"主页：https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:562
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "选择 %s 的快捷键"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "登录时运行 IBus"
 
-#. Translators: Title of the window
-#: ../setup/main.py:564
-msgid "switching input methods"
-msgstr "切换输入法"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>启动</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "活动"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "动物和自然"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "组件"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "旗帜"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "食物饮料"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "实体"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "笑脸和人物"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "人物和身体"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "笑脸和情绪"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "符号"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "交通工具和场所"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "基本拉丁语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "拉丁-1 补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "拉丁语扩展-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "拉丁语扩展-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA 扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "希腊和古埃及语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "西里尔语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "西里尔语补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "希伯来语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "阿拉伯语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "蒙语"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "拉丁语扩展附加"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "希腊语扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "通用标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "上标和下标"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "货币符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "类似字母的符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "数字形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "箭头"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "数学运算符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "各种技术类符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "控制图"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "几何形状"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "其它各种符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "汉、日、韩语符号和标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "汉、日、韩语笔画"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "汉日韩字符兼容"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "易经六边形符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "麻将块"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
-msgstr ""
+msgstr "多米诺骨牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
-msgstr ""
+msgstr "纸牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "象棋符号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "读取系统注册缓存。"
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "读取注册缓存 FILE。"
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "注册缓存无效。\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "写入系统注册缓存。"
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "写入注册缓存 FILE。"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "正在重置"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "完成"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "设定或获取引擎"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "退出 ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "显示可用引擎"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(暂不可用)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "重启 ibus-daemon"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "显示版本号"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "显示注册缓存内容。"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "创建注册缓存"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "显示配置值"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "重置配置"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "将面板中的 emoji 保存到剪贴板"
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "显示本信息"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s 命令 [选项...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "最爱"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
-msgstr ""
+msgstr "其他"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "键入释文或是选择 emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "下一页"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "上一页"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
-msgstr ""
+msgstr "显示表情变体"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
-msgstr ""
+msgstr "菜单"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "点击查看警告信息"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "正在加载 Unicode 字典"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
-msgstr ""
+msgstr "有表情符号变体"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "无"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "释义：%s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "名称：%s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
-msgstr ""
+msgstr "别名：%s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
-msgstr ""
+msgstr "无法捕捉当前文字应用程序。请重新让该应用程序获得焦点。比如多次按 Esc 键来释放表情输入模式，点击桌面然后再点击该文字应用程序。"
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "已取消选择一个 emoji"
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "已将 emoji 复制到你的剪贴板"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:114
+#, fuzzy
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr ""
+msgstr "用于表情符号对话框中显示表情符号的字体"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
-msgstr ""
+msgstr "字体"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus 更新"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space 是目前默认的快捷键。"
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "黄鹏 <shawn.p.huang@gmail.com>\n"
 "Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "退出"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"

From 7fc8943eee0aeff635deb1e4e4667fe9c2dd3e9f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 23 Aug 2019 13:56:13 +0900
Subject: [PATCH 581/816] Fix some build errors with make dist

The latest distcheck requires uninstall-hook for install-data-hook
and missed wayland_scanner_rules with --disable-wayland.
---
 bindings/pygobject/Makefile.am | 22 +++++++++++++++++++++-
 configure.ac                   |  1 +
 data/its/Makefile.am           |  4 ++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am
index fb2e2a7aa..84bd37cb5 100644
--- a/bindings/pygobject/Makefile.am
+++ b/bindings/pygobject/Makefile.am
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
 # Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2012-2018 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -60,6 +60,7 @@ EXTRA_DIST =					\
 	$(NULL)
 
 install-data-hook:
+	@$(NORMAL_INSTALL)
 if ENABLE_PYTHON2
 	@for data in $(overrides2_DATA); do \
 	    file=`echo $$data | sed -e 's|^.*/||'`; \
@@ -70,5 +71,24 @@ if ENABLE_PYTHON2
 	               $$dlist
 endif
 	$(NULL)
+uninstall-hook:
+	@$(NORMAL_UNINSTALL)
+if ENABLE_PYTHON2
+	@list='$(overrides2_DATA)'; test -n "$(overrides2dir)" || list=; \
+	py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$py_files" || exit 0; \
+	dir='$(DESTDIR)$(overrides2dir)'; \
+	pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
+	pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
+	for files in \
+	    "$$py_files" \
+	    "$$pyc_files" \
+	    "$$pyo_files" \
+	; do \
+	    test -z "$$files" || rm -f "$$dir/$$files" || st=$$?; \
+	done; \
+	exit $$st
+endif
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 949bb4f3c..d3bfe6cb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,6 +296,7 @@ if test x"$enable_wayland" = x"yes"; then
              [AC_SUBST(wayland_scanner_rules)])
 else
     enable_wayland="no (disabled, use --enable-wayland to enable)"
+    AC_SUBST(wayland_scanner_rules)
 fi
 
 enable_appindicator_engine_icon="no"
diff --git a/data/its/Makefile.am b/data/its/Makefile.am
index 07c8a96d5..e051daa44 100644
--- a/data/its/Makefile.am
+++ b/data/its/Makefile.am
@@ -26,4 +26,8 @@ its_DATA = \
     ibus.loc \
     $(NULL)
 
+EXTRA_DIST = \
+    $(its_DATA) \
+    $(NULL)
+
 -include $(top_srcdir)/git.mk

From 5744073a343fe34e309738915ad49e576f9fe8a5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 23 Aug 2019 14:01:00 +0900
Subject: [PATCH 582/816] Release 1.5.21

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d3bfe6cb0..c47e23dc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [20])
+m4_define([ibus_micro_version], [21])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From ae0040c73466bb6e78fce5e669a55fcce6ffd16d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 23 Aug 2019 19:47:18 +0900
Subject: [PATCH 583/816] build: Fix build errors with '-include' directive

I forgot to test the Makefile with autoconf and also missed to
add meta.test.in to EXTRA_DIST
---
 client/wayland/Makefile.am | 2 +-
 src/tests/Makefile.am      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/wayland/Makefile.am b/client/wayland/Makefile.am
index 302375462..ec983e803 100644
--- a/client/wayland/Makefile.am
+++ b/client/wayland/Makefile.am
@@ -60,6 +60,6 @@ EXTRA_DIST = \
     $(protocol_sources) \
     $(NULL)
 
-@wayland_scanner_rules@
+-include @wayland_scanner_rules@
 
 -include $(top_srcdir)/git.mk
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2e75932c5..0a2e523c0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -79,10 +79,10 @@ TESTS_ENVIRONMENT = \
     $(NULL)
 
 LOG_COMPILER = $(srcdir)/runtest
+test_metas_in = meta.test.in
 
 if ENABLE_INSTALL_TESTS
 bin_SCRIPTS = ibus-desktop-testing-runner
-test_metas_in = meta.test.in
 test_execs = $(TESTS:ibus-compose=ibus-compose-locales)
 test_metas = $(addsuffix .test, $(test_execs))
 test_sources_DATA = \

From 71ee904f000f9335ceb6ece054ce18f1291a8490 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 29 Aug 2019 13:26:58 +0900
Subject: [PATCH 584/816] ui/gtk3: Fix manpage-section-mismatch in ibus-emoji.7

BUG=https://github.com/ibus/ibus/issues/2119
---
 ui/gtk3/ibus-emoji.7.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index b8b43574c..9c6d3c6f0 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -2,7 +2,7 @@
 .\" package.
 .\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017-2018.
 .\"
-.TH "IBUS EMOJI" 1 "August 2018" "@VERSION@" "User Commands"
+.TH "IBUS EMOJI" 7 "August 2018" "@VERSION@" "User Commands"
 .SH NAME
 .B ibus-emoji
 \- Call the IBus emoji utility by

From fcb2187dd46d71031867f3bd43196c2448693469 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Sep 2019 20:59:49 +0900
Subject: [PATCH 585/816] src/tests: Replace push with cd for Posix SH

BUG=https://github.com/ibus/ibus/issues/2124
BUG=https://github.com/ibus/ibus/issues/2126
---
 src/tests/ibus-config.c | 2 +-
 src/tests/runtest       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index 9b925ad9e..5e845f10a 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -114,7 +114,7 @@ test_config_set_get (void)
             value_bits |= (1 << 1);
         }
         else {
-            g_warning ("unknow value name=%s", name);
+            g_warning ("Unknown value name=%s", name);
         }
         ibus_config_unset (config, "test", name);
         g_variant_unref (value);
diff --git a/src/tests/runtest b/src/tests/runtest
index 1fcc92830..ed38992f7 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -111,7 +111,8 @@ fi
 run_test_case()
 {
     test -d $tstdir || mkdir $tstdir
-    pushd $tstdir
+    backup_dir=$PWD
+    cd $tstdir
 
     need_bus=no
     for t in $BUS_REQUIRED_TESTS; do
@@ -190,7 +191,7 @@ run_test_case()
 
     retval=`expr $retval \| $?`
 
-    popd
+    cd $backup_dir
 
     func_cleanup $tstdir
 }

From bb638201599291f41cde84d6fe8d16f8d1e18268 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Fri, 6 Sep 2019 21:07:55 +0900
Subject: [PATCH 586/816] Make session file header comment more clear

BUG=https://github.com/ibus/ibus/pull/2129
---
 src/ibusshare.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index d7724a6b2..a731f6ba5 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -251,7 +251,11 @@ ibus_write_address (const gchar *address)
     g_return_if_fail (pf != NULL);
 
     fprintf (pf,
-        "# This file is created by ibus-daemon, please do not modify it\n"
+        "# This file is created by ibus-daemon, please do not modify it.\n"
+        "# This file allows processes on the machine to find the\n"
+        "# ibus session bus with the below address.\n"
+        "# If the IBUS_ADDRESS environment variable is set, it will\n"
+        "# be used rather than this file.\n"
         "IBUS_ADDRESS=%s\n"
         "IBUS_DAEMON_PID=%ld\n",
         address, (glong) getpid ());

From 48a8d7ed58bdfb02c24c8039bae1cb15d4fc1bce Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 6 Sep 2019 21:24:24 +0900
Subject: [PATCH 587/816] Delete deprecated g_type_class_add_private since glib
 2.58

G_DEFINE_TYPE_WITH_PRIVATE() and G_ADD_PRIVATE() have been available
since 2.38.
IBusService has custom GBaseInitFunc and GBaseFinalizeFunc in
ibus_service_get_type() and implements ibus_service_private_offset
and ibus_service_get_instance_private() directly without
G_DEFINE_TYPE_WITH_PRIVATE().
---
 bus/ibusimpl.c         |  7 +++---
 src/ibusbus.c          |  8 +++---
 src/ibuscomponent.c    | 10 ++++----
 src/ibusconfig.c       |  9 +++----
 src/ibusemoji.c        | 14 +++++------
 src/ibusengine.c       | 10 +++-----
 src/ibusenginedesc.c   | 10 ++++----
 src/ibusenginesimple.c |  8 +++---
 src/ibusfactory.c      |  8 +++---
 src/ibushotkey.c       | 55 ++++++++++++------------------------------
 src/ibusinputcontext.c | 12 ++++-----
 src/ibusobject.c       |  8 +++---
 src/ibusobservedpath.c |  6 ++---
 src/ibusproperty.c     |  8 +++---
 src/ibusregistry.c     | 10 +++-----
 src/ibusserializable.c | 24 ++++++++++++++----
 src/ibusservice.c      | 34 +++++++++++++++++++-------
 src/ibusunicode.c      | 24 ++++++++----------
 src/ibusxevent.c       | 22 ++++++++---------
 19 files changed, 135 insertions(+), 152 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index bbbb57702..39b16139a 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2011-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -2180,7 +2180,8 @@ bus_ibus_impl_registry_destroy (BusIBusImpl *ibus)
 
     g_clear_pointer (&ibus->engine_table, g_hash_table_destroy);
 
-    g_clear_pointer (&ibus->registry, ibus_object_destroy);
+    ibus_object_destroy (IBUS_OBJECT (ibus->registry));
+    ibus->registry = NULL;
 
     if (ibus->extension_register_keys)
         g_clear_pointer (&ibus->extension_register_keys, g_variant_unref);
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 090548514..0783e7bb7 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
 #include "ibusconfig.h"
 
 #define IBUS_BUS_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_BUS, IBusBusPrivate))
+   ((IBusBusPrivate *)ibus_bus_get_instance_private (o))
 
 enum {
     CONNECTED,
@@ -115,7 +115,7 @@ static void      ibus_bus_get_property           (IBusBus                *bus,
 
 static void     ibus_bus_close_connection        (IBusBus                *bus);
 
-G_DEFINE_TYPE (IBusBus, ibus_bus, IBUS_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusBus, ibus_bus, IBUS_TYPE_OBJECT)
 
 static void
 ibus_bus_class_init (IBusBusClass *class)
@@ -234,8 +234,6 @@ ibus_bus_class_init (IBusBusClass *class)
             G_TYPE_NONE,
             3,
             G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-    g_type_class_add_private (class, sizeof (IBusBusPrivate));
 }
 
 static void
diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index a933e79b8..9837f47c1 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -58,7 +58,7 @@ struct _IBusComponentPrivate {
 };
 
 #define IBUS_COMPONENT_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_COMPONENT, IBusComponentPrivate))
+   ((IBusComponentPrivate *)ibus_component_get_instance_private (o))
 
 // static guint            _signals[LAST_SIGNAL] = { 0 };
 
@@ -90,7 +90,9 @@ static void         ibus_component_parse_observed_paths
                                                  XMLNode                *node,
                                                  gboolean                access_fs);
 
-G_DEFINE_TYPE (IBusComponent, ibus_component, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusComponent,
+                            ibus_component,
+                            IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_component_class_init (IBusComponentClass *class)
@@ -99,8 +101,6 @@ ibus_component_class_init (IBusComponentClass *class)
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
-    g_type_class_add_private (class, sizeof (IBusComponentPrivate));
-
     gobject_class->set_property = (GObjectSetPropertyFunc) ibus_component_set_property;
     gobject_class->get_property = (GObjectGetPropertyFunc) ibus_component_get_property;
     object_class->destroy = (IBusObjectDestroyFunc) ibus_component_destroy;
diff --git a/src/ibusconfig.c b/src/ibusconfig.c
index 621a4e532..713fe251f 100644
--- a/src/ibusconfig.c
+++ b/src/ibusconfig.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -27,7 +27,7 @@
 #include "ibuserror.h"
 
 #define IBUS_CONFIG_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_CONFIG, IBusConfigPrivate))
+   ((IBusConfigPrivate *)ibus_config_get_instance_private (o))
 
 enum {
     VALUE_CHANGED,
@@ -65,6 +65,7 @@ static void      _signal_unsubscribe        (GDBusProxy         *proxy,
 static void      _remove_all_match_rules    (IBusConfig         *config);
 
 G_DEFINE_TYPE_WITH_CODE (IBusConfig, ibus_config, IBUS_TYPE_PROXY,
+                         G_ADD_PRIVATE (IBusConfig)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
                          );
@@ -75,8 +76,6 @@ ibus_config_class_init (IBusConfigClass *class)
     GDBusProxyClass *dbus_proxy_class = G_DBUS_PROXY_CLASS (class);
     IBusProxyClass *proxy_class = IBUS_PROXY_CLASS (class);
 
-    g_type_class_add_private (class, sizeof (IBusConfigPrivate));
-
     dbus_proxy_class->g_signal = ibus_config_g_signal;
     proxy_class->destroy = ibus_config_real_destroy;
 
@@ -116,7 +115,7 @@ ibus_config_init (IBusConfig *config)
 static void
 ibus_config_real_destroy (IBusProxy *proxy)
 {
-    IBusConfigPrivate *priv = IBUS_CONFIG_GET_PRIVATE (proxy);
+    IBusConfigPrivate *priv = IBUS_CONFIG_GET_PRIVATE (IBUS_CONFIG (proxy));
 
     _signal_unsubscribe (G_DBUS_PROXY (proxy), priv->watch_config_signal_id);
     _remove_all_match_rules (IBUS_CONFIG (proxy));
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index d56c48aad..ae8907a26 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -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) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2017 Red Hat, Inc.
+ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017-2019 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
@@ -47,9 +47,7 @@ struct _IBusEmojiDataPrivate {
 };
 
 #define IBUS_EMOJI_DATA_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-    IBUS_TYPE_EMOJI_DATA, \
-    IBusEmojiDataPrivate))
+   ((IBusEmojiDataPrivate *)ibus_emoji_data_get_instance_private (o))
 
 /* functions prototype */
 static void      ibus_emoji_data_set_property  (IBusEmojiData       *emoji,
@@ -68,7 +66,9 @@ static gint      ibus_emoji_data_deserialize   (IBusEmojiData       *emoji,
 static gboolean  ibus_emoji_data_copy          (IBusEmojiData       *emoji,
                                                 const IBusEmojiData *src);
 
-G_DEFINE_TYPE (IBusEmojiData, ibus_emoji_data, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusEmojiData,
+                            ibus_emoji_data,
+                            IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_emoji_data_class_init (IBusEmojiDataClass *class)
@@ -89,8 +89,6 @@ ibus_emoji_data_class_init (IBusEmojiDataClass *class)
     serializable_class->copy        =
             (IBusSerializableCopyFunc) ibus_emoji_data_copy;
 
-    g_type_class_add_private (class, sizeof (IBusEmojiDataPrivate));
-
     /* install properties */
     /**
      * IBusEmojiData:emoji:
diff --git a/src/ibusengine.c b/src/ibusengine.c
index 7fb4e8563..9aeafbf9b 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -32,7 +32,7 @@
 #include "ibusxevent.h"
 
 #define IBUS_ENGINE_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE, IBusEnginePrivate))
+   ((IBusEnginePrivate *)ibus_engine_get_instance_private (o))
 
 enum {
     PROCESS_KEY_EVENT,
@@ -187,7 +187,7 @@ static void      ibus_engine_dbus_property_changed
                                               GVariant           *value);
 
 
-G_DEFINE_TYPE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusEngine, ibus_engine, IBUS_TYPE_SERVICE)
 
 static const gchar introspection_xml[] =
     "<node>"
@@ -830,8 +830,6 @@ ibus_engine_class_init (IBusEngineClass *class)
             G_TYPE_UINT,
             G_TYPE_UINT);
 
-    g_type_class_add_private (class, sizeof (IBusEnginePrivate));
-
     text_empty = ibus_text_new_from_static_string ("");
     g_object_ref_sink (text_empty);
 }
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index 22622865f..064588bd1 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -72,7 +72,7 @@ struct _IBusEngineDescPrivate {
 };
 
 #define IBUS_ENGINE_DESC_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_DESC, IBusEngineDescPrivate))
+   ((IBusEngineDescPrivate *)ibus_engine_desc_get_instance_private (o))
 
 // static guint            _signals[LAST_SIGNAL] = { 0 };
 
@@ -95,7 +95,9 @@ static gboolean     ibus_engine_desc_copy           (IBusEngineDesc         *des
 static gboolean     ibus_engine_desc_parse_xml_node (IBusEngineDesc         *desc,
                                                      XMLNode                *node);
 
-G_DEFINE_TYPE (IBusEngineDesc, ibus_engine_desc, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusEngineDesc,
+                            ibus_engine_desc,
+                            IBUS_TYPE_SERIALIZABLE)
 
 
 static void
@@ -113,8 +115,6 @@ ibus_engine_desc_class_init (IBusEngineDescClass *class)
     serializable_class->deserialize = (IBusSerializableDeserializeFunc) ibus_engine_desc_deserialize;
     serializable_class->copy        = (IBusSerializableCopyFunc) ibus_engine_desc_copy;
 
-    g_type_class_add_private (class, sizeof (IBusEngineDescPrivate));
-
     /* install properties */
     /**
      * IBusEngineDesc:name:
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index b623e149e..43bd5283e 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -45,7 +45,7 @@
 
 #define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
+   ((IBusEngineSimplePrivate *)ibus_engine_simple_get_instance_private (o))
 
 #define SET_COMPOSE_BUFFER_ELEMENT_NEXT(buffer, index, value) {         \
     if ((index) >= COMPOSE_BUFFER_SIZE &&                               \
@@ -150,7 +150,9 @@ static void     ibus_engine_simple_commit_str  (IBusEngineSimple    *simple,
 static void     ibus_engine_simple_update_preedit_text
                                                (IBusEngineSimple    *simple);
 
-G_DEFINE_TYPE (IBusEngineSimple, ibus_engine_simple, IBUS_TYPE_ENGINE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusEngineSimple,
+                            ibus_engine_simple,
+                            IBUS_TYPE_ENGINE)
 
 static void
 ibus_engine_simple_class_init (IBusEngineSimpleClass *class)
@@ -170,8 +172,6 @@ ibus_engine_simple_class_init (IBusEngineSimpleClass *class)
     engine_class->page_up   = ibus_engine_simple_page_up;
     engine_class->candidate_clicked
                             = ibus_engine_simple_candidate_clicked;
-
-    g_type_class_add_private (class, sizeof (IBusEngineSimplePrivate));
 }
 
 static void
diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index e915c9311..cb9b53ccd 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -26,7 +26,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_FACTORY_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_FACTORY, IBusFactoryPrivate))
+   ((IBusFactoryPrivate *)ibus_factory_get_instance_private (o))
 
 enum {
     CREATE_ENGINE,
@@ -87,7 +87,7 @@ static void      ibus_factory_engine_destroy_cb
                                              (IBusEngine         *engine,
                                               IBusFactory        *factory);
 
-G_DEFINE_TYPE (IBusFactory, ibus_factory, IBUS_TYPE_SERVICE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusFactory, ibus_factory, IBUS_TYPE_SERVICE)
 
 static const gchar introspection_xml[] =
     "<node>"
@@ -158,8 +158,6 @@ ibus_factory_class_init (IBusFactoryClass *class)
 
     ibus_service_class_add_interfaces (IBUS_SERVICE_CLASS (class), introspection_xml);
 
-    g_type_class_add_private (class, sizeof (IBusFactoryPrivate));
-
     /**
      * IBusFactory::create-engine:
      * @factory: the factory which received the signal
diff --git a/src/ibushotkey.c b/src/ibushotkey.c
index 249ed5d21..d4ab7c23c 100644
--- a/src/ibushotkey.c
+++ b/src/ibushotkey.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -27,7 +27,7 @@
 #include "ibusshare.h"
 
 #define IBUS_HOTKEY_PROFILE_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_HOTKEY_PROFILE, IBusHotkeyProfilePrivate))
+   ((IBusHotkeyProfilePrivate *)ibus_hotkey_profile_get_instance_private (o))
 
 enum {
     TRIGGER,
@@ -79,7 +79,10 @@ static guint         normalize_modifiers            (guint                   key
                                                      guint                   modifiers);
 static gboolean      is_modifier                    (guint                   keyval);
 
-static IBusSerializableClass *parent_class = NULL;
+G_DEFINE_TYPE_WITH_PRIVATE (IBusHotkeyProfile,
+                            ibus_hotkey_profile,
+                            IBUS_TYPE_SERIALIZABLE)
+
 
 static guint profile_signals[LAST_SIGNAL] = { 0 };
 
@@ -141,43 +144,12 @@ ibus_hotkey_cmp_with_data (IBusHotkey *hotkey1,
 
 
 
-GType
-ibus_hotkey_profile_get_type (void)
-{
-    static GType type = 0;
-
-    static const GTypeInfo type_info = {
-        sizeof (IBusHotkeyProfileClass),
-        (GBaseInitFunc)     NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc)    ibus_hotkey_profile_class_init,
-        NULL,               /* class finalize */
-        NULL,               /* class data */
-        sizeof (IBusHotkeyProfile),
-        0,
-        (GInstanceInitFunc) ibus_hotkey_profile_init,
-    };
-
-    if (type == 0) {
-        type = g_type_register_static (IBUS_TYPE_SERIALIZABLE,
-                                       "IBusHotkeyProfile",
-                                       &type_info,
-                                       0);
-    }
-
-    return type;
-}
-
 static void
 ibus_hotkey_profile_class_init (IBusHotkeyProfileClass *class)
 {
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
-    parent_class = (IBusSerializableClass *) g_type_class_peek_parent (class);
-
-    g_type_class_add_private (class, sizeof (IBusHotkeyProfilePrivate));
-
     object_class->destroy = (IBusObjectDestroyFunc) ibus_hotkey_profile_destroy;
 
     serializable_class->serialize   = (IBusSerializableSerializeFunc) ibus_hotkey_profile_serialize;
@@ -255,7 +227,8 @@ ibus_hotkey_profile_destroy (IBusHotkeyProfile *profile)
         priv->hotkeys = NULL;
     }
 
-    IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)profile);
+    IBUS_OBJECT_CLASS (ibus_hotkey_profile_parent_class)->
+            destroy ((IBusObject *)profile);
 }
 
 static gboolean
@@ -264,7 +237,8 @@ ibus_hotkey_profile_serialize (IBusHotkeyProfile *profile,
 {
     gboolean retval;
 
-    retval = parent_class->serialize ((IBusSerializable *) profile, builder);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_hotkey_profile_parent_class)->
+            serialize ((IBusSerializable *) profile, builder);
     g_return_val_if_fail (retval, FALSE);
 
     return TRUE;
@@ -276,7 +250,8 @@ ibus_hotkey_profile_deserialize (IBusHotkeyProfile *profile,
 {
     gint retval;
 
-    retval = parent_class->deserialize ((IBusSerializable *) profile, variant);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_hotkey_profile_parent_class)->
+            deserialize ((IBusSerializable *) profile, variant);
     g_return_val_if_fail (retval, 0);
 
     return retval;
@@ -288,8 +263,8 @@ ibus_hotkey_profile_copy (IBusHotkeyProfile       *dest,
 {
     gboolean retval;
 
-    retval = parent_class->copy ((IBusSerializable *)dest,
-                                 (IBusSerializable *)src);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_hotkey_profile_parent_class)->
+            copy ((IBusSerializable *)dest, (IBusSerializable *)src);
     g_return_val_if_fail (retval, FALSE);
 
     g_return_val_if_fail (IBUS_IS_HOTKEY_PROFILE (dest), FALSE);
diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index a809ef08f..2b1438fc6 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -31,7 +31,7 @@
 #include "ibuserror.h"
 
 #define IBUS_INPUT_CONTEXT_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_INPUT_CONTEXT, IBusInputContextPrivate))
+   ((IBusInputContextPrivate *)ibus_input_context_get_instance_private (o))
 
 enum {
     ENABLED,
@@ -83,7 +83,9 @@ static void     ibus_input_context_g_signal     (GDBusProxy             *proxy,
                                                  const gchar            *signal_name,
                                                  GVariant               *parameters);
 
-G_DEFINE_TYPE (IBusInputContext, ibus_input_context, IBUS_TYPE_PROXY)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusInputContext,
+                            ibus_input_context,
+                            IBUS_TYPE_PROXY)
 
 static void
 ibus_input_context_class_init (IBusInputContextClass *class)
@@ -91,8 +93,6 @@ ibus_input_context_class_init (IBusInputContextClass *class)
     IBusProxyClass *ibus_proxy_class = IBUS_PROXY_CLASS (class);
     GDBusProxyClass *g_dbus_proxy_class = G_DBUS_PROXY_CLASS (class);
 
-    g_type_class_add_private (class, sizeof (IBusInputContextPrivate));
-
     ibus_proxy_class->destroy = ibus_input_context_real_destroy;
 
     g_dbus_proxy_class->g_signal = ibus_input_context_g_signal;
diff --git a/src/ibusobject.c b/src/ibusobject.c
index 258048c00..15d9aa3ab 100644
--- a/src/ibusobject.c
+++ b/src/ibusobject.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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,7 +25,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_OBJECT_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_OBJECT, IBusObjectPrivate))
+   ((IBusObjectPrivate *)ibus_object_get_instance_private (o))
 
 enum {
     DESTROY,
@@ -53,7 +53,7 @@ static void      ibus_object_dispose        (IBusObject         *obj);
 static void      ibus_object_finalize       (IBusObject         *obj);
 static void      ibus_object_real_destroy   (IBusObject         *obj);
 
-G_DEFINE_TYPE (IBusObject, ibus_object, G_TYPE_INITIALLY_UNOWNED)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusObject, ibus_object, G_TYPE_INITIALLY_UNOWNED)
 
 static void
 ibus_object_class_init     (IBusObjectClass *class)
@@ -86,8 +86,6 @@ ibus_object_class_init     (IBusObjectClass *class)
             _ibus_marshal_VOID__VOID,
             G_TYPE_NONE, 0);
 
-    g_type_class_add_private (class, sizeof (IBusObjectPrivate));
-
 #ifdef DEBUG_MEMORY
     _count_table = g_hash_table_new (g_direct_hash, g_direct_equal);
 #endif
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index cbb846dfc..5b79f1fe2 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input IBus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -37,7 +37,7 @@ struct _IBusObservedPathPrivate {
 typedef struct _IBusObservedPathPrivate IBusObservedPathPrivate;
 
 #define IBUS_OBSERVED_PATH_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_OBSERVED_PATH, IBusObservedPathPrivate))
+   ((IBusObservedPathPrivate *)ibus_observed_path_get_instance_private (o))
 
 // static guint            _signals[LAST_SIGNAL] = { 0 };
 
@@ -60,8 +60,6 @@ ibus_observed_path_class_init (IBusObservedPathClass *class)
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
-    // g_type_class_add_private (class, sizeof (IBusObservedPathPrivate));
-
     object_class->destroy = (IBusObjectDestroyFunc) ibus_observed_path_destroy;
 
     serializable_class->serialize   = (IBusSerializableSerializeFunc) ibus_observed_path_serialize;
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index c6a37534f..e87d26b64 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2019 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
@@ -59,7 +59,7 @@ struct _IBusPropertyPrivate {
 };
 
 #define IBUS_PROPERTY_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_PROPERTY, IBusPropertyPrivate))
+   ((IBusPropertyPrivate *)ibus_property_get_instance_private (o))
 
 /* functions prototype */
 static void         ibus_property_set_property  (IBusProperty       *prop,
@@ -78,7 +78,7 @@ static gint         ibus_property_deserialize   (IBusProperty       *prop,
 static gboolean     ibus_property_copy          (IBusProperty       *dest,
                                                  const IBusProperty *src);
 
-G_DEFINE_TYPE (IBusProperty, ibus_property, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusProperty, ibus_property, IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_property_class_init (IBusPropertyClass *class)
@@ -87,8 +87,6 @@ ibus_property_class_init (IBusPropertyClass *class)
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (class);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (class);
 
-    g_type_class_add_private (class, sizeof (IBusPropertyPrivate));
-
     gobject_class->set_property = (GObjectSetPropertyFunc) ibus_property_set_property;
     gobject_class->get_property = (GObjectGetPropertyFunc) ibus_property_get_property;
 
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index b0483998c..43990d5f5 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2015 Red Hat, Inc.
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2019 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
@@ -55,7 +55,7 @@ struct _IBusRegistryPrivate {
 };
 
 #define IBUS_REGISTRY_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_REGISTRY, IBusRegistryPrivate))
+   ((IBusRegistryPrivate *)ibus_registry_get_instance_private (o))
 
 /* functions prototype */
 static void     ibus_registry_destroy        (IBusRegistry           *registry);
@@ -67,7 +67,7 @@ static gint     ibus_registry_deserialize    (IBusRegistry           *registry,
 static gboolean ibus_registry_copy           (IBusRegistry           *dest,
                                               const IBusRegistry     *src);
 
-G_DEFINE_TYPE (IBusRegistry, ibus_registry, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusRegistry, ibus_registry, IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_registry_class_init (IBusRegistryClass *class)
@@ -84,8 +84,6 @@ ibus_registry_class_init (IBusRegistryClass *class)
         (IBusSerializableDeserializeFunc) ibus_registry_deserialize;
     serializable_class->copy = (IBusSerializableCopyFunc) ibus_registry_copy;
 
-    g_type_class_add_private (class, sizeof (IBusRegistryPrivate));
-
     /* install signals */
     /**
      * IBusRegistry::changed:
diff --git a/src/ibusserializable.c b/src/ibusserializable.c
index a8d4dd65c..231020b72 100644
--- a/src/ibusserializable.c
+++ b/src/ibusserializable.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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,7 +24,7 @@
 #include "ibusserializable.h"
 
 #define IBUS_SERIALIZABLE_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_SERIALIZABLE, IBusSerializablePrivate))
+   ((IBusSerializablePrivate *)ibus_serializable_get_instance_private (o))
 
 enum {
     LAST_SIGNAL,
@@ -50,7 +50,15 @@ static gboolean  ibus_serializable_real_copy        (IBusSerializable       *des
                                                      const IBusSerializable *src);
 
 static IBusObjectClass *parent_class = NULL;
+static gint ibus_serializable_private_offset;
 
+G_GNUC_UNUSED
+static inline gpointer
+ibus_serializable_get_instance_private (IBusSerializable *self)
+{
+    return (G_STRUCT_MEMBER_P (self, ibus_serializable_private_offset));
+}
+ 
 GType
 ibus_serializable_get_type (void)
 {
@@ -73,6 +81,9 @@ ibus_serializable_get_type (void)
                                        "IBusSerializable",
                                        &type_info,
                                        0);
+        ibus_serializable_private_offset =
+                g_type_add_instance_private (type,
+                                             sizeof (IBusSerializablePrivate));
     }
 
     return type;
@@ -101,7 +112,10 @@ ibus_serializable_class_init     (IBusSerializableClass *class)
 
     parent_class = (IBusObjectClass *) g_type_class_peek_parent (class);
 
-    g_type_class_add_private (class, sizeof (IBusSerializablePrivate));
+    if (ibus_serializable_private_offset) {
+        g_type_class_adjust_private_offset (class,
+                                            &ibus_serializable_private_offset);
+    }
 
     object_class->destroy = (IBusObjectDestroyFunc) ibus_serializable_destroy;
 
@@ -184,7 +198,7 @@ ibus_serializable_real_copy (IBusSerializable *dest,
 {
     IBusSerializablePrivate *src_priv;
     IBusSerializablePrivate *dest_priv;
-    src_priv = IBUS_SERIALIZABLE_GET_PRIVATE (src);
+    src_priv = IBUS_SERIALIZABLE_GET_PRIVATE (IBUS_SERIALIZABLE (src));
     dest_priv = IBUS_SERIALIZABLE_GET_PRIVATE (dest);
 
     g_datalist_foreach (&src_priv->attachments,
diff --git a/src/ibusservice.c b/src/ibusservice.c
index eb370e8ba..60255bd50 100644
--- a/src/ibusservice.c
+++ b/src/ibusservice.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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,7 +24,7 @@
 #include "ibusinternal.h"
 
 #define IBUS_SERVICE_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_SERVICE, IBusServicePrivate))
+   ((IBusServicePrivate *)ibus_service_get_instance_private (o))
 
 enum {
     LAST_SIGNAL
@@ -133,6 +133,13 @@ static const GDBusInterfaceVTable ibus_service_interface_vtable = {
 };
 
 static IBusObjectClass *ibus_service_parent_class = NULL;
+static gint ibus_service_private_offset;
+
+static inline gpointer
+ibus_service_get_instance_private (IBusService *self)
+{
+    return (G_STRUCT_MEMBER_P (self, ibus_service_private_offset));
+}
 
 GType
 ibus_service_get_type (void)
@@ -156,6 +163,9 @@ ibus_service_get_type (void)
                                        "IBusService",
                                        &type_info,
                                        0);
+        ibus_service_private_offset =
+                g_type_add_instance_private (type,
+                                             sizeof (IBusServicePrivate));
     }
 
     return type;
@@ -198,12 +208,20 @@ ibus_service_class_init (IBusServiceClass *class)
     GObjectClass *gobject_class = G_OBJECT_CLASS (class);
     IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (class);
 
-    ibus_service_parent_class = IBUS_OBJECT_CLASS (g_type_class_peek_parent (class));
+    ibus_service_parent_class =
+            IBUS_OBJECT_CLASS (g_type_class_peek_parent (class));
+    if (ibus_service_private_offset) {
+        g_type_class_adjust_private_offset (class,
+                                            &ibus_service_private_offset);
+    }
 
     gobject_class->constructed  = ibus_service_constructed;
-    gobject_class->set_property = (GObjectSetPropertyFunc) ibus_service_set_property;
-    gobject_class->get_property = (GObjectGetPropertyFunc) ibus_service_get_property;
-    ibus_object_class->destroy  = (IBusObjectDestroyFunc) ibus_service_destroy;
+    gobject_class->set_property =
+            (GObjectSetPropertyFunc) ibus_service_set_property;
+    gobject_class->get_property =
+            (GObjectGetPropertyFunc) ibus_service_get_property;
+    ibus_object_class->destroy  =
+            (IBusObjectDestroyFunc) ibus_service_destroy;
 
     /* virtual functions */
     class->service_method_call = ibus_service_service_method_call;
@@ -252,8 +270,6 @@ ibus_service_class_init (IBusServiceClass *class)
                         G_PARAM_STATIC_NICK |
                         G_PARAM_STATIC_BLURB)
                     );
-
-    g_type_class_add_private (class, sizeof (IBusServicePrivate));
 }
 
 static void
diff --git a/src/ibusunicode.c b/src/ibusunicode.c
index aac9c135c..9e6f6b2b5 100644
--- a/src/ibusunicode.c
+++ b/src/ibusunicode.c
@@ -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) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2019 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
@@ -64,13 +64,9 @@ typedef struct {
 } IBusUnicodeDataLoadData;
 
 #define IBUS_UNICODE_DATA_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-    IBUS_TYPE_UNICODE_DATA, \
-    IBusUnicodeDataPrivate))
+   ((IBusUnicodeDataPrivate *)ibus_unicode_data_get_instance_private (o))
 #define IBUS_UNICODE_BLOCK_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-    IBUS_TYPE_UNICODE_BLOCK, \
-    IBusUnicodeBlockPrivate))
+   ((IBusUnicodeBlockPrivate *)ibus_unicode_block_get_instance_private (o))
 
 /* functions prototype */
 static void      ibus_unicode_data_set_property (IBusUnicodeData      *unicode,
@@ -106,8 +102,12 @@ static gint      ibus_unicode_block_deserialize (IBusUnicodeBlock     *block,
 static gboolean  ibus_unicode_block_copy        (IBusUnicodeBlock     *dest,
                                                 const IBusUnicodeBlock *src);
 
-G_DEFINE_TYPE (IBusUnicodeData, ibus_unicode_data, IBUS_TYPE_SERIALIZABLE)
-G_DEFINE_TYPE (IBusUnicodeBlock, ibus_unicode_block, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusUnicodeData,
+                            ibus_unicode_data,
+                            IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusUnicodeBlock,
+                            ibus_unicode_block,
+                            IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_unicode_data_class_init (IBusUnicodeDataClass *class)
@@ -128,8 +128,6 @@ ibus_unicode_data_class_init (IBusUnicodeDataClass *class)
     serializable_class->copy        =
             (IBusSerializableCopyFunc) ibus_unicode_data_copy;
 
-    g_type_class_add_private (class, sizeof (IBusUnicodeDataPrivate));
-
     /* install properties */
     /**
      * IBusUnicodeData:code:
@@ -690,8 +688,6 @@ ibus_unicode_block_class_init (IBusUnicodeBlockClass *class)
     serializable_class->copy        =
             (IBusSerializableCopyFunc) ibus_unicode_block_copy;
 
-    g_type_class_add_private (class, sizeof (IBusUnicodeBlockPrivate));
-
     /* install properties */
     /**
      * IBusUnicodeBlock:start:
diff --git a/src/ibusxevent.c b/src/ibusxevent.c
index 287bb99bc..a2ea7b57d 100644
--- a/src/ibusxevent.c
+++ b/src/ibusxevent.c
@@ -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) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2019 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,13 +24,11 @@
 
 #define IBUS_EXTENSION_EVENT_VERSION 1
 #define IBUS_EXTENSION_EVENT_GET_PRIVATE(o)                             \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o),                                   \
-                                 IBUS_TYPE_EXTENSION_EVENT,             \
-                                 IBusExtensionEventPrivate))
+   ((IBusExtensionEventPrivate *)ibus_extension_event_get_instance_private (o))
 
 #define IBUS_X_EVENT_VERSION 1
 #define IBUS_X_EVENT_GET_PRIVATE(o)                                     \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_X_EVENT, IBusXEventPrivate))
+   ((IBusXEventPrivate *)ibus_x_event_get_instance_private (o))
 
 enum {
     PROP_0,
@@ -128,8 +126,12 @@ static gint      ibus_x_event_deserialize          (IBusXEvent         *event,
 static gboolean  ibus_x_event_copy                 (IBusXEvent         *dest,
                                                     const IBusXEvent   *src);
 
-G_DEFINE_TYPE (IBusExtensionEvent, ibus_extension_event, IBUS_TYPE_SERIALIZABLE)
-G_DEFINE_TYPE (IBusXEvent, ibus_x_event, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusExtensionEvent,
+                            ibus_extension_event,
+                            IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusXEvent,
+                            ibus_x_event,
+                            IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_extension_event_class_init (IBusExtensionEventClass *class)
@@ -228,8 +230,6 @@ ibus_extension_event_class_init (IBusExtensionEventClass *class)
                         "",
                         G_PARAM_READWRITE |
                         G_PARAM_CONSTRUCT_ONLY));
-
-    g_type_class_add_private (class, sizeof (IBusExtensionEventPrivate));
 }
 
 static void
@@ -779,8 +779,6 @@ ibus_x_event_class_init (IBusXEventClass *class)
                         "",
                         G_PARAM_READWRITE |
                         G_PARAM_CONSTRUCT_ONLY));
-
-    g_type_class_add_private (class, sizeof (IBusXEventPrivate));
 }
 
 static void

From 3d442dbf936d197aa11ca0a71663c2bc61696151 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Sep 2019 15:59:03 +0900
Subject: [PATCH 588/816] bus: Implement GDBusAuthObserver callback

ibus uses a GDBusServer with G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
and doesn't set a GDBusAuthObserver, which allows anyone who can connect
to its AF_UNIX socket to authenticate and be authorized to send method calls.
It also seems to use an abstract AF_UNIX socket, which does not have
filesystem permissions, so the practical effect might be that a local
attacker can connect to another user's ibus service and make arbitrary
method calls.

BUGS=rhbz#1717958
---
 bus/server.c | 89 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index 3a626230a..2439de140 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -69,17 +70,64 @@ _restart_server (void)
     exit (-1);
 }
 
+/**
+ * bus_allow_mechanism_cb:
+ * @observer: A #GDBusAuthObserver.
+ * @mechanism: The name of the mechanism.
+ * @user_data: always %NULL.
+ *
+ * Check if @mechanism can be used to authenticate the other peer.
+ * Returns: %TRUE if the peer's mechanism is allowed.
+ */
+static gboolean
+bus_allow_mechanism_cb (GDBusAuthObserver     *observer,
+                        const gchar           *mechanism,
+                        G_GNUC_UNUSED gpointer user_data)
+{
+    if (g_strcmp0 (mechanism, "EXTERNAL") == 0)
+        return TRUE;
+    return FALSE;
+}
+
+/**
+ * bus_authorize_authenticated_peer_cb:
+ * @observer: A #GDBusAuthObserver.
+ * @stream: A #GIOStream.
+ * @credentials: A #GCredentials.
+ * @user_data: always %NULL.
+ *
+ * Check if a peer who has already authenticated should be authorized.
+ * Returns: %TRUE if the peer's credential is authorized.
+ */
+static gboolean
+bus_authorize_authenticated_peer_cb (GDBusAuthObserver     *observer,
+                                     GIOStream             *stream,
+                                     GCredentials          *credentials,
+                                     G_GNUC_UNUSED gpointer user_data)
+{
+    gboolean authorized = FALSE;
+    if (credentials) {
+        GCredentials *own_credentials = g_credentials_new ();
+        if (g_credentials_is_same_user (credentials, own_credentials, NULL))
+            authorized = TRUE;
+        g_object_unref (own_credentials);
+    }
+    return authorized;
+}
+
 /**
  * bus_new_connection_cb:
- * @user_data: always NULL.
- * @returns: TRUE when the function can handle the connection.
+ * @observer: A #GDBusAuthObserver.
+ * @dbus_connection: A #GDBusconnection.
+ * @user_data: always %NULL.
  *
  * Handle incoming connections.
+ * Returns: %TRUE when the function can handle the connection.
  */
 static gboolean
-bus_new_connection_cb (GDBusServer     *server,
-                       GDBusConnection *dbus_connection,
-                       gpointer         user_data)
+bus_new_connection_cb (GDBusServer           *server,
+                       GDBusConnection       *dbus_connection,
+                       G_GNUC_UNUSED gpointer user_data)
 {
     BusConnection *connection = bus_connection_new (dbus_connection);
     bus_dbus_impl_new_connection (dbus, connection);
@@ -94,9 +142,9 @@ bus_new_connection_cb (GDBusServer     *server,
 }
 
 static void
-_server_connect_start_portal_cb (GObject      *source_object,
-                                 GAsyncResult *res,
-                                 gpointer      user_data)
+_server_connect_start_portal_cb (GObject               *source_object,
+                                 GAsyncResult          *res,
+                                 G_GNUC_UNUSED gpointer user_data)
 {
     GVariant *result;
     GError *error = NULL;
@@ -113,9 +161,9 @@ _server_connect_start_portal_cb (GObject      *source_object,
 }
 
 static void
-bus_acquired_handler (GDBusConnection *connection,
-                      const gchar     *name,
-                      gpointer         user_data)
+bus_acquired_handler (GDBusConnection       *connection,
+                      const gchar           *name,
+                      G_GNUC_UNUSED gpointer user_data)
 {
     g_dbus_connection_call (connection,
                             IBUS_SERVICE_PORTAL,
@@ -136,14 +184,17 @@ void
 bus_server_init (void)
 {
     GError *error = NULL;
+    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
+    gchar *guid;
+    GDBusAuthObserver *observer;
 
     dbus = bus_dbus_impl_get_default ();
     ibus = bus_ibus_impl_get_default ();
     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
 
     /* init server */
-    GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
-    gchar *guid = g_dbus_generate_guid ();
+    guid = g_dbus_generate_guid ();
+    observer = g_dbus_auth_observer_new ();
     if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
         !g_str_has_prefix (g_address, "unix:path=")) {
         g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
@@ -152,7 +203,7 @@ bus_server_init (void)
     server =  g_dbus_server_new_sync (
                     g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
                     flags, guid,
-                    NULL /* observer */,
+                    observer,
                     NULL /* cancellable */,
                     &error);
     if (server == NULL) {
@@ -162,7 +213,13 @@ bus_server_init (void)
     }
     g_free (guid);
 
-    g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL);
+    g_signal_connect (observer, "allow-mechanism",
+                      G_CALLBACK (bus_allow_mechanism_cb), NULL);
+    g_signal_connect (observer, "authorize-authenticated-peer",
+                      G_CALLBACK (bus_authorize_authenticated_peer_cb), NULL);
+    g_object_unref (observer);
+    g_signal_connect (server, "new-connection",
+                      G_CALLBACK (bus_new_connection_cb), NULL);
 
     g_dbus_server_start (server);
 

From a141a14102da038e3f35557ec42e14e322cfdff1 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 13 Sep 2019 20:19:36 +0900
Subject: [PATCH 589/816] bus: Use XDG_RUNTIME_DIR for Unix socket directory

g_dbus_server_new_sync() is failed with address "unix:tmpdir=/tmp/ibus"
in BSD systems because BSD systems do not support abstract socket files
and use the real files but no directory "/tmp/ibus". Now the default
directory will be an unique "unix:tmpdir=$XDG_RUNTIME_DIR/ibus" by user
in Linux and "unix:tmpdir=/tmp" in BSD and mkdir() runs with the directory
mode 0700 not to modify by malicious users.

BUG=https://github.com/ibus/ibus/issues/2116
---
 bus/global.c |  6 ++--
 bus/server.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++-----
 configure.ac | 25 +++++++++++++
 3 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/bus/global.c b/bus/global.c
index 2ba8b2a71..8758d923a 100644
--- a/bus/global.c
+++ b/bus/global.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2019 Red Hat, Inc.
  * Copyright (c) 2012 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -21,10 +21,12 @@
  * USA
  */
 
+#include <config.h>
+
 #include "global.h"
 
 gchar **g_argv = NULL;
-gchar *g_address = "unix:tmpdir=/tmp/ibus";
+gchar *g_address = IBUS_SOCKET_DIR;
 gchar *g_cache = "auto";
 gboolean g_mempro = FALSE;
 gboolean g_verbose = FALSE;
diff --git a/bus/server.c b/bus/server.c
index 2439de140..d9c30e441 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -22,6 +22,8 @@
  */
 #include "server.h"
 
+#include <errno.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -180,28 +182,102 @@ bus_acquired_handler (GDBusConnection       *connection,
                             NULL);
 }
 
+static gchar *
+_bus_extract_address (void)
+{
+    gchar *socket_address = g_strdup (g_address);
+    gchar *p;
+
+#define IF_REPLACE_VARIABLE_WITH_FUNC(variable, func, format)           \
+    if ((p = g_strstr_len (socket_address, -1, (variable)))) {          \
+        gchar *sub1 = g_strndup (socket_address, p - socket_address);   \
+        gchar *sub2 = g_strdup (p + strlen (variable));                 \
+        gchar *tmp = g_strdup_printf ("%s" format "%s",                 \
+                                      sub1, (func) (), sub2);           \
+        g_free (sub1);                                                  \
+        g_free (sub2);                                                  \
+        g_free (socket_address);                                        \
+        socket_address = tmp;                                           \
+    }
+
+    IF_REPLACE_VARIABLE_WITH_FUNC ("$XDG_RUNTIME_DIR",
+                                   g_get_user_runtime_dir,
+                                   "%s")
+    else
+    IF_REPLACE_VARIABLE_WITH_FUNC ("$XDG_CACHE_HOME",
+                                   g_get_user_cache_dir,
+                                   "%s")
+    else
+    IF_REPLACE_VARIABLE_WITH_FUNC ("$UID", getuid, "%d")
+
+#undef IF_REPLACE_VARIABLE_WITH_FUNC
+
+    return socket_address;
+}
+
 void
 bus_server_init (void)
 {
-    GError *error = NULL;
+#define IBUS_UNIX_TMPDIR        "unix:tmpdir="
+#define IBUS_UNIX_PATH          "unix:path="
+#define IBUS_UNIX_ABSTRACT      "unix:abstract="
+#define IBUS_UNIX_DIR           "unix:dir="
+
+    gchar *socket_address;
     GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
     gchar *guid;
     GDBusAuthObserver *observer;
+    GError *error = NULL;
+    gchar *unix_dir = NULL;
 
     dbus = bus_dbus_impl_get_default ();
     ibus = bus_ibus_impl_get_default ();
     bus_dbus_impl_register_object (dbus, (IBusService *)ibus);
 
     /* init server */
+    socket_address = _bus_extract_address ();
+
+#define IF_GET_UNIX_DIR(prefix)                                         \
+    if (g_str_has_prefix (socket_address, (prefix))) {                  \
+        unix_dir = g_strdup (socket_address + strlen (prefix));         \
+    }
+
+    IF_GET_UNIX_DIR (IBUS_UNIX_TMPDIR)
+    else
+    IF_GET_UNIX_DIR (IBUS_UNIX_PATH)
+    else
+    IF_GET_UNIX_DIR (IBUS_UNIX_ABSTRACT)
+    else
+    IF_GET_UNIX_DIR (IBUS_UNIX_DIR)
+    else {
+        g_error ("Your socket address \"%s\" does not correspond with "
+                 "one of the following formats; "
+                 IBUS_UNIX_TMPDIR "DIR, " IBUS_UNIX_PATH "FILE, "
+                 IBUS_UNIX_ABSTRACT "FILE, " IBUS_UNIX_DIR "DIR.",
+                 socket_address);
+    }
+    if (!g_file_test (unix_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+        /* Require mkdir for BSD system. */
+        if (g_mkdir_with_parents (unix_dir, 0) != 0) {
+            g_error ("mkdir is failed in: %s: %s",
+                     unix_dir, g_strerror (errno));
+        }
+        /* The mode 0700 can eliminate malicious users change the mode.
+         * `chmod` runs for the last directory only not to change the modes
+         * of the parent directories. E.g. "/tmp/ibus".
+         */
+        if (g_chmod (unix_dir, 0700) != 0) {
+            g_error ("chmod(700) is failed in: %s: %s",
+                     unix_dir, g_strerror (errno));
+        }
+    }
+    g_free (unix_dir);
     guid = g_dbus_generate_guid ();
     observer = g_dbus_auth_observer_new ();
-    if (!g_str_has_prefix (g_address, "unix:tmpdir=") &&
-        !g_str_has_prefix (g_address, "unix:path=")) {
-        g_error ("Your socket address does not have the format unix:tmpdir=$DIR "
-                 "or unix:path=$FILE; %s", g_address);
-    }
     server =  g_dbus_server_new_sync (
-                    g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */
+                    /* the place where the socket file lives, e.g. /tmp,
+                     * abstract namespace, etc. */
+                    socket_address,
                     flags, guid,
                     observer,
                     NULL /* cancellable */,
@@ -209,8 +285,9 @@ bus_server_init (void)
     if (server == NULL) {
         g_error ("g_dbus_server_new_sync() is failed with address %s "
                  "and guid %s: %s",
-                 g_address, guid, error->message);
+                 socket_address, guid, error->message);
     }
+    g_free (socket_address);
     g_free (guid);
 
     g_signal_connect (observer, "allow-mechanism",
@@ -235,6 +312,12 @@ bus_server_init (void)
                     G_BUS_NAME_OWNER_FLAGS_NONE,
                     bus_acquired_handler,
                     NULL, NULL, NULL, NULL);
+
+#undef IF_GET_UNIX_DIR
+#undef IBUS_UNIX_TMPDIR
+#undef IBUS_UNIX_PATH
+#undef IBUS_UNIX_ABSTRACT
+#undef IBUS_UNIX_DIR
 }
 
 const gchar *
diff --git a/configure.ac b/configure.ac
index c47e23dc4..0c1ee40e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -702,6 +702,30 @@ the UCD files from https://www.unicode.org/Public/UNIDATA/)
     enable_unicode_dict="yes (enabled, use --disable-unicode-dict to disable)"
 fi
 
+AC_ARG_WITH(socket-dir,
+    AS_HELP_STRING([--with-socket-dir[=DIR]],
+        [Set the default socket directory to connect ibus-daemon with D-Bus
+         connections (default: "$XDG_RUNTIME_DIR/ibus").
+         The best practice of the socket directory would be unique per user
+         not to modify by malicious users but XDG_RUNTIME_DIR is not integrated
+         in BSD systems and the BSD's default is "/tmp".
+         "$XDG_RUMTIME_DIR", "$XDG_CACHE_HOME", "$UID" are extracted by
+         ibus-daemon.
+         ibus-daemon also runs mkdir for the socket directory since BSD
+         systems do not support abstract socket paths.
+         The socket path on a NFS mount would not be a good idea likes
+         "/home/$USER" because the directory is not sometimes accessible
+         with the network condition.]),
+    [IBUS_SOCKET_DIR=$with_socket_dir],
+    [case $host in
+         *linux*) IBUS_SOCKET_DIR='unix:tmpdir=$XDG_RUNTIME_DIR/ibus';;
+         *)       IBUS_SOCKET_DIR='unix:tmpdir=/tmp';;
+     esac]
+
+)
+AC_DEFINE_UNQUOTED(IBUS_SOCKET_DIR, "$IBUS_SOCKET_DIR",
+                   [The default socket directory to connect ibus-daemon.])
+
 # Check iso-codes.
 PKG_CHECK_MODULES(ISOCODES, [
     iso-codes
@@ -793,6 +817,7 @@ Build options:
   CLDR annotation directory     $EMOJI_ANNOTATION_DIR
   Enable Unicode dict           $enable_unicode_dict
   UCD directory                 $UCD_DIR
+  Socket directory              "$IBUS_SOCKET_DIR"
   Run test cases                $enable_tests
   Install tests                 $enable_install_tests
 ])

From 982c40fb819878a8131d2d4a4573d0073ef4d6cc Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Fri, 13 Sep 2019 20:27:43 +0900
Subject: [PATCH 590/816] src: Save address file in XDG_RUNTIME_DIR

Currently the address file is saved in XDG_CONFIG_DIR, however since it
is not a config or preferences file perhaps it should instead be saved
to XDG_RUNTIME_DIR.

BUG=https://github.com/ibus/ibus/pull/2128
---
 src/ibusshare.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index a731f6ba5..dcad7152e 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -142,7 +142,7 @@ ibus_get_socket_path (void)
                              ibus_get_local_machine_id (),
                              hostname,
                              displaynumber);
-        path = g_build_filename (g_get_user_config_dir (),
+        path = g_build_filename (g_get_user_runtime_dir (),
                                  "ibus",
                                  "bus",
                                  p,

From 773420fad23078ceef83e8ae84bba4e139d0bea3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 19 Sep 2019 17:09:46 +0900
Subject: [PATCH 591/816] src: Fix to allocate compose output buffer with more
 than two chars

If the compose output chars are more than two, IBusCompose calls
g_renew() but the size is not enough to insert '\0'.

BUG=https://github.com/ibus/ibus/issues/2123
---
 src/ibuscomposetable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 5fd37f10c..dd9d31d4e 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -148,7 +148,7 @@ parse_compose_value (IBusComposeData  *compose_data,
             } else {
                 compose_data->values = g_renew (gunichar,
                                                 compose_data->values,
-                                                n_uchars + 1);
+                                                n_uchars + 2);
             }
             compose_data->values[n_uchars++] = *up;
         }

From 5742e1b399e5d50f34f35b1cda74e548b95554da Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 2 Oct 2019 16:41:27 +0900
Subject: [PATCH 592/816] Revert XDG_RUNTIME_DIR to XDG_CONFIG_HOME

Some users failed to run ibus-daemon with XDG_RUNTIME_DIR because
the directory is not created by `su` command.
Now the IBus socket files will be generated in XDG_CACHE_HOME.

BUG=https://github.com/ibus/ibus/issues/2135
---
 configure.ac    | 6 ++++--
 src/ibusshare.c | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c1ee40e7..84589be07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,10 +705,12 @@ fi
 AC_ARG_WITH(socket-dir,
     AS_HELP_STRING([--with-socket-dir[=DIR]],
         [Set the default socket directory to connect ibus-daemon with D-Bus
-         connections (default: "$XDG_RUNTIME_DIR/ibus").
+         connections (default: "$XDG_CACHE_HOME/ibus").
          The best practice of the socket directory would be unique per user
          not to modify by malicious users but XDG_RUNTIME_DIR is not integrated
          in BSD systems and the BSD's default is "/tmp".
+         XDG_RUMTIME_DIR is not useful now because XDG_RUMTIME_DIR is available
+         by login but not `su` command but ibus-daemon can be run with su.
          "$XDG_RUMTIME_DIR", "$XDG_CACHE_HOME", "$UID" are extracted by
          ibus-daemon.
          ibus-daemon also runs mkdir for the socket directory since BSD
@@ -718,7 +720,7 @@ AC_ARG_WITH(socket-dir,
          with the network condition.]),
     [IBUS_SOCKET_DIR=$with_socket_dir],
     [case $host in
-         *linux*) IBUS_SOCKET_DIR='unix:tmpdir=$XDG_RUNTIME_DIR/ibus';;
+         *linux*) IBUS_SOCKET_DIR='unix:tmpdir=$XDG_CACHE_HOME/ibus';;
          *)       IBUS_SOCKET_DIR='unix:tmpdir=/tmp';;
      esac]
 
diff --git a/src/ibusshare.c b/src/ibusshare.c
index dcad7152e..45e90ac3e 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -142,7 +142,10 @@ ibus_get_socket_path (void)
                              ibus_get_local_machine_id (),
                              hostname,
                              displaynumber);
-        path = g_build_filename (g_get_user_runtime_dir (),
+        /* XDG_RUNTIME_DIR is not useful because it's generated by
+         * login but not `su` command and ibus-daemon can be run with su.
+         */
+        path = g_build_filename (g_get_user_cache_dir (),
                                  "ibus",
                                  "bus",
                                  p,

From 745ffb807072b69f7566091855af9a20aabc854d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 24 Oct 2019 18:11:38 +0900
Subject: [PATCH 593/816] src: Replace g_abort with abort in unicode-parser.c

BUG=https://github.com/ibus/ibus/issues/2142
---
 src/unicode-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unicode-parser.c b/src/unicode-parser.c
index 0e4fe8b7c..b4303ea82 100644
--- a/src/unicode-parser.c
+++ b/src/unicode-parser.c
@@ -315,7 +315,7 @@ ucd_parse_file (const gchar *filename,
             }
             break;
         default:
-            g_abort ();
+            abort ();
         }
         while (*end == '\n' && end - content < length) {
             end++;

From d53401efd3ffb4a424a0b332ec65f1d461abbc33 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 24 Oct 2019 18:24:12 +0900
Subject: [PATCH 594/816] Revert the commit
 982c40fb819878a8131d2d4a4573d0073ef4d6cc

Some IBus clients could access the ibus address file without using
ibus_get_socket_path().

BUG=https://github.com/ibus/ibus/pull/2128
---
 src/ibusshare.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index 45e90ac3e..0d50d3f5c 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -142,10 +142,13 @@ ibus_get_socket_path (void)
                              ibus_get_local_machine_id (),
                              hostname,
                              displaynumber);
-        /* XDG_RUNTIME_DIR is not useful because it's generated by
-         * login but not `su` command and ibus-daemon can be run with su.
+        /* Qt5 IBus module has a hard-coded path and we cannot change this
+         * for the back compatibility.
+         * XDG_RUNTIME_DIR is not useful because it's generated by
+         * login but not `su` command and ibus-daemon can be run with `su`
+         * and we may change the path to XDG_CACHE_HOME in the future.
          */
-        path = g_build_filename (g_get_user_cache_dir (),
+        path = g_build_filename (g_get_user_config_dir (),
                                  "ibus",
                                  "bus",
                                  p,

From 17f8a86ad3302d2df8c68726361f4e08b4e2861a Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Thu, 24 Oct 2019 19:43:20 +0900
Subject: [PATCH 595/816] Update translations

Update po/ko.po po/pt.po

BUG=https://github.com/ibus/ibus/pull/2138
---
 po/LINGUAS |    1 +
 po/ko.po   | 2693 +++++++++++++++++++++++--------------------
 po/pt.po   | 3209 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 4686 insertions(+), 1217 deletions(-)
 create mode 100644 po/pt.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 060a82750..1d01b2b4c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -33,6 +33,7 @@ nl
 or
 pa
 pl
+pt
 pt_BR
 ru
 sq
diff --git a/po/ko.po b/po/ko.po
index 0ecb44da3..72ca9824e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,485 +14,234 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Michelle Kim <mkim33@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Young-Ho, Cha <ganadist at mizi.com>, 2003-2006. (gucharmap)
+# Changwoo Ryu <cwryu@debian.org>, 2007-2015. (gucharmap)
+# DaeHyun Sung <sungdh86@gmail.com>, 2016-2019. (gucharmap)
+# Changwoo Ryu <cwryu@debian.org>, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: IBus\n"
+"Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2019-10-24 19:18+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
+"PO-Revision-Date: 2019-10-24 10:31+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: Korean <en@li.org>\n"
+"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.6\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 "Do not show"
-msgstr "보여주지 않음"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-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:16
-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 "<b>Keyboard Shortcuts</b>"
-msgstr "<b>단축키</b>"
-
-#: ../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 property panel:"
-msgstr "속성 패널을 표시:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "언어 패널 위치:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "시스템 트레이에 아이콘 보여주기"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-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 "<b>Font and Style</b>"
-msgstr "<b>글꼴 및 스타일</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "일반"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "추가(_A)"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "제거(_R)"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "위로(_U)"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "아래로(_D)"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "정보(_A)"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "선택한 입력 방식의 정보 보여주기"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "기본 설정(_P)"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "선택한 입력 방식 설정 보기"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>활성화된 입력 방식 목록에서 키보드 단축키를 누르거나 패널 아이콘을 클릭하여 선택한 활성 입력 방식을 전환할 수 "
-"있습니다.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "입력 방식"
-
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr ""
-
-#: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr ""
-
-#: ../setup/setup.ui.h:53
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:54
-msgid "Emoji annotation language:"
-msgstr ""
-
-#: ../setup/setup.ui.h:55
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-
-#: ../setup/setup.ui.h:56
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-
-#: ../setup/setup.ui.h:57
-msgid "Prefix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:58
-msgid "Suffix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:59
-msgid "Containing match"
-msgstr ""
-
-#: ../setup/setup.ui.h:60
-msgid "Emoji"
-msgstr ""
-
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "시스템 키보드 레이아웃 사용"
-
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "시스템 키보드 (XKB) 레이아웃 사용"
-
-#: ../setup/setup.ui.h:63
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>키보드 레이아웃</b>"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
-msgid "Share the same input method among all applications"
-msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Global input method settings</b>"
-msgstr "<b>전역 입력 방식 설정</b>"
-
-#: ../setup/setup.ui.h:66
-msgid "Advanced"
-msgstr "고급"
-
-#: ../setup/setup.ui.h:67
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>지능형 입력 버스</small>\n"
-"홈페이지: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:74
-msgid "Start ibus on login"
-msgstr "로그인 시 ibus 시작"
-
-#: ../setup/setup.ui.h:75
-msgid "<b>Startup</b>"
-msgstr "<b>시작</b>"
-
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
-msgid "About"
-msgstr "정보"
-
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "닫기(_C)"
+"X-Generator: Zanata 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "엔진 미리로드"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "ibus 시작 시 엔진 미리 로드"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "엔진 순서"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "입력 방식 목록에 저장된 엔진 순서"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+" 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
+"the window and switch prev/next engines."
 msgstr ""
-"IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 &lt; "
-"밀리초 단위로 지연합니다. 0 &gt; 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
+"IME 스위치 창을 표시할 때 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0보다 크면 밀리초 "
+"단위로 지연합니다. 0보다 작으면 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "저장된 버전 번호"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "ASCII가 없는 라틴어 레이아웃"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr "US 레이아웃이 라틴어 레인아웃에 추가되었습니다. 변형된 것은 생략될 수 있습니다."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "xmodmap 사용"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus 엔진을 전환할때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행"
+msgstr "ibus 엔진을 전환할 때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행합니다."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "시스템 키보드 레이아웃 사용"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "시스템 키보드 (XKB) 레이아웃 사용"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "프리에디트 텍스트 포함"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "응용 프로그램 창에 프리에디트 텍스트를 포함"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "모든 응용 프로그램에서 동일한 입력 방식 공유"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "입력기를 디폴트로 활성화"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf는 이름 접두사를 보존합니다"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
-msgstr "트리거 단축키"
+msgstr "트리거 바로 가기 키"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "입력 방식을 활성 또는 해제하는 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse의 트리거 단축키"
+msgstr "gtk_accelerator_parse의 트리거 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
-msgstr "단축키 활성화"
+msgstr "바로 가기 키 활성화"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
-msgstr "입력 방식 전환을 위한 단축키 활성화"
+msgstr "입력 방식을 전환하는 바로 가기 키 활성화"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
-msgstr "단축키 비활성화"
+msgstr "바로 가기 키 비활성화"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr "입력 방식 전환을 위한 단축키 비활성화"
+msgstr "입력 방식을 전환하는 바로 가기 키 비활성화"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
-msgstr "다음 엔진 단축키"
+msgstr "다음 엔진 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축 키"
+msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
-msgstr "이전 엔진 단축키"
+msgstr "이전 엔진 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
+msgstr "목록에 있는 이전 입력 방식으로 전환하는 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "자동 숨기기"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr "속성 패널 돌작입니다. 0 = 보여주지 않음, 1 = 자동 숨김, 2 = 항상 표시"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "언어 패널 위치"
 
-#: ../data/ibus.schemas.in.h:29
-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:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "패널을 항상 표시할 경우 입력 커서를 따라감"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr "참이면, 패널을 항상 표시할 때 패널이 입력 커서를 따라갑니다. 거짓이면, 고정된 위치에서 패널이 나타납니다."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "속성 패널을 표시할 밀리세컨드 단위 시간"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr "포커스 인 상태 또는 속성 값을 바꾸었을 경우 속성 패널을 표시할 밀리세컨드 단위 시간입니다."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "검색 테이블의 방향"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "시스템 트레이에 아이콘 보여주기"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "XKB 아이콘의 RGBA 값"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -503,137 +252,149 @@ msgid ""
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' "
-"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0 "
-"부터 255까지의 값 또는 0% 부터 100% 까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
+"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 "
+"0부터 255까지의 값 또는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
 "여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "속성에 대해 패널 아이콘을 표시하는 시간, 밀리초 단위"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"엔진을 전환할 때 IBusEngineDesc에서 icon-prop-key 값을 통해 속성이 지정되었을 때, 패널 아이콘을 엔진 아이콘에서 "
+"속성 아이콘으로 표시하는 시간 (밀리초 단위). 이 값이 0이면 지연 시간이 없고 속성 아이콘을 즉시 표시합니다."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "유니코드 바로 가기 키, gtk_accelerator_parse 형식"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "입력 방식을 활성 또는 해제하는 바로 가기 키"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse에 사용할 에모지 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
+msgstr "에모지 입력을 켜거나 끄는 바로 가기 키"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr ""
+msgstr "에모지 대화창의 에모지 문자에 사용할 사용자 설정 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
-msgstr ""
+msgstr "에모지 사전에 사용할 기본값 언어"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
+"에모지 대화창의 에모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/share/ibus/dicts/emoji-$lang."
+"dict 사전을 사용합니다."
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
-msgstr ""
+msgstr "에모지 대화 창의 자주 사용하는 에모지 목록"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
-msgstr ""
+msgstr "이 목록에 문자가 들어 있으면 에모지 목록에서 자주 사용하는 에모지를 표시합니다."
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
+msgstr "에모지 대화 창의 자주 사용하는 에모지 주석"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr ""
+msgstr "이 목록에 자주 사용하는 에모지의 주석을 저장할 수 있습니다."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgstr "에모지 주석을 일부분 일치할지 여부"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr ""
+msgstr "에모지 주석 전체가 일치할 경우가 아니더라도 문자열 일부분만 일치해도 찾을지 여부."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "지정한 길이의 에모지 주석 일치"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr ""
+msgstr "에모지 주석 전체가 일치할 경우가 아니더라도 지정한 개수의 문자보다 많이 일치하면 찾습니다."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "에모지 주석을 부분 일치하는 조건 선택"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:65
-msgid "Embed Preedit Text"
-msgstr "편집전 텍스트 포함"
+msgstr "에모지 주석을 부분 일치하는 다음 조건 중의 하나를 고르십시오: 0 = 시작 일치, 1 == 끝 일치, 2 == 포함 일치"
 
-#: ../data/ibus.schemas.in.h:66
-msgid "Embed Preedit Text in Application Window"
-msgstr "어플리케이션 창에 편집전 텍스트를 포함"
-
-#: ../data/ibus.schemas.in.h:67
-msgid "Use global input method"
-msgstr "전역 입력 방식 사용"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr "시작할 때 에모지 데이터 읽어들이기"
 
-#: ../data/ibus.schemas.in.h:69
-msgid "Enable input method by default"
-msgstr "입력기를 디폴트로 활성화"
-
-#: ../data/ibus.schemas.in.h:70
-msgid "Enable input method by default when the application gets input focus"
-msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+"참이면 시작할 때 에모지 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 10MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 "
+"처음 열 때 에모지 데이터를 읽어들입니다."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "DConf preserve name prefixes"
-msgstr "DConf는 이름 접두사를 보존합니다"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr "시작할 때 유니코드 데이터 읽어들이기"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"참이면 시작할 때 유니코드 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 15MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 "
+"처음 열 때 유니코드 데이터를 읽어들입니다. 참이더라도 에모지 데이터를 읽어들인 뒤에는 유니코드 데이터를 항상 읽어들입니다."
 
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
@@ -641,2401 +402,2899 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "기타"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "언어를 선택하십시오"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
 msgstr "확인(_O)"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
-msgstr "더보기..."
+msgstr "더 보기…"
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "정보"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "닫기(_C)"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "언어: %s\n"
 
-#: ../setup/engineabout.py:75
+#: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "키보드 레이아웃: %s\n"
 
-#: ../setup/engineabout.py:78
+#: setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
-msgstr "저자: %s\n"
+msgstr "작성자: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "설명:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "입력 방식을 선택합니다"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "추가(_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "입력 방식"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus 환경 설정"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus 환경 설정 변경"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "키보드 바로 가기 키"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "키 코드:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "수정자:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "삭제(_D)"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "키 또는 키 조합을 입력하십시오"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "이전 입력 방식으로 전환는 바로 가기 키에 shift를 누른 키 사용"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
+
+#: setup/main.py:536
+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를 시작했습니다! 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus 데몬이 %d초 내에 시작하지 못했습니다"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s의 바로 가기 키를 선택"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "입력 방식 전환 중"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "가로"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "세로"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "왼쪽 위"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "오른쪽 위"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "왼쪽 아래"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "오른쪽 아래"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "사용자 정의"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "보여주지 않음"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "자동으로 숨기기"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "항상"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 키"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "다음 입력 방식:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "목록에 있는 이전 입력 방식으로 전환하는 바로 가기 키"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "이전 입력 방식:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "활성화 또는 비활성화:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "활성화:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "비활성화:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>바로 가기 키</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "검색 테이블에서 후보 창의 방향 설정"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "후보 창의 방향:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "속성 패널을 표시:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "언어 패널 위치:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "확인란을 선택하면 입력 방식의 이름을 입력 도구 모음에 표시"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "응용 프로그램 창에 프리에디트 텍스트 포함"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "입력 방식의 프리에디트 텍스트를 어플레케이션 창에 포함시킵니다"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "사용자 정의 글꼴 사용:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>글꼴 및 스타일</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "일반"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "제거(_R)"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "위로(_U)"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "아래로(_D)"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "정보(_A)"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "선택한 입력 방식의 정보 보여주기"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "기본 설정(_P)"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "선택한 입력 방식 설정 보기"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>활성화된 입력 방식 목록에서 키보드 바로 가기 키를 누르거나 패널 아이콘을 눌러 선택한 활성 입력 방식을 전환할 수 "
+"있습니다.</i></small>"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "설명:\n"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr "에모지 주석 또는 유니코드 이름을 변환하는 바로 가기 키 목록"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "입력 방식을 선택합니다"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "에모지 주석:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "유니코드 코드 값 변환을 활성화하는 바로 가기 키"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus 환경 설정 변경"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "유니코드 코드 값:"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "단축키"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "에모지 대화창의 유니코드 후보 글꼴을 설정"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "키 코드:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "유니코드 글꼴:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "수정자:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "에모지 대화창의 에모지 주석 언어를 설정"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "적용(_A)"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "에모지 주석 언어:"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "삭제(_D)"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr "에모지 주석이 다음 조건에 따라 일정 문자 개수보다 더 일치하면 찾기:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr "키 또는 키 조합을 입력하십시오.\n"
-"키를 입력하면 대화 상자가 닫히게 됩니다."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr "에모지 주석이 전체 일치하지 않더라도 문자열 일부만 일치하면 찾습니다"
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "키 또는 키 조합을 입력하십시오. "
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "시작 일치"
 
-#: ../setup/main.py:121 ../setup/main.py:580
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "끝 일치"
 
-#: ../setup/main.py:507
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "포함 일치"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "에모지"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>키보드 레이아웃</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>전역 입력 방식 설정</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "고급"
 
-#: ../setup/main.py:528
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:542
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
+"<big><b>IBus</b></big>\n"
+"<small>지능형 입력 버스</small>\n"
+"홈페이지: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:554
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s의 단축키를 선택"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "로그인 시 ibus 시작"
 
-#. Translators: Title of the window
-#: ../setup/main.py:556
-msgid "switching input methods"
-msgstr "입력 방식 전환 중"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>시작</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "활동"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "동물 및 자연"
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "부품"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:33
 msgid "Flags"
-msgstr ""
+msgstr "깃발"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
-msgstr ""
+msgstr "음식 및 음료"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
-msgstr ""
+msgstr "물건"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr ""
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "사람 및 신체"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "표정 및 감정 표현"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
-msgstr ""
+msgstr "기호"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr ""
+msgstr "여행 및 장소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "기본 라틴문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "라틴-1 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "라틴문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "라틴문자 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "국제 음표 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "간격 조정 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "조합 구분 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "그리스 문자 및 콥트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "키릴 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "키릴 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "아르메니아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "히브리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "아랍 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "시리아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "아랍 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "타너 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "은코 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "사마리아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "만다르어 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "시리아 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "아랍 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "데바나가리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "벵골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "구르무키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "구자라트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "오리야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "타밀 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "텔루구 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "칸나다 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "말라얌람 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "신할라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "타이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "라오 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "티베트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "미얀마 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "그루지야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "한글 자모"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "에티오피아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "에티오피아 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "체로키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "통합 캐나다 원주민 음절"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "오검 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "룬 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "타갈로그 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "하누누 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "부히드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "타그반와 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "크메르 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "몽골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "통합 캐나다 원주민 음절 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "림부 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "타이레 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "신 타이 루에"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "크메르 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "부기스 문자"
 
+# 태국 북부
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "타이삼 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "조합 구분 표시 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "발리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "순다 문자"
 
+# 인도네시아
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "바타크 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "레프차 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "올 치키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "키릴 문자 확장영역 C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "그루지야 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "순다 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "베다 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "발음 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "발음 확장 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "조합 구분 표시 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "라틴 확장 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
-msgstr ""
+msgstr "그리스 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
-msgstr ""
+msgstr "일반 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "위첨자/아래첨자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
-msgstr ""
+msgstr "화폐 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "기호용 조합 구분 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "문자 모양 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
-msgstr ""
+msgstr "여러가지 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
-msgstr ""
+msgstr "화살표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "수학 연산자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "여러가지 기타 서술 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
-msgstr ""
+msgstr "제어 문자 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "광학 인식 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "괄호 영문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
-msgstr ""
+msgstr "테두리 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
-msgstr ""
+msgstr "블럭 요소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "도형"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "여러가지 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
-msgstr ""
+msgstr "딩뱃 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "여러가지 수학기호 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "화살표 추가영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
-msgstr ""
+msgstr "점자 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "화살표 추가영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "여러가지 수학기호 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "수학 연산자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "여러가지 기호 및 화살표"
 
+# 고대 슬라브어를 적는 데 쓰였던 음소 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr ""
+msgstr "글라골루 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "라틴문자 확장영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
-msgstr ""
+msgstr "콥트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "그루지야 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
-msgstr ""
+msgstr "티피나그 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "에티오피아 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "키릴 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "추가 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "한중일 부수 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "강희자전 부수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "한자 기술 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "한중일 기호 및 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "히라가나"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "카타카나"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
-msgstr ""
+msgstr "주음부호(중국어 발음기호)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "한글 호환 자모"
 
+# 중국어 텍스트를 이해하기 쉽도록 주석을 다는 일본식 표기
+# http://en.wikipedia.org/wiki/Kanbun#Unicode_kanbun
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
-msgstr ""
+msgstr "간분"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "주음부호 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
-msgstr ""
+msgstr "한중일 획수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "카타카나 발음 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "한중일 둘러싼 문자 및 날짜 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "한중일 호환 영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "주역 6선형 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "한중일 통합 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
-msgstr ""
+msgstr "이 음절문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
-msgstr ""
+msgstr "이 문자 부수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr ""
+msgstr "리수어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
-msgstr ""
+msgstr "바이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "키릴 문자 확장영역 B"
 
+# 아프리카
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
-msgstr ""
+msgstr "바뭄어 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "변조 성조 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "라틴 문자 확장영역-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "실헤티 나가리"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "인도 공통 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
-msgstr ""
+msgstr "파스파 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
-msgstr ""
+msgstr "사우라슈트라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "데바나가리 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
-msgstr ""
+msgstr "카야 리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
-msgstr ""
+msgstr "레장 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "한글 자모 확장영역 A"
 
+# 인도네시아
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
-msgstr ""
+msgstr "자와어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "미얀마 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
-msgstr ""
+msgstr "참 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "미얀마 확장영역 A"
 
+# 태국
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
-msgstr ""
+msgstr "타이비엣 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "메이테이 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "에티오피아 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "라틴문자 확장영역 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "체로키 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "메이테이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "한글 음절"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "한글 자모 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
-msgstr ""
+msgstr "상위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "개인용 상위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
-msgstr ""
+msgstr "하위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
-msgstr ""
+msgstr "개인 사용 영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "한중일 호환 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "알파벳 표시 꼴"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "아랍 문자 표시 꼴 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
-msgstr ""
+msgstr "여러가지 선택자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
-msgstr ""
+msgstr "세로 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "조합 반각 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "한중일 호환 꼴"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
-msgstr ""
+msgstr "작은꼴 변형"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "아랍 문자 표시 꼴 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "반각 및 전각 꼴"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
-msgstr ""
+msgstr "특수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "선형 B 음절문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "선형 B 표의문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "에게 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "고대 그리스 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "고대 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "파이스토스 원판"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
-msgstr ""
+msgstr "리키아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
-msgstr ""
+msgstr "카리 문자"
 
+# Epact - 태양력이 태음력보다 초과하는 날 수, 1월 1일에 달의 형태
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "콥트어 이팩트 번호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr ""
+msgstr "고대 이탈리아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "고트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "고대 페름어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
-msgstr ""
+msgstr "우가릿 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
-msgstr ""
+msgstr "옛 페르시아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
-msgstr ""
+msgstr "데저렛 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
-msgstr ""
+msgstr "쇼 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
-msgstr ""
+msgstr "오스마냐 문자"
 
+# 아메리카 원주민 오세이지족의 언어를 표기하기 위한 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "오세이지 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "엘바산 문자"
 
+# 중세에 있던 알바니아라는 국가를 현대의 알바니아와 구분하는 용어
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "캅카스 알바니아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "선형 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "키프로스 음절표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "황실 아람어 알파벳"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "팔미라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "나바테아 문자"
 
+# 이란 지역
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
-msgstr ""
+msgstr "하트란 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
-msgstr ""
+msgstr "페니키아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
-msgstr ""
+msgstr "리디아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "메로에 상형문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "메로에 필기체"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
-msgstr ""
+msgstr "카로시디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
-msgstr ""
+msgstr "고대 남아라비아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
-msgstr ""
+msgstr "고대 북아라비아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
-msgstr ""
+msgstr "마니교 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
-msgstr ""
+msgstr "아베스탄어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "파르티아어 새김 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "팔레비어 새김 문자"
 
+# 시편(Psalter)으로 발견된 팔레비어 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "시편 팔레비어 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
-msgstr ""
+msgstr "고대 튀르크 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
-msgstr ""
+msgstr "옛 헝가리 문자"
+
+# 1980년대 이슬람학자인 모하마드 하니프가 로힝야족의 언어를 연구해 개발한 문자 '하니프 로힝야(Hanifi Rohingya)'
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "하니피 로힝야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "루미 숫자 기호"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "고대 소그드 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "소그드 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "엘리마이스 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
-msgstr ""
+msgstr "브라흐미 문자"
 
+# 북 인도 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
-msgstr ""
+msgstr "카이시 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "소라 솜펭 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
-msgstr ""
+msgstr "차크마 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
-msgstr ""
+msgstr "마하자니 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
-msgstr ""
+msgstr "샤라다 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "신할라 고대 숫자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
-msgstr ""
+msgstr "코즈키 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
-msgstr ""
+msgstr "물타니 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
-msgstr ""
+msgstr "쿠다와디 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
-msgstr ""
+msgstr "그랜사 문자"
 
+# 네팔에서 사용하는 네와르어의 문자(newa alphabet)
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
-msgstr ""
+msgstr "네와 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
-msgstr ""
+msgstr "티르후타 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
-msgstr ""
+msgstr "시드햄 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
-msgstr ""
+msgstr "모디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "몽골 문자 추가영역"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
-msgstr ""
+msgstr "타크리 문자"
 
+# 인도
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
-msgstr ""
+msgstr "아홈 문자"
 
+# The Dogra script is historically associated with the Dogri language
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "도그라 문자"
+
+# 인도
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
-msgstr ""
+msgstr "바랑 크시티 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "난디나가리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "자나바자르 정방형 문자"
 
+# 소욤보는 몽골인의 문자인 소욤보 문자로 구성
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
-msgstr ""
+msgstr "소욤보 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "파우 킨 하우 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "바이크수키 문자"
 
+# 티베트 북부지방에서 사용하던  샹슝(象雄,zhang-zhung)왕국의 고대문자. 샹슝 문자라고도 부름. 사어(死語)
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
-msgstr ""
+msgstr "샹슝 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "마사람 곤디 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "건잘라 곤디 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "마카사르 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "타밀 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
-msgstr ""
+msgstr "설형 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "설형 숫자및 구두기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "초기 왕조 쐐기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "고대 이집트 신성문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "고대 이집트 신성문자 형식 제어 문자"
 
+# 현재 터키 지역
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "아나톨리아 상형문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "바뭄어 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
-msgstr ""
+msgstr "므로 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
-msgstr ""
+msgstr "바사 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "파하우몽 문자"
 
+# Oberi Okaime,The Medefaidrin script was created for an artificial language Medefaidrin
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "메데파이드린 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
-msgstr ""
+msgstr "먀오 문자"
 
+# 서하문자(西夏文字, Tangut Block)
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "표의문자용 기호 및 구두 기호"
 
+# 서하문자(西夏文字, Tangut Block)
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
-msgstr ""
+msgstr "서하 문자"
 
+# 서하문자(西夏文字, Tangut Block)
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
-msgstr ""
+msgstr "서하 문자 구성요소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
-msgstr ""
+msgstr "가나 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "가나 확장영역 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "작은 가나꼴 확장영역"
 
+# 뉘수 문자(女书, 女書, Nǚshū) 음절 문자이며, 중국의 소수민족인 야오족 여성들만이 사용함.
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
-msgstr ""
+msgstr "뉘수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
-msgstr ""
+msgstr "듀플로이언 속기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "속기 형식 컨트롤 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "비잔틴 음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
-msgstr ""
+msgstr "음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "고대 그리스 음표"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr "마야 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "태현경 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "산가지 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "수학용 알파벳, 숫자 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "서튼 수화 표기"
 
+# 고대 슬라브어를 적는 데 쓰였던 음소 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "글라골루 문자 추가영역"
+
+#  ‘Genesis Complete Hmong script’; 출처: https://www.unicode.org/L2/L2017/17002r3-n4780r3-nyiakeng-puachue-hmong.pdf
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "창세기 몽족 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "완초 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "멘데어 키카쿠이 문자"
 
+# 플라니어(Fulani language)를 표기하기 위한 문자
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
-msgstr ""
+msgstr "애들램 문자"
+
+# the Indic Siyaq Numbers are a specialized subset of the Arabic script that was used for accounting and in general for recording numbers https://www.unicode.org/L2/L2015/15121r2-indic-siyaq.pdf
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr "인도 시야크 숫자"
+
+# the Indic Siyaq Numbers are a specialized subset of the Arabic script that was used for accounting and in general for recording numbers https://www.unicode.org/L2/L2015/15121r2-indic-siyaq.pdf
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "오스만 시야크 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "아랍 수학용 알파벳 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "마작 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
-msgstr ""
+msgstr "도미노 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
-msgstr ""
+msgstr "플레잉카드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "괄호 영문자 및 숫자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "괄호 한자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "여러가지 기호 및 그림 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
-msgstr ""
+msgstr "이모티콘"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "장식용 딩뱃 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "교통 및 지도 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "연금술 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "도형 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "화살표 추가영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "추가 기호 및 그림 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "체스 기호"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "기호 및 그림 문자 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "한중일 통합 한자 확장영역 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "한중일 호환 보충 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
-msgstr ""
+msgstr "태그"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "여러가지 선택자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "사용자 추가영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "사용자 추가영역 B"
 
-#: ../tools/main.vala:54
+#: tools/main.vala:51
 msgid "List engine name only"
-msgstr "엔진 이름만 나열 "
+msgstr "엔진 이름만 나열합니다"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "IBus에 연결할 수 없습니다.\n"
 
-#: ../tools/main.vala:96
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "언어: %s\n"
 
-#: ../tools/main.vala:164
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "엔진이 설정되어 있지 않습니다.\n"
 
-#: ../tools/main.vala:172
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
 
-#: ../tools/main.vala:177
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
 
-#: ../tools/main.vala:220
+#: tools/main.vala:217
 msgid "Read the system registry cache."
-msgstr "시스템 레지스트리 캐시 읽어들이기"
+msgstr "시스템 레지스트리 캐시를 읽어들입니다."
 
-#: ../tools/main.vala:222
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
-msgstr "레지스트리 캐시 파일 읽어들이기"
+msgstr "레지스트리 캐시 파일을 읽어들입니다."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "레지스트리 캐시가 잘못되었습니다.\n"
 
-#: ../tools/main.vala:260
+#: tools/main.vala:257
 msgid "Write the system registry cache."
-msgstr "시스템 레지스트리 캐시 쓰기"
+msgstr "시스템 레지스트리 캐시를 씁니다."
 
-#: ../tools/main.vala:262
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
-msgstr "레지스트리 캐시파일 쓰기"
+msgstr "레지스트리 캐시 파일을 씁니다."
+
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr "IBus 코어 대신 엔진 스키마 경로 사용, 쉼표로 구분한 경로 값 목록."
 
-#: ../tools/main.vala:314
+#: tools/main.vala:381
 msgid "Resetting…"
-msgstr "재설정중..."
+msgstr "초기화 중…"
 
-#: ../tools/main.vala:328
+#: tools/main.vala:399
 msgid "Done"
 msgstr "완료"
 
-#: ../tools/main.vala:373
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "엔진을 설정하거나 얻기"
 
-#: ../tools/main.vala:374
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
-msgstr "ibus-daemon 종료"
+msgstr "ibus-daemon 끝내기"
 
-#: ../tools/main.vala:375
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "존재하는 엔진 표시"
 
-#: ../tools/main.vala:376
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(구현 안함)"
 
-#: ../tools/main.vala:377
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
-msgstr "ibus-daemon 재시작"
+msgstr "ibus-daemon 다시 시작"
 
-#: ../tools/main.vala:378
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "버전 보기"
 
-#: ../tools/main.vala:379
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "레지스트리 캐시 내용 표시"
 
-#: ../tools/main.vala:380
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "레지스트리 캐시 만들기"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon의 D-Bus 주소 출력"
 
-#: ../tools/main.vala:382
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "설정 값 표시"
 
-#: ../tools/main.vala:383
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "설정 값 재설정"
 
-#: ../tools/main.vala:385
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgstr "대화창의 에모지를 클립보드에 저장"
 
-#: ../tools/main.vala:387
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "이 정보 표시"
 
-#: ../tools/main.vala:393
+#: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "사용법: %s COMMAND [OPTION...]\n"
+msgstr "사용법: %s <명령> [옵션...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "명령:\n"
 
-#: ../tools/main.vala:423
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s는 알 수 없는 명령입니다!\n"
-
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr ""
+msgstr "%s은(는) 알 수 없는 명령입니다!\n"
 
-#: ../ui/gtk3/emojier.vala:273
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
-msgstr ""
+msgstr "자주 사용"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
-msgstr ""
+msgstr "기타"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "유니코드 선택 열기"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr ""
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr "에모지 선택으로 돌아가기"
 
-#: ../ui/gtk3/emojier.vala:451
-msgid "Type annotation or choose emoji"
-msgstr ""
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr "다음 페이지"
 
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr ""
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr "이전 페이지"
 
-#: ../ui/gtk3/emojier.vala:950
-msgid "Bring back emoji choice"
-msgstr ""
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr "에모지 변종 보기"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr ""
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr "닫기"
 
-#: ../ui/gtk3/emojier.vala:1071
-msgid "Page Down"
-msgstr ""
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr "메뉴"
 
-#: ../ui/gtk3/emojier.vala:1082
-msgid "Page Up"
-msgstr ""
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr "경고 메시지를 보려면 누르십시오"
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr "유니코드 사전 읽어들이는 중:"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "코드값: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
-msgstr ""
+msgstr "에모지 변종 있음"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
-msgstr ""
+msgstr "설명: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
-msgstr ""
+msgstr "없음"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
-msgstr ""
+msgstr "주석: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "이름: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
+msgstr "다른 이름: %s"
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr "에모지 선택"
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr "유니코드 선택"
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
 msgstr ""
+"현재 텍스트 응용 프로그램을 알아낼 수 없습니다. 응용 프로그램의 포커스를 다시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 "
+"에모지 입력 모드를 벗어나거나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보십시오."
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
-msgstr ""
+msgstr "에모지 선택 취소됨."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
-msgstr ""
+msgstr "에모지를 클립보드에 복사."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
-#: ../ui/gtk3/emojierapp.vala:97
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr ""
+msgstr "\"<글꼴>\"을 에모지 대화창의 에모지 문자에 사용합니다"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
-msgstr ""
+msgstr "<글꼴>"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
-#: ../ui/gtk3/emojierapp.vala:103
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "\"<언어>\"를 에모지 대화창 주석에 사용합니다 (예: \"en\")"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
-msgstr ""
+msgstr "<언어>"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "에모지 주석 일부분과 일치 가능"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "지정한 정수 값 길이만큼 일치"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "지정한 정수 값의 조건에 맞게 일치"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
-msgstr ""
-
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus 업데이트"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space는 이제 기본 단축키입니다."
+msgstr "IBus 패널"
 
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다."
+msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
-msgstr "김은주(eukim@redhat.com)"
+msgstr "김은주 <eukim@redhat.com>\n"
+"류창우 <cwryu@debian.org>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
-msgstr "재시작"
+msgstr "다시 시작"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "끝내기"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 000000000..2aa85f8a0
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,3209 @@
+# Portuguese translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Manuela Silva <mmsrs@sky.com>, 2019. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus 1.5.21\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2019-10-24 19:18+0900\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2019-09-16 11:26+0000\n"
+"Last-Translator: Manuela Silva <mmsrs@sky.com>\n"
+"Language-Team: Portuguese\n"
+"Language: pt\n"
+"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "Mecanismos de pré-carregamento"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "Mecanismos de pré-carregamento durante o arranque de ibus"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "Ordem de mecanismos"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr "Ordem de mecanismos guardados na lista de métodos de entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "Número de versão guardado"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "Utilizar xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Utilizar disposição do teclado do sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Utilizar disposição do teclado do sistema (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Utilizar método de entrada global"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Ativar método de entrada por predefinição"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr "Ativar teclas de atalho"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr "Desativar teclas de atalho"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
+"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
+"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
+"point value in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+"Direitos de Autor (c) 2007-2010 Peng Huang\n"
+"Direitos de Autor (c) 2007-2010 Red Hat, Inc."
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr "Outros"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Selecione um idioma"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mais…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Sobre"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Fechar"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Idioma: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Disposição do teclado: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Descrição:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Selecione um método de entrada"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Adicionar"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Método de Entrada"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferências de IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Definir Preferências de IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Atalhos de teclado"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr ""
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr ""
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertical"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr ""
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr ""
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr ""
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Não mostrar"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Ocultar automaticamente"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Sempre"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr ""
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr ""
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Ativar ou desativar:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Ativar:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Desativar:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Atalhos de Teclado</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr ""
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr ""
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr ""
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Geral"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Remover"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "Para _Cima"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "Para _Baixo"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Sobre"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Mostrar informação do método de entrada selecionado"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode "
+"names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Anotação de emoji:"
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr ""
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Atalhos de Teclado</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Definições globais do método de entrada</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avançado"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Iniciar ibus ao iniciar a sessão"
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Arranque</b>"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Atividades"
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Animais e Natureza"
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Componente"
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr "Bandeiras"
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr "Comida e Bebidas"
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr "Objetos"
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr "Símbolos"
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr "Viagem e Locais"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Extensões de IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr "Hiragana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr "Katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr "Bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
+msgstr "Suplemento de Mongolian "
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+msgstr "Takri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
+msgstr "Ahom"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
+msgstr "Warang Citi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr "Zanabazar Square"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr "Soyombo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
+msgstr "Pau Cin Hau"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr "Bhaiksuki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr "Marchen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr "Masaram Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "Gunjala Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "Makasar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Suplemento de Tamil"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
+msgstr "Mro"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
+msgstr "Bassa Vah"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
+msgstr "Miao"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
+msgstr "Tangut"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
+msgstr "Componentes de Tangut"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
+msgstr "Suplemento de Kana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
+msgstr "Nushu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
+msgstr "Duployan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
+msgstr "Sutton SignWriting"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr "Suplemento de Glagolitic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
+msgstr "Mende Kikakui"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
+msgstr "Adlam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr "Cartas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr "Emoticons"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr ""
+
+#: tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:237 tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: tools/main.vala:257
+msgid "Write the system registry cache."
+msgstr ""
+
+#: tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr "A redefinir..."
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr "Concluído "
+
+#: tools/main.vala:444
+msgid "Set or get engine"
+msgstr ""
+
+#: tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:446
+msgid "Show available engines"
+msgstr "Mostrar mecanismos disponíveis"
+
+#: tools/main.vala:447
+msgid "(Not implemented)"
+msgstr "(Não implementado)"
+
+#: tools/main.vala:448
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:449
+msgid "Show version"
+msgstr "Mostrar versão"
+
+#: tools/main.vala:450
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: tools/main.vala:451
+msgid "Create registry cache"
+msgstr ""
+
+#: tools/main.vala:452
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr "Mostrar os valores da configuração"
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr "Redefinir os valores da configuração"
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr "Guardar emoji na janela para a área de transferência"
+
+#: tools/main.vala:458
+msgid "Show this information"
+msgstr "Mostrar esta informação"
+
+#: tools/main.vala:464
+#, c-format
+msgid "Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: tools/main.vala:465
+msgid "Commands:\n"
+msgstr "Comandos:\n"
+
+#: tools/main.vala:494
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr "Outros"
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr "Página para Baixo"
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr "Página para Cima"
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr "Mostrar variantes de emoji"
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr "Fechar"
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr "Clique para ver uma mensagem de aviso"
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr "A carregar um dicionário Unicode:"
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr "Tem variantes de emoji"
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, c-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr "Nenhum"
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr "Anotações: %s"
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your application."
+" E.g. Press Esc key several times to release the emoji typing mode, click "
+"your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr "Cancelado para escolher um emoji."
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr "Copiado um emoji para a sua área de transferência."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#. 
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#. 
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1095
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1099
+msgid "translator-credits"
+msgstr "Manuela Silva <mmsrs@sky.com>"
+
+#: ui/gtk3/panel.vala:1118
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ui/gtk3/panel.vala:1144
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: ui/gtk3/panel.vala:1148
+msgid "Quit"
+msgstr "Sair"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
+msgid "default:LTR"
+msgstr "predefinição:LTR"

From 35863d81d15e3d3463cd5dafd0473afb193c57e3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 30 Oct 2019 17:29:25 +0900
Subject: [PATCH 596/816] Fix deprecated APIs

- Fix deprecated gtk_misc_set_padding(), gtk_widget_set_margin_left(),
  gtk_widget_set_margin_right() in emojilang.py, enginedialog.py,
  setup.ui, candidatearea.vala, candidatepanel.vala, switcher.vala
  since GTK 3.12

- Fix g_new0() argument 1 range [18446744071562067968, 18446744073709551615]
  exceeds maximum object size 9223372036854775807
  [-Walloc-size-larger-than=] by adding g_assert() in ibuscomposetable.c

- Fix gdk_keymap_get_default() with gdk_keymap_get_for_display() in
  bindingcommon.vala

- Fix string.utf8_offset() with string.next_char() in emojier.vala

- Fix Posix.SIGUSR1 with Posix.Signal.USR1 in panel.vala
---
 bus/ibusimpl.c              |  1 +
 configure.ac                |  3 ++-
 setup/emojilang.py          | 14 +++++++-------
 setup/enginedialog.py       | 18 +++++++++---------
 setup/setup.ui              | 34 +++++++++++++++++-----------------
 src/ibuscomposetable.c      |  1 +
 ui/gtk3/bindingcommon.vala  |  6 +++---
 ui/gtk3/candidatearea.vala  |  9 +++++----
 ui/gtk3/candidatepanel.vala | 10 +++++-----
 ui/gtk3/emojier.vala        |  4 +++-
 ui/gtk3/panel.vala          |  4 ++--
 ui/gtk3/switcher.vala       |  9 +++++----
 12 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 39b16139a..85761d30b 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2180,6 +2180,7 @@ bus_ibus_impl_registry_destroy (BusIBusImpl *ibus)
 
     g_clear_pointer (&ibus->engine_table, g_hash_table_destroy);
 
+    /* g_clear_pointer() does not set the cast. */
     ibus_object_destroy (IBUS_OBJECT (ibus->registry));
     ibus->registry = NULL;
 
diff --git a/configure.ac b/configure.ac
index 84589be07..ab74a3802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ m4_define([ibus_binary_version],
 
 # Required versions of other packages.
 m4_define([glib_required_version], [2.46.0])
+m4_define([gtk3_required_version], [3.12.0])
 
 # VALA_TARGET_GLIB_VERSION is used by valac --ccode --target-glib .
 # VALA_TARGET_GLIB_VERSION and glib_required_version will be different
@@ -238,7 +239,7 @@ fi
 if test x"$enable_gtk3" = x"yes"; then
     # check for gtk3
     PKG_CHECK_MODULES(GTK3, [
-        gtk+-3.0
+        gtk+-3.0 >= gtk3_required_version
     ])
     PKG_CHECK_EXISTS([gdk-wayland-3.0],
         [enable_gdk3_wayland=yes],
diff --git a/setup/emojilang.py b/setup/emojilang.py
index 8250589d3..58757d869 100644
--- a/setup/emojilang.py
+++ b/setup/emojilang.py
@@ -3,7 +3,7 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -83,8 +83,8 @@ def __init__(self, id = None, transient_for = None):
                 hscrollbar_policy = Gtk.PolicyType.NEVER,
                 vscrollbar_policy = Gtk.PolicyType.NEVER,
                 shadow_type = Gtk.ShadowType.IN,
-                margin_left = 6,
-                margin_right = 6,
+                margin_start = 6,
+                margin_end = 6,
                 margin_top = 6,
                 margin_bottom = 6)
         self.vbox.add(self.__scrolled)
@@ -192,8 +192,8 @@ def __padded_label_new(self, text, icon, alignment, direction):
         label = Gtk.Label(label = text)
         label.set_halign(alignment)
         label.set_valign(Gtk.Align.CENTER)
-        label.set_margin_left(20)
-        label.set_margin_right(20)
+        label.set_margin_start(20)
+        label.set_margin_end(20)
         label.set_margin_top(6)
         label.set_margin_bottom(6)
         hbox.pack_start(label, True, True, 0)
@@ -235,8 +235,8 @@ def __more_row_new(self):
         row.set_tooltip_text(_("More…"))
         arrow = Gtk.Image.new_from_icon_name('view-more-symbolic',
                                              Gtk.IconSize.MENU)
-        arrow.set_margin_left(20)
-        arrow.set_margin_right(20)
+        arrow.set_margin_start(20)
+        arrow.set_margin_end(20)
         arrow.set_margin_top(6)
         arrow.set_margin_bottom(6)
         arrow.set_halign(Gtk.Align.CENTER)
diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index 2c472debd..72deada88 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -4,7 +4,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2013-2015 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -70,8 +70,8 @@ def __init__(self, transient_for = None):
                 hscrollbar_policy = Gtk.PolicyType.NEVER,
                 vscrollbar_policy = Gtk.PolicyType.NEVER,
                 shadow_type = Gtk.ShadowType.IN,
-                margin_left = 6,
-                margin_right = 6,
+                margin_start = 6,
+                margin_end = 6,
                 margin_top = 6,
                 margin_bottom = 6)
         self.vbox.add(self.__scrolled)
@@ -94,8 +94,8 @@ def __init__(self, transient_for = None):
         self.__filter_timeout_id = 0
         self.__filter_word = None
         self.__filter_entry = Gtk.SearchEntry(hexpand = True,
-                                              margin_left = 6,
-                                              margin_right = 6,
+                                              margin_start = 6,
+                                              margin_end = 6,
                                               margin_top = 6,
                                               margin_bottom = 6)
         self.__filter_entry.set_no_show_all(True)
@@ -164,8 +164,8 @@ def __padded_label_new(self, text, icon, alignment, direction):
         label = Gtk.Label(label = text)
         label.set_halign(alignment)
         label.set_valign(Gtk.Align.CENTER)
-        label.set_margin_left(20)
-        label.set_margin_right(20)
+        label.set_margin_start(20)
+        label.set_margin_end(20)
         label.set_margin_top(6)
         label.set_margin_bottom(6)
         hbox.pack_start(label, True, True, 0)
@@ -205,8 +205,8 @@ def __more_row_new(self):
         row.set_tooltip_text(_("More…"))
         arrow = Gtk.Image.new_from_icon_name('view-more-symbolic',
                                              Gtk.IconSize.MENU)
-        arrow.set_margin_left(20)
-        arrow.set_margin_right(20)
+        arrow.set_margin_start(20)
+        arrow.set_margin_end(20)
         arrow.set_margin_top(6)
         arrow.set_margin_bottom(6)
         arrow.set_halign(Gtk.Align.CENTER)
diff --git a/setup/setup.ui b/setup/setup.ui
index 9d9d7ee97..56453054c 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -90,8 +90,8 @@
                 <property name="spacing">18</property>
                 <property name="margin_top">12</property>
                 <property name="margin_bottom">12</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <child>
                   <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
@@ -105,7 +105,7 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                         <child>
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
@@ -366,7 +366,7 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                         <child>
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
@@ -589,8 +589,8 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">12</property>
                 <property name="margin_bottom">12</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="orientation">horizontal</property>
@@ -658,7 +658,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">5</property>
                         <property name="layout_style">start</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                         <child>
                           <object class="GtkButton" id="button_engine_add">
                             <property name="label" translatable="yes">_Add</property>
@@ -811,7 +811,7 @@
                         <property name="max_width_chars">74</property>
                         <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;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.&lt;/i&gt;&lt;/small&gt;</property>
                         <property name="use_markup">True</property>
-                        <!-- property name="margin_left">0</property -->
+                        <!-- property name="margin_start">0</property -->
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -850,8 +850,8 @@
                 <property name="spacing">18</property>
                 <property name="margin_top">12</property>
                 <property name="margin_bottom">12</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <child>
                   <object class="GtkFrame" id="frame_emoji1">
                     <property name="visible">True</property>
@@ -865,7 +865,7 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                         <child>
                           <object class="GtkLabel" id="label_emoji1">
                             <property name="visible">True</property>
@@ -1004,7 +1004,7 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                         <property name="row_homogeneous">false</property>
                         <child>
                           <object class="GtkLabel" id="label_emoji_font">
@@ -1187,8 +1187,8 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">12</property>
                 <property name="margin_bottom">12</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
@@ -1202,7 +1202,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">24</property>
+                        <property name="margin_start">24</property>
                         <child>
                           <object class="GtkCheckButton" id="checkbutton_use_sys_layout">
                             <property name="label" translatable="yes">Use system keyboard layout</property>
@@ -1251,7 +1251,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">24</property>
+                        <property name="margin_start">24</property>
                         <child>
                           <object class="GtkCheckButton" id="checkbutton_use_global_engine">
                             <property name="label" translatable="yes">Share the same input method among all applications</property>
@@ -1348,7 +1348,7 @@ Homepage: https://github.com/ibus/ibus/wiki
                         <property name="halign">start</property>
                         <property name="draw_indicator">True</property>
                         <property name="margin_top">6</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin_start">12</property>
                       </object>
                     </child>
                     <child type="label">
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index dd9d31d4e..e4e3a7cd8 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1058,6 +1058,7 @@ ibus_compose_table_list_add_array (GSList        *compose_tables,
     int i;
     guint16 *ibus_compose_seqs = NULL;
 
+    g_assert (length >= 0);
     g_return_val_if_fail (data != NULL, compose_tables);
     g_return_val_if_fail (max_seq_len <= IBUS_MAX_COMPOSE_LEN, compose_tables);
 
diff --git a/ui/gtk3/bindingcommon.vala b/ui/gtk3/bindingcommon.vala
index 4171f29df..150d4c399 100644
--- a/ui/gtk3/bindingcommon.vala
+++ b/ui/gtk3/bindingcommon.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2018-2019 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -75,8 +75,8 @@ class BindingCommon {
         // workaround a bug in gdk vapi vala > 0.18
         // https://bugzilla.gnome.org/show_bug.cgi?id=677559
 #if VALA_0_18
-            Gdk.Keymap.get_default().map_virtual_modifiers(
-                    ref switch_modifiers);
+            Gdk.Keymap.get_for_display(Gdk.Display.get_default()
+                    ).map_virtual_modifiers(ref switch_modifiers);
 #else
             if ((switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0)
                 switch_modifiers |= Gdk.ModifierType.MOD4_MASK;
diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index 781ecd1ed..b22ab5da4 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -215,9 +215,10 @@ class CandidateArea : Gtk.Box {
                 candidate.show();
                 m_candidates += candidate;
 
-                /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
-                label.set_padding(8, 0);
-                candidate.set_padding(8, 0);
+                label.set_margin_start (8);
+                label.set_margin_end (8);
+                candidate.set_margin_start (8);
+                candidate.set_margin_end (8);
 
                 // Make a copy of i to workaround a bug in vala.
                 // https://bugzilla.gnome.org/show_bug.cgi?id=628336
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index d404c6597..8994cdb98 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -242,16 +242,16 @@ public class CandidatePanel : Gtk.Box{
         m_preedit_label.set_size_request(20, -1);
         m_preedit_label.set_halign(Gtk.Align.START);
         m_preedit_label.set_valign(Gtk.Align.CENTER);
-        /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
-        m_preedit_label.set_padding(8, 0);
+        m_preedit_label.set_margin_start(8);
+        m_preedit_label.set_margin_end(8);
         m_preedit_label.set_no_show_all(true);
 
         m_aux_label = new Gtk.Label(null);
         m_aux_label.set_size_request(20, -1);
         m_aux_label.set_halign(Gtk.Align.START);
         m_aux_label.set_valign(Gtk.Align.CENTER);
-        /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */
-        m_aux_label.set_padding(8, 0);
+        m_aux_label.set_margin_start(8);
+        m_aux_label.set_margin_end(8);
         m_aux_label.set_no_show_all(true);
 
         m_candidate_area = new CandidateArea(m_vertical_panel_system);
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index fc15cffec..4e52769c4 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2147,11 +2147,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                         ncandidates));
         int char_count = text.text.char_count();
         int start_index = -1;
+        unowned string title = text.text;
         for (int i = 0; i < char_count; i++) {
-            if (text.text.utf8_offset(i).has_prefix(language)) {
+            if (title.has_prefix(language)) {
                 start_index = i;
                 break;
             }
+            title = title.next_char();
         }
         if (start_index >= 0) {
             var attr = new IBus.Attribute(
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 2054658e0..680c86edf 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1053,7 +1053,7 @@ class Panel : IBus.PanelService {
 
     private void show_setup_dialog() {
         if (m_setup_pid != 0) {
-            if (Posix.kill(m_setup_pid, Posix.SIGUSR1) == 0)
+            if (Posix.kill(m_setup_pid, Posix.Signal.USR1) == 0)
                 return;
             m_setup_pid = 0;
         }
@@ -1087,7 +1087,7 @@ class Panel : IBus.PanelService {
 
             string copyright =
                 "Copyright © 2007-2015 Peng Huang\n" +
-                "Copyright © 2015 Takao Fujiwara\n" +
+                "Copyright © 2015-2019 Takao Fujiwara\n" +
                 "Copyright © 2007-2015 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 0de44e986..a4529c889 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2016 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -125,9 +125,10 @@ class Switcher : Gtk.Window {
         Atk.Object obj = m_label.get_accessible();
         obj.set_role (Atk.Role.STATUSBAR);
 
-        /* Use Gtk.Widget.set_margin_start() and
-         * Gtk.Widget.set_margin_top() since gtk 3.12 */
-        m_label.set_padding(3, 3);
+        m_label.set_margin_start(3);
+        m_label.set_margin_end(3);
+        m_label.set_margin_top(3);
+        m_label.set_margin_bottom(3);
         vbox.pack_end(m_label, false, false, 0);
 
         grab_focus();

From efeb7b9689126e4f05bd1e10441cdc4a3720ff1c Mon Sep 17 00:00:00 2001
From: Robert Hoffmann <externer.dl.hoffmann@muenchen.de>
Date: Fri, 1 Nov 2019 21:55:13 +0900
Subject: [PATCH 597/816] bus: Fix restart crash with inotify read()

Do not close inotify desciptors when restarting the server. This
may lead to crashes in glib.

Fixes crash in libglib/libgio with
GLib-GIO-ERROR : inotify read(): Bad file descriptor

See also src/tests/ibus-bus.c: start_exit_async():
    /* When `./runtest ibus-bus` runs, ibus-daemon sometimes failed to
     * restart because closing a file descriptor was failed in
     * bus/server.c:_restart_server() with a following error:
     *     "inotify read(): Bad file descriptor"

Test plan:
Run
$ ibus restart
several times. Without the patch ibus-daemon will crash occasionally.

BUG=https://github.com/ibus/ibus/pull/2148
---
 bus/server.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index d9c30e441..a7554a889 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -26,6 +26,8 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
 #include <string.h>
 
 #include "dbusimpl.h"
@@ -45,16 +47,33 @@ _restart_server (void)
 {
     gchar *exe;
     gint fd;
+    ssize_t r;
+    int MAXSIZE = 0xFFF;
+    char proclnk[MAXSIZE];
+    char filename[MAXSIZE];
 
-    exe = g_strdup_printf ("/proc/%d/exe", getpid ());
-    exe = g_file_read_link (exe, NULL);
+    exe = g_file_read_link ("/proc/self/exe", NULL);
 
     if (exe == NULL)
-        exe = BINDIR "/ibus-daemon";
+        exe = g_strdup (BINDIR "/ibus-daemon");
 
     /* close all fds except stdin, stdout, stderr */
     for (fd = 3; fd <= sysconf (_SC_OPEN_MAX); fd ++) {
-        close (fd);
+        errno = 0;
+        /* only close valid fds */
+        if (fcntl (fd, F_GETFD) != -1 || errno != EBADF) {
+            g_sprintf (proclnk, "/proc/self/fd/%d", fd);
+            r = readlink (proclnk, filename, MAXSIZE);
+            if (r < 0) {
+                continue;
+            }
+            filename[r] = '\0';
+
+            /* Do not close 'anon_inode:inotify' fds, that may crash in glib */
+            if (g_strcmp0 (filename, "anon_inode:inotify") != 0) {
+                close (fd);
+            }
+        }
     }
 
     _restart = FALSE;
@@ -69,6 +88,7 @@ _restart_server (void)
         execv (exe, g_argv);
     }
     g_warning ("execv %s failed!", g_argv[0]);
+    g_free (exe);
     exit (-1);
 }
 

From 26a8105b7003953e56bf04426ee89a93482a45c5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 10 Nov 2019 09:53:27 +0900
Subject: [PATCH 598/816] ui/gtk3: Fix to exit `ibus emoji` with Escape key

When Escape key is pressed, the current ibus-ui-emojier should exit
although another daemon one is alive.

`ibus emoji` was used in Wayland desktop as a workaround but now
IBus emoji functions are moved to the engine's pre-edit and the same
function is available with Ctrl-Sfhit-e and space key so this problem
would not be so visible.

BUG=rhbz#1658187
---
 ui/gtk3/emojier.vala    |  5 ++--
 ui/gtk3/emojierapp.vala | 63 +++++++++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 4e52769c4..13bacebde 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -320,6 +320,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void commit_text(string text);
+    public signal void cancel();
 
     public IBusEmojier() {
         GLib.Object(
@@ -1789,8 +1790,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             show_emoji_variants(emojis);
             return true;
         }
-        if (m_input_context_path != "")
-            m_result = text;
+        m_result = text;
         if (need_commit_signal)
             commit_text(text);
         return false;
@@ -1897,6 +1897,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
             // PageUp/PageDown.
             remove_all_children();
         }
+        cancel();
         return false;
     }
 
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index e83319895..783c611c1 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -3,6 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright (c) 2017 Peng Wu <alexepico@gmail.com>
+ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,6 +41,33 @@ public class EmojiApplication : Gtk.Application {
     }
 
 
+    private void save_selected_string(string? selected_string,
+                                      bool    cancelled) {
+        if (cancelled) {
+            m_command_line.print("%s\n", _("Canceled to choose an emoji."));
+            return;
+        }
+        GLib.return_if_fail(selected_string != null);
+        Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
+        clipboard.set_text(selected_string, -1);
+        clipboard.store();
+
+        var emojier_favorites = m_settings_emoji.get_strv("favorites");
+        bool has_favorite = false;
+        foreach (unowned string favorite in emojier_favorites) {
+            if (favorite == selected_string) {
+                has_favorite = true;
+                break;
+            }
+        }
+        if (!has_favorite) {
+            emojier_favorites += selected_string;
+            m_settings_emoji.set_strv("favorites", emojier_favorites);
+        }
+        m_command_line.print("%s\n", _("Copied an emoji to your clipboard."));
+    }
+
+
     private void show_dialog(ApplicationCommandLine command_line) {
         m_command_line = command_line;
         m_emojier.reset();
@@ -55,7 +83,7 @@ public class EmojiApplication : Gtk.Application {
             return;
         if (button == IBusEmojier.BUTTON_CLOSE_BUTTON) {
             m_emojier.hide();
-            m_command_line.print("%s\n", _("Canceled to choose an emoji."));
+            save_selected_string(null, true);
             m_command_line = null;
             return;
         }
@@ -74,23 +102,7 @@ public class EmojiApplication : Gtk.Application {
         }
         string emoji = m_emojier.get_current_candidate();
         m_emojier.hide();
-        Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
-        clipboard.set_text(emoji, -1);
-        clipboard.store();
-
-        var emojier_favorites = m_settings_emoji.get_strv("favorites");
-        bool has_favorite = false;
-        foreach (unowned string favorite in emojier_favorites) {
-            if (favorite == emoji) {
-                has_favorite = true;
-                break;
-            }
-        }
-        if (!has_favorite) {
-            emojier_favorites += emoji;
-            m_settings_emoji.set_strv("favorites", emojier_favorites);
-        }
-        m_command_line.print("%s\n", _("Copied an emoji to your clipboard."));
+        save_selected_string(emoji, false);
         m_command_line = null;
     }
 
@@ -202,6 +214,21 @@ public class EmojiApplication : Gtk.Application {
             m_emojier.candidate_clicked.connect((i, b, s) => {
                 candidate_clicked_lookup_table(i, b, s);
             });
+            m_emojier.cancel.connect(() => {
+                if (m_command_line == null)
+                    return;
+                m_emojier.hide();
+                save_selected_string(null, true);
+                m_command_line = null;
+            });
+            m_emojier.commit_text.connect(() => {
+                if (m_command_line == null)
+                    return;
+                m_emojier.hide();
+                string selected_string = m_emojier.get_selected_string();
+                save_selected_string(selected_string, false);
+                m_command_line = null;
+            });
         }
 
         activate_dialog(command_line);

From 76b1773c6ef529888bcd62c4f8207c89ba23503f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Mon, 18 Nov 2019 12:05:35 +0900
Subject: [PATCH 599/816] engine-simple: Add the French bepo_afnor layout

BUG=https://github.com/ibus/ibus/pull/2155
---
 engine/simple.xml.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 4445c2545..fc1541eca 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -283,6 +283,18 @@
                         <icon>ibus-keyboard</icon>
                         <rank>1</rank>
                 </engine>
+                <engine>
+                        <name>xkb:fr:bepo_afnor:fra</name>
+                        <language>fr</language>
+                        <license>GPL</license>
+                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+                        <layout>fr</layout>
+                        <layout_variant>bepo_afnor</layout_variant>
+                        <longname>French (Bepo, ergonomic, Dvorak way, AFNOR)</longname>
+                        <description>French (Bepo, ergonomic, Dvorak way, AFNOR)</description>
+                        <icon>ibus-keyboard</icon>
+                        <rank>1</rank>
+                </engine>
                 <engine>
                         <name>xkb:fr:dvorak:fra</name>
                         <language>fr</language>

From 052994d153810c4307747fa954f87b2a09dd12f3 Mon Sep 17 00:00:00 2001
From: pan93412 <pan93412@gmail.com>
Date: Mon, 25 Nov 2019 18:56:59 +0900
Subject: [PATCH 600/816] Update translations

Update po/zh_TW.po

BUG=https://github.com/ibus/ibus/pull/2158
---
 po/zh_TW.po | 93 +++++++++++++++++++++++++++--------------------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index e68d83e45..d388da08c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,10 +4,9 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012,2014
-# Ding-Yi Chen <dchen@redhat.com>, 2009
-# Ding-Yi Chen <dchen@redhat.com>, 2009
-# Walter Cheuk <wwycheuk@gmail.com>, 2012
+# Ding-Yi Chen <dchen@redhat.com>, 2009.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011-2012,2014.
+# Walter Cheuk <wwycheuk@gmail.com>, 2012.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # tomoe musashi <hkg.musashi@gmail.com>, 2016. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
@@ -15,17 +14,18 @@
 # Peter Pan <pan93412@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Peter Pan <pan93412@gmail.com>, 2019. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.20\n"
+"Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-07-04 05:41+0000\n"
-"Last-Translator: Peter Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <trans-zh_TW@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2019-10-24 19:18+0900\n"
+"PO-Revision-Date: 2019-11-25 09:53+0000\n"
+"Last-Translator: pan93412 <pan93412@gmail.com>\n"
+"Language-Team: Chinese <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
@@ -38,7 +38,7 @@ msgstr "預先載入引擎"
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "當 iBus 啟動時預先載入引擎"
+msgstr "當 IBus 啟動時預先載入引擎"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
@@ -58,6 +58,7 @@ msgid ""
 " 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/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -395,7 +396,7 @@ msgid ""
 msgstr "著作權所有 (c) 2007-2010 黃鵬\n"
 "著作權所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "其他"
 
@@ -463,11 +464,11 @@ msgstr "鍵盤"
 
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
-msgstr "iBus 偏好設定"
+msgstr "IBus 偏好設定"
 
 #: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
-msgstr "設置 iBus 偏好設定"
+msgstr "設定 IBus 偏好設定"
 
 #: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -618,7 +619,7 @@ msgstr "<b>鍵盤快捷鍵</b>"
 
 #: setup/setup.ui:374
 msgid "Set the orientation of candidates in lookup table"
-msgstr "設置查詢表單內候選字詞的排列方向"
+msgstr "設定查詢表單內候選字詞的排列方向"
 
 #: setup/setup.ui:376
 msgid "Candidates orientation:"
@@ -626,7 +627,7 @@ msgstr "候選詞排列方向："
 
 #: setup/setup.ui:407
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "設置 iBus 如何顯示或隱藏語言列的行為"
+msgstr "設定 IBus 如何顯示或隱藏語言列的行為"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
@@ -702,7 +703,7 @@ msgstr "偏好設定(_P)"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
-msgstr "顯示選取輸入法的設置"
+msgstr "顯示選取輸入法的設定"
 
 #: setup/setup.ui:812
 msgid ""
@@ -716,11 +717,11 @@ msgstr ""
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
-msgstr "啟用 Emoji 符號或 Unicode 名稱轉換的快捷鍵"
+msgstr "啟用繪文字符號或 Unicode 名稱轉換的快捷鍵"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
-msgstr "Emoji 符號："
+msgstr "繪文字符號："
 
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
@@ -732,7 +733,7 @@ msgstr "Unicode 碼位："
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "設定 Emoji 對話框上的 Unicode 候選字型"
+msgstr "設定繪文字對話框上的 Unicode 候選字型"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
@@ -795,7 +796,7 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
-"<big><b>iBus</b></big>\n"
+"<big><b>IBus</b></big>\n"
 "<small>智慧型輸入框架</small>\n"
 "首頁: https://github.com/ibus/ibus/wiki\n"
 "\n"
@@ -804,7 +805,7 @@ msgstr ""
 
 #: setup/setup.ui:1341
 msgid "Start ibus on login"
-msgstr "在登入時啟動 iBus"
+msgstr "在登入時啟動 IBus"
 
 #: setup/setup.ui:1358
 msgid "<b>Startup</b>"
@@ -836,11 +837,11 @@ msgstr "物體"
 
 #: src/ibusemojigen.h:36
 msgid "People & Body"
-msgstr ""
+msgstr "人們 & 身體"
 
 #: src/ibusemojigen.h:37
 msgid "Smileys & Emotion"
-msgstr ""
+msgstr "笑臉 & 表情"
 
 #: src/ibusemojigen.h:38
 msgid "Symbols"
@@ -1296,7 +1297,7 @@ msgstr "西里爾字擴充-C"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:285
 msgid "Georgian Extended"
-msgstr ""
+msgstr "喬治亞文擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2276,7 +2277,7 @@ msgstr "古匈牙利文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:845
 msgid "Hanifi Rohingya"
-msgstr ""
+msgstr "哈乃斐羅興亞文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2290,21 +2291,21 @@ msgstr "魯米數字符號"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
 msgid "Old Sogdian"
-msgstr ""
+msgstr "古粟特字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
 msgid "Sogdian"
-msgstr ""
+msgstr "粟特字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
 msgid "Elymaic"
-msgstr ""
+msgstr "埃利邁文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2437,7 +2438,7 @@ msgstr "阿洪姆文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
 msgid "Dogra"
-msgstr ""
+msgstr "多格拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2451,7 +2452,7 @@ msgstr "瓦蘭齊地文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
 msgid "Nandinagari"
-msgstr ""
+msgstr "南迪城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2500,21 +2501,22 @@ msgstr "馬薩拉姆共地文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
-msgstr ""
+msgstr "古吉拉共地文字"
 
+# ref: https://zh.wikipedia.org/wiki/Unicode%E5%AD%97%E7%AC%A6%E5%B9%B3%E9%9D%A2%E6%98%A0%E5%B0%84
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
 msgid "Makasar"
-msgstr ""
+msgstr "瑪卡莎文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
 msgid "Tamil Supplement"
-msgstr ""
+msgstr "泰米爾文補充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2549,7 +2551,7 @@ msgstr "古埃及聖書字碑銘體"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
 msgid "Egyptian Hieroglyph Format Controls"
-msgstr ""
+msgstr "埃及聖書體格式控制"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2591,7 +2593,7 @@ msgstr "救世苗文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
-msgstr ""
+msgstr "梅德法伊德林文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2640,7 +2642,7 @@ msgstr "假名擴充-A"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
 msgid "Small Kana Extension"
-msgstr ""
+msgstr "小假名擴充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2689,7 +2691,7 @@ msgstr "古希臘音樂譜記號"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
-msgstr ""
+msgstr "瑪雅數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2731,14 +2733,14 @@ msgstr "格拉哥里字母補充"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
 msgid "Nyiakeng Puachue Hmong"
-msgstr ""
+msgstr "創世紀苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
 msgid "Wancho"
-msgstr ""
+msgstr "萬秋文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2759,14 +2761,14 @@ msgstr "阿德拉姆文"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
-msgstr ""
+msgstr "印度西亞克數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
 msgid "Ottoman Siyaq Numbers"
-msgstr ""
+msgstr "奧斯曼西亞克數字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2871,14 +2873,14 @@ msgstr "補充符號與象形圖"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
-msgstr ""
+msgstr "西洋棋符號"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1189
 msgid "Symbols and Pictographs Extended-A"
-msgstr ""
+msgstr "符號和象形文字擴充-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3168,8 +3170,7 @@ msgid ""
 "Failed to get the current text application. Please re-focus your application."
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
-msgstr ""
-"無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出 Emoji 輸入模式後，按一下桌面再重按您的文字應用程式一次。"
+msgstr "無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出繪文字輸入模式後，按一下桌面再重按您的文字應用程式一次。"
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
@@ -3219,7 +3220,7 @@ msgstr "IBus 面板"
 
 #: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "iBus 為 Linux/Unix 上的智慧型輸入法框架。"
+msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"

From 2a08af4c979ac42aeb037bb86b7717f4272082b5 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Mon, 25 Nov 2019 18:58:04 +0900
Subject: [PATCH 601/816] Amend typos

BUG=https://github.com/ibus/ibus/pull/2159
---
 bus/inputcontext.c             |  2 +-
 bus/panelproxy.c               |  4 ++--
 engine/gensimple.py            |  6 +++---
 src/ibusbus.c                  |  2 +-
 src/ibusbus.h                  | 28 ++++++++++++++--------------
 src/ibusengine.h               |  2 +-
 src/ibusobject.h               |  2 +-
 src/ibusproperty.h             |  2 +-
 src/tests/ibus-bus.c           |  8 ++++----
 ui/gtk3/emojier.vala           |  2 +-
 ui/gtk3/ibusemojidialog.h      |  4 ++--
 ui/gtk3/indicator.vala         |  2 +-
 ui/gtk3/keybindingmanager.vala |  2 +-
 13 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 1b8e7adbb..ceea4b60e 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2543,7 +2543,7 @@ new_engine_cb (GObject             *obj,
     }
     else {
         if (data->context->data != data) {
-            /* Request has been overriden or cancelled */
+            /* Request has been overridden or cancelled */
             g_object_unref (engine);
             g_task_return_new_error (data->task,
                                      G_IO_ERROR,
diff --git a/bus/panelproxy.c b/bus/panelproxy.c
index 024a451c6..e6001ebfc 100644
--- a/bus/panelproxy.c
+++ b/bus/panelproxy.c
@@ -747,7 +747,7 @@ _context_update_preedit_text_cb (BusInputContext *context,
      * the callback is not called for extensions and panel
      * extensions are always calls by
      * bus_panel_proxy_update_preedit_text() directly
-     * because panel extensions foward UpdatePreeditText to
+     * because panel extensions forward UpdatePreeditText to
      * UpdatePreeditTextReceived and it can be an infinite
      * loop.
      */
@@ -870,7 +870,7 @@ _context_set_content_type_cb (BusInputContext *context,
          * the callback is not called for extensions and panel  \
          * extensions are always calls by                       \
          * bus_panel_proxy_update_preedit_text() directly       \
-         * because panel extensions foward UpdatePreeditText to \
+         * because panel extensions forward UpdatePreeditText to \
          * UpdatePreeditTextReceived and it can be an infinite  \
          * loop.                                                \
          */                                                     \
diff --git a/engine/gensimple.py b/engine/gensimple.py
index 857397ea3..b038fe1fe 100644
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -24,7 +24,7 @@
 import urllib2
 from xml.dom import minidom
 
-def simplfy_dom(node):
+def simplify_dom(node):
     name = node.nodeName
     children = {}
     if len(node.childNodes) == 1 and node.childNodes[0].nodeType == node.TEXT_NODE:
@@ -32,7 +32,7 @@ def simplfy_dom(node):
     for child in node.childNodes:
         if child.nodeType != node.ELEMENT_NODE:
             continue
-        child_name, child_value = simplfy_dom(child)
+        child_name, child_value = simplify_dom(child)
         if child_name not in children:
             children[child_name] = []
         children[child_name].append(child_value)
@@ -41,7 +41,7 @@ def simplfy_dom(node):
 def parse_xml():
     filename = "/usr/share/X11/xkb/rules/evdev.xml"
     dom = minidom.parse(file(filename))
-    name, root = simplfy_dom(dom)
+    name, root = simplify_dom(dom)
 
     layouts = root['xkbConfigRegistry'][0]['layoutList'][0]['layout']
     for layout in layouts:
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 0783e7bb7..b7ffbb47d 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -927,7 +927,7 @@ _create_input_context_async_step_one_done (GDBusConnection *connection,
 
     if (g_dbus_connection_is_closed (connection)) {
         /*
-         * The connection is closed, can not contine next steps, so complete
+         * The connection is closed, can not continue next steps, so complete
          * the asynchronous request with error.
          */
         g_variant_unref(variant);
diff --git a/src/ibusbus.h b/src/ibusbus.h
index fddcf5b2a..76df4fdc0 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -493,7 +493,7 @@ gchar       *ibus_bus_get_name_owner_async_finish
  *
  * Exit or restart ibus-daemon synchronously.
  *
- * Returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
+ * Returns: %TRUE if the "Exit" call is successful, %FALSE otherwise.
  */
 gboolean     ibus_bus_exit              (IBusBus        *bus,
                                          gboolean        restart);
@@ -527,7 +527,7 @@ void        ibus_bus_exit_async         (IBusBus        *bus,
  *
  * Finishes an operation started with ibus_bus_exit_async().
  *
- * Returns: %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
+ * Returns: %TRUE if the "Exit" call is successful, %FALSE otherwise.
  */
 gboolean    ibus_bus_exit_async_finish  (IBusBus        *bus,
                                          GAsyncResult   *res,
@@ -537,11 +537,11 @@ gboolean    ibus_bus_exit_async_finish  (IBusBus        *bus,
  * ibus_bus_create_input_context:
  * @bus: An #IBusBus.
  * @client_name: Name of client.
- *      "CreateInputContext" call is suceeded, %NULL otherwise.
  *
  * Create an input context for client synchronously.
  *
- * Returns: (transfer full): An newly allocated #IBusInputContext if the
+ * Returns: (transfer full): A newly allocated #IBusInputContext if the
+ *      "CreateInputContext" call is succeeded, %NULL otherwise.
  */
 IBusInputContext *
             ibus_bus_create_input_context
@@ -578,8 +578,8 @@ void        ibus_bus_create_input_context_async
  *
  * Finishes an operation started with ibus_bus_create_input_context_async().
  *
- * Returns: (transfer full): An newly allocated #IBusInputContext if the
- *      "CreateInputContext" call is suceeded, %NULL otherwise.
+ * Returns: (transfer full): A newly allocated #IBusInputContext if the
+ *      "CreateInputContext" call is succeeded, %NULL otherwise.
  */
 IBusInputContext *
              ibus_bus_create_input_context_async_finish
@@ -593,8 +593,8 @@ IBusInputContext *
  *
  * Get the current focused input context synchronously.
  *
- * Returns: The named of currently focued #IBusInputContext if the
- *          "CurrentInputContext" call suceeded, %NULL otherwise. The return
+ * Returns: Name of the currently focused #IBusInputContext if the
+ *          "CurrentInputContext" call succeeded, %NULL otherwise. The return
  *          value must be freed with g_free().
  */
 gchar       *ibus_bus_current_input_context
@@ -628,8 +628,8 @@ void         ibus_bus_current_input_context_async
  *
  * Finishes an operation started with ibus_bus_current_input_context_async().
  *
- * Returns: The named of currently focued IBusInputContext if the
- *          "CurrentInputContext" call suceeded, %NULL otherwise. The return
+ * Returns: Name of the currently focused IBusInputContext if the
+ *          "CurrentInputContext" call succeeded, %NULL otherwise. The return
  *          value must be freed with g_free().
  */
 gchar       *ibus_bus_current_input_context_async_finish
@@ -642,9 +642,9 @@ gchar       *ibus_bus_current_input_context_async_finish
  * @bus: An #IBusBus.
  * @component: A input engine component.
  *
- * Register a componet to an #IBusBus synchronously.
+ * Register a component to an #IBusBus synchronously.
  *
- * Returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
+ * Returns: %TRUE if the "RegisterComponent" call is successful, %FALSE otherwise.
  */
 gboolean     ibus_bus_register_component
                                         (IBusBus        *bus,
@@ -660,7 +660,7 @@ gboolean     ibus_bus_register_component
  *      or %NULL if you don't care about the result of the method invocation.
  * @user_data: The data to pass to callback.
  *
- * Register a componet to an #IBusBus asynchronously.
+ * Register a component to an #IBusBus asynchronously.
  */
 void         ibus_bus_register_component_async
                                         (IBusBus        *bus,
@@ -680,7 +680,7 @@ void         ibus_bus_register_component_async
  *
  * Finishes an operation started with ibus_bus_register_component_async().
  *
- * Returns: %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
+ * Returns: %TRUE if the "RegisterComponent" call is successful, %FALSE otherwise.
  */
 gboolean     ibus_bus_register_component_async_finish
                                         (IBusBus        *bus,
diff --git a/src/ibusengine.h b/src/ibusengine.h
index b6461ce99..43eaa554e 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -237,7 +237,7 @@ void         ibus_engine_update_preedit_text
  * the behavior on focus out when the pre-edit buffer is visible.
  *
  * If @mode is IBUS_ENGINE_PREEDIT_COMMIT, contents of the pre-edit buffer
- * will be comitted and cleared.
+ * will be committed and cleared.
  * If @mode is IBUS_ENGINE_PREEDIT_CLEAR, contents of the pre-edit buffer
  * will be cleared only.
  *
diff --git a/src/ibusobject.h b/src/ibusobject.h
index a8b21a8a9..2117316fb 100644
--- a/src/ibusobject.h
+++ b/src/ibusobject.h
@@ -128,7 +128,7 @@ IBusObject     *ibus_object_new                 (void);
  * ibus_object_destroy:
  * @object: an #IBusObject to destroy.
  *
- * Emit the "destory" signal notifying all reference holders that they should
+ * Emit the "destroy" 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
diff --git a/src/ibusproperty.h b/src/ibusproperty.h
index 45bab1087..8bd481446 100644
--- a/src/ibusproperty.h
+++ b/src/ibusproperty.h
@@ -371,7 +371,7 @@ void             ibus_property_set_sub_props(IBusProperty   *prop,
  * #IBusProperty @prop_update can either be sub-property of @prop,
  * or holds new values for @prop.
  *
- * Returns: TRUE for update suceeded; FALSE otherwise.
+ * Returns: TRUE if update succeeded; FALSE otherwise.
  */
 
 gboolean         ibus_property_update       (IBusProperty   *prop,
diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
index 24b151e3e..a2af0bb21 100644
--- a/src/tests/ibus-bus.c
+++ b/src/tests/ibus-bus.c
@@ -245,7 +245,7 @@ start_remove_match_async (void)
 
 static int create_input_context_count = 0;
 static void
-finish_create_input_context_async_sucess (GObject      *source_object,
+finish_create_input_context_async_success (GObject      *source_object,
                                           GAsyncResult *res,
                                           gpointer      user_data)
 {
@@ -290,7 +290,7 @@ test_create_input_context_async (void)
             "test-async",
             -1, /* timeout */
             NULL, /* cancellable */
-            finish_create_input_context_async_sucess,
+            finish_create_input_context_async_success,
             loop); /* user_data */
     g_main_loop_run (loop);
     g_main_loop_unref (loop);
@@ -324,13 +324,13 @@ test_create_input_context_async (void)
             "test-async",
             -1, /* timeout */
             NULL, /* cancellable */
-            finish_create_input_context_async_sucess,
+            finish_create_input_context_async_success,
             loop); /* user_data */
     ibus_bus_create_input_context_async (bus,
             "test-async",
             -1, /* timeout */
             NULL, /* cancellable */
-            finish_create_input_context_async_sucess,
+            finish_create_input_context_async_success,
             loop); /* user_data */
     ibus_bus_create_input_context_async (bus,
             "test-async",
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 13bacebde..9e6e92636 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2126,7 +2126,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     public string get_current_candidate() {
         // If category_list mode, do not show the category name on preedit.
         // If candidate_panel mode, the first space key does not show the
-        // lookup table but the first candidate is avaiable on preedit.
+        // lookup table but the first candidate is available on preedit.
         if (!m_candidate_panel_mode)
             return "";
         uint cursor = m_lookup_table.get_cursor_pos();
diff --git a/ui/gtk3/ibusemojidialog.h b/ui/gtk3/ibusemojidialog.h
index 3b420b21c..c946124b3 100644
--- a/ui/gtk3/ibusemojidialog.h
+++ b/ui/gtk3/ibusemojidialog.h
@@ -181,9 +181,9 @@ void          ibus_emojier_set_partial_match      (gboolean  has_partial_match);
 
 /**
  * ibus_emojier_set_partial_match_length:
- * @length: minimum lenght to match partially.
+ * @length: minimum length to match partially.
  *
- * Set the minimum lenght to match partially.
+ * Set the minimum length to match partially.
  */
 void          ibus_emojier_set_partial_match_length
                                                   (gint         length);
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index e04d48395..0cca410ff 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -564,7 +564,7 @@ class Indicator : IBus.Service
      * unregister_connection:
      *
      * "Destroy" dbus method is not called for the indicator's connection
-     * when panel's connection is disconneted because the dbus connection
+     * when panel's connection is disconnected because the dbus connection
      * is a shared session bus so need to call
      * g_dbus_connection_unregister_object() by manual here
      * so that g_object_unref(m_panel) will be called later with an idle method,
diff --git a/ui/gtk3/keybindingmanager.vala b/ui/gtk3/keybindingmanager.vala
index c8b1e7f6c..12d11976e 100644
--- a/ui/gtk3/keybindingmanager.vala
+++ b/ui/gtk3/keybindingmanager.vala
@@ -4,7 +4,7 @@ valac --pkg gtk+-2.0 --pkg x11 --pkg gdk-x11-2.0 --pkg gee-1.0 keybinding-manage
 
 /**
  * This class is in charge to grab keybindings on the X11 display
- * and filter X11-events and passing on such events to the registed
+ * and filter X11-events and passing on such events to the registered
  * handler methods.
  *
  * @author Oliver Sauder <os@esite.ch>

From bccf94d5ec1c5fc80d5aeac622f2ab8007d5a28a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Nov 2019 20:28:49 +0900
Subject: [PATCH 602/816] src/tests: RHEL codereview for
 ibus-desktop-testing-runner

---
 src/tests/ibus-desktop-testing-runner.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 141e9b5b9..72537cd43 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -28,6 +28,10 @@
 # # /root/ibus/tests/test-console.sh --tests ibus-compose \
 #   --builddir /root/ibus/src/tests --srcdir /root/ibus/src/tests
 
+# POSIX sh has no 'echo -e'
+: ${ECHO:='/usr/bin/echo'}
+
+
 PROGNAME=`basename $0`
 VERSION=0.1
 DISPLAY=:99.0
@@ -54,15 +58,15 @@ print_log()
             shift
         fi
         NO_ESCAPE=`echo $@ | sed -e 's/\\\033\\[0;3.m//g' -e 's/\\\033\\[0m//g'`
-        echo $NO_ESCAPE >> $RESULT_LOG
+        $ECHO $NO_ESCAPE >> $RESULT_LOG
     else
-        echo $@
+        $ECHO $@
     fi
 }
 
 usage()
 {
-    echo -e \
+    $ECHO -e \
 "This test runs /usr/bin/ibus-daemon after install ibus\n"                     \
 "$PROGNAME [OPTIONS…]\n"                                                       \
 "\n"                                                                           \
@@ -92,7 +96,7 @@ parse_args()
     while [ 1 ] ; do
         case "$1" in
         -h | --help )        usage; exit 0;;
-        -v | --version )     echo -e "$VERSION"; exit 0;;
+        -v | --version )     $ECHO -e "$VERSION"; exit 0;;
         -b | --builddir )    BUILDDIR="$2"; shift 2;;
         -s | --srcdir )      SRCDIR="$2"; shift 2;;
         -c | --no-graphics ) HAVE_GRAPHICS=0; shift;;
@@ -121,7 +125,7 @@ init_desktop()
     fi
     if [ "$TEST_LOG" = "" ] ; then
         print_log -e "${RED}FAIL${NC}: ${RED}ERROR${NC}: a log file is required to get return value with 'read' command"
-        exit -1
+        exit 255
     elif [ -f $TEST_LOG ] ; then
         rm $TEST_LOG
     fi
@@ -291,7 +295,7 @@ EOF
     done
     child_pass=`grep '^PASS:' $TEST_LOG | wc -l`
     child_fail=`grep '^FAIL:' $TEST_LOG | wc -l`
-    if [ $child_pass -ne 0 -o $child_fail -ne 0 ] ; then
+    if [ $child_pass -ne 0 ] || [ $child_fail -ne 0 ] ; then
         pass=$child_pass
         if [ $child_fail -ne 0 ] ; then
             fail=`expr $child_fail / 2`

From d50627f0b7a000ee13ea6dcc02a4162be1fa853d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 3 Dec 2019 21:42:49 +0900
Subject: [PATCH 603/816] src/tests: RHEL codereview #2 for
 ibus-desktop-testing-runner

---
 src/tests/ibus-compose-locales.in        | 21 +++++++--------
 src/tests/ibus-desktop-testing-runner.in | 33 ++++++++++++------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/tests/ibus-compose-locales.in b/src/tests/ibus-compose-locales.in
index f650b5844..b36165fea 100755
--- a/src/tests/ibus-compose-locales.in
+++ b/src/tests/ibus-compose-locales.in
@@ -7,27 +7,26 @@ BUILDDIR=`dirname $0`
 export IBUS_COMPOSE_CACHE_DIR=$PWD
 
 retval=0
-# Let for-loop notice '\n' as a delimiter
-IFS=$'\n'
-for var in `cat $SRCDIR/ibus-compose.env`
+# Deleted for var in `cat *.env` because IFS=$'\n' is not supported in POSIX sh
+while read var
 do
-    # Revert IFS to recognize env a=foo b=foo
-    IFS=' '
     IS_COMMENT=`echo "$var" | grep "^#"`
     if [ "x$IS_COMMENT" != x ] ; then
         continue
     fi
-    echo "# Starting $var $BUILDDIR/ibus-compose $SRCDIR $@"
-    env $var $BUILDDIR/ibus-compose $SRCDIR $@
+    # Use $* instead of $@ not to mix strings and integers
+    echo "# Starting $var $BUILDDIR/ibus-compose $SRCDIR $*"
+    # Need to enclose $@ with double quotes not to split the array.
+    env $var $BUILDDIR/ibus-compose $SRCDIR "$@"
     retval=`expr $retval + $?`
-    echo "# Finished $var $BUILDDIR/ibus-compose $SRCDIR $@ with $retval"
+    echo "# Finished $var $BUILDDIR/ibus-compose $SRCDIR $* with $retval"
 
     CACHE_FILES=`ls *.cache`
     if [ x"$CACHE_FILES" != x ] ; then
         echo "Clean $CACHE_FILES"
         rm $CACHE_FILES
     fi
-    IFS=$'\n'
-done
-IFS=' '
+done << EOF_ENVS
+`cat $SRCDIR/ibus-compose.env`
+EOF_ENVS
 exit $retval
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 72537cd43..981941d58 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -30,6 +30,8 @@
 
 # POSIX sh has no 'echo -e'
 : ${ECHO:='/usr/bin/echo'}
+# POSIX sh has $UID
+: ${UID:='`id -u`'}
 
 
 PROGNAME=`basename $0`
@@ -57,10 +59,10 @@ print_log()
         if [ x"$1" = x'-e' ] ; then
             shift
         fi
-        NO_ESCAPE=`echo $@ | sed -e 's/\\\033\\[0;3.m//g' -e 's/\\\033\\[0m//g'`
+        NO_ESCAPE=`echo "$@" | sed -e 's/\\\033\\[0;3.m//g' -e 's/\\\033\\[0m//g'`
         $ECHO $NO_ESCAPE >> $RESULT_LOG
     else
-        $ECHO $@
+        $ECHO "$@"
     fi
 }
 
@@ -231,9 +233,9 @@ run_direct_test_cases()
         if test x"$ENVS" = x ; then
             $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
             retval=$?
-            read pass fail << EOF
+            read pass fail << EOF_COUNT
             `count_case_result $retval $pass $fail`
-EOF
+EOF_COUNT
             echo_case_result $retval $tst
             CACHE_FILES=`ls *.cache`
             if [ x"$CACHE_FILES" != x ] ; then
@@ -242,11 +244,9 @@ EOF
             fi
         else
             i=1
-            # Let for-loop notice '\n' as a delimiter
-            IFS=$'\n'
-            for e in $ENVS; do
-                # Revert IFS to recognize env a=foo b=foo
-                IFS=' '
+            # Deleted for var in "$ENVS" because IFS=$'\n' is not supported
+            # in POSIX sh
+            while read e ; do
                 first=`echo "$e" | grep '^#'`
                 if test x"$first" = x"#" ; then
                     continue
@@ -255,9 +255,9 @@ EOF
                 env $e $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
                 retval=$?
                 echo "# Finished $e $BUILDDIR/$tst $SRCDIR with $retval" >>$TEST_LOG
-                read pass fail << EOF
+                read pass fail << EOF_COUNT
                 `count_case_result $retval $pass $fail`
-EOF
+EOF_COUNT
                 echo_case_result $retval $tst $e
                 CACHE_FILES=`ls *.cache`
                 if [ x"$CACHE_FILES" != x ] ; then
@@ -265,9 +265,9 @@ EOF
                     rm $CACHE_FILES
                 fi
                 i=`expr $i + 1`
-                IFS=$'\n'
-            done
-            IFS=' '
+            done << EOF_ENVS
+            `echo "$ENVS"`
+EOF_ENVS
         fi
     done
     echo $pass $fail
@@ -357,7 +357,7 @@ finit()
 
 main()
 {
-    parse_args $@
+    parse_args "$@"
     init_desktop
     run_dbus_daemon 2>>$TEST_LOG 1>>$TEST_LOG
     run_desktop 2>>$TEST_LOG 1>>$TEST_LOG
@@ -365,4 +365,5 @@ main()
     finit
 }
 
-main $@
+# Need to enclose $@ with double quotes not to split the array.
+main "$@"

From 66141bbc5e68c5f221737282fc4f3d5e48ba6c69 Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Tue, 10 Dec 2019 13:19:21 +0900
Subject: [PATCH 604/816] setup: Add NotShowIn and Keywords keys to the desktop
 entry

BUG=https://github.com/ibus/ibus/pull/2162
---
 setup/ibus-setup.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup/ibus-setup.desktop b/setup/ibus-setup.desktop
index 0608a68f0..c6d19b6d5 100644
--- a/setup/ibus-setup.desktop
+++ b/setup/ibus-setup.desktop
@@ -7,3 +7,6 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Settings;
+# GNOME uses its own "input source" settings instead
+NotShowIn=GNOME;Unity;
+Keywords=keyboard;input;

From 25d11f5cfd4c39e53be11a1348da29a61593cc4c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 11 Dec 2019 16:28:22 +0900
Subject: [PATCH 605/816] client/gtk2: Fix to set use_button_press_event after
 signals are connected

_ibus_context_update_preedit_text_cb() can be called with reset signals
before ibus_im_context_set_client_window() is called. Then
use_button_press_event needs to be set only when the signals are connected.

BUG=https://github.com/ibus/ibus/issues/1980
---
 client/gtk2/ibusimcontext.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 5e3457baa..ac5de809b 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1074,8 +1074,9 @@ ibus_im_context_reset (GtkIMContext *context)
         /* Commented out ibus_im_context_clear_preedit_text().
          * Hangul needs to receive the reset callback with button press
          * but other IMEs should avoid to receive the reset callback
-         * so the signal would need to be customized with GtkSetting.
-         * IBus uses button-press-event instead.
+         * by themselves.
+         * IBus uses button-press-event instead until GTK is fixed.
+         * https://gitlab.gnome.org/GNOME/gtk/issues/1534
          */
         ibus_input_context_reset (ibusimcontext->ibuscontext);
     }
@@ -1657,10 +1658,13 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
     if (!ibusimcontext->use_button_press_event &&
         mode == IBUS_ENGINE_PREEDIT_COMMIT) {
 #if !GTK_CHECK_VERSION (3, 93, 0)
-        if (ibusimcontext->client_window)
+        if (ibusimcontext->client_window) {
             _connect_button_press_event (ibusimcontext, TRUE);
-#endif
+            ibusimcontext->use_button_press_event = TRUE;
+        }
+#else
         ibusimcontext->use_button_press_event = TRUE;
+#endif
     }
 
     str = text->text;

From c662a02bf3b50914c697af12fc152ee97e2df961 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 25 Dec 2019 17:30:56 +0900
Subject: [PATCH 606/816] client/gtk2: Fix to connect button-press-event signal

IBus clients do not connect button-press-event in some conditions
and it will be fixed.

BUG=https://github.com/ibus/ibus/issues/1980
---
 client/gtk2/ibusimcontext.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index ac5de809b..305854036 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2019 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
@@ -73,7 +73,7 @@ struct _IBusIMContext {
     GCancellable    *cancellable;
     GQueue          *events_queue;
 
-    gboolean use_button_press_event;
+    gboolean         use_button_press_event;
 };
 
 struct _IBusIMContextClass {
@@ -1125,6 +1125,10 @@ ibus_im_context_get_preedit_string (GtkIMContext   *context,
 
 
 #if !GTK_CHECK_VERSION (3, 93, 0)
+/* Use the button-press-event signal until GtkIMContext always emits the reset
+ * signal.
+ * https://gitlab.gnome.org/GNOME/gtk/merge_requests/460
+ */
 static gboolean
 ibus_im_context_button_press_event_cb (GtkWidget      *widget,
                                        GdkEventButton *event,
@@ -1157,11 +1161,13 @@ _connect_button_press_event (IBusIMContext *ibusimcontext,
                     "button-press-event",
                     G_CALLBACK (ibus_im_context_button_press_event_cb),
                     ibusimcontext);
+            ibusimcontext->use_button_press_event = TRUE;
         } else {
             g_signal_handlers_disconnect_by_func (
                     widget,
                     G_CALLBACK (ibus_im_context_button_press_event_cb),
                     ibusimcontext);
+            ibusimcontext->use_button_press_event = FALSE;
         }
     }
 }
@@ -1188,7 +1194,7 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
     if (client != NULL) {
         ibusimcontext->client_window = g_object_ref (client);
 #if !GTK_CHECK_VERSION (3, 93, 0)
-        if (ibusimcontext->use_button_press_event)
+        if (!ibusimcontext->use_button_press_event)
             _connect_button_press_event (ibusimcontext, TRUE);
 #endif
     }
@@ -1655,17 +1661,14 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
         ibusimcontext->preedit_attrs = NULL;
     }
 
+#if !GTK_CHECK_VERSION (3, 93, 0)
     if (!ibusimcontext->use_button_press_event &&
         mode == IBUS_ENGINE_PREEDIT_COMMIT) {
-#if !GTK_CHECK_VERSION (3, 93, 0)
         if (ibusimcontext->client_window) {
             _connect_button_press_event (ibusimcontext, TRUE);
-            ibusimcontext->use_button_press_event = TRUE;
         }
-#else
-        ibusimcontext->use_button_press_event = TRUE;
-#endif
     }
+#endif
 
     str = text->text;
     ibusimcontext->preedit_string = g_strdup (str);

From 6f0fec0ff266d1cf7975f3691f2e1a23d4edad4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Mon, 6 Jan 2020 19:39:30 +0900
Subject: [PATCH 607/816] Translated using Weblate (Turkish)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/tr/
---
 po/tr.po | 1081 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 580 insertions(+), 501 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 98c34e23f..c2046873f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,45 +1,47 @@
 # Turkish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Serdar Sağlam <teknomobil@msn.com>, 2019. #zanata
+# Oğuz Ersen <oguzersen@protonmail.com>, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-03 13:37+0000\n"
+"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
+"Language-Team: Turkish <https://translate.stg.fedoraproject.org/projects/"
+"ibus/ibus/tr/>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-03-26 06:30+0000\n"
-"Last-Translator: Serdar Sağlam <teknomobil@msn.com>\n"
-"Language-Team: Turkish\n"
-"Language: tr\n"
-"X-Generator: Zanata 4.6.2\n"
-"Plural-Forms: nplurals=2; plural=(n>1)\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
-msgstr ""
+msgstr "Motorları önceden yükle"
 
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr ""
+msgstr "Ibus başlatılırken motorları önceden yükle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
-msgstr ""
+msgstr "Motor sırası"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Giriş yöntemi listesinde kayıtlı motor sırası"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "IME değiştirici penceresi için açılır pencere gecikme milisaniyesi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
@@ -47,183 +49,198 @@ msgid ""
 " 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
 "the window and switch prev/next engines."
 msgstr ""
+"IME değiştirici penceresini gösterecek açılır pencere gecikmesini milisaniye "
+"olarak ayarlayın. Varsayılan değer 400'dür. 0 = Pencereyi hemen göster. 0 < "
+"Milisaniye cinsinden gecikme. 0 > Pencereyi gösterme ve önceki/sonraki "
+"motorlara geçiş yap."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
-msgstr ""
+msgstr "Kaydedilen versiyon numarası"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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 ""
+"Kaydedilen versiyon numarası, daha önce kurulmuş olan ibus ile mevcut "
+"ibus'un biri arasındaki farkı kontrol etmek için kullanılacaktır."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "ASCII içermeyen Latin düzenleri"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr ""
+msgstr "ABD düzeni Latin düzenlerine eklenir. varyant göz ardı edilebilir."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
-msgstr ""
+msgstr "xmodmap kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"İbus motorları değiştirildiğinde .xmodmap veya .Xmodmap mevcutsa xmodmap "
+"komutunu çalıştır."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
-msgstr ""
+msgstr "Sistem klavye düzenini kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
 msgid "Use system keyboard (XKB) layout"
-msgstr ""
+msgstr "Sistem klavye (XKB) düzenini kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:47
 msgid "Embed Preedit Text"
-msgstr ""
+msgstr "Ön-Düzenleme Metnini Ekle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:48
 msgid "Embed Preedit Text in Application Window"
-msgstr ""
+msgstr "Uygulama Penceresinde Ön-Düzenleme Metnini Ekle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
-msgstr ""
+msgstr "Global giriş yöntemini kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
 msgid "Share the same input method among all applications"
-msgstr ""
+msgstr "Tüm uygulamalar ile aynı giriş yöntemini paylaş"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:57
 msgid "Enable input method by default"
-msgstr ""
+msgstr "Giriş yöntemini varsayılan olarak etkinleştir"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
+"Uygulama giriş odağı aldığında varsayılan olarak giriş yöntemini etkinleştir"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf isim koruma önekleri"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "İsim dönüştürmeyi durdurmak için DConf anahtarlarının önekleri"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
-msgstr ""
+msgstr "Tetikleme kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:71
 #: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
 msgid "The shortcut keys for turning input method on or off"
-msgstr ""
+msgstr "Giriş yöntemini açmak veya kapatmak için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse için tetikleme kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
-msgstr ""
+msgstr "Etkinleştirme kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
-msgstr ""
+msgstr "Giriş yöntemini açmak için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
-msgstr ""
+msgstr "Devre dışı bırakma kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr ""
+msgstr "Giriş yöntemini kapatmak için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:90
 #: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
-msgstr ""
+msgstr "Sonraki motor kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:91
 #: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
+msgstr "Listedeki bir sonraki giriş yöntemine geçmek için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:100
 #: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
-msgstr ""
+msgstr "Önceki motor kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:101
 #: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
+msgstr "Listedeki bir önceki giriş yöntemine geçmek için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
-msgstr ""
+msgstr "Otomatik gizle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"Özellik panelinin davranışı. 0 = Gösterme, 1 = Otomatik gizle, 2 = Her zaman "
+"göster"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
-msgstr ""
+msgstr "Dil panelinin konumu"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "Panelin her zaman gösterilmesi durumunda giriş imlecini takip et"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"Değer doğruysa, panelin her zaman gösterilmesi durumunda panel giriş "
+"imlecini izler. Yanlışsa, panel sabit bir yerde gösterilir."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "Özellik panelinin gösterileceği milisaniye süresi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
+"Odaklanıldığında veya özellikler değiştirildiğinde özellik panelinin "
+"gösterileceği milisaniye süresi."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
-msgstr ""
+msgstr "Arama tablosunun yönü"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
+msgstr "Arama tablosunun yönü: 0 = Yatay, 1 = Dikey"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:140
 #: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
 #: setup/setup.ui:475
 msgid "Show icon on system tray"
-msgstr ""
+msgstr "Simgeyi sistem tepsisinde göster"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
-msgstr ""
+msgstr "Giriş yöntemi adını göster"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 msgid "Show input method name on language bar"
-msgstr ""
+msgstr "Giriş yöntemi adını dil çubuğunda göster"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
-msgstr ""
+msgstr "XKB simgesinin RGBA değeri"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
@@ -235,10 +252,18 @@ msgid ""
 "to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"XKB simgesi yerleşim stringini gösterir ve string RGBA değeri ile "
+"oluşturulur. RGBA değeri; 1. X11'den bir renk adı, 2. 'r', 'g' ve 'b' "
+"kırmızı, yeşil ve mavinin onaltılık basamakları olmak üzere '#rrggbb' "
+"şeklinde bir onaltılık değer, 3. 'rgb(r,g,b)' biçimindeki bir RGB rengi veya "
+"4. 'r', 'g' ve 'b' 0 ila 255 aralığındaki tamsayılar veya %0 ile %100 "
+"aralığındaki yüzde değerleri ve 'a', alfa'nın 0 ile 1 aralığındaki bir "
+"ondalık sayı değeri olmak üzere 'rgba(r,g,b,a)' biçimindeki bir RGBA rengi "
+"olabilir."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "Bir özellik için panel simgesinin gösterileceği milisaniye süresi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
@@ -247,105 +272,119 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"Özellik, IBusEngineDesc'deki icon-prop-key değeri ile belirtilirse, motorlar "
+"her değiştirildiğinde, panel simgesini motor simgesinden bir özellik "
+"simgesine göstermek için milisaniye süresi. Değer 0 ise, gecikme süresi "
+"yoktur ve hemen özellik simgesi gösterilir."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
-msgstr ""
+msgstr "Özel yazı tipi kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr ""
+msgstr "Dil paneli için özel yazı tipi ismi kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
 #: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
-msgstr ""
+msgstr "Özel yazı tipi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr ""
+msgstr "Dil paneli için özel yazı tipi ismi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse için Unicode kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "Unicode yazmayı açmak veya kapatmak için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse için emoji kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
+msgstr "Emoji yazmayı açmak veya kapatmak için kısayol tuşları"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr ""
+msgstr "Emoji iletişim kutusundaki emoji karakterleri için özel yazı tipi adı"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
-msgstr ""
+msgstr "Emoji sözlüğü için varsayılan dil"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
+"Emoji iletişim kutusunda varsayılan bir emoji sözlük dili seçin. $lang "
+"değeri /usr/share/ibus/dicts/emoji-$lang.dict ögesine uygulanır"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
-msgstr ""
+msgstr "emoji iletişim kutusundaki favori emoji listesi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
+"Bu listede herhangi bir karakter varsa, favori emojileri emoji listesinde "
+"gösterebilirsiniz."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
+msgstr "emoji iletişim kutusundaki favori emoji ek açıklama listesi"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr ""
+msgstr "Bu listeden favori bir emoji için bir açıklama atayabilirsiniz."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr ""
+msgstr "Emoji ek açıklamalarının kısmen eşleşip eşleşemeyeceği"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
+"Emoji ek açıklamalarının tam eşleme yerine kısmi bir string ile eşleşip "
+"eşleşemeyeceği."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "Belirtilen uzunluktaki emoji ek açıklamalarıyla eşleştir"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
+"Emoji ek açıklamalarını, tam eşleşme yerine belirtilen sayıda karakterden "
+"fazlasıyla kısmen eşleştir."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
+msgstr "Emoji ek açıklamalarını kısmen eşleştirmek için bir koşul seçin"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Emoji ek açıklamalarını kısmen eşleştirmek için aşağıdaki koşullardan birini "
+"seçin: 0 == Önek eşlemesi, 1 == Sonek eşleşmesi, 2 == İçerilen eşleşme"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Emoji verilerini başlatma anında yükle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
@@ -353,10 +392,13 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Değer doğruysa, emoji verilerini başlatma anında yükle. Verileri yüklemek "
+"için yaklaşık 10 MB bellek gerekmektedir. Yanlışsa, emoji verilerini "
+"başlangıçta emoji iletişim kutusunu açarken yükle."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Unicode verilerini başlatma anında yükle"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
@@ -365,12 +407,18 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Değer doğruysa, Unicode verilerini başlatma anında yükle. Verileri yüklemek "
+"için yaklaşık 15 MB bellek gerekmektedir. Yanlışsa, Unicode verilerini "
+"başlangıçta emoji iletişim kutusunu açarken yükle. Doğru olsa bile, Unicode "
+"verileri, emoji verileri yüklendikten sonra her zaman yüklenir."
 
 #: ibus/_config.py.in:41
 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."
 
 #: ibus/lang.py:41 src/ibusutil.c:198
 msgid "Other"
@@ -391,7 +439,7 @@ msgstr "_Tamam"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
-msgstr "Dahası..."
+msgstr "Daha fazla…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
 msgid "About"
@@ -436,7 +484,7 @@ msgstr "Giriş Yöntemi"
 
 #: setup/enginetreeview.py:96
 msgid "Kbd"
-msgstr ""
+msgstr "Kbd"
 
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
@@ -444,7 +492,7 @@ msgstr "IBus Tercihleri"
 
 #: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
-msgstr ""
+msgstr "IBus Tercihlerini Ayarla"
 
 #: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -452,11 +500,11 @@ msgstr "Klavye kısayolları"
 
 #: setup/keyboardshortcut.py:67
 msgid "Key code:"
-msgstr "Anahtar kodu:"
+msgstr "Tuş kodu:"
 
 #: setup/keyboardshortcut.py:82
 msgid "Modifiers:"
-msgstr "Düzenleyiciler:"
+msgstr "Değiştiriciler:"
 
 #. apply button
 #: setup/keyboardshortcut.py:130
@@ -473,18 +521,20 @@ msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
+"Lütfen bir tuşa (veya tuş kombinasyonuna) basın.\n"
+"Tuş serbest bırakıldığında iletişim kutusu kapatılacaktır."
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr ""
+msgstr "Lütfen bir tuşa (veya bir tuş kombinasyonuna) basın"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
+msgstr "Önceki giriş yöntemine geçmek için kısayol ile shift tuşunu kullanın"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "IBus arka plan programı çalışmıyor. Başlatmak ister misiniz?"
 
 #: setup/main.py:536
 msgid ""
@@ -494,147 +544,152 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
+"IBus başlatıldı! IBus'ı kullanamıyorsanız, $HOME/.bashrc dosyanıza aşağıdaki "
+"satırları ekleyin; ardından masaüstünüze yeniden giriş yapın.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "IBus arka plan programı %d saniye içinde başlatılamadı"
 
 #: setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr ""
+msgstr "%s için klavye kısayolunu seçin"
 
 #. Translators: Title of the window
 #: setup/main.py:564
 msgid "switching input methods"
-msgstr ""
+msgstr "giriş yöntemlerini değiştirme"
 
 #: setup/setup.ui:11
 msgid "Horizontal"
-msgstr ""
+msgstr "Yatay"
 
 #: setup/setup.ui:14
 msgid "Vertical"
-msgstr ""
+msgstr "Dikey"
 
 #: setup/setup.ui:25
 msgid "Top left corner"
-msgstr ""
+msgstr "Sol üst köşe"
 
 #: setup/setup.ui:28
 msgid "Top right corner"
-msgstr ""
+msgstr "Sağ üst köşe"
 
 #: setup/setup.ui:31
 msgid "Bottom left corner"
-msgstr ""
+msgstr "Sol alt köşe"
 
 #: setup/setup.ui:34
 msgid "Bottom right corner"
-msgstr ""
+msgstr "Sağ alt köşe"
 
 #: setup/setup.ui:37
 msgid "Custom"
-msgstr ""
+msgstr "Özel"
 
 #: setup/setup.ui:48
 msgid "Do not show"
-msgstr ""
+msgstr "Gösterme"
 
 #: setup/setup.ui:51
 msgid "Hide automatically"
-msgstr ""
+msgstr "Otomatik gizle"
 
 #: setup/setup.ui:54
 msgid "Always"
-msgstr ""
+msgstr "Her zaman"
 
 #: setup/setup.ui:113
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
+msgstr "Listedeki bir sonraki giriş yöntemine geçmek için kısayol tuşları"
 
 #: setup/setup.ui:115
 msgid "Next input method:"
-msgstr ""
+msgstr "Sonraki giriş yöntemi:"
 
 #: setup/setup.ui:127
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
+msgstr "Listedeki bir önceki giriş yöntemine geçmek için kısayol tuşları"
 
 #: setup/setup.ui:129
 msgid "Previous input method:"
-msgstr ""
+msgstr "Önceki giriş yöntemi:"
 
 #: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
 #: setup/setup.ui:903 setup/setup.ui:957
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: setup/setup.ui:226
 msgid "Enable or disable:"
-msgstr ""
+msgstr "Etkinleştir veya devre dışı bırak:"
 
 #: setup/setup.ui:238
 msgid "Enable:"
-msgstr ""
+msgstr "Etkinleştir:"
 
 #: setup/setup.ui:291
 msgid "Disable:"
-msgstr ""
+msgstr "Devre dışı bırak:"
 
 #: setup/setup.ui:345 setup/setup.ui:983
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr ""
+msgstr "<b>Klavye Kısayolları</b>"
 
 #: setup/setup.ui:374
 msgid "Set the orientation of candidates in lookup table"
-msgstr ""
+msgstr "Arama tablosunda adayların yönünü ayarla"
 
 #: setup/setup.ui:376
 msgid "Candidates orientation:"
-msgstr ""
+msgstr "Adayların yönü:"
 
 #: setup/setup.ui:407
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+msgstr "Ibus'un dil çubuğunun nasıl gösterileceğini veya gizleneceğini ayarla"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
-msgstr ""
+msgstr "Özellik panelini göster:"
 
 #: setup/setup.ui:423
 msgid "Language panel position:"
-msgstr ""
+msgstr "Dil panelinin konumu:"
 
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
+msgstr "Onay kutusunu işaretlerken giriş yönteminin adını dil çubuğunda göster"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
-msgstr ""
+msgstr "Uygulama penceresinde ön-düzenleme metnini ekle"
 
 #: setup/setup.ui:513
 msgid "Embed the preedit text of input method in the application window"
-msgstr ""
+msgstr "Uygulama penceresinde, giriş yönteminin ön-düzenleme metnini ekle"
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
-msgstr ""
+msgstr "Özel yazı tipi kullan:"
 
 #: setup/setup.ui:562 setup/setup.ui:1156
 msgid "<b>Font and Style</b>"
-msgstr ""
+msgstr "<b>Yazı Tipi ve Stili</b>"
 
 #: setup/setup.ui:579
 msgid "General"
-msgstr ""
+msgstr "Genel"
 
 #: setup/setup.ui:671
 msgid "Add the selected input method into the enabled input methods"
-msgstr ""
+msgstr "Seçilen giriş yöntemini etkin giriş yöntemlerine ekle"
 
 #: setup/setup.ui:682
 msgid "_Remove"
@@ -642,23 +697,23 @@ msgstr "_Kaldır"
 
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
+msgstr "Seçilen giriş yöntemini etkin giriş yöntemlerinden kaldır"
 
 #: setup/setup.ui:700
 msgid "_Up"
-msgstr ""
+msgstr "_Yukarı"
 
 #: setup/setup.ui:707
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
+msgstr "Seçilen giriş yöntemini etkin giriş yöntemleri listesinde yukarı taşı"
 
 #: setup/setup.ui:718
 msgid "_Down"
-msgstr ""
+msgstr "_Aşağı"
 
 #: setup/setup.ui:725
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
+msgstr "Seçilen giriş yöntemini etkin giriş yöntemleri listesinde aşağı taşı"
 
 #: setup/setup.ui:736
 msgid "_About"
@@ -666,7 +721,7 @@ msgstr "_Hakkında"
 
 #: setup/setup.ui:743
 msgid "Show information of the selected input method"
-msgstr ""
+msgstr "Seçilen giriş yönteminin bilgilerini göster"
 
 #: setup/setup.ui:754
 msgid "_Preferences"
@@ -674,7 +729,7 @@ msgstr "_Tercihler"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
-msgstr ""
+msgstr "Seçilen giriş yönteminin ayarlarını göster"
 
 #: setup/setup.ui:812
 msgid ""
@@ -682,76 +737,85 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>Etkin giriş yöntemi, klavye kısayol tuşlarına basarak veya panel "
+"simgesine tıklayarak yukarıdaki listede seçilenler arasında "
+"değiştirilebilir.</i></small>"
 
 #: setup/setup.ui:873
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode "
 "names"
 msgstr ""
+"Emoji ek açıklamalarının veya Unicode isimlerinin dönüşümlerini "
+"etkinleştirmek için kısayol tuşları"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
-msgstr ""
+msgstr "Emoji ek açıklaması:"
 
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "Unicode kod noktası dönüşümlerini etkinleştirmek için kısayol tuşları"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode kod noktası:"
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "Emoji iletişim kutusunda Unicode adaylarının yazı tipini ayarla"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
-msgstr ""
+msgstr "Unicode yazı tipi:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
+msgstr "Emoji iletişim kutusunda emoji ek açıklamalarının dilini ayarla"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
-msgstr ""
+msgstr "Emoji ek açıklaması dili:"
 
 #: setup/setup.ui:1062
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
+"Emoji ek açıklamalarını kısmen aşağıdaki koşulla ve karakter sayısından daha "
+"fazlasıyla eşleştir:"
 
 #: setup/setup.ui:1067
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
+"Emoji ek açıklamalarının tam eşleşme yerine kısmi bir string ile eşleşip "
+"eşleşemeyeceği"
 
 #: setup/setup.ui:1101
 msgid "Prefix match"
-msgstr ""
+msgstr "Önek eşleşmesi"
 
 #: setup/setup.ui:1115
 msgid "Suffix match"
-msgstr ""
+msgstr "Sonek eşleşmesi"
 
 #: setup/setup.ui:1130
 msgid "Containing match"
-msgstr ""
+msgstr "Eşleşme içeren"
 
 #: setup/setup.ui:1176
 msgid "Emoji"
-msgstr ""
+msgstr "Emoji"
 
 #: setup/setup.ui:1230
 msgid "<b>Keyboard Layout</b>"
-msgstr ""
+msgstr "<b>Klavye Düzeni</b>"
 
 #: setup/setup.ui:1278
 msgid "<b>Global input method settings</b>"
-msgstr ""
+msgstr "<b>Global giriş yöntemi ayarları</b>"
 
 #: setup/setup.ui:1298
 msgid "Advanced"
@@ -766,2366 +830,2376 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Akıllı giriş veri yolu</small>\n"
+"Ana sayfa: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: setup/setup.ui:1341
 msgid "Start ibus on login"
-msgstr ""
+msgstr "Girişte ibus'ı başlat"
 
 #: setup/setup.ui:1358
 msgid "<b>Startup</b>"
-msgstr ""
+msgstr "<b>Başlangıç</b>"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
-msgstr ""
+msgstr "Aktiviteler"
 
 #: src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr ""
+msgstr "Hayvanlar & Doğa"
 
 #: src/ibusemojigen.h:32
 msgid "Component"
-msgstr ""
+msgstr "Bileşen"
 
 #: src/ibusemojigen.h:33
 msgid "Flags"
-msgstr ""
+msgstr "Bayraklar"
 
 #: src/ibusemojigen.h:34
 msgid "Food & Drink"
-msgstr ""
+msgstr "Yiyecek & İçecek"
 
 #: src/ibusemojigen.h:35
 msgid "Objects"
-msgstr ""
+msgstr "Nesneler"
 
 #: src/ibusemojigen.h:36
 msgid "People & Body"
-msgstr ""
+msgstr "İnsanlar & Vücut"
 
 #: src/ibusemojigen.h:37
 msgid "Smileys & Emotion"
-msgstr ""
+msgstr "Gülüşler & Duygular"
 
 #: src/ibusemojigen.h:38
 msgid "Symbols"
-msgstr ""
+msgstr "Semboller"
 
 #: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr ""
+msgstr "Seyahat & Yerler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Temel Latin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latin-1 İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latin Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latin Genişletilmiş-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA Uzantıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Boşluk Değiştirici Harfler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Birleşik Aksan İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Yunan ve Kıpti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kiril"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Kiril İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Ermeni"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "İbrani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arap"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Süryani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arap İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samiriyeli"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandaik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Süryani İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arap Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Taylandlı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Gürcü"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Etiyopya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Etiyopya İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Birleşik Kanada Yerli Heceleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Kmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Moğol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Birleşik Kanada Yerli Heceleri Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Yeni Tai Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Kmer Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Bugis"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Birleşik Aksan İşaretleri Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Bali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sunda"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Kiril Genişletilmiş-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:285
 msgid "Georgian Extended"
-msgstr ""
+msgstr "Gürcü Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Sunda İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Vedik Uzantılar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Fonetik Uzantılar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Fonetik Uzantılar İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Birleşik Aksan İşaretleri İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latin Genişletilmiş Ek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:313
 msgid "Greek Extended"
-msgstr ""
+msgstr "Yunan Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:317
 msgid "General Punctuation"
-msgstr ""
+msgstr "Genel Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Üst Simgeler ve Alt Simgeler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Para Birimi Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Semboller için Birleşik Aksan İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Harf Benzeri Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:337
 msgid "Number Forms"
-msgstr ""
+msgstr "Sayı Formları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:341
 msgid "Arrows"
-msgstr ""
+msgstr "Oklar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Matematiksel Operatörler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Çeşitli Teknik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:353
 msgid "Control Pictures"
-msgstr ""
+msgstr "Kontrol Resimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optik Karakter Tanıma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Kapalı Alfanumerik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:365
 msgid "Box Drawing"
-msgstr ""
+msgstr "Kutu Çizimi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:369
 msgid "Block Elements"
-msgstr ""
+msgstr "Blok Elemanları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometrik Şekiller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Çeşitli Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:381
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbat'ler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Çeşitli Matematiksel Semboller-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "İlave Oklar-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Braille Desenleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "İlave Oklar-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Çeşitli Matematiksel Semboller-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "İlave Matematiksel Operatörler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Çeşitli Semboller ve Oklar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latin Genişletilmiş-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:421
 msgid "Coptic"
-msgstr ""
+msgstr "Kıpti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Gürcü İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:429
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Etiyopya Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Kiril Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "İlave Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK Radikaller İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kangxi Radikaller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "İdeografik Açıklama Karakterleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK Sembolleri ve Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:469
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul Uyumlu Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:477
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK Çizgileri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Katakana Fonetik Uzantılar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Kapalı CJK Harfleri ve Ayları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK Uyumluluğu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Yijing Altıgen Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi Heceleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi Radikaller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:525
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Kiril Genişletilmiş-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:533
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Değiştirici Ton Harfleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latin Genişletilmiş-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Ortak Hint Sayı Formları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:553
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:557
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:565
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:569
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul Jamo Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:577
 msgid "Javanese"
-msgstr ""
+msgstr "Cava"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Myanmar Genişletilmiş-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:585
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Myanmar Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:593
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meetei Mayek Uzantılar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Etiyopya Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latin Genişletilmiş-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokee İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangul Heceleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul Jamo Genişletilmiş-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:625
 msgid "High Surrogates"
-msgstr ""
+msgstr "Yüksek Temsilciler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Yüksek Özel Kullanımlı Temsilciler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Düşük Temsilciler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:637
 msgid "Private Use Area"
-msgstr ""
+msgstr "Özel Kullanım Alanı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK Uyumluluk İdeografları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alfabetik Sunum Formları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arapça Sunum Formları-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Varyasyon Seçiciler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Dikey Formlar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Birleşik Yarım İşaretler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK Uyumluluk Formları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Küçük Form Varyantları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arapça Sunum Formları-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Yarım ve Tam Genişlik Formları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:681
 msgid "Specials"
-msgstr ""
+msgstr "Özel Karakterler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Doğrusal B Heceler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Doğrusal B İdeogramlar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Ege Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Antik Yunan Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Antik Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Phaistos Diski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:709
 msgid "Lycian"
-msgstr ""
+msgstr "Likya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:713
 msgid "Carian"
-msgstr ""
+msgstr "Karya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Kıpti Epakt Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr ""
+msgstr "Eski İtalik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "Gotik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "Eski Permik"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:733
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugarit"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:737
 msgid "Old Persian"
-msgstr ""
+msgstr "Eski Fars"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:741
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:745
 msgid "Shavian"
-msgstr ""
+msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:749
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Kafkas Arnavut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "Doğrusal A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Kıbrıs Heceler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "İmparatorluk Aramice"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmira"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "Nebati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:785
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:789
 msgid "Phoenician"
-msgstr ""
+msgstr "Fenike"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:793
 msgid "Lydian"
-msgstr ""
+msgstr "Lidya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroitik Hiyeroglifler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroitik El Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Eski Güney Arap"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Eski Kuzey Arap"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:817
 msgid "Manichaean"
-msgstr ""
+msgstr "Mani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:821
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Kitabe Parthia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Kitabe Pehlevi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Mezmur Pehlevi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:837
 msgid "Old Turkic"
-msgstr ""
+msgstr "Eski Türk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Eski Macar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:845
 msgid "Hanifi Rohingya"
-msgstr ""
+msgstr "Hanifi Rohingya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Rumi Sayısal Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
 msgid "Old Sogdian"
-msgstr ""
+msgstr "Eski Soğd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
 msgid "Sogdian"
-msgstr ""
+msgstr "Soğd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
 msgid "Elymaic"
-msgstr ""
+msgstr "Elam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:877
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:881
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:885
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Sinhala Arkaik Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:893
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:897
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:901
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:905
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:909
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:913
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:917
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:921
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Moğol İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:929
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:933
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
 msgid "Dogra"
-msgstr ""
+msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:941
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
 msgid "Nandinagari"
-msgstr ""
+msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar Kare"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:965
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
-msgstr ""
+msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
 msgid "Makasar"
-msgstr ""
+msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
 msgid "Tamil Supplement"
-msgstr ""
+msgstr "Tamil İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:985
 msgid "Cuneiform"
-msgstr ""
+msgstr "Çivi Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Çivi Yazısı Sayılar ve Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Erken Hanedan Çivi Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Mısır Hiyeroglifleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
 msgid "Egyptian Hieroglyph Format Controls"
-msgstr ""
+msgstr "Mısır Hiyeroglif Format Kontrolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anadolu Hiyeroglifleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1013
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
-msgstr ""
+msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1029
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "İdeografik Semboller ve Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1037
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
-msgstr ""
+msgstr "Tangut Bileşenler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
 msgid "Small Kana Extension"
-msgstr ""
+msgstr "Küçük Kana Uzantı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
 msgid "Duployan"
-msgstr ""
+msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Kestirme Format Kontrolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Bizans Müzikal Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Müzikal Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Antik Yunan Müzik Notaları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
-msgstr ""
+msgstr "Maya Rakamları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai Xuan Jing Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Sayma Çubuğu Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Matematiksel Alfanumerik Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Sutton İşaret Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolitik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
 msgid "Nyiakeng Puachue Hmong"
-msgstr ""
+msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
 msgid "Wancho"
-msgstr ""
+msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
-msgstr ""
+msgstr "Hint Siyaq Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
 msgid "Ottoman Siyaq Numbers"
-msgstr ""
+msgstr "Osmanlı Siyaq Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arapça Matematiksel Alfabetik Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Mahjong Taşları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Domino Taşları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
-msgstr ""
+msgstr "İskambil Kağıtları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Kapalı Alfanumerik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Kapalı İdeografik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Çeşitli Semboller ve Piktograflar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1157
 msgid "Emoticons"
-msgstr ""
+msgstr "İfadeler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Süsleme Dingbat'leri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Ulaşım ve Harita Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Simya Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Geometrik Şekiller Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "İlave Oklar-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "İlave Semboller ve Piktograflar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
-msgstr ""
+msgstr "Satranç Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1189
 msgid "Symbols and Pictographs Extended-A"
-msgstr ""
+msgstr "Semboller ve Piktograflar Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "CJK Birleşik İdeograflar Uzantı F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "CJK Uyumluluk İdeografları İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
 msgid "Tags"
-msgstr ""
+msgstr "Etiketler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Varyasyon Seçiciler İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "İlave Özel Kullanım Alanı-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "İlave Özel Kullanım Alanı-B"
 
 #: tools/main.vala:51
 msgid "List engine name only"
-msgstr ""
+msgstr "Yalnızca motor adını listele"
 
 #: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "IBus'a bağlanılamıyor.\n"
 
 #: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "dil: %s\n"
 
 #: tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "Motor ayarlanmadı.\n"
 
 #: tools/main.vala:169
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "Global motor ayarlanamadı.\n"
 
 #: tools/main.vala:174
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "Global motor alınamadı.\n"
 
 #: tools/main.vala:217
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Sistem kayıt önbelleğini oku."
 
 #: tools/main.vala:219
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Kayıt önbellek DOSYASI'nı oku."
 
 #: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "Kayıt önbelleği geçersiz.\n"
 
 #: tools/main.vala:257
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Sistem kayıt önbelleğini yaz."
 
 #: tools/main.vala:259
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Kayıt önbelleği DOSYASI'nı yaz."
 
 #: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Ibus çekirdeği yerine, virgülle ayrılmış değerler olabilecek motor şema "
+"yollarını kullan."
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr ""
+msgstr "Sıfırlanıyor…"
 
 #: tools/main.vala:399
 msgid "Done"
-msgstr ""
+msgstr "Bitti"
 
 #: tools/main.vala:444
 msgid "Set or get engine"
-msgstr ""
+msgstr "Motoru ayarla veya al"
 
 #: tools/main.vala:445
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "ibus-daemon'dan çık"
 
 #: tools/main.vala:446
 msgid "Show available engines"
-msgstr ""
+msgstr "Mevcut motorları göster"
 
 #: tools/main.vala:447
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Uygulanmadı)"
 
 #: tools/main.vala:448
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "ibus-daemon'u yeniden başlat"
 
 #: tools/main.vala:449
 msgid "Show version"
-msgstr ""
+msgstr "Versiyonu göster"
 
 #: tools/main.vala:450
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Kayıt önbelleğinin içeriğini göster"
 
 #: tools/main.vala:451
 msgid "Create registry cache"
-msgstr ""
+msgstr "Kayıt önbelleği oluştur"
 
 #: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "ibus-daemon'un D-Bus adresini yazdır"
 
 #: tools/main.vala:453
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Yapılandırma değerlerini göster"
 
 #: tools/main.vala:454
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Yapılandırma değerlerini sıfırla"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgstr "İletişim kutusundaki emojiyi panoya kaydet "
 
 #: tools/main.vala:458
 msgid "Show this information"
-msgstr ""
+msgstr "Bu bilgiyi göster"
 
 #: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
+"Kullanım: %s KOMUT [SEÇENEK...]\n"
+"\n"
 
 #: tools/main.vala:465
 msgid "Commands:\n"
-msgstr ""
+msgstr "Komutlar:\n"
 
 #: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s, bilinmeyen komut!\n"
 
 #: ui/gtk3/emojier.vala:233
 msgid "Favorites"
-msgstr ""
+msgstr "Favoriler"
 
 #: ui/gtk3/emojier.vala:234
 msgid "Others"
-msgstr ""
+msgstr "Diğer"
 
 #: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "Unicode seçimini aç"
 
 #: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Emoji seçimini geri getir"
 
 #: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
-msgstr ""
+msgstr "Sayfa Aşağı"
 
 #: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
-msgstr ""
+msgstr "Sayfa Yukarı"
 
 #: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
-msgstr ""
+msgstr "Emoji çeşitlerini göster"
 
 #: ui/gtk3/emojier.vala:1111
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #: ui/gtk3/emojier.vala:1117
 msgid "Menu"
-msgstr ""
+msgstr "Menü"
 
 #: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Bir uyarı mesajı görmek için tıklayın"
 
 #: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "Unicode sözlük yükleme:"
 
 #: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "Kod noktası: %s"
 
 #: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
-msgstr ""
+msgstr "Emoji çeşitleri var"
 
 #: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
-msgstr ""
+msgstr "Açıklama: %s"
 
 #: ui/gtk3/emojier.vala:1591
 msgid "None"
-msgstr ""
+msgstr "Hiçbiri"
 
 #: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
-msgstr ""
+msgstr "Ek açıklamalar: %s"
 
 #: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "İsim: %s"
 
 #: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
-msgstr ""
+msgstr "Takma ad: %s"
 
 #: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
-msgstr ""
+msgstr "Emoji Seçimi"
 
 #: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Unicode Seçimi"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
@@ -3133,60 +3207,65 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Mevcut metin uygulaması alınamadı. Lütfen uygulamanızı yeniden odaklayın. "
+"Örn. emoji yazma modunu bırakmak için Esc tuşuna birkaç kez basın, "
+"masaüstünüze ve metin uygulamanıza tekrar tıklayın."
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
-msgstr ""
+msgstr "Bir emoji seçmek için iptal edildi."
 
 #: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
-msgstr ""
+msgstr "Bir emoji panonuza kopyalandı."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #. 
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr ""
+msgstr "Emoji iletişim kutusundaki emoji karakterleri için \"YAZI TİPİ\""
 
 #: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
-msgstr ""
+msgstr "YAZI TİPİ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "Emoji iletişim kutusundaki ek açıklamalar için \"DİL\". Örn. \"tr\""
 
 #: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
-msgstr ""
+msgstr "DİL"
 
 #: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "Emoji ek açıklamaları kısmen eşleşebilir"
 
 #: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "Belirtilen tamsayı uzunluğuyla eşleştir"
 
 #: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "Belirtilen tamsayı koşuluyla eşleştir"
 
 #: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
-msgstr ""
+msgstr "IBus Paneli"
 
 #: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr ""
+msgstr "IBus, Linux/Unix için akıllı bir giriş veri yoludur."
 
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
-msgstr "Serdar Sağlam <teknomobil@yandex.com, 2019."
+msgstr ""
+"Serdar Sağlam <teknomobil@yandex.com>, 2019.\n"
+"Oğuz Ersen <oguzersen@protonmail.com>, 2019"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"
@@ -3194,7 +3273,7 @@ msgstr "Tercihler"
 
 #: ui/gtk3/panel.vala:1144
 msgid "Restart"
-msgstr ""
+msgstr "Yeniden başlat"
 
 #: ui/gtk3/panel.vala:1148
 msgid "Quit"
@@ -3204,4 +3283,4 @@ msgstr "Çık"
 #. * Otherwise the msgstr is "default:LTR".
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
-msgstr ""
+msgstr "varsayılan:LTR (soldan sağa)"

From fc2328e7e39c8fc55a7950522aeb2798cf2750cc Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Mon, 6 Jan 2020 19:39:34 +0900
Subject: [PATCH 608/816] Translated using Weblate (German)

Currently translated at 100.0% (514 of 514 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/de/
---
 po/de.po | 657 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 340 insertions(+), 317 deletions(-)

diff --git a/po/de.po b/po/de.po
index 0742ef4b4..ccd99175e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -18,20 +18,22 @@
 # Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
 # Tobias Weise <tobias.weise@web.de>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Mike FABIAN <mfabian@redhat.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
+"Language-Team: German <https://translate.stg.fedoraproject.org/projects/ibus/"
+"ibus/de/>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: German <trans-de@lists.fedoraproject.org>\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -266,35 +268,39 @@ msgstr "Emoji Font:"
 
 #: ../setup/setup.ui.h:53
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Einstellen einer Sprache für Emoji-Annotationen im Emoji-Dialog"
+msgstr "Einstellen einer Sprache für Emojianmerkungen im Emojidialog"
 
 #: ../setup/setup.ui.h:54
 msgid "Emoji annotation language:"
-msgstr "Emoji-Annotationssprache:"
+msgstr "Emojianmerkungssprache:"
 
 #: ../setup/setup.ui.h:55
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
+"Nach teilweisen Übereinstimmungen in Emojianmerkungen suchen mit folgender "
+"Bedingung und mehr als der folgenden Anzahl von Zeichen:"
 
 #: ../setup/setup.ui.h:56
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
+"Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
+"müssen anstatt mit kompletten Zeichenfolge"
 
 #: ../setup/setup.ui.h:57
 msgid "Prefix match"
-msgstr ""
+msgstr "Präfix-Übereinstimmung"
 
 #: ../setup/setup.ui.h:58
 msgid "Suffix match"
-msgstr ""
+msgstr "Suffix-Übereinstimmung"
 
 #: ../setup/setup.ui.h:59
 msgid "Containing match"
-msgstr ""
+msgstr "Enthält den Text"
 
 #: ../setup/setup.ui.h:60
 msgid "Emoji"
@@ -318,7 +324,7 @@ msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
 #: ../setup/setup.ui.h:65
 msgid "<b>Global input method settings</b>"
-msgstr "Eingabemethode wählen"
+msgstr "<b>Globale Inputmethodeneinstellungen</b>"
 
 #: ../setup/setup.ui.h:66
 msgid "Advanced"
@@ -558,6 +564,11 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"Millisekunden, die es dauert bevor das Panel-Icon vom Engine-Icon zum "
+"Property-Icon wechselt wenn Engines gewechselt werden wenn die Property "
+"durch den Wert von icon-prop-key in IBusEngineDesc spezifiziert ist. Wenn "
+"der Wert 0 ist, gibt es keine Verzögerungszeit und das Property-Icon wird "
+"sofort gezeigt."
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Use custom font"
@@ -613,41 +624,52 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:57
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
+msgstr "Anmerkungsliste für bevorzugte Emoji im Emojidialog"
 
 #: ../data/ibus.schemas.in.h:58
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
+"In dieser Liste kann man eine Anmerkung für  bevorzugte Emoji definieren."
 
 #: ../data/ibus.schemas.in.h:59
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
+"Ob in Emojianmerkungen mit  teilweiser  Übereinstimmung gesucht wird oder  "
+"nicht"
 
 #: ../data/ibus.schemas.in.h:60
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
+"Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
+"müssen anstatt mit kompletten Zeichenfolge."
 
 #: ../data/ibus.schemas.in.h:61
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "Finde Emojianmerkungen mit der angegebenen Länge"
 
 #: ../data/ibus.schemas.in.h:62
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
+"Finde Emojianmerkungen mit teilweiser Übereinstimmung mit mehr als der "
+"angegebenen Zahl von Zeichen anstelle von exakter Übereinstimmung."
 
 #: ../data/ibus.schemas.in.h:63
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
+"Wähle eine Bedingung um nach teilweisen Übereinstimmungen in "
+"Emojianmerkungen zu suchen"
 
 #: ../data/ibus.schemas.in.h:64
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Wähle eine der folgenden Bedingungen um nach teilweisen Übereinstimmungen in "
+"Emojianmerkungen zu suchen: 0 == Präfix, 1  == Suffix, 2  == Mittendrin"
 
 #: ../data/ibus.schemas.in.h:65
 msgid "Embed Preedit Text"
@@ -852,1960 +874,1960 @@ msgstr "Reisen & Orte"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Basis-Lateinisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Lateinisch-1, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Lateinisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Lateinisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "IPA Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Nichtkombinierende Zusatzzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Kombinierende diakritische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Griechisch und koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrillisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Kyrillisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armenisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebräisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Syrisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Arabisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "N’Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samaritanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Syrisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Arabisch, Erweiterung A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tamilisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Singhalesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Thailändisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Laotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Birmanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangeul-Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Äthiopisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Äthiopisch, Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Runen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunóo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanuwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongolisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Neu-Tai-Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Khmer-Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Lanna"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Kombinierende diakritische Zeichen, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Kyrillisch, erweitert-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:285
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Sundanesisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:289
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Vedische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:293
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Phonetische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:297
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Phonetische Erweiterungen, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:301
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Kombinierende diakritische Zeichen, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:305
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Lateinisch, weiterer Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:309
 msgid "Greek Extended"
-msgstr ""
+msgstr "Griechisch, Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:313
 msgid "General Punctuation"
-msgstr ""
+msgstr "Allgemeine Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:317
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Hoch- und tiefgestellte Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:321
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Währungszeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:325
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Kombinierende diakritische Zeichen für Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:329
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Buchstabenähnliche Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:333
 msgid "Number Forms"
-msgstr ""
+msgstr "Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:337
 msgid "Arrows"
-msgstr ""
+msgstr "Pfeile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:341
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Mathematische Operatoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:345
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Verschiedene technische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:349
 msgid "Control Pictures"
-msgstr ""
+msgstr "Symbole für Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:353
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Optische Zeichenerkennung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:357
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Umschlossene alphanumerische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:361
 msgid "Box Drawing"
-msgstr ""
+msgstr "Rahmenzeichnung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:365
 msgid "Block Elements"
-msgstr ""
+msgstr "Blockelemente"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:369
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Geometrische Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:373
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Verschiedene Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:377
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:381
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Verschiedene mathematische Symbole-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:385
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Zusätzliche Pfeile-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:389
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Braille-Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Zusätzliche Pfeile-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:397
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Verschiedene mathematische Symbole-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:401
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Zusätzliche Mathematische Operatoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:405
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Verschiedene Symbole und Pfeile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:409
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolitisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:413
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Lateinisch, erweitert-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:417
 msgid "Coptic"
-msgstr ""
+msgstr "Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:421
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Georgisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:425
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:429
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Äthiopisch, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:433
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Kyrillisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:437
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Zusätzliche Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:441
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "CJK-Radikale, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:445
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Kangxi-Radikale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:449
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Ideographische Beschreibungszeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:453
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "CJK-Symbole und -Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:457
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:461
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:465
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:469
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangeul-Jamo, Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:473
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:477
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:481
 msgid "CJK Strokes"
-msgstr ""
+msgstr "CJK-Striche"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:485
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Katakana, Phonetische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:489
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Umschlossene CJK-Zeichen und -Monate"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:493
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "CJK-Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:497
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:501
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "I-Ging-Hexagramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:509
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Yi-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:513
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Yi-Radikale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:517
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:521
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:525
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Kyrillisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:529
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:533
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Modifizierende Tonzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:537
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Lateinisch, erweitert-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:541
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:545
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Allgemeine indische Ziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:549
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phagspa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:553
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:557
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:561
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:565
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:569
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangeul-Jamo, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:573
 msgid "Javanese"
-msgstr ""
+msgstr "Javanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:577
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Birmanisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:581
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:585
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Birmanisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:589
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:593
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Meitei-Mayek, Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:597
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Äthiopisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:601
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Lateinisch, erweitert-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:605
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokee, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:609
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meitei-Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:613
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Hangeul-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:617
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangeul-Jamo, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:621
 msgid "High Surrogates"
-msgstr ""
+msgstr "High Surrogates"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:625
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "High Surrogates (privater Bereich)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:629
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Low Surrogates"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:633
 msgid "Private Use Area"
-msgstr ""
+msgstr "Private Use Zone"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:637
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "CJK-Ideogramme, Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:641
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Alphabetische Präsentationsformen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:645
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Arabische Präsentationsformen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:649
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Variantenselektoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:653
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Vertikale Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:657
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Kombinierende halbe diakritische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:661
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "CJK-Kompatibilitätsformen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:665
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Kleine Formvarianten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:669
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Arabische Präsentationsformen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:673
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Halbbreite und vollbreite Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:677
 msgid "Specials"
-msgstr ""
+msgstr "Spezielles"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:681
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Linear-B-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:685
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Linear-B-Ideogramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:689
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Ägäische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:693
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Altgriechische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:697
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "Alte Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:701
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Diskos von Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:705
 msgid "Lycian"
-msgstr ""
+msgstr "Lykisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:709
 msgid "Carian"
-msgstr ""
+msgstr "Karisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:713
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Koptische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:717
 msgid "Old Italic"
-msgstr ""
+msgstr "Altitalisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:721
 msgid "Gothic"
-msgstr ""
+msgstr "Gotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:725
 msgid "Old Permic"
-msgstr ""
+msgstr "Altpermisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:729
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugaritisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:733
 msgid "Old Persian"
-msgstr ""
+msgstr "Altpersisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:737
 msgid "Deseret"
-msgstr ""
+msgstr "Mormonenalphabet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:741
 msgid "Shavian"
-msgstr ""
+msgstr "Shaw-Alphabet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:745
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmaniya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:749
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:753
 msgid "Elbasan"
-msgstr ""
+msgstr "Albanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:757
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Alwanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:761
 msgid "Linear A"
-msgstr ""
+msgstr "Linear A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:765
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Kyprische Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:769
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Aramäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:773
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmyrenisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:777
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabatäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:781
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:785
 msgid "Phoenician"
-msgstr ""
+msgstr "Phönizisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:789
 msgid "Lydian"
-msgstr ""
+msgstr "Lydisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:793
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Meroitische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:797
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroitisch-demotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:801
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:805
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Altsüdarabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:809
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Altnordarabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:813
 msgid "Manichaean"
-msgstr ""
+msgstr "Manichäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:817
 msgid "Avestan"
-msgstr ""
+msgstr "Avestisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:821
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Parthisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:825
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Inschriften-Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:829
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Psalter-Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:833
 msgid "Old Turkic"
-msgstr ""
+msgstr "Alttürkisch (Orchon-Runen)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:837
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Altungarisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:841
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Rumi-Ziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:845
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:849
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:853
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sorang-Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:857
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:861
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:865
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:869
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Singhalesische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:873
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:877
 msgid "Multani"
-msgstr ""
+msgstr "Multanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:881
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudabadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:885
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:889
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:893
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:897
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:901
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:905
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongolisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:909
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:913
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:917
 msgid "Warang Citi"
-msgstr ""
+msgstr "Varang Kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:921
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Dsanabadsar-Quadratschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:925
 msgid "Soyombo"
-msgstr ""
+msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:929
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:933
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:937
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:941
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:945
 msgid "Cuneiform"
-msgstr ""
+msgstr "Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:949
 msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgstr "Keilschrift-Zahlzeichen und -Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:953
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Frühe Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:957
 msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgstr "Ägyptische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:961
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Anatolische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:965
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Bamum, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:969
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:973
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:977
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:981
 msgid "Miao"
-msgstr ""
+msgstr "Pollard-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:985
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Ideographische Symbole und Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:989
 msgid "Tangut"
-msgstr ""
+msgstr "Xixia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:993
 msgid "Tangut Components"
-msgstr ""
+msgstr "Xixia-Komponenten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:997
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Kana, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1001
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1005
 msgid "Nushu"
-msgstr ""
+msgstr "Frauenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1009
 msgid "Duployan"
-msgstr ""
+msgstr "Duployé-Kurzschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1013
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Kurzschrift-Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1017
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Byzantinische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1021
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1025
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Altgriechische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1029
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Tai-Xuan-Jing-Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1033
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Zählstabziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1037
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1041
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Sutton-SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1045
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Glagolitisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1049
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1053
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1057
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Arabische mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1061
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Mahjonggsteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1065
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Dominosteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1069
 msgid "Playing Cards"
-msgstr ""
+msgstr "Spielkarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1073
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Zusätzliche umschlossene alphanumerische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1077
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Zusätzliche umschlossene CJK-Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1081
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Verschiedene piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1085
 msgid "Emoticons"
-msgstr ""
+msgstr "Smileys"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1089
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Ziersymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1093
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Verkehrs- und Kartensymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1097
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Alchemistische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1101
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Geometrische Formen, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1105
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Zusätzliche Pfeile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1109
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Zusätzliche piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1113
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1117
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1121
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1125
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1129
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1133
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "CJK-Ideogramme, Kompatibilität, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1137
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1141
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Variantenselektoren, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1145
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Supplementary Private Use Area-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: ../src/ibusunicodegen.h:1149
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Supplementary Private Use Area-B"
 
 #: ../tools/main.vala:54
 msgid "List engine name only"
@@ -2887,7 +2909,7 @@ msgstr "Anzeigen Version"
 
 #: ../tools/main.vala:379
 msgid "Show the content of registry cache"
-msgstr "Anzeigen Inhalt des Registry-Cache."
+msgstr "Anzeigen des Registry-Cache Inhalts"
 
 #: ../tools/main.vala:380
 msgid "Create registry cache"
@@ -2907,7 +2929,7 @@ msgstr "Zurücksetzen der Konfigurationswerte"
 
 #: ../tools/main.vala:385
 msgid "Save emoji on dialog to clipboard "
-msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage"
+msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage "
 
 #: ../tools/main.vala:387
 msgid "Show this information"
@@ -2947,12 +2969,12 @@ msgstr "Andere"
 
 #: ../ui/gtk3/emojier.vala:275
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "Öffne Unicodeauswahl"
 
 #: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
 #: ../ui/gtk3/panel.vala:1149
 msgid "Emoji Choice"
-msgstr ""
+msgstr "Emojiauswahl"
 
 #: ../ui/gtk3/emojier.vala:451
 msgid "Type annotation or choose emoji"
@@ -2960,15 +2982,15 @@ msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
 
 #: ../ui/gtk3/emojier.vala:948
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Unicodeauswahl"
 
 #: ../ui/gtk3/emojier.vala:950
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Zurück zur Emojiauswahl"
 
 #: ../ui/gtk3/emojier.vala:1016
 msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "Lade ein Unicodewörterbuch:"
 
 #: ../ui/gtk3/emojier.vala:1071
 msgid "Page Down"
@@ -2981,11 +3003,11 @@ msgstr "Seite hoch"
 #: ../ui/gtk3/emojier.vala:1236
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "Codepoint: %s"
 
 #: ../ui/gtk3/emojier.vala:1242
 msgid "Has emoji variants"
-msgstr ""
+msgstr "Hat Emojivarianten"
 
 #: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
 #, c-format
@@ -2994,26 +3016,26 @@ msgstr "Beschreibung: %s"
 
 #: ../ui/gtk3/emojier.vala:1377
 msgid "None"
-msgstr "Kein"
+msgstr "Keine"
 
 #: ../ui/gtk3/emojier.vala:1402
 #, c-format
 msgid "Annotations: %s"
-msgstr "Annotationen: %s"
+msgstr "Anmerkungen: %s"
 
 #: ../ui/gtk3/emojier.vala:1428
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Name: %s"
 
 #: ../ui/gtk3/emojier.vala:1436
 #, c-format
 msgid "Alias: %s"
-msgstr ""
+msgstr "Alias: %s"
 
 #: ../ui/gtk3/emojierapp.vala:56
 msgid "Canceled to choose an emoji."
-msgstr "Abbrechen der Emoji-Auswahl."
+msgstr "Abbrechen der Emojiauswahl."
 
 #: ../ui/gtk3/emojierapp.vala:77
 msgid "Copied an emoji to your clipboard."
@@ -3024,34 +3046,34 @@ msgstr "Emoji in die Zwischenablage kopiert."
 #. 
 #: ../ui/gtk3/emojierapp.vala:97
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr ""
+msgstr "„SCHRIFTART“ für Emojizeichen im Emojidialog"
 
 #: ../ui/gtk3/emojierapp.vala:98
 msgid "FONT"
-msgstr "SCHRIFT"
+msgstr "SCHRIFTART"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
 #: ../ui/gtk3/emojierapp.vala:103
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "„SPRACHE“ für Emojianmerkungen im Emojidialog. Zum Beispiel „en“"
 
 #: ../ui/gtk3/emojierapp.vala:104
 msgid "LANG"
-msgstr ""
+msgstr "SPRACHE"
 
 #: ../ui/gtk3/emojierapp.vala:106
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "Emojianmerkungen finden mit teilweiser Übereinstimmung"
 
 #: ../ui/gtk3/emojierapp.vala:110
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "Übereinstimmung  mit Länge  der angegebenen ganzen Zahl"
 
 #: ../ui/gtk3/emojierapp.vala:114
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "Übereinstimmung mit der Bedingung der angegebenen ganzen Zahl"
 
 #: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
 msgid "IBus Panel"
@@ -3073,7 +3095,8 @@ msgstr "IBus ist ein intelligenter Eingabe-Bus für Linux/Unix."
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
-"Hedda Peters <hpeters@redhat.com>, 2009."
+"Hedda Peters <hpeters@redhat.com>, 2009.\n"
+"Mike FABIAN <mfabian@redhat.com>, 2019."
 
 #: ../ui/gtk3/panel.vala:1144
 msgid "Preferences"

From 2e41b2a626fa14a82a7dce4d7a928b8b30b56cd0 Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Mon, 6 Jan 2020 19:41:23 +0900
Subject: [PATCH 609/816] Translated using Weblate (French)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/fr/
---
 po/fr.po | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index f3356343b..cd0831eb3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,15 +1,15 @@
 # French translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
 # dominique bribanick <chepioq@gmail.com>, 2011,2014
 # Jérôme Fenal <jfenal@gmail.com>, 2012-2013
-# Julien Humbert <julroy67@gmail.com>, 2009-2014
+# Julien Humbert <julroy67@gmail.com>, 2009-2014, 2020.
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
-# Julien Humbert <julroy67@gmail.com>, 2009-2015
+# Julien Humbert <julroy67@gmail.com>, 2009-2015, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata
 # José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
@@ -28,15 +28,16 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-01 12:23+0000\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"Language-Team: French <https://translate.stg.fedoraproject.org/projects/ibus/"
+"ibus/fr/>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-05-15 11:32+0000\n"
-"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -104,7 +105,7 @@ msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Lancer xmodmap si le fichier .xmodmap ou .Xmodmap existe lors d’un "
-"basculement de moteur ibus"
+"basculement de moteur ibus."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"

From 7be961789113eb739916a65e5f6855cd7cdae4a9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Mon, 6 Jan 2020 20:06:05 +0900
Subject: [PATCH 610/816] Translated using Weblate (French)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/fr/
---
 po/fr.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index cd0831eb3..3384a31dd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,25 +11,25 @@
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
 # Julien Humbert <julroy67@gmail.com>, 2009-2015, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata, 2020.
 # José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
 # Edouard Duliege <edouard.duliege@gmail.com>, 2017. #zanata
 # Emmanuel Nedelec <nednet@wanadoo.fr>, 2017. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata, 2020.
 # José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2018. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2018. #zanata, 2020.
 # elmerys <contact@zle.fr>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2019. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2019. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-01 12:23+0000\n"
-"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"PO-Revision-Date: 2020-01-03 13:37+0000\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://translate.stg.fedoraproject.org/projects/ibus/"
 "ibus/fr/>\n"
 "Language: fr\n"
@@ -733,7 +733,7 @@ msgstr "<b>Police et Style</b>"
 
 #: setup/setup.ui:579
 msgid "General"
-msgstr "Général"
+msgstr "Paramètres généraux"
 
 #: setup/setup.ui:671
 msgid "Add the selected input method into the enabled input methods"

From d31e55e46c1b3bbaa5326109a174a9d592ce0933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Mon, 6 Jan 2020 20:07:28 +0900
Subject: [PATCH 611/816] Translated using Weblate (Polish)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/pl/
---
 po/pl.po | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 6a434ef06..df99d122a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,33 +1,34 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
-# Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2014, 2020.
+# Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata, 2020.
+# Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2018. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2018. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata
+# Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-03 17:09+0000\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <https://translate.stg.fedoraproject.org/projects/ibus/"
+"ibus/pl/>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-04-18 05:34+0000\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 4.6.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"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -3285,7 +3286,7 @@ msgstr ""
 
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2018"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2020"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"

From 22b4a08e2eb40960c533774b89d5d9f7eac71187 Mon Sep 17 00:00:00 2001
From: Rafael Fontenelle <rafaelff@gnome.org>
Date: Mon, 6 Jan 2020 20:08:22 +0900
Subject: [PATCH 612/816] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/pt_BR/
---
 po/pt_BR.po | 859 +++++++++++++++++++++++++++-------------------------
 1 file changed, 446 insertions(+), 413 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index a4af22c7e..c053fb06f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # Portuguese (Brazil) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,42 +15,44 @@
 # Mateus de Melo Santos <mateusms@tutanota.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Cássio Rodrigo Honorato Rodrigues <cassiorhr@outlook.com>, 2019. #zanata
+# Rafael Fontenelle <rafaelff@gnome.org>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.stg.fedoraproject.org/"
+"projects/ibus/ibus/pt_BR/>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-07-13 02:07+0000\n"
-"Last-Translator: Cássio Rodrigo Honorato Rodrigues <cassiorhr@outlook.com>\n"
-"Language-Team: Portuguese (Brazil) <trans-pt_br@lists.fedoraproject.org>\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
-msgstr "Mecanismos de carregamento"
+msgstr "Pré-carregar motores"
 
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "Mecanismos de pré-carregamento durante a inicialização do ibus"
+msgstr "Carrega motores durante a inicialização do ibus"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
-msgstr "Ordem dos Motores"
+msgstr "Ordem dos motores"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr "Ordem dos motores salvas na lista de método de entrada"
+msgstr "Ordem dos motores salva na lista de método de entrada"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "Popup atrasou milisegundos para a janela de alterador IME"
+msgstr "Milissegundos de atraso do pop-up para a janela de alternador IME"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
@@ -58,6 +60,10 @@ msgid ""
 " 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
 "the window and switch prev/next engines."
 msgstr ""
+"Define o atraso do pop-up em milissegundos para mostrar a janela do "
+"comutador IME. O padrão é 400. 0 = Mostra a janela imediatamente. 0 < Atraso "
+"em milissegundos. 0 > Não mostra a janela e troca os motores anteriores/"
+"próximos."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -68,17 +74,17 @@ 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 ""
-"O número da versão armazenada será utilizado para checar a diferença entre a "
+"O número da versão salvo será utilizado para verificar a diferença entre a "
 "versão do ibus instalado anteriormente e o da versão atual do ibus."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
-msgstr "Leiautes latinos nos quais não contém ASCII"
+msgstr "Layouts latinos que não contêm ASCII"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Leiaute US é anexado aos leiautes Latinos. variantes podem ser omitidas."
+"O layout dos EUA é anexado aos layouts Latinos, variantes podem ser omitidas."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -88,32 +94,32 @@ msgstr "Usar xmodmap"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Executar xmodmap se .xmodmap ou .Xmodmap existir quando os motorres do ibus "
-"forem trocados."
+"Executar xmodmap se .xmodmap ou .Xmodmap existir quando os motores do ibus "
+"forem alternados."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
-msgstr "Usa o desenho do teclado do sistema"
+msgstr "Usar o layout de teclado do sistema"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
 msgid "Use system keyboard (XKB) layout"
-msgstr "Usa o desenho do teclado do sistema (XKB)"
+msgstr "Usa o layout de teclado do sistema (XKB)"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:47
 msgid "Embed Preedit Text"
-msgstr "Embutir Texto de Pré-Edição "
+msgstr "Embutir texto de pré-edição"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:48
 msgid "Embed Preedit Text in Application Window"
-msgstr "Embutir Texto de Pré-edição na Janela do Aplicativo"
+msgstr "Embute texto de pré-edição na janela do aplicativo"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
-msgstr "Use o método de entrada global"
+msgstr "Usar método de entrada global"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
 msgid "Share the same input method among all applications"
-msgstr "Compartilhar o mesmo método de entrada entre todos os aplicativos"
+msgstr "Compartilha o mesmo método de entrada entre todos os aplicativos"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:57
 msgid "Enable input method by default"
@@ -122,12 +128,12 @@ msgstr "Habilitar método de entrada por padrão"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 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 "
+"Habilita método de entrada por padrão quando o aplicativo obtiver o foco de "
 "entradas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
-msgstr "Prefixo de nome de preservação do DConf"
+msgstr "Prefixos de nome de preservação do DConf"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
@@ -135,7 +141,7 @@ msgstr "Prefixos das chaves do DConf para parar a conversão do nome"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
-msgstr "Realiza o trigger nas teclas de atalho"
+msgstr "Aciona teclas de atalho"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:71
 #: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
@@ -144,7 +150,7 @@ msgstr "As teclas de atalho para ligar ou desligar o método de entrada"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Desencadeia chaves de atalho para o "
+msgstr "Acionar teclas de atalho para gtk_accelerator_parse"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
@@ -165,18 +171,18 @@ msgstr "As teclas de atalho para desligar o método de entrada"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:90
 #: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
-msgstr "Próximo mecanismo de teclas de atalho"
+msgstr "Atalhos de teclado do próximo motor"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:91
 #: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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 "
+"As teclas de atalho para alteração ao próximo método de entrada na lista"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:100
 #: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
-msgstr "Visualização do mecanismo das teclas de atalho "
+msgstr "Teclas de atalho do motor anterior"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:101
 #: data/dconf/org.freedesktop.ibus.gschema.xml:106
@@ -185,20 +191,20 @@ msgstr "Teclas de atalho para alteração ao método de entrada anterior"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
-msgstr "Ocultar Automaticamente"
+msgstr "Ocultar automaticamente"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"Comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar "
+"O comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar "
 "automaticamente,  2 = Sempre mostrar"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
-msgstr "Posição do Painel de Idioma"
+msgstr "Posição do painel de idioma"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
@@ -230,21 +236,21 @@ msgstr "Orientação da tabela de pesquisa"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientação da Tabela de Pesquisa. 0 = Horizontal, 1 = Vertical "
+msgstr "Orientação da tabela de pesquisa. 0 = Horizontal, 1 = Vertical"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:140
 #: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
 #: setup/setup.ui:475
 msgid "Show icon on system tray"
-msgstr "Apresenta um ícone na bandeja do sistema"
+msgstr "Mostrar um ícone na área de notificação"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
-msgstr "Apresenta o nome do método de entrada"
+msgstr "Mostrar nome do método de entrada"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 msgid "Show input method name on language bar"
-msgstr "Apresenta o nome do método de entrada na barra de idioma"
+msgstr "Mostra o nome do método de entrada na barra de idiomas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
@@ -288,36 +294,36 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
-msgstr "Usa a fonte padrão"
+msgstr "Usar fonte personalizada"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr "Usa o nome da fonte padrão para o painel de idioma"
+msgstr "Usa o nome de fonte personalizada para o painel de idiomas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
 #: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
-msgstr "Fonte padrão"
+msgstr "Fonte personalizada"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "Nome da fonte padrão para o painel de idioma"
+msgstr "Nome de fonte personalizada para o painel de idiomas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr "Teclas de atalho para gtk_accelerator_parse"
+msgstr "Teclas de atalho Unicode para gtk_accelerator_parse"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr "As teclas de talho para alternar a digitação do Unicode em on ou off"
+msgstr "As teclas de talho para ligar ou desligar digitação em Unicode"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr "Teclas de atalho emoji para o gtk_accelerator_parse"
+msgstr "Teclas de atalho de emoji para o gtk_accelerator_parse"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr "A tecla de atalho para habilitar ou desabilitar a digitação emoji"
+msgstr "As teclas de atalho para ligar ou desligar a digitação de emoji"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
@@ -357,33 +363,41 @@ msgstr "Você pode atribuir uma anotação para um emoji favorito nesta lista."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr "Se as anotações emoji podem ser combinadas parcialmente ou não. "
+msgstr "Se as anotações emoji podem ser combinadas parcialmente ou não"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
+"Se as anotações emoji podem ser correspondidas com uma string parcial em vez "
+"da correspondência exata ou não."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
-msgstr ""
+msgstr "Corresponder anotações emoji com o comprimento especificado"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
+"Combina as anotações emoji parcialmente com mais do que o número "
+"especificado de caracteres, em vez da correspondência exata."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
+"Escolher uma condição para corresponder parcialmente às anotações de emoji"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Escolha uma das seguintes condições para corresponder parcialmente às "
+"anotações de emoji: 0 == Correspondência de prefixo, 1 == Correspondência de "
+"sufixo, 2 == Correspondência de correspondência"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
@@ -395,6 +409,9 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Carrega os dados de emoji no momento da inicialização, se verdadeiro. São "
+"necessários cerca de 10 MB de memória para carregar os dados. Carrega os "
+"dados do emoji quando abrir a caixa de diálogo emoji no início, se falso."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
@@ -407,6 +424,11 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Carrega os dados Unicode no momento da inicialização, se verdadeiro. São "
+"necessários cerca de 15 MB de memória para carregar os dados. Carrega os "
+"dados Unicode quando abrir a caixa de diálogo emoji no início, se falso. Os "
+"dados Unicode sempre são carregados após os dados emoji serem carregados, "
+"mesmo que sejam verdadeiros."
 
 #: ibus/_config.py.in:41
 msgid ""
@@ -422,7 +444,7 @@ msgstr "Outros"
 
 #: setup/emojilang.py:67
 msgid "Select a language"
-msgstr "Selecione uma língua"
+msgstr "Selecione um idioma"
 
 #: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
 #: setup/main.py:560
@@ -453,7 +475,7 @@ msgstr "Idioma: %s\n"
 #: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "Desenho do teclado: %s\n"
+msgstr "Layout do teclado: %s\n"
 
 #: setup/engineabout.py:78
 #, python-format
@@ -476,7 +498,7 @@ msgstr "_Adicionar"
 #. create im name & icon column
 #: setup/enginetreeview.py:69 setup/setup.ui:838
 msgid "Input Method"
-msgstr "Método de Entrada"
+msgstr "Método de entrada"
 
 #: setup/enginetreeview.py:96
 msgid "Kbd"
@@ -517,22 +539,21 @@ 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 teclas).\n"
+"Pressione uma tecla (ou uma combinação de teclas).\n"
 "O diálogo será encerrado quando a tecla for liberada."
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "Por favor pressione uma tecla (ou uma combinação de teclas)"
+msgstr "Pressione uma tecla (ou uma combinação de teclas)"
 
 #: setup/main.py:121 setup/main.py:588
 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"
+"Utilize o atalho com o shift para mudar para o método de entrada anterior"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "O daemon IBus não está sendo executado. Você deseja iniciá-lo"
+msgstr "O daemon IBus não está em execução. Você deseja iniciá-lo?"
 
 #: setup/main.py:536
 msgid ""
@@ -545,9 +566,9 @@ 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"
+"export GTK_IM_MODULE=ibus\n"
+"export XMODIFIERS=@im=ibus\n"
+"export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
 #: setup/main.py:550
@@ -558,7 +579,7 @@ msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
 #: setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "Selecione o atalho do teclado para %s"
+msgstr "Selecione o atalho de teclado para %s"
 
 #. Translators: Title of the window
 #: setup/main.py:564
@@ -591,7 +612,7 @@ msgstr "Canto inferior direito"
 
 #: setup/setup.ui:37
 msgid "Custom"
-msgstr "Padrão"
+msgstr "Personalizado"
 
 #: setup/setup.ui:48
 msgid "Do not show"
@@ -642,11 +663,11 @@ msgstr "Desabilitar:"
 
 #: setup/setup.ui:345 setup/setup.ui:983
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Atalhos do Teclado</b>"
+msgstr "<b>Atalhos de Teclado</b>"
 
 #: setup/setup.ui:374
 msgid "Set the orientation of candidates in lookup table"
-msgstr "Configure a orientação dos candidatos na tabela de observação"
+msgstr "Configure a orientação dos candidatos na tabela de pesquisa"
 
 #: setup/setup.ui:376
 msgid "Candidates orientation:"
@@ -655,8 +676,8 @@ msgstr "Orientação dos candidatos:"
 #: setup/setup.ui:407
 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"
+"Configure o comportamento do ibus para como mostrar ou ocultar a barra de "
+"idiomas"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
@@ -664,30 +685,30 @@ msgstr "Mostrar painel de propriedades:"
 
 #: setup/setup.ui:423
 msgid "Language panel position:"
-msgstr "Posição do Painel de Idioma:"
+msgstr "Posição do painel de idiomas:"
 
 #: setup/setup.ui:494
 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"
+"Mostra o nome do método de entrada na barra de idioma quando selecionando a "
+"caixa de seleção"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
-msgstr "Embutir texto de pré-edição na janela do aplicativo "
+msgstr "Embutir texto de pré-edição na janela do aplicativo"
 
 #: setup/setup.ui:513
 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"
+"Embute o texto de pré-edição do método de entrada na janela do aplicativo"
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
-msgstr "Usa a fonte padrão:"
+msgstr "Usar a fonte personalizada:"
 
 #: setup/setup.ui:562 setup/setup.ui:1156
 msgid "<b>Font and Style</b>"
-msgstr "<b>Fonte e Estilo</b>"
+msgstr "<b>Fonte e estilo</b>"
 
 #: setup/setup.ui:579
 msgid "General"
@@ -696,7 +717,7 @@ msgstr "Geral"
 #: setup/setup.ui:671
 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"
+"Adiciona o método de entrada selecionado nos métodos de entrada ativados"
 
 #: setup/setup.ui:682
 msgid "_Remove"
@@ -710,22 +731,22 @@ msgstr ""
 
 #: setup/setup.ui:700
 msgid "_Up"
-msgstr "_Acima"
+msgstr "A_cima"
 
 #: setup/setup.ui:707
 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 "
+"Move para cima o método de entrada selecionado na lista dos métodos de "
 "entrada"
 
 #: setup/setup.ui:718
 msgid "_Down"
-msgstr "_Abaixo"
+msgstr "A_baixo"
 
 #: setup/setup.ui:725
 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 "
+"Move o método de entrada selecionado para baixo nos métodos de entrada "
 "ativados"
 
 #: setup/setup.ui:736
@@ -734,7 +755,7 @@ msgstr "_Sobre"
 
 #: setup/setup.ui:743
 msgid "Show information of the selected input method"
-msgstr "Apresente a informação do método de entrada selecionado"
+msgstr "Mostra informações do método de entrada selecionado"
 
 #: setup/setup.ui:754
 msgid "_Preferences"
@@ -742,7 +763,7 @@ msgstr "_Preferências"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
-msgstr "Mostrar configuração do método de entrada selecionado"
+msgstr "Mostra configuração do método de entrada selecionado"
 
 #: setup/setup.ui:812
 msgid ""
@@ -751,7 +772,7 @@ msgid ""
 "the panel icon.</i></small>"
 msgstr ""
 "<small><i>O método de entrada ativo pode ser alternado com os selecionados "
-"na lista acima pressionando as teclas de atalho do teclado ou clicando no "
+"na lista acima pressionando as teclas do atalho de teclado ou clicando no "
 "ícone do painel.</i></small>"
 
 #: setup/setup.ui:873
@@ -760,7 +781,7 @@ msgid ""
 "names"
 msgstr ""
 "As teclas de atalho para habilitar as conversões das anotações emoji ou "
-"nomes Unicode."
+"nomes Unicode"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
@@ -769,14 +790,15 @@ msgstr "Anotações emoji:"
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
 msgstr ""
+"Os atalhos de teclado para habilita conversões de ponto de código Unicode"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Ponto de código Unicode:"
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
+msgstr "Define uma fonte de candidatos Unicode no diálogo de emojis"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
@@ -784,7 +806,7 @@ msgstr "Fonte Unicode:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Defina um idioma de anotações emoji no diálogo emoji"
+msgstr "Define um idioma de anotações emoji no diálogo de emojis"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
@@ -795,24 +817,28 @@ msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
+"Combinar as anotações de emoji parcialmente com a seguinte condição e mais "
+"que o número de caracteres:"
 
 #: setup/setup.ui:1067
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
+"Se as anotações de emoji puderem corresponder a uma sequência parcial, em "
+"vez da correspondência exata"
 
 #: setup/setup.ui:1101
 msgid "Prefix match"
-msgstr ""
+msgstr "Correspondência de prefixo"
 
 #: setup/setup.ui:1115
 msgid "Suffix match"
-msgstr ""
+msgstr "Correspondência de sufixo"
 
 #: setup/setup.ui:1130
 msgid "Containing match"
-msgstr ""
+msgstr "Correspondência de conteúdo"
 
 #: setup/setup.ui:1176
 msgid "Emoji"
@@ -820,11 +846,11 @@ msgstr "Emoji"
 
 #: setup/setup.ui:1230
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Desenho do Teclado</b>"
+msgstr "<b>Layout do teclado</b>"
 
 #: setup/setup.ui:1278
 msgid "<b>Global input method settings</b>"
-msgstr "<b>Configurações de Método de Entrada Global</b> "
+msgstr "<b>Configurações globais de método de entrada</b>"
 
 #: setup/setup.ui:1298
 msgid "Advanced"
@@ -840,15 +866,15 @@ msgid ""
 "\n"
 msgstr ""
 "<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
+"<small>O barramento de entrada inteligente</small>\n"
+"Página inicial: https://github.com/ibus/ibus/wiki\n"
 "\n"
 "\n"
 "\n"
 
 #: setup/setup.ui:1341
 msgid "Start ibus on login"
-msgstr "Inicie o ibus na conexão "
+msgstr "Iniciar o ibus ao iniciar a sessão"
 
 #: setup/setup.ui:1358
 msgid "<b>Startup</b>"
@@ -860,7 +886,7 @@ msgstr "Atividades"
 
 #: src/ibusemojigen.h:31
 msgid "Animals & Nature"
-msgstr "Animais & Natureza"
+msgstr "Animais & natureza"
 
 #: src/ibusemojigen.h:32
 msgid "Component"
@@ -872,7 +898,7 @@ msgstr "Bandeiras"
 
 #: src/ibusemojigen.h:34
 msgid "Food & Drink"
-msgstr "Comida & Bebida"
+msgstr "Comida & bebida"
 
 #: src/ibusemojigen.h:35
 msgid "Objects"
@@ -880,11 +906,11 @@ msgstr "Objetos"
 
 #: src/ibusemojigen.h:36
 msgid "People & Body"
-msgstr "Pessoa & Corpo"
+msgstr "Pessoa & corpo"
 
 #: src/ibusemojigen.h:37
 msgid "Smileys & Emotion"
-msgstr ""
+msgstr "Smileys & emoticon"
 
 #: src/ibusemojigen.h:38
 msgid "Symbols"
@@ -892,35 +918,35 @@ msgstr "Símbolos"
 
 #: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr "Viagem & Lugares"
+msgstr "Viagem & lugares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr "Latin Básico"
+msgstr "Latim básico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Latim-1 suplemento"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Latim estendido A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Latim estendido B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -934,35 +960,35 @@ msgstr "Extensões IPA"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Letras modificadoras de espaçamento"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Marcas diacríticas combinadas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Grego e Copta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cirílico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Suplemento cirílico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -997,21 +1023,21 @@ msgstr "Siríaco"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Suplemento árabe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "N'Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1025,28 +1051,28 @@ msgstr "Samaritano"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandaico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Suplemento siríaco"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Árabe estendido A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanágari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1060,56 +1086,56 @@ msgstr "Bengalês"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Guzerate"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriá"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tâmil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Télugo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Canarês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malaiala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Cingalês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1123,7 +1149,7 @@ msgstr "Tailandês"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Laosiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1137,7 +1163,7 @@ msgstr "Tibetano"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Birmanês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1151,21 +1177,21 @@ msgstr "Georgiano"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Etíope"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Suplemento etíope"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1179,56 +1205,56 @@ msgstr "Cherokee"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Sílabas unificadas dos aborígenes canadenses"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Rúnico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tágalo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1242,119 +1268,119 @@ msgstr "Mongol"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Sílabas estendidas unificadas dos aborígenes canadenses"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Lü"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Tai Lü Novo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Símbolos Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Buginês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Marcas diacríticas combinadas estendidas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Santali"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "Cirílico estendido C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:285
 msgid "Georgian Extended"
-msgstr ""
+msgstr "Extensão georgiana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Suplemento sundanês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Extensões védicas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1375,21 +1401,21 @@ msgstr "Extensões Fonéticas Complementares"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Suplemento de marcas diacríticas combinadas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Latim estendido adicional"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:313
 msgid "Greek Extended"
-msgstr ""
+msgstr "Grego estendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1403,35 +1429,35 @@ msgstr "Pontuação Geral"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Sobrescritos e subscritos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Símbolos de moeda"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Marcas diacríticas combinadas para símbolos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Símbolos parecidos com letras"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:337
 msgid "Number Forms"
-msgstr ""
+msgstr "Formulários de números"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1445,49 +1471,49 @@ msgstr "Setas"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
-msgstr "Operadores Matemáticos"
+msgstr "Operadores matemáticos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Técnico diversos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:353
 msgid "Control Pictures"
-msgstr ""
+msgstr "Figuras de controle"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Reconhecimento óptico de caractere"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Alfanuméricos contidos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:365
 msgid "Box Drawing"
-msgstr ""
+msgstr "Desenhos de caixa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:369
 msgid "Block Elements"
-msgstr ""
+msgstr "Elementos de bloco"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1508,7 +1534,7 @@ msgstr "Símbolos Variados"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:381
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1522,511 +1548,511 @@ msgstr "Símbolos Matemáticos Variados-A"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Setas suplementares-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Padrões braile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Setas suplementares-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr "Símbolos Matemáticos Variados-B"
+msgstr "Símbolos matemáticos variados-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr "Operadores Matemáticos Suplementares"
+msgstr "Operadores matemáticos suplementares"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr "Símbolos Variados e Setas"
+msgstr "Símbolos variados e setas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolítico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Latim estendido C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:421
 msgid "Coptic"
-msgstr ""
+msgstr "Copta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Suplemento georgiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:429
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Etíope estendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Cirílico estendido A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Pontuação suplementar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "Suplemento de radicais CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Radicais Kangxi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Caracteres de descrição ideográfica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "Símbolos e pontuação CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:469
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul com Jamo de compatibilidade"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:477
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo estendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
-msgstr ""
+msgstr "Traços CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Extensões fonéticas de katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Letras e meses CJK contidos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "Compatibilidade CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Símbolos hexagramas yijing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "Ideogramas unificados CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Sílabas Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Radicais Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:525
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Cirílico estendido B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:533
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Letras modificadoras de tom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Latim estendido D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Formatos numéricos índicos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:553
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phagspa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:557
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanágari estendido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:565
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:569
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul Jamo estendido A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:577
 msgid "Javanese"
-msgstr ""
+msgstr "Javanês"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Birmanês estendido-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:585
 msgid "Cham"
-msgstr ""
+msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Birmanês estendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:593
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tailandês vietnamita"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Extensões Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Etíope estendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Latim estendido-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Suplemento cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Sílabas Hangul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul Jamo estendido B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:625
 msgid "High Surrogates"
-msgstr ""
+msgstr "Substituições altas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Substituições altas de uso privado"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Substituições baixas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:637
 msgid "Private Use Area"
-msgstr ""
+msgstr "Área de uso privado"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "Ideogramas de compatibilidade CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "Formas de apresentação alfabética"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Formas de apresentação arábica-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
-msgstr ""
+msgstr "Seletores de variação"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
-msgstr ""
+msgstr "Formulários verticais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "Meias marcas combinadas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "Formas de compatibilidade CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
-msgstr ""
+msgstr "Variantes de pequenas formas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Formas de apresentação arábica-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "Formas de meia e completa largura"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2040,70 +2066,70 @@ msgstr "Especiais"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Silabário linear B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "Ideogramas linear B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "Números Egeus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Números gregos antigos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
-msgstr "Símbolos Antigos"
+msgstr "Símbolos antigos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "Disco de Festos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:709
 msgid "Lycian"
-msgstr ""
+msgstr "Lício"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:713
 msgid "Carian"
-msgstr ""
+msgstr "Carian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Números de cóptico epacta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr "Antigo Itálico"
+msgstr "Itálico antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2117,749 +2143,749 @@ msgstr "Gótico"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "Pérmico antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:733
 msgid "Ugaritic"
-msgstr ""
+msgstr "Ugarítico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:737
 msgid "Old Persian"
-msgstr ""
+msgstr "Persa antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:741
 msgid "Deseret"
-msgstr ""
+msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:745
 msgid "Shavian"
-msgstr ""
+msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:749
 msgid "Osmanya"
-msgstr ""
+msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Albanês caucasiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "Linear A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "Silabário cipriota"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "Aramaico imperial"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "Palmireno"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabateu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:785
 msgid "Hatran"
-msgstr ""
+msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:789
 msgid "Phoenician"
-msgstr ""
+msgstr "Fenício"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:793
 msgid "Lydian"
-msgstr ""
+msgstr "Lídio"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Hieróglifos meroíticos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Meroítica cursiva"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
-msgstr ""
+msgstr "Árabe do sul antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
-msgstr ""
+msgstr "Árabe do norte antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:817
 msgid "Manichaean"
-msgstr ""
+msgstr "Maniqueano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:821
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "Pártico inscrito"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "Pálavi inscrito"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "Pálavi psalter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:837
 msgid "Old Turkic"
-msgstr ""
+msgstr "Turco antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
-msgstr ""
+msgstr "Húngaro antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:845
 msgid "Hanifi Rohingya"
-msgstr ""
+msgstr "Hanifi de Rohingya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "Símbolos numéricos Rumi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
 msgid "Old Sogdian"
-msgstr ""
+msgstr "Sogdiano antigo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
 msgid "Sogdian"
-msgstr ""
+msgstr "Sogdiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
 msgid "Elymaic"
-msgstr ""
+msgstr "Elymaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
 msgid "Brahmi"
-msgstr ""
+msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
 msgid "Kaithi"
-msgstr ""
+msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
-msgstr ""
+msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:877
 msgid "Chakma"
-msgstr ""
+msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:881
 msgid "Mahajani"
-msgstr ""
+msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:885
 msgid "Sharada"
-msgstr ""
+msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgstr "Números de cingalês arcaico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:893
 msgid "Khojki"
-msgstr ""
+msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:897
 msgid "Multani"
-msgstr ""
+msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:901
 msgid "Khudawadi"
-msgstr ""
+msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:905
 msgid "Grantha"
-msgstr ""
+msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:909
 msgid "Newa"
-msgstr ""
+msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:913
 msgid "Tirhuta"
-msgstr ""
+msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:917
 msgid "Siddham"
-msgstr ""
+msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:921
 msgid "Modi"
-msgstr ""
+msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Suplemento mongoliano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:929
 msgid "Takri"
-msgstr ""
+msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:933
 msgid "Ahom"
-msgstr ""
+msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
 msgid "Dogra"
-msgstr ""
+msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:941
 msgid "Warang Citi"
-msgstr ""
+msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
 msgid "Nandinagari"
-msgstr ""
+msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
-msgstr ""
+msgstr "Zanabazar Square"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
 msgid "Soyombo"
-msgstr ""
+msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
-msgstr ""
+msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
-msgstr ""
+msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:965
 msgid "Marchen"
-msgstr ""
+msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
-msgstr ""
+msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
 msgid "Gunjala Gondi"
-msgstr ""
+msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
 msgid "Makasar"
-msgstr ""
+msgstr "Makassar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
 msgid "Tamil Supplement"
-msgstr ""
+msgstr "Suplemento tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:985
 msgid "Cuneiform"
-msgstr ""
+msgstr "Cuneiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr "Números Cuneiforme e Pontuação"
+msgstr "Números e Pontuação cuneiformes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Cuneiforme pré-dinástico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
-msgstr "Hieróglifos Egípcios"
+msgstr "Hieróglifos egípcios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
 msgid "Egyptian Hieroglyph Format Controls"
-msgstr ""
+msgstr "Controles de formato de hieróglifos egípcios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
-msgstr "Hieróglifos da Anatólia"
+msgstr "Hieróglifos da anatólia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
-msgstr ""
+msgstr "Suplemento Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1013
 msgid "Mro"
-msgstr ""
+msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
-msgstr ""
+msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
-msgstr ""
+msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
 msgid "Medefaidrin"
-msgstr ""
+msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1029
 msgid "Miao"
-msgstr ""
+msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Símbolos e pontuação ideográficos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1037
 msgid "Tangut"
-msgstr ""
+msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
-msgstr ""
+msgstr "Componentes tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
-msgstr ""
+msgstr "Suplemento kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
-msgstr ""
+msgstr "Kana estendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
 msgid "Small Kana Extension"
-msgstr ""
+msgstr "Extensão de kana pequeno"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
 msgid "Nushu"
-msgstr ""
+msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
 msgid "Duployan"
-msgstr ""
+msgstr "Duployé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
-msgstr ""
+msgstr "Controles de formato de taquigrafia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Símbolos musicais bizantinos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
-msgstr ""
+msgstr "Símbolos musicais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgstr "Notação musical grega antiga"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
 msgid "Mayan Numerals"
-msgstr ""
+msgstr "Numeração maia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgstr "Símbolos Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
-msgstr ""
+msgstr "Barras de contar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Símbolos matemáticos alfanuméricos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
-msgstr ""
+msgstr "Escrita de sinais Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
-msgstr ""
+msgstr "Suplemento glagolítico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
 msgid "Nyiakeng Puachue Hmong"
-msgstr ""
+msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
 msgid "Wancho"
-msgstr ""
+msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
-msgstr ""
+msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
 msgid "Adlam"
-msgstr ""
+msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
 msgid "Indic Siyaq Numbers"
-msgstr ""
+msgstr "Números de Siyaq indiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
 msgid "Ottoman Siyaq Numbers"
-msgstr ""
+msgstr "Números de Siyaq otomano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgstr "Símbolos alfabéticos matemáticos árabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
-msgstr ""
+msgstr "Peças do Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
-msgstr ""
+msgstr "Peças de dominó"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
-msgstr ""
+msgstr "Jogo de cartas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "Suplemento alfanumérico contidos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "Suplemento ideográfico contido"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr "Símbolos Diversos e Pictogramas"
+msgstr "Símbolos diversos e pictogramas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2873,126 +2899,126 @@ msgstr "Emoticons"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Símbolos ornamentais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
-msgstr "Transporte e Símbolos de Mapa"
+msgstr "Símbolos de mapa e transporte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Símbolos alquímicos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Formas geométricas estendidas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Setas suplementares-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "Símbolos suplementares e pictogramas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
-msgstr ""
+msgstr "Símbolos em xadrez"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1189
 msgid "Symbols and Pictographs Extended-A"
-msgstr ""
+msgstr "Símbolos e pictogramas estendidas-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "Ideogramas unificados CJK extensão F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "Suplemento de ideogramas de compatibilidade CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
 msgid "Tags"
-msgstr ""
+msgstr "Marcas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Suplemento de seletores de variação"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "Área de uso privado suplementar-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "Área de uso privado suplementar-B"
 
 #: tools/main.vala:51
 msgid "List engine name only"
@@ -3009,41 +3035,43 @@ msgstr "idioma: %s\n"
 
 #: tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr "Nenhum motor configurado.\n"
+msgstr "Nenhum motor está definido.\n"
 
 #: tools/main.vala:169
 msgid "Set global engine failed.\n"
-msgstr "Configurar motor global falhou.\n"
+msgstr "A configuração do motor global falhou.\n"
 
 #: tools/main.vala:174
 msgid "Get global engine failed.\n"
-msgstr "Obter motor global falhour.\n"
+msgstr "A obtenção de motor global falhou.\n"
 
 #: tools/main.vala:217
 msgid "Read the system registry cache."
-msgstr "Ler o cache do registro do sistema."
+msgstr "Lê o cache de registro do sistema."
 
 #: tools/main.vala:219
 msgid "Read the registry cache FILE."
-msgstr "Ler o ARQUIVO de cache do registro."
+msgstr "Lê o ARQUIVO de cache de registro."
 
 #: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
-msgstr "O cache do registro é inválido.\n"
+msgstr "O cache de registro é inválido.\n"
 
 #: tools/main.vala:257
 msgid "Write the system registry cache."
-msgstr "Escrever o cache de registro do sistema."
+msgstr "Escreve o cache de registro do sistema."
 
 #: tools/main.vala:259
 msgid "Write the registry cache FILE."
-msgstr "Escrever o ARQUIVO de cache do registro."
+msgstr "Escreve o ARQUIVO de cache de registro."
 
 #: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Usa caminhos de esquema de motores em vez do ibus core, que podem ser "
+"valores separados por vírgula."
 
 #: tools/main.vala:381
 msgid "Resetting…"
@@ -3055,15 +3083,15 @@ msgstr "Concluído"
 
 #: tools/main.vala:444
 msgid "Set or get engine"
-msgstr "Definir ou obter motor"
+msgstr "Define ou obtém o motor"
 
 #: tools/main.vala:445
 msgid "Exit ibus-daemon"
-msgstr "Sair do ibus-daemon"
+msgstr "Encerra o ibus-daemon"
 
 #: tools/main.vala:446
 msgid "Show available engines"
-msgstr "Exibir motores disponíveis"
+msgstr "Mostra os motores disponíveis"
 
 #: tools/main.vala:447
 msgid "(Not implemented)"
@@ -3071,45 +3099,46 @@ msgstr "(Não implementado)"
 
 #: tools/main.vala:448
 msgid "Restart ibus-daemon"
-msgstr "Reiniciar ibus-daemon"
+msgstr "Reinicia o ibus-daemon"
 
 #: tools/main.vala:449
 msgid "Show version"
-msgstr "Mostrar versão"
+msgstr "Mostra a versão"
 
 #: tools/main.vala:450
 msgid "Show the content of registry cache"
-msgstr "Mostrar conteúdo de cachê do registro"
+msgstr "Mostra o conteúdo do cache de registro"
 
 #: tools/main.vala:451
 msgid "Create registry cache"
-msgstr "Criar registro de cache"
+msgstr "Cria um cache de registro"
 
 #: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Imprimir o endereço D-Bus do ibus-daemon"
+msgstr "Imprime o endereço D-Bus do ibus-daemon"
 
 #: tools/main.vala:453
 msgid "Show the configuration values"
-msgstr "Mostrar valores de configuração"
+msgstr "Mostra os valores de configuração"
 
 #: tools/main.vala:454
 msgid "Reset the configuration values"
-msgstr "Redefinir os valores de configuração"
+msgstr "Redefine os valores de configuração"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "Salvar emoji no diálogo para a área de transferência"
+msgstr "Salva emoji no diálogo para a área de transferência "
 
 #: tools/main.vala:458
 msgid "Show this information"
-msgstr "Mostrar essa informação"
+msgstr "Mostra essa informação"
 
 #: tools/main.vala:464
 #, c-format
 msgid "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Uso: %s COMMAND [OPTION...]\n"
+msgstr ""
+"Uso: %s COMANDO [OPÇÃO...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3131,11 +3160,11 @@ msgstr "Outros"
 
 #: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "Abrir escolha de Unicode"
 
 #: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Trazer de volta escolha de emoji"
 
 #: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
@@ -3147,11 +3176,11 @@ msgstr "Page Up"
 
 #: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
-msgstr ""
+msgstr "Mostrar variações de emoji"
 
 #: ui/gtk3/emojier.vala:1111
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #: ui/gtk3/emojier.vala:1117
 msgid "Menu"
@@ -3163,7 +3192,7 @@ msgstr "Clique para visualizar o aviso"
 
 #: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
-msgstr "Carregando um dicionário Unicode"
+msgstr "Carregando um dicionário Unicode:"
 
 #: ui/gtk3/emojier.vala:1418
 #, c-format
@@ -3172,7 +3201,7 @@ msgstr "Ponto de código: %s"
 
 #: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
-msgstr ""
+msgstr "Possui variações de emoji"
 
 #: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
@@ -3196,7 +3225,7 @@ msgstr "Nome: %s"
 #: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
-msgstr ""
+msgstr "Apelido: %s"
 
 #: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
@@ -3205,7 +3234,7 @@ msgstr "Escolha do emoji"
 
 #: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Escolha de Unicode"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
@@ -3213,6 +3242,10 @@ msgid ""
 " E.g. Press Esc key several times to release the emoji typing mode, click "
 "your desktop and click your text application again."
 msgstr ""
+"Falha ao obter o aplicativo de texto atual. Mude o foco para seu aplicativo "
+"novamente. Por exemplo, pressione a tecla Esc várias vezes para liberar o "
+"modo de digitação emoji, clique na área de trabalho e clique no aplicativo "
+"de texto novamente."
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
@@ -3227,18 +3260,18 @@ msgstr "Emoji copiado para a sua área de transferência."
 #. 
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "\"FONT\" para caracteres  no diálogo emoji"
+msgstr "\"FONTE\" para caracteres  no diálogo emoji"
 
 #: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
-msgstr "FONT"
+msgstr "FONTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #. 
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"LANG\" para anotações em diálogo emoji. V.g. \"en\""
+msgstr "\"LANG\" para anotações em diálogo emoji. Por exemplo, \"en\""
 
 #: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
@@ -3246,15 +3279,15 @@ msgstr "LANG"
 
 #: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "Anotações emoji podem ser correspondidas parcialmente"
 
 #: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "Corresponder com o comprimento do inteiro especificado"
 
 #: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "Corresponder com a condição do inteiro especificado"
 
 #: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
@@ -3262,11 +3295,11 @@ msgstr "Painel IBus"
 
 #: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus é um bus de entrada inteligente para o Linux/Unix."
+msgstr "IBus é um barramento de entrada inteligente para o Linux/Unix."
 
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
-msgstr "créditos-tradutor"
+msgstr "Rafael Fontenelle <rafaelff@gnome.org>"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"
@@ -3274,7 +3307,7 @@ msgstr "Preferências"
 
 #: ui/gtk3/panel.vala:1144
 msgid "Restart"
-msgstr "Reinicie"
+msgstr "Reiniciar"
 
 #: ui/gtk3/panel.vala:1148
 msgid "Quit"
@@ -3284,4 +3317,4 @@ msgstr "Sair"
 #. * Otherwise the msgstr is "default:LTR".
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
-msgstr "padrão:LTR"
+msgstr "default:LTR"

From 4a3aa879959af968c7ae585e7fe4e56df489f36e Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 6 Jan 2020 20:25:19 +0900
Subject: [PATCH 613/816] Translated using Weblate (Hebrew)

Currently translated at 100.0% (151 of 151 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/he/
---
 po/he.po | 319 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 176 insertions(+), 143 deletions(-)

diff --git a/po/he.po b/po/he.po
index 8fd9fa96b..b75fe42ba 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,206 +1,210 @@
 # translation of ibus.pot to Hebrew
 # Hebrew translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-17 12:25+0900\n"
-"PO-Revision-Date: 2014-02-17 05:02+0000\n"
-"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
-"Language-Team: Hebrew <trans-he@lists.fedoraproject.org>\n"
+"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"Language-Team: Hebrew <https://translate.stg.fedoraproject.org/projects/ibus/"
+"ibus/he/>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr ""
+msgstr "אופקי"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
-msgstr ""
+msgstr "אנכי"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
-msgstr ""
+msgstr "פינה שמאלית עליונה"
 
 #: ../setup/setup.ui.h:4
 msgid "Top right corner"
-msgstr ""
+msgstr "פינה ימנית עליונה"
 
 #: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
-msgstr ""
+msgstr "פינה שמאלית תחתונה"
 
 #: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
-msgstr ""
+msgstr "פינה ימנית תחתונה"
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr ""
+msgstr "בהתאמה אישית"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "לא להציג"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "להסתיר אוטומטית"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
-msgstr ""
+msgstr "תמיד"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
-msgstr ""
+msgstr "העדפות IBus"
 
 #: ../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:"
-msgstr ""
+msgstr "שיטת הקלט הבאה:"
 
 #: ../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:"
-msgstr ""
+msgstr "שיטת הקלט הקודמת:"
 
 #: ../setup/setup.ui.h:16
 msgid "..."
-msgstr ""
+msgstr "…"
 
 #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
-msgstr ""
+msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr ""
+msgstr "הפעלה או השבתה:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "הפעלה:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "השבתה:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr ""
+msgstr "<b>קיצורי מקלדת</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
-msgstr ""
+msgstr "הגדרת כיוון המועמדים בטבלת החיפוש"
 
 #: ../setup/setup.ui.h:23
 msgid "Candidates orientation:"
-msgstr ""
+msgstr "כיוון המועמדים:"
 
 #: ../setup/setup.ui.h:24
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
+msgstr "הגדרת ההתנהגות של ibus בנוגע להצגת או הסתרת סרגל השפה"
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "הצגת לוח מאפיינים:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
-msgstr ""
+msgstr "מיקום לוח השפה:"
 
 #: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
 msgid "Show icon on system tray"
-msgstr ""
+msgstr "הצגת סמל במגש המערכת"
 
 #: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
 msgid "Show input method name on language bar"
-msgstr ""
+msgstr "הצגת שם שיטת הקלט בסרגל השפה"
 
 #: ../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"
-msgstr ""
+msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
 
 #: ../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:"
-msgstr ""
+msgstr "להשתמש בגופן בהתאמה אישית:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
-msgstr ""
+msgstr "<b>גופן וסגנון</b>"
 
 #: ../setup/setup.ui.h:34
 msgid "General"
-msgstr ""
+msgstr "כללי"
 
 #: ../setup/setup.ui.h:35
 msgid "_Add"
-msgstr ""
+msgstr "הו_ספה"
 
 #: ../setup/setup.ui.h:36
 msgid "Add the selected input method into the enabled input methods"
-msgstr ""
+msgstr "להוסיף את שיטת הקלט הנבחרת לשיטות הקלט הפעילות"
 
 #: ../setup/setup.ui.h:37
 msgid "_Remove"
-msgstr ""
+msgstr "הס_רה"
 
 #: ../setup/setup.ui.h:38
 msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
+msgstr "להסיר את שיטת הקלט הנבחרת משיטות הקלט הפעילות"
 
 #: ../setup/setup.ui.h:39
 msgid "_Up"
-msgstr ""
+msgstr "למ_עלה"
 
 #: ../setup/setup.ui.h:40
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
+msgstr "להעלות את שיטת הקלט ברשימת שיטות הקלט הפעילות"
 
 #: ../setup/setup.ui.h:41
 msgid "_Down"
-msgstr ""
+msgstr "למ_טה"
 
 #: ../setup/setup.ui.h:42
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
+msgstr "להוריד את שיטת הקלט ברשימת שיטות הקלט הפעילות"
 
 #: ../setup/setup.ui.h:43
 msgid "_About"
-msgstr ""
+msgstr "על _אודות"
 
 #: ../setup/setup.ui.h:44
 msgid "Show information of the selected input method"
-msgstr ""
+msgstr "להציג מידע על שיטת הקלט הנבחרת"
 
 #: ../setup/setup.ui.h:45
 msgid "_Preferences"
-msgstr ""
+msgstr "הע_דפות"
 
 #: ../setup/setup.ui.h:46
 msgid "Show setup of the selected input method"
-msgstr ""
+msgstr "להציג את הגדרות שיטת הקלט הנבחרת"
 
 #: ../setup/setup.ui.h:47
 msgid ""
@@ -208,35 +212,37 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small>ניתן להחליף את שיטת הקלט באופן מחזורי מתוך הנבחרות שברשימה הבאה על "
+"ידי לחיצה על מקשי הקיצור במקלדת או על ידי לחיצה על הסמל שבלוח.</small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
 msgid "Input Method"
-msgstr ""
+msgstr "שיטת קלט"
 
 #: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
 msgid "Use system keyboard layout"
-msgstr ""
+msgstr "להשתמש בפריסת המקלדת של המערכת"
 
 #: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
 msgid "Use system keyboard (XKB) layout"
-msgstr ""
+msgstr "להשתמש בפריסת המקלדת של המערכת (XKB)"
 
 #: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr ""
+msgstr "<b>פריסת מקלדת</b>"
 
 #: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
-msgstr ""
+msgstr "לשתף את אותה שיטת הקלט בין כל היישומים"
 
 #: ../setup/setup.ui.h:53
 msgid "<b>Global input method settings</b>"
-msgstr ""
+msgstr "<b>הגדרות גלובליות לשיטות קלט</b>"
 
 #: ../setup/setup.ui.h:54
 msgid "Advanced"
-msgstr ""
+msgstr "מתקדם"
 
 #: ../setup/setup.ui.h:55
 msgid ""
@@ -247,42 +253,48 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>אפיק הקלט החכם</small>\n"
+"דף הבית: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
-msgstr ""
+msgstr "להפעיל את ibus עם הכניסה למערכת"
 
 #: ../setup/setup.ui.h:63
 msgid "<b>Startup</b>"
-msgstr ""
+msgstr "<b>התחלה</b>"
 
 #: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
 msgid "About"
-msgstr ""
+msgstr "על אודות"
 
 #: ../setup/setup.ui.h:65
 msgid "_Close"
-msgstr ""
+msgstr "_סגירה"
 
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
-msgstr ""
+msgstr "לטעון מנועים מראש"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
-msgstr ""
+msgstr "לטעון מנועים במהלך הטעינה של ibus"
 
 #: ../data/ibus.schemas.in.h:3
 msgid "Engines order"
-msgstr ""
+msgstr "סדר מנועים"
 
 #: ../data/ibus.schemas.in.h:4
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "סדר מנועים שמור ברשימת שיטות קלט"
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "השהיית חלונית קופצת במילישניות לחלון בורר IME"
 
 #: ../data/ibus.schemas.in.h:6
 msgid ""
@@ -290,223 +302,237 @@ msgid ""
 "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do "
 "not show the window and switch prev/next engines."
 msgstr ""
+"הגדרת השהיית חלונית קופצת במילישניות כדי להציג חלון בורר IME. בררת המחדל היא "
+"400. 0 = להציג את החלון מיידית. 0 &lt; ההשהיה במילישניות. 0 &gt; לא להצין את "
+"החלון ולהחליף למנוע הקודם/הבא."
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
-msgstr ""
+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 ""
+msgstr "מקשי קיצור להקפצה"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
-msgstr ""
+msgstr "הפעלת מקשי קיצור"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
-msgstr ""
+msgstr "מקשי הקיצור להפעלת שיטת קלט"
 
 #: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
-msgstr ""
+msgstr "השבתת מקשי קיצור"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
-msgstr ""
+msgstr "מקשי הקיצור לכיבוי שיטת קלט"
 
 #: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
-msgstr ""
+msgstr "מקשי הקיצור למנוע הבא"
 
 #: ../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"
-msgstr ""
+msgstr "מקשי הקיצור למנוע הקודם"
 
 #: ../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"
-msgstr ""
+msgstr "הסתרה אוטומטית"
 
 #: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"התנהגות חלונית המאפיינים. 0 = לא להציג, 1 = להסתיר אוטומטית, 2 = להציג תמיד"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
-msgstr ""
+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 "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "לעקוב אחר סמן הקלט במקרה שהחלונית תמיד מופיעה"
 
 #: ../data/ibus.schemas.in.h:25
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
+"אם true (אמת), החלונית עוקבת אחר סמן הקלט במקרה שהחלונית מופיעה תמיד. אם "
+"false (שקר), החלונית מופיעה במקום קבוע."
 
 #: ../data/ibus.schemas.in.h:26
 msgid "The milliseconds to show property panel"
-msgstr ""
+msgstr "המילישניות להצגת חלונית המאפיינים"
 
 #: ../data/ibus.schemas.in.h:27
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr ""
+msgstr "המילישניות להצגת חלונית מאפיינים לאחר שינויים במיקוד או במאפיינים."
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Orientation of lookup table"
-msgstr ""
+msgstr "כיוון טבלת החיפוש"
 
 #: ../data/ibus.schemas.in.h:29
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
+msgstr "כיוון טבלת החיפוש. 0 = אופקית, 1 = אנכית"
 
 #: ../data/ibus.schemas.in.h:31
 msgid "Show input method name"
-msgstr ""
+msgstr "להציג את שם שיטת הקלט"
 
 #: ../data/ibus.schemas.in.h:35
 msgid "Use custom font"
-msgstr ""
+msgstr "להשתמש בגופן מותאם אישית"
 
 #: ../data/ibus.schemas.in.h:36
 msgid "Use custom font name for language panel"
-msgstr ""
+msgstr "להשתמש בשם של גופן בהתאמה אישית ללוח השפה"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr ""
+msgstr "גופן בהתאמה אישית"
 
 #: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
-msgstr ""
+msgstr "שם גופן בהתאמה אישית לחלונית גופן"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "Embed Preedit Text"
-msgstr ""
+msgstr "הטעמת טקסט שנערך מראש"
 
 #: ../data/ibus.schemas.in.h:40
 msgid "Embed Preedit Text in Application Window"
-msgstr ""
+msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
 
 #: ../data/ibus.schemas.in.h:41
 msgid "Use global input method"
-msgstr ""
+msgstr "להשתמש בשיטת קלט גלובלית"
 
 #: ../data/ibus.schemas.in.h:43
 msgid "Enable input method by default"
-msgstr ""
+msgstr "הפעלת שיטת קלט כבררת מחדל"
 
 #: ../data/ibus.schemas.in.h:44
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
+msgstr "הפעלת שיטת שלט כבררת מחדל כאשר היישום מקבל מיקוד על קלט"
 
 #: ../data/ibus.schemas.in.h:45
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "שימור קידומות שמות ב־DConf"
 
 #: ../data/ibus.schemas.in.h:46
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
+msgstr "קידומות של מפתחות ב־DConf להפסקת המרת שמות עבורן"
 
 #: ../ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
+"כל הזכויות שמורות (c) 2007‏-2010 פנג הואנג\n"
+"כל הזכויות שמורות (c) 2007‏-2010 רד הט בע״מ."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
-msgstr ""
+msgstr "אחר"
 
 #: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
-msgstr ""
+msgstr "שפה: %s\n"
 
 #: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr ""
+msgstr "פריסת מקלדת: %s\n"
 
 #: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
-msgstr ""
+msgstr "יצירה: %s\n"
 
 #: ../setup/engineabout.py:77
 msgid "Description:\n"
-msgstr ""
+msgstr "תיאור:\n"
 
 #: ../setup/enginecombobox.py:139
 msgid "Select an input method"
-msgstr ""
+msgstr "נא לבחור שיטת קלט"
 
 #: ../setup/enginetreeview.py:94
 msgid "Kbd"
-msgstr ""
+msgstr "Kbd"
 
 #: ../setup/ibus-setup.desktop.in.h:2
 msgid "Set IBus Preferences"
-msgstr ""
+msgstr "הגדרת העדפות IBus"
 
 #: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "קיצורי מקלדת"
 
 #: ../setup/keyboardshortcut.py:65
 msgid "Key code:"
-msgstr ""
+msgstr "קוד מקש:"
 
 #: ../setup/keyboardshortcut.py:80
 msgid "Modifiers:"
-msgstr ""
+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 ""
+msgstr "נא ללחוץ על מקש (או על צירוף מקשים)"
 
 #: ../setup/main.py:102 ../setup/main.py:395
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
+msgstr "יש להשתמש במקש קיצור עם shift כדי לעבור לשיטת הקלט הקודמת"
 
 #: ../setup/main.py:329
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr ""
+msgstr "הסוכן של IBus אינו פעיל. להפעיל אותו?"
 
 #: ../setup/main.py:350
 msgid ""
@@ -515,111 +541,116 @@ msgid ""
 "  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:364
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr ""
+msgstr "לא ניתן להפעיל את הסוכן של IBus תוך %d שניות"
 
 #: ../setup/main.py:376
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr ""
+msgstr "נא לבחור קיצור מקלדת עבור %s"
 
 #: ../setup/main.py:377
 msgid "switching input methods"
-msgstr ""
+msgstr "החלפת שיטות קלט"
 
 #: ../tools/main.vala:42
 msgid "List engine name only"
-msgstr ""
+msgstr "List engine name only"
 
 #: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "Can't connect to IBus.\n"
 
 #: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "language: %s\n"
 
 #: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "No engine is set.\n"
 
 #: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
-msgstr ""
+msgstr "Set global engine failed.\n"
 
 #: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
-msgstr ""
+msgstr "Get global engine failed.\n"
 
 #: ../tools/main.vala:204
 msgid "Read the system registry cache."
-msgstr ""
+msgstr "Read the system registry cache."
 
 #: ../tools/main.vala:206
 msgid "Read the registry cache FILE."
-msgstr ""
+msgstr "Read the registry cache FILE."
 
 #: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
 msgid "The registry cache is invalid.\n"
-msgstr ""
+msgstr "The registry cache is invalid.\n"
 
 #: ../tools/main.vala:244
 msgid "Write the system registry cache."
-msgstr ""
+msgstr "Write the system registry cache."
 
 #: ../tools/main.vala:246
 msgid "Write the registry cache FILE."
-msgstr ""
+msgstr "Write the registry cache FILE."
 
 #: ../tools/main.vala:293
 msgid "Set or get engine"
-msgstr ""
+msgstr "Set or get engine"
 
 #: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Exit ibus-daemon"
 
 #: ../tools/main.vala:295
 msgid "Show available engines"
-msgstr ""
+msgstr "Show available engines"
 
 #: ../tools/main.vala:296
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Not implemented)"
 
 #: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Restart ibus-daemon"
 
 #: ../tools/main.vala:298
 msgid "Show version"
-msgstr ""
+msgstr "Show version"
 
 #: ../tools/main.vala:299
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Show the content of registry cache"
 
 #: ../tools/main.vala:300
 msgid "Create registry cache"
-msgstr ""
+msgstr "Create registry cache"
 
 #: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Print the D-Bus address of ibus-daemon"
 
 #: ../tools/main.vala:302
 msgid "Show this information"
-msgstr ""
+msgstr "Show this information"
 
 #: ../tools/main.vala:308
 #, c-format
@@ -627,44 +658,46 @@ msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
 
 #: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
-msgstr ""
+msgstr "Commands:\n"
 
 #: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr ""
+msgstr "%s is unknown command!\n"
 
 #: ../ui/gtk3/panel.vala:425
 msgid "IBus Update"
-msgstr ""
+msgstr "עדכון IBus"
 
 #: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Super+רווח הוא מקש הקיצור כבררת המחדל מעכשיו."
 
 #: ../ui/gtk3/panel.vala:707
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr ""
+msgstr "IBus היא אפיק קלט חכם ללינוקס/יוניקס."
 
 #: ../ui/gtk3/panel.vala:711
 msgid "translator-credits"
-msgstr ""
+msgstr "Yaron Shahrabani <sh.yaron@gmail.com>"
 
 #: ../ui/gtk3/panel.vala:732
 msgid "Preferences"
-msgstr ""
+msgstr "העדפות"
 
 #: ../ui/gtk3/panel.vala:742
 msgid "Restart"
-msgstr ""
+msgstr "הפעלה מחדש"
 
 #: ../ui/gtk3/panel.vala:746
 msgid "Quit"
-msgstr ""
+msgstr "יציאה"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".

From 6f7aceb4542dfb245548ca547df96d72feee4c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Mon, 6 Jan 2020 20:26:05 +0900
Subject: [PATCH 614/816] Translated using Weblate (Hungarian)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/hu/
---
 po/hu.po | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 9657f4b62..ed99c319a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
 # Hungarian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,20 +11,22 @@
 # Meskó Balázs <meskobalazs@gmail.com>, 2017. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2018. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2019. #zanata
+# Balázs Meskó <meskobalazs@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"Last-Translator: Balázs Meskó <meskobalazs@gmail.com>\n"
+"Language-Team: Hungarian <https://translate.stg.fedoraproject.org/projects/"
+"ibus/ibus/hu/>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-04-27 11:04+0000\n"
-"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
-"Language-Team: Hungarian <trans-hu@lists.fedoraproject.org>\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -342,7 +344,7 @@ msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
-"Megjelenítheti a kedvenc emodzsijait a listában, ha vannak ilyen karakterek"
+"Megjelenítheti a kedvenc emodzsijait a listában, ha vannak ilyen karakterek."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
@@ -362,7 +364,7 @@ msgid ""
 "the exact match or not."
 msgstr ""
 "Illeszthetőek-e részleges karakterláncokra az emodzsi annotációk, a pontos "
-"egyezés helyett"
+"egyezés helyett."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
@@ -374,7 +376,7 @@ msgid ""
 "characters instead of the exact match."
 msgstr ""
 "Az emodzsi annotációk részleges illesztése, a pontos egyezés helyett, ha "
-"több mint ennyi karakter lett megadva"
+"több mint ennyi karakter lett megadva."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
@@ -438,7 +440,7 @@ msgstr "Válasszon nyelvet"
 #: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
 #: setup/main.py:560
 msgid "_Cancel"
-msgstr "Mé_gse"
+msgstr "_Mégse"
 
 #: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
@@ -533,7 +535,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)."
+msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -563,7 +565,7 @@ msgstr ""
 #: setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "Az IBus démon nem indítható el %d másodpercen belül."
+msgstr "Az IBus démon nem indítható el %d másodpercen belül"
 
 #: setup/main.py:562
 #, python-format
@@ -1031,7 +1033,7 @@ msgstr "NKo"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr "Szamaritánus "
+msgstr "Szamaritánus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2522,7 +2524,7 @@ msgstr "Zanabazar-féle négyzet"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
 msgid "Soyombo"
-msgstr "Soyombo"
+msgstr "Szojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2704,7 +2706,7 @@ msgstr "Kis kana bővítés"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
 msgid "Nushu"
-msgstr "Nushu"
+msgstr "Nü-su"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3114,7 +3116,7 @@ msgstr "A beállítási értékek visszaállítása"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
+msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése "
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3174,7 +3176,7 @@ msgstr "Menü"
 
 #: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
-msgstr "Kattintson a figyelmeztető üzenet megtekintéséhez."
+msgstr "Kattintson a figyelmeztető üzenet megtekintéséhez"
 
 #: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"

From 9a9e5db8d10fdb30e133c71358360c7bf5479df6 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Mon, 6 Jan 2020 20:26:44 +0900
Subject: [PATCH 615/816] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (544 of 544 strings)

Translation: ibus/ibus
Translate-URL: https://translate.stg.fedoraproject.org/projects/ibus/ibus/uk/
---
 po/uk.po | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 3b247fc91..b607b51e3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,32 +1,33 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
-# Yuri Chornoivan <yurchor@ukr.net>, 2013
-# Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2014, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Yuri Chornoivan <yurchor@ukr.net>, 2018. #zanata
-# Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata
+# Yuri Chornoivan <yurchor@ukr.net>, 2018. #zanata, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <https://translate.stg.fedoraproject.org/projects/"
+"ibus/ibus/uk/>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-04-17 05:20+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 4.6.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"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -369,7 +370,7 @@ msgid ""
 "the exact match or not."
 msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
-"не повним збігом"
+"не повним збігом."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
@@ -3121,7 +3122,7 @@ msgstr "Скинути значення налаштувань до початк
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "Зберегти емодзі з вікна до буфера обміну даними"
+msgstr "Зберегти емодзі з вікна до буфера обміну даними "
 
 #: tools/main.vala:458
 msgid "Show this information"

From 687d026cc73b9991f6918604afc032c4c31ecb85 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 8 Jan 2020 12:45:12 +0900
Subject: [PATCH 616/816] po: Add ibus10.pot

---
 po/ibus10.pot | 3204 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 3204 insertions(+)
 create mode 100644 po/ibus10.pot

diff --git a/po/ibus10.pot b/po/ibus10.pot
new file mode 100644
index 000000000..e587988ad
--- /dev/null
+++ b/po/ibus10.pot
@@ -0,0 +1,3204 @@
+# Source translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus 1.5.21\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-01-08 12:40+0900\n"
+"Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
+"Language-Team: Source\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr ""
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr ""
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr ""
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr ""
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr ""
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr ""
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr ""
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr ""
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr ""
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr ""
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr ""
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr ""
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr ""
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr ""
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr ""
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr ""
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr ""
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr ""
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr ""
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr ""
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr ""
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr ""
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr ""
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr ""
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr ""
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr ""
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr ""
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr ""
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr ""
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr ""
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr ""
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr ""
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr ""
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr ""
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr ""
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr ""
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr ""
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr ""
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr ""
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr ""
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr ""
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr ""
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr ""
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
+msgstr ""
+
+#: tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr ""
+
+#: tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:237 tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: tools/main.vala:257
+msgid "Write the system registry cache."
+msgstr ""
+
+#: tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: tools/main.vala:444
+msgid "Set or get engine"
+msgstr ""
+
+#: tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:446
+msgid "Show available engines"
+msgstr ""
+
+#: tools/main.vala:447
+msgid "(Not implemented)"
+msgstr ""
+
+#: tools/main.vala:448
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:449
+msgid "Show version"
+msgstr ""
+
+#: tools/main.vala:450
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: tools/main.vala:451
+msgid "Create registry cache"
+msgstr ""
+
+#: tools/main.vala:452
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
+msgid "Show this information"
+msgstr ""
+
+#: tools/main.vala:464
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: tools/main.vala:465
+msgid "Commands:\n"
+msgstr ""
+
+#: tools/main.vala:494
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1095
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1099
+msgid "translator-credits"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1118
+msgid "Preferences"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1144
+msgid "Restart"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1148
+msgid "Quit"
+msgstr ""
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
+msgid "default:LTR"
+msgstr ""

From ecc3465a585448486b2ce68bcefc11d6aebae755 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 23 Jan 2020 16:13:05 +0900
Subject: [PATCH 617/816] client/gtk2: Fix some format sentences

---
 client/gtk2/ibusimcontext.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 305854036..50290c556 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -73,7 +73,9 @@ struct _IBusIMContext {
     GCancellable    *cancellable;
     GQueue          *events_queue;
 
+#if !GTK_CHECK_VERSION (3, 93, 0)
     gboolean         use_button_press_event;
+#endif
 };
 
 struct _IBusIMContextClass {
@@ -137,12 +139,12 @@ static void     ibus_im_context_set_surrounding
 
 /* static methods*/
 static void     _ibus_context_update_preedit_text_cb
-                                           (IBusInputContext   *ibuscontext,
-                                            IBusText           *text,
-                                            gint                cursor_pos,
-                                            gboolean            visible,
-                                            guint               mode,
-                                            IBusIMContext      *ibusimcontext);
+                                            (IBusInputContext   *ibuscontext,
+                                             IBusText           *text,
+                                             gint                cursor_pos,
+                                             gboolean            visible,
+                                             guint               mode,
+                                             IBusIMContext      *ibusimcontext);
 static void     _create_input_context       (IBusIMContext      *context);
 static gboolean _set_cursor_location_internal
                                             (IBusIMContext      *context);
@@ -172,7 +174,6 @@ static void     _create_fake_input_context  (void);
 static gboolean _set_content_type           (IBusIMContext      *context);
 
 
-
 static GType                _ibus_type_im_context = 0;
 static GtkIMContextClass    *parent_class = NULL;
 
@@ -313,7 +314,6 @@ _process_key_event_done (GObject      *object,
 {
     IBusInputContext *context = (IBusInputContext *)object;
     GdkEventKey *event = (GdkEventKey *) user_data;
-
     GError *error = NULL;
     gboolean retval = ibus_input_context_process_key_event_async_finish (
             context,
@@ -362,12 +362,10 @@ _process_key_event (IBusInputContext *context,
         retval = TRUE;
     }
 
-    if (retval) {
+    if (retval)
         event->state |= IBUS_HANDLED_MASK;
-    }
-    else {
+    else
         event->state |= IBUS_IGNORED_MASK;
-    }
 
     return retval;
 }
@@ -1508,6 +1506,7 @@ _key_is_modifier (guint keyval)
         return FALSE;
     }
 }
+
 /* Copy from gdk */
 static GdkEventKey *
 _create_gdk_event (IBusIMContext *ibusimcontext,

From afc0a89c74950351c32df3d60abb343a0dbc06cc Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Fri, 24 Jan 2020 15:37:01 +0900
Subject: [PATCH 618/816] Handle small final sigma in ibus_keyval_convert_case

lowercase: GREEK SMALL LETTER FINAL SIGMA (U+03C2)
uppercase: GREEK CAPITAL LETTER SIGMA (U+03A3)

This mapping was correct in UCSConvertCase, but the "legacy" mapping
must also be correct for Caps Lock to work with the final sigma key.

https://gitlab.freedesktop.org/xorg/lib/libx11/commit/7f46a38139

BUG=https://github.com/ibus/ibus/pull/2176
---
 src/ibuskeynames.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ibuskeynames.c b/src/ibuskeynames.c
index 085055987..544c6ade9 100644
--- a/src/ibuskeynames.c
+++ b/src/ibuskeynames.c
@@ -331,8 +331,9 @@ ibus_keyval_convert_case (guint symbol,
         xupper -= (IBUS_KEY_Greek_alphaaccent - IBUS_KEY_Greek_ALPHAaccent);
       else if (symbol >= IBUS_KEY_Greek_ALPHA && symbol <= IBUS_KEY_Greek_OMEGA)
         xlower += (IBUS_KEY_Greek_alpha - IBUS_KEY_Greek_ALPHA);
-      else if (symbol >= IBUS_KEY_Greek_alpha && symbol <= IBUS_KEY_Greek_omega &&
-               symbol != IBUS_KEY_Greek_finalsmallsigma)
+      else if (symbol == IBUS_KEY_Greek_finalsmallsigma)
+        xupper = IBUS_KEY_Greek_SIGMA;
+      else if (symbol >= IBUS_KEY_Greek_alpha && symbol <= IBUS_KEY_Greek_omega)
         xupper -= (IBUS_KEY_Greek_alpha - IBUS_KEY_Greek_ALPHA);
       break;
     }

From 74863851e83972e86a5bdb3da3d99784fc8d4955 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 28 Jan 2020 18:46:13 +0900
Subject: [PATCH 619/816] src/tests: Increase sleep to 3 waiting for IBusConfig

Sleep 1 would be too short for ibus-daemon which could run all components.
ibus-config test requires the running IBusConfig and the test could fail
in some slow systems.
Sleep time will be increased to 3 to run all components.

BUG=https://github.com/ibus/ibus/issues/2170
---
 src/tests/ibus-config.c                  | 4 ++++
 src/tests/ibus-desktop-testing-runner.in | 2 +-
 src/tests/runtest                        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tests/ibus-config.c b/src/tests/ibus-config.c
index 5e845f10a..0d9812a31 100644
--- a/src/tests/ibus-config.c
+++ b/src/tests/ibus-config.c
@@ -16,6 +16,10 @@ finish_create_config_async_success (GObject      *source_object,
     IBusConfig *config =
           ibus_config_new_async_finish (res, &error);
 
+    if (error) {
+        g_message ("Failed to generate IBusConfig: %s", error->message);
+        g_error_free (error);
+    }
     g_assert (IBUS_IS_CONFIG (config));
 
     /* Since we reuse single D-Bus connection, we need to remove the
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 981941d58..0d9a847c6 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -190,7 +190,7 @@ run_desktop()
     HAS_GNOME=`echo $DESKTOP_COMMAND | grep gnome-session`
     if [ x"$HAS_GNOME" = x ] ; then
         ibus-daemon --daemonize --verbose
-        sleep 1
+        sleep 3
     fi
 }
 
diff --git a/src/tests/runtest b/src/tests/runtest
index ed38992f7..a6e4194bf 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -180,7 +180,7 @@ run_test_case()
         fi
 
         # Wait until all necessary components are up.
-        sleep 1
+        sleep 3
 
         export GTK_IM_MODULE=ibus
     fi

From cd4fef5a3290869fc1c36392f5d404fa09932926 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 31 Jan 2020 15:35:02 +0900
Subject: [PATCH 620/816] src: Fix SEGV to access NULL GError when compose
 length is zero

BUG=rhbz#1788754
---
 src/ibuscomposetable.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index e4e3a7cd8..3f439134c 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -127,12 +127,14 @@ parse_compose_value (IBusComposeData  *compose_data,
         compose_data->values[0] = g_ascii_strtoll(p, NULL, 8);
         compose_data->values[1] = 0;
     } else {
-        if (!(uchars = g_utf8_to_ucs4 (ustr, -1, NULL, NULL, &error)) ||
-            !uchars[0]) {
+        if (!(uchars = g_utf8_to_ucs4 (ustr, -1, NULL, NULL, &error))) {
             g_warning ("Invalid Unicode: %s: %s in %s:",
                        error->message, ustr, line);
             g_error_free (error);
             goto fail;
+        } else if (!uchars[0]) {
+            g_warning ("Invalid Unicode: \"\" in %s:", line);
+            goto fail;
         }
 
         for (up = uchars; *up; up++) {

From a1705ad7e5f90cf8d87caf32d7b7acc7125e6778 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 13 Feb 2020 16:49:12 +0900
Subject: [PATCH 621/816] bus: Fix recursive mkdir is failed in
 /var/lib/gdm/.cache/ibus

If the parent directory (/var/lib/gdm/.cache) is not created,
mkdir childdir (/var/lib/gdm/.cache/ibus) is failed by the parentdir
with mode_t = 0.

BUG=https://github.com/ibus/ibus/issues/2177
---
 bus/server.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index a7554a889..6c9e2c02d 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -277,17 +277,13 @@ bus_server_init (void)
                  socket_address);
     }
     if (!g_file_test (unix_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-        /* Require mkdir for BSD system. */
-        if (g_mkdir_with_parents (unix_dir, 0) != 0) {
-            g_error ("mkdir is failed in: %s: %s",
-                     unix_dir, g_strerror (errno));
-        }
-        /* The mode 0700 can eliminate malicious users change the mode.
+        /* Require mkdir for BSD system.
+         * The mode 0700 can eliminate malicious users change the mode.
          * `chmod` runs for the last directory only not to change the modes
          * of the parent directories. E.g. "/tmp/ibus".
          */
-        if (g_chmod (unix_dir, 0700) != 0) {
-            g_error ("chmod(700) is failed in: %s: %s",
+        if (g_mkdir_with_parents (unix_dir, 0700) != 0) {
+            g_error ("mkdir is failed in: %s: %s",
                      unix_dir, g_strerror (errno));
         }
     }

From ac3f5b7c4be1d292568952fbba53c552a8e1d315 Mon Sep 17 00:00:00 2001
From: Ahmad Haghighi <haghighi.ahmad@gmail.com>
Date: Fri, 21 Feb 2020 16:01:46 +0900
Subject: [PATCH 622/816] po: Update translation (Persian)

Update po/fa.po at 25.2%
https://translate.stg.fedoraproject.org/projects/ibus/ibus/fa/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/fa.po | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/po/fa.po b/po/fa.po
index 1f0436c89..d5d827bf4 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,24 +1,28 @@
 # translation of ibus.pot to Persian
 # Persian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Daniyal Yousefi <da.yousefi@gmail.com>, 2011
 # Mostafa Daneshvar <lashar@fedoraproject.org>, 2011
+# Ahmad Haghighi <haghighi.ahmad@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:46+0000\n"
-"Last-Translator: danialyousefi <da.yousefi@gmail.com>\n"
-"Language-Team: Persian <trans-fa@lists.fedoraproject.org>\n"
+"PO-Revision-Date: 2020-01-08 03:55+0000\n"
+"Last-Translator: Ahmad Haghighi <haghighi.ahmad@gmail.com>\n"
+"Language-Team: Persian <https://translate.stg.fedoraproject.org/projects/"
+"ibus/ibus/fa/>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -50,7 +54,7 @@ msgstr "انتخابی"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "نمایش نده"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"

From 40f4a717d2299f4390343da054e4aec7b05e308e Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Fri, 21 Feb 2020 16:10:01 +0900
Subject: [PATCH 623/816] po: Update translation (Ukrainian)

Update po/uk.po at 100.0%
https://translate.stg.fedoraproject.org/projects/ibus/ibus/uk/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/uk.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index b607b51e3..cf3de4aef 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"PO-Revision-Date: 2020-01-08 10:24+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://translate.stg.fedoraproject.org/projects/"
 "ibus/ibus/uk/>\n"
@@ -717,7 +717,7 @@ msgstr ""
 
 #: setup/setup.ui:682
 msgid "_Remove"
-msgstr "В_илучити"
+msgstr "Ви_лучити"
 
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"

From 5f4f1a8aa3694a129d18ca0dd22bbad016452385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoni=20Bella=20P=C3=A9rez?= <antonibella5@yahoo.com>
Date: Fri, 21 Feb 2020 17:12:34 +0900
Subject: [PATCH 624/816] po: Update translation (Catalan)

Update po/ca.po at 92.0%
https://translate.stg.fedoraproject.org/projects/ibus/ibus/ca/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/ca.po | 2432 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 1307 insertions(+), 1125 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 473336db8..396afab1f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,6 @@
 # Catalan translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,498 +13,206 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017. #zanata
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-06-21 16:24+0900\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-01-09 22:01+0000\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <https://translate.stg.fedoraproject.org/projects/"
+"ibus/ibus/ca/>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-05-05 04:00+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
-"Language-Team: Catalan <fedora@llistes.softcatala.org>\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.4.5\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horitzontal"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertical"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Cantonada superior esquerra"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Cantonada superior dreta"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Cantonada inferior esquerra"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Cantonada inferior dreta"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Personalitzat"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "No mostrar"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Ocultar automàticament"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Preferències de l'IBus"
-
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Següent mètode d'entrada:"
-
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Les dreceres de teclat per canviar al mètode d'entrada anterior de la llista"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Mètode d'entrada anterior:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr ""
-"Les dreceres de teclat per habilitar o inhabilitar el mètode d'entrada"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Habilita o deshabilita:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Habilita:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Deshabilita:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Dreceres de teclat</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Estableix l'orientació dels candidats a la taula de cerca"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientació dels candidats:"
-
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
-"d'idiomes"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Mostra el quadre de propietats:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Posició del quadre d'idiomes:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Mostra la icona a la safata del sistema"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
-
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
-"casella de selecció"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Incrusta el text pre-editat del mètode d'entrada en la finestra de "
-"l'aplicació"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Utilitza la lletra personalitzada:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Lletra i estil</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "General"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Afegeix"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Suprimeix"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "A_munt"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Puja el mètode d'entrada seleccionat en la llista de mètodes habilitats"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "A_vall"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Baixa el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Quant a"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostra la informació del mètode d'entrada seleccionat"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Preferències"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Mostra la configuració del mètode d'entrada seleccionat"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>El mètode d'entrada actiu pot canviar-se amb els seleccionats en "
-"l'anterior llista prement les dreceres de teclat o en fer clic a la icona "
-"del quadre.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Mètode d'entrada"
-
-#: ../setup/setup.ui.h:49
-msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr ""
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji annotation:"
-msgstr ""
-
-#: ../setup/setup.ui.h:51
-msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
-
-#: ../setup/setup.ui.h:52
-msgid "Unicode code point:"
-msgstr ""
-
-#: ../setup/setup.ui.h:53
-msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr ""
-
-#: ../setup/setup.ui.h:54
-msgid "Unicode font:"
-msgstr ""
-
-#: ../setup/setup.ui.h:55
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Estableix l'idioma de les anotacions dels emojis al diàleg d'emojis"
-
-#: ../setup/setup.ui.h:56
-msgid "Emoji annotation language:"
-msgstr "Idioma d'anotació de l'emoji:"
-
-#: ../setup/setup.ui.h:57
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Fes coincidir parcialment les anotacions dels emojis amb la següent condició "
-"i més que el nombre de caràcters:"
-
-#: ../setup/setup.ui.h:58
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
-"comptes de la coincidència exacta"
-
-#: ../setup/setup.ui.h:59
-msgid "Prefix match"
-msgstr "Coincidència del prefix"
-
-#: ../setup/setup.ui.h:60
-msgid "Suffix match"
-msgstr "Coincidència del sufix"
-
-#: ../setup/setup.ui.h:61
-msgid "Containing match"
-msgstr "Coincidència conté"
-
-#: ../setup/setup.ui.h:62
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:63 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Utilitza la disposició de teclat del sistema"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Utilitza la disposició de teclat del sistema (XKB)"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposició del teclat</b>"
-
-#: ../setup/setup.ui.h:66 ../data/ibus.schemas.in.h:74
-msgid "Share the same input method among all applications"
-msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
-
-#: ../setup/setup.ui.h:67
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Paràmetres del mètode d'entrada global</b>"
-
-#: ../setup/setup.ui.h:68
-msgid "Advanced"
-msgstr "Avançat"
-
-#: ../setup/setup.ui.h:69
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus d'entrada intel·ligent</small>\n"
-"Lloc web: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:76
-msgid "Start ibus on login"
-msgstr "Inicia l'IBus en entrar"
-
-#: ../setup/setup.ui.h:77
-msgid "<b>Startup</b>"
-msgstr "<b>Inici</b>"
-
-#: ../setup/setup.ui.h:78 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1164
-msgid "About"
-msgstr "Quant a"
-
-#: ../setup/setup.ui.h:79 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Tanca"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Precarrega els motors"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Precarrega els motors durant l'inici de l'IBus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
-msgstr "Ordre de motors"
+msgstr "Ordre dels motors"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr "Ordre dels motors desats en la llista dels mètodes d'entrada"
+msgstr "Ordre dels motors desats a la llista dels mètodes d'entrada"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr ""
 "Retard en mil·lisegons de la finestra emergent per a la finestra del "
 "commutador IME"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"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 ""
 "Estableix el retard de la finestra emergent en mil·lisegons per mostrar la "
 "finestra del commutador IME. El valor predeterminat és 400. 0 = Mostra la "
-"finestra immediatament. 0 &lt; Retard en mil·lisegons. 0 &gt; No mostra la "
+"finestra immediatament. 0 < Retard en mil·lisegons. 0 > No mostra la "
 "finestra ni els motors anteriors o següents."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
-msgstr "Número de versió desada"
+msgstr "Número de la versió desada"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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 desat de la versió s'utilitzarà per comprovar la diferència entre "
-"la versió anterior i l'actual de l'ibus."
+"El número desat de la versió s'usarà per comprovar la diferència entre la "
+"versió anterior i l'actual de l'IBus."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Les disposicions llatines no tenen ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "La disposició dels EUA és un annex de les disposicions llatines. Es pot "
 "ometre la variant."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
-msgstr "Utilitza xmodmap"
+msgstr "Usa xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Executa xmodmap si existeix .xmodmap o .Xmodmap quan es commutin els motors "
-"de l'ibus."
+"de l'IBus."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Usa la disposició de teclat del sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usa la disposició de teclat del sistema (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Incrusta el text pre-editat"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Incrusta el text pre-editat a la finestra de l'aplicació"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Usa el mètode d'entrada global"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Comparteix el mateix mètode d'entrada amb totes les aplicacions"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Habilita el mètode d'entrada predeterminat"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Habilita el mètode d'entrada predeterminat quan l'aplicació obté el focus de "
+"l'entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf preserva els prefixes"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
-msgstr "Dreceres de teclat de l'activador"
+msgstr "Drecera de teclat per a l'activador"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "La drecera de teclat per habilitar o inhabilitar el mètode d'entrada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Dreceres de teclat de l'activador per gtk_accelerator_parse"
+msgstr "Drecera de teclat de l'activador per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Habilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
-msgstr "Les dreceres de teclat per habilitar el mètode d'entrada"
+msgstr "La drecera de teclat per activar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Inhabilita les dreceres de teclat"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr "Les dreceres de teclat per inhabilitar el mètode d'entrada"
+msgstr "La drecera de teclat per desactivar el mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
-msgstr "Dreceres de teclat del motor següent"
+msgstr "Drecera de teclat del motor següent"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
-"Les dreceres de teclat per commutar al següent mètode d'entrada de la llista"
+"La drecera de teclat per commutar al següent mètode d'entrada de la llista"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
-msgstr "Dreceres de teclat del motor anterior"
+msgstr "Drecera de teclat del motor anterior"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
-"Les dreceres de teclat per commutar al mètode d'entrada anterior de la "
-"llista"
+"La drecera de teclat per commutar al mètode d'entrada anterior de la llista"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Oculta automàticament"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"El comportament de la propietat panel. 0 = No es mostra, 1 = S'amaga "
+"El comportament de la propietat «panel». 0 = No es mostra, 1 = S'amaga "
 "automàticament, 2 = Es mostra sempre"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Posició del quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:29
-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 posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = "
-"cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
-"inferior dreta, 4 = personalitzat"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Segueix el cursor d'entrada en el cas que sempre es mostri el quadre"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -512,11 +220,11 @@ msgstr ""
 "Si és cert, el quadre segueix el cursor d'entrada en el cas que sempre es "
 "mostri el quadre. Si és fals, el quadre es mostra en una ubicació fixa."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Mil·lisegons per mostrar el quadre de propietats"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -524,47 +232,56 @@ msgstr ""
 "Els mil·lisegons per mostrar el quadre de propietats després de rebre "
 "l'enfocament o quan se'n canviïn les propietats."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientació de la taula de cerca"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientació de la taula de cerca. 0 = horitzontal, 1 = vertical"
+msgstr "Orientació de la taula de cerca. 0 = Horitzontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Mostra la icona a la safata del sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Mostra el nom del mètode d'entrada"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
-msgstr "valor RGBA de la icona XKB"
+msgstr "Valor RGBA de la icona XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "La icona XKB mostra la cadena de text de la disposició, la cadena de text es "
 "renderitza amb el valor RGBA. El valor RGBA pot ser 1. un color de X11, 2. "
 "un valor hexadecimal amb el format «#rrggbb» on «r», «g» i «b» són dígits "
-"hexadecimals per al roig, verd i blau, 3. un color RGB amb el format "
-"«rgb(r,g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i "
-"«b» són nombres enters en l'interval de 0 a 255 o valors de percentatge en "
+"hexadecimals per al roig, verd i blau, 3. un color RGB amb el format «rgb(r,"
+"g,b)» o 4. Un color RGBA amb el format «rgba(r,g,b,a)» on «r», «g», i «b» "
+"són nombres enters en l'interval de 0 a 255 o valors de percentatge en "
 "l'interval de 0% a 100%, i «a» té un valor en punt flotant en l'interval de "
 "0 a 1 per l'alfa."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Els mil·lisegons per mostrar el quadre d'icona amb una propietat"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -576,49 +293,50 @@ msgstr ""
 "s'especifica amb el valor icon-prop-key a IBusEngineDesc. Si el valor és 0, "
 "no hi ha retard i la icona de propietat es mostra automàticament."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
-msgstr "Utilitza una lletra personalitzada"
+msgstr "Usa un tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr "Utilitza una lletra personalitzada per al quadre d'idiomes"
+msgstr "Usa un tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
-msgstr "Lletra personalitzada"
+msgstr "Tipus de lletra personalitzat"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "Lletra personalitzada per al quadre d'idiomes"
+msgstr "Tipus de lletra personalitzat per al quadre d'idiomes"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Drecera de teclat d'Unicode per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "La drecera de teclat per activar o desactivar el tecleig d'Unicode"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Drecera de teclat d'emojis per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "La drecera de teclat per activar o desactivar el tecleig d'emojis"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
-"El nom de la lletra personalitzada per als caràcters emoji al diàleg dels "
-"emojis"
+"El nom del tipus de lletra personalitzat per als caràcters emoji al diàleg "
+"dels emojis"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Idioma predeterminat per al diccionari emoji"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -626,11 +344,11 @@ msgstr ""
 "Trieu l'idioma predeterminat per ls diccionaris dels emojis al diàleg "
 "d'emojis. El valor $lang s'aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "llista d'emojis preferits al diàleg dels emojis"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -638,105 +356,81 @@ msgstr ""
 "Podeu visualitzar els emojis preferits a la llista d'emojis, si aquesta "
 "llista té qualsevol caràcter."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr "llista d'anotacions dels emojis preferits al diàleg dels emojis"
+msgstr "llista de les anotacions emoji preferides al diàleg dels emojis"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr ""
-"En aquesta llista podeu assignar una anotació per a un emoji preferit."
+msgstr "En aquesta llista podeu assignar una anotació per a un emoji preferit."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
-msgstr "Si les anotacions dels emojis poden coincidir parcialment o no"
+msgstr "Si les anotacions emoji poden coincidir o no parcialment"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
-"Si les anotacions dels emojis poden coincidir amb una cadena parcial en "
-"comptes de la coincidència exacta, o no."
+"Si les anotacions emoji poden coincidir o no amb una cadena parcial en "
+"comptes de la coincidència exacta."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
-msgstr ""
-"Coincidència de les anotacions dels emojis amb la llargada especificada"
+msgstr "Coincidència de les anotacions emoji amb la llargada especificada"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
-"Coincidència parcial de les anotacions dels emojis amb el nombre de "
-"caràcters especificat en comptes de la coincidència exacta."
+"Coincidència parcial de les anotacions emoji amb el nombre de caràcters "
+"especificat en comptes de la coincidència exacta."
 
-#: ../data/ibus.schemas.in.h:65
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
-msgstr ""
-"Trieu una condició per coincidir parcialment amb les anotacions dels emojis"
+msgstr "Trieu una condició per coincidir parcialment amb les anotacions emoji"
 
-#: ../data/ibus.schemas.in.h:66
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
+"Trieu una de les condicions següents per coincidir parcialment amb les "
+"anotacions emoji: 0 == Coincidència del prefix, 1 == Coincidència del sufix, "
+"2 == La coincidència conté"
 
-#: ../data/ibus.schemas.in.h:67
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
-msgstr ""
+msgstr "Carrega les dades emoji en el moment de l'inici"
 
-#: ../data/ibus.schemas.in.h:68
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
+"Si és cert, es carregaran les dades emoji al moment de l'inici. Caldran uns "
+"10 MB de memòria per a carregar les dades. Si és fals, es carregaran les "
+"dades emoji quan s'obri el diàleg emoji al començament."
 
-#: ../data/ibus.schemas.in.h:69
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
-msgstr ""
+msgstr "Carrega les dades Unicode en el moment de l'inici"
 
-#: ../data/ibus.schemas.in.h:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
+"Si és cert, es carregaran les dades Unicode al moment de l'inici. Caldran "
+"uns 15 MB de memòria per a carregar les dades. Si és fals, es carregaran les "
+"dades Unicode quan s'obri el diàleg emoji al començament."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "Embed Preedit Text"
-msgstr "Incrusta el text pre-editat"
-
-#: ../data/ibus.schemas.in.h:72
-msgid "Embed Preedit Text in Application Window"
-msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
-
-#: ../data/ibus.schemas.in.h:73
-msgid "Use global input method"
-msgstr "Utilitza el mètode d'entrada global"
-
-#: ../data/ibus.schemas.in.h:75
-msgid "Enable input method by default"
-msgstr "Habilita els mètodes d'entrada per defecte"
-
-#: ../data/ibus.schemas.in.h:76
-msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Habilita els mètodes d'entrada per defecte quan l'aplicació obté el focus "
-"d'entrada"
-
-#: ../data/ibus.schemas.in.h:77
-msgid "DConf preserve name prefixes"
-msgstr "DConf preserva els prefixes"
-
-#: ../data/ibus.schemas.in.h:78
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Prefixos de tecles DConf per aturar la conversió del nom"
-
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
@@ -744,82 +438,103 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Altres"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "Selecciona un idioma"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:560
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:561
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
-msgstr "_D'acord"
+msgstr "D'ac_ord"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
-msgstr "Més..."
+msgstr "Més…"
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Quant a"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Tanca"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Idioma: %s\n"
 
-#: ../setup/engineabout.py:75
+#: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposició del teclat: %s\n"
 
-#: ../setup/engineabout.py:78
+#: setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autor: %s\n"
 
-#: ../setup/engineabout.py:81
+#: setup/engineabout.py:81
 msgid "Description:\n"
 msgstr "Descripció:\n"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Seleccioneu un mètode d'entrada"
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Seleccioneu un mètode d'entrada"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Afegeix"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Mètode d'entrada"
 
-#: ../setup/enginetreeview.py:96
+#: setup/enginetreeview.py:96
 msgid "Kbd"
 msgstr "Kbd"
 
-#: ../setup/ibus-setup.desktop.in.h:2
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferències de l'IBus"
+
+#: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
 msgstr "Establiu les preferències de l'IBus"
 
-#: ../setup/keyboardshortcut.py:55
+#: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: ../setup/keyboardshortcut.py:67
+#: setup/keyboardshortcut.py:67
 msgid "Key code:"
-msgstr "Codi de tecla:"
+msgstr "Codi de la tecla:"
 
-#: ../setup/keyboardshortcut.py:82
+#: setup/keyboardshortcut.py:82
 msgid "Modifiers:"
 msgstr "Modificadors:"
 
 #. apply button
-#: ../setup/keyboardshortcut.py:130
+#: setup/keyboardshortcut.py:130
 msgid "_Apply"
 msgstr "_Aplica"
 
 #. delete button
-#: ../setup/keyboardshortcut.py:136
+#: setup/keyboardshortcut.py:136
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/keyboardshortcut.py:252
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
@@ -827,21 +542,21 @@ msgstr ""
 "Premeu una tecla (o una combinació de tecles).\n"
 "El diàleg es tancarà quan es deixi anar la tecla."
 
-#: ../setup/keyboardshortcut.py:255
+#: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
 msgstr "Premeu una tecla (o una combinació de tecles)"
 
-#: ../setup/main.py:121 ../setup/main.py:588
+#: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
-"Utilitza la drecera de teclat amb la tecla de majúscules per canviar a "
-"l'anterior mètode d'entrada"
+"Usa la drecera de teclat amb la tecla de majúscules per canviar a l'anterior "
+"mètode d'entrada"
 
-#: ../setup/main.py:515
+#: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "No s'està executant el dimoni de l'IBus. Voleu iniciar-ho?"
+msgstr "No s'està executant el dimoni de l'IBus. El voleu iniciar?"
 
-#: ../setup/main.py:536
+#: setup/main.py:536
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -849,2326 +564,2793 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"S'ha iniciat IBus! Si no podeu utilitzar IBus, afegiu les línies següents al "
+"S'ha iniciat l'IBus! Si no podeu usar-lo, afegiu les línies següents al "
 "vostre $HOME/.bashrc; després torneu a entrar a l'escriptori.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:550
+#: setup/main.py:550
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
-msgstr "El dimoni d'IBus no es va poder iniciar en %d segons"
+msgstr "El dimoni de l'IBus no s'ha pogut iniciar en %d segons"
 
-#: ../setup/main.py:562
+#: setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccioneu la drecera de teclat per a %s"
 
 #. Translators: Title of the window
-#: ../setup/main.py:564
+#: setup/main.py:564
 msgid "switching input methods"
-msgstr "commutació dels mètodes d'entrada"
+msgstr "Commutació dels mètodes d'entrada"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horitzontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertical"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Cantonada superior esquerra"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Cantonada superior dreta"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Cantonada inferior esquerra"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Cantonada inferior dreta"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Personalitzat"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "No mostrar"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Ocultar automàticament"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Sempre"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+"La drecera de teclat per commutar al següent mètode d'entrada de la llista"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Següent mètode d'entrada:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"La drecera de teclat per canviar al mètode d'entrada anterior de la llista"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Mètode d'entrada anterior:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Habilita o inhabilita:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Habilita:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Inhabilita:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Dreceres de teclat</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Estableix l'orientació dels candidats a la taula de cerca"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientació dels candidats:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+"Estableix el comportament de l'IBus sobre com mostrar o ocultar la barra "
+"d'idiomes"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Mostra el quadre de propietats:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Posició del quadre d'idiomes:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Mostra el nom del mètode d'entrada a la barra d'idiomes quan s'activi la "
+"casella de selecció"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Incrusta el text pre-editat en la finestra de l'aplicació"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+"Incrusta el text pre-editat del mètode d'entrada en la finestra de "
+"l'aplicació"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Usa el tipus de lletra personalitzat:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Tipus de lletra i estil</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "General"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Afegeix el mètode d'entrada seleccionat als mètodes d'entrada habilitats"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "Sup_rimeix"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada habilitats"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "A_munt"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+"Mou amunt el mètode d'entrada seleccionat en la llista de mètodes habilitats"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "A_vall"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+"Mou avall el mètode d'entrada seleccionat en els mètodes d'entrada habilitats"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Quant a"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Mostra la informació del mètode d'entrada seleccionat"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Preferències"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Mostra la configuració del mètode d'entrada seleccionat"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>El mètode d'entrada actiu pot canviar-se amb els seleccionats en "
+"l'anterior llista prement les dreceres de teclat o en fer clic a la icona "
+"del quadre.</i></small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+"La drecera de teclat per habilitar les conversions de les anotacions emoji o "
+"els noms Unicode"
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Anotació emoji:"
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+"La drecera de teclat per habilitar les conversions de la posició del codi "
+"Unicode"
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Posició del codi Unicode:"
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+"Estableix un tipus de lletra dels candidats Unicode al diàleg de l'emoji"
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Tipus de lletra Unicode:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Estableix l'idioma de les anotacions emoji al diàleg dels emoji"
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Idioma d'anotació emoji:"
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+"Fes coincidir parcialment les anotacions emoji amb la següent condició i més "
+"que el nombre de caràcters:"
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+"Si les anotacions emoji poden coincidir amb una cadena parcial en comptes de "
+"la coincidència exacta"
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr "Coincidència del prefix"
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Coincidència del sufix"
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "La coincidència conté"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposició del teclat</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Paràmetres del mètode d'entrada global</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avançat"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>El bus d'entrada intel·ligent</small>\n"
+"Lloc web: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Inicia l'IBus en entrar"
 
-#: ../src/ibusemojigen.h:30
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Inici</b>"
+
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Activitats"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Animals i natura"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Banderes"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Menjar i beguda"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objectes"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+#, fuzzy
+#| msgid "Smileys & People"
+msgid "Smileys & Emotion"
 msgstr "Emoticones i gent"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Símbols"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Viatges i llocs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr ""
+msgstr "Llatí bàsic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr ""
+msgstr "Llatí-1 suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr ""
+msgstr "Llatí ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr ""
+msgstr "Llatí ampliat-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr ""
+msgstr "Extensions IPA"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "Modificador de l'espaiat de les lletres"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "Combinació de les marques diacrítiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr ""
+msgstr "Grec i copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr ""
+msgstr "Ciríl·lic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr ""
+msgstr "Ciríl·lic suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr ""
+msgstr "Armeni"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebreu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr ""
+msgstr "Àrab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "Siríac"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "Àrab suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "NKo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "Samarità"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "Mandaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "Siríac suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "Àrab ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalí"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "Tàmil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "Kanarès"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "Malaiàlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "Singalès"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "Tai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "Laosià"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetà"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "Birmà"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "Georgià"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "Hangul Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "Etiòpic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "Etiòpic suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "Sil·labaris aborígens unificats del Canadà"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "Ogham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "Rúnic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "Tagal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "Hanunoo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "Buhid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "Tagbanwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr ""
+msgstr "Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "Sil·labaris ampliats aborígens unificats del Canadà"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "Tai Lue nou"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "Símbols Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "Bugui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "Tai Tham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "Combinació ampliada de les marques diacrítiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "Balinès"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "Sundanès"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
+msgstr "Ciríl·lic ampliat-C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "Sundanès suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "Extensions vèdiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "Extensions fonètiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "Extensions fonètiques suplementàries"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "Combinació suplementària de les marques diacrítiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr ""
+msgstr "Llatí ampliat addicional"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
-msgstr ""
+msgstr "Grec ampliat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
-msgstr ""
+msgstr "Puntuació general"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
-msgstr ""
+msgstr "Superíndexs i subíndexs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Símbols de moneda"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "Combinació de les marques diacrítiques per als símbols"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
-msgstr ""
+msgstr "Símbols semblants a lletres"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
-msgstr ""
+msgstr "Formes de nombres"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
-msgstr ""
+msgstr "Fletxes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
-msgstr ""
+msgstr "Operadors matemàtics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
-msgstr ""
+msgstr "Tècnics variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
-msgstr ""
+msgstr "Imatges de control"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "Reconeixement òptic de caràcters"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "Alfanumèrics delimitats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
-msgstr ""
+msgstr "Dibuixos de quadres"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
-msgstr ""
+msgstr "Elements de blocs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
-msgstr ""
+msgstr "Figures geomètriques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
-msgstr ""
+msgstr "Símbols variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
-msgstr ""
+msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Símbols-A matemàtics variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "Fletxes-A suplementàries"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
-msgstr ""
+msgstr "Plantilles en Braille"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "Fletxes-B suplementàries"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "Símbols-B matemàtics variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "Operadors matemàtics suplementaris"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "Símbols i fletxes variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr ""
+msgstr "Glagolític"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "Llatí ampliat-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
-msgstr ""
+msgstr "Copte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "Georgià suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "Etiòpic ampliat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "Ciríl·lic ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "Puntuació suplementària"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "Radicals suplementaris del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "Radicals Kangxi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "Caràcters de descripció ideogràfica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
-msgstr ""
+msgstr "Símbols i puntuació del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
-msgstr ""
+msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "Hangul compatible amb el Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "Bopomofo ampliat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
-msgstr ""
+msgstr "Traços del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "Extensions fonètiques Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "Lletres i mesos delimitats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr ""
+msgstr "Compatibilitat del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "Extensió A d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
-msgstr ""
+msgstr "Símbols d'hexagrames Yijing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "Ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
-msgstr ""
+msgstr "Sil·labari Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
-msgstr ""
+msgstr "Radicals Yi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr ""
+msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
-msgstr ""
+msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "Ciríl·lic ampliat-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
-msgstr ""
+msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "Lletres amb modificació del to"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "Llatí ampliat-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "Formes de nombres comuns de l'Índic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
-msgstr ""
+msgstr "Phags-pa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
-msgstr ""
+msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "Devanagari ampliat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
-msgstr ""
+msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
-msgstr ""
+msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "Hangul Jamo ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
-msgstr ""
+msgstr "Javanès"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "Myanmar ampliat-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
-msgstr ""
+msgstr "Txam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "Myanmar ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
-msgstr ""
+msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "Ampliacions Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "Etiòpic ampliat-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "Llatí ampliat-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "Cherokee suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "Meetei Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "Sil·labari Hangul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "Hangul Jamo ampliat-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
-msgstr ""
+msgstr "Substitucions altes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "Substitucions altes d'ús privat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
-msgstr ""
+msgstr "Substitucions baixes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Àrea d'ús privat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
-msgstr "Ideogrames de compatibilitat CJK"
+msgstr "Ideogrames de compatibilitat del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Formes de presentació alfabètica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr "Formes de presentació àrab - A"
+msgstr "Formes A de presentació àrab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Selectors de variació"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Formes verticals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Combinació de mitges marques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr "Formes de compatibilitat CJK"
+msgstr "Formes de compatibilitat del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Variants de formes petites"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr "Formes de presentació àrab - B"
+msgstr "Formes B de presentació àrab"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Formes d'amplada mitjana i completa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Especials"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
-msgstr "Conjunt de síl·labes lineal B"
+msgstr "Conjunt lineal B de síl·labes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Ideogrames B lineals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
-msgstr "Nombres egeus"
+msgstr "Nombres de l'egeu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
-msgstr "Nombres grecs antics"
+msgstr "Nombres del grec antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Símbols antics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Disc de Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lici"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Cari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "Nombres epact coptes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Cursiva antiga"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "Gòtic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "Permià antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugarític"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Persa antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Deseret"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shavian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmanya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "Elbasan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "Albanès caucasià"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "Lineal A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr "Conjunt de síl·labes xipriotes"
+msgstr "Conjunt de síl·labes del xipriota"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Arameu imperial"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "Arameu de Palmira"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "Nabateu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Fenici"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lidi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "Jeroglífics meroítics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "Formes i valors meroítics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Àrab del sud antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Àrab del nord antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avèstic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr "Inscripcions Parthian"
+msgstr "Inscripcions del parthià"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr "Inscripcions Pahlavi"
+msgstr "Inscripcions del pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Turc antic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
+msgstr "Hongarès antic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+#, fuzzy
+#| msgid "Old South Arabian"
+msgid "Old Sogdian"
+msgstr "Àrab del sud antic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+#, fuzzy
+#| msgid "Lydian"
+msgid "Sogdian"
+msgstr "Lidi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
-msgstr ""
+msgstr "Mongol suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+#, fuzzy
+#| msgid "Variation Selectors Supplement"
+msgid "Tamil Supplement"
+msgstr "Suplement de selectors de variació"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Cuneïforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
-msgstr "Nombres i puntuació coniforme"
+msgstr "Nombres i puntuació cuneïforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgstr "Cuneïforme anterior a les dinasties"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Jeroglífics egipcis"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+#, fuzzy
+#| msgid "Egyptian Hieroglyphs"
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Jeroglífics egipcis"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgstr "Jeroglífics d'Anatòlia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgstr "Símbols i puntuació ideogràfiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Símbols musicals bizantins"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Símbols musicals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
-msgstr "Notació musical grega antiga"
+msgstr "Notació musical en grec antic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+#, fuzzy
+#| msgid "Aegean Numbers"
+msgid "Mayan Numerals"
+msgstr "Nombres egeus"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Símbols tai xuan jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Palets xinesos per comptar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Símbols matemàtics alfanumèrics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
+msgstr "Glagolític suplementari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
-msgid "Arabic Mathematical Alphabetic Symbols"
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Símbols alfabètics matemàtics àrabs"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Fitxes del Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Fitxes del dòmino"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
-msgstr ""
+msgstr "Cartes de joc"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Suplement alfanumèric tancat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Suplement ideogràfic tancat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "Símbols i pictogrames variats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
-msgstr ""
+msgstr "Emoticones"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "Dingbats ornamentals"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "Símbols de transports i mapes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "Símbols químics"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "Figures geomètriques ampliades"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "Fletxes-C suplementàries"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
+msgstr "Símbols i pictogrames suplementaris"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+#, fuzzy
+#| msgid "Symbols"
+msgid "Chess Symbols"
+msgstr "Símbols"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
-msgstr "Extensió B d'ideogrames unificats CJK"
+msgstr "Extensió B d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
-msgstr "Extensió C d'ideogrames unificats CJK"
+msgstr "Extensió C d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
-msgstr "Extensió D d'ideogrames unificats CJK"
+msgstr "Extensió D d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "Extensió E d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "Extensió F d'ideogrames unificats del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "Ideogrames suplementaris de compatibilitat del CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Etiquetes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
-msgstr "Suplement de selectors de variació"
+msgstr "Suplement dels selectors de variació"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Àrea A d'ús privat suplementari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Àrea B d'ús privat suplementari"
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Mostra tan sols el nom del motor"
 
-#: ../tools/main.vala:67 ../tools/main.vala:192 ../tools/main.vala:202
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
-msgstr "No es pot connectar a IBus.\n"
+msgstr "No es pot connectar amb l'IBus.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No s'ha establert cap motor.\n"
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "S'ha produït un error en establir el motor global.\n"
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "S'ha produït un error en obtenir el motor global.\n"
 
-#: ../tools/main.vala:217
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Llegeix la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:219
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Llegeix el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:237 ../tools/main.vala:242
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "La memòria cau del registre no és vàlida.\n"
 
-#: ../tools/main.vala:257
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Escriu la memòria cau del registre del sistema."
 
-#: ../tools/main.vala:259
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Escriu el FITXER de la memòria cau del registre."
 
-#: ../tools/main.vala:295
+#: tools/main.vala:295
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Usa els camins d'esquema del motor en comptes del nucli de l'IBus, el qual "
+"pot tenir els valors separats amb comes."
 
-#: ../tools/main.vala:381
+#: tools/main.vala:381
 msgid "Resetting…"
-msgstr "S'està restablint..."
+msgstr "S'està restablint…"
 
-#: ../tools/main.vala:399
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Fet"
 
-#: ../tools/main.vala:444
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Estableix o obté el motor"
 
-#: ../tools/main.vala:445
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Surt de l'ibus-daemon"
 
-#: ../tools/main.vala:446
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Mostra els motors disponibles"
 
-#: ../tools/main.vala:447
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(No implementat)"
 
-#: ../tools/main.vala:448
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
-msgstr "Reinicia el dimoni d'ibus"
+msgstr "Reinicia el dimoni de l'IBus"
 
-#: ../tools/main.vala:449
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Mostra la versió"
 
-#: ../tools/main.vala:450
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostra el contingut de la memòria cau del registre"
 
-#: ../tools/main.vala:451
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Crea la memòria cau del registre"
 
-#: ../tools/main.vala:452
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr "Mostra l'adreça D-Bus de l'ibus-daemon"
+msgstr "Mostra l'adreça D-Bus del dimoni de l'IBus"
 
-#: ../tools/main.vala:453
+#: tools/main.vala:453
 msgid "Show the configuration values"
-msgstr "Mostra els valors de configuració"
+msgstr "Mostra els valors de la configuració"
 
-#: ../tools/main.vala:454
+#: tools/main.vala:454
 msgid "Reset the configuration values"
-msgstr "Restableix els valors de configuració"
+msgstr "Restableix els valors de la configuració"
 
-#: ../tools/main.vala:456
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "Desa l'emoji del diàleg al porta-retalls"
+msgstr "Desa l'emoji del diàleg al porta-retalls "
 
-#: ../tools/main.vala:458
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostra aquesta informació"
 
-#: ../tools/main.vala:464
+#: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Ús: %s ORDRE [OPCIÓ...]\n"
+msgstr ""
+"Ús: %s ORDRE [OPCIÓ...]\n"
 "\n"
 
-#: ../tools/main.vala:465
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Ordres:\n"
 
-#: ../tools/main.vala:494
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s no és una ordre reconeguda!\n"
 
-#: ../ui/gtk3/emojier.vala:244
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Preferits"
 
-#: ../ui/gtk3/emojier.vala:245
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Altres"
 
-#: ../ui/gtk3/emojier.vala:246
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "Obre l'Unicode triat"
 
-#: ../ui/gtk3/emojier.vala:371
-msgid "Type annotation or choose emoji"
-msgstr "Teclegeu l'anotació o trieu l'emoji"
-
-#: ../ui/gtk3/emojier.vala:965
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "Torna a la selecció emoji"
 
-#: ../ui/gtk3/emojier.vala:1067
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Av Pàg"
 
-#: ../ui/gtk3/emojier.vala:1078
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Re Pàg"
 
-#: ../ui/gtk3/emojier.vala:1081
+#: ui/gtk3/emojier.vala:1110
 msgid "Show emoji variants"
 msgstr "Mostra les variants dels emojis"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1111
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
-#: ../ui/gtk3/emojier.vala:1088
+#: ui/gtk3/emojier.vala:1117
 msgid "Menu"
 msgstr "Menú"
 
-#: ../ui/gtk3/emojier.vala:1099
+#: ui/gtk3/emojier.vala:1128
 msgid "Click to view a warning message"
-msgstr ""
+msgstr "Cliqueu per a veure un missatge d'avís"
 
-#: ../ui/gtk3/emojier.vala:1143
+#: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
-msgstr ""
+msgstr "S'està carregant un diccionari Unicode:"
 
-#: ../ui/gtk3/emojier.vala:1383
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Posició del codi: %s"
 
-#: ../ui/gtk3/emojier.vala:1389
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Té variants d'emoji"
 
-#: ../ui/gtk3/emojier.vala:1556 ../ui/gtk3/emojier.vala:1569
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Descripció: %s"
 
-#: ../ui/gtk3/emojier.vala:1556
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Sense"
 
-#: ../ui/gtk3/emojier.vala:1580
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotacions: %s"
 
-#: ../ui/gtk3/emojier.vala:1606
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Nom: %s"
 
-#: ../ui/gtk3/emojier.vala:1614
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Àlies: %s"
 
-#: ../ui/gtk3/emojier.vala:2164
-#: ../ui/gtk3/ibus-extension-gtk3.desktop.in.in.h:1
-#: ../ui/gtk3/ibus-ui-emojier.desktop.in.in.h:1 ../ui/gtk3/panel.vala:1149
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
 msgid "Emoji Choice"
-msgstr "Tria de l'emoji"
+msgstr "Selecciona l'emoji"
 
-#: ../ui/gtk3/emojier.vala:2166
+#: ui/gtk3/emojier.vala:2141
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Unicode triat"
 
-#: ../ui/gtk3/emojier.vala:2526
+#: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
+"No s'ha pogut obtenir l'aplicació de text actual, si us plau torneu-li a "
+"donar el focus, p. ex., premeu Esc diverses vegades per sortir del mode "
+"escriptura emoji, cliqueu a l'escriptori i de nou en la vostra aplicació."
 
-#: ../ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "S'ha cancel·lat per triar un emoji."
 
-#: ../ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "S'ha copiat un emoji al vostre porta-retalls."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr ""
+msgstr "«TIPUS DE LLETRA» per als caracters emoji en el diàleg emoji"
 
-#: ../ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
-msgstr ""
+msgstr "TIPUS DE LLETRA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "ca"
 
-#: ../ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
-msgstr ""
+msgstr "IDIOMA"
 
-#: ../ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
-msgstr "Les anotacions dels emonjis poden coincidir parcialment"
+msgstr "Les anotacions emoji poden coincidir parcialment"
 
-#: ../ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Coincideix amb la llargada de l'enter especificat"
 
-#: ../ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Coincideix amb la condició de l'enter especificat"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Quadre de l'IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Actualització d'IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Súper+espai ara és l'accés de teclat per defecte."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "L'IBus és un bus d'entrada intel·ligent per a Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Joan Duran <jodufi@gmail.com>\n"
 "Oscar Osta Pueyo <oostap@gmail.com>,\n"
 "Patricia Rivera Escuder <patysya@gmail.com>,\n"
 "Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>,\n"
-"Xavier Conde Rueda <xavi.conde@gmail.com>"
+"Xavier Conde Rueda <xavi.conde@gmail.com>,\n"
+"Antoni Bella <antonibella5@yahoo.com>"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../ui/gtk3/panel.vala:1170
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk3/panel.vala:1174
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Surt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ 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 posició del quadre d'idiomes. 0 = cantonada superior esquerra, 1 = "
+#~ "cantonada superior dreta, 2 = cantonada inferior esquerra, 3 = cantonada "
+#~ "inferior dreta, 4 = personalitzat"
+
+#~ msgid "Type annotation or choose emoji"
+#~ msgstr "Teclegeu l'anotació o trieu l'emoji"
+
+#~ msgid "IBus Update"
+#~ msgstr "Actualització d'IBus"
+
+#~ msgid "Super+space is now the default hotkey."
+#~ msgstr "Súper+espai ara és l'accés de teclat per defecte."

From 16562d4c2ba5cba1488f793900e5809732d2c974 Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Fri, 21 Feb 2020 17:12:40 +0900
Subject: [PATCH 625/816] po: Update translation (French)

Update po/fr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/fr/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/fr.po | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 3384a31dd..10a5bd152 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -28,16 +28,16 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-03 13:37+0000\n"
-"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French <https://translate.stg.fedoraproject.org/projects/ibus/"
+"PO-Revision-Date: 2020-02-05 04:16+0000\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"Language-Team: French <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 3.10.3\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -328,7 +328,7 @@ msgstr "Touches de raccourcis Unicodes pour gtk_accelerator_parse"
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 "Les touches de raccourcis pour activer ou désactiver la frappe en mode "
-"Unicode "
+"Unicode"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
@@ -392,7 +392,7 @@ msgid ""
 "the exact match or not."
 msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
-"partielle plutôt qu’à la chaîne complète"
+"partielle plutôt qu’à la chaîne complète."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
@@ -422,7 +422,7 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
-msgstr "Charge les données relatives aux émoticônes au démarrage."
+msgstr "Charge les données relatives aux émoticônes au démarrage"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:219
 msgid ""
@@ -450,7 +450,7 @@ msgstr ""
 "mémoire sont nécessaires pour charger ces données. Sinon, les données "
 "Unicode sont chargées lors de l’ouverture de la boite de dialogue des "
 "émoticônes. Même dans le cas où la condition est remplie, les données "
-"Unicode sont toujours chargées après les données des émoticônes. "
+"Unicode sont toujours chargées après les données des émoticônes."
 
 #: ibus/_config.py.in:41
 msgid ""
@@ -479,7 +479,7 @@ msgstr "_Valider"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
-msgstr "Plus..."
+msgstr "Plus…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
 msgid "About"
@@ -571,7 +571,8 @@ msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 #: setup/main.py:121 setup/main.py:588
 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"
+"Utiliser le raccourci clavier avec Maj pour revenir à la méthode d’entrée "
+"précédente"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -805,7 +806,7 @@ msgstr ""
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
-msgstr "Annotation des émoticônes:"
+msgstr "Annotation des émoticônes :"
 
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
@@ -815,7 +816,7 @@ msgstr ""
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
-msgstr "Point de code Unicode:"
+msgstr "Point de code Unicode :"
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
@@ -823,7 +824,7 @@ msgstr "Défini la police des émoticônes candidates dans la boite de dialogue"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
-msgstr "Police de caractère Unicode:"
+msgstr "Police de caractère Unicode :"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -1059,7 +1060,7 @@ msgstr "Thaana"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr "NKo"
+msgstr "N’Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2235,7 +2236,7 @@ msgstr "Linéaire A"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr "Syllabaire Chypriote "
+msgstr "Syllabaire Chypriote"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2550,7 +2551,7 @@ msgstr "Nandinagari"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
-msgstr "Zanabazar Square"
+msgstr "Zanabazar carré"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2585,7 +2586,7 @@ msgstr "Marchen"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
-msgstr "Masaram Gondi"
+msgstr "Gondi de Masaram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2963,7 +2964,7 @@ msgstr "Symboles et pictogrammes supplémentaires"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
 msgid "Chess Symbols"
-msgstr "Symboles d'échecs"
+msgstr "Symboles d’échecs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3149,7 +3150,7 @@ msgstr "Réinitialiser les valeurs de configuration"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
+msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier "
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3281,7 +3282,7 @@ msgstr "Une émoticône a été copiée dans le presse-papier."
 #. 
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "« POLICE » des émoticônes dans la boite de dialogue."
+msgstr "« POLICE » des émoticônes dans la boite de dialogue"
 
 #: ui/gtk3/emojierapp.vala:115
 msgid "FONT"

From 9e238a87d7adcf3d63b4a10d3ee6977f5ed4540b Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Fri, 21 Feb 2020 17:12:42 +0900
Subject: [PATCH 626/816] po: Update translation (German)

Update po/de.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/de/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/de.po | 2047 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 1143 insertions(+), 904 deletions(-)

diff --git a/po/de.po b/po/de.po
index ccd99175e..df61ff353 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,383 +23,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
-"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-01-30 13:16+0000\n"
 "Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
-"Language-Team: German <https://translate.stg.fedoraproject.org/projects/ibus/"
+"Language-Team: German <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9.1\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horizontal"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertikal"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Ecke oben links"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Ecke oben rechts"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Ecke unten links"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Ecke unten rechts"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Nicht anzeigen"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Automatisch ausblenden"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Immer"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus-Einstellungen"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Nächste Eingabemethode:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Vorherige Eingabemethode:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Aktivieren oder deaktivieren:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Aktivieren:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Deaktivieren:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastenkombinationen</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Ausrichtung der Kandidaten:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Zeige Einstellungsleiste:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Position des Sprach-Panels:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Symbol im Benachrichtigungsfeld anzeigen"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Preedit-Text in Anwendungsfenster einbetten"
-
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Benutzerdefinierte Schriftart verwenden:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Schriftart und Stil</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Allgemein"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Hinzufügen"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden "
-"hinzu"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Entfernen"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Entfernen Sie die gewählte Eingabemethode aus den aktivierten "
-"Eingabemethoden"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Hoch"
-
-#: ../setup/setup.ui.h:40
-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"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Runter"
-
-#: ../setup/setup.ui.h:42
-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"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Info"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Informationen zur gewählten Eingabemethode anzeigen"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Einstellungen"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Die aktive Eingabemethode kann aus der angezeigten Liste durch die "
-"Tastenkombination oder durch einen Klick auf das Icon ausgewählt werden</i></"
-"small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Eingabemethode"
-
-#: ../setup/setup.ui.h:49
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr "Emoji-Auswahl:"
-
-#: ../setup/setup.ui.h:51
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Font von Emoji-Kandidaten im Emoji-Dialog einstellen"
-
-#: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Emoji Font:"
-
-#: ../setup/setup.ui.h:53
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Einstellen einer Sprache für Emojianmerkungen im Emojidialog"
-
-#: ../setup/setup.ui.h:54
-msgid "Emoji annotation language:"
-msgstr "Emojianmerkungssprache:"
-
-#: ../setup/setup.ui.h:55
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-"Nach teilweisen Übereinstimmungen in Emojianmerkungen suchen mit folgender "
-"Bedingung und mehr als der folgenden Anzahl von Zeichen:"
-
-#: ../setup/setup.ui.h:56
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-"Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
-"müssen anstatt mit kompletten Zeichenfolge"
-
-#: ../setup/setup.ui.h:57
-msgid "Prefix match"
-msgstr "Präfix-Übereinstimmung"
-
-#: ../setup/setup.ui.h:58
-msgid "Suffix match"
-msgstr "Suffix-Übereinstimmung"
-
-#: ../setup/setup.ui.h:59
-msgid "Containing match"
-msgstr "Enthält den Text"
-
-#: ../setup/setup.ui.h:60
-msgid "Emoji"
-msgstr "Emoji"
-
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "System-Tastaturbelegung verwenden"
-
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "System-Tastatur (XKB) Belegung verwenden"
-
-#: ../setup/setup.ui.h:63
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastaturbelegung</b>"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
-msgid "Share the same input method among all applications"
-msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globale Inputmethodeneinstellungen</b>"
-
-#: ../setup/setup.ui.h:66
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: ../setup/setup.ui.h:67
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Der intelligente Eingabe-Bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:74
-msgid "Start ibus on login"
-msgstr "IBus bei der Anmeldung starten"
-
-#: ../setup/setup.ui.h:75
-msgid "<b>Startup</b>"
-msgstr "<b>Starten</b>"
-
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
-msgid "About"
-msgstr "Info"
-
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "S_chließen"
+"X-Generator: Weblate 3.10.3\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Engines vorladen"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Engines vorladen, während IBus startet"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Engine-Reihenfolge"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Gespeicherte Engine-Reihenfolge in der Eingabemethoden-Liste"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Popup-Verzögerung für IME-Wechsel-Fenster in Millisekunden"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"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 &lt; Verzögerung in "
-"Millisekunden. 0 &gt; Fenster nicht anzeigen und zur vorhergehenden/ "
+"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:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Gespeicherte Versions-Numnner"
 
-#: ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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."
@@ -408,73 +81,124 @@ msgstr ""
 "der Version der zuvor installierten ibus und der aktuellen ibus zu "
 "überprüfen."
 
-#: ../data/ibus.schemas.in.h:11
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
 msgstr "Latin Tastaturbelegungen ohne ASCII"
 
-#: ../data/ibus.schemas.in.h:12
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 "US Tastaturbelegung wird den Latin Tastaturbelegungen angefügt. Varianten "
 "können vernachlässigt werden."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Verwenden von xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "xmodmap ausführen wenn .xmodmap oder .Xmodmap vorhanden ist wenn ibus "
 "Engines gewechselt werden."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "System-Tastaturbelegung verwenden"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "System-Tastatur (XKB) Belegung verwenden"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Preedit-Text einbetten"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Preedit-Text in Anwendungsfenster einbetten"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Globale Eingabemethode wählen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Eingabemethode standardmäßig aktivieren"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus "
+"erlangt"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "Dconf bewahrt Namenspräfixe"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Auslöser-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Tastenkombinationen auslösen für gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Tastenkürzel aktivieren"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Tastenkürzel deaktivieren"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Nächste Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Vorherige Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Automatisch verstecken"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -482,23 +206,16 @@ msgstr ""
 "Verhalten des Eigenschaften-Panels. 0 = nicht anzeigen, 1 = automatisch "
 "verstecken, 2 = immer anzeigen"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
-msgstr "Position des Sprach-Panels"
-
-#: ../data/ibus.schemas.in.h:29
-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 "Position des Sprach-Panels"
 
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr "Den Input-Cursor verfolgen falls das Panel immer angezeigt wird"
 
-#: ../data/ibus.schemas.in.h:31
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
@@ -506,11 +223,11 @@ msgstr ""
 "Wenn wahr folgt das Panel dem Input-Cursor wenn das Panel immer angezeigt "
 "wird. Wenn falsch wird das Panel an einer festen Position angezeigt."
 
-#: ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
 msgstr "Millisekunden bis die Einstellungsleiste angezeigt wird"
 
-#: ../data/ibus.schemas.in.h:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
@@ -518,46 +235,55 @@ msgstr ""
 "Millisekunden bis zum Anzeigen der Eigenschaftenleiste nach Fokuswechsel "
 "oder Eigenschaftenwechsel."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Symbol im Benachrichtigungsfeld anzeigen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Name der Eingabemethode anzeigen"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "RGBA Werte des XKB Icons"
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "Das XKB Icon zeigt den Layout-String und der String wird mit dem RGBA Wert "
-"gerendert. Der RGBA Wert kann sein  1. eine X11-Farbe , 2. ein Hex-Wert in "
+"gerendert. Der RGBA Wert kann sein 1. eine X11-Farbe , 2. ein Hex-Wert in "
 "der Form '#rrggbb' wobei 'r', 'g' und 'b' HEX-Werte für Rot, Grün und Blau "
 "sind, 3. eine RGB-Farbe in der Form 'rgb(r,g,b)' oder 4. eine RGBA-Farbe in "
 "der Form 'rgba(r,g,b,a)' wobei 'r', 'g', und 'b' entweder Integer im Bereich "
 "0 bis 255 oder Prozentwerte von 0-100% sind und 'a' ein Gleitkommawert im "
 "Bereich 0 bis 1 für das Alpha ist."
 
-#: ../data/ibus.schemas.in.h:42
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr "Millisekunden bis zum Anzeigen der Panel-Icons einer Eigenschaft"
 
-#: ../data/ibus.schemas.in.h:43
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -570,39 +296,48 @@ msgstr ""
 "der Wert 0 ist, gibt es keine Verzögerungszeit und das Property-Icon wird "
 "sofort gezeigt."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Unicode-Tastenkombinationen für gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "Die Tastenkombinationen zum Ein- und Ausschalten der Unicode-Eingabe"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji Tastenkombination für gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe"
 
-#: ../data/ibus.schemas.in.h:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Standard-Sprache für das Emoji-Wörterbuch"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -610,11 +345,11 @@ msgstr ""
 "Auswahl einer Standard-Sprache der Emoji-Wörterbücher im Emoji-Dialog. Der "
 "Wert $lang wird auf /usr/share/ibus/dicts/emoji-$lang.dict angewendet."
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "Emoji-Favoriteneliste im Emoji-Dialog"
 
-#: ../data/ibus.schemas.in.h:56
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -622,22 +357,22 @@ msgstr ""
 "Sie können die favorisierten Emoji in der Emoji-Liste anzeigen wenn die "
 "Liste Zeichen enthält."
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "Anmerkungsliste für bevorzugte Emoji im Emojidialog"
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "In dieser Liste kann man eine Anmerkung für  bevorzugte Emoji definieren."
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Ob in Emojianmerkungen mit  teilweiser  Übereinstimmung gesucht wird oder  "
 "nicht"
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -645,11 +380,11 @@ msgstr ""
 "Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
 "müssen anstatt mit kompletten Zeichenfolge."
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr "Finde Emojianmerkungen mit der angegebenen Länge"
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -657,13 +392,13 @@ msgstr ""
 "Finde Emojianmerkungen mit teilweiser Übereinstimmung mit mehr als der "
 "angegebenen Zahl von Zeichen anstelle von exakter Übereinstimmung."
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Wähle eine Bedingung um nach teilweisen Übereinstimmungen in "
 "Emojianmerkungen zu suchen"
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -671,37 +406,39 @@ msgstr ""
 "Wähle eine der folgenden Bedingungen um nach teilweisen Übereinstimmungen in "
 "Emojianmerkungen zu suchen: 0 == Präfix, 1  == Suffix, 2  == Mittendrin"
 
-#: ../data/ibus.schemas.in.h:65
-msgid "Embed Preedit Text"
-msgstr "Preedit-Text einbetten"
-
-#: ../data/ibus.schemas.in.h:66
-msgid "Embed Preedit Text in Application Window"
-msgstr "Preedit-Text in Anwendungsfenster einbetten"
-
-#: ../data/ibus.schemas.in.h:67
-msgid "Use global input method"
-msgstr "Globale Eingabemethode wählen"
-
-#: ../data/ibus.schemas.in.h:69
-msgid "Enable input method by default"
-msgstr "Eingabemethode standardmäßig aktivieren"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr "Emojidaten beim Starten laden"
 
-#: ../data/ibus.schemas.in.h:70
-msgid "Enable input method by default when the application gets input focus"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
 msgstr ""
-"Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus "
-"erlangt"
+"Wenn \"true\", dann werden die Emojidaten beim Starten geladen. Ungefähr "
+"10MB werden benötigt um diese Daten zu laden. Wenn \"false\", dann werden "
+"die Emojidaten erst geladen, wenn der Emojidialog zum ersten Mal geöffnet "
+"wird."
 
-#: ../data/ibus.schemas.in.h:71
-msgid "DConf preserve name prefixes"
-msgstr "Dconf bewahrt Namenspräfixe"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr "Unicodedaten beim Starten laden"
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+"Wenn \"true\", dann werden die Unicodedaten beim Starten geladen. Ungefähr "
+"15MB Speicher werden benötigt um die Daten zu laden. Wenn \"false\", dann "
+"werden die Unicodedaten erst geladen wenn der Emojidialog zum ersten Mal "
+"geöffnet wird. Die Unicodedaten werden immer nach den Emojidaten geladen, "
+"auch wenn diese Option \"true\" ist."
 
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
@@ -709,2409 +446,2911 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "Eine Sprache auswählen"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
 msgstr "Mehr..."
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Info"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "S_chließen"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastaturbelegung: %s\n"
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturbelegung: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beschreibung:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Eingabemethode wählen"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Eingabemethode"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus-Einstellungen"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus-Einstellungen konfigurieren"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Tastenkombinationen"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Tasten-Code:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Hilfstasten:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "An_wenden"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Löschen"
+
+#: setup/keyboardshortcut.py:252
+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).\n"
+"Der Dialog wird geschlossen, wenn die Taste losgelassen wird."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
+
+#: setup/main.py:121 setup/main.py:588
+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:515
+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:536
+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 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:550
+#, 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:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Wählen Sie eine Tastenkombination für %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "Eingabemethoden wechseln"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Ecke oben links"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Ecke oben rechts"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Ecke unten links"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Ecke unten rechts"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Nicht anzeigen"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Automatisch ausblenden"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Immer"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Nächste Eingabemethode:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"Tastenkombination zum Wechseln zur vorherigen Eingabemethode in der Liste"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Vorherige Eingabemethode:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Aktivieren oder deaktivieren:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Aktivieren:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Deaktivieren:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastenkombinationen</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Ausrichtung der Kandidaten:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+"Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu verstecken"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Zeige Einstellungsleiste:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Position des Sprach-Panels:"
+
+#: setup/setup.ui:494
+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"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Preedit-Text in Anwendungsfenster einbetten"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "Den Preedit-Text der Eingabemethode in Anwendungsfenster einbetten"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Benutzerdefinierte Schriftart verwenden:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Schriftart und Stil</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Allgemein"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+"Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden "
+"hinzu"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Entfernen"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+"Entfernen Sie die gewählte Eingabemethode aus den aktivierten Eingabemethoden"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Hoch"
+
+#: setup/setup.ui:707
+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"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Runter"
+
+#: setup/setup.ui:725
+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"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Info"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Informationen zur gewählten Eingabemethode anzeigen"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Einstellungen"
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Einstellungen der gewählten Eingabemethode anzeigen"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Beschreibung:\n"
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Die aktive Eingabemethode kann aus der angezeigten Liste durch die "
+"Tastenkombination oder durch einen Klick auf das Icon ausgewählt werden</i></"
+"small>"
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Eingabemethode wählen"
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+"Die Tastenkombinationen um Konvertierungen von Emoji- oder Unicodenamen "
+"einzuschalten"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Emojianmerkungen:"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus-Einstellungen konfigurieren"
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "Tastenkombinationen zum Einschalten der Unicode Codepoint Konvertierung"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Tastenkombinationen"
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr "Unicode Codepoint:"
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Tasten-Code:"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr "Font für Unicode-Kandidaten im Emoji-Dialog einstellen"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Hilfstasten:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicodefont:"
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "An_wenden"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr "Einstellen einer Sprache für Emojianmerkungen im Emojidialog"
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Löschen"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr "Emojianmerkungssprache:"
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1062
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
 msgstr ""
-"Bitte eine Taste (oder eine Tastenkombination drücken).\n"
-"Der Dialog wird geschlossen, wenn die Taste losgelassen wird."
-
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
+"Nach teilweisen Übereinstimmungen in Emojianmerkungen suchen mit folgender "
+"Bedingung und mehr als der folgenden Anzahl von Zeichen:"
 
-#: ../setup/main.py:121 ../setup/main.py:580
-msgid "Use shortcut with shift to switch to the previous input method"
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Tastenkombination mit Umschalttaste benutzen, um zur vorherigen "
-"Eingabemethode zu wechseln"
+"Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
+"müssen anstatt mit kompletten Zeichenfolge"
 
-#: ../setup/main.py:507
-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/setup.ui:1101
+msgid "Prefix match"
+msgstr "Präfix-Übereinstimmung"
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr "Suffix-Übereinstimmung"
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr "Enthält den Text"
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturbelegung</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globale Inputmethodeneinstellungen</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Erweitert"
 
-#: ../setup/main.py:528
+#: setup/setup.ui:1317
 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"
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 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:542
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-Dienst konnte innerhalb von %d Sekunden nicht gestartet werden"
+"<big><b>IBus</b></big>\n"
+"<small>Der intelligente Eingabe-Bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
-#: ../setup/main.py:554
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Wählen Sie eine Tastenkombination für %s"
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "IBus bei der Anmeldung starten"
 
-#. Translators: Title of the window
-#: ../setup/main.py:556
-msgid "switching input methods"
-msgstr "Eingabemethoden wechseln"
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Starten</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr "Aktivitäten"
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr "Tiere & Natur"
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Komponente"
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr "Flaggen"
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr "Essen & Trinken"
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr "Objekte"
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
-msgstr "Smileys & Leute"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Personen und Körper"
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Smileys und Emotionen"
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr "Symbole"
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr "Reisen & Orte"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr "Basis-Lateinisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr "Lateinisch-1, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr "Lateinisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr "Lateinisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr "IPA Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr "Nichtkombinierende Zusatzzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr "Kombinierende diakritische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr "Griechisch und koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr "Kyrillisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr "Armenisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr "Hebräisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr "Arabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr "Syrisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr "Arabisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr "Thaana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr "N’Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr "Samaritanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr "Mandäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr "Syrisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr "Arabisch, Erweiterung A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr "Devanagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr "Bengalisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr "Gujarati"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr "Oriya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr "Tamilisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr "Telugu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr "Kannada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr "Malayalam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr "Singhalesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr "Thailändisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr "Laotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr "Tibetisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr "Birmanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr "Georgisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr "Hangeul-Jamo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr "Äthiopisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr "Äthiopisch, Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr "Ogam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr "Runen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr "Tagalog"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr "Hanunóo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr "Buid"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr "Tagbanuwa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr "Khmer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr "Mongolisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Vereinheitlichte Silbenzeichen kanadischer Ureinwohner, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr "Limbu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr "Tai Le"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr "Neu-Tai-Lue"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr "Khmer-Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr "Buginesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr "Lanna"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr "Kombinierende diakritische Zeichen, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr "Balinesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr "Sundanesisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr "Batak"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr "Lepcha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr "Kyrillisch, erweitert-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Georgisch, erweitert"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr "Sundanesisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr "Vedische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr "Phonetische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr "Phonetische Erweiterungen, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Kombinierende diakritische Zeichen, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr "Lateinisch, weiterer Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr "Griechisch, Zusatz"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr "Allgemeine Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr "Hoch- und tiefgestellte Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr "Währungszeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Kombinierende diakritische Zeichen für Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr "Buchstabenähnliche Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr "Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr "Pfeile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr "Mathematische Operatoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr "Verschiedene technische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr "Symbole für Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr "Optische Zeichenerkennung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr "Umschlossene alphanumerische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr "Rahmenzeichnung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr "Blockelemente"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr "Geometrische Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr "Verschiedene Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr "Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Verschiedene mathematische Symbole-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr "Zusätzliche Pfeile-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr "Braille-Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr "Zusätzliche Pfeile-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Verschiedene mathematische Symbole-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr "Zusätzliche Mathematische Operatoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Verschiedene Symbole und Pfeile"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr "Glagolitisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr "Lateinisch, erweitert-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr "Koptisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr "Georgisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr "Äthiopisch, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr "Kyrillisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr "Zusätzliche Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr "CJK-Radikale, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr "Kangxi-Radikale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr "Ideographische Beschreibungszeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK-Symbole und -Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangeul-Jamo, Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr "Kanbun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr "Bopomofo, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr "CJK-Striche"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr "Katakana, Phonetische Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr "Umschlossene CJK-Zeichen und -Monate"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr "CJK-Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr "I-Ging-Hexagramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr "Vereinheitlichte CJK-Ideogramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr "Yi-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr "Yi-Radikale"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr "Lisu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr "Vai"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr "Kyrillisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr "Bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr "Modifizierende Tonzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr "Lateinisch, erweitert-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr "Allgemeine indische Ziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr "Phagspa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr "Devanagari, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr "Rejang"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangeul-Jamo, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr "Javanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr "Birmanisch, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr "Cham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr "Birmanisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr "Meitei-Mayek, Erweiterungen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr "Äthiopisch, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr "Lateinisch, erweitert-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr "Cherokee, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr "Meitei-Mayek"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr "Hangeul-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangeul-Jamo, erweitert-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr "High Surrogates"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr "High Surrogates (privater Bereich)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr "Low Surrogates"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr "Private Use Zone"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK-Ideogramme, Kompatibilität"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr "Alphabetische Präsentationsformen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr "Arabische Präsentationsformen-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr "Variantenselektoren"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr "Vertikale Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr "Kombinierende halbe diakritische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr "CJK-Kompatibilitätsformen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr "Kleine Formvarianten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr "Arabische Präsentationsformen-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Halbbreite und vollbreite Formen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr "Spezielles"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr "Linear-B-Silbenzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr "Linear-B-Ideogramme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr "Ägäische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr "Altgriechische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr "Alte Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr "Diskos von Phaistos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr "Lykisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr "Karisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr "Koptische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr "Altitalisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr "Gotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr "Altpermisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr "Ugaritisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr "Altpersisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr "Mormonenalphabet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr "Shaw-Alphabet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr "Osmaniya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr "Osage"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr "Albanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr "Alwanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr "Linear A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr "Kyprische Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr "Aramäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr "Palmyrenisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr "Nabatäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr "Hatran"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr "Phönizisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr "Lydisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr "Meroitische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr "Meroitisch-demotisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr "Altsüdarabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr "Altnordarabisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr "Manichäisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr "Avestisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr "Parthisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr "Inschriften-Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr "Psalter-Pahlavi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr "Alttürkisch (Orchon-Runen)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr "Altungarisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr "Hanifi Rohingya"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr "Rumi-Ziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr "Altsogdisch"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr "Sogdisch"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr "Elymaisch"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr "Sorang-Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr "Singhalesische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr "Multanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr "Khudabadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr "Mongolisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr "Dogra"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr "Varang Kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr "Nandinagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr "Dsanabadsar-Quadratschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr "Gunjala Gondi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr "Makassar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr "Tamilisch, Ergänzung"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr "Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Keilschrift-Zahlzeichen und -Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr "Frühe Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr "Ägyptische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "Ägyptische Hieroglyphen-Steuerzeichen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatolische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr "Bamum, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr "Medefaidrin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr "Pollard-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideographische Symbole und Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr "Xixia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr "Xixia-Komponenten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr "Kana, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr "Kana, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr "Kleine Kana, erweitert"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr "Frauenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr "Duployé-Kurzschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr "Kurzschrift-Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantinische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr "Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr "Altgriechische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr "Maya-Zahlzeichen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai-Xuan-Jing-Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr "Zählstabziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr "Sutton-SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr "Nyiakeng Puachue Hmong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr "Wancho"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr "Mende-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr "Indische Siyaq-Zahlzeichen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr "Osmanische Siyaq-Zahlzeichen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabische mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr "Mahjonggsteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr "Dominosteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr "Spielkarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Zusätzliche umschlossene alphanumerische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr "Zusätzliche umschlossene CJK-Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Verschiedene piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr "Smileys"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr "Ziersymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr "Verkehrs- und Kartensymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr "Alchemistische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr "Geometrische Formen, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr "Zusätzliche Pfeile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Zusätzliche piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr "Schachsymbole"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr "Piktografische Symbole, erweitert-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK-Ideogramme, Kompatibilität, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr "Variantenselektoren, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr "Supplementary Private Use Area-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr "Supplementary Private Use Area-B"
 
-#: ../tools/main.vala:54
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Nur Engine-Name auflisten"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Keine Verbindung zu IBus.\n"
 
-#: ../tools/main.vala:96
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../tools/main.vala:164
+#: tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr "Keine Engine gesetzt.\n"
+msgstr ""
+"Keine Engine gesetzt.\n"
 "\n"
 
-#: ../tools/main.vala:172
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:177
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:220
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Lesen Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:222
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Lesen Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "Der Registry-Cache ist ungültig.\n"
 
-#: ../tools/main.vala:260
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Schreiben Sie den System-Registry-Cache."
 
-#: ../tools/main.vala:262
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Schreiben Sie die Registry-Cache DATEI."
 
-#: ../tools/main.vala:314
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+"Schemapfade des Engines anstelle von ibus core verwenden, das können durch "
+"Komma getrennte Werte sein."
+
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr "Neustarten..."
 
-#: ../tools/main.vala:328
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Fertig"
 
-#: ../tools/main.vala:373
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Setzen oder erhalten Modul"
 
-#: ../tools/main.vala:374
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Beenden ibus-daemon"
 
-#: ../tools/main.vala:375
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Anzeigen verfügbare Module"
 
-#: ../tools/main.vala:376
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Nicht implementiert)"
 
-#: ../tools/main.vala:377
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Neustart ibus-daemon"
 
-#: ../tools/main.vala:378
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Anzeigen Version"
 
-#: ../tools/main.vala:379
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Anzeigen des Registry-Cache Inhalts"
 
-#: ../tools/main.vala:380
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Erstellen Registry-Cache"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
 
-#: ../tools/main.vala:382
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Anzeigen der Konfigurationswerte"
 
-#: ../tools/main.vala:383
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Zurücksetzen der Konfigurationswerte"
 
-#: ../tools/main.vala:385
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage "
 
-#: ../tools/main.vala:387
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Anzeige dieser Information"
 
-#: ../tools/main.vala:393
+#: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Anwendung: %s BEFEHL [OPTION...]\n"
+msgstr ""
+"Anwendung: %s BEFEHL [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: ../tools/main.vala:423
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr "Emoji-Varianten anzeigen"
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr "Menü"
-
-#: ../ui/gtk3/emojier.vala:273
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr "Andere"
 
-#: ../ui/gtk3/emojier.vala:275
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr "Öffne Unicodeauswahl"
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
-msgstr "Emojiauswahl"
-
-#: ../ui/gtk3/emojier.vala:451
-msgid "Type annotation or choose emoji"
-msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
-
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
-msgstr "Unicodeauswahl"
-
-#: ../ui/gtk3/emojier.vala:950
+#: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
 msgstr "Zurück zur Emojiauswahl"
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
-msgstr "Lade ein Unicodewörterbuch:"
-
-#: ../ui/gtk3/emojier.vala:1071
+#: ui/gtk3/emojier.vala:1096
 msgid "Page Down"
 msgstr "Seite runter"
 
-#: ../ui/gtk3/emojier.vala:1082
+#: ui/gtk3/emojier.vala:1107
 msgid "Page Up"
 msgstr "Seite hoch"
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr "Emoji-Varianten anzeigen"
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr "Schließen"
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr "Menü"
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr "Klicken um eine Warnmeldung anzusehen"
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr "Lade ein Unicodewörterbuch:"
+
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Codepoint: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr "Hat Emojivarianten"
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Keine"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anmerkungen: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr "Emojiauswahl"
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr "Unicodeauswahl"
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+"Konnte die aktuelle Textapplikation nicht finden. Bitte fokussieren Sie die "
+"Applikation erneut. Zum Beispiel tippen sie mehrere Male die Esc-Taste um "
+"den Emojieingabemodus zu verlassen, klicken Sie mit der Maus auf den Desktop "
+"und klicken sie dann wieder auf Ihre Textapplikation."
+
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Abbrechen der Emojiauswahl."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji in die Zwischenablage kopiert."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:97
+#.
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„SCHRIFTART“ für Emojizeichen im Emojidialog"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "SCHRIFTART"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:103
+#.
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„SPRACHE“ für Emojianmerkungen im Emojidialog. Zum Beispiel „en“"
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "SPRACHE"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr "Emojianmerkungen finden mit teilweiser Übereinstimmung"
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr "Übereinstimmung  mit Länge  der angegebenen ganzen Zahl"
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr "Übereinstimmung mit der Bedingung der angegebenen ganzen Zahl"
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "IBus Panel"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "IBus Aktualisierung"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 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:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009.\n"
 "Mike FABIAN <mfabian@redhat.com>, 2019."
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Beenden"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid "The shortcut keys for showing emoji dialog"
+#~ msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
+
+#~ msgid "Emoji choice:"
+#~ msgstr "Emoji-Auswahl:"
+
+#~ msgid "Emoji font:"
+#~ msgstr "Emoji Font:"
+
+#~ 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"
+
+#~ msgid "Type annotation or choose emoji"
+#~ msgstr "Emoji-Annotationen eingeben oder Emoji auswählen"
+
+#~ msgid "IBus Update"
+#~ msgstr "IBus Aktualisierung"
+
+#~ msgid "Super+space is now the default hotkey."
+#~ msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."

From 21f7b230896b5e8bc7e4a41bf9cc76fc68d723cb Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.toscano@tiscali.it>
Date: Fri, 21 Feb 2020 17:12:44 +0900
Subject: [PATCH 627/816] po: Update translation (Italian)

Update po/it.po at 32.0%
Translate-URL: https://translate.fedoraproject.org/projects/ibus/ibus/it/

BUG=https://github.com/ibus/ibus/pull/2174
---
 po/it.po | 2037 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 1096 insertions(+), 941 deletions(-)

diff --git a/po/it.po b/po/it.po
index e976c5c79..89c6c331a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,461 +16,182 @@
 # Alessio Ciregia <alciregi@gmail.com>, 2017. #zanata
 # Andrea Masala <andrea.masala87@gmail.com>, 2017. #zanata
 # Luca Ciavatta <luca.ciavatta@gmail.com>, 2017. #zanata
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2017. #zanata
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2018-02-20 17:31+0900\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-02-16 14:38+0000\n"
+"Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
+"Language-Team: Italian <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/it/>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-20 04:22-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: <it@li.org>\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.6\n"
-
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Orizzontale"
-
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Verticale"
-
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Angolo superiore sinistro"
-
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Angolo superiore destro"
-
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Angolo inferiore sinistro"
-
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Angolo inferiore destro"
-
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Personalizzato"
-
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Non mostrare"
-
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Nascondi automaticamente"
-
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Sempre"
-
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Preferenze di IBus"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Metodo di input successivo:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Metodo di input precedente:"
-
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
-
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
-msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
-
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Abilitare o disabilitare:"
-
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Abilita:"
-
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Disabilita:"
-
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Scorciatoie da tastiera</b>"
-
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
-
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "Orientamento dei candidati:"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "Mostra il pannello delle proprietà:"
-
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Posizione pannello della lingua:"
-
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Mostrare l'icona nell'area di notifica"
-
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Mostrare il nome del metodo di input nella barra della lingua"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
-
-#: ../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"
-
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Usare carattere personalizzato:"
-
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Tipo di carattere e stile</b>"
-
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Generali"
-
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "A_ggiungi"
-
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
-
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "_Rimuovi"
-
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
-
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Su"
-
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
-
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "_Giù"
-
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
-
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "I_nformazioni"
-
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Mostra le informazioni sul metodo di input selezionato"
-
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "Preferen_ze"
-
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "Mostra l'impostazione dell'input method selezionato"
-
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
-msgstr ""
-"<small><i>Il metodo di input attivo può essere commutato tra quelli "
-"selezionati nella lista sopra premendo i tasti di scelta rapida della "
-"tastiera o facendo clic sull'icona del pannello.</i></small>"
-
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Metodo di input"
-
-#: ../setup/setup.ui.h:49
-#, fuzzy
-msgid "The shortcut keys for showing emoji dialog"
-msgstr "I tasti scorciatoia per mostrare la finestra degli emoticon"
-
-#: ../setup/setup.ui.h:50
-msgid "Emoji choice:"
-msgstr ""
-
-#: ../setup/setup.ui.h:51
-#, fuzzy
-msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr "Impostare un font di candidati emoji nella finestra di emoji"
-
-#: ../setup/setup.ui.h:52
-msgid "Emoji font:"
-msgstr "Carattere emoticon:"
-
-#: ../setup/setup.ui.h:53
-#, fuzzy
-msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Impostare una lingua di annotazioni emoji nella finestra di emoji"
-
-#: ../setup/setup.ui.h:54
-#, fuzzy
-msgid "Emoji annotation language:"
-msgstr "Lingua di annotazione emoji:"
-
-#: ../setup/setup.ui.h:55
-msgid ""
-"Match emoji annotations partially with the following condition and more than "
-"the number of characters:"
-msgstr ""
-
-#: ../setup/setup.ui.h:56
-msgid ""
-"If emoji annotations can be matched with a partial string instead of the "
-"exact match"
-msgstr ""
-
-#: ../setup/setup.ui.h:57
-msgid "Prefix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:58
-msgid "Suffix match"
-msgstr ""
-
-#: ../setup/setup.ui.h:59
-msgid "Containing match"
-msgstr ""
-
-#: ../setup/setup.ui.h:60
-msgid "Emoji"
-msgstr ""
-
-#: ../setup/setup.ui.h:61 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Usa la disposizione di tastiera del sistema"
-
-#: ../setup/setup.ui.h:62 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Usa la disposizione di tastiera del sistema (XKB)"
-
-#: ../setup/setup.ui.h:63
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Disposizione tastiera</b>"
-
-#: ../setup/setup.ui.h:64 ../data/ibus.schemas.in.h:68
-msgid "Share the same input method among all applications"
-msgstr "Condivide lo stesso metodo di input tra le applicazioni"
-
-#: ../setup/setup.ui.h:65
-msgid "<b>Global input method settings</b>"
-msgstr "Seleziona un metodo di input"
-
-#: ../setup/setup.ui.h:66
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: ../setup/setup.ui.h:67
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Il bus di input intelligente</small>\n"
-"Sito web: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-
-#: ../setup/setup.ui.h:74
-msgid "Start ibus on login"
-msgstr "Avvia IBus all'accesso"
-
-#: ../setup/setup.ui.h:75
-msgid "<b>Startup</b>"
-msgstr "<b>Avvio</b>"
-
-#: ../setup/setup.ui.h:76 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1175
-msgid "About"
-msgstr "Informazioni"
-
-#: ../setup/setup.ui.h:77 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Chiudi"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10.3\n"
 
 #. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
 msgstr "Pre-carica i motori"
 
 #. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
 msgstr "Precarica i motori durante l'avvio di ibus"
 
-#: ../data/ibus.schemas.in.h:5
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
 msgstr "Ordine motori"
 
-#: ../data/ibus.schemas.in.h:6
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
 msgstr "Ordine motori salvati nell'elenco del metodo di input"
 
-#: ../data/ibus.schemas.in.h:7
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
 msgstr "Ritardo popup in millisecondi per la finestra del selettore IME"
 
-#: ../data/ibus.schemas.in.h:8
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
+"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 &lt; Ritardo in millisecondi. 0 &gt; Non mostrare la "
+"immediatamente. 0 < Ritardo in millisecondi. 0 > Non mostrare la "
 "finestra e passa ai motori prec/succ."
 
-#: ../data/ibus.schemas.in.h:9
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
 msgstr "Numero di versione salvata"
 
-#: ../data/ibus.schemas.in.h:10
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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 ""
-"Il numero di versione salvata verrà usato per controllare la differenza fra "
-"la versione precedente e quella corrente di ibus."
 
-#: ../data/ibus.schemas.in.h:11
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
-msgstr "Schemi latini senza ASCII"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
-"Lo schema US viene accodato agli schemi Latini. Le varianti possono essere "
-"omesse."
 
-#: ../data/ibus.schemas.in.h:13
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
 msgstr "Utilizza xmodmap"
 
-#: ../data/ibus.schemas.in.h:14
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"Eseguire xmodmap se .xmodmap o .Xmodmap esistono quando i motori ibus "
-"vengono scambiati."
 
-#: ../data/ibus.schemas.in.h:15
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Usa la disposizione di tastiera del sistema"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usa la disposizione di tastiera del sistema (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Inserire il testo pre-modificato"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "Usa il metodo di input globale"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Condivide lo stesso metodo di input tra le applicazioni"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Abilita per impostazione predefinita il metodo di input"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+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"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "Mantieni i prefissi dei nomi DConf"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
 msgstr "Tasto di scelta rapida di avvio"
 
-#: ../data/ibus.schemas.in.h:17
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Attiva i tasti scorciatoia per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:18
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
 msgstr "Abilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:19
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
 msgstr "I tasti scorciatoia per abilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:20
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
 msgstr "Disabilita i tasti scorciatoia"
 
-#: ../data/ibus.schemas.in.h:21
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
 msgstr "I tasti scorciatoia per disabilitare l'input method"
 
-#: ../data/ibus.schemas.in.h:22
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida successivo"
 
-#: ../data/ibus.schemas.in.h:23
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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"
 
-#: ../data/ibus.schemas.in.h:24
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
 msgstr "Motore dei tasti di scelta rapida precedente"
 
-#: ../data/ibus.schemas.in.h:25
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "I tasti scorciatoia per passare al metodo di input precedente"
 
-#: ../data/ibus.schemas.in.h:26
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
 msgstr "Nasconde automaticamente"
 
-#: ../data/ibus.schemas.in.h:27
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
@@ -478,143 +199,123 @@ msgstr ""
 "Comportamento del pannello proprietario. 0 = Non mostrare, 1 = Nascondi "
 "automaticamente, 2 = Mostra sempre"
 
-#: ../data/ibus.schemas.in.h:28
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
 msgid "Language panel position"
 msgstr "Posizione pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:29
-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"
-
-#: ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 "Segui il cursore di input nel caso in cui il pannello sia sempre visibile"
 
-#: ../data/ibus.schemas.in.h:31
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"Se vero, il pannello segue il cursore di input nel caso il pannello venga "
-"sempre mostrato. Se falso, il pannello viene mostrato in una posizione fissa."
-""
 
-#: ../data/ibus.schemas.in.h:32
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
-msgstr "La durata in millisecondi per mostrare il pannello delle proprietà"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:33
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
-"La durata in millisecondi per mostrare il pannello delle proprietà dopo "
-"l'acquisizione del fuoco o la modifica delle proprietà."
 
-#: ../data/ibus.schemas.in.h:34
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
 msgstr "Orientamento della tabella di ricerca"
 
-#: ../data/ibus.schemas.in.h:35
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientamento della tabella di ricerca. 0 = Orizzontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Mostrare l'icona nell'area di notifica"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
 msgstr "Mostra il nome del metodo di input"
 
-#: ../data/ibus.schemas.in.h:39
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Mostrare il nome del metodo di input nella barra della lingua"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
 msgstr "Valore RGBA dell'icona XKB"
 
-#: ../data/ibus.schemas.in.h:41
-#, fuzzy, no-c-format
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
-msgstr ""
-"L'icona XKB mostra la stringa di layout e la stringa è resa con il valore "
-"RGBA. Il valore RGBA può essere 1. un nome di colore X11, 2. un valore hex "
-"in formato '#rrggbb' dove  'r', 'g' e 'b' sono le cifre esadecimali per il "
-"rosso, il verde e il blu, 3. un colore RGB in formato 'rgb(r,g,b)' oppure 4. "
-"un colore RGBA in formato 'rgba(r,g,b,a)' dove 'r', 'g', e 'b' sono interi "
-"compresi nell'intervallo da 0 a 255 o valori percentuali nell'intervallo da "
-"0% a 100%, e 'a' è un numero in virgola mobile nell'intervallo da 0 a 1 "
-"dell'alpha."
-
-#: ../data/ibus.schemas.in.h:42
-#, fuzzy
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
-"La durata in millisecondi per mostrare l'icona del pannello di una proprietà"
 
-#: ../data/ibus.schemas.in.h:43
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"I millisecondi per mostrare l'icona del pannello dal sistema a una icona di "
-"struttura se la proprietà è specificata dal valore di icon-prop-key in "
-"IBusEngineDesc. Se il valore è 0, nessun tempo di ritardo e l'icona di "
-"proprietà è mostrata immediatamente."
 
-#: ../data/ibus.schemas.in.h:46
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
 msgstr "Usare carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
 msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: ../data/ibus.schemas.in.h:49
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
+msgstr "Nome del tipo di carattere personalizzato per il pannello della lingua"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Tasti scorciatoia Unicode per gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
-"Nome del tipo di carattere personalizzato per il pannello della lingua"
 
-#: ../data/ibus.schemas.in.h:50
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Tasti scelta rapida Emoji per gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:51
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
-"Tasti scelta rapida per abilitare o disabilitare il metodo di input delle "
-"Emoji"
 
-#: ../data/ibus.schemas.in.h:52
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
-"Nome del tipo di carattere personalizzato per emoji sulla finestra degli "
-"emoji"
 
-#: ../data/ibus.schemas.in.h:53
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
 msgstr "Lingua predefinita per il dizionario degli emoji"
 
-#: ../data/ibus.schemas.in.h:54
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
@@ -623,2498 +324,2952 @@ msgstr ""
 "dialogo. Il valore di $lang viene applicato a /usr/share/ibus/dicts/emoji-"
 "$lang.dict"
 
-#: ../data/ibus.schemas.in.h:55
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
 msgstr "Lista di emoji preferite sulla finestra degli emoji"
 
-#: ../data/ibus.schemas.in.h:56
-#, fuzzy
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
-"È possibile visualizzare le emoji preferite sulla lista emoji se questa "
-"lista ha dei caratteri."
 
-#: ../data/ibus.schemas.in.h:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:59
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:60
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:64
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:65
-msgid "Embed Preedit Text"
-msgstr "Inserire il testo pre-modificato"
-
-#: ../data/ibus.schemas.in.h:66
-msgid "Embed Preedit Text in Application Window"
-msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
-
-#: ../data/ibus.schemas.in.h:67
-msgid "Use global input method"
-msgstr "Usa il metodo di input globale"
-
-#: ../data/ibus.schemas.in.h:69
-msgid "Enable input method by default"
-msgstr "Abilita per impostazione predefinita il metodo di input"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:70
-msgid "Enable input method by default when the application gets input focus"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
 msgstr ""
-"Abilita per impostazione predefinita il metodo di input quando le "
-"applicazioni ottengono l'input focus"
 
-#: ../data/ibus.schemas.in.h:71
-msgid "DConf preserve name prefixes"
-msgstr "Mantieni i prefissi dei nomi DConf"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:72
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "Prefissi di chiavi DConf per arrestare la conversione dei nomi"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
 
-#: ../ibus/_config.py.in:41
+#: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007-2010 Peng Huang\n"
+msgstr ""
+"Copyright © 2007-2010 Peng Huang\n"
 "Copyright © 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Altro"
 
-#: ../setup/emojilang.py:67
+#: setup/emojilang.py:67
 msgid "Select a language"
 msgstr "Selezionare una lingua"
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:552
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:553
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
 msgstr "_OK"
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
 msgstr "Altro..."
 
-#: ../setup/engineabout.py:72
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Informazioni"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Chiudi"
+
+#: setup/engineabout.py:72
 #, python-format
 msgid "Language: %s\n"
 msgstr "Lingua: %s\n"
 
-#: ../setup/engineabout.py:75
+#: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposizione tastiera: %s\n"
 
-#: ../setup/engineabout.py:78
+#: setup/engineabout.py:78
 #, python-format
 msgid "Author: %s\n"
 msgstr "Autore: %s\n"
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Descrizione:\n"
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Descrizione:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Seleziona un metodo di input"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "A_ggiungi"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Metodo di input"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferenze di IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Imposta Preferenze di IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Scorciatoie da tastiera"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Codice del tasto:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modificatori:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "A_pplica"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "Eli_mina"
+
+#: setup/keyboardshortcut.py:252
+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).\n"
+"La finestra verrà chiusa dopo il rilascio del tasto stesso."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Premere un tasto (o una combinazione di tasti)"
+
+#: setup/main.py:121 setup/main.py:588
+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"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
+
+#: setup/main.py:536
+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 è 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "Impossibile avviare il demone IBus in %d secondi"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Selezione delle scorciatoie da tastiera per %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "selezione metodi di input in corso"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Orizzontale"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Verticale"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Angolo superiore sinistro"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Angolo superiore destro"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Angolo inferiore sinistro"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Angolo inferiore destro"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Personalizzato"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Non mostrare"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Nascondi automaticamente"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Sempre"
+
+#: setup/setup.ui:113
+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"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Metodo di input successivo:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+"I tasti scorciatoia per passare al metodo di input precedente nell'elenco"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Metodo di input precedente:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Abilitare o disabilitare:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Abilita:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Disabilita:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Scorciatoie da tastiera</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "Orientamento dei candidati:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+"Imposta il comportamento di IBus su come mostrare o nascondere la barra "
+"della lingua"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Mostra il pannello delle proprietà:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Posizione pannello della lingua:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+"Quando la casella è spuntata mostra il nome del metodo di input nella barra "
+"della lingua"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "Inserire il testo pre-modificato nella finestra dell'applicazione"
+
+#: setup/setup.ui:513
+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"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Usare carattere personalizzato:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Tipo di carattere e stile</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Generali"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "Aggiunge il metodo selezionato ai metodi di input abilitati"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Rimuovi"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Su"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Giù"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "Sposta in basso il metodo selezionato nei metodi di input abilitati"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "I_nformazioni"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Mostra le informazioni sul metodo di input selezionato"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "Preferen_ze"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Mostra l'impostazione dell'input method selezionato"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Il metodo di input attivo può essere commutato tra quelli "
+"selezionati nella lista sopra premendo i tasti di scelta rapida della "
+"tastiera o facendo clic sull'icona del pannello.</i></small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Seleziona un metodo di input"
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Annotazione emoji:"
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#: setup/setup.ui:927
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Imposta Preferenze di IBus"
+#: setup/setup.ui:929
+#, fuzzy
+#| msgid "Code point: %s"
+msgid "Unicode code point:"
+msgstr "Punto di codice: %s"
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Scorciatoie da tastiera"
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Codice del tasto:"
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Carattere Unicode:"
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Modificatori:"
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "A_pplica"
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "Eli_mina"
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:252
+#: setup/setup.ui:1067
 msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
 msgstr ""
-"Premere un tasto (o una combinazione di tasti).\n"
-"La finestra verrà chiusa dopo il rilascio del tasto stesso."
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
-msgstr "Premere un tasto (o una combinazione di tasti)"
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
 
-#: ../setup/main.py:121 ../setup/main.py:580
-msgid "Use shortcut with shift to switch to the previous input method"
+#: setup/setup.ui:1115
+msgid "Suffix match"
 msgstr ""
-"Usa i tasti scorciatoia e shift per passare al metodo di input successivo"
 
-#: ../setup/main.py:507
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "Il demone IBus non è in esecuzione. Desideri avviarlo?"
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
 
-#: ../setup/main.py:528
-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"
+#: setup/setup.ui:1176
+msgid "Emoji"
 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:542
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Impossibile avviare il demone IBus in %d secondi"
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposizione tastiera</b>"
 
-#: ../setup/main.py:554
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Selezione delle scorciatoie da tastiera per %s"
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "Seleziona un metodo di input"
 
-#. Translators: Title of the window
-#: ../setup/main.py:556
-msgid "switching input methods"
-msgstr "selezione metodi di input in corso"
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Il bus di input intelligente</small>\n"
+"Sito web: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Avvia IBus all'accesso"
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Avvio</b>"
 
-#: ../src/ibusemojigen.h:30
+#: src/ibusemojigen.h:30
 msgid "Activities"
 msgstr ""
 
-#: ../src/ibusemojigen.h:31
+#: src/ibusemojigen.h:31
 msgid "Animals & Nature"
 msgstr ""
 
-#: ../src/ibusemojigen.h:32
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
 msgid "Flags"
 msgstr ""
 
-#: ../src/ibusemojigen.h:33
+#: src/ibusemojigen.h:34
 msgid "Food & Drink"
 msgstr ""
 
-#: ../src/ibusemojigen.h:34
+#: src/ibusemojigen.h:35
 msgid "Objects"
 msgstr ""
 
-#: ../src/ibusemojigen.h:35
-msgid "Smileys & People"
+#: src/ibusemojigen.h:36
+msgid "People & Body"
 msgstr ""
 
-#: ../src/ibusemojigen.h:36
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
 msgid "Symbols"
 msgstr ""
 
-#: ../src/ibusemojigen.h:37
+#: src/ibusemojigen.h:39
 msgid "Travel & Places"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:33
+#: src/ibusunicodegen.h:33
 msgid "Basic Latin"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:37
+#: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:41
+#: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:45
+#: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:49
+#: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:53
+#: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:57
+#: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:61
+#: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:65
+#: src/ibusunicodegen.h:65
 msgid "Cyrillic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:69
+#: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:73
+#: src/ibusunicodegen.h:73
 msgid "Armenian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:77
+#: src/ibusunicodegen.h:77
 msgid "Hebrew"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:81
+#: src/ibusunicodegen.h:81
 msgid "Arabic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:85
+#: src/ibusunicodegen.h:85
 msgid "Syriac"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:89
+#: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:93
+#: src/ibusunicodegen.h:93
 msgid "Thaana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:97
+#: src/ibusunicodegen.h:97
 msgid "NKo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:101
+#: src/ibusunicodegen.h:101
 msgid "Samaritan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:105
+#: src/ibusunicodegen.h:105
 msgid "Mandaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:109
+#: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117
 msgid "Devanagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121
 msgid "Bengali"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129
 msgid "Gujarati"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133
 msgid "Oriya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137
 msgid "Tamil"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141
 msgid "Telugu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145
 msgid "Kannada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149
 msgid "Malayalam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153
 msgid "Sinhala"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157
 msgid "Thai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161
 msgid "Lao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165
 msgid "Tibetan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169
 msgid "Myanmar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173
 msgid "Georgian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181
 msgid "Ethiopic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189
 msgid "Cherokee"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197
 msgid "Ogham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201
 msgid "Runic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205
 msgid "Tagalog"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209
 msgid "Hanunoo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213
 msgid "Buhid"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221
 msgid "Khmer"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225
 msgid "Mongolian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233
 msgid "Limbu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237
 msgid "Tai Le"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249
 msgid "Buginese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253
 msgid "Tai Tham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261
 msgid "Balinese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265
 msgid "Sundanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269
 msgid "Batak"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273
 msgid "Lepcha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Greek Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "General Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "Superscripts and Subscripts"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Currency Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Control Pictures"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Box Drawing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Block Elements"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Geometric Shapes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Glagolitic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Tifinagh"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "Hiragana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Katakana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Bopomofo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Kanbun"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "Yijing Hexagram Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Lisu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Vai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Bamum"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Phags-pa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Saurashtra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Kayah Li"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Rejang"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Javanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Cham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Tai Viet"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "High Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Private Use Area"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Specials"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Lycian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Carian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Old Italic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Gothic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Old Permic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Ugaritic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Old Persian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Deseret"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Shavian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Osmanya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osage"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Elbasan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Linear A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:777
 msgid "Palmyrene"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:781
 msgid "Nabataean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:785
 msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:789
 msgid "Phoenician"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:793
 msgid "Lydian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:817
 msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:821
 msgid "Avestan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:837
 msgid "Old Turkic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:869
 msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:873
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:877
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:881
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:885
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:889
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:893
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:897
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:901
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:905
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:909
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:913
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:917
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:921
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:925
 msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:929
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:933
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:953
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:957
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:961
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:965
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:969
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
 msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:989
 msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:993
 msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:997
 msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
 msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:1009
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:1013
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:1017
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:1021
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1033
 msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1037
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1041
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1045
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1049
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1061
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1077
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1089
 msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1093
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1097
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1101
 msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1117
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1133
 msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1137
 msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1141
 msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1145
 msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1149
 msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1153
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1157
 msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1161
 msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1165
 msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1169
 msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1173
 msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1177
 msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1181
 msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1197
 msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1201
 msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1205
 msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1209
 msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1213
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1217
 msgid "Tags"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1221
 msgid "Variation Selectors Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1225
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: ../src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1229
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:54
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "Elenca solo il nome del motore"
 
-#: ../tools/main.vala:70 ../tools/main.vala:195 ../tools/main.vala:205
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Impossibile collegarsi a IBus.\n"
 
-#: ../tools/main.vala:96
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "lingua: %s\n"
 
-#: ../tools/main.vala:164
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "Nessun motore impostato.\n"
 
-#: ../tools/main.vala:172
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Impostazione motore globale fallita.\n"
 
-#: ../tools/main.vala:177
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Acquisizione motore globale fallita.\n"
 
-#: ../tools/main.vala:220
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Leggere la cache del registro di sistema."
 
-#: ../tools/main.vala:222
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Leggere la cache del registro dei FILE."
 
-#: ../tools/main.vala:240 ../tools/main.vala:245
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "La cache del registro non è valida.\n"
 
-#: ../tools/main.vala:260
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Scrivere la cache del registro di sistema."
 
-#: ../tools/main.vala:262
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Scrivere la cache del registro dei FILE."
 
-#: ../tools/main.vala:314
-#, fuzzy
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
 msgid "Resetting…"
-msgstr "Reset..."
+msgstr ""
 
-#: ../tools/main.vala:328
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Fatto"
 
-#: ../tools/main.vala:373
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Impostare od ottenere motore"
 
-#: ../tools/main.vala:374
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Esci ibus-daemon"
 
-#: ../tools/main.vala:375
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Mostra motori disponibili"
 
-#: ../tools/main.vala:376
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Non implementato)"
 
-#: ../tools/main.vala:377
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Fai ripartire il demone ibus"
 
-#: ../tools/main.vala:378
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Mostra la versione"
 
-#: ../tools/main.vala:379
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Mostra il contenuto della cache del registro"
 
-#: ../tools/main.vala:380
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Creare cache del registro"
 
-#: ../tools/main.vala:381
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Stampare l'indirizzo D-Bus di ibus-deamon"
 
-#: ../tools/main.vala:382
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr "Mostrare i valori della configurazione"
 
-#: ../tools/main.vala:383
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr "Reimpostare i valori della configurazione"
 
-#: ../tools/main.vala:385
+#: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
 msgstr "Salvare emoji sulla finestra degli appunti"
 
-#: ../tools/main.vala:387
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Mostrare questa informazione"
 
-#: ../tools/main.vala:393
+#: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n"
+msgstr ""
+"Utilizzo: %s COMANDO [OPZIONE...]\n"
 "\n"
 
-#: ../tools/main.vala:394
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
-#: ../tools/main.vala:423
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s è un comando sconosciuto!\n"
 
-#: ../ui/gtk3/emojier.vala:245
-msgid "Show emoji variants"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:250
-msgid "Menu"
-msgstr ""
-
-#: ../ui/gtk3/emojier.vala:273
+#: ui/gtk3/emojier.vala:233
 msgid "Favorites"
 msgstr "Preferiti"
 
-#: ../ui/gtk3/emojier.vala:274
+#: ui/gtk3/emojier.vala:234
 msgid "Others"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:275
+#: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:445 ../ui/gtk3/emojier.vala:826
-#: ../ui/gtk3/panel.vala:1149
-msgid "Emoji Choice"
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:451
-#, fuzzy
-msgid "Type annotation or choose emoji"
-msgstr "Scrivere una annotazione oppure scegliere una emoji"
-
-#: ../ui/gtk3/emojier.vala:948
-msgid "Unicode Choice"
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:950
-msgid "Bring back emoji choice"
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1016
-msgid "Loading a Unicode dictionary:"
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1071
+#: ui/gtk3/emojier.vala:1111
 #, fuzzy
-msgid "Page Down"
-msgstr "Page Down"
+#| msgid "_Close"
+msgid "Close"
+msgstr "_Chiudi"
 
-#: ../ui/gtk3/emojier.vala:1082
-#, fuzzy
-msgid "Page Up"
-msgstr "Page Up"
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1236
+#: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto di codice: %s"
 
-#: ../ui/gtk3/emojier.vala:1242
+#: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1377 ../ui/gtk3/emojier.vala:1391
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../ui/gtk3/emojier.vala:1377
+#: ui/gtk3/emojier.vala:1591
 msgid "None"
 msgstr "Nessuno"
 
-#: ../ui/gtk3/emojier.vala:1402
+#: ui/gtk3/emojier.vala:1615
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotazioni: %s"
 
-#: ../ui/gtk3/emojier.vala:1428
+#: ui/gtk3/emojier.vala:1641
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:1436
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:56
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
 msgstr "Annullato scegliere un emoji."
 
-#: ../ui/gtk3/emojierapp.vala:77
+#: ui/gtk3/emojierapp.vala:93
 msgid "Copied an emoji to your clipboard."
 msgstr "Copiato un emoji negli appunti."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:97
+#.
+#: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"FONT\" per i caratteri emoji sulla finestra degli emoji"
 
-#: ../ui/gtk3/emojierapp.vala:98
+#: ui/gtk3/emojierapp.vala:115
 msgid "FONT"
 msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:103
+#.
+#: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"LANG\" per le annotazioni sulla finestra degli emoji. es. \"en\""
 
-#: ../ui/gtk3/emojierapp.vala:104
+#: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
 msgstr "LANG"
 
-#: ../ui/gtk3/emojierapp.vala:106
+#: ui/gtk3/emojierapp.vala:123
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:110
+#: ui/gtk3/emojierapp.vala:127
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:131
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:282 ../ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
 msgid "IBus Panel"
 msgstr "Pannello IBus"
 
-#: ../ui/gtk3/panel.vala:710
-msgid "IBus Update"
-msgstr "Aggiorna IBus"
-
-#: ../ui/gtk3/panel.vala:711 ../ui/gtk3/panel.vala:722
-msgid "Super+space is now the default hotkey."
-msgstr "Super+spazio è ora la scelta rapida predefinita."
-
-#: ../ui/gtk3/panel.vala:1121
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus è un bus di input intelligente per Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:1125
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sergio Zanchetta https://launchpad.net/~primes2h"
 
-#: ../ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../ui/gtk3/panel.vala:1181
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../ui/gtk3/panel.vala:1185
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Esci"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:368 ../ui/gtk3/propertypanel.vala:376
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+

From e3262f08b9e3efc57808700823b0622ec03a1b5f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Feb 2020 21:43:01 +0900
Subject: [PATCH 628/816] Release 1.5.22

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ab74a3802..2917c10b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2019 Red Hat, Inc.
+# Copyright (c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2020 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
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [21])
+m4_define([ibus_micro_version], [22])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 7b0d091839a4f1315ba216175fb2787e86f7fa31 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 3 Mar 2020 17:08:30 +0900
Subject: [PATCH 629/816] src/tests: Delete graves in substitution in
 ibus-desktop-testing-runner

Delete the single quotations to enclose grave chracters because
DASH saves the single quoted '`id -u`' as the raw string in the command
substitution not to be extracted.

BUG=https://github.com/ibus/ibus/issues/2189
---
 src/tests/ibus-desktop-testing-runner.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 0d9a847c6..f9238e69d 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -4,7 +4,7 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2018 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,8 @@
 # POSIX sh has no 'echo -e'
 : ${ECHO:='/usr/bin/echo'}
 # POSIX sh has $UID
-: ${UID:='`id -u`'}
+# DASH saves the graves in '``' as characters not to be extracted
+: ${UID:=`id -u`}
 
 
 PROGNAME=`basename $0`
@@ -170,7 +171,7 @@ _EOF
 run_dbus_daemon()
 {
     # Use dbus-launch --exit-with-session later instead of --sh-syntax
-    export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/bus
+    export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
 }
 
 run_desktop()

From 8ce25208c3f4adfd290a032c6aa739d2b7580eb1 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 12 Mar 2020 16:02:16 +0900
Subject: [PATCH 630/816] src: Use WAYLAND_DISPLAY on Wayland sessions to make
 up IBus socket name

In Wayland sessions, GNOME Shell 3.36 is leveraging 2 X11 Display
connections so one is used to set up all services for a "X11 session"
before user applications connected to the other display might require it.
This allows seamlessly starting Xwayland on demand to X11 user applications.

IBus here belongs to the first described connection, it is started
explicitly on that display by GNOME Shell as it is necessary to set up
ibus-x11 before any other X11 client might want to use it.

However the use of this "secondary" display results in IBus daemon left
unable to talk to applications, as the socket name is dependent on the
DISPLAY envvar and ibus/applications don't agree on its content.

For wayland sessions, make it look for WAYLAND_DISPLAY, as that'll have
the similar "per session bus" behavior that this seems to look after.

BUG=https://gitlab.gnome.org/GNOME/gnome-shell/issues/2341
---
 src/ibusshare.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ibusshare.c b/src/ibusshare.c
index 0d50d3f5c..e0ef2ce08 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -100,6 +100,7 @@ ibus_get_socket_path (void)
         gchar *display;
         gchar *displaynumber = "0";
         /* gchar *screennumber = "0"; */
+        gboolean is_wayland = FALSE;
         gchar *p;
 
         path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE"));
@@ -108,13 +109,19 @@ ibus_get_socket_path (void)
         }
 
         if (_display == NULL) {
-            display = g_strdup (g_getenv ("DISPLAY"));
+            display = g_strdup (g_getenv ("WAYLAND_DISPLAY"));
+            if (display)
+                is_wayland = TRUE;
+            else
+                display = g_strdup (g_getenv ("DISPLAY"));
         }
         else {
             display = g_strdup (_display);
         }
 
-        if (display) {
+        if (is_wayland) {
+            displaynumber = display;
+        } else if (display) {
             p = display;
             hostname = display;
             for (; *p != ':' && *p != '\0'; p++);

From 5765bfd69fb2ab1174378fbb0d8cac7f2bd2610f Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Wed, 15 Apr 2020 17:43:14 +0900
Subject: [PATCH 631/816] client/gtk2: Remove glib_check_version() in gtk
 immodule

In the gtk2/gtk3 immodule, glib_check_version() is being used to make sure
that the installed glib version is not older than the glib version which ibus
is built with.

But there is no reason why glib version is checked in runtime. Library
compatibility is already being checked more precisely by packaging systems and
linkers.

This version check can break the ibus gtk immodule when used with an older but
compatible version of glib, such as glib 2.62.x which is compatible with
2.64.x.

BUG=https://github.com/ibus/ibus/issues/2200
---
 client/gtk2/ibusim.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/gtk2/ibusim.c b/client/gtk2/ibusim.c
index bfacd0f05..d70800d3a 100644
--- a/client/gtk2/ibusim.c
+++ b/client/gtk2/ibusim.c
@@ -41,9 +41,7 @@ static const GtkIMContextInfo *info_list[] = {
 G_MODULE_EXPORT const gchar*
 g_module_check_init (GModule *module)
 {
-    return glib_check_version (GLIB_MAJOR_VERSION,
-                               GLIB_MINOR_VERSION,
-                               0);
+    return null;
 }
 
 G_MODULE_EXPORT void

From 8da016764cee9616cca4658d1fb311d6b3bfc0df Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 15 Apr 2020 17:55:03 +0900
Subject: [PATCH 632/816] src/tests: Fix to get focus events with su in
 ibus-desktop-testing-runner

GtkWindow haven't received focus events in any test cases since Fedora 31
whenever Ansible runs ibus-desktop-testing-runner after `su root`.
Seems su command does not run systemd automatically and now systemd
requires XDG_RUNTIME_DIR and Ansible requires root access with ssh.
This fix requires to restart sshd with modified /etc/ssh/sshd_config
with "PermitRootLogin yes" in order to run with su command.

Ansible with ibus-desktop-testin-runner has worked fine if root console
login is used without this patch because PAM runs systemd by login.
---
 src/tests/ibus-desktop-testing-runner.in | 36 ++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index f9238e69d..f760fd5be 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -49,6 +49,7 @@ PID_XORG=0
 PID_GNOME_SESSION=0
 TESTING_RUNNER="default"
 TESTS=""
+TIMEOUT=300
 GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0m'
@@ -84,6 +85,7 @@ usage()
 "-r, --runner=RUNNER              Run TESTS programs with a test RUNNER.\n"    \
 "                                 RUNNDER = gnome or default.\n"               \
 "                                 default is an embedded runner.\n"            \
+"-T, --timeout=TIMEOUT            Set timeout (default TIMEOUT is 300 sec).\n" \
 "-o, --output=OUTPUT_FILE         OUtput the log to OUTPUT_FILE\n"             \
 "-O, --result=RESULT_FILE         OUtput the result to RESULT_FILE\n"          \
 ""
@@ -92,8 +94,8 @@ usage()
 parse_args()
 {
     # This is GNU getopt. "sudo port getopt" in BSD?
-    ARGS=`getopt -o hvb:s:cd:t:r:o:O: --long \
-          help,version,builddir:,srcdir:,no-graphics,desktop:,tests:,runner:,output:,result:\
+    ARGS=`getopt -o hvb:s:cd:t:r:T:o:O: --long \
+          help,version,builddir:,srcdir:,no-graphics,desktop:,tests:,runner:,timeout:,output:,result:\
         -- "$@"`;
     eval set -- "$ARGS"
     while [ 1 ] ; do
@@ -106,6 +108,7 @@ parse_args()
         -d | --desktop )     DESKTOP_COMMAND="$2"; shift 2;;
         -t | --tests )       TESTS="$2"; shift 2;;
         -r | --runner )      TESTING_RUNNER="$2"; shift 2;;
+        -T | --timeout )     TIMEOUT="$2"; shift 2;;
         -o | --output )      TEST_LOG="$2"; shift 2;;
         -O | --result )      RESULT_LOG="$2"; shift 2;;
         -- )                 shift; break;;
@@ -166,11 +169,37 @@ _EOF
     fi
     # `su` command does not run loginctl
     export XDG_SESSION_TYPE='x11'
+    export XDG_SESSION_CLASS=user
+    # `su` command does not get focus in events without this variable.
+    # Need to restart sshd after set "PermitRootLogin yes" in sshd_config
+    if [ "x$XDG_RUNTIME_DIR" = x ] ; then
+        export XDG_RUNTIME_DIR=/run/user/$UID
+        is_root_login=`grep "^PermitRootLogin" /etc/ssh/sshd_config | grep yes`
+        if [ "x$ANSIBLE" != x ] && [ "x$is_root_login" = x ] ; then
+            print_log -e "${RED}FAIL${NC}: No permission to get focus-in events in GtkWindow with ansible"
+            echo "su command does not configure necessary login info "         \
+                 "with systemd and GtkWindow cannot receive focus-events "     \
+                 "when ibus-desktop-testing-runner is executed by "            \
+                 "ansible-playbook." >> $TEST_LOG
+            echo "Enabling root login via sshd, restarting sshd, set "         \
+                 "XDG_RUNTIME_DIR can resolve the problem under "              \
+                 "ansible-playbook." >> $TEST_LOG
+            exit 255
+        fi
+    fi
+    #  Do we need XDG_SESSION_ID and XDG_SEAT?
+    #export XDG_CONFIG_DIRS=/etc/xdg
+    #export XDG_SESSION_ID=10
+    #export XDG_SESSION_DESKTOP=gnome
+    #export XDG_SEAT=seat0
 }
 
 run_dbus_daemon()
 {
     # Use dbus-launch --exit-with-session later instead of --sh-syntax
+    # GNOME uses a unix:abstract address and it effects gsettings set values
+    # in each test case.
+    # TODO: Should we comment out this line?
     export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
 }
 
@@ -288,7 +317,8 @@ run_gnome_desktop_testing_runner()
             fail=1
             continue
         fi
-        gnome-desktop-testing-runner $tst 2>>$TEST_LOG 1>>$TEST_LOG
+        gnome-desktop-testing-runner --timeout=$TIMEOUT $tst \
+                2>>$TEST_LOG 1>>$TEST_LOG
         retval=$?
         read pass fail << EOF
         `count_case_result $retval $pass $fail`

From 0b9d9365988a96a2bc31c48624f9c2b8081601b6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 22 Apr 2020 20:17:12 +0900
Subject: [PATCH 633/816] client/gtk2: Fix typo

---
 client/gtk2/ibusim.c                     | 4 ++--
 src/tests/ibus-desktop-testing-runner.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/gtk2/ibusim.c b/client/gtk2/ibusim.c
index d70800d3a..55609ce73 100644
--- a/client/gtk2/ibusim.c
+++ b/client/gtk2/ibusim.c
@@ -2,7 +2,7 @@
 /* vim:set et ts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2020 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
@@ -41,7 +41,7 @@ static const GtkIMContextInfo *info_list[] = {
 G_MODULE_EXPORT const gchar*
 g_module_check_init (GModule *module)
 {
-    return null;
+    return NULL;
 }
 
 G_MODULE_EXPORT void
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index f760fd5be..4232c549b 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -173,7 +173,7 @@ _EOF
     # `su` command does not get focus in events without this variable.
     # Need to restart sshd after set "PermitRootLogin yes" in sshd_config
     if [ "x$XDG_RUNTIME_DIR" = x ] ; then
-        export XDG_RUNTIME_DIR=/run/user/$UID
+        export XDG_RUNTIME_DIR="/run/user/$UID"
         is_root_login=`grep "^PermitRootLogin" /etc/ssh/sshd_config | grep yes`
         if [ "x$ANSIBLE" != x ] && [ "x$is_root_login" = x ] ; then
             print_log -e "${RED}FAIL${NC}: No permission to get focus-in events in GtkWindow with ansible"

From 59d0de47a62395553734070b7d5f26349499bb38 Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Thu, 23 Apr 2020 09:46:06 +0900
Subject: [PATCH 634/816] src: Build the Emoji dictionaries in parallel

Instead of building Emoji dictionaries src/dicts/emoji-*.dict in sequence, a
pattern rule is specified for them. The make -jN option builds the
dictionaries in parallel.

The GNU make extensions like pattern rule and patsubst function are used for
it. But src/Makefile.am has had other GNU make extensions for a while, so
using more extensions should not make portability worse.

BUG=https://github.com/ibus/ibus/pull/2209
---
 src/Makefile.am | 55 ++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a8e3d07da..99de1ab7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,42 +246,41 @@ if ENABLE_EMOJI_DICT
 AM_CPPFLAGS += -DENABLE_EMOJI_DICT
 
 dictdir = $(pkgdatadir)/dicts
-dict_DATA = dicts/emoji-en.dict
 LANG_FILES = $(basename $(notdir $(wildcard $(EMOJI_ANNOTATION_DIR)/*.xml)))
+EMOJI_DICT_FILES = $(patsubst %,dicts/emoji-%.dict,$(LANG_FILES))
+dict_DATA = $(EMOJI_DICT_FILES)
 
 noinst_PROGRAMS += emoji-parser
 
-dicts/emoji-en.dict: emoji-parser
+dicts/emoji-%.dict: emoji-parser
 	$(AM_V_at)if test x"$(LANG_FILES)" = x ; then \
 	    echo "WARNING: Not found $(EMOJI_ANNOTATION_DIR)/en.xml" 1>&2; \
 	fi; \
-	for f in $(LANG_FILES) ; do \
-	    if test -f dicts/emoji-$$f.dict; then \
-	        echo "Already exists dicts/emoji-$$f.dict"; \
-	        continue; \
-	    fi; \
-	    if test -f \
-	    "$(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml" ; then \
-	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml"; \
+	if test -f $@; then \
+	    echo "Already exists $@"; \
+	    exit 0; \
+	fi; \
+	if test -f \
+	    "$(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$*.xml" ; then \
+	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$*.xml"; \
 	        plus_comment="derived"; \
-	    fi; \
-	    if test x"$$f" = xen ; then \
-	        $(builddir)/emoji-parser \
-	            --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
-	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
-	            $$xml_derived_option \
-	            --xml-ascii $(top_srcdir)/data/annotations/en_ascii.xml \
-	            --out-category ibusemojigen.h \
-	            --out $@; \
-	    else \
-	        $(builddir)/emoji-parser \
-	            --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
-	            --xml $(EMOJI_ANNOTATION_DIR)/$$f.xml \
-	            $$xml_derived_option \
-	            --out dicts/emoji-$$f.dict; \
-	    fi; \
-	    echo "Generated $$plus_comment dicts/emoji-$$f.dict"; \
-	done
+	fi; \
+	if test x"$*" = xen ; then \
+	    $(builddir)/emoji-parser \
+	        --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
+	        --xml $(EMOJI_ANNOTATION_DIR)/$*.xml \
+	        $$xml_derived_option \
+	        --xml-ascii $(top_srcdir)/data/annotations/en_ascii.xml \
+	        --out-category ibusemojigen.h \
+	        --out $@; \
+	else \
+	    $(builddir)/emoji-parser \
+	        --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
+	        --xml $(EMOJI_ANNOTATION_DIR)/$*.xml \
+	        $$xml_derived_option \
+	        --out $@; \
+	fi; \
+	echo "Generated $$plus_comment $@"
 
 ibusemojigen.h: dicts/emoji-en.dict
 	$(NULL)

From 02105c4d486283e6b561181d9c934d4d23f2d65e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 May 2020 15:48:34 +0900
Subject: [PATCH 635/816] bus: Fix SEGV in bus_panel_proxy_focus_in()

SEGV in BUS_IS_PANEL_PROXY() in bus_panel_proxy_focus_in()
Check if GDBusConnect is closed before bus_panel_proxy_new() is called.

BUG=rhbz#1349148
BUG=rhbz#1385349
---
 bus/ibusimpl.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 85761d30b..e432e8492 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2011-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
@@ -464,13 +464,16 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
     else if (!g_strcmp0 (name, IBUS_SERVICE_PANEL_EXTENSION_EMOJI))
         panel_type = PANEL_TYPE_EXTENSION_EMOJI;
 
-    if (panel_type != PANEL_TYPE_NONE) {
+    do {
+        if (panel_type == PANEL_TYPE_NONE)
+            break;
         if (g_strcmp0 (new_name, "") != 0) {
             /* a Panel process is started. */
             BusConnection *connection;
             BusInputContext *context = NULL;
             BusPanelProxy   **panel = (panel_type == PANEL_TYPE_PANEL) ?
                                       &ibus->panel : &ibus->emoji_extension;
+            GDBusConnection *dbus_connection = NULL;
 
             if (*panel != NULL) {
                 ibus_proxy_destroy ((IBusProxy *)(*panel));
@@ -479,9 +482,21 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
                 g_assert (*panel == NULL);
             }
 
-            connection = bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS, new_name);
+            connection = bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS,
+                                                               new_name);
             g_return_if_fail (connection != NULL);
 
+            dbus_connection = bus_connection_get_dbus_connection (connection);
+            /* rhbz#1349148 rhbz#1385349
+             * Avoid SEGV of BUS_IS_PANEL_PROXY (ibus->panel)
+             * This function is called during destroying the connection
+             * in this case? */
+            if (dbus_connection == NULL ||
+                g_dbus_connection_is_closed (dbus_connection)) {
+                new_name = "";
+                break;
+            }
+
             *panel = bus_panel_proxy_new (connection, panel_type);
             if (panel_type == PANEL_TYPE_EXTENSION_EMOJI)
                 ibus->enable_emoji_extension = FALSE;
@@ -535,7 +550,7 @@ _dbus_name_owner_changed_cb (BusDBusImpl   *dbus,
                 }
             }
         }
-    }
+    } while (0);
 
     bus_ibus_impl_component_name_owner_changed (ibus, name, old_name, new_name);
 }

From f591381e3c892947ecaffe9131b9039ab9014498 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 14 May 2020 16:02:00 +0900
Subject: [PATCH 636/816] bus: Fix SEGV in bus_dbus_impl_name_owner_changed()

rhbz#1406699 SEGV in new_owner!=NULL in bus_dbus_impl_name_owner_changed()
which is called by bus_name_service_remove_owner()
If bus_connection_get_unique_name()==NULL, set new_owner="" in
bus_name_service_remove_owner()

rhbz#1432252 SEGV in old_owner!=NULL in bus_dbus_impl_name_owner_changed()
which is called by bus_name_service_set_primary_owner()
If bus_connection_get_unique_name()==NULL, set old_owner="" in
bus_name_service_set_primary_owner()

BUG=rhbz#1406699
BUG=rhbz#1432252
---
 bus/dbusimpl.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index b54ef817a..59787a80a 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2013 Red Hat, Inc.
+ * Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
@@ -344,6 +345,8 @@ bus_name_service_set_primary_owner (BusNameService     *service,
                                     BusConnectionOwner *owner,
                                     BusDBusImpl        *dbus)
 {
+    gboolean has_old_owner = FALSE;
+
     g_assert (service != NULL);
     g_assert (owner != NULL);
     g_assert (dbus != NULL);
@@ -351,6 +354,13 @@ bus_name_service_set_primary_owner (BusNameService     *service,
     BusConnectionOwner *old = service->owners != NULL ?
             (BusConnectionOwner *)service->owners->data : NULL;
 
+    /* rhbz#1432252 If bus_connection_get_unique_name() == NULL,
+     * "Hello" method is not received yet.
+     */
+    if (old != NULL && bus_connection_get_unique_name (old->conn) != NULL) {
+        has_old_owner = TRUE;
+    }
+
     if (old != NULL) {
         g_signal_emit (dbus,
                        dbus_signals[NAME_LOST],
@@ -370,7 +380,8 @@ bus_name_service_set_primary_owner (BusNameService     *service,
                    0,
                    owner->conn,
                    service->name,
-                   old != NULL ? bus_connection_get_unique_name (old->conn) : "",
+                   has_old_owner ? bus_connection_get_unique_name (old->conn) :
+                           "",
                    bus_connection_get_unique_name (owner->conn));
 
     if (old != NULL && old->do_not_queue != 0) {
@@ -427,6 +438,7 @@ bus_name_service_remove_owner (BusNameService     *service,
                                BusDBusImpl        *dbus)
 {
     GSList *owners;
+    gboolean has_new_owner = FALSE;
 
     g_assert (service != NULL);
     g_assert (owner != NULL);
@@ -439,6 +451,13 @@ bus_name_service_remove_owner (BusNameService     *service,
         BusConnectionOwner *_new = NULL;
         if (owners->next != NULL) {
             _new = (BusConnectionOwner *)owners->next->data;
+            /* rhbz#1406699 If bus_connection_get_unique_name() == NULL,
+             * "Hello" method is not received yet.
+             */
+            if (_new != NULL &&
+                bus_connection_get_unique_name (_new->conn) != NULL) {
+                has_new_owner = TRUE;
+            }
         }
 
         if (dbus != NULL) {
@@ -447,7 +466,7 @@ bus_name_service_remove_owner (BusNameService     *service,
                            0,
                            owner->conn,
                            service->name);
-            if (_new != NULL) {
+            if (has_new_owner) {
                 g_signal_emit (dbus,
                                dbus_signals[NAME_ACQUIRED],
                                0,
@@ -460,7 +479,7 @@ bus_name_service_remove_owner (BusNameService     *service,
                     _new != NULL ? _new->conn : NULL,
                     service->name,
                     bus_connection_get_unique_name (owner->conn),
-                    _new != NULL ? bus_connection_get_unique_name (_new->conn) : "");
+                    has_new_owner ? bus_connection_get_unique_name (_new->conn) : "");
 
         }
     }

From 0da3cece88c8b94c0721aa7aca4f2d427aa22069 Mon Sep 17 00:00:00 2001
From: Neil Shepperd <nshepperd@gmail.com>
Date: Wed, 22 Jul 2020 15:31:29 +0900
Subject: [PATCH 637/816] src: Skip parsing of compose sequence with invalid
 keysyms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of continuing with the keysym defaulted to <Delete>, print a
warning and skip the broken XCompose rule entirely. Fixes a bug where
an ~/.XCompose file with a error breaks the delete key.

Tested locally with the example from launchpad bug below:

	   <\> <)> : "☭" # HAMMER AND SICKLE

This is incorrect syntax as neither <\> nor <)> are correct keysym
names. Before this patch, ibus-daemon -v prints a warning, but
pressing delete twice produces ☭ instead of its normal function. After
this patch, ibus-daemon -v prints a slightly better warning, and the
delete key is unaffected.

BUG=https://github.com/ibus/ibus/issues/2130
BUG=https://bugs.launchpad.net/ubuntu/+source/ibus/+bug/1849399
---
 src/ibuscomposetable.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 3f439134c..c50be2b36 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -216,8 +216,12 @@ parse_compose_sequence (IBusComposeData *compose_data,
             compose_data->sequence[n] = codepoint;
         }
 
-        if (codepoint == IBUS_KEY_VoidSymbol)
-            g_warning ("Could not get code point of keysym %s", match);
+        if (codepoint == IBUS_KEY_VoidSymbol) {
+            g_warning ("Could not get code point of keysym %s: %s",
+                       match, line);
+            g_free (match);
+            goto fail;
+        }
         g_free (match);
         n++;
     }

From 0ad5e9a6b6611b53c63e635e89b42e30e43ac701 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 5 Aug 2020 19:50:02 +0900
Subject: [PATCH 638/816] setup: Delete autostart setting

BUG=https://github.com/ibus/ibus/pull/2224
---
 setup/main.py  | 38 --------------------------------
 setup/setup.ui | 59 --------------------------------------------------
 2 files changed, 97 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index f6adb0982..d5e2078c7 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -398,13 +398,6 @@ def __init_ui(self):
         self.__button_close = self.__builder.get_object("button_close")
         self.__button_close.connect("clicked", Gtk.main_quit)
 
-        # auto start ibus
-        self.__checkbutton_auto_start = self.__builder.get_object(
-                "checkbutton_auto_start")
-        self.__checkbutton_auto_start.set_active(self.__is_auto_start())
-        self.__checkbutton_auto_start.connect("toggled",
-                self.__checkbutton_auto_start_toggled_cb)
-
         self.__init_hotkeys()
         self.__init_panel()
         self.__init_general()
@@ -647,37 +640,6 @@ def __item_preload_column_toggled_cb(self, cell, path_str, model):
         # set new value
         model.set(iter, COLUMN_PRELOAD, data[DATA_PRELOAD])
 
-    def __is_auto_start(self):
-        link_file = path.join(GLib.get_user_config_dir(),
-                              "autostart/ibus.desktop")
-        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
-                                 "share/applications/ibus.desktop")
-
-        if not path.exists(link_file):
-            return False
-        if not path.islink(link_file):
-            return False
-        if path.realpath(link_file) != ibus_desktop:
-            return False
-        return True
-
-    def __checkbutton_auto_start_toggled_cb(self, button):
-        auto_start_dir = path.join(GLib.get_user_config_dir(), "autostart")
-        if not path.isdir(auto_start_dir):
-            os.makedirs(auto_start_dir)
-
-        link_file = path.join(GLib.get_user_config_dir(),
-                              "autostart/ibus.desktop")
-        ibus_desktop = path.join(os.getenv("IBUS_PREFIX"),
-                                 "share/applications/ibus.desktop")
-        # unlink file
-        try:
-            os.unlink(link_file)
-        except:
-            pass
-        if self.__checkbutton_auto_start.get_active():
-            os.symlink(ibus_desktop, link_file)
-
     def __sigusr1_cb(self, *args):
         self.__window.present()
 
diff --git a/setup/setup.ui b/setup/setup.ui
index 56453054c..250f43a01 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1307,65 +1307,6 @@
                 <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;IBus&lt;/b&gt;&lt;/big&gt;
-&lt;small&gt;The intelligent input bus&lt;/small&gt;
-Homepage: https://github.com/ibus/ibus/wiki
-
-
-
-</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame1">
-                    <property name="can_focus">False</property>
-                    <property name="no_show_all">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_auto_start">
-                        <property name="label" translatable="yes">Start ibus on login</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="halign">start</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="margin_top">6</property>
-                        <property name="margin_start">12</property>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Startup&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">4</property>

From 3f098dc51a718f3bd427873607dcd47865523dce Mon Sep 17 00:00:00 2001
From: Aaron Muir Hamilton <aaron@correspondwith.me>
Date: Tue, 18 Aug 2020 13:45:32 +0900
Subject: [PATCH 639/816] ui/gtk3: Tell Pango about the engine language in the
 candidate panel

This helps Pango select the correct font variants for the engine
language, which is especially important between languages based on han
characters which have wildly different forms of the same character.

BUG=https://github.com/ibus/ibus/issues/2238
---
 ui/gtk3/candidatearea.vala  | 7 +++++++
 ui/gtk3/candidatepanel.vala | 9 +++++++++
 ui/gtk3/panel.vala          | 2 ++
 3 files changed, 18 insertions(+)

diff --git a/ui/gtk3/candidatearea.vala b/ui/gtk3/candidatearea.vala
index b22ab5da4..0ab412171 100644
--- a/ui/gtk3/candidatearea.vala
+++ b/ui/gtk3/candidatearea.vala
@@ -32,6 +32,8 @@ class CandidateArea : Gtk.Box {
     private bool m_show_cursor;
     private ThemedRGBA m_rgba;
 
+    private Pango.Attribute m_language_attribute;
+
     private const string LABELS[] = {
         "1.", "2.", "3.", "4.", "5.", "6.", "7.", "8.",
         "9.", "0.", "a.", "b.", "c.", "d.", "e.", "f."
@@ -102,6 +104,10 @@ class CandidateArea : Gtk.Box {
             m_labels[i].set_text(LABELS[i]);
     }
 
+    public void set_language(Pango.Attribute language_attribute) {
+        m_language_attribute = language_attribute.copy();
+    }
+
     public void set_candidates(IBus.Text[] candidates,
                                uint focus_candidate = 0,
                                bool show_cursor = true) {
@@ -115,6 +121,7 @@ class CandidateArea : Gtk.Box {
             bool visible = false;
             if (i < candidates.length) {
                 Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(candidates[i]);
+                attrs.change(m_language_attribute.copy());
                 if (i == focus_candidate && show_cursor) {
                     Pango.Attribute pango_attr = Pango.attr_foreground_new(
                             (uint16)(m_rgba.selected_fg.red * uint16.MAX),
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
index 8994cdb98..57544df36 100644
--- a/ui/gtk3/candidatepanel.vala
+++ b/ui/gtk3/candidatepanel.vala
@@ -34,6 +34,8 @@ public class CandidatePanel : Gtk.Box{
 
     private Gdk.Rectangle m_cursor_location;
 
+    private Pango.Attribute m_language_attribute;
+
     public signal void cursor_up();
     public signal void cursor_down();
     public signal void page_up();
@@ -112,8 +114,14 @@ public class CandidatePanel : Gtk.Box{
         m_candidate_area.set_labels(labels);
     }
 
+    public void set_language(Pango.Attribute language_attribute) {
+        m_candidate_area.set_language(language_attribute);
+        m_language_attribute = language_attribute.copy();
+    }
+
     private void set_attributes(Gtk.Label label, IBus.Text text) {
         Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(text);
+        attrs.change(m_language_attribute.copy());
 
         Gtk.StyleContext context = label.get_style_context();
         Gdk.RGBA color;
@@ -154,6 +162,7 @@ public class CandidatePanel : Gtk.Box{
         if (text != null) {
             m_aux_label.set_text(text.get_text());
             Pango.AttrList attrs = get_pango_attr_list_from_ibus_text(text);
+            attrs.change(m_language_attribute.copy());
             m_aux_label.set_attributes(attrs);
             m_aux_label.show();
         } else {
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 680c86edf..8d9f5cc04 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -822,6 +822,8 @@ class Panel : IBus.PanelService {
         if (!m_use_system_keyboard_layout)
             m_xkblayout.set_layout(engine);
 
+        m_candidate_panel.set_language(new Pango.AttrLanguage(Pango.Language.from_string(engine.get_language())));
+
         engine_contexts_insert(engine);
     }
 

From 79a09f1e75357a9f1b38e80717a59c19cca1645e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Aug 2020 13:45:38 +0900
Subject: [PATCH 640/816] setup: Add use-glyph-from-engine-lang

The setting can revert the previous setting to choose glpyhs
with the current locale on lookup window instead of the engine's language.

BUG=https://github.com/ibus/ibus/issues/2238
---
 data/dconf/org.freedesktop.ibus.gschema.xml |  9 ++++
 setup/main.py                               |  7 +++
 setup/setup.ui                              | 49 +++++++++++++++++++++
 ui/gtk3/panel.vala                          | 26 ++++++++++-
 4 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 7ae8f0f62..11a179a67 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -165,6 +165,15 @@
       <summary>Custom font</summary>
       <description>Custom font name for language panel</description>
     </key>
+    <key name="use-glyph-from-engine-lang" type="b">
+      <default>true</default>
+      <summary>Choose glyphs with input method's language on candidate window</summary>
+      <description>Some code points have the different glyphs and Pango
+                   determines the glyphs from the language attribute.
+                   Pango chooses glyphs from the IBus engine's language
+                   if the value is true and choose them from the desktop
+                   locale if the value is false.</description>
+    </key>
     <child name="emoji" schema="org.freedesktop.ibus.panel.emoji"/>
   </schema>
   <schema id="org.freedesktop.ibus.panel.emoji" path="/desktop/ibus/panel/emoji/">
diff --git a/setup/main.py b/setup/main.py
index d5e2078c7..8c8d7a472 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -212,6 +212,13 @@ def __init_panel(self):
                                    'active',
                                    Gio.SettingsBindFlags.DEFAULT)
 
+        self.__checkbutton_glyph_from_engine_lang = self.__builder.get_object(
+                "checkbutton_use_glyph_from_engine_lang")
+        self.__settings_panel.bind('use-glyph-from-engine-lang',
+                                   self.__checkbutton_glyph_from_engine_lang,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
+
     def __init_general(self):
         # embed preedit text
         self.__checkbutton_embed_preedit_text = self.__builder.get_object(
diff --git a/setup/setup.ui b/setup/setup.ui
index 250f43a01..a15b9083c 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1286,6 +1286,55 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkBox" id="vbox10">
+                        <property name="orientation">vertical</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_start">24</property>
+                        <child>
+                          <object class="GtkCheckButton" id="checkbutton_use_glyph_from_engine_lang">
+                            <property name="label" translatable="yes">Choose glyphs with input method's language on candidate window</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Choose glyphs with the input method's language on the candidate window for the duplicated code points</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Fonts&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 8d9f5cc04..dc98e7223 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -47,6 +47,7 @@ class Panel : IBus.PanelService {
     private string m_current_context_path = "";
     private string m_real_current_context_path = "";
     private bool m_use_global_engine = true;
+    private bool m_use_engine_lang = true;
     private CandidatePanel m_candidate_panel;
     private Switcher m_switcher;
     private uint m_switcher_focus_set_engine_id;
@@ -197,6 +198,15 @@ class Panel : IBus.PanelService {
                                               ref m_css_provider);
         });
 
+        m_settings_panel.changed["use-glyph-from-engine-lang"].connect((key) =>
+        {
+                m_use_engine_lang = m_settings_panel.get_boolean(
+                        "use-glyph-from-engine-lang");
+                var engine = m_bus.get_global_engine();
+                if (engine != null)
+                    set_language_from_engine(engine);
+        });
+
         m_settings_panel.changed["show-icon-on-systray"].connect((key) => {
                 set_show_icon_on_systray();
         });
@@ -732,6 +742,8 @@ class Panel : IBus.PanelService {
         set_use_system_keyboard_layout();
         set_use_global_engine();
         set_use_xmodmap();
+        m_use_engine_lang = m_settings_panel.get_boolean(
+                        "use-glyph-from-engine-lang");
         update_engines(m_settings_general.get_strv("preload-engines"),
                        m_settings_general.get_strv("engines-order"));
         BindingCommon.unbind_switch_shortcut(
@@ -801,6 +813,17 @@ class Panel : IBus.PanelService {
         m_engine_contexts.replace(m_current_context_path, engine);
     }
 
+    private void set_language_from_engine(IBus.EngineDesc engine) {
+        if (m_use_engine_lang) {
+            m_candidate_panel.set_language(new Pango.AttrLanguage(
+                    Pango.Language.from_string(engine.get_language())));
+        } else {
+            m_candidate_panel.set_language(new Pango.AttrLanguage(
+                    Pango.Language.from_string(null)));
+        }
+
+    }
+
     private void set_engine(IBus.EngineDesc engine) {
         if (m_property_icon_delay_time_id > 0) {
             GLib.Source.remove(m_property_icon_delay_time_id);
@@ -822,8 +845,7 @@ class Panel : IBus.PanelService {
         if (!m_use_system_keyboard_layout)
             m_xkblayout.set_layout(engine);
 
-        m_candidate_panel.set_language(new Pango.AttrLanguage(Pango.Language.from_string(engine.get_language())));
-
+        set_language_from_engine(engine);
         engine_contexts_insert(engine);
     }
 

From 60429741526dd63299a95c9c512cb615d3bc1e90 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 08:17:59 +0900
Subject: [PATCH 641/816] engine: Delete gensimple.py and update autogen.sh

Will replace gensimple.py with the new one later. Also update autogen.sh
to delete distro genaration files.
---
 autogen.sh               |  24 ++++++++
 conf/memconf/Makefile.am |   4 ++
 engine/gensimple.py      | 119 ---------------------------------------
 3 files changed, 28 insertions(+), 119 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 73ca174fe..ff39b5a7d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,23 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="ibus"
+DIST_FILES="
+engine/simple.xml
+src/ibusemojigen.h
+src/ibusunicodegen.h
+"
+FEDORA_PKG1='autoconf automake libtool gettext-devel'
+FEDORA_PKG2='glib2-devel gtk2-devel gtk3-devel qt5-qtbase-devel
+ wayland-devel'
+FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd'
+
+(test -z "$DISABLE_INSTALL_PKGS") && {
+    (test -f /etc/fedora-release ) && {
+        dnf update --assumeno $FEDORA_PKG1 || exit 1
+        dnf update --assumeno $FEDORA_PKG2 || exit 1
+        dnf update --assumeno $FEDORA_PKG3 || exit 1
+    }
+}
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/README ) || {
@@ -26,3 +43,10 @@ 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 "$@"
+
+(test -z "$SAVE_DIST_FILES") && {
+    for f in $DIST_FILES ; do
+        echo "rm $f"
+        rm $f
+    done
+}
diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index 7c3bd659c..b152a98de 100644
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -60,6 +60,10 @@ component_DATA = \
 	$(NULL)
 
 componentdir = $(pkgdatadir)/component
+else
+noinst_DATA = \
+	memconf.xml \
+	$(NULL)
 endif
 
 CLEANFILES = \
diff --git a/engine/gensimple.py b/engine/gensimple.py
index b038fe1fe..e69de29bb 100644
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -1,119 +0,0 @@
-# vim:set et sts=4 sw=4:
-#
-# ibus - The Input Bus
-#
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 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
-# License as published by the Free Software Foundation; either
-# version 2 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
-
-import cgi
-import urllib2
-from xml.dom import minidom
-
-def simplify_dom(node):
-    name = node.nodeName
-    children = {}
-    if len(node.childNodes) == 1 and node.childNodes[0].nodeType == node.TEXT_NODE:
-        return name, node.childNodes[0].nodeValue
-    for child in node.childNodes:
-        if child.nodeType != node.ELEMENT_NODE:
-            continue
-        child_name, child_value = simplify_dom(child)
-        if child_name not in children:
-            children[child_name] = []
-        children[child_name].append(child_value)
-    return name, children
-
-def parse_xml():
-    filename = "/usr/share/X11/xkb/rules/evdev.xml"
-    dom = minidom.parse(file(filename))
-    name, root = simplify_dom(dom)
-
-    layouts = root['xkbConfigRegistry'][0]['layoutList'][0]['layout']
-    for layout in layouts:
-        config = layout['configItem'][0]
-        name = config['name'][0]
-        short_desc = config.get('shortDescription', [''])[0]
-        desc = config.get('description', [''])[0]
-        languages = config.get('languageList', [{}])[0].get('iso639Id', [])
-        variants = layout.get('variantList', [{}])[0].get('variant', [])
-        yield name, '', short_desc, desc, languages
-        for variant in variants:
-            variant_config = variant['configItem'][0]
-            variant_name = variant_config['name'][0]
-            variant_short_desc = variant_config.get('shortDescription', [''])[0]
-            variant_desc = variant_config.get('description', [''])[0]
-            variant_languages = variant_config.get('languageList', [{}])[0].get('iso639Id', [])
-            if not isinstance(variant_languages, list):
-                variant_languages = [variant_languages]
-            yield name, variant_name, variant_short_desc, variant_desc, languages + variant_languages
-
-def gen_xml():
-    header = u"""<?xml version="1.0" encoding="utf-8"?>
-<component>
-	<name>org.freedesktop.IBus.Simple</name>
-	<description>A table based simple engine</description>
-	<exec>@libexecdir@/ibus-engine-simple</exec>
-	<version>@VERSION@</version>
-	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
-	<textdomain>ibus</textdomain>
-	<engines>"""
-    engine = u"""\t\t<engine>
-			<name>%s</name>
-			<language>%s</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>%s</layout>
-			<longname>%s</longname>
-			<description>%s</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>%d</rank>
-		</engine>"""
-    footer = u"""\t</engines>
-</component>"""
-
-    print header
-
-    whitelist = parse_whitelist()
-    for name, vname, sdesc, desc, languages in parse_xml():
-        layout = "%s(%s)" % (name, vname) if vname else name
-        for lang in languages:
-            ibus_name = "xkb:%s:%s:%s" % (name, vname, lang)
-            if ibus_name not in whitelist:
-                continue
-            desc = cgi.escape(desc)
-            out = engine % (ibus_name, lang, layout, desc, desc, 99)
-            print out.encode("utf8")
-
-    print footer
-
-def parse_whitelist():
-    url = "http://git.chromium.org/gitweb/?p=chromium/chromium.git;a=blob_plain;f=chrome/browser/chromeos/input_method/ibus_input_methods.txt;hb=HEAD"
-    whitelist = []
-    for line in urllib2.urlopen(url):
-        line = line.strip()
-        if not line:
-            continue
-        if line.startswith("#"):
-            continue
-        whitelist.append(line.split()[0])
-    return set(whitelist)
-
-if __name__ == "__main__":
-    gen_xml()

From 508527daaf90901b6a7fa062372516640f88aa75 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 09:07:39 +0900
Subject: [PATCH 642/816] engine: Generate simple.xml with denylist

simple.xml was generated by allowlist (whitelist) and it will be
done by denylist (blacklist).

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/Makefile.am  |  20 ++-
 engine/denylist.txt |  27 ++++
 engine/gensimple.py | 367 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 407 insertions(+), 7 deletions(-)
 create mode 100644 engine/denylist.txt
 mode change 100644 => 100755 engine/gensimple.py

diff --git a/engine/Makefile.am b/engine/Makefile.am
index 86f0e2b86..ca4054961 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -4,6 +4,7 @@
 #
 # Copyright (c) 2010-2016, Google Inc. All rights reserved.
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2013-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -78,20 +79,25 @@ component_DATA = \
 
 componentdir = $(pkgdatadir)/component
 
-CLEANFILES = \
+MAINTAINERCLEANFILES = \
 	simple.xml \
 	$(NULL)
 
 EXTRA_DIST = \
+	gensimple.py \
 	iso639converter.py \
-	simple.xml.in \
+	simple.xml \
 	$(NULL)
 
-simple.xml: simple.xml.in
-	$(AM_V_GEN) sed \
-		-e 's|@VERSION[@]|$(VERSION)|g' \
-		-e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
-		mv $@.tmp $@
+simple.xml:
+	$(srcdir)/gensimple.py \
+	    --input=$(datarootdir)/X11/xkb/rules/evdev.xml \
+	    --output=$@ \
+	    --version=$(VERSION).`date '+%Y%m%d'` \
+	    --exec-path=$(libexecdir)/ibus-engine-simple \
+	    --iso-path=$(datarootdir)/xml/iso-codes/iso_639.xml \
+	    --first-language \
+	$(NULL)
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
diff --git a/engine/denylist.txt b/engine/denylist.txt
new file mode 100644
index 000000000..e4cd04735
--- /dev/null
+++ b/engine/denylist.txt
@@ -0,0 +1,27 @@
+# vim:set fileencoding=utf-8 et sts=4 sw=4:
+#
+# ibus - Intelligent Input Bus for Linux / Unix OS
+#
+# Copyright © 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+# This file is a deny list (black list) and used by gensimple.py.
+# gensimple.py generates the engine list with evdev.xml and if an engine name
+# is matched with any entries in this file, the engine is excluded from the
+# engine list.
+# Asterisk(*) character can be used to match any engines.
+# E.g. xkb:cn:*:* excludes xkb:cn::zho and xkb:cn:mon_trad:mvf
+xkb:cn:*:*
+xkb:nec_vndr/jp:*:*
diff --git a/engine/gensimple.py b/engine/gensimple.py
old mode 100644
new mode 100755
index e69de29bb..dc4ccf126
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -0,0 +1,367 @@
+#!/usr/bin/python
+# vim:set fileencoding=utf-8 et sts=4 sw=4:
+#
+# ibus - Intelligent Input Bus for Linux / Unix OS
+#
+# Copyright © 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+
+# This script generates simple.xml with /usr/share/X11/xkb/rules/evdev.xml,
+# /usr/share/xml/iso-codes/iso_639.xml and denylist.txt
+
+
+from xml.dom import minidom
+from xml.sax import make_parser as sax_make_parser
+from xml.sax.handler import feature_namespaces as sax_feature_namespaces
+from xml.sax.saxutils import XMLFilterBase, XMLGenerator, escape
+from xml.sax.xmlreader import AttributesImpl
+from xml.sax._exceptions import SAXParseException
+
+import codecs
+import getopt
+import io
+import os
+import sys
+
+VERSION='0.1'
+EVDEV_XML = '/usr/share/X11/xkb/rules/evdev.xml'
+EXEC_PATH='/usr/lib/ibus-engine-simple'
+ISO_PATH='/usr/share/xml/iso-codes/iso_639.xml'
+PY3K = sys.version_info >= (3, 0)
+
+if PY3K:
+    from io import StringIO
+else:
+    # io.StringIO does not work with XMLGenerator
+    from cStringIO import StringIO
+    # iso_639.xml includes UTF-8
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
+
+def usage(prgname):
+    print('''\
+%s Version %s
+Usage:
+  %s [OPTION...]
+
+Options:
+  -h, --help                         Show this message
+  -i, --input=EVDEV_XML              Load EVDEV_XML file (default is:
+                                         %s)
+  -o, --output=FILE                  Output FILE (default is stdout)
+  -V, --version=VERSION              Set IBus VERSION (default is %s)
+  -e, --exec-path=EXEC_PATH          Set EXEC_PATH file (default is:
+                                         %s)
+  -I, --iso-path=ISO_PATH            Load ISO_PATH file (default is:
+                                         %s)
+  -1, --first-language               Pull first language only in language list
+''' % (prgname, VERSION, prgname, EVDEV_XML, VERSION, EXEC_PATH, ISO_PATH))
+
+
+class EvdevXML(XMLFilterBase):
+    def __init__(self, parser=None, downstream=None, iso639=None,
+                 denylist=None, author=None, first=False):
+        XMLFilterBase.__init__(self, parser)
+        self.__downstream = downstream
+        self.__iso639 = iso639
+        self.__denylist = denylist
+        self.__author = author
+        self.__first = first
+        self.__is_layout = False
+        self.__is_description = False
+        self.__is_config_item = False
+        self.__is_variant = False
+        self.__is_iso639 = False
+        self.__is_name = False
+        self.__layout = ''
+        self.__description = ''
+        self.__variant = ''
+        self.__list_iso639 = []
+    def startDocument(self):
+        if self.__downstream:
+            self.__downstream.startDocument()
+            self.__downstream.startElement('engines', AttributesImpl({}))
+    def endDocument(self):
+        if self.__downstream:
+            self.__downstream.endElement('engines')
+            self.__downstream.endDocument()
+    def startElement(self, name, attrs):
+        if name == 'layout':
+            self.__is_layout = True
+        elif name == 'description':
+            self.__is_description = True
+        elif name == 'configItem':
+            self.__is_config_item = True
+        elif name == 'languageList':
+            self.__list_iso639 = []
+        elif name == 'iso639Id':
+            self.__is_iso639 = True
+        elif name == 'variant':
+            self.__is_variant = True
+        elif name == 'name':
+            self.__is_name = True
+    def endElement(self, name):
+        if name == 'layout':
+            self.__is_layout = False
+            self.__layout = ''
+            self.__description = ''
+            self.__variant = ''
+            self.__list_iso639 = []
+        elif name == 'description':
+            self.__is_description = False
+        elif name == 'configItem':
+            self.save()
+            self.__is_config_item = False
+        elif name == 'iso639Id':
+            self.__is_iso639 = False
+        elif name == 'variant':
+            self.__is_variant = False
+        elif name == 'name':
+            self.__is_name = False
+    def characters(self, text):
+        if self.__is_description:
+            self.__description = text
+        elif self.__is_name:
+            if self.__is_variant and self.__is_config_item:
+                self.__variant = text
+            elif self.__is_layout and self.__is_config_item:
+                self.__layout = text
+        elif self.__is_iso639:
+                self.__list_iso639.append(text)
+    def save(self):
+        if not self.__downstream:
+            return
+        for iso in self.__list_iso639:
+            do_deny = False
+            for [xkb, layout, variant, lang] in self.__denylist:
+                if xkb == 'xkb' \
+                   and ( layout == self.__layout or layout == '*' ) \
+                   and ( variant == self.__variant or variant == '*' ) \
+                   and ( lang == iso or variant == '*' ):
+                    do_deny = True
+                    break
+            if do_deny:
+                continue
+            self.__downstream.startElement('engine', AttributesImpl({}))
+            self.__downstream.startElement('name', AttributesImpl({}))
+            name = 'xkb:%s:%s:%s' % (
+                self.__layout,
+                self.__variant,
+                iso
+            )
+            self.__downstream.characters(name)
+            self.__downstream.endElement('name')
+            self.__downstream.startElement('language', AttributesImpl({}))
+            iso639_1 = self.__iso639.code2to1(iso)
+            if iso639_1 != None:
+                iso = iso639_1
+            self.__downstream.characters(iso)
+            self.__downstream.endElement('language')
+            self.__downstream.startElement('license', AttributesImpl({}))
+            self.__downstream.characters('GPL')
+            self.__downstream.endElement('license')
+            if self.__author != None:
+                self.__downstream.startElement('author', AttributesImpl({}))
+                self.__downstream.characters(self.__author)
+                self.__downstream.endElement('author')
+            self.__downstream.startElement('layout', AttributesImpl({}))
+            self.__downstream.characters(self.__layout)
+            self.__downstream.endElement('layout')
+            self.__downstream.startElement('longname', AttributesImpl({}))
+            self.__downstream.characters(self.__description)
+            self.__downstream.endElement('longname')
+            self.__downstream.startElement('description', AttributesImpl({}))
+            self.__downstream.characters(self.__description)
+            self.__downstream.endElement('description')
+            self.__downstream.startElement('icon', AttributesImpl({}))
+            self.__downstream.characters('ibus-keyboard')
+            self.__downstream.endElement('icon')
+            self.__downstream.startElement('rank', AttributesImpl({}))
+            if self.__variant == '':
+                self.__downstream.characters('50')
+            else:
+                self.__downstream.characters('1')
+            self.__downstream.endElement('rank')
+            self.__downstream.endElement('engine')
+            if self.__first:
+                break
+
+
+class GenerateEngineXML():
+    _NAME = 'org.freedesktop.IBus.Simple'
+    _DESCRIPTION = 'A table based simple engine'
+    _AUTHOR = 'Peng Huang <shawn.p.huang@gmail.com>'
+    _HOMEPAGE = 'https://github.com/ibus/ibus/wiki'
+    _DOMAIN = 'ibus'
+    def __init__(self, path, iso639=None, denylist='', version='', exec='',
+                 first=False):
+        self.__path = path
+        self.__iso639 = iso639
+        self.__denylist = denylist
+        self.__version = version
+        self.__exec = exec
+        self.__first = first
+        self.__result = StringIO()
+        downstream = XMLGenerator(self.__result, 'utf-8')
+        self.__load(downstream)
+
+    def __load(self, downstream=None):
+        parser = sax_make_parser()
+        parser.setFeature(sax_feature_namespaces, 0)
+        self.__handler = EvdevXML(parser,
+                                  downstream,
+                                  self.__iso639,
+                                  self.__denylist,
+                                  self._AUTHOR,
+                                  self.__first)
+        parser.setContentHandler(self.__handler)
+        f = codecs.open(self.__path, 'r', encoding='utf-8')
+        try:
+            parser.parse(f)
+        except SAXParseException:
+            print('Error: Invalid file format: %s' % path)
+        finally:
+            f.close()
+    def write(self, output=None):
+        if output != None:
+            od = codecs.open(output, 'w', encoding='utf-8')
+        else:
+            if PY3K:
+                od = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
+            else:
+                od = codecs.getwriter('utf-8')(sys.stdout)
+        contents = self.__result.getvalue()
+        index = contents.find('<engines>')
+        if index >= 0:
+            author = escape(self._AUTHOR)
+            contents = '%s<component><name>%s</name>\
+<description>%s</description><exec>%s</exec><version>%s</version>\
+<author>%s</author><license>%s</license><homepage>%s</homepage>\
+<textdomain>%s</textdomain>%s</component>' % (
+        contents[:index],
+        self._NAME, self._DESCRIPTION,
+        self.__exec, self.__version, author, 'GPL',
+        self._HOMEPAGE, self._DOMAIN, contents[index:] )
+        parsed = minidom.parseString(contents)
+        # format with indent and encoding attribute in header
+        xml = parsed.toprettyxml(indent='    ', encoding='utf-8')
+        # convert byte to str
+        od.write(str(xml, 'utf-8'))
+        #od.write(contents)
+
+
+class ISO639XML(XMLFilterBase):
+    def __init__(self, parser=None):
+        self.__code2to1 = {}
+        self.__codetoname = {}
+        XMLFilterBase.__init__(self, parser)
+    def startElement(self, name, attrs):
+        if name != 'iso_639_entry':
+            return
+        n = attrs.get('name')
+        iso639_1 = attrs.get('iso_639_1_code')
+        iso639_2b = attrs.get('iso_639_2B_code')
+        iso639_2t = attrs.get('iso_639_2T_code')
+        if iso639_1 != None:
+            self.__codetoname[iso639_1] = n
+            if iso639_2b != None:
+                self.__code2to1[iso639_2b] = iso639_1
+                self.__codetoname[iso639_2b] = n
+            if iso639_2t != None and iso639_2b != iso639_2t:
+                self.__code2to1[iso639_2t] = iso639_1
+                self.__codetoname[iso639_2t] = n
+    def code2to1(self, iso639_2):
+        try:
+            return self.__code2to1[iso639_2]
+        except KeyError:
+            return None
+
+
+def parse_iso639(path):
+    f = codecs.open(path, 'r', encoding='utf-8')
+    parser = sax_make_parser()
+    parser.setFeature(sax_feature_namespaces, 0)
+    handler = ISO639XML(parser)
+    parser.setContentHandler(handler)
+    try:
+        parser.parse(f)
+    except SAXParseException:
+        print('Error: Invalid file format: %s' % path)
+    finally:
+        f.close()
+    return handler
+
+
+def parse_denylist(denyfile):
+    denylist = []
+    f = codecs.open(denyfile, 'r', encoding='utf-8')
+    for line in f.readlines():
+        if line == '\n' or line[0] == '#':
+            continue
+        line = line.rstrip()
+        entry = line.split(':')
+        if len(entry) != 4:
+            print('WARNING: format error: \'%s\' against \'%s\'' \
+                  % (line, 'xkb:layout:variant:lang'))
+            continue
+        denylist.append(entry)
+    f.close()
+    return denylist
+
+
+if __name__ == '__main__':
+    prgname = os.path.basename(sys.argv[0])
+    mydir = os.path.dirname(sys.argv[0])
+    try:
+        opts, args = getopt.getopt(sys.argv[1:],
+                                   'hi:o:V:e:I:1',
+                                   ['help', 'input=', 'output=', 'version=',
+                                    'exec-path=', 'iso-path=',
+                                    'first-language'])
+    except getopt.GetoptError as err:
+        print(err)
+        usage(prgname)
+        sys.exit(2)
+    if len(args) > 0:
+        usage(prgname)
+        sys.exit(2)
+    input = EVDEV_XML
+    output = None
+    version=VERSION
+    exec_path=EXEC_PATH
+    iso_path=ISO_PATH
+    first=False
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            usage(prgname)
+            sys.exit()
+        elif opt in ('-i', '--input'):
+            input = arg
+        elif opt in ('-o', '--output'):
+            output = arg
+        elif opt in ('-V', '--version'):
+            version = arg
+        elif opt in ('-e', '--exec-path'):
+            exec_path = arg
+        elif opt in ('-I', '--iso-path'):
+            iso_path = arg
+        elif opt in ('-1', '--first-langauge'):
+            first=True
+
+    iso639 = parse_iso639(iso_path)
+    denylist = parse_denylist('%s/%s' % ( mydir, 'denylist.txt'))
+    xml = GenerateEngineXML(input, iso639, denylist, version, exec_path, first)
+    xml.write(output)

From 37db75bf59c31252db4c0657f31520f2a7e34a77 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 09:14:01 +0900
Subject: [PATCH 643/816] engine: Add simple.xml

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/simple.xml | 9605 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 9605 insertions(+)
 create mode 100644 engine/simple.xml

diff --git a/engine/simple.xml b/engine/simple.xml
new file mode 100644
index 000000000..fdce1b52d
--- /dev/null
+++ b/engine/simple.xml
@@ -0,0 +1,9605 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component>
+    <name>org.freedesktop.IBus.Simple</name>
+    <description>A table based simple engine</description>
+    <exec>/usr/libexec/ibus-engine-simple</exec>
+    <version>1.5.22.20200821</version>
+    <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+    <license>GPL</license>
+    <homepage>https://github.com/ibus/ibus/wiki</homepage>
+    <textdomain>ibus</textdomain>
+    <engines>
+        <engine>
+            <name>xkb:us::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (US)</longname>
+            <description>English (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:chr:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Cherokee</longname>
+            <description>Cherokee</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:euro:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (US, euro on 5)</longname>
+            <description>English (US, euro on 5)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:intl:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (US, intl., with dead keys)</longname>
+            <description>English (US, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:alt-intl:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (US, alt. intl.)</longname>
+            <description>English (US, alt. intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:colemak:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Colemak)</longname>
+            <description>English (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Dvorak)</longname>
+            <description>English (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-intl:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Dvorak, intl., with dead keys)</longname>
+            <description>English (Dvorak, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-alt-intl:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Dvorak, alt. intl.)</longname>
+            <description>English (Dvorak, alt. intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-l:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Dvorak, left-handed)</longname>
+            <description>English (Dvorak, left-handed)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-r:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Dvorak, right-handed)</longname>
+            <description>English (Dvorak, right-handed)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-classic:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (classic Dvorak)</longname>
+            <description>English (classic Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvp:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (programmer Dvorak)</longname>
+            <description>English (programmer Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Russian (US, phonetic)</longname>
+            <description>Russian (US, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:mac:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Macintosh)</longname>
+            <description>English (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (the divide/multiply keys toggle the layout)</longname>
+            <description>English (the divide/multiply keys toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (the divide/multiply keys toggle the layout)</longname>
+            <description>English (the divide/multiply keys toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (the divide/multiply keys toggle the layout)</longname>
+            <description>English (the divide/multiply keys toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:ps:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Pashto</longname>
+            <description>Pashto</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:uz:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Uzbek (Afghanistan)</longname>
+            <description>Uzbek (Afghanistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:olpc-ps:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Pashto (Afghanistan, OLPC)</longname>
+            <description>Pashto (Afghanistan, OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:fa-olpc:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Persian (Afghanistan, Dari OLPC)</longname>
+            <description>Persian (Afghanistan, Dari OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:uz-olpc:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Uzbek (Afghanistan, OLPC)</longname>
+            <description>Uzbek (Afghanistan, OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara::ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic</longname>
+            <description>Arabic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:azerty:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (AZERTY)</longname>
+            <description>Arabic (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:azerty_digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (AZERTY/digits)</longname>
+            <description>Arabic (AZERTY/digits)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (digits)</longname>
+            <description>Arabic (digits)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:qwerty:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (QWERTY)</longname>
+            <description>Arabic (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:qwerty_digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (qwerty/digits)</longname>
+            <description>Arabic (qwerty/digits)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:buckwalter:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (Buckwalter)</longname>
+            <description>Arabic (Buckwalter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:olpc:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (OLPC)</longname>
+            <description>Arabic (OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:mac:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic (Macintosh)</longname>
+            <description>Arabic (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:al::sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <longname>Albanian</longname>
+            <description>Albanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:al:plisi:sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <longname>Albanian (Plisi)</longname>
+            <description>Albanian (Plisi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:al:veqilharxhi:sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <longname>Albanian (Veqilharxhi)</longname>
+            <description>Albanian (Veqilharxhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am::hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian</longname>
+            <description>Armenian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:phonetic:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian (phonetic)</longname>
+            <description>Armenian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:phonetic-alt:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian (alt. phonetic)</longname>
+            <description>Armenian (alt. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:eastern:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian (eastern)</longname>
+            <description>Armenian (eastern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:western:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian (western)</longname>
+            <description>Armenian (western)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:eastern-alt:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian (alt. eastern)</longname>
+            <description>Armenian (alt. eastern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <longname>German (Austria)</longname>
+            <description>German (Austria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <longname>German (Austria, no dead keys)</longname>
+            <description>German (Austria, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <longname>German (Austria, with Sun dead keys)</longname>
+            <description>German (Austria, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:mac:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <longname>German (Austria, Macintosh)</longname>
+            <description>German (Austria, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:au::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>au</layout>
+            <longname>English (Australian)</longname>
+            <description>English (Australian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:az::aze</name>
+            <language>az</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>az</layout>
+            <longname>Azerbaijani</longname>
+            <description>Azerbaijani</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:az:cyrillic:aze</name>
+            <language>az</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>az</layout>
+            <longname>Azerbaijani (Cyrillic)</longname>
+            <description>Azerbaijani (Cyrillic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by::bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <longname>Belarusian</longname>
+            <description>Belarusian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:legacy:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <longname>Belarusian (legacy)</longname>
+            <description>Belarusian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:latin:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <longname>Belarusian (Latin)</longname>
+            <description>Belarusian (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., Latin-9 only)</longname>
+            <description>Belgian (alt., Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., Latin-9 only)</longname>
+            <description>Belgian (alt., Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., Latin-9 only)</longname>
+            <description>Belgian (alt., Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., with Sun dead keys)</longname>
+            <description>Belgian (alt., with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., with Sun dead keys)</longname>
+            <description>Belgian (alt., with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt., with Sun dead keys)</longname>
+            <description>Belgian (alt., with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt. ISO)</longname>
+            <description>Belgian (alt. ISO)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt. ISO)</longname>
+            <description>Belgian (alt. ISO)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (alt. ISO)</longname>
+            <description>Belgian (alt. ISO)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (with Sun dead keys)</longname>
+            <description>Belgian (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (with Sun dead keys)</longname>
+            <description>Belgian (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (with Sun dead keys)</longname>
+            <description>Belgian (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd::ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla</longname>
+            <description>Bangla</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd::sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla</longname>
+            <description>Bangla</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd:probhat:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla (Probhat)</longname>
+            <description>Bangla (Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd:probhat:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla (Probhat)</longname>
+            <description>Bangla (Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India)</longname>
+            <description>Bangla (India)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India)</longname>
+            <description>Bangla (India)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_probhat:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Probhat)</longname>
+            <description>Bangla (India, Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_probhat:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Probhat)</longname>
+            <description>Bangla (India, Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_baishakhi:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Baishakhi)</longname>
+            <description>Bangla (India, Baishakhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_baishakhi:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Baishakhi)</longname>
+            <description>Bangla (India, Baishakhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_bornona:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Bornona)</longname>
+            <description>Bangla (India, Bornona)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_bornona:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Bornona)</longname>
+            <description>Bangla (India, Bornona)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_gitanjali:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Uni Gitanjali)</longname>
+            <description>Bangla (India, Uni Gitanjali)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_gitanjali:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Uni Gitanjali)</longname>
+            <description>Bangla (India, Uni Gitanjali)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_inscript:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Baishakhi Inscript)</longname>
+            <description>Bangla (India, Baishakhi Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_inscript:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Bangla (India, Baishakhi Inscript)</longname>
+            <description>Bangla (India, Baishakhi Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:eeyek:mni</name>
+            <language>mni</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Manipuri (Eeyek)</longname>
+            <description>Manipuri (Eeyek)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:guj:guj</name>
+            <language>gu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Gujarati</longname>
+            <description>Gujarati</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:guru:pan</name>
+            <language>pa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Punjabi (Gurmukhi)</longname>
+            <description>Punjabi (Gurmukhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:jhelum:pan</name>
+            <language>pa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Punjabi (Gurmukhi Jhelum)</longname>
+            <description>Punjabi (Gurmukhi Jhelum)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:kan:kan</name>
+            <language>kn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Kannada</longname>
+            <description>Kannada</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:kan-kagapa:kan</name>
+            <language>kn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Kannada (KaGaPa phonetic)</longname>
+            <description>Kannada (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Malayalam</longname>
+            <description>Malayalam</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal_lalitha:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Malayalam (Lalitha)</longname>
+            <description>Malayalam (Lalitha)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal_enhanced:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Malayalam (enhanced Inscript, with rupee)</longname>
+            <description>Malayalam (enhanced Inscript, with rupee)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori:ori</name>
+            <language>or</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Oriya</longname>
+            <description>Oriya</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Oriya</longname>
+            <description>Oriya</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:olck:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Ol Chiki</longname>
+            <description>Ol Chiki</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Tamil (TamilNet '99)</longname>
+            <description>Tamil (TamilNet '99)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_with_tam_nums:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Tamil (TamilNet '99 with Tamil numerals)</longname>
+            <description>Tamil (TamilNet '99 with Tamil numerals)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_TAB:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Tamil (TamilNet '99, TAB encoding)</longname>
+            <description>Tamil (TamilNet '99, TAB encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_TSCII:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Tamil (TamilNet '99, TSCII encoding)</longname>
+            <description>Tamil (TamilNet '99, TSCII encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Tamil (Inscript)</longname>
+            <description>Tamil (Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Telugu</longname>
+            <description>Telugu</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-kagapa:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Telugu (KaGaPa phonetic)</longname>
+            <description>Telugu (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-sarala:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Telugu (Sarala)</longname>
+            <description>Telugu (Sarala)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-kagapa:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Telugu (KaGaPa phonetic)</longname>
+            <description>Telugu (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-phonetic:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Urdu (phonetic)</longname>
+            <description>Urdu (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-phonetic3:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Urdu (alt. phonetic)</longname>
+            <description>Urdu (alt. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-winkeys:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Urdu (Win keys)</longname>
+            <description>Urdu (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:bolnagri:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Hindi (Bolnagri)</longname>
+            <description>Hindi (Bolnagri)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:hin-wx:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Hindi (Wx)</longname>
+            <description>Hindi (Wx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:hin-kagapa:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Hindi (KaGaPa phonetic)</longname>
+            <description>Hindi (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:san-kagapa:san</name>
+            <language>sa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Sanskrit (KaGaPa phonetic)</longname>
+            <description>Sanskrit (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mar-kagapa:mar</name>
+            <language>mr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Marathi (KaGaPa phonetic)</longname>
+            <description>Marathi (KaGaPa phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:eng:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>English (India, with rupee)</longname>
+            <description>English (India, with rupee)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba::bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian</longname>
+            <description>Bosnian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:alternatequotes:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian (with guillemets)</longname>
+            <description>Bosnian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:unicode:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian (with Bosnian digraphs)</longname>
+            <description>Bosnian (with Bosnian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:unicodeus:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian (US, with Bosnian digraphs)</longname>
+            <description>Bosnian (US, with Bosnian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:us:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian (US, with Bosnian letters)</longname>
+            <description>Bosnian (US, with Bosnian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br::por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil)</longname>
+            <description>Portuguese (Brazil)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil, no dead keys)</longname>
+            <description>Portuguese (Brazil, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:dvorak:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil, Dvorak)</longname>
+            <description>Portuguese (Brazil, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil, Nativo)</longname>
+            <description>Portuguese (Brazil, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo-us:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil, Nativo for US keyboards)</longname>
+            <description>Portuguese (Brazil, Nativo for US keyboards)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo-epo:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Esperanto (Brazil, Nativo)</longname>
+            <description>Esperanto (Brazil, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:thinkpad:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil, IBM/Lenovo ThinkPad)</longname>
+            <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg::bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <longname>Bulgarian</longname>
+            <description>Bulgarian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg:phonetic:bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <longname>Bulgarian (traditional phonetic)</longname>
+            <description>Bulgarian (traditional phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg:bas_phonetic:bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <longname>Bulgarian (new phonetic)</longname>
+            <description>Bulgarian (new phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:ber:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <longname>Berber (Algeria, Tifinagh)</longname>
+            <description>Berber (Algeria, Tifinagh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:ar:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <longname>Arabic (Algeria)</longname>
+            <description>Arabic (Algeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:french:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>French (Morocco)</longname>
+            <description>French (Morocco)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh)</longname>
+            <description>Berber (Morocco, Tifinagh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-alt:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh alt.)</longname>
+            <description>Berber (Morocco, Tifinagh alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-alt-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh alt. phonetic)</longname>
+            <description>Berber (Morocco, Tifinagh alt. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-extended:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh extended)</longname>
+            <description>Berber (Morocco, Tifinagh extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh phonetic)</longname>
+            <description>Berber (Morocco, Tifinagh phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-extended-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Berber (Morocco, Tifinagh extended phonetic)</longname>
+            <description>Berber (Morocco, Tifinagh extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>English (Cameroon)</longname>
+            <description>English (Cameroon)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:french:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>French (Cameroon)</longname>
+            <description>French (Cameroon)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (QWERTY)</longname>
+            <description>Cameroon Multilingual (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (AZERTY)</longname>
+            <description>Cameroon Multilingual (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Cameroon Multilingual (Dvorak)</longname>
+            <description>Cameroon Multilingual (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm::mya</name>
+            <language>my</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <longname>Burmese</longname>
+            <description>Burmese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:zawgyi:mya</name>
+            <language>my</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <longname>Burmese Zawgyi</longname>
+            <description>Burmese Zawgyi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>French (Canada)</longname>
+            <description>French (Canada)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:fr-dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>French (Canada, Dvorak)</longname>
+            <description>French (Canada, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:fr-legacy:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>French (Canada, legacy)</longname>
+            <description>French (Canada, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multix:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>Canadian Multilingual</longname>
+            <description>Canadian Multilingual</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multi:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>Canadian Multilingual (1st part)</longname>
+            <description>Canadian Multilingual (1st part)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multi-2gr:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>Canadian Multilingual (2nd part)</longname>
+            <description>Canadian Multilingual (2nd part)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:ike:iku</name>
+            <language>iu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>Inuktitut</longname>
+            <description>Inuktitut</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:eng:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>English (Canada)</longname>
+            <description>English (Canada)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cd::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cd</layout>
+            <longname>French (Democratic Republic of the Congo)</longname>
+            <description>French (Democratic Republic of the Congo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr::hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian</longname>
+            <description>Croatian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:alternatequotes:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian (with guillemets)</longname>
+            <description>Croatian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:unicode:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian (with Croatian digraphs)</longname>
+            <description>Croatian (with Croatian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:unicodeus:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian (US, with Croatian digraphs)</longname>
+            <description>Croatian (US, with Croatian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:us:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian (US, with Croatian letters)</longname>
+            <description>Croatian (US, with Croatian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz::ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech</longname>
+            <description>Czech</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:bksl:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname> key)</longname>
+            <description> key)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech (QWERTY)</longname>
+            <description>Czech (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty_bksl:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech (QWERTY, extended backslash)</longname>
+            <description>Czech (QWERTY, extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty-mac:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech (QWERTY, Macintosh)</longname>
+            <description>Czech (QWERTY, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:ucw:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech (UCW, only accented letters)</longname>
+            <description>Czech (UCW, only accented letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:dvorak-ucw:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech (US, Dvorak, UCW support)</longname>
+            <description>Czech (US, Dvorak, UCW support)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Russian (Czech, phonetic)</longname>
+            <description>Russian (Czech, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk::dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish</longname>
+            <description>Danish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:nodeadkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish (no dead keys)</longname>
+            <description>Danish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:winkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish (Win keys)</longname>
+            <description>Danish (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:mac:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish (Macintosh)</longname>
+            <description>Danish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:mac_nodeadkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish (Macintosh, no dead keys)</longname>
+            <description>Danish (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:dvorak:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish (Dvorak)</longname>
+            <description>Danish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl::nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <longname>Dutch</longname>
+            <description>Dutch</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <longname>Dutch (with Sun dead keys)</longname>
+            <description>Dutch (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:mac:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <longname>Dutch (Macintosh)</longname>
+            <description>Dutch (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:std:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <longname>Dutch (standard)</longname>
+            <description>Dutch (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bt::dzo</name>
+            <language>dz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bt</layout>
+            <longname>Dzongkha</longname>
+            <description>Dzongkha</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee::est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <longname>Estonian</longname>
+            <description>Estonian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:nodeadkeys:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <longname>Estonian (no dead keys)</longname>
+            <description>Estonian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:dvorak:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <longname>Estonian (Dvorak)</longname>
+            <description>Estonian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:us:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <longname>Estonian (US, with Estonian letters)</longname>
+            <description>Estonian (US, with Estonian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir::fas</name>
+            <language>fa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Persian</longname>
+            <description>Persian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:pes_keypad:fas</name>
+            <language>fa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Persian (with Persian keypad)</longname>
+            <description>Persian (with Persian keypad)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Kurdish (Iran, Latin Q)</longname>
+            <description>Kurdish (Iran, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Kurdish (Iran, F)</longname>
+            <description>Kurdish (Iran, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Kurdish (Iran, Latin Alt-Q)</longname>
+            <description>Kurdish (Iran, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_ara:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Kurdish (Iran, Arabic-Latin)</longname>
+            <description>Kurdish (Iran, Arabic-Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq::ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Iraqi</longname>
+            <description>Iraqi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq::kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Iraqi</longname>
+            <description>Iraqi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Kurdish (Iraq, Latin Q)</longname>
+            <description>Kurdish (Iraq, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Kurdish (Iraq, F)</longname>
+            <description>Kurdish (Iraq, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Kurdish (Iraq, Latin Alt-Q)</longname>
+            <description>Kurdish (Iraq, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_ara:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Kurdish (Iraq, Arabic-Latin)</longname>
+            <description>Kurdish (Iraq, Arabic-Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fo::fao</name>
+            <language>fo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fo</layout>
+            <longname>Faroese</longname>
+            <description>Faroese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fo:nodeadkeys:fao</name>
+            <language>fo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fo</layout>
+            <longname>Faroese (no dead keys)</longname>
+            <description>Faroese (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi::fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish</longname>
+            <description>Finnish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:winkeys:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish (Winkeys)</longname>
+            <description>Finnish (Winkeys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:classic:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish (classic)</longname>
+            <description>Finnish (classic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:nodeadkeys:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish (classic, no dead keys)</longname>
+            <description>Finnish (classic, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Northern Saami (Finland)</longname>
+            <description>Northern Saami (Finland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish (Macintosh)</longname>
+            <description>Finnish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French</longname>
+            <description>French</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (no dead keys)</longname>
+            <description>French (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (with Sun dead keys)</longname>
+            <description>French (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (alt.)</longname>
+            <description>French (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (alt., Latin-9 only)</longname>
+            <description>French (alt., Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (alt., no dead keys)</longname>
+            <description>French (alt., no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (alt., with Sun dead keys)</longname>
+            <description>French (alt., with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (legacy, alt.)</longname>
+            <description>French (legacy, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (legacy, alt., no dead keys)</longname>
+            <description>French (legacy, alt., no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (legacy, alt., with Sun dead keys)</longname>
+            <description>French (legacy, alt., with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Bepo, ergonomic, Dvorak way)</longname>
+            <description>French (Bepo, ergonomic, Dvorak way)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</longname>
+            <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo_afnor:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Bepo, ergonomic, Dvorak way, AFNOR)</longname>
+            <description>French (Bepo, ergonomic, Dvorak way, AFNOR)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Dvorak)</longname>
+            <description>French (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Macintosh)</longname>
+            <description>French (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:azerty:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (AZERTY)</longname>
+            <description>French (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:afnor:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (AFNOR standardized AZERTY)</longname>
+            <description>French (AFNOR standardized AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bre:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (Breton)</longname>
+            <description>French (Breton)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oci:oci</name>
+            <language>oc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>Occitan</longname>
+            <description>Occitan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:geo:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>Georgian (France, AZERTY Tskapo)</longname>
+            <description>Georgian (France, AZERTY Tskapo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:us:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French (US, with French letters)</longname>
+            <description>French (US, with French letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>English (Ghana)</longname>
+            <description>English (Ghana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:generic:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>English (Ghana, multilingual)</longname>
+            <description>English (Ghana, multilingual)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:akan:aka</name>
+            <language>ak</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Akan</longname>
+            <description>Akan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:ewe:ewe</name>
+            <language>ee</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Ewe</longname>
+            <description>Ewe</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:fula:ful</name>
+            <language>ff</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Fula</longname>
+            <description>Fula</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:ga:gaa</name>
+            <language>gaa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Ga</longname>
+            <description>Ga</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:hausa:hau</name>
+            <language>ha</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Hausa (Ghana)</longname>
+            <description>Hausa (Ghana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:avn:avn</name>
+            <language>avn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>Avatime</longname>
+            <description>Avatime</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:gillbt:avn</name>
+            <language>avn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>English (Ghana, GILLBT)</longname>
+            <description>English (Ghana, GILLBT)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gn::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gn</layout>
+            <longname>French (Guinea)</longname>
+            <description>French (Guinea)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge::kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Georgian</longname>
+            <description>Georgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:ergonomic:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Georgian (ergonomic)</longname>
+            <description>Georgian (ergonomic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:mess:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Georgian (MESS)</longname>
+            <description>Georgian (MESS)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:ru:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Russian (Georgia)</longname>
+            <description>Russian (Georgia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:os:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Ossetian (Georgia)</longname>
+            <description>Ossetian (Georgia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German</longname>
+            <description>German</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadacute:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (dead acute)</longname>
+            <description>German (dead acute)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadgraveacute:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (dead grave acute)</longname>
+            <description>German (dead grave acute)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (no dead keys)</longname>
+            <description>German (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:T3:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (T3)</longname>
+            <description>German (T3)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ro:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Romanian (Germany)</longname>
+            <description>Romanian (Germany)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ro_nodeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Romanian (Germany, no dead keys)</longname>
+            <description>Romanian (Germany, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dvorak:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (Dvorak)</longname>
+            <description>German (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:sundeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (with Sun dead keys)</longname>
+            <description>German (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:neo:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (Neo 2)</longname>
+            <description>German (Neo 2)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:mac:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (Macintosh)</longname>
+            <description>German (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:mac_nodeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (Macintosh, no dead keys)</longname>
+            <description>German (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dsb:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Lower Sorbian</longname>
+            <description>Lower Sorbian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dsb_qwertz:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Lower Sorbian (QWERTZ)</longname>
+            <description>Lower Sorbian (QWERTZ)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:qwerty:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (QWERTY)</longname>
+            <description>German (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:tr:tr</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Turkish (Germany)</longname>
+            <description>Turkish (Germany)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ru:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>Russian (Germany, phonetic)</longname>
+            <description>Russian (Germany, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadtilde:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German (dead tilde)</longname>
+            <description>German (dead tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr::ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek</longname>
+            <description>Greek</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:simple:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek (simple)</longname>
+            <description>Greek (simple)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:extended:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek (extended)</longname>
+            <description>Greek (extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:nodeadkeys:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek (no dead keys)</longname>
+            <description>Greek (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:polytonic:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek (polytonic)</longname>
+            <description>Greek (polytonic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu::hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian</longname>
+            <description>Hungarian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:standard:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (standard)</longname>
+            <description>Hungarian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:nodeadkeys:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (no dead keys)</longname>
+            <description>Hungarian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:qwerty:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (QWERTY)</longname>
+            <description>Hungarian (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTZ/comma/dead keys)</longname>
+            <description>Hungarian (101/QWERTZ/comma/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTZ/comma/no dead keys)</longname>
+            <description>Hungarian (101/QWERTZ/comma/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTZ/dot/dead keys)</longname>
+            <description>Hungarian (101/QWERTZ/dot/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTZ/dot/no dead keys)</longname>
+            <description>Hungarian (101/QWERTZ/dot/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTY/comma/dead keys)</longname>
+            <description>Hungarian (101/QWERTY/comma/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTY/comma/no dead keys)</longname>
+            <description>Hungarian (101/QWERTY/comma/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTY/dot/dead keys)</longname>
+            <description>Hungarian (101/QWERTY/dot/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (101/QWERTY/dot/no dead keys)</longname>
+            <description>Hungarian (101/QWERTY/dot/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTZ/comma/dead keys)</longname>
+            <description>Hungarian (102/QWERTZ/comma/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTZ/comma/no dead keys)</longname>
+            <description>Hungarian (102/QWERTZ/comma/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTZ/dot/dead keys)</longname>
+            <description>Hungarian (102/QWERTZ/dot/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTZ/dot/no dead keys)</longname>
+            <description>Hungarian (102/QWERTZ/dot/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTY/comma/dead keys)</longname>
+            <description>Hungarian (102/QWERTY/comma/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTY/comma/no dead keys)</longname>
+            <description>Hungarian (102/QWERTY/comma/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTY/dot/dead keys)</longname>
+            <description>Hungarian (102/QWERTY/dot/dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian (102/QWERTY/dot/no dead keys)</longname>
+            <description>Hungarian (102/QWERTY/dot/no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is::isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic</longname>
+            <description>Icelandic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:Sundeadkeys:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic (with Sun dead keys)</longname>
+            <description>Icelandic (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:nodeadkeys:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic (no dead keys)</longname>
+            <description>Icelandic (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:mac_legacy:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic (Macintosh, legacy)</longname>
+            <description>Icelandic (Macintosh, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:mac:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic (Macintosh)</longname>
+            <description>Icelandic (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:dvorak:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic (Dvorak)</longname>
+            <description>Icelandic (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il::heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <longname>Hebrew</longname>
+            <description>Hebrew</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:lyx:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <longname>Hebrew (lyx)</longname>
+            <description>Hebrew (lyx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:phonetic:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <longname>Hebrew (phonetic)</longname>
+            <description>Hebrew (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:biblical:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <longname>Hebrew (Biblical, Tiro)</longname>
+            <description>Hebrew (Biblical, Tiro)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it::ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian</longname>
+            <description>Italian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:nodeadkeys:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (no dead keys)</longname>
+            <description>Italian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:winkeys:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (Winkeys)</longname>
+            <description>Italian (Winkeys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:mac:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (Macintosh)</longname>
+            <description>Italian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:us:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (US, with Italian letters)</longname>
+            <description>Italian (US, with Italian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:geo:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Georgian (Italy)</longname>
+            <description>Georgian (Italy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:ibm:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (IBM 142)</longname>
+            <description>Italian (IBM 142)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:srd</name>
+            <language>sc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:nap</name>
+            <language>nap</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:scn</name>
+            <language>scn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:fur</name>
+            <language>fur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:scn:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Sicilian</longname>
+            <description>Sicilian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:scn:scn</name>
+            <language>scn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Sicilian</longname>
+            <description>Sicilian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:fur:fur</name>
+            <language>fur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Friulian (Italy)</longname>
+            <description>Friulian (Italy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp::jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese</longname>
+            <description>Japanese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:kana:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese (Kana)</longname>
+            <description>Japanese (Kana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:kana86:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese (Kana 86)</longname>
+            <description>Japanese (Kana 86)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:OADG109A:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese (OADG 109A)</longname>
+            <description>Japanese (OADG 109A)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:mac:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese (Macintosh)</longname>
+            <description>Japanese (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:dvorak:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese (Dvorak)</longname>
+            <description>Japanese (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kg::kir</name>
+            <language>ky</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kg</layout>
+            <longname>Kyrgyz</longname>
+            <description>Kyrgyz</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kg:phonetic:kir</name>
+            <language>ky</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kg</layout>
+            <longname>Kyrgyz (phonetic)</longname>
+            <description>Kyrgyz (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kh::khm</name>
+            <language>km</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kh</layout>
+            <longname>Khmer (Cambodia)</longname>
+            <description>Khmer (Cambodia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz::kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh</longname>
+            <description>Kazakh</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ruskaz:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Russian (Kazakhstan, with Kazakh)</longname>
+            <description>Russian (Kazakhstan, with Kazakh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ruskaz:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Russian (Kazakhstan, with Kazakh)</longname>
+            <description>Russian (Kazakhstan, with Kazakh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:kazrus:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh (with Russian)</longname>
+            <description>Kazakh (with Russian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:kazrus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh (with Russian)</longname>
+            <description>Kazakh (with Russian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ext:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh (extended)</longname>
+            <description>Kazakh (extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:latin:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh (Latin)</longname>
+            <description>Kazakh (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:la::lao</name>
+            <language>lo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>la</layout>
+            <longname>Lao</longname>
+            <description>Lao</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:la:stea:lao</name>
+            <language>lo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>la</layout>
+            <longname>Lao (STEA proposed standard layout)</longname>
+            <description>Lao (STEA proposed standard layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam::spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American)</longname>
+            <description>Spanish (Latin American)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:nodeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, no dead keys)</longname>
+            <description>Spanish (Latin American, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:deadtilde:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, dead tilde)</longname>
+            <description>Spanish (Latin American, dead tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:sundeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, with Sun dead keys)</longname>
+            <description>Spanish (Latin American, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:dvorak:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, Dvorak)</longname>
+            <description>Spanish (Latin American, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:colemak:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, Colemak)</longname>
+            <description>Spanish (Latin American, Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:latam:colemak-gaming:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>latam</layout>
+            <longname>Spanish (Latin American, Colemak for gaming)</longname>
+            <description>Spanish (Latin American, Colemak for gaming)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt::lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian</longname>
+            <description>Lithuanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:std:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian (standard)</longname>
+            <description>Lithuanian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:us:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian (US, with Lithuanian letters)</longname>
+            <description>Lithuanian (US, with Lithuanian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:ibm:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian (IBM LST 1205-92)</longname>
+            <description>Lithuanian (IBM LST 1205-92)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:lekp:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian (LEKP)</longname>
+            <description>Lithuanian (LEKP)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:lekpa:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian (LEKPa)</longname>
+            <description>Lithuanian (LEKPa)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:sgs:sgs</name>
+            <language>sgs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Samogitian</longname>
+            <description>Samogitian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv::lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian</longname>
+            <description>Latvian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:apostrophe:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (apostrophe)</longname>
+            <description>Latvian (apostrophe)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:tilde:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (tilde)</longname>
+            <description>Latvian (tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:fkey:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (F)</longname>
+            <description>Latvian (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:modern:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (modern)</longname>
+            <description>Latvian (modern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:ergonomic:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (ergonomic, ŪGJRMV)</longname>
+            <description>Latvian (ergonomic, ŪGJRMV)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:adapted:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian (adapted)</longname>
+            <description>Latvian (adapted)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mao::mri</name>
+            <language>mi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mao</layout>
+            <longname>Maori</longname>
+            <description>Maori</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:me::srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin</longname>
+            <description>Montenegrin</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillic:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Cyrillic)</longname>
+            <description>Montenegrin (Cyrillic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillicyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Cyrillic, ZE and ZHE swapped)</longname>
+            <description>Montenegrin (Cyrillic, ZE and ZHE swapped)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinunicode:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Latin, Unicode)</longname>
+            <description>Montenegrin (Latin, Unicode)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Latin, QWERTY)</longname>
+            <description>Montenegrin (Latin, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinunicodeyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Latin, Unicode, QWERTY)</longname>
+            <description>Montenegrin (Latin, Unicode, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillicalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Cyrillic with guillemets)</longname>
+            <description>Montenegrin (Cyrillic with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin (Latin with guillemets)</longname>
+            <description>Montenegrin (Latin with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mk::mkd</name>
+            <language>mk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mk</layout>
+            <longname>Macedonian</longname>
+            <description>Macedonian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mk:nodeadkeys:mkd</name>
+            <language>mk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mk</layout>
+            <longname>Macedonian (no dead keys)</longname>
+            <description>Macedonian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt::mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <longname>Maltese</longname>
+            <description>Maltese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:us:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <longname>Maltese (with US layout)</longname>
+            <description>Maltese (with US layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:alt-us:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <longname>Maltese (US layout with AltGr overrides)</longname>
+            <description>Maltese (US layout with AltGr overrides)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:alt-gb:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <longname>Maltese (UK layout with AltGr overrides)</longname>
+            <description>Maltese (UK layout with AltGr overrides)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mn::mon</name>
+            <language>mn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mn</layout>
+            <longname>Mongolian</longname>
+            <description>Mongolian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Win keys)</longname>
+            <description>Norwegian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Win keys)</longname>
+            <description>Norwegian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Win keys)</longname>
+            <description>Norwegian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Northern Saami (Norway)</longname>
+            <description>Northern Saami (Norway)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:smi_nodeadkeys:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Northern Saami (Norway, no dead keys)</longname>
+            <description>Northern Saami (Norway, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Macintosh)</longname>
+            <description>Norwegian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac_nodeadkeys:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Macintosh, no dead keys)</longname>
+            <description>Norwegian (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:colemak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian (Colemak)</longname>
+            <description>Norwegian (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl::pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish</longname>
+            <description>Polish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:legacy:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (legacy)</longname>
+            <description>Polish (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:qwertz:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (QWERTZ)</longname>
+            <description>Polish (QWERTZ)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (Dvorak)</longname>
+            <description>Polish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak_quotes:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (Dvorak, with Polish quotes on quotemark key)</longname>
+            <description>Polish (Dvorak, with Polish quotes on quotemark key)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak_altquotes:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (Dvorak, with Polish quotes on key 1)</longname>
+            <description>Polish (Dvorak, with Polish quotes on key 1)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:csb:csb</name>
+            <language>csb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Kashubian</longname>
+            <description>Kashubian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:szl:szl</name>
+            <language>szl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Silesian</longname>
+            <description>Silesian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:ru_phonetic_dvorak:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Russian (Poland, phonetic Dvorak)</longname>
+            <description>Russian (Poland, phonetic Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvp:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish (programmer Dvorak)</longname>
+            <description>Polish (programmer Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt::por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese</longname>
+            <description>Portuguese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (no dead keys)</longname>
+            <description>Portuguese (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:sundeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (with Sun dead keys)</longname>
+            <description>Portuguese (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (Macintosh)</longname>
+            <description>Portuguese (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac_nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (Macintosh, no dead keys)</longname>
+            <description>Portuguese (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac_sundeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (Macintosh, with Sun dead keys)</longname>
+            <description>Portuguese (Macintosh, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (Nativo)</longname>
+            <description>Portuguese (Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo-us:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese (Nativo for US keyboards)</longname>
+            <description>Portuguese (Nativo for US keyboards)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo-epo:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Esperanto (Portugal, Nativo)</longname>
+            <description>Esperanto (Portugal, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro::ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian</longname>
+            <description>Romanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:cedilla:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian (cedilla)</longname>
+            <description>Romanian (cedilla)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:std:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian (standard)</longname>
+            <description>Romanian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:std_cedilla:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian (standard cedilla)</longname>
+            <description>Romanian (standard cedilla)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:winkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian (Win keys)</longname>
+            <description>Romanian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru::rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian</longname>
+            <description>Russian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic)</longname>
+            <description>Russian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_winkeys:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic, with Win keys)</longname>
+            <description>Russian (phonetic, with Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_yazherty:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic yazherty)</longname>
+            <description>Russian (phonetic yazherty)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:typewriter:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (typewriter)</longname>
+            <description>Russian (typewriter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:legacy:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (legacy)</longname>
+            <description>Russian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:typewriter-legacy:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (typewriter, legacy)</longname>
+            <description>Russian (typewriter, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:tt:tat</name>
+            <language>tt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Tatar</longname>
+            <description>Tatar</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:os_legacy:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Ossetian (legacy)</longname>
+            <description>Ossetian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:os_winkeys:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Ossetian (Win keys)</longname>
+            <description>Ossetian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:cv:chv</name>
+            <language>cv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Chuvash</longname>
+            <description>Chuvash</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:cv_latin:chv</name>
+            <language>cv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Chuvash (Latin)</longname>
+            <description>Chuvash (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:udm:udm</name>
+            <language>udm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Udmurt</longname>
+            <description>Udmurt</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:kom:kom</name>
+            <language>kv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Komi</longname>
+            <description>Komi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:sah:sah</name>
+            <language>sah</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Yakut</longname>
+            <description>Yakut</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:xal:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Kalmyk</longname>
+            <description>Kalmyk</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:dos:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (DOS)</longname>
+            <description>Russian (DOS)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:mac:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (Macintosh)</longname>
+            <description>Russian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:srp:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Serbian (Russia)</longname>
+            <description>Serbian (Russia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:srp:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Serbian (Russia)</longname>
+            <description>Serbian (Russia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:bak:bak</name>
+            <language>ba</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Bashkirian</longname>
+            <description>Bashkirian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:chm:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Mari</longname>
+            <description>Mari</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_azerty:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic, AZERTY)</longname>
+            <description>Russian (phonetic, AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_dvorak:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic, Dvorak)</longname>
+            <description>Russian (phonetic, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_fr:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian (phonetic, French)</longname>
+            <description>Russian (phonetic, French)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs::srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian</longname>
+            <description>Serbian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:yz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Cyrillic, ZE and ZHE swapped)</longname>
+            <description>Serbian (Cyrillic, ZE and ZHE swapped)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latin:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Latin)</longname>
+            <description>Serbian (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinunicode:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Latin, Unicode)</longname>
+            <description>Serbian (Latin, Unicode)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Latin, QWERTY)</longname>
+            <description>Serbian (Latin, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinunicodeyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Latin, Unicode, QWERTY)</longname>
+            <description>Serbian (Latin, Unicode, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:alternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Cyrillic with guillemets)</longname>
+            <description>Serbian (Cyrillic with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian (Latin with guillemets)</longname>
+            <description>Serbian (Latin with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:rue:rue</name>
+            <language>rue</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Pannonian Rusyn</longname>
+            <description>Pannonian Rusyn</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:si::slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <longname>Slovenian</longname>
+            <description>Slovenian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:si:alternatequotes:slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <longname>Slovenian (with guillemets)</longname>
+            <description>Slovenian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:si:us:slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <longname>Slovenian (US, with Slovenian letters)</longname>
+            <description>Slovenian (US, with Slovenian letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk::slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <longname>Slovak</longname>
+            <description>Slovak</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:bksl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <longname>Slovak (extended backslash)</longname>
+            <description>Slovak (extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:qwerty:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <longname>Slovak (QWERTY)</longname>
+            <description>Slovak (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:qwerty_bksl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <longname>Slovak (QWERTY, extended backslash)</longname>
+            <description>Slovak (QWERTY, extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es::spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish</longname>
+            <description>Spanish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:nodeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (no dead keys)</longname>
+            <description>Spanish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:winkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (Win keys)</longname>
+            <description>Spanish (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:deadtilde:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (dead tilde)</longname>
+            <description>Spanish (dead tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:sundeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (with Sun dead keys)</longname>
+            <description>Spanish (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:dvorak:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (Dvorak)</longname>
+            <description>Spanish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:ast:ast</name>
+            <language>ast</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Asturian (Spain, with bottom-dot H and bottom-dot L)</longname>
+            <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:cat:cat</name>
+            <language>ca</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Catalan (Spain, with middle-dot L)</longname>
+            <description>Catalan (Spain, with middle-dot L)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:mac:cat</name>
+            <language>ca</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish (Macintosh)</longname>
+            <description>Spanish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se::swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish</longname>
+            <description>Swedish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:nodeadkeys:swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (no dead keys)</longname>
+            <description>Swedish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:dvorak:swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (Dvorak)</longname>
+            <description>Swedish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Russian (Sweden, phonetic)</longname>
+            <description>Russian (Sweden, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:rus_nodeadkeys:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Russian (Sweden, phonetic, no dead keys)</longname>
+            <description>Russian (Sweden, phonetic, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Northern Saami (Sweden)</longname>
+            <description>Northern Saami (Sweden)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (Macintosh)</longname>
+            <description>Swedish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:svdvorak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (Svdvorak)</longname>
+            <description>Swedish (Svdvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:us_dvorak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (based on US Intl. Dvorak)</longname>
+            <description>Swedish (based on US Intl. Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:us:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish (US, with Swedish letters)</longname>
+            <description>Swedish (US, with Swedish letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:swl:swl</name>
+            <language>swl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish Sign Language</longname>
+            <description>Swedish Sign Language</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland)</longname>
+            <description>German (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch::gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland)</longname>
+            <description>German (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:legacy:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, legacy)</longname>
+            <description>German (Switzerland, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:legacy:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, legacy)</longname>
+            <description>German (Switzerland, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, no dead keys)</longname>
+            <description>German (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_nodeadkeys:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, no dead keys)</longname>
+            <description>German (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, with Sun dead keys)</longname>
+            <description>German (Switzerland, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_sundeadkeys:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, with Sun dead keys)</longname>
+            <description>German (Switzerland, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>French (Switzerland)</longname>
+            <description>French (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>French (Switzerland, no dead keys)</longname>
+            <description>French (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>French (Switzerland, with Sun dead keys)</longname>
+            <description>French (Switzerland, with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>French (Switzerland, Macintosh)</longname>
+            <description>French (Switzerland, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland, Macintosh)</longname>
+            <description>German (Switzerland, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy::syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Arabic (Syria)</longname>
+            <description>Arabic (Syria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:syc:syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Syriac</longname>
+            <description>Syriac</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:syc_phonetic:syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Syriac (phonetic)</longname>
+            <description>Syriac (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Kurdish (Syria, Latin Q)</longname>
+            <description>Kurdish (Syria, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Kurdish (Syria, F)</longname>
+            <description>Kurdish (Syria, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Kurdish (Syria, Latin Alt-Q)</longname>
+            <description>Kurdish (Syria, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tj::tgk</name>
+            <language>tg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tj</layout>
+            <longname>Tajik</longname>
+            <description>Tajik</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tj:legacy:tgk</name>
+            <language>tg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tj</layout>
+            <longname>Tajik (legacy)</longname>
+            <description>Tajik (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk::sin</name>
+            <language>si</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <longname>Sinhala (phonetic)</longname>
+            <description>Sinhala (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:tam_unicode:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <longname>Tamil (Sri Lanka, TamilNet '99)</longname>
+            <description>Tamil (Sri Lanka, TamilNet '99)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:tam_TAB:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <longname>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</longname>
+            <description>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:us:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <longname>Sinhala (US, with Sinhala letters)</longname>
+            <description>Sinhala (US, with Sinhala letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:th::tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <longname>Thai</longname>
+            <description>Thai</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:th:tis:tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <longname>Thai (TIS-820.2538)</longname>
+            <description>Thai (TIS-820.2538)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:th:pat:tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <longname>Thai (Pattachote)</longname>
+            <description>Thai (Pattachote)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr::tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish</longname>
+            <description>Turkish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:f:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish (F)</longname>
+            <description>Turkish (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:alt:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish (Alt-Q)</longname>
+            <description>Turkish (Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:sundeadkeys:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish (with Sun dead keys)</longname>
+            <description>Turkish (with Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Kurdish (Turkey, Latin Q)</longname>
+            <description>Kurdish (Turkey, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Kurdish (Turkey, F)</longname>
+            <description>Kurdish (Turkey, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Kurdish (Turkey, Latin Alt-Q)</longname>
+            <description>Kurdish (Turkey, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:intl:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish (intl., with dead keys)</longname>
+            <description>Turkish (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Crimean Tatar (Turkish Q)</longname>
+            <description>Crimean Tatar (Turkish Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh_f:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Crimean Tatar (Turkish F)</longname>
+            <description>Crimean Tatar (Turkish F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh_alt:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Crimean Tatar (Turkish Alt-Q)</longname>
+            <description>Crimean Tatar (Turkish Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw::fox</name>
+            <language>fox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese</longname>
+            <description>Taiwanese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ami</name>
+            <language>ami</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tay</name>
+            <language>tay</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:bnn</name>
+            <language>bnn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ckv</name>
+            <language>ckv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:pwn</name>
+            <language>pwn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:pyu</name>
+            <language>pyu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:dru</name>
+            <language>dru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ais</name>
+            <language>ais</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ssf</name>
+            <language>ssf</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tao</name>
+            <language>tao</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tsu</name>
+            <language>tsu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:trv</name>
+            <language>trv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:xnb</name>
+            <language>xnb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:sxr</name>
+            <language>sxr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:uun</name>
+            <language>uun</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:fos</name>
+            <language>fos</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:saisiyat:xsy</name>
+            <language>xsy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Saisiyat (Taiwan)</longname>
+            <description>Saisiyat (Taiwan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua::ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian</longname>
+            <description>Ukrainian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:phonetic:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (phonetic)</longname>
+            <description>Ukrainian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:typewriter:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (typewriter)</longname>
+            <description>Ukrainian (typewriter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:winkeys:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (Win keys)</longname>
+            <description>Ukrainian (Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:legacy:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (legacy)</longname>
+            <description>Ukrainian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:rstu:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (standard RSTU)</longname>
+            <description>Ukrainian (standard RSTU)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:rstu_ru:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Russian (Ukraine, standard RSTU)</longname>
+            <description>Russian (Ukraine, standard RSTU)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:homophonic:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian (homophonic)</longname>
+            <description>Ukrainian (homophonic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK)</longname>
+            <description>English (UK)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:extd:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, extended, with Win keys)</longname>
+            <description>English (UK, extended, with Win keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, intl., with dead keys)</longname>
+            <description>English (UK, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:dvorak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, Dvorak)</longname>
+            <description>English (UK, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:dvorakukp:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, Dvorak, with UK punctuation)</longname>
+            <description>English (UK, Dvorak, with UK punctuation)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:mac:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, Macintosh)</longname>
+            <description>English (UK, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:mac_intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, intl., Macintosh)</longname>
+            <description>English (UK, intl., Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:colemak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK, Colemak)</longname>
+            <description>English (UK, Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:pl:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>Polish (British keyboard)</longname>
+            <description>Polish (British keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:uz::uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>uz</layout>
+            <longname>Uzbek</longname>
+            <description>Uzbek</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:uz:latin:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>uz</layout>
+            <longname>Uzbek (Latin)</longname>
+            <description>Uzbek (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn::vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <longname>Vietnamese</longname>
+            <description>Vietnamese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn:us:vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <longname>Vietnamese (US, with Vietnamese letters)</longname>
+            <description>Vietnamese (US, with Vietnamese letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn:fr:vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <longname>Vietnamese (French, with Vietnamese letters)</longname>
+            <description>Vietnamese (French, with Vietnamese letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kr::kor</name>
+            <language>ko</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kr</layout>
+            <longname>Korean</longname>
+            <description>Korean</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kr:kr104:kor</name>
+            <language>ko</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kr</layout>
+            <longname>Korean (101/104 key compatible)</longname>
+            <description>Korean (101/104 key compatible)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>Irish</longname>
+            <description>Irish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:CloGaelach:gle</name>
+            <language>ga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>CloGaelach</longname>
+            <description>CloGaelach</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:UnicodeExpert:gle</name>
+            <language>ga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>Irish (UnicodeExpert)</longname>
+            <description>Irish (UnicodeExpert)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:ogam:sga</name>
+            <language>sga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>Ogham</longname>
+            <description>Ogham</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:ogam_is434:sga</name>
+            <language>sga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>Ogham (IS434)</longname>
+            <description>Ogham (IS434)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk::urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Urdu (Pakistan)</longname>
+            <description>Urdu (Pakistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:urd-crulp:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Urdu (Pakistan, CRULP)</longname>
+            <description>Urdu (Pakistan, CRULP)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:urd-nla:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Urdu (Pakistan, NLA)</longname>
+            <description>Urdu (Pakistan, NLA)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:ara:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Arabic (Pakistan)</longname>
+            <description>Arabic (Pakistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:snd:snd</name>
+            <language>sd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Sindhi</longname>
+            <description>Sindhi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mv::div</name>
+            <language>dv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mv</layout>
+            <longname>Dhivehi</longname>
+            <description>Dhivehi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:za::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>za</layout>
+            <longname>English (South Africa)</longname>
+            <description>English (South Africa)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:epo::epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>epo</layout>
+            <longname>Esperanto</longname>
+            <description>Esperanto</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:epo:legacy:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>epo</layout>
+            <longname>Esperanto (displaced semicolon and quote, obsolete)</longname>
+            <description>Esperanto (displaced semicolon and quote, obsolete)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:np::nep</name>
+            <language>ne</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>np</layout>
+            <longname>Nepali</longname>
+            <description>Nepali</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:np::sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>np</layout>
+            <longname>Nepali</longname>
+            <description>Nepali</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <longname>English (Nigeria)</longname>
+            <description>English (Nigeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:igbo:ibo</name>
+            <language>ig</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <longname>Igbo</longname>
+            <description>Igbo</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:yoruba:yor</name>
+            <language>yo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <longname>Yoruba</longname>
+            <description>Yoruba</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:hausa:hau</name>
+            <language>ha</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <longname>Hausa (Nigeria)</longname>
+            <description>Hausa (Nigeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:et::amh</name>
+            <language>am</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>et</layout>
+            <longname>Amharic</longname>
+            <description>Amharic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sn::wol</name>
+            <language>wo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sn</layout>
+            <longname>Wolof</longname>
+            <description>Wolof</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tm::tuk</name>
+            <language>tk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tm</layout>
+            <longname>Turkmen</longname>
+            <description>Turkmen</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tm:alt:tuk</name>
+            <language>tk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tm</layout>
+            <longname>Turkmen (Alt-Q)</longname>
+            <description>Turkmen (Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml::bam</name>
+            <language>bm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <longname>Bambara</longname>
+            <description>Bambara</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:fr-oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <longname>French (Mali, alt.)</longname>
+            <description>French (Mali, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:us-mac:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <longname>English (Mali, US, Macintosh)</longname>
+            <description>English (Mali, US, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:us-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <longname>English (Mali, US, intl.)</longname>
+            <description>English (Mali, US, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tz::swa</name>
+            <language>sw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tz</layout>
+            <longname>Swahili (Tanzania)</longname>
+            <description>Swahili (Tanzania)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ajg</name>
+            <language>ajg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::blo</name>
+            <language>blo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kpo</name>
+            <language>kpo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ewe</name>
+            <language>ee</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fon</name>
+            <language>fon</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fue</name>
+            <language>fue</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::gej</name>
+            <language>gej</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ife</name>
+            <language>ife</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kbp</name>
+            <language>kbp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::las</name>
+            <language>las</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::dop</name>
+            <language>dop</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::mfg</name>
+            <language>mfg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::nmz</name>
+            <language>nmz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::bud</name>
+            <language>bud</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::gng</name>
+            <language>gng</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kdh</name>
+            <language>kdh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::soy</name>
+            <language>soy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ke::swa</name>
+            <language>sw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ke</layout>
+            <longname>Swahili (Kenya)</longname>
+            <description>Swahili (Kenya)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ke:kik:kik</name>
+            <language>ki</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ke</layout>
+            <longname>Kikuyu</longname>
+            <description>Kikuyu</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bw::tsn</name>
+            <language>tn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bw</layout>
+            <longname>Tswana</longname>
+            <description>Tswana</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:md::ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>md</layout>
+            <longname>Moldavian</longname>
+            <description>Moldavian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:md:gag:gag</name>
+            <language>gag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>md</layout>
+            <longname>Moldavian (Gagauz)</longname>
+            <description>Moldavian (Gagauz)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
+            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jv::jv</name>
+            <language>jv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jv</layout>
+            <longname>Indonesian (Javanese)</longname>
+            <description>Indonesian (Javanese)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+    </engines>
+</component>

From 6879879002af47d49d8740ca383a048d2ac8e904 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 09:15:14 +0900
Subject: [PATCH 644/816] src/tests: Fix runtest with simple.xml

Now simple.xml.in is replaced with simple.xml and modify runtest
to copy simple.xml.

BUG=https://github.com/ibus/ibus/issues/2153
---
 src/tests/runtest | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/tests/runtest b/src/tests/runtest
index a6e4194bf..11bcc6c2d 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -91,6 +91,19 @@ func_copy_component () {
     fi
 }
 
+func_copy_simple_xml () {
+    file=$1
+    base=`func_basename $file`
+    libexecdir=`func_dirname $file`
+    # top_srcdir != top_builddir in make dist
+    libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
+    if test -f $file; then
+        mkdir -p components
+        sed "s|\(<exec>\).*\(/ibus-engine-simple</exec>\)|\1$libexecdir\2|" \
+                < $file > components/$base
+    fi
+}
+
 trap 'func_cleanup $tstdir' 1 2 3 15
 
 tst=$1; shift
@@ -127,7 +140,7 @@ run_test_case()
             exit -1
         fi
         # func_copy_component replaces s/$top_srcdir/%top_builddir/
-        func_copy_component "../$top_srcdir/engine/simple.xml"
+        func_copy_simple_xml "../$top_srcdir/engine/simple.xml"
         func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
 
         IBUS_COMPONENT_PATH=$PWD/components

From 59b902a809ed628bb4d5bbad2b8bcb79a8a23208 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 09:46:46 +0900
Subject: [PATCH 645/816] src: Add file list in registry file

Under Fedora Silverblue, st_mtime in /usr/share/ibus/component is
1 Jan 1970 even if ibus engines are installed and ibus-daemon
cannot detect new engines.
Now IBusObservedPath saves hashed file list besides st_mtime of
the compnent directory to detect the installed engines newly.

BUG=https://github.com/ibus/ibus/issues/2132
---
 src/ibuscomponent.c    |   9 +-
 src/ibusobservedpath.c | 277 ++++++++++++++++++++++++++++++++++++-----
 src/ibusregistry.c     |   6 +-
 3 files changed, 254 insertions(+), 38 deletions(-)

diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index 9837f47c1..1404ada08 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
@@ -499,11 +500,7 @@ ibus_component_output (IBusComponent *component,
 
         for (p = component->priv->observed_paths; p != NULL; p = p->next ) {
             IBusObservedPath *path = (IBusObservedPath *) p->data;
-
-            g_string_append_indent (output, indent + 2);
-            g_string_append_printf (output, "<path mtime=\"%ld\" >%s</path>\n",
-                                    path->mtime,
-                                    path->path);
+            ibus_observed_path_output (path, output, indent + 2);
         }
 
         g_string_append_indent (output, indent + 1);
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index 5b79f1fe2..42192431b 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input IBus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
@@ -30,9 +31,9 @@ enum {
 };
 
 
-/* IBusObservedPathPriv */
+/* IBusObservedPathPrivate */
 struct _IBusObservedPathPrivate {
-    gpointer pad;
+    guint   *file_hash_list;
 };
 typedef struct _IBusObservedPathPrivate IBusObservedPathPrivate;
 
@@ -52,7 +53,9 @@ static gboolean  ibus_observed_path_copy            (IBusObservedPath       *des
 static gboolean  ibus_observed_path_parse_xml_node  (IBusObservedPath       *path,
                                                      XMLNode                *node);
 
-G_DEFINE_TYPE (IBusObservedPath, ibus_observed_path, IBUS_TYPE_SERIALIZABLE)
+G_DEFINE_TYPE_WITH_PRIVATE (IBusObservedPath,
+                            ibus_observed_path,
+                            IBUS_TYPE_SERIALIZABLE)
 
 static void
 ibus_observed_path_class_init (IBusObservedPathClass *class)
@@ -84,7 +87,9 @@ static gboolean
 ibus_observed_path_serialize (IBusObservedPath *path,
                               GVariantBuilder  *builder)
 {
+    IBusObservedPathPrivate *priv = IBUS_OBSERVED_PATH_GET_PRIVATE (path);
     gboolean retval;
+    guint i;
 
     retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->
             serialize ((IBusSerializable *)path, builder);
@@ -93,6 +98,15 @@ ibus_observed_path_serialize (IBusObservedPath *path,
     g_variant_builder_add (builder, "s", path->path);
     g_variant_builder_add (builder, "x", path->mtime);
 
+    if (!priv->file_hash_list) {
+        g_variant_builder_add (builder, "u", 0);
+        return TRUE;
+    }
+    for (i = 0; priv->file_hash_list[i]; i++);
+    g_variant_builder_add (builder, "u", i);
+    for (i = 0; priv->file_hash_list[i]; i++)
+        g_variant_builder_add (builder, "u", priv->file_hash_list[i]);
+
     return TRUE;
 }
 
@@ -100,7 +114,9 @@ static gint
 ibus_observed_path_deserialize (IBusObservedPath *path,
                                 GVariant         *variant)
 {
+    IBusObservedPathPrivate *priv = IBUS_OBSERVED_PATH_GET_PRIVATE (path);
     gint retval;
+    guint i, length = 0;
 
     retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->
             deserialize ((IBusSerializable *)path, variant);
@@ -109,6 +125,15 @@ ibus_observed_path_deserialize (IBusObservedPath *path,
     ibus_g_variant_get_child_string (variant, retval++, &path->path);
     g_variant_get_child (variant, retval++, "x", &path->mtime);
 
+    if (g_variant_n_children (variant) < retval + 2)
+        return retval;
+    g_variant_get_child (variant, retval++, "u", &length);
+    if (!length)
+        return retval;
+    priv->file_hash_list = g_new0 (guint, length + 1);
+    for (i = 0; i < length; i++)
+        g_variant_get_child (variant, retval++, "u", &priv->file_hash_list[i]);
+
     return retval;
 }
 
@@ -116,14 +141,27 @@ static gboolean
 ibus_observed_path_copy (IBusObservedPath       *dest,
                          const IBusObservedPath *src)
 {
+    IBusObservedPathPrivate *dest_priv = IBUS_OBSERVED_PATH_GET_PRIVATE (dest);
+    IBusObservedPathPrivate *src_priv =
+            IBUS_OBSERVED_PATH_GET_PRIVATE ((IBusObservedPath *)src);
     gboolean retval;
+    guint i;
 
-    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->copy ((IBusSerializable *)dest, (IBusSerializable *)src);
+    retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->
+            copy ((IBusSerializable *)dest, (IBusSerializable *)src);
     g_return_val_if_fail (retval, FALSE);
 
     dest->path = g_strdup (src->path);
     dest->mtime = src->mtime;
 
+    g_clear_pointer (&dest_priv->file_hash_list, g_free);
+    if (!src_priv->file_hash_list)
+        return TRUE;
+    for (i = 0; src_priv->file_hash_list[i]; i++);
+    dest_priv->file_hash_list = g_new0 (guint, i + 1);
+    for (i = 0; src_priv->file_hash_list[i]; i++)
+        dest_priv->file_hash_list[i] = src_priv->file_hash_list[i];
+
     return TRUE;
 }
 
@@ -137,23 +175,48 @@ ibus_observed_path_copy (IBusObservedPath       *dest,
 
 void
 ibus_observed_path_output (IBusObservedPath *path,
-                          GString         *output,
-                          gint             indent)
+                           GString          *output,
+                           gint              indent)
 {
+    IBusObservedPathPrivate *priv = IBUS_OBSERVED_PATH_GET_PRIVATE (path);
+    guint i;
+
     g_assert (IBUS_IS_OBSERVED_PATH (path));
     g_assert (output);
 
-    g_string_append_indent (output, indent);
-    g_string_append_printf (output, "<path mtime=\"%ld\" >%s</path>\n",
-                                    path->mtime,
-                                    path->path);
+    if (!priv->file_hash_list) {
+        g_string_append_indent (output, indent);
+        g_string_append_printf (output, "<path mtime=\"%ld\" >%s</path>\n",
+                                path->mtime,
+                                path->path);
+    } else {
+        g_string_append_indent (output, indent);
+        g_string_append_printf (
+                output,
+                "<path mtime=\"%ld\" type=\"dir\" path=\"%s\">\n",
+                path->mtime,
+                path->path);
+        for (i = 0; priv->file_hash_list[i]; i++) {
+            g_string_append_indent (output, indent + 1);
+            g_string_append_printf (output, "<file hash=\"%u\" />\n",
+                                    priv->file_hash_list[i]);
+        }
+        g_string_append_indent (output, indent);
+        g_string_append_printf (output, "</path>\n");
+    }
 }
 
 gboolean
 ibus_observed_path_check_modification (IBusObservedPath *path)
 {
+    IBusObservedPathPrivate *priv = IBUS_OBSERVED_PATH_GET_PRIVATE (path);
     gchar *real_path = NULL;
     struct stat buf;
+    gboolean retval = FALSE;
+    GDir *dir = NULL;
+    const gchar *name;
+    guint i = 0;
+    guint file_num = 0;
 
     g_assert (IBUS_IS_OBSERVED_PATH (path));
 
@@ -169,11 +232,71 @@ ibus_observed_path_check_modification (IBusObservedPath *path)
         buf.st_mtime = 0;
     }
 
-    g_free (real_path);
 
-    if (path->mtime == buf.st_mtime)
-        return FALSE;
-    return TRUE;
+    if (path->mtime != buf.st_mtime) {
+        retval = TRUE;
+        goto end_check_modification;
+    }
+
+    /* If an ibus engine is installed, normal file system updates
+     * the directory mtime of "/usr/share/ibus/component" and
+     * path->mtime of the cache file and buf.st_mtime of the current directory
+     * could have the different values.
+     *
+     * But under a special file system, the buf.st_mtime is not updated
+     * even if an ibus engine is installed, likes Fedora Silverblue
+     * and ibus_observed_path_check_modification() could not detect
+     * the installed ibus engines.
+     * Now path->priv->file_hash_list reserves the hash list of the files
+     * in the observed directory and if a new ibus engine is installed,
+     * the hash of the compose file does not exists in the cache's
+     * file_hash_list and ibus-daemon regenerate the cache successfully.
+     */
+    if (!priv->file_hash_list) {
+        /* If the cache version is old, ibus_registry_load_cache() returns
+         * FALSE and ibus_registry_check_modification() and this are not
+         * called.
+         * If the cache version is the latest, the cache file includes the
+         * filled file_hash_list for directories with ibus_observed_path_new()
+         * when the cache was generated.
+         * Then if file_hash_list is null, it's a simple file in ibus
+         * components and return here simply.
+         */
+        goto end_check_modification;
+    }
+    dir = g_dir_open (real_path, 0, NULL);
+    g_return_val_if_fail (dir, FALSE);
+
+    while ((name = g_dir_read_name (dir)) != NULL) {
+        guint current_hash;
+        gboolean has_file = FALSE;
+
+        if (!g_str_has_suffix (name, ".xml"))
+            continue;
+        current_hash = g_str_hash (name);
+        for (i = 0; priv->file_hash_list[i]; i++) {
+            if (current_hash == priv->file_hash_list[i]) {
+                has_file = TRUE;
+                break;
+            }
+        }
+        if (!has_file) {
+            retval = TRUE;
+            goto end_check_modification;
+        }
+        file_num++;
+    }
+    if (!retval) {
+        for (i = 0; priv->file_hash_list[i]; i++);
+        if (file_num != i)
+            retval = TRUE;
+    }
+
+end_check_modification:
+    if (dir)
+        g_dir_close (dir);
+    g_free (real_path);
+    return retval;
 }
 
 static void
@@ -224,7 +347,7 @@ ibus_observed_path_traverse (IBusObservedPath *path,
             paths = g_list_append (paths, sub);
             paths = g_list_concat (paths,
                                    ibus_observed_path_traverse (sub, dir_only));
-        } else if (!dir_only) {
+        } else if (sub->is_exist && !dir_only) {
             paths = g_list_append (paths, sub);
         }
     }
@@ -233,36 +356,102 @@ ibus_observed_path_traverse (IBusObservedPath *path,
     return paths;
 }
 
+
+static gboolean
+ibus_observed_path_parse_file (IBusObservedPath *path,
+                               XMLNode          *node,
+                               int              *nth)
+{
+    IBusObservedPathPrivate *priv = IBUS_OBSERVED_PATH_GET_PRIVATE (path);
+    gchar **attr;
+
+    for (attr = node->attributes; attr[0]; attr += 2) {
+        guint hash = 0;
+
+        if (g_strcmp0 (*attr, "hash") == 0)
+            hash = atol (attr[1]);
+        else if (g_strcmp0 (*attr, "name") == 0)
+            hash = g_str_hash (attr[1]);
+        if (hash) {
+            if (!priv->file_hash_list) {
+                *nth = 0;
+                priv->file_hash_list = g_new0 (guint, *nth + 2);
+            } else {
+                priv->file_hash_list = g_renew (guint, priv->file_hash_list,
+                                                *nth + 2);
+            }
+            priv->file_hash_list[*nth] = hash;
+            priv->file_hash_list[*nth + 1] = 0;
+            *nth += 1;
+            continue;
+        }
+        g_warning ("Unkonwn attribute %s", attr[0]);
+    }
+
+    return TRUE;
+}
+
+
 static gboolean
 ibus_observed_path_parse_xml_node (IBusObservedPath *path,
                                    XMLNode          *node)
 {
+    gchar **attr;
+    const gchar *full_path = node->text;
+    GList *p;
+    int i = 0;
+
     g_assert (IBUS_IS_OBSERVED_PATH (path));
     g_assert (node);
 
-    if (G_UNLIKELY (g_strcmp0 (node->name, "path") != 0)) {
+    if (G_UNLIKELY (g_strcmp0 (node->name, "path") != 0))
         return FALSE;
+
+    for (attr = node->attributes; attr[0]; attr += 2) {
+        if (g_strcmp0 (*attr, "mtime") == 0) {
+            path->mtime = atol (attr[1]);
+            continue;
+        }
+        if (g_strcmp0 (*attr, "path") == 0) {
+            full_path = attr[1];
+            continue;
+        }
+        if (g_strcmp0 (*attr, "type") == 0) {
+            if (!g_strcmp0 (attr[1], "dir"))
+                path->is_dir = TRUE;
+            else if (!g_strcmp0 (attr[1], "file"))
+                path->is_dir = FALSE;
+            else
+                g_warning ("The type attribute can be \"dir\" or \"file\".");
+            continue;
+        }
+        g_warning ("Unkonwn attribute %s", attr[0]);
     }
 
-    if (node->text[0] == '~' && node->text[1] != G_DIR_SEPARATOR) {
-        g_warning ("Invalid path \"%s\"", node->text);
+    if (full_path[0] == '~' && full_path[1] != G_DIR_SEPARATOR) {
+        g_warning ("Invalid path \"%s\"", full_path);
         return FALSE;
     }
 
-    path->path = g_strdup (node->text);
+    path->path = g_strdup (full_path);
 
-    gchar **attr;
-    for (attr = node->attributes; attr[0]; attr += 2) {
-        if (g_strcmp0 (*attr, "mtime") == 0) {
-            path->mtime = atol (attr[1]);
+    if (!path->is_dir)
+        return TRUE;
+
+    for (i = 0, p = node->sub_nodes; p != NULL; p = p->next) {
+        XMLNode *sub_node = (XMLNode *)p->data;
+
+        if (G_UNLIKELY (g_strcmp0 (sub_node->name, "file") != 0)) {
+            g_warning ("Unkonwn tag %s", sub_node->name);
             continue;
         }
-        g_warning ("Unkonwn attribute %s", attr[0]);
+        ibus_observed_path_parse_file (path, sub_node, &i);
     }
 
     return TRUE;
 }
 
+
 IBusObservedPath *
 ibus_observed_path_new_from_xml_node (XMLNode *node,
                                      gboolean fill_stat)
@@ -288,16 +477,46 @@ IBusObservedPath *
 ibus_observed_path_new (const gchar *path,
                         gboolean     fill_stat)
 {
-    g_assert (path);
-
     IBusObservedPath *op;
+    IBusObservedPathPrivate *priv;
+    GList *file_list, *l;
+    guint i = 0;
 
+    g_assert (path);
     op = (IBusObservedPath *) g_object_new (IBUS_TYPE_OBSERVED_PATH, NULL);
     op->path = g_strdup (path);
 
-    if (fill_stat) {
-        ibus_observed_path_fill_stat (op);
+    priv = IBUS_OBSERVED_PATH_GET_PRIVATE (op);
+    l = file_list = ibus_observed_path_traverse (op, FALSE);
+    for (; l; l = l->next) {
+        IBusObservedPath *sub = l->data;
+        const gchar *file = NULL;
+
+        g_return_val_if_fail (sub && sub->path, op);
+
+        file = sub->path;
+        if (!g_str_has_suffix (file, ".xml"))
+            continue;
+        if (g_str_has_prefix (file, path)) {
+            file += strlen (path);
+            if (*file == '/')
+                file++;
+            /* Ignore sub directories */
+            if (strchr (file, '/'))
+                continue;
+        }
+        if (!i)
+            priv->file_hash_list = g_new0 (guint, i + 2);
+        else
+            priv->file_hash_list = g_renew (guint, priv->file_hash_list, i + 2);
+        priv->file_hash_list[i] = g_str_hash (file);
+        priv->file_hash_list[i + 1] = 0;
+        ++i;
     }
+    g_list_free_full (file_list, (GDestroyNotify)ibus_observed_path_destroy);
+
+    if (fill_stat)
+        ibus_observed_path_fill_stat (op);
 
     return op;
 }
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index 43990d5f5..3386a5d14 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2015-2019 Red Hat, Inc.
+ * Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2020 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
@@ -29,7 +29,7 @@
 #include "ibusregistry.h"
 
 #define IBUS_CACHE_MAGIC 0x49425553 /* "IBUS" */
-#define IBUS_CACHE_VERSION 0x00010512
+#define IBUS_CACHE_VERSION 0x00010522
 
 enum {
     CHANGED,

From 568d58dfadefa801b96058c1155daecff3d51605 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 22:07:31 +0900
Subject: [PATCH 646/816] engine: Add layout_variant in gensimple.py

Missed to handle layout_variant and also add latam layouts to denylist

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/denylist.txt | 1 +
 engine/gensimple.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/engine/denylist.txt b/engine/denylist.txt
index e4cd04735..9cbc7fc38 100644
--- a/engine/denylist.txt
+++ b/engine/denylist.txt
@@ -24,4 +24,5 @@
 # Asterisk(*) character can be used to match any engines.
 # E.g. xkb:cn:*:* excludes xkb:cn::zho and xkb:cn:mon_trad:mvf
 xkb:cn:*:*
+xkb:latam:*:*
 xkb:nec_vndr/jp:*:*
diff --git a/engine/gensimple.py b/engine/gensimple.py
index dc4ccf126..18f7dc8cd 100755
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -180,6 +180,11 @@ def save(self):
             self.__downstream.startElement('layout', AttributesImpl({}))
             self.__downstream.characters(self.__layout)
             self.__downstream.endElement('layout')
+            if self.__variant != '':
+                self.__downstream.startElement('layout_variant',
+                                               AttributesImpl({}))
+                self.__downstream.characters(self.__variant)
+                self.__downstream.endElement('layout_variant')
             self.__downstream.startElement('longname', AttributesImpl({}))
             self.__downstream.characters(self.__description)
             self.__downstream.endElement('longname')

From 6ed34f3bbe978ab174b58cfdfe36a83870ed136a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 21 Aug 2020 22:12:42 +0900
Subject: [PATCH 647/816] engine: Update simple.xml with layout_variant

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/simple.xml | 804 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 727 insertions(+), 77 deletions(-)

diff --git a/engine/simple.xml b/engine/simple.xml
index fdce1b52d..0f2e79ae8 100644
--- a/engine/simple.xml
+++ b/engine/simple.xml
@@ -26,6 +26,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>chr</layout_variant>
             <longname>Cherokee</longname>
             <description>Cherokee</description>
             <icon>ibus-keyboard</icon>
@@ -37,6 +38,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>euro</layout_variant>
             <longname>English (US, euro on 5)</longname>
             <description>English (US, euro on 5)</description>
             <icon>ibus-keyboard</icon>
@@ -48,6 +50,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>intl</layout_variant>
             <longname>English (US, intl., with dead keys)</longname>
             <description>English (US, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -59,6 +62,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>alt-intl</layout_variant>
             <longname>English (US, alt. intl.)</longname>
             <description>English (US, alt. intl.)</description>
             <icon>ibus-keyboard</icon>
@@ -70,6 +74,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>English (Colemak)</longname>
             <description>English (Colemak)</description>
             <icon>ibus-keyboard</icon>
@@ -81,6 +86,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>English (Dvorak)</longname>
             <description>English (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -92,6 +98,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak-intl</layout_variant>
             <longname>English (Dvorak, intl., with dead keys)</longname>
             <description>English (Dvorak, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -103,6 +110,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak-alt-intl</layout_variant>
             <longname>English (Dvorak, alt. intl.)</longname>
             <description>English (Dvorak, alt. intl.)</description>
             <icon>ibus-keyboard</icon>
@@ -114,6 +122,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak-l</layout_variant>
             <longname>English (Dvorak, left-handed)</longname>
             <description>English (Dvorak, left-handed)</description>
             <icon>ibus-keyboard</icon>
@@ -125,6 +134,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak-r</layout_variant>
             <longname>English (Dvorak, right-handed)</longname>
             <description>English (Dvorak, right-handed)</description>
             <icon>ibus-keyboard</icon>
@@ -136,6 +146,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvorak-classic</layout_variant>
             <longname>English (classic Dvorak)</longname>
             <description>English (classic Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -147,6 +158,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>dvp</layout_variant>
             <longname>English (programmer Dvorak)</longname>
             <description>English (programmer Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -158,6 +170,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>rus</layout_variant>
             <longname>Russian (US, phonetic)</longname>
             <description>Russian (US, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -169,6 +182,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>mac</layout_variant>
             <longname>English (Macintosh)</longname>
             <description>English (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -180,6 +194,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
             <longname>English (intl., with AltGr dead keys)</longname>
             <description>English (intl., with AltGr dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -191,6 +206,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
             <longname>English (intl., with AltGr dead keys)</longname>
             <description>English (intl., with AltGr dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -202,6 +218,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
             <longname>English (intl., with AltGr dead keys)</longname>
             <description>English (intl., with AltGr dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -213,6 +230,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
             <longname>English (the divide/multiply keys toggle the layout)</longname>
             <description>English (the divide/multiply keys toggle the layout)</description>
             <icon>ibus-keyboard</icon>
@@ -224,6 +242,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
             <longname>English (the divide/multiply keys toggle the layout)</longname>
             <description>English (the divide/multiply keys toggle the layout)</description>
             <icon>ibus-keyboard</icon>
@@ -235,6 +254,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
             <longname>English (the divide/multiply keys toggle the layout)</longname>
             <description>English (the divide/multiply keys toggle the layout)</description>
             <icon>ibus-keyboard</icon>
@@ -246,6 +266,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
             <longname>Serbo-Croatian (US)</longname>
             <description>Serbo-Croatian (US)</description>
             <icon>ibus-keyboard</icon>
@@ -257,6 +278,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
             <longname>Serbo-Croatian (US)</longname>
             <description>Serbo-Croatian (US)</description>
             <icon>ibus-keyboard</icon>
@@ -268,6 +290,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
             <longname>Serbo-Croatian (US)</longname>
             <description>Serbo-Croatian (US)</description>
             <icon>ibus-keyboard</icon>
@@ -279,6 +302,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
             <longname>Serbo-Croatian (US)</longname>
             <description>Serbo-Croatian (US)</description>
             <icon>ibus-keyboard</icon>
@@ -290,6 +314,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
             <longname>Serbo-Croatian (US)</longname>
             <description>Serbo-Croatian (US)</description>
             <icon>ibus-keyboard</icon>
@@ -301,6 +326,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>norman</layout_variant>
             <longname>English (Norman)</longname>
             <description>English (Norman)</description>
             <icon>ibus-keyboard</icon>
@@ -312,6 +338,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>norman</layout_variant>
             <longname>English (Norman)</longname>
             <description>English (Norman)</description>
             <icon>ibus-keyboard</icon>
@@ -323,6 +350,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>norman</layout_variant>
             <longname>English (Norman)</longname>
             <description>English (Norman)</description>
             <icon>ibus-keyboard</icon>
@@ -334,6 +362,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>norman</layout_variant>
             <longname>English (Norman)</longname>
             <description>English (Norman)</description>
             <icon>ibus-keyboard</icon>
@@ -345,6 +374,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>norman</layout_variant>
             <longname>English (Norman)</longname>
             <description>English (Norman)</description>
             <icon>ibus-keyboard</icon>
@@ -356,6 +386,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman</layout_variant>
             <longname>English (Workman)</longname>
             <description>English (Workman)</description>
             <icon>ibus-keyboard</icon>
@@ -367,6 +398,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman</layout_variant>
             <longname>English (Workman)</longname>
             <description>English (Workman)</description>
             <icon>ibus-keyboard</icon>
@@ -378,6 +410,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman</layout_variant>
             <longname>English (Workman)</longname>
             <description>English (Workman)</description>
             <icon>ibus-keyboard</icon>
@@ -389,6 +422,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman</layout_variant>
             <longname>English (Workman)</longname>
             <description>English (Workman)</description>
             <icon>ibus-keyboard</icon>
@@ -400,6 +434,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman</layout_variant>
             <longname>English (Workman)</longname>
             <description>English (Workman)</description>
             <icon>ibus-keyboard</icon>
@@ -411,6 +446,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
             <longname>English (Workman, intl., with dead keys)</longname>
             <description>English (Workman, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -422,6 +458,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
             <longname>English (Workman, intl., with dead keys)</longname>
             <description>English (Workman, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -433,6 +470,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
             <longname>English (Workman, intl., with dead keys)</longname>
             <description>English (Workman, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -444,6 +482,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
             <longname>English (Workman, intl., with dead keys)</longname>
             <description>English (Workman, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -455,6 +494,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
             <longname>English (Workman, intl., with dead keys)</longname>
             <description>English (Workman, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -466,6 +506,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
+            <layout_variant>ps</layout_variant>
             <longname>Pashto</longname>
             <description>Pashto</description>
             <icon>ibus-keyboard</icon>
@@ -477,6 +518,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
+            <layout_variant>uz</layout_variant>
             <longname>Uzbek (Afghanistan)</longname>
             <description>Uzbek (Afghanistan)</description>
             <icon>ibus-keyboard</icon>
@@ -488,6 +530,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
+            <layout_variant>olpc-ps</layout_variant>
             <longname>Pashto (Afghanistan, OLPC)</longname>
             <description>Pashto (Afghanistan, OLPC)</description>
             <icon>ibus-keyboard</icon>
@@ -499,6 +542,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
+            <layout_variant>fa-olpc</layout_variant>
             <longname>Persian (Afghanistan, Dari OLPC)</longname>
             <description>Persian (Afghanistan, Dari OLPC)</description>
             <icon>ibus-keyboard</icon>
@@ -510,6 +554,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
+            <layout_variant>uz-olpc</layout_variant>
             <longname>Uzbek (Afghanistan, OLPC)</longname>
             <description>Uzbek (Afghanistan, OLPC)</description>
             <icon>ibus-keyboard</icon>
@@ -532,6 +577,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Arabic (AZERTY)</longname>
             <description>Arabic (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -543,6 +589,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>azerty_digits</layout_variant>
             <longname>Arabic (AZERTY/digits)</longname>
             <description>Arabic (AZERTY/digits)</description>
             <icon>ibus-keyboard</icon>
@@ -554,6 +601,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>digits</layout_variant>
             <longname>Arabic (digits)</longname>
             <description>Arabic (digits)</description>
             <icon>ibus-keyboard</icon>
@@ -565,6 +613,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Arabic (QWERTY)</longname>
             <description>Arabic (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -576,6 +625,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>qwerty_digits</layout_variant>
             <longname>Arabic (qwerty/digits)</longname>
             <description>Arabic (qwerty/digits)</description>
             <icon>ibus-keyboard</icon>
@@ -587,6 +637,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>buckwalter</layout_variant>
             <longname>Arabic (Buckwalter)</longname>
             <description>Arabic (Buckwalter)</description>
             <icon>ibus-keyboard</icon>
@@ -598,6 +649,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>olpc</layout_variant>
             <longname>Arabic (OLPC)</longname>
             <description>Arabic (OLPC)</description>
             <icon>ibus-keyboard</icon>
@@ -609,6 +661,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Arabic (Macintosh)</longname>
             <description>Arabic (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -631,6 +684,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>al</layout>
+            <layout_variant>plisi</layout_variant>
             <longname>Albanian (Plisi)</longname>
             <description>Albanian (Plisi)</description>
             <icon>ibus-keyboard</icon>
@@ -642,6 +696,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>al</layout>
+            <layout_variant>veqilharxhi</layout_variant>
             <longname>Albanian (Veqilharxhi)</longname>
             <description>Albanian (Veqilharxhi)</description>
             <icon>ibus-keyboard</icon>
@@ -664,6 +719,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>am</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Armenian (phonetic)</longname>
             <description>Armenian (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -675,6 +731,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>am</layout>
+            <layout_variant>phonetic-alt</layout_variant>
             <longname>Armenian (alt. phonetic)</longname>
             <description>Armenian (alt. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -686,6 +743,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>am</layout>
+            <layout_variant>eastern</layout_variant>
             <longname>Armenian (eastern)</longname>
             <description>Armenian (eastern)</description>
             <icon>ibus-keyboard</icon>
@@ -697,6 +755,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>am</layout>
+            <layout_variant>western</layout_variant>
             <longname>Armenian (western)</longname>
             <description>Armenian (western)</description>
             <icon>ibus-keyboard</icon>
@@ -708,6 +767,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>am</layout>
+            <layout_variant>eastern-alt</layout_variant>
             <longname>Armenian (alt. eastern)</longname>
             <description>Armenian (alt. eastern)</description>
             <icon>ibus-keyboard</icon>
@@ -730,6 +790,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>at</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>German (Austria, no dead keys)</longname>
             <description>German (Austria, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -741,6 +802,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>at</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>German (Austria, with Sun dead keys)</longname>
             <description>German (Austria, with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -752,6 +814,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>at</layout>
+            <layout_variant>mac</layout_variant>
             <longname>German (Austria, Macintosh)</longname>
             <description>German (Austria, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -785,6 +848,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>az</layout>
+            <layout_variant>cyrillic</layout_variant>
             <longname>Azerbaijani (Cyrillic)</longname>
             <description>Azerbaijani (Cyrillic)</description>
             <icon>ibus-keyboard</icon>
@@ -807,6 +871,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>by</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Belarusian (legacy)</longname>
             <description>Belarusian (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -818,6 +883,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>by</layout>
+            <layout_variant>latin</layout_variant>
             <longname>Belarusian (Latin)</longname>
             <description>Belarusian (Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -862,6 +928,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss</layout_variant>
             <longname>Belgian (alt.)</longname>
             <description>Belgian (alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -873,6 +940,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss</layout_variant>
             <longname>Belgian (alt.)</longname>
             <description>Belgian (alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -884,6 +952,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss</layout_variant>
             <longname>Belgian (alt.)</longname>
             <description>Belgian (alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -895,6 +964,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
             <longname>Belgian (alt., Latin-9 only)</longname>
             <description>Belgian (alt., Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
@@ -906,6 +976,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
             <longname>Belgian (alt., Latin-9 only)</longname>
             <description>Belgian (alt., Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
@@ -917,6 +988,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
             <longname>Belgian (alt., Latin-9 only)</longname>
             <description>Belgian (alt., Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
@@ -928,6 +1000,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
             <longname>Belgian (alt., with Sun dead keys)</longname>
             <description>Belgian (alt., with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -939,6 +1012,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
             <longname>Belgian (alt., with Sun dead keys)</longname>
             <description>Belgian (alt., with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -950,6 +1024,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
             <longname>Belgian (alt., with Sun dead keys)</longname>
             <description>Belgian (alt., with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -961,6 +1036,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
             <longname>Belgian (alt. ISO)</longname>
             <description>Belgian (alt. ISO)</description>
             <icon>ibus-keyboard</icon>
@@ -972,6 +1048,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
             <longname>Belgian (alt. ISO)</longname>
             <description>Belgian (alt. ISO)</description>
             <icon>ibus-keyboard</icon>
@@ -983,6 +1060,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
             <longname>Belgian (alt. ISO)</longname>
             <description>Belgian (alt. ISO)</description>
             <icon>ibus-keyboard</icon>
@@ -994,6 +1072,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Belgian (no dead keys)</longname>
             <description>Belgian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1005,6 +1084,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Belgian (no dead keys)</longname>
             <description>Belgian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1016,6 +1096,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Belgian (no dead keys)</longname>
             <description>Belgian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1027,6 +1108,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Belgian (with Sun dead keys)</longname>
             <description>Belgian (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1038,6 +1120,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Belgian (with Sun dead keys)</longname>
             <description>Belgian (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1049,6 +1132,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Belgian (with Sun dead keys)</longname>
             <description>Belgian (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1060,6 +1144,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>wang</layout_variant>
             <longname>Belgian (Wang 724 AZERTY)</longname>
             <description>Belgian (Wang 724 AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1071,6 +1156,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>wang</layout_variant>
             <longname>Belgian (Wang 724 AZERTY)</longname>
             <description>Belgian (Wang 724 AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1082,6 +1168,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
+            <layout_variant>wang</layout_variant>
             <longname>Belgian (Wang 724 AZERTY)</longname>
             <description>Belgian (Wang 724 AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1115,6 +1202,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>bd</layout>
+            <layout_variant>probhat</layout_variant>
             <longname>Bangla (Probhat)</longname>
             <description>Bangla (Probhat)</description>
             <icon>ibus-keyboard</icon>
@@ -1126,6 +1214,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>bd</layout>
+            <layout_variant>probhat</layout_variant>
             <longname>Bangla (Probhat)</longname>
             <description>Bangla (Probhat)</description>
             <icon>ibus-keyboard</icon>
@@ -1137,6 +1226,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben</layout_variant>
             <longname>Bangla (India)</longname>
             <description>Bangla (India)</description>
             <icon>ibus-keyboard</icon>
@@ -1148,6 +1238,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben</layout_variant>
             <longname>Bangla (India)</longname>
             <description>Bangla (India)</description>
             <icon>ibus-keyboard</icon>
@@ -1159,6 +1250,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_probhat</layout_variant>
             <longname>Bangla (India, Probhat)</longname>
             <description>Bangla (India, Probhat)</description>
             <icon>ibus-keyboard</icon>
@@ -1170,6 +1262,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_probhat</layout_variant>
             <longname>Bangla (India, Probhat)</longname>
             <description>Bangla (India, Probhat)</description>
             <icon>ibus-keyboard</icon>
@@ -1181,6 +1274,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_baishakhi</layout_variant>
             <longname>Bangla (India, Baishakhi)</longname>
             <description>Bangla (India, Baishakhi)</description>
             <icon>ibus-keyboard</icon>
@@ -1192,6 +1286,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_baishakhi</layout_variant>
             <longname>Bangla (India, Baishakhi)</longname>
             <description>Bangla (India, Baishakhi)</description>
             <icon>ibus-keyboard</icon>
@@ -1203,6 +1298,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_bornona</layout_variant>
             <longname>Bangla (India, Bornona)</longname>
             <description>Bangla (India, Bornona)</description>
             <icon>ibus-keyboard</icon>
@@ -1214,6 +1310,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_bornona</layout_variant>
             <longname>Bangla (India, Bornona)</longname>
             <description>Bangla (India, Bornona)</description>
             <icon>ibus-keyboard</icon>
@@ -1225,6 +1322,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_gitanjali</layout_variant>
             <longname>Bangla (India, Uni Gitanjali)</longname>
             <description>Bangla (India, Uni Gitanjali)</description>
             <icon>ibus-keyboard</icon>
@@ -1236,6 +1334,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_gitanjali</layout_variant>
             <longname>Bangla (India, Uni Gitanjali)</longname>
             <description>Bangla (India, Uni Gitanjali)</description>
             <icon>ibus-keyboard</icon>
@@ -1247,6 +1346,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_inscript</layout_variant>
             <longname>Bangla (India, Baishakhi Inscript)</longname>
             <description>Bangla (India, Baishakhi Inscript)</description>
             <icon>ibus-keyboard</icon>
@@ -1258,6 +1358,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ben_inscript</layout_variant>
             <longname>Bangla (India, Baishakhi Inscript)</longname>
             <description>Bangla (India, Baishakhi Inscript)</description>
             <icon>ibus-keyboard</icon>
@@ -1269,6 +1370,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>eeyek</layout_variant>
             <longname>Manipuri (Eeyek)</longname>
             <description>Manipuri (Eeyek)</description>
             <icon>ibus-keyboard</icon>
@@ -1280,6 +1382,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>guj</layout_variant>
             <longname>Gujarati</longname>
             <description>Gujarati</description>
             <icon>ibus-keyboard</icon>
@@ -1291,6 +1394,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>guru</layout_variant>
             <longname>Punjabi (Gurmukhi)</longname>
             <description>Punjabi (Gurmukhi)</description>
             <icon>ibus-keyboard</icon>
@@ -1302,6 +1406,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>jhelum</layout_variant>
             <longname>Punjabi (Gurmukhi Jhelum)</longname>
             <description>Punjabi (Gurmukhi Jhelum)</description>
             <icon>ibus-keyboard</icon>
@@ -1313,6 +1418,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>kan</layout_variant>
             <longname>Kannada</longname>
             <description>Kannada</description>
             <icon>ibus-keyboard</icon>
@@ -1324,6 +1430,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>kan-kagapa</layout_variant>
             <longname>Kannada (KaGaPa phonetic)</longname>
             <description>Kannada (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1335,6 +1442,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>mal</layout_variant>
             <longname>Malayalam</longname>
             <description>Malayalam</description>
             <icon>ibus-keyboard</icon>
@@ -1346,6 +1454,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>mal_lalitha</layout_variant>
             <longname>Malayalam (Lalitha)</longname>
             <description>Malayalam (Lalitha)</description>
             <icon>ibus-keyboard</icon>
@@ -1357,6 +1466,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>mal_enhanced</layout_variant>
             <longname>Malayalam (enhanced Inscript, with rupee)</longname>
             <description>Malayalam (enhanced Inscript, with rupee)</description>
             <icon>ibus-keyboard</icon>
@@ -1368,6 +1478,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ori</layout_variant>
             <longname>Oriya</longname>
             <description>Oriya</description>
             <icon>ibus-keyboard</icon>
@@ -1379,6 +1490,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>ori</layout_variant>
             <longname>Oriya</longname>
             <description>Oriya</description>
             <icon>ibus-keyboard</icon>
@@ -1390,6 +1502,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>olck</layout_variant>
             <longname>Ol Chiki</longname>
             <description>Ol Chiki</description>
             <icon>ibus-keyboard</icon>
@@ -1401,6 +1514,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tam_tamilnet</layout_variant>
             <longname>Tamil (TamilNet '99)</longname>
             <description>Tamil (TamilNet '99)</description>
             <icon>ibus-keyboard</icon>
@@ -1412,6 +1526,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tam_tamilnet_with_tam_nums</layout_variant>
             <longname>Tamil (TamilNet '99 with Tamil numerals)</longname>
             <description>Tamil (TamilNet '99 with Tamil numerals)</description>
             <icon>ibus-keyboard</icon>
@@ -1423,6 +1538,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tam_tamilnet_TAB</layout_variant>
             <longname>Tamil (TamilNet '99, TAB encoding)</longname>
             <description>Tamil (TamilNet '99, TAB encoding)</description>
             <icon>ibus-keyboard</icon>
@@ -1434,6 +1550,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tam_tamilnet_TSCII</layout_variant>
             <longname>Tamil (TamilNet '99, TSCII encoding)</longname>
             <description>Tamil (TamilNet '99, TSCII encoding)</description>
             <icon>ibus-keyboard</icon>
@@ -1445,6 +1562,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tam</layout_variant>
             <longname>Tamil (Inscript)</longname>
             <description>Tamil (Inscript)</description>
             <icon>ibus-keyboard</icon>
@@ -1456,6 +1574,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tel</layout_variant>
             <longname>Telugu</longname>
             <description>Telugu</description>
             <icon>ibus-keyboard</icon>
@@ -1467,6 +1586,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tel-kagapa</layout_variant>
             <longname>Telugu (KaGaPa phonetic)</longname>
             <description>Telugu (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1478,6 +1598,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tel-sarala</layout_variant>
             <longname>Telugu (Sarala)</longname>
             <description>Telugu (Sarala)</description>
             <icon>ibus-keyboard</icon>
@@ -1489,6 +1610,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>tel-kagapa</layout_variant>
             <longname>Telugu (KaGaPa phonetic)</longname>
             <description>Telugu (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1500,6 +1622,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>urd-phonetic</layout_variant>
             <longname>Urdu (phonetic)</longname>
             <description>Urdu (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1511,6 +1634,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>urd-phonetic3</layout_variant>
             <longname>Urdu (alt. phonetic)</longname>
             <description>Urdu (alt. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1522,6 +1646,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>urd-winkeys</layout_variant>
             <longname>Urdu (Win keys)</longname>
             <description>Urdu (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1533,6 +1658,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>bolnagri</layout_variant>
             <longname>Hindi (Bolnagri)</longname>
             <description>Hindi (Bolnagri)</description>
             <icon>ibus-keyboard</icon>
@@ -1544,6 +1670,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>hin-wx</layout_variant>
             <longname>Hindi (Wx)</longname>
             <description>Hindi (Wx)</description>
             <icon>ibus-keyboard</icon>
@@ -1555,6 +1682,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>hin-kagapa</layout_variant>
             <longname>Hindi (KaGaPa phonetic)</longname>
             <description>Hindi (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1566,6 +1694,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>san-kagapa</layout_variant>
             <longname>Sanskrit (KaGaPa phonetic)</longname>
             <description>Sanskrit (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1577,6 +1706,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>mar-kagapa</layout_variant>
             <longname>Marathi (KaGaPa phonetic)</longname>
             <description>Marathi (KaGaPa phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1588,6 +1718,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
+            <layout_variant>eng</layout_variant>
             <longname>English (India, with rupee)</longname>
             <description>English (India, with rupee)</description>
             <icon>ibus-keyboard</icon>
@@ -1610,6 +1741,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ba</layout>
+            <layout_variant>alternatequotes</layout_variant>
             <longname>Bosnian (with guillemets)</longname>
             <description>Bosnian (with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -1621,6 +1753,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ba</layout>
+            <layout_variant>unicode</layout_variant>
             <longname>Bosnian (with Bosnian digraphs)</longname>
             <description>Bosnian (with Bosnian digraphs)</description>
             <icon>ibus-keyboard</icon>
@@ -1632,6 +1765,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ba</layout>
+            <layout_variant>unicodeus</layout_variant>
             <longname>Bosnian (US, with Bosnian digraphs)</longname>
             <description>Bosnian (US, with Bosnian digraphs)</description>
             <icon>ibus-keyboard</icon>
@@ -1643,6 +1777,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ba</layout>
+            <layout_variant>us</layout_variant>
             <longname>Bosnian (US, with Bosnian letters)</longname>
             <description>Bosnian (US, with Bosnian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -1665,6 +1800,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Portuguese (Brazil, no dead keys)</longname>
             <description>Portuguese (Brazil, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -1676,6 +1812,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Portuguese (Brazil, Dvorak)</longname>
             <description>Portuguese (Brazil, Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -1687,6 +1824,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>nativo</layout_variant>
             <longname>Portuguese (Brazil, Nativo)</longname>
             <description>Portuguese (Brazil, Nativo)</description>
             <icon>ibus-keyboard</icon>
@@ -1698,6 +1836,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>nativo-us</layout_variant>
             <longname>Portuguese (Brazil, Nativo for US keyboards)</longname>
             <description>Portuguese (Brazil, Nativo for US keyboards)</description>
             <icon>ibus-keyboard</icon>
@@ -1709,6 +1848,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>nativo-epo</layout_variant>
             <longname>Esperanto (Brazil, Nativo)</longname>
             <description>Esperanto (Brazil, Nativo)</description>
             <icon>ibus-keyboard</icon>
@@ -1720,6 +1860,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
+            <layout_variant>thinkpad</layout_variant>
             <longname>Portuguese (Brazil, IBM/Lenovo ThinkPad)</longname>
             <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
             <icon>ibus-keyboard</icon>
@@ -1742,6 +1883,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>bg</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Bulgarian (traditional phonetic)</longname>
             <description>Bulgarian (traditional phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1753,6 +1895,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>bg</layout>
+            <layout_variant>bas_phonetic</layout_variant>
             <longname>Bulgarian (new phonetic)</longname>
             <description>Bulgarian (new phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1764,6 +1907,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
+            <layout_variant>ber</layout_variant>
             <longname>Berber (Algeria, Tifinagh)</longname>
             <description>Berber (Algeria, Tifinagh)</description>
             <icon>ibus-keyboard</icon>
@@ -1775,6 +1919,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
+            <layout_variant>ar</layout_variant>
             <longname>Arabic (Algeria)</longname>
             <description>Arabic (Algeria)</description>
             <icon>ibus-keyboard</icon>
@@ -1786,6 +1931,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>french</layout_variant>
             <longname>French (Morocco)</longname>
             <description>French (Morocco)</description>
             <icon>ibus-keyboard</icon>
@@ -1797,6 +1943,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh</layout_variant>
             <longname>Berber (Morocco, Tifinagh)</longname>
             <description>Berber (Morocco, Tifinagh)</description>
             <icon>ibus-keyboard</icon>
@@ -1808,6 +1955,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh-alt</layout_variant>
             <longname>Berber (Morocco, Tifinagh alt.)</longname>
             <description>Berber (Morocco, Tifinagh alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -1819,6 +1967,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh-alt-phonetic</layout_variant>
             <longname>Berber (Morocco, Tifinagh alt. phonetic)</longname>
             <description>Berber (Morocco, Tifinagh alt. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1830,6 +1979,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh-extended</layout_variant>
             <longname>Berber (Morocco, Tifinagh extended)</longname>
             <description>Berber (Morocco, Tifinagh extended)</description>
             <icon>ibus-keyboard</icon>
@@ -1841,6 +1991,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh-phonetic</layout_variant>
             <longname>Berber (Morocco, Tifinagh phonetic)</longname>
             <description>Berber (Morocco, Tifinagh phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1852,6 +2003,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
+            <layout_variant>tifinagh-extended-phonetic</layout_variant>
             <longname>Berber (Morocco, Tifinagh extended phonetic)</longname>
             <description>Berber (Morocco, Tifinagh extended phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -1874,6 +2026,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>french</layout_variant>
             <longname>French (Cameroon)</longname>
             <description>French (Cameroon)</description>
             <icon>ibus-keyboard</icon>
@@ -1885,6 +2038,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1896,6 +2050,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1907,6 +2062,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1918,6 +2074,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1929,6 +2086,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1940,6 +2098,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1951,6 +2110,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1962,6 +2122,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1973,6 +2134,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1984,6 +2146,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -1995,6 +2158,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2006,6 +2170,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2017,6 +2182,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2028,6 +2194,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2039,6 +2206,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2050,6 +2218,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2061,6 +2230,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2072,6 +2242,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2083,6 +2254,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2094,6 +2266,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2105,6 +2278,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2116,6 +2290,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2127,6 +2302,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2138,6 +2314,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2149,6 +2326,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2160,6 +2338,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2171,6 +2350,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2182,6 +2362,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2193,6 +2374,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Cameroon Multilingual (QWERTY)</longname>
             <description>Cameroon Multilingual (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2204,6 +2386,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2215,6 +2398,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2226,6 +2410,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2237,6 +2422,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2248,6 +2434,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2259,6 +2446,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2270,6 +2458,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2281,6 +2470,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2292,6 +2482,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2303,6 +2494,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2314,6 +2506,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2325,6 +2518,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2336,6 +2530,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2347,6 +2542,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2358,6 +2554,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2369,6 +2566,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2380,6 +2578,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2391,6 +2590,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2402,6 +2602,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2413,6 +2614,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2424,6 +2626,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2435,6 +2638,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2446,6 +2650,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2457,6 +2662,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2468,6 +2674,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2479,6 +2686,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2490,6 +2698,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2501,6 +2710,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2512,6 +2722,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>Cameroon Multilingual (AZERTY)</longname>
             <description>Cameroon Multilingual (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -2523,6 +2734,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2534,6 +2746,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2545,6 +2758,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2556,6 +2770,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2567,6 +2782,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2578,6 +2794,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2589,6 +2806,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2600,6 +2818,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2611,6 +2830,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2622,6 +2842,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2633,6 +2854,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2644,6 +2866,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2655,6 +2878,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2666,6 +2890,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2677,6 +2902,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2688,6 +2914,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2699,6 +2926,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2710,6 +2938,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2721,6 +2950,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2732,6 +2962,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2743,6 +2974,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2754,6 +2986,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2765,6 +2998,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2776,6 +3010,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2787,6 +3022,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2798,6 +3034,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2809,6 +3046,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2820,6 +3058,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2831,6 +3070,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Cameroon Multilingual (Dvorak)</longname>
             <description>Cameroon Multilingual (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -2842,6 +3082,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2853,6 +3094,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2864,6 +3106,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2875,6 +3118,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2886,6 +3130,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2897,6 +3142,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2908,6 +3154,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2919,6 +3166,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2930,6 +3178,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2941,6 +3190,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2952,6 +3202,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2963,6 +3214,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2974,6 +3226,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2985,6 +3238,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -2996,6 +3250,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3007,6 +3262,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3018,6 +3274,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3029,6 +3286,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3040,6 +3298,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3051,6 +3310,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3062,6 +3322,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3073,6 +3334,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3084,6 +3346,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3095,6 +3358,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3106,6 +3370,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3117,6 +3382,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3128,6 +3394,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3139,6 +3406,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3150,6 +3418,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
             <icon>ibus-keyboard</icon>
@@ -3172,6 +3441,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mm</layout>
+            <layout_variant>zawgyi</layout_variant>
             <longname>Burmese Zawgyi</longname>
             <description>Burmese Zawgyi</description>
             <icon>ibus-keyboard</icon>
@@ -3194,6 +3464,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>fr-dvorak</layout_variant>
             <longname>French (Canada, Dvorak)</longname>
             <description>French (Canada, Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -3205,6 +3476,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>fr-legacy</layout_variant>
             <longname>French (Canada, legacy)</longname>
             <description>French (Canada, legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -3216,6 +3488,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>multix</layout_variant>
             <longname>Canadian Multilingual</longname>
             <description>Canadian Multilingual</description>
             <icon>ibus-keyboard</icon>
@@ -3227,6 +3500,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>multi</layout_variant>
             <longname>Canadian Multilingual (1st part)</longname>
             <description>Canadian Multilingual (1st part)</description>
             <icon>ibus-keyboard</icon>
@@ -3238,6 +3512,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>multi-2gr</layout_variant>
             <longname>Canadian Multilingual (2nd part)</longname>
             <description>Canadian Multilingual (2nd part)</description>
             <icon>ibus-keyboard</icon>
@@ -3249,6 +3524,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>ike</layout_variant>
             <longname>Inuktitut</longname>
             <description>Inuktitut</description>
             <icon>ibus-keyboard</icon>
@@ -3260,6 +3536,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
+            <layout_variant>eng</layout_variant>
             <longname>English (Canada)</longname>
             <description>English (Canada)</description>
             <icon>ibus-keyboard</icon>
@@ -3293,6 +3570,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hr</layout>
+            <layout_variant>alternatequotes</layout_variant>
             <longname>Croatian (with guillemets)</longname>
             <description>Croatian (with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -3304,6 +3582,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hr</layout>
+            <layout_variant>unicode</layout_variant>
             <longname>Croatian (with Croatian digraphs)</longname>
             <description>Croatian (with Croatian digraphs)</description>
             <icon>ibus-keyboard</icon>
@@ -3315,6 +3594,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hr</layout>
+            <layout_variant>unicodeus</layout_variant>
             <longname>Croatian (US, with Croatian digraphs)</longname>
             <description>Croatian (US, with Croatian digraphs)</description>
             <icon>ibus-keyboard</icon>
@@ -3326,6 +3606,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hr</layout>
+            <layout_variant>us</layout_variant>
             <longname>Croatian (US, with Croatian letters)</longname>
             <description>Croatian (US, with Croatian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -3348,6 +3629,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>bksl</layout_variant>
             <longname> key)</longname>
             <description> key)</description>
             <icon>ibus-keyboard</icon>
@@ -3359,6 +3641,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Czech (QWERTY)</longname>
             <description>Czech (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -3370,6 +3653,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>qwerty_bksl</layout_variant>
             <longname>Czech (QWERTY, extended backslash)</longname>
             <description>Czech (QWERTY, extended backslash)</description>
             <icon>ibus-keyboard</icon>
@@ -3381,6 +3665,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>qwerty-mac</layout_variant>
             <longname>Czech (QWERTY, Macintosh)</longname>
             <description>Czech (QWERTY, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -3392,6 +3677,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>ucw</layout_variant>
             <longname>Czech (UCW, only accented letters)</longname>
             <description>Czech (UCW, only accented letters)</description>
             <icon>ibus-keyboard</icon>
@@ -3403,6 +3689,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>dvorak-ucw</layout_variant>
             <longname>Czech (US, Dvorak, UCW support)</longname>
             <description>Czech (US, Dvorak, UCW support)</description>
             <icon>ibus-keyboard</icon>
@@ -3414,6 +3701,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cz</layout>
+            <layout_variant>rus</layout_variant>
             <longname>Russian (Czech, phonetic)</longname>
             <description>Russian (Czech, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -3436,6 +3724,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Danish (no dead keys)</longname>
             <description>Danish (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3447,6 +3736,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Danish (Win keys)</longname>
             <description>Danish (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3458,6 +3748,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Danish (Macintosh)</longname>
             <description>Danish (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -3469,6 +3760,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
             <longname>Danish (Macintosh, no dead keys)</longname>
             <description>Danish (Macintosh, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3480,6 +3772,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Danish (Dvorak)</longname>
             <description>Danish (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -3502,6 +3795,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>nl</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Dutch (with Sun dead keys)</longname>
             <description>Dutch (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3513,6 +3807,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>nl</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Dutch (Macintosh)</longname>
             <description>Dutch (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -3524,6 +3819,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>nl</layout>
+            <layout_variant>std</layout_variant>
             <longname>Dutch (standard)</longname>
             <description>Dutch (standard)</description>
             <icon>ibus-keyboard</icon>
@@ -3557,6 +3853,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ee</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Estonian (no dead keys)</longname>
             <description>Estonian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3568,6 +3865,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ee</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Estonian (Dvorak)</longname>
             <description>Estonian (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -3579,6 +3877,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ee</layout>
+            <layout_variant>us</layout_variant>
             <longname>Estonian (US, with Estonian letters)</longname>
             <description>Estonian (US, with Estonian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -3601,6 +3900,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ir</layout>
+            <layout_variant>pes_keypad</layout_variant>
             <longname>Persian (with Persian keypad)</longname>
             <description>Persian (with Persian keypad)</description>
             <icon>ibus-keyboard</icon>
@@ -3612,6 +3912,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ir</layout>
+            <layout_variant>ku</layout_variant>
             <longname>Kurdish (Iran, Latin Q)</longname>
             <description>Kurdish (Iran, Latin Q)</description>
             <icon>ibus-keyboard</icon>
@@ -3623,6 +3924,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ir</layout>
+            <layout_variant>ku_f</layout_variant>
             <longname>Kurdish (Iran, F)</longname>
             <description>Kurdish (Iran, F)</description>
             <icon>ibus-keyboard</icon>
@@ -3634,6 +3936,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ir</layout>
+            <layout_variant>ku_alt</layout_variant>
             <longname>Kurdish (Iran, Latin Alt-Q)</longname>
             <description>Kurdish (Iran, Latin Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -3645,6 +3948,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ir</layout>
+            <layout_variant>ku_ara</layout_variant>
             <longname>Kurdish (Iran, Arabic-Latin)</longname>
             <description>Kurdish (Iran, Arabic-Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -3678,6 +3982,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>iq</layout>
+            <layout_variant>ku</layout_variant>
             <longname>Kurdish (Iraq, Latin Q)</longname>
             <description>Kurdish (Iraq, Latin Q)</description>
             <icon>ibus-keyboard</icon>
@@ -3689,6 +3994,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>iq</layout>
+            <layout_variant>ku_f</layout_variant>
             <longname>Kurdish (Iraq, F)</longname>
             <description>Kurdish (Iraq, F)</description>
             <icon>ibus-keyboard</icon>
@@ -3700,6 +4006,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>iq</layout>
+            <layout_variant>ku_alt</layout_variant>
             <longname>Kurdish (Iraq, Latin Alt-Q)</longname>
             <description>Kurdish (Iraq, Latin Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -3711,6 +4018,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>iq</layout>
+            <layout_variant>ku_ara</layout_variant>
             <longname>Kurdish (Iraq, Arabic-Latin)</longname>
             <description>Kurdish (Iraq, Arabic-Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -3733,6 +4041,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fo</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Faroese (no dead keys)</longname>
             <description>Faroese (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3755,6 +4064,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Finnish (Winkeys)</longname>
             <description>Finnish (Winkeys)</description>
             <icon>ibus-keyboard</icon>
@@ -3766,6 +4076,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
+            <layout_variant>classic</layout_variant>
             <longname>Finnish (classic)</longname>
             <description>Finnish (classic)</description>
             <icon>ibus-keyboard</icon>
@@ -3777,6 +4088,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Finnish (classic, no dead keys)</longname>
             <description>Finnish (classic, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3788,6 +4100,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
+            <layout_variant>smi</layout_variant>
             <longname>Northern Saami (Finland)</longname>
             <description>Northern Saami (Finland)</description>
             <icon>ibus-keyboard</icon>
@@ -3799,6 +4112,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Finnish (Macintosh)</longname>
             <description>Finnish (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -3821,6 +4135,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>French (no dead keys)</longname>
             <description>French (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3832,6 +4147,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>French (with Sun dead keys)</longname>
             <description>French (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3843,6 +4159,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>oss</layout_variant>
             <longname>French (alt.)</longname>
             <description>French (alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -3854,6 +4171,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>oss_latin9</layout_variant>
             <longname>French (alt., Latin-9 only)</longname>
             <description>French (alt., Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
@@ -3865,6 +4183,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>oss_nodeadkeys</layout_variant>
             <longname>French (alt., no dead keys)</longname>
             <description>French (alt., no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3876,6 +4195,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
             <longname>French (alt., with Sun dead keys)</longname>
             <description>French (alt., with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3887,6 +4207,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>latin9</layout_variant>
             <longname>French (legacy, alt.)</longname>
             <description>French (legacy, alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -3898,6 +4219,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>latin9_nodeadkeys</layout_variant>
             <longname>French (legacy, alt., no dead keys)</longname>
             <description>French (legacy, alt., no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3909,6 +4231,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>latin9_sundeadkeys</layout_variant>
             <longname>French (legacy, alt., with Sun dead keys)</longname>
             <description>French (legacy, alt., with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -3920,6 +4243,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>bepo</layout_variant>
             <longname>French (Bepo, ergonomic, Dvorak way)</longname>
             <description>French (Bepo, ergonomic, Dvorak way)</description>
             <icon>ibus-keyboard</icon>
@@ -3931,6 +4255,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>bepo_latin9</layout_variant>
             <longname>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</longname>
             <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
@@ -3942,6 +4267,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>bepo_afnor</layout_variant>
             <longname>French (Bepo, ergonomic, Dvorak way, AFNOR)</longname>
             <description>French (Bepo, ergonomic, Dvorak way, AFNOR)</description>
             <icon>ibus-keyboard</icon>
@@ -3953,6 +4279,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>French (Dvorak)</longname>
             <description>French (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -3964,6 +4291,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>mac</layout_variant>
             <longname>French (Macintosh)</longname>
             <description>French (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -3975,6 +4303,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>azerty</layout_variant>
             <longname>French (AZERTY)</longname>
             <description>French (AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -3986,6 +4315,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>afnor</layout_variant>
             <longname>French (AFNOR standardized AZERTY)</longname>
             <description>French (AFNOR standardized AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -3997,6 +4327,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>bre</layout_variant>
             <longname>French (Breton)</longname>
             <description>French (Breton)</description>
             <icon>ibus-keyboard</icon>
@@ -4008,6 +4339,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>oci</layout_variant>
             <longname>Occitan</longname>
             <description>Occitan</description>
             <icon>ibus-keyboard</icon>
@@ -4019,6 +4351,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>geo</layout_variant>
             <longname>Georgian (France, AZERTY Tskapo)</longname>
             <description>Georgian (France, AZERTY Tskapo)</description>
             <icon>ibus-keyboard</icon>
@@ -4030,6 +4363,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
+            <layout_variant>us</layout_variant>
             <longname>French (US, with French letters)</longname>
             <description>French (US, with French letters)</description>
             <icon>ibus-keyboard</icon>
@@ -4052,6 +4386,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>generic</layout_variant>
             <longname>English (Ghana, multilingual)</longname>
             <description>English (Ghana, multilingual)</description>
             <icon>ibus-keyboard</icon>
@@ -4063,6 +4398,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>akan</layout_variant>
             <longname>Akan</longname>
             <description>Akan</description>
             <icon>ibus-keyboard</icon>
@@ -4074,6 +4410,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>ewe</layout_variant>
             <longname>Ewe</longname>
             <description>Ewe</description>
             <icon>ibus-keyboard</icon>
@@ -4085,6 +4422,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>fula</layout_variant>
             <longname>Fula</longname>
             <description>Fula</description>
             <icon>ibus-keyboard</icon>
@@ -4096,6 +4434,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>ga</layout_variant>
             <longname>Ga</longname>
             <description>Ga</description>
             <icon>ibus-keyboard</icon>
@@ -4107,6 +4446,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>hausa</layout_variant>
             <longname>Hausa (Ghana)</longname>
             <description>Hausa (Ghana)</description>
             <icon>ibus-keyboard</icon>
@@ -4118,6 +4458,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>avn</layout_variant>
             <longname>Avatime</longname>
             <description>Avatime</description>
             <icon>ibus-keyboard</icon>
@@ -4129,6 +4470,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
+            <layout_variant>gillbt</layout_variant>
             <longname>English (Ghana, GILLBT)</longname>
             <description>English (Ghana, GILLBT)</description>
             <icon>ibus-keyboard</icon>
@@ -4162,6 +4504,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ge</layout>
+            <layout_variant>ergonomic</layout_variant>
             <longname>Georgian (ergonomic)</longname>
             <description>Georgian (ergonomic)</description>
             <icon>ibus-keyboard</icon>
@@ -4173,6 +4516,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ge</layout>
+            <layout_variant>mess</layout_variant>
             <longname>Georgian (MESS)</longname>
             <description>Georgian (MESS)</description>
             <icon>ibus-keyboard</icon>
@@ -4184,6 +4528,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ge</layout>
+            <layout_variant>ru</layout_variant>
             <longname>Russian (Georgia)</longname>
             <description>Russian (Georgia)</description>
             <icon>ibus-keyboard</icon>
@@ -4195,6 +4540,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ge</layout>
+            <layout_variant>os</layout_variant>
             <longname>Ossetian (Georgia)</longname>
             <description>Ossetian (Georgia)</description>
             <icon>ibus-keyboard</icon>
@@ -4217,6 +4563,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>deadacute</layout_variant>
             <longname>German (dead acute)</longname>
             <description>German (dead acute)</description>
             <icon>ibus-keyboard</icon>
@@ -4228,6 +4575,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>deadgraveacute</layout_variant>
             <longname>German (dead grave acute)</longname>
             <description>German (dead grave acute)</description>
             <icon>ibus-keyboard</icon>
@@ -4239,6 +4587,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>German (no dead keys)</longname>
             <description>German (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4250,6 +4599,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>T3</layout_variant>
             <longname>German (T3)</longname>
             <description>German (T3)</description>
             <icon>ibus-keyboard</icon>
@@ -4261,6 +4611,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>ro</layout_variant>
             <longname>Romanian (Germany)</longname>
             <description>Romanian (Germany)</description>
             <icon>ibus-keyboard</icon>
@@ -4272,6 +4623,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>ro_nodeadkeys</layout_variant>
             <longname>Romanian (Germany, no dead keys)</longname>
             <description>Romanian (Germany, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4283,6 +4635,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>German (Dvorak)</longname>
             <description>German (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -4294,6 +4647,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>German (with Sun dead keys)</longname>
             <description>German (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4305,6 +4659,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>neo</layout_variant>
             <longname>German (Neo 2)</longname>
             <description>German (Neo 2)</description>
             <icon>ibus-keyboard</icon>
@@ -4316,6 +4671,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>mac</layout_variant>
             <longname>German (Macintosh)</longname>
             <description>German (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -4327,6 +4683,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
             <longname>German (Macintosh, no dead keys)</longname>
             <description>German (Macintosh, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4338,6 +4695,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>dsb</layout_variant>
             <longname>Lower Sorbian</longname>
             <description>Lower Sorbian</description>
             <icon>ibus-keyboard</icon>
@@ -4349,6 +4707,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>dsb_qwertz</layout_variant>
             <longname>Lower Sorbian (QWERTZ)</longname>
             <description>Lower Sorbian (QWERTZ)</description>
             <icon>ibus-keyboard</icon>
@@ -4360,6 +4719,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>German (QWERTY)</longname>
             <description>German (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -4371,6 +4731,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>tr</layout_variant>
             <longname>Turkish (Germany)</longname>
             <description>Turkish (Germany)</description>
             <icon>ibus-keyboard</icon>
@@ -4382,6 +4743,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>ru</layout_variant>
             <longname>Russian (Germany, phonetic)</longname>
             <description>Russian (Germany, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -4393,6 +4755,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
+            <layout_variant>deadtilde</layout_variant>
             <longname>German (dead tilde)</longname>
             <description>German (dead tilde)</description>
             <icon>ibus-keyboard</icon>
@@ -4415,6 +4778,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gr</layout>
+            <layout_variant>simple</layout_variant>
             <longname>Greek (simple)</longname>
             <description>Greek (simple)</description>
             <icon>ibus-keyboard</icon>
@@ -4426,6 +4790,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gr</layout>
+            <layout_variant>extended</layout_variant>
             <longname>Greek (extended)</longname>
             <description>Greek (extended)</description>
             <icon>ibus-keyboard</icon>
@@ -4437,6 +4802,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gr</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Greek (no dead keys)</longname>
             <description>Greek (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4448,6 +4814,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gr</layout>
+            <layout_variant>polytonic</layout_variant>
             <longname>Greek (polytonic)</longname>
             <description>Greek (polytonic)</description>
             <icon>ibus-keyboard</icon>
@@ -4470,6 +4837,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>standard</layout_variant>
             <longname>Hungarian (standard)</longname>
             <description>Hungarian (standard)</description>
             <icon>ibus-keyboard</icon>
@@ -4481,6 +4849,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Hungarian (no dead keys)</longname>
             <description>Hungarian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4492,6 +4861,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Hungarian (QWERTY)</longname>
             <description>Hungarian (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -4503,6 +4873,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwertz_comma_dead</layout_variant>
             <longname>Hungarian (101/QWERTZ/comma/dead keys)</longname>
             <description>Hungarian (101/QWERTZ/comma/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4514,6 +4885,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwertz_comma_nodead</layout_variant>
             <longname>Hungarian (101/QWERTZ/comma/no dead keys)</longname>
             <description>Hungarian (101/QWERTZ/comma/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4525,6 +4897,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwertz_dot_dead</layout_variant>
             <longname>Hungarian (101/QWERTZ/dot/dead keys)</longname>
             <description>Hungarian (101/QWERTZ/dot/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4536,6 +4909,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwertz_dot_nodead</layout_variant>
             <longname>Hungarian (101/QWERTZ/dot/no dead keys)</longname>
             <description>Hungarian (101/QWERTZ/dot/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4547,6 +4921,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwerty_comma_dead</layout_variant>
             <longname>Hungarian (101/QWERTY/comma/dead keys)</longname>
             <description>Hungarian (101/QWERTY/comma/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4558,6 +4933,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwerty_comma_nodead</layout_variant>
             <longname>Hungarian (101/QWERTY/comma/no dead keys)</longname>
             <description>Hungarian (101/QWERTY/comma/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4569,6 +4945,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwerty_dot_dead</layout_variant>
             <longname>Hungarian (101/QWERTY/dot/dead keys)</longname>
             <description>Hungarian (101/QWERTY/dot/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4580,6 +4957,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>101_qwerty_dot_nodead</layout_variant>
             <longname>Hungarian (101/QWERTY/dot/no dead keys)</longname>
             <description>Hungarian (101/QWERTY/dot/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4591,6 +4969,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwertz_comma_dead</layout_variant>
             <longname>Hungarian (102/QWERTZ/comma/dead keys)</longname>
             <description>Hungarian (102/QWERTZ/comma/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4602,6 +4981,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwertz_comma_nodead</layout_variant>
             <longname>Hungarian (102/QWERTZ/comma/no dead keys)</longname>
             <description>Hungarian (102/QWERTZ/comma/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4613,6 +4993,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwertz_dot_dead</layout_variant>
             <longname>Hungarian (102/QWERTZ/dot/dead keys)</longname>
             <description>Hungarian (102/QWERTZ/dot/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4624,6 +5005,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwertz_dot_nodead</layout_variant>
             <longname>Hungarian (102/QWERTZ/dot/no dead keys)</longname>
             <description>Hungarian (102/QWERTZ/dot/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4635,6 +5017,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwerty_comma_dead</layout_variant>
             <longname>Hungarian (102/QWERTY/comma/dead keys)</longname>
             <description>Hungarian (102/QWERTY/comma/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4646,6 +5029,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwerty_comma_nodead</layout_variant>
             <longname>Hungarian (102/QWERTY/comma/no dead keys)</longname>
             <description>Hungarian (102/QWERTY/comma/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4657,6 +5041,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwerty_dot_dead</layout_variant>
             <longname>Hungarian (102/QWERTY/dot/dead keys)</longname>
             <description>Hungarian (102/QWERTY/dot/dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4668,6 +5053,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
+            <layout_variant>102_qwerty_dot_nodead</layout_variant>
             <longname>Hungarian (102/QWERTY/dot/no dead keys)</longname>
             <description>Hungarian (102/QWERTY/dot/no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4690,6 +5076,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
+            <layout_variant>Sundeadkeys</layout_variant>
             <longname>Icelandic (with Sun dead keys)</longname>
             <description>Icelandic (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4701,6 +5088,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Icelandic (no dead keys)</longname>
             <description>Icelandic (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4712,6 +5100,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
+            <layout_variant>mac_legacy</layout_variant>
             <longname>Icelandic (Macintosh, legacy)</longname>
             <description>Icelandic (Macintosh, legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -4723,6 +5112,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Icelandic (Macintosh)</longname>
             <description>Icelandic (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -4734,6 +5124,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Icelandic (Dvorak)</longname>
             <description>Icelandic (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -4756,6 +5147,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>il</layout>
+            <layout_variant>lyx</layout_variant>
             <longname>Hebrew (lyx)</longname>
             <description>Hebrew (lyx)</description>
             <icon>ibus-keyboard</icon>
@@ -4767,6 +5159,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>il</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Hebrew (phonetic)</longname>
             <description>Hebrew (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -4778,6 +5171,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>il</layout>
+            <layout_variant>biblical</layout_variant>
             <longname>Hebrew (Biblical, Tiro)</longname>
             <description>Hebrew (Biblical, Tiro)</description>
             <icon>ibus-keyboard</icon>
@@ -4800,6 +5194,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Italian (no dead keys)</longname>
             <description>Italian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4811,6 +5206,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Italian (Winkeys)</longname>
             <description>Italian (Winkeys)</description>
             <icon>ibus-keyboard</icon>
@@ -4822,6 +5218,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Italian (Macintosh)</longname>
             <description>Italian (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -4833,6 +5230,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>us</layout_variant>
             <longname>Italian (US, with Italian letters)</longname>
             <description>Italian (US, with Italian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -4844,6 +5242,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>geo</layout_variant>
             <longname>Georgian (Italy)</longname>
             <description>Georgian (Italy)</description>
             <icon>ibus-keyboard</icon>
@@ -4855,6 +5254,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>ibm</layout_variant>
             <longname>Italian (IBM 142)</longname>
             <description>Italian (IBM 142)</description>
             <icon>ibus-keyboard</icon>
@@ -4866,6 +5266,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4877,6 +5278,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4888,6 +5290,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4899,6 +5302,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4910,6 +5314,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4921,6 +5326,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4932,6 +5338,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4943,6 +5350,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Italian (intl., with dead keys)</longname>
             <description>Italian (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -4954,6 +5362,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>scn</layout_variant>
             <longname>Sicilian</longname>
             <description>Sicilian</description>
             <icon>ibus-keyboard</icon>
@@ -4965,6 +5374,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>scn</layout_variant>
             <longname>Sicilian</longname>
             <description>Sicilian</description>
             <icon>ibus-keyboard</icon>
@@ -4976,6 +5386,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
+            <layout_variant>fur</layout_variant>
             <longname>Friulian (Italy)</longname>
             <description>Friulian (Italy)</description>
             <icon>ibus-keyboard</icon>
@@ -4998,6 +5409,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>jp</layout>
+            <layout_variant>kana</layout_variant>
             <longname>Japanese (Kana)</longname>
             <description>Japanese (Kana)</description>
             <icon>ibus-keyboard</icon>
@@ -5009,6 +5421,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>jp</layout>
+            <layout_variant>kana86</layout_variant>
             <longname>Japanese (Kana 86)</longname>
             <description>Japanese (Kana 86)</description>
             <icon>ibus-keyboard</icon>
@@ -5020,6 +5433,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>jp</layout>
+            <layout_variant>OADG109A</layout_variant>
             <longname>Japanese (OADG 109A)</longname>
             <description>Japanese (OADG 109A)</description>
             <icon>ibus-keyboard</icon>
@@ -5031,6 +5445,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>jp</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Japanese (Macintosh)</longname>
             <description>Japanese (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -5042,6 +5457,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>jp</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Japanese (Dvorak)</longname>
             <description>Japanese (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5064,6 +5480,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kg</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Kyrgyz (phonetic)</longname>
             <description>Kyrgyz (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -5097,6 +5514,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>ruskaz</layout_variant>
             <longname>Russian (Kazakhstan, with Kazakh)</longname>
             <description>Russian (Kazakhstan, with Kazakh)</description>
             <icon>ibus-keyboard</icon>
@@ -5108,6 +5526,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>ruskaz</layout_variant>
             <longname>Russian (Kazakhstan, with Kazakh)</longname>
             <description>Russian (Kazakhstan, with Kazakh)</description>
             <icon>ibus-keyboard</icon>
@@ -5119,6 +5538,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>kazrus</layout_variant>
             <longname>Kazakh (with Russian)</longname>
             <description>Kazakh (with Russian)</description>
             <icon>ibus-keyboard</icon>
@@ -5130,6 +5550,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>kazrus</layout_variant>
             <longname>Kazakh (with Russian)</longname>
             <description>Kazakh (with Russian)</description>
             <icon>ibus-keyboard</icon>
@@ -5141,6 +5562,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>ext</layout_variant>
             <longname>Kazakh (extended)</longname>
             <description>Kazakh (extended)</description>
             <icon>ibus-keyboard</icon>
@@ -5152,6 +5574,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kz</layout>
+            <layout_variant>latin</layout_variant>
             <longname>Kazakh (Latin)</longname>
             <description>Kazakh (Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -5174,88 +5597,12 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>la</layout>
+            <layout_variant>stea</layout_variant>
             <longname>Lao (STEA proposed standard layout)</longname>
             <description>Lao (STEA proposed standard layout)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:latam::spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American)</longname>
-            <description>Spanish (Latin American)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:nodeadkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, no dead keys)</longname>
-            <description>Spanish (Latin American, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:deadtilde:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, dead tilde)</longname>
-            <description>Spanish (Latin American, dead tilde)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:sundeadkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, with Sun dead keys)</longname>
-            <description>Spanish (Latin American, with Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:dvorak:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, Dvorak)</longname>
-            <description>Spanish (Latin American, Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:colemak:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, Colemak)</longname>
-            <description>Spanish (Latin American, Colemak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:latam:colemak-gaming:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>latam</layout>
-            <longname>Spanish (Latin American, Colemak for gaming)</longname>
-            <description>Spanish (Latin American, Colemak for gaming)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:lt::lit</name>
             <language>lt</language>
@@ -5273,6 +5620,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>std</layout_variant>
             <longname>Lithuanian (standard)</longname>
             <description>Lithuanian (standard)</description>
             <icon>ibus-keyboard</icon>
@@ -5284,6 +5632,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>us</layout_variant>
             <longname>Lithuanian (US, with Lithuanian letters)</longname>
             <description>Lithuanian (US, with Lithuanian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -5295,6 +5644,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>ibm</layout_variant>
             <longname>Lithuanian (IBM LST 1205-92)</longname>
             <description>Lithuanian (IBM LST 1205-92)</description>
             <icon>ibus-keyboard</icon>
@@ -5306,6 +5656,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>lekp</layout_variant>
             <longname>Lithuanian (LEKP)</longname>
             <description>Lithuanian (LEKP)</description>
             <icon>ibus-keyboard</icon>
@@ -5317,6 +5668,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>lekpa</layout_variant>
             <longname>Lithuanian (LEKPa)</longname>
             <description>Lithuanian (LEKPa)</description>
             <icon>ibus-keyboard</icon>
@@ -5328,6 +5680,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
+            <layout_variant>sgs</layout_variant>
             <longname>Samogitian</longname>
             <description>Samogitian</description>
             <icon>ibus-keyboard</icon>
@@ -5350,6 +5703,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>apostrophe</layout_variant>
             <longname>Latvian (apostrophe)</longname>
             <description>Latvian (apostrophe)</description>
             <icon>ibus-keyboard</icon>
@@ -5361,6 +5715,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>tilde</layout_variant>
             <longname>Latvian (tilde)</longname>
             <description>Latvian (tilde)</description>
             <icon>ibus-keyboard</icon>
@@ -5372,6 +5727,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>fkey</layout_variant>
             <longname>Latvian (F)</longname>
             <description>Latvian (F)</description>
             <icon>ibus-keyboard</icon>
@@ -5383,6 +5739,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>modern</layout_variant>
             <longname>Latvian (modern)</longname>
             <description>Latvian (modern)</description>
             <icon>ibus-keyboard</icon>
@@ -5394,6 +5751,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>ergonomic</layout_variant>
             <longname>Latvian (ergonomic, ŪGJRMV)</longname>
             <description>Latvian (ergonomic, ŪGJRMV)</description>
             <icon>ibus-keyboard</icon>
@@ -5405,6 +5763,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lv</layout>
+            <layout_variant>adapted</layout_variant>
             <longname>Latvian (adapted)</longname>
             <description>Latvian (adapted)</description>
             <icon>ibus-keyboard</icon>
@@ -5438,6 +5797,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>cyrillic</layout_variant>
             <longname>Montenegrin (Cyrillic)</longname>
             <description>Montenegrin (Cyrillic)</description>
             <icon>ibus-keyboard</icon>
@@ -5449,6 +5809,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>cyrillicyz</layout_variant>
             <longname>Montenegrin (Cyrillic, ZE and ZHE swapped)</longname>
             <description>Montenegrin (Cyrillic, ZE and ZHE swapped)</description>
             <icon>ibus-keyboard</icon>
@@ -5460,6 +5821,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>latinunicode</layout_variant>
             <longname>Montenegrin (Latin, Unicode)</longname>
             <description>Montenegrin (Latin, Unicode)</description>
             <icon>ibus-keyboard</icon>
@@ -5471,6 +5833,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>latinyz</layout_variant>
             <longname>Montenegrin (Latin, QWERTY)</longname>
             <description>Montenegrin (Latin, QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -5482,6 +5845,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>latinunicodeyz</layout_variant>
             <longname>Montenegrin (Latin, Unicode, QWERTY)</longname>
             <description>Montenegrin (Latin, Unicode, QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -5493,6 +5857,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>cyrillicalternatequotes</layout_variant>
             <longname>Montenegrin (Cyrillic with guillemets)</longname>
             <description>Montenegrin (Cyrillic with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -5504,6 +5869,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
+            <layout_variant>latinalternatequotes</layout_variant>
             <longname>Montenegrin (Latin with guillemets)</longname>
             <description>Montenegrin (Latin with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -5526,6 +5892,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mk</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Macedonian (no dead keys)</longname>
             <description>Macedonian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5548,6 +5915,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
+            <layout_variant>us</layout_variant>
             <longname>Maltese (with US layout)</longname>
             <description>Maltese (with US layout)</description>
             <icon>ibus-keyboard</icon>
@@ -5559,6 +5927,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
+            <layout_variant>alt-us</layout_variant>
             <longname>Maltese (US layout with AltGr overrides)</longname>
             <description>Maltese (US layout with AltGr overrides)</description>
             <icon>ibus-keyboard</icon>
@@ -5570,6 +5939,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
+            <layout_variant>alt-gb</layout_variant>
             <longname>Maltese (UK layout with AltGr overrides)</longname>
             <description>Maltese (UK layout with AltGr overrides)</description>
             <icon>ibus-keyboard</icon>
@@ -5625,6 +5995,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Norwegian (no dead keys)</longname>
             <description>Norwegian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5636,6 +6007,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Norwegian (no dead keys)</longname>
             <description>Norwegian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5647,6 +6019,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Norwegian (no dead keys)</longname>
             <description>Norwegian (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5658,6 +6031,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Norwegian (Win keys)</longname>
             <description>Norwegian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5669,6 +6043,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Norwegian (Win keys)</longname>
             <description>Norwegian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5680,6 +6055,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Norwegian (Win keys)</longname>
             <description>Norwegian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5691,6 +6067,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Norwegian (Dvorak)</longname>
             <description>Norwegian (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5702,6 +6079,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Norwegian (Dvorak)</longname>
             <description>Norwegian (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5713,6 +6091,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Norwegian (Dvorak)</longname>
             <description>Norwegian (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5724,6 +6103,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>smi</layout_variant>
             <longname>Northern Saami (Norway)</longname>
             <description>Northern Saami (Norway)</description>
             <icon>ibus-keyboard</icon>
@@ -5735,6 +6115,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>smi_nodeadkeys</layout_variant>
             <longname>Northern Saami (Norway, no dead keys)</longname>
             <description>Northern Saami (Norway, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5746,6 +6127,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Norwegian (Macintosh)</longname>
             <description>Norwegian (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -5757,6 +6139,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
             <longname>Norwegian (Macintosh, no dead keys)</longname>
             <description>Norwegian (Macintosh, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5768,6 +6151,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Norwegian (Colemak)</longname>
             <description>Norwegian (Colemak)</description>
             <icon>ibus-keyboard</icon>
@@ -5790,6 +6174,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Polish (legacy)</longname>
             <description>Polish (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -5801,6 +6186,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>qwertz</layout_variant>
             <longname>Polish (QWERTZ)</longname>
             <description>Polish (QWERTZ)</description>
             <icon>ibus-keyboard</icon>
@@ -5812,6 +6198,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Polish (Dvorak)</longname>
             <description>Polish (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5823,6 +6210,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>dvorak_quotes</layout_variant>
             <longname>Polish (Dvorak, with Polish quotes on quotemark key)</longname>
             <description>Polish (Dvorak, with Polish quotes on quotemark key)</description>
             <icon>ibus-keyboard</icon>
@@ -5834,6 +6222,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>dvorak_altquotes</layout_variant>
             <longname>Polish (Dvorak, with Polish quotes on key 1)</longname>
             <description>Polish (Dvorak, with Polish quotes on key 1)</description>
             <icon>ibus-keyboard</icon>
@@ -5845,6 +6234,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>csb</layout_variant>
             <longname>Kashubian</longname>
             <description>Kashubian</description>
             <icon>ibus-keyboard</icon>
@@ -5856,6 +6246,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>szl</layout_variant>
             <longname>Silesian</longname>
             <description>Silesian</description>
             <icon>ibus-keyboard</icon>
@@ -5867,6 +6258,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>ru_phonetic_dvorak</layout_variant>
             <longname>Russian (Poland, phonetic Dvorak)</longname>
             <description>Russian (Poland, phonetic Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5878,6 +6270,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
+            <layout_variant>dvp</layout_variant>
             <longname>Polish (programmer Dvorak)</longname>
             <description>Polish (programmer Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -5900,6 +6293,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Portuguese (no dead keys)</longname>
             <description>Portuguese (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5911,6 +6305,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Portuguese (with Sun dead keys)</longname>
             <description>Portuguese (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5922,6 +6317,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Portuguese (Macintosh)</longname>
             <description>Portuguese (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -5933,6 +6329,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
             <longname>Portuguese (Macintosh, no dead keys)</longname>
             <description>Portuguese (Macintosh, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5944,6 +6341,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>mac_sundeadkeys</layout_variant>
             <longname>Portuguese (Macintosh, with Sun dead keys)</longname>
             <description>Portuguese (Macintosh, with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -5955,6 +6353,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>nativo</layout_variant>
             <longname>Portuguese (Nativo)</longname>
             <description>Portuguese (Nativo)</description>
             <icon>ibus-keyboard</icon>
@@ -5966,6 +6365,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>nativo-us</layout_variant>
             <longname>Portuguese (Nativo for US keyboards)</longname>
             <description>Portuguese (Nativo for US keyboards)</description>
             <icon>ibus-keyboard</icon>
@@ -5977,6 +6377,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
+            <layout_variant>nativo-epo</layout_variant>
             <longname>Esperanto (Portugal, Nativo)</longname>
             <description>Esperanto (Portugal, Nativo)</description>
             <icon>ibus-keyboard</icon>
@@ -5999,6 +6400,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ro</layout>
+            <layout_variant>cedilla</layout_variant>
             <longname>Romanian (cedilla)</longname>
             <description>Romanian (cedilla)</description>
             <icon>ibus-keyboard</icon>
@@ -6010,6 +6412,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ro</layout>
+            <layout_variant>std</layout_variant>
             <longname>Romanian (standard)</longname>
             <description>Romanian (standard)</description>
             <icon>ibus-keyboard</icon>
@@ -6021,6 +6424,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ro</layout>
+            <layout_variant>std_cedilla</layout_variant>
             <longname>Romanian (standard cedilla)</longname>
             <description>Romanian (standard cedilla)</description>
             <icon>ibus-keyboard</icon>
@@ -6032,6 +6436,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ro</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Romanian (Win keys)</longname>
             <description>Romanian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6054,6 +6459,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Russian (phonetic)</longname>
             <description>Russian (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -6065,6 +6471,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic_winkeys</layout_variant>
             <longname>Russian (phonetic, with Win keys)</longname>
             <description>Russian (phonetic, with Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6076,6 +6483,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic_yazherty</layout_variant>
             <longname>Russian (phonetic yazherty)</longname>
             <description>Russian (phonetic yazherty)</description>
             <icon>ibus-keyboard</icon>
@@ -6087,6 +6495,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>typewriter</layout_variant>
             <longname>Russian (typewriter)</longname>
             <description>Russian (typewriter)</description>
             <icon>ibus-keyboard</icon>
@@ -6098,6 +6507,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Russian (legacy)</longname>
             <description>Russian (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6109,6 +6519,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>typewriter-legacy</layout_variant>
             <longname>Russian (typewriter, legacy)</longname>
             <description>Russian (typewriter, legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6120,6 +6531,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>tt</layout_variant>
             <longname>Tatar</longname>
             <description>Tatar</description>
             <icon>ibus-keyboard</icon>
@@ -6131,6 +6543,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>os_legacy</layout_variant>
             <longname>Ossetian (legacy)</longname>
             <description>Ossetian (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6142,6 +6555,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>os_winkeys</layout_variant>
             <longname>Ossetian (Win keys)</longname>
             <description>Ossetian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6153,6 +6567,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>cv</layout_variant>
             <longname>Chuvash</longname>
             <description>Chuvash</description>
             <icon>ibus-keyboard</icon>
@@ -6164,6 +6579,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>cv_latin</layout_variant>
             <longname>Chuvash (Latin)</longname>
             <description>Chuvash (Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -6175,6 +6591,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>udm</layout_variant>
             <longname>Udmurt</longname>
             <description>Udmurt</description>
             <icon>ibus-keyboard</icon>
@@ -6186,6 +6603,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>kom</layout_variant>
             <longname>Komi</longname>
             <description>Komi</description>
             <icon>ibus-keyboard</icon>
@@ -6197,6 +6615,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>sah</layout_variant>
             <longname>Yakut</longname>
             <description>Yakut</description>
             <icon>ibus-keyboard</icon>
@@ -6208,6 +6627,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>xal</layout_variant>
             <longname>Kalmyk</longname>
             <description>Kalmyk</description>
             <icon>ibus-keyboard</icon>
@@ -6219,6 +6639,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>dos</layout_variant>
             <longname>Russian (DOS)</longname>
             <description>Russian (DOS)</description>
             <icon>ibus-keyboard</icon>
@@ -6230,6 +6651,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Russian (Macintosh)</longname>
             <description>Russian (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -6241,6 +6663,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>srp</layout_variant>
             <longname>Serbian (Russia)</longname>
             <description>Serbian (Russia)</description>
             <icon>ibus-keyboard</icon>
@@ -6252,6 +6675,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>srp</layout_variant>
             <longname>Serbian (Russia)</longname>
             <description>Serbian (Russia)</description>
             <icon>ibus-keyboard</icon>
@@ -6263,6 +6687,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>bak</layout_variant>
             <longname>Bashkirian</longname>
             <description>Bashkirian</description>
             <icon>ibus-keyboard</icon>
@@ -6274,6 +6699,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>chm</layout_variant>
             <longname>Mari</longname>
             <description>Mari</description>
             <icon>ibus-keyboard</icon>
@@ -6285,6 +6711,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic_azerty</layout_variant>
             <longname>Russian (phonetic, AZERTY)</longname>
             <description>Russian (phonetic, AZERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -6296,6 +6723,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic_dvorak</layout_variant>
             <longname>Russian (phonetic, Dvorak)</longname>
             <description>Russian (phonetic, Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -6307,6 +6735,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
+            <layout_variant>phonetic_fr</layout_variant>
             <longname>Russian (phonetic, French)</longname>
             <description>Russian (phonetic, French)</description>
             <icon>ibus-keyboard</icon>
@@ -6329,6 +6758,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>yz</layout_variant>
             <longname>Serbian (Cyrillic, ZE and ZHE swapped)</longname>
             <description>Serbian (Cyrillic, ZE and ZHE swapped)</description>
             <icon>ibus-keyboard</icon>
@@ -6340,6 +6770,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>latin</layout_variant>
             <longname>Serbian (Latin)</longname>
             <description>Serbian (Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -6351,6 +6782,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>latinunicode</layout_variant>
             <longname>Serbian (Latin, Unicode)</longname>
             <description>Serbian (Latin, Unicode)</description>
             <icon>ibus-keyboard</icon>
@@ -6362,6 +6794,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>latinyz</layout_variant>
             <longname>Serbian (Latin, QWERTY)</longname>
             <description>Serbian (Latin, QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -6373,6 +6806,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>latinunicodeyz</layout_variant>
             <longname>Serbian (Latin, Unicode, QWERTY)</longname>
             <description>Serbian (Latin, Unicode, QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -6384,6 +6818,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>alternatequotes</layout_variant>
             <longname>Serbian (Cyrillic with guillemets)</longname>
             <description>Serbian (Cyrillic with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -6395,6 +6830,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>latinalternatequotes</layout_variant>
             <longname>Serbian (Latin with guillemets)</longname>
             <description>Serbian (Latin with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -6406,6 +6842,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
+            <layout_variant>rue</layout_variant>
             <longname>Pannonian Rusyn</longname>
             <description>Pannonian Rusyn</description>
             <icon>ibus-keyboard</icon>
@@ -6428,6 +6865,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>si</layout>
+            <layout_variant>alternatequotes</layout_variant>
             <longname>Slovenian (with guillemets)</longname>
             <description>Slovenian (with guillemets)</description>
             <icon>ibus-keyboard</icon>
@@ -6439,6 +6877,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>si</layout>
+            <layout_variant>us</layout_variant>
             <longname>Slovenian (US, with Slovenian letters)</longname>
             <description>Slovenian (US, with Slovenian letters)</description>
             <icon>ibus-keyboard</icon>
@@ -6461,6 +6900,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sk</layout>
+            <layout_variant>bksl</layout_variant>
             <longname>Slovak (extended backslash)</longname>
             <description>Slovak (extended backslash)</description>
             <icon>ibus-keyboard</icon>
@@ -6472,6 +6912,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sk</layout>
+            <layout_variant>qwerty</layout_variant>
             <longname>Slovak (QWERTY)</longname>
             <description>Slovak (QWERTY)</description>
             <icon>ibus-keyboard</icon>
@@ -6483,6 +6924,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sk</layout>
+            <layout_variant>qwerty_bksl</layout_variant>
             <longname>Slovak (QWERTY, extended backslash)</longname>
             <description>Slovak (QWERTY, extended backslash)</description>
             <icon>ibus-keyboard</icon>
@@ -6505,6 +6947,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Spanish (no dead keys)</longname>
             <description>Spanish (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6516,6 +6959,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Spanish (Win keys)</longname>
             <description>Spanish (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6527,6 +6971,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>deadtilde</layout_variant>
             <longname>Spanish (dead tilde)</longname>
             <description>Spanish (dead tilde)</description>
             <icon>ibus-keyboard</icon>
@@ -6538,6 +6983,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Spanish (with Sun dead keys)</longname>
             <description>Spanish (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6549,6 +6995,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Spanish (Dvorak)</longname>
             <description>Spanish (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -6560,6 +7007,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>ast</layout_variant>
             <longname>Asturian (Spain, with bottom-dot H and bottom-dot L)</longname>
             <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description>
             <icon>ibus-keyboard</icon>
@@ -6571,6 +7019,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>cat</layout_variant>
             <longname>Catalan (Spain, with middle-dot L)</longname>
             <description>Catalan (Spain, with middle-dot L)</description>
             <icon>ibus-keyboard</icon>
@@ -6582,6 +7031,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Spanish (Macintosh)</longname>
             <description>Spanish (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -6604,6 +7054,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>nodeadkeys</layout_variant>
             <longname>Swedish (no dead keys)</longname>
             <description>Swedish (no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6615,6 +7066,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Swedish (Dvorak)</longname>
             <description>Swedish (Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -6626,6 +7078,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>rus</layout_variant>
             <longname>Russian (Sweden, phonetic)</longname>
             <description>Russian (Sweden, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -6637,6 +7090,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>rus_nodeadkeys</layout_variant>
             <longname>Russian (Sweden, phonetic, no dead keys)</longname>
             <description>Russian (Sweden, phonetic, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6648,6 +7102,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>smi</layout_variant>
             <longname>Northern Saami (Sweden)</longname>
             <description>Northern Saami (Sweden)</description>
             <icon>ibus-keyboard</icon>
@@ -6659,6 +7114,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>mac</layout_variant>
             <longname>Swedish (Macintosh)</longname>
             <description>Swedish (Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -6670,6 +7126,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>svdvorak</layout_variant>
             <longname>Swedish (Svdvorak)</longname>
             <description>Swedish (Svdvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -6681,6 +7138,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>us_dvorak</layout_variant>
             <longname>Swedish (based on US Intl. Dvorak)</longname>
             <description>Swedish (based on US Intl. Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -6692,6 +7150,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>us</layout_variant>
             <longname>Swedish (US, with Swedish letters)</longname>
             <description>Swedish (US, with Swedish letters)</description>
             <icon>ibus-keyboard</icon>
@@ -6703,6 +7162,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
+            <layout_variant>swl</layout_variant>
             <longname>Swedish Sign Language</longname>
             <description>Swedish Sign Language</description>
             <icon>ibus-keyboard</icon>
@@ -6736,6 +7196,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>German (Switzerland, legacy)</longname>
             <description>German (Switzerland, legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6747,6 +7208,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>German (Switzerland, legacy)</longname>
             <description>German (Switzerland, legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6758,6 +7220,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>de_nodeadkeys</layout_variant>
             <longname>German (Switzerland, no dead keys)</longname>
             <description>German (Switzerland, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6769,6 +7232,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>de_nodeadkeys</layout_variant>
             <longname>German (Switzerland, no dead keys)</longname>
             <description>German (Switzerland, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6780,6 +7244,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>de_sundeadkeys</layout_variant>
             <longname>German (Switzerland, with Sun dead keys)</longname>
             <description>German (Switzerland, with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6791,6 +7256,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>de_sundeadkeys</layout_variant>
             <longname>German (Switzerland, with Sun dead keys)</longname>
             <description>German (Switzerland, with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6802,6 +7268,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>fr</layout_variant>
             <longname>French (Switzerland)</longname>
             <description>French (Switzerland)</description>
             <icon>ibus-keyboard</icon>
@@ -6813,6 +7280,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>fr_nodeadkeys</layout_variant>
             <longname>French (Switzerland, no dead keys)</longname>
             <description>French (Switzerland, no dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6824,6 +7292,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>fr_sundeadkeys</layout_variant>
             <longname>French (Switzerland, with Sun dead keys)</longname>
             <description>French (Switzerland, with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -6835,6 +7304,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>fr_mac</layout_variant>
             <longname>French (Switzerland, Macintosh)</longname>
             <description>French (Switzerland, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -6846,6 +7316,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
+            <layout_variant>de_mac</layout_variant>
             <longname>German (Switzerland, Macintosh)</longname>
             <description>German (Switzerland, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -6868,6 +7339,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sy</layout>
+            <layout_variant>syc</layout_variant>
             <longname>Syriac</longname>
             <description>Syriac</description>
             <icon>ibus-keyboard</icon>
@@ -6879,6 +7351,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sy</layout>
+            <layout_variant>syc_phonetic</layout_variant>
             <longname>Syriac (phonetic)</longname>
             <description>Syriac (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -6890,6 +7363,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sy</layout>
+            <layout_variant>ku</layout_variant>
             <longname>Kurdish (Syria, Latin Q)</longname>
             <description>Kurdish (Syria, Latin Q)</description>
             <icon>ibus-keyboard</icon>
@@ -6901,6 +7375,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sy</layout>
+            <layout_variant>ku_f</layout_variant>
             <longname>Kurdish (Syria, F)</longname>
             <description>Kurdish (Syria, F)</description>
             <icon>ibus-keyboard</icon>
@@ -6912,6 +7387,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>sy</layout>
+            <layout_variant>ku_alt</layout_variant>
             <longname>Kurdish (Syria, Latin Alt-Q)</longname>
             <description>Kurdish (Syria, Latin Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -6934,6 +7410,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tj</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Tajik (legacy)</longname>
             <description>Tajik (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -6956,6 +7433,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lk</layout>
+            <layout_variant>tam_unicode</layout_variant>
             <longname>Tamil (Sri Lanka, TamilNet '99)</longname>
             <description>Tamil (Sri Lanka, TamilNet '99)</description>
             <icon>ibus-keyboard</icon>
@@ -6967,6 +7445,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lk</layout>
+            <layout_variant>tam_TAB</layout_variant>
             <longname>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</longname>
             <description>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</description>
             <icon>ibus-keyboard</icon>
@@ -6978,6 +7457,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lk</layout>
+            <layout_variant>us</layout_variant>
             <longname>Sinhala (US, with Sinhala letters)</longname>
             <description>Sinhala (US, with Sinhala letters)</description>
             <icon>ibus-keyboard</icon>
@@ -7000,6 +7480,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>th</layout>
+            <layout_variant>tis</layout_variant>
             <longname>Thai (TIS-820.2538)</longname>
             <description>Thai (TIS-820.2538)</description>
             <icon>ibus-keyboard</icon>
@@ -7011,6 +7492,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>th</layout>
+            <layout_variant>pat</layout_variant>
             <longname>Thai (Pattachote)</longname>
             <description>Thai (Pattachote)</description>
             <icon>ibus-keyboard</icon>
@@ -7033,6 +7515,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>f</layout_variant>
             <longname>Turkish (F)</longname>
             <description>Turkish (F)</description>
             <icon>ibus-keyboard</icon>
@@ -7044,6 +7527,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>alt</layout_variant>
             <longname>Turkish (Alt-Q)</longname>
             <description>Turkish (Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7055,6 +7539,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>sundeadkeys</layout_variant>
             <longname>Turkish (with Sun dead keys)</longname>
             <description>Turkish (with Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -7066,6 +7551,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>ku</layout_variant>
             <longname>Kurdish (Turkey, Latin Q)</longname>
             <description>Kurdish (Turkey, Latin Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7077,6 +7563,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>ku_f</layout_variant>
             <longname>Kurdish (Turkey, F)</longname>
             <description>Kurdish (Turkey, F)</description>
             <icon>ibus-keyboard</icon>
@@ -7088,6 +7575,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>ku_alt</layout_variant>
             <longname>Kurdish (Turkey, Latin Alt-Q)</longname>
             <description>Kurdish (Turkey, Latin Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7099,6 +7587,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>intl</layout_variant>
             <longname>Turkish (intl., with dead keys)</longname>
             <description>Turkish (intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -7110,6 +7599,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>crh</layout_variant>
             <longname>Crimean Tatar (Turkish Q)</longname>
             <description>Crimean Tatar (Turkish Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7121,6 +7611,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>crh_f</layout_variant>
             <longname>Crimean Tatar (Turkish F)</longname>
             <description>Crimean Tatar (Turkish F)</description>
             <icon>ibus-keyboard</icon>
@@ -7132,6 +7623,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
+            <layout_variant>crh_alt</layout_variant>
             <longname>Crimean Tatar (Turkish Alt-Q)</longname>
             <description>Crimean Tatar (Turkish Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7154,6 +7646,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7165,6 +7658,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7176,6 +7670,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7187,6 +7682,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7198,6 +7694,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7209,6 +7706,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7220,6 +7718,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7231,6 +7730,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7242,6 +7742,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7253,6 +7754,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7264,6 +7766,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7275,6 +7778,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7286,6 +7790,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7297,6 +7802,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7308,6 +7814,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7319,6 +7826,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
             <longname>Taiwanese (indigenous)</longname>
             <description>Taiwanese (indigenous)</description>
             <icon>ibus-keyboard</icon>
@@ -7330,6 +7838,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tw</layout>
+            <layout_variant>saisiyat</layout_variant>
             <longname>Saisiyat (Taiwan)</longname>
             <description>Saisiyat (Taiwan)</description>
             <icon>ibus-keyboard</icon>
@@ -7352,6 +7861,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Ukrainian (phonetic)</longname>
             <description>Ukrainian (phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -7363,6 +7873,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>typewriter</layout_variant>
             <longname>Ukrainian (typewriter)</longname>
             <description>Ukrainian (typewriter)</description>
             <icon>ibus-keyboard</icon>
@@ -7374,6 +7885,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>winkeys</layout_variant>
             <longname>Ukrainian (Win keys)</longname>
             <description>Ukrainian (Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -7385,6 +7897,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Ukrainian (legacy)</longname>
             <description>Ukrainian (legacy)</description>
             <icon>ibus-keyboard</icon>
@@ -7396,6 +7909,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>rstu</layout_variant>
             <longname>Ukrainian (standard RSTU)</longname>
             <description>Ukrainian (standard RSTU)</description>
             <icon>ibus-keyboard</icon>
@@ -7407,6 +7921,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>rstu_ru</layout_variant>
             <longname>Russian (Ukraine, standard RSTU)</longname>
             <description>Russian (Ukraine, standard RSTU)</description>
             <icon>ibus-keyboard</icon>
@@ -7418,6 +7933,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
+            <layout_variant>homophonic</layout_variant>
             <longname>Ukrainian (homophonic)</longname>
             <description>Ukrainian (homophonic)</description>
             <icon>ibus-keyboard</icon>
@@ -7440,6 +7956,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>extd</layout_variant>
             <longname>English (UK, extended, with Win keys)</longname>
             <description>English (UK, extended, with Win keys)</description>
             <icon>ibus-keyboard</icon>
@@ -7451,6 +7968,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>intl</layout_variant>
             <longname>English (UK, intl., with dead keys)</longname>
             <description>English (UK, intl., with dead keys)</description>
             <icon>ibus-keyboard</icon>
@@ -7462,6 +7980,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>English (UK, Dvorak)</longname>
             <description>English (UK, Dvorak)</description>
             <icon>ibus-keyboard</icon>
@@ -7473,6 +7992,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>dvorakukp</layout_variant>
             <longname>English (UK, Dvorak, with UK punctuation)</longname>
             <description>English (UK, Dvorak, with UK punctuation)</description>
             <icon>ibus-keyboard</icon>
@@ -7484,6 +8004,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>mac</layout_variant>
             <longname>English (UK, Macintosh)</longname>
             <description>English (UK, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -7495,6 +8016,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>mac_intl</layout_variant>
             <longname>English (UK, intl., Macintosh)</longname>
             <description>English (UK, intl., Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -7506,6 +8028,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>English (UK, Colemak)</longname>
             <description>English (UK, Colemak)</description>
             <icon>ibus-keyboard</icon>
@@ -7517,6 +8040,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
+            <layout_variant>pl</layout_variant>
             <longname>Polish (British keyboard)</longname>
             <description>Polish (British keyboard)</description>
             <icon>ibus-keyboard</icon>
@@ -7539,6 +8063,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>uz</layout>
+            <layout_variant>latin</layout_variant>
             <longname>Uzbek (Latin)</longname>
             <description>Uzbek (Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -7561,6 +8086,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>vn</layout>
+            <layout_variant>us</layout_variant>
             <longname>Vietnamese (US, with Vietnamese letters)</longname>
             <description>Vietnamese (US, with Vietnamese letters)</description>
             <icon>ibus-keyboard</icon>
@@ -7572,6 +8098,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>vn</layout>
+            <layout_variant>fr</layout_variant>
             <longname>Vietnamese (French, with Vietnamese letters)</longname>
             <description>Vietnamese (French, with Vietnamese letters)</description>
             <icon>ibus-keyboard</icon>
@@ -7594,6 +8121,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kr</layout>
+            <layout_variant>kr104</layout_variant>
             <longname>Korean (101/104 key compatible)</longname>
             <description>Korean (101/104 key compatible)</description>
             <icon>ibus-keyboard</icon>
@@ -7616,6 +8144,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ie</layout>
+            <layout_variant>CloGaelach</layout_variant>
             <longname>CloGaelach</longname>
             <description>CloGaelach</description>
             <icon>ibus-keyboard</icon>
@@ -7627,6 +8156,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ie</layout>
+            <layout_variant>UnicodeExpert</layout_variant>
             <longname>Irish (UnicodeExpert)</longname>
             <description>Irish (UnicodeExpert)</description>
             <icon>ibus-keyboard</icon>
@@ -7638,6 +8168,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ie</layout>
+            <layout_variant>ogam</layout_variant>
             <longname>Ogham</longname>
             <description>Ogham</description>
             <icon>ibus-keyboard</icon>
@@ -7649,6 +8180,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ie</layout>
+            <layout_variant>ogam_is434</layout_variant>
             <longname>Ogham (IS434)</longname>
             <description>Ogham (IS434)</description>
             <icon>ibus-keyboard</icon>
@@ -7671,6 +8203,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pk</layout>
+            <layout_variant>urd-crulp</layout_variant>
             <longname>Urdu (Pakistan, CRULP)</longname>
             <description>Urdu (Pakistan, CRULP)</description>
             <icon>ibus-keyboard</icon>
@@ -7682,6 +8215,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pk</layout>
+            <layout_variant>urd-nla</layout_variant>
             <longname>Urdu (Pakistan, NLA)</longname>
             <description>Urdu (Pakistan, NLA)</description>
             <icon>ibus-keyboard</icon>
@@ -7693,6 +8227,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pk</layout>
+            <layout_variant>ara</layout_variant>
             <longname>Arabic (Pakistan)</longname>
             <description>Arabic (Pakistan)</description>
             <icon>ibus-keyboard</icon>
@@ -7704,6 +8239,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pk</layout>
+            <layout_variant>snd</layout_variant>
             <longname>Sindhi</longname>
             <description>Sindhi</description>
             <icon>ibus-keyboard</icon>
@@ -7748,6 +8284,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>epo</layout>
+            <layout_variant>legacy</layout_variant>
             <longname>Esperanto (displaced semicolon and quote, obsolete)</longname>
             <description>Esperanto (displaced semicolon and quote, obsolete)</description>
             <icon>ibus-keyboard</icon>
@@ -7792,6 +8329,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ng</layout>
+            <layout_variant>igbo</layout_variant>
             <longname>Igbo</longname>
             <description>Igbo</description>
             <icon>ibus-keyboard</icon>
@@ -7803,6 +8341,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ng</layout>
+            <layout_variant>yoruba</layout_variant>
             <longname>Yoruba</longname>
             <description>Yoruba</description>
             <icon>ibus-keyboard</icon>
@@ -7814,6 +8353,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ng</layout>
+            <layout_variant>hausa</layout_variant>
             <longname>Hausa (Nigeria)</longname>
             <description>Hausa (Nigeria)</description>
             <icon>ibus-keyboard</icon>
@@ -7858,6 +8398,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tm</layout>
+            <layout_variant>alt</layout_variant>
             <longname>Turkmen (Alt-Q)</longname>
             <description>Turkmen (Alt-Q)</description>
             <icon>ibus-keyboard</icon>
@@ -7880,6 +8421,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ml</layout>
+            <layout_variant>fr-oss</layout_variant>
             <longname>French (Mali, alt.)</longname>
             <description>French (Mali, alt.)</description>
             <icon>ibus-keyboard</icon>
@@ -7891,6 +8433,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ml</layout>
+            <layout_variant>us-mac</layout_variant>
             <longname>English (Mali, US, Macintosh)</longname>
             <description>English (Mali, US, Macintosh)</description>
             <icon>ibus-keyboard</icon>
@@ -7902,6 +8445,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ml</layout>
+            <layout_variant>us-intl</layout_variant>
             <longname>English (Mali, US, intl.)</longname>
             <description>English (Mali, US, intl.)</description>
             <icon>ibus-keyboard</icon>
@@ -8133,6 +8677,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ke</layout>
+            <layout_variant>kik</layout_variant>
             <longname>Kikuyu</longname>
             <description>Kikuyu</description>
             <icon>ibus-keyboard</icon>
@@ -8276,6 +8821,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8287,6 +8833,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8298,6 +8845,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8309,6 +8857,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8320,6 +8869,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8331,6 +8881,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8342,6 +8893,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8353,6 +8905,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8364,6 +8917,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8375,6 +8929,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
             <longname>Filipino (QWERTY, Baybayin)</longname>
             <description>Filipino (QWERTY, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8386,6 +8941,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8397,6 +8953,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8408,6 +8965,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8419,6 +8977,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8430,6 +8989,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8441,6 +9001,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8452,6 +9013,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8463,6 +9025,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8474,6 +9037,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8485,6 +9049,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Latin)</longname>
             <description>Filipino (Capewell-Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8496,6 +9061,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8507,6 +9073,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8518,6 +9085,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8529,6 +9097,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8540,6 +9109,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8551,6 +9121,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8562,6 +9133,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8573,6 +9145,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8584,6 +9157,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8595,6 +9169,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
             <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
             <description>Filipino (Capewell-Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8606,6 +9181,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8617,6 +9193,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8628,6 +9205,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8639,6 +9217,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8650,6 +9229,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8661,6 +9241,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8672,6 +9253,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8683,6 +9265,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8694,6 +9277,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8705,6 +9289,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8716,6 +9301,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8727,6 +9313,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8738,6 +9325,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8749,6 +9337,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8760,6 +9349,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8771,6 +9361,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8782,6 +9373,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8793,6 +9385,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8804,6 +9397,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8815,6 +9409,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
             <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
             <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8826,6 +9421,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8837,6 +9433,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8848,6 +9445,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8859,6 +9457,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8870,6 +9469,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8881,6 +9481,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8892,6 +9493,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8903,6 +9505,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8914,6 +9517,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8925,6 +9529,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
             <longname>Filipino (Colemak, Latin)</longname>
             <description>Filipino (Colemak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -8936,6 +9541,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8947,6 +9553,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8958,6 +9565,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8969,6 +9577,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8980,6 +9589,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -8991,6 +9601,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9002,6 +9613,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9013,6 +9625,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9024,6 +9637,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9035,6 +9649,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
             <longname>Filipino (Colemak, Baybayin)</longname>
             <description>Filipino (Colemak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9046,6 +9661,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9057,6 +9673,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9068,6 +9685,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9079,6 +9697,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9090,6 +9709,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9101,6 +9721,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9112,6 +9733,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9123,6 +9745,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9134,6 +9757,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9145,6 +9769,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
             <longname>Filipino (Dvorak, Latin)</longname>
             <description>Filipino (Dvorak, Latin)</description>
             <icon>ibus-keyboard</icon>
@@ -9156,6 +9781,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9167,6 +9793,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9178,6 +9805,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9189,6 +9817,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9200,6 +9829,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9211,6 +9841,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9222,6 +9853,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9233,6 +9865,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9244,6 +9877,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9255,6 +9889,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
             <longname>Filipino (Dvorak, Baybayin)</longname>
             <description>Filipino (Dvorak, Baybayin)</description>
             <icon>ibus-keyboard</icon>
@@ -9277,6 +9912,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>md</layout>
+            <layout_variant>gag</layout_variant>
             <longname>Moldavian (Gagauz)</longname>
             <description>Moldavian (Gagauz)</description>
             <icon>ibus-keyboard</icon>
@@ -9365,6 +10001,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9376,6 +10013,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9387,6 +10025,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9398,6 +10037,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9409,6 +10049,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9420,6 +10061,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9431,6 +10073,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
             <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
             <description>Indonesian (Arab Melayu, ext. phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9530,6 +10173,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9541,6 +10185,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9552,6 +10197,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9563,6 +10209,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9574,6 +10221,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9585,6 +10233,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>
@@ -9596,6 +10245,7 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
             <longname>Malay (Jawi, phonetic)</longname>
             <description>Malay (Jawi, phonetic)</description>
             <icon>ibus-keyboard</icon>

From e933cc95b5766953c6328c090baae3e1d2e7ff53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Wed, 26 Aug 2020 23:14:52 +0900
Subject: [PATCH 648/816] po: Update translation (Finnish)

Update po/fi.po at 52.2%
https://translate.fedoraproject.org/projects/ibus/ibus/fi/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/fi.po | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index fd1157a95..9a11e7291 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,25 +1,26 @@
 # Finnish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2017. #zanata
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2017. #zanata, 2020.
 # Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"PO-Revision-Date: 2020-03-19 09:38+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/fi/>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-17 12:26-0400\n"
-"Last-Translator: Toni Rantala <trantalafilo@gmail.com>\n"
-"Language-Team: Finnish\n"
-"Language: fi\n"
-"X-Generator: Zanata 3.9.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.11.3\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -71,7 +72,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
-msgstr ""
+msgstr "Seuraava syötetapa:"
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
@@ -79,7 +80,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
-msgstr ""
+msgstr "Edellinen syötetapa:"
 
 #: ../setup/setup.ui.h:16
 msgid "The shortcut keys for showing emoji dialog"
@@ -87,7 +88,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:17
 msgid "Emoji dialog:"
-msgstr ""
+msgstr "Emoji-ikkuna:"
 
 #: ../setup/setup.ui.h:18
 msgid "..."
@@ -448,7 +449,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
-msgstr ""
+msgstr "Näytä syötetavan nimi"
 
 #: ../data/ibus.schemas.in.h:39
 msgid "RGBA value of XKB icon"
@@ -540,7 +541,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:61
 msgid "Enable input method by default"
-msgstr ""
+msgstr "Käytä syötetapaa oletuksena"
 
 #: ../data/ibus.schemas.in.h:62
 msgid "Enable input method by default when the application gets input focus"
@@ -568,7 +569,7 @@ msgstr "Muu"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "Valitse kieli"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
@@ -748,7 +749,7 @@ msgstr ""
 
 #: ../tools/main.vala:368
 msgid "Show available engines"
-msgstr ""
+msgstr "Näytä saatavilla olevat moottorit"
 
 #: ../tools/main.vala:369
 msgid "(Not implemented)"
@@ -807,7 +808,7 @@ msgstr "%s on tuntematon komento!\n"
 
 #: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
 msgid "Emoji Dialog"
-msgstr ""
+msgstr "Emoji-ikkuna"
 
 #: ../ui/gtk3/emojier.vala:293
 msgid "Type annotation or choose emoji"
@@ -890,7 +891,7 @@ msgstr ""
 
 #: ../ui/gtk3/emojierapp.vala:52
 msgid "Copied an emoji to your clipboard."
-msgstr ""
+msgstr "Kopioitiin emoji leikepöydälle."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT

From c17b51b201142c1b922b538461f5fe62e110b878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Wed, 26 Aug 2020 23:20:19 +0900
Subject: [PATCH 649/816] po: Update translation (Turkish)

Update po/tr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/tr/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/tr.po | 120 +++++++++++++++++++++++++++----------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index c2046873f..2b1ed6a9a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-03 13:37+0000\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-04-21 19:40+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
-"Language-Team: Turkish <https://translate.stg.fedoraproject.org/projects/"
-"ibus/ibus/tr/>\n"
+"Language-Team: Turkish <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.0.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -45,26 +45,26 @@ msgstr "IME değiştirici penceresi için açılır pencere gecikme milisaniyesi
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 değiştirici penceresini gösterecek açılır pencere gecikmesini milisaniye "
-"olarak ayarlayın. Varsayılan değer 400'dür. 0 = Pencereyi hemen göster. 0 < "
+"olarak ayarlayın. Öntanımlı değer 400'dür. 0 = Pencereyi hemen göster. 0 < "
 "Milisaniye cinsinden gecikme. 0 > Pencereyi gösterme ve önceki/sonraki "
 "motorlara geçiş yap."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
-msgstr "Kaydedilen versiyon numarası"
+msgstr "Kaydedilen sürüm numarası"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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 ""
-"Kaydedilen versiyon numarası, daha önce kurulmuş olan ibus ile mevcut "
-"ibus'un biri arasındaki farkı kontrol etmek için kullanılacaktır."
+"Kaydedilen sürüm numarası, daha önce kurulmuş olan ibus ile mevcut ibus'un "
+"biri arasındaki farkı denetlemek için kullanılacaktır."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -111,12 +111,12 @@ msgstr "Tüm uygulamalar ile aynı giriş yöntemini paylaş"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:57
 msgid "Enable input method by default"
-msgstr "Giriş yöntemini varsayılan olarak etkinleştir"
+msgstr "Öntanımlı olarak giriş yöntemini etkinleştir"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
-"Uygulama giriş odağı aldığında varsayılan olarak giriş yöntemini etkinleştir"
+"Uygulama giriş odağı aldığında öntanımlı olarak giriş yöntemini etkinleştir"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -247,16 +247,16 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB simgesi yerleşim stringini gösterir ve string RGBA değeri ile "
+"XKB simgesi yerleşim dizgesini gösterir ve dizge RGBA değeri ile "
 "oluşturulur. RGBA değeri; 1. X11'den bir renk adı, 2. 'r', 'g' ve 'b' "
 "kırmızı, yeşil ve mavinin onaltılık basamakları olmak üzere '#rrggbb' "
 "şeklinde bir onaltılık değer, 3. 'rgb(r,g,b)' biçimindeki bir RGB rengi veya "
-"4. 'r', 'g' ve 'b' 0 ila 255 aralığındaki tamsayılar veya %0 ile %100 "
+"4. 'r', 'g' ve 'b' 0 ila 255 aralığındaki tam sayılar veya %0 ile %100 "
 "aralığındaki yüzde değerleri ve 'a', alfa'nın 0 ile 1 aralığındaki bir "
 "ondalık sayı değeri olmak üzere 'rgba(r,g,b,a)' biçimindeki bir RGBA rengi "
 "olabilir."
@@ -316,14 +316,14 @@ msgstr "Emoji iletişim kutusundaki emoji karakterleri için özel yazı tipi ad
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "Default language for emoji dictionary"
-msgstr "Emoji sözlüğü için varsayılan dil"
+msgstr "Emoji sözlüğü için öntanımlı dil"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
-"Emoji iletişim kutusunda varsayılan bir emoji sözlük dili seçin. $lang "
+"Emoji iletişim kutusunda öntanımlı bir emoji sözlük dili seçin. $lang "
 "değeri /usr/share/ibus/dicts/emoji-$lang.dict ögesine uygulanır"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
@@ -355,7 +355,7 @@ msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
-"Emoji ek açıklamalarının tam eşleme yerine kısmi bir string ile eşleşip "
+"Emoji ek açıklamalarının tam eşleme yerine kısmi bir dizge ile eşleşip "
 "eşleşemeyeceği."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
@@ -417,10 +417,10 @@ 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."
+"Telif Hakkı (c) 2007-2010 Peng Huang\n"
+"Telif Hakkı (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Diğer"
 
@@ -521,12 +521,12 @@ msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
-"Lütfen bir tuşa (veya tuş kombinasyonuna) basın.\n"
+"Lütfen bir tuşa (veya tuş dizisine) basın.\n"
 "Tuş serbest bırakıldığında iletişim kutusu kapatılacaktır."
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "Lütfen bir tuşa (veya bir tuş kombinasyonuna) basın"
+msgstr "Lütfen bir tuşa (veya bir tuş dizisine) basın"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -738,13 +738,12 @@ msgid ""
 "the panel icon.</i></small>"
 msgstr ""
 "<small><i>Etkin giriş yöntemi, klavye kısayol tuşlarına basarak veya panel "
-"simgesine tıklayarak yukarıdaki listede seçilenler arasında "
-"değiştirilebilir.</i></small>"
+"simgesine tıklayarak yukarıdaki listede seçilenler arasında değiştirilebilir."
+"</i></small>"
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Emoji ek açıklamalarının veya Unicode isimlerinin dönüşümlerini "
 "etkinleştirmek için kısayol tuşları"
@@ -790,7 +789,7 @@ msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
-"Emoji ek açıklamalarının tam eşleşme yerine kısmi bir string ile eşleşip "
+"Emoji ek açıklamalarının tam eşleşme yerine kısmi bir dizge ile eşleşip "
 "eşleşemeyeceği"
 
 #: setup/setup.ui:1101
@@ -1107,7 +1106,7 @@ msgstr "Sinhala"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr "Taylandlı"
+msgstr "Tayland"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1422,7 +1421,7 @@ msgstr "Harf Benzeri Semboller"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:337
 msgid "Number Forms"
-msgstr "Sayı Formları"
+msgstr "Sayı Biçimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1450,7 +1449,7 @@ msgstr "Çeşitli Teknik"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:353
 msgid "Control Pictures"
-msgstr "Kontrol Resimleri"
+msgstr "Denetim Resimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1793,7 +1792,7 @@ msgstr "Syloti Nagri"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr "Ortak Hint Sayı Formları"
+msgstr "Ortak Hint Sayı Biçimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1961,14 +1960,14 @@ msgstr "CJK Uyumluluk İdeografları"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr "Alfabetik Sunum Formları"
+msgstr "Alfabetik Sunum Biçimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr "Arapça Sunum Formları-A"
+msgstr "Arapça Sunum Biçimleri-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1982,7 +1981,7 @@ msgstr "Varyasyon Seçiciler"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
-msgstr "Dikey Formlar"
+msgstr "Dikey Biçimler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1996,28 +1995,28 @@ msgstr "Birleşik Yarım İşaretler"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr "CJK Uyumluluk Formları"
+msgstr "CJK Uyumluluk Biçimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
-msgstr "Küçük Form Varyantları"
+msgstr "Küçük Biçimli Çeşitleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr "Arapça Sunum Formları-B"
+msgstr "Arapça Sunum Biçimleri-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr "Yarım ve Tam Genişlik Formları"
+msgstr "Yarım ve Tam Genişlik Biçimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2584,7 +2583,7 @@ msgstr "Mısır Hiyeroglifleri"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
 msgid "Egyptian Hieroglyph Format Controls"
-msgstr "Mısır Hiyeroglif Format Kontrolleri"
+msgstr "Mısır Hiyeroglif Biçim Denetimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2696,21 +2695,21 @@ msgstr "Duployan"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
 msgid "Shorthand Format Controls"
-msgstr "Kestirme Format Kontrolleri"
+msgstr "Steno Biçim Denetimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
 msgid "Byzantine Musical Symbols"
-msgstr "Bizans Müzikal Semboller"
+msgstr "Bizans Müzik Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
 msgid "Musical Symbols"
-msgstr "Müzikal Semboller"
+msgstr "Müzik Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2987,7 +2986,7 @@ msgstr "İlave Özel Kullanım Alanı-B"
 
 #: tools/main.vala:51
 msgid "List engine name only"
-msgstr "Yalnızca motor adını listele"
+msgstr "Sadece motor adını listele"
 
 #: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
@@ -3056,7 +3055,7 @@ msgstr "ibus-daemon'dan çık"
 
 #: tools/main.vala:446
 msgid "Show available engines"
-msgstr "Mevcut motorları göster"
+msgstr "Kullanılabilir motorları göster"
 
 #: tools/main.vala:447
 msgid "(Not implemented)"
@@ -3068,7 +3067,7 @@ msgstr "ibus-daemon'u yeniden başlat"
 
 #: tools/main.vala:449
 msgid "Show version"
-msgstr "Versiyonu göster"
+msgstr "Sürümü göster"
 
 #: tools/main.vala:450
 msgid "Show the content of registry cache"
@@ -3100,7 +3099,8 @@ msgstr "Bu bilgiyi göster"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 "Kullanım: %s KOMUT [SEÇENEK...]\n"
@@ -3203,9 +3203,9 @@ msgstr "Unicode Seçimi"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Mevcut metin uygulaması alınamadı. Lütfen uygulamanızı yeniden odaklayın. "
 "Örn. emoji yazma modunu bırakmak için Esc tuşuna birkaç kez basın, "
@@ -3221,7 +3221,7 @@ msgstr "Bir emoji panonuza kopyalandı."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "Emoji iletişim kutusundaki emoji karakterleri için \"YAZI TİPİ\""
@@ -3232,7 +3232,7 @@ msgstr "YAZI TİPİ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "Emoji iletişim kutusundaki ek açıklamalar için \"DİL\". Örn. \"tr\""
@@ -3264,8 +3264,8 @@ msgstr "IBus, Linux/Unix için akıllı bir giriş veri yoludur."
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
-"Serdar Sağlam <teknomobil@yandex.com>, 2019.\n"
-"Oğuz Ersen <oguzersen@protonmail.com>, 2019"
+"Serdar Sağlam <teknomobil@yandex.com>\n"
+"Oğuz Ersen <oguzersen@protonmail.com>"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"
@@ -3283,4 +3283,4 @@ msgstr "Çık"
 #. * Otherwise the msgstr is "default:LTR".
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
-msgstr "varsayılan:LTR (soldan sağa)"
+msgstr "öntanımlı olarak:LTR (soldan sağa)"

From 39f67610be762cbb3c2dfd55849a4295b16727d2 Mon Sep 17 00:00:00 2001
From: Ankit Behera <proneon267@gmail.com>
Date: Wed, 26 Aug 2020 23:53:08 +0900
Subject: [PATCH 650/816] po: Update translation (Odia)

Update po/or.po at 98.0%
https://translate.fedoraproject.org/projects/ibus/ibus/or/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/or.po | 3485 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 3036 insertions(+), 449 deletions(-)

diff --git a/po/or.po b/po/or.po
index aec683041..2d8cd5728 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,694 +1,3281 @@
-# translation of ibus.pot to Oriya
 # Oriya translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Manoj Kumar Giri <mgiri@redhat.com>, 2009,2011-2013
 # Manoj Kumar Giri <mgiri@redhat.com>, 2013
+# Ankit Behera <proneon267@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
-"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
-"Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-04-13 22:40+0000\n"
+"Last-Translator: Ankit Behera <proneon267@gmail.com>\n"
+"Language-Team: Odia <https://translate.fedoraproject.org/projects/ibus/ibus/"
+"or/>\n"
+"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: or\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.11.3\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "ଯନ୍ତ୍ର କ୍ରମ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀ ତାଲିକାରେ ସଂରକ୍ଷିତ ଯନ୍ତ୍ର କ୍ରମ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+#, fuzzy
+#| msgid ""
+#| "Set popup delay milliseconds to show IME switcher window. The default is "
+#| "400. 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; "
+#| "Do not show the window and switch prev/next engines."
+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 &lt; ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 &gt; ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ "
+"ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "ସଂରକ୍ଷିତ ସଂସ୍କରଣ କ୍ରମ ସଂଖ୍ୟା"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "DConf ନାମ ଉପସର୍ଗଗୁଡ଼ିକୁ ସଂରକ୍ଷିତ ରଖିଥାଏ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "ନାମ ପରିବର୍ତ୍ତନକୁ ଅଟକାଇବା ପାଇଁ DConf କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ଟ୍ରିଗର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ପାଇଁ ସଂକ୍ଷିପ୍ତ ପଥ ଚାବିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr "ପରବର୍ତ୍ତି ଯନ୍ତ୍ର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"ଗୁଣଧର୍ମ ତାଲିକାର ଆଚରଣ। 0 = ଦେଖାନ୍ତୁ ନାହିଁ, 1 = ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ , 2 = ସର୍ବଦା "
+"ଦେଖାନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr "ଗୁଣଧର୍ମ ତାଲିକାକୁ ଦେଖାଇବା ପାଇଁ ମିଲି ସେକେଣ୍ଡସ୍‌"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#, fuzzy
+#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ପାଇଁ ସଂକ୍ଷିପ୍ତ ପଥ ଚାବିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#, fuzzy
+#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse ପାଇଁ ସଂକ୍ଷିପ୍ତ ପଥ ଚାବିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#, fuzzy
+#| msgid "Custom font name for language panel"
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+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."
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr "ଅନ୍ୟାନ୍ୟ"
+
+#: setup/emojilang.py:67
+#, fuzzy
+#| msgid "Select an input method"
+msgid "Select a language"
+msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "ଠିକ ଅଛି (_O)"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "ବିବରଣୀ"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "ଭାଷା: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "କିବୋର୍ଡ ବିନ୍ୟାସ: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "ଲେଖକ: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "ବର୍ଣ୍ଣନା:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀ"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus ପସନ୍ଦ"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "IBus ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟକରନ୍ତୁ"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "କି ସଂକେତ:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "ରୂପାନ୍ତରକ:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ (_A)"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "ଲିଭାନ୍ତୁ (_D)"
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "shift ସହିତ ସଂକ୍ଷିପ୍ତ ପଥକୁ ପୂର୍ବ ନିବେଶ ପଦ୍ଧତିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus ଡେମନ ଚାଲୁ ନାହିଁ। ଆପଣ ଏହାକୁ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
+
+#: setup/main.py:536
+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 ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ 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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "IBus ଡେମନ  %d ସେକଣ୍ଡରେ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରୁଅଛି"
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "ଭୂ-ସମାନ୍ତରାଳ"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "ଭୂଲମ୍ବ"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "ଉପର ପାଖ ବାମ କୋଣ"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "ତଳପାଖ ବାମ କୋଣ"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "ଇଚ୍ଛାରୂପୀ"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "ଦେଖାଅ ନାହିଁ"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚେଇ ଦିଅ"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "ସର୍ବଦା"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "ସକ୍ରିୟ ଅଥବା ନିଷ୍କ୍ରିୟ:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "ସକ୍ରିୟ କରନ୍ତୁ:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>କିବୋର୍ଡ ସଂକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "ଅବଲୋକନ ସାରଣୀରେ ବ୍ୟକ୍ତିମାନଙ୍କର ଅନୁସ୍ଥାପନ ସେଟକରନ୍ତୁ"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "ପ୍ରାର୍ଥୀ ଅନୁସ୍ଥାପନ:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ଭାଷା ସୂଚକକୁ ଦର୍ଶାଇବା ଅଥବା ଲୁଚାଇବା ପାଇଁ ibus ର ଆଚରଣକୁ ସେଟକରନ୍ତୁ"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "ଗୁଣଧର୍ମ ତାଲିକା ଦେଖନ୍ତୁ:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "ନିବେଶ ପଦ୍ଧତି ନାମକୁ ଭାଷା ସୂଚକରେ ଦର୍ଶାନ୍ତୁ ଯେତେବେଳେ ଯାଞ୍ଚବାକ୍ସକୁ ଯାଞ୍ଚକରୁଛନ୍ତି"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "ନିବେଶ ପଦ୍ଧତିର ପ୍ରୀଡିତ ପାଠ୍ୟକୁ ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>ଅକ୍ଷରରୂପ ଏବଂ ଶୈଳୀ</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "ସାଧାରଣ"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀରେ ଯୋଗକରନ୍ତୁ"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "କାଢ଼ନ୍ତୁ (_R)"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିରୁ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ କାଢ଼ିଦିଅନ୍ତୁ"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "ଉପର (_U)"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତି ତାଲିକାରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "ତଳ (_D)"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିଗୁଡ଼ିକରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ତଳକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "ବିବରଣୀ (_A)"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "ପସନ୍ଦ (_P)"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀର ବ୍ୟବସ୍ଥାକୁ ଦର୍ଶାନ୍ତୁ"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିକୁ ପରିବର୍ତ୍ତନ କରାଯାଇପାରିବ ଉପର ତାଲିକାରୁ ବଛିତ ମାନଙ୍କ ମଧ୍ଯରୁ, "
+"କୀବୋର୍ଡ଼ shortcut କୀ ଦବେଇବା ଦ୍ୱାରା କିମ୍ବା ତାଲିକା ଚିତ୍ରସଙ୍କେତକୁ ଦବେଇବା ଦ୍ୱାରା<</i></"
+"small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+#, fuzzy
+#| msgid "Use custom font:"
+msgid "Unicode font:"
+msgstr "ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr ""
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀ ବିନ୍ୟାସ</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "ଉନ୍ନତ"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\n"
+"ମୂଖ୍ୟ ପୃଷ୍ଠା: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>ଆରମ୍ଭ</b>"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "ଭୂ-ସମାନ୍ତରାଳ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
 
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+#, fuzzy
+#| msgid "Vertical"
+msgid "Vertical Forms"
 msgstr "ଭୂଲମ୍ବ"
 
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "ଉପର ପାଖ ବାମ କୋଣ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "ତଳପାଖ ବାମ କୋଣ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "ଇଚ୍ଛାରୂପୀ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
 
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
 msgstr ""
 
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
 msgstr ""
 
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "ସର୍ବଦା"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
 
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus ପସନ୍ଦ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
 
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
 
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
 
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
-msgid "The shortcut keys for turning input method on or off"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "ସକ୍ରିୟ ଅଥବା ନିଷ୍କ୍ରିୟ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "ସକ୍ରିୟ କରନ୍ତୁ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
 
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>କିବୋର୍ଡ ସଂକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "ଅବଲୋକନ ସାରଣୀରେ ବ୍ୟକ୍ତିମାନଙ୍କର ଅନୁସ୍ଥାପନ ସେଟକରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "ପ୍ରାର୍ଥୀ ଅନୁସ୍ଥାପନ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
 
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ଭାଷା ସୂଚକକୁ ଦର୍ଶାଇବା ଅଥବା ଲୁଚାଇବା ପାଇଁ ibus ର ଆଚରଣକୁ ସେଟକରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
 
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
-msgid "Show icon on system tray"
-msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
-msgid "Show input method name on language bar"
-msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
 
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "ନିବେଶ ପଦ୍ଧତି ନାମକୁ ଭାଷା ସୂଚକରେ ଦର୍ଶାନ୍ତୁ ଯେତେବେଳେ ଯାଞ୍ଚବାକ୍ସକୁ ଯାଞ୍ଚକରୁଛନ୍ତି"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr "ନିବେଶ ପଦ୍ଧତିର ପ୍ରୀଡିତ ପାଠ୍ୟକୁ ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
 
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
 
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>ଅକ୍ଷରରୂପ ଏବଂ ଶୈଳୀ</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "ସାଧାରଣ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
 
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
-msgid "_Add"
-msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀରେ ଯୋଗକରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "କାଢ଼ନ୍ତୁ (_R)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିରୁ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ କାଢ଼ିଦିଅନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "ଉପର (_U)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତି ତାଲିକାରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "ତଳ (_D)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
 
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିଗୁଡ଼ିକରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ତଳକୁ ଘୁଞ୍ଚାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
 
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "ବିବରଣୀ (_A)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
 
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "ପସନ୍ଦ (_P)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
 
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣାଳୀର ବ୍ୟବସ୍ଥାକୁ ଦର୍ଶାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
 msgstr ""
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
-msgid "Input Method"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
-msgid "Use system keyboard layout"
-msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
-msgid "Use system keyboard (XKB) layout"
-msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
 
-#: ../setup/setup.ui.h:51
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>କିବୋର୍ଡ ବିନ୍ୟାସ</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
-msgid "Share the same input method among all applications"
-msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid "<b>Global input method settings</b>"
-msgstr "<b>ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀ ବିନ୍ୟାସ</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
 
-#: ../setup/setup.ui.h:54
-msgid "Advanced"
-msgstr "ଉନ୍ନତ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
 
-#: ../setup/setup.ui.h:55
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr "<big><b>IBus</b></big>\n<small>ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ</small>\nମୂଖ୍ୟ ପୃଷ୍ଠା: https://github.com/ibus/ibus/wiki\n\n\n\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
 
-#: ../setup/setup.ui.h:62
-msgid "Start ibus on login"
-msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
 
-#: ../setup/setup.ui.h:63
-msgid "<b>Startup</b>"
-msgstr "<b>ଆରମ୍ଭ</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
-msgid "About"
-msgstr "ବିବରଣୀ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
-msgid "_Close"
-msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Preload engines"
-msgstr "ଯନ୍ତ୍ରକୁ ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines during ibus starts up"
-msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ ଧାରଣ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Engines order"
-msgstr "ଯନ୍ତ୍ର କ୍ରମ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Saved engines order in input method list"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀ ତାଲିକାରେ ସଂରକ୍ଷିତ ଯନ୍ତ୍ର କ୍ରମ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+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 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
-msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ ସେଟ କରନ୍ତୁ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି400. 0 = ସଙ୍ଗେ ସଙ୍ଗେ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ। 0 &lt; ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 &gt; ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Saved version number"
-msgstr "ସଂରକ୍ଷିତ ସଂସ୍କରଣ କ୍ରମ ସଂଖ୍ୟା"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+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 ମଧ୍ଯରେ ପାର୍ଥକ୍ୟକୁ ଯାଞ୍ଚ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇଥାଏ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ଟ୍ରିଗର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse ପାଇଁ ସଂକ୍ଷିପ୍ତ ପଥ ଚାବିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
-msgstr "ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
-msgid "The shortcut keys for turning input method off"
-msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-msgid "Next engine shortcut keys"
-msgstr "ପରବର୍ତ୍ତି ଯନ୍ତ୍ର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
-msgid "Prev engine shortcut keys"
-msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Auto hide"
-msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid ""
-"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
-"show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-msgid "Language panel position"
-msgstr "ଭାଷା ଫଳକ ଅବସ୍ଥାନ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+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 = ଇଚ୍ଛାମୁତାବକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Follow the input cursor in case the panel is always shown"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid ""
-"If true, the panel follows the input cursor in case the panel is always "
-"shown. If false, the panel is shown at a fixed location."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
-msgid "The milliseconds to show property panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
-msgid ""
-"The milliseconds to show property panel after focus-in or properties are "
-"changed."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Orientation of lookup table"
-msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "ଅବଲୋକନ ସାରଣୀର ଅନୁସ୍ଥାପନ। 0 = ଭୂ-ସମାନ୍ତର, 1 = ଭୂ-ଲମ୍ବ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
-msgid "Show input method name"
-msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
-msgid "Use custom font"
-msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
-msgid "Use custom font name for language panel"
-msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
-msgid "Custom font"
-msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:38
-msgid "Custom font name for language panel"
-msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:39
-msgid "Embed Preedit Text"
-msgstr "ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:40
-msgid "Embed Preedit Text in Application Window"
-msgstr "ପ୍ରୟୋଗ ୱିଣ୍ଡୋରେ ଅନ୍ତସ୍ଥାପିତ ପ୍ରୀଡିତ ପାଠ୍ୟ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-msgid "Use global input method"
-msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
-msgid "Enable input method by default"
-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
-msgid "Enable input method by default when the application gets input focus"
-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:45
-msgid "DConf preserve name prefixes"
-msgstr "DConf ନାମ ଉପସର୍ଗଗୁଡ଼ିକୁ ସଂରକ୍ଷିତ ରଖିଥାଏ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "ନାମ ପରିବର୍ତ୍ତନକୁ ଅଟକାଇବା ପାଇଁ DConf କିଗୁଡ଼ିକର ଉପସର୍ଗଗୁଡ଼ିକ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
 
-#: ../ibus/_config.py.in:41
-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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
+msgstr ""
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
-msgid "Other"
-msgstr "ଅନ୍ୟାନ୍ୟ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
 
-#: ../setup/engineabout.py:68
-#, python-format
-msgid "Language: %s\n"
-msgstr "ଭାଷା: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr ""
 
-#: ../setup/engineabout.py:71
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "କିବୋର୍ଡ ବିନ୍ୟାସ: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
 
-#: ../setup/engineabout.py:74
-#, python-format
-msgid "Author: %s\n"
-msgstr "ଲେଖକ: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
 
-#: ../setup/engineabout.py:77
-msgid "Description:\n"
-msgstr "ବର୍ଣ୍ଣନା:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139
-msgid "Select an input method"
-msgstr "ଗୋଟିଏ ନିବେଶ ପ୍ରଣୀଳୀ ବାଛନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr ""
 
-#: ../setup/enginetreeview.py:94
-msgid "Kbd"
-msgstr "Kbd"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "IBus ପସନ୍ଦଗୁଡ଼ିକୁ ସେଟକରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:66
-msgid "Key code:"
-msgstr "କି ସଂକେତ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:81
-msgid "Modifiers:"
-msgstr "ରୂପାନ୍ତରକ:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:133
-msgid "_Apply"
-msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ (_A)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
 
-#. delete button
-#: ../setup/keyboardshortcut.py:139
-msgid "_Delete"
-msgstr "ଲିଭାନ୍ତୁ (_D)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:254
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
-msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\nକିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:256
-msgid "Please press a key (or a key combination)"
-msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "ଠିକ ଅଛି (_O)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
 
-#: ../setup/main.py:102 ../setup/main.py:395
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "shift ସହିତ ସଂକ୍ଷିପ୍ତ ପଥକୁ ପୂର୍ବ ନିବେଶ ପଦ୍ଧତିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
 
-#: ../setup/main.py:329
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus ଡେମନ ଚାଲୁ ନାହିଁ। ଆପଣ ଏହାକୁ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
 
-#: ../setup/main.py:350
-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 ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ $HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ତାପରେ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
 
-#. Translators: %d == 5 currently
-#: ../setup/main.py:364
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ଡେମନ  %d ସେକଣ୍ଡରେ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
+msgstr ""
 
-#: ../setup/main.py:376
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
 
-#: ../setup/main.py:377
-msgid "switching input methods"
-msgstr "ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରୁଅଛି"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
+msgstr ""
 
-#: ../tools/main.vala:42
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "କେବଳ ଯନ୍ତ୍ର ନାମକୁ ତାଲିକାଭୁକ୍ତ କରନ୍ତୁ"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "IBus ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାରିବେ ନାହିଁ।\n"
 
-#: ../tools/main.vala:84
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "ଭାଷା: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "କୋଣସି ଯନ୍ତ୍ର ସେଟ ହୋଇନାହିଁ।\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ସେଟ କରିବାରେ ବିଫଳ।\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "ସର୍ବସାଧାରଣ ଯନ୍ତ୍ର ପାଇବାରେ ବିଫଳ।\n"
 
-#: ../tools/main.vala:204
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "ତନ୍ତ୍ର ପଞ୍ଜିକରଣ କ୍ୟାଶେକୁ ପଢ଼ନ୍ତୁ।"
 
-#: ../tools/main.vala:206
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "ପଞ୍ଜିକରଣ କ୍ୟାଶେ ଫାଇଲକୁ ପଢ଼ନ୍ତୁ।"
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "ପଞ୍ଜିକରଣ କ୍ୟାଶେ ଅବୈଧ ଅଟେ।\n"
 
-#: ../tools/main.vala:244
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "ତନ୍ତ୍ର ପଞ୍ଜିକରଣ କ୍ୟାଶେକୁ ଲେଖନ୍ତୁ।"
 
-#: ../tools/main.vala:246
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "ପଞ୍ଜିକରଣ କ୍ୟାଶେ ଫାଇଲକୁ ଲେଖନ୍ତୁ।"
 
-#: ../tools/main.vala:293
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "ଯନ୍ତ୍ରକୁ ସେଟ କରନ୍ତୁ କିମ୍ବା ଆଣନ୍ତୁ"
 
-#: ../tools/main.vala:294
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "ibus-ଡେମନରୁ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "ଉପଲବ୍ଧ ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../tools/main.vala:296
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(କାର୍ଯ୍ୟକାରୀ ହୋଇନାହିଁ)"
 
-#: ../tools/main.vala:297
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "ibus-ଡେମନକୁ ପୁନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ"
 
-#: ../tools/main.vala:298
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "ସଂସ୍କରଣ ଦେଖାନ୍ତୁ"
 
-#: ../tools/main.vala:299
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "ପଞ୍ଜିକରଣ କ୍ୟାଶେର ବିଷୟବସ୍ତୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../tools/main.vala:300
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "ପଞ୍ଜିକରଣ କ୍ୟାଶେ ସୃଷ୍ଟିକରନ୍ତୁ"
 
-#: ../tools/main.vala:301
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-ଡେମନର D-Bus ଠିକଣାକୁ ମୁଦ୍ରଣ କରନ୍ତୁ"
 
-#: ../tools/main.vala:302
+#: tools/main.vala:453
+#, fuzzy
+#| msgid "Show this information"
+msgid "Show the configuration values"
+msgstr "ଏହି ସୂଚନାକୁ ଦର୍ଶାନ୍ତୁ"
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "ଏହି ସୂଚନାକୁ ଦର୍ଶାନ୍ତୁ"
 
-#: ../tools/main.vala:308
+#: tools/main.vala:464
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "ବ୍ୟବହାର: %s COMMAND [OPTION...]\n\n"
+msgstr ""
+"ବ୍ୟବହାର: %s COMMAND [OPTION...]\n"
+"\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "ଆଦେଶଗୁଡିକ:\n"
 
-#: ../tools/main.vala:338
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ଟି ଗୋଟିଏ ଅଜଣା ନିର୍ଦ୍ଦେଶ!\n"
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
-msgstr "IBus ଅଦ୍ୟତନ"
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:234
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "ଅନ୍ୟାନ୍ୟ"
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
-msgid "Super+space is now the default hotkey."
-msgstr "Super+space ଟି ବର୍ତ୍ତମାନ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ହଟକି ଅଟେ।"
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)"
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, fuzzy, c-format
+#| msgid "Description:\n"
+msgid "Description: %s"
+msgstr "ବର୍ଣ୍ଣନା:\n"
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#, fuzzy
+#| msgid "IBus Update"
+msgid "IBus Panel"
+msgstr "IBus ଅଦ୍ୟତନ"
+
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#: ../ui/gtk3/panel.vala:711
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "ପସନ୍ଦ"
 
-#: ../ui/gtk3/panel.vala:742
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "ପୁନଃଚାଳନ"
 
-#: ../ui/gtk3/panel.vala:746
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "ବିଦାୟ ନିଅନ୍ତୁ"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ 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 = ଇଚ୍ଛାମୁତାବକ"
+
+#~ msgid "Super+space is now the default hotkey."
+#~ msgstr "Super+space ଟି ବର୍ତ୍ତମାନ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ହଟକି ଅଟେ।"

From 372bc3b55b761948964716eb2e17a868989bf9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 26 Aug 2020 23:53:20 +0900
Subject: [PATCH 651/816] =?UTF-8?q?po:=20Update=20translation=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update po/nb.po at 14.1%
https://translate.fedoraproject.org/projects/ibus/ibus/nb_NO/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/nb.po | 3346 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 2951 insertions(+), 395 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 58491e9a7..d1b605f9c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,693 +1,3249 @@
-# translation of ibus.pot to Norwegian Bokmål
 # Norwegian Bokmål translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Kjartan Maraas <kmaraas@gnome.org>, 2012
+# Allan Nordhøy <epost@anotheragency.no>, 2020.
+# Anonymous <noreply@weblate.org>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:48+0000\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-05-24 12:40+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: Norwegian Bokmål <https://translate.fedoraproject.org/"
+"projects/ibus/ibus/nb_NO/>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.4\n"
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
-msgstr "Horisontal"
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "Forhåndsinnlast motorer"
 
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Vertikal"
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "Forhåndsinnlast motorer under IBus-oppstart"
 
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "Motorrekkefølge"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr "Lagret motorrekkefølge i listen over inndatametoder"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
 msgstr ""
+"Antall millisekunder oppstartsforsinkelse for oppsprettsvindu der man kan "
+"bytte IME"
 
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+#, fuzzy
+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 ""
+"Sett oppsettsforsinkelse i millisekunder for å vise IME-vekslervindu. "
+"Forvalget er 400. 0 = Vis vinduet umiddelvbart. 0 <  forsinkelse "
+"millisekunder. 0 > Ikke vis vinduet og bytt til forrige/neste motor."
 
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Nederste venstre hjørne"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "Lagret versjonsnummer"
 
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Nederste høyre hjørne"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+#, fuzzy
+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 ""
+"Lagret versjonsnummer brukes til å sjekke forskjellen mellom versjonen av "
+"tidligere installert IBus, og nåværende IBus."
 
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Egendefinert"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:32
+#, fuzzy
+msgid "Latin layouts which have no ASCII"
+msgstr "Latinsk oppsett som ikke har ASCII"
 
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr ""
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr "Amerikansk oppsett som legges til den latinske. Variant kan utelates."
 
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "Bruk xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"Kjøre xmodmap hvis .xmodmap eller .Xmodmap finnes når IBus-motorer byttes."
 
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Alltid"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Bruk systemets tastaturoppsett"
 
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "Brukervalg for IBus"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Bruk systemtastatur (XKB)-oppsett"
 
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "Bygg inn forhåndsredigert tekst"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "Bygg inn forhåndsredigert tekst i programvindu"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
 msgstr ""
 
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Neste inndatametode:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Del samme inndatametode mellom alle programmer"
 
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Slå på inndatametode som forvalg"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Forrige inndatametode:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
 
-#: ../setup/setup.ui.h:16
-msgid "..."
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
 msgstr ""
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
 msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "Slå på eller av:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "Slå på:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr ""
 
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "Slå av:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Tastatursnarveier</b>"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr "Slå av snarveistaster"
 
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
 msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
 msgstr ""
 
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "Posisjon for språkpanel:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr "Skjul automatisk"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
 msgid "Show icon on system tray"
 msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 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"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "Bruk egendefinert skrift:"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
 
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>Skrift og stil</b>"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr "Bruk egendefinert skrift"
 
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "Generelt"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr "Egendefinert skriftnavn i språkpanelet"
 
-#. add button
-#: ../setup/setup.ui.h:35 ../setup/keyboardshortcut.py:127
-msgid "_Add"
-msgstr "_Legg til"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr "Egendefinert skrift"
 
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr "Egendefinert skriftnavn for språkpanelet"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "Unicode-snarveistaster for gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "Fje_rn"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "_Opp"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#, fuzzy
+#| msgid "Custom font name for language panel"
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr "Egendefinert skriftnavn for språkpanelet"
 
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr "Forvalgt språk for emoji-ordbok"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "Ne_d"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
 
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
 msgstr ""
 
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "_Om"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "Vis informasjon om valgt inndatametode"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 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:209
+msgid "Other"
+msgstr "Annet"
+
+#: setup/emojilang.py:67
+#, fuzzy
+#| msgid "Select an input method"
+msgid "Select a language"
+msgstr "Velg en inndatametode"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mer…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "Om"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_Lukk"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Språk: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Tastaturutforming: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Forfatter: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Beskrivelse: \n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Velg en inndatametode"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Legg til"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Inndatametode"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Tastatur"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Innstillinger for IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Sett innstillinger for IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Tastatursnarveier"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Tastekode:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Endringstaster:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Bruk"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Slett"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+"Trykk en tast (eller en tastekombinasjon)\n"
+"Dialogen vil lukkes når tasten slippes."
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Trykk en tast (eller en tastekombinasjon)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "Bruk snarvei med shift for å bytte til forrige inndatametode"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "Velg tastatursnarvei for %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Vannrett"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Loddrett"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Nederste venstre hjørne"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Nederste høyre hjørne"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Ikke vis"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Skjul automatisk"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Alltid"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Neste inndatametode:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Forrige inndatametode:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Slå på eller av:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Slå på:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Slå av:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Tastatursnarveier</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Vis egenskapspanel:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Posisjon for språkpanel:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Bruk egendefinert skrift:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Skrift og stil</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Generelt"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Opp"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "Ne_d"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Om"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Vis info om valgt inndatametode"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Innstillinger"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+#, fuzzy
+#| msgid "Use custom font:"
+msgid "Unicode font:"
+msgstr "Bruk egendefinert skrift:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Tastaturutforming</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Globale innstillinger for inndatametode</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "Avansert"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>Den intelligente inndatabussen</small>\n"
+"Hjemmeside: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "Start ibus ved pålogging"
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>Oppstart</b>"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Aktiviteter"
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Dyr og natur"
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Komponent"
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr "Flagg"
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr "Mat og drikke"
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr "Objekter"
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr "Folk og kropp"
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr "Smilefjes og føleri"
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr "Symboler"
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr "Reiser og plasser"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Grunnleggende latinsk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Latinsk-1-tillegg"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Latinsk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Latinsk utvividet-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "IPA-utvidelser"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Kyrillisk-utvidelse"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Armensk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Arabisk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr "Bokstavlignende symboler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr "Tallformer"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr "Piler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr "Matematiske operatorer"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr "Ymse teknisk"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr "Kontrollbilder"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr "Optisk tegngjenkjennelse"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr "Geometriske former"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr "Ymse symboler"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+#, fuzzy
+#| msgid "Vertical"
+msgid "Vertical Forms"
+msgstr "Vertikal"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr "Spesialtegn"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+msgstr ""
 
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "_Brukervalg"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
 
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
 msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
 msgstr ""
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
-msgid "Input Method"
-msgstr "Inndatametode"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+msgstr ""
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
-msgid "Use system keyboard layout"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
 msgstr ""
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
-msgid "Use system keyboard (XKB) layout"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
 msgstr ""
 
-#: ../setup/setup.ui.h:51
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Tastaturutforming</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
+msgstr ""
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
-msgid "Share the same input method among all applications"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
 msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Globale innstillinger for inndatametode</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr ""
 
-#: ../setup/setup.ui.h:54
-msgid "Advanced"
-msgstr "Avansert"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr ""
 
-#: ../setup/setup.ui.h:55
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
 msgstr ""
 
-#: ../setup/setup.ui.h:62
-msgid "Start ibus on login"
-msgstr "Start ibus ved pålogging"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr ""
 
-#: ../setup/setup.ui.h:63
-msgid "<b>Startup</b>"
-msgstr "<b>Oppstart</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr ""
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
-msgid "About"
-msgstr "Om"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr ""
 
-#: ../setup/setup.ui.h:65 ../setup/engineabout.py:36
-msgid "_Close"
-msgstr "_Lukk"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Preload engines"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines during ibus starts up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Engines order"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Saved engines order in input method list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Popup delay milliseconds for IME switcher window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
 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 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Saved version number"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
 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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
-msgstr "Slå av snarveitaster"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
-msgid "The shortcut keys for turning input method off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-msgid "Next engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-msgid "The shortcut keys for switching to the next input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
-msgid "Prev engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for switching to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Auto hide"
-msgstr "Skjul automatisk"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid ""
-"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
-"show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-msgid "Language panel position"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
 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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Follow the input cursor in case the panel is always shown"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid ""
-"If true, the panel follows the input cursor in case the panel is always "
-"shown. If false, the panel is shown at a fixed location."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
-msgid "The milliseconds to show property panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
-msgid ""
-"The milliseconds to show property panel after focus-in or properties are "
-"changed."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Orientation of lookup table"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
-msgid "Show input method name"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
-msgid "Use custom font"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
-msgid "Use custom font name for language panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
-msgid "Custom font"
-msgstr "Egendefinert skrift"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:38
-msgid "Custom font name for language panel"
-msgstr "Egendefinert skriftnavn for språkpanelet"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:39
-msgid "Embed Preedit Text"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:40
-msgid "Embed Preedit Text in Application Window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-msgid "Use global input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
-msgid "Enable input method by default"
-msgstr "Slå på inndatametode som forvalg"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
-msgid "Enable input method by default when the application gets input focus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:45
-msgid "DConf preserve name prefixes"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
-msgid "Prefixes of DConf keys to stop name conversion"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
 msgstr ""
 
-#: ../ibus/_config.py.in:41
-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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
-msgid "Other"
-msgstr "Annet"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr ""
 
-#: ../setup/engineabout.py:68
-#, python-format
-msgid "Language: %s\n"
-msgstr "Språk: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
 
-#: ../setup/engineabout.py:71
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Tastaturutforming: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
 
-#: ../setup/engineabout.py:74
-#, python-format
-msgid "Author: %s\n"
-msgstr "Forfatter: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
 
-#: ../setup/engineabout.py:77
-msgid "Description:\n"
-msgstr "Beskrivelse: \n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139
-msgid "Select an input method"
-msgstr "Velg en inndatametode"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
 
-#: ../setup/enginetreeview.py:94
-msgid "Kbd"
-msgstr "Tastatur"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Sett brukervalg for IBus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Tastatursnarveier"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:66
-msgid "Key code:"
-msgstr "Tastekode:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:81
-msgid "Modifiers:"
-msgstr "Endringstaster:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:133
-msgid "_Apply"
-msgstr "_Bruk"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
 
-#. delete button
-#: ../setup/keyboardshortcut.py:139
-msgid "_Delete"
-msgstr "_Slett"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:254
-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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:256
-msgid "Please press a key (or a key combination)"
-msgstr "Vennligst trykk en tast (eller en tastekombinasjon)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:338 ../setup/main.py:374
-msgid "_Cancel"
-msgstr "_Avbryt"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:375
-msgid "_OK"
-msgstr "_OK"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
 
-#: ../setup/main.py:102 ../setup/main.py:395
-msgid "Use shortcut with shift to switch to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
-#: ../setup/main.py:329
-msgid "The IBus daemon is not running. Do you wish to start it?"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
-#: ../setup/main.py:350
-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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
 msgstr ""
 
-#. Translators: %d == 5 currently
-#: ../setup/main.py:364
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
 msgstr ""
 
-#: ../setup/main.py:376
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "Velg tastatursnarvei for %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
 
-#: ../setup/main.py:377
-msgid "switching input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:42
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
-msgstr ""
+msgstr "Kan ikke koble til IBus.\n"
 
-#: ../tools/main.vala:84
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "språk: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr ""
+msgstr "Ingen motor er angitt.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:165
-#, c-format
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:204
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr "Nullstiller…"
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr "Ferdig"
+
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: tools/main.vala:446
 msgid "Show available engines"
-msgstr ""
+msgstr "Vis tilgjengelige motorer"
 
-#: ../tools/main.vala:296
+#: tools/main.vala:447
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(Ikke implementert)"
 
-#: ../tools/main.vala:297
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:298
+#: tools/main.vala:449
 msgid "Show version"
-msgstr ""
+msgstr "Vis versjon"
 
-#: ../tools/main.vala:299
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
-msgid "Show this information"
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
+msgid "Show this information"
+msgstr "Vis denne informasjonen"
+
+#: tools/main.vala:464
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
+"Bruk: %s KOMMANDO [KOMMANDOVALG…]\n"
+"\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: tools/main.vala:465
 msgid "Commands:\n"
-msgstr ""
+msgstr "Kommandoer:\n"
 
-#: ../tools/main.vala:338
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
+msgstr "%s er en ukjent kommando!\n"
+
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr "Favoritter"
+
+#: ui/gtk3/emojier.vala:234
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "Annet"
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "_Lukk"
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr "Meny"
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, fuzzy, c-format
+#| msgid "Description:\n"
+msgid "Description: %s"
+msgstr "Beskrivelse: \n"
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr "Navn: %s"
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr "SKRIFT"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr "SPRÅK"
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
-msgid "Super+space is now the default hotkey."
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#, fuzzy
+#| msgid "IBus Preferences"
+msgid "IBus Panel"
+msgstr "Brukervalg for IBus"
+
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inndatabuss for Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:711
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../ui/gtk3/panel.vala:742
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "Start på nytt"
 
-#: ../ui/gtk3/panel.vala:746
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "Avslutt"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"

From 79f055780b43cb629f5fb98f618f774df4ab9484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 26 Aug 2020 23:53:27 +0900
Subject: [PATCH 652/816] po: Update translation (Swedish)

Update po/sv.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/sv/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/sv.po | 75 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index a521c7ab9..d84f42235 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # Swedish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -9,20 +9,22 @@
 # Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata
+# Allan Nordhøy <epost@anotheragency.no>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-05-24 12:40+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: Swedish <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/sv/>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-06-11 10:11+0000\n"
-"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
-"Language-Team: Swedish\n"
-"Language: sv\n"
-"X-Generator: Zanata 4.6.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.4\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -48,13 +50,13 @@ msgstr "Fördröjning i millisekunder för pop-up-fönster för IME-byte"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 ""
-"Ange fördröjningen i millisekunder för att visa pop-up-fönstret för IME-byte."
-"  Standard är 400.  0 = Visa fönstret omedelbart. 0 < Vänta millisekunder. 0 "
-"> Visa inte fönstret och byt till föregående/nästa maskin."
+"Ange fördröjningen i millisekunder för att visa pop-up-fönstret för IME-"
+"byte.  Standard är 400.  0 = Visa fönstret omedelbart. 0 < Vänta "
+"millisekunder. 0 > Visa inte fönstret och byt till föregående/nästa maskin."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -202,8 +204,8 @@ msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"Om sant följer panelen inmatningsmarkören i fallet när panelen alltid visas. "
-" Om falskt visas panelen på en bestämd plats."
+"Om sant följer panelen inmatningsmarkören i fallet när panelen alltid "
+"visas.  Om falskt visas panelen på en bestämd plats."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
@@ -249,10 +251,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB-ikonen visar layout-strängen och strängen visas med RGBA-värdet.  RGBA-"
 "värdet kan vara 1. ett färgnamn från X11, 2. ett hexadecimalt värde på "
@@ -380,8 +382,8 @@ msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
-"Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 =="
-" prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
+"Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 "
+"== prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
@@ -417,10 +419,11 @@ msgstr ""
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007-2010 Peng Huang\n"
+msgstr ""
+"Copyright © 2007-2010 Peng Huang\n"
 "Copyright © 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Andra"
 
@@ -535,7 +538,7 @@ msgstr ""
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-demonen kör inte.  Vill du starta den?"
+msgstr "IBus-demonen kör inte. Vill du starta den?"
 
 #: setup/main.py:536
 msgid ""
@@ -666,8 +669,7 @@ msgstr "Språkpanelens position:"
 
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Visa inmatningsmetodens namn i språkpanelen när kryssrytan är iklickad"
+msgstr "Visa inmatningsmetodens namn i språkpanelen när kryssrytan är iklickad"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
@@ -750,8 +752,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr "Kortkommandot för att aktivera emoji-annoteringar eller Unicode-namn"
 
 #: setup/setup.ui:875
@@ -3105,9 +3106,11 @@ msgstr "Visa denna information"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Användning: %s KOMMANDO [FLAGGA …]\n"
+msgstr ""
+"Användning: %s KOMMANDO [FLAGGA …]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3207,9 +3210,9 @@ msgstr "Unicode-val"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Misslyckades att få det aktuella textprogrammet.  Fokusera om ditt program.  "
 "T.ex. tryck Esc-tangenten flera gånger för att släppa emoji-"
@@ -3226,7 +3229,7 @@ msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
@@ -3237,7 +3240,7 @@ msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"

From 80f50a73b347146b381fe2145fd1d1a9c74ca848 Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Wed, 26 Aug 2020 23:58:44 +0900
Subject: [PATCH 653/816] po: Update translation (Chinese (Traditional))

Update po/zh_TW.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_TW/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/zh_TW.po | 114 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 46 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index d388da08c..0402be5b1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
 # Traditional Chinese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,20 +15,22 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Peter Pan <pan93412@gmail.com>, 2019. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
+# Yi-Jyun Pan <pan93412@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-05-24 12:40+0000\n"
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
+"Language-Team: Chinese (Traditional) <https://translate.fedoraproject.org/"
+"projects/ibus/ibus/zh_TW/>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2019-10-24 19:18+0900\n"
-"PO-Revision-Date: 2019-11-25 09:53+0000\n"
-"Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <chinese-l10n@googlegroups.com>\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Weblate 4.0.4\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -54,11 +56,12 @@ msgstr "IME 切換器視窗彈出延遲的毫秒數"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 > 不顯示視窗及切換上下引擎。"
+"設定用來顯示 IME 切換器視窗的彈出視窗延遲毫秒。預設值是 400。0 = 永遠顯示視"
+"窗。0 < 延遲毫秒。0 > 不顯示視窗及切換上下引擎。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -68,7 +71,9 @@ msgstr "儲存的版本號碼"
 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/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -85,7 +90,8 @@ msgstr "使用 xmodmap"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "當 ibus 引擎切換之時，若 .xmodmap 或 .Xmodmap 存在的話，則執行 xmodmap。 "
+msgstr ""
+"當 ibus 引擎切換之時，若 .xmodmap 或 .Xmodmap 存在的話，則執行 xmodmap。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
@@ -199,7 +205,9 @@ msgstr "在面板總是顯示的情況下跟隨輸入游標"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "若為真，則面板會在總是顯示的情況下跟隨輸入游標。若為假，則面板會顯示在固定位置上。"
+msgstr ""
+"若為真，則面板會在總是顯示的情況下跟隨輸入游標。若為假，則面板會顯示在固定位"
+"置上。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
@@ -242,15 +250,16 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 定義的顏色，2."
-"「#rrggbb」格式的十六進位值，其中 r、g、b 分別是紅色、綠色與藍色，3. 「rgb(r,g,b)」格式的 RGB 色彩，4."
-"「rgba(r,g,b,a)」格式的 RGBA 採，其中的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a "
-"則是 0 至 1 之間的浮點 alpha 值。"
+"XKB 圖示會顯示鍵盤配置的字串，且該字串會以 RGBA 值繪製。RGBA 值可以是 1. X11 "
+"定義的顏色，2.「#rrggbb」格式的十六進位值，其中 r、g、b 分別是紅色、綠色與藍"
+"色，3. 「rgb(r,g,b)」格式的 RGB 色彩，4.「rgba(r,g,b,a)」格式的 RGBA 採，其中"
+"的 r、g、b 為 0 至 255 之間的整數值，或 0% 至 100% 之間的百分比，而 a 則是 0 "
+"至 1 之間的浮點 alpha 值。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
@@ -263,8 +272,9 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"當切換引擎時將面板的引擎圖示改顯示為屬性圖示的毫秒數，若 IBusEngineDesc 中該屬性的 icon-prop-key 值有指定的話。如果值為 "
-"0，則沒有延遲時間，該屬性圖示將立即顯示。"
+"當切換引擎時將面板的引擎圖示改顯示為屬性圖示的毫秒數，若 IBusEngineDesc 中該"
+"屬性的 icon-prop-key 值有指定的話。如果值為 0，則沒有延遲時間，該屬性圖示將立"
+"即顯示。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
@@ -312,7 +322,8 @@ msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
-"請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/dicts/emoji-$lang.dict"
+"請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/"
+"dicts/emoji-$lang.dict"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -360,7 +371,9 @@ msgstr "選擇部分符合繪文字註解的條件"
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr "選擇下列部分符合繪文字註解的條件之一：0 == 前綴符合，1 == 後綴符合, 2 == 內含符合"
+msgstr ""
+"選擇下列部分符合繪文字註解的條件之一：0 == 前綴符合，1 == 後綴符合, 2 == 內含"
+"符合"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
@@ -372,8 +385,8 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"如果為 True 則在每次開啟時載入 Emoji 資料，載入資料大約需要 10MB 的記憶體大小。當設定為 False 時則在第一次開啟 Emoji "
-"對話框時載入 Emoji 資料。"
+"如果為 True 則在每次開啟時載入 Emoji 資料，載入資料大約需要 10MB 的記憶體大"
+"小。當設定為 False 時則在第一次開啟 Emoji 對話框時載入 Emoji 資料。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
@@ -386,14 +399,16 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"如果為 True 則在每次開啟時載入 Unicode 資料。載入資料需要大約 15MB 大小的記憶體。如果設定為 False 則在第一次開啟 Emoji "
-"對話框時載入 Unicode 資料，就算設定為 True，Unicode 資料永遠都會在 Emoji 資料載入後才載入。"
+"如果為 True 則在每次開啟時載入 Unicode 資料。載入資料需要大約 15MB 大小的記憶"
+"體。如果設定為 False 則在第一次開啟 Emoji 對話框時載入 Unicode 資料，就算設定"
+"為 True，Unicode 資料永遠都會在 Emoji 資料載入後才載入。"
 
 #: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "著作權所有 (c) 2007-2010 黃鵬\n"
+msgstr ""
+"著作權所有 (c) 2007-2010 黃鵬\n"
 "著作權所有 (c) 2007-2010 Red Hat, Inc."
 
 #: ibus/lang.py:41 src/ibusutil.c:209
@@ -496,7 +511,8 @@ msgstr "刪除(_D)"
 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:255
@@ -519,7 +535,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus 已經啟動！若您無法使用 IBus，請將下列文字加入您的 $HOME/.bashrc 中；接著重新登入桌面。\n"
+"IBus 已經啟動！若您無法使用 IBus，請將下列文字加入您的 $HOME/.bashrc 中；接著"
+"重新登入桌面。\n"
 "export GTK_IM_MODULE=ibus\n"
 "export XMODIFIERS=@im=ibus\n"
 "export QT_IM_MODULE=ibus"
@@ -711,12 +728,12 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選取的輸入法之中切換使用中的輸入法。</i></small>"
+"<small><i>您可以透過按下鍵盤快捷鍵，或是點按面板圖示的方式，來從上列清單中選"
+"取的輸入法之中切換使用中的輸入法。</i></small>"
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr "啟用繪文字符號或 Unicode 名稱轉換的快捷鍵"
 
 #: setup/setup.ui:875
@@ -3057,7 +3074,7 @@ msgstr "重設組態值"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard "
-msgstr "將對話窗中的繪文字儲存到剪貼簿"
+msgstr "將對話窗中的繪文字儲存到剪貼簿 "
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3065,9 +3082,11 @@ msgstr "顯示此資訊"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "用法：%s COMMAND [OPTION...]\n"
+msgstr ""
+"用法：%s COMMAND [OPTION...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3167,10 +3186,12 @@ msgstr "Unicode 選擇"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
-msgstr "無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出繪文字輸入模式後，按一下桌面再重按您的文字應用程式一次。"
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+"無法取得目前的文字應用程式，請重新取回您應用程式的焦點。例如按幾次 Esc 退出繪"
+"文字輸入模式後，按一下桌面再重按您的文字應用程式一次。"
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
@@ -3182,7 +3203,7 @@ msgstr "已將繪文字複製到您的剪貼簿。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "繪文字對話盒之繪文字字元用「FONT」字型"
@@ -3193,7 +3214,7 @@ msgstr "FONT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "繪文字對話盒的「LANG」語言註解。例：「en」"
@@ -3226,7 +3247,8 @@ msgstr "IBus 為 Linux/Unix 上的智慧型輸入法框架。"
 msgid "translator-credits"
 msgstr ""
 "Ding-Yi Chen 陳定彞 <dchen@redhat.com>, 2009.\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-17."
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2010-17.\n"
+"Yi-Jyun Pan <pan93412@gmail.com>, 2019-20."
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"

From 5671a28d379c29b66702a42518528534c6e3d85f Mon Sep 17 00:00:00 2001
From: Tian Shixiong <tiansworld@gmail.com>
Date: Thu, 27 Aug 2020 08:48:30 +0900
Subject: [PATCH 654/816] po: Update translation (Chinese (Simplified))

Update po/zh_CN.po at 47.2%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/zh_CN.po | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85a8f1dee..dbd59ee51 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -17,7 +17,7 @@
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Pany <pany@fedoraproject.org>, 2019. #zanata
-# Tian Shixiong <tiansworld@fedoraproject.org>, 2019. #zanata
+# Tian Shixiong <tiansworld@fedoraproject.org>, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
@@ -26,12 +26,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-07-26 04:03+0000\n"
-"Last-Translator: Tian Shixiong <tiansworld@fedoraproject.org>\n"
-"Language-Team: Chinese (China) <trans-zh_cn@lists.fedoraproject.org>\n"
+"PO-Revision-Date: 2020-06-16 00:40+0000\n"
+"Last-Translator: Tian Shixiong <tiansworld@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
+"projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Weblate 4.0.4\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -61,6 +62,8 @@ msgid ""
 " 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show "
 "the window and switch prev/next engines."
 msgstr ""
+"设置弹出显示输入法引擎切换窗口的延迟时间，单位为毫秒。默认为 400。0 = 立即显示窗口。 0 <延迟毫秒数. 0> "
+"不显示窗口并切换到之前或之后的引擎。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -256,9 +259,8 @@ msgstr ""
 "100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
-#, fuzzy
 msgid "The milliseconds to show the panel icon for a property"
-msgstr "显示属性面板的毫秒数"
+msgstr "显示属性面板图标的毫秒数"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""

From c1a8204e9d6e3d18fd749dd572b46fd768fe46a2 Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Thu, 27 Aug 2020 08:56:04 +0900
Subject: [PATCH 655/816] po: Update translation (Chinese (Simplified))

Update po/zh_CN.po at 47.6%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/zh_CN.po | 111 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 47 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dbd59ee51..3b0bf4938 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,22 +17,24 @@
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Pany <pany@fedoraproject.org>, 2019. #zanata
-# Tian Shixiong <tiansworld@fedoraproject.org>, 2019, 2020.
+# Tian Shixiong <tiansworld@fedoraproject.org>, 2019. #zanata
+# Tian Shixiong <tiansworld@gmail.com>, 2020.
+# Boyuan Yang <073plan@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2020-06-16 00:40+0000\n"
-"Last-Translator: Tian Shixiong <tiansworld@gmail.com>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-07-11 15:27+0000\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.0.4\n"
+"X-Generator: Weblate 4.1.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -58,12 +60,12 @@ msgstr "输入法切换窗口弹出延时微秒数"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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> "
-"不显示窗口并切换到之前或之后的引擎。"
+"设置弹出显示输入法引擎切换窗口的延迟时间，单位为毫秒。默认为 400。0 = 立即显"
+"示窗口。 0 <延迟毫秒数. 0> 不显示窗口并切换到之前或之后的引擎。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -205,7 +207,9 @@ msgstr "在始终显示的情况下面板跟随输入光标"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "若为真，当面板设为始终显示时面板将跟随输入光标。若为假，面板将在固定位置显示。"
+msgstr ""
+"若为真，当面板设为始终显示时面板将跟随输入光标。若为假，面板将在固定位置显"
+"示。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
@@ -248,14 +252,15 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
-msgstr ""
-"XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜色名；2. '#rrggbb' "
-"形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. "
-"'rgba(r,g,b,a)' 形式的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+"XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜"
+"色名；2. '#rrggbb' 形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数"
+"字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. 'rgba(r,g,b,a)' 形式"
+"的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 "
 "100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
@@ -316,7 +321,8 @@ msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
-"在表情输入对话框中选择默认表情输入语言。设定值 $lang 会应用于 /usr/share/ibus/dicts/emoji-$lang.dict"
+"在表情输入对话框中选择默认表情输入语言。设定值 $lang 会应用于 /usr/share/"
+"ibus/dicts/emoji-$lang.dict"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -364,7 +370,8 @@ msgstr "选择一种条件来部分匹配表情注释"
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr "选择以下条件来部分匹配表情注释：0 == 字首匹配, 1 == 字尾匹配, 2 == 包含匹配"
+msgstr ""
+"选择以下条件来部分匹配表情注释：0 == 字首匹配, 1 == 字尾匹配, 2 == 包含匹配"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
@@ -376,7 +383,8 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"如果设定为真 (True)，则在启动时载入表情数据。大概需要 10MB 内存来载入数据。如果设定为假 (False)，则在打开表情对话框时加载表情数据。"
+"如果设定为真 (True)，则在启动时载入表情数据。大概需要 10MB 内存来载入数据。如"
+"果设定为假 (False)，则在打开表情对话框时加载表情数据。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid "Load the Unicode data at the time of startup"
@@ -389,17 +397,19 @@ msgid ""
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果设为“False”，则当打开表情符号对话框时加载 "
-"Unicode 数据。Unicode 数据总是会在表情符号数据加载之后加载，即使设置为“True”也是如此。"
+"如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果"
+"设为“False”，则当打开表情符号对话框时加载 Unicode 数据。Unicode 数据总是会在"
+"表情符号数据加载之后加载，即使设置为“True”也是如此。"
 
 #: ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "版权所有 (c) 2007-2010 黄鹏\n"
+msgstr ""
+"版权所有 (c) 2007-2010 黄鹏\n"
 "版权所有 (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "其他"
 
@@ -499,7 +509,8 @@ msgstr "删除(_D)"
 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:255
@@ -522,7 +533,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登录您的桌面。\n"
+"IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登"
+"录您的桌面。\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -713,13 +725,14 @@ msgid ""
 "<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>"
-msgstr "<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
+msgstr ""
+"<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入"
+"法</i></small>"
 
 #: setup/setup.ui:873
 #, fuzzy
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr "启用在表情符号注释或 Unicode 名称间转换的快捷键"
 
 #: setup/setup.ui:875
@@ -732,7 +745,7 @@ msgstr ""
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
-msgstr ""
+msgstr "Unicode 码位："
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
@@ -740,7 +753,7 @@ msgstr "设置表情符号对话框中 Unicode 候选字的字体"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
-msgstr "Unicode 字体"
+msgstr "Unicode 字体："
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -3007,7 +3020,7 @@ msgstr ""
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr "正在重置"
+msgstr "正在重置…"
 
 #: tools/main.vala:399
 msgid "Done"
@@ -3067,9 +3080,11 @@ msgstr "显示本信息"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "用法：%s 命令 [选项...]\n"
+msgstr ""
+"用法：%s 命令 [选项...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3123,12 +3138,12 @@ msgstr "点击查看警告信息"
 
 #: ui/gtk3/emojier.vala:1172
 msgid "Loading a Unicode dictionary:"
-msgstr "正在加载 Unicode 字典"
+msgstr "正在加载 Unicode 字典："
 
 #: ui/gtk3/emojier.vala:1418
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "码位：%s"
 
 #: ui/gtk3/emojier.vala:1424
 msgid "Has emoji variants"
@@ -3169,10 +3184,12 @@ msgstr ""
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
-msgstr "无法捕捉当前文字应用程序。请重新让该应用程序获得焦点。比如多次按 Esc 键来释放表情输入模式，点击桌面然后再点击该文字应用程序。"
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+"无法捕捉当前文字应用程序。请重新让该应用程序获得焦点。比如多次按 Esc 键来释放"
+"表情输入模式，点击桌面然后再点击该文字应用程序。"
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
@@ -3184,7 +3201,7 @@ msgstr "已将 emoji 复制到你的剪贴板"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 #, fuzzy
 msgid "\"FONT\" for emoji characters on emoji dialog"
@@ -3196,7 +3213,7 @@ msgstr "字体"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""

From 61feeedf217bedf0fd9c25138398d6dd89738c87 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu, 27 Aug 2020 09:24:02 +0900
Subject: [PATCH 656/816] po: Update translation (Hebrew)

Update po/he.po at 28.4%
https://translate.fedoraproject.org/projects/ibus/ibus/he/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/he.po | 3478 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 3022 insertions(+), 456 deletions(-)

diff --git a/po/he.po b/po/he.po
index b75fe42ba..11a5db0e3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,4 +1,3 @@
-# translation of ibus.pot to Hebrew
 # Hebrew translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
@@ -10,649 +9,3072 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-17 12:25+0900\n"
-"PO-Revision-Date: 2020-01-05 18:49+0000\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-08-04 15:29+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <https://translate.stg.fedoraproject.org/projects/ibus/"
+"Language-Team: Hebrew <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.1.1\n"
 
-#: ../setup/setup.ui.h:1
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "לטעון מנועים מראש"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "לטעון מנועים במהלך הטעינה של ibus"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "סדר מנועים"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr "סדר מנועים שמור ברשימת שיטות קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "השהיית חלונית קופצת במילישניות לחלון בורר IME"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "מספר גרסה שמור"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr "פריסות לטיניות שאין להן ASCII"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr "פריסת ארה״ב נוספת לסוף הפריסות הלטיניות. אפשר להשמיט את ההגוון."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "להשתמש ב־xmodmap"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr "להריץ את xmodmap אם קיימים ‎.xmodmap או ‎.Xmodmap בעת החלפת מנועי ibus."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "להשתמש בפריסת המקלדת של המערכת"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "להשתמש בפריסת המקלדת של המערכת (XKB)"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr "הטעמת טקסט שנערך מראש"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr "להשתמש בשיטת קלט גלובלית"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "לשתף את אותה שיטת הקלט בין כל היישומים"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "הפעלת שיטת קלט כבררת מחדל"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr "הפעלת שיטת שלט כבררת מחדל כאשר היישום מקבל מיקוד על קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr "שימור קידומות שמות ב־DConf"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr "קידומות של מפתחות ב־DConf להפסקת המרת שמות עבורן"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr "מקשי קיצור להקפצה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr "הפעלת מקשי קיצור"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr "מקשי הקיצור להפעלת שיטת קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr "השבתת מקשי קיצור"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr "מקשי הקיצור לכיבוי שיטת קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr "מקשי הקיצור למנוע הבא"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "מקשי הקיצור למעבר לשיטת הקלט הבאה ברשימה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr "מקשי הקיצור למנוע הקודם"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "מקשי הקיצור למעבר לשיטת הקלט הקודמת ברשימה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr "הסתרה אוטומטית"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"התנהגות חלונית המאפיינים. 0 = לא להציג, 1 = להסתיר אוטומטית, 2 = להציג תמיד"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr "מיקום חלונית שפה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr "לעקוב אחר סמן הקלט במקרה שהחלונית תמיד מופיעה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+"אם true (אמת), החלונית עוקבת אחר סמן הקלט במקרה שהחלונית מופיעה תמיד. אם "
+"false (שקר), החלונית מופיעה במקום קבוע."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr "המילישניות להצגת חלונית המאפיינים"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr "המילישניות להצגת חלונית מאפיינים לאחר שינויים במיקוד או במאפיינים."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr "כיוון טבלת החיפוש"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "כיוון טבלת החיפוש. 0 = אופקית, 1 = אנכית"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "הצגת סמל במגש המערכת"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr "להציג את שם שיטת הקלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "הצגת שם שיטת הקלט בסרגל השפה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr "ערך RGBA של סמל XKB"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+#, fuzzy
+#| msgid "The milliseconds to show property panel"
+msgid "The milliseconds to show the panel icon for a property"
+msgstr "המילישניות להצגת חלונית המאפיינים"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr "להשתמש בגופן מותאם אישית"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr "להשתמש בשם של גופן בהתאמה אישית ללוח השפה"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr "גופן בהתאמה אישית"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr "שם גופן בהתאמה אישית לחלונית גופן"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#, fuzzy
+#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#, fuzzy
+#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#, fuzzy
+#| msgid "Custom font name for language panel"
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr "שם גופן בהתאמה אישית לחלונית גופן"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+"כל הזכויות שמורות (c) 2007‏-2010 פנג הואנג\n"
+"כל הזכויות שמורות (c) 2007‏-2010 רד הט בע״מ."
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr "אחר"
+
+#: setup/emojilang.py:67
+#, fuzzy
+#| msgid "Select an input method"
+msgid "Select a language"
+msgstr "נא לבחור שיטת קלט"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr ""
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr ""
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr "על אודות"
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr "_סגירה"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "שפה: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "פריסת מקלדת: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "יצירה: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "תיאור:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "נא לבחור שיטת קלט"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "הו_ספה"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "שיטת קלט"
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr "Kbd"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "העדפות IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "הגדרת העדפות IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "קיצורי מקלדת"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "קוד מקש:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "מקשי החלפה:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr ""
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr ""
+
+#: setup/keyboardshortcut.py:252
+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:255
+msgid "Please press a key (or a key combination)"
+msgstr "נא ללחוץ על מקש (או על צירוף מקשים)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "יש להשתמש במקש קיצור עם shift כדי לעבור לשיטת הקלט הקודמת"
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "הסוכן של IBus אינו פעיל. להפעיל אותו?"
+
+#: setup/main.py:536
+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 הופעל! אם אין לך אפשרות להשתמש ב־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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr "לא ניתן להפעיל את הסוכן של IBus תוך %d שניות"
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "נא לבחור קיצור מקלדת עבור %s"
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr "החלפת שיטות קלט"
+
+#: setup/setup.ui:11
 msgid "Horizontal"
 msgstr "אופקי"
 
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "אנכי"
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "אנכי"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "פינה שמאלית עליונה"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "פינה ימנית עליונה"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "פינה שמאלית תחתונה"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "פינה ימנית תחתונה"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "בהתאמה אישית"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "לא להציג"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "להסתיר אוטומטית"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "תמיד"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "מקשי הקיצור להחלפה לשיטת הקלט הבאה ברשימה"
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "שיטת הקלט הבאה:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "מקשי הקיצור להחלפה לשיטת הקלט הקודמת ברשימה"
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "שיטת הקלט הקודמת:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "…"
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "הפעלה או השבתה:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "הפעלה:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "השבתה:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>קיצורי מקלדת</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr "הגדרת כיוון המועמדים בטבלת החיפוש"
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr "כיוון המועמדים:"
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "הגדרת ההתנהגות של ibus בנוגע להצגת או הסתרת סרגל השפה"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "הצגת לוח מאפיינים:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "מיקום לוח השפה:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "להציג את שם שיטת הקלט בסרגל השפה כשהתיבה מסומנת"
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr "הטמעת הטקסט שנערך מראש של שיטת קלט בחלון היישום"
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "להשתמש בגופן בהתאמה אישית:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>גופן וסגנון</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "כללי"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr "להוסיף את שיטת הקלט הנבחרת לשיטות הקלט הפעילות"
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "הס_רה"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "להסיר את שיטת הקלט הנבחרת משיטות הקלט הפעילות"
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "למ_עלה"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "להעלות את שיטת הקלט ברשימת שיטות הקלט הפעילות"
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "למ_טה"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "להוריד את שיטת הקלט ברשימת שיטות הקלט הפעילות"
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "על _אודות"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "להציג מידע על שיטת הקלט הנבחרת"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "הע_דפות"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "להציג את הגדרות שיטת הקלט הנבחרת"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small>ניתן להחליף את שיטת הקלט באופן מחזורי מתוך הנבחרות שברשימה הבאה על "
+"ידי לחיצה על מקשי הקיצור במקלדת או על ידי לחיצה על הסמל שבלוח.</small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+#, fuzzy
+#| msgid "The shortcut keys for turning input method on or off"
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+#, fuzzy
+#| msgid "Use custom font:"
+msgid "Unicode font:"
+msgstr "להשתמש בגופן בהתאמה אישית:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr ""
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>פריסת מקלדת</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>הגדרות גלובליות לשיטות קלט</b>"
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr "מתקדם"
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>אפיק הקלט החכם</small>\n"
+"דף הבית: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr "להפעיל את ibus עם הכניסה למערכת"
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr "<b>התחלה</b>"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+#, fuzzy
+#| msgid "Vertical"
+msgid "Vertical Forms"
+msgstr "אנכי"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "פינה שמאלית עליונה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "פינה ימנית עליונה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "פינה שמאלית תחתונה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "פינה ימנית תחתונה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "בהתאמה אישית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
 
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "לא להציג"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
 
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "להסתיר אוטומטית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
 
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "תמיד"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
 
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "העדפות IBus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
-msgstr "מקשי הקיצור להחלפה לשיטת הקלט הבאה ברשימה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
 
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "שיטת הקלט הבאה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
 
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "מקשי הקיצור להחלפה לשיטת הקלט הקודמת ברשימה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
 
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "שיטת הקלט הקודמת:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
 
-#: ../setup/setup.ui.h:16
-msgid "..."
-msgstr "…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
-msgid "The shortcut keys for turning input method on or off"
-msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
 
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
-msgstr "הפעלה או השבתה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
-msgstr "הפעלה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
 
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
-msgstr "השבתה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>קיצורי מקלדת</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
-msgstr "הגדרת כיוון המועמדים בטבלת החיפוש"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
-msgstr "כיוון המועמדים:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
 
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "הגדרת ההתנהגות של ibus בנוגע להצגת או הסתרת סרגל השפה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr ""
 
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
-msgstr "הצגת לוח מאפיינים:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
-msgstr "מיקום לוח השפה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
-msgid "Show icon on system tray"
-msgstr "הצגת סמל במגש המערכת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
-msgid "Show input method name on language bar"
-msgstr "הצגת שם שיטת הקלט בסרגל השפה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr ""
 
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
-msgstr "להציג את שם שיטת הקלט בסרגל השפה כשהתיבה מסומנת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
-msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
-msgstr "הטמעת הטקסט שנערך מראש של שיטת קלט בחלון היישום"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
 
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
-msgstr "להשתמש בגופן בהתאמה אישית:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
 
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
-msgstr "<b>גופן וסגנון</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "General"
-msgstr "כללי"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
 
-#: ../setup/setup.ui.h:35
-msgid "_Add"
-msgstr "הו_ספה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Add the selected input method into the enabled input methods"
-msgstr "להוסיף את שיטת הקלט הנבחרת לשיטות הקלט הפעילות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "_Remove"
-msgstr "הס_רה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Remove the selected input method from the enabled input methods"
-msgstr "להסיר את שיטת הקלט הנבחרת משיטות הקלט הפעילות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "_Up"
-msgstr "למ_עלה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Move up the selected input method in the enabled input methods list"
-msgstr "להעלות את שיטת הקלט ברשימת שיטות הקלט הפעילות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
 
-#: ../setup/setup.ui.h:41
-msgid "_Down"
-msgstr "למ_טה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
 
-#: ../setup/setup.ui.h:42
-msgid "Move down the selected input method in the enabled input methods"
-msgstr "להוריד את שיטת הקלט ברשימת שיטות הקלט הפעילות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
 
-#: ../setup/setup.ui.h:43
-msgid "_About"
-msgstr "על _אודות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
 
-#: ../setup/setup.ui.h:44
-msgid "Show information of the selected input method"
-msgstr "להציג מידע על שיטת הקלט הנבחרת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
 
-#: ../setup/setup.ui.h:45
-msgid "_Preferences"
-msgstr "הע_דפות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
+msgstr ""
 
-#: ../setup/setup.ui.h:46
-msgid "Show setup of the selected input method"
-msgstr "להציג את הגדרות שיטת הקלט הנבחרת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
+msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid ""
-"<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>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
 msgstr ""
-"<small>ניתן להחליף את שיטת הקלט באופן מחזורי מתוך הנבחרות שברשימה הבאה על "
-"ידי לחיצה על מקשי הקיצור במקלדת או על ידי לחיצה על הסמל שבלוח.</small>"
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:66
-msgid "Input Method"
-msgstr "שיטת קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
+msgstr ""
 
-#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:33
-msgid "Use system keyboard layout"
-msgstr "להשתמש בפריסת המקלדת של המערכת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
+msgstr ""
 
-#: ../setup/setup.ui.h:50 ../data/ibus.schemas.in.h:34
-msgid "Use system keyboard (XKB) layout"
-msgstr "להשתמש בפריסת המקלדת של המערכת (XKB)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
+msgstr ""
 
-#: ../setup/setup.ui.h:51
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>פריסת מקלדת</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
+msgstr ""
 
-#: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
-msgid "Share the same input method among all applications"
-msgstr "לשתף את אותה שיטת הקלט בין כל היישומים"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
+msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid "<b>Global input method settings</b>"
-msgstr "<b>הגדרות גלובליות לשיטות קלט</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
+msgstr ""
 
-#: ../setup/setup.ui.h:54
-msgid "Advanced"
-msgstr "מתקדם"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:55
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>אפיק הקלט החכם</small>\n"
-"דף הבית: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:62
-msgid "Start ibus on login"
-msgstr "להפעיל את ibus עם הכניסה למערכת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
+msgstr ""
 
-#: ../setup/setup.ui.h:63
-msgid "<b>Startup</b>"
-msgstr "<b>התחלה</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
+msgstr ""
 
-#: ../setup/setup.ui.h:64 ../setup/engineabout.py:34 ../ui/gtk3/panel.vala:736
-msgid "About"
-msgstr "על אודות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
+msgstr ""
 
-#: ../setup/setup.ui.h:65
-msgid "_Close"
-msgstr "_סגירה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Preload engines"
-msgstr "לטעון מנועים מראש"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines during ibus starts up"
-msgstr "לטעון מנועים במהלך הטעינה של ibus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Engines order"
-msgstr "סדר מנועים"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Saved engines order in input method list"
-msgstr "סדר מנועים שמור ברשימת שיטות קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Popup delay milliseconds for IME switcher window"
-msgstr "השהיית חלונית קופצת במילישניות לחלון בורר IME"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
+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 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
 msgstr ""
-"הגדרת השהיית חלונית קופצת במילישניות כדי להציג חלון בורר IME. בררת המחדל היא "
-"400. 0 = להציג את החלון מיידית. 0 &lt; ההשהיה במילישניות. 0 &gt; לא להצין את "
-"החלון ולהחליף למנוע הקודם/הבא."
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Saved version number"
-msgstr "מספר גרסה שמור"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
+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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
 msgstr ""
-"מספר הגרסה השמור ישמש לבדוק את ההבדל בין הגרסה של ה־ibus הקודם שהותקן לזאת "
-"של ה־ibus הנוכחי."
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
-msgstr "מקשי קיצור להקפצה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
-msgstr "הפעלת מקשי קיצור"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
-msgstr "מקשי הקיצור להפעלת שיטת קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
-msgstr "השבתת מקשי קיצור"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
-msgid "The shortcut keys for turning input method off"
-msgstr "מקשי הקיצור לכיבוי שיטת קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-msgid "Next engine shortcut keys"
-msgstr "מקשי הקיצור למנוע הבא"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "מקשי הקיצור למעבר לשיטת הקלט הבאה ברשימה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
-msgid "Prev engine shortcut keys"
-msgstr "מקשי הקיצור למנוע הקודם"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for switching to the previous input method"
-msgstr "מקשי הקיצור למעבר לשיטת הקלט הקודמת ברשימה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Auto hide"
-msgstr "הסתרה אוטומטית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid ""
-"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
-"show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
 msgstr ""
-"התנהגות חלונית המאפיינים. 0 = לא להציג, 1 = להסתיר אוטומטית, 2 = להציג תמיד"
 
-#: ../data/ibus.schemas.in.h:22
-msgid "Language panel position"
-msgstr "מיקום חלונית שפה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
+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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
 msgstr ""
-"מיקום חלונית השפה. 0 = פינה שמאלית עליונה, 1 = פינה ימנית עליונה, 2 = פינה "
-"שמאלית תחתונה, 3 = פינה ימנית תחתונה, 4 = בהתאמה אישית"
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Follow the input cursor in case the panel is always shown"
-msgstr "לעקוב אחר סמן הקלט במקרה שהחלונית תמיד מופיעה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid ""
-"If true, the panel follows the input cursor in case the panel is always "
-"shown. If false, the panel is shown at a fixed location."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
-"אם true (אמת), החלונית עוקבת אחר סמן הקלט במקרה שהחלונית מופיעה תמיד. אם "
-"false (שקר), החלונית מופיעה במקום קבוע."
 
-#: ../data/ibus.schemas.in.h:26
-msgid "The milliseconds to show property panel"
-msgstr "המילישניות להצגת חלונית המאפיינים"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
-msgid ""
-"The milliseconds to show property panel after focus-in or properties are "
-"changed."
-msgstr "המילישניות להצגת חלונית מאפיינים לאחר שינויים במיקוד או במאפיינים."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Orientation of lookup table"
-msgstr "כיוון טבלת החיפוש"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "כיוון טבלת החיפוש. 0 = אופקית, 1 = אנכית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
-msgid "Show input method name"
-msgstr "להציג את שם שיטת הקלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
-msgid "Use custom font"
-msgstr "להשתמש בגופן מותאם אישית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
-msgid "Use custom font name for language panel"
-msgstr "להשתמש בשם של גופן בהתאמה אישית ללוח השפה"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
-msgid "Custom font"
-msgstr "גופן בהתאמה אישית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:38
-msgid "Custom font name for language panel"
-msgstr "שם גופן בהתאמה אישית לחלונית גופן"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:39
-msgid "Embed Preedit Text"
-msgstr "הטעמת טקסט שנערך מראש"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:40
-msgid "Embed Preedit Text in Application Window"
-msgstr "הטמעת טקסט שנערך מראש בחלון היישום"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-msgid "Use global input method"
-msgstr "להשתמש בשיטת קלט גלובלית"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
-msgid "Enable input method by default"
-msgstr "הפעלת שיטת קלט כבררת מחדל"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
-msgid "Enable input method by default when the application gets input focus"
-msgstr "הפעלת שיטת שלט כבררת מחדל כאשר היישום מקבל מיקוד על קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:45
-msgid "DConf preserve name prefixes"
-msgstr "שימור קידומות שמות ב־DConf"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
-msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "קידומות של מפתחות ב־DConf להפסקת המרת שמות עבורן"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
-"כל הזכויות שמורות (c) 2007‏-2010 פנג הואנג\n"
-"כל הזכויות שמורות (c) 2007‏-2010 רד הט בע״מ."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
-msgid "Other"
-msgstr "אחר"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
+msgstr ""
 
-#: ../setup/engineabout.py:68
-#, python-format
-msgid "Language: %s\n"
-msgstr "שפה: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
+msgstr ""
 
-#: ../setup/engineabout.py:71
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "פריסת מקלדת: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
+msgstr ""
 
-#: ../setup/engineabout.py:74
-#, python-format
-msgid "Author: %s\n"
-msgstr "יצירה: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
+msgstr ""
 
-#: ../setup/engineabout.py:77
-msgid "Description:\n"
-msgstr "תיאור:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139
-msgid "Select an input method"
-msgstr "נא לבחור שיטת קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
+msgstr ""
 
-#: ../setup/enginetreeview.py:94
-msgid "Kbd"
-msgstr "Kbd"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "הגדרת העדפות IBus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
-msgid "Keyboard shortcuts"
-msgstr "קיצורי מקלדת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:65
-msgid "Key code:"
-msgstr "קוד מקש:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:80
-msgid "Modifiers:"
-msgstr "מקשי החלפה:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
 msgstr ""
-"נא ללחוץ על מקש (או על צירוף מקשים).\n"
-"תיבת הדו־שיח תיסגר עם שחרור המקשים."
 
-#: ../setup/keyboardshortcut.py:252
-msgid "Please press a key (or a key combination)"
-msgstr "נא ללחוץ על מקש (או על צירוף מקשים)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
 
-#: ../setup/main.py:102 ../setup/main.py:395
-msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "יש להשתמש במקש קיצור עם shift כדי לעבור לשיטת הקלט הקודמת"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
 
-#: ../setup/main.py:329
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "הסוכן של IBus אינו פעיל. להפעיל אותו?"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
 
-#: ../setup/main.py:350
-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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
 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:364
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "לא ניתן להפעיל את הסוכן של IBus תוך %d שניות"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
 
-#: ../setup/main.py:376
-#, python-format
-msgid "Select keyboard shortcut for %s"
-msgstr "נא לבחור קיצור מקלדת עבור %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
 
-#: ../setup/main.py:377
-msgid "switching input methods"
-msgstr "החלפת שיטות קלט"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
+msgstr ""
 
-#: ../tools/main.vala:42
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr "List engine name only"
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Can't connect to IBus.\n"
 
-#: ../tools/main.vala:84
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "language: %s\n"
 
-#: ../tools/main.vala:152
-#, c-format
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr "No engine is set.\n"
 
-#: ../tools/main.vala:160
-#, c-format
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr "Set global engine failed.\n"
 
-#: ../tools/main.vala:165
-#, c-format
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr "Get global engine failed.\n"
 
-#: ../tools/main.vala:204
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr "Read the system registry cache."
 
-#: ../tools/main.vala:206
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr "Read the registry cache FILE."
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr "The registry cache is invalid.\n"
 
-#: ../tools/main.vala:244
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr "Write the system registry cache."
 
-#: ../tools/main.vala:246
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr "Write the registry cache FILE."
 
-#: ../tools/main.vala:293
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr "Set or get engine"
 
-#: ../tools/main.vala:294
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr "Exit ibus-daemon"
 
-#: ../tools/main.vala:295
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Show available engines"
 
-#: ../tools/main.vala:296
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Not implemented)"
 
-#: ../tools/main.vala:297
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Restart ibus-daemon"
 
-#: ../tools/main.vala:298
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Show version"
 
-#: ../tools/main.vala:299
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr "Show the content of registry cache"
 
-#: ../tools/main.vala:300
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr "Create registry cache"
 
-#: ../tools/main.vala:301
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print the D-Bus address of ibus-daemon"
 
-#: ../tools/main.vala:302
+#: tools/main.vala:453
+#, fuzzy
+#| msgid "Show this information"
+msgid "Show the configuration values"
+msgstr "Show this information"
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Show this information"
 
-#: ../tools/main.vala:308
+#: tools/main.vala:464
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
@@ -661,46 +3083,190 @@ msgstr ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 
-#: ../tools/main.vala:309
-#, c-format
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Commands:\n"
 
-#: ../tools/main.vala:338
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is unknown command!\n"
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
-msgstr "עדכון IBus"
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:234
+#, fuzzy
+#| msgid "Other"
+msgid "Others"
+msgstr "אחר"
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "_סגירה"
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, c-format
+msgid "Description: %s"
+msgstr "תיאור: %s"
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
-msgid "Super+space is now the default hotkey."
-msgstr "Super+רווח הוא מקש הקיצור כבררת המחדל מעכשיו."
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr "לוח IBus"
 
-#: ../ui/gtk3/panel.vala:707
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus היא אפיק קלט חכם ללינוקס/יוניקס."
 
-#: ../ui/gtk3/panel.vala:711
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr "Yaron Shahrabani <sh.yaron@gmail.com>"
 
-#: ../ui/gtk3/panel.vala:732
+#: ui/gtk3/panel.vala:1118
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../ui/gtk3/panel.vala:742
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr "הפעלה מחדש"
 
-#: ../ui/gtk3/panel.vala:746
+#: ui/gtk3/panel.vala:1148
 msgid "Quit"
 msgstr "יציאה"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:RTL"
+
+#~ 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 = בהתאמה אישית"
+
+#~ msgid "Super+space is now the default hotkey."
+#~ msgstr "Super+רווח הוא מקש הקיצור כבררת המחדל מעכשיו."

From 55795f466a441e975b4cb0d1160bad7638e7ca00 Mon Sep 17 00:00:00 2001
From: Shehroz Kaleem <shehrozkhawajachk@gmail.com>
Date: Thu, 27 Aug 2020 09:37:23 +0900
Subject: [PATCH 657/816] po: Update translation (Urdu)

Update po/ur.po at 0.5%
https://translate.fedoraproject.org/projects/ibus/ibus/ur/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/ur.po | 3186 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 2879 insertions(+), 307 deletions(-)

diff --git a/po/ur.po b/po/ur.po
index 7b0320388..52c858d43 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -1,637 +1,3209 @@
-# translation of ibus.pot to Urdu
 # Urdu translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
+# Shehroz Kaleem <shehrozkhawajachk@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2014-02-12 15:12+0900\n"
-"PO-Revision-Date: 2014-02-12 07:40+0000\n"
-"Last-Translator: fujiwara <tfujiwar@redhat.com>\n"
-"Language-Team: Urdu <trans-ur@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-06-30 11:40+0000\n"
+"Last-Translator: Shehroz Kaleem <shehrozkhawajachk@gmail.com>\n"
+"Language-Team: Urdu <https://translate.fedoraproject.org/projects/ibus/ibus/"
+"ur/>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.1.1\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "پہلے سے موجود"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr "پہلے سے موجود"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "Custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr ""
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr ""
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr ""
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr ""
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr ""
+
+#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+msgid "About"
+msgstr ""
+
+#: setup/engineabout.py:40 setup/setup.ui:1401
+msgid "_Close"
+msgstr ""
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr ""
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr ""
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr ""
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr ""
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr ""
+
+#: setup/enginetreeview.py:96
+msgid "Kbd"
+msgstr ""
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr ""
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr ""
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr ""
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr ""
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr ""
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr ""
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr ""
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr ""
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr ""
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr ""
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr ""
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr ""
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr ""
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr ""
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr ""
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr ""
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr ""
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr ""
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr ""
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr ""
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr ""
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr ""
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr ""
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr ""
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr ""
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr ""
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr ""
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr ""
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr ""
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr ""
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr ""
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr ""
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr ""
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: setup/setup.ui:1298
+msgid "Advanced"
+msgstr ""
+
+#: setup/setup.ui:1317
+msgid ""
+"<big><b>IBus</b></big>\n"
+"<small>The intelligent input bus</small>\n"
+"Homepage: https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+
+#: setup/setup.ui:1341
+msgid "Start ibus on login"
+msgstr ""
+
+#: setup/setup.ui:1358
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
 
-#: ../setup/setup.ui.h:1
-msgid "Horizontal"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
 msgstr ""
 
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
 msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
 msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
 msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
 msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
 msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid "Custom"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
 msgstr ""
 
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
 msgstr ""
 
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
 msgstr ""
 
-#: ../setup/setup.ui.h:10
-msgid "Always"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
 msgstr ""
 
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
 msgstr ""
 
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
 msgstr ""
 
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
 msgstr ""
 
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
 msgstr ""
 
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
 msgstr ""
 
-#: ../setup/setup.ui.h:16
-msgid "..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
 msgstr ""
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
-msgid "The shortcut keys for turning input method on or off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
 msgstr ""
 
-#: ../setup/setup.ui.h:18
-msgid "Enable or disable:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
 msgstr ""
 
-#: ../setup/setup.ui.h:19
-msgid "Enable:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
 msgstr ""
 
-#: ../setup/setup.ui.h:20
-msgid "Disable:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
 msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "<b>Keyboard Shortcuts</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
 msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Set the orientation of candidates in lookup table"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
 msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "Candidates orientation:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
 msgstr ""
 
-#: ../setup/setup.ui.h:24
-msgid "Set the behavior of ibus how to show or hide language bar"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
 msgstr ""
 
-#: ../setup/setup.ui.h:25
-msgid "Show property panel:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Language panel position:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
 msgstr ""
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:30
-msgid "Show icon on system tray"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
 msgstr ""
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:32
-msgid "Show input method name on language bar"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
 msgstr ""
 
-#: ../setup/setup.ui.h:29
-msgid "Show input method's name on language bar when check the checkbox"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
 msgstr ""
 
-#: ../setup/setup.ui.h:30
-msgid "Embed preedit text in application window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Old Sogdian"
 msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Embed the preedit text of input method in the application window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Sogdian"
 msgstr ""
 
-#: ../setup/setup.ui.h:32
-msgid "Use custom font:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Elymaic"
 msgstr ""
 
-#: ../setup/setup.ui.h:33
-msgid "<b>Font and Style</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Brahmi"
 msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "General"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Kaithi"
 msgstr ""
 
-#: ../setup/setup.ui.h:35
-msgid "Add the selected input method into the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sora Sompeng"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Remove the selected input method from the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Chakma"
 msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Move up the selected input method in the enabled input methods list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Mahajani"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Move down the selected input method in the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Sharada"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "Show information of the selected input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Sinhala Archaic Numbers"
 msgstr ""
 
-#: ../setup/setup.ui.h:40
-msgid "Show setup of the selected input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Khojki"
 msgstr ""
 
-#: ../setup/setup.ui.h:41
-msgid ""
-"<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>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Multani"
 msgstr ""
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
-msgid "Input Method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khudawadi"
 msgstr ""
 
-#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:33
-msgid "Use system keyboard layout"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Grantha"
 msgstr ""
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:34
-msgid "Use system keyboard (XKB) layout"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Newa"
 msgstr ""
 
-#: ../setup/setup.ui.h:45
-msgid "<b>Keyboard Layout</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Tirhuta"
 msgstr ""
 
-#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:42
-msgid "Share the same input method among all applications"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Siddham"
 msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid "<b>Global input method settings</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Modi"
 msgstr ""
 
-#: ../setup/setup.ui.h:48
-msgid "Advanced"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Mongolian Supplement"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Takri"
 msgstr ""
 
-#: ../setup/setup.ui.h:56
-msgid "Start ibus on login"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Ahom"
 msgstr ""
 
-#: ../setup/setup.ui.h:57
-msgid "<b>Startup</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Dogra"
 msgstr ""
 
-#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
-msgid "About"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Warang Citi"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:1
-msgid "Preload engines"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Nandinagari"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines during ibus starts up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Zanabazar Square"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:3
-msgid "Engines order"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Soyombo"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
-msgid "Saved engines order in input method list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Pau Cin Hau"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Popup delay milliseconds for IME switcher window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Bhaiksuki"
 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 &lt; Delay milliseconds. 0 &gt; Do "
-"not show the window and switch prev/next engines."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Marchen"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Saved version number"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Masaram Gondi"
 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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Gunjala Gondi"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Trigger shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Makasar"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Tamil Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-msgid "Enable shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Cuneiform"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "The shortcut keys for turning input method on"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-msgid "Disable shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Early Dynastic Cuneiform"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
-msgid "The shortcut keys for turning input method off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Egyptian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:16
-msgid "Next engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-msgid "The shortcut keys for switching to the next input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Anatolian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
-msgid "Prev engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Bamum Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for switching to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Mro"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Auto hide"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Bassa Vah"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid ""
-"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
-"show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Pahawh Hmong"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-msgid "Language panel position"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Medefaidrin"
 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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Miao"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Follow the input cursor in case the panel is always shown"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid ""
-"If true, the panel follows the input cursor in case the panel is always "
-"shown. If false, the panel is shown at a fixed location."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Tangut"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
-msgid "The milliseconds to show property panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Tangut Components"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
-msgid ""
-"The milliseconds to show property panel after focus-in or properties are "
-"changed."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Kana Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Orientation of lookup table"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Kana Extended-A"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Small Kana Extension"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
-msgid "Show input method name"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Nushu"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
-msgid "Use custom font"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Duployan"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
-msgid "Use custom font name for language panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Shorthand Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
-msgid "Custom font"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Byzantine Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:38
-msgid "Custom font name for language panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:39
-msgid "Embed Preedit Text"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Ancient Greek Musical Notation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:40
-msgid "Embed Preedit Text in Application Window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Mayan Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-msgid "Use global input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
-msgid "Enable input method by default"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Counting Rod Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:44
-msgid "Enable input method by default when the application gets input focus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:45
-msgid "DConf preserve name prefixes"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Sutton SignWriting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
-msgid "Prefixes of DConf keys to stop name conversion"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Glagolitic Supplement"
 msgstr ""
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
-msgid "Other"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Wancho"
 msgstr ""
 
-#: ../setup/engineabout.py:68
-#, python-format
-msgid "Language: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Mende Kikakui"
 msgstr ""
 
-#: ../setup/engineabout.py:71
-#, python-format
-msgid "Keyboard layout: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Adlam"
 msgstr ""
 
-#: ../setup/engineabout.py:74
-#, python-format
-msgid "Author: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Indic Siyaq Numbers"
 msgstr ""
 
-#: ../setup/engineabout.py:77
-msgid "Description:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
-#: ../setup/enginecombobox.py:139
-msgid "Select an input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
-#: ../setup/enginetreeview.py:94
-msgid "Kbd"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Mahjong Tiles"
 msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Domino Tiles"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:54
-msgid "Keyboard shortcuts"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Playing Cards"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:65
-msgid "Key code:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:80
-msgid "Modifiers:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Enclosed Ideographic Supplement"
 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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:252
-msgid "Please press a key (or a key combination)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Emoticons"
 msgstr ""
 
-#: ../setup/main.py:102 ../setup/main.py:395
-msgid "Use shortcut with shift to switch to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Ornamental Dingbats"
 msgstr ""
 
-#: ../setup/main.py:329
-msgid "The IBus daemon is not running. Do you wish to start it?"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Transport and Map Symbols"
 msgstr ""
 
-#: ../setup/main.py:350
-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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Alchemical Symbols"
 msgstr ""
 
-#. Translators: %d == 5 currently
-#: ../setup/main.py:364
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Geometric Shapes Extended"
 msgstr ""
 
-#: ../setup/main.py:376
-#, python-format
-msgid "Select keyboard shortcut for %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Supplemental Arrows-C"
 msgstr ""
 
-#: ../setup/main.py:377
-msgid "switching input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:42
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr ""
 
-#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
-#, c-format
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr ""
 
-#: ../tools/main.vala:84
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr ""
 
-#: ../tools/main.vala:152
-#, c-format
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:160
-#, c-format
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:165
-#, c-format
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:204
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:206
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:224 ../tools/main.vala:229
-#, c-format
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:244
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:246
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:293
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr ""
+
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:294
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:295
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr ""
 
-#: ../tools/main.vala:296
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr ""
 
-#: ../tools/main.vala:297
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:298
+#: tools/main.vala:449
 msgid "Show version"
 msgstr ""
 
-#: ../tools/main.vala:299
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:300
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:301
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:302
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard "
+msgstr ""
+
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr ""
 
-#: ../tools/main.vala:308
+#: tools/main.vala:464
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:309
-#, c-format
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr ""
 
-#: ../tools/main.vala:338
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:425
-msgid "IBus Update"
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:426 ../ui/gtk3/panel.vala:437
-msgid "Super+space is now the default hotkey."
+#: ui/gtk3/emojier.vala:994
+msgid "Bring back emoji choice"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:707
+#: ui/gtk3/emojier.vala:1096
+msgid "Page Down"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1107
+msgid "Page Up"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1110
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Close"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1117
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1128
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1172
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1418
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1424
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1591
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1615
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1641
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1649
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2141
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2429
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:58
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:93
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:114
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:115
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:120
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:121
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:123
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:131
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+msgid "IBus Panel"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1095
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:711
+#: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:743
+#: ui/gtk3/panel.vala:1118
+msgid "Preferences"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1144
 msgid "Restart"
 msgstr ""
 
+#: ui/gtk3/panel.vala:1148
+msgid "Quit"
+msgstr ""
+
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:374
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:RTL"

From 3b089a477268caa65e1c0ceb1741260b39049ef6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 27 Aug 2020 09:42:31 +0900
Subject: [PATCH 658/816] po: Update translation (French)

Update po/fr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/fr/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/fr.po | 63 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 10a5bd152..e8237a5bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-02-05 04:16+0000\n"
-"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-07-06 08:27+0000\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fr/>\n"
 "Language: fr\n"
@@ -37,7 +37,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10.3\n"
+"X-Generator: Weblate 4.1.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -65,9 +65,9 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 "
@@ -138,8 +138,7 @@ msgstr "Par défaut, activer la méthode d’entrée"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 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"
+"Par défaut, activer la méthode d’entrée lorsque l’application reçoit le focus"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -176,7 +175,7 @@ msgstr "Désactiver les raccourcis clavier"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr "Les raccourcis clavier pour désactiver  la méthode d’entrée"
+msgstr "Les raccourcis clavier pour désactiver la méthode d’entrée"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:90
 #: data/dconf/org.freedesktop.ibus.gschema.xml:95
@@ -271,10 +270,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "L’icône XKB affiche la chaîne de caractères de la disposition et cette "
 "chaîne de caractères est affichée avec sa valeur RGBA. Cette valeur RGBA "
@@ -336,8 +335,7 @@ msgstr "Raccourcis clavier des émoticônes pour gtk_accelerator_parse"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
-"Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
+msgstr "Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:184
 msgid "Custom font name for emoji characters on emoji dialog"
@@ -372,8 +370,7 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr ""
-"liste des annotations d’émoticônes favorites dans la boite de dialogue"
+msgstr "liste des annotations d’émoticônes favorites dans la boite de dialogue"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:199
 msgid "You can assign an annotation for a favorite emoji in this list."
@@ -416,8 +413,8 @@ msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
-"Choisissez une des conditions suivantes pour pour la correspondance "
-"partielle d’annotations d’émoticônes : 0 == correspondance de préfixe, 1 == "
+"Choisissez une des conditions suivantes pour la correspondance partielle "
+"d’annotations d’émoticônes : 0 == correspondance de préfixe, 1 == "
 "correspondance de suffixe, 2 == correspondance de contenu"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
@@ -460,7 +457,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Autre"
 
@@ -738,8 +735,7 @@ msgstr "Paramètres généraux"
 
 #: setup/setup.ui:671
 msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
+msgstr "Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée actives"
 
 #: setup/setup.ui:682
 msgid "_Remove"
@@ -798,8 +794,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Les touches de raccourcis pour activer les conversions des annotations "
 "d’émoticônes ou des noms Unicode"
@@ -841,7 +836,7 @@ msgid ""
 "the number of characters:"
 msgstr ""
 "Correspondances partielles d’annotations des émoticônes ayant les conditions "
-"suivantes et plus que le nombre de caractères  :"
+"suivantes et plus que le nombre de caractères :"
 
 #: setup/setup.ui:1067
 msgid ""
@@ -3158,9 +3153,11 @@ msgstr "Afficher cette information"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Utilisation : %s COMMANDE [OPTION…]\n"
+msgstr ""
+"Utilisation : %s COMMANDE [OPTION…]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3260,9 +3257,9 @@ msgstr "Choix Unicode"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Impossible d’obtenir l’application texte actuelle. Veuillez sélectionner à "
 "nouveau votre application. Par exemple, appuyez plusieurs fois sur la touche "
@@ -3279,7 +3276,7 @@ msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue"
@@ -3290,7 +3287,7 @@ msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""

From 2858c2b6ed0657cfd360a99b29bc44337200f37c Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Thu, 27 Aug 2020 09:45:33 +0900
Subject: [PATCH 659/816] po: Update translation (Danish)

Update po/da.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/da/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/da.po | 69 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/po/da.po b/po/da.po
index 84925242c..3947773b8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,28 +1,29 @@
 # Danish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2009,2011
-# scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
+# scootergrisen <scootergrisen@gmail.com>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# scootergrisen <scootergrisen@gmail.com>, 2018. #zanata
-# scootergrisen <scootergrisen@gmail.com>, 2019. #zanata
+# scootergrisen <scootergrisen@gmail.com>, 2018. #zanata, 2020.
+# scootergrisen <scootergrisen@gmail.com>, 2019. #zanata, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-07-21 19:28+0000\n"
+"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
+"Language-Team: Danish <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/da/>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-06-22 05:37+0000\n"
-"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.1.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -48,9 +49,9 @@ msgstr "Pop op-forsinkelse i millisekunder for IME-skifter-vindue"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 ""
 "Sæt pop op-forsinkelse millisekunder som IME-skifter-vindue skal vises. "
 "Standarden er 400. 0 = Vis vinduet med det samme. 0 < Forsinkelse "
@@ -85,7 +86,6 @@ msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 "Kør xmodmap hvis .xmodmap eller .Xmodmap findes når der skiftes ibus-motorer."
-""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
@@ -250,10 +250,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "XKB-ikon viser layoutstrengen og strengen gengives med RGBA-værdien. RGBA-"
 "værdien kan være 1. Et farvenavn fra X11, 2. En heksadecimalværdi i formatet "
@@ -380,8 +380,8 @@ msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
-"Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 ="
-"= Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
+"Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 "
+"== Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid "Load the emoji data at the time of startup"
@@ -421,7 +421,7 @@ msgstr ""
 "Ophavsret (c) 2007-2010 Peng Huang\n"
 "Ophavsret (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Andre"
 
@@ -751,8 +751,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Genvejstasterne til at aktivere samtaler med emoji-annoteringer eller "
 "unicode-navne"
@@ -3108,9 +3107,11 @@ msgstr "Vis denne information"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Anvendelse: %s KOMMANDO [TILVALG...]\n"
+msgstr ""
+"Anvendelse: %s KOMMANDO [TILVALG...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3210,9 +3211,9 @@ msgstr "Valg af unicode"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Kunne ikke hente det nuværende tekstprogram. Giv venligst fokus til dit "
 "program igen. Tryk f.eks. på Esc-tasten flere gange for at slippe fri fra "
@@ -3229,7 +3230,7 @@ msgstr "Kopierede en emoji til dit skrivebord."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
@@ -3240,7 +3241,7 @@ msgstr "SKRIFTTYPE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
@@ -3273,9 +3274,11 @@ msgstr "IBus er en intelligent indtastningsbus til Linux/Unix."
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
+"scootergrisen\n"
 "\n"
-"Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
-"Mere info: http://www.dansk-gruppen.dk"
+"Dansk-gruppen\n"
+"Websted http://dansk-gruppen.dk\n"
+"E-mail <dansk@dansk-gruppen.dk>"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"

From 3d636acbbe3a66b83d48b7cf917660522e745307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@mailbox.org>
Date: Thu, 27 Aug 2020 09:47:38 +0900
Subject: [PATCH 660/816] po: Update translation (Hungarian)

Update po/hu.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/hu/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/hu.po | 79 +++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 44 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index ed99c319a..14c713110 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,21 +12,22 @@
 # Meskó Balázs <meskobalazs@gmail.com>, 2018. #zanata
 # Meskó Balázs <meskobalazs@gmail.com>, 2019. #zanata
 # Balázs Meskó <meskobalazs@gmail.com>, 2020.
+# Balázs Meskó <meskobalazs@mailbox.org>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-05 18:49+0000\n"
-"Last-Translator: Balázs Meskó <meskobalazs@gmail.com>\n"
-"Language-Team: Hungarian <https://translate.stg.fedoraproject.org/projects/"
-"ibus/ibus/hu/>\n"
+"POT-Creation-Date: 2020-01-08 12:40+0900\n"
+"PO-Revision-Date: 2020-07-21 19:28+0000\n"
+"Last-Translator: Balázs Meskó <meskobalazs@mailbox.org>\n"
+"Language-Team: Hungarian <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.1.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -36,7 +37,7 @@ msgstr "Alrendszerek előtöltése"
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "Alrendszerek előtöltése  az ibus indításakor"
+msgstr "Alrendszerek előtöltése az ibus indításakor"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
@@ -52,12 +53,12 @@ msgstr "Felugró ablak késleltetése az IME váltóablaknál"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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ésleltetését az IME váltóablaknál. Az "
-"alapértelmezett 400.0  =  Ablak azonnali megjelenítése.  0 < Késleltetés "
+"alapértelmezett 400.0 = Ablak azonnali megjelenítése. 0 < Késleltetés "
 "ezredmásodpercben. 0 > Nem jeleníti meg az ablakot, és átvált a következő/"
 "előző alrendszerre."
 
@@ -132,8 +133,7 @@ msgstr "A DConf megőrzi a név előtagokat"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr ""
-"A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
+msgstr "A DConf előtaggal látja el a kulcsokat, hogy ne legyenek névkonverziók"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
@@ -146,7 +146,7 @@ msgstr "Gyorsbillentyűk a beviteli mód ki- vagy bekapcsolásához"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Aktiválja a gyorsbillentyűket a  gtk_accelerator_parse részére"
+msgstr "Aktiválja a gyorsbillentyűket a gtk_accelerator_parse részére"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
@@ -256,12 +256,12 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
-"Az XKB ikon a kiosztási karakterláncot mutatja, és a karakterlánc  RGBA "
+"Az XKB ikon a kiosztási karakterláncot mutatja, és a karakterlánc RGBA "
 "értékként jelenik meg. Az RGA érték a következők egyike lehet. 1. egy X11 "
 "színnév, 2. egy hexadecimális érték „#rrggbb” formában, ahol az „r”, „g” és "
 "„b” a vörös, zöld és kék színek értékei hexadecimális számjegyekkel, 3. egy "
@@ -304,7 +304,7 @@ msgstr "Egyéni betűkészlet neve a nyelv panelhez"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr "Unicode gyorsbillentyű a  gtk_accelerator_parse részére"
+msgstr "Unicode gyorsbillentyű a gtk_accelerator_parse részére"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
@@ -312,7 +312,7 @@ msgstr "Gyorsbillentyű az Unicode bevitel ki- vagy bekapcsolásához"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr "Emodzsi gyorsbillentyűket a  gtk_accelerator_parse részére"
+msgstr "Emodzsi gyorsbillentyűket a gtk_accelerator_parse részére"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
@@ -429,7 +429,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Egyéb"
 
@@ -540,8 +540,7 @@ msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt)"
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
-"Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli "
-"módra"
+"Használja a Shift billentyűt a gyors visszaváltáshoz a korábbi beviteli módra"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -766,8 +765,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Gyorsbillentyű az emodzsi annotációk vagy a Unicode nevek átalakításának "
 "engedélyezéséhez"
@@ -3124,9 +3122,11 @@ msgstr "Ezen információk megjelenítése"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Használat: %s PARANCS [KAPCSOLÓK…]\n"
+msgstr ""
+"Használat: %s PARANCS [KAPCSOLÓK…]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3226,14 +3226,13 @@ msgstr "Unicode választás"
 
 #: ui/gtk3/emojier.vala:2429
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Nem sikerült lekérni a jelenlegi szöveges alkalmazást. Hozza újra fókuszba "
 "az alkalmazást. Például nyomja meg többször az Esc gombot az emodzsi beírási "
 "módból kilépéshez, kattintson az asztalra, majd újra a szöveges alkalmazásra."
-""
 
 #: ui/gtk3/emojierapp.vala:58
 msgid "Canceled to choose an emoji."
@@ -3245,7 +3244,7 @@ msgstr "Emodzsi vágólapra másolva."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„BETŰKÉSZLET” az emodzsiválasztó párbeszédablakon"
@@ -3256,10 +3255,10 @@ msgstr "BETŰKÉSZLET"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
+#.
 #: ui/gtk3/emojierapp.vala:120
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "„NYELV”  az emodzsi párbeszédablak annotációhoz. Például „en”"
+msgstr "„NYELV” az emodzsi párbeszédablak annotációhoz. Például „en”"
 
 #: ui/gtk3/emojierapp.vala:121
 msgid "LANG"
@@ -3289,15 +3288,7 @@ msgstr "Az IBus egy intelligens beviteli busz Linux/Unix rendszerekhez."
 msgid "translator-credits"
 msgstr ""
 "Zoltan Hoppar <zoltanh721@fedoraproject.org>, 2012.\n"
-"Meskó Balázs <meskobalazs@fedoraproject.org>, 2017.\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"
+"Meskó Balázs <meskobalazs@fedoraproject.org>, 2017,2020."
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"

From 5959d6f1d40c06f57bd895cd84d2b84deb6b6d8d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 10:30:43 +0900
Subject: [PATCH 661/816] data/dconf: Fix rm $TMPDIR in
 make-dconf-override-db.sh

dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
via systemd since gvfs 1.45.90 in Fedora 33
---
 data/dconf/make-dconf-override-db.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
index 9c650e973..48dd8fac2 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -45,6 +45,10 @@ for schema in $schemas; do
   done
 done
 
+# dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
+# via systemd since gvfs 1.45.90 in Fedora 33
+# and rm $TMPDIR could be failed until umount would be called.
+umount $TMPDIR/cache/gvfs
 rm -rf $TMPDIR
 
 kill $DBUS_SESSION_BUS_PID

From 5d67a28bd134bd97b6942bf5199da810b184f63d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 10:31:02 +0900
Subject: [PATCH 662/816] engine: Update simple.xml with xkeyboard-config 2.30

---
 engine/simple.xml | 936 +++++++++++++++++++++++++---------------------
 1 file changed, 516 insertions(+), 420 deletions(-)

diff --git a/engine/simple.xml b/engine/simple.xml
index 0f2e79ae8..f546b2f35 100644
--- a/engine/simple.xml
+++ b/engine/simple.xml
@@ -2,8 +2,8 @@
 <component>
     <name>org.freedesktop.IBus.Simple</name>
     <description>A table based simple engine</description>
-    <exec>/usr/libexec/ibus-engine-simple</exec>
-    <version>1.5.22.20200821</version>
+    <exec>/usr/local/libexec/ibus-engine-simple</exec>
+    <version>1.5.22.20200826</version>
     <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
     <license>GPL</license>
     <homepage>https://github.com/ibus/ibus/wiki</homepage>
@@ -33,8 +33,20 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:euro:chr</name>
-            <language>chr</language>
+            <name>xkb:us:haw:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>haw</layout_variant>
+            <longname>Hawaiian</longname>
+            <description>Hawaiian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:euro:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -45,8 +57,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:intl:chr</name>
-            <language>chr</language>
+            <name>xkb:us:intl:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -57,8 +69,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:alt-intl:chr</name>
-            <language>chr</language>
+            <name>xkb:us:alt-intl:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -69,8 +81,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:colemak:chr</name>
-            <language>chr</language>
+            <name>xkb:us:colemak:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -81,8 +93,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -93,8 +105,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-intl:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak-intl:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -105,8 +117,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-alt-intl:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak-alt-intl:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -117,8 +129,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-l:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak-l:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -129,8 +141,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-r:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak-r:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -141,8 +153,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-classic:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvorak-classic:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -153,8 +165,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvp:chr</name>
-            <language>chr</language>
+            <name>xkb:us:dvp:haw</name>
+            <language>haw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -231,8 +243,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
             <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply keys toggle the layout)</longname>
-            <description>English (the divide/multiply keys toggle the layout)</description>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -243,8 +255,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
             <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply keys toggle the layout)</longname>
-            <description>English (the divide/multiply keys toggle the layout)</description>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -255,8 +267,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
             <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply keys toggle the layout)</longname>
-            <description>English (the divide/multiply keys toggle the layout)</description>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -590,8 +602,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
             <layout_variant>azerty_digits</layout_variant>
-            <longname>Arabic (AZERTY/digits)</longname>
-            <description>Arabic (AZERTY/digits)</description>
+            <longname>Arabic (AZERTY, Eastern Arabic numerals)</longname>
+            <description>Arabic (AZERTY, Eastern Arabic numerals)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -602,8 +614,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
             <layout_variant>digits</layout_variant>
-            <longname>Arabic (digits)</longname>
-            <description>Arabic (digits)</description>
+            <longname>Arabic (Eastern Arabic numerals)</longname>
+            <description>Arabic (Eastern Arabic numerals)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -626,8 +638,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ara</layout>
             <layout_variant>qwerty_digits</layout_variant>
-            <longname>Arabic (qwerty/digits)</longname>
-            <description>Arabic (qwerty/digits)</description>
+            <longname>Arabic (QWERTY, Eastern Arabic numerals)</longname>
+            <description>Arabic (QWERTY, Eastern Arabic numerals)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -803,8 +815,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>at</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (Austria, with Sun dead keys)</longname>
-            <description>German (Austria, with Sun dead keys)</description>
+            <longname>German (Austria, Sun dead keys)</longname>
+            <description>German (Austria, Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -889,6 +901,30 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:by:ru:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>ru</layout_variant>
+            <longname>Russian (Belarus)</longname>
+            <description>Russian (Belarus)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:intl:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Belarusian (intl.)</longname>
+            <description>Belarusian (intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:be::deu</name>
             <language>de</language>
@@ -965,8 +1001,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (alt., Latin-9 only)</longname>
-            <description>Belgian (alt., Latin-9 only)</description>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -977,8 +1013,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (alt., Latin-9 only)</longname>
-            <description>Belgian (alt., Latin-9 only)</description>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -989,8 +1025,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (alt., Latin-9 only)</longname>
-            <description>Belgian (alt., Latin-9 only)</description>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1001,8 +1037,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (alt., with Sun dead keys)</longname>
-            <description>Belgian (alt., with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1013,8 +1049,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (alt., with Sun dead keys)</longname>
-            <description>Belgian (alt., with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1025,8 +1061,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (alt., with Sun dead keys)</longname>
-            <description>Belgian (alt., with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1037,8 +1073,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (alt. ISO)</longname>
-            <description>Belgian (alt. ISO)</description>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1049,8 +1085,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (alt. ISO)</longname>
-            <description>Belgian (alt. ISO)</description>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1061,8 +1097,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (alt. ISO)</longname>
-            <description>Belgian (alt. ISO)</description>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1109,8 +1145,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (with Sun dead keys)</longname>
-            <description>Belgian (with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1121,8 +1157,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (with Sun dead keys)</longname>
-            <description>Belgian (with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1133,8 +1169,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>be</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (with Sun dead keys)</longname>
-            <description>Belgian (with Sun dead keys)</description>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1323,8 +1359,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>ben_gitanjali</layout_variant>
-            <longname>Bangla (India, Uni Gitanjali)</longname>
-            <description>Bangla (India, Uni Gitanjali)</description>
+            <longname>Bangla (India, Gitanjali)</longname>
+            <description>Bangla (India, Gitanjali)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1335,8 +1371,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>ben_gitanjali</layout_variant>
-            <longname>Bangla (India, Uni Gitanjali)</longname>
-            <description>Bangla (India, Uni Gitanjali)</description>
+            <longname>Bangla (India, Gitanjali)</longname>
+            <description>Bangla (India, Gitanjali)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1431,8 +1467,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>kan-kagapa</layout_variant>
-            <longname>Kannada (KaGaPa phonetic)</longname>
-            <description>Kannada (KaGaPa phonetic)</description>
+            <longname>Kannada (KaGaPa, phonetic)</longname>
+            <description>Kannada (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1587,8 +1623,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>tel-kagapa</layout_variant>
-            <longname>Telugu (KaGaPa phonetic)</longname>
-            <description>Telugu (KaGaPa phonetic)</description>
+            <longname>Telugu (KaGaPa, phonetic)</longname>
+            <description>Telugu (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1611,8 +1647,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>tel-kagapa</layout_variant>
-            <longname>Telugu (KaGaPa phonetic)</longname>
-            <description>Telugu (KaGaPa phonetic)</description>
+            <longname>Telugu (KaGaPa, phonetic)</longname>
+            <description>Telugu (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1647,8 +1683,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>urd-winkeys</layout_variant>
-            <longname>Urdu (Win keys)</longname>
-            <description>Urdu (Win keys)</description>
+            <longname>Urdu (Windows)</longname>
+            <description>Urdu (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1683,8 +1719,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>hin-kagapa</layout_variant>
-            <longname>Hindi (KaGaPa phonetic)</longname>
-            <description>Hindi (KaGaPa phonetic)</description>
+            <longname>Hindi (KaGaPa, phonetic)</longname>
+            <description>Hindi (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1695,8 +1731,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>san-kagapa</layout_variant>
-            <longname>Sanskrit (KaGaPa phonetic)</longname>
-            <description>Sanskrit (KaGaPa phonetic)</description>
+            <longname>Sanskrit (KaGaPa, phonetic)</longname>
+            <description>Sanskrit (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1707,8 +1743,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>mar-kagapa</layout_variant>
-            <longname>Marathi (KaGaPa phonetic)</longname>
-            <description>Marathi (KaGaPa phonetic)</description>
+            <longname>Marathi (KaGaPa, phonetic)</longname>
+            <description>Marathi (KaGaPa, phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1724,6 +1760,30 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:in:iipa:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>iipa</layout_variant>
+            <longname>Indic IPA (IIPA)</longname>
+            <description>Indic IPA (IIPA)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:marathi:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>marathi</layout_variant>
+            <longname>मराठी इन्स्क्रिप्ट</longname>
+            <description>मराठी इन्स्क्रिप्ट</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ba::bos</name>
             <language>bs</language>
@@ -1778,8 +1838,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ba</layout>
             <layout_variant>us</layout_variant>
-            <longname>Bosnian (US, with Bosnian letters)</longname>
-            <description>Bosnian (US, with Bosnian letters)</description>
+            <longname>Bosnian (US)</longname>
+            <description>Bosnian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1902,14 +1962,50 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:dz:ber:ber</name>
-            <language>ber</language>
+            <name>xkb:dz:azerty-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>azerty-deadkeys</layout_variant>
+            <longname>Kabylian (azerty layout, with dead keys)</longname>
+            <description>Kabylian (azerty layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:qwerty-gb-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>qwerty-gb-deadkeys</layout_variant>
+            <longname>Kabylian (qwerty-gb layout, with dead keys)</longname>
+            <description>Kabylian (qwerty-gb layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:qwerty-us-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>qwerty-us-deadkeys</layout_variant>
+            <longname>Kabylian (qwerty-us layout, with dead keys)</longname>
+            <description>Kabylian (qwerty-us layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:ber:kab</name>
+            <language>kab</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>ber</layout_variant>
-            <longname>Berber (Algeria, Tifinagh)</longname>
-            <description>Berber (Algeria, Tifinagh)</description>
+            <longname>Kabylian (Algeria, Tifinagh)</longname>
+            <description>Kabylian (Algeria, Tifinagh)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1968,8 +2064,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ma</layout>
             <layout_variant>tifinagh-alt-phonetic</layout_variant>
-            <longname>Berber (Morocco, Tifinagh alt. phonetic)</longname>
-            <description>Berber (Morocco, Tifinagh alt. phonetic)</description>
+            <longname>Berber (Morocco, Tifinagh phonetic, alt.)</longname>
+            <description>Berber (Morocco, Tifinagh phonetic, alt.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2039,8 +2135,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2051,8 +2147,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2063,8 +2159,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2075,8 +2171,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2087,8 +2183,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2099,8 +2195,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2111,8 +2207,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2123,8 +2219,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2135,8 +2231,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2147,8 +2243,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2159,8 +2255,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2171,8 +2267,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2183,8 +2279,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2195,8 +2291,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2207,8 +2303,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2219,8 +2315,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2231,8 +2327,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2243,8 +2339,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2255,8 +2351,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2267,8 +2363,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2279,8 +2375,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2291,8 +2387,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2303,8 +2399,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2315,8 +2411,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2327,8 +2423,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2339,8 +2435,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2351,8 +2447,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2363,8 +2459,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2375,8 +2471,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY)</longname>
-            <description>Cameroon Multilingual (QWERTY)</description>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2387,8 +2483,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2399,8 +2495,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2411,8 +2507,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2423,8 +2519,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2435,8 +2531,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2447,8 +2543,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2459,8 +2555,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2471,8 +2567,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2483,8 +2579,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2495,8 +2591,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2507,8 +2603,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2519,8 +2615,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2531,8 +2627,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2543,8 +2639,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2555,8 +2651,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2567,8 +2663,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2579,8 +2675,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2591,8 +2687,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2603,8 +2699,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2615,8 +2711,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2627,8 +2723,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2639,8 +2735,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2651,8 +2747,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2663,8 +2759,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2675,8 +2771,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2687,8 +2783,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2699,8 +2795,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2711,8 +2807,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2723,8 +2819,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>azerty</layout_variant>
-            <longname>Cameroon Multilingual (AZERTY)</longname>
-            <description>Cameroon Multilingual (AZERTY)</description>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2735,8 +2831,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2747,8 +2843,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2759,8 +2855,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2771,8 +2867,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2783,8 +2879,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2795,8 +2891,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2807,8 +2903,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2819,8 +2915,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2831,8 +2927,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2843,8 +2939,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2855,8 +2951,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2867,8 +2963,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2879,8 +2975,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2891,8 +2987,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2903,8 +2999,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2915,8 +3011,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2927,8 +3023,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2939,8 +3035,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2951,8 +3047,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2963,8 +3059,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2975,8 +3071,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2987,8 +3083,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2999,8 +3095,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3011,8 +3107,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3023,8 +3119,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3035,8 +3131,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3047,8 +3143,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3059,8 +3155,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3071,8 +3167,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
             <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon Multilingual (Dvorak)</longname>
-            <description>Cameroon Multilingual (Dvorak)</description>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3489,8 +3585,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
             <layout_variant>multix</layout_variant>
-            <longname>Canadian Multilingual</longname>
-            <description>Canadian Multilingual</description>
+            <longname>Canadian (intl.)</longname>
+            <description>Canadian (intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3501,8 +3597,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
             <layout_variant>multi</layout_variant>
-            <longname>Canadian Multilingual (1st part)</longname>
-            <description>Canadian Multilingual (1st part)</description>
+            <longname>Canadian (intl., 1st part)</longname>
+            <description>Canadian (intl., 1st part)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3513,8 +3609,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ca</layout>
             <layout_variant>multi-2gr</layout_variant>
-            <longname>Canadian Multilingual (2nd part)</longname>
-            <description>Canadian Multilingual (2nd part)</description>
+            <longname>Canadian (intl., 2nd part)</longname>
+            <description>Canadian (intl., 2nd part)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3607,8 +3703,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hr</layout>
             <layout_variant>us</layout_variant>
-            <longname>Croatian (US, with Croatian letters)</longname>
-            <description>Croatian (US, with Croatian letters)</description>
+            <longname>Croatian (US)</longname>
+            <description>Croatian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3737,8 +3833,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dk</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Danish (Win keys)</longname>
-            <description>Danish (Win keys)</description>
+            <longname>Danish (Windows)</longname>
+            <description>Danish (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3796,8 +3892,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>nl</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Dutch (with Sun dead keys)</longname>
-            <description>Dutch (with Sun dead keys)</description>
+            <longname>Dutch (Sun dead keys)</longname>
+            <description>Dutch (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3878,8 +3974,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ee</layout>
             <layout_variant>us</layout_variant>
-            <longname>Estonian (US, with Estonian letters)</longname>
-            <description>Estonian (US, with Estonian letters)</description>
+            <longname>Estonian (US)</longname>
+            <description>Estonian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4065,8 +4161,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Finnish (Winkeys)</longname>
-            <description>Finnish (Winkeys)</description>
+            <longname>Finnish (Windows)</longname>
+            <description>Finnish (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4148,8 +4244,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>French (with Sun dead keys)</longname>
-            <description>French (with Sun dead keys)</description>
+            <longname>French (Sun dead keys)</longname>
+            <description>French (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4196,8 +4292,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>French (alt., with Sun dead keys)</longname>
-            <description>French (alt., with Sun dead keys)</description>
+            <longname>French (alt., Sun dead keys)</longname>
+            <description>French (alt., Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4232,8 +4328,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>latin9_sundeadkeys</layout_variant>
-            <longname>French (legacy, alt., with Sun dead keys)</longname>
-            <description>French (legacy, alt., with Sun dead keys)</description>
+            <longname>French (legacy, alt., Sun dead keys)</longname>
+            <description>French (legacy, alt., Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4244,8 +4340,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>bepo</layout_variant>
-            <longname>French (Bepo, ergonomic, Dvorak way)</longname>
-            <description>French (Bepo, ergonomic, Dvorak way)</description>
+            <longname>French (BEPO)</longname>
+            <description>French (BEPO)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4256,8 +4352,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>bepo_latin9</layout_variant>
-            <longname>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</longname>
-            <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description>
+            <longname>French (BEPO, Latin-9 only)</longname>
+            <description>French (BEPO, Latin-9 only)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4268,8 +4364,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>bepo_afnor</layout_variant>
-            <longname>French (Bepo, ergonomic, Dvorak way, AFNOR)</longname>
-            <description>French (Bepo, ergonomic, Dvorak way, AFNOR)</description>
+            <longname>French (BEPO, AFNOR)</longname>
+            <description>French (BEPO, AFNOR)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4316,8 +4412,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>afnor</layout_variant>
-            <longname>French (AFNOR standardized AZERTY)</longname>
-            <description>French (AFNOR standardized AZERTY)</description>
+            <longname>French (AZERTY, AFNOR)</longname>
+            <description>French (AZERTY, AFNOR)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4364,8 +4460,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
             <layout_variant>us</layout_variant>
-            <longname>French (US, with French letters)</longname>
-            <description>French (US, with French letters)</description>
+            <longname>French (US)</longname>
+            <description>French (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4648,8 +4744,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (with Sun dead keys)</longname>
-            <description>German (with Sun dead keys)</description>
+            <longname>German (Sun dead keys)</longname>
+            <description>German (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4874,8 +4970,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwertz_comma_dead</layout_variant>
-            <longname>Hungarian (101/QWERTZ/comma/dead keys)</longname>
-            <description>Hungarian (101/QWERTZ/comma/dead keys)</description>
+            <longname>Hungarian (QWERTZ, 101-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, comma, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4886,8 +4982,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwertz_comma_nodead</layout_variant>
-            <longname>Hungarian (101/QWERTZ/comma/no dead keys)</longname>
-            <description>Hungarian (101/QWERTZ/comma/no dead keys)</description>
+            <longname>Hungarian (QWERTZ, 101-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, comma, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4898,8 +4994,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwertz_dot_dead</layout_variant>
-            <longname>Hungarian (101/QWERTZ/dot/dead keys)</longname>
-            <description>Hungarian (101/QWERTZ/dot/dead keys)</description>
+            <longname>Hungarian (QWERTZ, 101-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, dot, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4910,8 +5006,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwertz_dot_nodead</layout_variant>
-            <longname>Hungarian (101/QWERTZ/dot/no dead keys)</longname>
-            <description>Hungarian (101/QWERTZ/dot/no dead keys)</description>
+            <longname>Hungarian (QWERTZ, 101-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, dot, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4922,8 +5018,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwerty_comma_dead</layout_variant>
-            <longname>Hungarian (101/QWERTY/comma/dead keys)</longname>
-            <description>Hungarian (101/QWERTY/comma/dead keys)</description>
+            <longname>Hungarian (QWERTY, 101-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, comma, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4934,8 +5030,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwerty_comma_nodead</layout_variant>
-            <longname>Hungarian (101/QWERTY/comma/no dead keys)</longname>
-            <description>Hungarian (101/QWERTY/comma/no dead keys)</description>
+            <longname>Hungarian (QWERTY, 101-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, comma, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4946,8 +5042,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwerty_dot_dead</layout_variant>
-            <longname>Hungarian (101/QWERTY/dot/dead keys)</longname>
-            <description>Hungarian (101/QWERTY/dot/dead keys)</description>
+            <longname>Hungarian (QWERTY, 101-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, dot, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4958,8 +5054,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>101_qwerty_dot_nodead</layout_variant>
-            <longname>Hungarian (101/QWERTY/dot/no dead keys)</longname>
-            <description>Hungarian (101/QWERTY/dot/no dead keys)</description>
+            <longname>Hungarian (QWERTY, 101-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, dot, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4970,8 +5066,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwertz_comma_dead</layout_variant>
-            <longname>Hungarian (102/QWERTZ/comma/dead keys)</longname>
-            <description>Hungarian (102/QWERTZ/comma/dead keys)</description>
+            <longname>Hungarian (QWERTZ, 102-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, comma, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4982,8 +5078,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwertz_comma_nodead</layout_variant>
-            <longname>Hungarian (102/QWERTZ/comma/no dead keys)</longname>
-            <description>Hungarian (102/QWERTZ/comma/no dead keys)</description>
+            <longname>Hungarian (QWERTZ, 102-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, comma, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -4994,8 +5090,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwertz_dot_dead</layout_variant>
-            <longname>Hungarian (102/QWERTZ/dot/dead keys)</longname>
-            <description>Hungarian (102/QWERTZ/dot/dead keys)</description>
+            <longname>Hungarian (QWERTZ, 102-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, dot, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5006,8 +5102,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwertz_dot_nodead</layout_variant>
-            <longname>Hungarian (102/QWERTZ/dot/no dead keys)</longname>
-            <description>Hungarian (102/QWERTZ/dot/no dead keys)</description>
+            <longname>Hungarian (QWERTZ, 102-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, dot, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5018,8 +5114,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwerty_comma_dead</layout_variant>
-            <longname>Hungarian (102/QWERTY/comma/dead keys)</longname>
-            <description>Hungarian (102/QWERTY/comma/dead keys)</description>
+            <longname>Hungarian (QWERTY, 102-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, comma, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5030,8 +5126,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwerty_comma_nodead</layout_variant>
-            <longname>Hungarian (102/QWERTY/comma/no dead keys)</longname>
-            <description>Hungarian (102/QWERTY/comma/no dead keys)</description>
+            <longname>Hungarian (QWERTY, 102-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, comma, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5042,8 +5138,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwerty_dot_dead</layout_variant>
-            <longname>Hungarian (102/QWERTY/dot/dead keys)</longname>
-            <description>Hungarian (102/QWERTY/dot/dead keys)</description>
+            <longname>Hungarian (QWERTY, 102-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, dot, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5054,8 +5150,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>hu</layout>
             <layout_variant>102_qwerty_dot_nodead</layout_variant>
-            <longname>Hungarian (102/QWERTY/dot/no dead keys)</longname>
-            <description>Hungarian (102/QWERTY/dot/no dead keys)</description>
+            <longname>Hungarian (QWERTY, 102-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, dot, no dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5077,8 +5173,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>is</layout>
             <layout_variant>Sundeadkeys</layout_variant>
-            <longname>Icelandic (with Sun dead keys)</longname>
-            <description>Icelandic (with Sun dead keys)</description>
+            <longname>Icelandic (Sun dead keys)</longname>
+            <description>Icelandic (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5207,8 +5303,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Italian (Winkeys)</longname>
-            <description>Italian (Winkeys)</description>
+            <longname>Italian (Windows)</longname>
+            <description>Italian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5231,8 +5327,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
             <layout_variant>us</layout_variant>
-            <longname>Italian (US, with Italian letters)</longname>
-            <description>Italian (US, with Italian letters)</description>
+            <longname>Italian (US)</longname>
+            <description>Italian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5598,8 +5694,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>la</layout>
             <layout_variant>stea</layout_variant>
-            <longname>Lao (STEA proposed standard layout)</longname>
-            <description>Lao (STEA proposed standard layout)</description>
+            <longname>Lao (STEA)</longname>
+            <description>Lao (STEA)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5633,8 +5729,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lt</layout>
             <layout_variant>us</layout_variant>
-            <longname>Lithuanian (US, with Lithuanian letters)</longname>
-            <description>Lithuanian (US, with Lithuanian letters)</description>
+            <longname>Lithuanian (US)</longname>
+            <description>Lithuanian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5858,8 +5954,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
             <layout_variant>cyrillicalternatequotes</layout_variant>
-            <longname>Montenegrin (Cyrillic with guillemets)</longname>
-            <description>Montenegrin (Cyrillic with guillemets)</description>
+            <longname>Montenegrin (Cyrillic, with guillemets)</longname>
+            <description>Montenegrin (Cyrillic, with guillemets)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5870,8 +5966,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>me</layout>
             <layout_variant>latinalternatequotes</layout_variant>
-            <longname>Montenegrin (Latin with guillemets)</longname>
-            <description>Montenegrin (Latin with guillemets)</description>
+            <longname>Montenegrin (Latin, with guillemets)</longname>
+            <description>Montenegrin (Latin, with guillemets)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5916,8 +6012,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
             <layout_variant>us</layout_variant>
-            <longname>Maltese (with US layout)</longname>
-            <description>Maltese (with US layout)</description>
+            <longname>Maltese (US)</longname>
+            <description>Maltese (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -5940,8 +6036,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
             <layout_variant>alt-gb</layout_variant>
-            <longname>Maltese (UK layout with AltGr overrides)</longname>
-            <description>Maltese (UK layout with AltGr overrides)</description>
+            <longname>Maltese (UK, with AltGr overrides)</longname>
+            <description>Maltese (UK, with AltGr overrides)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6032,8 +6128,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Win keys)</longname>
-            <description>Norwegian (Win keys)</description>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6044,8 +6140,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Win keys)</longname>
-            <description>Norwegian (Win keys)</description>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6056,8 +6152,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Win keys)</longname>
-            <description>Norwegian (Win keys)</description>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6306,8 +6402,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Portuguese (with Sun dead keys)</longname>
-            <description>Portuguese (with Sun dead keys)</description>
+            <longname>Portuguese (Sun dead keys)</longname>
+            <description>Portuguese (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6342,8 +6438,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pt</layout>
             <layout_variant>mac_sundeadkeys</layout_variant>
-            <longname>Portuguese (Macintosh, with Sun dead keys)</longname>
-            <description>Portuguese (Macintosh, with Sun dead keys)</description>
+            <longname>Portuguese (Macintosh, Sun dead keys)</longname>
+            <description>Portuguese (Macintosh, Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6437,8 +6533,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ro</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Romanian (Win keys)</longname>
-            <description>Romanian (Win keys)</description>
+            <longname>Romanian (Windows)</longname>
+            <description>Romanian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6472,20 +6568,20 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
             <layout_variant>phonetic_winkeys</layout_variant>
-            <longname>Russian (phonetic, with Win keys)</longname>
-            <description>Russian (phonetic, with Win keys)</description>
+            <longname>Russian (phonetic, Windows)</longname>
+            <description>Russian (phonetic, Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:phonetic_yazherty:rus</name>
+            <name>xkb:ru:phonetic_YAZHERTY:rus</name>
             <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
-            <layout_variant>phonetic_yazherty</layout_variant>
-            <longname>Russian (phonetic yazherty)</longname>
-            <description>Russian (phonetic yazherty)</description>
+            <layout_variant>phonetic_YAZHERTY</layout_variant>
+            <longname>Russian (phonetic, YAZHERTY)</longname>
+            <description>Russian (phonetic, YAZHERTY)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6556,8 +6652,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
             <layout_variant>os_winkeys</layout_variant>
-            <longname>Ossetian (Win keys)</longname>
-            <description>Ossetian (Win keys)</description>
+            <longname>Ossetian (Windows)</longname>
+            <description>Ossetian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6819,8 +6915,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
             <layout_variant>alternatequotes</layout_variant>
-            <longname>Serbian (Cyrillic with guillemets)</longname>
-            <description>Serbian (Cyrillic with guillemets)</description>
+            <longname>Serbian (Cyrillic, with guillemets)</longname>
+            <description>Serbian (Cyrillic, with guillemets)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6831,8 +6927,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>rs</layout>
             <layout_variant>latinalternatequotes</layout_variant>
-            <longname>Serbian (Latin with guillemets)</longname>
-            <description>Serbian (Latin with guillemets)</description>
+            <longname>Serbian (Latin, with guillemets)</longname>
+            <description>Serbian (Latin, with guillemets)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6878,8 +6974,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>si</layout>
             <layout_variant>us</layout_variant>
-            <longname>Slovenian (US, with Slovenian letters)</longname>
-            <description>Slovenian (US, with Slovenian letters)</description>
+            <longname>Slovenian (US)</longname>
+            <description>Slovenian (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6960,8 +7056,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Spanish (Win keys)</longname>
-            <description>Spanish (Win keys)</description>
+            <longname>Spanish (Windows)</longname>
+            <description>Spanish (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6984,8 +7080,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Spanish (with Sun dead keys)</longname>
-            <description>Spanish (with Sun dead keys)</description>
+            <longname>Spanish (Sun dead keys)</longname>
+            <description>Spanish (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7008,8 +7104,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
             <layout_variant>ast</layout_variant>
-            <longname>Asturian (Spain, with bottom-dot H and bottom-dot L)</longname>
-            <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description>
+            <longname>Asturian (Spain, with bottom-dot H and L)</longname>
+            <description>Asturian (Spain, with bottom-dot H and L)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7139,8 +7235,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
             <layout_variant>us_dvorak</layout_variant>
-            <longname>Swedish (based on US Intl. Dvorak)</longname>
-            <description>Swedish (based on US Intl. Dvorak)</description>
+            <longname>Swedish (Dvorak, intl.)</longname>
+            <description>Swedish (Dvorak, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7151,8 +7247,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
             <layout_variant>us</layout_variant>
-            <longname>Swedish (US, with Swedish letters)</longname>
-            <description>Swedish (US, with Swedish letters)</description>
+            <longname>Swedish (US)</longname>
+            <description>Swedish (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7245,8 +7341,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
             <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, with Sun dead keys)</longname>
-            <description>German (Switzerland, with Sun dead keys)</description>
+            <longname>German (Switzerland, Sun dead keys)</longname>
+            <description>German (Switzerland, Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7257,8 +7353,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
             <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, with Sun dead keys)</longname>
-            <description>German (Switzerland, with Sun dead keys)</description>
+            <longname>German (Switzerland, Sun dead keys)</longname>
+            <description>German (Switzerland, Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7293,8 +7389,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
             <layout_variant>fr_sundeadkeys</layout_variant>
-            <longname>French (Switzerland, with Sun dead keys)</longname>
-            <description>French (Switzerland, with Sun dead keys)</description>
+            <longname>French (Switzerland, Sun dead keys)</longname>
+            <description>French (Switzerland, Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7458,8 +7554,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lk</layout>
             <layout_variant>us</layout_variant>
-            <longname>Sinhala (US, with Sinhala letters)</longname>
-            <description>Sinhala (US, with Sinhala letters)</description>
+            <longname>Sinhala (US)</longname>
+            <description>Sinhala (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7540,8 +7636,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
             <layout_variant>sundeadkeys</layout_variant>
-            <longname>Turkish (with Sun dead keys)</longname>
-            <description>Turkish (with Sun dead keys)</description>
+            <longname>Turkish (Sun dead keys)</longname>
+            <description>Turkish (Sun dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7886,8 +7982,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ua</layout>
             <layout_variant>winkeys</layout_variant>
-            <longname>Ukrainian (Win keys)</longname>
-            <description>Ukrainian (Win keys)</description>
+            <longname>Ukrainian (Windows)</longname>
+            <description>Ukrainian (Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -7957,8 +8053,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
             <layout_variant>extd</layout_variant>
-            <longname>English (UK, extended, with Win keys)</longname>
-            <description>English (UK, extended, with Win keys)</description>
+            <longname>English (UK, extended, Windows)</longname>
+            <description>English (UK, extended, Windows)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -8017,8 +8113,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gb</layout>
             <layout_variant>mac_intl</layout_variant>
-            <longname>English (UK, intl., Macintosh)</longname>
-            <description>English (UK, intl., Macintosh)</description>
+            <longname>English (UK, Macintosh, intl.)</longname>
+            <description>English (UK, Macintosh, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -8087,8 +8183,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>vn</layout>
             <layout_variant>us</layout_variant>
-            <longname>Vietnamese (US, with Vietnamese letters)</longname>
-            <description>Vietnamese (US, with Vietnamese letters)</description>
+            <longname>Vietnamese (US)</longname>
+            <description>Vietnamese (US)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -8099,8 +8195,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>vn</layout>
             <layout_variant>fr</layout_variant>
-            <longname>Vietnamese (French, with Vietnamese letters)</longname>
-            <description>Vietnamese (French, with Vietnamese letters)</description>
+            <longname>Vietnamese (French)</longname>
+            <description>Vietnamese (French)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -8122,8 +8218,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>kr</layout>
             <layout_variant>kr104</layout_variant>
-            <longname>Korean (101/104 key compatible)</longname>
-            <description>Korean (101/104 key compatible)</description>
+            <longname>Korean (101/104-key compatible)</longname>
+            <description>Korean (101/104-key compatible)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -8285,8 +8381,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>epo</layout>
             <layout_variant>legacy</layout_variant>
-            <longname>Esperanto (displaced semicolon and quote, obsolete)</longname>
-            <description>Esperanto (displaced semicolon and quote, obsolete)</description>
+            <longname>Esperanto (legacy)</longname>
+            <description>Esperanto (legacy)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10002,8 +10098,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10014,8 +10110,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10026,8 +10122,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10038,8 +10134,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10050,8 +10146,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10062,8 +10158,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -10074,8 +10170,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, ext. phonetic)</longname>
-            <description>Indonesian (Arab Melayu, ext. phonetic)</description>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>

From e10fc89c5afa1941801429b3a653b3f83b5d3802 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 10:31:10 +0900
Subject: [PATCH 663/816] src: Update ibusunicodegen.h with unicode-ucd 13.0.0

---
 po/ibus10.pot        | 400 +++++++++++++++++++++++++------------------
 src/ibusunicodegen.h |  32 ++++
 2 files changed, 262 insertions(+), 170 deletions(-)

diff --git a/po/ibus10.pot b/po/ibus10.pot
index e587988ad..7b171c03b 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.21\n"
+"Project-Id-Version: ibus 1.5.22\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-01-08 12:40+0900\n"
+"POT-Creation-Date: 2020-08-26 19:53+0900\n"
+"PO-Revision-Date: 2020-08-26 19:53+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -254,7 +254,7 @@ msgid "Use custom font name for language panel"
 msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr ""
 
@@ -262,100 +262,112 @@ msgstr ""
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -390,11 +402,11 @@ msgstr ""
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr ""
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr ""
 
@@ -749,26 +761,18 @@ msgstr ""
 msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr ""
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
 msgstr ""
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
 msgstr ""
 
 #: src/ibusemojigen.h:30
@@ -2250,664 +2254,720 @@ msgstr ""
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
-msgid "Old Sogdian"
+msgid "Yezidi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
-msgid "Sogdian"
+msgid "Old Sogdian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
-msgid "Elymaic"
+msgid "Sogdian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
-msgid "Brahmi"
+msgid "Chorasmian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
-msgid "Kaithi"
+msgid "Elymaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:873
-msgid "Sora Sompeng"
+msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:877
-msgid "Chakma"
+msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:881
-msgid "Mahajani"
+msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:885
-msgid "Sharada"
+msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:889
-msgid "Sinhala Archaic Numbers"
+msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:893
-msgid "Khojki"
+msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:897
-msgid "Multani"
+msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:901
-msgid "Khudawadi"
+msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:905
-msgid "Grantha"
+msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:909
-msgid "Newa"
+msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:913
-msgid "Tirhuta"
+msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:917
-msgid "Siddham"
+msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:921
-msgid "Modi"
+msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:925
-msgid "Mongolian Supplement"
+msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:929
-msgid "Takri"
+msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:933
-msgid "Ahom"
+msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
-msgid "Dogra"
+msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:941
-msgid "Warang Citi"
+msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
-msgid "Nandinagari"
+msgid "Dogra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
-msgid "Zanabazar Square"
+msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
-msgid "Soyombo"
+msgid "Dives Akuru"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:957
-msgid "Pau Cin Hau"
+msgid "Nandinagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:961
-msgid "Bhaiksuki"
+msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:965
-msgid "Marchen"
+msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
-msgid "Masaram Gondi"
+msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
-msgid "Gunjala Gondi"
+msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
-msgid "Makasar"
+msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
-msgid "Tamil Supplement"
+msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:985
-msgid "Cuneiform"
+msgid "Gunjala Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:989
-msgid "Cuneiform Numbers and Punctuation"
+msgid "Makasar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
-msgid "Early Dynastic Cuneiform"
+msgid "Lisu Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:997
-msgid "Egyptian Hieroglyphs"
+msgid "Tamil Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
-msgid "Egyptian Hieroglyph Format Controls"
+msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1005
-msgid "Anatolian Hieroglyphs"
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1009
-msgid "Bamum Supplement"
+msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1013
-msgid "Mro"
+msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1017
-msgid "Bassa Vah"
+msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1021
-msgid "Pahawh Hmong"
+msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
-msgid "Medefaidrin"
+msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1029
-msgid "Miao"
+msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1033
-msgid "Ideographic Symbols and Punctuation"
+msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1037
-msgid "Tangut"
+msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1041
-msgid "Tangut Components"
+msgid "Medefaidrin"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1045
-msgid "Kana Supplement"
+msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1049
-msgid "Kana Extended-A"
+msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
-msgid "Small Kana Extension"
+msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
-msgid "Nushu"
+msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
-msgid "Duployan"
+msgid "Khitan Small Script"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
-msgid "Shorthand Format Controls"
+msgid "Tangut Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
-msgid "Byzantine Musical Symbols"
+msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
-msgid "Musical Symbols"
+msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
-msgid "Ancient Greek Musical Notation"
+msgid "Small Kana Extension"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
-msgid "Mayan Numerals"
+msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1085
-msgid "Tai Xuan Jing Symbols"
+msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1089
-msgid "Counting Rod Numerals"
+msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1093
-msgid "Mathematical Alphanumeric Symbols"
+msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1097
-msgid "Sutton SignWriting"
+msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1101
-msgid "Glagolitic Supplement"
+msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
-msgid "Nyiakeng Puachue Hmong"
+msgid "Mayan Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
-msgid "Wancho"
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1113
-msgid "Mende Kikakui"
+msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
-msgid "Adlam"
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
-msgid "Indic Siyaq Numbers"
+msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
-msgid "Ottoman Siyaq Numbers"
+msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1129
-msgid "Arabic Mathematical Alphabetic Symbols"
+msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1133
-msgid "Mahjong Tiles"
+msgid "Wancho"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1137
-msgid "Domino Tiles"
+msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1141
-msgid "Playing Cards"
+msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1145
-msgid "Enclosed Alphanumeric Supplement"
+msgid "Indic Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1149
-msgid "Enclosed Ideographic Supplement"
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1153
-msgid "Miscellaneous Symbols and Pictographs"
+msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1157
-msgid "Emoticons"
+msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1161
-msgid "Ornamental Dingbats"
+msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1165
-msgid "Transport and Map Symbols"
+msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1169
-msgid "Alchemical Symbols"
+msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1173
-msgid "Geometric Shapes Extended"
+msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1177
-msgid "Supplemental Arrows-C"
+msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1181
-msgid "Supplemental Symbols and Pictographs"
+msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
-msgid "Chess Symbols"
+msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1189
-msgid "Symbols and Pictographs Extended-A"
+msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1193
-msgid "CJK Unified Ideographs Extension B"
+msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1197
-msgid "CJK Unified Ideographs Extension C"
+msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1201
-msgid "CJK Unified Ideographs Extension D"
+msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1205
-msgid "CJK Unified Ideographs Extension E"
+msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1209
-msgid "CJK Unified Ideographs Extension F"
+msgid "Chess Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1213
-msgid "CJK Compatibility Ideographs Supplement"
+msgid "Symbols and Pictographs Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
-msgid "Tags"
+msgid "Symbols for Legacy Computing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1221
-msgid "Variation Selectors Supplement"
+msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1225
-msgid "Supplementary Private Use Area-A"
+msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1229
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1233
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1237
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1241
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1253
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1257
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
@@ -3050,150 +3110,150 @@ msgstr ""
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr ""
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr ""
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr ""
 
diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
index 6a60a5a9a..c891d0e3e 100644
--- a/src/ibusunicodegen.h
+++ b/src/ibusunicodegen.h
@@ -847,6 +847,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Rumi Numeral Symbols"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Yezidi"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -855,6 +859,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Sogdian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Chorasmian"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -939,6 +947,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Warang Citi"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Dives Akuru"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -975,6 +987,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Makasar"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Lisu Supplement"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1039,6 +1055,14 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Tangut Components"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Khitan Small Script"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tangut Supplement"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1187,6 +1211,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Symbols and Pictographs Extended-A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Symbols for Legacy Computing"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1211,6 +1239,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("CJK Compatibility Ideographs Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("CJK Unified Ideographs Extension G"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */

From e5b014bb85c6dc2ad8ffa73af19a22aee2196849 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 11:18:50 +0900
Subject: [PATCH 664/816] po: Update translation (Japanese)

Update po/ja.po at 95%
https://translate.fedoraproject.org/projects/ibus/ibus/ja/

BUG=https://github.com/ibus/ibus/pull/2201
---
 po/ja.po | 564 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 329 insertions(+), 235 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 152c33fe1..e0e224bfc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,14 +20,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2020-08-26 19:53+0900\n"
 "PO-Revision-Date: 2019-07-24 03:07+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
 "Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
@@ -55,13 +55,14 @@ msgstr "IME 切り替えウィンドウのポップアップ遅延時間 (ミリ
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 "
-">」の場合はウィンドウは表示されず前のエンジンまたは次のエンジンに切り替わります。"
+"IME 切り替えウィンドウのポップアップ表示を遅延させるミリ秒数を指定します。デ"
+"フォルトは 400 ミリ秒です。「0 =」ならウィンドウが直ちに表示されます。「0 <」"
+"にすると指定したミリ秒数遅延します。「0 >」の場合はウィンドウは表示されず前の"
+"エンジンまたは次のエンジンに切り替わります。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -72,7 +73,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 のバージョンの違いをチェックする場合に使用されます。"
+"保存されているバージョン番号は、以前インストールした ibus のバージョンと現在"
+"の ibus のバージョンの違いをチェックする場合に使用されます。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -80,7 +82,8 @@ msgstr "ASCII を持たないラテンレイアウト"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr "US レイアウトはラテンレイアウトに追加されます。variant は省略可能です。"
+msgstr ""
+"US レイアウトはラテンレイアウトに追加されます。variant は省略可能です。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -89,7 +92,9 @@ msgstr "xmodmap を使用する"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば xmodmap を実行します。"
+msgstr ""
+"ibus エンジンが切り替えられたときに .xmodmap もしくは .Xmodmap が存在すれば "
+"xmodmap を実行します。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
@@ -121,7 +126,9 @@ msgstr "デフォルトで入力メソッドを有効にする"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
-msgstr "アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効にします"
+msgstr ""
+"アプリケーションで入力が必要とされる場合にはデフォルトで入力メソッドを有効に"
+"します"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -188,7 +195,8 @@ msgstr "自動的に隠す"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
+msgstr ""
+"プロパティーパネルの挙動。 0 = 表示しない、1 = 自動的に隠す、2 = 常に表示する"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -203,7 +211,9 @@ msgstr "パネルが常に表示されている場合に入力カーソルに従
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。false ならば、パネルは固定位置に表示されます。"
+msgstr ""
+"true ならば、パネルが常に表示されている場合にパネルは入力カーソルに従います。"
+"false ならば、パネルは固定位置に表示されます。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
@@ -213,7 +223,9 @@ msgstr "プロパティーパネルを表示するミリ秒"
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミリ秒。"
+msgstr ""
+"フォーカスインまたはプロパティが変更された後でプロパティーパネルを表示するミ"
+"リ秒。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
@@ -246,16 +258,18 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。RGBA 値は次のいずれかを選ぶことができます。1. X11 "
-"からの色彩名、2. 書式 '#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、3. 書式 "
-"'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラーで、その 'r', 'g', 'b' は "
-"0 から 255 までの範囲内の整数値か 0% から 100% までの範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 "
-"までの範囲内の浮動小数値のこと。"
+"XKB アイコンはレイアウト文字列を表示してその文字列は RGBA 値で描画されます。"
+"RGBA 値は次のいずれかを選ぶことができます。1. X11 からの色彩名、2. 書式 "
+"'#rrggbb' の16進数値で、その 'r', 'g', 'b' は赤、緑、青の16進数の数字のこと、"
+"3. 書式 'rgb(r,g,b)' の RGB カラー、4. 書式 'rgba(r,g,b,a)' の RGBA カラー"
+"で、その 'r', 'g', 'b' は 0 から 255 までの範囲内の整数値か 0% から 100% まで"
+"の範囲内のパーセンテージのことで、'a' はアルファ値の 0 から 1 までの範囲内の"
+"浮動小数値のこと。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
@@ -268,9 +282,10 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"あるプロパティーが IBusEngineDesc の icon-prop-key "
-"の値に指定されている場合、エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にそのプロパティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が "
-"0 の場合、遅延無くプロパティーアイコンが即時に表示される。"
+"あるプロパティーが IBusEngineDesc の icon-prop-key の値に指定されている場合、"
+"エンジンが切り替えられたときはいつでも、エンジンアイコンを表示の後にそのプロ"
+"パティーをパネルアイコンを表示するためのミリ秒単位の遅延時間。値が 0 の場合、"
+"遅延無くプロパティーアイコンが即時に表示される。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
@@ -281,7 +296,7 @@ msgid "Use custom font name for language panel"
 msgstr "言語パネル用にカスタムフォント名を使用する"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "カスタムフォント"
 
@@ -289,113 +304,135 @@ msgstr "カスタムフォント"
 msgid "Custom font name for language panel"
 msgstr "言語パネル用のカスタムフォント名"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "候補ウィンドウ上でインプットメソッドの言語でグリフを選択する"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"いくつかのコードポイントは異なるグリフを持ち、Pango は言語属性からグリフを"
+"決定する。値が真の場合、Pango は IBus エンジンの言語からグリフを選択し、"
+"値が偽の場合、デスクトップのロケールから選択する。"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のための Unicode ショートカットキー"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Unicode 入力の有効と無効を切り替えるためのショートカットキー"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse のための絵文字ショートカットキー"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "絵文字入力の有効と無効を切り替えるためのショートカットキー"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用のカスタムフォント名"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "絵文字辞書用のデフォルトの言語"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
-"絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang は、/usr/share/ibus/dicts/emoji-$lang."
-"dict に適用されます。"
+"絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang "
+"は、/usr/share/ibus/dicts/emoji-$lang.dict に適用されます。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入り絵文字リスト"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
-msgstr "このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示することができます。"
+msgstr ""
+"このリストが文字を含む場合、絵文字リスト上にお気に入りの絵文字を表示すること"
+"ができます。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "絵文字ダイアログ上のお気に入りの絵文字ルビリスト"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "このリストの中にお気に入りの絵文字用のルビを指定できます。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "絵文字ルビを部分一致させることを可能にするか否か"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr "絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
+msgstr ""
+"絵文字ルビを完全一致ではなく部分文字列で一致させることを可能にするか否か。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "指定した長さで絵文字ルビを一致させる"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "絵文字ルビを部分一致させる条件を選ぶ"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr "絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文末一致、2 == 文中一致"
+msgstr ""
+"絵文字ルビを部分一致させる次の条件のうちの１つを選ぶ: 0 == 文頭一致、1 == 文"
+"末一致、2 == 文中一致"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "起動時に絵文字データを読み込む"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"true の場合、起動時に絵文字データを読み込みます。約 10 MBメモリーがデータを読み込むために必要になります。false "
-"の場合、初めて絵文字ダイアログを開く時に絵文字データを読み込みます。"
+"true の場合、起動時に絵文字データを読み込みます。約 10 MBメモリーがデータを読"
+"み込むために必要になります。false の場合、初めて絵文字ダイアログを開く時に絵"
+"文字データを読み込みます。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "起動時に Unicode データを読み込む"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"true の場合、起動時に Unicode データを読み込みます。約 15 MB メモリーがデータを読み込むために必要になります。false "
-"の場合、初めて絵文字ダイアログを開く時に Unicode データを読み込みます。true の場合、常に絵文字データが読み込まれた後で、Unicode "
-"データが読み込まれます。"
+"true の場合、起動時に Unicode データを読み込みます。約 15 MB メモリーがデータ"
+"を読み込むために必要になります。false の場合、初めて絵文字ダイアログを開く時"
+"に Unicode データを読み込みます。true の場合、常に絵文字データが読み込まれた"
+"後で、Unicode データが読み込まれます。"
 
 #: ibus/_config.py.in:41
 msgid ""
@@ -405,7 +442,7 @@ msgstr ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "その他"
 
@@ -426,11 +463,11 @@ msgstr "OK(_O)"
 msgid "More…"
 msgstr "さらに…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "情報"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -505,7 +542,8 @@ msgstr "削除(_D)"
 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:255
@@ -514,7 +552,9 @@ msgstr "キーもしくはキーの組み合わせを入力してください"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用します"
+msgstr ""
+"以前の入力メソッドに切り替えるにはショートカットにシフトキーを付けて使用しま"
+"す"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -528,8 +568,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus は起動されています。IBus が使用できない場合は、次の行を $HOME/.bashrc "
-"に追記し、デスクトップにログインし直してみてください。\n"
+"IBus は起動されています。IBus が使用できない場合は、次の行を $HOME/.bashrc に"
+"追記し、デスクトップにログインし直してみてください。\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -649,7 +689,8 @@ msgstr "言語パネルの位置"
 
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "チェックボックスにチェック付けると、言語バーに入力メソッド名が表示されます"
+msgstr ""
+"チェックボックスにチェック付けると、言語バーに入力メソッド名が表示されます"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
@@ -657,7 +698,9 @@ msgstr "アプリケーションウィンドウに前編集テキストを組み
 
 #: setup/setup.ui:513
 msgid "Embed the preedit text of input method in the application window"
-msgstr "アプリケーションウィンドウに入力メソッドのプリエディットテキストを組み込みます"
+msgstr ""
+"アプリケーションウィンドウに入力メソッドのプリエディットテキストを組み込みま"
+"す"
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
@@ -721,13 +764,13 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。</"
-"i></small>"
+"<small><i>アクティブなインプットメソッドは、キーボードショートカットキーを押"
+"すかパネルアイコンをクリックすることによってリストされている中から１つのイン"
+"プットメソッドを選択することで切り替えることが可能です。</i></small>"
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr "絵文字ルビまたは Unicode 名の変換を可能にするショートカットキー"
 
 #: setup/setup.ui:875
@@ -794,33 +837,21 @@ msgstr "<b>キーボードレイアウト</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>グローバル入力メソッドの設定</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "詳細"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>インテリジェントなインプットバス</small>\n"
-"ホームページ: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"重複したコードポイントのために候補ウィンドウ上でインプットメソッドの言語で"
+"グリフを選択する"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "ログイン時に IBus を起動"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>フォント</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>スタートアップ</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "詳細"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2305,664 +2336,720 @@ msgstr "ルーミー数字記号"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "ヤズィーディー文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "旧ソグド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "ソグド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "エリマイス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "ブラーフミー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "カイティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "ソラ・ソンペン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "チャクマ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "マハージャニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "シャラダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "シンハラ旧数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "ホジャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "ムルターニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "フダーワーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "グランタ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "ネワ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "ティルフータ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "悉曇文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "モーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "モンゴル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "タクリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "アーホム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "ドーグリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "ワラング・クシティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "ナンディナーガリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "ザナバザル方形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "ソヨンボ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "パウ・チン・ハウ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "バイクシュキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "マルチェン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "マサラム・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "グンジャラ・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "マカサル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "リス文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "タミル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "くさび形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "くさび形文字の数字及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "シュメール楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "ヒエログリフ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "ヒエログリフ文字書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "アナトリア・ヒエログリフ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "バムン文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "ムロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "バサ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "パハウ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "メデファイドリン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "ポラード文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "漢字の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "西夏文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "西南文字の構成要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "西夏文字補助"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "仮名文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "仮名文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "小書き仮名拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "女書"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "デュプロワイエ式速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "速記書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "ビザンチン音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "古代ギリシア音符記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "マヤ数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "太玄経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "算木用数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "サットン手話表記法"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "グラゴル文文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "ニアケン・プアチェ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "ワンチョ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "メンデ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "アドラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "インド・シヤク数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "オスマン・シヤク数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "アラビア数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "麻雀牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "ドミノ牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "トランプ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "囲み英数字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "囲み表意文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "その他の記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "顔文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "オーナメント"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "交通と地図の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "錬金術記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "幾何学模様拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "補助矢印 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "補助記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "チェス記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "記号と絵文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK 統合漢字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK 統合漢字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK 統合漢字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK 統合漢字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK 統合漢字拡張 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK 互換漢字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "CJK 統合漢字拡張 G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "字形選択子補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "補助私用領域 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "補助私用領域 B"
 
@@ -3015,7 +3102,9 @@ msgstr "レジストリーキャッシュ FILE を書き込みます。"
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
-msgstr "ibus コアの代わりにエンジンのスキーマパスを使用し、コンマで区切られた値が可能です。"
+msgstr ""
+"ibus コアの代わりにエンジンのスキーマパスを使用し、コンマで区切られた値が可能"
+"です。"
 
 #: tools/main.vala:381
 msgid "Resetting…"
@@ -3079,9 +3168,11 @@ msgstr "この情報を表示する"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "使い方: %s コマンド [オプション...]\n"
+msgstr ""
+"使い方: %s コマンド [オプション...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3105,140 +3196,142 @@ msgstr "その他"
 msgid "Open Unicode choice"
 msgstr "Unicode の選択を開く"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "絵文字の選択に戻る"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "絵文字異形を表示する"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "閉じる"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "メニュー"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "警告メッセージを閲覧するためにクリックしてください"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode の辞書を読み込んでいます:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "なし"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "別名: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Unicode の選択"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
-"現在のテキストアプリケーションを取得するのに失敗しました。アプリケーションを再フォーカスさせてください。例えば、Esc "
-"キーを数回入力して絵文字入力モードを開放し、デスクトップをクリックして、テキストアプリケーションを再度クリックしてください。"
+"現在のテキストアプリケーションを取得するのに失敗しました。アプリケーションを"
+"再フォーカスさせてください。例えば、Esc キーを数回入力して絵文字入力モードを"
+"開放し、デスクトップをクリックして、テキストアプリケーションを再度クリックし"
+"てください。"
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "絵文字の選択を取り消しました。"
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "クリップボードに絵文字をコピーしました。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "絵文字ダイアログ上の絵文字用の「フォント」"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "フォント"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "絵文字ダイアログ上のルビ用の「言語」。例「en」"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "言語"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "絵文字ルビを部分一致させることが可能になる"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "指定した数字をもつ長さで一致させる"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -3246,15 +3339,15 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "設定"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "再起動"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "終了"
 
@@ -3263,3 +3356,4 @@ msgstr "終了"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+

From 394d9a83962225bff4c39ed3e9ddd5c3019a3936 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 11:52:16 +0900
Subject: [PATCH 665/816] data/dconf: Fix regression in
 make-dconf-override-db.sh

---
 data/dconf/make-dconf-override-db.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
index 48dd8fac2..601c1c3fa 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -48,7 +48,9 @@ done
 # dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
 # via systemd since gvfs 1.45.90 in Fedora 33
 # and rm $TMPDIR could be failed until umount would be called.
-umount $TMPDIR/cache/gvfs
+if [ -d $TMPDIR/cache/gvfs ] ; then
+    umount $TMPDIR/cache/gvfs
+fi
 rm -rf $TMPDIR
 
 kill $DBUS_SESSION_BUS_PID

From ed7bc8dcded59fb391687e3e9b0676c77accf736 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 22:36:29 +0900
Subject: [PATCH 666/816] engine: Move simple.xml to simple.xml.in

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/simple.xml    | 10351 --------------------------------------
 engine/simple.xml.in | 11124 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 10348 insertions(+), 11127 deletions(-)
 delete mode 100644 engine/simple.xml

diff --git a/engine/simple.xml b/engine/simple.xml
deleted file mode 100644
index f546b2f35..000000000
--- a/engine/simple.xml
+++ /dev/null
@@ -1,10351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component>
-    <name>org.freedesktop.IBus.Simple</name>
-    <description>A table based simple engine</description>
-    <exec>/usr/local/libexec/ibus-engine-simple</exec>
-    <version>1.5.22.20200826</version>
-    <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-    <license>GPL</license>
-    <homepage>https://github.com/ibus/ibus/wiki</homepage>
-    <textdomain>ibus</textdomain>
-    <engines>
-        <engine>
-            <name>xkb:us::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <longname>English (US)</longname>
-            <description>English (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:chr:chr</name>
-            <language>chr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>chr</layout_variant>
-            <longname>Cherokee</longname>
-            <description>Cherokee</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:haw:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>haw</layout_variant>
-            <longname>Hawaiian</longname>
-            <description>Hawaiian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:euro:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>euro</layout_variant>
-            <longname>English (US, euro on 5)</longname>
-            <description>English (US, euro on 5)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:intl:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>English (US, intl., with dead keys)</longname>
-            <description>English (US, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:alt-intl:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>alt-intl</layout_variant>
-            <longname>English (US, alt. intl.)</longname>
-            <description>English (US, alt. intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:colemak:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>English (Colemak)</longname>
-            <description>English (Colemak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>English (Dvorak)</longname>
-            <description>English (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak-intl:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak-intl</layout_variant>
-            <longname>English (Dvorak, intl., with dead keys)</longname>
-            <description>English (Dvorak, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak-alt-intl:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak-alt-intl</layout_variant>
-            <longname>English (Dvorak, alt. intl.)</longname>
-            <description>English (Dvorak, alt. intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak-l:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak-l</layout_variant>
-            <longname>English (Dvorak, left-handed)</longname>
-            <description>English (Dvorak, left-handed)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak-r:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak-r</layout_variant>
-            <longname>English (Dvorak, right-handed)</longname>
-            <description>English (Dvorak, right-handed)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvorak-classic:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvorak-classic</layout_variant>
-            <longname>English (classic Dvorak)</longname>
-            <description>English (classic Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:dvp:haw</name>
-            <language>haw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>dvp</layout_variant>
-            <longname>English (programmer Dvorak)</longname>
-            <description>English (programmer Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:rus:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>rus</layout_variant>
-            <longname>Russian (US, phonetic)</longname>
-            <description>Russian (US, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:mac:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>English (Macintosh)</longname>
-            <description>English (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:altgr-intl:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>altgr-intl</layout_variant>
-            <longname>English (intl., with AltGr dead keys)</longname>
-            <description>English (intl., with AltGr dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:altgr-intl:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>altgr-intl</layout_variant>
-            <longname>English (intl., with AltGr dead keys)</longname>
-            <description>English (intl., with AltGr dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:altgr-intl:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>altgr-intl</layout_variant>
-            <longname>English (intl., with AltGr dead keys)</longname>
-            <description>English (intl., with AltGr dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:olpc2:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply toggle the layout)</longname>
-            <description>English (the divide/multiply toggle the layout)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:olpc2:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply toggle the layout)</longname>
-            <description>English (the divide/multiply toggle the layout)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:olpc2:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply toggle the layout)</longname>
-            <description>English (the divide/multiply toggle the layout)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:hbs:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>hbs</layout_variant>
-            <longname>Serbo-Croatian (US)</longname>
-            <description>Serbo-Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:hbs:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>hbs</layout_variant>
-            <longname>Serbo-Croatian (US)</longname>
-            <description>Serbo-Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:hbs:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>hbs</layout_variant>
-            <longname>Serbo-Croatian (US)</longname>
-            <description>Serbo-Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:hbs:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>hbs</layout_variant>
-            <longname>Serbo-Croatian (US)</longname>
-            <description>Serbo-Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:hbs:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>hbs</layout_variant>
-            <longname>Serbo-Croatian (US)</longname>
-            <description>Serbo-Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:af:ps:pus</name>
-            <language>ps</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>ps</layout_variant>
-            <longname>Pashto</longname>
-            <description>Pashto</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:af:uz:uzb</name>
-            <language>uz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>uz</layout_variant>
-            <longname>Uzbek (Afghanistan)</longname>
-            <description>Uzbek (Afghanistan)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:af:olpc-ps:pus</name>
-            <language>ps</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>olpc-ps</layout_variant>
-            <longname>Pashto (Afghanistan, OLPC)</longname>
-            <description>Pashto (Afghanistan, OLPC)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:af:fa-olpc:pus</name>
-            <language>ps</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>fa-olpc</layout_variant>
-            <longname>Persian (Afghanistan, Dari OLPC)</longname>
-            <description>Persian (Afghanistan, Dari OLPC)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:af:uz-olpc:uzb</name>
-            <language>uz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>uz-olpc</layout_variant>
-            <longname>Uzbek (Afghanistan, OLPC)</longname>
-            <description>Uzbek (Afghanistan, OLPC)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara::ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <longname>Arabic</longname>
-            <description>Arabic</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:azerty:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Arabic (AZERTY)</longname>
-            <description>Arabic (AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:azerty_digits:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>azerty_digits</layout_variant>
-            <longname>Arabic (AZERTY, Eastern Arabic numerals)</longname>
-            <description>Arabic (AZERTY, Eastern Arabic numerals)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:digits:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>digits</layout_variant>
-            <longname>Arabic (Eastern Arabic numerals)</longname>
-            <description>Arabic (Eastern Arabic numerals)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:qwerty:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Arabic (QWERTY)</longname>
-            <description>Arabic (QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:qwerty_digits:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>qwerty_digits</layout_variant>
-            <longname>Arabic (QWERTY, Eastern Arabic numerals)</longname>
-            <description>Arabic (QWERTY, Eastern Arabic numerals)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:buckwalter:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>buckwalter</layout_variant>
-            <longname>Arabic (Buckwalter)</longname>
-            <description>Arabic (Buckwalter)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:olpc:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>olpc</layout_variant>
-            <longname>Arabic (OLPC)</longname>
-            <description>Arabic (OLPC)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ara:mac:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ara</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Arabic (Macintosh)</longname>
-            <description>Arabic (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:al::sqi</name>
-            <language>sq</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>al</layout>
-            <longname>Albanian</longname>
-            <description>Albanian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:al:plisi:sqi</name>
-            <language>sq</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>al</layout>
-            <layout_variant>plisi</layout_variant>
-            <longname>Albanian (Plisi)</longname>
-            <description>Albanian (Plisi)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:al:veqilharxhi:sqi</name>
-            <language>sq</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>al</layout>
-            <layout_variant>veqilharxhi</layout_variant>
-            <longname>Albanian (Veqilharxhi)</longname>
-            <description>Albanian (Veqilharxhi)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:am::hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <longname>Armenian</longname>
-            <description>Armenian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:am:phonetic:hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Armenian (phonetic)</longname>
-            <description>Armenian (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:am:phonetic-alt:hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <layout_variant>phonetic-alt</layout_variant>
-            <longname>Armenian (alt. phonetic)</longname>
-            <description>Armenian (alt. phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:am:eastern:hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <layout_variant>eastern</layout_variant>
-            <longname>Armenian (eastern)</longname>
-            <description>Armenian (eastern)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:am:western:hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <layout_variant>western</layout_variant>
-            <longname>Armenian (western)</longname>
-            <description>Armenian (western)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:am:eastern-alt:hye</name>
-            <language>hy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>am</layout>
-            <layout_variant>eastern-alt</layout_variant>
-            <longname>Armenian (alt. eastern)</longname>
-            <description>Armenian (alt. eastern)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:at::deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>at</layout>
-            <longname>German (Austria)</longname>
-            <description>German (Austria)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:at:nodeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>at</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>German (Austria, no dead keys)</longname>
-            <description>German (Austria, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:at:sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>at</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (Austria, Sun dead keys)</longname>
-            <description>German (Austria, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:at:mac:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>at</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>German (Austria, Macintosh)</longname>
-            <description>German (Austria, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:au::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>au</layout>
-            <longname>English (Australian)</longname>
-            <description>English (Australian)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:az::aze</name>
-            <language>az</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>az</layout>
-            <longname>Azerbaijani</longname>
-            <description>Azerbaijani</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:az:cyrillic:aze</name>
-            <language>az</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>az</layout>
-            <layout_variant>cyrillic</layout_variant>
-            <longname>Azerbaijani (Cyrillic)</longname>
-            <description>Azerbaijani (Cyrillic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:by::bel</name>
-            <language>be</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>by</layout>
-            <longname>Belarusian</longname>
-            <description>Belarusian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:by:legacy:bel</name>
-            <language>be</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>by</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Belarusian (legacy)</longname>
-            <description>Belarusian (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:by:latin:bel</name>
-            <language>be</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>by</layout>
-            <layout_variant>latin</layout_variant>
-            <longname>Belarusian (Latin)</longname>
-            <description>Belarusian (Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:by:ru:bel</name>
-            <language>be</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>by</layout>
-            <layout_variant>ru</layout_variant>
-            <longname>Russian (Belarus)</longname>
-            <description>Russian (Belarus)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:by:intl:bel</name>
-            <language>be</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>by</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Belarusian (intl.)</longname>
-            <description>Belarusian (intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be::deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <longname>Belgian</longname>
-            <description>Belgian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:be::nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <longname>Belgian</longname>
-            <description>Belgian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:be::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <longname>Belgian</longname>
-            <description>Belgian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss</layout_variant>
-            <longname>Belgian (alt.)</longname>
-            <description>Belgian (alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss</layout_variant>
-            <longname>Belgian (alt.)</longname>
-            <description>Belgian (alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss</layout_variant>
-            <longname>Belgian (alt.)</longname>
-            <description>Belgian (alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_latin9:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (Latin-9 only, alt.)</longname>
-            <description>Belgian (Latin-9 only, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_latin9:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (Latin-9 only, alt.)</longname>
-            <description>Belgian (Latin-9 only, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_latin9:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_latin9</layout_variant>
-            <longname>Belgian (Latin-9 only, alt.)</longname>
-            <description>Belgian (Latin-9 only, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:iso-alternate:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (ISO, alt.)</longname>
-            <description>Belgian (ISO, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:iso-alternate:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (ISO, alt.)</longname>
-            <description>Belgian (ISO, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:iso-alternate:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>iso-alternate</layout_variant>
-            <longname>Belgian (ISO, alt.)</longname>
-            <description>Belgian (ISO, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:nodeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Belgian (no dead keys)</longname>
-            <description>Belgian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:nodeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Belgian (no dead keys)</longname>
-            <description>Belgian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:nodeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Belgian (no dead keys)</longname>
-            <description>Belgian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:wang:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>wang</layout_variant>
-            <longname>Belgian (Wang 724 AZERTY)</longname>
-            <description>Belgian (Wang 724 AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:wang:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>wang</layout_variant>
-            <longname>Belgian (Wang 724 AZERTY)</longname>
-            <description>Belgian (Wang 724 AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:wang:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>wang</layout_variant>
-            <longname>Belgian (Wang 724 AZERTY)</longname>
-            <description>Belgian (Wang 724 AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bd::ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bd</layout>
-            <longname>Bangla</longname>
-            <description>Bangla</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:bd::sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bd</layout>
-            <longname>Bangla</longname>
-            <description>Bangla</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:bd:probhat:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bd</layout>
-            <layout_variant>probhat</layout_variant>
-            <longname>Bangla (Probhat)</longname>
-            <description>Bangla (Probhat)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bd:probhat:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bd</layout>
-            <layout_variant>probhat</layout_variant>
-            <longname>Bangla (Probhat)</longname>
-            <description>Bangla (Probhat)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben</layout_variant>
-            <longname>Bangla (India)</longname>
-            <description>Bangla (India)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben</layout_variant>
-            <longname>Bangla (India)</longname>
-            <description>Bangla (India)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_probhat:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_probhat</layout_variant>
-            <longname>Bangla (India, Probhat)</longname>
-            <description>Bangla (India, Probhat)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_probhat:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_probhat</layout_variant>
-            <longname>Bangla (India, Probhat)</longname>
-            <description>Bangla (India, Probhat)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_baishakhi:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_baishakhi</layout_variant>
-            <longname>Bangla (India, Baishakhi)</longname>
-            <description>Bangla (India, Baishakhi)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_baishakhi:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_baishakhi</layout_variant>
-            <longname>Bangla (India, Baishakhi)</longname>
-            <description>Bangla (India, Baishakhi)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_bornona:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_bornona</layout_variant>
-            <longname>Bangla (India, Bornona)</longname>
-            <description>Bangla (India, Bornona)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_bornona:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_bornona</layout_variant>
-            <longname>Bangla (India, Bornona)</longname>
-            <description>Bangla (India, Bornona)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_gitanjali:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_gitanjali</layout_variant>
-            <longname>Bangla (India, Gitanjali)</longname>
-            <description>Bangla (India, Gitanjali)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_gitanjali:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_gitanjali</layout_variant>
-            <longname>Bangla (India, Gitanjali)</longname>
-            <description>Bangla (India, Gitanjali)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_inscript:ben</name>
-            <language>bn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_inscript</layout_variant>
-            <longname>Bangla (India, Baishakhi Inscript)</longname>
-            <description>Bangla (India, Baishakhi Inscript)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ben_inscript:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ben_inscript</layout_variant>
-            <longname>Bangla (India, Baishakhi Inscript)</longname>
-            <description>Bangla (India, Baishakhi Inscript)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:eeyek:mni</name>
-            <language>mni</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>eeyek</layout_variant>
-            <longname>Manipuri (Eeyek)</longname>
-            <description>Manipuri (Eeyek)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:guj:guj</name>
-            <language>gu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>guj</layout_variant>
-            <longname>Gujarati</longname>
-            <description>Gujarati</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:guru:pan</name>
-            <language>pa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>guru</layout_variant>
-            <longname>Punjabi (Gurmukhi)</longname>
-            <description>Punjabi (Gurmukhi)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:jhelum:pan</name>
-            <language>pa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>jhelum</layout_variant>
-            <longname>Punjabi (Gurmukhi Jhelum)</longname>
-            <description>Punjabi (Gurmukhi Jhelum)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:kan:kan</name>
-            <language>kn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>kan</layout_variant>
-            <longname>Kannada</longname>
-            <description>Kannada</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:kan-kagapa:kan</name>
-            <language>kn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>kan-kagapa</layout_variant>
-            <longname>Kannada (KaGaPa, phonetic)</longname>
-            <description>Kannada (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:mal:mal</name>
-            <language>ml</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>mal</layout_variant>
-            <longname>Malayalam</longname>
-            <description>Malayalam</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:mal_lalitha:mal</name>
-            <language>ml</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>mal_lalitha</layout_variant>
-            <longname>Malayalam (Lalitha)</longname>
-            <description>Malayalam (Lalitha)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:mal_enhanced:mal</name>
-            <language>ml</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>mal_enhanced</layout_variant>
-            <longname>Malayalam (enhanced Inscript, with rupee)</longname>
-            <description>Malayalam (enhanced Inscript, with rupee)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ori:ori</name>
-            <language>or</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ori</layout_variant>
-            <longname>Oriya</longname>
-            <description>Oriya</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:ori:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>ori</layout_variant>
-            <longname>Oriya</longname>
-            <description>Oriya</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:olck:sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>olck</layout_variant>
-            <longname>Ol Chiki</longname>
-            <description>Ol Chiki</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tam_tamilnet:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tam_tamilnet</layout_variant>
-            <longname>Tamil (TamilNet '99)</longname>
-            <description>Tamil (TamilNet '99)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tam_tamilnet_with_tam_nums:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tam_tamilnet_with_tam_nums</layout_variant>
-            <longname>Tamil (TamilNet '99 with Tamil numerals)</longname>
-            <description>Tamil (TamilNet '99 with Tamil numerals)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tam_tamilnet_TAB:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tam_tamilnet_TAB</layout_variant>
-            <longname>Tamil (TamilNet '99, TAB encoding)</longname>
-            <description>Tamil (TamilNet '99, TAB encoding)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tam_tamilnet_TSCII:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tam_tamilnet_TSCII</layout_variant>
-            <longname>Tamil (TamilNet '99, TSCII encoding)</longname>
-            <description>Tamil (TamilNet '99, TSCII encoding)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tam:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tam</layout_variant>
-            <longname>Tamil (Inscript)</longname>
-            <description>Tamil (Inscript)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tel:tel</name>
-            <language>te</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tel</layout_variant>
-            <longname>Telugu</longname>
-            <description>Telugu</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tel-kagapa:tel</name>
-            <language>te</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tel-kagapa</layout_variant>
-            <longname>Telugu (KaGaPa, phonetic)</longname>
-            <description>Telugu (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tel-sarala:tel</name>
-            <language>te</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tel-sarala</layout_variant>
-            <longname>Telugu (Sarala)</longname>
-            <description>Telugu (Sarala)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:tel-kagapa:tel</name>
-            <language>te</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tel-kagapa</layout_variant>
-            <longname>Telugu (KaGaPa, phonetic)</longname>
-            <description>Telugu (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:urd-phonetic:urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>urd-phonetic</layout_variant>
-            <longname>Urdu (phonetic)</longname>
-            <description>Urdu (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:urd-phonetic3:urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>urd-phonetic3</layout_variant>
-            <longname>Urdu (alt. phonetic)</longname>
-            <description>Urdu (alt. phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:urd-winkeys:urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>urd-winkeys</layout_variant>
-            <longname>Urdu (Windows)</longname>
-            <description>Urdu (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:bolnagri:hin</name>
-            <language>hi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>bolnagri</layout_variant>
-            <longname>Hindi (Bolnagri)</longname>
-            <description>Hindi (Bolnagri)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:hin-wx:hin</name>
-            <language>hi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>hin-wx</layout_variant>
-            <longname>Hindi (Wx)</longname>
-            <description>Hindi (Wx)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:hin-kagapa:hin</name>
-            <language>hi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>hin-kagapa</layout_variant>
-            <longname>Hindi (KaGaPa, phonetic)</longname>
-            <description>Hindi (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:san-kagapa:san</name>
-            <language>sa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>san-kagapa</layout_variant>
-            <longname>Sanskrit (KaGaPa, phonetic)</longname>
-            <description>Sanskrit (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:mar-kagapa:mar</name>
-            <language>mr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>mar-kagapa</layout_variant>
-            <longname>Marathi (KaGaPa, phonetic)</longname>
-            <description>Marathi (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:eng:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>eng</layout_variant>
-            <longname>English (India, with rupee)</longname>
-            <description>English (India, with rupee)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:iipa:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>iipa</layout_variant>
-            <longname>Indic IPA (IIPA)</longname>
-            <description>Indic IPA (IIPA)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:in:marathi:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>marathi</layout_variant>
-            <longname>मराठी इन्स्क्रिप्ट</longname>
-            <description>मराठी इन्स्क्रिप्ट</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ba::bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ba</layout>
-            <longname>Bosnian</longname>
-            <description>Bosnian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ba:alternatequotes:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ba</layout>
-            <layout_variant>alternatequotes</layout_variant>
-            <longname>Bosnian (with guillemets)</longname>
-            <description>Bosnian (with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ba:unicode:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ba</layout>
-            <layout_variant>unicode</layout_variant>
-            <longname>Bosnian (with Bosnian digraphs)</longname>
-            <description>Bosnian (with Bosnian digraphs)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ba:unicodeus:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ba</layout>
-            <layout_variant>unicodeus</layout_variant>
-            <longname>Bosnian (US, with Bosnian digraphs)</longname>
-            <description>Bosnian (US, with Bosnian digraphs)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ba:us:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ba</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Bosnian (US)</longname>
-            <description>Bosnian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br::por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <longname>Portuguese (Brazil)</longname>
-            <description>Portuguese (Brazil)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:nodeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Portuguese (Brazil, no dead keys)</longname>
-            <description>Portuguese (Brazil, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:dvorak:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Portuguese (Brazil, Dvorak)</longname>
-            <description>Portuguese (Brazil, Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:nativo:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>nativo</layout_variant>
-            <longname>Portuguese (Brazil, Nativo)</longname>
-            <description>Portuguese (Brazil, Nativo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:nativo-us:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>nativo-us</layout_variant>
-            <longname>Portuguese (Brazil, Nativo for US keyboards)</longname>
-            <description>Portuguese (Brazil, Nativo for US keyboards)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:nativo-epo:epo</name>
-            <language>eo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>nativo-epo</layout_variant>
-            <longname>Esperanto (Brazil, Nativo)</longname>
-            <description>Esperanto (Brazil, Nativo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:br:thinkpad:epo</name>
-            <language>eo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>br</layout>
-            <layout_variant>thinkpad</layout_variant>
-            <longname>Portuguese (Brazil, IBM/Lenovo ThinkPad)</longname>
-            <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bg::bul</name>
-            <language>bg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bg</layout>
-            <longname>Bulgarian</longname>
-            <description>Bulgarian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:bg:phonetic:bul</name>
-            <language>bg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bg</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Bulgarian (traditional phonetic)</longname>
-            <description>Bulgarian (traditional phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bg:bas_phonetic:bul</name>
-            <language>bg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bg</layout>
-            <layout_variant>bas_phonetic</layout_variant>
-            <longname>Bulgarian (new phonetic)</longname>
-            <description>Bulgarian (new phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dz:azerty-deadkeys:kab</name>
-            <language>kab</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dz</layout>
-            <layout_variant>azerty-deadkeys</layout_variant>
-            <longname>Kabylian (azerty layout, with dead keys)</longname>
-            <description>Kabylian (azerty layout, with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dz:qwerty-gb-deadkeys:kab</name>
-            <language>kab</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dz</layout>
-            <layout_variant>qwerty-gb-deadkeys</layout_variant>
-            <longname>Kabylian (qwerty-gb layout, with dead keys)</longname>
-            <description>Kabylian (qwerty-gb layout, with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dz:qwerty-us-deadkeys:kab</name>
-            <language>kab</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dz</layout>
-            <layout_variant>qwerty-us-deadkeys</layout_variant>
-            <longname>Kabylian (qwerty-us layout, with dead keys)</longname>
-            <description>Kabylian (qwerty-us layout, with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dz:ber:kab</name>
-            <language>kab</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dz</layout>
-            <layout_variant>ber</layout_variant>
-            <longname>Kabylian (Algeria, Tifinagh)</longname>
-            <description>Kabylian (Algeria, Tifinagh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dz:ar:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dz</layout>
-            <layout_variant>ar</layout_variant>
-            <longname>Arabic (Algeria)</longname>
-            <description>Arabic (Algeria)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:french:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>french</layout_variant>
-            <longname>French (Morocco)</longname>
-            <description>French (Morocco)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh</layout_variant>
-            <longname>Berber (Morocco, Tifinagh)</longname>
-            <description>Berber (Morocco, Tifinagh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh-alt:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh-alt</layout_variant>
-            <longname>Berber (Morocco, Tifinagh alt.)</longname>
-            <description>Berber (Morocco, Tifinagh alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh-alt-phonetic:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh-alt-phonetic</layout_variant>
-            <longname>Berber (Morocco, Tifinagh phonetic, alt.)</longname>
-            <description>Berber (Morocco, Tifinagh phonetic, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh-extended:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh-extended</layout_variant>
-            <longname>Berber (Morocco, Tifinagh extended)</longname>
-            <description>Berber (Morocco, Tifinagh extended)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh-phonetic:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh-phonetic</layout_variant>
-            <longname>Berber (Morocco, Tifinagh phonetic)</longname>
-            <description>Berber (Morocco, Tifinagh phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ma:tifinagh-extended-phonetic:ber</name>
-            <language>ber</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ma</layout>
-            <layout_variant>tifinagh-extended-phonetic</layout_variant>
-            <longname>Berber (Morocco, Tifinagh extended phonetic)</longname>
-            <description>Berber (Morocco, Tifinagh extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <longname>English (Cameroon)</longname>
-            <description>English (Cameroon)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:french:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>french</layout_variant>
-            <longname>French (Cameroon)</longname>
-            <description>French (Cameroon)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:qwerty:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
-            <description>Cameroon Multilingual (QWERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mm::mya</name>
-            <language>my</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mm</layout>
-            <longname>Burmese</longname>
-            <description>Burmese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:mm:zawgyi:mya</name>
-            <language>my</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mm</layout>
-            <layout_variant>zawgyi</layout_variant>
-            <longname>Burmese Zawgyi</longname>
-            <description>Burmese Zawgyi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <longname>French (Canada)</longname>
-            <description>French (Canada)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:fr-dvorak:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>fr-dvorak</layout_variant>
-            <longname>French (Canada, Dvorak)</longname>
-            <description>French (Canada, Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:fr-legacy:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>fr-legacy</layout_variant>
-            <longname>French (Canada, legacy)</longname>
-            <description>French (Canada, legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:multix:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>multix</layout_variant>
-            <longname>Canadian (intl.)</longname>
-            <description>Canadian (intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:multi:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>multi</layout_variant>
-            <longname>Canadian (intl., 1st part)</longname>
-            <description>Canadian (intl., 1st part)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:multi-2gr:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>multi-2gr</layout_variant>
-            <longname>Canadian (intl., 2nd part)</longname>
-            <description>Canadian (intl., 2nd part)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:ike:iku</name>
-            <language>iu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>ike</layout_variant>
-            <longname>Inuktitut</longname>
-            <description>Inuktitut</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ca:eng:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ca</layout>
-            <layout_variant>eng</layout_variant>
-            <longname>English (Canada)</longname>
-            <description>English (Canada)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cd::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cd</layout>
-            <longname>French (Democratic Republic of the Congo)</longname>
-            <description>French (Democratic Republic of the Congo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:hr::hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hr</layout>
-            <longname>Croatian</longname>
-            <description>Croatian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:hr:alternatequotes:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hr</layout>
-            <layout_variant>alternatequotes</layout_variant>
-            <longname>Croatian (with guillemets)</longname>
-            <description>Croatian (with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hr:unicode:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hr</layout>
-            <layout_variant>unicode</layout_variant>
-            <longname>Croatian (with Croatian digraphs)</longname>
-            <description>Croatian (with Croatian digraphs)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hr:unicodeus:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hr</layout>
-            <layout_variant>unicodeus</layout_variant>
-            <longname>Croatian (US, with Croatian digraphs)</longname>
-            <description>Croatian (US, with Croatian digraphs)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hr:us:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hr</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Croatian (US)</longname>
-            <description>Croatian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz::ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <longname>Czech</longname>
-            <description>Czech</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:bksl:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>bksl</layout_variant>
-            <longname> key)</longname>
-            <description> key)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:qwerty:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Czech (QWERTY)</longname>
-            <description>Czech (QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:qwerty_bksl:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>qwerty_bksl</layout_variant>
-            <longname>Czech (QWERTY, extended backslash)</longname>
-            <description>Czech (QWERTY, extended backslash)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:qwerty-mac:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>qwerty-mac</layout_variant>
-            <longname>Czech (QWERTY, Macintosh)</longname>
-            <description>Czech (QWERTY, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:ucw:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>ucw</layout_variant>
-            <longname>Czech (UCW, only accented letters)</longname>
-            <description>Czech (UCW, only accented letters)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:dvorak-ucw:ces</name>
-            <language>cs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>dvorak-ucw</layout_variant>
-            <longname>Czech (US, Dvorak, UCW support)</longname>
-            <description>Czech (US, Dvorak, UCW support)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cz:rus:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cz</layout>
-            <layout_variant>rus</layout_variant>
-            <longname>Russian (Czech, phonetic)</longname>
-            <description>Russian (Czech, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk::dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <longname>Danish</longname>
-            <description>Danish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk:nodeadkeys:dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Danish (no dead keys)</longname>
-            <description>Danish (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk:winkeys:dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Danish (Windows)</longname>
-            <description>Danish (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk:mac:dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Danish (Macintosh)</longname>
-            <description>Danish (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk:mac_nodeadkeys:dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <layout_variant>mac_nodeadkeys</layout_variant>
-            <longname>Danish (Macintosh, no dead keys)</longname>
-            <description>Danish (Macintosh, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:dk:dvorak:dan</name>
-            <language>da</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>dk</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Danish (Dvorak)</longname>
-            <description>Danish (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:nl::nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>nl</layout>
-            <longname>Dutch</longname>
-            <description>Dutch</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:nl:sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>nl</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Dutch (Sun dead keys)</longname>
-            <description>Dutch (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:nl:mac:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>nl</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Dutch (Macintosh)</longname>
-            <description>Dutch (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:nl:std:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>nl</layout>
-            <layout_variant>std</layout_variant>
-            <longname>Dutch (standard)</longname>
-            <description>Dutch (standard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bt::dzo</name>
-            <language>dz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bt</layout>
-            <longname>Dzongkha</longname>
-            <description>Dzongkha</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ee::est</name>
-            <language>et</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ee</layout>
-            <longname>Estonian</longname>
-            <description>Estonian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ee:nodeadkeys:est</name>
-            <language>et</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ee</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Estonian (no dead keys)</longname>
-            <description>Estonian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ee:dvorak:est</name>
-            <language>et</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ee</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Estonian (Dvorak)</longname>
-            <description>Estonian (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ee:us:est</name>
-            <language>et</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ee</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Estonian (US)</longname>
-            <description>Estonian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir::fas</name>
-            <language>fa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <longname>Persian</longname>
-            <description>Persian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir:pes_keypad:fas</name>
-            <language>fa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <layout_variant>pes_keypad</layout_variant>
-            <longname>Persian (with Persian keypad)</longname>
-            <description>Persian (with Persian keypad)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir:ku:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <layout_variant>ku</layout_variant>
-            <longname>Kurdish (Iran, Latin Q)</longname>
-            <description>Kurdish (Iran, Latin Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir:ku_f:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <layout_variant>ku_f</layout_variant>
-            <longname>Kurdish (Iran, F)</longname>
-            <description>Kurdish (Iran, F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir:ku_alt:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <layout_variant>ku_alt</layout_variant>
-            <longname>Kurdish (Iran, Latin Alt-Q)</longname>
-            <description>Kurdish (Iran, Latin Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ir:ku_ara:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ir</layout>
-            <layout_variant>ku_ara</layout_variant>
-            <longname>Kurdish (Iran, Arabic-Latin)</longname>
-            <description>Kurdish (Iran, Arabic-Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq::ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <longname>Iraqi</longname>
-            <description>Iraqi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq::kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <longname>Iraqi</longname>
-            <description>Iraqi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq:ku:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <layout_variant>ku</layout_variant>
-            <longname>Kurdish (Iraq, Latin Q)</longname>
-            <description>Kurdish (Iraq, Latin Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq:ku_f:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <layout_variant>ku_f</layout_variant>
-            <longname>Kurdish (Iraq, F)</longname>
-            <description>Kurdish (Iraq, F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq:ku_alt:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <layout_variant>ku_alt</layout_variant>
-            <longname>Kurdish (Iraq, Latin Alt-Q)</longname>
-            <description>Kurdish (Iraq, Latin Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:iq:ku_ara:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>iq</layout>
-            <layout_variant>ku_ara</layout_variant>
-            <longname>Kurdish (Iraq, Arabic-Latin)</longname>
-            <description>Kurdish (Iraq, Arabic-Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fo::fao</name>
-            <language>fo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fo</layout>
-            <longname>Faroese</longname>
-            <description>Faroese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:fo:nodeadkeys:fao</name>
-            <language>fo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fo</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Faroese (no dead keys)</longname>
-            <description>Faroese (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi::fin</name>
-            <language>fi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <longname>Finnish</longname>
-            <description>Finnish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi:winkeys:fin</name>
-            <language>fi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Finnish (Windows)</longname>
-            <description>Finnish (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi:classic:fin</name>
-            <language>fi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <layout_variant>classic</layout_variant>
-            <longname>Finnish (classic)</longname>
-            <description>Finnish (classic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi:nodeadkeys:fin</name>
-            <language>fi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Finnish (classic, no dead keys)</longname>
-            <description>Finnish (classic, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi:smi:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <layout_variant>smi</layout_variant>
-            <longname>Northern Saami (Finland)</longname>
-            <description>Northern Saami (Finland)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fi:mac:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fi</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Finnish (Macintosh)</longname>
-            <description>Finnish (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <longname>French</longname>
-            <description>French</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:nodeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>French (no dead keys)</longname>
-            <description>French (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>French (Sun dead keys)</longname>
-            <description>French (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:oss:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oss</layout_variant>
-            <longname>French (alt.)</longname>
-            <description>French (alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:oss_latin9:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oss_latin9</layout_variant>
-            <longname>French (alt., Latin-9 only)</longname>
-            <description>French (alt., Latin-9 only)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:oss_nodeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oss_nodeadkeys</layout_variant>
-            <longname>French (alt., no dead keys)</longname>
-            <description>French (alt., no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:oss_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>French (alt., Sun dead keys)</longname>
-            <description>French (alt., Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:latin9:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>latin9</layout_variant>
-            <longname>French (legacy, alt.)</longname>
-            <description>French (legacy, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:latin9_nodeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>latin9_nodeadkeys</layout_variant>
-            <longname>French (legacy, alt., no dead keys)</longname>
-            <description>French (legacy, alt., no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:latin9_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>latin9_sundeadkeys</layout_variant>
-            <longname>French (legacy, alt., Sun dead keys)</longname>
-            <description>French (legacy, alt., Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:bepo:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>bepo</layout_variant>
-            <longname>French (BEPO)</longname>
-            <description>French (BEPO)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:bepo_latin9:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>bepo_latin9</layout_variant>
-            <longname>French (BEPO, Latin-9 only)</longname>
-            <description>French (BEPO, Latin-9 only)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:bepo_afnor:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>bepo_afnor</layout_variant>
-            <longname>French (BEPO, AFNOR)</longname>
-            <description>French (BEPO, AFNOR)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:dvorak:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>French (Dvorak)</longname>
-            <description>French (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:mac:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>French (Macintosh)</longname>
-            <description>French (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:azerty:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>French (AZERTY)</longname>
-            <description>French (AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:afnor:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>afnor</layout_variant>
-            <longname>French (AZERTY, AFNOR)</longname>
-            <description>French (AZERTY, AFNOR)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:bre:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>bre</layout_variant>
-            <longname>French (Breton)</longname>
-            <description>French (Breton)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:oci:oci</name>
-            <language>oc</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oci</layout_variant>
-            <longname>Occitan</longname>
-            <description>Occitan</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:geo:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>geo</layout_variant>
-            <longname>Georgian (France, AZERTY Tskapo)</longname>
-            <description>Georgian (France, AZERTY Tskapo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:fr:us:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>us</layout_variant>
-            <longname>French (US)</longname>
-            <description>French (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <longname>English (Ghana)</longname>
-            <description>English (Ghana)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:generic:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>generic</layout_variant>
-            <longname>English (Ghana, multilingual)</longname>
-            <description>English (Ghana, multilingual)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:akan:aka</name>
-            <language>ak</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>akan</layout_variant>
-            <longname>Akan</longname>
-            <description>Akan</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:ewe:ewe</name>
-            <language>ee</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>ewe</layout_variant>
-            <longname>Ewe</longname>
-            <description>Ewe</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:fula:ful</name>
-            <language>ff</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>fula</layout_variant>
-            <longname>Fula</longname>
-            <description>Fula</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:ga:gaa</name>
-            <language>gaa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>ga</layout_variant>
-            <longname>Ga</longname>
-            <description>Ga</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:hausa:hau</name>
-            <language>ha</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>hausa</layout_variant>
-            <longname>Hausa (Ghana)</longname>
-            <description>Hausa (Ghana)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:avn:avn</name>
-            <language>avn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>avn</layout_variant>
-            <longname>Avatime</longname>
-            <description>Avatime</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gh:gillbt:avn</name>
-            <language>avn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gh</layout>
-            <layout_variant>gillbt</layout_variant>
-            <longname>English (Ghana, GILLBT)</longname>
-            <description>English (Ghana, GILLBT)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gn::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gn</layout>
-            <longname>French (Guinea)</longname>
-            <description>French (Guinea)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ge::kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ge</layout>
-            <longname>Georgian</longname>
-            <description>Georgian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ge:ergonomic:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ge</layout>
-            <layout_variant>ergonomic</layout_variant>
-            <longname>Georgian (ergonomic)</longname>
-            <description>Georgian (ergonomic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ge:mess:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ge</layout>
-            <layout_variant>mess</layout_variant>
-            <longname>Georgian (MESS)</longname>
-            <description>Georgian (MESS)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ge:ru:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ge</layout>
-            <layout_variant>ru</layout_variant>
-            <longname>Russian (Georgia)</longname>
-            <description>Russian (Georgia)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ge:os:oss</name>
-            <language>os</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ge</layout>
-            <layout_variant>os</layout_variant>
-            <longname>Ossetian (Georgia)</longname>
-            <description>Ossetian (Georgia)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de::deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <longname>German</longname>
-            <description>German</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:deadacute:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>deadacute</layout_variant>
-            <longname>German (dead acute)</longname>
-            <description>German (dead acute)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:deadgraveacute:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>deadgraveacute</layout_variant>
-            <longname>German (dead grave acute)</longname>
-            <description>German (dead grave acute)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:nodeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>German (no dead keys)</longname>
-            <description>German (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:T3:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>T3</layout_variant>
-            <longname>German (T3)</longname>
-            <description>German (T3)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:ro:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>ro</layout_variant>
-            <longname>Romanian (Germany)</longname>
-            <description>Romanian (Germany)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:ro_nodeadkeys:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>ro_nodeadkeys</layout_variant>
-            <longname>Romanian (Germany, no dead keys)</longname>
-            <description>Romanian (Germany, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:dvorak:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>German (Dvorak)</longname>
-            <description>German (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:sundeadkeys:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (Sun dead keys)</longname>
-            <description>German (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:neo:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>neo</layout_variant>
-            <longname>German (Neo 2)</longname>
-            <description>German (Neo 2)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:mac:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>German (Macintosh)</longname>
-            <description>German (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:mac_nodeadkeys:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>mac_nodeadkeys</layout_variant>
-            <longname>German (Macintosh, no dead keys)</longname>
-            <description>German (Macintosh, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:dsb:dsb</name>
-            <language>dsb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>dsb</layout_variant>
-            <longname>Lower Sorbian</longname>
-            <description>Lower Sorbian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:dsb_qwertz:dsb</name>
-            <language>dsb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>dsb_qwertz</layout_variant>
-            <longname>Lower Sorbian (QWERTZ)</longname>
-            <description>Lower Sorbian (QWERTZ)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:qwerty:dsb</name>
-            <language>dsb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>German (QWERTY)</longname>
-            <description>German (QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:tr:tr</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>tr</layout_variant>
-            <longname>Turkish (Germany)</longname>
-            <description>Turkish (Germany)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:ru:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>ru</layout_variant>
-            <longname>Russian (Germany, phonetic)</longname>
-            <description>Russian (Germany, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:de:deadtilde:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>deadtilde</layout_variant>
-            <longname>German (dead tilde)</longname>
-            <description>German (dead tilde)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gr::ell</name>
-            <language>el</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gr</layout>
-            <longname>Greek</longname>
-            <description>Greek</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:gr:simple:ell</name>
-            <language>el</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gr</layout>
-            <layout_variant>simple</layout_variant>
-            <longname>Greek (simple)</longname>
-            <description>Greek (simple)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gr:extended:ell</name>
-            <language>el</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gr</layout>
-            <layout_variant>extended</layout_variant>
-            <longname>Greek (extended)</longname>
-            <description>Greek (extended)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gr:nodeadkeys:ell</name>
-            <language>el</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gr</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Greek (no dead keys)</longname>
-            <description>Greek (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gr:polytonic:ell</name>
-            <language>el</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gr</layout>
-            <layout_variant>polytonic</layout_variant>
-            <longname>Greek (polytonic)</longname>
-            <description>Greek (polytonic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu::hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <longname>Hungarian</longname>
-            <description>Hungarian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:standard:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>standard</layout_variant>
-            <longname>Hungarian (standard)</longname>
-            <description>Hungarian (standard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:nodeadkeys:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Hungarian (no dead keys)</longname>
-            <description>Hungarian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:qwerty:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Hungarian (QWERTY)</longname>
-            <description>Hungarian (QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwertz_comma_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwertz_comma_dead</layout_variant>
-            <longname>Hungarian (QWERTZ, 101-key, comma, dead keys)</longname>
-            <description>Hungarian (QWERTZ, 101-key, comma, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwertz_comma_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwertz_comma_nodead</layout_variant>
-            <longname>Hungarian (QWERTZ, 101-key, comma, no dead keys)</longname>
-            <description>Hungarian (QWERTZ, 101-key, comma, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwertz_dot_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwertz_dot_dead</layout_variant>
-            <longname>Hungarian (QWERTZ, 101-key, dot, dead keys)</longname>
-            <description>Hungarian (QWERTZ, 101-key, dot, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwertz_dot_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwertz_dot_nodead</layout_variant>
-            <longname>Hungarian (QWERTZ, 101-key, dot, no dead keys)</longname>
-            <description>Hungarian (QWERTZ, 101-key, dot, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwerty_comma_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwerty_comma_dead</layout_variant>
-            <longname>Hungarian (QWERTY, 101-key, comma, dead keys)</longname>
-            <description>Hungarian (QWERTY, 101-key, comma, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwerty_comma_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwerty_comma_nodead</layout_variant>
-            <longname>Hungarian (QWERTY, 101-key, comma, no dead keys)</longname>
-            <description>Hungarian (QWERTY, 101-key, comma, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwerty_dot_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwerty_dot_dead</layout_variant>
-            <longname>Hungarian (QWERTY, 101-key, dot, dead keys)</longname>
-            <description>Hungarian (QWERTY, 101-key, dot, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:101_qwerty_dot_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>101_qwerty_dot_nodead</layout_variant>
-            <longname>Hungarian (QWERTY, 101-key, dot, no dead keys)</longname>
-            <description>Hungarian (QWERTY, 101-key, dot, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwertz_comma_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwertz_comma_dead</layout_variant>
-            <longname>Hungarian (QWERTZ, 102-key, comma, dead keys)</longname>
-            <description>Hungarian (QWERTZ, 102-key, comma, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwertz_comma_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwertz_comma_nodead</layout_variant>
-            <longname>Hungarian (QWERTZ, 102-key, comma, no dead keys)</longname>
-            <description>Hungarian (QWERTZ, 102-key, comma, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwertz_dot_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwertz_dot_dead</layout_variant>
-            <longname>Hungarian (QWERTZ, 102-key, dot, dead keys)</longname>
-            <description>Hungarian (QWERTZ, 102-key, dot, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwertz_dot_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwertz_dot_nodead</layout_variant>
-            <longname>Hungarian (QWERTZ, 102-key, dot, no dead keys)</longname>
-            <description>Hungarian (QWERTZ, 102-key, dot, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwerty_comma_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwerty_comma_dead</layout_variant>
-            <longname>Hungarian (QWERTY, 102-key, comma, dead keys)</longname>
-            <description>Hungarian (QWERTY, 102-key, comma, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwerty_comma_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwerty_comma_nodead</layout_variant>
-            <longname>Hungarian (QWERTY, 102-key, comma, no dead keys)</longname>
-            <description>Hungarian (QWERTY, 102-key, comma, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwerty_dot_dead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwerty_dot_dead</layout_variant>
-            <longname>Hungarian (QWERTY, 102-key, dot, dead keys)</longname>
-            <description>Hungarian (QWERTY, 102-key, dot, dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:hu:102_qwerty_dot_nodead:hun</name>
-            <language>hu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>hu</layout>
-            <layout_variant>102_qwerty_dot_nodead</layout_variant>
-            <longname>Hungarian (QWERTY, 102-key, dot, no dead keys)</longname>
-            <description>Hungarian (QWERTY, 102-key, dot, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is::isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <longname>Icelandic</longname>
-            <description>Icelandic</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:Sundeadkeys:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>Sundeadkeys</layout_variant>
-            <longname>Icelandic (Sun dead keys)</longname>
-            <description>Icelandic (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:nodeadkeys:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Icelandic (no dead keys)</longname>
-            <description>Icelandic (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:mac_legacy:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>mac_legacy</layout_variant>
-            <longname>Icelandic (Macintosh, legacy)</longname>
-            <description>Icelandic (Macintosh, legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:mac:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Icelandic (Macintosh)</longname>
-            <description>Icelandic (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:dvorak:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Icelandic (Dvorak)</longname>
-            <description>Icelandic (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:il::heb</name>
-            <language>he</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>il</layout>
-            <longname>Hebrew</longname>
-            <description>Hebrew</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:il:lyx:heb</name>
-            <language>he</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>il</layout>
-            <layout_variant>lyx</layout_variant>
-            <longname>Hebrew (lyx)</longname>
-            <description>Hebrew (lyx)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:il:phonetic:heb</name>
-            <language>he</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>il</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Hebrew (phonetic)</longname>
-            <description>Hebrew (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:il:biblical:heb</name>
-            <language>he</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>il</layout>
-            <layout_variant>biblical</layout_variant>
-            <longname>Hebrew (Biblical, Tiro)</longname>
-            <description>Hebrew (Biblical, Tiro)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it::ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <longname>Italian</longname>
-            <description>Italian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:nodeadkeys:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Italian (no dead keys)</longname>
-            <description>Italian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:winkeys:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Italian (Windows)</longname>
-            <description>Italian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:mac:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Italian (Macintosh)</longname>
-            <description>Italian (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:us:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Italian (US)</longname>
-            <description>Italian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:geo:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>geo</layout_variant>
-            <longname>Georgian (Italy)</longname>
-            <description>Georgian (Italy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:ibm:kat</name>
-            <language>ka</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>ibm</layout_variant>
-            <longname>Italian (IBM 142)</longname>
-            <description>Italian (IBM 142)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:slk</name>
-            <language>sk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:srd</name>
-            <language>sc</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:nap</name>
-            <language>nap</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:scn</name>
-            <language>scn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:intl:fur</name>
-            <language>fur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Italian (intl., with dead keys)</longname>
-            <description>Italian (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:scn:ita</name>
-            <language>it</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>scn</layout_variant>
-            <longname>Sicilian</longname>
-            <description>Sicilian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:scn:scn</name>
-            <language>scn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>scn</layout_variant>
-            <longname>Sicilian</longname>
-            <description>Sicilian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:it:fur:fur</name>
-            <language>fur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>it</layout>
-            <layout_variant>fur</layout_variant>
-            <longname>Friulian (Italy)</longname>
-            <description>Friulian (Italy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp::jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <longname>Japanese</longname>
-            <description>Japanese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp:kana:jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <layout_variant>kana</layout_variant>
-            <longname>Japanese (Kana)</longname>
-            <description>Japanese (Kana)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp:kana86:jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <layout_variant>kana86</layout_variant>
-            <longname>Japanese (Kana 86)</longname>
-            <description>Japanese (Kana 86)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp:OADG109A:jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <layout_variant>OADG109A</layout_variant>
-            <longname>Japanese (OADG 109A)</longname>
-            <description>Japanese (OADG 109A)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp:mac:jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Japanese (Macintosh)</longname>
-            <description>Japanese (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jp:dvorak:jpn</name>
-            <language>ja</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jp</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Japanese (Dvorak)</longname>
-            <description>Japanese (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kg::kir</name>
-            <language>ky</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kg</layout>
-            <longname>Kyrgyz</longname>
-            <description>Kyrgyz</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:kg:phonetic:kir</name>
-            <language>ky</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kg</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Kyrgyz (phonetic)</longname>
-            <description>Kyrgyz (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kh::khm</name>
-            <language>km</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kh</layout>
-            <longname>Khmer (Cambodia)</longname>
-            <description>Khmer (Cambodia)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz::kaz</name>
-            <language>kk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <longname>Kazakh</longname>
-            <description>Kazakh</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:ruskaz:kaz</name>
-            <language>kk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>ruskaz</layout_variant>
-            <longname>Russian (Kazakhstan, with Kazakh)</longname>
-            <description>Russian (Kazakhstan, with Kazakh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:ruskaz:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>ruskaz</layout_variant>
-            <longname>Russian (Kazakhstan, with Kazakh)</longname>
-            <description>Russian (Kazakhstan, with Kazakh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:kazrus:kaz</name>
-            <language>kk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>kazrus</layout_variant>
-            <longname>Kazakh (with Russian)</longname>
-            <description>Kazakh (with Russian)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:kazrus:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>kazrus</layout_variant>
-            <longname>Kazakh (with Russian)</longname>
-            <description>Kazakh (with Russian)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:ext:kaz</name>
-            <language>kk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>ext</layout_variant>
-            <longname>Kazakh (extended)</longname>
-            <description>Kazakh (extended)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kz:latin:kaz</name>
-            <language>kk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kz</layout>
-            <layout_variant>latin</layout_variant>
-            <longname>Kazakh (Latin)</longname>
-            <description>Kazakh (Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:la::lao</name>
-            <language>lo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>la</layout>
-            <longname>Lao</longname>
-            <description>Lao</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:la:stea:lao</name>
-            <language>lo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>la</layout>
-            <layout_variant>stea</layout_variant>
-            <longname>Lao (STEA)</longname>
-            <description>Lao (STEA)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt::lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <longname>Lithuanian</longname>
-            <description>Lithuanian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:std:lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>std</layout_variant>
-            <longname>Lithuanian (standard)</longname>
-            <description>Lithuanian (standard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:us:lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Lithuanian (US)</longname>
-            <description>Lithuanian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:ibm:lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>ibm</layout_variant>
-            <longname>Lithuanian (IBM LST 1205-92)</longname>
-            <description>Lithuanian (IBM LST 1205-92)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:lekp:lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>lekp</layout_variant>
-            <longname>Lithuanian (LEKP)</longname>
-            <description>Lithuanian (LEKP)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:lekpa:lit</name>
-            <language>lt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>lekpa</layout_variant>
-            <longname>Lithuanian (LEKPa)</longname>
-            <description>Lithuanian (LEKPa)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lt:sgs:sgs</name>
-            <language>sgs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lt</layout>
-            <layout_variant>sgs</layout_variant>
-            <longname>Samogitian</longname>
-            <description>Samogitian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv::lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <longname>Latvian</longname>
-            <description>Latvian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:apostrophe:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>apostrophe</layout_variant>
-            <longname>Latvian (apostrophe)</longname>
-            <description>Latvian (apostrophe)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:tilde:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>tilde</layout_variant>
-            <longname>Latvian (tilde)</longname>
-            <description>Latvian (tilde)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:fkey:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>fkey</layout_variant>
-            <longname>Latvian (F)</longname>
-            <description>Latvian (F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:modern:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>modern</layout_variant>
-            <longname>Latvian (modern)</longname>
-            <description>Latvian (modern)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:ergonomic:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>ergonomic</layout_variant>
-            <longname>Latvian (ergonomic, ŪGJRMV)</longname>
-            <description>Latvian (ergonomic, ŪGJRMV)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lv:adapted:lav</name>
-            <language>lv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lv</layout>
-            <layout_variant>adapted</layout_variant>
-            <longname>Latvian (adapted)</longname>
-            <description>Latvian (adapted)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mao::mri</name>
-            <language>mi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mao</layout>
-            <longname>Maori</longname>
-            <description>Maori</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:me::srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <longname>Montenegrin</longname>
-            <description>Montenegrin</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:cyrillic:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>cyrillic</layout_variant>
-            <longname>Montenegrin (Cyrillic)</longname>
-            <description>Montenegrin (Cyrillic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:cyrillicyz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>cyrillicyz</layout_variant>
-            <longname>Montenegrin (Cyrillic, ZE and ZHE swapped)</longname>
-            <description>Montenegrin (Cyrillic, ZE and ZHE swapped)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:latinunicode:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>latinunicode</layout_variant>
-            <longname>Montenegrin (Latin, Unicode)</longname>
-            <description>Montenegrin (Latin, Unicode)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:latinyz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>latinyz</layout_variant>
-            <longname>Montenegrin (Latin, QWERTY)</longname>
-            <description>Montenegrin (Latin, QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:latinunicodeyz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>latinunicodeyz</layout_variant>
-            <longname>Montenegrin (Latin, Unicode, QWERTY)</longname>
-            <description>Montenegrin (Latin, Unicode, QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:cyrillicalternatequotes:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>cyrillicalternatequotes</layout_variant>
-            <longname>Montenegrin (Cyrillic, with guillemets)</longname>
-            <description>Montenegrin (Cyrillic, with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:me:latinalternatequotes:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>me</layout>
-            <layout_variant>latinalternatequotes</layout_variant>
-            <longname>Montenegrin (Latin, with guillemets)</longname>
-            <description>Montenegrin (Latin, with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mk::mkd</name>
-            <language>mk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mk</layout>
-            <longname>Macedonian</longname>
-            <description>Macedonian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:mk:nodeadkeys:mkd</name>
-            <language>mk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mk</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Macedonian (no dead keys)</longname>
-            <description>Macedonian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mt::mlt</name>
-            <language>mt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mt</layout>
-            <longname>Maltese</longname>
-            <description>Maltese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:mt:us:mlt</name>
-            <language>mt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mt</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Maltese (US)</longname>
-            <description>Maltese (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mt:alt-us:mlt</name>
-            <language>mt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mt</layout>
-            <layout_variant>alt-us</layout_variant>
-            <longname>Maltese (US layout with AltGr overrides)</longname>
-            <description>Maltese (US layout with AltGr overrides)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mt:alt-gb:mlt</name>
-            <language>mt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mt</layout>
-            <layout_variant>alt-gb</layout_variant>
-            <longname>Maltese (UK, with AltGr overrides)</longname>
-            <description>Maltese (UK, with AltGr overrides)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mn::mon</name>
-            <language>mn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mn</layout>
-            <longname>Mongolian</longname>
-            <description>Mongolian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:no::nor</name>
-            <language>no</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <longname>Norwegian</longname>
-            <description>Norwegian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:no::nob</name>
-            <language>nb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <longname>Norwegian</longname>
-            <description>Norwegian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:no::nno</name>
-            <language>nn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <longname>Norwegian</longname>
-            <description>Norwegian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:nodeadkeys:nor</name>
-            <language>no</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Norwegian (no dead keys)</longname>
-            <description>Norwegian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:nodeadkeys:nob</name>
-            <language>nb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Norwegian (no dead keys)</longname>
-            <description>Norwegian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:nodeadkeys:nno</name>
-            <language>nn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Norwegian (no dead keys)</longname>
-            <description>Norwegian (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:winkeys:nor</name>
-            <language>no</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Windows)</longname>
-            <description>Norwegian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:winkeys:nob</name>
-            <language>nb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Windows)</longname>
-            <description>Norwegian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:winkeys:nno</name>
-            <language>nn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Norwegian (Windows)</longname>
-            <description>Norwegian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:dvorak:nor</name>
-            <language>no</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Norwegian (Dvorak)</longname>
-            <description>Norwegian (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:dvorak:nob</name>
-            <language>nb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Norwegian (Dvorak)</longname>
-            <description>Norwegian (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:dvorak:nno</name>
-            <language>nn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Norwegian (Dvorak)</longname>
-            <description>Norwegian (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:smi:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>smi</layout_variant>
-            <longname>Northern Saami (Norway)</longname>
-            <description>Northern Saami (Norway)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:smi_nodeadkeys:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>smi_nodeadkeys</layout_variant>
-            <longname>Northern Saami (Norway, no dead keys)</longname>
-            <description>Northern Saami (Norway, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:mac:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Norwegian (Macintosh)</longname>
-            <description>Norwegian (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:mac_nodeadkeys:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>mac_nodeadkeys</layout_variant>
-            <longname>Norwegian (Macintosh, no dead keys)</longname>
-            <description>Norwegian (Macintosh, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:no:colemak:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>no</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Norwegian (Colemak)</longname>
-            <description>Norwegian (Colemak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl::pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <longname>Polish</longname>
-            <description>Polish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:legacy:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Polish (legacy)</longname>
-            <description>Polish (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:qwertz:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>qwertz</layout_variant>
-            <longname>Polish (QWERTZ)</longname>
-            <description>Polish (QWERTZ)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:dvorak:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Polish (Dvorak)</longname>
-            <description>Polish (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:dvorak_quotes:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>dvorak_quotes</layout_variant>
-            <longname>Polish (Dvorak, with Polish quotes on quotemark key)</longname>
-            <description>Polish (Dvorak, with Polish quotes on quotemark key)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:dvorak_altquotes:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>dvorak_altquotes</layout_variant>
-            <longname>Polish (Dvorak, with Polish quotes on key 1)</longname>
-            <description>Polish (Dvorak, with Polish quotes on key 1)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:csb:csb</name>
-            <language>csb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>csb</layout_variant>
-            <longname>Kashubian</longname>
-            <description>Kashubian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:szl:szl</name>
-            <language>szl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>szl</layout_variant>
-            <longname>Silesian</longname>
-            <description>Silesian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:ru_phonetic_dvorak:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>ru_phonetic_dvorak</layout_variant>
-            <longname>Russian (Poland, phonetic Dvorak)</longname>
-            <description>Russian (Poland, phonetic Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pl:dvp:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pl</layout>
-            <layout_variant>dvp</layout_variant>
-            <longname>Polish (programmer Dvorak)</longname>
-            <description>Polish (programmer Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt::por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <longname>Portuguese</longname>
-            <description>Portuguese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:nodeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Portuguese (no dead keys)</longname>
-            <description>Portuguese (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:sundeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Portuguese (Sun dead keys)</longname>
-            <description>Portuguese (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:mac:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Portuguese (Macintosh)</longname>
-            <description>Portuguese (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:mac_nodeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>mac_nodeadkeys</layout_variant>
-            <longname>Portuguese (Macintosh, no dead keys)</longname>
-            <description>Portuguese (Macintosh, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:mac_sundeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>mac_sundeadkeys</layout_variant>
-            <longname>Portuguese (Macintosh, Sun dead keys)</longname>
-            <description>Portuguese (Macintosh, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:nativo:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>nativo</layout_variant>
-            <longname>Portuguese (Nativo)</longname>
-            <description>Portuguese (Nativo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:nativo-us:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>nativo-us</layout_variant>
-            <longname>Portuguese (Nativo for US keyboards)</longname>
-            <description>Portuguese (Nativo for US keyboards)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pt:nativo-epo:epo</name>
-            <language>eo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>nativo-epo</layout_variant>
-            <longname>Esperanto (Portugal, Nativo)</longname>
-            <description>Esperanto (Portugal, Nativo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ro::ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <longname>Romanian</longname>
-            <description>Romanian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ro:cedilla:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>cedilla</layout_variant>
-            <longname>Romanian (cedilla)</longname>
-            <description>Romanian (cedilla)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ro:std:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>std</layout_variant>
-            <longname>Romanian (standard)</longname>
-            <description>Romanian (standard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ro:std_cedilla:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>std_cedilla</layout_variant>
-            <longname>Romanian (standard cedilla)</longname>
-            <description>Romanian (standard cedilla)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ro:winkeys:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Romanian (Windows)</longname>
-            <description>Romanian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru::rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <longname>Russian</longname>
-            <description>Russian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Russian (phonetic)</longname>
-            <description>Russian (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic_winkeys:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic_winkeys</layout_variant>
-            <longname>Russian (phonetic, Windows)</longname>
-            <description>Russian (phonetic, Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic_YAZHERTY:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic_YAZHERTY</layout_variant>
-            <longname>Russian (phonetic, YAZHERTY)</longname>
-            <description>Russian (phonetic, YAZHERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:typewriter:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>typewriter</layout_variant>
-            <longname>Russian (typewriter)</longname>
-            <description>Russian (typewriter)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:legacy:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Russian (legacy)</longname>
-            <description>Russian (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:typewriter-legacy:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>typewriter-legacy</layout_variant>
-            <longname>Russian (typewriter, legacy)</longname>
-            <description>Russian (typewriter, legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:tt:tat</name>
-            <language>tt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>tt</layout_variant>
-            <longname>Tatar</longname>
-            <description>Tatar</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:os_legacy:oss</name>
-            <language>os</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>os_legacy</layout_variant>
-            <longname>Ossetian (legacy)</longname>
-            <description>Ossetian (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:os_winkeys:oss</name>
-            <language>os</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>os_winkeys</layout_variant>
-            <longname>Ossetian (Windows)</longname>
-            <description>Ossetian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:cv:chv</name>
-            <language>cv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>cv</layout_variant>
-            <longname>Chuvash</longname>
-            <description>Chuvash</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:cv_latin:chv</name>
-            <language>cv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>cv_latin</layout_variant>
-            <longname>Chuvash (Latin)</longname>
-            <description>Chuvash (Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:udm:udm</name>
-            <language>udm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>udm</layout_variant>
-            <longname>Udmurt</longname>
-            <description>Udmurt</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:kom:kom</name>
-            <language>kv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>kom</layout_variant>
-            <longname>Komi</longname>
-            <description>Komi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:sah:sah</name>
-            <language>sah</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>sah</layout_variant>
-            <longname>Yakut</longname>
-            <description>Yakut</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:xal:xal</name>
-            <language>xal</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>xal</layout_variant>
-            <longname>Kalmyk</longname>
-            <description>Kalmyk</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:dos:xal</name>
-            <language>xal</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>dos</layout_variant>
-            <longname>Russian (DOS)</longname>
-            <description>Russian (DOS)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:mac:xal</name>
-            <language>xal</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Russian (Macintosh)</longname>
-            <description>Russian (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:srp:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>srp</layout_variant>
-            <longname>Serbian (Russia)</longname>
-            <description>Serbian (Russia)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:srp:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>srp</layout_variant>
-            <longname>Serbian (Russia)</longname>
-            <description>Serbian (Russia)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:bak:bak</name>
-            <language>ba</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>bak</layout_variant>
-            <longname>Bashkirian</longname>
-            <description>Bashkirian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:chm:chm</name>
-            <language>chm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>chm</layout_variant>
-            <longname>Mari</longname>
-            <description>Mari</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic_azerty:chm</name>
-            <language>chm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic_azerty</layout_variant>
-            <longname>Russian (phonetic, AZERTY)</longname>
-            <description>Russian (phonetic, AZERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic_dvorak:chm</name>
-            <language>chm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic_dvorak</layout_variant>
-            <longname>Russian (phonetic, Dvorak)</longname>
-            <description>Russian (phonetic, Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ru:phonetic_fr:chm</name>
-            <language>chm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ru</layout>
-            <layout_variant>phonetic_fr</layout_variant>
-            <longname>Russian (phonetic, French)</longname>
-            <description>Russian (phonetic, French)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs::srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <longname>Serbian</longname>
-            <description>Serbian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:yz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>yz</layout_variant>
-            <longname>Serbian (Cyrillic, ZE and ZHE swapped)</longname>
-            <description>Serbian (Cyrillic, ZE and ZHE swapped)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:latin:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>latin</layout_variant>
-            <longname>Serbian (Latin)</longname>
-            <description>Serbian (Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:latinunicode:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>latinunicode</layout_variant>
-            <longname>Serbian (Latin, Unicode)</longname>
-            <description>Serbian (Latin, Unicode)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:latinyz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>latinyz</layout_variant>
-            <longname>Serbian (Latin, QWERTY)</longname>
-            <description>Serbian (Latin, QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:latinunicodeyz:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>latinunicodeyz</layout_variant>
-            <longname>Serbian (Latin, Unicode, QWERTY)</longname>
-            <description>Serbian (Latin, Unicode, QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:alternatequotes:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>alternatequotes</layout_variant>
-            <longname>Serbian (Cyrillic, with guillemets)</longname>
-            <description>Serbian (Cyrillic, with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:latinalternatequotes:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>latinalternatequotes</layout_variant>
-            <longname>Serbian (Latin, with guillemets)</longname>
-            <description>Serbian (Latin, with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:rs:rue:rue</name>
-            <language>rue</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>rs</layout>
-            <layout_variant>rue</layout_variant>
-            <longname>Pannonian Rusyn</longname>
-            <description>Pannonian Rusyn</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:si::slv</name>
-            <language>sl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>si</layout>
-            <longname>Slovenian</longname>
-            <description>Slovenian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:si:alternatequotes:slv</name>
-            <language>sl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>si</layout>
-            <layout_variant>alternatequotes</layout_variant>
-            <longname>Slovenian (with guillemets)</longname>
-            <description>Slovenian (with guillemets)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:si:us:slv</name>
-            <language>sl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>si</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Slovenian (US)</longname>
-            <description>Slovenian (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sk::slk</name>
-            <language>sk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sk</layout>
-            <longname>Slovak</longname>
-            <description>Slovak</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:sk:bksl:slk</name>
-            <language>sk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sk</layout>
-            <layout_variant>bksl</layout_variant>
-            <longname>Slovak (extended backslash)</longname>
-            <description>Slovak (extended backslash)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sk:qwerty:slk</name>
-            <language>sk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sk</layout>
-            <layout_variant>qwerty</layout_variant>
-            <longname>Slovak (QWERTY)</longname>
-            <description>Slovak (QWERTY)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sk:qwerty_bksl:slk</name>
-            <language>sk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sk</layout>
-            <layout_variant>qwerty_bksl</layout_variant>
-            <longname>Slovak (QWERTY, extended backslash)</longname>
-            <description>Slovak (QWERTY, extended backslash)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es::spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <longname>Spanish</longname>
-            <description>Spanish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:nodeadkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Spanish (no dead keys)</longname>
-            <description>Spanish (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:winkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Spanish (Windows)</longname>
-            <description>Spanish (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:deadtilde:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>deadtilde</layout_variant>
-            <longname>Spanish (dead tilde)</longname>
-            <description>Spanish (dead tilde)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:sundeadkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Spanish (Sun dead keys)</longname>
-            <description>Spanish (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:dvorak:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Spanish (Dvorak)</longname>
-            <description>Spanish (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:ast:ast</name>
-            <language>ast</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>ast</layout_variant>
-            <longname>Asturian (Spain, with bottom-dot H and L)</longname>
-            <description>Asturian (Spain, with bottom-dot H and L)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:cat:cat</name>
-            <language>ca</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>cat</layout_variant>
-            <longname>Catalan (Spain, with middle-dot L)</longname>
-            <description>Catalan (Spain, with middle-dot L)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:es:mac:cat</name>
-            <language>ca</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Spanish (Macintosh)</longname>
-            <description>Spanish (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se::swe</name>
-            <language>sv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <longname>Swedish</longname>
-            <description>Swedish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:nodeadkeys:swe</name>
-            <language>sv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Swedish (no dead keys)</longname>
-            <description>Swedish (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:dvorak:swe</name>
-            <language>sv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Swedish (Dvorak)</longname>
-            <description>Swedish (Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:rus:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>rus</layout_variant>
-            <longname>Russian (Sweden, phonetic)</longname>
-            <description>Russian (Sweden, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:rus_nodeadkeys:rus</name>
-            <language>ru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>rus_nodeadkeys</layout_variant>
-            <longname>Russian (Sweden, phonetic, no dead keys)</longname>
-            <description>Russian (Sweden, phonetic, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:smi:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>smi</layout_variant>
-            <longname>Northern Saami (Sweden)</longname>
-            <description>Northern Saami (Sweden)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:mac:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>Swedish (Macintosh)</longname>
-            <description>Swedish (Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:svdvorak:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>svdvorak</layout_variant>
-            <longname>Swedish (Svdvorak)</longname>
-            <description>Swedish (Svdvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:us_dvorak:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>us_dvorak</layout_variant>
-            <longname>Swedish (Dvorak, intl.)</longname>
-            <description>Swedish (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:us:sme</name>
-            <language>se</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Swedish (US)</longname>
-            <description>Swedish (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:se:swl:swl</name>
-            <language>swl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>se</layout>
-            <layout_variant>swl</layout_variant>
-            <longname>Swedish Sign Language</longname>
-            <description>Swedish Sign Language</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch::deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <longname>German (Switzerland)</longname>
-            <description>German (Switzerland)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch::gsw</name>
-            <language>gsw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <longname>German (Switzerland)</longname>
-            <description>German (Switzerland)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:legacy:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>German (Switzerland, legacy)</longname>
-            <description>German (Switzerland, legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:legacy:gsw</name>
-            <language>gsw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>German (Switzerland, legacy)</longname>
-            <description>German (Switzerland, legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_nodeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_nodeadkeys</layout_variant>
-            <longname>German (Switzerland, no dead keys)</longname>
-            <description>German (Switzerland, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_nodeadkeys:gsw</name>
-            <language>gsw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_nodeadkeys</layout_variant>
-            <longname>German (Switzerland, no dead keys)</longname>
-            <description>German (Switzerland, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, Sun dead keys)</longname>
-            <description>German (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_sundeadkeys:gsw</name>
-            <language>gsw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, Sun dead keys)</longname>
-            <description>German (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:fr:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>fr</layout_variant>
-            <longname>French (Switzerland)</longname>
-            <description>French (Switzerland)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:fr_nodeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>fr_nodeadkeys</layout_variant>
-            <longname>French (Switzerland, no dead keys)</longname>
-            <description>French (Switzerland, no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:fr_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>fr_sundeadkeys</layout_variant>
-            <longname>French (Switzerland, Sun dead keys)</longname>
-            <description>French (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:fr_mac:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>fr_mac</layout_variant>
-            <longname>French (Switzerland, Macintosh)</longname>
-            <description>French (Switzerland, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_mac:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_mac</layout_variant>
-            <longname>German (Switzerland, Macintosh)</longname>
-            <description>German (Switzerland, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy::syr</name>
-            <language>syr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <longname>Arabic (Syria)</longname>
-            <description>Arabic (Syria)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy:syc:syr</name>
-            <language>syr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <layout_variant>syc</layout_variant>
-            <longname>Syriac</longname>
-            <description>Syriac</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy:syc_phonetic:syr</name>
-            <language>syr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <layout_variant>syc_phonetic</layout_variant>
-            <longname>Syriac (phonetic)</longname>
-            <description>Syriac (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy:ku:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <layout_variant>ku</layout_variant>
-            <longname>Kurdish (Syria, Latin Q)</longname>
-            <description>Kurdish (Syria, Latin Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy:ku_f:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <layout_variant>ku_f</layout_variant>
-            <longname>Kurdish (Syria, F)</longname>
-            <description>Kurdish (Syria, F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:sy:ku_alt:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sy</layout>
-            <layout_variant>ku_alt</layout_variant>
-            <longname>Kurdish (Syria, Latin Alt-Q)</longname>
-            <description>Kurdish (Syria, Latin Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tj::tgk</name>
-            <language>tg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tj</layout>
-            <longname>Tajik</longname>
-            <description>Tajik</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tj:legacy:tgk</name>
-            <language>tg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tj</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Tajik (legacy)</longname>
-            <description>Tajik (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lk::sin</name>
-            <language>si</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lk</layout>
-            <longname>Sinhala (phonetic)</longname>
-            <description>Sinhala (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:lk:tam_unicode:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lk</layout>
-            <layout_variant>tam_unicode</layout_variant>
-            <longname>Tamil (Sri Lanka, TamilNet '99)</longname>
-            <description>Tamil (Sri Lanka, TamilNet '99)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lk:tam_TAB:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lk</layout>
-            <layout_variant>tam_TAB</layout_variant>
-            <longname>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</longname>
-            <description>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:lk:us:tam</name>
-            <language>ta</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>lk</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Sinhala (US)</longname>
-            <description>Sinhala (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:th::tha</name>
-            <language>th</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>th</layout>
-            <longname>Thai</longname>
-            <description>Thai</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:th:tis:tha</name>
-            <language>th</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>th</layout>
-            <layout_variant>tis</layout_variant>
-            <longname>Thai (TIS-820.2538)</longname>
-            <description>Thai (TIS-820.2538)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:th:pat:tha</name>
-            <language>th</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>th</layout>
-            <layout_variant>pat</layout_variant>
-            <longname>Thai (Pattachote)</longname>
-            <description>Thai (Pattachote)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr::tur</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <longname>Turkish</longname>
-            <description>Turkish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:f:tur</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>f</layout_variant>
-            <longname>Turkish (F)</longname>
-            <description>Turkish (F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:alt:tur</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>alt</layout_variant>
-            <longname>Turkish (Alt-Q)</longname>
-            <description>Turkish (Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:sundeadkeys:tur</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Turkish (Sun dead keys)</longname>
-            <description>Turkish (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:ku:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>ku</layout_variant>
-            <longname>Kurdish (Turkey, Latin Q)</longname>
-            <description>Kurdish (Turkey, Latin Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:ku_f:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>ku_f</layout_variant>
-            <longname>Kurdish (Turkey, F)</longname>
-            <description>Kurdish (Turkey, F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:ku_alt:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>ku_alt</layout_variant>
-            <longname>Kurdish (Turkey, Latin Alt-Q)</longname>
-            <description>Kurdish (Turkey, Latin Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:intl:kur</name>
-            <language>ku</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>Turkish (intl., with dead keys)</longname>
-            <description>Turkish (intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:crh:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh</layout_variant>
-            <longname>Crimean Tatar (Turkish Q)</longname>
-            <description>Crimean Tatar (Turkish Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:crh_f:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh_f</layout_variant>
-            <longname>Crimean Tatar (Turkish F)</longname>
-            <description>Crimean Tatar (Turkish F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:crh_alt:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh_alt</layout_variant>
-            <longname>Crimean Tatar (Turkish Alt-Q)</longname>
-            <description>Crimean Tatar (Turkish Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw::fox</name>
-            <language>fox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <longname>Taiwanese</longname>
-            <description>Taiwanese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:ami</name>
-            <language>ami</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:tay</name>
-            <language>tay</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:bnn</name>
-            <language>bnn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:ckv</name>
-            <language>ckv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:pwn</name>
-            <language>pwn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:pyu</name>
-            <language>pyu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:dru</name>
-            <language>dru</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:ais</name>
-            <language>ais</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:ssf</name>
-            <language>ssf</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:tao</name>
-            <language>tao</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:tsu</name>
-            <language>tsu</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:trv</name>
-            <language>trv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:xnb</name>
-            <language>xnb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:sxr</name>
-            <language>sxr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:uun</name>
-            <language>uun</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:indigenous:fos</name>
-            <language>fos</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>indigenous</layout_variant>
-            <longname>Taiwanese (indigenous)</longname>
-            <description>Taiwanese (indigenous)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tw:saisiyat:xsy</name>
-            <language>xsy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tw</layout>
-            <layout_variant>saisiyat</layout_variant>
-            <longname>Saisiyat (Taiwan)</longname>
-            <description>Saisiyat (Taiwan)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua::ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <longname>Ukrainian</longname>
-            <description>Ukrainian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:phonetic:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Ukrainian (phonetic)</longname>
-            <description>Ukrainian (phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:typewriter:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>typewriter</layout_variant>
-            <longname>Ukrainian (typewriter)</longname>
-            <description>Ukrainian (typewriter)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:winkeys:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>winkeys</layout_variant>
-            <longname>Ukrainian (Windows)</longname>
-            <description>Ukrainian (Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:legacy:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Ukrainian (legacy)</longname>
-            <description>Ukrainian (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:rstu:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>rstu</layout_variant>
-            <longname>Ukrainian (standard RSTU)</longname>
-            <description>Ukrainian (standard RSTU)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:rstu_ru:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>rstu_ru</layout_variant>
-            <longname>Russian (Ukraine, standard RSTU)</longname>
-            <description>Russian (Ukraine, standard RSTU)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ua:homophonic:ukr</name>
-            <language>uk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ua</layout>
-            <layout_variant>homophonic</layout_variant>
-            <longname>Ukrainian (homophonic)</longname>
-            <description>Ukrainian (homophonic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <longname>English (UK)</longname>
-            <description>English (UK)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:extd:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>extd</layout_variant>
-            <longname>English (UK, extended, Windows)</longname>
-            <description>English (UK, extended, Windows)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:intl:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>intl</layout_variant>
-            <longname>English (UK, intl., with dead keys)</longname>
-            <description>English (UK, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:dvorak:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>English (UK, Dvorak)</longname>
-            <description>English (UK, Dvorak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:dvorakukp:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>dvorakukp</layout_variant>
-            <longname>English (UK, Dvorak, with UK punctuation)</longname>
-            <description>English (UK, Dvorak, with UK punctuation)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:mac:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>mac</layout_variant>
-            <longname>English (UK, Macintosh)</longname>
-            <description>English (UK, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:mac_intl:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>mac_intl</layout_variant>
-            <longname>English (UK, Macintosh, intl.)</longname>
-            <description>English (UK, Macintosh, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:colemak:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>English (UK, Colemak)</longname>
-            <description>English (UK, Colemak)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:gb:pl:pol</name>
-            <language>pl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>gb</layout>
-            <layout_variant>pl</layout_variant>
-            <longname>Polish (British keyboard)</longname>
-            <description>Polish (British keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:uz::uzb</name>
-            <language>uz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>uz</layout>
-            <longname>Uzbek</longname>
-            <description>Uzbek</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:uz:latin:uzb</name>
-            <language>uz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>uz</layout>
-            <layout_variant>latin</layout_variant>
-            <longname>Uzbek (Latin)</longname>
-            <description>Uzbek (Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:vn::vie</name>
-            <language>vi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>vn</layout>
-            <longname>Vietnamese</longname>
-            <description>Vietnamese</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:vn:us:vie</name>
-            <language>vi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>vn</layout>
-            <layout_variant>us</layout_variant>
-            <longname>Vietnamese (US)</longname>
-            <description>Vietnamese (US)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:vn:fr:vie</name>
-            <language>vi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>vn</layout>
-            <layout_variant>fr</layout_variant>
-            <longname>Vietnamese (French)</longname>
-            <description>Vietnamese (French)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:kr::kor</name>
-            <language>ko</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kr</layout>
-            <longname>Korean</longname>
-            <description>Korean</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:kr:kr104:kor</name>
-            <language>ko</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>kr</layout>
-            <layout_variant>kr104</layout_variant>
-            <longname>Korean (101/104-key compatible)</longname>
-            <description>Korean (101/104-key compatible)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ie::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ie</layout>
-            <longname>Irish</longname>
-            <description>Irish</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ie:CloGaelach:gle</name>
-            <language>ga</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ie</layout>
-            <layout_variant>CloGaelach</layout_variant>
-            <longname>CloGaelach</longname>
-            <description>CloGaelach</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ie:UnicodeExpert:gle</name>
-            <language>ga</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ie</layout>
-            <layout_variant>UnicodeExpert</layout_variant>
-            <longname>Irish (UnicodeExpert)</longname>
-            <description>Irish (UnicodeExpert)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ie:ogam:sga</name>
-            <language>sga</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ie</layout>
-            <layout_variant>ogam</layout_variant>
-            <longname>Ogham</longname>
-            <description>Ogham</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ie:ogam_is434:sga</name>
-            <language>sga</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ie</layout>
-            <layout_variant>ogam_is434</layout_variant>
-            <longname>Ogham (IS434)</longname>
-            <description>Ogham (IS434)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pk::urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pk</layout>
-            <longname>Urdu (Pakistan)</longname>
-            <description>Urdu (Pakistan)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:pk:urd-crulp:urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pk</layout>
-            <layout_variant>urd-crulp</layout_variant>
-            <longname>Urdu (Pakistan, CRULP)</longname>
-            <description>Urdu (Pakistan, CRULP)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pk:urd-nla:urd</name>
-            <language>ur</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pk</layout>
-            <layout_variant>urd-nla</layout_variant>
-            <longname>Urdu (Pakistan, NLA)</longname>
-            <description>Urdu (Pakistan, NLA)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pk:ara:ara</name>
-            <language>ar</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pk</layout>
-            <layout_variant>ara</layout_variant>
-            <longname>Arabic (Pakistan)</longname>
-            <description>Arabic (Pakistan)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:pk:snd:snd</name>
-            <language>sd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pk</layout>
-            <layout_variant>snd</layout_variant>
-            <longname>Sindhi</longname>
-            <description>Sindhi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:mv::div</name>
-            <language>dv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>mv</layout>
-            <longname>Dhivehi</longname>
-            <description>Dhivehi</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:za::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>za</layout>
-            <longname>English (South Africa)</longname>
-            <description>English (South Africa)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:epo::epo</name>
-            <language>eo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>epo</layout>
-            <longname>Esperanto</longname>
-            <description>Esperanto</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:epo:legacy:epo</name>
-            <language>eo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>epo</layout>
-            <layout_variant>legacy</layout_variant>
-            <longname>Esperanto (legacy)</longname>
-            <description>Esperanto (legacy)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:np::nep</name>
-            <language>ne</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>np</layout>
-            <longname>Nepali</longname>
-            <description>Nepali</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:np::sat</name>
-            <language>sat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>np</layout>
-            <longname>Nepali</longname>
-            <description>Nepali</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ng::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ng</layout>
-            <longname>English (Nigeria)</longname>
-            <description>English (Nigeria)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ng:igbo:ibo</name>
-            <language>ig</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ng</layout>
-            <layout_variant>igbo</layout_variant>
-            <longname>Igbo</longname>
-            <description>Igbo</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ng:yoruba:yor</name>
-            <language>yo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ng</layout>
-            <layout_variant>yoruba</layout_variant>
-            <longname>Yoruba</longname>
-            <description>Yoruba</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ng:hausa:hau</name>
-            <language>ha</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ng</layout>
-            <layout_variant>hausa</layout_variant>
-            <longname>Hausa (Nigeria)</longname>
-            <description>Hausa (Nigeria)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:et::amh</name>
-            <language>am</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>et</layout>
-            <longname>Amharic</longname>
-            <description>Amharic</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:sn::wol</name>
-            <language>wo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>sn</layout>
-            <longname>Wolof</longname>
-            <description>Wolof</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tm::tuk</name>
-            <language>tk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tm</layout>
-            <longname>Turkmen</longname>
-            <description>Turkmen</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tm:alt:tuk</name>
-            <language>tk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tm</layout>
-            <layout_variant>alt</layout_variant>
-            <longname>Turkmen (Alt-Q)</longname>
-            <description>Turkmen (Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ml::bam</name>
-            <language>bm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ml</layout>
-            <longname>Bambara</longname>
-            <description>Bambara</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ml:fr-oss:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ml</layout>
-            <layout_variant>fr-oss</layout_variant>
-            <longname>French (Mali, alt.)</longname>
-            <description>French (Mali, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ml:us-mac:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ml</layout>
-            <layout_variant>us-mac</layout_variant>
-            <longname>English (Mali, US, Macintosh)</longname>
-            <description>English (Mali, US, Macintosh)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ml:us-intl:eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ml</layout>
-            <layout_variant>us-intl</layout_variant>
-            <longname>English (Mali, US, intl.)</longname>
-            <description>English (Mali, US, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tz::swa</name>
-            <language>sw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tz</layout>
-            <longname>Swahili (Tanzania)</longname>
-            <description>Swahili (Tanzania)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::ajg</name>
-            <language>ajg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::blo</name>
-            <language>blo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::kpo</name>
-            <language>kpo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::ewe</name>
-            <language>ee</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::fon</name>
-            <language>fon</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::fue</name>
-            <language>fue</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::gej</name>
-            <language>gej</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::ife</name>
-            <language>ife</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::kbp</name>
-            <language>kbp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::las</name>
-            <language>las</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::dop</name>
-            <language>dop</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::mfg</name>
-            <language>mfg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::nmz</name>
-            <language>nmz</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::bud</name>
-            <language>bud</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::gng</name>
-            <language>gng</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::kdh</name>
-            <language>kdh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:tg::soy</name>
-            <language>soy</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tg</layout>
-            <longname>French (Togo)</longname>
-            <description>French (Togo)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ke::swa</name>
-            <language>sw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ke</layout>
-            <longname>Swahili (Kenya)</longname>
-            <description>Swahili (Kenya)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ke:kik:kik</name>
-            <language>ki</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ke</layout>
-            <layout_variant>kik</layout_variant>
-            <longname>Kikuyu</longname>
-            <description>Kikuyu</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:bw::tsn</name>
-            <language>tn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bw</layout>
-            <longname>Tswana</longname>
-            <description>Tswana</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::eng</name>
-            <language>en</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph::war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <longname>Filipino</longname>
-            <description>Filipino</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:qwerty-bay:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>qwerty-bay</layout_variant>
-            <longname>Filipino (QWERTY, Baybayin)</longname>
-            <description>Filipino (QWERTY, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
-            <description>Filipino (Capewell-Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-dvorak-bay:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-dvorak-bay</layout_variant>
-            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
-            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:capewell-qwerf2k6-bay:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
-            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
-            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak</layout_variant>
-            <longname>Filipino (Colemak, Latin)</longname>
-            <description>Filipino (Colemak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:colemak-bay:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>colemak-bay</layout_variant>
-            <longname>Filipino (Colemak, Baybayin)</longname>
-            <description>Filipino (Colemak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Filipino (Dvorak, Latin)</longname>
-            <description>Filipino (Dvorak, Latin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:bik</name>
-            <language>bik</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:ceb</name>
-            <language>ceb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:fil</name>
-            <language>fil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:hil</name>
-            <language>hil</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:ilo</name>
-            <language>ilo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:pam</name>
-            <language>pam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:pag</name>
-            <language>pag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:phi</name>
-            <language>phi</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:tgl</name>
-            <language>tl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ph:dvorak-bay:war</name>
-            <language>war</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ph</layout>
-            <layout_variant>dvorak-bay</layout_variant>
-            <longname>Filipino (Dvorak, Baybayin)</longname>
-            <description>Filipino (Dvorak, Baybayin)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:md::ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>md</layout>
-            <longname>Moldavian</longname>
-            <description>Moldavian</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:md:gag:gag</name>
-            <language>gag</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>md</layout>
-            <layout_variant>gag</layout_variant>
-            <longname>Moldavian (Gagauz)</longname>
-            <description>Moldavian (Gagauz)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::ind</name>
-            <language>id</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::msa</name>
-            <language>ms</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::min</name>
-            <language>min</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::ace</name>
-            <language>ace</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::bjn</name>
-            <language>bjn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::tsg</name>
-            <language>tsg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id::mfa</name>
-            <language>mfa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:ind</name>
-            <language>id</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:msa</name>
-            <language>ms</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:min</name>
-            <language>min</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:ace</name>
-            <language>ace</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:bjn</name>
-            <language>bjn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:tsg</name>
-            <language>tsg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:id:phoneticx:mfa</name>
-            <language>mfa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>id</layout>
-            <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:jv::jv</name>
-            <language>jv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>jv</layout>
-            <longname>Indonesian (Javanese)</longname>
-            <description>Indonesian (Javanese)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::ind</name>
-            <language>id</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::msa</name>
-            <language>ms</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::min</name>
-            <language>min</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::ace</name>
-            <language>ace</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::bjn</name>
-            <language>bjn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::tsg</name>
-            <language>tsg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my::mfa</name>
-            <language>mfa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <longname>Malay (Jawi, Arabic Keyboard)</longname>
-            <description>Malay (Jawi, Arabic Keyboard)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>50</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:ind</name>
-            <language>id</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:msa</name>
-            <language>ms</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:min</name>
-            <language>min</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:ace</name>
-            <language>ace</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:bjn</name>
-            <language>bjn</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:tsg</name>
-            <language>tsg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:my:phonetic:mfa</name>
-            <language>mfa</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>my</layout>
-            <layout_variant>phonetic</layout_variant>
-            <longname>Malay (Jawi, phonetic)</longname>
-            <description>Malay (Jawi, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-    </engines>
-</component>
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index fc1541eca..4ab50286a 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -1,779 +1,10351 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component>
-	<name>org.freedesktop.IBus.Simple</name>
-	<description>A table based simple engine</description>
-	<exec>@libexecdir@/ibus-engine-simple</exec>
-	<version>@VERSION@</version>
-	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-	<license>GPL</license>
-	<homepage>https://github.com/ibus/ibus/wiki</homepage>
-	<textdomain>ibus</textdomain>
-	<engines>
-		<engine>
-			<name>xkb:us::eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us</layout>
-			<longname>English (US)</longname>
-			<description>English (US)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:us:intl:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us</layout>
-			<layout_variant>intl</layout_variant>
-			<longname>English (US, international with dead keys)</longname>
-			<description>English (US, international with dead keys)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:us:colemak:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us</layout>
-			<layout_variant>colemak</layout_variant>
-			<longname>English (Colemak)</longname>
-			<description>English (Colemak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:us:dvorak:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>English (Dvorak)</longname>
-			<description>English (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:us:altgr-intl:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>us</layout>
-			<layout_variant>altgr-intl</layout_variant>
-			<longname>English (international AltGr dead keys)</longname>
-			<description>English (international AltGr dead keys)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:ara::ara</name>
-			<language>ar</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ara</layout>
-			<longname>Arabic</longname>
-			<description>Arabic</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:be::ger</name>
-			<language>de</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>be</layout>
-			<longname>Belgian</longname>
-			<description>Belgian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:be::nld</name>
-			<language>nl</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>be</layout>
-			<longname>Belgian</longname>
-			<description>Belgian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:be::fra</name>
-			<language>fr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>be</layout>
-			<longname>Belgian</longname>
-			<description>Belgian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:br::por</name>
-			<language>pt</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>br</layout>
-			<longname>Portuguese (Brazil)</longname>
-			<description>Portuguese (Brazil)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:br:dvorak:por</name>
-			<language>pt</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>br</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>Portuguese (Brazil, Dvorak)</longname>
-			<description>Portuguese (Brazil, Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:bg::bul</name>
-			<language>bg</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>bg</layout>
-			<longname>Bulgarian</longname>
-			<description>Bulgarian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:bg:phonetic:bul</name>
-			<language>bg</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>bg</layout>
-			<layout_variant>phonetic</layout_variant>
-			<longname>Bulgarian (traditional phonetic)</longname>
-			<description>Bulgarian (traditional phonetic)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ca::fra</name>
-			<language>fr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ca</layout>
-			<longname>French (Canada)</longname>
-			<description>French (Canada)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:ca:eng:eng</name>
-			<language>en</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ca</layout>
-			<layout_variant>eng</layout_variant>
-			<longname>English (Canada)</longname>
-			<description>English (Canada)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:hr::hr</name>
-			<language>hr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>hr</layout>
-			<longname>Croatian</longname>
-			<description>Croatian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:cz::cze</name>
-			<language>cs</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>cz</layout>
-			<longname>Czech</longname>
-			<description>Czech</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-                <engine>
-                        <name>xkb:cz:qwerty:cze</name>
-                        <language>cs</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>cz</layout>
-                        <layout_variant>qwerty</layout_variant>
-                        <longname>Czech (qwerty)</longname>
-                        <description>Czech (qwerty)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
-                </engine>
-		<engine>
-			<name>xkb:dk::dan</name>
-			<language>da</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>dk</layout>
-			<longname>Danish</longname>
-			<description>Danish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ee::est</name>
-			<language>et</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ee</layout>
-			<longname>Estonian</longname>
-			<description>Estonian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:fi::fin</name>
-			<language>fi</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>fi</layout>
-			<longname>Finnish</longname>
-			<description>Finnish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-                <engine>
-                        <name>xkb:fr::fra</name>
-                        <language>fr</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>fr</layout>
-                        <longname>French</longname>
-                        <description>French</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
-                </engine>
-                <engine>
-                        <name>xkb:fr:oss:fra</name>
-                        <language>fr</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>fr</layout>
-                        <layout_variant>oss</layout_variant>
-                        <longname>French (alternative)</longname>
-                        <description>French (alternative)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:fr:bepo:fra</name>
-                        <language>fr</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>fr</layout>
-                        <layout_variant>bepo</layout_variant>
-                        <longname>French (Bepo, ergonomic, Dvorak way)</longname>
-                        <description>French (Bepo, ergonomic, Dvorak way)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:fr:bepo_afnor:fra</name>
-                        <language>fr</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>fr</layout>
-                        <layout_variant>bepo_afnor</layout_variant>
-                        <longname>French (Bepo, ergonomic, Dvorak way, AFNOR)</longname>
-                        <description>French (Bepo, ergonomic, Dvorak way, AFNOR)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:fr:dvorak:fra</name>
-                        <language>fr</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>fr</layout>
-                        <layout_variant>dvorak</layout_variant>
-                        <longname>French (Dvorak)</longname>
-                        <description>French (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-		<engine>
-			<name>xkb:de::ger</name>
-			<language>de</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>de</layout>
-			<longname>German</longname>
-			<description>German</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:de:dvorak:ger</name>
-			<language>de</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>de</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>German (Dvorak)</longname>
-			<description>German (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:de:neo:ger</name>
-			<language>de</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>de</layout>
-			<layout_variant>neo</layout_variant>
-			<longname>German (Neo 2)</longname>
-			<description>German (Neo 2)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-                <engine>
-                        <name>xkb:de:nodeadkeys:ger</name>
-                        <language>de</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>de</layout>
-                        <layout_variant>nodeadkeys</layout_variant>
-                        <longname>German (eliminate dead keys)</longname>
-                        <description>German (eliminate dead keys)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-		<engine>
-			<name>xkb:gr::gre</name>
-			<language>el</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>gr</layout>
-			<longname>Greek</longname>
-			<description>Greek</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:hu::hun</name>
-			<language>hu</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>hu</layout>
-			<longname>Hungarian</longname>
-			<description>Hungarian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:il::heb</name>
-			<language>he</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>il</layout>
-			<longname>Hebrew</longname>
-			<description>Hebrew</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:it::ita</name>
-			<language>it</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>it</layout>
-			<longname>Italian</longname>
-			<description>Italian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:jp::jpn</name>
-			<language>ja</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>jp</layout>
-			<longname>Japanese</longname>
-			<description>Japanese</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:latam::spa</name>
-			<language>es</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>latam</layout>
-			<longname>Spanish (Latin American)</longname>
-			<description>Spanish (Latin American)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:lt::lit</name>
-			<language>lt</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>lt</layout>
-			<longname>Lithuanian</longname>
-			<description>Lithuanian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:lv:apostrophe:lav</name>
-			<language>lv</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>lv</layout>
-			<layout_variant>apostrophe</layout_variant>
-			<longname>Latvian (apostrophe variant)</longname>
-			<description>Latvian (apostrophe variant)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:no::nor</name>
-			<language>no</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>no</layout>
-			<longname>Norwegian</longname>
-			<description>Norwegian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:no:dvorak:nor</name>
-			<language>no</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>no</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>Norwegian (Dvorak)</longname>
-			<description>Norwegian (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:pl::pol</name>
-			<language>pl</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>pl</layout>
-			<longname>Polish</longname>
-			<description>Polish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:pl:dvorak:pol</name>
-			<language>pl</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>pl</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>Polish (Dvorak)</longname>
-			<description>Polish (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-                <engine>
-                        <name>xkb:pl:qwertz:pol</name>
-                        <language>pl</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>pl</layout>
-                        <layout_variant>qwertz</layout_variant>
-                        <longname>Polish (qwertz)</longname>
-                        <description>Polish (qwertz)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-		<engine>
-			<name>xkb:pt::por</name>
-			<language>pt</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>pt</layout>
-			<longname>Portuguese</longname>
-			<description>Portuguese</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ro::rum</name>
-			<language>ro</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ro</layout>
-			<longname>Romanian</longname>
-			<description>Romanian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ru::rus</name>
-			<language>ru</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ru</layout>
-			<longname>Russian</longname>
-			<description>Russian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ru:phonetic:rus</name>
-			<language>ru</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ru</layout>
-			<layout_variant>phonetic</layout_variant>
-			<longname>Russian (phonetic)</longname>
-			<description>Russian (phonetic)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:rs::srp</name>
-			<language>sr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>rs</layout>
-			<longname>Serbian</longname>
-			<description>Serbian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:si::slv</name>
-			<language>sl</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>si</layout>
-			<longname>Slovenian</longname>
-			<description>Slovenian</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:sk::slo</name>
-			<language>sk</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>sk</layout>
-			<longname>Slovak</longname>
-			<description>Slovak</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-                <engine>
-                        <name>xkb:sk:qwerty:slo</name>
-                        <language>sk</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>sk</layout>
-                        <layout_variant>qwerty</layout_variant>
-                        <longname>Slovak (qwerty)</longname>
-                        <description>Slovak (qwerty)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
-                </engine>
-		<engine>
-			<name>xkb:es::spa</name>
-			<language>es</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>es</layout>
-			<longname>Spanish</longname>
-			<description>Spanish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:es:cat:cat</name>
-			<language>ca</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>es</layout>
-			<layout_variant>cat</layout_variant>
-			<longname>Catalan (Spain, with middle-dot L)</longname>
-			<description>Catalan (Spain, with middle-dot L)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:se::swe</name>
-			<language>sv</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>se</layout>
-			<longname>Swedish</longname>
-			<description>Swedish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:se:dvorak:swe</name>
-			<language>sv</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>se</layout>
-			<layout_variant>dvorak</layout_variant>
-			<longname>Swedish (Dvorak)</longname>
-			<description>Swedish (Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-                <engine>
-                        <name>xkb:se:svdvorak:swe</name>
-                        <language>sv</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>se</layout>
-                        <layout_variant>svdvorak</layout_variant>
-                        <longname>Swedish (Svdvorak)</longname>
-                        <description>Swedish (Svdvorak)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-		<engine>
-			<name>xkb:ch::ger</name>
-			<language>de</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ch</layout>
-			<longname>German (Switzerland)</longname>
-			<description>German (Switzerland)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:ch:fr:fra</name>
-			<language>fr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ch</layout>
-			<layout_variant>fr</layout_variant>
-			<longname>French (Switzerland)</longname>
-			<description>French (Switzerland)</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>1</rank>
-		</engine>
-		<engine>
-			<name>xkb:tr::tur</name>
-			<language>tr</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>tr</layout>
-			<longname>Turkish</longname>
-			<description>Turkish</description>
-                        <icon>ibus-keyboard</icon>
-			<rank>99</rank>
-		</engine>
-		<engine>
-			<name>xkb:ua::ukr</name>
-			<language>uk</language>
-			<license>GPL</license>
-			<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-			<layout>ua</layout>
-			<longname>Ukrainian</longname>
-			<description>Ukrainian</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
-                </engine>
-                <engine>
-                        <name>xkb:uz::uzb</name>
-                        <language>uz</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>uz</layout>
-                        <longname>Uzbek</longname>
-                        <description>Uzbek</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>99</rank>
-                </engine>
-                <engine>
-                        <name>xkb:uz:cyrillic:uzb</name>
-                        <language>uz</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>uz</layout>
-                        <layout_variant>cyrillic</layout_variant>
-                        <longname>Uzbek Cyrillic</longname>
-                        <description>Uzbek Cyrillic</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:uz:latin:uzb</name>
-                        <language>uz</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>uz</layout>
-                        <layout_variant>latin</layout_variant>
-                        <longname>Uzbek Latin</longname>
-                        <description>Uzbek Latin</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:gb:extd:eng</name>
-                        <language>en</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>gb</layout>
-                        <layout_variant>extd</layout_variant>
-                        <longname>English (UK, extended WinKeys)</longname>
-                        <description>English (UK, extended WinKeys)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:gb:dvorak:eng</name>
-                        <language>en</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>gb</layout>
-                        <layout_variant>dvorak</layout_variant>
-                        <longname>English (UK, Dvorak)</longname>
-                        <description>English (UK, Dvorak)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:my::msa</name>
-                        <language>ms</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>my</layout>
-                        <longname>Malay (Jawi)</longname>
-                        <description>Malay (Jawi)</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-                <engine>
-                        <name>xkb:mn::mon</name>
-                        <language>mn</language>
-                        <license>GPL</license>
-                        <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-                        <layout>mn</layout>
-                        <longname>Mongolian</longname>
-                        <description>Mongolian</description>
-                        <icon>ibus-keyboard</icon>
-                        <rank>1</rank>
-                </engine>
-	</engines>
+    <name>org.freedesktop.IBus.Simple</name>
+    <description>A table based simple engine</description>
+    <exec>@libexecdir@/ibus-engine-simple</exec>
+    <version>1.5.22.20200827</version>
+    <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+    <license>GPL</license>
+    <homepage>https://github.com/ibus/ibus/wiki</homepage>
+    <textdomain>ibus</textdomain>
+    <engines>
+        <engine>
+            <name>xkb:us::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <longname>English (US)</longname>
+            <description>English (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:chr:chr</name>
+            <language>chr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>chr</layout_variant>
+            <longname>Cherokee</longname>
+            <description>Cherokee</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:haw:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>haw</layout_variant>
+            <longname>Hawaiian</longname>
+            <description>Hawaiian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:euro:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>euro</layout_variant>
+            <longname>English (US, euro on 5)</longname>
+            <description>English (US, euro on 5)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:intl:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>English (US, intl., with dead keys)</longname>
+            <description>English (US, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:alt-intl:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>alt-intl</layout_variant>
+            <longname>English (US, alt. intl.)</longname>
+            <description>English (US, alt. intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:colemak:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>English (Colemak)</longname>
+            <description>English (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>English (Dvorak)</longname>
+            <description>English (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-intl:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-intl</layout_variant>
+            <longname>English (Dvorak, intl., with dead keys)</longname>
+            <description>English (Dvorak, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-alt-intl:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-alt-intl</layout_variant>
+            <longname>English (Dvorak, alt. intl.)</longname>
+            <description>English (Dvorak, alt. intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-l:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-l</layout_variant>
+            <longname>English (Dvorak, left-handed)</longname>
+            <description>English (Dvorak, left-handed)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-r:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-r</layout_variant>
+            <longname>English (Dvorak, right-handed)</longname>
+            <description>English (Dvorak, right-handed)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvorak-classic:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-classic</layout_variant>
+            <longname>English (classic Dvorak)</longname>
+            <description>English (classic Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:dvp:haw</name>
+            <language>haw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvp</layout_variant>
+            <longname>English (programmer Dvorak)</longname>
+            <description>English (programmer Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>rus</layout_variant>
+            <longname>Russian (US, phonetic)</longname>
+            <description>Russian (US, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:mac:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>English (Macintosh)</longname>
+            <description>English (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:altgr-intl:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>altgr-intl</layout_variant>
+            <longname>English (intl., with AltGr dead keys)</longname>
+            <description>English (intl., with AltGr dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:olpc2:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>olpc2</layout_variant>
+            <longname>English (the divide/multiply toggle the layout)</longname>
+            <description>English (the divide/multiply toggle the layout)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:hbs:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>hbs</layout_variant>
+            <longname>Serbo-Croatian (US)</longname>
+            <description>Serbo-Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>norman</layout_variant>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>norman</layout_variant>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>norman</layout_variant>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>norman</layout_variant>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:norman:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>norman</layout_variant>
+            <longname>English (Norman)</longname>
+            <description>English (Norman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman</layout_variant>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman</layout_variant>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman</layout_variant>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman</layout_variant>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman</layout_variant>
+            <longname>English (Workman)</longname>
+            <description>English (Workman)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:hbs</name>
+            <language>hbs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:us:workman-intl:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>workman-intl</layout_variant>
+            <longname>English (Workman, intl., with dead keys)</longname>
+            <description>English (Workman, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:ps:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>ps</layout_variant>
+            <longname>Pashto</longname>
+            <description>Pashto</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:uz:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>uz</layout_variant>
+            <longname>Uzbek (Afghanistan)</longname>
+            <description>Uzbek (Afghanistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:olpc-ps:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>olpc-ps</layout_variant>
+            <longname>Pashto (Afghanistan, OLPC)</longname>
+            <description>Pashto (Afghanistan, OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:fa-olpc:pus</name>
+            <language>ps</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>fa-olpc</layout_variant>
+            <longname>Persian (Afghanistan, Dari OLPC)</longname>
+            <description>Persian (Afghanistan, Dari OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:af:uz-olpc:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>uz-olpc</layout_variant>
+            <longname>Uzbek (Afghanistan, OLPC)</longname>
+            <description>Uzbek (Afghanistan, OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara::ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <longname>Arabic</longname>
+            <description>Arabic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:azerty:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Arabic (AZERTY)</longname>
+            <description>Arabic (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:azerty_digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>azerty_digits</layout_variant>
+            <longname>Arabic (AZERTY, Eastern Arabic numerals)</longname>
+            <description>Arabic (AZERTY, Eastern Arabic numerals)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>digits</layout_variant>
+            <longname>Arabic (Eastern Arabic numerals)</longname>
+            <description>Arabic (Eastern Arabic numerals)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:qwerty:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Arabic (QWERTY)</longname>
+            <description>Arabic (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:qwerty_digits:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>qwerty_digits</layout_variant>
+            <longname>Arabic (QWERTY, Eastern Arabic numerals)</longname>
+            <description>Arabic (QWERTY, Eastern Arabic numerals)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:buckwalter:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>buckwalter</layout_variant>
+            <longname>Arabic (Buckwalter)</longname>
+            <description>Arabic (Buckwalter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:olpc:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>olpc</layout_variant>
+            <longname>Arabic (OLPC)</longname>
+            <description>Arabic (OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ara:mac:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ara</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Arabic (Macintosh)</longname>
+            <description>Arabic (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:al::sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <longname>Albanian</longname>
+            <description>Albanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:al:plisi:sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <layout_variant>plisi</layout_variant>
+            <longname>Albanian (Plisi)</longname>
+            <description>Albanian (Plisi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:al:veqilharxhi:sqi</name>
+            <language>sq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>al</layout>
+            <layout_variant>veqilharxhi</layout_variant>
+            <longname>Albanian (Veqilharxhi)</longname>
+            <description>Albanian (Veqilharxhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am::hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <longname>Armenian</longname>
+            <description>Armenian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:phonetic:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Armenian (phonetic)</longname>
+            <description>Armenian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:phonetic-alt:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <layout_variant>phonetic-alt</layout_variant>
+            <longname>Armenian (alt. phonetic)</longname>
+            <description>Armenian (alt. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:eastern:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <layout_variant>eastern</layout_variant>
+            <longname>Armenian (eastern)</longname>
+            <description>Armenian (eastern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:western:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <layout_variant>western</layout_variant>
+            <longname>Armenian (western)</longname>
+            <description>Armenian (western)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:am:eastern-alt:hye</name>
+            <language>hy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>am</layout>
+            <layout_variant>eastern-alt</layout_variant>
+            <longname>Armenian (alt. eastern)</longname>
+            <description>Armenian (alt. eastern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <longname>German (Austria)</longname>
+            <description>German (Austria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>German (Austria, no dead keys)</longname>
+            <description>German (Austria, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>German (Austria, Sun dead keys)</longname>
+            <description>German (Austria, Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:at:mac:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>at</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>German (Austria, Macintosh)</longname>
+            <description>German (Austria, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:au::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>au</layout>
+            <longname>English (Australian)</longname>
+            <description>English (Australian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:az::aze</name>
+            <language>az</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>az</layout>
+            <longname>Azerbaijani</longname>
+            <description>Azerbaijani</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:az:cyrillic:aze</name>
+            <language>az</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>az</layout>
+            <layout_variant>cyrillic</layout_variant>
+            <longname>Azerbaijani (Cyrillic)</longname>
+            <description>Azerbaijani (Cyrillic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by::bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <longname>Belarusian</longname>
+            <description>Belarusian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:legacy:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Belarusian (legacy)</longname>
+            <description>Belarusian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:latin:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>latin</layout_variant>
+            <longname>Belarusian (Latin)</longname>
+            <description>Belarusian (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:ru:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>ru</layout_variant>
+            <longname>Russian (Belarus)</longname>
+            <description>Russian (Belarus)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:by:intl:bel</name>
+            <language>be</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>by</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Belarusian (intl.)</longname>
+            <description>Belarusian (intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <longname>Belgian</longname>
+            <description>Belgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss</layout_variant>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss</layout_variant>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss</layout_variant>
+            <longname>Belgian (alt.)</longname>
+            <description>Belgian (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_latin9</layout_variant>
+            <longname>Belgian (Latin-9 only, alt.)</longname>
+            <description>Belgian (Latin-9 only, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:oss_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys, alt.)</longname>
+            <description>Belgian (Sun dead keys, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:iso-alternate:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>iso-alternate</layout_variant>
+            <longname>Belgian (ISO, alt.)</longname>
+            <description>Belgian (ISO, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Belgian (no dead keys)</longname>
+            <description>Belgian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Belgian (Sun dead keys)</longname>
+            <description>Belgian (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>wang</layout_variant>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>wang</layout_variant>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:be:wang:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>be</layout>
+            <layout_variant>wang</layout_variant>
+            <longname>Belgian (Wang 724 AZERTY)</longname>
+            <description>Belgian (Wang 724 AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd::ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla</longname>
+            <description>Bangla</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd::sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <longname>Bangla</longname>
+            <description>Bangla</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd:probhat:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <layout_variant>probhat</layout_variant>
+            <longname>Bangla (Probhat)</longname>
+            <description>Bangla (Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bd:probhat:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bd</layout>
+            <layout_variant>probhat</layout_variant>
+            <longname>Bangla (Probhat)</longname>
+            <description>Bangla (Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben</layout_variant>
+            <longname>Bangla (India)</longname>
+            <description>Bangla (India)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben</layout_variant>
+            <longname>Bangla (India)</longname>
+            <description>Bangla (India)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_probhat:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_probhat</layout_variant>
+            <longname>Bangla (India, Probhat)</longname>
+            <description>Bangla (India, Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_probhat:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_probhat</layout_variant>
+            <longname>Bangla (India, Probhat)</longname>
+            <description>Bangla (India, Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_baishakhi:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_baishakhi</layout_variant>
+            <longname>Bangla (India, Baishakhi)</longname>
+            <description>Bangla (India, Baishakhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_baishakhi:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_baishakhi</layout_variant>
+            <longname>Bangla (India, Baishakhi)</longname>
+            <description>Bangla (India, Baishakhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_bornona:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_bornona</layout_variant>
+            <longname>Bangla (India, Bornona)</longname>
+            <description>Bangla (India, Bornona)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_bornona:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_bornona</layout_variant>
+            <longname>Bangla (India, Bornona)</longname>
+            <description>Bangla (India, Bornona)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_gitanjali:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_gitanjali</layout_variant>
+            <longname>Bangla (India, Gitanjali)</longname>
+            <description>Bangla (India, Gitanjali)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_gitanjali:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_gitanjali</layout_variant>
+            <longname>Bangla (India, Gitanjali)</longname>
+            <description>Bangla (India, Gitanjali)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_inscript:ben</name>
+            <language>bn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_inscript</layout_variant>
+            <longname>Bangla (India, Baishakhi Inscript)</longname>
+            <description>Bangla (India, Baishakhi Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ben_inscript:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ben_inscript</layout_variant>
+            <longname>Bangla (India, Baishakhi Inscript)</longname>
+            <description>Bangla (India, Baishakhi Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:eeyek:mni</name>
+            <language>mni</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>eeyek</layout_variant>
+            <longname>Manipuri (Eeyek)</longname>
+            <description>Manipuri (Eeyek)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:guj:guj</name>
+            <language>gu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>guj</layout_variant>
+            <longname>Gujarati</longname>
+            <description>Gujarati</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:guru:pan</name>
+            <language>pa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>guru</layout_variant>
+            <longname>Punjabi (Gurmukhi)</longname>
+            <description>Punjabi (Gurmukhi)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:jhelum:pan</name>
+            <language>pa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>jhelum</layout_variant>
+            <longname>Punjabi (Gurmukhi Jhelum)</longname>
+            <description>Punjabi (Gurmukhi Jhelum)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:kan:kan</name>
+            <language>kn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>kan</layout_variant>
+            <longname>Kannada</longname>
+            <description>Kannada</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:kan-kagapa:kan</name>
+            <language>kn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>kan-kagapa</layout_variant>
+            <longname>Kannada (KaGaPa, phonetic)</longname>
+            <description>Kannada (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>mal</layout_variant>
+            <longname>Malayalam</longname>
+            <description>Malayalam</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal_lalitha:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>mal_lalitha</layout_variant>
+            <longname>Malayalam (Lalitha)</longname>
+            <description>Malayalam (Lalitha)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mal_enhanced:mal</name>
+            <language>ml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>mal_enhanced</layout_variant>
+            <longname>Malayalam (enhanced Inscript, with rupee)</longname>
+            <description>Malayalam (enhanced Inscript, with rupee)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori:ori</name>
+            <language>or</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori</layout_variant>
+            <longname>Oriya</longname>
+            <description>Oriya</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori</layout_variant>
+            <longname>Oriya</longname>
+            <description>Oriya</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:olck:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>olck</layout_variant>
+            <longname>Ol Chiki</longname>
+            <description>Ol Chiki</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tam_tamilnet</layout_variant>
+            <longname>Tamil (TamilNet '99)</longname>
+            <description>Tamil (TamilNet '99)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_with_tam_nums:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tam_tamilnet_with_tam_nums</layout_variant>
+            <longname>Tamil (TamilNet '99 with Tamil numerals)</longname>
+            <description>Tamil (TamilNet '99 with Tamil numerals)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_TAB:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tam_tamilnet_TAB</layout_variant>
+            <longname>Tamil (TamilNet '99, TAB encoding)</longname>
+            <description>Tamil (TamilNet '99, TAB encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam_tamilnet_TSCII:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tam_tamilnet_TSCII</layout_variant>
+            <longname>Tamil (TamilNet '99, TSCII encoding)</longname>
+            <description>Tamil (TamilNet '99, TSCII encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tam:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tam</layout_variant>
+            <longname>Tamil (Inscript)</longname>
+            <description>Tamil (Inscript)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tel</layout_variant>
+            <longname>Telugu</longname>
+            <description>Telugu</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-kagapa:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tel-kagapa</layout_variant>
+            <longname>Telugu (KaGaPa, phonetic)</longname>
+            <description>Telugu (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-sarala:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tel-sarala</layout_variant>
+            <longname>Telugu (Sarala)</longname>
+            <description>Telugu (Sarala)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:tel-kagapa:tel</name>
+            <language>te</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>tel-kagapa</layout_variant>
+            <longname>Telugu (KaGaPa, phonetic)</longname>
+            <description>Telugu (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-phonetic:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>urd-phonetic</layout_variant>
+            <longname>Urdu (phonetic)</longname>
+            <description>Urdu (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-phonetic3:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>urd-phonetic3</layout_variant>
+            <longname>Urdu (alt. phonetic)</longname>
+            <description>Urdu (alt. phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:urd-winkeys:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>urd-winkeys</layout_variant>
+            <longname>Urdu (Windows)</longname>
+            <description>Urdu (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:bolnagri:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>bolnagri</layout_variant>
+            <longname>Hindi (Bolnagri)</longname>
+            <description>Hindi (Bolnagri)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:hin-wx:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>hin-wx</layout_variant>
+            <longname>Hindi (Wx)</longname>
+            <description>Hindi (Wx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:hin-kagapa:hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>hin-kagapa</layout_variant>
+            <longname>Hindi (KaGaPa, phonetic)</longname>
+            <description>Hindi (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:san-kagapa:san</name>
+            <language>sa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>san-kagapa</layout_variant>
+            <longname>Sanskrit (KaGaPa, phonetic)</longname>
+            <description>Sanskrit (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:mar-kagapa:mar</name>
+            <language>mr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>mar-kagapa</layout_variant>
+            <longname>Marathi (KaGaPa, phonetic)</longname>
+            <description>Marathi (KaGaPa, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:eng:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>eng</layout_variant>
+            <longname>English (India, with rupee)</longname>
+            <description>English (India, with rupee)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:iipa:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>iipa</layout_variant>
+            <longname>Indic IPA (IIPA)</longname>
+            <description>Indic IPA (IIPA)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:marathi:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>marathi</layout_variant>
+            <longname>मराठी इन्स्क्रिप्ट</longname>
+            <description>मराठी इन्स्क्रिप्ट</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba::bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <longname>Bosnian</longname>
+            <description>Bosnian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:alternatequotes:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <layout_variant>alternatequotes</layout_variant>
+            <longname>Bosnian (with guillemets)</longname>
+            <description>Bosnian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:unicode:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <layout_variant>unicode</layout_variant>
+            <longname>Bosnian (with Bosnian digraphs)</longname>
+            <description>Bosnian (with Bosnian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:unicodeus:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <layout_variant>unicodeus</layout_variant>
+            <longname>Bosnian (US, with Bosnian digraphs)</longname>
+            <description>Bosnian (US, with Bosnian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ba:us:bos</name>
+            <language>bs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ba</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Bosnian (US)</longname>
+            <description>Bosnian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br::por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <longname>Portuguese (Brazil)</longname>
+            <description>Portuguese (Brazil)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Portuguese (Brazil, no dead keys)</longname>
+            <description>Portuguese (Brazil, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:dvorak:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Portuguese (Brazil, Dvorak)</longname>
+            <description>Portuguese (Brazil, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>nativo</layout_variant>
+            <longname>Portuguese (Brazil, Nativo)</longname>
+            <description>Portuguese (Brazil, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo-us:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>nativo-us</layout_variant>
+            <longname>Portuguese (Brazil, Nativo for US keyboards)</longname>
+            <description>Portuguese (Brazil, Nativo for US keyboards)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:nativo-epo:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>nativo-epo</layout_variant>
+            <longname>Esperanto (Brazil, Nativo)</longname>
+            <description>Esperanto (Brazil, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:br:thinkpad:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>br</layout>
+            <layout_variant>thinkpad</layout_variant>
+            <longname>Portuguese (Brazil, IBM/Lenovo ThinkPad)</longname>
+            <description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg::bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <longname>Bulgarian</longname>
+            <description>Bulgarian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg:phonetic:bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Bulgarian (traditional phonetic)</longname>
+            <description>Bulgarian (traditional phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bg:bas_phonetic:bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <layout_variant>bas_phonetic</layout_variant>
+            <longname>Bulgarian (new phonetic)</longname>
+            <description>Bulgarian (new phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:azerty-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>azerty-deadkeys</layout_variant>
+            <longname>Kabylian (azerty layout, with dead keys)</longname>
+            <description>Kabylian (azerty layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:qwerty-gb-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>qwerty-gb-deadkeys</layout_variant>
+            <longname>Kabylian (qwerty-gb layout, with dead keys)</longname>
+            <description>Kabylian (qwerty-gb layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:qwerty-us-deadkeys:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>qwerty-us-deadkeys</layout_variant>
+            <longname>Kabylian (qwerty-us layout, with dead keys)</longname>
+            <description>Kabylian (qwerty-us layout, with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:ber:kab</name>
+            <language>kab</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>ber</layout_variant>
+            <longname>Kabylian (Algeria, Tifinagh)</longname>
+            <description>Kabylian (Algeria, Tifinagh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz:ar:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <layout_variant>ar</layout_variant>
+            <longname>Arabic (Algeria)</longname>
+            <description>Arabic (Algeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:french:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>french</layout_variant>
+            <longname>French (Morocco)</longname>
+            <description>French (Morocco)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh</layout_variant>
+            <longname>Berber (Morocco, Tifinagh)</longname>
+            <description>Berber (Morocco, Tifinagh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-alt:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh-alt</layout_variant>
+            <longname>Berber (Morocco, Tifinagh alt.)</longname>
+            <description>Berber (Morocco, Tifinagh alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-alt-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh-alt-phonetic</layout_variant>
+            <longname>Berber (Morocco, Tifinagh phonetic, alt.)</longname>
+            <description>Berber (Morocco, Tifinagh phonetic, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-extended:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh-extended</layout_variant>
+            <longname>Berber (Morocco, Tifinagh extended)</longname>
+            <description>Berber (Morocco, Tifinagh extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh-phonetic</layout_variant>
+            <longname>Berber (Morocco, Tifinagh phonetic)</longname>
+            <description>Berber (Morocco, Tifinagh phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ma:tifinagh-extended-phonetic:ber</name>
+            <language>ber</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>tifinagh-extended-phonetic</layout_variant>
+            <longname>Berber (Morocco, Tifinagh extended phonetic)</longname>
+            <description>Berber (Morocco, Tifinagh extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <longname>English (Cameroon)</longname>
+            <description>English (Cameroon)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:french:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>french</layout_variant>
+            <longname>French (Cameroon)</longname>
+            <description>French (Cameroon)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:qwerty:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Cameroon Multilingual (QWERTY, intl.)</longname>
+            <description>Cameroon Multilingual (QWERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:azerty:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bas</name>
+            <language>bas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:nmg</name>
+            <language>nmg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:fub</name>
+            <language>fub</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ewo</name>
+            <language>ewo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:xmd</name>
+            <language>xmd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mfh</name>
+            <language>mfh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bkm</name>
+            <language>bkm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ozm</name>
+            <language>ozm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:lns</name>
+            <language>lns</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:sox</name>
+            <language>sox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:pny</name>
+            <language>pny</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:wes</name>
+            <language>wes</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:lem</name>
+            <language>lem</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:nyj</name>
+            <language>nyj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mfk</name>
+            <language>mfk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:mcp</name>
+            <language>mcp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ass</name>
+            <language>ass</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:xed</name>
+            <language>xed</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:dua</name>
+            <language>dua</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:anv</name>
+            <language>anv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bum</name>
+            <language>bum</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:btb</name>
+            <language>btb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:bfd</name>
+            <language>bfd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:azo</name>
+            <language>azo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:ken</name>
+            <language>ken</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yam</name>
+            <language>yam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yat</name>
+            <language>yat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:yas</name>
+            <language>yas</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>mmuock</layout_variant>
+            <longname>Mmuock</longname>
+            <description>Mmuock</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm::mya</name>
+            <language>my</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <longname>Burmese</longname>
+            <description>Burmese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:zawgyi:mya</name>
+            <language>my</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>zawgyi</layout_variant>
+            <longname>Burmese Zawgyi</longname>
+            <description>Burmese Zawgyi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <longname>French (Canada)</longname>
+            <description>French (Canada)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:fr-dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>fr-dvorak</layout_variant>
+            <longname>French (Canada, Dvorak)</longname>
+            <description>French (Canada, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:fr-legacy:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>fr-legacy</layout_variant>
+            <longname>French (Canada, legacy)</longname>
+            <description>French (Canada, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multix:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>multix</layout_variant>
+            <longname>Canadian (intl.)</longname>
+            <description>Canadian (intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multi:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>multi</layout_variant>
+            <longname>Canadian (intl., 1st part)</longname>
+            <description>Canadian (intl., 1st part)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:multi-2gr:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>multi-2gr</layout_variant>
+            <longname>Canadian (intl., 2nd part)</longname>
+            <description>Canadian (intl., 2nd part)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:ike:iku</name>
+            <language>iu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>ike</layout_variant>
+            <longname>Inuktitut</longname>
+            <description>Inuktitut</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ca:eng:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ca</layout>
+            <layout_variant>eng</layout_variant>
+            <longname>English (Canada)</longname>
+            <description>English (Canada)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cd::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cd</layout>
+            <longname>French (Democratic Republic of the Congo)</longname>
+            <description>French (Democratic Republic of the Congo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr::hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <longname>Croatian</longname>
+            <description>Croatian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:alternatequotes:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <layout_variant>alternatequotes</layout_variant>
+            <longname>Croatian (with guillemets)</longname>
+            <description>Croatian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:unicode:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <layout_variant>unicode</layout_variant>
+            <longname>Croatian (with Croatian digraphs)</longname>
+            <description>Croatian (with Croatian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:unicodeus:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <layout_variant>unicodeus</layout_variant>
+            <longname>Croatian (US, with Croatian digraphs)</longname>
+            <description>Croatian (US, with Croatian digraphs)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hr:us:hrv</name>
+            <language>hr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hr</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Croatian (US)</longname>
+            <description>Croatian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz::ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <longname>Czech</longname>
+            <description>Czech</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:bksl:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>bksl</layout_variant>
+            <longname> key)</longname>
+            <description> key)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Czech (QWERTY)</longname>
+            <description>Czech (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty_bksl:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>qwerty_bksl</layout_variant>
+            <longname>Czech (QWERTY, extended backslash)</longname>
+            <description>Czech (QWERTY, extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:qwerty-mac:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>qwerty-mac</layout_variant>
+            <longname>Czech (QWERTY, Macintosh)</longname>
+            <description>Czech (QWERTY, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:ucw:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>ucw</layout_variant>
+            <longname>Czech (UCW, only accented letters)</longname>
+            <description>Czech (UCW, only accented letters)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:dvorak-ucw:ces</name>
+            <language>cs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>dvorak-ucw</layout_variant>
+            <longname>Czech (US, Dvorak, UCW support)</longname>
+            <description>Czech (US, Dvorak, UCW support)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cz:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cz</layout>
+            <layout_variant>rus</layout_variant>
+            <longname>Russian (Czech, phonetic)</longname>
+            <description>Russian (Czech, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk::dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <longname>Danish</longname>
+            <description>Danish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:nodeadkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Danish (no dead keys)</longname>
+            <description>Danish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:winkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Danish (Windows)</longname>
+            <description>Danish (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:mac:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Danish (Macintosh)</longname>
+            <description>Danish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:mac_nodeadkeys:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>Danish (Macintosh, no dead keys)</longname>
+            <description>Danish (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:dk:dvorak:dan</name>
+            <language>da</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dk</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Danish (Dvorak)</longname>
+            <description>Danish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl::nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <longname>Dutch</longname>
+            <description>Dutch</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:sundeadkeys:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Dutch (Sun dead keys)</longname>
+            <description>Dutch (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:mac:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Dutch (Macintosh)</longname>
+            <description>Dutch (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:nl:std:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <layout_variant>std</layout_variant>
+            <longname>Dutch (standard)</longname>
+            <description>Dutch (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bt::dzo</name>
+            <language>dz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bt</layout>
+            <longname>Dzongkha</longname>
+            <description>Dzongkha</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee::est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <longname>Estonian</longname>
+            <description>Estonian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:nodeadkeys:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Estonian (no dead keys)</longname>
+            <description>Estonian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:dvorak:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Estonian (Dvorak)</longname>
+            <description>Estonian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ee:us:est</name>
+            <language>et</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ee</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Estonian (US)</longname>
+            <description>Estonian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir::fas</name>
+            <language>fa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <longname>Persian</longname>
+            <description>Persian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:pes_keypad:fas</name>
+            <language>fa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <layout_variant>pes_keypad</layout_variant>
+            <longname>Persian (with Persian keypad)</longname>
+            <description>Persian (with Persian keypad)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <layout_variant>ku</layout_variant>
+            <longname>Kurdish (Iran, Latin Q)</longname>
+            <description>Kurdish (Iran, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <layout_variant>ku_f</layout_variant>
+            <longname>Kurdish (Iran, F)</longname>
+            <description>Kurdish (Iran, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <layout_variant>ku_alt</layout_variant>
+            <longname>Kurdish (Iran, Latin Alt-Q)</longname>
+            <description>Kurdish (Iran, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ir:ku_ara:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ir</layout>
+            <layout_variant>ku_ara</layout_variant>
+            <longname>Kurdish (Iran, Arabic-Latin)</longname>
+            <description>Kurdish (Iran, Arabic-Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq::ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Iraqi</longname>
+            <description>Iraqi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq::kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <longname>Iraqi</longname>
+            <description>Iraqi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <layout_variant>ku</layout_variant>
+            <longname>Kurdish (Iraq, Latin Q)</longname>
+            <description>Kurdish (Iraq, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <layout_variant>ku_f</layout_variant>
+            <longname>Kurdish (Iraq, F)</longname>
+            <description>Kurdish (Iraq, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <layout_variant>ku_alt</layout_variant>
+            <longname>Kurdish (Iraq, Latin Alt-Q)</longname>
+            <description>Kurdish (Iraq, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:iq:ku_ara:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>iq</layout>
+            <layout_variant>ku_ara</layout_variant>
+            <longname>Kurdish (Iraq, Arabic-Latin)</longname>
+            <description>Kurdish (Iraq, Arabic-Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fo::fao</name>
+            <language>fo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fo</layout>
+            <longname>Faroese</longname>
+            <description>Faroese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fo:nodeadkeys:fao</name>
+            <language>fo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fo</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Faroese (no dead keys)</longname>
+            <description>Faroese (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi::fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <longname>Finnish</longname>
+            <description>Finnish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:winkeys:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Finnish (Windows)</longname>
+            <description>Finnish (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:classic:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <layout_variant>classic</layout_variant>
+            <longname>Finnish (classic)</longname>
+            <description>Finnish (classic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:nodeadkeys:fin</name>
+            <language>fi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Finnish (classic, no dead keys)</longname>
+            <description>Finnish (classic, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <layout_variant>smi</layout_variant>
+            <longname>Northern Saami (Finland)</longname>
+            <description>Northern Saami (Finland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fi:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fi</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Finnish (Macintosh)</longname>
+            <description>Finnish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <longname>French</longname>
+            <description>French</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>French (no dead keys)</longname>
+            <description>French (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>French (Sun dead keys)</longname>
+            <description>French (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>oss</layout_variant>
+            <longname>French (alt.)</longname>
+            <description>French (alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>oss_latin9</layout_variant>
+            <longname>French (alt., Latin-9 only)</longname>
+            <description>French (alt., Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>oss_nodeadkeys</layout_variant>
+            <longname>French (alt., no dead keys)</longname>
+            <description>French (alt., no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oss_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>oss_sundeadkeys</layout_variant>
+            <longname>French (alt., Sun dead keys)</longname>
+            <description>French (alt., Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>latin9</layout_variant>
+            <longname>French (legacy, alt.)</longname>
+            <description>French (legacy, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>latin9_nodeadkeys</layout_variant>
+            <longname>French (legacy, alt., no dead keys)</longname>
+            <description>French (legacy, alt., no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:latin9_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>latin9_sundeadkeys</layout_variant>
+            <longname>French (legacy, alt., Sun dead keys)</longname>
+            <description>French (legacy, alt., Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>bepo</layout_variant>
+            <longname>French (BEPO)</longname>
+            <description>French (BEPO)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo_latin9:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>bepo_latin9</layout_variant>
+            <longname>French (BEPO, Latin-9 only)</longname>
+            <description>French (BEPO, Latin-9 only)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bepo_afnor:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>bepo_afnor</layout_variant>
+            <longname>French (BEPO, AFNOR)</longname>
+            <description>French (BEPO, AFNOR)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:dvorak:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>French (Dvorak)</longname>
+            <description>French (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>French (Macintosh)</longname>
+            <description>French (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:azerty:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>French (AZERTY)</longname>
+            <description>French (AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:afnor:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>afnor</layout_variant>
+            <longname>French (AZERTY, AFNOR)</longname>
+            <description>French (AZERTY, AFNOR)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:bre:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>bre</layout_variant>
+            <longname>French (Breton)</longname>
+            <description>French (Breton)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:oci:oci</name>
+            <language>oc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>oci</layout_variant>
+            <longname>Occitan</longname>
+            <description>Occitan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:geo:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>geo</layout_variant>
+            <longname>Georgian (France, AZERTY Tskapo)</longname>
+            <description>Georgian (France, AZERTY Tskapo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:fr:us:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>fr</layout>
+            <layout_variant>us</layout_variant>
+            <longname>French (US)</longname>
+            <description>French (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <longname>English (Ghana)</longname>
+            <description>English (Ghana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:generic:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>generic</layout_variant>
+            <longname>English (Ghana, multilingual)</longname>
+            <description>English (Ghana, multilingual)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:akan:aka</name>
+            <language>ak</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>akan</layout_variant>
+            <longname>Akan</longname>
+            <description>Akan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:ewe:ewe</name>
+            <language>ee</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>ewe</layout_variant>
+            <longname>Ewe</longname>
+            <description>Ewe</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:fula:ful</name>
+            <language>ff</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>fula</layout_variant>
+            <longname>Fula</longname>
+            <description>Fula</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:ga:gaa</name>
+            <language>gaa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>ga</layout_variant>
+            <longname>Ga</longname>
+            <description>Ga</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:hausa:hau</name>
+            <language>ha</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>hausa</layout_variant>
+            <longname>Hausa (Ghana)</longname>
+            <description>Hausa (Ghana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:avn:avn</name>
+            <language>avn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>avn</layout_variant>
+            <longname>Avatime</longname>
+            <description>Avatime</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gh:gillbt:avn</name>
+            <language>avn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gh</layout>
+            <layout_variant>gillbt</layout_variant>
+            <longname>English (Ghana, GILLBT)</longname>
+            <description>English (Ghana, GILLBT)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gn::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gn</layout>
+            <longname>French (Guinea)</longname>
+            <description>French (Guinea)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge::kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <longname>Georgian</longname>
+            <description>Georgian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:ergonomic:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <layout_variant>ergonomic</layout_variant>
+            <longname>Georgian (ergonomic)</longname>
+            <description>Georgian (ergonomic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:mess:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <layout_variant>mess</layout_variant>
+            <longname>Georgian (MESS)</longname>
+            <description>Georgian (MESS)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:ru:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <layout_variant>ru</layout_variant>
+            <longname>Russian (Georgia)</longname>
+            <description>Russian (Georgia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ge:os:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ge</layout>
+            <layout_variant>os</layout_variant>
+            <longname>Ossetian (Georgia)</longname>
+            <description>Ossetian (Georgia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <longname>German</longname>
+            <description>German</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadacute:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>deadacute</layout_variant>
+            <longname>German (dead acute)</longname>
+            <description>German (dead acute)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadgraveacute:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>deadgraveacute</layout_variant>
+            <longname>German (dead grave acute)</longname>
+            <description>German (dead grave acute)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>German (no dead keys)</longname>
+            <description>German (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:T3:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>T3</layout_variant>
+            <longname>German (T3)</longname>
+            <description>German (T3)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ro:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>ro</layout_variant>
+            <longname>Romanian (Germany)</longname>
+            <description>Romanian (Germany)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ro_nodeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>ro_nodeadkeys</layout_variant>
+            <longname>Romanian (Germany, no dead keys)</longname>
+            <description>Romanian (Germany, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dvorak:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>German (Dvorak)</longname>
+            <description>German (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:sundeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>German (Sun dead keys)</longname>
+            <description>German (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:neo:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>neo</layout_variant>
+            <longname>German (Neo 2)</longname>
+            <description>German (Neo 2)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:mac:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>German (Macintosh)</longname>
+            <description>German (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:mac_nodeadkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>German (Macintosh, no dead keys)</longname>
+            <description>German (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dsb:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>dsb</layout_variant>
+            <longname>Lower Sorbian</longname>
+            <description>Lower Sorbian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:dsb_qwertz:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>dsb_qwertz</layout_variant>
+            <longname>Lower Sorbian (QWERTZ)</longname>
+            <description>Lower Sorbian (QWERTZ)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:qwerty:dsb</name>
+            <language>dsb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>German (QWERTY)</longname>
+            <description>German (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:tr:tr</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>tr</layout_variant>
+            <longname>Turkish (Germany)</longname>
+            <description>Turkish (Germany)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:ru:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>ru</layout_variant>
+            <longname>Russian (Germany, phonetic)</longname>
+            <description>Russian (Germany, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:deadtilde:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>deadtilde</layout_variant>
+            <longname>German (dead tilde)</longname>
+            <description>German (dead tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr::ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <longname>Greek</longname>
+            <description>Greek</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:simple:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <layout_variant>simple</layout_variant>
+            <longname>Greek (simple)</longname>
+            <description>Greek (simple)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:extended:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <layout_variant>extended</layout_variant>
+            <longname>Greek (extended)</longname>
+            <description>Greek (extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:nodeadkeys:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Greek (no dead keys)</longname>
+            <description>Greek (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gr:polytonic:ell</name>
+            <language>el</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gr</layout>
+            <layout_variant>polytonic</layout_variant>
+            <longname>Greek (polytonic)</longname>
+            <description>Greek (polytonic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu::hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <longname>Hungarian</longname>
+            <description>Hungarian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:standard:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>standard</layout_variant>
+            <longname>Hungarian (standard)</longname>
+            <description>Hungarian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:nodeadkeys:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Hungarian (no dead keys)</longname>
+            <description>Hungarian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:qwerty:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Hungarian (QWERTY)</longname>
+            <description>Hungarian (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwertz_comma_dead</layout_variant>
+            <longname>Hungarian (QWERTZ, 101-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, comma, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwertz_comma_nodead</layout_variant>
+            <longname>Hungarian (QWERTZ, 101-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, comma, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwertz_dot_dead</layout_variant>
+            <longname>Hungarian (QWERTZ, 101-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, dot, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwertz_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwertz_dot_nodead</layout_variant>
+            <longname>Hungarian (QWERTZ, 101-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 101-key, dot, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwerty_comma_dead</layout_variant>
+            <longname>Hungarian (QWERTY, 101-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, comma, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwerty_comma_nodead</layout_variant>
+            <longname>Hungarian (QWERTY, 101-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, comma, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwerty_dot_dead</layout_variant>
+            <longname>Hungarian (QWERTY, 101-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, dot, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:101_qwerty_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>101_qwerty_dot_nodead</layout_variant>
+            <longname>Hungarian (QWERTY, 101-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 101-key, dot, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwertz_comma_dead</layout_variant>
+            <longname>Hungarian (QWERTZ, 102-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, comma, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwertz_comma_nodead</layout_variant>
+            <longname>Hungarian (QWERTZ, 102-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, comma, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwertz_dot_dead</layout_variant>
+            <longname>Hungarian (QWERTZ, 102-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, dot, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwertz_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwertz_dot_nodead</layout_variant>
+            <longname>Hungarian (QWERTZ, 102-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTZ, 102-key, dot, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_comma_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwerty_comma_dead</layout_variant>
+            <longname>Hungarian (QWERTY, 102-key, comma, dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, comma, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_comma_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwerty_comma_nodead</layout_variant>
+            <longname>Hungarian (QWERTY, 102-key, comma, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, comma, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_dot_dead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwerty_dot_dead</layout_variant>
+            <longname>Hungarian (QWERTY, 102-key, dot, dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, dot, dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:hu:102_qwerty_dot_nodead:hun</name>
+            <language>hu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>hu</layout>
+            <layout_variant>102_qwerty_dot_nodead</layout_variant>
+            <longname>Hungarian (QWERTY, 102-key, dot, no dead keys)</longname>
+            <description>Hungarian (QWERTY, 102-key, dot, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is::isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <longname>Icelandic</longname>
+            <description>Icelandic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:Sundeadkeys:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <layout_variant>Sundeadkeys</layout_variant>
+            <longname>Icelandic (Sun dead keys)</longname>
+            <description>Icelandic (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:nodeadkeys:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Icelandic (no dead keys)</longname>
+            <description>Icelandic (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:mac_legacy:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <layout_variant>mac_legacy</layout_variant>
+            <longname>Icelandic (Macintosh, legacy)</longname>
+            <description>Icelandic (Macintosh, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:mac:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Icelandic (Macintosh)</longname>
+            <description>Icelandic (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:is:dvorak:isl</name>
+            <language>is</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>is</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Icelandic (Dvorak)</longname>
+            <description>Icelandic (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il::heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <longname>Hebrew</longname>
+            <description>Hebrew</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:lyx:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <layout_variant>lyx</layout_variant>
+            <longname>Hebrew (lyx)</longname>
+            <description>Hebrew (lyx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:phonetic:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Hebrew (phonetic)</longname>
+            <description>Hebrew (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:il:biblical:heb</name>
+            <language>he</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>il</layout>
+            <layout_variant>biblical</layout_variant>
+            <longname>Hebrew (Biblical, Tiro)</longname>
+            <description>Hebrew (Biblical, Tiro)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it::ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <longname>Italian</longname>
+            <description>Italian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:nodeadkeys:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Italian (no dead keys)</longname>
+            <description>Italian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:winkeys:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Italian (Windows)</longname>
+            <description>Italian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:mac:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Italian (Macintosh)</longname>
+            <description>Italian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:us:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Italian (US)</longname>
+            <description>Italian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:geo:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>geo</layout_variant>
+            <longname>Georgian (Italy)</longname>
+            <description>Georgian (Italy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:ibm:kat</name>
+            <language>ka</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>ibm</layout_variant>
+            <longname>Italian (IBM 142)</longname>
+            <description>Italian (IBM 142)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:srd</name>
+            <language>sc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:nap</name>
+            <language>nap</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:scn</name>
+            <language>scn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:intl:fur</name>
+            <language>fur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Italian (intl., with dead keys)</longname>
+            <description>Italian (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:scn:ita</name>
+            <language>it</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>scn</layout_variant>
+            <longname>Sicilian</longname>
+            <description>Sicilian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:scn:scn</name>
+            <language>scn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>scn</layout_variant>
+            <longname>Sicilian</longname>
+            <description>Sicilian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:it:fur:fur</name>
+            <language>fur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>it</layout>
+            <layout_variant>fur</layout_variant>
+            <longname>Friulian (Italy)</longname>
+            <description>Friulian (Italy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp::jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <longname>Japanese</longname>
+            <description>Japanese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:kana:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <layout_variant>kana</layout_variant>
+            <longname>Japanese (Kana)</longname>
+            <description>Japanese (Kana)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:kana86:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <layout_variant>kana86</layout_variant>
+            <longname>Japanese (Kana 86)</longname>
+            <description>Japanese (Kana 86)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:OADG109A:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <layout_variant>OADG109A</layout_variant>
+            <longname>Japanese (OADG 109A)</longname>
+            <description>Japanese (OADG 109A)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:mac:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Japanese (Macintosh)</longname>
+            <description>Japanese (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jp:dvorak:jpn</name>
+            <language>ja</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jp</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Japanese (Dvorak)</longname>
+            <description>Japanese (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kg::kir</name>
+            <language>ky</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kg</layout>
+            <longname>Kyrgyz</longname>
+            <description>Kyrgyz</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kg:phonetic:kir</name>
+            <language>ky</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kg</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Kyrgyz (phonetic)</longname>
+            <description>Kyrgyz (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kh::khm</name>
+            <language>km</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kh</layout>
+            <longname>Khmer (Cambodia)</longname>
+            <description>Khmer (Cambodia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz::kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <longname>Kazakh</longname>
+            <description>Kazakh</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ruskaz:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>ruskaz</layout_variant>
+            <longname>Russian (Kazakhstan, with Kazakh)</longname>
+            <description>Russian (Kazakhstan, with Kazakh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ruskaz:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>ruskaz</layout_variant>
+            <longname>Russian (Kazakhstan, with Kazakh)</longname>
+            <description>Russian (Kazakhstan, with Kazakh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:kazrus:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>kazrus</layout_variant>
+            <longname>Kazakh (with Russian)</longname>
+            <description>Kazakh (with Russian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:kazrus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>kazrus</layout_variant>
+            <longname>Kazakh (with Russian)</longname>
+            <description>Kazakh (with Russian)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:ext:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>ext</layout_variant>
+            <longname>Kazakh (extended)</longname>
+            <description>Kazakh (extended)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kz:latin:kaz</name>
+            <language>kk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kz</layout>
+            <layout_variant>latin</layout_variant>
+            <longname>Kazakh (Latin)</longname>
+            <description>Kazakh (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:la::lao</name>
+            <language>lo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>la</layout>
+            <longname>Lao</longname>
+            <description>Lao</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:la:stea:lao</name>
+            <language>lo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>la</layout>
+            <layout_variant>stea</layout_variant>
+            <longname>Lao (STEA)</longname>
+            <description>Lao (STEA)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt::lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <longname>Lithuanian</longname>
+            <description>Lithuanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:std:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>std</layout_variant>
+            <longname>Lithuanian (standard)</longname>
+            <description>Lithuanian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:us:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Lithuanian (US)</longname>
+            <description>Lithuanian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:ibm:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>ibm</layout_variant>
+            <longname>Lithuanian (IBM LST 1205-92)</longname>
+            <description>Lithuanian (IBM LST 1205-92)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:lekp:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>lekp</layout_variant>
+            <longname>Lithuanian (LEKP)</longname>
+            <description>Lithuanian (LEKP)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:lekpa:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>lekpa</layout_variant>
+            <longname>Lithuanian (LEKPa)</longname>
+            <description>Lithuanian (LEKPa)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lt:sgs:sgs</name>
+            <language>sgs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>sgs</layout_variant>
+            <longname>Samogitian</longname>
+            <description>Samogitian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv::lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <longname>Latvian</longname>
+            <description>Latvian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:apostrophe:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>apostrophe</layout_variant>
+            <longname>Latvian (apostrophe)</longname>
+            <description>Latvian (apostrophe)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:tilde:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>tilde</layout_variant>
+            <longname>Latvian (tilde)</longname>
+            <description>Latvian (tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:fkey:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>fkey</layout_variant>
+            <longname>Latvian (F)</longname>
+            <description>Latvian (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:modern:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>modern</layout_variant>
+            <longname>Latvian (modern)</longname>
+            <description>Latvian (modern)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:ergonomic:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>ergonomic</layout_variant>
+            <longname>Latvian (ergonomic, ŪGJRMV)</longname>
+            <description>Latvian (ergonomic, ŪGJRMV)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lv:adapted:lav</name>
+            <language>lv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lv</layout>
+            <layout_variant>adapted</layout_variant>
+            <longname>Latvian (adapted)</longname>
+            <description>Latvian (adapted)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mao::mri</name>
+            <language>mi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mao</layout>
+            <longname>Maori</longname>
+            <description>Maori</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:me::srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <longname>Montenegrin</longname>
+            <description>Montenegrin</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillic:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>cyrillic</layout_variant>
+            <longname>Montenegrin (Cyrillic)</longname>
+            <description>Montenegrin (Cyrillic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillicyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>cyrillicyz</layout_variant>
+            <longname>Montenegrin (Cyrillic, ZE and ZHE swapped)</longname>
+            <description>Montenegrin (Cyrillic, ZE and ZHE swapped)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinunicode:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>latinunicode</layout_variant>
+            <longname>Montenegrin (Latin, Unicode)</longname>
+            <description>Montenegrin (Latin, Unicode)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>latinyz</layout_variant>
+            <longname>Montenegrin (Latin, QWERTY)</longname>
+            <description>Montenegrin (Latin, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinunicodeyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>latinunicodeyz</layout_variant>
+            <longname>Montenegrin (Latin, Unicode, QWERTY)</longname>
+            <description>Montenegrin (Latin, Unicode, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:cyrillicalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>cyrillicalternatequotes</layout_variant>
+            <longname>Montenegrin (Cyrillic, with guillemets)</longname>
+            <description>Montenegrin (Cyrillic, with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:me:latinalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>me</layout>
+            <layout_variant>latinalternatequotes</layout_variant>
+            <longname>Montenegrin (Latin, with guillemets)</longname>
+            <description>Montenegrin (Latin, with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mk::mkd</name>
+            <language>mk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mk</layout>
+            <longname>Macedonian</longname>
+            <description>Macedonian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mk:nodeadkeys:mkd</name>
+            <language>mk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mk</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Macedonian (no dead keys)</longname>
+            <description>Macedonian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt::mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <longname>Maltese</longname>
+            <description>Maltese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:us:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Maltese (US)</longname>
+            <description>Maltese (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:alt-us:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <layout_variant>alt-us</layout_variant>
+            <longname>Maltese (US layout with AltGr overrides)</longname>
+            <description>Maltese (US layout with AltGr overrides)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mt:alt-gb:mlt</name>
+            <language>mt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mt</layout>
+            <layout_variant>alt-gb</layout_variant>
+            <longname>Maltese (UK, with AltGr overrides)</longname>
+            <description>Maltese (UK, with AltGr overrides)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mn::mon</name>
+            <language>mn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mn</layout>
+            <longname>Mongolian</longname>
+            <description>Mongolian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no::nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <longname>Norwegian</longname>
+            <description>Norwegian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:nodeadkeys:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Norwegian (no dead keys)</longname>
+            <description>Norwegian (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:winkeys:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Norwegian (Windows)</longname>
+            <description>Norwegian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:dvorak:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Norwegian (Dvorak)</longname>
+            <description>Norwegian (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>smi</layout_variant>
+            <longname>Northern Saami (Norway)</longname>
+            <description>Northern Saami (Norway)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:smi_nodeadkeys:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>smi_nodeadkeys</layout_variant>
+            <longname>Northern Saami (Norway, no dead keys)</longname>
+            <description>Northern Saami (Norway, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Norwegian (Macintosh)</longname>
+            <description>Norwegian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac_nodeadkeys:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>Norwegian (Macintosh, no dead keys)</longname>
+            <description>Norwegian (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:colemak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Norwegian (Colemak)</longname>
+            <description>Norwegian (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl::pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <longname>Polish</longname>
+            <description>Polish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:legacy:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Polish (legacy)</longname>
+            <description>Polish (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:qwertz:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>qwertz</layout_variant>
+            <longname>Polish (QWERTZ)</longname>
+            <description>Polish (QWERTZ)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Polish (Dvorak)</longname>
+            <description>Polish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak_quotes:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>dvorak_quotes</layout_variant>
+            <longname>Polish (Dvorak, with Polish quotes on quotemark key)</longname>
+            <description>Polish (Dvorak, with Polish quotes on quotemark key)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvorak_altquotes:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>dvorak_altquotes</layout_variant>
+            <longname>Polish (Dvorak, with Polish quotes on key 1)</longname>
+            <description>Polish (Dvorak, with Polish quotes on key 1)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:csb:csb</name>
+            <language>csb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>csb</layout_variant>
+            <longname>Kashubian</longname>
+            <description>Kashubian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:szl:szl</name>
+            <language>szl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>szl</layout_variant>
+            <longname>Silesian</longname>
+            <description>Silesian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:ru_phonetic_dvorak:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>ru_phonetic_dvorak</layout_variant>
+            <longname>Russian (Poland, phonetic Dvorak)</longname>
+            <description>Russian (Poland, phonetic Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pl:dvp:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pl</layout>
+            <layout_variant>dvp</layout_variant>
+            <longname>Polish (programmer Dvorak)</longname>
+            <description>Polish (programmer Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt::por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <longname>Portuguese</longname>
+            <description>Portuguese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Portuguese (no dead keys)</longname>
+            <description>Portuguese (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:sundeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Portuguese (Sun dead keys)</longname>
+            <description>Portuguese (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Portuguese (Macintosh)</longname>
+            <description>Portuguese (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac_nodeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>Portuguese (Macintosh, no dead keys)</longname>
+            <description>Portuguese (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:mac_sundeadkeys:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>mac_sundeadkeys</layout_variant>
+            <longname>Portuguese (Macintosh, Sun dead keys)</longname>
+            <description>Portuguese (Macintosh, Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>nativo</layout_variant>
+            <longname>Portuguese (Nativo)</longname>
+            <description>Portuguese (Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo-us:por</name>
+            <language>pt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>nativo-us</layout_variant>
+            <longname>Portuguese (Nativo for US keyboards)</longname>
+            <description>Portuguese (Nativo for US keyboards)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pt:nativo-epo:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pt</layout>
+            <layout_variant>nativo-epo</layout_variant>
+            <longname>Esperanto (Portugal, Nativo)</longname>
+            <description>Esperanto (Portugal, Nativo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro::ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <longname>Romanian</longname>
+            <description>Romanian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:cedilla:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <layout_variant>cedilla</layout_variant>
+            <longname>Romanian (cedilla)</longname>
+            <description>Romanian (cedilla)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:std:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <layout_variant>std</layout_variant>
+            <longname>Romanian (standard)</longname>
+            <description>Romanian (standard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:std_cedilla:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <layout_variant>std_cedilla</layout_variant>
+            <longname>Romanian (standard cedilla)</longname>
+            <description>Romanian (standard cedilla)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ro:winkeys:ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ro</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Romanian (Windows)</longname>
+            <description>Romanian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru::rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <longname>Russian</longname>
+            <description>Russian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Russian (phonetic)</longname>
+            <description>Russian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_winkeys:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic_winkeys</layout_variant>
+            <longname>Russian (phonetic, Windows)</longname>
+            <description>Russian (phonetic, Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_YAZHERTY:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic_YAZHERTY</layout_variant>
+            <longname>Russian (phonetic, YAZHERTY)</longname>
+            <description>Russian (phonetic, YAZHERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:typewriter:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>typewriter</layout_variant>
+            <longname>Russian (typewriter)</longname>
+            <description>Russian (typewriter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:legacy:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Russian (legacy)</longname>
+            <description>Russian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:typewriter-legacy:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>typewriter-legacy</layout_variant>
+            <longname>Russian (typewriter, legacy)</longname>
+            <description>Russian (typewriter, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:tt:tat</name>
+            <language>tt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>tt</layout_variant>
+            <longname>Tatar</longname>
+            <description>Tatar</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:os_legacy:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>os_legacy</layout_variant>
+            <longname>Ossetian (legacy)</longname>
+            <description>Ossetian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:os_winkeys:oss</name>
+            <language>os</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>os_winkeys</layout_variant>
+            <longname>Ossetian (Windows)</longname>
+            <description>Ossetian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:cv:chv</name>
+            <language>cv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>cv</layout_variant>
+            <longname>Chuvash</longname>
+            <description>Chuvash</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:cv_latin:chv</name>
+            <language>cv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>cv_latin</layout_variant>
+            <longname>Chuvash (Latin)</longname>
+            <description>Chuvash (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:udm:udm</name>
+            <language>udm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>udm</layout_variant>
+            <longname>Udmurt</longname>
+            <description>Udmurt</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:kom:kom</name>
+            <language>kv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>kom</layout_variant>
+            <longname>Komi</longname>
+            <description>Komi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:sah:sah</name>
+            <language>sah</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>sah</layout_variant>
+            <longname>Yakut</longname>
+            <description>Yakut</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:xal:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>xal</layout_variant>
+            <longname>Kalmyk</longname>
+            <description>Kalmyk</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:dos:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>dos</layout_variant>
+            <longname>Russian (DOS)</longname>
+            <description>Russian (DOS)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:mac:xal</name>
+            <language>xal</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Russian (Macintosh)</longname>
+            <description>Russian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:srp:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>srp</layout_variant>
+            <longname>Serbian (Russia)</longname>
+            <description>Serbian (Russia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:srp:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>srp</layout_variant>
+            <longname>Serbian (Russia)</longname>
+            <description>Serbian (Russia)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:bak:bak</name>
+            <language>ba</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>bak</layout_variant>
+            <longname>Bashkirian</longname>
+            <description>Bashkirian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:chm:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>chm</layout_variant>
+            <longname>Mari</longname>
+            <description>Mari</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_azerty:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic_azerty</layout_variant>
+            <longname>Russian (phonetic, AZERTY)</longname>
+            <description>Russian (phonetic, AZERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_dvorak:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic_dvorak</layout_variant>
+            <longname>Russian (phonetic, Dvorak)</longname>
+            <description>Russian (phonetic, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ru:phonetic_fr:chm</name>
+            <language>chm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ru</layout>
+            <layout_variant>phonetic_fr</layout_variant>
+            <longname>Russian (phonetic, French)</longname>
+            <description>Russian (phonetic, French)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs::srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <longname>Serbian</longname>
+            <description>Serbian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:yz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>yz</layout_variant>
+            <longname>Serbian (Cyrillic, ZE and ZHE swapped)</longname>
+            <description>Serbian (Cyrillic, ZE and ZHE swapped)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latin:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>latin</layout_variant>
+            <longname>Serbian (Latin)</longname>
+            <description>Serbian (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinunicode:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>latinunicode</layout_variant>
+            <longname>Serbian (Latin, Unicode)</longname>
+            <description>Serbian (Latin, Unicode)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>latinyz</layout_variant>
+            <longname>Serbian (Latin, QWERTY)</longname>
+            <description>Serbian (Latin, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinunicodeyz:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>latinunicodeyz</layout_variant>
+            <longname>Serbian (Latin, Unicode, QWERTY)</longname>
+            <description>Serbian (Latin, Unicode, QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:alternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>alternatequotes</layout_variant>
+            <longname>Serbian (Cyrillic, with guillemets)</longname>
+            <description>Serbian (Cyrillic, with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:latinalternatequotes:srp</name>
+            <language>sr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>latinalternatequotes</layout_variant>
+            <longname>Serbian (Latin, with guillemets)</longname>
+            <description>Serbian (Latin, with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:rs:rue:rue</name>
+            <language>rue</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>rs</layout>
+            <layout_variant>rue</layout_variant>
+            <longname>Pannonian Rusyn</longname>
+            <description>Pannonian Rusyn</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:si::slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <longname>Slovenian</longname>
+            <description>Slovenian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:si:alternatequotes:slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <layout_variant>alternatequotes</layout_variant>
+            <longname>Slovenian (with guillemets)</longname>
+            <description>Slovenian (with guillemets)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:si:us:slv</name>
+            <language>sl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>si</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Slovenian (US)</longname>
+            <description>Slovenian (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk::slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <longname>Slovak</longname>
+            <description>Slovak</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:bksl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <layout_variant>bksl</layout_variant>
+            <longname>Slovak (extended backslash)</longname>
+            <description>Slovak (extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:qwerty:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <layout_variant>qwerty</layout_variant>
+            <longname>Slovak (QWERTY)</longname>
+            <description>Slovak (QWERTY)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sk:qwerty_bksl:slk</name>
+            <language>sk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sk</layout>
+            <layout_variant>qwerty_bksl</layout_variant>
+            <longname>Slovak (QWERTY, extended backslash)</longname>
+            <description>Slovak (QWERTY, extended backslash)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es::spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <longname>Spanish</longname>
+            <description>Spanish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:nodeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Spanish (no dead keys)</longname>
+            <description>Spanish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:winkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Spanish (Windows)</longname>
+            <description>Spanish (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:deadtilde:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>deadtilde</layout_variant>
+            <longname>Spanish (dead tilde)</longname>
+            <description>Spanish (dead tilde)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:sundeadkeys:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Spanish (Sun dead keys)</longname>
+            <description>Spanish (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:dvorak:spa</name>
+            <language>es</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Spanish (Dvorak)</longname>
+            <description>Spanish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:ast:ast</name>
+            <language>ast</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>ast</layout_variant>
+            <longname>Asturian (Spain, with bottom-dot H and L)</longname>
+            <description>Asturian (Spain, with bottom-dot H and L)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:cat:cat</name>
+            <language>ca</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>cat</layout_variant>
+            <longname>Catalan (Spain, with middle-dot L)</longname>
+            <description>Catalan (Spain, with middle-dot L)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:es:mac:cat</name>
+            <language>ca</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>es</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Spanish (Macintosh)</longname>
+            <description>Spanish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se::swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <longname>Swedish</longname>
+            <description>Swedish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:nodeadkeys:swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>nodeadkeys</layout_variant>
+            <longname>Swedish (no dead keys)</longname>
+            <description>Swedish (no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:dvorak:swe</name>
+            <language>sv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Swedish (Dvorak)</longname>
+            <description>Swedish (Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:rus:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>rus</layout_variant>
+            <longname>Russian (Sweden, phonetic)</longname>
+            <description>Russian (Sweden, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:rus_nodeadkeys:rus</name>
+            <language>ru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>rus_nodeadkeys</layout_variant>
+            <longname>Russian (Sweden, phonetic, no dead keys)</longname>
+            <description>Russian (Sweden, phonetic, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:smi:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>smi</layout_variant>
+            <longname>Northern Saami (Sweden)</longname>
+            <description>Northern Saami (Sweden)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:mac:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Swedish (Macintosh)</longname>
+            <description>Swedish (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:svdvorak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>svdvorak</layout_variant>
+            <longname>Swedish (Svdvorak)</longname>
+            <description>Swedish (Svdvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:us_dvorak:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>us_dvorak</layout_variant>
+            <longname>Swedish (Dvorak, intl.)</longname>
+            <description>Swedish (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:us:sme</name>
+            <language>se</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Swedish (US)</longname>
+            <description>Swedish (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:se:swl:swl</name>
+            <language>swl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>se</layout>
+            <layout_variant>swl</layout_variant>
+            <longname>Swedish Sign Language</longname>
+            <description>Swedish Sign Language</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch::deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland)</longname>
+            <description>German (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch::gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <longname>German (Switzerland)</longname>
+            <description>German (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:legacy:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>German (Switzerland, legacy)</longname>
+            <description>German (Switzerland, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:legacy:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>German (Switzerland, legacy)</longname>
+            <description>German (Switzerland, legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_nodeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_nodeadkeys</layout_variant>
+            <longname>German (Switzerland, no dead keys)</longname>
+            <description>German (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_nodeadkeys:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_nodeadkeys</layout_variant>
+            <longname>German (Switzerland, no dead keys)</longname>
+            <description>German (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_sundeadkeys:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_sundeadkeys</layout_variant>
+            <longname>German (Switzerland, Sun dead keys)</longname>
+            <description>German (Switzerland, Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_sundeadkeys:gsw</name>
+            <language>gsw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_sundeadkeys</layout_variant>
+            <longname>German (Switzerland, Sun dead keys)</longname>
+            <description>German (Switzerland, Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>fr</layout_variant>
+            <longname>French (Switzerland)</longname>
+            <description>French (Switzerland)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_nodeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>fr_nodeadkeys</layout_variant>
+            <longname>French (Switzerland, no dead keys)</longname>
+            <description>French (Switzerland, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_sundeadkeys:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>fr_sundeadkeys</layout_variant>
+            <longname>French (Switzerland, Sun dead keys)</longname>
+            <description>French (Switzerland, Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:fr_mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>fr_mac</layout_variant>
+            <longname>French (Switzerland, Macintosh)</longname>
+            <description>French (Switzerland, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_mac:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_mac</layout_variant>
+            <longname>German (Switzerland, Macintosh)</longname>
+            <description>German (Switzerland, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy::syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <longname>Arabic (Syria)</longname>
+            <description>Arabic (Syria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:syc:syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <layout_variant>syc</layout_variant>
+            <longname>Syriac</longname>
+            <description>Syriac</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:syc_phonetic:syr</name>
+            <language>syr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <layout_variant>syc_phonetic</layout_variant>
+            <longname>Syriac (phonetic)</longname>
+            <description>Syriac (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <layout_variant>ku</layout_variant>
+            <longname>Kurdish (Syria, Latin Q)</longname>
+            <description>Kurdish (Syria, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <layout_variant>ku_f</layout_variant>
+            <longname>Kurdish (Syria, F)</longname>
+            <description>Kurdish (Syria, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:sy:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sy</layout>
+            <layout_variant>ku_alt</layout_variant>
+            <longname>Kurdish (Syria, Latin Alt-Q)</longname>
+            <description>Kurdish (Syria, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tj::tgk</name>
+            <language>tg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tj</layout>
+            <longname>Tajik</longname>
+            <description>Tajik</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tj:legacy:tgk</name>
+            <language>tg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tj</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Tajik (legacy)</longname>
+            <description>Tajik (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk::sin</name>
+            <language>si</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <longname>Sinhala (phonetic)</longname>
+            <description>Sinhala (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:tam_unicode:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <layout_variant>tam_unicode</layout_variant>
+            <longname>Tamil (Sri Lanka, TamilNet '99)</longname>
+            <description>Tamil (Sri Lanka, TamilNet '99)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:tam_TAB:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <layout_variant>tam_TAB</layout_variant>
+            <longname>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</longname>
+            <description>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:lk:us:tam</name>
+            <language>ta</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lk</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Sinhala (US)</longname>
+            <description>Sinhala (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:th::tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <longname>Thai</longname>
+            <description>Thai</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:th:tis:tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <layout_variant>tis</layout_variant>
+            <longname>Thai (TIS-820.2538)</longname>
+            <description>Thai (TIS-820.2538)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:th:pat:tha</name>
+            <language>th</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>th</layout>
+            <layout_variant>pat</layout_variant>
+            <longname>Thai (Pattachote)</longname>
+            <description>Thai (Pattachote)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr::tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <longname>Turkish</longname>
+            <description>Turkish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:f:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>f</layout_variant>
+            <longname>Turkish (F)</longname>
+            <description>Turkish (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:alt:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>alt</layout_variant>
+            <longname>Turkish (Alt-Q)</longname>
+            <description>Turkish (Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:sundeadkeys:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>sundeadkeys</layout_variant>
+            <longname>Turkish (Sun dead keys)</longname>
+            <description>Turkish (Sun dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>ku</layout_variant>
+            <longname>Kurdish (Turkey, Latin Q)</longname>
+            <description>Kurdish (Turkey, Latin Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku_f:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>ku_f</layout_variant>
+            <longname>Kurdish (Turkey, F)</longname>
+            <description>Kurdish (Turkey, F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:ku_alt:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>ku_alt</layout_variant>
+            <longname>Kurdish (Turkey, Latin Alt-Q)</longname>
+            <description>Kurdish (Turkey, Latin Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:intl:kur</name>
+            <language>ku</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>Turkish (intl., with dead keys)</longname>
+            <description>Turkish (intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>crh</layout_variant>
+            <longname>Crimean Tatar (Turkish Q)</longname>
+            <description>Crimean Tatar (Turkish Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh_f:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>crh_f</layout_variant>
+            <longname>Crimean Tatar (Turkish F)</longname>
+            <description>Crimean Tatar (Turkish F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:crh_alt:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>crh_alt</layout_variant>
+            <longname>Crimean Tatar (Turkish Alt-Q)</longname>
+            <description>Crimean Tatar (Turkish Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw::fox</name>
+            <language>fox</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <longname>Taiwanese</longname>
+            <description>Taiwanese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ami</name>
+            <language>ami</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tay</name>
+            <language>tay</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:bnn</name>
+            <language>bnn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ckv</name>
+            <language>ckv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:pwn</name>
+            <language>pwn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:pyu</name>
+            <language>pyu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:dru</name>
+            <language>dru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ais</name>
+            <language>ais</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:ssf</name>
+            <language>ssf</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tao</name>
+            <language>tao</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:tsu</name>
+            <language>tsu</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:trv</name>
+            <language>trv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:xnb</name>
+            <language>xnb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:sxr</name>
+            <language>sxr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:uun</name>
+            <language>uun</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:indigenous:fos</name>
+            <language>fos</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>indigenous</layout_variant>
+            <longname>Taiwanese (indigenous)</longname>
+            <description>Taiwanese (indigenous)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tw:saisiyat:xsy</name>
+            <language>xsy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tw</layout>
+            <layout_variant>saisiyat</layout_variant>
+            <longname>Saisiyat (Taiwan)</longname>
+            <description>Saisiyat (Taiwan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua::ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <longname>Ukrainian</longname>
+            <description>Ukrainian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:phonetic:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Ukrainian (phonetic)</longname>
+            <description>Ukrainian (phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:typewriter:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>typewriter</layout_variant>
+            <longname>Ukrainian (typewriter)</longname>
+            <description>Ukrainian (typewriter)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:winkeys:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>winkeys</layout_variant>
+            <longname>Ukrainian (Windows)</longname>
+            <description>Ukrainian (Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:legacy:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Ukrainian (legacy)</longname>
+            <description>Ukrainian (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:rstu:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>rstu</layout_variant>
+            <longname>Ukrainian (standard RSTU)</longname>
+            <description>Ukrainian (standard RSTU)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:rstu_ru:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>rstu_ru</layout_variant>
+            <longname>Russian (Ukraine, standard RSTU)</longname>
+            <description>Russian (Ukraine, standard RSTU)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:homophonic:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>homophonic</layout_variant>
+            <longname>Ukrainian (homophonic)</longname>
+            <description>Ukrainian (homophonic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <longname>English (UK)</longname>
+            <description>English (UK)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:extd:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>extd</layout_variant>
+            <longname>English (UK, extended, Windows)</longname>
+            <description>English (UK, extended, Windows)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>intl</layout_variant>
+            <longname>English (UK, intl., with dead keys)</longname>
+            <description>English (UK, intl., with dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:dvorak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>English (UK, Dvorak)</longname>
+            <description>English (UK, Dvorak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:dvorakukp:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>dvorakukp</layout_variant>
+            <longname>English (UK, Dvorak, with UK punctuation)</longname>
+            <description>English (UK, Dvorak, with UK punctuation)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:mac:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>English (UK, Macintosh)</longname>
+            <description>English (UK, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:mac_intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>mac_intl</layout_variant>
+            <longname>English (UK, Macintosh, intl.)</longname>
+            <description>English (UK, Macintosh, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:colemak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>English (UK, Colemak)</longname>
+            <description>English (UK, Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:pl:pol</name>
+            <language>pl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>pl</layout_variant>
+            <longname>Polish (British keyboard)</longname>
+            <description>Polish (British keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:uz::uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>uz</layout>
+            <longname>Uzbek</longname>
+            <description>Uzbek</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:uz:latin:uzb</name>
+            <language>uz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>uz</layout>
+            <layout_variant>latin</layout_variant>
+            <longname>Uzbek (Latin)</longname>
+            <description>Uzbek (Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn::vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <longname>Vietnamese</longname>
+            <description>Vietnamese</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn:us:vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Vietnamese (US)</longname>
+            <description>Vietnamese (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:vn:fr:vie</name>
+            <language>vi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>vn</layout>
+            <layout_variant>fr</layout_variant>
+            <longname>Vietnamese (French)</longname>
+            <description>Vietnamese (French)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:kr::kor</name>
+            <language>ko</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kr</layout>
+            <longname>Korean</longname>
+            <description>Korean</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:kr:kr104:kor</name>
+            <language>ko</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>kr</layout>
+            <layout_variant>kr104</layout_variant>
+            <longname>Korean (101/104-key compatible)</longname>
+            <description>Korean (101/104-key compatible)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <longname>Irish</longname>
+            <description>Irish</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:CloGaelach:gle</name>
+            <language>ga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <layout_variant>CloGaelach</layout_variant>
+            <longname>CloGaelach</longname>
+            <description>CloGaelach</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:UnicodeExpert:gle</name>
+            <language>ga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <layout_variant>UnicodeExpert</layout_variant>
+            <longname>Irish (UnicodeExpert)</longname>
+            <description>Irish (UnicodeExpert)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:ogam:sga</name>
+            <language>sga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <layout_variant>ogam</layout_variant>
+            <longname>Ogham</longname>
+            <description>Ogham</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ie:ogam_is434:sga</name>
+            <language>sga</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ie</layout>
+            <layout_variant>ogam_is434</layout_variant>
+            <longname>Ogham (IS434)</longname>
+            <description>Ogham (IS434)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk::urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <longname>Urdu (Pakistan)</longname>
+            <description>Urdu (Pakistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:urd-crulp:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <layout_variant>urd-crulp</layout_variant>
+            <longname>Urdu (Pakistan, CRULP)</longname>
+            <description>Urdu (Pakistan, CRULP)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:urd-nla:urd</name>
+            <language>ur</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <layout_variant>urd-nla</layout_variant>
+            <longname>Urdu (Pakistan, NLA)</longname>
+            <description>Urdu (Pakistan, NLA)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:ara:ara</name>
+            <language>ar</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <layout_variant>ara</layout_variant>
+            <longname>Arabic (Pakistan)</longname>
+            <description>Arabic (Pakistan)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:pk:snd:snd</name>
+            <language>sd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>pk</layout>
+            <layout_variant>snd</layout_variant>
+            <longname>Sindhi</longname>
+            <description>Sindhi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mv::div</name>
+            <language>dv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mv</layout>
+            <longname>Dhivehi</longname>
+            <description>Dhivehi</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:za::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>za</layout>
+            <longname>English (South Africa)</longname>
+            <description>English (South Africa)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:epo::epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>epo</layout>
+            <longname>Esperanto</longname>
+            <description>Esperanto</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:epo:legacy:epo</name>
+            <language>eo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>epo</layout>
+            <layout_variant>legacy</layout_variant>
+            <longname>Esperanto (legacy)</longname>
+            <description>Esperanto (legacy)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:np::nep</name>
+            <language>ne</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>np</layout>
+            <longname>Nepali</longname>
+            <description>Nepali</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:np::sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>np</layout>
+            <longname>Nepali</longname>
+            <description>Nepali</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <longname>English (Nigeria)</longname>
+            <description>English (Nigeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:igbo:ibo</name>
+            <language>ig</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <layout_variant>igbo</layout_variant>
+            <longname>Igbo</longname>
+            <description>Igbo</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:yoruba:yor</name>
+            <language>yo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <layout_variant>yoruba</layout_variant>
+            <longname>Yoruba</longname>
+            <description>Yoruba</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ng:hausa:hau</name>
+            <language>ha</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ng</layout>
+            <layout_variant>hausa</layout_variant>
+            <longname>Hausa (Nigeria)</longname>
+            <description>Hausa (Nigeria)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:et::amh</name>
+            <language>am</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>et</layout>
+            <longname>Amharic</longname>
+            <description>Amharic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:sn::wol</name>
+            <language>wo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>sn</layout>
+            <longname>Wolof</longname>
+            <description>Wolof</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tm::tuk</name>
+            <language>tk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tm</layout>
+            <longname>Turkmen</longname>
+            <description>Turkmen</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tm:alt:tuk</name>
+            <language>tk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tm</layout>
+            <layout_variant>alt</layout_variant>
+            <longname>Turkmen (Alt-Q)</longname>
+            <description>Turkmen (Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml::bam</name>
+            <language>bm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <longname>Bambara</longname>
+            <description>Bambara</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:fr-oss:fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <layout_variant>fr-oss</layout_variant>
+            <longname>French (Mali, alt.)</longname>
+            <description>French (Mali, alt.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:us-mac:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <layout_variant>us-mac</layout_variant>
+            <longname>English (Mali, US, Macintosh)</longname>
+            <description>English (Mali, US, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ml:us-intl:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ml</layout>
+            <layout_variant>us-intl</layout_variant>
+            <longname>English (Mali, US, intl.)</longname>
+            <description>English (Mali, US, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tz::swa</name>
+            <language>sw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tz</layout>
+            <longname>Swahili (Tanzania)</longname>
+            <description>Swahili (Tanzania)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ajg</name>
+            <language>ajg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::blo</name>
+            <language>blo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kpo</name>
+            <language>kpo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ewe</name>
+            <language>ee</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fon</name>
+            <language>fon</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::fue</name>
+            <language>fue</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::gej</name>
+            <language>gej</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::ife</name>
+            <language>ife</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kbp</name>
+            <language>kbp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::las</name>
+            <language>las</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::dop</name>
+            <language>dop</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::mfg</name>
+            <language>mfg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::nmz</name>
+            <language>nmz</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::bud</name>
+            <language>bud</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::gng</name>
+            <language>gng</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::kdh</name>
+            <language>kdh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:tg::soy</name>
+            <language>soy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tg</layout>
+            <longname>French (Togo)</longname>
+            <description>French (Togo)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ke::swa</name>
+            <language>sw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ke</layout>
+            <longname>Swahili (Kenya)</longname>
+            <description>Swahili (Kenya)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ke:kik:kik</name>
+            <language>ki</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ke</layout>
+            <layout_variant>kik</layout_variant>
+            <longname>Kikuyu</longname>
+            <description>Kikuyu</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:bw::tsn</name>
+            <language>tn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bw</layout>
+            <longname>Tswana</longname>
+            <description>Tswana</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph::war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <longname>Filipino</longname>
+            <description>Filipino</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:qwerty-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>qwerty-bay</layout_variant>
+            <longname>Filipino (QWERTY, Baybayin)</longname>
+            <description>Filipino (QWERTY, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak-bay</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Baybayin)</longname>
+            <description>Filipino (Capewell-Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6-bay</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Baybayin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:colemak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak-bay</layout_variant>
+            <longname>Filipino (Colemak, Baybayin)</longname>
+            <description>Filipino (Colemak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:bik</name>
+            <language>bik</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:ceb</name>
+            <language>ceb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:fil</name>
+            <language>fil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:hil</name>
+            <language>hil</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:ilo</name>
+            <language>ilo</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:pam</name>
+            <language>pam</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:pag</name>
+            <language>pag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:phi</name>
+            <language>phi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:tgl</name>
+            <language>tl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ph:dvorak-bay:war</name>
+            <language>war</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak-bay</layout_variant>
+            <longname>Filipino (Dvorak, Baybayin)</longname>
+            <description>Filipino (Dvorak, Baybayin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:md::ron</name>
+            <language>ro</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>md</layout>
+            <longname>Moldavian</longname>
+            <description>Moldavian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:md:gag:gag</name>
+            <language>gag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>md</layout>
+            <layout_variant>gag</layout_variant>
+            <longname>Moldavian (Gagauz)</longname>
+            <description>Moldavian (Gagauz)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id::mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <longname>Indonesian (Arab Melayu, phonetic)</longname>
+            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phoneticx:mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phoneticx</layout_variant>
+            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
+            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:jv::jv</name>
+            <language>jv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>jv</layout>
+            <longname>Indonesian (Javanese)</longname>
+            <description>Indonesian (Javanese)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my::mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <longname>Malay (Jawi, Arabic Keyboard)</longname>
+            <description>Malay (Jawi, Arabic Keyboard)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:my:phonetic:mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>my</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Malay (Jawi, phonetic)</longname>
+            <description>Malay (Jawi, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+    </engines>
 </component>

From e938846b1624a9455128edb64f144b0a1181736c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 27 Aug 2020 22:40:23 +0900
Subject: [PATCH 667/816] engine: Genarate simple.xml at build time

The engine path of ibus-engine-simple should be decided in
build time and simple.xml is renamed to simple.xml.in
Also Revert 6879879002af47d49d8740ca383a048d2ac8e904

BUG=https://github.com/ibus/ibus/issues/2153
---
 engine/Makefile.am | 15 ++++++++++++---
 src/tests/runtest  | 15 +--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/engine/Makefile.am b/engine/Makefile.am
index ca4054961..d810704b5 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -80,21 +80,30 @@ component_DATA = \
 componentdir = $(pkgdatadir)/component
 
 MAINTAINERCLEANFILES = \
+	simple.xml.in \
+	$(NULL)
+
+CLEANFILES = \
 	simple.xml \
 	$(NULL)
 
 EXTRA_DIST = \
 	gensimple.py \
 	iso639converter.py \
-	simple.xml \
+	simple.xml.in \
 	$(NULL)
 
-simple.xml:
+simple.xml: simple.xml.in
+	$(AM_V_GEN) sed \
+	    -e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \
+	    mv $@.tmp $@
+
+simple.xml.in:
 	$(srcdir)/gensimple.py \
 	    --input=$(datarootdir)/X11/xkb/rules/evdev.xml \
 	    --output=$@ \
 	    --version=$(VERSION).`date '+%Y%m%d'` \
-	    --exec-path=$(libexecdir)/ibus-engine-simple \
+	    --exec-path=@libexecdir\@/ibus-engine-simple \
 	    --iso-path=$(datarootdir)/xml/iso-codes/iso_639.xml \
 	    --first-language \
 	$(NULL)
diff --git a/src/tests/runtest b/src/tests/runtest
index 11bcc6c2d..a6e4194bf 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -91,19 +91,6 @@ func_copy_component () {
     fi
 }
 
-func_copy_simple_xml () {
-    file=$1
-    base=`func_basename $file`
-    libexecdir=`func_dirname $file`
-    # top_srcdir != top_builddir in make dist
-    libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
-    if test -f $file; then
-        mkdir -p components
-        sed "s|\(<exec>\).*\(/ibus-engine-simple</exec>\)|\1$libexecdir\2|" \
-                < $file > components/$base
-    fi
-}
-
 trap 'func_cleanup $tstdir' 1 2 3 15
 
 tst=$1; shift
@@ -140,7 +127,7 @@ run_test_case()
             exit -1
         fi
         # func_copy_component replaces s/$top_srcdir/%top_builddir/
-        func_copy_simple_xml "../$top_srcdir/engine/simple.xml"
+        func_copy_component "../$top_srcdir/engine/simple.xml"
         func_copy_component "../$top_srcdir/conf/memconf/memconf.xml"
 
         IBUS_COMPONENT_PATH=$PWD/components

From 00adea6d16939e2da35ede7f2ecf3fe0a2156fa6 Mon Sep 17 00:00:00 2001
From: "ntfs.hard" <ntfs.hard@gmail.com>
Date: Thu, 3 Sep 2020 14:59:35 +0900
Subject: [PATCH 668/816] Fix for several error spotted by static analyzer

- ibuscomposetable.c, ibusxml.c:
Check size before memory access

- inputcontext.c:
Use logical operator for bool type variables

- config.c:
Extra break removed

BUG=https://github.com/ibus/ibus/pull/2242
---
 bus/inputcontext.c     | 6 +++---
 conf/gconf/config.c    | 1 -
 src/ibuscomposetable.c | 2 +-
 src/ibusxml.c          | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index ceea4b60e..8d84fd056 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2842,11 +2842,11 @@ bus_input_context_update_preedit_text (BusInputContext *context,
     context->preedit_text = (IBusText *) g_object_ref_sink (text ? text :
                                                             text_empty);
     context->preedit_cursor_pos = cursor_pos;
-    if (use_extension)
+    if (use_extension) {
         context->preedit_visible = visible;
-    if (use_extension)
         context->preedit_mode = mode;
-    extension_visible = context->preedit_visible |
+    }
+    extension_visible = context->preedit_visible ||
                         (context->emoji_extension != NULL);
 
     if (use_extension && context->emoji_extension) {
diff --git a/conf/gconf/config.c b/conf/gconf/config.c
index 6a4bd5bdd..902742dbe 100644
--- a/conf/gconf/config.c
+++ b/conf/gconf/config.c
@@ -202,7 +202,6 @@ _from_gconf_value (const GConfValue *gv)
                 g_variant_builder_init (&builder, G_VARIANT_TYPE("ad")); break;
             case GCONF_VALUE_BOOL:
                 g_variant_builder_init (&builder, G_VARIANT_TYPE("ab")); break;
-                break;
             default:
                 g_assert_not_reached ();
             }
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index c50be2b36..ef20469c9 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -382,7 +382,7 @@ ibus_compose_list_check_duplicated (GList *compose_list,
             
             if (n_outputs == unichar_length (output_chars)) {
                 int j = 0;
-                while (compose_data->values[j] && j < n_outputs) {
+                while (j < n_outputs && compose_data->values[j]) {
                     if (compose_data->values[j] != output_chars[j])
                         break;
                     ++j;
diff --git a/src/ibusxml.c b/src/ibusxml.c
index 266a82076..b6d0feb8f 100644
--- a/src/ibusxml.c
+++ b/src/ibusxml.c
@@ -148,7 +148,7 @@ _is_space (const gchar *text,
 {
     gsize i = 0;
 
-    for (i = 0; text[i] != '\0' && i < text_len; i++) {
+    for (i = 0; i < text_len && text[i] != '\0'; i++) {
         switch (text[i]) {
         case '\t':
         case ' ':

From 7caead10d3698ef1ecaa97e6e122e27a720d612e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 3 Sep 2020 21:21:31 +0900
Subject: [PATCH 669/816] Fix string formats in translatable strings

---
 autogen.sh                                  |  2 +-
 data/dconf/org.freedesktop.ibus.gschema.xml |  2 +-
 po/ibus10.pot                               | 12 ++++++------
 setup/enginetreeview.py                     |  6 +++---
 setup/main.py                               |  6 +++---
 tools/main.vala                             |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index ff39b5a7d..8efc56de0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="ibus"
 DIST_FILES="
-engine/simple.xml
+engine/simple.xml.in
 src/ibusemojigen.h
 src/ibusunicodegen.h
 "
diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 11a179a67..a79e92963 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -195,7 +195,7 @@
     <key name="lang" type="s">
       <default>'en'</default>
       <summary>Default language for emoji dictionary</summary>
-      <description>Choose a default language of emoji dictionaries on the emoji dialog. The value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict</description>
+      <description>Choose a default language of emoji dictionaries on the emoji dialog. The value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict .</description>
     </key>
     <key name="favorites" type="as">
       <default>[]</default>
diff --git a/po/ibus10.pot b/po/ibus10.pot
index 7b171c03b..aaf598e84 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -1,14 +1,14 @@
 # Source translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.22\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-08-26 19:53+0900\n"
-"PO-Revision-Date: 2020-08-26 19:53+0900\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-03 21:21+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -301,7 +301,7 @@ msgstr ""
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:202
@@ -507,7 +507,7 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
+msgid "IBus daemon could not be started in %d seconds."
 msgstr ""
 
 #: setup/main.py:562
@@ -3075,7 +3075,7 @@ msgid "Reset the configuration values"
 msgstr ""
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr ""
 
 #: tools/main.vala:458
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index aea84593c..8534de5ee 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2014-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2014-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2020 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
@@ -93,7 +93,7 @@ def __init__(self):
         renderer.set_property("has-entry", False)
         renderer.set_property("editable", True)
 
-        column = Gtk.TreeViewColumn(_("Kbd"))
+        column = Gtk.TreeViewColumn("Kbd")
         column.set_expand(False)
         column.set_fixed_width(32)
         column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
diff --git a/setup/main.py b/setup/main.py
index 8c8d7a472..673c8cdee 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -4,8 +4,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2016 Red Hat, Inc.
+# Copyright (c) 2010-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2020 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
@@ -547,7 +547,7 @@ def __init_bus(self):
             self.__flush_gtk_events()
         else:
             # Translators: %d == 5 currently
-            message = _("IBus daemon could not be started in %d seconds")
+            message = _("IBus daemon could not be started in %d seconds.")
             dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO,
                                     buttons = Gtk.ButtonsType.OK,
                                     text = message % timeout)
diff --git a/tools/main.vala b/tools/main.vala
index bf9c0fc95..26e7fd884 100644
--- a/tools/main.vala
+++ b/tools/main.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -453,7 +453,7 @@ const CommandEntry commands[]  = {
     { "read-config", N_("Show the configuration values"), read_config },
     { "reset-config", N_("Reset the configuration values"), reset_config },
 #if EMOJI_DICT
-    { "emoji", N_("Save emoji on dialog to clipboard "), emoji_dialog },
+    { "emoji", N_("Save emoji on dialog to clipboard"), emoji_dialog },
 #endif
     { "help", N_("Show this information"), print_help }
 };

From f8c468ab2726305a3a568d346e6f8b10d81ef3c5 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 4 Sep 2020 11:47:04 +0900
Subject: [PATCH 670/816] Update translations

Update po/bg.po po/ca.po po/cs.po po/da.po po/de.po po/es.po po/fr.po
       po/gu.po po/he.po po/hu.po po/ia.po po/id.po po/it.po po/ja.po
       po/kn.po po/ko.po po/ml.po po/mr.po po/nl.po po/pa.po po/pl.po
       po/pt.po po/pt_BR.po po/ru.po po/sv.po po/ta.po po/te.po
       po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_HK.po po/zh_TW.po
---
 po/bg.po    |  4 ++--
 po/ca.po    | 12 ++++++------
 po/cs.po    | 12 ++++++------
 po/da.po    | 12 ++++++------
 po/de.po    | 10 +++++-----
 po/es.po    | 12 ++++++------
 po/fr.po    | 12 ++++++------
 po/gu.po    |  4 ++--
 po/he.po    |  4 ++--
 po/hu.po    | 12 ++++++------
 po/ia.po    |  4 ++--
 po/id.po    |  4 ++--
 po/it.po    | 10 +++++-----
 po/ja.po    | 22 +++++++++++-----------
 po/kn.po    |  4 ++--
 po/ko.po    |  8 ++++----
 po/ml.po    |  4 ++--
 po/mr.po    |  4 ++--
 po/nl.po    | 12 ++++++------
 po/pa.po    |  4 ++--
 po/pl.po    | 12 ++++++------
 po/pt.po    |  2 +-
 po/pt_BR.po | 12 ++++++------
 po/ru.po    |  2 +-
 po/sv.po    | 10 +++++-----
 po/ta.po    |  4 ++--
 po/te.po    |  4 ++--
 po/tr.po    | 12 ++++++------
 po/uk.po    | 12 ++++++------
 po/vi.po    |  4 ++--
 po/zh_CN.po | 10 +++++-----
 po/zh_HK.po |  4 ++--
 po/zh_TW.po | 12 ++++++------
 33 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 0322903d1..a73634e71 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -539,8 +539,8 @@ msgstr "IBus беше стартиран! Ако не можете да изпо
 #. Translators: %d == 5 currently
 #: ../setup/main.py:364
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus демонът не може да се стартира вече %d секунди"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus демонът не може да се стартира вече %d секунди."
 
 #: ../setup/main.py:376
 #, python-format
diff --git a/po/ca.po b/po/ca.po
index 396afab1f..0e954d845 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -339,10 +339,10 @@ msgstr "Idioma predeterminat per al diccionari emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Trieu l'idioma predeterminat per ls diccionaris dels emojis al diàleg "
-"d'emojis. El valor $lang s'aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
+"d'emojis. El valor $lang s'aplica a /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -573,8 +573,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "El dimoni de l'IBus no s'ha pogut iniciar en %d segons"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "El dimoni de l'IBus no s'ha pogut iniciar en %d segons."
 
 #: setup/main.py:562
 #, python-format
@@ -3139,8 +3139,8 @@ msgid "Reset the configuration values"
 msgstr "Restableix els valors de la configuració"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Desa l'emoji del diàleg al porta-retalls "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Desa l'emoji del diàleg al porta-retalls"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/cs.po b/po/cs.po
index 90fb30e1d..ed8c30a75 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -580,10 +580,10 @@ msgstr "Předvolený jazyk pro slovník emoji"
 #: ../data/ibus.schemas.in.h:54
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Zvolte výchozí jazyk slovníků emoji v dialogovém okně emoji. Hodnota $lang "
-"je aplikována na /usr/share/ibus/dicts/emoji-$lang.dict"
+"je aplikována na /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: ../data/ibus.schemas.in.h:55
 msgid "favorite emoji list on emoji dialog"
@@ -792,8 +792,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Démon IBus nemohl být spuštěn během %d sekund"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Démon IBus nemohl být spuštěn během %d sekund."
 
 #: ../setup/main.py:554
 #, python-format
@@ -2897,8 +2897,8 @@ msgid "Reset the configuration values"
 msgstr "Obnovit konfigurační hodnoty"
 
 #: ../tools/main.vala:385
-msgid "Save emoji on dialog to clipboard "
-msgstr "Uložit emoji z dialogu do schránky."
+msgid "Save emoji on dialog to clipboard"
+msgstr "Uložit emoji z dialogu do schránky"
 
 #: ../tools/main.vala:387
 msgid "Show this information"
diff --git a/po/da.po b/po/da.po
index 3947773b8..b2a3bcf8e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -323,10 +323,10 @@ msgstr "Standardsprog for emojiordbog"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Vælg et standardsprog af emoji-ordbøger i emoji-dialogen. Værdien $lang "
-"anvendes på /usr/share/ibus/dicts/emoji-$lang.dict"
+"anvendes på /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -554,8 +554,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-dæmon kunne ikke startes på %d sekunder"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus-dæmon kunne ikke startes på %d sekunder."
 
 #: setup/main.py:562
 #, python-format
@@ -3098,8 +3098,8 @@ msgid "Reset the configuration values"
 msgstr "Nulstil konfigurationsværdierne"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Gem emoji i dialog til udklipsholder "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Gem emoji i dialog til udklipsholder"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/de.po b/po/de.po
index df61ff353..2c7dffca8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -340,7 +340,7 @@ msgstr "Standard-Sprache für das Emoji-Wörterbuch"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Auswahl einer Standard-Sprache der Emoji-Wörterbücher im Emoji-Dialog. Der "
 "Wert $lang wird auf /usr/share/ibus/dicts/emoji-$lang.dict angewendet."
@@ -582,8 +582,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-Dienst konnte innerhalb von %d Sekunden nicht gestartet werden"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus-Dienst konnte innerhalb von %d Sekunden nicht gestartet werden."
 
 #: setup/main.py:562
 #, python-format
@@ -3133,8 +3133,8 @@ msgid "Reset the configuration values"
 msgstr "Zurücksetzen der Konfigurationswerte"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Kopieren des ausgewählten Emoji in die Zwischenablage"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/es.po b/po/es.po
index 4183e9787..f343df3bd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -346,10 +346,10 @@ msgstr "Idioma predeterminado para el diccionario de emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Elija un idioma predeterminado para el diccionario de emoji. Su valor "
-"($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict"
+"($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -582,8 +582,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "El demonio IBus no se pudo iniciar en %d segundos"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "El demonio IBus no se pudo iniciar en %d segundos."
 
 #: setup/main.py:562
 #, python-format
@@ -3136,8 +3136,8 @@ msgid "Reset the configuration values"
 msgstr "Restablecer los valores de la configuración"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Guardar emoji del diálogo en el portapapeles."
+msgid "Save emoji on dialog to clipboard"
+msgstr "Guardar emoji del diálogo en el portapapeles"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/fr.po b/po/fr.po
index e8237a5bc..721e3ddeb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -350,11 +350,11 @@ msgstr "Langue par défaut pour le dictionnaire des émoticônes"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Choisissez la langue par défaut pour les dictionnaires d’émoticônes dans la "
 "boite de dialogue. La valeur $Lang est appliquée à /usr/share/ibus/dicts/"
-"emoji-$lang.dict"
+"emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -593,8 +593,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, 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"
+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:562
 #, python-format
@@ -3144,8 +3144,8 @@ msgid "Reset the configuration values"
 msgstr "Réinitialiser les valeurs de configuration"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Copie l’émoticône dans la boite de dialogue vers le presse-papier"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/gu.po b/po/gu.po
index 877ad57c9..accb7f1f3 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -769,8 +769,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus ડિમન %d સેકંડમાં શરૂ કરી શક્યા નહિં."
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/he.po b/po/he.po
index 11a5db0e3..eedff4bab 100644
--- a/po/he.po
+++ b/po/he.po
@@ -531,8 +531,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "לא ניתן להפעיל את הסוכן של IBus תוך %d שניות"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "לא ניתן להפעיל את הסוכן של IBus תוך %d שניות."
 
 #: setup/main.py:562
 #, python-format
diff --git a/po/hu.po b/po/hu.po
index 14c713110..2415a2175 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -329,11 +329,11 @@ msgstr "Emodzsi szótár alapértelmezett neve"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Válassza ki az emodzsi párbeszédablakon megjelenő emodzsi szótárak "
 "alapértelmezett nyelvét. A $lang érték ebbe lesz behelyettesítve: /usr/share/"
-"ibus/dicts/emoji-$lang.dict"
+"ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -563,8 +563,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Az IBus démon nem indítható el %d másodpercen belül"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Az IBus démon nem indítható el %d másodpercen belül."
 
 #: setup/main.py:562
 #, python-format
@@ -3113,8 +3113,8 @@ msgid "Reset the configuration values"
 msgstr "A beállítási értékek visszaállítása"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése "
+msgid "Save emoji on dialog to clipboard"
+msgstr "A párbeszédablakon lévő emodzsi vágólapra mentése"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/ia.po b/po/ia.po
index e5ee6c7ad..03d630121 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -540,8 +540,8 @@ msgstr "IBus se ha initiate! Si tu non pote usar IBus, adde le lineas sequente a
 #. Translators: %d == 5 currently
 #: ../setup/main.py:364
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Le demonio IBus non pote initiar se in %d secundas"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Le demonio IBus non pote initiar se in %d secundas."
 
 #: ../setup/main.py:376
 #, python-format
diff --git a/po/id.po b/po/id.po
index af08195d5..5fd914e75 100644
--- a/po/id.po
+++ b/po/id.po
@@ -579,8 +579,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:364
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Daemon IBus tidak dapat dimulai dalam% d detik"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Daemon IBus tidak dapat dimulai dalam% d detik."
 
 #: ../setup/main.py:376
 #, python-format
diff --git a/po/it.po b/po/it.po
index 89c6c331a..b43ac7425 100644
--- a/po/it.po
+++ b/po/it.po
@@ -318,11 +318,11 @@ msgstr "Lingua predefinita per il dizionario degli emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Scegliere una lingua predefinita di dizionari emoji nella finestra di "
 "dialogo. Il valore di $lang viene applicato a /usr/share/ibus/dicts/emoji-"
-"$lang.dict"
+"$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -538,8 +538,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Impossibile avviare il demone IBus in %d secondi"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Impossibile avviare il demone IBus in %d secondi."
 
 #: setup/main.py:562
 #, python-format
@@ -3079,7 +3079,7 @@ msgid "Reset the configuration values"
 msgstr "Reimpostare i valori della configurazione"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "Salvare emoji sulla finestra degli appunti"
 
 #: tools/main.vala:458
diff --git a/po/ja.po b/po/ja.po
index e0e224bfc..26e2983b1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -346,7 +346,7 @@ msgstr "絵文字辞書用のデフォルトの言語"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "絵文字ダイアログ上の絵文字辞書のデフォルトの言語を選択します。その値 $lang "
 "は、/usr/share/ibus/dicts/emoji-$lang.dict に適用されます。"
@@ -390,7 +390,7 @@ msgstr "指定した長さで絵文字ルビを一致させる"
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる"
+msgstr "絵文字ルビを完全一致ではなく指定した文字数で部分一致させる。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
@@ -439,8 +439,8 @@ 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."
+"Copyright © 2007-2010 Peng Huang\n"
+"Copyright © 2007-2010 Red Hat, Inc."
 
 #: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
@@ -543,12 +543,12 @@ msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
-"キーもしくはキーの組み合わせを入力してください。\n"
+"キー (もしくはキーの組み合わせ) を入力してください。\n"
 "キーを離すとダイアログを閉じます。"
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "キーもしくはキーの組み合わせを入力してください"
+msgstr "キー (もしくはキーの組み合わせ) を入力してください"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -577,7 +577,7 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
+msgid "IBus daemon could not be started in %d seconds."
 msgstr "IBus デーモンを %d 秒以内に開始できませんでした。"
 
 #: setup/main.py:562
@@ -653,7 +653,7 @@ msgstr "…"
 
 #: setup/setup.ui:226
 msgid "Enable or disable:"
-msgstr "切り替え"
+msgstr "切り替え:"
 
 #: setup/setup.ui:238
 msgid "Enable:"
@@ -685,7 +685,7 @@ msgstr "プロパティーパネルを表示する:"
 
 #: setup/setup.ui:423
 msgid "Language panel position:"
-msgstr "言語パネルの位置"
+msgstr "言語パネルの位置:"
 
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
@@ -3116,7 +3116,7 @@ msgstr "完了"
 
 #: tools/main.vala:444
 msgid "Set or get engine"
-msgstr "エンジンを設定もしくは表示する。"
+msgstr "エンジンを設定もしくは表示する"
 
 #: tools/main.vala:445
 msgid "Exit ibus-daemon"
@@ -3159,7 +3159,7 @@ msgid "Reset the configuration values"
 msgstr "設定値を初期化する"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "ダイアログ上の絵文字をクリップボードに保存する"
 
 #: tools/main.vala:458
diff --git a/po/kn.po b/po/kn.po
index c9faabe50..ad828ea4b 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -787,8 +787,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಆರಂಭಿಸಲಾಗಿಲ್ಲ"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಆರಂಭಿಸಲಾಗಿಲ್ಲ."
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/ko.po b/po/ko.po
index 72ca9824e..0495c25e0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -314,7 +314,7 @@ msgstr "에모지 사전에 사용할 기본값 언어"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "에모지 대화창의 에모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/share/ibus/dicts/emoji-$lang."
 "dict 사전을 사용합니다."
@@ -534,8 +534,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 데몬이 %d초 내에 시작하지 못했습니다"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus 데몬이 %d초 내에 시작하지 못했습니다."
 
 #: setup/main.py:562
 #, python-format
@@ -3108,7 +3108,7 @@ msgid "Reset the configuration values"
 msgstr "설정 값 재설정"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "대화창의 에모지를 클립보드에 저장"
 
 #: tools/main.vala:458
diff --git a/po/ml.po b/po/ml.po
index b82a90bfc..71809bad2 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -580,8 +580,8 @@ msgstr "IBus തുടങ്ങി! IBus ഉപയോഗിയ്ക്കുവ
 #. Translators: %d == 5 currently
 #: ../setup/main.py:403
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus ഡെമണ്‍ %d സെക്കന്‍ഡുകളില്‍ ആരംഭിയ്ക്കുവാന്‍ സാധ്യമല്ല."
 
 #: ../setup/main.py:415
 #, python-format
diff --git a/po/mr.po b/po/mr.po
index a3dcce691..43bcd1fae 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -764,8 +764,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus डिमन %d सेकंदात सुरू करणे अशक्य."
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/nl.po b/po/nl.po
index 6abe7afeb..aa5955d22 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -334,10 +334,10 @@ msgstr "Standaard taal voor emoji woordenboek"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Kies een standaard taal met emoji woordenboeken op de emoji dialoog. De "
-"waarde $lang wordt toepast in /usr/share/ibus/dicts/emoji-$lang.dict"
+"waarde $lang wordt toepast in /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -570,8 +570,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus daemon kon niet binnen %d seconden gestart worden."
 
 #: setup/main.py:562
 #, python-format
@@ -3120,8 +3120,8 @@ msgid "Reset the configuration values"
 msgstr "Herstel de configuratiewaarden"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Sla emoji op dialoog  op naar clipboard "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Sla emoji op dialoog  op naar clipboard"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/pa.po b/po/pa.po
index 7707bf6e0..e7c0104f0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -520,8 +520,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus ਡੈਮਨ %d ਸਕਿੰਟਾਂ ਵਿੱਚ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ."
 
 #: setup/main.py:562
 #, python-format
diff --git a/po/pl.po b/po/pl.po
index df99d122a..5663ea1ab 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -337,10 +337,10 @@ msgstr "Domyślny język dla słownika emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Wybór domyślnego języka słowników emoji w oknie emoji. Wartość $lang jest "
-"zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict"
+"zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -569,8 +569,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Nie można uruchomić usługi IBus od %d s"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Nie można uruchomić usługi IBus od %d s."
 
 #: setup/main.py:562
 #, python-format
@@ -3114,8 +3114,8 @@ msgid "Reset the configuration values"
 msgstr "Przywraca wartości konfiguracji"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Zapisuje emoji w oknie do schowka "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Zapisuje emoji w oknie do schowka"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/pt.po b/po/pt.po
index 2aa85f8a0..32d820c18 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3021,7 +3021,7 @@ msgid "Reset the configuration values"
 msgstr "Redefinir os valores da configuração"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "Guardar emoji na janela para a área de transferência"
 
 #: tools/main.vala:458
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c053fb06f..165c24e52 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -336,10 +336,10 @@ msgstr "Idioma padrão para o dicionário emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Escolha o idioma padrão para os dicionários emoji no diálogo emoji. O valor "
-"$lang é aplicado em /usr/share/ibus/dicts/emoji-$lang.dict"
+"$lang é aplicado em /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -573,8 +573,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "O daemon do IBus não pôde ser iniciado em %d segundos"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "O daemon do IBus não pôde ser iniciado em %d segundos."
 
 #: setup/main.py:562
 #, python-format
@@ -3126,8 +3126,8 @@ msgid "Reset the configuration values"
 msgstr "Redefine os valores de configuração"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Salva emoji no diálogo para a área de transferência "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Salva emoji no diálogo para a área de transferência"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/ru.po b/po/ru.po
index 5c876a4a5..782d2ee37 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -694,7 +694,7 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:447
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
+msgid "IBus daemon could not be started in %d seconds."
 msgstr "Не удалось запустить IBus через %d сек."
 
 #: ../setup/main.py:459
diff --git a/po/sv.po b/po/sv.po
index d84f42235..61c43cdd2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -324,10 +324,10 @@ msgstr "Standardspråk för emoji-ordlista"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Välj ett standardspråk med emoji-ordlistor i emoji-dialogen.  Värdet $lang "
-"används i /usr/share/ibus/dicts/emoji-$lang.dict"
+"används i /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -557,8 +557,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus-demonen kunde inte startas på %d sekunder"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus-demonen kunde inte startas på %d sekunder."
 
 #: setup/main.py:562
 #, python-format
@@ -3097,7 +3097,7 @@ msgid "Reset the configuration values"
 msgstr "Återställ konfigurationsvärdena"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "Spara emoji i dialogen till urklipp"
 
 #: tools/main.vala:458
diff --git a/po/ta.po b/po/ta.po
index 47b199eb6..664fab5b3 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -791,8 +791,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை."
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/te.po b/po/te.po
index e5b27ca37..93973b82a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -774,8 +774,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "ఐబస్ డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "ఐబస్ డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది."
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/tr.po b/po/tr.po
index 2b1ed6a9a..5c979db84 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -321,10 +321,10 @@ msgstr "Emoji sözlüğü için öntanımlı dil"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Emoji iletişim kutusunda öntanımlı bir emoji sözlük dili seçin. $lang "
-"değeri /usr/share/ibus/dicts/emoji-$lang.dict ögesine uygulanır"
+"değeri /usr/share/ibus/dicts/emoji-$lang.dict ögesine uygulanır."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -553,8 +553,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus arka plan programı %d saniye içinde başlatılamadı"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus arka plan programı %d saniye içinde başlatılamadı."
 
 #: setup/main.py:562
 #, python-format
@@ -3090,8 +3090,8 @@ msgid "Reset the configuration values"
 msgstr "Yapılandırma değerlerini sıfırla"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "İletişim kutusundaki emojiyi panoya kaydet "
+msgid "Save emoji on dialog to clipboard"
+msgstr "İletişim kutusundaki emojiyi panoya kaydet"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/uk.po b/po/uk.po
index cf3de4aef..a7af73f45 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -335,10 +335,10 @@ msgstr "Типова мова словника емодзі"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "Виберіть типову мову словників емодзі у вікні емодзі. Значення $lang "
-"застосовується до /usr/share/ibus/dicts/emoji-$lang.dict"
+"застосовується до /usr/share/ibus/dicts/emoji-$lang.dict ."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -571,8 +571,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд."
 
 #: setup/main.py:562
 #, python-format
@@ -3121,8 +3121,8 @@ msgid "Reset the configuration values"
 msgstr "Скинути значення налаштувань до початкових"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "Зберегти емодзі з вікна до буфера обміну даними "
+msgid "Save emoji on dialog to clipboard"
+msgstr "Зберегти емодзі з вікна до буфера обміну даними"
 
 #: tools/main.vala:458
 msgid "Show this information"
diff --git a/po/vi.po b/po/vi.po
index da2563db7..cf0a8959f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -785,8 +785,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus daemon không thể khởi động trong %d giây"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus daemon không thể khởi động trong %d giây."
 
 #: ../setup/main.py:562
 #, python-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b0bf4938..371d1c804 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -319,10 +319,10 @@ msgstr "emoji 字典的默认语言"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "在表情输入对话框中选择默认表情输入语言。设定值 $lang 会应用于 /usr/share/"
-"ibus/dicts/emoji-$lang.dict"
+"ibus/dicts/emoji-$lang.dict。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -542,8 +542,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 守护在 %d 秒内无法启动"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus 守护在 %d 秒内无法启动。"
 
 #: setup/main.py:562
 #, python-format
@@ -3071,7 +3071,7 @@ msgid "Reset the configuration values"
 msgstr "重置配置"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
+msgid "Save emoji on dialog to clipboard"
 msgstr "将面板中的 emoji 保存到剪贴板"
 
 #: tools/main.vala:458
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ddf067798..e4fbea7cc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -748,8 +748,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: ../setup/main.py:542
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 背景程式無法在 %d 秒後啟動"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus 背景程式無法在 %d 秒後啟動。"
 
 #: ../setup/main.py:554
 #, python-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0402be5b1..3c6fba3c5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -320,10 +320,10 @@ msgstr "繪文字字典的預設語言"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:189
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 "請在繪文字對話窗當中選擇繪文字字典語言。$lang 的值會套用到 /usr/share/ibus/"
-"dicts/emoji-$lang.dict"
+"dicts/emoji-$lang.dict。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "favorite emoji list on emoji dialog"
@@ -544,8 +544,8 @@ msgstr ""
 #. Translators: %d == 5 currently
 #: setup/main.py:550
 #, python-format
-msgid "IBus daemon could not be started in %d seconds"
-msgstr "IBus 幕後程式無法在 %d 秒後啟動"
+msgid "IBus daemon could not be started in %d seconds."
+msgstr "IBus 幕後程式無法在 %d 秒後啟動。"
 
 #: setup/main.py:562
 #, python-format
@@ -3073,8 +3073,8 @@ msgid "Reset the configuration values"
 msgstr "重設組態值"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr "將對話窗中的繪文字儲存到剪貼簿 "
+msgid "Save emoji on dialog to clipboard"
+msgstr "將對話窗中的繪文字儲存到剪貼簿"
 
 #: tools/main.vala:458
 msgid "Show this information"

From a440942a62c46578377a8679c48146f597e338a4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 9 Sep 2020 18:36:18 +0900
Subject: [PATCH 671/816] ui/gtk3: Accept xdigits only for Unicode typing

Ctrl-Shift-u behavior now follows GTK's one.

BUG=https://github.com/ibus/ibus/issues/2249
---
 ui/gtk3/panelbinding.vala | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 01c43b0d1..861255b14 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2018 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2018-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -190,7 +190,7 @@ class Preedit : Gtk.Window {
 
     public IBus.Text get_commit_text() {
         string extension_text = m_extension_preedit_emoji.get_text();
-        if (extension_text.length == 0)
+        if (extension_text.length == 0 && m_prefix != "u")
             extension_text = m_extension_preedit_text.get_text();
         return new IBus.Text.from_string(extension_text);
     }
@@ -556,8 +556,10 @@ class PanelBinding : IBus.PanelService {
 
     private bool key_press_keyval(uint keyval) {
         unichar ch = IBus.keyval_to_unicode(keyval);
+        if (m_extension_name == "unicode" && !ch.isxdigit())
+            return false;
         if (ch.iscntrl())
-                return false;
+            return false;
         string str = ch.to_string();
         m_preedit.append_text(str);
         string annotation = m_preedit.get_text();

From 3aa670e9f8319fe064ce7c45ce56304ca5af94dc Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 9 Sep 2020 18:42:10 +0900
Subject: [PATCH 672/816] engine: Fix to pull the correct language with no
 iso639 variants

Some variants have iso639 but others do not in evdev.xml and
gensimple.py have to fallback to the layout iso639.

BUG=rhbz#1876877
---
 engine/gensimple.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/engine/gensimple.py b/engine/gensimple.py
index 18f7dc8cd..de6d7ff5e 100755
--- a/engine/gensimple.py
+++ b/engine/gensimple.py
@@ -90,6 +90,7 @@ def __init__(self, parser=None, downstream=None, iso639=None,
         self.__description = ''
         self.__variant = ''
         self.__list_iso639 = []
+        self.__list_iso639_for_variant = []
     def startDocument(self):
         if self.__downstream:
             self.__downstream.startDocument()
@@ -106,7 +107,10 @@ def startElement(self, name, attrs):
         elif name == 'configItem':
             self.__is_config_item = True
         elif name == 'languageList':
-            self.__list_iso639 = []
+            if self.__is_variant and self.__is_config_item:
+                self.__list_iso639_for_variant = []
+            elif self.__is_layout and self.__is_config_item:
+                self.__list_iso639 = []
         elif name == 'iso639Id':
             self.__is_iso639 = True
         elif name == 'variant':
@@ -129,6 +133,7 @@ def endElement(self, name):
             self.__is_iso639 = False
         elif name == 'variant':
             self.__is_variant = False
+            self.__list_iso639_for_variant = []
         elif name == 'name':
             self.__is_name = False
     def characters(self, text):
@@ -140,11 +145,21 @@ def characters(self, text):
             elif self.__is_layout and self.__is_config_item:
                 self.__layout = text
         elif self.__is_iso639:
+            if self.__is_variant and self.__is_config_item:
+                self.__list_iso639_for_variant.append(text)
+            elif self.__is_layout and self.__is_config_item:
                 self.__list_iso639.append(text)
     def save(self):
         if not self.__downstream:
             return
-        for iso in self.__list_iso639:
+        list_iso639 = []
+        if self.__is_variant and self.__is_config_item:
+            list_iso639 = self.__list_iso639_for_variant
+            if len(list_iso639) == 0:
+                list_iso639 = self.__list_iso639
+        elif self.__is_layout and self.__is_config_item:
+            list_iso639 = self.__list_iso639
+        for iso in list_iso639:
             do_deny = False
             for [xkb, layout, variant, lang] in self.__denylist:
                 if xkb == 'xkb' \

From 0d90da4c968b8f5603c0880e130058dd00af5aa7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 9 Sep 2020 18:49:20 +0900
Subject: [PATCH 673/816] engine: Update simple.xml.in with latest gensimple.py

BUG=rhbz#1876877
---
 engine/simple.xml.in | 1270 +++++++++---------------------------------
 1 file changed, 275 insertions(+), 995 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 4ab50286a..9751578f0 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -3,7 +3,7 @@
     <name>org.freedesktop.IBus.Simple</name>
     <description>A table based simple engine</description>
     <exec>@libexecdir@/ibus-engine-simple</exec>
-    <version>1.5.22.20200827</version>
+    <version>1.5.22.20200909</version>
     <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
     <license>GPL</license>
     <homepage>https://github.com/ibus/ibus/wiki</homepage>
@@ -45,8 +45,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:euro:haw</name>
-            <language>haw</language>
+            <name>xkb:us:euro:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -57,8 +57,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:intl:haw</name>
-            <language>haw</language>
+            <name>xkb:us:intl:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -69,8 +69,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:alt-intl:haw</name>
-            <language>haw</language>
+            <name>xkb:us:alt-intl:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -81,8 +81,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:colemak:haw</name>
-            <language>haw</language>
+            <name>xkb:us:colemak:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -93,8 +93,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -105,8 +105,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-intl:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak-intl:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -117,8 +117,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-alt-intl:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak-alt-intl:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -129,8 +129,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-l:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak-l:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -141,8 +141,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-r:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak-r:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -153,8 +153,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvorak-classic:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvorak-classic:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -165,8 +165,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:dvp:haw</name>
-            <language>haw</language>
+            <name>xkb:us:dvp:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -189,8 +189,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:us:mac:rus</name>
-            <language>ru</language>
+            <name>xkb:us:mac:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>us</layout>
@@ -248,30 +248,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:us:olpc2:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply toggle the layout)</longname>
-            <description>English (the divide/multiply toggle the layout)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:olpc2:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>olpc2</layout_variant>
-            <longname>English (the divide/multiply toggle the layout)</longname>
-            <description>English (the divide/multiply toggle the layout)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:us:hbs:eng</name>
             <language>en</language>
@@ -344,54 +320,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:us:norman:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:norman:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>norman</layout_variant>
-            <longname>English (Norman)</longname>
-            <description>English (Norman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:us:workman:eng</name>
             <language>en</language>
@@ -404,54 +332,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:us:workman:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman</layout_variant>
-            <longname>English (Workman)</longname>
-            <description>English (Workman)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:us:workman-intl:eng</name>
             <language>en</language>
@@ -464,54 +344,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:us:workman-intl:bos</name>
-            <language>bs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:hbs</name>
-            <language>hbs</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:hrv</name>
-            <language>hr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:us:workman-intl:srp</name>
-            <language>sr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>us</layout>
-            <layout_variant>workman-intl</layout_variant>
-            <longname>English (Workman, intl., with dead keys)</longname>
-            <description>English (Workman, intl., with dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:af:ps:pus</name>
             <language>ps</language>
@@ -548,18 +380,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:af:fa-olpc:pus</name>
-            <language>ps</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>af</layout>
-            <layout_variant>fa-olpc</layout_variant>
-            <longname>Persian (Afghanistan, Dari OLPC)</longname>
-            <description>Persian (Afghanistan, Dari OLPC)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:af:uz-olpc:uzb</name>
             <language>uz</language>
@@ -1915,8 +1735,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:br:thinkpad:epo</name>
-            <language>eo</language>
+            <name>xkb:br:thinkpad:por</name>
+            <language>pt</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>br</layout>
@@ -2720,800 +2540,128 @@
             <name>xkb:cm:azerty:anv</name>
             <language>anv</language>
             <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:azerty:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>azerty</layout_variant>
-            <longname>Cameroon (AZERTY, intl.)</longname>
-            <description>Cameroon (AZERTY, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bum</name>
-            <language>bum</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:btb</name>
-            <language>btb</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:bfd</name>
-            <language>bfd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:azo</name>
-            <language>azo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:ken</name>
-            <language>ken</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yam</name>
-            <language>yam</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yat</name>
-            <language>yat</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:dvorak:yas</name>
-            <language>yas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>dvorak</layout_variant>
-            <longname>Cameroon (Dvorak, intl.)</longname>
-            <description>Cameroon (Dvorak, intl.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bas</name>
-            <language>bas</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:nmg</name>
-            <language>nmg</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:fub</name>
-            <language>fub</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ewo</name>
-            <language>ewo</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:xmd</name>
-            <language>xmd</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mfh</name>
-            <language>mfh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:bkm</name>
-            <language>bkm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ozm</name>
-            <language>ozm</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:lns</name>
-            <language>lns</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:sox</name>
-            <language>sox</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:pny</name>
-            <language>pny</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:wes</name>
-            <language>wes</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:lem</name>
-            <language>lem</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:nyj</name>
-            <language>nyj</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mfk</name>
-            <language>mfk</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:mcp</name>
-            <language>mcp</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:ass</name>
-            <language>ass</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:xed</name>
-            <language>xed</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:dua</name>
-            <language>dua</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:cm:mmuock:anv</name>
-            <language>anv</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:bum</name>
+            <name>xkb:cm:azerty:bum</name>
             <language>bum</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:btb</name>
+            <name>xkb:cm:azerty:btb</name>
             <language>btb</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:bfd</name>
+            <name>xkb:cm:azerty:bfd</name>
             <language>bfd</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:azo</name>
+            <name>xkb:cm:azerty:azo</name>
             <language>azo</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:ken</name>
+            <name>xkb:cm:azerty:ken</name>
             <language>ken</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:yam</name>
+            <name>xkb:cm:azerty:yam</name>
             <language>yam</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:yat</name>
+            <name>xkb:cm:azerty:yat</name>
             <language>yat</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
-            <layout_variant>mmuock</layout_variant>
-            <longname>Mmuock</longname>
-            <description>Mmuock</description>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:cm:mmuock:yas</name>
+            <name>xkb:cm:azerty:yas</name>
             <language>yas</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>cm</layout>
+            <layout_variant>azerty</layout_variant>
+            <longname>Cameroon (AZERTY, intl.)</longname>
+            <description>Cameroon (AZERTY, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:dvorak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Cameroon (Dvorak, intl.)</longname>
+            <description>Cameroon (Dvorak, intl.)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:cm:mmuock:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>cm</layout>
             <layout_variant>mmuock</layout_variant>
             <longname>Mmuock</longname>
             <description>Mmuock</description>
@@ -4203,8 +3351,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:fi:mac:sme</name>
-            <language>se</language>
+            <name>xkb:fi:mac:fin</name>
+            <language>fi</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fi</layout>
@@ -4454,8 +3602,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:fr:us:kat</name>
-            <language>ka</language>
+            <name>xkb:fr:us:fra</name>
+            <language>fr</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>fr</layout>
@@ -4561,8 +3709,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:gh:gillbt:avn</name>
-            <language>avn</language>
+            <name>xkb:gh:gillbt:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gh</layout>
@@ -4726,8 +3874,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:dvorak:ron</name>
-            <language>ro</language>
+            <name>xkb:de:dvorak:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4738,8 +3886,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:sundeadkeys:ron</name>
-            <language>ro</language>
+            <name>xkb:de:sundeadkeys:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4750,8 +3898,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:neo:ron</name>
-            <language>ro</language>
+            <name>xkb:de:neo:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4762,8 +3910,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:mac:ron</name>
-            <language>ro</language>
+            <name>xkb:de:mac:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4774,8 +3922,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:mac_nodeadkeys:ron</name>
-            <language>ro</language>
+            <name>xkb:de:mac_nodeadkeys:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4810,8 +3958,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:qwerty:dsb</name>
-            <language>dsb</language>
+            <name>xkb:de:qwerty:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -4846,8 +3994,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:deadtilde:rus</name>
-            <language>ru</language>
+            <name>xkb:de:deadtilde:deu</name>
+            <language>de</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>de</layout>
@@ -5345,8 +4493,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:it:ibm:kat</name>
-            <language>ka</language>
+            <name>xkb:it:ibm:ita</name>
+            <language>it</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>it</layout>
@@ -6218,8 +5366,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:no:mac:sme</name>
-            <language>se</language>
+            <name>xkb:no:mac:nor</name>
+            <language>no</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
@@ -6230,8 +5378,32 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:no:mac_nodeadkeys:sme</name>
-            <language>se</language>
+            <name>xkb:no:mac:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Norwegian (Macintosh)</longname>
+            <description>Norwegian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac</layout_variant>
+            <longname>Norwegian (Macintosh)</longname>
+            <description>Norwegian (Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac_nodeadkeys:nor</name>
+            <language>no</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
@@ -6242,8 +5414,56 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:no:colemak:sme</name>
-            <language>se</language>
+            <name>xkb:no:mac_nodeadkeys:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>Norwegian (Macintosh, no dead keys)</longname>
+            <description>Norwegian (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:mac_nodeadkeys:nno</name>
+            <language>nn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>mac_nodeadkeys</layout_variant>
+            <longname>Norwegian (Macintosh, no dead keys)</longname>
+            <description>Norwegian (Macintosh, no dead keys)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:colemak:nor</name>
+            <language>no</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Norwegian (Colemak)</longname>
+            <description>Norwegian (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:colemak:nob</name>
+            <language>nb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>no</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Norwegian (Colemak)</longname>
+            <description>Norwegian (Colemak)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:no:colemak:nno</name>
+            <language>nn</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>no</layout>
@@ -6361,8 +5581,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:pl:dvp:rus</name>
-            <language>ru</language>
+            <name>xkb:pl:dvp:pol</name>
+            <language>pl</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>pl</layout>
@@ -6730,8 +5950,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:dos:xal</name>
-            <language>xal</language>
+            <name>xkb:ru:dos:rus</name>
+            <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
@@ -6742,8 +5962,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:mac:xal</name>
-            <language>xal</language>
+            <name>xkb:ru:mac:rus</name>
+            <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
@@ -6802,8 +6022,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:phonetic_azerty:chm</name>
-            <language>chm</language>
+            <name>xkb:ru:phonetic_azerty:rus</name>
+            <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
@@ -6814,8 +6034,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:phonetic_dvorak:chm</name>
-            <language>chm</language>
+            <name>xkb:ru:phonetic_dvorak:rus</name>
+            <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
@@ -6826,8 +6046,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ru:phonetic_fr:chm</name>
-            <language>chm</language>
+            <name>xkb:ru:phonetic_fr:rus</name>
+            <language>ru</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ru</layout>
@@ -7122,8 +6342,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:es:mac:cat</name>
-            <language>ca</language>
+            <name>xkb:es:mac:spa</name>
+            <language>es</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>es</layout>
@@ -7205,8 +6425,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:se:mac:sme</name>
-            <language>se</language>
+            <name>xkb:se:mac:swe</name>
+            <language>sv</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
@@ -7217,8 +6437,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:se:svdvorak:sme</name>
-            <language>se</language>
+            <name>xkb:se:svdvorak:swe</name>
+            <language>sv</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
@@ -7229,8 +6449,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:se:us_dvorak:sme</name>
-            <language>se</language>
+            <name>xkb:se:us_dvorak:swe</name>
+            <language>sv</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
@@ -7241,8 +6461,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:se:us:sme</name>
-            <language>se</language>
+            <name>xkb:se:us:swe</name>
+            <language>sv</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>se</layout>
@@ -7407,8 +6627,20 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ch:de_mac:fra</name>
-            <language>fr</language>
+            <name>xkb:ch:de_mac:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ch</layout>
+            <layout_variant>de_mac</layout_variant>
+            <longname>German (Switzerland, Macintosh)</longname>
+            <description>German (Switzerland, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ch:de_mac:gsw</name>
+            <language>gsw</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ch</layout>
@@ -7548,8 +6780,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:lk:us:tam</name>
-            <language>ta</language>
+            <name>xkb:lk:us:sin</name>
+            <language>si</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>lk</layout>
@@ -7678,8 +6910,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:tr:intl:kur</name>
-            <language>ku</language>
+            <name>xkb:tr:intl:tur</name>
+            <language>tr</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
@@ -8247,8 +7479,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:ie:UnicodeExpert:gle</name>
-            <language>ga</language>
+            <name>xkb:ie:UnicodeExpert:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>ie</layout>
@@ -9031,6 +8263,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ph:capewell-dvorak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-dvorak</layout_variant>
+            <longname>Filipino (Capewell-Dvorak, Latin)</longname>
+            <description>Filipino (Capewell-Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ph:capewell-dvorak:bik</name>
             <language>bik</language>
@@ -9271,6 +8515,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ph:capewell-qwerf2k6:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>capewell-qwerf2k6</layout_variant>
+            <longname>Filipino (Capewell-QWERF 2006, Latin)</longname>
+            <description>Filipino (Capewell-QWERF 2006, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ph:capewell-qwerf2k6:bik</name>
             <language>bik</language>
@@ -9511,6 +8767,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ph:colemak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>colemak</layout_variant>
+            <longname>Filipino (Colemak, Latin)</longname>
+            <description>Filipino (Colemak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ph:colemak:bik</name>
             <language>bik</language>
@@ -9751,6 +9019,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ph:dvorak:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ph</layout>
+            <layout_variant>dvorak</layout_variant>
+            <longname>Filipino (Dvorak, Latin)</longname>
+            <description>Filipino (Dvorak, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ph:dvorak:bik</name>
             <language>bik</language>

From ce865f6735559eea76cd016dbed649f70e9e7be9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Sep 2020 18:34:04 +0900
Subject: [PATCH 674/816] Update POT file

Delete unused msgid
---
 po/ibus10.pot | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/po/ibus10.pot b/po/ibus10.pot
index aaf598e84..76b6ef761 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -443,10 +443,6 @@ msgstr ""
 msgid "Input Method"
 msgstr ""
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr ""
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr ""

From 3b64d4ada8112bea7fcce40cac7b5d8bb215b89b Mon Sep 17 00:00:00 2001
From: Tian Shixiong <tiansworld@gmail.com>
Date: Mon, 14 Sep 2020 18:45:44 +0900
Subject: [PATCH 675/816] po: Update translation (Chinese (Simplified))

Update po/zh_CN.po at 47.7%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/zh_CN.po | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 371d1c804..a59d52db7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -25,8 +25,8 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-07-11 15:27+0000\n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"PO-Revision-Date: 2020-08-28 06:29+0000\n"
+"Last-Translator: Tian Shixiong <tiansworld@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.2.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -78,7 +78,6 @@ msgid ""
 msgstr "已保存的版本号将被用作检查之前安装的 ibus 版本和当前版本间的区别。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
-#, fuzzy
 msgid "Latin layouts which have no ASCII"
 msgstr "无 ASCII 码的拉丁字符布局"
 
@@ -471,10 +470,6 @@ msgstr "添加(_A)"
 msgid "Input Method"
 msgstr "输入法"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus 首选项"

From ea27a8be47cec9adbd62fea3b8bc8810e9ff1c8d Mon Sep 17 00:00:00 2001
From: Whired Planck <fungdaat31@outlook.com>
Date: Mon, 14 Sep 2020 18:45:53 +0900
Subject: [PATCH 676/816] po: Update translation (Chinese (Simplified))

Update po/zh_CN.po at 47.7%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/zh_CN.po | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a59d52db7..e4cd6686c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,13 +20,14 @@
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2019. #zanata
 # Tian Shixiong <tiansworld@gmail.com>, 2020.
 # Boyuan Yang <073plan@gmail.com>, 2020.
+# Whired Planck <fungdaat31@outlook.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-08-28 06:29+0000\n"
-"Last-Translator: Tian Shixiong <tiansworld@gmail.com>\n"
+"PO-Revision-Date: 2020-08-31 03:29+0000\n"
+"Last-Translator: Whired Planck <fungdaat31@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -92,7 +93,7 @@ msgstr "使用 xmodmap"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "若 .xmodmap 或者 .Xmodmap 存在则当 ibus 框架启动时执行 xmodmap"
+msgstr "若 .xmodmap 或者 .Xmodmap 存在则当 ibus 框架启动时执行 xmodmap。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
@@ -218,7 +219,7 @@ msgstr "以毫秒为单位显示属性面板的时间"
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间"
+msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
@@ -427,7 +428,7 @@ msgstr "确定(_O)"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
-msgstr "更多..."
+msgstr "更多…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
 msgid "About"
@@ -510,7 +511,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "请按一个键盘按键（或者一个组合按键）"
+msgstr "请按一个键盘按键（或者组合按键）"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"

From 700ef87ec3042a64fb726e1c32dcbc190d99945d Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Mon, 14 Sep 2020 18:55:36 +0900
Subject: [PATCH 677/816] po: Update translation (Ukrainian)

Update po/uk.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/uk/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/uk.po | 503 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 289 insertions(+), 214 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a7af73f45..e828fef91 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-08 10:24+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-07 13:29+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <https://translate.stg.fedoraproject.org/projects/"
-"ibus/ibus/uk/>\n"
+"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 3.9.1\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"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -53,9 +53,9 @@ msgstr "Затримка появи контекстного вікна для 
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 < — затримка у "
@@ -125,8 +125,7 @@ msgstr "Типово увімкнути спосіб введення"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Типово увімкнути спосіб введення, коли програма отримує фокус введення"
+msgstr "Типово увімкнути спосіб введення, коли програма отримує фокус введення"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -195,8 +194,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 ="
-" завжди показувати"
+"Поведінка панелі властивостей. 0 = не показувати, 1 = автоматично ховати, 2 "
+"= завжди показувати"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -259,10 +258,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "На піктограмі XKB буде показано рядок розкладки. Для показу цього рядка буде "
 "використано вказане значення RGBA. Значенням RGBA може бути: 1. назва "
@@ -299,7 +298,7 @@ msgid "Use custom font name for language panel"
 msgstr "Використовувати нетиповий шрифт для мовної панелі"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Нетиповий шрифт"
 
@@ -307,32 +306,48 @@ msgstr "Нетиповий шрифт"
 msgid "Custom font name for language panel"
 msgstr "Назва нетипового шрифту для мовної панелі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Вибирати гліфи з мови способу введення у вікні варіантів"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Для деяких позицій у кодуванні існують різні гліфи, і Pango визначає гліф на "
+"основі атрибута мови. Pango вибирає гліфи з мови рушія IBus, якщо цей "
+"параметр має значення «true», і вибирає їх з локалі стільничного середовища, "
+"якщо цей параметр має значення «false»."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Клавіатурне скорочення Unicode для gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 "Клавіатурне скорочення для вмикання і вимикання введення символів Unicode"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Клавіатурне скорочення емодзі для gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Клавіатурне скорочення для вмикання і вимикання введення емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Назва нетипового шрифту для символів емодзі у вікні емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Типова мова словника емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -340,11 +355,11 @@ msgstr ""
 "Виберіть типову мову словників емодзі у вікні емодзі. Значення $lang "
 "застосовується до /usr/share/ibus/dicts/emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "Список улюблених емодзі у вікні емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -352,19 +367,19 @@ msgstr ""
 "Ви зможете переглянути улюблені емодзі у списку емодзі, якщо у цьому списку "
 "є якісь символи."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "список анотацій до улюблених емодзі у вікні емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Ви можете додавати анотації до улюблених емодзі у цьому списку."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Визначає, чи може бути встановлено часткову відповідність"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -372,11 +387,11 @@ msgstr ""
 "Визначає, чи може бути встановлено відповідність емодзі за частиною рядка, а "
 "не повним збігом."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Відповідність анотацій до емодзі за вказаною довжиною рядка"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -384,11 +399,11 @@ msgstr ""
 "Встановлювати часткову відповідність анотацій до емодзі, якщо збігається "
 "вказана кількість символів, але відповідність не є повною."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Вибрати умову часткової відповідності анотацій до емодзі"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -397,11 +412,11 @@ msgstr ""
 "анотаціями до емодзі: 0 == відповідність за префіксом, 1 == відповідність за "
 "суфіксом, 2 == відповідність за вмістом"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Завантажувати дані емодзі під час запуску програми"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -411,11 +426,11 @@ msgstr ""
 "завантаження даних потрібно приблизно 10 МБ пам'яті. Якщо false, дані емодзі "
 "буде завантажено під час відкриття діалогового вікна емодзі на початку."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Завантажувати дані Unicode під час запуску"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -432,10 +447,11 @@ msgstr ""
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "© Peng Huang, 2007–2010\n"
+msgstr ""
+"© Peng Huang, 2007–2010\n"
 "© Red Hat, Inc., 2007–2010"
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Інше"
 
@@ -456,11 +472,11 @@ msgstr "_Гаразд"
 msgid "More…"
 msgstr "Більше…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Інформація"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -497,10 +513,6 @@ msgstr "_Додати"
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "Налаштування IBus"
@@ -636,8 +648,7 @@ msgstr "Наступний спосіб введення:"
 #: setup/setup.ui:127
 msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
-"Клавіатурне скорочення для перемикання на попередній спосіб введення у "
-"списку"
+"Клавіатурне скорочення для перемикання на попередній спосіб введення у списку"
 
 #: setup/setup.ui:129
 msgid "Previous input method:"
@@ -695,8 +706,7 @@ msgstr "Вбудувати попередньо створений текст у
 
 #: setup/setup.ui:513
 msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Вбудувати попередньо створений текст способу введення у вікно програми"
+msgstr "Вбудувати попередньо створений текст способу введення у вікно програми"
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
@@ -772,8 +782,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Клавіатурне скорочення для вмикання перетворень анотацій емодзі або назв "
 "символів Unicode"
@@ -847,33 +856,21 @@ msgstr "<b>Розкладка клавіатури</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Загальні параметри способів введення</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Додатково"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Інтелектуальний канал введення</small>\n"
-"Домашня сторінка: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Вибирати гліфи з мови способу введення у вікні варіантів для дублювання "
+"гліфів у позиції кодування"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Запускати ibus при вході"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Шрифти</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Запуск</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Додатково"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2354,664 +2351,720 @@ msgstr "Числові символи румі"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Єзидська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Давня согдійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Согдійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "хорезмійська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Елімаїдська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Брахмійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Кайтхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Соранг сомпенг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Чакма"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Махаджані"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Шарада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Сингальські архаїчні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Ходжкі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Мултанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Худабадська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Грантха"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Неварська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Тірхута"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Сіддхам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Моді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Додаткові монгольські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Такрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ахом"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Доґра"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Варанг-кшиті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Дайвс-акуру"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Нандінагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Квадратний Занабазара"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Сойомбо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Пау Цин Хау"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Бхайксукі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Марчен"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Масарам гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Гунджала гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Макасар"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Лісу, доповнення Latin-1"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Додаткова тамільська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Клинопис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Клинописні числа і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Клинопис ранньої династії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Єгипетська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Керування форматами єгипетських ієрогліфів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Анатолійьска ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Розширений бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Мро"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Басса-вах"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Медефайдрін"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Мяо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ідеографічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Тангутська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Компоненти тангутської"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Киданська мала писемність"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Тангутська, доповнення"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Додаткова кана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Кана розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Мале розширення кани"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Нюй-шу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Система Дюполоє"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Керування форматами скоропису"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Візантійські музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Давньогрецькі символи запису музики"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Цифри майя"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Символи Тай Хуан Жинь"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Числа з паличок для лічби"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Математичні буквено-цифрові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Жестова писемність Саттон"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Додаткові глаголиці"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Ньякензька пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Ванчо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Менде кікауї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Адлам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Індійські числа сіяк"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Оттоманські сіякські числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Арабські математичні символи абетки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Плитки маджонґ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Плитки доміно"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Ігрові карти"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Додаткові буквенно-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Додаткові ідеографічні у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Різні символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Емоційки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Орнаментальні декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Транспортні і картографічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Алхімічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Розширені геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Додаткові стрілки-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Додаткові символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Шахові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Символи і піктографи, розширення A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Застарілі символи комп'ютерних наук"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Уніфіковані ієрогліфічні ідеограми, додаток B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Ієрогліфічні ідеограми, додаток C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Ієрогліфічні ідеограми, додаток D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Ієрогліфічні ідеограми, додаток E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Ієрогліфічні ідеограми, додаток F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Додаткові ієрогліфічні ідеограми для сумісності"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "Універсальні ідеографічні ієрогліфи, додаток G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Мітки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Додаткові символи зміни"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Додаткова область приватного використання A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Додаткова область приватного використання B"
 
@@ -3130,9 +3183,11 @@ msgstr "Показати цю довідкову інформацію"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
+msgstr ""
+"Користування: %s КОМАНДА [ПАРАМЕТР...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3156,155 +3211,154 @@ msgstr "Інше"
 msgid "Open Unicode choice"
 msgstr "Відкрити вибір Unicode"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Повернути вибір емоційок"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Показувати варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Закрити"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Меню"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Натисніть, щоб переглянути попередження"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Завантаження словника Unicode:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Немає"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Назва: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Вибір Unicode"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Не вдалося отримати дані поточної програми для роботи з текстом. Будь ласка, "
 "повторно встановіть фокус на вікно програми. Наприклад, натисніть клавішу "
 "Esc декілька разів, щоб вимкнути режим введення емодзі, клацніть на "
 "стільниці, а потім клацніть у вікні вашої програми для роботи з текстом."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Скасовано вибір емодзі."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Скопійовано емодзі до вашого буфера обміну даними."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "«ШРИФТ» для символів емодзі у діалоговому вікні емодзі"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "«МОВА» для анотацій у діалоговому вікні емодзі. Приклад: en"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "МОВА"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
-msgstr ""
-"Встановлення відповідності за анотаціями до емодзі може бути частковим"
+msgstr "Встановлення відповідності за анотаціями до емодзі може бути частковим"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Відповідність за вказаною довжиною рядка"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Вийти"
 
@@ -3313,3 +3367,24 @@ msgstr "Вийти"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Інтелектуальний канал введення</small>\n"
+#~ "Домашня сторінка: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Запускати ibus при вході"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Запуск</b>"

From 7e469b59fdfd5cab3462b91b43d5efde636fa796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Mon, 14 Sep 2020 18:59:57 +0900
Subject: [PATCH 678/816] po: Update translation (Polish)

Update po/pl.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/pl/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/pl.po | 484 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 281 insertions(+), 203 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 5663ea1ab..2f40f9717 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,10 +17,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-03 17:09+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-05 07:53+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <https://translate.stg.fedoraproject.org/projects/ibus/"
+"Language-Team: Polish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -54,9 +54,9 @@ msgstr "Opóźnienie wyświetlenia okna przełącznika IME w milisekundach"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 "
@@ -262,10 +262,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "Ikona XKB wyświetla ciąg układu, który jest wyświetlany za pomocą wartości "
 "RGBA. Wartość RGBA może wynosić 1. nazwę kolory z X11, 2. wartość "
@@ -302,7 +302,7 @@ msgid "Use custom font name for language panel"
 msgstr "Niestandardowa czcionka dla panelu języków"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Nazwa niestandardowej czcionki"
 
@@ -310,31 +310,47 @@ msgstr "Nazwa niestandardowej czcionki"
 msgid "Custom font name for language panel"
 msgstr "Nazwa niestandardowej czcionki dla panelu języków"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Wybieranie glifów w oknie kandydatów w języku metody wprowadzania"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Niektóre kody znaków mają różne glify i biblioteka Pango ustala je na "
+"podstawie atrybutu języka. Pango wybiera glify z języka mechanizmu IBus, "
+"jeśli wartość wynosi „true”, lub z języka środowiska, jeśli wartość wynosi "
+"„false”."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisze skrótów unikodu dla gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania pisania unikodu"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Klawisz skrótu emoji dla „gtk_accelerator_parse”"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Klawisze skrótów do włączania lub wyłączania wpisywania emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Nazwa niestandardowej czcionki dla znaków emoji w oknie emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Domyślny język dla słownika emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -342,29 +358,29 @@ msgstr ""
 "Wybór domyślnego języka słowników emoji w oknie emoji. Wartość $lang jest "
 "zastosowywana do /usr/share/ibus/dicts/emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista ulubionych emoji w oknie emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr "Wpisane tutaj znaki pojawią się na liście ulubionych emoji."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista ulubionych uwag emoji w oknie emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Można przydzielić uwagę do ulubionej emoji na tej liście."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Czy uwagi emoji mogą być dopasowywane częściowo"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -372,11 +388,11 @@ msgstr ""
 "Czy uwagi emoji mogą być dopasowywane z częściowym ciągiem, zamiast "
 "z dokładnym dopasowaniem."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Dopasowywanie uwag emoji o podanej długości"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -384,11 +400,11 @@ msgstr ""
 "Częściowe dopasowywanie uwag emoji o więcej niż tej liczbie znaków, zamiast "
 "dokładnego dopasowywania."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Warunek częściowego dopasowywania uwag emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -397,11 +413,11 @@ msgstr ""
 "0 == dopasowywanie przedrostka, 1 == dopasowywanie przyrostka, 2 == "
 "dopasowywanie w środku"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Wczytywanie danych emoji podczas uruchamiania"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -411,11 +427,11 @@ msgstr ""
 "uruchamiania. Wymaga około 10 MB pamięci. Jeśli jest ustawione na wartość "
 "„false”, to wczytuje dane emoji podczas otwierania okna emoji."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Wczytywanie danych unikodu podczas uruchamiania"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -432,10 +448,11 @@ msgstr ""
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright © 2007-2010 Peng Huang\n"
+msgstr ""
+"Copyright © 2007-2010 Peng Huang\n"
 "Copyright © 2007-2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Inne"
 
@@ -456,11 +473,11 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Więcej…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "O programie"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -497,10 +514,6 @@ msgstr "_Dodaj"
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "KBD"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "Preferencje usługi IBus"
@@ -768,8 +781,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr "Klawisze skrótów do włączania konwersji uwag emoji lub nazw unikodu"
 
 #: setup/setup.ui:875
@@ -840,33 +852,21 @@ msgstr "<b>Układ klawiatury</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Ustawienia globalnej metody wprowadzania</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Inteligentna magistrala wprowadzania</small>\n"
-"Strona domowa: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Wybiera glify dla podwójnych kodów znaków w oknie kandydatów w języku metody "
+"wprowadzania"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Uruchamianie IBus podczas logowania"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Czcionki</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Uruchamianie</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Zaawansowane"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2347,664 +2347,720 @@ msgstr "Symbole numeryczne rumi"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Jezydyjski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Starosogdyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdyjski"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "Chorezmijski"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Elamicki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sorang sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Czakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajański"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Śarada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Archaiczne cyfry syngaleskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Chodżycki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Uzupełnienie mongolskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Varang kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Dives akuru"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Kwadratowe Zanabazara"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Gondi masarama"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gondi gunjala"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Uzupełnienie lisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Uzupełnienie tamilskiego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cyfry i interpunkcja pisma klinowego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Wczesnodynastyczne pismo klinowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Hieroglify egipskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Modyfikatory formatu hieroglifów egipskich"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Hieroglify anatolijskie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Uzupełnienie bamum"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassa vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideograficzne symbole i znaki interpunkcyjne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangucki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Składniki tanguckie"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Kitańskie małe"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Uzupełnienie tanguckiego"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Uzupełnienie kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Rozszerzony kana A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Rozszerzenie małej kany"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nüshu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Stenografia Duployé’a"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Modyfikatory formatu stenograficznego"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Bizantyjskie symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Symbole muzyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Starożytna grecka notacja muzyczna"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Cyfry Majów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symbole Tai xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Cyfry w chińskim zapisie pałeczkowym"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematyczne symbole alfanumeryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Sutton SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Uzupełnienie głagolicy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng puachue hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Pismo ki-ka-ku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Indyjskie cyfry siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Osmańskie cyfry siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabskie matematyczne symbole alfabetyczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Klocki Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Klocki domina"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Karty do gry"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Uzupełnienie otoczonych symboli alfanumerycznych"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Uzupełnienie otoczonych ideogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Różne symbole i piktogramy"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Emotikony"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Ozdoby drukarskie Dingbat"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Symbole transportowe i dla map"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Symbole alchemiczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Rozszerzone kształty geometryczne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Uzupełnienie strzałek C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Uzupełnienie symboli i piktogramów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Symbole szachowe"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Rozszerzone symbole i piktogramy A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Symbole dla starych komputerów"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Rozszerzenie B ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Rozszerzenie C ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Rozszerzenie D ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Rozszerzenie E ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Rozszerzenie F ujednoliconych ideogramów CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Dodatkowe ideogramy zgodności CJK"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "Rozszerzenie G ujednoliconych ideogramów CJK"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Dodatkowe przełączniki wariantów glifów"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Dodatkowy obszar prywatnego użytku A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Dodatkowy obszar prywatnego użytku B"
 
@@ -3123,9 +3179,11 @@ msgstr "Wyświetla tę informację"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Użycie: %s POLECENIE [OPCJA…]\n"
+msgstr ""
+"Użycie: %s POLECENIE [OPCJA…]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3149,154 +3207,153 @@ msgstr "Inne"
 msgid "Open Unicode choice"
 msgstr "Otwórz wybór unikodu"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Wróć do wyboru emoji"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Strona w dół"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Strona w górę"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Wyświetlanie wariantów emoji"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Zamknij"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Kliknięcie wyświetli komunikat ostrzeżenia"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Wczytywanie słownika unikodu:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod znaku: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Ma warianty emoji"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Brak"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Uwagi: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Nazwa: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Wybór unikodu"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "Uzyskanie obecnej aplikacji tekstowej się nie powiodło. Proszę ponownie ją "
 "aktywować. Można np. nacisnąć klawisz Esc kilka razy, aby zwolnić tryb "
 "pisania emoji, albo kliknąć pulpit i kliknąć aplikację tekstową jeszcze raz."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Anulowano, aby wybrać emoji."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Skopiowano emoji do schowka."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„CZCIONKA” dla znaków emoji w oknie emoji"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "CZCIONKA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„JĘZYK” uwag w oknie emoji, np. „pl”"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "JĘZYK"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Uwagi emoji mogą być częściowo dopasowywane"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Dopasowywanie o podanej długości jako liczba całkowita"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr ""
-"IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
+msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2020"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Zakończ"
 
@@ -3305,3 +3362,24 @@ msgstr "Zakończ"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Inteligentna magistrala wprowadzania</small>\n"
+#~ "Strona domowa: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Uruchamianie IBus podczas logowania"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Uruchamianie</b>"

From 6662b8e0b11d104e4ca1b384df0a1141a417a4dd Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Mon, 14 Sep 2020 19:03:18 +0900
Subject: [PATCH 679/816] po: Update translation (German)

Update po/de.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/de/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/de.po | 457 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 266 insertions(+), 191 deletions(-)

diff --git a/po/de.po b/po/de.po
index 2c7dffca8..2566ae00d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-01-30 13:16+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-07 13:29+0000\n"
 "Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
 "Language-Team: German <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/de/>\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10.3\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -305,7 +305,7 @@ msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
@@ -313,31 +313,47 @@ msgstr "Benutzerdefinierte Schriftart"
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Wähle Glyphen in der Sprache der Eingabemethode im Kandidatenfenster"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Zu manchen Unicodenummern gibt es unterschiedliche Glyphen je nach Sprache "
+"und Pango bestimmt die korrekten Glyphen anhand des Sprachattributs. Pango "
+"wählt Glyphen passend zur Sprache des IBus engines wenn dieser Wert true ist "
+"und von der Lokale des Desktops wenn dieser Wert false ist."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode-Tastenkombinationen für gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Die Tastenkombinationen zum Ein- und Ausschalten der Unicode-Eingabe"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji Tastenkombination für gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Standard-Sprache für das Emoji-Wörterbuch"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -345,11 +361,11 @@ msgstr ""
 "Auswahl einer Standard-Sprache der Emoji-Wörterbücher im Emoji-Dialog. Der "
 "Wert $lang wird auf /usr/share/ibus/dicts/emoji-$lang.dict angewendet."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "Emoji-Favoriteneliste im Emoji-Dialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -357,22 +373,21 @@ msgstr ""
 "Sie können die favorisierten Emoji in der Emoji-Liste anzeigen wenn die "
 "Liste Zeichen enthält."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "Anmerkungsliste für bevorzugte Emoji im Emojidialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
-"In dieser Liste kann man eine Anmerkung für  bevorzugte Emoji definieren."
+"In dieser Liste kann man eine Anmerkung für bevorzugte Emoji definieren."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
-"Ob in Emojianmerkungen mit  teilweiser  Übereinstimmung gesucht wird oder  "
-"nicht"
+"Ob in Emojianmerkungen mit teilweiser Übereinstimmung gesucht wird oder nicht"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -380,11 +395,11 @@ msgstr ""
 "Ob Emojianmerkungen nur mit einem Teil der Zeichenfolge übereinstimmen "
 "müssen anstatt mit kompletten Zeichenfolge."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Finde Emojianmerkungen mit der angegebenen Länge"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -392,25 +407,25 @@ msgstr ""
 "Finde Emojianmerkungen mit teilweiser Übereinstimmung mit mehr als der "
 "angegebenen Zahl von Zeichen anstelle von exakter Übereinstimmung."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Wähle eine Bedingung um nach teilweisen Übereinstimmungen in "
 "Emojianmerkungen zu suchen"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 "Wähle eine der folgenden Bedingungen um nach teilweisen Übereinstimmungen in "
-"Emojianmerkungen zu suchen: 0 == Präfix, 1  == Suffix, 2  == Mittendrin"
+"Emojianmerkungen zu suchen: 0 == Präfix, 1 == Suffix, 2 == Mittendrin"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Emojidaten beim Starten laden"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -421,11 +436,11 @@ msgstr ""
 "die Emojidaten erst geladen, wenn der Emojidialog zum ersten Mal geöffnet "
 "wird."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Unicodedaten beim Starten laden"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -467,11 +482,11 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Mehr..."
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Info"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -508,10 +523,6 @@ msgstr "_Hinzufügen"
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus-Einstellungen"
@@ -795,7 +806,8 @@ msgstr "Emojianmerkungen:"
 
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "Tastenkombinationen zum Einschalten der Unicode Codepoint Konvertierung"
+msgstr ""
+"Tastenkombinationen zum Einschalten der Unicode Codepoint Konvertierung"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
@@ -857,33 +869,21 @@ msgstr "<b>Tastaturbelegung</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Globale Inputmethodeneinstellungen</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Der intelligente Eingabe-Bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Wähle Glyphen passend zur Sprache der Inputmethode im Kandidatenfenster für "
+"duplizierte Unicodenummern"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "IBus bei der Anmeldung starten"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Schriftarten</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Starten</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Erweitert"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2364,664 +2364,720 @@ msgstr "Rumi-Ziffern"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Jesidisch"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Altsogdisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "Chorasmian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Elymaisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sorang-Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Singhalesische Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multanisch"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudabadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Mongolisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Varang Kshiti"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Dives Akuru"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Dsanabadsar-Quadratschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Sojombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Makassar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Lisu, Ergänzung"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Tamilisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Keilschrift-Zahlzeichen und -Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Frühe Keilschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Ägyptische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Ägyptische Hieroglyphen-Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatolische Hieroglyphen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Bamum, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Pollard-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideographische Symbole und Interpunktion"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Xixia"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Xixia-Komponenten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Kleine Kitan-Schrift"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Xixia, Ergänzung"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Kana, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Kana, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Kleine Kana, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Frauenschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployé-Kurzschrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Kurzschrift-Steuerzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantinische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Altgriechische Notenschriftzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Maya-Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai-Xuan-Jing-Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Zählstabziffern"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Sutton-SignWriting"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisch, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Mende-Schrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Indische Siyaq-Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Osmanische Siyaq-Zahlzeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabische mathematische alphanumerische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Mahjonggsteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Dominosteine"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Spielkarten"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Zusätzliche umschlossene alphanumerische Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Zusätzliche umschlossene CJK-Zeichen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Verschiedene piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Smileys"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Ziersymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Verkehrs- und Kartensymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Alchemistische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Geometrische Formen, erweitert"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Zusätzliche Pfeile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Zusätzliche piktografische Symbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Schachsymbole"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Piktografische Symbole, erweitert-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Symbole für Retrocomputer"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK-Ideogramme, Kompatibilität, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "Vereinheitlichte CJK-Ideogramme, Erweiterung G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Variantenselektoren, Ergänzung"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Supplementary Private Use Area-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Supplementary Private Use Area-B"
 
@@ -3040,9 +3096,7 @@ msgstr "Sprache: %s\n"
 
 #: tools/main.vala:161
 msgid "No engine is set.\n"
-msgstr ""
-"Keine Engine gesetzt.\n"
-"\n"
+msgstr "Keine Engine gesetzt.\n"
 
 #: tools/main.vala:169
 msgid "Set global engine failed.\n"
@@ -3170,81 +3224,81 @@ msgstr "Andere"
 msgid "Open Unicode choice"
 msgstr "Öffne Unicodeauswahl"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Zurück zur Emojiauswahl"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Seite runter"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Seite hoch"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Emoji-Varianten anzeigen"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Schließen"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menü"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Klicken um eine Warnmeldung anzusehen"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Lade ein Unicodewörterbuch:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Codepoint: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Hat Emojivarianten"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Keine"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anmerkungen: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Emojiauswahl"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Unicodeauswahl"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3255,72 +3309,72 @@ msgstr ""
 "den Emojieingabemodus zu verlassen, klicken Sie mit der Maus auf den Desktop "
 "und klicken sie dann wieder auf Ihre Textapplikation."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Abbrechen der Emojiauswahl."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Emoji in die Zwischenablage kopiert."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "„SCHRIFTART“ für Emojizeichen im Emojidialog"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "SCHRIFTART"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "„SPRACHE“ für Emojianmerkungen im Emojidialog. Zum Beispiel „en“"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "SPRACHE"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Emojianmerkungen finden mit teilweiser Übereinstimmung"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
-msgstr "Übereinstimmung  mit Länge  der angegebenen ganzen Zahl"
+msgstr "Übereinstimmung mit Länge der angegebenen ganzen Zahl"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Übereinstimmung mit der Bedingung der angegebenen ganzen Zahl"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus Panel"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 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:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009.\n"
 "Mike FABIAN <mfabian@redhat.com>, 2019."
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Neustart"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Beenden"
 
@@ -3330,6 +3384,27 @@ msgstr "Beenden"
 msgid "default:LTR"
 msgstr "default:LTR"
 
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Der intelligente Eingabe-Bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "IBus bei der Anmeldung starten"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Starten</b>"
+
 #~ msgid "The shortcut keys for showing emoji dialog"
 #~ msgstr "Tastenkombination zum Anzeigen des Emoji-Dialogs"
 

From e491e20ff90d0ada8502fc486f88b994d914b28a Mon Sep 17 00:00:00 2001
From: Emilio Herrera <ehespinosa57@gmail.com>
Date: Mon, 14 Sep 2020 19:06:49 +0900
Subject: [PATCH 680/816] po: Update translation (Spanish)

Update po/es.po at 96.3%
https://translate.fedoraproject.org/projects/ibus/ibus/es/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/es.po | 497 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 288 insertions(+), 209 deletions(-)

diff --git a/po/es.po b/po/es.po
index f343df3bd..8ba7d671f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -23,20 +23,22 @@
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2019. #zanata
+# Emilio Herrera <ehespinosa57@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-07 13:29+0000\n"
+"Last-Translator: Emilio Herrera <ehespinosa57@gmail.com>\n"
+"Language-Team: Spanish <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/es/>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-03-02 11:55+0000\n"
-"Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
-"Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -62,9 +64,9 @@ msgstr "Retraso en milisegundos de Popup para ventana del interruptor IME"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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 en milisegundos para mostrar la ventana del selector IME. "
 "El valor predeterminado es 400. 0 = Muestra la ventana inmediatamente. 0 < "
@@ -184,8 +186,7 @@ msgstr "Atajo de teclado para el siguiente motor"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:96
 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"
+"Los atajos de teclado para avanzar al siguiente método de entrada de la lista"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:100
 #: data/dconf/org.freedesktop.ibus.gschema.xml:105
@@ -271,10 +272,10 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
 "El ícono XKB muestra la cadena de diseño que se renderiza con el valor RGBA. "
 "El valor RGBA puede ser 1. un color de X11, 2. un valor hexa en la forma "
@@ -310,7 +311,7 @@ msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizado para el panel de idioma"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
@@ -318,32 +319,44 @@ msgstr "Fuente personalizada"
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Elegir glyphs con el idioma del método de entrada en la ventana"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Atajos de teclado Unicode para gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura Unicode"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Atajos de teclado de emoji para gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Idioma predeterminado para el diccionario de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -351,11 +364,11 @@ msgstr ""
 "Elija un idioma predeterminado para el diccionario de emoji. Su valor "
 "($lang) se aplica a /usr/share/ibus/dicts/emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "lista de emoji favoritos en el diálogo de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -363,20 +376,20 @@ msgstr ""
 "Puede mostrar sus emoji favoritos en la lista de emoji si los incluye en "
 "esta lista."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "lista de anotaciones de emoji favoritos en el diálogo de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Puede poner anotaciones a sus emoji favoritos en esta lista."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si se permiten o no las coincidencias parciales en las anotaciones de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -384,13 +397,13 @@ msgstr ""
 "Si se puede obtener una coincidencia parcial en la búsqueda de anotaciones "
 "de emoji en lugar de una exacta."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 "Realizar búsquedas en las anotaciones de emoji con la longitud de texto "
 "indicada"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -398,12 +411,12 @@ msgstr ""
 "Obtener coincidencias parciales en lugar de exactas en las anotaciones de "
 "emoji que tengan más que el número de caracteres indicado "
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Elija una condición para las coincidencias parciales de anotaciones de emoji"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -412,11 +425,11 @@ msgstr ""
 "anotaciones de emoji: 0 == inicio del texto, 1 == final del texto, 2 == "
 "contiene el texto."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Cargar los datos de emoji al inicio"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -425,11 +438,11 @@ msgstr ""
 "Cargar los datos de emoji al inicio. Se necesitan alrededor de 10MB. Si está "
 "desactivado, se cargarán al abrir el cuadro de selección de emoji."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Cargar los datos de Unicode al inicio"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -449,7 +462,7 @@ msgstr ""
 "Copyright (c) 2007–2010 Peng Huang\n"
 "Copyright (c) 2007–2010 Red Hat, Inc."
 
-#: ibus/lang.py:41 src/ibusutil.c:198
+#: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
 msgstr "Otro"
 
@@ -470,11 +483,11 @@ msgstr "_Aceptar"
 msgid "More…"
 msgstr "Más..."
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Acerca de"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -511,10 +524,6 @@ msgstr "_Añadir"
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "Preferencias de IBus"
@@ -788,8 +797,7 @@ msgstr ""
 
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 "Los atajos de teclado para activar las conversiones de las anotaciones de "
 "emoji o nombre Unicode"
@@ -817,8 +825,7 @@ msgstr "Fuente Unicode:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
-"Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
+msgstr "Idioma a usar en el cuadro de emoji para las anotaciones de los mismos"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
@@ -864,33 +871,21 @@ msgstr "<b>Distribución del teclado</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuraciones globales de método de entrada</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>El bus de entrada inteligente</small>\n"
-"Sitio web: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Iniciar ibus al ingresar"
+#: setup/setup.ui:1327
+#, fuzzy
+#| msgid "<b>Font and Style</b>"
+msgid "<b>Fonts</b>"
+msgstr "<b>Fuente y Estilo</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2371,664 +2366,726 @@ msgstr "Numerales rumi"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Sogdiano antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdiano"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Sinhala, numerales antiguos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Mongol (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Zanabazar cuadrada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Macasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+#, fuzzy
+#| msgid "Latin-1 Supplement"
+msgid "Lisu Supplement"
+msgstr "Latino-1 (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Cuneiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Cuneiforme, números y puntuación"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Cuneiforme arcaico"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Jeroglíficos egipcios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Jeroglíficos anatolios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Shümom (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Pollard Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Símbolos y puntuación ideográfica"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Tangut, componentes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+#, fuzzy
+#| msgid "Kana Supplement"
+msgid "Tangut Supplement"
+msgstr "Kana (suplemento)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Kana (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Kana extendido-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nü shu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Taquigrafía, controles de formato"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Símbolos musicales biznatinos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Símbolos musicales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Notación musical del griego antiguo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Numeración maya"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Varillas de numeración"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Símbolos matemáticos alfanuméricos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Lengua de signos Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Glagolítico (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Silabario ki-ka-ku"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Números índicos siyah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Símbolos alfabéticos matemáticos árabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Fichas de Mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Fichas de dominó"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Naipes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Alfanuméricos encerrados (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Ideogramas encerrados (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Símbolos y pictogramas varios"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Emoticonos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Pictogramas ornamentales"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Símbolos de transporte y mapas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Símbolos alquímicos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Formas geométricas extendidas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Flechas (suplemento-C)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Símbolos y pictogramas (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Símbolos de ajedrez"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK, ideogramas unificados extensión B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK, ideogramas unificados extensión C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK, ideogramas unificados extensión D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK, ideogramas unificados extensión E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK, ideogramas unificados extensión F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK, ideogramas de compatibilidad (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+#, fuzzy
+#| msgid "CJK Unified Ideographs Extension A"
+msgid "CJK Unified Ideographs Extension G"
+msgstr "CJK, ideogramas unificados extensión A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Selectores de variación (suplemento)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Área suplementaria de uso privado A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Área suplementaria de uso privado B"
 
@@ -3145,9 +3202,11 @@ msgstr "Mostrar esta información"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "Uso: %s COMANDO [OPCIÓN...]\n"
+msgstr ""
+"Uso: %s COMANDO [OPCIÓN...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3171,155 +3230,154 @@ msgstr "Otros"
 msgid "Open Unicode choice"
 msgstr "Abrir selección Unicode"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Volver a la selección emoji"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Siguiente"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Anterior"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Mostrar variantes de emoji"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Cerrar"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menú"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Pulse para ver mensaje de aviso"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Cargando un diccionario Unicode:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Punto de código: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Tiene variantes emoji"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Ninguna"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Anotaciones: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Selección de emoji"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Selección Unicode"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
 "No se pudo obtener la aplicación de texto actual, por favor devuélvala el "
 "foco (por ejemplo, pulse escape varias veces para salir del modo emoji, haga "
 "clic en el escritorio y de nuevo en su aplicación."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Cancelada la selección de emoji."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Se copió un emoji al portapapeles."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "FUENTE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "IDIOMA para las anotaciones en el cuadro de diálogo de emoji (p.ej.: \"es\")."
-""
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "IDIOMA"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Se permiten coincidencias parciales en las anotaciones de emoji"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Buscar coincidencias con la longtud indicada"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Buscar coincidencias con la condición indicada por el código"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 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:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr "Créditos de Traducción"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Salir"
 
@@ -3328,3 +3386,24 @@ msgstr "Salir"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>El bus de entrada inteligente</small>\n"
+#~ "Sitio web: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Iniciar ibus al ingresar"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Inicio</b>"

From 9f455b48e30004dd194342bffeca424505c4c53c Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 14 Sep 2020 19:09:44 +0900
Subject: [PATCH 681/816] po: Update translation (Hebrew)

Update po/he.po at 31.2%
https://translate.fedoraproject.org/projects/ibus/ibus/he/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/he.po | 505 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 276 insertions(+), 229 deletions(-)

diff --git a/po/he.po b/po/he.po
index eedff4bab..8a0c49181 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-08-04 15:29+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-07 13:29+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/he/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -247,10 +247,8 @@ msgid ""
 msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
-#, fuzzy
-#| msgid "The milliseconds to show property panel"
 msgid "The milliseconds to show the panel icon for a property"
-msgstr "המילישניות להצגת חלונית המאפיינים"
+msgstr "המילישניות להצגת סמל חלונית למאפיין"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
@@ -269,7 +267,7 @@ msgid "Use custom font name for language panel"
 msgstr "להשתמש בשם של גופן בהתאמה אישית ללוח השפה"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "גופן בהתאמה אישית"
 
@@ -277,110 +275,112 @@ msgstr "גופן בהתאמה אישית"
 msgid "Custom font name for language panel"
 msgstr "שם גופן בהתאמה אישית לחלונית גופן"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
-#, fuzzy
-#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+msgstr "מקשי קיצור יוניקוד של gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
-#, fuzzy
-#| msgid "The shortcut keys for turning input method on or off"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+msgstr "מקשי הקיצור להפעלה או השבתה של הקלדת יוניקוד"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
-#, fuzzy
-#| msgid "Trigger shortcut keys for gtk_accelerator_parse"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr "מקשי קיצור להקפצה של gtk_accelerator_parse"
+msgstr "מקשי קיצור לאמוג׳י של gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
-#, fuzzy
-#| msgid "The shortcut keys for turning input method on or off"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+msgstr "מקשי הקיצור להפעלה או השבתה של הקלדת אמוג׳י"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
-#, fuzzy
-#| msgid "Custom font name for language panel"
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr "שם גופן בהתאמה אישית לחלונית גופן"
+msgstr "שם גופן בהתאמה אישית לתווי אמוג׳י בחלונית אמוג׳י"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
-msgstr ""
+msgstr "שפת בררת מחדל ליומן אמוג׳י"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -401,10 +401,8 @@ msgid "Other"
 msgstr "אחר"
 
 #: setup/emojilang.py:67
-#, fuzzy
-#| msgid "Select an input method"
 msgid "Select a language"
-msgstr "נא לבחור שיטת קלט"
+msgstr "נא לבחור שפה"
 
 #: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
 #: setup/main.py:560
@@ -419,11 +417,11 @@ msgstr ""
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "על אודות"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_סגירה"
 
@@ -460,10 +458,6 @@ msgstr "הו_ספה"
 msgid "Input Method"
 msgstr "שיטת קלט"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "העדפות IBus"
@@ -728,10 +722,8 @@ msgid "Emoji annotation:"
 msgstr ""
 
 #: setup/setup.ui:927
-#, fuzzy
-#| msgid "The shortcut keys for turning input method on or off"
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "מקשי הקיצור להפעלה או השבתה של שיטת קלט"
+msgstr "מקשי הקיצור להפעלת המרת נקודות קוד של יוניקוד"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
@@ -742,10 +734,8 @@ msgid "Set a font of Unicode candidates on the emoji dialog"
 msgstr ""
 
 #: setup/setup.ui:1015
-#, fuzzy
-#| msgid "Use custom font:"
 msgid "Unicode font:"
-msgstr "להשתמש בגופן בהתאמה אישית:"
+msgstr "גופן יוניקוד:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -791,33 +781,19 @@ msgstr "<b>פריסת מקלדת</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>הגדרות גלובליות לשיטות קלט</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "מתקדם"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>אפיק הקלט החכם</small>\n"
-"דף הבית: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "להפעיל את ibus עם הכניסה למערכת"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>גופנים</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>התחלה</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "מתקדם"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -1955,10 +1931,8 @@ msgstr ""
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
-#, fuzzy
-#| msgid "Vertical"
 msgid "Vertical Forms"
-msgstr "אנכי"
+msgstr "צורות אנכיות"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2300,664 +2274,720 @@ msgstr ""
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
-msgid "Old Sogdian"
+msgid "Yezidi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
-msgid "Sogdian"
+msgid "Old Sogdian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
-msgid "Elymaic"
+msgid "Sogdian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
-msgid "Brahmi"
+msgid "Chorasmian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
-msgid "Kaithi"
+msgid "Elymaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:873
-msgid "Sora Sompeng"
+msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:877
-msgid "Chakma"
+msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:881
-msgid "Mahajani"
+msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:885
-msgid "Sharada"
+msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:889
-msgid "Sinhala Archaic Numbers"
+msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:893
-msgid "Khojki"
+msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:897
-msgid "Multani"
+msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:901
-msgid "Khudawadi"
+msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:905
-msgid "Grantha"
+msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:909
-msgid "Newa"
+msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:913
-msgid "Tirhuta"
+msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:917
-msgid "Siddham"
+msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:921
-msgid "Modi"
+msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:925
-msgid "Mongolian Supplement"
+msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:929
-msgid "Takri"
+msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:933
-msgid "Ahom"
+msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
-msgid "Dogra"
+msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:941
-msgid "Warang Citi"
+msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
-msgid "Nandinagari"
+msgid "Dogra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
-msgid "Zanabazar Square"
+msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
-msgid "Soyombo"
+msgid "Dives Akuru"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:957
-msgid "Pau Cin Hau"
+msgid "Nandinagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:961
-msgid "Bhaiksuki"
+msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:965
-msgid "Marchen"
+msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
-msgid "Masaram Gondi"
+msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
-msgid "Gunjala Gondi"
+msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
-msgid "Makasar"
+msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
-msgid "Tamil Supplement"
+msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:985
-msgid "Cuneiform"
+msgid "Gunjala Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:989
-msgid "Cuneiform Numbers and Punctuation"
+msgid "Makasar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
-msgid "Early Dynastic Cuneiform"
+msgid "Lisu Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:997
-msgid "Egyptian Hieroglyphs"
+msgid "Tamil Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
-msgid "Egyptian Hieroglyph Format Controls"
+msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1005
-msgid "Anatolian Hieroglyphs"
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1009
-msgid "Bamum Supplement"
+msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1013
-msgid "Mro"
+msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1017
-msgid "Bassa Vah"
+msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1021
-msgid "Pahawh Hmong"
+msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
-msgid "Medefaidrin"
+msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1029
-msgid "Miao"
+msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1033
-msgid "Ideographic Symbols and Punctuation"
+msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1037
-msgid "Tangut"
+msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1041
-msgid "Tangut Components"
+msgid "Medefaidrin"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1045
-msgid "Kana Supplement"
+msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1049
-msgid "Kana Extended-A"
+msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
-msgid "Small Kana Extension"
+msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
-msgid "Nushu"
+msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
-msgid "Duployan"
+msgid "Khitan Small Script"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
-msgid "Shorthand Format Controls"
+msgid "Tangut Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
-msgid "Byzantine Musical Symbols"
+msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
-msgid "Musical Symbols"
+msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
-msgid "Ancient Greek Musical Notation"
+msgid "Small Kana Extension"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
-msgid "Mayan Numerals"
+msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1085
-msgid "Tai Xuan Jing Symbols"
+msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1089
-msgid "Counting Rod Numerals"
+msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1093
-msgid "Mathematical Alphanumeric Symbols"
+msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1097
-msgid "Sutton SignWriting"
+msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1101
-msgid "Glagolitic Supplement"
+msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
-msgid "Nyiakeng Puachue Hmong"
+msgid "Mayan Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
-msgid "Wancho"
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1113
-msgid "Mende Kikakui"
+msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
-msgid "Adlam"
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
-msgid "Indic Siyaq Numbers"
+msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
-msgid "Ottoman Siyaq Numbers"
+msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1129
-msgid "Arabic Mathematical Alphabetic Symbols"
+msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1133
-msgid "Mahjong Tiles"
+msgid "Wancho"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1137
-msgid "Domino Tiles"
+msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1141
-msgid "Playing Cards"
+msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1145
-msgid "Enclosed Alphanumeric Supplement"
+msgid "Indic Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1149
-msgid "Enclosed Ideographic Supplement"
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1153
-msgid "Miscellaneous Symbols and Pictographs"
+msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1157
-msgid "Emoticons"
+msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1161
-msgid "Ornamental Dingbats"
+msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1165
-msgid "Transport and Map Symbols"
+msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1169
-msgid "Alchemical Symbols"
+msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1173
-msgid "Geometric Shapes Extended"
+msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1177
-msgid "Supplemental Arrows-C"
+msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1181
-msgid "Supplemental Symbols and Pictographs"
+msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1185
-msgid "Chess Symbols"
+msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1189
-msgid "Symbols and Pictographs Extended-A"
+msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1193
-msgid "CJK Unified Ideographs Extension B"
+msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1197
-msgid "CJK Unified Ideographs Extension C"
+msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1201
-msgid "CJK Unified Ideographs Extension D"
+msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1205
-msgid "CJK Unified Ideographs Extension E"
+msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1209
-msgid "CJK Unified Ideographs Extension F"
+msgid "Chess Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1213
-msgid "CJK Compatibility Ideographs Supplement"
+msgid "Symbols and Pictographs Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
-msgid "Tags"
+msgid "Symbols for Legacy Computing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1221
-msgid "Variation Selectors Supplement"
+msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1225
-msgid "Supplementary Private Use Area-A"
+msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1229
+msgid "CJK Unified Ideographs Extension D"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1233
+msgid "CJK Unified Ideographs Extension E"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1237
+msgid "CJK Unified Ideographs Extension F"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1241
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
+msgid "Tags"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1253
+msgid "Variation Selectors Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1257
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
@@ -3011,14 +3041,16 @@ msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
 msgstr ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr ""
+msgstr "Resetting…"
 
 #: tools/main.vala:399
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #: tools/main.vala:444
 msgid "Set or get engine"
@@ -3057,18 +3089,16 @@ msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print the D-Bus address of ibus-daemon"
 
 #: tools/main.vala:453
-#, fuzzy
-#| msgid "Show this information"
 msgid "Show the configuration values"
-msgstr "Show this information"
+msgstr "Show the configuration values"
 
 #: tools/main.vala:454
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Reset the configuration values"
 
 #: tools/main.vala:456
-msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgid "Save emoji on dialog to clipboard"
+msgstr "Save emoji on dialog to clipboard"
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3094,164 +3124,160 @@ msgstr "%s is unknown command!\n"
 
 #: ui/gtk3/emojier.vala:233
 msgid "Favorites"
-msgstr ""
+msgstr "מועדפים"
 
 #: ui/gtk3/emojier.vala:234
-#, fuzzy
-#| msgid "Other"
 msgid "Others"
-msgstr "אחר"
+msgstr "אחרים"
 
 #: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1111
-#, fuzzy
-#| msgid "_Close"
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
-msgstr "_סגירה"
+msgstr "סגירה"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr ""
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr ""
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr ""
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "לוח IBus"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus היא אפיק קלט חכם ללינוקס/יוניקס."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr "Yaron Shahrabani <sh.yaron@gmail.com>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "הפעלה מחדש"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "יציאה"
 
@@ -3261,6 +3287,27 @@ msgstr "יציאה"
 msgid "default:LTR"
 msgstr "default:RTL"
 
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>אפיק הקלט החכם</small>\n"
+#~ "דף הבית: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "להפעיל את ibus עם הכניסה למערכת"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>התחלה</b>"
+
 #~ 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"

From 8a40f5c9f195f3cb4a37c2c92e1f2c6481d461c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Mon, 14 Sep 2020 19:13:03 +0900
Subject: [PATCH 682/816] po: Update translation (Turkish)

Update po/tr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/tr/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/tr.po | 442 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 259 insertions(+), 183 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 5c979db84..ba6d63526 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-04-21 19:40+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-07 13:29+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: Turkish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/tr/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Weblate 4.0.1\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -286,7 +286,7 @@ msgid "Use custom font name for language panel"
 msgstr "Dil paneli için özel yazı tipi ismi kullan"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Özel yazı tipi"
 
@@ -294,31 +294,46 @@ msgstr "Özel yazı tipi"
 msgid "Custom font name for language panel"
 msgstr "Dil paneli için özel yazı tipi ismi"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Aday penceresinde glifleri giriş yönteminin dilinde seçin"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Bazı karakter kodlarının farklı glifleri vardır ve Pango glifleri dil "
+"özelliğinden belirlemektedir. Pango, bu değer doğruysa IBus motorunun "
+"dilinden, yanlışsa masaüstü yerel ayarından glifleri seçer."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse için Unicode kısayol tuşları"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Unicode yazmayı açmak veya kapatmak için kısayol tuşları"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse için emoji kısayol tuşları"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Emoji yazmayı açmak veya kapatmak için kısayol tuşları"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Emoji iletişim kutusundaki emoji karakterleri için özel yazı tipi adı"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Emoji sözlüğü için öntanımlı dil"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -326,11 +341,11 @@ msgstr ""
 "Emoji iletişim kutusunda öntanımlı bir emoji sözlük dili seçin. $lang "
 "değeri /usr/share/ibus/dicts/emoji-$lang.dict ögesine uygulanır."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "emoji iletişim kutusundaki favori emoji listesi"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -338,19 +353,19 @@ msgstr ""
 "Bu listede herhangi bir karakter varsa, favori emojileri emoji listesinde "
 "gösterebilirsiniz."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "emoji iletişim kutusundaki favori emoji ek açıklama listesi"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Bu listeden favori bir emoji için bir açıklama atayabilirsiniz."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Emoji ek açıklamalarının kısmen eşleşip eşleşemeyeceği"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -358,11 +373,11 @@ msgstr ""
 "Emoji ek açıklamalarının tam eşleme yerine kısmi bir dizge ile eşleşip "
 "eşleşemeyeceği."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Belirtilen uzunluktaki emoji ek açıklamalarıyla eşleştir"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -370,11 +385,11 @@ msgstr ""
 "Emoji ek açıklamalarını, tam eşleşme yerine belirtilen sayıda karakterden "
 "fazlasıyla kısmen eşleştir."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Emoji ek açıklamalarını kısmen eşleştirmek için bir koşul seçin"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -382,11 +397,11 @@ msgstr ""
 "Emoji ek açıklamalarını kısmen eşleştirmek için aşağıdaki koşullardan birini "
 "seçin: 0 == Önek eşlemesi, 1 == Sonek eşleşmesi, 2 == İçerilen eşleşme"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Emoji verilerini başlatma anında yükle"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -396,11 +411,11 @@ msgstr ""
 "için yaklaşık 10 MB bellek gerekmektedir. Yanlışsa, emoji verilerini "
 "başlangıçta emoji iletişim kutusunu açarken yükle."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Unicode verilerini başlatma anında yükle"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -441,11 +456,11 @@ msgstr "_Tamam"
 msgid "More…"
 msgstr "Daha fazla…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Hakkında"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Kapat"
 
@@ -482,10 +497,6 @@ msgstr "_Ekle"
 msgid "Input Method"
 msgstr "Giriş Yöntemi"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus Tercihleri"
@@ -681,7 +692,7 @@ msgstr "Özel yazı tipi kullan:"
 
 #: setup/setup.ui:562 setup/setup.ui:1156
 msgid "<b>Font and Style</b>"
-msgstr "<b>Yazı Tipi ve Stili</b>"
+msgstr "<b>Yazı Tipi ve Stil</b>"
 
 #: setup/setup.ui:579
 msgid "General"
@@ -816,33 +827,21 @@ msgstr "<b>Klavye Düzeni</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Global giriş yöntemi ayarları</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Akıllı giriş veri yolu</small>\n"
-"Ana sayfa: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Yinelenen karakter kodları için aday penceresinde glifleri giriş yönteminin "
+"dilinde seçin"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Girişte ibus'ı başlat"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Yazı Tipleri</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Başlangıç</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Gelişmiş"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2323,664 +2322,720 @@ msgstr "Rumi Sayısal Semboller"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Yezidi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Eski Soğd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Soğd"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "Harezmce"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Elam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Sinhala Arkaik Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Moğol İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Dives Akuru"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Zanabazar Kare"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Lisu İlave"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Tamil İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Çivi Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Çivi Yazısı Sayılar ve Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Erken Hanedan Çivi Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Mısır Hiyeroglifleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Mısır Hiyeroglif Biçim Denetimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Anadolu Hiyeroglifleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Bamum İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "İdeografik Semboller ve Noktalama İşaretleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Tangut Bileşenler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Küçük Hitay Alfabesi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Tangut İlave"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Kana İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Kana Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Küçük Kana Uzantı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Steno Biçim Denetimleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Bizans Müzik Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Müzik Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Antik Yunan Müzik Notaları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Maya Rakamları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Sayma Çubuğu Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematiksel Alfanumerik Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Sutton İşaret Yazısı"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Glagolitik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Hint Siyaq Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Osmanlı Siyaq Sayıları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arapça Matematiksel Alfabetik Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Mahjong Taşları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Domino Taşları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "İskambil Kağıtları"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Kapalı Alfanumerik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Kapalı İdeografik İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Çeşitli Semboller ve Piktograflar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "İfadeler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Süsleme Dingbat'leri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Ulaşım ve Harita Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Simya Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Geometrik Şekiller Genişletilmiş"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "İlave Oklar-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "İlave Semboller ve Piktograflar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Satranç Sembolleri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Semboller ve Piktograflar Genişletilmiş-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Eski Bilgisayarlar için Semboller"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK Birleşik İdeograflar Uzantı B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK Birleşik İdeograflar Uzantı C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK Birleşik İdeograflar Uzantı D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK Birleşik İdeograflar Uzantı E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK Birleşik İdeograflar Uzantı F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK Uyumluluk İdeografları İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "CJK Birleşik İdeograflar Uzantı G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Etiketler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Varyasyon Seçiciler İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "İlave Özel Kullanım Alanı-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "İlave Özel Kullanım Alanı-B"
 
@@ -3127,81 +3182,81 @@ msgstr "Diğer"
 msgid "Open Unicode choice"
 msgstr "Unicode seçimini aç"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Emoji seçimini geri getir"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Sayfa Aşağı"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Sayfa Yukarı"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Emoji çeşitlerini göster"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Kapat"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menü"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Bir uyarı mesajı görmek için tıklayın"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode sözlük yükleme:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Kod noktası: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Emoji çeşitleri var"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Açıklama: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Ek açıklamalar: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "İsim: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Takma ad: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Emoji Seçimi"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Unicode Seçimi"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3211,71 +3266,71 @@ msgstr ""
 "Örn. emoji yazma modunu bırakmak için Esc tuşuna birkaç kez basın, "
 "masaüstünüze ve metin uygulamanıza tekrar tıklayın."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Bir emoji seçmek için iptal edildi."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Bir emoji panonuza kopyalandı."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "Emoji iletişim kutusundaki emoji karakterleri için \"YAZI TİPİ\""
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "YAZI TİPİ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "Emoji iletişim kutusundaki ek açıklamalar için \"DİL\". Örn. \"tr\""
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "DİL"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji ek açıklamaları kısmen eşleşebilir"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Belirtilen tamsayı uzunluğuyla eşleştir"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Belirtilen tamsayı koşuluyla eşleştir"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus Paneli"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus, Linux/Unix için akıllı bir giriş veri yoludur."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr ""
 "Serdar Sağlam <teknomobil@yandex.com>\n"
 "Oğuz Ersen <oguzersen@protonmail.com>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Yeniden başlat"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Çık"
 
@@ -3284,3 +3339,24 @@ msgstr "Çık"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "öntanımlı olarak:LTR (soldan sağa)"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Akıllı giriş veri yolu</small>\n"
+#~ "Ana sayfa: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Girişte ibus'ı başlat"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Başlangıç</b>"

From cd063958873b151e5f125da67eca20ed2d4abf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= <goeran@uddeborg.se>
Date: Mon, 14 Sep 2020 19:16:15 +0900
Subject: [PATCH 683/816] po: Update translation (Swedish)

Update po/sv.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/sv/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/sv.po | 485 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 280 insertions(+), 205 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 61c43cdd2..ff44c2008 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,19 +4,19 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata
+# Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata
+# Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata
+# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020.
 # Allan Nordhøy <epost@anotheragency.no>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-05-24 12:40+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-08 15:29+0000\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/sv/>\n"
 "Language: sv\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0.4\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -55,7 +55,7 @@ msgid ""
 "show the window and switch prev/next engines."
 msgstr ""
 "Ange fördröjningen i millisekunder för att visa pop-up-fönstret för IME-"
-"byte.  Standard är 400.  0 = Visa fönstret omedelbart. 0 < Vänta "
+"byte. Standard är 400. 0 = Visa fönstret omedelbart. 0 < Vänta "
 "millisekunder. 0 > Visa inte fönstret och byt till föregående/nästa maskin."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
@@ -187,8 +187,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"Beteendet hos egenskapspanelen.  0 = Visa inte, 1 = Dölj automatiskt 2 = "
-"Visa alltid"
+"Beteendet hos egenskapspanelen. 0 = Visa inte, 1 = Dölj automatiskt 2 = Visa "
+"alltid"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -204,8 +204,8 @@ msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"Om sant följer panelen inmatningsmarkören i fallet när panelen alltid "
-"visas.  Om falskt visas panelen på en bestämd plats."
+"Om sant följer panelen inmatningsmarkören i fallet när panelen alltid visas. "
+"Om falskt visas panelen på en bestämd plats."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
@@ -225,8 +225,7 @@ msgstr "Orienteringen på uppslagningstabellen"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-"Orienteringen på uppslagningstabellen.  0 = horisontellt, 1 = vertikalt"
+msgstr "Orienteringen på uppslagningstabellen. 0 = horisontellt, 1 = vertikalt"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:140
 #: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
@@ -256,7 +255,7 @@ msgid ""
 "percentage values in the range 0% to 100%, and 'a' is a floating point value "
 "in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB-ikonen visar layout-strängen och strängen visas med RGBA-värdet.  RGBA-"
+"XKB-ikonen visar layout-strängen och strängen visas med RGBA-värdet. RGBA-"
 "värdet kan vara 1. ett färgnamn från X11, 2. ett hexadecimalt värde på "
 "formen ”#rrggbb” där ”r”, ”g” och ”b” är hexadecimala siffror för rött, "
 "grönt och blått, 3. en RGB-färg på formen ”rgb(r,g,b)” eller 4. en RGBA-färg "
@@ -277,7 +276,7 @@ msgid ""
 msgstr ""
 "Antalet millisekunder att visa panelikonen från maskinikonen för en "
 "egenskapsikon när maskinen byts om egenskapen anges av värdet på icon-prop-"
-"key i IBusEngineDesc.  Om värdet är 0, ingen fördröjning och egenskapsikonen "
+"key i IBusEngineDesc. Om värdet är 0, ingen fördröjning och egenskapsikonen "
 "visas omedelbart."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
@@ -289,7 +288,7 @@ msgid "Use custom font name for language panel"
 msgstr "Använd det anpassade typsnittsnamnet till språkpanelen"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Anpassat typsnitt"
 
@@ -297,43 +296,58 @@ msgstr "Anpassat typsnitt"
 msgid "Custom font name for language panel"
 msgstr "Anpassat typsnittsnamn till språkpanelen"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "Välj glyfer med inmatningsmetodens språk på kandidatfönstret"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Några kodpunkter har andra glyfer och Pango väljer glyfen från "
+"språkattributet. Pango väljer glyfer från IBus-motorns språk om värdet är "
+"sant och väljer dem från skrivbordslokalen om värdet är falskt."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode-kortkommandon för gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Kortkommandot för att slå på och av Unicode-inmatning"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-kortkommando för gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Kortkommandot för att slå på och av emoji-inmatning"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Anpassat typsnitt för emoji-tecken i emoji-dialogen"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Standardspråk för emoji-ordlista"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
-"Välj ett standardspråk med emoji-ordlistor i emoji-dialogen.  Värdet $lang "
+"Välj ett standardspråk med emoji-ordlistor i emoji-dialogen. Värdet $lang "
 "används i /usr/share/ibus/dicts/emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "favorit-emoji-lista i emoji-dialogen"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -341,19 +355,19 @@ msgstr ""
 "Du kan visa favorit-emoji:erna i emoji-listan om denna lista har några "
 "tecken."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit-emoji-annoteringslista i emoji-dialogen"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tilldela en annotering för en favorit-emoji i denna lista."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Huruvida emoji-annotationer kan matchas partiellt eller inte"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -361,11 +375,11 @@ msgstr ""
 "Huruvida emoji-annotationer kan matchas med en partiell sträng istället för "
 "den exakta matchningen eller inte."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Matcha emoji-annotationer med den angivna längden"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -373,11 +387,11 @@ msgstr ""
 "Matcha emoji-annotationer partiellt med mer än det angivna antalet tecken "
 "istället för den exakta matchningen."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Välj ett villkor för att matcha emoji-annotationer partiellt"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -385,34 +399,34 @@ msgstr ""
 "Välj en av följande villkor för att matcha emoji-annotationer partiellt: 0 "
 "== prefixmatchning, 1 == suffixmatchning, 2 == innehållsmatchning"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Läs in emoji-data vid uppstartstillfället"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"Läs in emoji-data vid uppstartstillfället om sant.  Ungefär 10 MB minne "
-"behövs för att läsa in datan.  Läs emoji-datan när emoji-dialogen öppnas i "
+"Läs in emoji-data vid uppstartstillfället om sant. Ungefär 10 MB minne "
+"behövs för att läsa in datan. Läs emoji-datan när emoji-dialogen öppnas i "
 "början om falskt."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Läs in Unicode-data vid uppstartstillfället"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"Läs in Unicode-data vid uppstartstillfället om sant.  Ungefär 15 MB minne "
-"behövs för att läsa in datan.  Läs Unicode-datan när emoji-dialogen öppnas i "
-"början om falskt.  Unicode-datan läses alltid in efter emoji-datan läses in "
+"Läs in Unicode-data vid uppstartstillfället om sant. Ungefär 15 MB minne "
+"behövs för att läsa in datan. Läs Unicode-datan när emoji-dialogen öppnas i "
+"början om falskt. Unicode-datan läses alltid in efter emoji-datan läses in "
 "även om sant."
 
 #: ibus/_config.py.in:41
@@ -444,11 +458,11 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Mer …"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Om"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Stäng"
 
@@ -485,10 +499,6 @@ msgstr "_Lägg till"
 msgid "Input Method"
 msgstr "Inmatningsmetod"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus-inställningar"
@@ -823,33 +833,21 @@ msgstr "<b>Tangentbordslayout</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Inställningar för global inmatningsmetod</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligenta inmatningsbussen</small>\n"
-"Hemsida: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Välj glyfer med inmatningsmetodens språk på kandidatfönstret för de "
+"dubblerade kodpunkterna"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Starta ibus vid inloggning"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Typsnitt</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Uppstart</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -1008,7 +1006,7 @@ msgstr "Thaana"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr "NKo"
+msgstr "N'Ko"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2330,664 +2328,720 @@ msgstr "Numeriska Rumi-symboler"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Ezdiki"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Gammalsogdiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "Khwarezmiska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Elymaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Singalesiska arkaiska nummer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojkiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Sindhiska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Mongoliska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Dhives Akuruiska"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Zanabazar-kvadratskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gunjala Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Makassariska"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Lisu-tillägg"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Tillägg för tamil"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Kilskrift-tal och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Tidig dynastisk kilskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Egyptiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Formatstyrning för egyptiska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatoliska hieroglyfer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Bamum-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mru"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassaiska vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahaw mong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografiska symboler och skiljetecken"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Khitansk liten skrift"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Tangut-tillägg"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Kana-tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Utökad Kana-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Utökning för små kanasymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Formateringskontroll för Stenografi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Bysantinska musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Musiksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Gammalgrekisk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Mayasiffror"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Talstav"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematiska alfanumeriska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Suttons teckningsskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Glagolitiska tillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Indiska siyaq-siffror"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Ottomanska siyaq-siffror"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabiska matematiska alfabetiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Mahjong-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Domino-brickor"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Spelkort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Inneslutna alfanumeriska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Inneslutna ideografiska utökningar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symboler och piktogram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Humörsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Dekorativa Dingbats"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Transport- och kartsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Alkemiska symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Utökade geometriska former"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Piltillägg-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Symbol- och piktogramtillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Schacksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Symboler och piktogram tillägg-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Symboler för föråldrade databeräkningar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Enhetliga CJK-ideograftillägg B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Enhetliga CJK-ideograftillägg C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Enhetliga CJK-ideograftillägg D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Enhetliga CJK-ideograftillägg E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Enhetliga CJK-ideograftillägg F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK-kompatibilitetideografstillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "Enhetliga CJK-ideograftillägg G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Taggar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Variationsväljartillägg"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Tillägg till privat användningsområde-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Tillägg till privat användningsområde-B"
 
@@ -3134,154 +3188,154 @@ msgstr "Annat"
 msgid "Open Unicode choice"
 msgstr "Öppna Unicode-val"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Ta tillbaks emoji-val"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Bläddra ned"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Bläddra upp"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Visa emoji-varianter"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Stäng"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Meny"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Klicka för att visa ett varningsmeddelande"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
-msgstr "Laddar en Unicode-ordbok"
+msgstr "Laddar en Unicode-ordbok:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodpunkt: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Ingen"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotationer: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Unicode-val"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
-"Misslyckades att få det aktuella textprogrammet.  Fokusera om ditt program.  "
+"Misslyckades att få det aktuella textprogrammet. Fokusera om ditt program. "
 "T.ex. tryck Esc-tangenten flera gånger för att släppa emoji-"
 "inskrivningsläget, klicka på ditt skrivbord och klicka på ditt textprogram "
 "igen."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Avbröt att välja en emoji."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierade en emoji till ditt urklipp."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "”TYPSNITT” för emoji-tecken i emoji-dialogen"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "TYPSNITT"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "”SPRÅK” för annotationer i emoji-dialogen.  T.ex. ”sv”"
+msgstr "”SPRÅK” för annotationer i emoji-dialogen. T.ex. ”sv”"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "SPRÅK"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annotationer kan matcha partiellt"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Matcha med längden på det angivna heltalet"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Matcha med villkoret för det angivna heltalet"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Starta om"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3290,3 +3344,24 @@ msgstr "Avsluta"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Den intelligenta inmatningsbussen</small>\n"
+#~ "Hemsida: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Starta ibus vid inloggning"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Uppstart</b>"

From 38a729589f1ca636d12a39422cffbcc1386636de Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Mon, 14 Sep 2020 19:19:05 +0900
Subject: [PATCH 684/816] po: Update translation (Danish)

Update po/da.po at 98.0%
https://translate.fedoraproject.org/projects/ibus/ibus/da/

BUG=https://github.com/ibus/ibus/pull/2253
---
 po/da.po | 441 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 259 insertions(+), 182 deletions(-)

diff --git a/po/da.po b/po/da.po
index b2a3bcf8e..37cbe617f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-07-21 19:28+0000\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-14 09:14+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/da/>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -288,7 +288,7 @@ msgid "Use custom font name for language panel"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Tilpasset skrifttype"
 
@@ -296,31 +296,43 @@ msgstr "Tilpasset skrifttype"
 msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Unicode-genvejstaster til gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "Genvejstasterne til at slå Unicode-skrivning til eller fra"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Emoji-genvejstaster for gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Genvejstasterne til at slå emoji-indtastning til eller fra"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "Tilpasset skrifttypenavn for emoji-tegn i emoji-dialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Standardsprog for emojiordbog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -328,30 +340,30 @@ msgstr ""
 "Vælg et standardsprog af emoji-ordbøger i emoji-dialogen. Værdien $lang "
 "anvendes på /usr/share/ibus/dicts/emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "favorit emojiliste i emoji-dialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 "Du kan vise favorit emojierne i emojiliste hvis denne liste har nogen tegn."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "favorit emoji-annonteringsliste i emoji-dialog"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "Du kan tildele en annotering til en favorit-emoji i denne liste."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "Hvorvidt emoji-annonteringer kan matches delvist eller ej"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -359,11 +371,11 @@ msgstr ""
 "Hvorvidt emoji-annoteringer kan matches med en delvis streng i stedet for "
 "det præcise match eller ej."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Match emoji-annoteringer med den angivne længde"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -371,11 +383,11 @@ msgstr ""
 "Match emoji-annoteringer delvist med flere end det angivne antal tegn i "
 "stedet for det præcise match."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "Vælg en betingelse til delvist at matche emoji-annonteringer"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -383,11 +395,11 @@ msgstr ""
 "Vælg en af følgende betingelser for at matche emoji-annoteringer delvist: 0 "
 "== Præfiks match, 1 == Suffiks match, 2 == Indeholdende match"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Indlæs emoji-dataene ved opstart"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -397,11 +409,11 @@ msgstr ""
 "hukommelse for at indlæse dataene. Indlæs emoji-dataene når emoji-dialogen "
 "åbnes ved begyndelsen hvis falsk."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Indlæs unicode-dataene ved opstart"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -442,11 +454,11 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Mere…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "Om"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Luk"
 
@@ -483,10 +495,6 @@ msgstr "_Tilføj"
 msgid "Input Method"
 msgstr "Indtastningsmetode"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus-præferencer"
@@ -824,33 +832,21 @@ msgstr "<b>Tastaturlayout</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Indstillinger for global indtastningsmetode</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Den intelligente indtastningsbus</small>\n"
-"Hjemmeside: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Start ibus ved login"
+#: setup/setup.ui:1327
+#, fuzzy
+#| msgid "<b>Font and Style</b>"
+msgid "<b>Fonts</b>"
+msgstr "<b>Skrifttype og stil</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Opstart</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Avanceret"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2331,664 +2327,724 @@ msgstr "Rumi numeriske symboler"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Oldsogdian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Elym"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Bramisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaithi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Sinhala-arkaiske tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Mongolsk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogra"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nand"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Zanabazar kvadratisk"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gunjala gondi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Makasar"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+#, fuzzy
+#| msgid "Latin-1 Supplement"
+msgid "Lisu Supplement"
+msgstr "Latin-1 supplement"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Tamilsk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Kileskriftstal og -tegnsætning"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Tidlig dynastisk kileskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Ægyptiske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Ægyptiske hieroglyffer formatteringskontroltegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Anatoliske hieroglyffer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Bamum-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medefaidrin"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ideografiske symboler og tegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangut"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Tangut-komponenter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+#, fuzzy
+#| msgid "Kana Supplement"
+msgid "Tangut Supplement"
+msgstr "Kana-supplement"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Kana-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Kana udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Små kana udvidelse"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Forkortede formatteringskontroltegn"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Byzantiske musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Musiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Oldgræsk musiknotation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Maya talsystem"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Tai Xuan Jing-symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Kinesisk stregtalsystem"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Matematiske alfanumeriske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "Sutton tegnsprogskrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Glagolitisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wancho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Indisk siyaq tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Ottomanske siyaq tal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Arabiske matematiske alfabetiske symboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Mahjong-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Domino-brikker"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Spillekort"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Indrammet alfanumerisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Indrammet ideografisk supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Diverse symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Emotikoner"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Pyntedingbatter"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Transport- og kortsymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Alkymisymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Geometriske former udvidet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Ekstra pile-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Supplerende symboler og piktogrammer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Skaksymboler"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Symboler og piktogrammer udvidet-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Forenede CJK-ideografer, udvidelse B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Forenede CJK-ideografer, udvidelse C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Forenede CJK-ideografer, udvidelse D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Forenede CJK-ideografer, udvidelse E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK-forenede ideografer-udvidelse F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Supplerende CJK-kompatibilitetsideografer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "CJK-forenede ideografer-udvidelse G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Mærkater"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Variationsvælgere-supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Ekstra privat brug-område-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Ekstra privat brug-område-B"
 
@@ -3135,81 +3191,81 @@ msgstr "Andre"
 msgid "Open Unicode choice"
 msgstr "Åbn valg af unicode"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Tilbage til valg af emoji"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Page Down"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Page Up"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Vis emoji-varianter"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Luk"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Klik for at vise en advarselsmeddelelse"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Indlæser en unicode-ordbog:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Kodepunkt: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "Har emoji-varianter"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Ingen"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annoteringer: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "Valg af emoji"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Valg af unicode"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3220,57 +3276,57 @@ msgstr ""
 "emoji-indtastningstilstanden, klik på dit skrivebord og klik på "
 "tekstprogrammet igen."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Annulleret for at vælge en emoji."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Kopierede en emoji til dit skrivebord."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"SKRIFTTYPE\" for emoji-tegn i emoji-dialog"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "SKRIFTTYPE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"SPROG\" for annoteringer i emoji-dialog. F.eks. \"en\""
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "SPROG"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Emoji-annoteringer kan matches delvist"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Match med længen af det angive heltal"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Match med betingelsen af det angive heltal"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent indtastningsbus til Linux/Unix."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
@@ -3280,15 +3336,15 @@ msgstr ""
 "Websted http://dansk-gruppen.dk\n"
 "E-mail <dansk@dansk-gruppen.dk>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "Genstart"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "Afslut"
 
@@ -3297,3 +3353,24 @@ msgstr "Afslut"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Den intelligente indtastningsbus</small>\n"
+#~ "Hjemmeside: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Start ibus ved login"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Opstart</b>"

From 920fa490b349fa26d525fd1263a11b18e7daa5d7 Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Fri, 18 Sep 2020 17:11:23 +0900
Subject: [PATCH 685/816] po: Update translation (Korean)

BUG=https://github.com/ibus/ibus/pull/2198
---
 po/ko.po | 676 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 396 insertions(+), 280 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 0495c25e0..ebffbcf89 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -17,19 +17,19 @@
 # Young-Ho, Cha <ganadist at mizi.com>, 2003-2006. (gucharmap)
 # Changwoo Ryu <cwryu@debian.org>, 2007-2015. (gucharmap)
 # DaeHyun Sung <sungdh86@gmail.com>, 2016-2019. (gucharmap)
-# Changwoo Ryu <cwryu@debian.org>, 2019.
+# Changwoo Ryu <cwryu@debian.org>, 2019-2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2019-10-24 19:18+0900\n"
+"POT-Creation-Date: 2020-09-03 21:21+0900\n"
+"PO-Revision-Date: 2020-09-16 08:13+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-10-24 10:31+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
@@ -41,7 +41,7 @@ msgstr "엔진 미리로드"
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "ibus 시작 시 엔진 미리 로드"
+msgstr "ibus 시작할 때 엔진을 미리 읽어들입니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
@@ -53,16 +53,17 @@ msgstr "입력 방식 목록에 저장된 엔진 순서"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME 스위치 창의 팝업 밀리초 단위의 지연"
+msgstr "IME 전환 창의 팝업 지연 시간, 밀리초 단위"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 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."
+"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보다 작으면 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
+"IME 전환 창을 표시할 때 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. "
+"0 = 창을 즉시 표시합니다. 0보다 크면 밀리초 단위로 지연합니다. 0보다 작으면 "
+"창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -72,15 +73,19 @@ msgstr "저장된 버전 번호"
 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 입력기와 현재 버저ibus 버전을 비교"
+"하는 데 사용됩니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
-msgstr "ASCII가 없는 라틴어 레이아웃"
+msgstr "ASCII가 없는 라틴 문자 키보드 배치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr "US 레이아웃이 라틴어 레인아웃에 추가되었습니다. 변형된 것은 생략될 수 있습니다."
+msgstr ""
+"US 키보드 배치가 라틴 문자 키보드 배치에 추가되었습니다. 변형 버전은 생략될 "
+"수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -89,15 +94,16 @@ msgstr "xmodmap 사용"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:38
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
-msgstr "ibus 엔진을 전환할 때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행합니다."
+msgstr ""
+"ibus 엔진을 전환할 때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행합니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
-msgstr "시스템 키보드 레이아웃 사용"
+msgstr "시스템 키보드 배치 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
 msgid "Use system keyboard (XKB) layout"
-msgstr "시스템 키보드 (XKB) 레이아웃 사용"
+msgstr "시스템 키보드 배치 (XKB) 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:47
 msgid "Embed Preedit Text"
@@ -109,7 +115,7 @@ msgstr "응용 프로그램 창에 프리에디트 텍스트를 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
-msgstr "전역 입력 방식 사용"
+msgstr "전체 공통 입력 방식 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
 msgid "Share the same input method among all applications"
@@ -117,11 +123,11 @@ msgstr "모든 응용 프로그램에서 동일한 입력 방식 공유"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:57
 msgid "Enable input method by default"
-msgstr "입력기를 디폴트로 활성화"
+msgstr "입력기를 기본값으로 활성화"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
-msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
+msgstr "프로그램의 입력창에 포커스가 가면 기본값으로 입력기를 활성화합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -203,17 +209,21 @@ msgstr "패널을 항상 표시할 경우 입력 커서를 따라감"
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
-msgstr "참이면, 패널을 항상 표시할 때 패널이 입력 커서를 따라갑니다. 거짓이면, 고정된 위치에서 패널이 나타납니다."
+msgstr ""
+"참이면, 패널을 항상 표시할 때 패널이 입력 커서를 따라갑니다. 거짓이면, 고정"
+"된 위치에서 패널이 나타납니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
-msgstr "속성 패널을 표시할 밀리세컨드 단위 시간"
+msgstr "속성 패널을 표시할 시간, 밀리초 단위"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "포커스 인 상태 또는 속성 값을 바꾸었을 경우 속성 패널을 표시할 밀리세컨드 단위 시간입니다."
+msgstr ""
+"포커스를 받은 다음, 또는 속성 값을 바꾸었을 때 속성 패널을 표시할 밀리초 단"
+"위 시간입니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
@@ -227,15 +237,15 @@ msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
 #: setup/setup.ui:475
 msgid "Show icon on system tray"
-msgstr "시스템 트레이에 아이콘 보여주기"
+msgstr "시스템 트레이에 아이콘 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
-msgstr "입력 방식 이름 보여주기"
+msgstr "입력 방식 이름 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 msgid "Show input method name on language bar"
-msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
+msgstr "언어 도구 모음에 입력 방식 이름 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
@@ -246,15 +256,17 @@ msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
 "form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or percentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' "
-"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 "
-"0부터 255까지의 값 또는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
-"여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
+"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. "
+"X11의 색상 이름, 2. 'r' 'g' 'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 "
+"'#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0부터 255까지의 값 또"
+"는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또"
+"는, 4. 여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값"
+"이 될 수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
@@ -267,8 +279,9 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
-"엔진을 전환할 때 IBusEngineDesc에서 icon-prop-key 값을 통해 속성이 지정되었을 때, 패널 아이콘을 엔진 아이콘에서 "
-"속성 아이콘으로 표시하는 시간 (밀리초 단위). 이 값이 0이면 지연 시간이 없고 속성 아이콘을 즉시 표시합니다."
+"엔진을 전환할 때 IBusEngineDesc에서 icon-prop-key 값을 통해 속성이 지정되었"
+"을 때, 패널 아이콘을 엔진 아이콘에서 속성 아이콘으로 표시하는 시간 (밀리초 단"
+"위). 이 값이 0이면 지연 시간이 없고 속성 아이콘을 즉시 표시합니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
@@ -279,120 +292,143 @@ msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "언어 패널 용 사용자 정의 글꼴 이름"
+msgstr "언어 패널에 사용할 사용자 정의 글꼴 이름"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "후보 창에서 입력기의 언어에 따라 글리프 선택"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr "일부 코드 포인트는 여러 개의 글리프를 사용할 수 있어서 Pango에서 언어 속성에 따라 글리프를 결정합니다. 이 값이 참이면 Pango에서는 아이버스 엔진의 언어에 따라 글리프를 결정합니다. 이 값이 거짓이면 데스크톱 로캘에 따라 글리프를 결정합니다."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "유니코드 바로 가기 키, gtk_accelerator_parse 형식"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "입력 방식을 활성 또는 해제하는 바로 가기 키"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse에 사용할 에모지 바로 가기 키"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "에모지 입력을 켜거나 끄는 바로 가기 키"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr "에모지 대화창의 에모지 문자에 사용할 사용자 설정 글꼴 이름"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "에모지 사전에 사용할 기본값 언어"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
-"에모지 대화창의 에모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/share/ibus/dicts/emoji-$lang."
-"dict 사전을 사용합니다."
+"에모지 대화창의 에모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/"
+"share/ibus/dicts/emoji-$lang.dict 사전을 사용합니다."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "에모지 대화 창의 자주 사용하는 에모지 목록"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
-msgstr "이 목록에 문자가 들어 있으면 에모지 목록에서 자주 사용하는 에모지를 표시합니다."
+msgstr ""
+"이 목록에 문자가 들어 있으면 에모지 목록에서 자주 사용하는 에모지를 표시합니"
+"다."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "에모지 대화 창의 자주 사용하는 에모지 주석"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr "이 목록에 자주 사용하는 에모지의 주석을 저장할 수 있습니다."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr "에모지 주석을 일부분 일치할지 여부"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr "에모지 주석 전체가 일치할 경우가 아니더라도 문자열 일부분만 일치해도 찾을지 여부."
+msgstr ""
+"에모지 주석 전체가 일치할 경우가 아니더라도 문자열 일부분만 일치해도 찾을지 "
+"여부."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "지정한 길이의 에모지 주석 일치"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr "에모지 주석 전체가 일치할 경우가 아니더라도 지정한 개수의 문자보다 많이 일치하면 찾습니다."
+msgstr ""
+"에모지 주석 전체가 일치할 경우가 아니더라도 지정한 개수의 문자보다 많이 일치"
+"하면 찾습니다."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr "에모지 주석을 부분 일치하는 조건 선택"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
-msgstr "에모지 주석을 부분 일치하는 다음 조건 중의 하나를 고르십시오: 0 = 시작 일치, 1 == 끝 일치, 2 == 포함 일치"
+msgstr ""
+"에모지 주석을 부분 일치하는 다음 조건 중의 하나를 고르십시오: 0 = 시작 일치, "
+"1 == 끝 일치, 2 == 포함 일치"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "시작할 때 에모지 데이터 읽어들이기"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"참이면 시작할 때 에모지 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 10MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 "
-"처음 열 때 에모지 데이터를 읽어들입니다."
+"참이면 시작할 때 에모지 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 "
+"10MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 처음 열 때 에모지 데이터"
+"를 읽어들입니다."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "시작할 때 유니코드 데이터 읽어들이기"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"참이면 시작할 때 유니코드 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 15MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 "
-"처음 열 때 유니코드 데이터를 읽어들입니다. 참이더라도 에모지 데이터를 읽어들인 뒤에는 유니코드 데이터를 항상 읽어들입니다."
+"참이면 시작할 때 유니코드 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 "
+"15MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 처음 열 때 유니코드 데이"
+"터를 읽어들입니다. 참이더라도 에모지 데이터를 읽어들인 뒤에는 유니코드 데이터"
+"를 항상 읽어들입니다."
 
 #: ibus/_config.py.in:41
 msgid ""
@@ -423,11 +459,11 @@ msgstr "확인(_O)"
 msgid "More…"
 msgstr "더 보기…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
 msgstr "정보"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "닫기(_C)"
 
@@ -439,7 +475,7 @@ msgstr "언어: %s\n"
 #: setup/engineabout.py:75
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "키보드 레이아웃: %s\n"
+msgstr "키보드 배치: %s\n"
 
 #: setup/engineabout.py:78
 #, python-format
@@ -464,17 +500,13 @@ msgstr "추가(_A)"
 msgid "Input Method"
 msgstr "입력 방식"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
-msgstr "IBus 환경 설정"
+msgstr "IBus 기본 설정"
 
 #: setup/ibus-setup.desktop:4
 msgid "Set IBus Preferences"
-msgstr "IBus 환경 설정 변경"
+msgstr "IBus 기본 설정 변경"
 
 #: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
@@ -486,7 +518,7 @@ msgstr "키 코드:"
 
 #: setup/keyboardshortcut.py:82
 msgid "Modifiers:"
-msgstr "수정자:"
+msgstr "변경 키:"
 
 #. apply button
 #: setup/keyboardshortcut.py:130
@@ -502,7 +534,8 @@ msgstr "삭제(_D)"
 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:255
@@ -511,11 +544,11 @@ msgstr "키 또는 키 조합을 입력하십시오"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "이전 입력 방식으로 전환는 바로 가기 키에 shift를 누른 키 사용"
+msgstr "이전 입력 방식으로 전환는 바로 가기 키에 Shift를 누른 키 사용"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
+msgstr "IBus 데몬이 실행 중이 아닙니다. 시작하시겠습니까?"
 
 #: setup/main.py:536
 msgid ""
@@ -525,8 +558,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/.bashrc;에 추가하고 바탕 화면으로 다시 "
-"로그인합니다.\n"
+"IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/."
+"bashrc 파일에 추가하고, 데스크톱에 다시 로그인하십시오.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -540,12 +573,12 @@ msgstr "IBus 데몬이 %d초 내에 시작하지 못했습니다."
 #: setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "%s의 바로 가기 키를 선택"
+msgstr "%s의 바로 가기 키 선택"
 
 #. Translators: Title of the window
 #: setup/main.py:564
 msgid "switching input methods"
-msgstr "입력 방식 전환 중"
+msgstr "입력 방식 전환"
 
 #: setup/setup.ui:11
 msgid "Horizontal"
@@ -557,19 +590,19 @@ msgstr "세로"
 
 #: setup/setup.ui:25
 msgid "Top left corner"
-msgstr "왼쪽 위"
+msgstr "왼쪽 위 구석"
 
 #: setup/setup.ui:28
 msgid "Top right corner"
-msgstr "오른쪽 위"
+msgstr "오른쪽 위 구석"
 
 #: setup/setup.ui:31
 msgid "Bottom left corner"
-msgstr "왼쪽 아래"
+msgstr "왼쪽 아래 구석"
 
 #: setup/setup.ui:34
 msgid "Bottom right corner"
-msgstr "오른쪽 아래"
+msgstr "오른쪽 아래 구석"
 
 #: setup/setup.ui:37
 msgid "Custom"
@@ -577,7 +610,7 @@ msgstr "사용자 정의"
 
 #: setup/setup.ui:48
 msgid "Do not show"
-msgstr "보여주지 않음"
+msgstr "표시하지 않음"
 
 #: setup/setup.ui:51
 msgid "Hide automatically"
@@ -587,6 +620,7 @@ msgstr "자동으로 숨기기"
 msgid "Always"
 msgstr "항상"
 
+# tooltip
 #: setup/setup.ui:113
 msgid "The shortcut keys for switching to next input method in the list"
 msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 키"
@@ -595,6 +629,7 @@ msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 
 msgid "Next input method:"
 msgstr "다음 입력 방식:"
 
+# tooltip
 #: setup/setup.ui:127
 msgid "The shortcut keys for switching to previous input method in the list"
 msgstr "목록에 있는 이전 입력 방식으로 전환하는 바로 가기 키"
@@ -626,15 +661,16 @@ msgstr "<b>바로 가기 키</b>"
 
 #: setup/setup.ui:374
 msgid "Set the orientation of candidates in lookup table"
-msgstr "검색 테이블에서 후보 창의 방향 설정"
+msgstr "검색 테이블에서 후보 창의 방향을 설정합니다"
 
 #: setup/setup.ui:376
 msgid "Candidates orientation:"
 msgstr "후보 창의 방향:"
 
+# tooltip
 #: setup/setup.ui:407
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
+msgstr "ibus가 언어 모음을 표시하거나 숨기는 방식을 설정합니다"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
@@ -644,14 +680,16 @@ msgstr "속성 패널을 표시:"
 msgid "Language panel position:"
 msgstr "언어 패널 위치:"
 
+# tooltip
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "확인란을 선택하면 입력 방식의 이름을 입력 도구 모음에 표시"
+msgstr "확인란을 선택하면 입력 방식의 이름을 언어 모음에 표시합니다"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
 msgstr "응용 프로그램 창에 프리에디트 텍스트 포함"
 
+# tooltip
 #: setup/setup.ui:513
 msgid "Embed the preedit text of input method in the application window"
 msgstr "입력 방식의 프리에디트 텍스트를 어플레케이션 창에 포함시킵니다"
@@ -668,22 +706,25 @@ msgstr "<b>글꼴 및 스타일</b>"
 msgid "General"
 msgstr "일반"
 
+# tooltip
 #: setup/setup.ui:671
 msgid "Add the selected input method into the enabled input methods"
-msgstr "활성화된 입력 방식에 선택한 입력 방식을 추가합니다"
+msgstr "활성화된 입력 방식 목록에 선택한 입력 방식을 추가합니다"
 
 #: setup/setup.ui:682
 msgid "_Remove"
 msgstr "제거(_R)"
 
+# tooltip
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
+msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거합니다"
 
 #: setup/setup.ui:700
 msgid "_Up"
 msgstr "위로(_U)"
 
+# tooltip
 #: setup/setup.ui:707
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
@@ -692,6 +733,7 @@ msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위
 msgid "_Down"
 msgstr "아래로(_D)"
 
+# tooltip
 #: setup/setup.ui:725
 msgid "Move down the selected input method in the enabled input methods"
 msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
@@ -702,7 +744,7 @@ msgstr "정보(_A)"
 
 #: setup/setup.ui:743
 msgid "Show information of the selected input method"
-msgstr "선택한 입력 방식의 정보 보여주기"
+msgstr "선택한 입력 방식의 정보를 표시합니다"
 
 #: setup/setup.ui:754
 msgid "_Preferences"
@@ -710,7 +752,7 @@ msgstr "기본 설정(_P)"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
-msgstr "선택한 입력 방식 설정 보기"
+msgstr "선택한 입력 방식의 설정을 표시합니다"
 
 #: setup/setup.ui:812
 msgid ""
@@ -718,38 +760,41 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>활성화된 입력 방식 목록에서 키보드 바로 가기 키를 누르거나 패널 아이콘을 눌러 선택한 활성 입력 방식을 전환할 수 "
-"있습니다.</i></small>"
+"<small><i>위의 목록에서 선택한 후 키보드 바로 가기 키를 누르거나 패널 아이콘"
+"을 눌러 활성 입력 방식을 전환할 수 있습니다.</i></small>"
 
+# tooltip
 #: setup/setup.ui:873
 msgid ""
-"The shortcut keys to enable conversions of emoji annotations or Unicode "
-"names"
-msgstr "에모지 주석 또는 유니코드 이름을 변환하는 바로 가기 키 목록"
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr "에모지 주석 또는 유니코드 이름을 문자로 변환하는 바로 가기 키 목록"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
 msgstr "에모지 주석:"
 
+# tooltip
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "유니코드 코드 값 변환을 활성화하는 바로 가기 키"
+msgstr "유니코드 코드 값을 문자로 변환하는 바로 가기 키"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
 msgstr "유니코드 코드 값:"
 
+# tooltip
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "에모지 대화창의 유니코드 후보 글꼴을 설정"
+msgstr "에모지 대화창의 유니코드 후보 문자의 글꼴을 설정합니다"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
 msgstr "유니코드 글꼴:"
 
+# tooltip
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "에모지 대화창의 에모지 주석 언어를 설정"
+msgstr "에모지 대화창의 에모지 주석 언어를 설정합니다"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
@@ -785,39 +830,25 @@ msgstr "에모지"
 
 #: setup/setup.ui:1230
 msgid "<b>Keyboard Layout</b>"
-msgstr "<b>키보드 레이아웃</b>"
+msgstr "<b>키보드 배치</b>"
 
 #: setup/setup.ui:1278
 msgid "<b>Global input method settings</b>"
-msgstr "<b>전역 입력 방식 설정</b>"
+msgstr "<b>전체 공통 입력 방식 설정</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "고급"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>지능형 입력 버스</small>\n"
-"홈페이지: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
+msgstr "중복된 코드 포인트의 후보 창에서 입력기의 언어에 따라 글리프를 선택합니다"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "로그인 시 ibus 시작"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>글꼴</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>시작</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "고급"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -864,7 +895,7 @@ msgstr "여행 및 장소"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr "기본 라틴문자"
+msgstr "기본 라틴 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -878,14 +909,14 @@ msgstr "라틴-1 문자 추가영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr "라틴문자 확장영역 A"
+msgstr "라틴 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr "라틴문자 확장영역 B"
+msgstr "라틴 문자 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1723,7 +1754,7 @@ msgstr "이 문자 부수"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr "리수어"
+msgstr "리수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2312,27 +2343,41 @@ msgstr "루미 숫자 기호"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "야지디 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "고대 소그드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "소그드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "호라즘 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "엘리마이스 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "브라흐미 문자"
 
@@ -2340,7 +2385,7 @@ msgstr "브라흐미 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "카이시 문자"
 
@@ -2348,7 +2393,7 @@ msgstr "카이시 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "소라 솜펭 문자"
 
@@ -2356,7 +2401,7 @@ msgstr "소라 솜펭 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "차크마 문자"
 
@@ -2364,7 +2409,7 @@ msgstr "차크마 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "마하자니 문자"
 
@@ -2372,7 +2417,7 @@ msgstr "마하자니 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "샤라다 문자"
 
@@ -2380,7 +2425,7 @@ msgstr "샤라다 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "신할라 고대 숫자"
 
@@ -2388,7 +2433,7 @@ msgstr "신할라 고대 숫자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "코즈키 문자"
 
@@ -2396,7 +2441,7 @@ msgstr "코즈키 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "물타니 문자"
 
@@ -2404,7 +2449,7 @@ msgstr "물타니 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "쿠다와디 문자"
 
@@ -2412,7 +2457,7 @@ msgstr "쿠다와디 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "그랜사 문자"
 
@@ -2420,7 +2465,7 @@ msgstr "그랜사 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "네와 문자"
 
@@ -2428,7 +2473,7 @@ msgstr "네와 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "티르후타 문자"
 
@@ -2436,7 +2481,7 @@ msgstr "티르후타 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "시드햄 문자"
 
@@ -2444,14 +2489,14 @@ msgstr "시드햄 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "모디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "몽골 문자 추가영역"
 
@@ -2459,7 +2504,7 @@ msgstr "몽골 문자 추가영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "타크리 문자"
 
@@ -2467,7 +2512,7 @@ msgstr "타크리 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "아홈 문자"
 
@@ -2475,7 +2520,7 @@ msgstr "아홈 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "도그라 문자"
 
@@ -2483,21 +2528,28 @@ msgstr "도그라 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "바랑 크시티 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "디베스 아쿠루 문자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "난디나가리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "자나바자르 정방형 문자"
 
@@ -2505,21 +2557,21 @@ msgstr "자나바자르 정방형 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "소욤보 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "파우 킨 하우 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "바이크수키 문자"
 
@@ -2527,70 +2579,77 @@ msgstr "바이크수키 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "샹슝 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "마사람 곤디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "건잘라 곤디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "마카사르 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "리수 문자 추가영역"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "타밀 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "설형 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "설형 숫자및 구두기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "초기 왕조 쐐기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "고대 이집트 신성문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "고대 이집트 신성문자 형식 제어 문자"
 
@@ -2598,35 +2657,35 @@ msgstr "고대 이집트 신성문자 형식 제어 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "아나톨리아 상형문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "바뭄어 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "므로 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "바사 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "파하우몽 문자"
 
@@ -2634,14 +2693,14 @@ msgstr "파하우몽 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "메데파이드린 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "먀오 문자"
 
@@ -2649,7 +2708,7 @@ msgstr "먀오 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "표의문자용 기호 및 구두 기호"
 
@@ -2657,7 +2716,7 @@ msgstr "표의문자용 기호 및 구두 기호"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "서하 문자"
 
@@ -2665,28 +2724,42 @@ msgstr "서하 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "서하 문자 구성요소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "거란 소자"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "서하 문자 추가영역"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "가나 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "가나 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "작은 가나꼴 확장영역"
 
@@ -2694,77 +2767,77 @@ msgstr "작은 가나꼴 확장영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "뉘수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "듀플로이언 속기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "속기 형식 컨트롤 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "비잔틴 음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "고대 그리스 음표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "마야 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "태현경 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "산가지 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "수학용 알파벳, 숫자 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "서튼 수화 표기"
 
@@ -2772,7 +2845,7 @@ msgstr "서튼 수화 표기"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "글라골루 문자 추가영역"
 
@@ -2780,21 +2853,21 @@ msgstr "글라골루 문자 추가영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "창세기 몽족 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "완초 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "멘데어 키카쿠이 문자"
 
@@ -2802,7 +2875,7 @@ msgstr "멘데어 키카쿠이 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "애들램 문자"
 
@@ -2810,7 +2883,7 @@ msgstr "애들램 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "인도 시야크 숫자"
 
@@ -2818,189 +2891,203 @@ msgstr "인도 시야크 숫자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "오스만 시야크 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "아랍 수학용 알파벳 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "마작 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "도미노 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "플레잉카드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "괄호 영문자 및 숫자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "괄호 한자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "여러가지 기호 및 그림 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "이모티콘"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "장식용 딩뱃 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "교통 및 지도 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "연금술 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "도형 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "화살표 추가영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "추가 기호 및 그림 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "체스 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "기호 및 그림 문자 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "레거시 컴퓨팅 기호"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "한중일 통합 한자 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "한중일 통합 한자 확장영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "한중일 통합 한자 확장영역 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "한중일 통합 한자 확장영역 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "한중일 통합 한자 확장영역 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "한중일 호환 보충 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "한중일 통합 한자 확장영역 G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "태그"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "여러가지 선택자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "사용자 추가영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "사용자 추가영역 B"
 
@@ -3023,11 +3110,11 @@ msgstr "엔진이 설정되어 있지 않습니다.\n"
 
 #: tools/main.vala:169
 msgid "Set global engine failed.\n"
-msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
+msgstr "전체 공통 엔진의 설정에 실패했습니다.\n"
 
 #: tools/main.vala:174
 msgid "Get global engine failed.\n"
-msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
+msgstr "전체 공통 엔진의 취득에 실패했습니다.\n"
 
 #: tools/main.vala:217
 msgid "Read the system registry cache."
@@ -3053,7 +3140,8 @@ msgstr "레지스트리 캐시 파일을 씁니다."
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
-msgstr "IBus 코어 대신 엔진 스키마 경로 사용, 쉼표로 구분한 경로 값 목록."
+msgstr ""
+"IBus 코어 대신 엔진 스키마 경로를 사용합니다. 쉼표로 구분한 경로 값 목록."
 
 #: tools/main.vala:381
 msgid "Resetting…"
@@ -3117,9 +3205,11 @@ msgstr "이 정보 표시"
 
 #: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr "사용법: %s <명령> [옵션...]\n"
+msgstr ""
+"사용법: %s <명령> [옵션...]\n"
 "\n"
 
 #: tools/main.vala:465
@@ -3143,153 +3233,155 @@ msgstr "기타"
 msgid "Open Unicode choice"
 msgstr "유니코드 선택 열기"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "에모지 선택으로 돌아가기"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "다음 페이지"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "이전 페이지"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "에모지 변종 보기"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "닫기"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "메뉴"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "경고 메시지를 보려면 누르십시오"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "유니코드 사전 읽어들이는 중:"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "코드값: %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "에모지 변종 있음"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "설명: %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "없음"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "주석: %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "이름: %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "다른 이름: %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
 msgstr "에모지 선택"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "유니코드 선택"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
-"Failed to get the current text application. Please re-focus your application."
-" E.g. Press Esc key several times to release the emoji typing mode, click "
-"your desktop and click your text application again."
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
 msgstr ""
-"현재 텍스트 응용 프로그램을 알아낼 수 없습니다. 응용 프로그램의 포커스를 다시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 "
-"에모지 입력 모드를 벗어나거나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보십시오."
+"현재 텍스트 응용 프로그램을 알아낼 수 없습니다. 응용 프로그램의 포커스를 다"
+"시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 에모지 입력 모드를 벗어나거"
+"나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보십시오."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "에모지 선택 취소됨."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "에모지를 클립보드에 복사."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
-#. 
-#: ui/gtk3/emojierapp.vala:114
+#.
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "\"<글꼴>\"을 에모지 대화창의 에모지 문자에 사용합니다"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "<글꼴>"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
-#. 
-#: ui/gtk3/emojierapp.vala:120
+#.
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr "\"<언어>\"를 에모지 대화창 주석에 사용합니다 (예: \"en\")"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "<언어>"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "에모지 주석 일부분과 일치 가능"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "지정한 정수 값 길이만큼 일치"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "지정한 정수 값의 조건에 맞게 일치"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus 패널"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:1119
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1123
 msgid "translator-credits"
-msgstr "김은주 <eukim@redhat.com>\n"
+msgstr ""
+"김은주 <eukim@redhat.com>\n"
 "류창우 <cwryu@debian.org>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1142
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1168
 msgid "Restart"
 msgstr "다시 시작"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1172
 msgid "Quit"
 msgstr "끝내기"
 
@@ -3298,3 +3390,27 @@ msgstr "끝내기"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid "Kbd"
+#~ msgstr "키보드"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus (지능형 입력 버스)</small>\n"
+#~ "홈페이지: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "로그인하면 ibus 시작"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>시작</b>"

From cbc956bb4ccfc8fa6f0c11aca6b5080939683a0c Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Fri, 18 Sep 2020 17:12:45 +0900
Subject: [PATCH 686/816] po: Update translation (Danish)

Update po/da.po at 98.5%
https://translate.fedoraproject.org/projects/ibus/ibus/da/

BUG=https://github.com/ibus/ibus/pull/2259
---
 po/da.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/da.po b/po/da.po
index 37cbe617f..86cd2e060 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-14 09:14+0000\n"
+"PO-Revision-Date: 2020-09-17 22:29+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/da/>\n"
@@ -298,7 +298,7 @@ msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
 msgid "Choose glyphs with input method's language on candidate window"
-msgstr ""
+msgstr "Vælg glyffer med inputmetodens sprog i kandidatvinduet"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:171
 msgid ""
@@ -837,12 +837,12 @@ msgid ""
 "Choose glyphs with the input method's language on the candidate window for "
 "the duplicated code points"
 msgstr ""
+"Vælg glyffer med inputmetodens sprog i kandidatvinduet for de duplikerede "
+"kodepunkter"
 
 #: setup/setup.ui:1327
-#, fuzzy
-#| msgid "<b>Font and Style</b>"
 msgid "<b>Fonts</b>"
-msgstr "<b>Skrifttype og stil</b>"
+msgstr "<b>Skrifttyper</b>"
 
 #: setup/setup.ui:1347
 msgid "Advanced"

From aa3a9f0524ac0e4210c4e2eeb78196775dff8920 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 19 Sep 2020 17:36:32 +0900
Subject: [PATCH 687/816] ui/gtk3: Delete deprecated
 ENABLE_APPINDICATOR_ENGINE_ICON check

Now plasma-workspace 5.2 and qtbase 5.4 are deprecated and delete
the version check.

BUG=https://github.com/ibus/ibus/pull/2194
---
 configure.ac        | 17 -----------------
 ui/gtk3/Makefile.am |  8 ++------
 ui/gtk3/panel.vala  | 33 +++++++++------------------------
 3 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2917c10b5..a576b4b35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,25 +300,9 @@ else
     AC_SUBST(wayland_scanner_rules)
 fi
 
-enable_appindicator_engine_icon="no"
 if test x"$enable_appindicator" = x"yes"; then
     enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
-
-    # Need qt5-qtbase-devel package
-    # There is no way to check the version of KStatusNotifierItem and
-    # check the version of qtbase here.
-    AC_MSG_CHECKING([for KDE5 appindicator engine icon])
-    PKG_CHECK_EXISTS([Qt5Gui >= 5.4],
-        enable_appindicator_engine_icon="yes"
-    )
-    AC_MSG_RESULT([$enable_appindicator_engine_icon])
-
-fi
-if test x"$enable_appindicator_engine_icon" != x"yes" ; then
-    enable_appindicator_engine_icon="no (disabled, need qtbase-devel 5.4 or later)"
 fi
-AM_CONDITIONAL([ENABLE_APPINDICATOR_ENGINE_ICON],
-               [test x"$enable_appindicator_engine_icon" = x"yes"])
 
 # GObject introspection
 GOBJECT_INTROSPECTION_CHECK([0.6.8])
@@ -801,7 +785,6 @@ Build options:
   Build wayland support         $enable_wayland
   Build gdk3 wayland support    $enable_gdk3_wayland
   Build appindicator support    $enable_appindicator
-  Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library
   Build memconf modules         $enable_memconf
   Build dconf modules           $enable_dconf
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 667d51c60..ab379328c 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2019 Takao Fujwiara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2019 Red Hat, Inc.
+# Copyright (c) 2015-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2020 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
@@ -85,10 +85,6 @@ if ENABLE_APPINDICATOR
 AM_VALAFLAGS += --define=INDICATOR
 endif
 
-if ENABLE_APPINDICATOR_ENGINE_ICON
-AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
-endif
-
 if ENABLE_GDK3_WAYLAND
 AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
 endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index dc98e7223..627e26ae5 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2019 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -594,11 +594,10 @@ class Panel : IBus.PanelService {
             if (m_indicator == null)
                 return;
 
-            if (m_settings_panel.get_boolean("show-icon-on-systray")) {
+            if (m_settings_panel.get_boolean("show-icon-on-systray"))
                 m_indicator.set_status(Indicator.Status.ACTIVE);
-            } else {
+            else
                 m_indicator.set_status(Indicator.Status.PASSIVE);
-            }
         }
     }
 
@@ -1459,20 +1458,10 @@ class Panel : IBus.PanelService {
         }
 
         if (icon_name[0] == '/') {
-            if (m_icon_type == IconType.STATUS_ICON) {
+            if (m_icon_type == IconType.STATUS_ICON)
                 m_status_icon.set_from_file(icon_name);
-            }
-            else if (m_icon_type == IconType.INDICATOR) {
-#if INDICATOR_ENGINE_ICON
+            else if (m_icon_type == IconType.INDICATOR)
                 m_indicator.set_icon_full(icon_name, "");
-#else
-                warning("plasma-workspace 5.2 or later is required to " +
-                        "show the absolute path icon %s. Currently check " +
-                        "qtbase 5.4 since there is no way to check " +
-                        "the version of plasma-workspace.", icon_name);
-                m_indicator.set_icon_full("ibus-engine", "");
-#endif
-            }
         } else {
             string language = null;
 
@@ -1497,19 +1486,15 @@ class Panel : IBus.PanelService {
             } else {
                 var theme = Gtk.IconTheme.get_default();
                 if (theme.lookup_icon(icon_name, 48, 0) != null) {
-                    if (m_icon_type == IconType.STATUS_ICON) {
+                    if (m_icon_type == IconType.STATUS_ICON)
                         m_status_icon.set_from_icon_name(icon_name);
-                    }
-                    else if (m_icon_type == IconType.INDICATOR) {
+                    else if (m_icon_type == IconType.INDICATOR)
                         m_indicator.set_icon_full(icon_name, "");
-                    }
                 } else {
-                    if (m_icon_type == IconType.STATUS_ICON) {
+                    if (m_icon_type == IconType.STATUS_ICON)
                         m_status_icon.set_from_icon_name("ibus-engine");
-                    }
-                    else if (m_icon_type == IconType.INDICATOR) {
+                    else if (m_icon_type == IconType.INDICATOR)
                         m_indicator.set_icon_full("ibus-engine", "");
-                    }
                 }
             }
         }

From 9a9f82841d8454065b8ac3203c83e6416f2c5b4f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 25 Sep 2020 18:51:52 +0900
Subject: [PATCH 688/816] src: Update emoji-parser with CLDR emoji annotation
 release-31-0-1

cldr-emoji-annotation has no longer provided U+FE0F presentation
since release-31-0-1 and emoji-parser needs to follow it.

BUG=https://github.com/ibus/ibus/issues/2263
---
 src/emoji-parser.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index b8f4dcf16..96a779c65 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -238,7 +238,7 @@ find_emoji_data_list (IBusEmojiData *a,
         else if (strcmp_novariant (a_str, b->emoji, 0xfe0f, 0) == 0)
             return 0;
         else
-            return g_strcmp0 (a_str, b->emoji);
+            return -1;
         break;
     case EMOJI_NOVARIANT:
         if (strcmp_novariant (a_str, b->emoji, 0, 0xfe0e) == 0)
@@ -246,7 +246,7 @@ find_emoji_data_list (IBusEmojiData *a,
         else if (strcmp_novariant (a_str, b->emoji, 0, 0xfe0f) == 0)
             return 0;
         else
-            return g_strcmp0 (a_str, b->emoji);
+            return -1;
         break;
     default:;
     }
@@ -305,6 +305,7 @@ update_emoji_list (EmojiData *data,
                    gboolean   base_update)
 {
     GSList *list;
+    gboolean has_strict = FALSE;
     data->search_type = EMOJI_STRICT;
     list = g_slist_find_custom (
             data->list,
@@ -312,7 +313,7 @@ update_emoji_list (EmojiData *data,
             (GCompareFunc) find_emoji_data_list);
     if (list) {
         emoji_data_update_object (data, list->data);
-        return;
+        has_strict = TRUE;
     } else if (base_update) {
         emoji_data_new_object (data);
         return;
@@ -339,7 +340,8 @@ update_emoji_list (EmojiData *data,
             return;
         }
     }
-    emoji_data_new_object (data);
+    if (!has_strict)
+        emoji_data_new_object (data);
 }
 
 static void

From e4dd6d148c5bea7564b9dd052bde290d5434abcb Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 25 Sep 2020 21:45:27 +0900
Subject: [PATCH 689/816] engine: Delete xkb:in:tel-kagapa:tel in simple.xml.in

tel-kagapa variant is duplicated in base.xml

BUG=https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/222
---
 engine/simple.xml.in | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 9751578f0..78255d054 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -1460,18 +1460,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:in:tel-kagapa:tel</name>
-            <language>te</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>in</layout>
-            <layout_variant>tel-kagapa</layout_variant>
-            <longname>Telugu (KaGaPa, phonetic)</longname>
-            <description>Telugu (KaGaPa, phonetic)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:in:urd-phonetic:urd</name>
             <language>ur</language>

From 9d386d939ae1b636c3e02b8cd6d3f187d7afa367 Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Tue, 29 Sep 2020 17:40:47 +0900
Subject: [PATCH 690/816] po: Update translation (Danish)

Update po/da.po at 99.6%
https://translate.fedoraproject.org/projects/ibus/ibus/da/

BUG=https://github.com/ibus/ibus/pull/2264
---
 po/da.po | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/po/da.po b/po/da.po
index 86cd2e060..789c95379 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-17 22:29+0000\n"
+"PO-Revision-Date: 2020-09-28 14:29+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/da/>\n"
@@ -2328,7 +2328,7 @@ msgstr "Rumi numeriske symboler"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
 msgid "Yezidi"
-msgstr ""
+msgstr "Yezidi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2349,7 +2349,7 @@ msgstr "Sogdian"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
 msgid "Chorasmian"
-msgstr ""
+msgstr "Chorasmian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2503,7 +2503,7 @@ msgstr "Warang Citi"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
 msgid "Dives Akuru"
-msgstr ""
+msgstr "Dives Akuru"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2572,10 +2572,8 @@ msgstr "Makasar"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
-#, fuzzy
-#| msgid "Latin-1 Supplement"
 msgid "Lisu Supplement"
-msgstr "Latin-1 supplement"
+msgstr "Lisu supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2694,16 +2692,14 @@ msgstr "Tangut-komponenter"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
 msgid "Khitan Small Script"
-msgstr ""
+msgstr "Khitan lille skrift"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
-#, fuzzy
-#| msgid "Kana Supplement"
 msgid "Tangut Supplement"
-msgstr "Kana-supplement"
+msgstr "Tangut supplement"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:

From 447908702fda9f98bd696d680957f508395aac69 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 29 Sep 2020 19:52:04 +0900
Subject: [PATCH 691/816] Release 1.5.23

---
 autogen.sh   | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8efc56de0..20d6361af 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,7 +11,7 @@ src/ibusemojigen.h
 src/ibusunicodegen.h
 "
 FEDORA_PKG1='autoconf automake libtool gettext-devel'
-FEDORA_PKG2='glib2-devel gtk2-devel gtk3-devel qt5-qtbase-devel
+FEDORA_PKG2='glib2-devel gtk2-devel gtk3-devel
  wayland-devel'
 FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd'
 
diff --git a/configure.ac b/configure.ac
index a576b4b35..5753057bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [22])
+m4_define([ibus_micro_version], [23])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 30 Sep 2020 20:35:23 +0900
Subject: [PATCH 692/816] ui/gtk3: Fix arguments in GLib.DBusSignalCallback for
 Vala 0.50

BUG=https://github.com/ibus/ibus/issues/2265
---
 ui/gtk3/application.vala | 22 +++++++++++-----------
 ui/gtk3/extension.vala   | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index cc9ee54c9..da65301b4 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2017-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -69,22 +69,22 @@ class Application {
     }
 
     private void bus_name_acquired_cb(DBusConnection connection,
-                                      string sender_name,
-                                      string object_path,
-                                      string interface_name,
-                                      string signal_name,
-                                      Variant parameters) {
+                                      string?        sender_name,
+                                      string         object_path,
+                                      string         interface_name,
+                                      string         signal_name,
+                                      Variant        parameters) {
         debug("signal_name = %s", signal_name);
         m_panel = new Panel(m_bus);
         m_panel.load_settings();
     }
 
     private void bus_name_lost_cb(DBusConnection connection,
-                                  string sender_name,
-                                  string object_path,
-                                  string interface_name,
-                                  string signal_name,
-                                  Variant parameters) {
+                                  string?        sender_name,
+                                  string         object_path,
+                                  string         interface_name,
+                                  string         signal_name,
+                                  Variant        parameters) {
         // "Destroy" dbus method was called before this callback is called.
         // "Destroy" dbus method -> ibus_service_destroy()
         // -> g_dbus_connection_unregister_object()
diff --git a/ui/gtk3/extension.vala b/ui/gtk3/extension.vala
index ea3cd4647..a6f2e8e6a 100644
--- a/ui/gtk3/extension.vala
+++ b/ui/gtk3/extension.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2018-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -67,22 +67,22 @@ class ExtensionGtk : Gtk.Application {
 
 
     private void bus_name_acquired_cb(DBusConnection connection,
-                                      string sender_name,
-                                      string object_path,
-                                      string interface_name,
-                                      string signal_name,
-                                      Variant parameters) {
+                                      string?        sender_name,
+                                      string         object_path,
+                                      string         interface_name,
+                                      string         signal_name,
+                                      Variant        parameters) {
         debug("signal_name = %s", signal_name);
         m_panel = new PanelBinding(m_bus, this);
         m_panel.load_settings();
     }
 
     private void bus_name_lost_cb(DBusConnection connection,
-                                  string sender_name,
-                                  string object_path,
-                                  string interface_name,
-                                  string signal_name,
-                                  Variant parameters) {
+                                  string?        sender_name,
+                                  string         object_path,
+                                  string         interface_name,
+                                  string         signal_name,
+                                  Variant        parameters) {
         // "Destroy" dbus method was called before this callback is called.
         // "Destroy" dbus method -> ibus_service_destroy()
         // -> g_dbus_connection_unregister_object()

From 02338ce751a1ed5b9b892fba530ec2fe211d314e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Nov 2020 08:58:52 +0900
Subject: [PATCH 693/816] docs: Fix make dist

---
 docs/reference/ibus/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 1ece234c1..0f307bbdc 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
-# Copyright (c) 2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2020 Red Hat, Inc.
+# Copyright (c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -147,6 +147,6 @@ tmpl-build.stamp: trim-build.stamp  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 # clean-local:
 # 	rm -rf tmpl ${DOC_MODULE)
 
-CLEANFILES+= *.stamp
+CLEANFILES+= *actions *.stamp
 
 -include $(top_srcdir)/git.mk

From aa558de80c224921753990806cf553428fbe7057 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Nov 2020 09:03:32 +0900
Subject: [PATCH 694/816] src: Fix to build emoji-*.dict in CLDR 38

root.xml and sr_Cyrl.xml have included no contents since
cldr-emoji-annotation-38 and make install failed because of no
emoji-root.dict and emoji-sr.Cyrl.dict.
Now the build creates the no content files but remove those files
in the install hook.

BUG=rhbz#1898065
---
 src/Makefile.am    | 61 ++++++++++++++++++++++------------------------
 src/emoji-parser.c |  4 ++-
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 99de1ab7c..742ee7d78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -248,6 +248,7 @@ AM_CPPFLAGS += -DENABLE_EMOJI_DICT
 dictdir = $(pkgdatadir)/dicts
 LANG_FILES = $(basename $(notdir $(wildcard $(EMOJI_ANNOTATION_DIR)/*.xml)))
 EMOJI_DICT_FILES = $(patsubst %,dicts/emoji-%.dict,$(LANG_FILES))
+# emoji-root.dict, emoji-sr_Cyrl.dict have no contents.
 dict_DATA = $(EMOJI_DICT_FILES)
 
 noinst_PROGRAMS += emoji-parser
@@ -265,6 +266,7 @@ dicts/emoji-%.dict: emoji-parser
 	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$*.xml"; \
 	        plus_comment="derived"; \
 	fi; \
+	is_skip=0; \
 	if test x"$*" = xen ; then \
 	    $(builddir)/emoji-parser \
 	        --unicode-emoji-dir $(UNICODE_EMOJI_DIR) \
@@ -279,48 +281,43 @@ dicts/emoji-%.dict: emoji-parser
 	        --xml $(EMOJI_ANNOTATION_DIR)/$*.xml \
 	        $$xml_derived_option \
 	        --out $@; \
+	    retval=$$?; \
+	    if test $$retval -eq 99 ; then \
+	        is_skip=1; \
+	        touch $@; \
+	    elif test $$retval -ne 0 ; then \
+	        echo "Fail to generate $@"; \
+	        abrt; \
+	    fi; \
 	fi; \
-	echo "Generated $$plus_comment $@"
+	if test $$is_skip -eq 0 ; then \
+	    echo "Generated $$plus_comment $@"; \
+	else \
+	    echo "Skip $$plus_comment $@"; \
+	fi;
 
 ibusemojigen.h: dicts/emoji-en.dict
 	$(NULL)
 
-install-data-hook: $(dict_DATA)
-	@$(NORMAL_INSTALL)
+# We put dicts/emoji-%.dict as the make target for the parallel build
+# and the make target has to be genarated even if the file size is zero.
+# But we don't want to install the zero size files and delete them
+# in install-data-hook.
+install-data-hook:
 	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \
         test -n "$(dictdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(dictdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(dictdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
+	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	    if test -s  "$$d$$p"; then continue; fi;  \
+	    basename "$$p"; \
 	done | \
-	while read files; do \
-	  if [ x$(AM_DEFAULT_VERBOSITY) = x1 ] ; then \
-	      echo "$(INSTALL_DATA) $$files '$(DESTDIR)$(dictdir)'"; \
-	  else \
-	      echo "Installing $$files"; \
-	  fi; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dictdir)" || exit $$?; \
+	while read file; do \
+	    if test -f "$(DESTDIR)$(dictdir)/$$file"; then \
+	        echo "Delete $(DESTDIR)$(dictdir)/$$file"; \
+	        rm "$(DESTDIR)$(dictdir)/$$file" || exit $$?; \
+	    fi; \
 	done
 
-dict__uninstall_files_from_dir = { \
-    test -z "$$files" \
-        || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-        || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-             cd "$$dir" && rm -f $$files; }; \
-    }
-
-# for make dist
-uninstall-hook:
-	@$(NORMAL_UNINSTALL)
-	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \
-	test -n "$(dictdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(dictdir)'; $(dict__uninstall_files_from_dir)
-
 emoji_parser_SOURCES =          \
     emoji-parser.c              \
     $(NULL)
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index 96a779c65..b117b1b41 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -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) 2016-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -1294,6 +1294,8 @@ main (int argc, char *argv[])
         category_file_save (output_category, list);
     if (list)
         g_slist_free (list);
+    else
+        return 99;
 
     return 0;
 }

From b72efea42d5f72e08e2774ae03027c246d41cab7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Nov 2020 10:56:11 +0900
Subject: [PATCH 695/816] src: Update IBusInputPurpose and IBusInputHints in
 ibustypes.h

Copy IBUS_INPUT_PURPOSE_TERMINAL, IBUS_INPUT_PURPOSE_PIN,
IBUS_INPUT_PURPOSE_TERMINAL from GTK 3.24.14
---
 src/ibustypes.h | 77 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/ibustypes.h b/src/ibustypes.h
index 06370a277..798ad04d9 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2015 Red Hat, Inc.
+ * Copyright (C) 2008-2020 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
@@ -241,29 +241,46 @@ typedef void (* IBusFreeFunc) (gpointer object);
  * @IBUS_INPUT_PURPOSE_EMAIL: Edited field expects email address
  * @IBUS_INPUT_PURPOSE_NAME: Edited field expects the name of a person
  * @IBUS_INPUT_PURPOSE_PASSWORD: Like @IBUS_INPUT_PURPOSE_FREE_FORM,
- * but characters are hidden
+ *     but characters are hidden
  * @IBUS_INPUT_PURPOSE_PIN: Like @IBUS_INPUT_PURPOSE_DIGITS, but
- * characters are hidden
+ *     characters are hidden
+ * @IBUS_INPUT_PURPOSE_TERMINAL: Allow any character, in addition to control
+ *     codes. Since 1.5.24
  *
  * 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.
  *
+ * Note that the purpose is not meant to impose a totally strict rule
+ * about allowed characters, and does not replace input validation.
+ * It is fine for an on-screen keyboard to let the user override the
+ * character set restriction that is expressed by the purpose. The
+ * application is expected to validate the entry contents, even if
+ * it specified a purpose.
+ *
+ * The difference between @IBUS_INPUT_PURPOSE_DIGITS and
+ * @IBUS_INPUT_PURPOSE_NUMBER is that the former accepts only digits
+ * while the latter also some punctuation (like commas or points, plus,
+ * minus) and “e” or “E” as in 3.14E+000.
+ *
  * This enumeration may be extended in the future; engines should
  * interpret unknown values as 'free form'.
+ *
+ * Since: 1.5.4
  */
 typedef enum
 {
-  IBUS_INPUT_PURPOSE_FREE_FORM,
-  IBUS_INPUT_PURPOSE_ALPHA,
-  IBUS_INPUT_PURPOSE_DIGITS,
-  IBUS_INPUT_PURPOSE_NUMBER,
-  IBUS_INPUT_PURPOSE_PHONE,
-  IBUS_INPUT_PURPOSE_URL,
-  IBUS_INPUT_PURPOSE_EMAIL,
-  IBUS_INPUT_PURPOSE_NAME,
-  IBUS_INPUT_PURPOSE_PASSWORD,
-  IBUS_INPUT_PURPOSE_PIN
+    IBUS_INPUT_PURPOSE_FREE_FORM,
+    IBUS_INPUT_PURPOSE_ALPHA,
+    IBUS_INPUT_PURPOSE_DIGITS,
+    IBUS_INPUT_PURPOSE_NUMBER,
+    IBUS_INPUT_PURPOSE_PHONE,
+    IBUS_INPUT_PURPOSE_URL,
+    IBUS_INPUT_PURPOSE_EMAIL,
+    IBUS_INPUT_PURPOSE_NAME,
+    IBUS_INPUT_PURPOSE_PASSWORD,
+    IBUS_INPUT_PURPOSE_PIN,
+    IBUS_INPUT_PURPOSE_TERMINAL
 } IBusInputPurpose;
 
 /**
@@ -280,24 +297,36 @@ typedef enum
  *     first word of each sentence
  * @IBUS_INPUT_HINT_INHIBIT_OSK: Suggest to not show an onscreen keyboard
  *     (e.g for a calculator that already has all the keys).
- * @IBUS_INPUT_HINT_VERTICAL_WRITING: The text is vertical.
+ * @IBUS_INPUT_HINT_VERTICAL_WRITING: The text is vertical. Since 1.5.11
+ * @IBUS_INPUT_HINT_EMOJI: Suggest offering Emoji support. Since 1.5.24
+ * @IBUS_INPUT_HINT_NO_EMOJI: Suggest not offering Emoji support. Since 1.5.24
  *
  * 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.
+ *
+ * Some common sense is expected when using these flags - mixing
+ * @IBUS_INPUT_HINT_LOWERCASE with any of the uppercase hints makes no sense.
+ *
+ * This enumeration may be extended in the future; engines should
+ * ignore unknown values.
+ *
+ * Since: 1.5.4
  */
 typedef enum
 {
-  IBUS_INPUT_HINT_NONE                = 0,
-  IBUS_INPUT_HINT_SPELLCHECK          = 1 << 0,
-  IBUS_INPUT_HINT_NO_SPELLCHECK       = 1 << 1,
-  IBUS_INPUT_HINT_WORD_COMPLETION     = 1 << 2,
-  IBUS_INPUT_HINT_LOWERCASE           = 1 << 3,
-  IBUS_INPUT_HINT_UPPERCASE_CHARS     = 1 << 4,
-  IBUS_INPUT_HINT_UPPERCASE_WORDS     = 1 << 5,
-  IBUS_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
-  IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7,
-  IBUS_INPUT_HINT_VERTICAL_WRITING    = 1 << 8
+    IBUS_INPUT_HINT_NONE                = 0,
+    IBUS_INPUT_HINT_SPELLCHECK          = 1 << 0,
+    IBUS_INPUT_HINT_NO_SPELLCHECK       = 1 << 1,
+    IBUS_INPUT_HINT_WORD_COMPLETION     = 1 << 2,
+    IBUS_INPUT_HINT_LOWERCASE           = 1 << 3,
+    IBUS_INPUT_HINT_UPPERCASE_CHARS     = 1 << 4,
+    IBUS_INPUT_HINT_UPPERCASE_WORDS     = 1 << 5,
+    IBUS_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
+    IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7,
+    IBUS_INPUT_HINT_VERTICAL_WRITING    = 1 << 8,
+    IBUS_INPUT_HINT_EMOJI               = 1 << 9,
+    IBUS_INPUT_HINT_NO_EMOJI            = 1 << 10
 } IBusInputHints;
 
 #endif

From 5322c447c74a10ee54b482d6eff6da6d16a7c9ce Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sat, 21 Nov 2020 07:41:23 +0900
Subject: [PATCH 696/816] ui/gtk3: Warn deprecated IBus XKB engines /w dialog

simple.xml is updated by IBus release and some XKB engines
could be deprecated with xkeyboard-config updates.
Now a warning dialog is launched when the deprecated engines are
changed to xkb:us::eng engine.

BUG=https://github.com/ibus/ibus/issues/2274
---
 po/ibus10.pot      | 28 ++++++++++++++++++----------
 ui/gtk3/panel.vala | 15 +++++++++++++++
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/po/ibus10.pot b/po/ibus10.pot
index 76b6ef761..a26dad7eb 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.22\n"
+"Project-Id-Version: ibus 1.5.23\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-03 21:21+0900\n"
+"POT-Creation-Date: 2020-11-21 07:09+0900\n"
+"PO-Revision-Date: 2020-11-21 07:09+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1176
 msgid "About"
 msgstr ""
 
@@ -3172,7 +3172,7 @@ msgid "Alias: %s"
 msgstr ""
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1161
 msgid "Emoji Choice"
 msgstr ""
 
@@ -3233,23 +3233,31 @@ msgstr ""
 msgid "IBus Panel"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:970
+#, c-format
+msgid ""
+"Your input method %s does not exist in IBus input methods so \"US\" layout "
+"was configured instead of your input method. Please run `ibus-setup` "
+"command, open \"Input Method\" tab, and configure your input methods again."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1133
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1137
 msgid "translator-credits"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1156
 msgid "Preferences"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1182
 msgid "Restart"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1186
 msgid "Quit"
 msgstr ""
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 627e26ae5..01f87e339 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -970,6 +970,21 @@ class Panel : IBus.PanelService {
             names =  {"xkb:us::eng"};
             m_settings_general.set_strv("preload-engines", names);
             engines = m_bus.get_engines_by_names(names);
+            var message = _("Your input method %s does not exist in IBus " +
+                    "input methods so \"US\" layout was configured instead " +
+                    "of your input method. Please run `ibus-setup` command, " +
+                    "open \"Input Method\" tab, and configure your input " +
+                    "methods again.").printf(names[0]);
+            var dialog = new Gtk.MessageDialog(
+                    null,
+                    Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                    Gtk.MessageType.WARNING,
+                    Gtk.ButtonsType.CLOSE,
+                    message);
+            dialog.response.connect((id) => {
+                    dialog.destroy();
+            });
+            dialog.show();
 	}
 
         if (m_engines.length == 0) {

From aec2ac75ea673d3701904735378765476cad0f21 Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Fri, 11 Dec 2020 16:27:36 +0900
Subject: [PATCH 697/816] ui/gtk3: Warning dialog for any deprecated IBus XKB
 engine

This is a follow-up of commit 5322c447. That commit introduced
a warning dialog in case of an empty engines list.

This commit makes a differently worded warning dialog be shown
in cases where the engines list is not empty but preload-engines
includes at least one deprecated engine. It also fixes a variable
confusion so a deprecated engine is mentioned in the first kind
of warning dialog and not the US engine.

BUG=https://github.com/ibus/ibus/issues/2274
---
 po/ibus10.pot      | 37 ++++++++++++++++++++++++-------------
 ui/gtk3/panel.vala | 30 +++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/po/ibus10.pot b/po/ibus10.pot
index a26dad7eb..dbba6ea7e 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.23\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-11-21 07:09+0900\n"
-"PO-Revision-Date: 2020-11-21 07:09+0900\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2020-12-11 16:21+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1176
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr ""
 
@@ -3172,7 +3172,7 @@ msgid "Alias: %s"
 msgstr ""
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1161
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr ""
 
@@ -3233,31 +3233,42 @@ msgstr ""
 msgid "IBus Panel"
 msgstr ""
 
-#: ui/gtk3/panel.vala:970
+#: ui/gtk3/panel.vala:975
 #, c-format
 msgid ""
-"Your input method %s does not exist in IBus input methods so \"US\" layout "
-"was configured instead of your input method. Please run `ibus-setup` "
-"command, open \"Input Method\" tab, and configure your input methods again."
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1133
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1137
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1156
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1182
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1186
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr ""
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 01f87e339..ab2005d7e 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -966,25 +966,33 @@ class Panel : IBus.PanelService {
         /* Fedora internal patch could save engines not in simple.xml
          * likes 'xkb:cn::chi'.
          */
-        if (engines.length == 0) {
-            names =  {"xkb:us::eng"};
-            m_settings_general.set_strv("preload-engines", names);
-            engines = m_bus.get_engines_by_names(names);
-            var message = _("Your input method %s does not exist in IBus " +
-                    "input methods so \"US\" layout was configured instead " +
-                    "of your input method. Please run `ibus-setup` command, " +
-                    "open \"Input Method\" tab, and configure your input " +
-                    "methods again.").printf(names[0]);
+        if (engines.length < names.length) {
+            string message1;
+            if (engines.length == 0) {
+                string[] fallback_names = {"xkb:us::eng"};
+                m_settings_general.set_strv("preload-engines", fallback_names);
+                engines = m_bus.get_engines_by_names(fallback_names);
+                message1 = _("Your configured input method %s does not exist " +
+                             "in IBus input methods so \"US\" layout was " +
+                             "configured instead of your input method."
+                            ).printf(names[0]);
+            } else {
+                message1 = _("At least one of your configured input methods " +
+                             "does not exist in IBus input methods.");
+            }
+            var message2 = _("Please run `ibus-setup` command, open \"Input " +
+                             "Method\" tab, and configure your input methods " +
+                             "again.");
             var dialog = new Gtk.MessageDialog(
                     null,
                     Gtk.DialogFlags.DESTROY_WITH_PARENT,
                     Gtk.MessageType.WARNING,
                     Gtk.ButtonsType.CLOSE,
-                    message);
+                    "%s %s", message1, message2);
             dialog.response.connect((id) => {
                     dialog.destroy();
             });
-            dialog.show();
+            dialog.show_all();
 	}
 
         if (m_engines.length == 0) {

From 5d68b00e0464d43ba2f77697f9dcfbff78d7b438 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 31 Dec 2020 17:28:45 +0900
Subject: [PATCH 698/816] engine: Fix iso-path in gensimple.py

Replace datarootdir with ISOCODES_PREFIX.
---
 engine/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/Makefile.am b/engine/Makefile.am
index d810704b5..1944c02b9 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -104,7 +104,7 @@ simple.xml.in:
 	    --output=$@ \
 	    --version=$(VERSION).`date '+%Y%m%d'` \
 	    --exec-path=@libexecdir\@/ibus-engine-simple \
-	    --iso-path=$(datarootdir)/xml/iso-codes/iso_639.xml \
+	    --iso-path=$(ISOCODES_PREFIX)/share/xml/iso-codes/iso_639.xml \
 	    --first-language \
 	$(NULL)
 

From 29959e1d2521781c544879b284e03812a2a11b2e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 31 Dec 2020 20:00:02 +0900
Subject: [PATCH 699/816] engine: Fix input in gensimple.py

Replace datarootdir with XKBCONFIG_BASE.
---
 configure.ac       | 7 +++++++
 engine/Makefile.am | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5753057bb..9ed5cb664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -720,6 +720,13 @@ PKG_CHECK_MODULES(ISOCODES, [
 ISOCODES_PREFIX=`$PKG_CONFIG iso-codes --variable=prefix`
 AC_SUBST(ISOCODES_PREFIX)
 
+PKG_CHECK_MODULES(XKBCONFIG,
+    [xkeyboard-config],
+    [XKBCONFIG_BASE=`$PKG_CONFIG xkeyboard-config --variable=xkb_base`],
+    [XKBCONFIG_BASE='$(datarootdir)/X11/xkb']
+)
+AC_SUBST(XKBCONFIG_BASE)
+
 AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
 
 # OUTPUT files
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 1944c02b9..84bc7f6cd 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -100,7 +100,7 @@ simple.xml: simple.xml.in
 
 simple.xml.in:
 	$(srcdir)/gensimple.py \
-	    --input=$(datarootdir)/X11/xkb/rules/evdev.xml \
+	    --input=$(XKBCONFIG_BASE)/rules/evdev.xml \
 	    --output=$@ \
 	    --version=$(VERSION).`date '+%Y%m%d'` \
 	    --exec-path=@libexecdir\@/ibus-engine-simple \

From 30a3641e19c541924959a5770dd784b4424288d4 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 1 Jan 2021 07:02:43 +0900
Subject: [PATCH 700/816] travis: Add CI

---
 .travis.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..e90dc230c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,70 @@
+language: c
+compiler: gcc
+os: linux
+
+# Require gettext-0.19.8
+dist: focal
+
+branches:
+  only:
+  - master
+
+# FIXME: Run script in every arch
+arch:
+  - amd64
+  #- ppc64le
+  #- s390x
+  #- arm64
+
+addons:
+  apt:
+    packages:
+    # For autogen.sh
+    - gnome-common
+    - gtk-doc-tools
+    # For make from
+    # https://packages.ubuntu.com/search?searchon=sourcenames&keywords=ibus
+    - desktop-file-utils
+    - gobject-introspection
+    - iso-codes
+    - libdconf-dev
+    - libgirepository1.0-dev
+    - libglib2.0-dev
+    - libgtk-3-bin
+    - libgtk-3-dev
+    - libgtk2.0-dev
+    - libtool
+    - libwayland-dev
+    - python-gi-dev
+    - python3-all
+    - unicode-cldr-core
+    - unicode-data
+    - valac
+
+jobs:
+  include:
+  - name: Build in Ubuntu
+    before_script:
+    - sudo apt-get -qq update
+    script:
+    - set -e
+    - git pull --depth=200
+    # configure options from
+    # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules
+    - >
+      ./autogen.sh
+      --with-ucd-dir='/usr/share/unicode'
+    # Set the cutom DESTDIR because the default DESTDIR
+    # /home/travis/bulid/fujiwarat/$PKG/ibus/ibus-$VERSION/_inst seems to be
+    # too long and failed to set DESTDIR to install bindings/pygobject/IBus.py
+    - >
+      make distcheck
+      DISTCHECK_CONFIGURE_FLAGS="
+      --enable-gtk-doc
+      --disable-schemas-install
+      --enable-memconf
+      --with-ucd-dir='/usr/share/unicode'
+      "
+      DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress"
+      VERBOSE=1
+      DESTDIR="$HOME/build/$USER/dest"

From c7928b158741282e17a042f767bc5ae32c302c96 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 8 Jan 2021 18:45:55 +0900
Subject: [PATCH 701/816] Add GTK4 IM module

BUG=https://github.com/ibus/ibus/issues/2291
---
 client/Makefile.am          |   7 +-
 client/gtk2/ibusimcontext.c | 352 +++++++++++++++++++++++++++++++-----
 client/gtk4/Makefile.am     |  66 +++++++
 client/gtk4/ibusim.c        |  52 ++++++
 client/gtk4/ibusimcontext.c |   1 +
 client/gtk4/ibusimcontext.h |   1 +
 configure.ac                |  32 ++++
 7 files changed, 465 insertions(+), 46 deletions(-)
 create mode 100644 client/gtk4/Makefile.am
 create mode 100644 client/gtk4/ibusim.c
 create mode 120000 client/gtk4/ibusimcontext.c
 create mode 120000 client/gtk4/ibusimcontext.h

diff --git a/client/Makefile.am b/client/Makefile.am
index 546ca132f..1744518ca 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2020 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
@@ -28,6 +28,10 @@ if ENABLE_GTK3
 GTK3 = gtk3
 endif
 
+if ENABLE_GTK4
+GTK4 = gtk4
+endif
+
 if ENABLE_XIM
 X11 = x11
 endif
@@ -39,6 +43,7 @@ endif
 SUBDIRS = \
 	$(GTK2) \
 	$(GTK3) \
+	$(GTK4) \
 	$(X11) \
 	$(WAYLAND) \
 	$(NULL)
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 50290c556..a23fc2e35 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
@@ -32,8 +32,12 @@
 #include "ibusimcontext.h"
 
 #ifdef GDK_WINDOWING_WAYLAND
+#if GTK_CHECK_VERSION (3, 98, 4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
 #endif
+#endif
 
 #if !GTK_CHECK_VERSION (2, 91, 0)
 #  define DEPRECATED_GDK_KEYSYMS 1
@@ -52,7 +56,11 @@ struct _IBusIMContext {
 
     /* instance members */
     GtkIMContext *slave;
+#if GTK_CHECK_VERSION (3, 98, 4)
+    GtkWidget *client_window;
+#else
     GdkWindow *client_window;
+#endif
 
     IBusInputContext *ibuscontext;
 
@@ -73,7 +81,12 @@ struct _IBusIMContext {
     GCancellable    *cancellable;
     GQueue          *events_queue;
 
-#if !GTK_CHECK_VERSION (3, 93, 0)
+#if GTK_CHECK_VERSION (3, 98, 4)
+    GdkSurface      *surface;
+    GdkDevice       *device;
+    double           x;
+    double           y;
+#else
     gboolean         use_button_press_event;
 #endif
 };
@@ -90,9 +103,11 @@ static guint    _signal_preedit_end_id = 0;
 static guint    _signal_delete_surrounding_id = 0;
 static guint    _signal_retrieve_surrounding_id = 0;
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
 static const gchar *_no_snooper_apps = NO_SNOOPER_APPS;
 static gboolean _use_key_snooper = ENABLE_SNOOPER;
 static guint    _key_snooper_id = 0;
+#endif
 
 static gboolean _use_sync_mode = FALSE;
 
@@ -101,8 +116,10 @@ static gboolean _use_discard_password = FALSE;
 
 static GtkIMContext *_focus_im_context = NULL;
 static IBusInputContext *_fake_context = NULL;
+#if !GTK_CHECK_VERSION (3, 98, 4)
 static GdkWindow *_input_window = NULL;
 static GtkWidget *_input_widget = NULL;
+#endif
 
 /* functions prototype */
 static void     ibus_im_context_class_init  (IBusIMContextClass    *class);
@@ -114,7 +131,11 @@ static void     ibus_im_context_finalize    (GObject               *obj);
 static void     ibus_im_context_reset       (GtkIMContext          *context);
 static gboolean ibus_im_context_filter_keypress
                                             (GtkIMContext           *context,
+#if GTK_CHECK_VERSION (3, 98, 4)
+                                             GdkEvent               *key);
+#else
                                              GdkEventKey            *key);
+#endif
 static void     ibus_im_context_focus_in    (GtkIMContext          *context);
 static void     ibus_im_context_focus_out   (GtkIMContext          *context);
 static void     ibus_im_context_get_preedit_string
@@ -122,9 +143,15 @@ static void     ibus_im_context_get_preedit_string
                                              gchar                  **str,
                                              PangoAttrList          **attrs,
                                              gint                   *cursor_pos);
+#if GTK_CHECK_VERSION (3, 98, 4)
+static void     ibus_im_context_set_client_widget
+                                            (GtkIMContext           *context,
+                                             GtkWidget              *client);
+#else
 static void     ibus_im_context_set_client_window
                                             (GtkIMContext           *context,
                                              GdkWindow              *client);
+#endif
 static void     ibus_im_context_set_cursor_location
                                             (GtkIMContext           *context,
                                              GdkRectangle           *area);
@@ -239,6 +266,7 @@ ibus_im_context_new (void)
     return IBUS_IM_CONTEXT (obj);
 }
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
 static gboolean
 _focus_in_cb (GtkWidget     *widget,
               GdkEventFocus *event,
@@ -260,22 +288,41 @@ _focus_out_cb (GtkWidget     *widget,
     }
     return FALSE;
 }
+#endif /* end of GTK_CHECK_VERSION (3, 98, 4) */
 
 static gboolean
 ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
+#if GTK_CHECK_VERSION (3, 98, 4)
+                              GdkEvent      *event)
+#else
                               GdkEventKey   *event)
+#endif
 {
+    guint keyval = 0;
+    GdkModifierType state = 0;
     int i;
     GdkModifierType no_text_input_mask;
     gunichar ch;
 
+#if GTK_CHECK_VERSION (3, 98, 4)
+    if (gdk_event_get_event_type (event) == GDK_KEY_RELEASE)
+        return FALSE;
+    keyval = gdk_key_event_get_keyval (event);
+    state = gdk_event_get_modifier_state (event);
+#else
     if (event->type == GDK_KEY_RELEASE)
         return FALSE;
+    keyval = event->keyval;
+    state = event->state;
+#endif
+
     /* Ignore modifier key presses */
     for (i = 0; i < G_N_ELEMENTS (IBUS_COMPOSE_IGNORE_KEYLIST); i++)
-        if (event->keyval == IBUS_COMPOSE_IGNORE_KEYLIST[i])
+        if (keyval == IBUS_COMPOSE_IGNORE_KEYLIST[i])
             return FALSE;
-#if GTK_CHECK_VERSION (3, 4, 0)
+#if GTK_CHECK_VERSION (3, 98, 4)
+    no_text_input_mask = GDK_MODIFIER_MASK;
+#elif GTK_CHECK_VERSION (3, 4, 0)
     no_text_input_mask = gdk_keymap_get_modifier_mask (
             gdk_keymap_get_for_display (gdk_display_get_default ()),
             GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
@@ -290,13 +337,13 @@ ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
 
 #  undef _IBUS_NO_TEXT_INPUT_MOD_MASK
 #endif
-    if (event->state & no_text_input_mask ||
-        event->keyval == GDK_KEY_Return ||
-        event->keyval == GDK_KEY_ISO_Enter ||
-        event->keyval == GDK_KEY_KP_Enter) {
+    if (state & no_text_input_mask ||
+        keyval == GDK_KEY_Return ||
+        keyval == GDK_KEY_ISO_Enter ||
+        keyval == GDK_KEY_KP_Enter) {
         return FALSE;
     }
-    ch = ibus_keyval_to_unicode (event->keyval);
+    ch = ibus_keyval_to_unicode (keyval);
     if (ch != 0 && !g_unichar_iscntrl (ch)) {
         IBusText *text = ibus_text_new_from_unichar (ch);
         g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
@@ -307,14 +354,26 @@ ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
    return FALSE;
 }
 
+struct _ProcessKeyEventData {
+    GdkEvent *event;
+    IBusIMContext *ibusimcontext;
+};
+
+typedef struct _ProcessKeyEventData ProcessKeyEventData;
+
 static void
 _process_key_event_done (GObject      *object,
                          GAsyncResult *res,
                          gpointer      user_data)
 {
     IBusInputContext *context = (IBusInputContext *)object;
-    GdkEventKey *event = (GdkEventKey *) user_data;
+
+    ProcessKeyEventData *data = (ProcessKeyEventData *)user_data;
+    GdkEvent *event = data->event;
+    IBusIMContext *ibusimcontext = data->ibusimcontext;
     GError *error = NULL;
+
+    g_slice_free (ProcessKeyEventData, data);
     gboolean retval = ibus_input_context_process_key_event_async_finish (
             context,
             res,
@@ -326,46 +385,96 @@ _process_key_event_done (GObject      *object,
     }
 
     if (retval == FALSE) {
-        event->state |= IBUS_IGNORED_MASK;
-        gdk_event_put ((GdkEvent *)event);
+#if GTK_CHECK_VERSION (3, 98, 4)
+        g_return_if_fail (GTK_IS_IM_CONTEXT (ibusimcontext));
+        gtk_im_context_filter_key (
+                GTK_IM_CONTEXT (ibusimcontext),
+                gdk_event_get_event_type (event) == GDK_KEY_PRESS,
+                gdk_event_get_surface (event),
+                gdk_event_get_device (event),
+                gdk_event_get_time (event),
+                gdk_key_event_get_keycode (event),
+                gdk_event_get_modifier_state (event) | IBUS_IGNORED_MASK,
+                0);
+#else
+        ((GdkEventKey *)event)->state |= IBUS_IGNORED_MASK;
+        gdk_event_put (event);
+#endif
     }
-    gdk_event_free ((GdkEvent *)event);
+#if GTK_CHECK_VERSION (3, 98, 4)
+    gdk_event_unref (event);
+#else
+    gdk_event_free (event);
+#endif
 }
 
 static gboolean
 _process_key_event (IBusInputContext *context,
-                    GdkEventKey      *event)
+#if GTK_CHECK_VERSION (3, 98, 4)
+                    GdkEvent         *event,
+#else
+                    GdkEventKey      *event,
+#endif
+                    IBusIMContext    *ibusimcontext)
 {
-    guint state = event->state;
+    guint state;
+    guint keyval = 0;
+    guint16 hardware_keycode = 0;
+    guint keycode = 0;
     gboolean retval = FALSE;
 
-    if (event->type == GDK_KEY_RELEASE) {
+#if GTK_CHECK_VERSION (3, 98, 4)
+    GdkModifierType gdkstate = gdk_event_get_modifier_state (event);
+    state = (uint)gdkstate;
+    if (gdk_event_get_event_type (event) == GDK_KEY_RELEASE)
         state |= IBUS_RELEASE_MASK;
-    }
+    keyval = gdk_key_event_get_keyval (event);
+    hardware_keycode = gdk_key_event_get_keycode (event);
+#else
+    state = event->state;
+    if (event->type == GDK_KEY_RELEASE)
+        state |= IBUS_RELEASE_MASK;
+    keyval = event->keyval;
+    hardware_keycode = event->hardware_keycode;
+#endif
+    keycode = hardware_keycode;
 
     if (_use_sync_mode) {
         retval = ibus_input_context_process_key_event (context,
-            event->keyval,
-            event->hardware_keycode - 8,
+            keyval,
+            keycode - 8,
             state);
     }
     else {
+        ProcessKeyEventData *data = g_slice_new0 (ProcessKeyEventData);
+#if GTK_CHECK_VERSION (3, 98, 4)
+        data->event = gdk_event_ref (event);
+#else
+        data->event = gdk_event_copy ((GdkEvent *)event);
+#endif
+        data->ibusimcontext = ibusimcontext;
         ibus_input_context_process_key_event_async (context,
-            event->keyval,
-            event->hardware_keycode - 8,
+            keyval,
+            keycode - 8,
             state,
             -1,
             NULL,
             _process_key_event_done,
-            gdk_event_copy ((GdkEvent *) event));
+            data);
 
         retval = TRUE;
     }
 
+    /* GTK4 does not provide gtk_key_snooper_install() and also
+     * GtkIMContextClass->filter_keypress() cannot send the updated
+     * GdkEventKey so event->state is not updated here in GTK4.
+     */
+#if !GTK_CHECK_VERSION (3, 98, 4)
     if (retval)
         event->state |= IBUS_HANDLED_MASK;
     else
         event->state |= IBUS_IGNORED_MASK;
+#endif
 
     return retval;
 }
@@ -425,6 +534,7 @@ _set_content_type (IBusIMContext *context)
 }
 
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
 static gint
 _key_snooper_cb (GtkWidget   *widget,
                  GdkEventKey *event,
@@ -526,7 +636,7 @@ _key_snooper_cb (GtkWidget   *widget,
         ibusimcontext->time = event->time;
     }
 
-    retval = _process_key_event (ibuscontext, event);
+    retval = _process_key_event (ibuscontext, event, ibusimcontext);
 
     if (ibusimcontext != NULL) {
         /* unref ibusimcontext could call ibus_im_context_finalize here
@@ -537,6 +647,7 @@ _key_snooper_cb (GtkWidget   *widget,
 
     return retval;
 }
+#endif
 
 static gboolean
 _get_boolean_env(const gchar *name,
@@ -599,7 +710,11 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     im_context_class->focus_out = ibus_im_context_focus_out;
     im_context_class->filter_keypress = ibus_im_context_filter_keypress;
     im_context_class->get_preedit_string = ibus_im_context_get_preedit_string;
+#if GTK_CHECK_VERSION (3, 98, 4)
+    im_context_class->set_client_widget = ibus_im_context_set_client_widget;
+#else
     im_context_class->set_client_window = ibus_im_context_set_client_window;
+#endif
     im_context_class->set_cursor_location = ibus_im_context_set_cursor_location;
     im_context_class->set_use_preedit = ibus_im_context_set_use_preedit;
     im_context_class->set_surrounding = ibus_im_context_set_surrounding;
@@ -630,8 +745,10 @@ ibus_im_context_class_init (IBusIMContextClass *class)
         g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (class));
     g_assert (_signal_retrieve_surrounding_id != 0);
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
     _use_key_snooper = !_get_boolean_env ("IBUS_DISABLE_SNOOPER",
                                           !(ENABLE_SNOOPER));
+#endif
     _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
     _use_discard_password = _get_boolean_env ("IBUS_DISCARD_PASSWORD", FALSE);
 
@@ -656,6 +773,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     g_strfreev (apps);                                                  \
 }
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
     /* env IBUS_DISABLE_SNOOPER does not exist */
     if (_use_key_snooper) {
         /* disable snooper if app is in _no_snooper_apps */
@@ -664,6 +782,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
                                         _no_snooper_apps,
                                         FALSE);
     }
+#endif
     if (!_use_discard_password) {
         CHECK_APP_IN_CSV_ENV_VARIABLES (_use_discard_password,
                                         IBUS_DISCARD_PASSWORD_APPS,
@@ -686,6 +805,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
     }
 
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
     /* always install snooper */
     if (_key_snooper_id == 0) {
 #pragma GCC diagnostic push
@@ -693,6 +813,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
         _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
 #pragma GCC diagnostic pop
     }
+#endif
 
     _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                               ibus_bus_get_service_name (_bus),
@@ -706,6 +827,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 static void
 ibus_im_context_class_fini (IBusIMContextClass *class)
 {
+#if !GTK_CHECK_VERSION (3, 98, 4)
     if (_key_snooper_id != 0) {
         IDEBUG ("snooper is terminated.");
 #pragma GCC diagnostic push
@@ -714,6 +836,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
 #pragma GCC diagnostic pop
         _key_snooper_id = 0;
     }
+#endif
 
     g_bus_unwatch_name (_daemon_name_watch_id);
 }
@@ -849,7 +972,11 @@ ibus_im_context_finalize (GObject *obj)
         ibus_proxy_destroy ((IBusProxy *)ibusimcontext->ibuscontext);
     }
 
+#if GTK_CHECK_VERSION (3, 98, 4)
+    ibus_im_context_set_client_widget ((GtkIMContext *)ibusimcontext, NULL);
+#else
     ibus_im_context_set_client_window ((GtkIMContext *)ibusimcontext, NULL);
+#endif
 
     if (ibusimcontext->slave) {
         g_object_unref (ibusimcontext->slave);
@@ -864,8 +991,13 @@ ibus_im_context_finalize (GObject *obj)
         pango_attr_list_unref (ibusimcontext->preedit_attrs);
     }
 
+#if GTK_CHECK_VERSION (3, 98, 4)
+    g_queue_free_full (ibusimcontext->events_queue,
+                       (GDestroyNotify)gdk_event_unref);
+#else
     g_queue_free_full (ibusimcontext->events_queue,
                        (GDestroyNotify)gdk_event_free);
+#endif
 
     G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -902,7 +1034,11 @@ ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
 
 static gboolean
 ibus_im_context_filter_keypress (GtkIMContext *context,
+#if GTK_CHECK_VERSION (3, 98, 4)
+                                 GdkEvent     *event)
+#else
                                  GdkEventKey  *event)
+#endif
 {
     IDEBUG ("%s", __FUNCTION__);
 
@@ -917,6 +1053,15 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
     if (!ibusimcontext->has_focus)
         return gtk_im_context_filter_keypress (ibusimcontext->slave, event);
 
+#if GTK_CHECK_VERSION (3, 98, 4)
+    {
+        GdkModifierType state = gdk_event_get_modifier_state (event);
+        if (state & IBUS_HANDLED_MASK)
+            return TRUE;
+        if (state & IBUS_IGNORED_MASK)
+            return ibus_im_context_commit_event (ibusimcontext, event);
+    }
+#else
     if (event->state & IBUS_HANDLED_MASK)
         return TRUE;
 
@@ -931,17 +1076,28 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
     if (ibusimcontext->client_window == NULL && event->window != NULL)
         gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext,
                                           event->window);
+#endif
 
     _request_surrounding_text (ibusimcontext);
 
+#if GTK_CHECK_VERSION (3, 98, 4)
+    ibusimcontext->time = gdk_event_get_time (event);
+    ibusimcontext->surface= gdk_event_get_surface (event);
+    ibusimcontext->device = gdk_event_get_device (event);
+    gdk_event_get_position (event, &ibusimcontext->x, &ibusimcontext->y);
+#else
     ibusimcontext->time = event->time;
+#endif
 
     if (ibusimcontext->ibuscontext) {
-        if (_process_key_event (ibusimcontext->ibuscontext, event))
+        if (_process_key_event (ibusimcontext->ibuscontext,
+                                event,
+                                ibusimcontext)) {
             return TRUE;
-        else
+        } else {
             return gtk_im_context_filter_keypress (ibusimcontext->slave,
                                                    event);
+        }
     }
 
     /* At this point we _should_ be waiting for the IBus context to be
@@ -952,12 +1108,21 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
                           ibus_bus_is_connected (_bus) == FALSE,
                           FALSE);
     g_queue_push_tail (ibusimcontext->events_queue,
+#if GTK_CHECK_VERSION (3, 98, 4)
+                       gdk_event_ref (event));
+#else
                        gdk_event_copy ((GdkEvent *)event));
+#endif
 
     if (g_queue_get_length (ibusimcontext->events_queue) > MAX_QUEUED_EVENTS) {
         g_warning ("Events queue growing too big, will start to drop.");
+#if GTK_CHECK_VERSION (3, 98, 4)
+        gdk_event_unref ((GdkEvent *)
+                         g_queue_pop_head (ibusimcontext->events_queue));
+#else
         gdk_event_free ((GdkEvent *)
                         g_queue_pop_head (ibusimcontext->events_queue));
+#endif
     }
 
     return TRUE;
@@ -966,26 +1131,29 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
 static void
 ibus_im_context_focus_in (GtkIMContext *context)
 {
-    IDEBUG ("%s", __FUNCTION__);
-
     IBusIMContext *ibusimcontext = (IBusIMContext *) context;
+    GtkWidget *widget = NULL;
+
+    IDEBUG ("%s", __FUNCTION__);
 
     if (ibusimcontext->has_focus)
         return;
 
     /* don't set focus on password entry */
+#if GTK_CHECK_VERSION (3, 98, 4)
+    widget = ibusimcontext->client_window;
+#else
     if (ibusimcontext->client_window != NULL) {
-        GtkWidget *widget;
-
         gdk_window_get_user_data (ibusimcontext->client_window,
                                   (gpointer *)&widget);
 
-        if (GTK_IS_ENTRY (widget) &&
-            !gtk_entry_get_visibility (GTK_ENTRY (widget))) {
-            return;
-        }
     }
+#endif
 
+    if (widget && GTK_IS_ENTRY (widget) &&
+        !gtk_entry_get_visibility (GTK_ENTRY (widget))) {
+        return;
+    }
     /* Do not call gtk_im_context_focus_out() here.
      * google-chrome's notification popup window (Pushbullet)
      * takes the focus and the popup window disappears.
@@ -1014,10 +1182,10 @@ ibus_im_context_focus_in (GtkIMContext *context)
 
     /* set_cursor_location_internal() will get origin from X server,
      * it blocks UI. So delay it to idle callback. */
-    gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
-                               (GSourceFunc) _set_cursor_location_internal,
-                               g_object_ref (ibusimcontext),
-                               (GDestroyNotify) g_object_unref);
+    g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                     (GSourceFunc) _set_cursor_location_internal,
+                     g_object_ref (ibusimcontext),
+                     (GDestroyNotify) g_object_unref);
 
     /* retrieve the initial surrounding-text (regardless of whether
      * the current IBus engine needs surrounding-text) */
@@ -1122,7 +1290,7 @@ ibus_im_context_get_preedit_string (GtkIMContext   *context,
 }
 
 
-#if !GTK_CHECK_VERSION (3, 93, 0)
+#if !GTK_CHECK_VERSION (3, 98, 4)
 /* Use the button-press-event signal until GtkIMContext always emits the reset
  * signal.
  * https://gitlab.gnome.org/GNOME/gtk/merge_requests/460
@@ -1171,8 +1339,15 @@ _connect_button_press_event (IBusIMContext *ibusimcontext,
 }
 #endif
 
+#if GTK_CHECK_VERSION (3, 98, 4)
 static void
-ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
+ibus_im_context_set_client_widget (GtkIMContext *context,
+                                   GtkWidget    *client)
+#else
+static void
+ibus_im_context_set_client_window (GtkIMContext *context,
+                                   GdkWindow    *client)
+#endif
 {
     IBusIMContext *ibusimcontext;
 
@@ -1181,7 +1356,7 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
     ibusimcontext = IBUS_IM_CONTEXT (context);
 
     if (ibusimcontext->client_window) {
-#if !GTK_CHECK_VERSION (3, 93, 0)
+#if !GTK_CHECK_VERSION (3, 98, 4)
         if (ibusimcontext->use_button_press_event)
             _connect_button_press_event (ibusimcontext, FALSE);
 #endif
@@ -1191,26 +1366,41 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
 
     if (client != NULL) {
         ibusimcontext->client_window = g_object_ref (client);
-#if !GTK_CHECK_VERSION (3, 93, 0)
+#if !GTK_CHECK_VERSION (3, 98, 4)
         if (!ibusimcontext->use_button_press_event)
             _connect_button_press_event (ibusimcontext, TRUE);
 #endif
     }
+#if GTK_CHECK_VERSION (3, 98, 4)
+    if (ibusimcontext->slave)
+        gtk_im_context_set_client_widget (ibusimcontext->slave, client);
+#else
     if (ibusimcontext->slave)
         gtk_im_context_set_client_window (ibusimcontext->slave, client);
+#endif
 }
 
 static void
 _set_rect_scale_factor_with_window (GdkRectangle *area,
+#if GTK_CHECK_VERSION (3, 98, 4)
+                                    GtkWidget    *window)
+#else
                                     GdkWindow    *window)
+#endif
 {
 #if GTK_CHECK_VERSION (3, 10, 0)
     int scale_factor;
 
     g_assert (area);
+#if GTK_CHECK_VERSION (3, 98, 4)
+    g_assert (GTK_IS_WIDGET (window));
+
+    scale_factor = gtk_widget_get_scale_factor (window);
+#else
     g_assert (GDK_IS_WINDOW (window));
 
     scale_factor = gdk_window_get_scale_factor (window);
+#endif
     area->x *= scale_factor;
     area->y *= scale_factor;
     area->width *= scale_factor;
@@ -1230,6 +1420,7 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 
     area = ibusimcontext->cursor_area;
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
 #ifdef GDK_WINDOWING_WAYLAND
     if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) {
         gdouble px, py;
@@ -1253,10 +1444,14 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
             area.height);
         return FALSE;
     }
+#endif
 #endif
 
     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
-#if GTK_CHECK_VERSION (2, 91, 0)
+#if GTK_CHECK_VERSION (3, 98, 4)
+        area.x = 0;
+        area.y += gtk_widget_get_height (ibusimcontext->client_window);
+#elif GTK_CHECK_VERSION (2, 91, 0)
         area.x = 0;
         area.y += gdk_window_get_height (ibusimcontext->client_window);
 #else
@@ -1267,9 +1462,39 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 #endif
     }
 
+#if GTK_CHECK_VERSION (3, 93, 0)
+    {
+#if GTK_CHECK_VERSION (3, 98, 4)
+        GtkNative *native = gtk_widget_get_native (
+                ibusimcontext->client_window);
+        GtkRoot *root = gtk_widget_get_root (ibusimcontext->client_window);
+        double nx, ny;
+        double px, py;
+        gtk_native_get_surface_transform (native, &nx, &ny);
+        px = (double)area.x + ibusimcontext->x - nx;
+        py = (double)area.y + ibusimcontext->y - ny;
+        gtk_widget_translate_coordinates (ibusimcontext->client_window,
+                                          (GtkWidget *)root,
+                                          px, py,
+                                          &px, &py);
+        area.x = (int)px;
+        area.y = (int)py;
+#else
+        GtkNative *native = gtk_widget_get_native (
+                ibusimcontext->client_window);
+        GdkSurface *surface = gtk_native_get_surface (native);
+        int root_x = 0;
+        int root_y = 0;
+        gdk_surface_get_position (surface, &root_x, &root_y);
+        area.x += root_x;
+        area.y += root_y;
+#endif
+    }
+#else
     gdk_window_get_root_coords (ibusimcontext->client_window,
                                 area.x, area.y,
                                 &area.x, &area.y);
+#endif
     _set_rect_scale_factor_with_window (&area, ibusimcontext->client_window);
     ibus_input_context_set_cursor_location (ibusimcontext->ibuscontext,
                                             area.x,
@@ -1326,7 +1551,11 @@ get_selection_anchor_point (IBusIMContext *ibusimcontext,
     if (ibusimcontext->client_window == NULL) {
         return cursor_pos;
     }
+#if GTK_CHECK_VERSION (3, 98, 4)
+    widget = ibusimcontext->client_window;
+#else
     gdk_window_get_user_data (ibusimcontext->client_window, (gpointer *)&widget);
+#endif
 
     if (!GTK_IS_TEXT_VIEW (widget)){
         return cursor_pos;
@@ -1440,6 +1669,7 @@ _ibus_context_commit_text_cb (IBusInputContext *ibuscontext,
     _request_surrounding_text (ibusimcontext);
 }
 
+#if !GTK_CHECK_VERSION (3, 98, 4)
 static gboolean
 _key_is_modifier (guint keyval)
 {
@@ -1615,6 +1845,7 @@ _create_gdk_event (IBusIMContext *ibusimcontext,
 out:
     return event;
 }
+#endif
 
 static void
 _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
@@ -1624,9 +1855,32 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
                                     IBusIMContext     *ibusimcontext)
 {
     IDEBUG ("%s", __FUNCTION__);
+#if GTK_CHECK_VERSION (3, 98, 4)
+    int group = 0;
+    g_return_if_fail (GTK_IS_IM_CONTEXT (ibusimcontext));
+    if (keycode == 0 && ibusimcontext->client_window) {
+        GdkDisplay *display = gtk_widget_get_display (ibusimcontext->client_window);
+        GdkKeymapKey *keys = NULL;
+        gint n_keys = 0;
+        if (!gdk_display_map_keyval (display, keyval, &keys, &n_keys))
+            g_warning ("Failed to parse keycode from keyval %x", keyval);
+       keycode = keys->keycode;
+       group = keys->group;
+    }
+    gtk_im_context_filter_key (
+        GTK_IM_CONTEXT (ibusimcontext),
+        (state & IBUS_RELEASE_MASK) ? FALSE : TRUE,
+        ibusimcontext->surface,
+        ibusimcontext->device,
+        ibusimcontext->time,
+        keycode,
+        (GdkModifierType)state,
+        group);
+#else
     GdkEventKey *event = _create_gdk_event (ibusimcontext, keyval, keycode, state);
     gdk_event_put ((GdkEvent *)event);
     gdk_event_free ((GdkEvent *)event);
+#endif
 }
 
 static void
@@ -1660,7 +1914,7 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
         ibusimcontext->preedit_attrs = NULL;
     }
 
-#if !GTK_CHECK_VERSION (3, 93, 0)
+#if !GTK_CHECK_VERSION (3, 98, 4)
     if (!ibusimcontext->use_button_press_event &&
         mode == IBUS_ENGINE_PREEDIT_COMMIT) {
         if (ibusimcontext->client_window) {
@@ -1847,10 +2101,18 @@ _create_input_context_done (IBusBus       *bus,
         }
 
         if (!g_queue_is_empty (ibusimcontext->events_queue)) {
+#if GTK_CHECK_VERSION (3, 98, 4)
+            GdkEvent *event;
+#else
             GdkEventKey *event;
+#endif
             while ((event = g_queue_pop_head (ibusimcontext->events_queue))) {
-                _process_key_event (context, event);
+                _process_key_event (context, event, ibusimcontext);
+#if GTK_CHECK_VERSION (3, 98, 4)
+                gdk_event_unref (event);
+#else
                 gdk_event_free ((GdkEvent *)event);
+#endif
             }
         }
     }
diff --git a/client/gtk4/Makefile.am b/client/gtk4/Makefile.am
new file mode 100644
index 000000000..8d8b31db8
--- /dev/null
+++ b/client/gtk4/Makefile.am
@@ -0,0 +1,66 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2020 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
+# 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
+
+libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	$(NULL)
+
+immoduledir = @GTK4_IM_MODULEDIR@
+immodule_LTLIBRARIES = libim-ibus.la
+
+libim_ibus_la_SOURCES = \
+	ibusim.c \
+	ibusimcontext.c \
+	ibusimcontext.h \
+	$(NULL)
+
+libim_ibus_la_DEPENDENCIES = $(libibus)
+
+libim_ibus_la_CFLAGS = \
+	@GTK4_CFLAGS@ \
+	@DBUS_CFLAGS@ \
+	-DG_LOG_DOMAIN=\"IBUS\" \
+	$(NULL)
+
+libim_ibus_la_LIBADD = \
+	@GTK4_LIBS@ \
+	@DBUS_LIBS@ \
+	$(libibus) \
+	$(NULL)
+libim_ibus_la_LDFLAGS = \
+	-avoid-version \
+	-module \
+	$(NULL)
+
+$(libibus):
+	(cd $(top_builddir)/src; make )
+
+EXTRA_DIST = \
+	$(NULL)
+
+test: all
+	GTK_IM_MODULE=ibus gedit
+
+-include $(top_srcdir)/git.mk
diff --git a/client/gtk4/ibusim.c b/client/gtk4/ibusim.c
new file mode 100644
index 000000000..5ecf9778c
--- /dev/null
+++ b/client/gtk4/ibusim.c
@@ -0,0 +1,52 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et ts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (C) 2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2020 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
+ * 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 <gtk/gtk.h>
+#include <gtk/gtkimmodule.h>
+#include <ibus.h>
+#include "ibusimcontext.h"
+
+G_MODULE_EXPORT void
+g_io_im_ibus_load (GTypeModule *type_module)
+{
+    static gboolean inited = FALSE;
+
+    if (!inited) {
+        ibus_init ();
+        ibus_im_context_register_type (type_module);
+        g_io_extension_point_implement ("gtk-im-module",
+                                        IBUS_TYPE_IM_CONTEXT,
+                                        "ibus",
+                                        50);
+        inited = TRUE;
+    }
+    /* make module resident */
+    g_type_module_use (type_module);
+}
+
+G_MODULE_EXPORT void
+g_io_im_ibus_unload (GTypeModule *type_module)
+{
+    g_type_module_unuse (type_module);
+}
+
diff --git a/client/gtk4/ibusimcontext.c b/client/gtk4/ibusimcontext.c
new file mode 120000
index 000000000..41896f052
--- /dev/null
+++ b/client/gtk4/ibusimcontext.c
@@ -0,0 +1 @@
+../gtk2/ibusimcontext.c
\ No newline at end of file
diff --git a/client/gtk4/ibusimcontext.h b/client/gtk4/ibusimcontext.h
new file mode 120000
index 000000000..29759883e
--- /dev/null
+++ b/client/gtk4/ibusimcontext.h
@@ -0,0 +1 @@
+../gtk2/ibusimcontext.h
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 9ed5cb664..ffea33174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,15 @@ AC_ARG_ENABLE(gtk3,
 )
 AM_CONDITIONAL([ENABLE_GTK3], [test x"$enable_gtk3" = x"yes"])
 
+# --enable-gtk4 option.
+AC_ARG_ENABLE(gtk4,
+    AS_HELP_STRING([--enable-gtk4],
+                   [Build gtk4 im module]),
+    [enable_gtk4=$enableval],
+    [enable_gtk4=no]
+)
+AM_CONDITIONAL([ENABLE_GTK4], [test x"$enable_gtk4" = x"yes"])
+
 # --disable-xim option.
 AC_ARG_ENABLE(xim,
     AS_HELP_STRING([--disable-xim],
@@ -257,6 +266,18 @@ if test x"$enable_gdk3_wayland" != x"yes"; then
 fi
 AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"])
 
+if test x"$enable_gtk4" = x"yes"; then
+    # check for gtk4
+    PKG_CHECK_MODULES(GTK4, [
+        gtk4
+    ])
+
+    gtk4_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk4`
+    GTK4_IM_MODULEDIR="$libdir"/gtk-4.0/$gtk4_binary_version/immodules
+else
+    enable_gtk4="no (disabled, use --enable-gtk4 to enable)"
+fi
+
 if test x"$enable_xim" = x"yes"; then
     # Check for x11
     PKG_CHECK_MODULES(X11, [
@@ -478,6 +499,14 @@ AC_ARG_WITH(gtk3-im-module-dir,
 )
 AC_SUBST(GTK3_IM_MODULEDIR)
 
+# Define gtk4 immodule dir.
+AC_ARG_WITH(gtk4-im-module-dir,
+    AS_HELP_STRING([--with-gtk4-im-module-dir[=DIR]],
+        [Select gtk4 immodule dir]),
+    GTK4_IM_MODULEDIR=$with_gtk4_im_module_dir
+)
+AC_SUBST(GTK4_IM_MODULEDIR)
+
 if test x"$enable_python" = x"yes"; then
     # Check for dbus-python.
     AC_ARG_ENABLE(dbus-python-check,
@@ -737,6 +766,7 @@ ibus.spec
 client/Makefile
 client/gtk2/Makefile
 client/gtk3/Makefile
+client/gtk4/Makefile
 client/x11/Makefile
 client/wayland/Makefile
 src/Makefile
@@ -786,8 +816,10 @@ Build options:
   Enable python2                $enable_python2
   Gtk2 immodule dir             $GTK2_IM_MODULEDIR
   Gtk3 immodule dir             $GTK3_IM_MODULEDIR
+  Gtk4 immodule dir             $GTK4_IM_MODULEDIR
   Build gtk2 immodule           $enable_gtk2
   Build gtk3 immodule           $enable_gtk3
+  Build gtk4 immodule           $enable_gtk4
   Build XIM agent server        $enable_xim
   Build wayland support         $enable_wayland
   Build gdk3 wayland support    $enable_gdk3_wayland

From d0a47c3c82b1a0c263ff8b95f9cf5c0a5d1f228d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 8 Jan 2021 18:48:13 +0900
Subject: [PATCH 702/816] client/gtk2: Add XTranslateCoordinates for GTK4 X11
 coordinate

GdkWindow had the absolute coordiante in the private class in GTK3
but the absolute coordiane no longer exists in GTK4 for Wayland.
Now get the toplevel window coordiante for the warkaround in GTK4
but the coordiante of the inner widgets is no longer available too.

BUG=https://gitlab.gnome.org/GNOME/gtk/-/issues/3024#note_987835
---
 client/gtk2/ibusimcontext.c | 47 ++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index a23fc2e35..e153081df 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -39,6 +39,13 @@
 #endif
 #endif
 
+#ifdef GDK_WINDOWING_X11
+#if GTK_CHECK_VERSION (3, 98, 4)
+#include <gdk/x11/gdkx.h>
+#include <X11/Xlib.h>
+#endif
+#endif
+
 #if !GTK_CHECK_VERSION (2, 91, 0)
 #  define DEPRECATED_GDK_KEYSYMS 1
 #endif
@@ -1462,24 +1469,33 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 #endif
     }
 
-#if GTK_CHECK_VERSION (3, 93, 0)
-    {
 #if GTK_CHECK_VERSION (3, 98, 4)
+#ifdef GDK_WINDOWING_X11
+    GdkDisplay *display = gtk_widget_get_display (ibusimcontext->client_window);
+    if (GDK_IS_X11_DISPLAY (display)) {
+        Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+        Window root_window = gdk_x11_display_get_xrootwindow (display);
         GtkNative *native = gtk_widget_get_native (
                 ibusimcontext->client_window);
-        GtkRoot *root = gtk_widget_get_root (ibusimcontext->client_window);
-        double nx, ny;
-        double px, py;
-        gtk_native_get_surface_transform (native, &nx, &ny);
-        px = (double)area.x + ibusimcontext->x - nx;
-        py = (double)area.y + ibusimcontext->y - ny;
-        gtk_widget_translate_coordinates (ibusimcontext->client_window,
-                                          (GtkWidget *)root,
-                                          px, py,
-                                          &px, &py);
-        area.x = (int)px;
-        area.y = (int)py;
-#else
+        GdkSurface *surface = gtk_native_get_surface (native);
+        /* The window is the toplevel window but not the inner text widget.
+         * Unfortunatelly GTK4 cannot get the coordinate of the text widget.
+         */
+        Window window = gdk_x11_surface_get_xid (surface);
+        Window child;
+        int x, y;
+        XTranslateCoordinates (xdisplay, window, root_window,
+                               0, 0, &x, &y, &child);
+        XWindowAttributes xwa;
+        XGetWindowAttributes (xdisplay, window, &xwa);
+        area.x = x - xwa.x + area.x;
+        area.y = y - xwa.y + area.y;
+        area.width = xwa.width;
+        area.height = xwa.height;
+    }
+#endif
+#elif GTK_CHECK_VERSION (3, 93, 0)
+    {
         GtkNative *native = gtk_widget_get_native (
                 ibusimcontext->client_window);
         GdkSurface *surface = gtk_native_get_surface (native);
@@ -1488,7 +1504,6 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
         gdk_surface_get_position (surface, &root_x, &root_y);
         area.x += root_x;
         area.y += root_y;
-#endif
     }
 #else
     gdk_window_get_root_coords (ibusimcontext->client_window,

From ef4c5c7ef790ce1f80e94a5463e110ed4bae254e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 20 Jan 2021 17:26:47 +0900
Subject: [PATCH 703/816] setup: Search engine name directly

Currently users can search language names only in the language list
in ibus-setup. After a language is selected and open, engine names can
be searched.
Now engine names also can be searched in the language list.
---
 setup/enginedialog.py | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index 72deada88..e1c322bf9 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -4,7 +4,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2013-2015 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -112,15 +112,20 @@ def __list_filter(self, row, data):
             return False
         if self.__filter_word == None:
             return True
+        if row.back:
+            return True
 
-        name = row.name.lower()
-        untrans = row.untrans.lower()
-        if self.__filter_word != None:
-            word = self.__filter_word.lower()
-            if name.startswith(word):
-                return True
-            if untrans.startswith(word):
-                return True
+        word = self.__filter_word.lower()
+        if word in row.name.lower():
+            return True
+        if word in row.untrans.lower():
+            return True
+        if row.lang_info and row.name in self.__engines_for_lang:
+            for row_e in self.__engines_for_lang[row.name]:
+                if word in row_e.name.lower():
+                    return True
+                if word in row_e.untrans.lower():
+                    return True
         return False
 
 
@@ -129,11 +134,9 @@ def __row_activated(self, box, row):
             self.__show_more()
             return
         if row.back:
-            self.__filter_entry.set_text('')
             self.__show_lang_rows()
             return
         if row.lang_info:
-            self.__filter_entry.set_text('')
             self.__show_engines_for_lang(row)
             return
 
@@ -232,6 +235,7 @@ def __engine_row_new(self, engine):
         description = i18n.gettext_engine_description(engine)
         row = self.__list_box_row_new(longname)
         row.untrans = engine.get_longname()
+        row.rank = engine.get_rank()
         row.set_tooltip_text(description)
         row.engine = engine
         widget = self.__padded_label_new(longname,
@@ -260,16 +264,13 @@ def __add_engine_rows_for_lang(self, row):
         lang = row.name
 
         def cmp_engine(a, b):
-            if a.get_rank() == b.get_rank():
-                a_longname = i18n.gettext_engine_longname(a)
-                b_longname = i18n.gettext_engine_longname(b)
-                return locale.strcoll(a_longname, b_longname)
-            return int(b.get_rank() - a.get_rank())
+            if a.rank == b.rank:
+                return locale.strcoll(a.name, b.name)
+            return int(b.rank - a.rank)
 
         self.__engines_for_lang[lang].sort(
                 key = functools.cmp_to_key(cmp_engine))
-        for e in self.__engines_for_lang[lang]:
-            row = self.__engine_row_new(e)
+        for row in self.__engines_for_lang[lang]:
             self.__list.add(row)
 
 
@@ -329,7 +330,8 @@ def set_engines(self, engines):
             if l not in self.__engines_for_lang:
                 self.__engines_for_lang[l] = []
             i18n.init_textdomain(e.get_textdomain())
-            self.__engines_for_lang[l].append(e)
+            row = self.__engine_row_new(e)
+            self.__engines_for_lang[l].append(row)
 
             # Retrieve Untranslated language names.
             untrans = IBus.get_untranslated_language_name(e.get_language())

From 2d4925645f6f08deef89cf7b8e2d2a9da80939b3 Mon Sep 17 00:00:00 2001
From: scootergrisen <scootergrisen@gmail.com>
Date: Sun, 21 Feb 2021 00:33:27 +0900
Subject: [PATCH 704/816] po: Update translation (Danish)

Update po/da.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/da/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/da.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/po/da.po b/po/da.po
index 789c95379..be085eec4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # Danish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-28 14:29+0000\n"
+"PO-Revision-Date: 2020-10-01 11:30+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/da/>\n"
@@ -307,6 +307,9 @@ msgid ""
 "language if the value is true and choose them from the desktop locale if the "
 "value is false."
 msgstr ""
+"Nogle kodepunkter beslutter glyffer for de forskellige glyffer og Pango fra "
+"sprogattributten. Pango vælger glyffer fra IBus-motorens sprog hvis værdien "
+"er sand og vælger dem fra skrivebordets lokalitet hvis værdien er falsk."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
@@ -2965,7 +2968,7 @@ msgstr "Symboler og piktogrammer udvidet-A"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
 msgid "Symbols for Legacy Computing"
-msgstr ""
+msgstr "Symboler for udgået computer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:

From abca46492977e842e49434cb5b784bd829f3a527 Mon Sep 17 00:00:00 2001
From: Tawsif Hossain Shafi <tenshou170@outlook.com>
Date: Sun, 21 Feb 2021 00:33:44 +0900
Subject: [PATCH 705/816] po: Update translation (Bengali)

Update po/bn.po at 69.8%
https://translate.fedoraproject.org/projects/ibus/ibus/bn/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/bn.po | 61 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/po/bn.po b/po/bn.po
index 8d4129133..d1fc97bfd 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,6 +1,6 @@
-# translation of ibus.pot to Bengali
 # Bengali translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,20 +12,22 @@
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2009
 # runab <runab@redhat.com>, 2009, 2010
 # runab <runab@redhat.com>, 2009-2010
+# Tawsif Hossain Shafi <tenshou170@outlook.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2015-07-13 19:48+0900\n"
-"PO-Revision-Date: 2014-02-18 12:45-0500\n"
-"Last-Translator: Ayesha Akhtar <ayesha@ankur.org.bd>\n"
-"Language-Team: Bengali <trans-bn@lists.fedoraproject.org>\n"
+"PO-Revision-Date: 2020-10-22 17:25+0000\n"
+"Last-Translator: Tawsif Hossain Shafi <tenshou170@outlook.com>\n"
+"Language-Team: Bengali <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/bn/>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Weblate 4.3.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -57,11 +59,11 @@ msgstr "স্বনির্ধারিত"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "দেখাবেন না"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "স্বয়ংক্রিয়ভাবে লুকান"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
@@ -129,7 +131,7 @@ msgstr "ভাষার বার প্রদর্শন ও আড়াল ক
 
 #: ../setup/setup.ui.h:25
 msgid "Show property panel:"
-msgstr ""
+msgstr "প্রপার্টি প্যানেল প্রদর্শন করুন:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
@@ -230,6 +232,9 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
+"<small><i>সক্রিয় ইনপুট পদ্ধতিটি উপরের তালিকার নির্বাচিতগুলি থেকে কীবোর্ড "
+"শর্টকাট কীগুলি চেপে বা প্যানেল আইকনে ক্লিক করে পরিবর্তন করা যেতে "
+"পারে।</i></small>"
 
 #. create im name & icon column
 #: ../setup/setup.ui.h:48 ../setup/enginetreeview.py:68
@@ -269,6 +274,12 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>একটি ইনটেলিজেন্ট ইনপুট বাস</small>\n"
+"হোমপেজঃ https://github.com/ibus/ibus/wiki\n"
+"\n"
+"\n"
+"\n"
 
 #: ../setup/setup.ui.h:62
 msgid "Start ibus on login"
@@ -299,40 +310,48 @@ msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি প
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Engines order"
-msgstr ""
+msgstr "ইঞ্জিনের অর্ডার"
 
 #: ../data/ibus.schemas.in.h:6
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "ইনপুট পদ্ধতি তালিকায় সংরক্ষিত ইঞ্জিনগুলো অর্ডার"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
+msgstr "আইএমই সুইচ পপআপের বিলম্ব (মিলিসেকেন্ড এ)"
 
 #: ../data/ibus.schemas.in.h:8
+#, fuzzy
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is 400."
 " 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
 "show the window and switch prev/next engines."
 msgstr ""
+"আইএমই স্যুইচার উইন্ডোটি দেখানোর জন্য পপআপ বিলম্ব মিলিসেকেন্ড এ সেট করুন। "
+"ডিফল্টে হচ্ছে 400.0 =তাত্ক্ষণিকভাবে উইন্ডোটি দেখান। ০ &lt; মিলিসেকেন্ডে "
+"বিলম্ব। ০ &gt; উইন্ডোটি প্রদর্শন করবেন না এবং পূর্ববর্তী / পরবর্তী "
+"ইঞ্জিনগুলোতে স্যুইচ করবেন না।"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Saved version number"
-msgstr ""
+msgstr "সংরক্ষিত ভার্সন নাম্বার"
 
 #: ../data/ibus.schemas.in.h: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 ""
+"সংরক্ষিত ভার্সন নাম্বারটি পূর্ববর্তী ইন্সটল করা আইবাস এবং বর্তমানে আইবাসের "
+"একটির সাথে পার্থক্য দেখার জন্য ব্যবহৃত করা হবে।"
 
 #: ../data/ibus.schemas.in.h:11
 msgid "Latin layouts which have no ASCII"
-msgstr ""
+msgstr "ASCII নেই যেসব ল্যাটিন লেআউটগুলো"
 
 #: ../data/ibus.schemas.in.h:12
 msgid "US layout is appended to the latin layouts. variant can be omitted."
 msgstr ""
+"US লেআউটটি ল্যাটিন লেআউটে সংযুক্ত করা হয়েছে। বৈকল্পিক বাদ দেওয়া যেতে পারে।"
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
@@ -494,21 +513,21 @@ msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্য
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Use global input method"
-msgstr "সার্বজনীন ইনপুট পদ্ধতি "
+msgstr "গ্লোবাল ইনপুট পদ্ধতি ব্যবহার করুন"
 
 #: ../data/ibus.schemas.in.h:54
 msgid "Enable input method by default"
-msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
+msgstr "ডিফল্ট ভাবে ইনপুট পদ্ধতি সক্রিয় করুন"
 
 #: ../data/ibus.schemas.in.h:55
+#, fuzzy
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট "
-"পদ্ধতি সক্রিয় করা হবে"
+msgstr "অ্যাপ্লিকেশনটি ইনপুট ফোকাস পেলে ডিফল্ট ভাবে ইনপুট পদ্ধতি সক্রিয় করুন"
 
 #: ../data/ibus.schemas.in.h:56
+#, fuzzy
 msgid "DConf preserve name prefixes"
-msgstr ""
+msgstr "DConf নাম উপসর্গ সংরক্ষণ করে"
 
 #: ../data/ibus.schemas.in.h:57
 msgid "Prefixes of DConf keys to stop name conversion"
@@ -556,7 +575,7 @@ msgstr "বাতিল (_C)"
 
 #: ../setup/enginedialog.py:205
 msgid "More…"
-msgstr ""
+msgstr "আরও…"
 
 #: ../setup/enginetreeview.py:96
 msgid "Kbd"
@@ -648,7 +667,7 @@ msgstr ""
 #: ../tools/main.vala:90
 #, c-format
 msgid "language: %s\n"
-msgstr ""
+msgstr "ভাষা: %s\n"
 
 #: ../tools/main.vala:158
 msgid "No engine is set.\n"

From c62043f4db825cfda57d2cb54e8d8a74d922cba3 Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Sun, 21 Feb 2021 00:33:56 +0900
Subject: [PATCH 706/816] po: Update translation (Spanish)

Update po/es.po at 96.5%
https://translate.fedoraproject.org/projects/ibus/ibus/es/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/es.po | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/po/es.po b/po/es.po
index 8ba7d671f..a63feadc3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -24,13 +24,14 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2019. #zanata
 # Emilio Herrera <ehespinosa57@gmail.com>, 2020.
+# Adolfo Jayme Barrientos <fitoschido@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-07 13:29+0000\n"
-"Last-Translator: Emilio Herrera <ehespinosa57@gmail.com>\n"
+"PO-Revision-Date: 2020-10-18 00:04+0000\n"
+"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/es/>\n"
 "Language: es\n"
@@ -38,7 +39,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.3\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -304,24 +305,25 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
-msgstr "Usar fuente personalizada"
+msgstr "Utilizar tipo de letra personalizado"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr "Usar nombre de fuente personalizado para el panel de idioma"
+msgstr "Utilizar tipo de letra personalizado para el panel de idiomas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
 #: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
-msgstr "Fuente personalizada"
+msgstr "Tipo de letra personalizado"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "Nombre de fuente personalizado para el panel de idioma"
+msgstr "Tipo de letra personalizado para el panel de idiomas"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
 msgid "Choose glyphs with input method's language on candidate window"
-msgstr "Elegir glyphs con el idioma del método de entrada en la ventana"
+msgstr ""
+"Elegir glifos en el idioma del método de entrada en la ventana de candidatos"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:171
 msgid ""
@@ -350,7 +352,7 @@ msgstr "Los atajos de teclado para activar y desactivar la escritura de emoji"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
-"Nombre de fuente personalizada para caracteres emoji en el diálogo de emoji"
+"Tipo de letra personalizado para caracteres emoyi en el diálogo de emoyis"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
@@ -723,11 +725,11 @@ msgstr ""
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
-msgstr "Usar fuente personalizada:"
+msgstr "Utilizar tipo de letra personalizado:"
 
 #: setup/setup.ui:562 setup/setup.ui:1156
 msgid "<b>Font and Style</b>"
-msgstr "<b>Fuente y Estilo</b>"
+msgstr "<b>Tipo de letra y estilo</b>"
 
 #: setup/setup.ui:579
 msgid "General"
@@ -817,11 +819,12 @@ msgstr "Código Unicode:"
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "Fuente a usar para los candidatos Unicode en el cuadro de emoji."
+msgstr ""
+"Establecer el tipo de letra de los candidatos Unicode en el diálogo de emoyis"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
-msgstr "Fuente Unicode:"
+msgstr "Tipo de letra Unicode:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
@@ -878,10 +881,8 @@ msgid ""
 msgstr ""
 
 #: setup/setup.ui:1327
-#, fuzzy
-#| msgid "<b>Font and Style</b>"
 msgid "<b>Fonts</b>"
-msgstr "<b>Fuente y Estilo</b>"
+msgstr "<b>Tipos de letra</b>"
 
 #: setup/setup.ui:1347
 msgid "Advanced"
@@ -3327,11 +3328,11 @@ msgstr "Se copió un emoji al portapapeles."
 #.
 #: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "FUENTE para los emoji en el cuadro de diálogo de emoji"
+msgstr "«TIPODELETRA» para los emoyis en el diálogo de emoyis"
 
 #: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
-msgstr "FUENTE"
+msgstr "TIPODELETRA"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG

From 54224eee95f6cd7e4dc9ad86a3bc34b1f667a073 Mon Sep 17 00:00:00 2001
From: Emilio Herrera <ehespinosa57@gmail.com>
Date: Sun, 21 Feb 2021 00:34:00 +0900
Subject: [PATCH 707/816] po: Update translation (Spanish)

Update po/es.po at 96.5%
https://translate.fedoraproject.org/projects/ibus/ibus/es/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/es.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/es.po b/po/es.po
index a63feadc3..47f9de101 100644
--- a/po/es.po
+++ b/po/es.po
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-10-18 00:04+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"PO-Revision-Date: 2020-10-22 17:25+0000\n"
+"Last-Translator: Emilio Herrera <ehespinosa57@gmail.com>\n"
 "Language-Team: Spanish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/es/>\n"
 "Language: es\n"
@@ -39,7 +39,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3\n"
+"X-Generator: Weblate 4.3.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -566,7 +566,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "Por favor, presione una tecla (o combinación de teclas)"
+msgstr "Por favor, presione una tecla (o una combinación de teclas)"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -763,7 +763,7 @@ msgstr ""
 
 #: setup/setup.ui:718
 msgid "_Down"
-msgstr "_Bajar"
+msgstr "_Abajo"
 
 #: setup/setup.ui:725
 msgid "Move down the selected input method in the enabled input methods"

From 54652f5d8dc73ad27b5bf0a9a94731f6bcb61669 Mon Sep 17 00:00:00 2001
From: Henrique Roberto Gattermann Mittelstaedt <henrique.roberto97@gmail.com>
Date: Sun, 21 Feb 2021 00:34:10 +0900
Subject: [PATCH 708/816] po: Update translation (Portuguese (Brazil))

Update po/pt_BR.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/pt_BR/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/pt_BR.po | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 165c24e52..f055cbe74 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # Portuguese (Brazil) translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -16,21 +16,23 @@
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Cássio Rodrigo Honorato Rodrigues <cassiorhr@outlook.com>, 2019. #zanata
 # Rafael Fontenelle <rafaelff@gnome.org>, 2020.
+# Henrique Roberto Gattermann Mittelstaedt <henrique.roberto97@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
-"PO-Revision-Date: 2020-01-05 18:49+0000\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
-"Language-Team: Portuguese (Brazil) <https://translate.stg.fedoraproject.org/"
+"PO-Revision-Date: 2020-11-30 11:35+0000\n"
+"Last-Translator: Henrique Roberto Gattermann Mittelstaedt <henrique."
+"roberto97@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -198,8 +200,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
-"O comportamento do painel de propriedades. 0 = Não mostrar, 1 =  Ocultar "
-"automaticamente,  2 = Sempre mostrar"
+"O comportamento do painel de propriedades. 0 = Não mostrar, 1 = Ocultar "
+"automaticamente, 2 = Sempre mostrar"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -3260,7 +3262,7 @@ msgstr "Emoji copiado para a sua área de transferência."
 #. 
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "\"FONTE\" para caracteres  no diálogo emoji"
+msgstr "\"FONTE\" para caracteres no diálogo emoji"
 
 #: ui/gtk3/emojierapp.vala:115
 msgid "FONT"

From fece06e271c8a734ebb261f6ddfa197646144c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 21 Feb 2021 00:34:32 +0900
Subject: [PATCH 709/816] po: Update translation (Polish)

Update po/pl.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/pl/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/pl.po | 60 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 2f40f9717..364549f36 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,24 +1,17 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2014, 2020.
-# Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2016. #zanata, 2020.
-# Piotr Drąg <piotrdrag@gmail.com>, 2017. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2018. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata, 2020.
+# fujiwara <takao.fujiwara1@gmail.com>, 2015, 2017.
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-05 07:53+0000\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-16 12:24+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/pl/>\n"
@@ -28,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -473,7 +466,7 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Więcej…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "O programie"
 
@@ -3273,7 +3266,7 @@ msgid "Alias: %s"
 msgstr "Alias: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Wybór emoji"
 
@@ -3337,23 +3330,48 @@ msgstr "Dopasowywanie o podanym warunku jako liczba całkowita"
 msgid "IBus Panel"
 msgstr "Panel IBus"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Skonfigurowana metoda wprowadzania %s nie istnieje w metodach wprowadzania "
+"usługi IBus, więc zamiast niej skonfigurowano układ „US”."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Co najmniej jedna ze skonfigurowanych metod wprowadzania nie istnieje w "
+"metodach wprowadzania usługi IBus."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Proszę wykonać polecenie „ibus-setup”, otworzyć kartę „Metoda wprowadzania” "
+"i ponownie skonfigurować metody wprowadzania."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
-msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2020"
+msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009-2021"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Zakończ"
 

From ceea329ab60a49905fac8b086f05d4033c114658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Sun, 21 Feb 2021 00:34:39 +0900
Subject: [PATCH 710/816] po: Update translation (Turkish)

Update po/tr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/tr/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/tr.po | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index ba6d63526..cfb08bbc7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,16 +1,16 @@
 # Turkish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Serdar Sağlam <teknomobil@msn.com>, 2019. #zanata
-# Oğuz Ersen <oguzersen@protonmail.com>, 2019, 2020.
+# Oğuz Ersen <oguzersen@protonmail.com>, 2019, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-07 13:29+0000\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-17 12:37+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: Turkish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/tr/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -456,7 +456,7 @@ msgstr "_Tamam"
 msgid "More…"
 msgstr "Daha fazla…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "Hakkında"
 
@@ -3248,7 +3248,7 @@ msgid "Alias: %s"
 msgstr "Takma ad: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Emoji Seçimi"
 
@@ -3312,25 +3312,50 @@ msgstr "Belirtilen tamsayı koşuluyla eşleştir"
 msgid "IBus Panel"
 msgstr "IBus Paneli"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Yapılandırılan giriş yönteminiz %s IBus giriş yöntemlerinde mevcut değil, bu "
+"nedenle giriş yönteminiz yerine \"US\" düzeni yapılandırıldı."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Yapılandırılan giriş yöntemlerinizden en az biri IBus giriş yöntemlerinde "
+"mevcut değil."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Lütfen `ibus-setup` komutunu çalıştırın, \"Giriş Yöntemi\" sekmesini açın ve "
+"giriş yöntemlerinizi yeniden yapılandırın."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus, Linux/Unix için akıllı bir giriş veri yoludur."
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Serdar Sağlam <teknomobil@yandex.com>\n"
 "Oğuz Ersen <oguzersen@protonmail.com>"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Yeniden başlat"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Çık"
 

From 3af102b3871250ae855310f2337fc692905e8256 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 21 Feb 2021 00:34:50 +0900
Subject: [PATCH 711/816] po: Update translation (Ukrainian)

Update po/uk.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/uk/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/uk.po | 58 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index e828fef91..96341b628 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,23 +1,17 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2014, 2020.
-# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2020.
-# Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Yuri Chornoivan <yurchor@ukr.net>, 2017. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Yuri Chornoivan <yurchor@ukr.net>, 2018. #zanata, 2020.
-# Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata, 2020.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2015, 2017-2020, 2021.
+# fujiwara <takao.fujiwara1@gmail.com>, 2015, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-07 13:29+0000\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-17 12:37+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/uk/>\n"
@@ -27,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -472,7 +466,7 @@ msgstr "_Гаразд"
 msgid "More…"
 msgstr "Більше…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "Інформація"
 
@@ -3277,7 +3271,7 @@ msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
@@ -3342,23 +3336,49 @@ msgstr "Відповідність з умовою на вказану довж
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Налаштованого вами способу введення %s немає серед способів введення IBus. "
+"Через це, замість вибраного вами способу введення, буде використано "
+"розкладку «US»."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Серед способів введення IBus немає принаймні одного із налаштованих способів "
+"введення."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Будь ласка, віддайте команду «ibus-setup», відкрийте вкладку «Способи "
+"введення» і налаштуйте ваші способи введення ще раз."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Вийти"
 

From e9cd26d9a7ffc6900cd6062db2277f7bdb850d94 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Sun, 21 Feb 2021 00:34:58 +0900
Subject: [PATCH 712/816] po: Update translation (Swedish)

Update po/sv.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/sv/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/sv.po | 61 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index ff44c2008..dc9802dd7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,22 +1,22 @@
 # Swedish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Göran Uddeborg <goeran@uddeborg.se>, 2017. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2017, 2018. #zanata
 # Göran Uddeborg <goeran@uddeborg.se>, 2018. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020.
 # Allan Nordhøy <epost@anotheragency.no>, 2020.
+# Sebastian Rasmussen <sebras@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-08 15:29+0000\n"
-"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-23 01:37+0000\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/sv/>\n"
 "Language: sv\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -458,7 +458,7 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Mer …"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "Om"
 
@@ -3254,7 +3254,7 @@ msgid "Alias: %s"
 msgstr "Alias: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Emoji-val"
 
@@ -3268,10 +3268,9 @@ msgid ""
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
-"Misslyckades att få det aktuella textprogrammet. Fokusera om ditt program. "
-"T.ex. tryck Esc-tangenten flera gånger för att släppa emoji-"
-"inskrivningsläget, klicka på ditt skrivbord och klicka på ditt textprogram "
-"igen."
+"Misslyckades att få det aktuella textprogrammet. Fokusera om ditt program. T."
+"ex. tryck Esc-tangenten flera gånger för att släppa emoji-inskrivningsläget, "
+"klicka på ditt skrivbord och klicka på ditt textprogram igen."
 
 #: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
@@ -3319,23 +3318,49 @@ msgstr "Matcha med villkoret för det angivna heltalet"
 msgid "IBus Panel"
 msgstr "IBus-panel"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Din konfigurerade inmatningsmetod %s existerar inte bland IBus "
+"inmatningsbetoder så ”US”-layouten konfigurerades istället för din "
+"inmatningsmetod."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Åtminstone en av dina konfigurerade inmatningsmetode existerar inte bland "
+"IBus inmatningsmetoder."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Kör kommandot ”ibus-setup”, öppna fliken ”Inmatningsmetod” och konfigurera "
+"dina inmatningsmetoder igen."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus är en intelligent inmatningsbuss för Linux/Unix."
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr "Göran Uddeborg <goeran@uddeborg.se>"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Starta om"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Avsluta"
 

From 37ec7304a007231cdd3aa5ed9227e3faf861acde Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Sun, 21 Feb 2021 00:35:01 +0900
Subject: [PATCH 713/816] po: Update translation (German)

Update po/de.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/de/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/de.po | 53 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/po/de.po b/po/de.po
index 2566ae00d..34321614b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,19 +12,18 @@
 # Rainer <rgromans@redhat.com>, 2013
 # Rainer <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015, 2018. #zanata
 # Florian H. <postfuerflo@gmail.com>, 2016. #zanata
 # Roman Spirgi <bigant@fedoraproject.org>, 2017. #zanata
 # Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
 # Tobias Weise <tobias.weise@web.de>, 2017. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Mike FABIAN <mfabian@redhat.com>, 2020.
+# Mike FABIAN <mfabian@redhat.com>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-07 13:29+0000\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-28 17:40+0000\n"
 "Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
 "Language-Team: German <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/de/>\n"
@@ -33,7 +32,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -482,7 +481,7 @@ msgstr "_OK"
 msgid "More…"
 msgstr "Mehr..."
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "Info"
 
@@ -3290,7 +3289,7 @@ msgid "Alias: %s"
 msgstr "Alias: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Emojiauswahl"
 
@@ -3355,26 +3354,52 @@ msgstr "Übereinstimmung mit der Bedingung der angegebenen ganzen Zahl"
 msgid "IBus Panel"
 msgstr "IBus Panel"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Die eingestellte Inputmethode %s existiert nicht unter den verfügbaren IBus-"
+"Inputmethoden, deswegen wurde die „US“ Tastaturbelegung stattdessen "
+"eingestellt."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Mindestens eine der eingestellten Inputmethoden existiert nicht in den "
+"verfügbaren IBus Inputmethoden."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Bitte starte das `ibus-setup` Kommando, öffne den „Inputmethoden“ Tabreiter "
+"und konfigurieren die Inputmethoden noch einmal."
+
+#: ui/gtk3/panel.vala:1141
 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:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Fabian Affolter <fab@fedoraproject.org>, 2009.\n"
 "Hedda Peters <hpeters@redhat.com>, 2009.\n"
 "Mike FABIAN <mfabian@redhat.com>, 2019."
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Neustart"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Beenden"
 

From ceea02ef354a3583bf55701c2e6db718a5a90ab6 Mon Sep 17 00:00:00 2001
From: Dingzhong Chen <wsxy162@gmail.com>
Date: Sun, 21 Feb 2021 00:35:06 +0900
Subject: [PATCH 714/816] po: Update translation (Chinese (Simplified) (zh_CN))

Update po/zh_CN.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/zh_CN.po | 1221 +++++++++++++++++++++++++++------------------------
 1 file changed, 653 insertions(+), 568 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e4cd6686c..e96d33cef 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -11,23 +11,22 @@
 # Peng Huang <shawn.p.huang@gmail.com>, 2007
 # simonyanix <simonyan@fedoraproject.org>, 2011
 # Tommy He <lovenemesis@gmail.com>, 2012-2014
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015, 2017-2018. #zanata
 # Jerry Lee <lchopn@gmail.com>, 2017. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2018. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Pany <pany@fedoraproject.org>, 2019. #zanata
 # Tian Shixiong <tiansworld@fedoraproject.org>, 2019. #zanata
 # Tian Shixiong <tiansworld@gmail.com>, 2020.
 # Boyuan Yang <073plan@gmail.com>, 2020.
 # Whired Planck <fungdaat31@outlook.com>, 2020.
+# Dingzhong Chen <wsxy162@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-08-31 03:29+0000\n"
-"Last-Translator: Whired Planck <fungdaat31@outlook.com>\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-01-28 17:40+0000\n"
+"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -35,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.2.1\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -57,7 +56,7 @@ msgstr "保存在输入法选单中的引擎顺序"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "输入法切换窗口弹出延时微秒数"
+msgstr "输入法切换窗口弹出延时"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
@@ -65,8 +64,8 @@ msgid ""
 "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> 不显示窗口并切换到之前或之后的引擎。"
+"设置弹出显示输入法引擎切换窗口的延迟时间，单位为毫秒。默认为 400。0 等于立即显示窗口。大于 0 则延迟对应毫秒数。小于 0 "
+"则不显示窗口并切换到之前或之后的引擎。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
@@ -80,11 +79,11 @@ msgstr "已保存的版本号将被用作检查之前安装的 ibus 版本和当
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
-msgstr "无 ASCII 码的拉丁字符布局"
+msgstr "无 ASCII 码的拉丁字母布局"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr ""
+msgstr "附加美国布局到这些拉丁字母布局上，忽略其字母变体。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -142,15 +141,15 @@ msgstr "触发快捷键"
 #: data/dconf/org.freedesktop.ibus.gschema.xml:71
 #: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
 msgid "The shortcut keys for turning input method on or off"
-msgstr "打开关闭输入法的快捷键"
+msgstr "用于开启或关闭输入法的快捷键"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "为 gtk_accelerator_parse 触发快捷键"
+msgstr "触发快捷键（gtk_accelerator_parse 格式）"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
-msgstr "应用快捷键"
+msgstr "开启快捷键"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
@@ -158,7 +157,7 @@ msgstr "开启输入法的快捷键"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
-msgstr "禁用快捷键"
+msgstr "关闭快捷键"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
@@ -192,7 +191,7 @@ msgstr "自动隐藏"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "属性面板的行为。 0 = 不再显示，1 = 自动隐藏，2 = 始终显示"
+msgstr "属性面板的行为。0 = 不再显示，1 = 自动隐藏，2 = 始终显示"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -213,13 +212,13 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
-msgstr "以毫秒为单位显示属性面板的时间"
+msgstr "显示属性面板的延时"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
-msgstr "在离开焦点或属性变更后，以毫秒为单位显示属性面板的时间。"
+msgstr "在输入焦点或属性变更后，属性面板的显示延迟时间，单位为毫秒。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:135
 msgid "Orientation of lookup table"
@@ -227,7 +226,7 @@ msgstr "候选词表方向"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:136
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "候选词表方向。0 = 水平，1 = 竖直。"
+msgstr "候选词表方向。0 = 水平，1 = 竖直"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:140
 #: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
@@ -241,7 +240,7 @@ msgstr "显示输入法名称"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 msgid "Show input method name on language bar"
-msgstr "语言栏上显示输入法名称"
+msgstr "在语言栏上显示输入法名称"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
@@ -257,15 +256,14 @@ msgid ""
 "percentage values in the range 0% to 100%, and 'a' is a floating point value "
 "in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 中的颜"
-"色名；2. '#rrggbb' 形式的十六进制数，其中 'r', 'g' 和 'b' 分别代表十六进制数"
-"字的红、绿和蓝；3. 'rgb(r,g,b)' 形式的 RGB 颜色；或者 4. 'rgba(r,g,b,a)' 形式"
-"的 RGBA 颜色，其中 'r', 'g' 和 'b' 分别为 0 到 255 之间的整数值，或者 0% 到 "
-"100% 之间的百分比值，而 'a' 为 0 到 1 之间的浮点透明度。"
+"XKB 图标显示键盘布局字符串并依据 RGBA 值进行渲染。RGBA 值可以是 1. X11 "
+"中的颜色名；2.“#rrggbb”形式的十六进制数，其中“r”“g”“b”分别代表十六进制数字的红、绿和蓝；3.“rgb(r,g,b)”形式的 RGB "
+"颜色；或者 4.“rgba(r,g,b,a)”形式的 RGBA 颜色，其中“r”“g”“b”分别为 0 到 255 之间的整数值，或者 0% 到 "
+"100% 之间的百分比值，而“a”为 0 到 1 之间的浮点透明度。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
-msgstr "显示属性面板图标的毫秒数"
+msgstr "显示属性面板图标的延时"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:156
 msgid ""
@@ -274,6 +272,8 @@ msgid ""
 "of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
 "property icon is shown immediately."
 msgstr ""
+"如果由 IBusEngineDesc 中的 icon-prop-key 值指定的引擎属性被切换时，面板图标从引擎图标变成属性图标的显示延迟时间。如果值为 "
+"0，则没有延时，属性图标立即显示。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
@@ -284,7 +284,7 @@ msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "自定义字体"
 
@@ -292,114 +292,123 @@ msgstr "自定义字体"
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr "按照输入法语言选择候选词窗口的字形"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr "有些字符码位有多个不同的字形，Pango 根据语言属性确定其字形。如果该值为真，从 IBus 引擎的语言选择字形；为假，从桌面语言选择字形。"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr "用于 gtk_accelerator_parse 的 Unicode 快捷键"
+msgstr "Unicode 快捷键（gtk_accelerator_parse 格式）"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr "开启或关闭 Unicode 输入的快捷键"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Emoji 快捷键（gtk_accelerator_parse 格式）"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "用于开启或关闭表情输入的快捷键"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr "表情符号对话框中用于表情符号的自定义字体名称"
+msgstr "用于自定义表情符号对话框中表情符号的字体名称"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
-msgstr "emoji 字典的默认语言"
+msgstr "Emoji 字典的默认语言"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
-"在表情输入对话框中选择默认表情输入语言。设定值 $lang 会应用于 /usr/share/"
-"ibus/dicts/emoji-$lang.dict。"
+"选择表情输入面板中默认的表情字典语言。设定值 $lang 会应用于 /usr/share/ibus/dicts/emoji-$lang.dict。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
-msgstr "emoji 面板中的最喜爱的 emoji 列表"
+msgstr "Emoji 面板中的常用表情列表"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
-msgstr "可在表情符号列表中显示最喜爱的表情符号，但前提是该列表中存在字符。"
+msgstr "可在表情列表中显示常用的表情符号，但前提是该列表中存在字符。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr "表情符号对话框中的最喜爱表情符号注释列表"
+msgstr "Emoji 面板中的常用表情注释列表"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr "您可在此列表中为喜欢的表情符号添加注释。"
+msgstr "你可以在此列表中为常用的表情符号添加注释。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
-msgstr "表情符号注释是否可以部分匹配"
+msgstr "表情注释是否可以部分匹配"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
-msgstr "是否使用部分字符而非完整字符匹配表情注释。"
+msgstr "是否允许使用部分字符来匹配表情注释，而不用完整字符串。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "使用特定长度字符匹配表情注释"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
-msgstr "使用超过特定长度字符对表情注释进行匹配，而非完全匹配。"
+msgstr "不用完全匹配表情注释，只要输入的字符与表情注释匹配超过指定的字符数即可。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
-msgstr "选择一种条件来部分匹配表情注释"
+msgstr "选择表情注释部分匹配条件"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 "选择以下条件来部分匹配表情注释：0 == 字首匹配, 1 == 字尾匹配, 2 == 包含匹配"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
-msgstr "在启动时加载 emoji 数据"
+msgstr "启动时加载 Emoji 数据"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"如果设定为真 (True)，则在启动时载入表情数据。大概需要 10MB 内存来载入数据。如"
-"果设定为假 (False)，则在打开表情对话框时加载表情数据。"
+"如果设定为真（True），则在启动时载入表情数据。大概需要 10MB 内存来载入数据。如果设定为假（False），则在打开表情输入面板时加载表情数据。"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
-msgstr "在启动时加载 Unicode 数据"
+msgstr "启动时加载 Unicode 数据"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
 "the beginning if false. The Unicode data is always loaded after the emoji "
 "data is loaded even if true."
 msgstr ""
-"如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果"
-"设为“False”，则当打开表情符号对话框时加载 Unicode 数据。Unicode 数据总是会在"
-"表情符号数据加载之后加载，即使设置为“True”也是如此。"
+"如果设为“True”，则在启动时加载 Unicode 数据。加载数据大约需要 15MB 内存。如果设为“False”，则打开表情输入面板时加载 "
+"Unicode 数据。Unicode 数据总是会在表情数据加载之后加载，即使设置为“True”也是如此。"
 
 #: ibus/_config.py.in:41
 msgid ""
@@ -430,11 +439,11 @@ msgstr "确定(_O)"
 msgid "More…"
 msgstr "更多…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "关于"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -489,7 +498,7 @@ msgstr "按键："
 
 #: setup/keyboardshortcut.py:82
 msgid "Modifiers:"
-msgstr "修饰符："
+msgstr "修饰键："
 
 #. apply button
 #: setup/keyboardshortcut.py:130
@@ -506,12 +515,12 @@ msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
-"请按一个键盘按键（或者一个组合按键）\n"
-"当您松开任意按键时，对话框会自动关闭。"
+"请按下一个键盘按键（或者按键组合）。\n"
+"当您松开按键时，对话框将自动关闭。"
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "请按一个键盘按键（或者组合按键）"
+msgstr "请按下一个键盘按键（或者按键组合）"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -529,8 +538,7 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登"
-"录您的桌面。\n"
+"IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后重新登录您的桌面。\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -553,11 +561,11 @@ msgstr "切换输入法"
 
 #: setup/setup.ui:11
 msgid "Horizontal"
-msgstr "水平"
+msgstr "横排"
 
 #: setup/setup.ui:14
 msgid "Vertical"
-msgstr "竖直"
+msgstr "竖排"
 
 #: setup/setup.ui:25
 msgid "Top left corner"
@@ -593,7 +601,7 @@ msgstr "总是"
 
 #: setup/setup.ui:113
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr "切换下一个输入法快捷键"
+msgstr "切换下一个输入法的快捷键"
 
 #: setup/setup.ui:115
 msgid "Next input method:"
@@ -601,7 +609,7 @@ msgstr "下一输入法："
 
 #: setup/setup.ui:127
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "切换上一个输入法快捷键"
+msgstr "切换上一个输入法的快捷键"
 
 #: setup/setup.ui:129
 msgid "Previous input method:"
@@ -638,7 +646,7 @@ msgstr "候选词排列方向："
 
 #: setup/setup.ui:407
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "设置如何显示或隐藏语言栏的方式"
+msgstr "设置如何显示或隐藏语言栏"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
@@ -721,23 +729,20 @@ msgid ""
 "<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>"
-msgstr ""
-"<small><i>可以通过敲击键盘快捷键或者点击面板图标来在上述列表中切换选中的输入"
-"法</i></small>"
+msgstr "<small><i>可以通过按下键盘快捷键或者点击面板图标来在上述列表中切换选中的输入法</i></small>"
 
 #: setup/setup.ui:873
-#, fuzzy
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode names"
-msgstr "启用在表情符号注释或 Unicode 名称间转换的快捷键"
+msgstr "启用 Emoji 注释或 Unicode 名称转换的快捷键"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
-msgstr "表情符号注释"
+msgstr "表情注释："
 
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr ""
+msgstr "启用 Unicode 码位转换的快捷键"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
@@ -745,7 +750,7 @@ msgstr "Unicode 码位："
 
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "设置表情符号对话框中 Unicode 候选字的字体"
+msgstr "设置表情输入面板中 Unicode 候选字符的字体"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
@@ -753,23 +758,23 @@ msgstr "Unicode 字体："
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "设置 emoji 面板中 emoji 释文的语言"
+msgstr "设置表情输入面板中表情注释的语言"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
-msgstr "Emoji 释文语言："
+msgstr "表情注释语言："
 
 #: setup/setup.ui:1062
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
-msgstr ""
+msgstr "不用完全匹配表情注释，只要输入的字符与表情注释匹配超过指定的字符数："
 
 #: setup/setup.ui:1067
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
-msgstr ""
+msgstr "是否允许使用部分字符来匹配表情注释，而不用完整字符串"
 
 #: setup/setup.ui:1101
 msgid "Prefix match"
@@ -795,33 +800,19 @@ msgstr "<b>键盘布局</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>全局输入法设置</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "高级"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>智能输入平台</small>\n"
-"主页：https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
+msgstr "对于复用的码位，按照输入法语言选择它在候选词窗口中的字形"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "登录时运行 IBus"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>字体</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>启动</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "高级"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -841,11 +832,11 @@ msgstr "旗帜"
 
 #: src/ibusemojigen.h:34
 msgid "Food & Drink"
-msgstr "食物饮料"
+msgstr "食物和饮料"
 
 #: src/ibusemojigen.h:35
 msgid "Objects"
-msgstr "实体"
+msgstr "物品"
 
 #: src/ibusemojigen.h:36
 msgid "People & Body"
@@ -853,7 +844,7 @@ msgstr "人物和身体"
 
 #: src/ibusemojigen.h:37
 msgid "Smileys & Emotion"
-msgstr "笑脸和情绪"
+msgstr "笑脸和情感"
 
 #: src/ibusemojigen.h:38
 msgid "Symbols"
@@ -861,511 +852,511 @@ msgstr "符号"
 
 #: src/ibusemojigen.h:39
 msgid "Travel & Places"
-msgstr "交通工具和场所"
+msgstr "旅行和地点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:33
 msgid "Basic Latin"
-msgstr "基本拉丁语"
+msgstr "基本拉丁字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:37
 msgid "Latin-1 Supplement"
-msgstr "拉丁-1 补充"
+msgstr "拉丁文 1 补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:41
 msgid "Latin Extended-A"
-msgstr "拉丁语扩展-A"
+msgstr "拉丁文扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:45
 msgid "Latin Extended-B"
-msgstr "拉丁语扩展-B"
+msgstr "拉丁文扩展 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:49
 msgid "IPA Extensions"
-msgstr "IPA 扩展"
+msgstr "国际音标扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:53
 msgid "Spacing Modifier Letters"
-msgstr ""
+msgstr "空格修饰字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:57
 msgid "Combining Diacritical Marks"
-msgstr ""
+msgstr "组合变音标记"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:61
 msgid "Greek and Coptic"
-msgstr "希腊和古埃及语"
+msgstr "希腊和科普特字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:65
 msgid "Cyrillic"
-msgstr "西里尔语"
+msgstr "西里尔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:69
 msgid "Cyrillic Supplement"
-msgstr "西里尔语补充"
+msgstr "西里尔文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:73
 msgid "Armenian"
-msgstr "亚美尼亚语"
+msgstr "亚美尼亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:77
 msgid "Hebrew"
-msgstr "希伯来语"
+msgstr "希伯来字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:81
 msgid "Arabic"
-msgstr "阿拉伯语"
+msgstr "阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:85
 msgid "Syriac"
-msgstr ""
+msgstr "叙利亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:89
 msgid "Arabic Supplement"
-msgstr ""
+msgstr "阿拉伯文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:93
 msgid "Thaana"
-msgstr ""
+msgstr "它拿字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:97
 msgid "NKo"
-msgstr ""
+msgstr "Nko 书面字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:101
 msgid "Samaritan"
-msgstr ""
+msgstr "撒玛利亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:105
 msgid "Mandaic"
-msgstr ""
+msgstr "曼达安文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:109
 msgid "Syriac Supplement"
-msgstr ""
+msgstr "叙利亚文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
 msgid "Arabic Extended-A"
-msgstr ""
+msgstr "阿拉伯文扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:117
 msgid "Devanagari"
-msgstr ""
+msgstr "天城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:121
 msgid "Bengali"
-msgstr ""
+msgstr "孟加拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:125
 msgid "Gurmukhi"
-msgstr ""
+msgstr "古木基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:129
 msgid "Gujarati"
-msgstr ""
+msgstr "古吉拉特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:133
 msgid "Oriya"
-msgstr ""
+msgstr "奥里亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:137
 msgid "Tamil"
-msgstr ""
+msgstr "泰米尔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:141
 msgid "Telugu"
-msgstr ""
+msgstr "泰卢固文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:145
 msgid "Kannada"
-msgstr ""
+msgstr "卡纳达文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:149
 msgid "Malayalam"
-msgstr ""
+msgstr "马拉雅拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:153
 msgid "Sinhala"
-msgstr ""
+msgstr "僧伽罗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:157
 msgid "Thai"
-msgstr ""
+msgstr "泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:161
 msgid "Lao"
-msgstr ""
+msgstr "老挝文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:165
 msgid "Tibetan"
-msgstr ""
+msgstr "藏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:169
 msgid "Myanmar"
-msgstr ""
+msgstr "缅甸文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:173
 msgid "Georgian"
-msgstr ""
+msgstr "格鲁吉亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:177
 msgid "Hangul Jamo"
-msgstr ""
+msgstr "谚文字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:181
 msgid "Ethiopic"
-msgstr ""
+msgstr "埃塞俄比亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:185
 msgid "Ethiopic Supplement"
-msgstr ""
+msgstr "埃塞俄比亚文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:189
 msgid "Cherokee"
-msgstr ""
+msgstr "切罗基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:193
 msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+msgstr "统一加拿大原住民音节文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:197
 msgid "Ogham"
-msgstr ""
+msgstr "欧甘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:201
 msgid "Runic"
-msgstr ""
+msgstr "卢恩文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:205
 msgid "Tagalog"
-msgstr ""
+msgstr "他加禄文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:209
 msgid "Hanunoo"
-msgstr ""
+msgstr "哈努诺文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:213
 msgid "Buhid"
-msgstr ""
+msgstr "布希德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:217
 msgid "Tagbanwa"
-msgstr ""
+msgstr "塔格班瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:221
 msgid "Khmer"
-msgstr ""
+msgstr "高棉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:225
 msgid "Mongolian"
-msgstr "蒙语"
+msgstr "蒙古文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:229
 msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
+msgstr "统一加拿大原住民音节文字扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:233
 msgid "Limbu"
-msgstr ""
+msgstr "林布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:237
 msgid "Tai Le"
-msgstr ""
+msgstr "傣仂文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:241
 msgid "New Tai Lue"
-msgstr ""
+msgstr "新傣仂文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:245
 msgid "Khmer Symbols"
-msgstr ""
+msgstr "高棉文符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:249
 msgid "Buginese"
-msgstr ""
+msgstr "布吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr ""
+msgstr "老傣文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:257
 msgid "Combining Diacritical Marks Extended"
-msgstr ""
+msgstr "组合变音标记扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:261
 msgid "Balinese"
-msgstr ""
+msgstr "巴厘文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:265
 msgid "Sundanese"
-msgstr ""
+msgstr "巽他文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:269
 msgid "Batak"
-msgstr ""
+msgstr "巴塔克文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr ""
+msgstr "绒巴文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr ""
+msgstr "桑塔利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr ""
+msgstr "西里尔文扩展 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:285
 msgid "Georgian Extended"
-msgstr ""
+msgstr "格鲁吉亚文扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:289
 msgid "Sundanese Supplement"
-msgstr ""
+msgstr "巽他字母补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr ""
+msgstr "吠陀扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:297
 msgid "Phonetic Extensions"
-msgstr ""
+msgstr "音标扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions Supplement"
-msgstr ""
+msgstr "音标扩展补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:305
 msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+msgstr "组合变音标记补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr "拉丁语扩展附加"
+msgstr "拉丁文扩展附加"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:313
 msgid "Greek Extended"
-msgstr "希腊语扩展"
+msgstr "希腊文扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:317
 msgid "General Punctuation"
-msgstr "通用标点"
+msgstr "通用标点符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1386,14 +1377,14 @@ msgstr "货币符号"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:329
 msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+msgstr "符号用组合变音标记"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:333
 msgid "Letterlike Symbols"
-msgstr "类似字母的符号"
+msgstr "字母状符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1421,7 +1412,7 @@ msgstr "数学运算符"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:349
 msgid "Miscellaneous Technical"
-msgstr "各种技术类符号"
+msgstr "杂项技术符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1435,28 +1426,28 @@ msgstr "控制图"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:357
 msgid "Optical Character Recognition"
-msgstr ""
+msgstr "光学识别符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr ""
+msgstr "带圈的字母数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:365
 msgid "Box Drawing"
-msgstr ""
+msgstr "制表符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:369
 msgid "Block Elements"
-msgstr ""
+msgstr "块状元素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1470,224 +1461,224 @@ msgstr "几何形状"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:377
 msgid "Miscellaneous Symbols"
-msgstr "其它各种符号"
+msgstr "杂项符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:381
 msgid "Dingbats"
-msgstr ""
+msgstr "杂锦符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "杂项数学符号 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr ""
+msgstr "补充箭头 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:393
 msgid "Braille Patterns"
-msgstr ""
+msgstr "盲文点字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr ""
+msgstr "补充箭头 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+msgstr "杂项数学符号 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:405
 msgid "Supplemental Mathematical Operators"
-msgstr ""
+msgstr "补充数学运算符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:409
 msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+msgstr "杂项符号和箭头"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr ""
+msgstr "格拉哥里文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr ""
+msgstr "拉丁文扩展 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:421
 msgid "Coptic"
-msgstr ""
+msgstr "科普特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:425
 msgid "Georgian Supplement"
-msgstr ""
+msgstr "格鲁吉亚文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:429
 msgid "Tifinagh"
-msgstr ""
+msgstr "提非纳文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:433
 msgid "Ethiopic Extended"
-msgstr ""
+msgstr "埃塞俄比亚文扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:437
 msgid "Cyrillic Extended-A"
-msgstr ""
+msgstr "西里尔文扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:441
 msgid "Supplemental Punctuation"
-msgstr ""
+msgstr "补充标点符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:445
 msgid "CJK Radicals Supplement"
-msgstr ""
+msgstr "中日韩部首补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:449
 msgid "Kangxi Radicals"
-msgstr ""
+msgstr "康熙部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:453
 msgid "Ideographic Description Characters"
-msgstr ""
+msgstr "表意文字描述字符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:457
 msgid "CJK Symbols and Punctuation"
-msgstr "汉、日、韩语符号和标点"
+msgstr "中日韩符号和标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "平假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "片假名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:469
 msgid "Bopomofo"
-msgstr ""
+msgstr "注音符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:473
 msgid "Hangul Compatibility Jamo"
-msgstr ""
+msgstr "谚文兼容字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:477
 msgid "Kanbun"
-msgstr ""
+msgstr "汉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:481
 msgid "Bopomofo Extended"
-msgstr ""
+msgstr "注音符号扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:485
 msgid "CJK Strokes"
-msgstr "汉、日、韩语笔画"
+msgstr "中日韩笔画"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:489
 msgid "Katakana Phonetic Extensions"
-msgstr ""
+msgstr "片假名语音扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:493
 msgid "Enclosed CJK Letters and Months"
-msgstr ""
+msgstr "带圈的中日韩字符和月份"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:497
 msgid "CJK Compatibility"
-msgstr "汉日韩字符兼容"
+msgstr "中日韩兼容字符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:501
 msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1701,1267 +1692,1323 @@ msgstr "易经六边形符号"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:509
 msgid "CJK Unified Ideographs"
-msgstr ""
+msgstr "中日韩统一表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:513
 msgid "Yi Syllables"
-msgstr ""
+msgstr "彝文音节"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:517
 msgid "Yi Radicals"
-msgstr ""
+msgstr "彝文部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:521
 msgid "Lisu"
-msgstr ""
+msgstr "傈僳文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:525
 msgid "Vai"
-msgstr ""
+msgstr "瓦伊文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr ""
+msgstr "西里尔文扩展 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:533
 msgid "Bamum"
-msgstr ""
+msgstr "巴姆穆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:537
 msgid "Modifier Tone Letters"
-msgstr ""
+msgstr "修饰用声调字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:541
 msgid "Latin Extended-D"
-msgstr ""
+msgstr "拉丁文扩展 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:545
 msgid "Syloti Nagri"
-msgstr ""
+msgstr "锡尔赫特城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:549
 msgid "Common Indic Number Forms"
-msgstr ""
+msgstr "通用印度数字形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:553
 msgid "Phags-pa"
-msgstr ""
+msgstr "八思巴文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:557
 msgid "Saurashtra"
-msgstr ""
+msgstr "索拉什特拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:561
 msgid "Devanagari Extended"
-msgstr ""
+msgstr "天城文扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:565
 msgid "Kayah Li"
-msgstr ""
+msgstr "克耶里文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:569
 msgid "Rejang"
-msgstr ""
+msgstr "拉让文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr ""
+msgstr "谚文字母扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:577
 msgid "Javanese"
-msgstr ""
+msgstr "爪哇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr ""
+msgstr "缅甸文扩展 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:585
 msgid "Cham"
-msgstr ""
+msgstr "占文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr ""
+msgstr "缅甸文扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:593
 msgid "Tai Viet"
-msgstr ""
+msgstr "越南傣文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:597
 msgid "Meetei Mayek Extensions"
-msgstr ""
+msgstr "曼尼普尔文扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr ""
+msgstr "埃塞俄比亚文扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr ""
+msgstr "拉丁文扩展 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:609
 msgid "Cherokee Supplement"
-msgstr ""
+msgstr "切罗基文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:613
 msgid "Meetei Mayek"
-msgstr ""
+msgstr "曼尼普尔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:617
 msgid "Hangul Syllables"
-msgstr ""
+msgstr "谚文音节"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr ""
+msgstr "谚文字母扩展 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:625
 msgid "High Surrogates"
-msgstr ""
+msgstr "高半代理区"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:629
 msgid "High Private Use Surrogates"
-msgstr ""
+msgstr "高半私用代理区"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:633
 msgid "Low Surrogates"
-msgstr ""
+msgstr "低半代理区"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:637
 msgid "Private Use Area"
-msgstr ""
+msgstr "私用区"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:641
 msgid "CJK Compatibility Ideographs"
-msgstr ""
+msgstr "中日韩兼容表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr ""
+msgstr "字母表示形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "阿拉伯文表现形式 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:653
 msgid "Variation Selectors"
-msgstr ""
+msgstr "变体选择符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
 msgid "Vertical Forms"
-msgstr ""
+msgstr "竖排形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:661
 msgid "Combining Half Marks"
-msgstr ""
+msgstr "组合用半形标记"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr ""
+msgstr "中日韩兼容形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:669
 msgid "Small Form Variants"
-msgstr ""
+msgstr "小型变体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "阿拉伯文表现形式 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr ""
+msgstr "半角及全角形式"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:681
 msgid "Specials"
-msgstr ""
+msgstr "特殊字符"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:685
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "线形文字 B 音节"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:689
 msgid "Linear B Ideograms"
-msgstr ""
+msgstr "线形文字 B 表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:693
 msgid "Aegean Numbers"
-msgstr ""
+msgstr "爱琴海数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:697
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "古希腊数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:701
 msgid "Ancient Symbols"
-msgstr ""
+msgstr "古代符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:705
 msgid "Phaistos Disc"
-msgstr ""
+msgstr "斐斯托斯圆盘"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:709
 msgid "Lycian"
-msgstr ""
+msgstr "吕西亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:713
 msgid "Carian"
-msgstr ""
+msgstr "卡里亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:717
 msgid "Coptic Epact Numbers"
-msgstr ""
+msgstr "科普特闰余数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:721
 msgid "Old Italic"
-msgstr ""
+msgstr "古意大利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:725
 msgid "Gothic"
-msgstr ""
+msgstr "哥特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:729
 msgid "Old Permic"
-msgstr ""
+msgstr "古彼尔姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:733
 msgid "Ugaritic"
-msgstr ""
+msgstr "乌加里特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:737
 msgid "Old Persian"
-msgstr ""
+msgstr "古波斯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:741
 msgid "Deseret"
-msgstr ""
+msgstr "德瑟雷特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:745
 msgid "Shavian"
-msgstr ""
+msgstr "萧伯纳文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:749
 msgid "Osmanya"
-msgstr ""
+msgstr "奥斯曼亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:753
 msgid "Osage"
-msgstr ""
+msgstr "欧塞奇文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:757
 msgid "Elbasan"
-msgstr ""
+msgstr "爱尔巴桑文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:761
 msgid "Caucasian Albanian"
-msgstr ""
+msgstr "高加索阿尔巴尼亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:765
 msgid "Linear A"
-msgstr ""
+msgstr "线形文字 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:769
 msgid "Cypriot Syllabary"
-msgstr ""
+msgstr "塞浦路斯文字音表"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:773
 msgid "Imperial Aramaic"
-msgstr ""
+msgstr "帝国亚拉姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:777
 msgid "Palmyrene"
-msgstr ""
+msgstr "帕米拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:781
 msgid "Nabataean"
-msgstr ""
+msgstr "纳巴泰文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:785
 msgid "Hatran"
-msgstr ""
+msgstr "哈特拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:789
 msgid "Phoenician"
-msgstr ""
+msgstr "腓尼基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:793
 msgid "Lydian"
-msgstr ""
+msgstr "吕底亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:797
 msgid "Meroitic Hieroglyphs"
-msgstr ""
+msgstr "麦罗埃文圣书体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:801
 msgid "Meroitic Cursive"
-msgstr ""
+msgstr "麦罗埃文草书体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:805
 msgid "Kharoshthi"
-msgstr ""
+msgstr "佉卢文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:809
 msgid "Old South Arabian"
-msgstr ""
+msgstr "古南阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:813
 msgid "Old North Arabian"
-msgstr ""
+msgstr "古北阿拉伯文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:817
 msgid "Manichaean"
-msgstr ""
+msgstr "摩尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:821
 msgid "Avestan"
-msgstr ""
+msgstr "阿维斯陀文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:825
 msgid "Inscriptional Parthian"
-msgstr ""
+msgstr "碑刻帕提亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:829
 msgid "Inscriptional Pahlavi"
-msgstr ""
+msgstr "碑刻巴列维文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:833
 msgid "Psalter Pahlavi"
-msgstr ""
+msgstr "诗篇巴列维文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:837
 msgid "Old Turkic"
-msgstr ""
+msgstr "古突厥文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:841
 msgid "Old Hungarian"
-msgstr ""
+msgstr "古匈牙利文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:845
 msgid "Hanifi Rohingya"
-msgstr ""
+msgstr "哈乃斐罗兴亚文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:849
 msgid "Rumi Numeral Symbols"
-msgstr ""
+msgstr "卢米计数符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
-msgid "Old Sogdian"
-msgstr ""
+msgid "Yezidi"
+msgstr "雅茲迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:857
-msgid "Sogdian"
-msgstr ""
+msgid "Old Sogdian"
+msgstr "古粟特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:861
-msgid "Elymaic"
-msgstr ""
+msgid "Sogdian"
+msgstr "粟特文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
-msgid "Brahmi"
-msgstr ""
+msgid "Chorasmian"
+msgstr "花剌子模文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
-msgid "Kaithi"
-msgstr ""
+msgid "Elymaic"
+msgstr "以利买文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:873
-msgid "Sora Sompeng"
-msgstr ""
+msgid "Brahmi"
+msgstr "婆罗米文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:877
-msgid "Chakma"
-msgstr ""
+msgid "Kaithi"
+msgstr "凯提文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:881
-msgid "Mahajani"
-msgstr ""
+msgid "Sora Sompeng"
+msgstr "索拉桑朋文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:885
-msgid "Sharada"
-msgstr ""
+msgid "Chakma"
+msgstr "查克马文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:889
-msgid "Sinhala Archaic Numbers"
-msgstr ""
+msgid "Mahajani"
+msgstr "马哈加尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:893
-msgid "Khojki"
-msgstr ""
+msgid "Sharada"
+msgstr "夏达拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:897
-msgid "Multani"
-msgstr ""
+msgid "Sinhala Archaic Numbers"
+msgstr "僧伽罗文古数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:901
-msgid "Khudawadi"
-msgstr ""
+msgid "Khojki"
+msgstr "可吉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:905
-msgid "Grantha"
-msgstr ""
+msgid "Multani"
+msgstr "穆尔塔尼文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:909
-msgid "Newa"
-msgstr ""
+msgid "Khudawadi"
+msgstr "库达瓦迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:913
-msgid "Tirhuta"
-msgstr ""
+msgid "Grantha"
+msgstr "古兰塔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:917
-msgid "Siddham"
-msgstr ""
+msgid "Newa"
+msgstr "纽瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:921
-msgid "Modi"
-msgstr ""
+msgid "Tirhuta"
+msgstr "提尔胡塔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:925
-msgid "Mongolian Supplement"
-msgstr ""
+msgid "Siddham"
+msgstr "悉昙文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:929
-msgid "Takri"
-msgstr ""
+msgid "Modi"
+msgstr "莫迪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:933
-msgid "Ahom"
-msgstr ""
+msgid "Mongolian Supplement"
+msgstr "蒙古文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:937
-msgid "Dogra"
-msgstr ""
+msgid "Takri"
+msgstr "塔卡里"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:941
-msgid "Warang Citi"
-msgstr ""
+msgid "Ahom"
+msgstr "阿洪姆文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:945
-msgid "Nandinagari"
-msgstr ""
+msgid "Dogra"
+msgstr "多格拉文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:949
-msgid "Zanabazar Square"
-msgstr ""
+msgid "Warang Citi"
+msgstr "瓦兰齐地文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
-msgid "Soyombo"
-msgstr ""
+msgid "Dives Akuru"
+msgstr "迪维西阿库鲁文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:957
-msgid "Pau Cin Hau"
-msgstr ""
+msgid "Nandinagari"
+msgstr "南迪城文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:961
-msgid "Bhaiksuki"
-msgstr ""
+msgid "Zanabazar Square"
+msgstr "札那巴札尔方形字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:965
-msgid "Marchen"
-msgstr ""
+msgid "Soyombo"
+msgstr "索永布文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:969
-msgid "Masaram Gondi"
-msgstr ""
+msgid "Pau Cin Hau"
+msgstr "包钦豪文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:973
-msgid "Gunjala Gondi"
-msgstr ""
+msgid "Bhaiksuki"
+msgstr "拜克舒基文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:977
-msgid "Makasar"
-msgstr ""
+msgid "Marchen"
+msgstr "玛钦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:981
-msgid "Tamil Supplement"
-msgstr ""
+msgid "Masaram Gondi"
+msgstr "马萨拉姆贡德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:985
-msgid "Cuneiform"
-msgstr ""
+msgid "Gunjala Gondi"
+msgstr "贡贾拉贡德文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:989
-msgid "Cuneiform Numbers and Punctuation"
-msgstr ""
+msgid "Makasar"
+msgstr "望加锡文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:993
-msgid "Early Dynastic Cuneiform"
-msgstr ""
+msgid "Lisu Supplement"
+msgstr "傈僳文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:997
-msgid "Egyptian Hieroglyphs"
-msgstr ""
+msgid "Tamil Supplement"
+msgstr "泰米尔文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1001
-msgid "Egyptian Hieroglyph Format Controls"
-msgstr ""
+msgid "Cuneiform"
+msgstr "楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1005
-msgid "Anatolian Hieroglyphs"
-msgstr ""
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "楔形数字和标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1009
-msgid "Bamum Supplement"
-msgstr ""
+msgid "Early Dynastic Cuneiform"
+msgstr "早王朝楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1013
-msgid "Mro"
-msgstr ""
+msgid "Egyptian Hieroglyphs"
+msgstr "埃及圣书体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1017
-msgid "Bassa Vah"
-msgstr ""
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr "埃及圣书体格式控制"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1021
-msgid "Pahawh Hmong"
-msgstr ""
+msgid "Anatolian Hieroglyphs"
+msgstr "安纳托利亚象形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1025
-msgid "Medefaidrin"
-msgstr ""
+msgid "Bamum Supplement"
+msgstr "巴姆穆文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1029
-msgid "Miao"
-msgstr ""
+msgid "Mro"
+msgstr "莫鲁文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1033
-msgid "Ideographic Symbols and Punctuation"
-msgstr ""
+msgid "Bassa Vah"
+msgstr "巴萨瓦文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1037
-msgid "Tangut"
-msgstr ""
+msgid "Pahawh Hmong"
+msgstr "帕哈苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1041
-msgid "Tangut Components"
-msgstr ""
+msgid "Medefaidrin"
+msgstr "梅德法伊德林文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1045
-msgid "Kana Supplement"
-msgstr ""
+msgid "Miao"
+msgstr "苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1049
-msgid "Kana Extended-A"
-msgstr ""
+msgid "Ideographic Symbols and Punctuation"
+msgstr "表意符号及标点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1053
-msgid "Small Kana Extension"
-msgstr ""
+msgid "Tangut"
+msgstr "西夏文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1057
-msgid "Nushu"
-msgstr ""
+msgid "Tangut Components"
+msgstr "西夏文偏旁"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
-msgid "Duployan"
-msgstr ""
+msgid "Khitan Small Script"
+msgstr "契丹小字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1065
-msgid "Shorthand Format Controls"
-msgstr ""
+msgid "Tangut Supplement"
+msgstr "西夏文补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1069
-msgid "Byzantine Musical Symbols"
-msgstr ""
+msgid "Kana Supplement"
+msgstr "假名补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
-msgid "Musical Symbols"
-msgstr ""
+msgid "Kana Extended-A"
+msgstr "假名扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
-msgid "Ancient Greek Musical Notation"
-msgstr ""
+msgid "Small Kana Extension"
+msgstr "小型假名扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1081
-msgid "Mayan Numerals"
-msgstr ""
+msgid "Nushu"
+msgstr "女书"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1085
-msgid "Tai Xuan Jing Symbols"
-msgstr ""
+msgid "Duployan"
+msgstr "杜普洛彦速记文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1089
-msgid "Counting Rod Numerals"
-msgstr ""
+msgid "Shorthand Format Controls"
+msgstr "速记格式控制"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1093
-msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgid "Byzantine Musical Symbols"
+msgstr "拜占庭音乐符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1097
-msgid "Sutton SignWriting"
-msgstr ""
+msgid "Musical Symbols"
+msgstr "音乐符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1101
-msgid "Glagolitic Supplement"
-msgstr ""
+msgid "Ancient Greek Musical Notation"
+msgstr "古希腊音乐记号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1105
-msgid "Nyiakeng Puachue Hmong"
-msgstr ""
+msgid "Mayan Numerals"
+msgstr "玛雅数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1109
-msgid "Wancho"
-msgstr ""
+msgid "Tai Xuan Jing Symbols"
+msgstr "太玄经符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1113
-msgid "Mende Kikakui"
-msgstr ""
+msgid "Counting Rod Numerals"
+msgstr "算筹数码"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
-msgid "Adlam"
-msgstr ""
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "数学用字母数字符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1121
-msgid "Indic Siyaq Numbers"
-msgstr ""
+msgid "Sutton SignWriting"
+msgstr "萨顿手语文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1125
-msgid "Ottoman Siyaq Numbers"
-msgstr ""
+msgid "Glagolitic Supplement"
+msgstr "格拉哥里字母补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1129
-msgid "Arabic Mathematical Alphabetic Symbols"
-msgstr ""
+msgid "Nyiakeng Puachue Hmong"
+msgstr "涅根普瓦最苗文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1133
-msgid "Mahjong Tiles"
-msgstr "麻将块"
+msgid "Wancho"
+msgstr "文乔文"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1137
+msgid "Mende Kikakui"
+msgstr "门德基卡库文"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Adlam"
+msgstr "阿德拉姆文"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Indic Siyaq Numbers"
+msgstr "印度西亚格数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Ottoman Siyaq Numbers"
+msgstr "奥斯曼西亚格数字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "阿拉伯数学字母符号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Mahjong Tiles"
+msgstr "麻将牌"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "多米诺骨牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
-msgstr "纸牌"
+msgstr "扑克牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
+msgstr "带圈字母数字补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
-msgstr ""
+msgstr "带圈表意文字补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
-msgstr ""
+msgstr "杂项符号和象形图"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
-msgstr ""
+msgstr "表情符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
-msgstr ""
+msgstr "装饰杂锦符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
-msgstr ""
+msgstr "交通和地图符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
-msgstr ""
+msgstr "炼金术符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
-msgstr ""
+msgstr "几何形状扩展"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
-msgstr ""
+msgstr "补充箭头 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
-msgstr ""
+msgstr "补充符号和象形图"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "象棋符号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
-msgstr ""
+msgstr "符号和象形图扩展 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "传统计算符号"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
-msgstr ""
+msgstr "中日韩统一表意文字扩展 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
-msgstr ""
+msgstr "中日韩兼容表意文字补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "中日韩统一表意文字扩展 G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "标签"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "变体选择器补充"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
-msgstr ""
+msgstr "补充私用区 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
-msgstr ""
+msgstr "补充私用区 B"
 
 #: tools/main.vala:51
 msgid "List engine name only"
@@ -2974,7 +3021,7 @@ msgstr "无法连接 IBus。\n"
 #: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
-msgstr "语言： %s\n"
+msgstr "语言：%s\n"
 
 #: tools/main.vala:161
 msgid "No engine is set.\n"
@@ -3012,11 +3059,11 @@ msgstr "写入注册缓存 FILE。"
 msgid ""
 "Use engine schema paths instead of ibus core, which can be comma-separated "
 "values."
-msgstr ""
+msgstr "使用引擎架构的路径而非 IBus 核心的，该值以半角逗号分隔。"
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr "正在重置…"
+msgstr "正在重置……"
 
 #: tools/main.vala:399
 msgid "Done"
@@ -3036,7 +3083,7 @@ msgstr "显示可用引擎"
 
 #: tools/main.vala:447
 msgid "(Not implemented)"
-msgstr "(暂不可用)"
+msgstr "（暂不可用）"
 
 #: tools/main.vala:448
 msgid "Restart ibus-daemon"
@@ -3048,7 +3095,7 @@ msgstr "显示版本号"
 
 #: tools/main.vala:450
 msgid "Show the content of registry cache"
-msgstr "显示注册缓存内容。"
+msgstr "显示注册缓存内容"
 
 #: tools/main.vala:451
 msgid "Create registry cache"
@@ -3056,7 +3103,7 @@ msgstr "创建注册缓存"
 
 #: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
+msgstr "输出 ibus-daemon 的 D-Bus 地址"
 
 #: tools/main.vala:453
 msgid "Show the configuration values"
@@ -3064,11 +3111,11 @@ msgstr "显示配置值"
 
 #: tools/main.vala:454
 msgid "Reset the configuration values"
-msgstr "重置配置"
+msgstr "重置配置值"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard"
-msgstr "将面板中的 emoji 保存到剪贴板"
+msgstr "保存面板中的 Emoji 到剪贴板"
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3094,7 +3141,7 @@ msgstr "%s 是未知命令！\n"
 
 #: ui/gtk3/emojier.vala:233
 msgid "Favorites"
-msgstr "最爱"
+msgstr "常用"
 
 #: ui/gtk3/emojier.vala:234
 msgid "Others"
@@ -3102,157 +3149,174 @@ msgstr "其他"
 
 #: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr ""
+msgstr "打开 Unicode 选择"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
-msgstr ""
+msgstr "返回 Emoji 选择"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "下一页"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "上一页"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "显示表情变体"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "关闭"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "菜单"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "点击查看警告信息"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "正在加载 Unicode 字典："
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "码位：%s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "有表情符号变体"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "无"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
-msgstr "释义：%s"
+msgstr "注释：%s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "名称：%s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "别名：%s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
-msgstr ""
+msgstr "Emoji 选择"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
-msgstr ""
+msgstr "Unicode 选择"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
-msgstr ""
-"无法捕捉当前文字应用程序。请重新让该应用程序获得焦点。比如多次按 Esc 键来释放"
-"表情输入模式，点击桌面然后再点击该文字应用程序。"
+msgstr "无法捕捉当前文本应用程序。请重新让该应用程序获得焦点。比如多次按 Esc 键来退出表情输入模式，或是点击桌面然后再点击回该文本应用程序。"
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
-msgstr "已取消选择一个 emoji"
+msgstr "已取消所选的 Emoji。"
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
-msgstr "已将 emoji 复制到你的剪贴板"
+msgstr "已复制 Emoji 到剪贴板。"
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
-#, fuzzy
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "用于表情符号对话框中显示表情符号的字体"
+msgstr "用于表情输入面板中表情符号的字体"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "字体"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+msgstr "表情输入面板中的注释语言，如“en”"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
-msgstr ""
+msgstr "语言"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
-msgstr ""
+msgstr "表情注释可以部分匹配"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
-msgstr ""
+msgstr "匹配指定整数的长度"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
-msgstr ""
+msgstr "按指定长度的条件匹配"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus 面板"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr "你配置的输入法 %s 在 IBus 输入法上不存在，因此配置了美国布局来替代你的输入法。"
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr "至少有一款你配置的输入法在 IBus 输入法上不存在。"
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr "请运行“ibus-setup”命令，打开“输入法”设置页，再次配置你的输入法。"
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 "黄鹏 <shawn.p.huang@gmail.com>\n"
-"Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>"
+"Fedora 简体中文组 <trans-zh_cn@lists.fedoraproject.org>\n"
+"Dingzhong Chen <wsxy162@gmail.com>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "首选项"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "重新启动"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "退出"
 
@@ -3261,3 +3325,24 @@ msgstr "退出"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>智能输入平台</small>\n"
+#~ "主页：https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "登录时运行 IBus"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>启动</b>"

From 1470078b9129753fb9f31e390336a423a489e4e8 Mon Sep 17 00:00:00 2001
From: Jan Kuparinen <copper_fin@hotmail.com>
Date: Sun, 21 Feb 2021 00:35:10 +0900
Subject: [PATCH 715/816] po: Update translation (Finnish)

Update po/fi.po at 18.9%
https://translate.fedoraproject.org/projects/ibus/ibus/fi/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/fi.po | 3487 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 2950 insertions(+), 537 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 9a11e7291..9155c49d7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,18 +1,19 @@
 # Finnish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2017. #zanata, 2020.
 # Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
+# Jan Kuparinen <copper_fin@hotmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2017-04-18 11:47+0900\n"
-"PO-Revision-Date: 2020-03-19 09:38+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-02-12 12:40+0000\n"
+"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
 "Language-Team: Finnish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fi/>\n"
 "Language: fi\n"
@@ -20,897 +21,3309 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.11.3\n"
+"X-Generator: Weblate 4.4.2\n"
 
-#: ../setup/setup.ui.h:1
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr ""
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr "Tallennettu versionumero"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr "Käytä xmodmapia"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr "Käytä järjestelmän näppäimistön asettelua"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr "Käytä järjestelmän näppäimistön (XKB) asettelua"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr "Jaa sama syötetapa kaikkien sovellusten välillä"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr "Käytä syötetapaa oletuksena"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr "Käytä pikanäppäimiä"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr "Poista pikanäppäimet käytöstä"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr "Automaattinen piilotus"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr "Kielipaneelin sijainti"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr "Näytä kuvake ilmoitusalueella"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr "Näytä syötetavan nimi"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr "Näytä syötetavan nimi kielipalkissa"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr "XKB-kuvakkeen RGBA-arvo"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr "Käytä omavalintaista fonttia"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
+msgid "Custom font"
+msgstr "Omavalintainen fontti"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+"Tekijänoikeus (c) 2007-2010 Peng Huang\n"
+"Tekijänoikeus (c) 2007-2010 Red Hat, Inc."
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr "Muu"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Valitse kieli"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_OK"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Lisää…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+msgid "About"
+msgstr "Tietoja"
+
+#: setup/engineabout.py:40 setup/setup.ui:1391
+msgid "_Close"
+msgstr "_Sulje"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Kieli: %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Näppäimistön asettelu: %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Tekijä: %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Kuvaus:\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr "Valitse syötetapa"
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Lisää"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Syötetapa"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "IBus-asetukset"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Määritä IBusin asetukset"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Pikanäppäimet"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Avain koodi:"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Muokkaajat:"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "_Poista"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr ""
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr "IBus-taustapalvelu ei ole käynnissä. Haluatko käynnistää sen?"
+
+#: setup/main.py:536
+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 on käynnistetty! Jos et voi käyttää IBusia, lisää seuraavat rivit "
+"$HOME/.bashrc-tiedostoon ja kirjaudu uudelleen.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+
+#. Translators: %d == 5 currently
+#: setup/main.py:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds."
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
 msgid "Horizontal"
 msgstr "Vaakasuora"
 
-#: ../setup/setup.ui.h:2
-msgid "Vertical"
-msgstr "Pystysuora"
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Pystysuora"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr "Vasen yläkulma"
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr "Oikea yläkulma"
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr "Vasen alakulma"
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr "Oikea alakulma"
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr "Älä näytä"
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr "Piilota automaattisesti"
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Aina"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr "Seuraava syötetapa:"
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr "Edellinen syötetapa:"
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr "..."
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr "Ota käyttöön tai poista käytöstä:"
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr "Ota käyttöön:"
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr "Poista käytöstä:"
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr "<b>Pikanäppäimet</b>"
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "Määritä miten ibus näyttää tai piilotaa kielivalikon"
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr "Näytä ominaisuuspaneeli:"
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr "Kielipaneelin sijainti:"
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr "Käytä mukautettua fonttia:"
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr "<b>Fontti ja tyyli</b>"
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "Yleiset"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Poista"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Ylös"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Alas"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "_Tietoja"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr "Näytä tietoja valitusta syötetavasta"
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Asetukset"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr "Näytä valitun syötetavan asetukset"
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+"<small><i>Aktiivinen syötetapa voidaan vaihtaa valitusta ylläolevasta "
+"listasta painamalla pikanäppäiimä tai klikkaamalla paneelin kuvaketta. </i></"
+"small>"
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr "Hymiöannotaatio:"
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr "Unicode fontti:"
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Näppäimistön asettelu</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr "<b>Yleiset syötetavan asetukset</b>"
+
+#: setup/setup.ui:1310
+msgid ""
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
+msgstr ""
+
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Fontit</b>"
+
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Edistyneet"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr ""
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr ""
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr ""
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr ""
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr ""
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr ""
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr ""
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr ""
 
-#: ../setup/setup.ui.h:3
-msgid "Top left corner"
-msgstr "Vasen yläkulma"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr ""
 
-#: ../setup/setup.ui.h:4
-msgid "Top right corner"
-msgstr "Oikea yläkulma"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr ""
 
-#: ../setup/setup.ui.h:5
-msgid "Bottom left corner"
-msgstr "Vasen alakulma"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
 
-#: ../setup/setup.ui.h:6
-msgid "Bottom right corner"
-msgstr "Oikea alakulma"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr ""
 
-#: ../setup/setup.ui.h:7
-msgid "Custom"
-msgstr "Mukautettu"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr ""
 
-#: ../setup/setup.ui.h:8
-msgid "Do not show"
-msgstr "Älä näytä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
 
-#: ../setup/setup.ui.h:9
-msgid "Hide automatically"
-msgstr "Piilota automaattisesti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr ""
 
-#: ../setup/setup.ui.h:10
-msgid "Always"
-msgstr "Aina"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr ""
 
-#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
-msgid "IBus Preferences"
-msgstr "IBus-asetukset"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
 
-#: ../setup/setup.ui.h:12
-msgid "The shortcut keys for switching to next input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
 msgstr ""
 
-#: ../setup/setup.ui.h:13
-msgid "Next input method:"
-msgstr "Seuraava syötetapa:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
 
-#: ../setup/setup.ui.h:14
-msgid "The shortcut keys for switching to previous input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
 msgstr ""
 
-#: ../setup/setup.ui.h:15
-msgid "Previous input method:"
-msgstr "Edellinen syötetapa:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr ""
 
-#: ../setup/setup.ui.h:16
-msgid "The shortcut keys for showing emoji dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
 msgstr ""
 
-#: ../setup/setup.ui.h:17
-msgid "Emoji dialog:"
-msgstr "Emoji-ikkuna:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
 
-#: ../setup/setup.ui.h:18
-msgid "..."
-msgstr "..."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr ""
 
-#: ../setup/setup.ui.h:19 ../data/ibus.schemas.in.h:16
-msgid "The shortcut keys for turning input method on or off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
 msgstr ""
 
-#: ../setup/setup.ui.h:20
-msgid "Enable or disable:"
-msgstr "Ota käyttöön tai poista käytöstä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr ""
 
-#: ../setup/setup.ui.h:21
-msgid "Enable:"
-msgstr "Ota käyttöön:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
 
-#: ../setup/setup.ui.h:22
-msgid "Disable:"
-msgstr "Poista käytöstä:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr ""
 
-#: ../setup/setup.ui.h:23
-msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Pikanäppäimet</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
 
-#: ../setup/setup.ui.h:24
-msgid "Set the orientation of candidates in lookup table"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
 msgstr ""
 
-#: ../setup/setup.ui.h:25
-msgid "Candidates orientation:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
 msgstr ""
 
-#: ../setup/setup.ui.h:26
-msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "Määritä miten ibus näyttää tai piilotaa kielivalikon"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr ""
 
-#: ../setup/setup.ui.h:27
-msgid "Show property panel:"
-msgstr "Näytä ominaisuuspaneeli:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr ""
 
-#: ../setup/setup.ui.h:28
-msgid "Language panel position:"
-msgstr "Kielipaneelin sijainti:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
 
-#: ../setup/setup.ui.h:29 ../data/ibus.schemas.in.h:36
-msgid "Show icon on system tray"
-msgstr "Näytä kuvake ilmoitusalueella"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr ""
 
-#: ../setup/setup.ui.h:30 ../data/ibus.schemas.in.h:38
-msgid "Show input method name on language bar"
-msgstr "Näytä syötetavan nimi kielipalkissa"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr ""
 
-#: ../setup/setup.ui.h:31
-msgid "Show input method's name on language bar when check the checkbox"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
 msgstr ""
 
-#: ../setup/setup.ui.h:32
-msgid "Embed preedit text in application window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
 msgstr ""
 
-#: ../setup/setup.ui.h:33
-msgid "Embed the preedit text of input method in the application window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
 msgstr ""
 
-#: ../setup/setup.ui.h:34
-msgid "Use custom font:"
-msgstr "Käytä mukautettua fonttia:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr ""
 
-#: ../setup/setup.ui.h:35
-msgid "Set a font of emoji candidates on the emoji dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
 msgstr ""
 
-#: ../setup/setup.ui.h:36
-msgid "Emoji font:"
-msgstr "Hymiöfontti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr ""
 
-#: ../setup/setup.ui.h:37
-msgid "Set a language of emoji annotations on the emoji dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
 msgstr ""
 
-#: ../setup/setup.ui.h:38
-msgid "Emoji annotation language:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
 msgstr ""
 
-#: ../setup/setup.ui.h:39
-msgid "<b>Font and Style</b>"
-msgstr "<b>Fontti ja tyyli</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr "Pystysuorat lomakkeet"
 
-#: ../setup/setup.ui.h:40
-msgid "General"
-msgstr "Yleiset"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr ""
 
-#. add button
-#: ../setup/setup.ui.h:41 ../setup/enginedialog.py:61
-#: ../setup/keyboardshortcut.py:124
-msgid "_Add"
-msgstr "_Lisää"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr ""
 
-#: ../setup/setup.ui.h:42
-msgid "Add the selected input method into the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
 msgstr ""
 
-#: ../setup/setup.ui.h:43
-msgid "_Remove"
-msgstr "_Poista"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr ""
 
-#: ../setup/setup.ui.h:44
-msgid "Remove the selected input method from the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
-#: ../setup/setup.ui.h:45
-msgid "_Up"
-msgstr "_Ylös"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr ""
 
-#: ../setup/setup.ui.h:46
-msgid "Move up the selected input method in the enabled input methods list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
 msgstr ""
 
-#: ../setup/setup.ui.h:47
-msgid "_Down"
-msgstr "_Alas"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr ""
 
-#: ../setup/setup.ui.h:48
-msgid "Move down the selected input method in the enabled input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
 msgstr ""
 
-#: ../setup/setup.ui.h:49
-msgid "_About"
-msgstr "_Tietoja"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:50
-msgid "Show information of the selected input method"
-msgstr "Näytä tietoja valitusta syötetavasta"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr ""
 
-#: ../setup/setup.ui.h:51
-msgid "_Preferences"
-msgstr "_Asetukset"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr ""
 
-#: ../setup/setup.ui.h:52
-msgid "Show setup of the selected input method"
-msgstr "Näytä valitun syötetavan asetukset"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr ""
 
-#: ../setup/setup.ui.h:53
-msgid ""
-"<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>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
 msgstr ""
-"<small><i>Aktiivinen syötetapa voidaan vaihtaa valitusta ylläolevasta "
-"listasta painamalla pikanäppäiimä tai klikkaamalla paneelin kuvaketta. </i></"
-"small>"
 
-#. create im name & icon column
-#: ../setup/setup.ui.h:54 ../setup/enginetreeview.py:68
-msgid "Input Method"
-msgstr "Syötetapa"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr ""
 
-#: ../setup/setup.ui.h:55 ../data/ibus.schemas.in.h:44
-msgid "Use system keyboard layout"
-msgstr "Käytä järjestelmän näppäimistön asettelua"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr ""
 
-#: ../setup/setup.ui.h:56 ../data/ibus.schemas.in.h:45
-msgid "Use system keyboard (XKB) layout"
-msgstr "Käytä järjestelmän näppäimistön (XKB) asettelua"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr ""
 
-#: ../setup/setup.ui.h:57
-msgid "<b>Keyboard Layout</b>"
-msgstr "<b>Näppäimistön asettelu</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr ""
 
-#: ../setup/setup.ui.h:58 ../data/ibus.schemas.in.h:60
-msgid "Share the same input method among all applications"
-msgstr "Jaa sama syötetapa kaikkien sovellusten välillä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr ""
 
-#: ../setup/setup.ui.h:59
-msgid "<b>Global input method settings</b>"
-msgstr "<b>Yleiset syötetavan asetukset</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr ""
 
-#: ../setup/setup.ui.h:60
-msgid "Advanced"
-msgstr "Edistyneet"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr ""
 
-#: ../setup/setup.ui.h:61
-msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>Älykäs syöteväylä</small>\n"
-"Sivusto: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
 
-#: ../setup/setup.ui.h:68
-msgid "Start ibus on login"
-msgstr "Käynnistä IBus kirjautumisen yhteydessä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
 
-#: ../setup/setup.ui.h:69
-msgid "<b>Startup</b>"
-msgstr "<b>Käynnistys</b>"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr ""
 
-#: ../setup/setup.ui.h:70 ../setup/engineabout.py:37 ../ui/gtk3/panel.vala:1232
-msgid "About"
-msgstr "Tietoja"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
 
-#: ../setup/setup.ui.h:71 ../setup/engineabout.py:40
-msgid "_Close"
-msgstr "_Sulje"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr ""
 
-#. Translators: Here “Preload” is a verb
-#: ../data/ibus.schemas.in.h:2
-msgid "Preload engines"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
 msgstr ""
 
-#. Translators: Tooltip for the button “Preload Engines”
-#: ../data/ibus.schemas.in.h:4
-msgid "Preload engines during ibus starts up"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
-msgid "Engines order"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:6
-msgid "Saved engines order in input method list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:7
-msgid "Popup delay milliseconds for IME switcher window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:8
-msgid ""
-"Set popup delay milliseconds to show IME switcher window. The default is 400."
-" 0 = Show the window immediately. 0 &lt; Delay milliseconds. 0 &gt; Do not "
-"show the window and switch prev/next engines."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
-msgid "Saved version number"
-msgstr "Tallennettu versionumero"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Sinhala Archaic Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Khudawadi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Tirhuta"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Modi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Mongolian Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Zanabazar Square"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h: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."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Soyombo"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
-msgid "Latin layouts which have no ASCII"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Pau Cin Hau"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
-msgid "US layout is appended to the latin layouts. variant can be omitted."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Bhaiksuki"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
-msgid "Use xmodmap"
-msgstr "Käytä xmodmapia"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Marchen"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
-msgid ""
-"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Masaram Gondi"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
-msgid "Trigger shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Gunjala Gondi"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
-msgid "Trigger shortcut keys for gtk_accelerator_parse"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Makasar"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:18
-msgid "Enable shortcut keys"
-msgstr "Käytä pikanäppäimiä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:19
-msgid "The shortcut keys for turning input method on"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Tamil Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Disable shortcut keys"
-msgstr "Poista pikanäppäimet käytöstä"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Cuneiform"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:21
-msgid "The shortcut keys for turning input method off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:22
-msgid "Next engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Early Dynastic Cuneiform"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:23
-msgid "The shortcut keys for switching to the next input method in the list"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Egyptian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:24
-msgid "Prev engine shortcut keys"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:25
-msgid "The shortcut keys for switching to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Anatolian Hieroglyphs"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:26
-msgid "Auto hide"
-msgstr "Automaattinen piilotus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Bamum Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:27
-msgid ""
-"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
-"show"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Mro"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:28
-msgid "Language panel position"
-msgstr "Kielipaneelin sijainti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Bassa Vah"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:29
-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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Pahawh Hmong"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:30
-msgid "Follow the input cursor in case the panel is always shown"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Medefaidrin"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
-msgid ""
-"If true, the panel follows the input cursor in case the panel is always "
-"shown. If false, the panel is shown at a fixed location."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Miao"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
-msgid "The milliseconds to show property panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:33
-msgid ""
-"The milliseconds to show property panel after focus-in or properties are "
-"changed."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Tangut"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:34
-msgid "Orientation of lookup table"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Tangut Components"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:35
-msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
-msgid "Show input method name"
-msgstr "Näytä syötetavan nimi"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:39
-msgid "RGBA value of XKB icon"
-msgstr "XKB-kuvakkeen RGBA-arvo"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Kana Supplement"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:41
-#, no-c-format
-msgid ""
-"XKB icon shows the layout string and the string is rendered with the RGBA "
-"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
-"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
-"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form "
-"'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 "
-"to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
-"point value in the range 0 to 1 of the alpha."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Kana Extended-A"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:42
-msgid "The milliseconds to show the panel icon for a property"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Small Kana Extension"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:43
-msgid ""
-"The milliseconds to show the panel icon from the engine icon to a property "
-"icon whenever engines are switched if the property is specified by the value "
-"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
-"property icon is shown immediately."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Nushu"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:46
-msgid "Use custom font"
-msgstr "Käytä omavalintaista fonttia"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Duployan"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:47
-msgid "Use custom font name for language panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Shorthand Format Controls"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:48
-msgid "Custom font"
-msgstr "Omavalintainen fontti"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Byzantine Musical Symbols"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:49
-msgid "Custom font name for language panel"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Musical Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:50
-msgid "Emoji shortcut keys for gtk_accelerator_parse"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Ancient Greek Musical Notation"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:51
-msgid "The shortcut keys for turning emoji typing on or off"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Mayan Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:52
-msgid "Custom font name for emoji chracters on emoji dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:53
-msgid "Default language for emoji dictionary"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Counting Rod Numerals"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:54
-msgid ""
-"Choose a default language of emoji dictionaries on the emoji dialog. The "
-"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:55
-msgid "favorite emoji list on emoji dialog"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Sutton SignWriting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:56
-msgid ""
-"You can show the favorite emojis on emoji list if this list has any "
-"characters."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Glagolitic Supplement"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:57
-msgid "Embed Preedit Text"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:58
-msgid "Embed Preedit Text in Application Window"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Wancho"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:59
-msgid "Use global input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Mende Kikakui"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:61
-msgid "Enable input method by default"
-msgstr "Käytä syötetapaa oletuksena"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Adlam"
+msgstr ""
 
-#: ../data/ibus.schemas.in.h:62
-msgid "Enable input method by default when the application gets input focus"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Indic Siyaq Numbers"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:63
-msgid "DConf preserve name prefixes"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:64
-msgid "Prefixes of DConf keys to stop name conversion"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
-#: ../ibus/_config.py.in:41
-msgid ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Mahjong Tiles"
 msgstr ""
-"Tekijänoikeus (c) 2007-2010 Peng Huang\n"
-"Tekijänoikeus (c) 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41 ../src/ibusutil.c:158
-msgid "Other"
-msgstr "Muu"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Domino Tiles"
+msgstr ""
 
-#: ../setup/emojilang.py:67
-msgid "Select a language"
-msgstr "Valitse kieli"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Playing Cards"
+msgstr ""
 
-#: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
-#: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
-msgid "_Cancel"
-msgstr "_Peru"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Enclosed Alphanumeric Supplement"
+msgstr ""
 
-#: ../setup/emojilang.py:71 ../setup/keyboardshortcut.py:340
-#: ../setup/main.py:458
-msgid "_OK"
-msgstr "_OK"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Enclosed Ideographic Supplement"
+msgstr ""
 
-#: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
-msgid "More…"
-msgstr "Lisää…"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr ""
 
-#: ../setup/engineabout.py:72
-#, python-format
-msgid "Language: %s\n"
-msgstr "Kieli: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Emoticons"
+msgstr ""
 
-#: ../setup/engineabout.py:75
-#, python-format
-msgid "Keyboard layout: %s\n"
-msgstr "Näppäimistön asettelu: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Ornamental Dingbats"
+msgstr ""
 
-#: ../setup/engineabout.py:78
-#, python-format
-msgid "Author: %s\n"
-msgstr "Tekijä: %s\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Transport and Map Symbols"
+msgstr ""
 
-#: ../setup/engineabout.py:81
-msgid "Description:\n"
-msgstr "Kuvaus:\n"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "Alchemical Symbols"
+msgstr ""
 
-#: ../setup/enginecombobox.py:139 ../setup/enginedialog.py:57
-msgid "Select an input method"
-msgstr "Valitse syötetapa"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "Geometric Shapes Extended"
+msgstr ""
 
-#: ../setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "Supplemental Arrows-C"
+msgstr ""
 
-#: ../setup/ibus-setup.desktop.in.h:2
-msgid "Set IBus Preferences"
-msgstr "Määritä IBusin asetukset"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "Supplemental Symbols and Pictographs"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:55
-msgid "Keyboard shortcuts"
-msgstr "Pikanäppäimet"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "Chess Symbols"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:67
-msgid "Key code:"
-msgstr "Avain koodi"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:82
-msgid "Modifiers:"
-msgstr "Muokkaajat:"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr ""
 
-#. apply button
-#: ../setup/keyboardshortcut.py:130
-msgid "_Apply"
-msgstr "_Toteuta"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "CJK Unified Ideographs Extension B"
+msgstr ""
 
-#. delete button
-#: ../setup/keyboardshortcut.py:136
-msgid "_Delete"
-msgstr "_Poista"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "CJK Unified Ideographs Extension C"
+msgstr ""
 
-#: ../setup/keyboardshortcut.py:252
-msgid ""
-"Please press a key (or a key combination).\n"
-"The dialog will be closed when the key is released."
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
-#: ../setup/keyboardshortcut.py:255
-msgid "Please press a key (or a key combination)"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1233
+msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
-#: ../setup/main.py:121 ../setup/main.py:485
-msgid "Use shortcut with shift to switch to the previous input method"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1237
+msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
-#: ../setup/main.py:412
-msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-taustapalvelu ei ole käynnissä. Haluatko käynnistää sen?"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1241
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr ""
 
-#: ../setup/main.py:433
-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"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
 msgstr ""
-"IBus on käynnistetty! Jos et voi käyttää IBusia, lisää seuraavat rivit $HOME/"
-".bashrc-tiedostoon ja kirjaudu uudelleen.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
 
-#. Translators: %d == 5 currently
-#: ../setup/main.py:447
-#, python-format
-msgid "IBus daemon could not be started in %d seconds"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
+msgid "Tags"
 msgstr ""
 
-#: ../setup/main.py:459
-#, python-format
-msgid "Select keyboard shortcut for %s"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1253
+msgid "Variation Selectors Supplement"
 msgstr ""
 
-#. Translators: Title of the window
-#: ../setup/main.py:461
-msgid "switching input methods"
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1257
+msgid "Supplementary Private Use Area-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1261
+msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: ../tools/main.vala:51
+#: tools/main.vala:51
 msgid "List engine name only"
 msgstr ""
 
-#: ../tools/main.vala:67 ../tools/main.vala:188 ../tools/main.vala:198
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
 msgstr "Yhteys IBusiin ei onnistu.\n"
 
-#: ../tools/main.vala:93
+#: tools/main.vala:93
 #, c-format
 msgid "language: %s\n"
 msgstr "kieli: %s\n"
 
-#: ../tools/main.vala:161
+#: tools/main.vala:161
 msgid "No engine is set.\n"
 msgstr ""
 
-#: ../tools/main.vala:169
+#: tools/main.vala:169
 msgid "Set global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:174
+#: tools/main.vala:174
 msgid "Get global engine failed.\n"
 msgstr ""
 
-#: ../tools/main.vala:213
+#: tools/main.vala:217
 msgid "Read the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:215
+#: tools/main.vala:219
 msgid "Read the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:233 ../tools/main.vala:238
+#: tools/main.vala:237 tools/main.vala:242
 msgid "The registry cache is invalid.\n"
 msgstr ""
 
-#: ../tools/main.vala:253
+#: tools/main.vala:257
 msgid "Write the system registry cache."
 msgstr ""
 
-#: ../tools/main.vala:255
+#: tools/main.vala:259
 msgid "Write the registry cache FILE."
 msgstr ""
 
-#: ../tools/main.vala:307
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
 msgid "Resetting…"
 msgstr ""
 
-#: ../tools/main.vala:321
+#: tools/main.vala:399
 msgid "Done"
 msgstr "Valmis"
 
-#: ../tools/main.vala:366
+#: tools/main.vala:444
 msgid "Set or get engine"
 msgstr ""
 
-#: ../tools/main.vala:367
+#: tools/main.vala:445
 msgid "Exit ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:368
+#: tools/main.vala:446
 msgid "Show available engines"
 msgstr "Näytä saatavilla olevat moottorit"
 
-#: ../tools/main.vala:369
+#: tools/main.vala:447
 msgid "(Not implemented)"
 msgstr "(Ei toteutettu)"
 
-#: ../tools/main.vala:370
+#: tools/main.vala:448
 msgid "Restart ibus-daemon"
 msgstr "Käynnistä ibus-daemon uudelleen"
 
-#: ../tools/main.vala:371
+#: tools/main.vala:449
 msgid "Show version"
 msgstr "Näytä versio"
 
-#: ../tools/main.vala:372
+#: tools/main.vala:450
 msgid "Show the content of registry cache"
 msgstr ""
 
-#: ../tools/main.vala:373
+#: tools/main.vala:451
 msgid "Create registry cache"
 msgstr ""
 
-#: ../tools/main.vala:374
+#: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr ""
 
-#: ../tools/main.vala:375
+#: tools/main.vala:453
 msgid "Show the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:376
+#: tools/main.vala:454
 msgid "Reset the configuration values"
 msgstr ""
 
-#: ../tools/main.vala:378
-msgid "Save emoji on dialog to clipboard "
-msgstr ""
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard"
+msgstr "Tallenna dialogin emoji leikepöydälle"
 
-#: ../tools/main.vala:380
+#: tools/main.vala:458
 msgid "Show this information"
 msgstr "Näytä tämä tieto"
 
-#: ../tools/main.vala:386
+#: tools/main.vala:464
 #, c-format
-msgid "Usage: %s COMMAND [OPTION...]\n"
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr ""
 
-#: ../tools/main.vala:387
+#: tools/main.vala:465
 msgid "Commands:\n"
 msgstr "Komennot:\n"
 
-#: ../tools/main.vala:416
+#: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s on tuntematon komento!\n"
 
-#: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
-msgid "Emoji Dialog"
-msgstr "Emoji-ikkuna"
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr "Suosikit"
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr "Muut"
 
-#: ../ui/gtk3/emojier.vala:293
-msgid "Type annotation or choose emoji"
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
-msgid "Favorites"
-msgstr "Suosikit"
+#: ui/gtk3/emojier.vala:995
+msgid "Bring back emoji choice"
+msgstr ""
 
-#: ../ui/gtk3/emojier.vala:628
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Sivu alas"
 
-#: ../ui/gtk3/emojier.vala:639
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Sivu ylös"
 
-#. TODO: Provide a custom description and annotation for
-#. the favorite emojis.
-#: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
+#: ui/gtk3/emojier.vala:1111
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1112
+msgid "Close"
+msgstr "Sulje"
+
+#: ui/gtk3/emojier.vala:1118
+msgid "Menu"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1129
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1173
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1419
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1425
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
-#: ../ui/gtk3/emojier.vala:813
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
+#: ui/gtk3/emojier.vala:1616
 #, c-format
-msgid "Code point: %s"
+msgid "Annotations: %s"
 msgstr ""
 
-#: ../ui/gtk3/emojier.vala:838
+#: ui/gtk3/emojier.vala:1642
 #, c-format
-msgid "Annotations: %s"
+msgid "Name: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1650
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
+msgid "Emoji Choice"
+msgstr "Hymiö valinta"
+
+#: ui/gtk3/emojier.vala:2142
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2432
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:67
+msgid "Copied an emoji to your clipboard."
+msgstr "Kopioitiin emoji leikepöydälle."
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:126
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "FONT"
+msgstr ""
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:132
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
+#: ui/gtk3/emojierapp.vala:133
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:135
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:139
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:143
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus-paneeli"
 
-#: ../ui/gtk3/panel.vala:823
-msgid "IBus Update"
-msgstr "IBus-päivitys"
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
-msgid "Super+space is now the default hotkey."
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
 msgstr ""
 
-#: ../ui/gtk3/panel.vala:1196
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus on älykäs syöteväylä Linuxille/Unixille."
 
-#: ../ui/gtk3/panel.vala:1200
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr "kääntäjät"
 
-#: ../ui/gtk3/panel.vala:1219
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../ui/gtk3/panel.vala:1238
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#: ../ui/gtk3/panel.vala:1242
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Lopeta"
 
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
-#: ../ui/gtk3/propertypanel.vala:341 ../ui/gtk3/propertypanel.vala:349
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr ""
 
-#: ../ui/gtk3/emojierapp.vala:45
-msgid "Canceled to choose an emoji."
-msgstr ""
+#~ msgid "Emoji dialog:"
+#~ msgstr "Emoji-ikkuna:"
 
-#: ../ui/gtk3/emojierapp.vala:52
-msgid "Copied an emoji to your clipboard."
-msgstr "Kopioitiin emoji leikepöydälle."
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>Älykäs syöteväylä</small>\n"
+#~ "Sivusto: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
 
-#. TRANSLATORS: "FONT" should be capital and translatable.
-#. * It's used for an argument command --font=FONT
-#. 
-#: ../ui/gtk3/emojierapp.vala:82
-msgid "\"FONT\" for emoji chracters on emoji dialog"
-msgstr ""
+#~ msgid "Start ibus on login"
+#~ msgstr "Käynnistä IBus kirjautumisen yhteydessä"
 
-#: ../ui/gtk3/emojierapp.vala:83
-msgid "FONT"
-msgstr ""
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Käynnistys</b>"
 
-#. TRANSLATORS: "LANG" should be capital and translatable.
-#. * It's used for an argument command --lang=LANG
-#. 
-#: ../ui/gtk3/emojierapp.vala:88
-msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr ""
+#~ msgid "Kbd"
+#~ msgstr "Kbd"
 
-#: ../ui/gtk3/emojierapp.vala:89
-msgid "LANG"
-msgstr ""
+#~ msgid "Emoji Dialog"
+#~ msgstr "Emoji-ikkuna"
+
+#~ msgid "IBus Update"
+#~ msgstr "IBus-päivitys"

From ef497424f5ca32b4b8749245a77d01c3bb6317de Mon Sep 17 00:00:00 2001
From: Ricky Tigg <ricky.tigg@gmail.com>
Date: Sun, 21 Feb 2021 00:35:10 +0900
Subject: [PATCH 716/816] po: Update translation (Finnish)

Update po/fi.po at 19.2%
https://translate.fedoraproject.org/projects/ibus/ibus/fi/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/fi.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 9155c49d7..50ccf8f51 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,6 +7,7 @@
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2017. #zanata, 2020.
 # Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
 # Jan Kuparinen <copper_fin@hotmail.com>, 2021.
+# Ricky Tigg <ricky.tigg@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
@@ -798,7 +799,7 @@ msgstr ""
 
 #: src/ibusemojigen.h:32
 msgid "Component"
-msgstr ""
+msgstr "Komponentti"
 
 #: src/ibusemojigen.h:33
 msgid "Flags"
@@ -3181,7 +3182,7 @@ msgstr ""
 #: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
-msgstr ""
+msgstr "Nimi: %s"
 
 #: ui/gtk3/emojier.vala:1650
 #, c-format

From 583420539f9ff1a3419b906ca4fd9e26d2f1f3ec Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Sun, 21 Feb 2021 00:35:23 +0900
Subject: [PATCH 717/816] po: Update translation (French)

Update po/fr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/fr/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/fr.po | 496 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 298 insertions(+), 198 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 721e3ddeb..8457893d9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,35 +1,27 @@
 # French translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Charles-Antoine Couret <cacouret@wanadoo.fr>, 2009
 # dominique bribanick <chepioq@gmail.com>, 2011,2014
 # Jérôme Fenal <jfenal@gmail.com>, 2012-2013
-# Julien Humbert <julroy67@gmail.com>, 2009-2014, 2020.
+# Julien Humbert <julroy67@gmail.com>, 2009-2015, 2020, 2021.
 # Sam Friedmann <sam.friedmann@redhat.com>, 2010
-# Julien Humbert <julroy67@gmail.com>, 2009-2015, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016. #zanata, 2020.
-# José Fournier <jaaf64@zoraldia.com>, 2016. #zanata
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2016-2019, 2020.
+# José Fournier <jaaf64@zoraldia.com>, 2016, 2017. #zanata
 # Edouard Duliege <edouard.duliege@gmail.com>, 2017. #zanata
 # Emmanuel Nedelec <nednet@wanadoo.fr>, 2017. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata, 2020.
-# José Fournier <jaaf64@zoraldia.com>, 2017. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2018. #zanata, 2020.
+# fujiwara <takao.fujiwara1@gmail.com>, 2015, 2017-2019. #zanata
 # elmerys <contact@zle.fr>, 2018. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2019. #zanata, 2020.
-# fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-07-06 08:27+0000\n"
-"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-02-16 10:40+0000\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
 "Language-Team: French <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fr/>\n"
 "Language: fr\n"
@@ -37,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -311,7 +303,7 @@ msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langues"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
 msgstr "Police personnalisée"
 
@@ -319,35 +311,53 @@ msgstr "Police personnalisée"
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour la barre de langues"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:173
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+"Choisissez les glyphes avec la langue de la méthode de saisie dans la "
+"fenêtre de candidats"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+"Certains points de code ont des glyphes différents et Pango détermine les "
+"glyphes à partir de l’attribut de langue. Pango choisit les glyphes à partir "
+"de la langue du moteur IBus si la valeur est vraie et les choisit à partir "
+"de la locale du bureau si la valeur est fausse."
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr "Touches de raccourcis Unicodes pour gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:174
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 "Les touches de raccourcis pour activer ou désactiver la frappe en mode "
 "Unicode"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:178
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourcis clavier des émoticônes pour gtk_accelerator_parse"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:179
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr "Raccourcis clavier pour activer ou désactiver la saisie des émoticônes"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:184
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 "Nom de la police personnalisée pour les caractères d’émoticônes dans la "
 "boite de dialogue"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
 msgstr "Langue par défaut pour le dictionnaire des émoticônes"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:189
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
@@ -356,11 +366,11 @@ msgstr ""
 "boite de dialogue. La valeur $Lang est appliquée à /usr/share/ibus/dicts/"
 "emoji-$lang.dict ."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
 msgstr "liste des émoticônes favorites dans la boite de dialogue"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:194
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
@@ -368,22 +378,22 @@ msgstr ""
 "Vous pouvez afficher les émoticônes favorites dans la liste des émoticônes "
 "si celle-ci contient des caractères."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr "liste des annotations d’émoticônes favorites dans la boite de dialogue"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:199
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 "Vous pouvez assigner une annotation pour une émoticône favorite dans cette "
 "liste."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre partiellement ou non"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:204
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
@@ -391,11 +401,11 @@ msgstr ""
 "Si les annotations d’émoticônes peuvent correspondre ou non à une chaîne "
 "partielle plutôt qu’à la chaîne complète."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
 msgstr "Correspondance d’annotations d’émoticônes ayant la longueur spécifiée"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:209
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
@@ -403,12 +413,12 @@ msgstr ""
 "Correspondances partielles avec plus que le nombre de caractères spécifié "
 "plutôt qu’une correspondance exacte."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 "Choisir une condition de correspondance partielle d’annotations d’émoticônes"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:214
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
@@ -417,11 +427,11 @@ msgstr ""
 "d’annotations d’émoticônes : 0 == correspondance de préfixe, 1 == "
 "correspondance de suffixe, 2 == correspondance de contenu"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
 msgstr "Charge les données relatives aux émoticônes au démarrage"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:219
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
@@ -432,11 +442,11 @@ msgstr ""
 "les données des émoticônes sont chargées lors de l’ouverture de la boite de "
 "dialogue des émoticônes."
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
 msgid "Load the Unicode data at the time of startup"
 msgstr "Charge les données Unicode au démarrage"
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -472,17 +482,17 @@ msgstr "A_nnuler"
 
 #: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
-msgstr "_Valider"
+msgstr "_OK"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
 msgstr "Plus…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1378 ui/gtk3/panel.vala:1138
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "À propos"
 
-#: setup/engineabout.py:40 setup/setup.ui:1401
+#: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -519,10 +529,6 @@ msgstr "_Ajouter"
 msgid "Input Method"
 msgstr "Méthode d’entrée"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "Préférences de IBus"
@@ -739,7 +745,7 @@ msgstr "Ajouter la méthode d’entrée selectionnée aux méthodes d’entrée
 
 #: setup/setup.ui:682
 msgid "_Remove"
-msgstr "_Enlever"
+msgstr "_Retirer"
 
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"
@@ -870,33 +876,21 @@ msgstr "<b>Disposition du clavier</b>"
 msgid "<b>Global input method settings</b>"
 msgstr "<b>Configuration de la méthode d’éntrée globale</b>"
 
-#: setup/setup.ui:1298
-msgid "Advanced"
-msgstr "Avancé"
-
-#: setup/setup.ui:1317
+#: setup/setup.ui:1310
 msgid ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Homepage: https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
 msgstr ""
-"<big><b>IBus</b></big>\n"
-"<small>The intelligent input bus</small>\n"
-"Page d’accueil : https://github.com/ibus/ibus/wiki\n"
-"\n"
-"\n"
-"\n"
+"Choisissez les glyphes avec la langue de la méthode de saisie dans la "
+"fenêtre de candidats pour les points de code dupliqués"
 
-#: setup/setup.ui:1341
-msgid "Start ibus on login"
-msgstr "Démarrer IBus lors de la connexion"
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Polices</b>"
 
-#: setup/setup.ui:1358
-msgid "<b>Startup</b>"
-msgstr "<b>Démarrage</b>"
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Avancé"
 
 #: src/ibusemojigen.h:30
 msgid "Activities"
@@ -2377,664 +2371,720 @@ msgstr "Symboles numériques Rûmî"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr "Yézidi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
 msgid "Old Sogdian"
 msgstr "Sogdiane ancien"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:861
 msgid "Sogdian"
 msgstr "Sogdiane"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr "Chorasmien"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
 msgid "Elymaic"
 msgstr "Élymaïque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:873
 msgid "Brahmi"
 msgstr "Brahmî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:877
 msgid "Kaithi"
 msgstr "Kaïthî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:881
 msgid "Sora Sompeng"
 msgstr "Sora Sompeng"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:885
 msgid "Chakma"
 msgstr "Chakma"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:889
 msgid "Mahajani"
 msgstr "Mahajani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:893
 msgid "Sharada"
 msgstr "Sharada"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:897
 msgid "Sinhala Archaic Numbers"
 msgstr "Nombre archaïque Cingalais"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:901
 msgid "Khojki"
 msgstr "Khojkï"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:905
 msgid "Multani"
 msgstr "Multani"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:909
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:913
 msgid "Grantha"
 msgstr "Grantha"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:917
 msgid "Newa"
 msgstr "Newa"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:921
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:925
 msgid "Siddham"
 msgstr "Siddham"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:929
 msgid "Modi"
 msgstr "Modi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:933
 msgid "Mongolian Supplement"
 msgstr "Supplément Mongol"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:937
 msgid "Takri"
 msgstr "Takrî"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:941
 msgid "Ahom"
 msgstr "Ahom"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:945
 msgid "Dogra"
 msgstr "Dogri"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:949
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr "Dives akuru"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
 msgid "Nandinagari"
 msgstr "Nandinagari"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:961
 msgid "Zanabazar Square"
 msgstr "Zanabazar carré"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:965
 msgid "Soyombo"
 msgstr "Soyombo"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:969
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:973
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:977
 msgid "Marchen"
 msgstr "Marchen"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:981
 msgid "Masaram Gondi"
 msgstr "Gondi de Masaram"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:985
 msgid "Gunjala Gondi"
 msgstr "Gong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:989
 msgid "Makasar"
 msgstr "Maka"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr "Supplément Lisu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
 msgid "Tamil Supplement"
 msgstr "Supplément Tamoul"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1001
 msgid "Cuneiform"
 msgstr "Cunéiforme"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1005
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Nombres cunéiformes et ponctuation"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1009
 msgid "Early Dynastic Cuneiform"
 msgstr "Cunéiforme dynastique archaïque"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1013
 msgid "Egyptian Hieroglyphs"
 msgstr "Hiéroglyphes égyptiens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1017
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Réglages du format hiéroglyphes égyptiens"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1021
 msgid "Anatolian Hieroglyphs"
 msgstr "Hiéroglyphes hittites"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1025
 msgid "Bamum Supplement"
 msgstr "Supplément Bamoun"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1029
 msgid "Mro"
 msgstr "Mro"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1033
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1037
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1041
 msgid "Medefaidrin"
 msgstr "Medf"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1045
 msgid "Miao"
 msgstr "Miao"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1049
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Symboles et ponctuation idéographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1053
 msgid "Tangut"
 msgstr "Tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1057
 msgid "Tangut Components"
 msgstr "Composants tangoute"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr "Petite écriture khitan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr "Supplément tangoute"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
 msgid "Kana Supplement"
 msgstr "Supplément Kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
 msgstr "Kana étendu A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
 msgstr "Extension de petits Kana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1081
 msgid "Nushu"
 msgstr "Nushu"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1085
 msgid "Duployan"
 msgstr "Duployan"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1089
 msgid "Shorthand Format Controls"
 msgstr "Réglages du format abrégé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1093
 msgid "Byzantine Musical Symbols"
 msgstr "Symboles musicaux byzantins"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1097
 msgid "Musical Symbols"
 msgstr "Symboles musicaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1101
 msgid "Ancient Greek Musical Notation"
 msgstr "Notation musicale grecque ancienne"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1105
 msgid "Mayan Numerals"
 msgstr "Chiffres mayas"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1109
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symboles Tai Xuan Jing"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1113
 msgid "Counting Rod Numerals"
 msgstr "Chiffres-bâtonnets chinois"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Symboles mathématiques alphanumériques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1121
 msgid "Sutton SignWriting"
 msgstr "SignWriting de Sutton"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1125
 msgid "Glagolitic Supplement"
 msgstr "Supplément Glagolitique"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1129
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Nyiakeng Puachue Hmong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1133
 msgid "Wancho"
 msgstr "Wantcho"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1137
 msgid "Mende Kikakui"
 msgstr "Écriture mendé Kikakui"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1141
 msgid "Adlam"
 msgstr "Adlam"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1145
 msgid "Indic Siyaq Numbers"
 msgstr "Nombres hindous Siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1149
 msgid "Ottoman Siyaq Numbers"
 msgstr "Nombres ottomans Siyaq"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1153
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Symboles mathématiques alphanumériques arabes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1157
 msgid "Mahjong Tiles"
 msgstr "Tuiles de mahjong"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1161
 msgid "Domino Tiles"
 msgstr "Dominos"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1165
 msgid "Playing Cards"
 msgstr "Cartes à jouer"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Supplément alphanumérique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1173
 msgid "Enclosed Ideographic Supplement"
 msgstr "Supplément idéographique cerclé"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1177
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Symboles et pictogrammes divers"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1181
 msgid "Emoticons"
 msgstr "Émoticônes"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1185
 msgid "Ornamental Dingbats"
 msgstr "Casseaux ornementaux"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1189
 msgid "Transport and Map Symbols"
 msgstr "Symboles du transport et cartographiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1193
 msgid "Alchemical Symbols"
 msgstr "Symboles alchimiques"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1197
 msgid "Geometric Shapes Extended"
 msgstr "Formes géométriques étendues"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
 msgstr "Flèches-C supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1205
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Symboles et pictogrammes supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1209
 msgid "Chess Symbols"
 msgstr "Symboles d’échecs"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1213
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Symboles et pictogrammes étendus-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr "Symboles pour informatique ancienne"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Idéographes unifiés CJC Extension B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1225
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Idéographes unifiés CJC Extension C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1229
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Idéographes unifiés CJC Extension D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1233
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Idéographes unifiés CJC Extension E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1237
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Idéographes unifiés CJC Extension F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1241
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Idéographes de compatibilité CJK supplémentaires"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr "Idéographes unifiés CJC Extension G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1253
 msgid "Variation Selectors Supplement"
 msgstr "Suppléments de sélecteurs de variante"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
 msgstr "Area-A Zone à usage privé supplémentaire"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
 msgstr "Area-B Zone à usage privé supplémentaire"
 
@@ -3181,81 +3231,81 @@ msgstr "Autres"
 msgid "Open Unicode choice"
 msgstr "Ouvrir un choix Unicode"
 
-#: ui/gtk3/emojier.vala:994
+#: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
 msgstr "Rétablir le choix emoji"
 
-#: ui/gtk3/emojier.vala:1096
+#: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
 msgstr "Page suivante"
 
-#: ui/gtk3/emojier.vala:1107
+#: ui/gtk3/emojier.vala:1108
 msgid "Page Up"
 msgstr "Page précédente"
 
-#: ui/gtk3/emojier.vala:1110
+#: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
 msgstr "Montrer les variantes d’émoticônes"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1112
 msgid "Close"
 msgstr "Fermer"
 
-#: ui/gtk3/emojier.vala:1117
+#: ui/gtk3/emojier.vala:1118
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/gtk3/emojier.vala:1128
+#: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"
 msgstr "Cliquez pour voir le message d’avertissement"
 
-#: ui/gtk3/emojier.vala:1172
+#: ui/gtk3/emojier.vala:1173
 msgid "Loading a Unicode dictionary:"
 msgstr "Chargement d’un dictionnaire Unicode :"
 
-#: ui/gtk3/emojier.vala:1418
+#: ui/gtk3/emojier.vala:1419
 #, c-format
 msgid "Code point: %s"
 msgstr "Point de code : %s"
 
-#: ui/gtk3/emojier.vala:1424
+#: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
 msgstr "A des variantes d’émoticônes"
 
-#: ui/gtk3/emojier.vala:1591 ui/gtk3/emojier.vala:1604
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ui/gtk3/emojier.vala:1591
+#: ui/gtk3/emojier.vala:1592
 msgid "None"
 msgstr "Aucune"
 
-#: ui/gtk3/emojier.vala:1615
+#: ui/gtk3/emojier.vala:1616
 #, c-format
 msgid "Annotations: %s"
 msgstr "Annotations : %s"
 
-#: ui/gtk3/emojier.vala:1641
+#: ui/gtk3/emojier.vala:1642
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: ui/gtk3/emojier.vala:1649
+#: ui/gtk3/emojier.vala:1650
 #, c-format
 msgid "Alias: %s"
 msgstr "Alias : %s"
 
-#: ui/gtk3/emojier.vala:2139 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1123
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "Choix d’émoticônes"
 
-#: ui/gtk3/emojier.vala:2141
+#: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
 msgstr "Choix Unicode"
 
-#: ui/gtk3/emojier.vala:2429
+#: ui/gtk3/emojier.vala:2432
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3266,71 +3316,97 @@ msgstr ""
 "Échap pour relâcher le mode de saisie emoji, cliquez sur votre bureau et "
 "cliquez à nouveau sur votre application texte."
 
-#: ui/gtk3/emojierapp.vala:58
+#: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
 msgstr "Abandon du choix d’émoticône."
 
-#: ui/gtk3/emojierapp.vala:93
+#: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
 msgstr "Une émoticône a été copiée dans le presse-papier."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
-#: ui/gtk3/emojierapp.vala:114
+#: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
 msgstr "« POLICE » des émoticônes dans la boite de dialogue"
 
-#: ui/gtk3/emojierapp.vala:115
+#: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
 msgstr "POLICE"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
-#: ui/gtk3/emojierapp.vala:120
+#: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
 msgstr ""
 "« LANGUE » des annotations dans la boite de dialogue des émoticône. Par ex : "
 "« fr »"
 
-#: ui/gtk3/emojierapp.vala:121
+#: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
 msgstr "LANGUE"
 
-#: ui/gtk3/emojierapp.vala:123
+#: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
 msgstr "Les annotations d’émoticônes peuvent correspondre partiellement"
 
-#: ui/gtk3/emojierapp.vala:127
+#: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
 msgstr "Faire correspondre avec la longueur de l’entier indiqué"
 
-#: ui/gtk3/emojierapp.vala:131
+#: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
 msgstr "Faire correspondre avec la condition de l’entier indiqué"
 
-#: ui/gtk3/panel.vala:282 ui/gtk3/panel.vala:313
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "Panneau IBUS"
 
-#: ui/gtk3/panel.vala:1095
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"Votre méthode d’entrée configurée %s n’existe pas dans les méthodes d’entrée "
+"IBus, la disposition « US » sera utilisée à la place de votre méthode "
+"d’entrée."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"Au moins une de vos méthodes d’entrée configurées n’existe pas dans les "
+"méthodes d’entrée IBus."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"Veuillez exécuter la commande `ibus-setup`, ouvrir l’onglet « Méthodes d’"
+"entrée », et configurer à nouveau vos méthodes d’entrée."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ui/gtk3/panel.vala:1099
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr "Julien Humbert <julroy67@gmail.com>"
 
-#: ui/gtk3/panel.vala:1118
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ui/gtk3/panel.vala:1144
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ui/gtk3/panel.vala:1148
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "Quitter"
 
@@ -3339,3 +3415,27 @@ msgstr "Quitter"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
+
+#~ msgid "Kbd"
+#~ msgstr "Kbd"
+
+#~ msgid ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Homepage: https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<big><b>IBus</b></big>\n"
+#~ "<small>The intelligent input bus</small>\n"
+#~ "Page d’accueil : https://github.com/ibus/ibus/wiki\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Start ibus on login"
+#~ msgstr "Démarrer IBus lors de la connexion"
+
+#~ msgid "<b>Startup</b>"
+#~ msgstr "<b>Démarrage</b>"

From 27baf2047ff5728cc7ae6806380541d038fcc99d Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@localhost.localdomain>
Date: Sun, 21 Feb 2021 00:35:29 +0900
Subject: [PATCH 718/816] po: Update translation (Japanese)

Update po/ja.po at 98.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ja/

BUG=https://github.com/ibus/ibus/pull/2266
---
 po/ja.po | 69 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 26e2983b1..e7caa0d97 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # Japanese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -12,15 +12,12 @@
 # noriko <noriko@redhat.com>, 2013
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
 # carrotsoft <www.carrotsoft@gmail.com>, 2012
-# fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
-# fujiwara <takao.fujiwara1@gmail.com>, 2019. #zanata
+# fujiwara <takao.fujiwara1@gmail.com>, 2015-2019. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-08-26 19:53+0900\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
 "PO-Revision-Date: 2019-07-24 03:07+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
@@ -315,9 +312,9 @@ msgid ""
 "language if the value is true and choose them from the desktop locale if the "
 "value is false."
 msgstr ""
-"いくつかのコードポイントは異なるグリフを持ち、Pango は言語属性からグリフを"
-"決定する。値が真の場合、Pango は IBus エンジンの言語からグリフを選択し、"
-"値が偽の場合、デスクトップのロケールから選択する。"
+"いくつかのコードポイントは異なるグリフを持ち、Pango は言語属性からグリフを決"
+"定する。値が真の場合、Pango は IBus エンジンの言語からグリフを選択し、値が偽"
+"の場合、デスクトップのロケールから選択する。"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
@@ -463,7 +460,7 @@ msgstr "OK(_O)"
 msgid "More…"
 msgstr "さらに…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "情報"
 
@@ -504,10 +501,6 @@ msgstr "追加(_A)"
 msgid "Input Method"
 msgstr "入力メソッド"
 
-#: setup/enginetreeview.py:96
-msgid "Kbd"
-msgstr "Kbd"
-
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
 msgstr "IBus の設定"
@@ -842,8 +835,8 @@ msgid ""
 "Choose glyphs with the input method's language on the candidate window for "
 "the duplicated code points"
 msgstr ""
-"重複したコードポイントのために候補ウィンドウ上でインプットメソッドの言語で"
-"グリフを選択する"
+"重複したコードポイントのために候補ウィンドウ上でインプットメソッドの言語でグ"
+"リフを選択する"
 
 #: setup/setup.ui:1327
 msgid "<b>Fonts</b>"
@@ -2358,7 +2351,7 @@ msgstr "ソグド文字"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
 msgid "Chorasmian"
-msgstr ""
+msgstr "ホラズム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2512,7 +2505,7 @@ msgstr "ワラング・クシティ文字"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:953
 msgid "Dives Akuru"
-msgstr ""
+msgstr "ディヴェ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2701,7 +2694,7 @@ msgstr "西南文字の構成要素"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1061
 msgid "Khitan Small Script"
-msgstr ""
+msgstr "契丹小さなスクリプト"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3262,7 +3255,7 @@ msgid "Alias: %s"
 msgstr "別名: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
@@ -3327,11 +3320,35 @@ msgstr "指定した数字の条件で一致させる"
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"構成された入力メソッド %s は IBus 入力メソッドに存在しないので、"
+"\"US\" レイアウトがあなたの入力メソッドの代わりに構成されました。"
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+"構成された入力メソッドの少なくとも１つが IBus 入力メソッドに存在しません。"
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"`ibus-setup` をコマンドを実行して、\"入力メソッド\" タブを開いて、"
+"入力メソッドを再度構成してください。"
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -3339,15 +3356,15 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "設定"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "再起動"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "終了"
 
@@ -3357,3 +3374,5 @@ msgstr "終了"
 msgid "default:LTR"
 msgstr "default:LTR"
 
+#~ msgid "Kbd"
+#~ msgstr "Kbd"

From 72ca5c932e511f10dabe171572fb97eaec001e4b Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Sun, 21 Feb 2021 22:03:42 +0900
Subject: [PATCH 719/816] setup: Hide IBus Preferences from AppStream

BUG=https://github.com/ibus/ibus/issues/2286
---
 setup/ibus-setup.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/ibus-setup.desktop b/setup/ibus-setup.desktop
index c6d19b6d5..3ad41c495 100644
--- a/setup/ibus-setup.desktop
+++ b/setup/ibus-setup.desktop
@@ -9,4 +9,5 @@ StartupNotify=true
 Categories=Settings;
 # GNOME uses its own "input source" settings instead
 NotShowIn=GNOME;Unity;
+X-AppStream-Ignore=true
 Keywords=keyboard;input;

From 5012b69c7c0ee39c6be4d230a5f1e8a9fc22a17f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 21 Feb 2021 23:27:26 +0900
Subject: [PATCH 720/816] engine: Update simple.xml

---
 engine/simple.xml.in | 414 ++++++++++++-------------------------------
 1 file changed, 117 insertions(+), 297 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 78255d054..f4aa1c6f8 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -3,7 +3,7 @@
     <name>org.freedesktop.IBus.Simple</name>
     <description>A table based simple engine</description>
     <exec>@libexecdir@/ibus-engine-simple</exec>
-    <version>1.5.22.20200909</version>
+    <version>1.5.23.20210221</version>
     <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
     <license>GPL</license>
     <homepage>https://github.com/ibus/ibus/wiki</homepage>
@@ -92,6 +92,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:us:colemak_dh:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>colemak_dh</layout_variant>
+            <longname>English (Colemak-DH)</longname>
+            <description>English (Colemak-DH)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:us:dvorak:eng</name>
             <language>en</language>
@@ -176,6 +188,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:us:symbolic:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>symbolic</layout_variant>
+            <longname>English (US, Symbolic)</longname>
+            <description>English (US, Symbolic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:us:rus:rus</name>
             <language>ru</language>
@@ -628,18 +652,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:at:sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>at</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (Austria, Sun dead keys)</longname>
-            <description>German (Austria, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:at:mac:deu</name>
             <language>de</language>
@@ -850,42 +862,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:oss_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys, alt.)</longname>
-            <description>Belgian (Sun dead keys, alt.)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:be:iso-alternate:deu</name>
             <language>de</language>
@@ -958,42 +934,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:be:sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>be</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Belgian (Sun dead keys)</longname>
-            <description>Belgian (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:be:wang:deu</name>
             <language>de</language>
@@ -1569,26 +1509,26 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:in:iipa:eng</name>
-            <language>en</language>
+            <name>xkb:in:iipa:inc</name>
+            <language>inc</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>iipa</layout_variant>
-            <longname>Indic IPA (IIPA)</longname>
-            <description>Indic IPA (IIPA)</description>
+            <longname>Indic IPA</longname>
+            <description>Indic IPA</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:in:marathi:eng</name>
-            <language>en</language>
+            <name>xkb:in:marathi:mar</name>
+            <language>mr</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>marathi</layout_variant>
-            <longname>मराठी इन्स्क्रिप्ट</longname>
-            <description>मराठी इन्स्क्रिप्ट</description>
+            <longname>Marathi (enhanced Inscript)</longname>
+            <description>Marathi (enhanced Inscript)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1769,6 +1709,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:bg:bekl:bul</name>
+            <language>bg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>bg</layout>
+            <layout_variant>bekl</layout_variant>
+            <longname>Bulgarian (enhanced)</longname>
+            <description>Bulgarian (enhanced)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:dz:azerty-deadkeys:kab</name>
             <language>kab</language>
@@ -1776,8 +1728,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>azerty-deadkeys</layout_variant>
-            <longname>Kabylian (azerty layout, with dead keys)</longname>
-            <description>Kabylian (azerty layout, with dead keys)</description>
+            <longname>Kabyle (azerty layout, dead keys)</longname>
+            <description>Kabyle (azerty layout, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1788,8 +1740,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>qwerty-gb-deadkeys</layout_variant>
-            <longname>Kabylian (qwerty-gb layout, with dead keys)</longname>
-            <description>Kabylian (qwerty-gb layout, with dead keys)</description>
+            <longname>Kabyle (qwerty-gb layout, dead keys)</longname>
+            <description>Kabyle (qwerty-gb layout, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1800,8 +1752,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>qwerty-us-deadkeys</layout_variant>
-            <longname>Kabylian (qwerty-us layout, with dead keys)</longname>
-            <description>Kabylian (qwerty-us layout, with dead keys)</description>
+            <longname>Kabyle (qwerty-us layout, dead keys)</longname>
+            <description>Kabyle (qwerty-us layout, dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1812,8 +1764,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>ber</layout_variant>
-            <longname>Kabylian (Algeria, Tifinagh)</longname>
-            <description>Kabylian (Algeria, Tifinagh)</description>
+            <longname>Berber (Algeria, Tifinagh)</longname>
+            <description>Berber (Algeria, Tifinagh)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -3021,18 +2973,6 @@
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
-        <engine>
-            <name>xkb:nl:sundeadkeys:nld</name>
-            <language>nl</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>nl</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Dutch (Sun dead keys)</longname>
-            <description>Dutch (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:nl:mac:nld</name>
             <language>nl</language>
@@ -3373,18 +3313,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:fr:sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>French (Sun dead keys)</longname>
-            <description>French (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:fr:oss:fra</name>
             <language>fr</language>
@@ -3421,18 +3349,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:fr:oss_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>oss_sundeadkeys</layout_variant>
-            <longname>French (alt., Sun dead keys)</longname>
-            <description>French (alt., Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:fr:latin9:fra</name>
             <language>fr</language>
@@ -3457,18 +3373,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:fr:latin9_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>fr</layout>
-            <layout_variant>latin9_sundeadkeys</layout_variant>
-            <longname>French (legacy, alt., Sun dead keys)</longname>
-            <description>French (legacy, alt., Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:fr:bepo:fra</name>
             <language>fr</language>
@@ -3709,13 +3613,13 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:gn::fra</name>
-            <language>fr</language>
+            <name>xkb:gn::nqo</name>
+            <language>nqo</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gn</layout>
-            <longname>French (Guinea)</longname>
-            <description>French (Guinea)</description>
+            <longname>N'Ko (azerty)</longname>
+            <description>N'Ko (azerty)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -3825,6 +3729,30 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:de:e1:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>e1</layout_variant>
+            <longname>German (E1)</longname>
+            <description>German (E1)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:de:e2:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>e2</layout_variant>
+            <longname>German (E2)</longname>
+            <description>German (E2)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:de:T3:deu</name>
             <language>de</language>
@@ -3837,6 +3765,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:de:us:deu</name>
+            <language>de</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>de</layout>
+            <layout_variant>us</layout_variant>
+            <longname>German (US)</longname>
+            <description>German (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:de:ro:ron</name>
             <language>ro</language>
@@ -3873,18 +3813,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:de:sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>de</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>German (Sun dead keys)</longname>
-            <description>German (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:de:neo:deu</name>
             <language>de</language>
@@ -4302,30 +4230,6 @@
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
-        <engine>
-            <name>xkb:is:Sundeadkeys:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>Sundeadkeys</layout_variant>
-            <longname>Icelandic (Sun dead keys)</longname>
-            <description>Icelandic (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:is:nodeadkeys:isl</name>
-            <language>is</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>is</layout>
-            <layout_variant>nodeadkeys</layout_variant>
-            <longname>Icelandic (no dead keys)</longname>
-            <description>Icelandic (no dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:is:mac_legacy:isl</name>
             <language>is</language>
@@ -4918,6 +4822,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:lt:ratise:lit</name>
+            <language>lt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>lt</layout>
+            <layout_variant>ratise</layout_variant>
+            <longname>Lithuanian (Ratise)</longname>
+            <description>Lithuanian (Ratise)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:lv::lav</name>
             <language>lv</language>
@@ -5603,18 +5519,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:pt:sundeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Portuguese (Sun dead keys)</longname>
-            <description>Portuguese (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:pt:mac:por</name>
             <language>pt</language>
@@ -5639,18 +5543,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:pt:mac_sundeadkeys:por</name>
-            <language>pt</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>pt</layout>
-            <layout_variant>mac_sundeadkeys</layout_variant>
-            <longname>Portuguese (Macintosh, Sun dead keys)</longname>
-            <description>Portuguese (Macintosh, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:pt:nativo:por</name>
             <language>pt</language>
@@ -5698,18 +5590,6 @@
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
-        <engine>
-            <name>xkb:ro:cedilla:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>cedilla</layout_variant>
-            <longname>Romanian (cedilla)</longname>
-            <description>Romanian (cedilla)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:ro:std:ron</name>
             <language>ro</language>
@@ -5722,18 +5602,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:ro:std_cedilla:ron</name>
-            <language>ro</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ro</layout>
-            <layout_variant>std_cedilla</layout_variant>
-            <longname>Romanian (standard cedilla)</longname>
-            <description>Romanian (standard cedilla)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:ro:winkeys:ron</name>
             <language>ro</language>
@@ -6281,18 +6149,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:es:sundeadkeys:spa</name>
-            <language>es</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>es</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Spanish (Sun dead keys)</longname>
-            <description>Spanish (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:es:dvorak:spa</name>
             <language>es</language>
@@ -6542,30 +6398,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:ch:de_sundeadkeys:deu</name>
-            <language>de</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, Sun dead keys)</longname>
-            <description>German (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:ch:de_sundeadkeys:gsw</name>
-            <language>gsw</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>de_sundeadkeys</layout_variant>
-            <longname>German (Switzerland, Sun dead keys)</longname>
-            <description>German (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:ch:fr:fra</name>
             <language>fr</language>
@@ -6590,18 +6422,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:ch:fr_sundeadkeys:fra</name>
-            <language>fr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>ch</layout>
-            <layout_variant>fr_sundeadkeys</layout_variant>
-            <longname>French (Switzerland, Sun dead keys)</longname>
-            <description>French (Switzerland, Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:ch:fr_mac:fra</name>
             <language>fr</language>
@@ -6849,18 +6669,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:tr:sundeadkeys:tur</name>
-            <language>tr</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>sundeadkeys</layout_variant>
-            <longname>Turkish (Sun dead keys)</longname>
-            <description>Turkish (Sun dead keys)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:tr:ku:kur</name>
             <language>ku</language>
@@ -7350,6 +7158,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:gb:colemak_dh:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>colemak_dh</layout_variant>
+            <longname>English (UK, Colemak-DH)</longname>
+            <description>English (UK, Colemak-DH)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:gb:pl:pol</name>
             <language>pl</language>

From 4d51b73b69de9003c0b7e8a2558d8666503b6f16 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Sun, 21 Feb 2021 23:59:05 +0900
Subject: [PATCH 721/816] Release 1.5.24

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ffea33174..4e2f8e6e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2020 Red Hat, Inc.
+# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2021 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
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [23])
+m4_define([ibus_micro_version], [24])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 214b60a3af67b6e8dafdb8edba666a369f18be12 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 26 Mar 2021 22:48:08 +0900
Subject: [PATCH 722/816] src/tests: Run gnome-session with no-overview mode

gnome-shell 40 now shows the overview mode by login and
gnome-desktop-testing-runner cannot get the input focus.
Running gnome-session with no-overview shell extension can
get the input focus or mutter is another option.
The default may be changed to twm if mutter also will be changed
not to accept the application focus in the future.

Disable Tour dialog which prevent test application from getting the
input focus.

Don't output FAIL if the actual failure is 0 for Fedora CI.

BUG=https://discourse.gnome.org/t/focus-on-autostart-application-by-login/5863
---
 src/tests/ibus-desktop-testing-runner.in | 69 ++++++++++++++++++++----
 1 file changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 4232c549b..15b2369d5 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -4,7 +4,7 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2018-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2018 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
 
 
 PROGNAME=`basename $0`
-VERSION=0.1
+VERSION=0.2
 DISPLAY=:99.0
 BUILDDIR="."
 SRCDIR="."
@@ -80,7 +80,9 @@ usage()
 "-b, --builddir=BUILDDIR          Set the BUILDDIR\n"                          \
 "-s, --srcdir=SOURCEDIR           Set the SOURCEDIR\n"                         \
 "-c, --no-graphics                Use Xvfb instead of Xorg\n"                  \
-"-d, --desktop=DESKTOP            Run DESTKTOP. The default is gnome-session\n" \
+"-d, --desktop=DESKTOP            Run DESTKTOP. The default is gnome-session.\n" \
+"                                 Suffix '-with-dbus' can run DESKTOP with dbus session." \
+"                                 E.g. --desktop=mutter-with-dbus"             \
 "-t, --tests=\"TESTS...\"           Run TESTS programs which is separated by space\n" \
 "-r, --runner=RUNNER              Run TESTS programs with a test RUNNER.\n"    \
 "                                 RUNNDER = gnome or default.\n"               \
@@ -115,6 +117,13 @@ parse_args()
         * )                  usage; exit 1;;
         esac
     done
+    DL='$'
+    echo "$DESKTOP_COMMAND" | grep "\-with\-dbus$DL" > /dev/null
+    HAS_DBUS_SUFFIX=$?
+    if [ $HAS_DBUS_SUFFIX -eq 0 ] ; then
+        DESKTOP_COMMAND=`echo "$DESKTOP_COMMAND" | sed -e 's/-with-dbus$//'`
+        DESKTOP_COMMAND="dbus-launch --exit-with-session $DESKTOP_COMMAND"
+    fi
 }
 
 init_desktop()
@@ -124,8 +133,9 @@ init_desktop()
             rm $RESULT_LOG
         fi
     fi
-    HAS_STDOUT=`echo "$TEST_LOG" | grep ':stdout'`
-    if [ x"$HAS_STDOUT" != x ] ; then
+    echo "$TEST_LOG" | grep ':stdout' > /dev/null
+    HAS_STDOUT=$?
+    if [ $HAS_STDOUT -eq 0 ] ; then
         TEST_LOG=`echo "$TEST_LOG" | sed -e 's|:stdout||'`
         TEST_LOG_STDOUT=1
     fi
@@ -203,6 +213,39 @@ run_dbus_daemon()
     export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
 }
 
+init_gnome()
+{
+    # Disable Tour dialog to get focus
+    V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version`
+    if [ x"$V" = x ] ; then
+        gsettings set org.gnome.shell welcome-dialog-last-shown-version '100'
+    fi
+    # gnome-shell now starts overview mode by login.
+    # https://extensions.gnome.org/extension/4099/no-overview/
+    NO_SYS_DIR=/usr/share/gnome-shell/extensions/no-overview@fthx
+    NO_USER_DIR=$HOME/.local/share/gnome-shell/extensions/no-overview@fthx
+    if [ ! -d $NO_SYS_DIR ] && [ ! -d $NO_USER_DIR ] ; then
+        mkdir -p `dirname $NO_USER_DIR`
+        cp -R no-overview@fthx `dirname $NO_USER_DIR`
+    fi
+    V=`gsettings get org.gnome.shell disable-user-extensions`
+    if [ x"$V" = x"true" ] ; then
+        gsettings set org.gnome.shell disable-user-extensions false
+    fi
+    V=`gsettings get org.gnome.shell enabled-extensions`
+    echo "$V" | grep "no-overview" > /dev/null
+    V2=$?
+    if [ $V2 -ne 0 ] ; then
+        V3=`echo "$V" | sed -e 's/\[//' -e 's/\]//'`
+        if [ x"$V3" = x ] ; then
+            V4="['no-overview@fthx']"
+        else
+            V4="[$V3, 'no-overview@fthx']"
+        fi
+        gsettings set org.gnome.shell enabled-extensions "$V4"
+    fi
+}
+
 run_desktop()
 {
     if test $HAVE_GRAPHICS -eq 1 ; then
@@ -217,8 +260,11 @@ run_desktop()
     $DESKTOP_COMMAND &
     PID_GNOME_SESSION=$!
     sleep 30
-    HAS_GNOME=`echo $DESKTOP_COMMAND | grep gnome-session`
-    if [ x"$HAS_GNOME" = x ] ; then
+    echo "$DESKTOP_COMMAND" | grep gnome-session > /dev/null
+    HAS_GNOME=$?
+    if [  $HAS_GNOME -eq 0 ] ; then
+        init_gnome
+    else
         ibus-daemon --daemonize --verbose
         sleep 3
     fi
@@ -360,8 +406,13 @@ EOF_RUNNER
         ;;
     esac
     echo ""
-    print_log -e "${GREEN}PASS${NC}: $pass"
-    print_log -e "${RED}FAIL${NC}: $fail"
+    # Fedora CI assumes the test is failed even if $fail is 0.
+    if [ $pass -ne 0 ] ; then
+        print_log -e "${GREEN}PASS${NC}: $pass"
+    fi
+    if [ $fail -ne 0 ] ; then
+        print_log -e "${RED}FAIL${NC}: $fail"
+    fi
     echo ""
     if [ $TEST_LOG_STDOUT -eq 1 ] ; then
         cat $TEST_LOG

From d105a3941aad53b0c7470a1e9c1033987b029fb8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 12 May 2021 18:54:30 +0900
Subject: [PATCH 723/816] client/gtk2: Implement
 ibus_im_context_set_surrounding_with_selection()

Selection bounds need to be re-calculated when pre-edit text is
inserted and the selection position is changed.
GTK4 has a new API GtkIMContext.set_surrounding_with_selection()
to fix this issue and now IBus GTK module inherits the API.

BUG=https://github.com/ibus/ibus/issues/2013
---
 client/gtk2/ibusimcontext.c | 53 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index e153081df..611948161 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2020 Red Hat, Inc.
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -165,11 +165,19 @@ static void     ibus_im_context_set_cursor_location
 static void     ibus_im_context_set_use_preedit
                                             (GtkIMContext           *context,
                                              gboolean               use_preedit);
+#if !GTK_CHECK_VERSION (4, 1, 2)
 static void     ibus_im_context_set_surrounding
                                             (GtkIMContext  *slave,
                                              const gchar   *text,
-                                             gint           len,
-                                             gint           cursor_index);
+                                             int            len,
+                                             int            cursor_index);
+#endif
+static void     ibus_im_context_set_surrounding_with_selection
+                                            (GtkIMContext  *slave,
+                                             const gchar   *text,
+                                             int            len,
+                                             int            cursor_index,
+                                             int            anchor_index);
 
 /* static methods*/
 static void     _ibus_context_update_preedit_text_cb
@@ -724,7 +732,12 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 #endif
     im_context_class->set_cursor_location = ibus_im_context_set_cursor_location;
     im_context_class->set_use_preedit = ibus_im_context_set_use_preedit;
+#if GTK_CHECK_VERSION (4, 1, 2)
+    im_context_class->set_surrounding_with_selection
+            = ibus_im_context_set_surrounding_with_selection;
+#else
     im_context_class->set_surrounding = ibus_im_context_set_surrounding;
+#endif
     gobject_class->notify = ibus_im_context_notify;
     gobject_class->finalize = ibus_im_context_finalize;
 
@@ -1624,8 +1637,22 @@ get_selection_anchor_point (IBusIMContext *ibusimcontext,
 static void
 ibus_im_context_set_surrounding (GtkIMContext  *context,
                                  const gchar   *text,
-                                 gint           len,
-                                 gint           cursor_index)
+                                 int            len,
+                                 int            cursor_index)
+{
+    ibus_im_context_set_surrounding_with_selection (context,
+                                                    text,
+                                                    len,
+                                                    cursor_index,
+                                                    cursor_index);
+}
+
+static void
+ibus_im_context_set_surrounding_with_selection (GtkIMContext  *context,
+                                                const gchar   *text,
+                                                int            len,
+                                                int            cursor_index,
+                                                int            anchor_index)
 {
     g_return_if_fail (context != NULL);
     g_return_if_fail (IBUS_IS_IM_CONTEXT (context));
@@ -1647,18 +1674,26 @@ ibus_im_context_set_surrounding (GtkIMContext  *context,
         ibustext = ibus_text_new_from_string (p);
         g_free (p);
 
-        guint anchor_pos = get_selection_anchor_point (ibusimcontext,
-                                                       cursor_pos,
-                                                       utf8_len);
+        gint anchor_pos = get_selection_anchor_point (ibusimcontext,
+                                                      cursor_pos,
+                                                      utf8_len);
         ibus_input_context_set_surrounding_text (ibusimcontext->ibuscontext,
                                                  ibustext,
                                                  cursor_pos,
                                                  anchor_pos);
     }
+#if GTK_CHECK_VERSION (4, 1, 2)
+    gtk_im_context_set_surrounding_with_selection (ibusimcontext->slave,
+                                                   text,
+                                                   len,
+                                                   cursor_index,
+                                                   anchor_index);
+#else
     gtk_im_context_set_surrounding (ibusimcontext->slave,
                                     text,
                                     len,
                                     cursor_index);
+#endif
 }
 
 static void

From e9e1642870994abfdbd06b0138524ac231c159b8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 16 Jun 2021 18:00:31 +0900
Subject: [PATCH 724/816] Fix code reviews

---
 bus/ibusimpl.c                |  23 ++++--
 bus/server.c                  |  10 +--
 client/gtk2/ibusimcontext.c   |   8 ++
 client/wayland/main.c         |   9 ++-
 client/x11/main.c             |  22 +++--
 conf/dconf/main.c             |   7 +-
 portal/portal.c               |   7 +-
 setup/ibus-setup.in           |   2 +-
 src/emoji-parser.c            |  46 ++++++-----
 src/ibusaccelgroup.c          |   2 +-
 src/ibusbus.c                 |  10 ++-
 src/ibuscomposetable.c        |  91 ++++++++++++++++++---
 src/ibusemoji.c               |   8 +-
 src/ibusenginesimple.c        |  21 +++--
 src/ibushotkey.c              |   4 +-
 src/ibusregistry.c            |   9 ++-
 src/ibusshare.c               |  36 +++++----
 src/ibustext.c                |   5 +-
 src/ibusunicode.c             |  17 +++-
 src/tests/ibus-compose.c      |   6 +-
 src/tests/ibus-keypress.c     |   3 +-
 src/unicode-parser.c          |  52 ++++++------
 util/IMdkit/FrameMgr.c        |  34 +++++++-
 util/IMdkit/i18nIc.c          |  41 ++++++++--
 util/IMdkit/i18nMethod.c      |  24 +++++-
 util/IMdkit/i18nOffsetCache.c |   2 +-
 util/IMdkit/i18nPtHdr.c       | 148 ++++++++++++++++++++++++++++------
 util/IMdkit/i18nUtil.c        |  20 +++++
 util/IMdkit/i18nX.c           |  29 ++++---
 29 files changed, 524 insertions(+), 172 deletions(-)

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index e432e8492..49a138fea 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2011-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2020 Red Hat, Inc.
+ * Copyright (C) 2011-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -624,7 +624,6 @@ bus_ibus_impl_destroy (BusIBusImpl *ibus)
 
     g_list_foreach (ibus->components, (GFunc) bus_component_stop, NULL);
 
-    pid = 0;
     timeout = 0;
     flag = FALSE;
     while (1) {
@@ -1190,6 +1189,7 @@ _ibus_get_current_input_context (BusIBusImpl     *ibus,
                                  GDBusConnection *connection,
                                  GError         **error)
 {
+    GVariant *retval = NULL;
     if (error) {
         *error = NULL;
     }
@@ -1204,8 +1204,14 @@ _ibus_get_current_input_context (BusIBusImpl     *ibus,
         const gchar *path = ibus_service_get_object_path (
                 (IBusService *) ibus->focused_context);
         /* the format-string 'o' is for a D-Bus object path. */
-        return g_variant_new_object_path (path);
+        retval = g_variant_new_object_path (path);
+        if (!retval) {
+            g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                         "Could not get object path from %s",
+                         path ? path : "(null)");
+        }
     }
+    return retval;
 }
 
 static void
@@ -1572,6 +1578,7 @@ _ibus_get_global_engine (BusIBusImpl     *ibus,
                          GError         **error)
 {
     IBusEngineDesc *desc = NULL;
+    GVariant *retval = NULL;
 
     if (error) {
         *error = NULL;
@@ -1592,7 +1599,13 @@ _ibus_get_global_engine (BusIBusImpl     *ibus,
         GVariant *variant = ibus_serializable_serialize (
                 (IBusSerializable *) desc);
         // Set type "v" for introspection_xml.
-        return g_variant_new_variant (variant);
+        retval = g_variant_new_variant (variant);
+        if (!retval) {
+            g_set_error (error,
+                         G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                         "Failed to serialize engine desc.");
+        }
+        return retval;
     } while (0);
 
     g_set_error (error,
diff --git a/bus/server.c b/bus/server.c
index 6c9e2c02d..e8d0ce2bd 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2011-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -22,12 +22,11 @@
  */
 #include "server.h"
 
-#include <errno.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <stdlib.h>
-#include <fcntl.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "dbusimpl.h"
@@ -282,6 +281,7 @@ bus_server_init (void)
          * `chmod` runs for the last directory only not to change the modes
          * of the parent directories. E.g. "/tmp/ibus".
          */
+        errno = 0;
         if (g_mkdir_with_parents (unix_dir, 0700) != 0) {
             g_error ("mkdir is failed in: %s: %s",
                      unix_dir, g_strerror (errno));
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 611948161..e7ce53638 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -385,7 +385,9 @@ _process_key_event_done (GObject      *object,
 
     ProcessKeyEventData *data = (ProcessKeyEventData *)user_data;
     GdkEvent *event = data->event;
+#if GTK_CHECK_VERSION (3, 98, 4)
     IBusIMContext *ibusimcontext = data->ibusimcontext;
+#endif
     GError *error = NULL;
 
     g_slice_free (ProcessKeyEventData, data);
@@ -1634,6 +1636,7 @@ get_selection_anchor_point (IBusIMContext *ibusimcontext,
     return anchor;
 }
 
+#if !GTK_CHECK_VERSION (4, 1, 2)
 static void
 ibus_im_context_set_surrounding (GtkIMContext  *context,
                                  const gchar   *text,
@@ -1646,6 +1649,7 @@ ibus_im_context_set_surrounding (GtkIMContext  *context,
                                                     cursor_index,
                                                     cursor_index);
 }
+#endif
 
 static void
 ibus_im_context_set_surrounding_with_selection (GtkIMContext  *context,
@@ -1851,7 +1855,11 @@ _create_gdk_event (IBusIMContext *ibusimcontext,
         if (event->state & GDK_CONTROL_MASK) {
             if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
             else if (c == '2') {
+#if GLIB_CHECK_VERSION (2, 68, 0)
+                event->string = g_memdup2 ("\0\0", 2);
+#else
                 event->string = g_memdup ("\0\0", 2);
+#endif
                 event->length = 1;
                 buf[0] = '\0';
                 goto out;
diff --git a/client/wayland/main.c b/client/wayland/main.c
index d86bab9ef..1f99c8042 100644
--- a/client/wayland/main.c
+++ b/client/wayland/main.c
@@ -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) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2019-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2013 Intel Corporation
  * Copyright (C) 2013-2019 Red Hat, Inc.
  *
@@ -339,16 +339,19 @@ input_method_keyboard_keymap (void               *data,
 {
     IBusWaylandIM *wlim = data;
     GMappedFile *map;
-    GError *error;
+    GError *error = NULL;
 
     if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
         close(fd);
         return;
     }
 
-    error = NULL;
     map = g_mapped_file_new_from_fd (fd, FALSE, &error);
     if (map == NULL) {
+        if (error) {
+            g_warning ("Failed to map file fd %s", error->message);
+            g_error_free (error);
+        }
         close (fd);
         return;
     }
diff --git a/client/x11/main.c b/client/x11/main.c
index c9ee174d1..ffd776fd6 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus
  * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
@@ -229,12 +229,13 @@ _xim_preedit_callback_draw (XIMS xims, X11IC *x11ic, const gchar *preedit_string
         }
     }
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; feedback && i < len; i++) {
         if (feedback[i] == 0) {
             feedback[i] = XIMUnderline;
         }
     }
-    feedback[len] = 0;
+    if (feedback)
+        feedback[len] = 0;
 
     pcb.major_code = XIM_PREEDIT_DRAW;
     pcb.connect_id = x11ic->connect_id;
@@ -736,9 +737,20 @@ xim_get_ic_values (XIMS xims, IMChangeICStruct *call_data)
 
     for (i = 0; i < (int) call_data->ic_attr_num; ++i, ++ic_attr) {
         if (g_strcmp0 (XNFilterEvents, ic_attr->name) == 0) {
+            /* ic_attr->value will be freed in server side and ignore
+             * leak of malloc with -Wanalyzer-malloc-leak flags in gcc 11.0.1
+             */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
             ic_attr->value = (void *) malloc (sizeof (CARD32));
-            *(CARD32 *) ic_attr->value = KeyPressMask | KeyReleaseMask;
-            ic_attr->value_length = sizeof (CARD32);
+            if (ic_attr->value) {
+                *(CARD32 *) ic_attr->value = KeyPressMask | KeyReleaseMask;
+                ic_attr->value_length = sizeof (CARD32);
+            } else {
+                g_warning ("Failed to malloc");
+                ic_attr->value_length = 0;
+            }
+#pragma GCC diagnostic pop
         }
     }
 
diff --git a/conf/dconf/main.c b/conf/dconf/main.c
index e68784247..c8250f686 100644
--- a/conf/dconf/main.c
+++ b/conf/dconf/main.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2012-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -70,7 +71,9 @@ main (gint argc, gchar **argv)
     GOptionContext *context;
 
     setlocale (LC_ALL, "");
-    g_setenv ("DCONF_PROFILE", "ibus", FALSE);
+    errno = 0;
+    if (!g_setenv ("DCONF_PROFILE", "ibus", FALSE))
+        g_warning ("Failed setenv %s", strerror (errno));
 
     context = g_option_context_new ("- ibus dconf component");
 
diff --git a/portal/portal.c b/portal/portal.c
index e78bc92f8..c2e4fc7f4 100644
--- a/portal/portal.c
+++ b/portal/portal.c
@@ -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) 2017-2019 Red Hat, Inc.
+ * Copyright (C) 2017-2021 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
@@ -508,7 +508,6 @@ create_input_context_done (IBusBus               *bus,
     if (portal_context == NULL) {
         g_dbus_method_invocation_return_gerror (invocation, error);
         g_error_free (error);
-        g_object_unref (portal_context);
         return;
     }
 
@@ -656,8 +655,10 @@ main (gint argc, gchar **argv)
         exit (-1);
     }
 
+     errno = 0;
     /* Avoid even loading gvfs to avoid accidental confusion */
-    g_setenv ("GIO_USE_VFS", "local", TRUE);
+    if (!g_setenv ("GIO_USE_VFS", "local", TRUE))
+        g_warning ("Failed setenv %s", strerror (errno));
 
     ibus_init ();
 
diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
index 4a6830af7..474ce8a83 100644
--- a/setup/ibus-setup.in
+++ b/setup/ibus-setup.in
@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@
 export IBUS_DATAROOTDIR=@datarootdir@
 export IBUS_LOCALEDIR=@localedir@
 export IBUS_LIBEXECDIR=${libexecdir}
-exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@
+exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@"
 
diff --git a/src/emoji-parser.c b/src/emoji-parser.c
index b117b1b41..36d36e057 100644
--- a/src/emoji-parser.c
+++ b/src/emoji-parser.c
@@ -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) 2016-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2016-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -291,11 +291,9 @@ emoji_data_new_object (EmojiData *data)
                                  "annotations",
                                  data->annotations,
                                  "description",
-                                 data->description ? data->description
-                                         : g_strdup (""),
+                                 data->description ? data->description : "",
                                  "category",
-                                 data->category ? data->category
-                                         : g_strdup (""),
+                                 data->category ? data->category : "",
                                  NULL);
     data->list = g_slist_append (data->list, emoji);
 }
@@ -608,7 +606,7 @@ unicode_emoji_test_parse_line (const gchar *line,
         return FALSE;
     }
     unicode_emoji_test_parse_description (segments[1], data);
-    g_strfreev (segments);
+    g_clear_pointer (&segments, g_strfreev);
     if (data->annotations == NULL) {
         if (data->subcategory) {
             int i;
@@ -631,7 +629,7 @@ unicode_emoji_test_parse_line (const gchar *line,
                 data->annotations = g_slist_append (data->annotations,
                                                     g_strdup (segments[i]));
             }
-            g_strfreev (segments);
+            g_clear_pointer (&segments, g_strfreev);
         } else {
             g_warning ("No subcategory line\n");
             goto failed_to_parse_unicode_emoji_test_line;
@@ -672,7 +670,7 @@ unicode_emoji_test_parse_file (const gchar *filename,
                    filename, error ? error->message : "");
         goto failed_to_parse_unicode_emoji_test;
     }
-    head = end = content;
+    end = content;
     while (*end == '\n' && end - content < length) {
         end++;
         n++;
@@ -1100,10 +1098,12 @@ static void
 category_list_dump (const gchar *category,
                     GString     *buff)
 {
+    gchar *line;
     g_return_if_fail (buff != NULL);
 
-    const gchar *line = g_strdup_printf ("    N_(\"%s\"),\n", category);
+    line = g_strdup_printf ("    N_(\"%s\"),\n", category);
     g_string_append (buff, line);
+    g_free (line);
 }
 
 static void
@@ -1113,7 +1113,7 @@ category_file_save (const gchar *filename,
     gchar *content = NULL;
     gsize length = 0;
     GError *error = NULL;
-    gchar *p;
+    gchar *p, *substr;
     GString *buff = NULL;
     int i;
     GSList *list_categories = NULL;
@@ -1139,24 +1139,28 @@ category_file_save (const gchar *filename,
             break;
     }
     if (p != NULL) {
-        g_string_append (buff, g_strndup (content, p - content));
+        substr = g_strndup (content, p - content);
+        g_string_append (buff, substr);
+        g_free (substr);
         g_string_append_c (buff, '\n');
     }
     g_clear_pointer (&content, g_free);
 
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup_printf ("/* This file is generated by %s. */", __FILE__));
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup ("include <glib/gi18n.h>\n"));
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup ("#ifndef __IBUS_EMOJI_GEN_H_\n"));
-    g_string_append (buff, g_strdup ("#define __IBUS_EMOJI_GEN_H_\n"));
-    g_string_append (buff, g_strdup ("const static char *unicode_emoji_categories[] = {\n"));
+    g_string_append (buff, "\n");
+    substr = g_strdup_printf ("/* This file is generated by %s. */", __FILE__);
+    g_string_append (buff, substr);
+    g_free (substr);
+    g_string_append (buff, "\n");
+    g_string_append (buff, "include <glib/gi18n.h>\n");
+    g_string_append (buff, "\n");
+    g_string_append (buff, "#ifndef __IBUS_EMOJI_GEN_H_\n");
+    g_string_append (buff, "#define __IBUS_EMOJI_GEN_H_\n");
+    g_string_append (buff, "const static char *unicode_emoji_categories[] = {\n");
     list_categories = g_slist_sort (list_categories, (GCompareFunc)g_strcmp0);
     g_slist_foreach (list_categories, (GFunc)category_list_dump, buff);
     g_slist_free (list_categories);
-    g_string_append (buff, g_strdup ("};\n"));
-    g_string_append (buff, g_strdup ("#endif\n"));
+    g_string_append (buff, "};\n");
+    g_string_append (buff, "#endif\n");
 
     if (!g_file_set_contents (filename, buff->str, -1, &error)) {
         g_warning ("Failed to save emoji category file %s: %s", filename, error->message);
diff --git a/src/ibusaccelgroup.c b/src/ibusaccelgroup.c
index 8a81597ec..ef2d3976b 100644
--- a/src/ibusaccelgroup.c
+++ b/src/ibusaccelgroup.c
@@ -468,7 +468,7 @@ ibus_accelerator_name (guint            accelerator_key,
     if (accelerator_mods & IBUS_SUPER_MASK)
         l += sizeof (text_super) - 1;
 
-    accelerator = g_new (gchar, l + 1);
+    g_return_val_if_fail ((accelerator = g_new (gchar, l + 1)), NULL);
 
     accelerator_mods = saved_mods;
     l = 0;
diff --git a/src/ibusbus.c b/src/ibusbus.c
index b7ffbb47d..e9b0bcbb4 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -555,12 +555,18 @@ ibus_bus_init (IBusBus *bus)
 
     path = g_path_get_dirname (ibus_get_socket_path ());
 
-    g_mkdir_with_parents (path, 0700);
+    errno = 0;
+    if (g_mkdir_with_parents (path, 0700)) {
+        g_warning ("Failed to mkdir %s: %s", path, g_strerror (errno));
+        g_free (path);
+        return;
+    }
 
     if (stat (path, &buf) == 0) {
         if (buf.st_uid != getuid ()) {
             g_warning ("The owner of %s is not %s!",
                        path, ibus_get_user_name ());
+            g_free (path);
             return;
         }
         if (buf.st_mode != (S_IFDIR | S_IRWXU)) {
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index ef20469c9..685ac7173 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -108,6 +108,7 @@ parse_compose_value (IBusComposeData  *compose_data,
     }
     ++head;
     p = head;
+    end = NULL;
     while ((*p != '\0') && (end = strchr (p, '\"'))) {
         if (*(end - 1) == '\\' && *(end - 2) == '\\')
             break;
@@ -516,10 +517,10 @@ ibus_compose_hash_get_cache_path (guint32 hash)
                                 "ibus", "compose", NULL);
     }
     path = g_build_filename (dir, basename, NULL);
-    if (g_mkdir_with_parents (dir, 0755) != 0) {
-        g_warning ("Failed to mkdir %s", dir);
-        g_free (path);
-        path = NULL;
+    errno = 0;
+    if (g_mkdir_with_parents (dir, 0755)) {
+        g_warning ("Failed to mkdir %s: %s", dir, g_strerror (errno));
+        g_clear_pointer (&path, g_free);
     }
 
     g_free (dir);
@@ -812,10 +813,14 @@ ibus_compose_table_deserialize (const gchar *contents,
         }
     }
     if (data_length) {
-        retval->priv->data_second = g_new (guint32, data_length);
-        memcpy (retval->priv->data_second,
-                data_32bit_second, data_length * sizeof (guint32));
-        retval->priv->second_size = second_size;
+        if ((retval->priv->data_second = g_new (guint32, data_length))) {
+            memcpy (retval->priv->data_second,
+                    data_32bit_second, data_length * sizeof (guint32));
+            retval->priv->second_size = second_size;
+        } else {
+            g_warning ("Failed g_new");
+            retval->priv->second_size = 0;
+        }
     }
 
 
@@ -910,6 +915,43 @@ ibus_compose_table_new_with_list (GList   *compose_list,
                                   int      n_index_stride,
                                   guint32  hash)
 {
+    /* @ibus_compose_seqs: Include both compose sequence and the value(compose
+     *     output) as the tradition GTK. The value is one character only
+     *     and within 16bit. I.e. All compose sequences and the values
+     *     are 16bit.
+     * @ibus_compose_seqs_32bit_second: Include the compose values only.
+     *     The length of values by compose sequence is more than one characster
+     *     or one of the values is outside 16bit but within 32bit.
+     *     Some values could be more than one character and Emoji character
+     *     could be outside 16bit.
+     *     See also ibus/src/tests/ibus-compose.emoji file for e.g.
+     * @ibus_compose_seqs_32bit_first: Include the compose sequence only in
+     *     case the value is included in @ibus_compose_seqs_32bit_second.
+     * @s_size_total: The number of compose sequences.
+     * @s_size_16bit: The number of compose sequences whose value is one
+     *     character only and within 16bit. I.e. the number of the compose
+     *     sequence in @ibus_compose_seqs is @@s_size_16bit. And
+     *     @s_size_total - @s_size_16bit is the number of the compose sequence
+     *     in @ibus_compose_seqs_32bit_first.
+     * @v_size_32bit: The total number of compose values. Each length of the
+     *     values is more than one character or one of the value is
+     *     outside 16bit but within 32bit. I.e. The size of
+     *     @ibus_compose_seqs_32bit_second is @v_size_32bit.
+     * @v_index_32bit: Each index of the compose values in
+     *     @ibus_compose_seqs_32bit_second and this is not a fixed value in
+     *     this API. If a compose sequence is found in
+     *     @ibus_compose_seqs_32bit_first and the next value is 0, 0 is lined
+     *     in @ibus_compose_seqs_32bit_first until @max_compose_len after
+     *     the found compose sequence. And the next value is the length of
+     *     the compose values and the next value is the @v_index_32bit, i.e.
+     *     the index of @ibus_compose_seqs_32bit_second.
+     *     E.g. the following line could be found in
+     *     @ibus_compose_seqs_32bit_first:
+     *         ..., "U17ff", "0", "0", "0", "0", 2, 100, ...
+     *     @ibus_compose_seqs_32bit_second[100] is "ាំ"  and the character
+     *     length is 2.
+     *     @max_compose_len is 5 and @n_index_stride is 7.
+     */
     gsize s_size_total, s_size_16bit, v_size_32bit, v_index_32bit;
     guint n = 0, m = 0;
     int i, j;
@@ -935,13 +977,25 @@ ibus_compose_table_new_with_list (GList   *compose_list,
         }
     }
 
-    if (s_size_16bit)
+    if (s_size_16bit) {
         ibus_compose_seqs = g_new (guint16, s_size_16bit * n_index_stride);
+        if (!ibus_compose_seqs) {
+            g_warning ("Failed g_new");
+            return NULL;
+        }
+    }
     if (s_size_total > s_size_16bit) {
         ibus_compose_seqs_32bit_first =
                 g_new (guint16,
                        (s_size_total - s_size_16bit) * n_index_stride);
         ibus_compose_seqs_32bit_second = g_new (guint32, v_size_32bit);
+        if (!ibus_compose_seqs_32bit_first || !ibus_compose_seqs_32bit_second) {
+            g_warning ("Failed g_new");
+            g_free (ibus_compose_seqs);
+            g_free (ibus_compose_seqs_32bit_first);
+            g_free (ibus_compose_seqs_32bit_second);
+            return NULL;
+        }
     }
 
     v_index_32bit = 0;
@@ -951,32 +1005,45 @@ ibus_compose_table_new_with_list (GList   *compose_list,
 
         is_32bit = unichar_length (compose_data->values) > 1 ? TRUE :
                 compose_data->values[0] >= 0xFFFF ? TRUE : FALSE;
+        if (is_32bit) {
+            g_assert (ibus_compose_seqs_32bit_first);
+            g_assert (ibus_compose_seqs_32bit_second);
+        }
         for (i = 0; i < max_compose_len; i++) {
             if (compose_data->sequence[i] == 0) {
                 for (j = i; j < max_compose_len; j++) {
-                    if (is_32bit)
+                    if (is_32bit) {
+                        g_assert (m < (s_size_total - s_size_16bit)
+                                  * n_index_stride);
                         ibus_compose_seqs_32bit_first[m++] = 0;
-                    else
+                    } else {
+                        g_assert (n < s_size_16bit * n_index_stride);
                         ibus_compose_seqs[n++] = 0;
+                    }
                 }
                 break;
             }
             if (is_32bit) {
+                g_assert (m < (s_size_total - s_size_16bit) * n_index_stride);
                 ibus_compose_seqs_32bit_first[m++] =
                         (guint16) compose_data->sequence[i];
             } else {
+                g_assert (n < s_size_16bit * n_index_stride);
                 ibus_compose_seqs[n++] = (guint16) compose_data->sequence[i];
             }
         }
         if (is_32bit) {
             for (j = 0; compose_data->values[j]; j++) {
+                g_assert (v_index_32bit + j <  v_size_32bit);
                 ibus_compose_seqs_32bit_second[v_index_32bit + j] =
                         compose_data->values[j];
             }
+            g_assert (m + 1 < (s_size_total - s_size_16bit) * n_index_stride);
             ibus_compose_seqs_32bit_first[m++] = j;
             ibus_compose_seqs_32bit_first[m++] = v_index_32bit;
             v_index_32bit += j;
         } else {
+            g_assert (n + 1 < s_size_16bit * n_index_stride);
             ibus_compose_seqs[n++] = (guint16) compose_data->values[0];
             ibus_compose_seqs[n++] = 0;
         }
diff --git a/src/ibusemoji.c b/src/ibusemoji.c
index ae8907a26..df97264ba 100644
--- a/src/ibusemoji.c
+++ b/src/ibusemoji.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2017-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2017-2019 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -497,7 +497,11 @@ ibus_emoji_data_save (const gchar *path,
 
     dir = g_path_get_dirname (path);
     if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
-        g_mkdir_with_parents (dir, 0777);
+        errno = 0;
+        if (g_mkdir_with_parents (dir, 0777)) {
+            g_warning ("Failed mkdir %s: %s", dir, g_strerror (errno));
+            return;
+        }
     }
     g_free (dir);
     if (!g_file_set_contents (path, contents, length, &error)) {
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 43bd5283e..6dbc39c7a 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014-2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -466,11 +466,15 @@ check_hex (IBusEngineSimple *simple,
 
         ch = ibus_keyval_to_unicode (priv->compose_buffer[i]);
 
-        if (ch == 0)
+        if (ch == 0) {
+            g_string_free (str, TRUE);
             return FALSE;
+        }
 
-        if (!g_unichar_isxdigit (ch))
+        if (!g_unichar_isxdigit (ch)) {
+            g_string_free (str, TRUE);
             return FALSE;
+        }
 
         buf[g_unichar_to_utf8 (ch, buf)] = '\0';
 
@@ -487,8 +491,9 @@ check_hex (IBusEngineSimple *simple,
     if (nptr - str->str < str->len) {
         g_string_free (str, TRUE);
         return FALSE;
-    } else
+    } else {
         g_string_free (str, TRUE);
+    }
 
     if (g_unichar_validate (n)) {
         priv->tentative_match = n;
@@ -559,11 +564,15 @@ check_emoji_table (IBusEngineSimple       *simple,
 
         ch = ibus_keyval_to_unicode (priv->compose_buffer[i]);
 
-        if (ch == 0)
+        if (ch == 0) {
+            g_string_free (str, TRUE);
             return FALSE;
+        }
 
-        if (!g_unichar_isprint (ch))
+        if (!g_unichar_isprint (ch)) {
+            g_string_free (str, TRUE);
             return FALSE;
+        }
 
         buf[g_unichar_to_utf8 (ch, buf)] = '\0';
 
diff --git a/src/ibushotkey.c b/src/ibushotkey.c
index d4ab7c23c..e72b8305e 100644
--- a/src/ibushotkey.c
+++ b/src/ibushotkey.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2019 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -373,6 +373,8 @@ ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile *profile,
         p->event = event;
     }
 
+    if (!p)
+        return FALSE;
     p->hotkeys = g_list_append (p->hotkeys, hotkey);
 
     return TRUE;
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index 3386a5d14..23c5ca1b7 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2015-2020 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -438,7 +438,12 @@ ibus_registry_save_cache_file (IBusRegistry *registry,
     g_assert (filename != NULL);
 
     cachedir = g_path_get_dirname (filename);
-    g_mkdir_with_parents (cachedir, 0775);
+    errno = 0;
+    if (g_mkdir_with_parents (cachedir, 0775)) {
+        g_warning ("Failed to mkdir %s: %s", cachedir, g_strerror (errno));
+        g_free (cachedir);
+        return FALSE;
+    }
     g_free (cachedir);
 
     variant = ibus_serializable_serialize (IBUS_SERIALIZABLE (registry));
diff --git a/src/ibusshare.c b/src/ibusshare.c
index e0ef2ce08..8974511ad 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2018 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -197,22 +197,17 @@ ibus_get_address (void)
     FILE *pf;
 
     /* free address */
-    if (address != NULL) {
-        g_free (address);
-        address = NULL;
-    }
+    g_clear_pointer (&address, g_free);
 
     /* get address from env variable */
     address = g_strdup (g_getenv ("IBUS_ADDRESS"));
-    if (address) {
+    if (address)
         return address;
-    }
 
     /* read address from ~/.config/ibus/bus/soketfile */
     pf = fopen (ibus_get_socket_path (), "r");
-    if (pf == NULL) {
+    if (pf == NULL)
         return NULL;
-    }
 
     while (!feof (pf)) {
         gchar *p = buffer;
@@ -224,11 +219,12 @@ ibus_get_address (void)
             continue;
         /* parse IBUS_ADDRESS */
         if (strncmp (p, "IBUS_ADDRESS=", sizeof ("IBUS_ADDRESS=") - 1) == 0) {
-            address = p + sizeof ("IBUS_ADDRESS=") - 1;
-            for (p = (gchar *)address; *p != '\n' && *p != '\0'; p++);
+            gchar *head = p + sizeof ("IBUS_ADDRESS=") - 1;
+            for (p = head; *p != '\n' && *p != '\0'; p++);
             if (*p == '\n')
                 *p = '\0';
-            address = g_strdup (address);
+            g_free (address);
+            address = g_strdup (head);
             continue;
         }
 
@@ -241,9 +237,8 @@ ibus_get_address (void)
     }
     fclose (pf);
 
-    if (pid == -1 || kill (pid, 0) != 0) {
+    if (pid == -1 || kill (pid, 0) != 0)
         return NULL;
-    }
 
     return address;
 }
@@ -256,10 +251,19 @@ ibus_write_address (const gchar *address)
     g_return_if_fail (address != NULL);
 
     path = g_path_get_dirname (ibus_get_socket_path ());
-    g_mkdir_with_parents (path, 0700);
+    errno = 0;
+    if (g_mkdir_with_parents (path, 0700)) {
+        g_warning ("Failed to mkdir %s: %s", path, g_strerror (errno));
+        g_free (path);
+        return;
+    }
     g_free (path);
 
-    g_unlink (ibus_get_socket_path ());
+    errno = 0;
+    if (g_unlink (ibus_get_socket_path ())) {
+        g_warning ("Failed to unlink %s: %s",
+                   ibus_get_socket_path (), g_strerror (errno));
+    }
     pf = fopen (ibus_get_socket_path (), "w");
     g_return_if_fail (pf != NULL);
 
diff --git a/src/ibustext.c b/src/ibustext.c
index a5e3c43b4..ed0fe666a 100644
--- a/src/ibustext.c
+++ b/src/ibustext.c
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2011-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -220,7 +221,7 @@ ibus_text_new_from_unichar (gunichar c)
     text= g_object_new (IBUS_TYPE_TEXT, NULL);
 
     text->is_static = FALSE;
-    text->text = (gchar *)g_malloc (12);
+    g_return_val_if_fail ((text->text = (gchar *)g_malloc (12)), NULL);
     len = g_unichar_to_utf8 (c, text->text);
     text->text[len] =  0;
 
diff --git a/src/ibusunicode.c b/src/ibusunicode.c
index 9e6f6b2b5..f7a897d1e 100644
--- a/src/ibusunicode.c
+++ b/src/ibusunicode.c
@@ -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) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018-2019 Red Hat, Inc.
+ * Copyright (C) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2021 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
@@ -472,7 +472,12 @@ ibus_unicode_data_save (const gchar *path,
 
     dir = g_path_get_dirname (path);
     if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
-        g_mkdir_with_parents (dir, 0777);
+        errno = 0;
+        if (g_mkdir_with_parents (dir, 0777)) {
+            g_warning ("Failed to mkdir %s: %s", dir, g_strerror (errno));
+            return;
+        }
+
     }
     g_free (dir);
     if (!g_file_set_contents (path, contents, length, &error)) {
@@ -967,7 +972,11 @@ ibus_unicode_block_save (const gchar *path,
 
     dir = g_path_get_dirname (path);
     if (g_strcmp0 (dir, ".") != 0 && g_stat (dir, &buf) != 0) {
-        g_mkdir_with_parents (dir, 0777);
+        errno = 0;
+        if (g_mkdir_with_parents (dir, 0777)) {
+            g_warning ("Failed to mkdir %s: %s", dir, g_strerror (errno));
+            return;
+        }
     }
     g_free (dir);
     if (!g_file_set_contents (path, contents, length, &error)) {
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index 4b4c56e7a..81bfc69b1 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -360,11 +360,13 @@ main (int argc, char *argv[])
     /* Avoid a warning of "AT-SPI: Could not obtain desktop path or name"
      * with gtk_main().
      */
-    g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+    if (!g_setenv ("NO_AT_BRIDGE", "1", TRUE))
+        g_message ("Failed setenv NO_AT_BRIDGE\n");
     g_test_init (&argc, &argv, NULL);
     gtk_init (&argc, &argv);
 
-    m_srcdir = argc > 1 ? g_strdup (argv[1]) : g_strdup (".");
+    m_srcdir = (argc > 1 && strlen (argv[1]) < FILENAME_MAX)
+            ? g_strdup (argv[1]) : g_strdup (".");
     m_compose_file = g_strdup (g_getenv ("COMPOSE_FILE"));
 #if GLIB_CHECK_VERSION (2, 58, 0)
     test_name = g_get_language_names_with_category ("LC_CTYPE")[0];
diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
index dd1b0042d..bab05398c 100644
--- a/src/tests/ibus-keypress.c
+++ b/src/tests/ibus-keypress.c
@@ -291,7 +291,8 @@ main (int argc, char *argv[])
     /* Avoid a warning of "AT-SPI: Could not obtain desktop path or name"
      * with gtk_main().
      */
-    g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+    if (!g_setenv ("NO_AT_BRIDGE", "1", TRUE))
+        g_message ("Failed setenv NO_AT_BRIDGE\n");
     g_test_init (&argc, &argv, NULL);
     gtk_init (&argc, &argv);
 
diff --git a/src/unicode-parser.c b/src/unicode-parser.c
index b4303ea82..2c4eb6776 100644
--- a/src/unicode-parser.c
+++ b/src/unicode-parser.c
@@ -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) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018 Red Hat, Inc.
+ * Copyright (C) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2021 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
@@ -76,11 +76,9 @@ unicode_data_new_object (UnicodeData *data)
             ibus_unicode_data_new ("code",
                                    data->code,
                                    "name",
-                                   data->name ? g_strdup (data->name)
-                                           : g_strdup (""),
+                                   data->name ? data->name : "",
                                    "alias",
-                                   data->alias ? g_strdup (data->alias)
-                                           : g_strdup (""),
+                                   data->alias ? data->alias : "",
                                    NULL);
     data->list = g_slist_append (data->list, unicode);
 }
@@ -98,8 +96,7 @@ unicode_block_new_object (UnicodeData *data)
                                     "end",
                                     data->end,
                                     "name",
-                                    data->name ? g_strdup (data->name)
-                                           : g_strdup (""),
+                                    data->name ? data->name : "",
                                    NULL);
     data->list = g_slist_append (data->list, block);
 }
@@ -285,7 +282,7 @@ ucd_parse_file (const gchar *filename,
                    filename, error ? error->message : "");
         goto failed_to_parse_ucd_names_list;
     }
-    head = end = content;
+    end = content;
     while (*end == '\n' && end - content < length) {
         end++;
         n++;
@@ -352,6 +349,7 @@ static void
 block_list_dump (IBusUnicodeBlock *block,
                  GString          *buff)
 {
+    gchar *line;
     g_return_if_fail (buff != NULL);
 
     g_string_append (buff, "    /* TRANSLATORS: You might refer the "         \
@@ -359,9 +357,10 @@ block_list_dump (IBusUnicodeBlock *block,
                            "                    the following command:\n"     \
                            "       msgmerge -C gucharmap.po ibus.po "         \
                            "ibus.pot */\n");
-    gchar *line = g_strdup_printf ("    N_(\"%s\"),\n",
-                                   ibus_unicode_block_get_name (block));
+    line = g_strdup_printf ("    N_(\"%s\"),\n",
+                            ibus_unicode_block_get_name (block));
     g_string_append (buff, line);
+    g_free (line);
 }
 
 static void
@@ -371,7 +370,7 @@ ucd_block_translatable_save (const gchar *filename,
     gchar *content = NULL;
     gsize length = 0;
     GError *error = NULL;
-    gchar *p;
+    gchar *p, *substr;
     GString *buff = NULL;
     int i;
     GSList *list = blocks_list;
@@ -392,25 +391,30 @@ ucd_block_translatable_save (const gchar *filename,
             break;
     }
     if (p != NULL) {
-        g_string_append (buff, g_strndup (content, p - content));
+        substr = g_strndup (content, p - content);
+        g_string_append (buff, substr);
+        g_free (substr);
         g_string_append_c (buff, '\n');
     }
     g_clear_pointer (&content, g_free);
 
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup_printf ("/* This file is generated by %s. */", __FILE__));
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup ("include <glib/gi18n.h>\n"));
-    g_string_append (buff, g_strdup ("\n"));
-    g_string_append (buff, g_strdup ("#ifndef __IBUS_UNICODE_GEN_H_\n"));
-    g_string_append (buff, g_strdup ("#define __IBUS_UNICODE_GEN_H_\n"));
-    g_string_append (buff, g_strdup ("const static char *unicode_blocks[] = {\n"));
+    g_string_append (buff, "\n");
+    substr = g_strdup_printf ("/* This file is generated by %s. */", __FILE__);
+    g_string_append (buff, substr);
+    g_free (substr);
+    g_string_append (buff, "\n");
+    g_string_append (buff, "include <glib/gi18n.h>\n");
+    g_string_append (buff, "\n");
+    g_string_append (buff, "#ifndef __IBUS_UNICODE_GEN_H_\n");
+    g_string_append (buff, "#define __IBUS_UNICODE_GEN_H_\n");
+    g_string_append (buff, "const static char *unicode_blocks[] = {\n");
     g_slist_foreach (list, (GFunc)block_list_dump, buff);
-    g_string_append (buff, g_strdup ("};\n"));
-    g_string_append (buff, g_strdup ("#endif\n"));
+    g_string_append (buff, "};\n");
+    g_string_append (buff, "#endif\n");
 
     if (!g_file_set_contents (filename, buff->str, -1, &error)) {
-        g_warning ("Failed to save emoji category file %s: %s", filename, error->message);
+        g_warning ("Failed to save emoji category file %s: %s",
+                   filename, error->message);
         g_error_free (error);
     }
 
diff --git a/util/IMdkit/FrameMgr.c b/util/IMdkit/FrameMgr.c
index 0e91b78ee..80d019a06 100644
--- a/util/IMdkit/FrameMgr.c
+++ b/util/IMdkit/FrameMgr.c
@@ -851,7 +851,7 @@ static Bool _FrameMgrProcessPadding (FrameMgr fm, FmStatus* status)
             return True;
         }
         /*endif*/
-        next_type = FrameInstGetNextType (fm->fi, &info);
+        FrameInstGetNextType (fm->fi, &info);
         fm->idx += info.num;
         if ((fitr = _FrameIterCounterIncr (fm->iters, info.num)))
             _FrameMgrRemoveIter (fm, fitr);
@@ -1525,6 +1525,11 @@ static Iter IterInit (XimFrame frame, int count)
     register XimFrameType type;
 
     it = (Iter) Xmalloc (sizeof (IterRec));
+    if (!it) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        return NULL;
+    }
     it->template = frame;
     it->max_count = (count == NO_VALUE)  ?  0  :  count;
     it->allow_expansion = (count == NO_VALUE);
@@ -1669,8 +1674,15 @@ static Bool IterIsLoopEnd (Iter it, Bool *myself)
 
 static XimFrameType IterGetNextType (Iter it, XimFrameTypeInfo info)
 {
-    XimFrameType type = it->template->type;
+    XimFrameType type;
+
+    if (!it || !it->template) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+	return (XimFrameType) NULL;
+    }
 
+    type = it->template->type;
     if (it->start_counter)
     {
         (*it->start_watch_proc) (it, it->client_data);
@@ -1766,7 +1778,15 @@ static XimFrameType IterGetNextType (Iter it, XimFrameTypeInfo info)
 
 static XimFrameType IterPeekNextType (Iter it, XimFrameTypeInfo info)
 {
-    XimFrameType type = it->template->type;
+    XimFrameType type;
+
+    if (!it->template) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: dereference pointer %s:%d.\n",
+                 __FILE__, __LINE__);
+        return (XimFrameType) NULL;
+    }
+
+    type = it->template->type;
 
     if (!it->allow_expansion  &&  it->cur_no >= it->max_count)
         return (EOL);
@@ -1866,6 +1886,9 @@ static FmStatus IterSetSize (Iter it, int num)
                     dr.num = NO_VALUE;
                     d = ChainMgrSetData (&it->cm, i, dr);
                 }
+                if (!d) {
+                    return FmNoMoreData;
+                }
                 /*endif*/
                 if (d->num == NO_VALUE)
                 {
@@ -2254,6 +2277,11 @@ static ExtraData ChainMgrSetData (ChainMgr cm,
                                   ExtraDataRec data)
 {
     Chain cur = (Chain) Xmalloc (sizeof (ChainRec));
+    if (!cur) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        return NULL;
+    }
 
     cur->frame_no = frame_no;
     cur->d = data;
diff --git a/util/IMdkit/i18nIc.c b/util/IMdkit/i18nIc.c
index 289837a64..14a3dc51b 100644
--- a/util/IMdkit/i18nIc.c
+++ b/util/IMdkit/i18nIc.c
@@ -470,13 +470,16 @@ static XICAttribute *CreateNestedList (CARD16 attr_id,
     /*endfor*/
     
     nest_list = (XICAttribute *) malloc (sizeof (XICAttribute));
-    if (nest_list == NULL)
+    if (nest_list == NULL) {
+        XFree (values);
         return NULL;
+    }
     /*endif*/
     memset (nest_list, 0, sizeof (XICAttribute));
     nest_list->value = (void *) malloc (value_length);
     if (nest_list->value == NULL) {
         XFree (nest_list);
+        XFree (values);
         return NULL;
     }
     /*endif*/
@@ -539,7 +542,13 @@ static int GetICValue (Xi18n i18n_core,
                     attr_ret[n].attribute_id = xic_attr[j].attribute_id;
                     attr_ret[n].name_length = xic_attr[j].length;
                     attr_ret[n].name = malloc (xic_attr[j].length + 1);
-		    strcpy(attr_ret[n].name, xic_attr[j].name);
+                    if (!attr_ret[n].name) {
+                        fprintf (stderr,
+                                 "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                                 __FILE__, __LINE__);
+                    } else {
+                        strcpy(attr_ret[n].name, xic_attr[j].name);
+                    }
                     attr_ret[n].type = xic_attr[j].type;
                     n++;
                     i++;
@@ -560,7 +569,13 @@ static int GetICValue (Xi18n i18n_core,
                 attr_ret[n].attribute_id = xic_attr[j].attribute_id;
                 attr_ret[n].name_length = xic_attr[j].length;
                 attr_ret[n].name = malloc (xic_attr[j].length + 1);
-		strcpy(attr_ret[n].name, xic_attr[j].name);
+                if (!attr_ret[n].name) {
+                    fprintf (stderr,
+                             "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                             __FILE__, __LINE__);
+                } else {
+		    strcpy(attr_ret[n].name, xic_attr[j].name);
+                }
                 attr_ret[n].type = xic_attr[j].type;
                 n++;
                 break;
@@ -700,10 +715,15 @@ void _Xi18nChangeIC (XIMS ims,
         attrib_list[attrib_num].value_length = value_length;
         FrameMgrGetToken (fm, value);
         attrib_list[attrib_num].value = (void *) malloc (value_length + 1);
-        memmove (attrib_list[attrib_num].value, value, value_length);
-	((char *)attrib_list[attrib_num].value)[value_length] = '\0';
+        if (!attrib_list[attrib_num].value) {
+            fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                     __FILE__, __LINE__);
+        } else {
+            memmove (attrib_list[attrib_num].value, value, value_length);
+            ((char *)attrib_list[attrib_num].value)[value_length] = '\0';
+            total_value_length += (value_length + 1);
+        }
         attrib_num++;
-        total_value_length += (value_length + 1);
     }
     /*endwhile*/
 
@@ -917,6 +937,12 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *call_data, unsigned char *p)
     FrameMgrGetToken (fm, byte_length);
 
     attrID_list = (CARD16 *) malloc (sizeof (CARD16)*IC_SIZE);  /* bogus */
+    if (!attrID_list) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        FrameMgrFree (fm);
+        return;
+    }
     memset (attrID_list, 0, sizeof (CARD16)*IC_SIZE);
 
     number = 0;
@@ -1026,7 +1052,7 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *call_data, unsigned char *p)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
         XFree (attrID_list);
-        FrameMgrFree (fm);
+        goto _Xi18nGetIC_finit;
         return;
     }
     /*endif*/
@@ -1097,6 +1123,7 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *call_data, unsigned char *p)
     }
     /*endfor*/
     
+_Xi18nGetIC_finit:
     if (preedit_ret)
     {
         XFree (preedit_ret->value);
diff --git a/util/IMdkit/i18nMethod.c b/util/IMdkit/i18nMethod.c
index 36dd28ac7..9c44e7feb 100644
--- a/util/IMdkit/i18nMethod.c
+++ b/util/IMdkit/i18nMethod.c
@@ -166,8 +166,14 @@ static Bool GetEncodings(Xi18n i18n_core, XIMEncodings **p_encoding)
     {
         (*p_encoding)->supported_encodings[i]
             = (char *) malloc (strlen (p->supported_encodings[i]) + 1);
-        strcpy ((*p_encoding)->supported_encodings[i],
-                p->supported_encodings[i]);
+        if (!((*p_encoding)->supported_encodings[i])) {
+            fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                     __FILE__, __LINE__);
+
+        } else {
+            strcpy ((*p_encoding)->supported_encodings[i],
+                    p->supported_encodings[i]);
+        }
     }
     /*endif*/
     return True;
@@ -187,11 +193,17 @@ static char *ParseArgs (Xi18n i18n_core, int mode, XIMArg *args)
                 if (address->imvalue_mask & I18N_IM_LOCALE)
                     return IMLocale;
                 /*endif*/
+                /* address->im_locale will be released later and don't need
+                 * -Wanalyzer-malloc-leak flag in gcc 11.0.1.
+                 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
                 address->im_locale = (char *) malloc (strlen (p->value) + 1);
                 if (!address->im_locale)
                     return IMLocale;
                 /*endif*/
                 strcpy (address->im_locale, p->value);
+#pragma GCC diagnostic pop
                 address->imvalue_mask |= I18N_IM_LOCALE;
             }
             else if (strcmp (p->name, IMServerTransport) == 0)
@@ -199,11 +211,14 @@ static char *ParseArgs (Xi18n i18n_core, int mode, XIMArg *args)
                 if (address->imvalue_mask & I18N_IM_ADDRESS)
                     return IMServerTransport;
                 /*endif*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
                 address->im_addr = (char *) malloc (strlen (p->value) + 1);
                 if (!address->im_addr)
                     return IMServerTransport;
                 /*endif*/
                 strcpy(address->im_addr, p->value);
+#pragma GCC diagnostic pop
                 address->imvalue_mask |= I18N_IM_ADDRESS;
             }
             else if (strcmp (p->name, IMServerName) == 0)
@@ -211,11 +226,14 @@ static char *ParseArgs (Xi18n i18n_core, int mode, XIMArg *args)
                 if (address->imvalue_mask & I18N_IM_NAME)
                     return IMServerName;
                 /*endif*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
                 address->im_name = (char *) malloc (strlen (p->value) + 1);
                 if (!address->im_name)
                     return IMServerName;
                 /*endif*/
                 strcpy (address->im_name, p->value);
+#pragma GCC diagnostic pop
                 address->imvalue_mask |= I18N_IM_NAME;
             }
             else if (strcmp (p->name, IMServerWindow) == 0)
@@ -698,7 +716,7 @@ static void ReturnSelectionNotify (Xi18n i18n_core, XSelectionRequestEvent *ev)
 {
     XEvent event;
     Display *dpy = i18n_core->address.dpy;
-    char buf[4096];
+    char buf[4096] = { '\0', };
 
     event.type = SelectionNotify;
     event.xselection.requestor = ev->requestor;
diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
index d53790516..e2fe8c6b3 100644
--- a/util/IMdkit/i18nOffsetCache.c
+++ b/util/IMdkit/i18nOffsetCache.c
@@ -94,7 +94,7 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
     }
 
     assert (data != NULL);
-    if (offset_cache->size > 0) {
+    if (offset_cache->size > 0 && i < offset_cache->capacity) {
         data[i].key = key;
         data[i].offset = offset;
     }
diff --git a/util/IMdkit/i18nPtHdr.c b/util/IMdkit/i18nPtHdr.c
index eaeeee1cc..8dc52714d 100644
--- a/util/IMdkit/i18nPtHdr.c
+++ b/util/IMdkit/i18nPtHdr.c
@@ -181,8 +181,13 @@ static void OpenMessageProc(XIMS ims, IMProtocol *call_data, unsigned char *p)
     FrameMgrGetToken (fm, name);
     imopen->lang.length = str_length;
     imopen->lang.name = malloc (str_length + 1);
-    strncpy (imopen->lang.name, name, str_length);
-    imopen->lang.name[str_length] = (char) 0;
+    if (!imopen->lang.name) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+    } else {
+        strncpy (imopen->lang.name, name, str_length);
+        imopen->lang.name[str_length] = (char) 0;
+    }
 
     FrameMgrFree (fm);
 
@@ -339,7 +344,7 @@ static XIMExt *MakeExtensionList (Xi18n i18n_core,
                                   int number,
                                   int *reply_number)
 {
-    XIMExt *ext_list;
+    XIMExt *ext_list = NULL;
     XIMExt *im_ext = (XIMExt *) i18n_core->address.extension;
     int im_ext_len = i18n_core->address.ext_num;
     int i;
@@ -358,7 +363,8 @@ static XIMExt *MakeExtensionList (Xi18n i18n_core,
         {
             for (j = 0;  j < (int) number;  j++)
             {
-                if (strcmp (lib_extension[j].name, im_ext[i].name) == 0)
+                if (lib_extension[j].name
+                    && strcmp (lib_extension[j].name, im_ext[i].name) == 0)
                 {
                     (*reply_number)++;
                     break;
@@ -389,7 +395,13 @@ static XIMExt *MakeExtensionList (Xi18n i18n_core,
             ext_list[i].minor_opcode = im_ext[i].minor_opcode;
             ext_list[i].length = im_ext[i].length;
             ext_list[i].name = malloc (im_ext[i].length + 1);
-            strcpy (ext_list[i].name, im_ext[i].name);
+            if (!ext_list[i].name) {
+                fprintf (stderr,
+                         "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                         __FILE__, __LINE__);
+            } else {
+                strcpy (ext_list[i].name, im_ext[i].name);
+            }
         }
         /*endfor*/
     }
@@ -401,13 +413,20 @@ static XIMExt *MakeExtensionList (Xi18n i18n_core,
         {
             for (j = 0;  j < (int)number;  j++)
             {
-                if (strcmp (lib_extension[j].name, im_ext[i].name) == 0)
+                if (lib_extension[j].name
+                    && strcmp (lib_extension[j].name, im_ext[i].name) == 0)
                 {
                     ext_list[n].major_opcode = im_ext[i].major_opcode;
                     ext_list[n].minor_opcode = im_ext[i].minor_opcode;
                     ext_list[n].length = im_ext[i].length;
                     ext_list[n].name = malloc (im_ext[i].length + 1);
-                    strcpy (ext_list[n].name, im_ext[i].name);
+                    if (!ext_list[n].name) {
+                        fprintf (stderr,
+                                 "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                                 __FILE__, __LINE__);
+                    } else {
+                        strcpy (ext_list[n].name, im_ext[i].name);
+                    }
                     n++;
                     break;
                 }
@@ -450,6 +469,11 @@ static void QueryExtensionMessageProc (XIMS ims,
     FrameMgrGetToken (fm, input_method_ID);
     FrameMgrGetToken (fm, byte_length);
     query_ext->extension = (XIMStr *) malloc (sizeof (XIMStr)*10);
+    if (!query_ext->extension) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        return;
+    }
     memset (query_ext->extension, 0, sizeof (XIMStr)*10);
     number = 0;
     while (FrameMgrIsIterLoopEnd (fm, &status) == False)
@@ -461,9 +485,20 @@ static void QueryExtensionMessageProc (XIMS ims,
         FrameMgrSetSize (fm, str_length);
         query_ext->extension[number].length = str_length;
         FrameMgrGetToken (fm, name);
+        /* I don't know why extension[number].name is detected as leak
+         * with -Wanalyzer-malloc-leak option in gcc 11.0.1.
+         */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
         query_ext->extension[number].name = malloc (str_length + 1);
-        strncpy (query_ext->extension[number].name, name, str_length);
-        query_ext->extension[number].name[str_length] = (char) 0;
+        if (!query_ext->extension[number].name) {
+            fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                     __FILE__, __LINE__);
+        } else {
+            strncpy (query_ext->extension[number].name, name, str_length);
+            query_ext->extension[number].name[str_length] = (char) 0;
+        }
+#pragma GCC diagnostic pop
         number++;
     }
     /*endwhile*/
@@ -490,6 +525,8 @@ static void QueryExtensionMessageProc (XIMS ims,
         XFree (query_ext->extension[i].name);
     /*endfor*/
     XFree (query_ext->extension);
+    if (!ext_list)
+        return;
 
     fm = FrameMgrInit (query_extension_reply_fr,
                        NULL,
@@ -501,7 +538,10 @@ static void QueryExtensionMessageProc (XIMS ims,
     /* set length of BARRAY item in ext_fr */
     for (i = 0;  i < reply_number;  i++)
     {
-        str_size = strlen (ext_list[i].name);
+        if (ext_list[i].name)
+            str_size = strlen (ext_list[i].name);
+        else
+            str_size = 0;
         FrameMgrSetSize (fm, str_size);
     }
     /*endfor*/
@@ -700,7 +740,13 @@ static XIMAttribute *MakeIMAttributeList (Xi18n i18n_core,
                                     &value_length);
                 attrib_list[list_num].value_length = value_length;
                 attrib_list[list_num].value = (void *) malloc (value_length);
-                memset(attrib_list[list_num].value, 0, value_length);
+                if (attrib_list[list_num].value) {
+                    memset(attrib_list[list_num].value, 0, value_length);
+                } else {
+                    fprintf (stderr,
+                             "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                             __FILE__, __LINE__);
+                }
                 GetIMValueFromName (i18n_core,
                                     connect_id,
                                     attrib_list[list_num].value,
@@ -737,10 +783,10 @@ static void GetIMValuesMessageProc (XIMS ims,
     register int i;
     register int j;
     int number;
-    CARD16 *im_attrID_list;
-    char **name_list;
+    CARD16 *im_attrID_list = NULL;
+    char **name_list = NULL;
     CARD16 name_number;
-    XIMAttribute *im_attribute_list;
+    XIMAttribute *im_attribute_list = NULL;
     IMGetIMValuesStruct *getim = (IMGetIMValuesStruct *)&call_data->getim;
     CARD16 connect_id = call_data->any.connect_id;
     CARD16 input_method_ID;
@@ -753,8 +799,18 @@ static void GetIMValuesMessageProc (XIMS ims,
     FrameMgrGetToken (fm, input_method_ID);
     FrameMgrGetToken (fm, byte_length);
     im_attrID_list = (CARD16 *) malloc (sizeof (CARD16)*20);
+    if (!im_attrID_list) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        goto GetIMValuesMessageProc_finit;
+    }
     memset (im_attrID_list, 0, sizeof (CARD16)*20);
     name_list = (char **)malloc(sizeof(char *) * 20);
+    if (!name_list) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        goto GetIMValuesMessageProc_finit;
+    }
     memset(name_list, 0, sizeof(char *) * 20);
     number = 0;
     while (FrameMgrIsIterLoopEnd (fm, &status) == False)
@@ -792,8 +848,11 @@ static void GetIMValuesMessageProc (XIMS ims,
                                              im_attrID_list,
                                              &number,
                                              &list_len);
-    if (im_attrID_list)
-        XFree (im_attrID_list);
+    if (!im_attribute_list) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        goto GetIMValuesMessageProc_finit2;
+    }
     /*endif*/
 
     fm = FrameMgrInit (get_im_values_reply_fr,
@@ -815,11 +874,7 @@ static void GetIMValuesMessageProc (XIMS ims,
     if (!reply)
     {
         _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
-        FrameMgrFree (fm);
-        for (i = 0; i < iter_count; i++)
-            XFree(im_attribute_list[i].value);
-        XFree (im_attribute_list);
-        return;
+        goto GetIMValuesMessageProc_finit;
     }
     /*endif*/
     memset (reply, 0, total_size);
@@ -840,12 +895,18 @@ static void GetIMValuesMessageProc (XIMS ims,
                        0,
                        reply,
                        total_size);
-    FrameMgrFree (fm);
     XFree (reply);
 
-    for (i = 0; i < iter_count; i++)
-        XFree(im_attribute_list[i].value);
-    XFree (im_attribute_list);
+GetIMValuesMessageProc_finit:
+    FrameMgrFree (fm);
+GetIMValuesMessageProc_finit2:
+    if (im_attrID_list)
+        XFree (im_attrID_list);
+    if (im_attribute_list) {
+        for (i = 0; i < iter_count; i++)
+            XFree(im_attribute_list[i].value);
+        XFree (im_attribute_list);
+    }
 }
 
 static void CreateICMessageProc (XIMS ims,
@@ -1435,6 +1496,11 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
     if (byte_length > 0)
     {
         enc_nego->encoding = (XIMStr *) malloc (sizeof (XIMStr)*10);
+        if (!enc_nego->encoding) {
+            fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                     __FILE__, __LINE__);
+            goto EncodingNegotiatonMessageProc_finit;
+        }
         memset (enc_nego->encoding, 0, sizeof (XIMStr)*10);
         i = 0;
         while (FrameMgrIsIterLoopEnd (fm, &status) == False)
@@ -1446,9 +1512,21 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
             FrameMgrSetSize (fm, str_length);
             enc_nego->encoding[i].length = str_length;
             FrameMgrGetToken (fm, name);
+            /* I don't know why encoding[i].name is detected as leak
+             * with -Wanalyzer-malloc-leak option in gcc 11.0.1.
+             */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
             enc_nego->encoding[i].name = malloc (str_length + 1);
+            if (!(enc_nego->encoding[i].name)) {
+                fprintf (stderr,
+                         "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                         __FILE__, __LINE__);
+                goto EncodingNegotiatonMessageProc_finit;
+            }
             strncpy (enc_nego->encoding[i].name, name, str_length);
             enc_nego->encoding[i].name[str_length] = '\0';
+#pragma GCC diagnostic pop
             i++;
         }
         /*endwhile*/
@@ -1460,20 +1538,37 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
     if (byte_length > 0)
     {
         enc_nego->encodinginfo = (XIMStr *) malloc (sizeof (XIMStr)*10);
+        if (!enc_nego->encodinginfo) {
+            fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                     __FILE__, __LINE__);
+            goto EncodingNegotiatonMessageProc_finit;
+        }
         memset (enc_nego->encodinginfo, 0, sizeof (XIMStr)*10);
         i = 0;
         while (FrameMgrIsIterLoopEnd (fm, &status) == False)
         {
             char *name;
             int str_length;
-            
+
             FrameMgrGetToken (fm, str_length);
             FrameMgrSetSize (fm, str_length);
             enc_nego->encodinginfo[i].length = str_length;
             FrameMgrGetToken (fm, name);
+            /* I don't know why encodinginfo[i].name is detected as leak
+             * with -Wanalyzer-malloc-leak option in gcc 11.0.1.
+             */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak"
             enc_nego->encodinginfo[i].name = malloc (str_length + 1);
+            if (!enc_nego->encodinginfo[i].name) {
+                fprintf (stderr,
+                         "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                         __FILE__, __LINE__);
+                goto EncodingNegotiatonMessageProc_finit;
+            }
             strncpy (enc_nego->encodinginfo[i].name, name, str_length);
             enc_nego->encodinginfo[i].name[str_length] = '\0';
+#pragma GCC diagnostic pop
             i++;
         }
         /*endwhile*/
@@ -1524,6 +1619,7 @@ static void EncodingNegotiatonMessageProc (XIMS ims,
                        total_size);
     XFree (reply);
 
+EncodingNegotiatonMessageProc_finit:
     /* free data for encoding list */
     if (enc_nego->encoding)
     {
diff --git a/util/IMdkit/i18nUtil.c b/util/IMdkit/i18nUtil.c
index 109dcdf96..c62154e73 100644
--- a/util/IMdkit/i18nUtil.c
+++ b/util/IMdkit/i18nUtil.c
@@ -46,6 +46,8 @@ _Xi18nNeedSwap (Xi18n i18n_core, CARD16 connect_id)
     CARD8 im_byteOrder = i18n_core->address.im_byteOrder;
     Xi18nClient *client = _Xi18nFindClient (i18n_core, connect_id);
 
+    if (!client)
+        return True;
     return (client->byte_order != im_byteOrder);
 }
 
@@ -67,6 +69,11 @@ Xi18nClient *_Xi18nNewClient(Xi18n i18n_core)
 	new_connect_id = ++connect_id;
     }
     /*endif*/
+    if (!client) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+        return NULL;
+    }
     memset (client, 0, sizeof (Xi18nClient));
     client->connect_id = new_connect_id;
     client->pending = (XIMPending *) NULL;
@@ -113,7 +120,14 @@ void _Xi18nDeleteClient (Xi18n i18n_core, CARD16 connect_id)
                 ccp0->next = ccp->next;
             /*endif*/
             /* put it back to free list */
+            /* gcc 11.0.1 warns dereference of NULL with
+             * -Wanalyzer-null-dereference option
+             * but target should not be NULL.
+             */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wanalyzer-null-dereference"
             target->next = i18n_core->address.free_clients;
+#pragma GCC diagnostic pop
             i18n_core->address.free_clients = target;
             return;
         }
@@ -161,6 +175,12 @@ void _Xi18nSendMessage (XIMS ims,
 
     reply_length = header_size + length;
     reply = (unsigned char *) malloc (reply_length);
+    if (!reply) {
+        _Xi18nSendMessage (ims, connect_id, XIM_ERROR, 0, 0, 0);
+        XFree (reply_hdr);
+        FrameMgrFree (fm);
+        return;
+    }
     replyp = reply;
     memmove (reply, reply_hdr, header_size);
     replyp += header_size;
diff --git a/util/IMdkit/i18nX.c b/util/IMdkit/i18nX.c
index 5e5c15fa6..152fc4e80 100644
--- a/util/IMdkit/i18nX.c
+++ b/util/IMdkit/i18nX.c
@@ -58,16 +58,21 @@ static XClient *NewXClient (Xi18n i18n_core, Window new_client)
     XClient *x_client;
 
     x_client = (XClient *) malloc (sizeof (XClient));
-    x_client->client_win = new_client;
-    x_client->accept_win = XCreateSimpleWindow (dpy,
-                                                DefaultRootWindow(dpy),
-                                                0,
-                                                0,
-                                                1,
-                                                1,
-                                                1,
-                                                0,
-                                                0);
+    if (!x_client) {
+        fprintf (stderr, "(XIM-IMdkit) WARNING: malloc failed in %s:%d.\n",
+                 __FILE__, __LINE__);
+    } else {
+        x_client->client_win = new_client;
+        x_client->accept_win = XCreateSimpleWindow (dpy,
+                                                    DefaultRootWindow(dpy),
+                                                    0,
+                                                    0,
+                                                    1,
+                                                    1,
+                                                    1,
+                                                    0,
+                                                    0);
+    }
     client->trans_rec = x_client;
     return ((XClient *) x_client);
 }
@@ -219,7 +224,7 @@ static void ReadXConnectMessage (XIMS ims, XClientMessageEvent *ev)
     }
     /*endif*/
     _XRegisterFilterByType (dpy,
-                            x_client->accept_win,
+                            x_client ? x_client->accept_win : 0,
                             ClientMessage,
                             ClientMessage,
                             WaitXIMProtocol,
@@ -229,7 +234,7 @@ static void ReadXConnectMessage (XIMS ims, XClientMessageEvent *ev)
     event.xclient.window = new_client;
     event.xclient.message_type = spec->connect_request;
     event.xclient.format = 32;
-    event.xclient.data.l[0] = x_client->accept_win;
+    event.xclient.data.l[0] = x_client ? x_client->accept_win : 0;
     event.xclient.data.l[1] = major_version;
     event.xclient.data.l[2] = minor_version;
     event.xclient.data.l[3] = XCM_DATA_LIMIT;

From bc7811c6247b7bb8eba2f9f80c4f9f1510cd6b65 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 16 Jun 2021 20:39:35 +0900
Subject: [PATCH 725/816] src/tests: Fix ibus-desktop-testing-runner to get
 gsettings result

gsettings null string is '' and the quote mark needs to be parsed.
Also no-overview gsetting should be changed before run gnome-session.
---
 src/tests/ibus-desktop-testing-runner.in | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 15b2369d5..54b7e0d7f 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -215,9 +215,11 @@ run_dbus_daemon()
 
 init_gnome()
 {
+    # gsettings set command needs dconf-service with the same $DISPLAY
+    pkill dconf-service
     # Disable Tour dialog to get focus
     V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version`
-    if [ x"$V" = x ] ; then
+    if [ x"$V" = x"''" ] ; then
         gsettings set org.gnome.shell welcome-dialog-last-shown-version '100'
     fi
     # gnome-shell now starts overview mode by login.
@@ -237,7 +239,7 @@ init_gnome()
     V2=$?
     if [ $V2 -ne 0 ] ; then
         V3=`echo "$V" | sed -e 's/\[//' -e 's/\]//'`
-        if [ x"$V3" = x ] ; then
+        if [ x"$V3" = x"''" ] ; then
             V4="['no-overview@fthx']"
         else
             V4="[$V3, 'no-overview@fthx']"
@@ -248,6 +250,8 @@ init_gnome()
 
 run_desktop()
 {
+    echo "$DESKTOP_COMMAND" | grep gnome-session > /dev/null
+    HAS_GNOME=$?
     if test $HAVE_GRAPHICS -eq 1 ; then
         /usr/libexec/Xorg.wrap -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . $DISPLAY &
     else
@@ -256,15 +260,15 @@ run_desktop()
     PID_XORG=$!
     sleep 1
     export DISPLAY=$DISPLAY
+    # init_gnome need to be called with $DISPLAY before gnome-session is called
+    if [  $HAS_GNOME -eq 0 ] ; then
+        init_gnome
+    fi
     echo "Running $DESKTOP_COMMAND with $USER in `tty`"
     $DESKTOP_COMMAND &
     PID_GNOME_SESSION=$!
     sleep 30
-    echo "$DESKTOP_COMMAND" | grep gnome-session > /dev/null
-    HAS_GNOME=$?
-    if [  $HAS_GNOME -eq 0 ] ; then
-        init_gnome
-    else
+    if [  $HAS_GNOME -ne 0 ] ; then
         ibus-daemon --daemonize --verbose
         sleep 3
     fi

From 9f9c88be46436b0a7aa8e09e044a2223356b46dc Mon Sep 17 00:00:00 2001
From: lf- <software@lfcode.ca>
Date: Fri, 18 Jun 2021 15:39:19 +0900
Subject: [PATCH 726/816] src/ibuscomposetable: Add support for the include
 directive

We also fix an issue with excess space at the start of lines stopping
comments being recognized.

BUG=https://github.com/ibus/ibus/pull/2296
---
 src/ibuscomposetable.c | 100 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 95 insertions(+), 5 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 685ac7173..66a5dfa75 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -21,7 +21,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -36,6 +35,7 @@
 
 #define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
 #define IBUS_COMPOSE_TABLE_VERSION (3)
+#define PATHLEN_MAX 256
 
 typedef struct {
   gunichar     *sequence;
@@ -181,7 +181,8 @@ parse_compose_sequence (IBusComposeData *compose_data,
     int n = 0;
 
     if (g_strv_length (words) < 2) {
-        g_warning ("key sequence format is <a> <b>...: %s", line);
+        g_warning ("too few words; key sequence format is <a> <b>...: %s",
+                   line);
         goto fail;
     }
 
@@ -244,10 +245,68 @@ parse_compose_sequence (IBusComposeData *compose_data,
 }
 
 
+static gchar *
+expand_include_path (const gchar *include_path) {
+    gchar *out = g_malloc0 (PATHLEN_MAX);
+    gchar *out_lastchar = out + PATHLEN_MAX - 2;
+    const gchar *i = include_path;
+    gchar *o = out;
+
+    while (*i && o < out_lastchar) {
+        // expand sequence
+        if (*i == '%') {
+            switch (*(i+1)) {
+            // $HOME
+            case 'H': {
+                const gchar *home = getenv ("HOME");
+                if (!home) {
+                    g_warning ("while parsing XCompose include target %s, "
+                               "%%H replacement failed because HOME is not "
+                               "defined; the include has been ignored",
+                               include_path);
+                    goto fail;
+                }
+                o = out + g_strlcat (out, home, PATHLEN_MAX);
+                break;
+            }
+            // locale compose file
+            case 'L':
+                g_warning ("while handling XCompose include target %s, found "
+                          "redundant %%L include; the include has been "
+                          "ignored", include_path);
+                goto fail;
+            // system compose dir
+            case 'S':
+                o = out + g_strlcat (out, "/usr/share/X11/locale",
+                                     PATHLEN_MAX);
+                break;
+            // escaped %
+            case '%':
+                *o++ = '%';
+                break;
+            default:
+                g_warning ("while parsing XCompose include target %s, found "
+                           "unknown substitution character '%c'; the include "
+                           "has been ignored", include_path, *(i+1));
+                goto fail;
+            }
+            i += 2;
+        } else {
+            *o++ = *i++;
+        }
+    }
+    return out;
+fail:
+    g_free (out);
+    return NULL;
+}
+
+
 static void
 parse_compose_line (GList       **compose_list,
                     const gchar  *line,
-                    int          *compose_len)
+                    int          *compose_len,
+                    gchar        **include)
 {
     gchar **components = NULL;
     IBusComposeData *compose_data = NULL;
@@ -256,11 +315,32 @@ parse_compose_line (GList       **compose_list,
     g_assert (compose_len);
     *compose_len = 0;
 
+    // eat spaces at the start of the line
+    while (*line && (*line == ' ' || *line == '\t')) line++;
+
     if (line[0] == '\0' || line[0] == '#')
         return;
 
-    if (g_str_has_prefix (line, "include "))
+    if (g_str_has_prefix (line, "include ")) {
+        const char *rest = line + sizeof ("include ") - 1;
+        while (*rest && *rest == ' ') rest++;
+
+        // grabbed the path part of the line
+        char *rest2;
+        if (*rest == '"') {
+            rest++;
+            rest2 = g_strdup (rest);
+            // eat the closing quote
+            char *i = rest2;
+            while (*i && *i != '"') i++;
+            *i = '\0';
+        } else {
+            rest2 = g_strdup (rest);
+        }
+        *include = expand_include_path (rest2);
+        g_free (rest2);
         return;
+    }
 
     components = g_strsplit (line, ":", 2);
 
@@ -316,8 +396,18 @@ ibus_compose_list_parse_file (const gchar *compose_file,
 
     lines = g_strsplit (contents, "\n", -1);
     g_free (contents);
+    gchar *include = NULL;
     for (i = 0; lines[i] != NULL; i++) {
-        parse_compose_line (&compose_list, lines[i], &compose_len);
+        parse_compose_line (&compose_list, lines[i], &compose_len, &include);
+        if (include && *include) {
+            GList *rest = ibus_compose_list_parse_file (include,
+                    max_compose_len);
+            if (rest) {
+                compose_list = g_list_concat (compose_list, rest);
+            }
+        }
+
+        g_clear_pointer (&include, g_free);
         if (*max_compose_len < compose_len)
             *max_compose_len = compose_len;
     }

From a755d1601a730b5fa0d463e7820311c12b1f1661 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 18 Jun 2021 15:39:50 +0900
Subject: [PATCH 727/816] src/ibuscomposetable: Do not include the same compose
 file

BUG=https://github.com/ibus/ibus/pull/2296
---
 src/ibuscomposetable.c | 130 +++++++++++++++++++++++++++++++----------
 1 file changed, 100 insertions(+), 30 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 66a5dfa75..916fcae30 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -34,8 +34,8 @@
 #include "ibusenginesimpleprivate.h"
 
 #define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
-#define IBUS_COMPOSE_TABLE_VERSION (3)
-#define PATHLEN_MAX 256
+#define IBUS_COMPOSE_TABLE_VERSION (4)
+#define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
 
 typedef struct {
   gunichar     *sequence;
@@ -247,17 +247,15 @@ parse_compose_sequence (IBusComposeData *compose_data,
 
 static gchar *
 expand_include_path (const gchar *include_path) {
-    gchar *out = g_malloc0 (PATHLEN_MAX);
-    gchar *out_lastchar = out + PATHLEN_MAX - 2;
-    const gchar *i = include_path;
-    gchar *o = out;
+    gchar *out = strdup ("");
+    const gchar *head, *i;
+    gchar *former, *o;
 
-    while (*i && o < out_lastchar) {
-        // expand sequence
+    for (head = i = include_path; *i; ++i) {
+        /* expand sequence */
         if (*i == '%') {
-            switch (*(i+1)) {
-            // $HOME
-            case 'H': {
+            switch (*(i + 1)) {
+            case 'H': { /* $HOME */
                 const gchar *home = getenv ("HOME");
                 if (!home) {
                     g_warning ("while parsing XCompose include target %s, "
@@ -266,23 +264,34 @@ expand_include_path (const gchar *include_path) {
                                include_path);
                     goto fail;
                 }
-                o = out + g_strlcat (out, home, PATHLEN_MAX);
+                o = out;
+                former = g_strndup (head, i - head);
+                out = g_strdup_printf ("%s%s%s", o, former, home);
+                head = i + 2;
+                g_free (o);
+                g_free (former);
                 break;
             }
-            // locale compose file
-            case 'L':
+            case 'L': /* locale compose file */
                 g_warning ("while handling XCompose include target %s, found "
                           "redundant %%L include; the include has been "
                           "ignored", include_path);
                 goto fail;
-            // system compose dir
-            case 'S':
-                o = out + g_strlcat (out, "/usr/share/X11/locale",
-                                     PATHLEN_MAX);
+            case 'S': /* system compose dir */
+                o = out;
+                former = g_strndup (head, i - head);
+                out = g_strdup_printf ("%s%s%s", o, former, X11_DATADIR);
+                head = i + 2;
+                g_free (o);
+                g_free (former);
                 break;
-            // escaped %
-            case '%':
-                *o++ = '%';
+            case '%': /* escaped % */
+                o = out;
+                former = g_strndup (head, i - head);
+                out = g_strdup_printf ("%s%s%s", o, former, "%");
+                head = i + 2;
+                g_free (o);
+                g_free (former);
                 break;
             default:
                 g_warning ("while parsing XCompose include target %s, found "
@@ -290,11 +299,12 @@ expand_include_path (const gchar *include_path) {
                            "has been ignored", include_path, *(i+1));
                 goto fail;
             }
-            i += 2;
-        } else {
-            *o++ = *i++;
+            ++i;
         }
     }
+    o = out;
+    out = g_strdup_printf ("%s%s", o, head);
+    g_free (o);
     return out;
 fail:
     g_free (out);
@@ -315,7 +325,7 @@ parse_compose_line (GList       **compose_list,
     g_assert (compose_len);
     *compose_len = 0;
 
-    // eat spaces at the start of the line
+    /* eat spaces at the start of the line */
     while (*line && (*line == ' ' || *line == '\t')) line++;
 
     if (line[0] == '\0' || line[0] == '#')
@@ -325,12 +335,12 @@ parse_compose_line (GList       **compose_list,
         const char *rest = line + sizeof ("include ") - 1;
         while (*rest && *rest == ' ') rest++;
 
-        // grabbed the path part of the line
+        /* grabbed the path part of the line */
         char *rest2;
         if (*rest == '"') {
             rest++;
             rest2 = g_strdup (rest);
-            // eat the closing quote
+            /* eat the closing quote */
             char *i = rest2;
             while (*i && *i != '"') i++;
             *i = '\0';
@@ -374,6 +384,23 @@ parse_compose_line (GList       **compose_list,
 }
 
 
+static gchar *
+get_en_compose_file (void)
+{
+    gchar * const sys_langs[] = { "en_US.UTF-8", "en_US", "en.UTF-8",
+                                  "en", NULL };
+    gchar * const *sys_lang = NULL;
+    gchar *path = NULL;
+    for (sys_lang = sys_langs; *sys_lang; sys_lang++) {
+        path = g_build_filename (X11_DATADIR, *sys_lang, "Compose", NULL);
+        if (g_file_test (path, G_FILE_TEST_EXISTS))
+            break;
+        g_free (path);
+    }
+    return path;
+}
+
+
 static GList *
 ibus_compose_list_parse_file (const gchar *compose_file,
                               int         *max_compose_len)
@@ -399,6 +426,52 @@ ibus_compose_list_parse_file (const gchar *compose_file,
     gchar *include = NULL;
     for (i = 0; lines[i] != NULL; i++) {
         parse_compose_line (&compose_list, lines[i], &compose_len, &include);
+        if (*max_compose_len < compose_len)
+            *max_compose_len = compose_len;
+        if (include && *include) {
+            GStatBuf buf_include = { 0, };
+            GStatBuf buf_parent = { 0, };
+            gchar *en_compose;
+            errno = 0;
+            if (g_stat (include,  &buf_include)) {
+                g_warning ("Cannot access %s: %s",
+                           include,
+                           g_strerror (errno));
+                g_clear_pointer (&include, g_free);
+                continue;
+            }
+            errno = 0;
+            if (g_stat (compose_file,  &buf_parent)) {
+                g_warning ("Cannot access %s: %s",
+                           compose_file,
+                           g_strerror (errno));
+                g_clear_pointer (&include, g_free);
+                continue;
+            }
+            if (buf_include.st_ino == buf_parent.st_ino) {
+                g_warning ("Found recursive nest same file %s", include);
+                g_clear_pointer (&include, g_free);
+                continue;
+            }
+            en_compose = get_en_compose_file ();
+            if (en_compose) {
+                errno = 0;
+                if (g_stat (en_compose,  &buf_parent)) {
+                    g_warning ("Cannot access %s: %s",
+                               compose_file,
+                               g_strerror (errno));
+                    g_clear_pointer (&include, g_free);
+                    g_free (en_compose);
+                    continue;
+                }
+            }
+            g_free (en_compose);
+            if (buf_include.st_ino == buf_parent.st_ino) {
+                g_log ("System en_US Compose is already loaded %s\n", include);
+                g_clear_pointer (&include, g_free);
+                continue;
+            }
+        }
         if (include && *include) {
             GList *rest = ibus_compose_list_parse_file (include,
                     max_compose_len);
@@ -406,10 +479,7 @@ ibus_compose_list_parse_file (const gchar *compose_file,
                 compose_list = g_list_concat (compose_list, rest);
             }
         }
-
         g_clear_pointer (&include, g_free);
-        if (*max_compose_len < compose_len)
-            *max_compose_len = compose_len;
     }
     g_strfreev (lines);
 

From 7f09379b3cb69c7de6d8d667ce398dcfc0000433 Mon Sep 17 00:00:00 2001
From: lf- <software@lfcode.ca>
Date: Thu, 24 Jun 2021 16:10:12 +0900
Subject: [PATCH 728/816] src/ibuscomposetable: Fix a buffer overflow in
 compose handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I believe this has no security impact but it is making my Valgrind sad.

Thanks to Omni for the help in finding the root cause of this.

~/.XCompose is:
```
<Multi_key> <g> <h> : "η"
<Multi_key> <g> <v> <t> <h> : "ϑ"
<Multi_key> <g> <h>     : "ɣ"
```

BUG=https://github.com/ibus/ibus/pull/2297
---
 src/ibuscomposetable.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 916fcae30..dd7cbf830 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -410,7 +410,6 @@ ibus_compose_list_parse_file (const gchar *compose_file,
     gsize length = 0;
     GError *error = NULL;
     GList *compose_list = NULL;
-    int compose_len = 0;
     int i;
 
     g_assert (max_compose_len);
@@ -423,8 +422,9 @@ ibus_compose_list_parse_file (const gchar *compose_file,
 
     lines = g_strsplit (contents, "\n", -1);
     g_free (contents);
-    gchar *include = NULL;
     for (i = 0; lines[i] != NULL; i++) {
+        int compose_len = 0;
+        gchar *include = NULL;
         parse_compose_line (&compose_list, lines[i], &compose_len, &include);
         if (*max_compose_len < compose_len)
             *max_compose_len = compose_len;
@@ -467,7 +467,8 @@ ibus_compose_list_parse_file (const gchar *compose_file,
             }
             g_free (en_compose);
             if (buf_include.st_ino == buf_parent.st_ino) {
-                g_log ("System en_US Compose is already loaded %s\n", include);
+                g_message ("System en_US Compose is already loaded %s\n",
+                           include);
                 g_clear_pointer (&include, g_free);
                 continue;
             }
@@ -583,12 +584,20 @@ ibus_compose_data_compare (gpointer a,
     IBusComposeData *compose_data_b = b;
     int max_compose_len = GPOINTER_TO_INT (data);
     int i;
+    /* The allocation length of compose_data_a->sequence[] is different from
+     * one of compose_data_b->sequence[] and max_compose_len indicates
+     * the sequence length only but not include the compose value length.
+     * So max_compose_len is greater than any allocation lengths of sequence[]
+     * and this API should return if code_a or code_b is 0.
+     */
     for (i = 0; i < max_compose_len; i++) {
         gunichar code_a = compose_data_a->sequence[i];
         gunichar code_b = compose_data_b->sequence[i];
 
         if (code_a != code_b)
             return code_a - code_b;
+        if (code_a == 0 && code_b == 0)
+            return 0;
     }
     return 0;
 }

From ab6b9587a497e9662a2936df3dabed4582eeabdb Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 29 Jun 2021 12:40:20 +0900
Subject: [PATCH 729/816] src/tests: Delete G_MESSAGES_DEBUG in desktop-testing
 for gsettings

G_MESSAGES_DEBUG message could be appended to the output of gsettings
command and it's not useful to check the output.
---
 src/tests/ibus-desktop-testing-runner.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 54b7e0d7f..0ef72c038 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -217,6 +217,10 @@ init_gnome()
 {
     # gsettings set command needs dconf-service with the same $DISPLAY
     pkill dconf-service
+    # G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG=GLib-GIO-DEBUG would append
+    # debug messages to gsettings output and could not get the result correctly.
+    backup_G_MESSAGES_DEBUG="$G_MESSAGES_DEBUG"
+    export -n G_MESSAGES_DEBUG=''
     # Disable Tour dialog to get focus
     V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version`
     if [ x"$V" = x"''" ] ; then
@@ -238,14 +242,17 @@ init_gnome()
     echo "$V" | grep "no-overview" > /dev/null
     V2=$?
     if [ $V2 -ne 0 ] ; then
-        V3=`echo "$V" | sed -e 's/\[//' -e 's/\]//'`
-        if [ x"$V3" = x"''" ] ; then
+        V3=`echo "$V" | sed -e 's/@as //' -e 's/\[//' -e 's/\]//'`
+        if [ x"$V3" = x"''" ] || [ x"$V3" = x"" ]; then
             V4="['no-overview@fthx']"
         else
             V4="[$V3, 'no-overview@fthx']"
         fi
         gsettings set org.gnome.shell enabled-extensions "$V4"
     fi
+    if [ x"$backup_G_MESSAGES_DEBUG" != x ] ; then
+        export G_MESSAGES_DEBUG="$backup_G_MESSAGES_DEBUG"
+    fi
 }
 
 run_desktop()

From b952d30a1b7c741052c168fe1081ecb4d4b1c034 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 14 Jul 2021 22:31:47 +0900
Subject: [PATCH 730/816] Change default Emoji shortcut key

The shortcut key was Ctrl-Shit-e to follow Unicode code point
shortcut key but now the shorcut key is changed to Ctrl-period
to follow GTK.

BUG=https://github.com/ibus/ibus/issues/2325
---
 data/dconf/org.freedesktop.ibus.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index a79e92963..099b9c600 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -183,7 +183,7 @@
       <description>The shortcut keys for turning Unicode typing on or off</description>
     </key>
     <key name="hotkey" type="as">
-      <default>[ '&lt;Control&gt;&lt;Shift&gt;e' ]</default>
+      <default>[ '&lt;Control&gt;period' ]</default>
       <summary>Emoji shortcut keys for gtk_accelerator_parse</summary>
       <description>The shortcut keys for turning emoji typing on or off</description>
     </key>

From a4939f67f9de8275219e2cfcd3873e0fbe59058f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 16 Jul 2021 13:08:02 +0900
Subject: [PATCH 731/816] setup: Enhance engine search function

ibus-setup can search both the language names and input method names
in the top language list but when you search a language keyword
in the language list and move to the input method list after click
the hit language name, any input methods could not be shown because
the language didn't hit in any input method names.

In this enhancement, ibus-setup can show the input methods to hit
the language names.
---
 setup/enginedialog.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/setup/enginedialog.py b/setup/enginedialog.py
index e1c322bf9..470f801c3 100644
--- a/setup/enginedialog.py
+++ b/setup/enginedialog.py
@@ -120,12 +120,26 @@ def __list_filter(self, row, data):
             return True
         if word in row.untrans.lower():
             return True
-        if row.lang_info and row.name in self.__engines_for_lang:
-            for row_e in self.__engines_for_lang[row.name]:
-                if word in row_e.name.lower():
-                    return True
-                if word in row_e.untrans.lower():
-                    return True
+        # Search engine name in language list
+        if row.lang_info:
+            if row.name in self.__engines_for_lang.keys():
+                for row_l in self.__engines_for_lang[row.name]:
+                    if word in row_l.name.lower():
+                        return True
+                    if word in row_l.untrans.lower():
+                        return True
+        # Search language name in engine list
+        if not row.lang_info:
+            for l in self.__engines_for_lang.keys():
+                if word in l.lower():
+                    for row_l in self.__engines_for_lang[l]:
+                        if row.name == row_l.name:
+                            return True
+            for (trans, untrans) in self.__untrans_for_lang.items():
+                if word in untrans.lower():
+                    for row_l in self.__engines_for_lang[trans]:
+                        if row.name == row_l.name:
+                            return True
         return False
 
 

From 7e12d589ee4979fdd0f0b08f1bac9049741ec628 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:52:12 +0900
Subject: [PATCH 732/816] src/ibuscomposetable: Move ibus_compose_table_check

- Move ibus_compose_table_check and ibus_compose_table_compact_check
  from ibusenginesimple.c to ibuscomposetable.c
- Fix src/tests/ibus-compose.c to read compose sequences correctly.
---
 src/ibuscomposetable.c        | 519 +++++++++++++++++++++++++++++-
 src/ibusenginesimple.c        | 583 ++++------------------------------
 src/ibusenginesimpleprivate.h |  17 +-
 src/tests/Makefile.am         |   3 +-
 src/tests/ibus-compose.c      |   7 +-
 5 files changed, 601 insertions(+), 528 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index dd7cbf830..f85177a66 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -33,6 +33,13 @@
 
 #include "ibusenginesimpleprivate.h"
 
+/* This file contains the table of the compose sequences,
+ * static const guint16 gtk_compose_seqs_compact[] = {}
+ * It is generated from the compose-parse.py script.
+ */
+#include "gtkimcontextsimpleseqs.h"
+
+
 #define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
 #define IBUS_COMPOSE_TABLE_VERSION (4)
 #define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
@@ -44,6 +51,10 @@ typedef struct {
 } IBusComposeData;
 
 
+extern const IBusComposeTableCompactEx ibus_compose_table_compact;
+extern const IBusComposeTableCompactEx ibus_compose_table_compact_32bit;
+
+
 static void
 ibus_compose_data_free (IBusComposeData *compose_data)
 {
@@ -527,20 +538,22 @@ ibus_compose_list_check_duplicated (GList *compose_list,
         is_32bit = (n_outputs > 1) ? TRUE :
                 (compose_data->values[0] >= 0xFFFF) ? TRUE : FALSE;
         if (!is_32bit &&
-            ibus_check_compact_table (&ibus_compose_table_compact,
-                                      keysyms,
-                                      n_compose,
-                                      &compose_finish,
-                                      &output_chars) && compose_finish) {
+            ibus_compose_table_compact_check (&ibus_compose_table_compact,
+                                              keysyms,
+                                              n_compose,
+                                              &compose_finish,
+                                              &output_chars) &&
+            compose_finish) {
             if (compose_data->values[0] == *output_chars)
                 removed_list = g_list_append (removed_list, compose_data);
             g_free (output_chars);
         } else if (is_32bit &&
-                   ibus_check_compact_table (&ibus_compose_table_compact_32bit,
-                                             keysyms,
-                                             n_compose,
-                                             &compose_finish,
-                                             &output_chars) && compose_finish) {
+                   ibus_compose_table_compact_check (
+                          &ibus_compose_table_compact_32bit,
+                          keysyms,
+                          n_compose,
+                          &compose_finish,
+                          &output_chars) && compose_finish) {
             
             if (n_outputs == unichar_length (output_chars)) {
                 int j = 0;
@@ -1354,3 +1367,489 @@ ibus_compose_table_list_add_file (GSList      *compose_tables,
     ibus_compose_table_save_cache (compose_table);
     return g_slist_prepend (compose_tables, compose_table);
 }
+
+
+static int
+compare_seq (const void *key, const void *value)
+{
+    int i = 0;
+    const guint16 *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;
+}
+
+
+gboolean
+ibus_compose_table_check (const IBusComposeTableEx *table,
+                          guint16                  *compose_buffer,
+                          gint                      n_compose,
+                          gboolean                 *compose_finish,
+                          gboolean                 *compose_match,
+                          GString                  *output,
+                          gboolean                  is_32bit)
+{
+    gint row_stride = table->max_seq_len + 2;
+    guint16 *data_first;
+    int n_seqs;
+    guint16 *seq;
+
+    if (compose_finish)
+        *compose_finish = FALSE;
+    if (compose_match)
+        *compose_match = FALSE;
+    if (output)
+        g_string_set_size (output, 0);
+
+    if (n_compose > table->max_seq_len)
+        return FALSE;
+
+    if (is_32bit) {
+        if (!table->priv)
+            return FALSE;
+        data_first = table->priv->data_first;
+        n_seqs = table->priv->first_n_seqs;
+    } else {
+        data_first = table->data;
+        n_seqs = table->n_seqs;
+    }
+    seq = bsearch (compose_buffer,
+                   data_first, n_seqs,
+                   sizeof (guint16) * row_stride,
+                   compare_seq);
+
+    if (seq == NULL)
+        return FALSE;
+
+    guint16 *prev_seq;
+
+    /* Back up to the first sequence that matches to make sure
+     * we find the exact match if their is one.
+     */
+    while (seq > data_first) {
+        prev_seq = seq - row_stride;
+        if (compare_seq (compose_buffer, prev_seq) != 0)
+            break;
+        seq = prev_seq;
+    }
+
+    /* complete sequence */
+    if (n_compose == table->max_seq_len || seq[n_compose] == 0) {
+        guint16 *next_seq;
+        gunichar value = 0;
+        int num = 0;
+        int index = 0;
+        gchar *output_str = NULL;
+        GError *error = NULL;
+
+        if (is_32bit) {
+            num = seq[table->max_seq_len];
+            index = seq[table->max_seq_len + 1];
+            value =  table->priv->data_second[index];
+        } else {
+            value = seq[table->max_seq_len];
+        }
+
+        if (is_32bit) {
+            output_str = g_ucs4_to_utf8 (table->priv->data_second + index,
+                                         num, NULL, NULL, &error);
+            if (output_str) {
+                if (output)
+                    g_string_append (output, output_str);
+                g_free (output_str);
+                if (compose_match)
+                    *compose_match = TRUE;
+            } else {
+                g_warning ("Failed to output multiple characters: %s",
+                           error->message);
+                g_error_free (error);
+            }
+        } else {
+            if (output)
+                g_string_append_unichar (output, value);
+            if (compose_match)
+                *compose_match = TRUE;
+        }
+
+        /* We found a tentative match. See if there are any longer
+         * sequences containing this subsequence
+         */
+        next_seq = seq + row_stride;
+        if (next_seq < data_first + row_stride * n_seqs) {
+            if (compare_seq (compose_buffer, next_seq) == 0)
+                return TRUE;
+        }
+
+        if (compose_finish)
+            *compose_finish = TRUE;
+        compose_buffer[0] = 0;
+    }
+    return TRUE;
+}
+
+
+static int
+compare_seq_index (const void *key, const void *value)
+{
+    const guint16 *keysyms = key;
+    const guint16 *seq = value;
+
+    if (keysyms[0] < seq[0])
+        return -1;
+    else if (keysyms[0] > seq[0])
+        return 1;
+    return 0;
+}
+
+
+/**
+ * ibus_compose_table_compact_check:
+ * @table: A const `IBusComposeTableCompactEx`
+ * @compose_buffer: Typed compose sequence buffer
+ * @n_compose: The length of `compose_buffer`
+ * @compose_finish: If %TRUE, `output_chars` should be committed
+ * @output_chars: An array of gunichar of output compose characters
+ *
+ * output_chars is better to use gunichar instead of GString because
+ * IBusComposeData->values[] is the gunichar array.
+ */
+gboolean
+ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
+                                  guint16
+                                                               *compose_buffer,
+                                  gint                             n_compose,
+                                  gboolean
+                                                               *compose_finish,
+                                  gunichar                       **output_chars)
+{
+    gint row_stride;
+    guint16 *seq_index;
+    guint16 *seq;
+    gint i;
+
+    if (compose_finish)
+        *compose_finish = FALSE;
+    if (output_chars)
+        *output_chars = NULL;
+
+    /* Will never match, if the sequence in the compose buffer is longer
+     * than the sequences in the table.  Further, compare_seq (key, val)
+     * will overrun val if key is longer than val. */
+    if (n_compose > table->max_seq_len)
+        return FALSE;
+
+    seq_index = bsearch (compose_buffer,
+                         table->data,
+                         table->n_index_size,
+                         sizeof (guint16) *  table->n_index_stride,
+                         compare_seq_index);
+
+    if (seq_index == NULL)
+        return FALSE;
+
+    if (n_compose == 1)
+        return TRUE;
+
+    seq = NULL;
+
+    if (table->priv) {
+        for (i = n_compose - 1; i < table->max_seq_len; i++) {
+            row_stride = i + 2;
+
+            if (seq_index[i + 1] - seq_index[i] > 0) {
+                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);
+                if (seq) {
+                    if (i == n_compose - 1)
+                        break;
+                    else
+                        return TRUE;
+                }
+            }
+        }
+        if (!seq) {
+            return FALSE;
+        } else {
+            int index = seq[row_stride - 2];
+            int length = seq[row_stride - 1];
+            int j;
+            if (compose_finish)
+                *compose_finish = TRUE;
+            if (output_chars) {
+                *output_chars = g_new (gunichar, length + 1);
+                for (j = 0; j < length; j++) {
+                    (*output_chars)[j] = table->priv->data2[index + j];
+                }
+                (*output_chars)[length] = 0;
+            }
+
+            return TRUE;
+        }
+    } else {
+        for (i = n_compose - 1; i < table->max_seq_len; i++) {
+            row_stride = i + 1;
+
+            if (seq_index[i + 1] - seq_index[i] > 0) {
+                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);
+
+                if (seq) {
+                    if (i == n_compose - 1)
+                        break;
+                    else
+                        return TRUE;
+                }
+            }
+        }
+        if (!seq) {
+            return FALSE;
+        } else {
+            if (compose_finish)
+                *compose_finish = TRUE;
+            if (output_chars) {
+                *output_chars = g_new (gunichar, 2);
+                (*output_chars)[0] = seq[row_stride - 1];
+                (*output_chars)[1] = 0;
+            }
+
+            return TRUE;
+        }
+    }
+
+    g_assert_not_reached ();
+}
+
+
+/* Checks if a keysym is a dead key. Dead key keysym values are defined in
+ * ../gdk/gdkkeysyms.h and the first is GDK_KEY_dead_grave. As X.Org is updated,
+ * more dead keys are added and we need to update the upper limit.
+ * Currently, the upper limit is GDK_KEY_dead_dasia+1. The +1 has to do with
+ * a temporary issue in the X.Org header files.
+ * In future versions it will be just the keysym (no +1).
+ */
+#define IS_DEAD_KEY(k) \
+      ((k) >= IBUS_KEY_dead_grave && (k) <= IBUS_KEY_dead_greek)
+
+/* This function receives a sequence of Unicode characters and tries to
+ * normalize it (NFC). We check for the case the the resulting string
+ * has length 1 (single character).
+ * NFC normalisation normally rearranges diacritic marks, unless these
+ * belong to the same Canonical Combining Class.
+ * If they belong to the same canonical combining class, we produce all
+ * permutations of the diacritic marks, then attempt to normalize.
+ */
+static gboolean
+check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
+{
+    gunichar combination_buffer_temp[IBUS_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;
+
+    /* Xorg reuses dead_tilde for the perispomeni diacritic mark.
+     * We check if base character belongs to Greek Unicode block,
+     * and if so, we replace tilde with perispomeni. */
+    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,
+            IBUS_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,
+                    IBUS_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) {
+            gint j = i % (n_compose - 1) + 1;
+            gint k = (i+1) % (n_compose - 1) + 1;
+            if (j >= IBUS_MAX_COMPOSE_LEN) {
+                g_warning ("j >= IBUS_MAX_COMPOSE_LEN for " \
+                           "combination_buffer_temp");
+                break;
+            }
+            if (k >= IBUS_MAX_COMPOSE_LEN) {
+                g_warning ("k >= IBUS_MAX_COMPOSE_LEN for " \
+                           "combination_buffer_temp");
+                break;
+            }
+            temp_swap = combination_buffer_temp[j];
+            combination_buffer_temp[j] = combination_buffer_temp[k];
+            combination_buffer_temp[k] = temp_swap;
+        } else {
+            break;
+        }
+    }
+
+    return FALSE;
+}
+
+
+gboolean
+ibus_check_algorithmically (const guint16 *compose_buffer,
+                            gint           n_compose,
+                            gunichar      *output_char)
+
+{
+    gint i;
+    gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
+    gchar *combination_utf8, *nfc;
+
+    if (output_char)
+        *output_char = 0;
+
+    if (n_compose >= IBUS_MAX_COMPOSE_LEN)
+        return FALSE;
+
+    for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
+        ;
+    if (i == n_compose)
+        return TRUE;
+
+    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) {
+            combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i],
+                                                              TRUE);
+            if (!combination_buffer[i+1]) {
+                combination_buffer[i+1] =
+                        ibus_keyval_to_unicode (compose_buffer[i]);
+            }
+            i--;
+        }
+
+        /* If the buffer normalizes to a single character,
+         * then modify the order of combination_buffer accordingly, if
+         * necessary, and return TRUE.
+         */
+        if (check_normalize_nfc (combination_buffer, n_compose)) {
+            combination_utf8 = g_ucs4_to_utf8 (combination_buffer, -1,
+                                               NULL, NULL, NULL);
+            nfc = g_utf8_normalize (combination_utf8, -1, G_NORMALIZE_NFC);
+
+            if (output_char)
+                *output_char = g_utf8_get_char (nfc);
+
+            g_free (combination_utf8);
+            g_free (nfc);
+
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+
+gunichar
+ibus_keysym_to_unicode (guint16  keysym,
+                        gboolean combining) {
+#define CASE(keysym_suffix, unicode)                                    \
+        case IBUS_KEY_dead_##keysym_suffix: return unicode
+#define CASE_COMBINE(keysym_suffix, combined_unicode, isolated_unicode) \
+        case IBUS_KEY_dead_##keysym_suffix:                             \
+            if (combining)                                              \
+                return combined_unicode;                                \
+            else                                                        \
+                return isolated_unicode
+    switch (keysym) {
+    CASE (a, 0x03041);
+    CASE (A, 0x03042);
+    CASE (i, 0x03043);
+    CASE (I, 0x03044);
+    CASE (u, 0x03045);
+    CASE (U, 0x03046);
+    CASE (e, 0x03047);
+    CASE (E, 0x03048);
+    CASE (o, 0x03049);
+    CASE (O, 0x0304A);
+    CASE         (abovecomma,                   0x0313);
+    CASE_COMBINE (abovedot,                     0x0307, 0x02D9);
+    CASE         (abovereversedcomma,           0x0314);
+    CASE_COMBINE (abovering,                    0x030A, 0x02DA);
+    CASE_COMBINE (acute,                        0x0301, 0x00B4);
+    CASE         (belowbreve,                   0x032E);
+    CASE_COMBINE (belowcircumflex,              0x032D, 0xA788);
+    CASE_COMBINE (belowcomma,                   0x0326, 0x002C);
+    CASE         (belowdiaeresis,               0x0324);
+    CASE_COMBINE (belowdot,                     0x0323, 0x002E);
+    CASE_COMBINE (belowmacron,                  0x0331, 0x02CD);
+    CASE_COMBINE (belowring,                    0x030A, 0x02F3);
+    CASE_COMBINE (belowtilde,                   0x0330, 0x02F7);
+    CASE_COMBINE (breve,                        0x0306, 0x02D8);
+    CASE_COMBINE (capital_schwa,                0x018F, 0x04D8);
+    CASE_COMBINE (caron,                        0x030C, 0x02C7);
+    CASE_COMBINE (cedilla,                      0x0327, 0x00B8);
+    CASE_COMBINE (circumflex,                   0x0302, 0x005E);
+    CASE         (currency,                     0x00A4);
+    // IBUS_KEY_dead_dasia == IBUS_KEY_dead_abovereversedcomma
+    CASE_COMBINE (diaeresis,                    0x0308, 0x00A8);
+    CASE_COMBINE (doubleacute,                  0x030B, 0x02DD);
+    CASE_COMBINE (doublegrave,                  0x030F, 0x02F5);
+    CASE_COMBINE (grave,                        0x0300, 0x0060);
+    CASE         (greek,                        0x03BC);
+    CASE         (hook,                         0x0309);
+    CASE         (horn,                         0x031B);
+    CASE         (invertedbreve,                0x032F);
+    CASE_COMBINE (iota,                         0x0345, 0x037A);
+    CASE_COMBINE (macron,                       0x0304, 0x00AF);
+    CASE_COMBINE (ogonek,                       0x0328, 0x02DB);
+    // IBUS_KEY_dead_perispomeni == IBUS_KEY_dead_tilde
+    // IBUS_KEY_dead_psili == IBUS_KEY_dead_abovecomma
+    CASE_COMBINE (semivoiced_sound,             0x309A, 0x309C);
+    CASE_COMBINE (small_schwa,                  0x1D4A, 0x04D9);
+    CASE         (stroke,                       0x002F);
+    CASE_COMBINE (tilde,                        0x0303, 0x007E);
+    CASE_COMBINE (voiced_sound,                 0x3099, 0x309B);
+    case IBUS_KEY_Multi_key:
+        return 0x2384;
+    default:;
+    }
+    return 0x0;
+#undef CASE
+#undef CASE_COMBINE
+}
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 6dbc39c7a..4644620b4 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -91,11 +91,6 @@ struct _IBusEngineSimplePrivate {
     gboolean            lookup_table_visible;
 };
 
-struct _IBusComposeTableCompactPrivate
-{
-    const guint32 *data2;
-};
-
 /* From the values below, the value 30 means the number of different first keysyms
  * that exist in the Compose file (from Xorg). When running compose-parse.py without
  * parameters, you get the count that you can put here. Needed when updating the
@@ -124,6 +119,7 @@ const IBusComposeTableCompactEx ibus_compose_table_compact_32bit = {
 };
 
 guint COMPOSE_BUFFER_SIZE = 20;
+G_LOCK_DEFINE_STATIC (global_tables);
 static GSList *global_tables;
 
 /* functions prototype */
@@ -261,74 +257,6 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
             ibus_text_new_from_unichar (ch));
 }
 
-static gunichar
-ibus_keysym_to_unicode (guint16  keysym,
-                        gboolean combining) {
-#define CASE(keysym_suffix, unicode)                                    \
-        case IBUS_KEY_dead_##keysym_suffix: return unicode
-#define CASE_COMBINE(keysym_suffix, combined_unicode, isolated_unicode) \
-        case IBUS_KEY_dead_##keysym_suffix:                             \
-            if (combining)                                              \
-                return combined_unicode;                                \
-            else                                                        \
-                return isolated_unicode
-    switch (keysym) {
-    CASE (a, 0x03041);
-    CASE (A, 0x03042);
-    CASE (i, 0x03043);
-    CASE (I, 0x03044);
-    CASE (u, 0x03045);
-    CASE (U, 0x03046);
-    CASE (e, 0x03047);
-    CASE (E, 0x03048);
-    CASE (o, 0x03049);
-    CASE (O, 0x0304A);
-    CASE         (abovecomma,                   0x0313);
-    CASE_COMBINE (abovedot,                     0x0307, 0x02D9);
-    CASE         (abovereversedcomma,           0x0314);
-    CASE_COMBINE (abovering,                    0x030A, 0x02DA);
-    CASE_COMBINE (acute,                        0x0301, 0x00B4);
-    CASE         (belowbreve,                   0x032E);
-    CASE_COMBINE (belowcircumflex,              0x032D, 0xA788);
-    CASE_COMBINE (belowcomma,                   0x0326, 0x002C);
-    CASE         (belowdiaeresis,               0x0324);
-    CASE_COMBINE (belowdot,                     0x0323, 0x002E);
-    CASE_COMBINE (belowmacron,                  0x0331, 0x02CD);
-    CASE_COMBINE (belowring,                    0x030A, 0x02F3);
-    CASE_COMBINE (belowtilde,                   0x0330, 0x02F7);
-    CASE_COMBINE (breve,                        0x0306, 0x02D8);
-    CASE_COMBINE (capital_schwa,                0x018F, 0x04D8);
-    CASE_COMBINE (caron,                        0x030C, 0x02C7);
-    CASE_COMBINE (cedilla,                      0x0327, 0x00B8);
-    CASE_COMBINE (circumflex,                   0x0302, 0x005E);
-    CASE         (currency,                     0x00A4);
-    // IBUS_KEY_dead_dasia == IBUS_KEY_dead_abovereversedcomma
-    CASE_COMBINE (diaeresis,                    0x0308, 0x00A8);
-    CASE_COMBINE (doubleacute,                  0x030B, 0x02DD);
-    CASE_COMBINE (doublegrave,                  0x030F, 0x02F5);
-    CASE_COMBINE (grave,                        0x0300, 0x0060);
-    CASE         (greek,                        0x03BC);
-    CASE         (hook,                         0x0309);
-    CASE         (horn,                         0x031B);
-    CASE         (invertedbreve,                0x032F);
-    CASE_COMBINE (iota,                         0x0345, 0x037A);
-    CASE_COMBINE (macron,                       0x0304, 0x00AF);
-    CASE_COMBINE (ogonek,                       0x0328, 0x02DB);
-    // IBUS_KEY_dead_perispomeni == IBUS_KEY_dead_tilde
-    // IBUS_KEY_dead_psili == IBUS_KEY_dead_abovecomma
-    CASE_COMBINE (semivoiced_sound,             0x309A, 0x309C);
-    CASE_COMBINE (small_schwa,                  0x1D4A, 0x04D9);
-    CASE         (stroke,                       0x002F);
-    CASE_COMBINE (tilde,                        0x0303, 0x007E);
-    CASE_COMBINE (voiced_sound,                 0x3099, 0x309B);
-    case IBUS_KEY_Multi_key:
-        return 0x2384;
-    default:;
-    }
-    return 0x0;
-#undef CASE
-#undef CASE_COMBINE
-}
 
 static void
 ibus_engine_simple_commit_str (IBusEngineSimple *simple,
@@ -607,415 +535,6 @@ check_emoji_table (IBusEngineSimple       *simple,
     return FALSE;
 }
 
-static int
-compare_seq_index (const void *key, const void *value)
-{
-    const guint16 *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 guint16 *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;
-}
-
-
-static gboolean
-check_table (IBusEngineSimple         *simple,
-             const IBusComposeTableEx *table,
-             gint                      n_compose,
-             gboolean                  is_32bit)
-{
-    IBusEngineSimplePrivate *priv = simple->priv;
-    gint row_stride = table->max_seq_len + 2;
-    guint16 *data_first;
-    int n_seqs;
-    guint16 *seq;
-
-    g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
-    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
-
-    if (n_compose > table->max_seq_len)
-        return FALSE;
-
-    if (is_32bit) {
-        if (!table->priv)
-            return FALSE;
-        data_first = table->priv->data_first;
-        n_seqs = table->priv->first_n_seqs;
-    } else {
-        data_first = table->data;
-        n_seqs = table->n_seqs;
-    }
-    seq = bsearch (priv->compose_buffer,
-                   data_first, n_seqs,
-                   sizeof (guint16) * row_stride,
-                   compare_seq);
-
-    if (seq == NULL)
-        return FALSE;
-
-    guint16 *prev_seq;
-
-    priv->tentative_match = 0;
-    priv->tentative_match_len = 0;
-    /* Back up to the first sequence that matches to make sure
-     * we find the exact match if their is one.
-     */
-    while (seq > data_first) {
-        prev_seq = seq - row_stride;
-        if (compare_seq (priv->compose_buffer, prev_seq) != 0) {
-            break;
-        }
-        seq = prev_seq;
-    }
-
-    /* complete sequence */
-    if (n_compose == table->max_seq_len || seq[n_compose] == 0) {
-        guint16 *next_seq;
-        gunichar value = 0;
-        int num = 0;
-        int index = 0;
-        gchar *output_str = NULL;
-        GError *error = NULL;
-
-        if (is_32bit) {
-            num = seq[table->max_seq_len];
-            index = seq[table->max_seq_len + 1];
-            value =  table->priv->data_second[index];
-        } else {
-            value = seq[table->max_seq_len];
-        }
-
-        /* We found a tentative match. See if there are any longer
-         * sequences containing this subsequence
-         */
-        next_seq = seq + row_stride;
-        if (next_seq < data_first + row_stride * n_seqs) {
-            if (compare_seq (priv->compose_buffer, next_seq) == 0) {
-                priv->tentative_match = value;
-                priv->tentative_match_len = n_compose;
-
-                ibus_engine_simple_update_preedit_text (simple);
-
-                return TRUE;
-            }
-        }
-
-        if (is_32bit) {
-            output_str = g_ucs4_to_utf8 (table->priv->data_second + index,
-                                         num, NULL, NULL, &error);
-            if (output_str) {
-                ibus_engine_simple_commit_str(simple, output_str);
-                g_free (output_str);
-            } else {
-                g_warning ("Failed to output multiple characters: %s",
-                           error->message);
-                g_error_free (error);
-            }
-        } else {
-            ibus_engine_simple_commit_char (simple, value);
-        }
-        priv->compose_buffer[0] = 0;
-    }
-    ibus_engine_simple_update_preedit_text (simple);
-    return TRUE;
-}
-
-gboolean
-ibus_check_compact_table (const IBusComposeTableCompactEx *table,
-                          guint16                         *compose_buffer,
-                          gint                             n_compose,
-                          gboolean                        *compose_finish,
-                          gunichar                       **output_chars)
-{
-    gint row_stride;
-    guint16 *seq_index;
-    guint16 *seq;
-    gint i;
-
-    if (compose_finish)
-        *compose_finish = FALSE;
-    if (output_chars)
-        *output_chars = NULL;
-
-    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
-
-    /* Will never match, if the sequence in the compose buffer is longer
-     * than the sequences in the table.  Further, compare_seq (key, val)
-     * will overrun val if key is longer than val. */
-    if (n_compose > table->max_seq_len)
-        return FALSE;
-
-    // g_debug ("check_compact_table(n_compose=%d) [%04x, %04x, %04x, %04x]",
-    //          n_compose,
-    //          compose_buffer[0],
-    //          compose_buffer[1],
-    //          compose_buffer[2],
-    //          compose_buffer[3]);
-
-    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;
-    }
-
-    if (n_compose == 1) {
-        // g_debug ("compact: yes\n");
-        return TRUE;
-    }
-
-    // g_debug ("compact: %04x ", *seq_index);
-    seq = NULL;
-
-    if (table->priv) {
-        for (i = n_compose - 1; i < table->max_seq_len; i++) {
-            row_stride = i + 2;
-
-            if (seq_index[i + 1] - seq_index[i] > 0) {
-                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);
-                if (seq) {
-                    if (i == n_compose - 1)
-                        break;
-                    else
-                        return TRUE;
-                }
-            }
-        }
-        if (!seq) {
-            return FALSE;
-        } else {
-            int index = seq[row_stride - 2];
-            int length = seq[row_stride - 1];
-            int j;
-            if (compose_finish)
-                *compose_finish = TRUE;
-            if (output_chars) {
-                *output_chars = g_new (gunichar, length + 1);
-                for (j = 0; j < length; j++)
-                    (*output_chars)[j] = table->priv->data2[index + j];
-                (*output_chars)[length] = 0;
-            }
-
-            // g_debug ("U+%04X\n", value);
-            return TRUE;
-        }
-    } else {
-        for (i = n_compose - 1; i < table->max_seq_len; i++) {
-            row_stride = i + 1;
-
-            if (seq_index[i + 1] - seq_index[i] > 0) {
-                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);
-
-                if (seq) {
-                    if (i == n_compose - 1)
-                        break;
-                    else
-                        return TRUE;
-                }
-            }
-        }
-        if (!seq) {
-            return FALSE;
-        } else {
-            if (compose_finish)
-                *compose_finish = TRUE;
-            if (output_chars) {
-                *output_chars = g_new (gunichar, 2);
-                (*output_chars)[0] = seq[row_stride - 1];
-                (*output_chars)[1] = 0;
-            }
-
-            // g_debug ("U+%04X\n", value);
-            return TRUE;
-        }
-    }
-
-    g_assert_not_reached ();
-}
-
-
-/* Checks if a keysym is a dead key. Dead key keysym values are defined in
- * ../gdk/gdkkeysyms.h and the first is GDK_KEY_dead_grave. As X.Org is updated,
- * more dead keys are added and we need to update the upper limit.
- * Currently, the upper limit is GDK_KEY_dead_dasia+1. The +1 has to do with
- * a temporary issue in the X.Org header files.
- * In future versions it will be just the keysym (no +1).
- */
-#define IS_DEAD_KEY(k) \
-      ((k) >= IBUS_KEY_dead_grave && (k) <= (IBUS_KEY_dead_dasia + 1))
-
-/* This function receives a sequence of Unicode characters and tries to
- * normalize it (NFC). We check for the case the the resulting string
- * has length 1 (single character).
- * NFC normalisation normally rearranges diacritic marks, unless these
- * belong to the same Canonical Combining Class.
- * If they belong to the same canonical combining class, we produce all
- * permutations of the diacritic marks, then attempt to normalize.
- */
-static gboolean
-check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
-{
-    gunichar combination_buffer_temp[IBUS_MAX_COMPOSE_LEN];
-    gchar *combination_utf8_temp = NULL;
-    gchar *nfc_temp = NULL;
-    gint n_combinations;
-    gunichar temp_swap;
-    gint i;
-
-    n_combinations = 1;
-
-    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
-
-    for (i = 1; i < n_compose; i++ )
-        n_combinations *= i;
-
-    /* Xorg reuses dead_tilde for the perispomeni diacritic mark.
-     * We check if base character belongs to Greek Unicode block,
-     * and if so, we replace tilde with perispomeni. */
-    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,
-            IBUS_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,
-                    IBUS_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) {
-            gint j = i % (n_compose - 1) + 1;
-            gint k = (i+1) % (n_compose - 1) + 1;
-            if (j >= IBUS_MAX_COMPOSE_LEN) {
-                g_warning ("j >= IBUS_MAX_COMPOSE_LEN for " \
-                           "combination_buffer_temp");
-                break;
-            }
-            if (k >= IBUS_MAX_COMPOSE_LEN) {
-                g_warning ("k >= IBUS_MAX_COMPOSE_LEN for " \
-                           "combination_buffer_temp");
-                break;
-            }
-            temp_swap = combination_buffer_temp[j];
-            combination_buffer_temp[j] = combination_buffer_temp[k];
-            combination_buffer_temp[k] = temp_swap;
-        }
-        else
-            break;
-    }
-
-    return FALSE;
-}
-
-gboolean
-ibus_check_algorithmically (const guint16 *compose_buffer,
-                            gint           n_compose,
-                            gunichar      *output_char)
-
-{
-    gint i;
-    gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
-    gchar *combination_utf8, *nfc;
-
-    if (output_char)
-        *output_char = 0;
-
-    CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
-
-    if (n_compose >= IBUS_MAX_COMPOSE_LEN)
-        return FALSE;
-
-    for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
-        ;
-    if (i == n_compose)
-        return TRUE;
-
-    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) {
-            combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i],
-                                                              TRUE);
-            if (!combination_buffer[i+1]) {
-                combination_buffer[i+1] =
-                        ibus_keyval_to_unicode (compose_buffer[i]);
-            }
-            i--;
-        }
-
-        /* If the buffer normalizes to a single character,
-         * then modify the order of combination_buffer accordingly, if necessary,
-         * and return TRUE.
-         */
-        if (check_normalize_nfc (combination_buffer, n_compose)) {
-            combination_utf8 = g_ucs4_to_utf8 (combination_buffer, -1, NULL, NULL, NULL);
-            nfc = g_utf8_normalize (combination_utf8, -1, G_NORMALIZE_NFC);
-
-            if (output_char)
-                *output_char = g_utf8_get_char (nfc);
-
-            g_free (combination_utf8);
-            g_free (nfc);
-
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
 
 static gboolean
 no_sequence_matches (IBusEngineSimple *simple,
@@ -1184,34 +703,71 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
                                             gint              n_compose)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
-    gboolean compose_finish;
-    gunichar output_char;
+    gboolean compose_finish = FALSE;
+    gboolean compose_match = FALSE;
+    GString *output = g_string_new ("");
+    gboolean does_hit = FALSE;
+    gboolean is_32bit = FALSE;
+    GSList *tmp_list;
     gunichar *output_chars = NULL;
-    gchar *output_str = NULL;
-    GError *error = NULL;
-    GSList *list = global_tables;
+    gunichar output_char;
 
-    while (list) {
-        if (check_table (simple,
-            (IBusComposeTableEx *)list->data,
+    G_LOCK (global_tables);
+    tmp_list = global_tables;
+    while (tmp_list) {
+        is_32bit = FALSE;
+        if (ibus_compose_table_check (
+            (IBusComposeTableEx *)tmp_list->data,
+            priv->compose_buffer,
             n_compose,
-            FALSE)) {
-            return TRUE;
+            &compose_finish,
+            &compose_match,
+            output,
+            is_32bit)) {
+            does_hit = TRUE;
+            break;
         }
-        if (check_table (simple,
-            (IBusComposeTableEx *)list->data,
+        is_32bit = TRUE;
+        if (ibus_compose_table_check (
+            (IBusComposeTableEx *)tmp_list->data,
+            priv->compose_buffer,
             n_compose,
-            TRUE)) {
-            return TRUE;
+            &compose_finish,
+            &compose_match,
+            output,
+            is_32bit)) {
+            does_hit = TRUE;
+            break;
         }
-        list = list->next;
+        tmp_list = tmp_list->next;
     }
+    G_UNLOCK (global_tables);
 
-    if (ibus_check_compact_table (&ibus_compose_table_compact,
-                                  priv->compose_buffer,
-                                  n_compose,
-                                  &compose_finish,
-                                  &output_chars)) {
+    if (does_hit) {
+        if (compose_finish) {
+            if (compose_match) {
+                if (is_32bit) {
+                    ibus_engine_simple_commit_str (simple, output->str);
+                } else {
+                    ibus_engine_simple_commit_char (simple,
+                                                    g_utf8_get_char (output->str));
+                }
+            }
+        } else if (compose_match) {
+            priv->tentative_match = g_utf8_get_char (output->str);
+            priv->tentative_match_len = n_compose;
+        }
+        ibus_engine_simple_update_preedit_text (simple);
+        g_string_free (output, TRUE);
+        return TRUE;
+    }
+    g_string_free (output, TRUE);
+
+    if (ibus_compose_table_compact_check (&ibus_compose_table_compact,
+                                          priv->compose_buffer,
+                                          n_compose,
+                                          &compose_finish,
+                                          &output_chars)) {
         if (compose_finish) {
             ibus_engine_simple_commit_char (simple, *output_chars);
             g_free (output_chars);
@@ -1220,28 +776,29 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
         ibus_engine_simple_update_preedit_text (simple);
         return TRUE;
     }
-    if (ibus_check_compact_table (&ibus_compose_table_compact_32bit,
-                                  priv->compose_buffer,
-                                  n_compose,
-                                  &compose_finish,
-                                  &output_chars)) {
+    if (ibus_compose_table_compact_check (&ibus_compose_table_compact_32bit,
+                                          priv->compose_buffer,
+                                          n_compose,
+                                          &compose_finish,
+                                          &output_chars)) {
         if (compose_finish) {
-            output_str = g_ucs4_to_utf8 (output_chars, -1, NULL, NULL, &error);
-            if (output_str) {
-                ibus_engine_simple_commit_str (simple, output_str);
-                g_free (output_str);
+            GError *error = NULL;
+            char *str = g_ucs4_to_utf8 (output_chars, -1, NULL, NULL, &error);
+            if (str) {
+                ibus_engine_simple_commit_str (simple, str);
+                g_free (str);
             } else {
                 g_warning ("Failed to output multiple characters: %s",
                            error->message);
                 g_error_free (error);
             }
-            g_free (output_chars);
             priv->compose_buffer[0] = 0;
         }
-        
+        g_free (output_chars);
         ibus_engine_simple_update_preedit_text (simple);
         return TRUE;
     }
+    g_assert (!output_chars);
     if (ibus_check_algorithmically (priv->compose_buffer,
                                     n_compose,
                                     &output_char)) {
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index 508d9344e..47f2a3d42 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -37,15 +37,30 @@ struct _IBusComposeTablePrivate
     gsize second_size;
 };
 
+struct _IBusComposeTableCompactPrivate
+{
+    const guint32 *data2;
+};
+
 gboolean ibus_check_algorithmically (const guint16              *compose_buffer,
                                      gint                        n_compose,
                                      gunichar                   *output);
-gboolean ibus_check_compact_table   (const IBusComposeTableCompactEx
+gboolean ibus_compose_table_check   (const IBusComposeTableEx   *table,
+                                     guint16                    *compose_buffer,
+                                     gint                        n_compose,
+                                     gboolean                   *compose_finish,
+                                     gboolean                   *compose_match,
+                                     GString                    *output,
+                                     gboolean                    is_32bit);
+gboolean ibus_compose_table_compact_check
+                                    (const IBusComposeTableCompactEx
                                                                 *table,
                                      guint16                    *compose_buffer,
                                      gint                        n_compose,
                                      gboolean                   *compose_finish,
                                      gunichar                  **output_chars);
+gunichar ibus_keysym_to_unicode     (guint16                     keysym,
+                                     gboolean                    combining);
 
 G_END_DECLS
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 0a2e523c0..13c06eb46 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2018 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -30,6 +30,7 @@ AM_CPPFLAGS = \
     @GLIB2_CFLAGS@                          \
     @GIO2_CFLAGS@                           \
     -DIBUS_DISABLE_DEPRECATION_WARNINGS     \
+    -DX11_DATA_PREFIX=\"$(X11_PREFIX)\"     \
     -I$(top_srcdir)/src                     \
     -I$(top_builddir)/src                   \
     $(NULL)
diff --git a/src/tests/ibus-compose.c b/src/tests/ibus-compose.c
index 81bfc69b1..0be01d27a 100644
--- a/src/tests/ibus-compose.c
+++ b/src/tests/ibus-compose.c
@@ -6,6 +6,7 @@
 #define GREEN "\033[0;32m"
 #define RED   "\033[0;31m"
 #define NC    "\033[0m"
+#define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
 
 IBusBus *m_bus;
 gchar *m_compose_file;
@@ -35,7 +36,7 @@ get_compose_path ()
             break;
         if (g_strcmp0 (*l, "C") == 0)
             break;
-        compose_path = g_build_filename ("/usr/share/X11/locale",
+        compose_path = g_build_filename (X11_DATADIR,
                                          *l,
                                          "Compose",
                                          NULL);
@@ -155,7 +156,7 @@ set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
     for (i = 0;
          i < (m_compose_table->n_seqs * index_stride);
          i += index_stride) {
-        for (j = i; j < i + (index_stride - 1); j++) {
+        for (j = i; j < i + (index_stride - 2); j++) {
             guint keyval = m_compose_table->data[j];
             guint keycode = 0;
             guint modifiers = 0;
@@ -175,7 +176,7 @@ set_engine_cb (GObject *object, GAsyncResult *res, gpointer data)
         for (i = 0;
              i < (priv->first_n_seqs * index_stride);
              i += index_stride) {
-            for (j = i; j < i + (index_stride - 1); j++) {
+            for (j = i; j < i + (index_stride - 2); j++) {
                 guint keyval = priv->data_first[j];
                 guint keycode = 0;
                 guint modifiers = 0;

From 2fc1a028aa697f1320d85a76548cde12894bf9ab Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:52:18 +0900
Subject: [PATCH 733/816] src/ibusenginesimple: Multi_key to 0xB7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use · instead of ⎄ to display Multi_key in pre-edit.

BUG=https://gitlab.gnome.org/GNOME/gtk/-/issues/3669
BUG=https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3220
---
 src/ibuscomposetable.c |  8 ++++++-
 src/ibusenginesimple.c | 49 ++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index f85177a66..4ebf119b6 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1846,7 +1846,13 @@ ibus_keysym_to_unicode (guint16  keysym,
     CASE_COMBINE (tilde,                        0x0303, 0x007E);
     CASE_COMBINE (voiced_sound,                 0x3099, 0x309B);
     case IBUS_KEY_Multi_key:
-        return 0x2384;
+        /* We only show the Compose key visibly when it is the
+         * only glyph in the preedit, or when it occurs in the
+         * middle of the sequence. Sadly, the official character,
+         * U+2384, COMPOSITION SYMBOL, is bit too distracting, so
+         * we use U+00B7, MIDDLE DOT.
+         */
+        return 0x00B7;
     default:;
     }
     return 0x0;
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 4644620b4..57ca10c4a 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -289,32 +289,27 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
 
-    gunichar outbuf[COMPOSE_BUFFER_SIZE + 1];
-    int len = 0;
+    GString *s = g_string_new ("");
 
     if (priv->in_hex_sequence || priv->in_emoji_sequence) {
         int hexchars = 0;
 
         if (priv->in_hex_sequence)
-            outbuf[0] = L'u';
+            g_string_append_c (s, 'u');
         else
-            outbuf[0] = L'@';
-
-        len = 1;
+            g_string_append_c (s, '@');
 
         while (priv->compose_buffer[hexchars] != 0) {
-            outbuf[len] = ibus_keyval_to_unicode (
-                priv->compose_buffer[hexchars]);
-            ++len;
-            ++hexchars;
+            g_string_append_unichar(
+                    s,
+                    ibus_keyval_to_unicode (priv->compose_buffer[hexchars++])
+            );
         }
-
-        g_assert (len <= COMPOSE_BUFFER_SIZE);
     } else if (priv->tentative_match) {
-        outbuf[len++] = priv->tentative_match;
+        g_string_append_unichar(s, priv->tentative_match);
     } else if (priv->tentative_emoji && *priv->tentative_emoji) {
         IBusText *text = ibus_text_new_from_string (priv->tentative_emoji);
-        len = strlen (priv->tentative_emoji);
+        int len = strlen (priv->tentative_emoji);
         ibus_text_append_attribute (text,
                 IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
         ibus_engine_update_preedit_text ((IBusEngine *)simple, text, len, TRUE);
@@ -324,31 +319,33 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
         while (priv->compose_buffer[hexchars] != 0) {
             guint16 keysym = priv->compose_buffer[hexchars];
             gunichar unichar = ibus_keysym_to_unicode (keysym, FALSE);
-            if (unichar > 0)
-                outbuf[len] = unichar;
-            else
-                outbuf[len] = ibus_keyval_to_unicode (keysym);
-            if (!outbuf[len]) {
+            if (unichar > 0) {
+                g_string_append_unichar(s, unichar);
+            } else {
+                unichar = ibus_keyval_to_unicode (keysym);
+                g_string_append_unichar(s, unichar);
+            }
+            if (!unichar) {
                 g_warning (
                         "Not found alternative character of compose key 0x%X",
                         priv->compose_buffer[hexchars]);
             }
-            ++len;
             ++hexchars;
         }
-        g_assert (len <= IBUS_MAX_COMPOSE_LEN);
     }
 
-    outbuf[len] = L'\0';
-    if (len == 0) {
+    if (s->len == 0) {
         ibus_engine_hide_preedit_text ((IBusEngine *)simple);
-    }
-    else {
-        IBusText *text = ibus_text_new_from_ucs4 (outbuf);
+    } else if (s->len >= G_MAXINT) {
+        g_warning ("%s is too long compose length: %lu", s->str, s->len);
+    } else {
+        int len = (int)s->len;
+        IBusText *text = ibus_text_new_from_string (s->str);
         ibus_text_append_attribute (text,
                 IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
         ibus_engine_update_preedit_text ((IBusEngine *)simple, text, len, TRUE);
     }
+    g_string_free (s, TRUE);
 }
 
 

From 3e2609e68c9107ce7c65e2d5876bfdc9f0f8c854 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:52:21 +0900
Subject: [PATCH 734/816] src: Update ibuskeysyms.h for latest dead keys

---
 src/ibuskeysyms.h | 186 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 185 insertions(+), 1 deletion(-)

diff --git a/src/ibuskeysyms.h b/src/ibuskeysyms.h
index d35eb4a71..2fb2ea193 100644
--- a/src/ibuskeysyms.h
+++ b/src/ibuskeysyms.h
@@ -274,6 +274,10 @@
 #define IBUS_KEY_dead_invertedbreve 0xfe6d
 #define IBUS_KEY_dead_belowcomma 0xfe6e
 #define IBUS_KEY_dead_currency 0xfe6f
+#define IBUS_KEY_dead_lowline 0xfe90
+#define IBUS_KEY_dead_aboveverticalline 0xfe91
+#define IBUS_KEY_dead_belowverticalline 0xfe92
+#define IBUS_KEY_dead_longsolidusoverlay 0xfe93
 #define IBUS_KEY_dead_a 0xfe80
 #define IBUS_KEY_dead_A 0xfe81
 #define IBUS_KEY_dead_e 0xfe82
@@ -1201,6 +1205,7 @@
 #define IBUS_KEY_leftdoublequotemark 0xad2
 #define IBUS_KEY_rightdoublequotemark 0xad3
 #define IBUS_KEY_prescription 0xad4
+#define IBUS_KEY_permille 0xad5
 #define IBUS_KEY_minutes 0xad6
 #define IBUS_KEY_seconds 0xad7
 #define IBUS_KEY_latincross 0xad9
@@ -1633,8 +1638,8 @@
 #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 0x10001b7
 #define IBUS_KEY_ezh 0x1000292
 #define IBUS_KEY_Lbelowdot 0x1001e36
 #define IBUS_KEY_lbelowdot 0x1001e37
@@ -2121,5 +2126,184 @@
 #define IBUS_KEY_Sinh_ruu2 0x1000df2
 #define IBUS_KEY_Sinh_luu2 0x1000df3
 #define IBUS_KEY_Sinh_kunddaliya 0x1000df4
+#define IBUS_KEY_ModeLock 0x1008ff01
+#define IBUS_KEY_MonBrightnessUp 0x1008ff02
+#define IBUS_KEY_MonBrightnessDown 0x1008ff03
+#define IBUS_KEY_KbdLightOnOff 0x1008ff04
+#define IBUS_KEY_KbdBrightnessUp 0x1008ff05
+#define IBUS_KEY_KbdBrightnessDown 0x1008ff06
+#define IBUS_KEY_Standby 0x1008ff10
+#define IBUS_KEY_AudioLowerVolume 0x1008ff11
+#define IBUS_KEY_AudioMute 0x1008ff12
+#define IBUS_KEY_AudioRaiseVolume 0x1008ff13
+#define IBUS_KEY_AudioPlay 0x1008ff14
+#define IBUS_KEY_AudioStop 0x1008ff15
+#define IBUS_KEY_AudioPrev 0x1008ff16
+#define IBUS_KEY_AudioNext 0x1008ff17
+#define IBUS_KEY_HomePage 0x1008ff18
+#define IBUS_KEY_Mail 0x1008ff19
+#define IBUS_KEY_Start 0x1008ff1a
+#define IBUS_KEY_Search 0x1008ff1b
+#define IBUS_KEY_AudioRecord 0x1008ff1c
+#define IBUS_KEY_Calculator 0x1008ff1d
+#define IBUS_KEY_Memo 0x1008ff1e
+#define IBUS_KEY_ToDoList 0x1008ff1f
+#define IBUS_KEY_Calendar 0x1008ff20
+#define IBUS_KEY_PowerDown 0x1008ff21
+#define IBUS_KEY_ContrastAdjust 0x1008ff22
+#define IBUS_KEY_RockerUp 0x1008ff23
+#define IBUS_KEY_RockerDown 0x1008ff24
+#define IBUS_KEY_RockerEnter 0x1008ff25
+#define IBUS_KEY_Back 0x1008ff26
+#define IBUS_KEY_Forward 0x1008ff27
+#define IBUS_KEY_Stop 0x1008ff28
+#define IBUS_KEY_Refresh 0x1008ff29
+#define IBUS_KEY_PowerOff 0x1008ff2a
+#define IBUS_KEY_WakeUp 0x1008ff2b
+#define IBUS_KEY_Eject 0x1008ff2c
+#define IBUS_KEY_ScreenSaver 0x1008ff2d
+#define IBUS_KEY_WWW 0x1008ff2e
+#define IBUS_KEY_Sleep 0x1008ff2f
+#define IBUS_KEY_Favorites 0x1008ff30
+#define IBUS_KEY_AudioPause 0x1008ff31
+#define IBUS_KEY_AudioMedia 0x1008ff32
+#define IBUS_KEY_MyComputer 0x1008ff33
+#define IBUS_KEY_VendorHome 0x1008ff34
+#define IBUS_KEY_LightBulb 0x1008ff35
+#define IBUS_KEY_Shop 0x1008ff36
+#define IBUS_KEY_History 0x1008ff37
+#define IBUS_KEY_OpenURL 0x1008ff38
+#define IBUS_KEY_AddFavorite 0x1008ff39
+#define IBUS_KEY_HotLinks 0x1008ff3a
+#define IBUS_KEY_BrightnessAdjust 0x1008ff3b
+#define IBUS_KEY_Finance 0x1008ff3c
+#define IBUS_KEY_Community 0x1008ff3d
+#define IBUS_KEY_AudioRewind 0x1008ff3e
+#define IBUS_KEY_BackForward 0x1008ff3f
+#define IBUS_KEY_Launch0 0x1008ff40
+#define IBUS_KEY_Launch1 0x1008ff41
+#define IBUS_KEY_Launch2 0x1008ff42
+#define IBUS_KEY_Launch3 0x1008ff43
+#define IBUS_KEY_Launch4 0x1008ff44
+#define IBUS_KEY_Launch5 0x1008ff45
+#define IBUS_KEY_Launch6 0x1008ff46
+#define IBUS_KEY_Launch7 0x1008ff47
+#define IBUS_KEY_Launch8 0x1008ff48
+#define IBUS_KEY_Launch9 0x1008ff49
+#define IBUS_KEY_LaunchA 0x1008ff4a
+#define IBUS_KEY_LaunchB 0x1008ff4b
+#define IBUS_KEY_LaunchC 0x1008ff4c
+#define IBUS_KEY_LaunchD 0x1008ff4d
+#define IBUS_KEY_LaunchE 0x1008ff4e
+#define IBUS_KEY_LaunchF 0x1008ff4f
+#define IBUS_KEY_ApplicationLeft 0x1008ff50
+#define IBUS_KEY_ApplicationRight 0x1008ff51
+#define IBUS_KEY_Book 0x1008ff52
+#define IBUS_KEY_CD 0x1008ff53
+#define IBUS_KEY_WindowClear 0x1008ff55
+#define IBUS_KEY_Close 0x1008ff56
+#define IBUS_KEY_Copy 0x1008ff57
+#define IBUS_KEY_Cut 0x1008ff58
+#define IBUS_KEY_Display 0x1008ff59
+#define IBUS_KEY_DOS 0x1008ff5a
+#define IBUS_KEY_Documents 0x1008ff5b
+#define IBUS_KEY_Excel 0x1008ff5c
+#define IBUS_KEY_Explorer 0x1008ff5d
+#define IBUS_KEY_Game 0x1008ff5e
+#define IBUS_KEY_Go 0x1008ff5f
+#define IBUS_KEY_iTouch 0x1008ff60
+#define IBUS_KEY_LogOff 0x1008ff61
+#define IBUS_KEY_Market 0x1008ff62
+#define IBUS_KEY_Meeting 0x1008ff63
+#define IBUS_KEY_MenuKB 0x1008ff65
+#define IBUS_KEY_MenuPB 0x1008ff66
+#define IBUS_KEY_MySites 0x1008ff67
+#define IBUS_KEY_New 0x1008ff68
+#define IBUS_KEY_News 0x1008ff69
+#define IBUS_KEY_OfficeHome 0x1008ff6a
+#define IBUS_KEY_Open 0x1008ff6b
+#define IBUS_KEY_Option 0x1008ff6c
+#define IBUS_KEY_Paste 0x1008ff6d
+#define IBUS_KEY_Phone 0x1008ff6e
+#define IBUS_KEY_Reply 0x1008ff72
+#define IBUS_KEY_Reload 0x1008ff73
+#define IBUS_KEY_RotateWindows 0x1008ff74
+#define IBUS_KEY_RotationPB 0x1008ff75
+#define IBUS_KEY_RotationKB 0x1008ff76
+#define IBUS_KEY_Save 0x1008ff77
+#define IBUS_KEY_ScrollUp 0x1008ff78
+#define IBUS_KEY_ScrollDown 0x1008ff79
+#define IBUS_KEY_ScrollClick 0x1008ff7a
+#define IBUS_KEY_Send 0x1008ff7b
+#define IBUS_KEY_Spell 0x1008ff7c
+#define IBUS_KEY_SplitScreen 0x1008ff7d
+#define IBUS_KEY_Support 0x1008ff7e
+#define IBUS_KEY_TaskPane 0x1008ff7f
+#define IBUS_KEY_Terminal 0x1008ff80
+#define IBUS_KEY_Tools 0x1008ff81
+#define IBUS_KEY_Travel 0x1008ff82
+#define IBUS_KEY_UserPB 0x1008ff84
+#define IBUS_KEY_User1KB 0x1008ff85
+#define IBUS_KEY_User2KB 0x1008ff86
+#define IBUS_KEY_Video 0x1008ff87
+#define IBUS_KEY_WheelButton 0x1008ff88
+#define IBUS_KEY_Word 0x1008ff89
+#define IBUS_KEY_Xfer 0x1008ff8a
+#define IBUS_KEY_ZoomIn 0x1008ff8b
+#define IBUS_KEY_ZoomOut 0x1008ff8c
+#define IBUS_KEY_Away 0x1008ff8d
+#define IBUS_KEY_Messenger 0x1008ff8e
+#define IBUS_KEY_WebCam 0x1008ff8f
+#define IBUS_KEY_MailForward 0x1008ff90
+#define IBUS_KEY_Pictures 0x1008ff91
+#define IBUS_KEY_Music 0x1008ff92
+#define IBUS_KEY_Battery 0x1008ff93
+#define IBUS_KEY_Bluetooth 0x1008ff94
+#define IBUS_KEY_WLAN 0x1008ff95
+#define IBUS_KEY_UWB 0x1008ff96
+#define IBUS_KEY_AudioForward 0x1008ff97
+#define IBUS_KEY_AudioRepeat 0x1008ff98
+#define IBUS_KEY_AudioRandomPlay 0x1008ff99
+#define IBUS_KEY_Subtitle 0x1008ff9a
+#define IBUS_KEY_AudioCycleTrack 0x1008ff9b
+#define IBUS_KEY_CycleAngle 0x1008ff9c
+#define IBUS_KEY_FrameBack 0x1008ff9d
+#define IBUS_KEY_FrameForward 0x1008ff9e
+#define IBUS_KEY_Time 0x1008ff9f
+#define IBUS_KEY_SelectButton 0x1008ffa0
+#define IBUS_KEY_View 0x1008ffa1
+#define IBUS_KEY_TopMenu 0x1008ffa2
+#define IBUS_KEY_Red 0x1008ffa3
+#define IBUS_KEY_Green 0x1008ffa4
+#define IBUS_KEY_Yellow 0x1008ffa5
+#define IBUS_KEY_Blue 0x1008ffa6
+#define IBUS_KEY_Suspend 0x1008ffa7
+#define IBUS_KEY_Hibernate 0x1008ffa8
+#define IBUS_KEY_TouchpadToggle 0x1008ffa9
+#define IBUS_KEY_TouchpadOn 0x1008ffb0
+#define IBUS_KEY_TouchpadOff 0x1008ffb1
+#define IBUS_KEY_AudioMicMute 0x1008ffb2
+#define IBUS_KEY_Keyboard 0x1008ffb3
+#define IBUS_KEY_WWAN 0x1008ffb4
+#define IBUS_KEY_RFKill 0x1008ffb5
+#define IBUS_KEY_AudioPreset 0x1008ffb6
+#define IBUS_KEY_Switch_VT_1 0x1008fe01
+#define IBUS_KEY_Switch_VT_2 0x1008fe02
+#define IBUS_KEY_Switch_VT_3 0x1008fe03
+#define IBUS_KEY_Switch_VT_4 0x1008fe04
+#define IBUS_KEY_Switch_VT_5 0x1008fe05
+#define IBUS_KEY_Switch_VT_6 0x1008fe06
+#define IBUS_KEY_Switch_VT_7 0x1008fe07
+#define IBUS_KEY_Switch_VT_8 0x1008fe08
+#define IBUS_KEY_Switch_VT_9 0x1008fe09
+#define IBUS_KEY_Switch_VT_10 0x1008fe0a
+#define IBUS_KEY_Switch_VT_11 0x1008fe0b
+#define IBUS_KEY_Switch_VT_12 0x1008fe0c
+#define IBUS_KEY_Ungrab 0x1008fe20
+#define IBUS_KEY_ClearGrab 0x1008fe21
+#define IBUS_KEY_Next_VMode 0x1008fe22
+#define IBUS_KEY_Prev_VMode 0x1008fe23
+#define IBUS_KEY_LogWindowTree 0x1008fe24
+#define IBUS_KEY_LogGrabInfo 0x1008fe25
 
 #endif /* __IBUS_KEYSYMS_H__ */

From df495660a6da492fe0cac8f7fe748f25a1c3217c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:52:23 +0900
Subject: [PATCH 735/816] src/ibusenginesimple: Change gint to int

---
 src/ibuscomposetable.c        | 128 +++++++++++++++++-----------------
 src/ibusenginesimple.c        |  58 +++++++--------
 src/ibusenginesimpleprivate.h |   6 +-
 3 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 4ebf119b6..aa58f1364 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -47,7 +47,7 @@
 typedef struct {
   gunichar     *sequence;
   gunichar     *values;
-  gchar        *comment;
+  char         *comment;
 } IBusComposeData;
 
 
@@ -85,7 +85,7 @@ unichar_length (gunichar *uni_array)
 
 
 static gboolean
-is_codepoint (const gchar *str)
+is_codepoint (const char *str)
 {
     int i;
 
@@ -104,11 +104,11 @@ is_codepoint (const gchar *str)
 
 static gboolean
 parse_compose_value (IBusComposeData  *compose_data,
-                     const gchar      *val,
-                     const gchar      *line)
+                     const char       *val,
+                     const char       *line)
 {
-    gchar *head, *end, *p;
-    gchar *ustr = NULL;
+    char *head, *end, *p;
+    char *ustr = NULL;
     gunichar *uchars = NULL, *up;
     GError *error = NULL;
     int n_uchars = 0;
@@ -184,10 +184,10 @@ parse_compose_value (IBusComposeData  *compose_data,
 
 static int
 parse_compose_sequence (IBusComposeData *compose_data,
-                        const gchar     *seq,
-                        const gchar     *line)
+                        const char      *seq,
+                        const char      *line)
 {
-    gchar **words = g_strsplit (seq, "<", -1);
+    char **words = g_strsplit (seq, "<", -1);
     int i;
     int n = 0;
 
@@ -198,9 +198,9 @@ parse_compose_sequence (IBusComposeData *compose_data,
     }
 
     for (i = 1; words[i] != NULL; i++) {
-        gchar *start = words[i];
-        gchar *end = index (words[i], '>');
-        gchar *match;
+        char *start = words[i];
+        char *end = index (words[i], '>');
+        char *match;
         gunichar codepoint;
 
         if (words[i][0] == '\0')
@@ -256,18 +256,18 @@ parse_compose_sequence (IBusComposeData *compose_data,
 }
 
 
-static gchar *
-expand_include_path (const gchar *include_path) {
-    gchar *out = strdup ("");
-    const gchar *head, *i;
-    gchar *former, *o;
+static char *
+expand_include_path (const char *include_path) {
+    char *out = strdup ("");
+    const char *head, *i;
+    char *former, *o;
 
     for (head = i = include_path; *i; ++i) {
         /* expand sequence */
         if (*i == '%') {
             switch (*(i + 1)) {
             case 'H': { /* $HOME */
-                const gchar *home = getenv ("HOME");
+                const char *home = getenv ("HOME");
                 if (!home) {
                     g_warning ("while parsing XCompose include target %s, "
                                "%%H replacement failed because HOME is not "
@@ -325,11 +325,11 @@ expand_include_path (const gchar *include_path) {
 
 static void
 parse_compose_line (GList       **compose_list,
-                    const gchar  *line,
+                    const char   *line,
                     int          *compose_len,
-                    gchar        **include)
+                    char        **include)
 {
-    gchar **components = NULL;
+    char **components = NULL;
     IBusComposeData *compose_data = NULL;
     int l;
 
@@ -395,13 +395,13 @@ parse_compose_line (GList       **compose_list,
 }
 
 
-static gchar *
+static char *
 get_en_compose_file (void)
 {
-    gchar * const sys_langs[] = { "en_US.UTF-8", "en_US", "en.UTF-8",
-                                  "en", NULL };
-    gchar * const *sys_lang = NULL;
-    gchar *path = NULL;
+    char * const sys_langs[] = { "en_US.UTF-8", "en_US", "en.UTF-8",
+                                 "en", NULL };
+    char * const *sys_lang = NULL;
+    char *path = NULL;
     for (sys_lang = sys_langs; *sys_lang; sys_lang++) {
         path = g_build_filename (X11_DATADIR, *sys_lang, "Compose", NULL);
         if (g_file_test (path, G_FILE_TEST_EXISTS))
@@ -413,11 +413,11 @@ get_en_compose_file (void)
 
 
 static GList *
-ibus_compose_list_parse_file (const gchar *compose_file,
-                              int         *max_compose_len)
+ibus_compose_list_parse_file (const char *compose_file,
+                              int        *max_compose_len)
 {
-    gchar *contents = NULL;
-    gchar **lines = NULL;
+    char *contents = NULL;
+    char **lines = NULL;
     gsize length = 0;
     GError *error = NULL;
     GList *compose_list = NULL;
@@ -435,14 +435,14 @@ ibus_compose_list_parse_file (const gchar *compose_file,
     g_free (contents);
     for (i = 0; lines[i] != NULL; i++) {
         int compose_len = 0;
-        gchar *include = NULL;
+        char *include = NULL;
         parse_compose_line (&compose_list, lines[i], &compose_len, &include);
         if (*max_compose_len < compose_len)
             *max_compose_len = compose_len;
         if (include && *include) {
             GStatBuf buf_include = { 0, };
             GStatBuf buf_parent = { 0, };
-            gchar *en_compose;
+            char *en_compose;
             errno = 0;
             if (g_stat (include,  &buf_include)) {
                 g_warning ("Cannot access %s: %s",
@@ -588,7 +588,7 @@ ibus_compose_list_check_duplicated (GList *compose_list,
 }
 
 
-static gint
+static int
 ibus_compose_data_compare (gpointer a,
                            gpointer b,
                            gpointer data)
@@ -625,7 +625,7 @@ ibus_compose_list_print (GList *compose_list,
     int i, j;
     IBusComposeData *compose_data;
     int total_size = 0;
-    const gchar *keyval;
+    const char *keyval;
 
     for (list = compose_list; list != NULL; list = list->next) {
         compose_data = list->data;
@@ -682,13 +682,13 @@ ibus_compose_table_data_hash (gconstpointer v,
 }
 
 
-static gchar *
+static char *
 ibus_compose_hash_get_cache_path (guint32 hash)
 {
-    gchar *basename = NULL;
-    const gchar *cache_dir;
-    gchar *dir = NULL;
-    gchar *path = NULL;
+    char *basename = NULL;
+    const char *cache_dir;
+    char *dir = NULL;
+    char *path = NULL;
 
     basename = g_strdup_printf ("%08x.cache", hash);
 
@@ -715,7 +715,7 @@ ibus_compose_hash_get_cache_path (guint32 hash)
 static GVariant *
 ibus_compose_table_serialize (IBusComposeTableEx *compose_table)
 {
-    const gchar *header = IBUS_COMPOSE_TABLE_MAGIC;
+    const char *header = IBUS_COMPOSE_TABLE_MAGIC;
     const guint16 version = IBUS_COMPOSE_TABLE_VERSION;
     guint16 max_seq_len;
     guint16 index_stride;
@@ -825,7 +825,7 @@ ibus_compose_table_serialize (IBusComposeTableEx *compose_table)
 }
 
 
-static gint
+static int
 ibus_compose_table_find (gconstpointer data1,
                          gconstpointer data2)
 {
@@ -837,8 +837,8 @@ ibus_compose_table_find (gconstpointer data1,
 
 
 static IBusComposeTableEx *
-ibus_compose_table_deserialize (const gchar *contents,
-                                gsize        length)
+ibus_compose_table_deserialize (const char *contents,
+                                gsize       length)
 {
     IBusComposeTableEx *retval = NULL;
     GVariantType *type;
@@ -846,7 +846,7 @@ ibus_compose_table_deserialize (const gchar *contents,
     GVariant *variant_data_32bit_first = NULL;
     GVariant *variant_data_32bit_second = NULL;
     GVariant *variant_table = NULL;
-    const gchar *header = NULL;
+    const char *header = NULL;
     guint16 version = 0;
     guint16 max_seq_len = 0;
     guint16 n_seqs = 0;
@@ -1020,8 +1020,8 @@ ibus_compose_table_load_cache (const gchar *compose_file)
 {
     IBusComposeTableEx *retval = NULL;
     guint32 hash;
-    gchar *path = NULL;
-    gchar *contents = NULL;
+    char *path = NULL;
+    char *contents = NULL;
     GStatBuf original_buf;
     GStatBuf cache_buf;
     gsize length = 0;
@@ -1063,9 +1063,9 @@ ibus_compose_table_load_cache (const gchar *compose_file)
 void
 ibus_compose_table_save_cache (IBusComposeTableEx *compose_table)
 {
-    gchar *path = NULL;
+    char *path = NULL;
     GVariant *variant_table = NULL;
-    const gchar *contents = NULL;
+    const char *contents = NULL;
     GError *error = NULL;
     gsize length = 0;
 
@@ -1392,13 +1392,13 @@ compare_seq (const void *key, const void *value)
 gboolean
 ibus_compose_table_check (const IBusComposeTableEx *table,
                           guint16                  *compose_buffer,
-                          gint                      n_compose,
+                          int                       n_compose,
                           gboolean                 *compose_finish,
                           gboolean                 *compose_match,
                           GString                  *output,
                           gboolean                  is_32bit)
 {
-    gint row_stride = table->max_seq_len + 2;
+    int row_stride = table->max_seq_len + 2;
     guint16 *data_first;
     int n_seqs;
     guint16 *seq;
@@ -1448,7 +1448,7 @@ ibus_compose_table_check (const IBusComposeTableEx *table,
         gunichar value = 0;
         int num = 0;
         int index = 0;
-        gchar *output_str = NULL;
+        char *output_str = NULL;
         GError *error = NULL;
 
         if (is_32bit) {
@@ -1526,15 +1526,15 @@ gboolean
 ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
                                   guint16
                                                                *compose_buffer,
-                                  gint                             n_compose,
+                                  int                              n_compose,
                                   gboolean
                                                                *compose_finish,
                                   gunichar                       **output_chars)
 {
-    gint row_stride;
+    int row_stride;
     guint16 *seq_index;
     guint16 *seq;
-    gint i;
+    int i;
 
     if (compose_finish)
         *compose_finish = FALSE;
@@ -1654,14 +1654,14 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
  * permutations of the diacritic marks, then attempt to normalize.
  */
 static gboolean
-check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
+check_normalize_nfc (gunichar* combination_buffer, int n_compose)
 {
     gunichar combination_buffer_temp[IBUS_MAX_COMPOSE_LEN];
-    gchar *combination_utf8_temp = NULL;
-    gchar *nfc_temp = NULL;
-    gint n_combinations;
+    char *combination_utf8_temp = NULL;
+    char *nfc_temp = NULL;
+    int n_combinations;
     gunichar temp_swap;
-    gint i;
+    int i;
 
     n_combinations = 1;
 
@@ -1703,8 +1703,8 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
         g_free (nfc_temp);
 
         if (n_compose > 2) {
-            gint j = i % (n_compose - 1) + 1;
-            gint k = (i+1) % (n_compose - 1) + 1;
+            int j = i % (n_compose - 1) + 1;
+            int k = (i+1) % (n_compose - 1) + 1;
             if (j >= IBUS_MAX_COMPOSE_LEN) {
                 g_warning ("j >= IBUS_MAX_COMPOSE_LEN for " \
                            "combination_buffer_temp");
@@ -1729,13 +1729,13 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 
 gboolean
 ibus_check_algorithmically (const guint16 *compose_buffer,
-                            gint           n_compose,
+                            int            n_compose,
                             gunichar      *output_char)
 
 {
-    gint i;
+    int i;
     gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
-    gchar *combination_utf8, *nfc;
+    char *combination_utf8, *nfc;
 
     if (output_char)
         *output_char = 0;
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 57ca10c4a..699cf0d4a 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -79,8 +79,8 @@ typedef struct {
 struct _IBusEngineSimplePrivate {
     guint16            *compose_buffer;
     gunichar            tentative_match;
-    gchar              *tentative_emoji;
-    gint                tentative_match_len;
+    char               *tentative_emoji;
+    int                 tentative_match_len;
 
     guint               hex_mode_enabled : 1;
     guint               in_hex_sequence : 1;
@@ -142,7 +142,7 @@ static void     ibus_engine_simple_candidate_clicked
 static void     ibus_engine_simple_commit_char (IBusEngineSimple    *simple,
                                                 gunichar             ch);
 static void     ibus_engine_simple_commit_str  (IBusEngineSimple    *simple,
-                                                const gchar         *str);
+                                                const char          *str);
 static void     ibus_engine_simple_update_preedit_text
                                                (IBusEngineSimple    *simple);
 
@@ -260,10 +260,10 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
 
 static void
 ibus_engine_simple_commit_str (IBusEngineSimple *simple,
-                               const gchar      *str)
+                               const char       *str)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
-    gchar *backup_str;
+    char *backup_str;
 
     g_return_if_fail (str && *str);
 
@@ -368,15 +368,15 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
 
 static gboolean
 check_hex (IBusEngineSimple *simple,
-           gint              n_compose)
+           int               n_compose)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
 
-    gint i;
+    int i;
     GString *str;
     gulong n;
-    gchar *nptr = NULL;
-    gchar buf[7];
+    char *nptr = NULL;
+    char buf[7];
 
     CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
 
@@ -453,14 +453,14 @@ load_emoji_dict ()
 
 static gboolean
 check_emoji_table (IBusEngineSimple       *simple,
-                   gint                    n_compose,
-                   gint                    index)
+                   int                     n_compose,
+                   int                     index)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
     IBusEngineDict *emoji_dict = priv->emoji_dict;
     GString *str = NULL;
-    gint i;
-    gchar buf[7];
+    int i;
+    char buf[7];
     GSList *words = NULL;
 
     g_assert (IBUS_IS_ENGINE_SIMPLE (simple));
@@ -535,7 +535,7 @@ check_emoji_table (IBusEngineSimple       *simple,
 
 static gboolean
 no_sequence_matches (IBusEngineSimple *simple,
-                     gint              n_compose,
+                     int               n_compose,
                      guint             keyval,
                      guint             keycode,
                      guint             modifiers)
@@ -550,7 +550,7 @@ no_sequence_matches (IBusEngineSimple *simple,
      * match pending.
      */
     if (priv->tentative_match) {
-        gint len = priv->tentative_match_len;
+        int len = priv->tentative_match_len;
         int i;
 
         ibus_engine_simple_commit_char (simple, priv->tentative_match);
@@ -615,7 +615,7 @@ ibus_engine_simple_update_lookup_and_aux_table (IBusEngineSimple *simple)
 {
     IBusEngineSimplePrivate *priv;
     guint index, candidates;
-    gchar *aux_label = NULL;
+    char *aux_label = NULL;
     IBusText *text = NULL;
 
     g_return_if_fail (IBUS_IS_ENGINE_SIMPLE (simple));
@@ -697,7 +697,7 @@ ibus_engine_simple_set_number_on_lookup_table (IBusEngineSimple *simple,
 
 static gboolean
 ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
-                                            gint              n_compose)
+                                            int               n_compose)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
     gboolean compose_finish = FALSE;
@@ -818,7 +818,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 {
     IBusEngineSimple *simple = (IBusEngineSimple *)engine;
     IBusEngineSimplePrivate *priv = simple->priv;
-    gint n_compose = 0;
+    int n_compose = 0;
     gboolean have_hex_mods;
     gboolean is_hex_start = FALSE;
     gboolean is_emoji_start = FALSE;
@@ -828,7 +828,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
     gboolean is_escape;
     guint hex_keyval;
     guint printable_keyval;
-    gint i;
+    int i;
 
     while (n_compose <= COMPOSE_BUFFER_SIZE && priv->compose_buffer[n_compose] != 0)
         n_compose++;
@@ -1274,7 +1274,7 @@ ibus_engine_simple_candidate_clicked (IBusEngine *engine,
     IBusEngineSimple *simple = (IBusEngineSimple *)engine;
     IBusEngineSimplePrivate *priv = simple->priv;
     guint keyval;
-    gint n_compose = 0;
+    int n_compose = 0;
 
     if (priv->lookup_table == NULL || !priv->lookup_table_visible)
         return;
@@ -1308,18 +1308,18 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
 {
     /* Now ibus_engine_simple_add_compose_file() always returns TRUE. */
     gboolean retval = TRUE;
-    gchar *path = NULL;
-    const gchar *home;
+    char *path = NULL;
+    const char *home;
 #if GLIB_CHECK_VERSION (2, 58, 0)
-    const gchar * const *langs;
-    const gchar * const *lang = NULL;
+    const char * const *langs;
+    const char * const *lang = NULL;
 #else
-    const gchar *_locale;
-    gchar **langs = NULL;
-    gchar **lang = NULL;
+    const char *_locale;
+    char **langs = NULL;
+    char **lang = NULL;
 #endif
-    gchar * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL };
-    gchar * const *sys_lang = NULL;
+    char * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL };
+    char * const *sys_lang = NULL;
 
     if (locale == NULL) {
         path = g_build_filename (g_get_user_config_dir (),
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index 47f2a3d42..5479e553e 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -43,11 +43,11 @@ struct _IBusComposeTableCompactPrivate
 };
 
 gboolean ibus_check_algorithmically (const guint16              *compose_buffer,
-                                     gint                        n_compose,
+                                     int                         n_compose,
                                      gunichar                   *output);
 gboolean ibus_compose_table_check   (const IBusComposeTableEx   *table,
                                      guint16                    *compose_buffer,
-                                     gint                        n_compose,
+                                     int                         n_compose,
                                      gboolean                   *compose_finish,
                                      gboolean                   *compose_match,
                                      GString                    *output,
@@ -56,7 +56,7 @@ gboolean ibus_compose_table_compact_check
                                     (const IBusComposeTableCompactEx
                                                                 *table,
                                      guint16                    *compose_buffer,
-                                     gint                        n_compose,
+                                     int                         n_compose,
                                      gboolean                   *compose_finish,
                                      gunichar                  **output_chars);
 gunichar ibus_keysym_to_unicode     (guint16                     keysym,

From 4259f16324d578aa2505cf50f2f23923d8d87e76 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:53:19 +0900
Subject: [PATCH 736/816] src/ibusenginesimple: Make Compose preedit less
 intrusive

Tweak the preedit display for Compose sequences to
be not so distracting. We only show the Compose key
when it occurs in the middle of the sequence or is
the only key so far.

BUG=https://gitlab.gnome.org/GNOME/gtk/-/issues/3669
BUG=https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3220
BUG=https://blog.gtk.org/2021/03/24/input-revisited/
---
 src/ibuscomposetable.c        | 175 +++++++++++---------
 src/ibusenginesimple.c        | 301 +++++++++++++++++++++++++---------
 src/ibusenginesimpleprivate.h |   9 +-
 3 files changed, 325 insertions(+), 160 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index aa58f1364..2ad215514 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1523,23 +1523,22 @@ compare_seq_index (const void *key, const void *value)
  * IBusComposeData->values[] is the gunichar array.
  */
 gboolean
-ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
-                                  guint16
-                                                               *compose_buffer,
-                                  int                              n_compose,
-                                  gboolean
-                                                               *compose_finish,
-                                  gunichar                       **output_chars)
+ibus_compose_table_compact_check (const IBusComposeTableCompactEx
+                                                                *table,
+                                  guint16                       *compose_buffer,
+                                  int                            n_compose,
+                                  gboolean                      *compose_finish,
+                                  gunichar                     **output_chars)
 {
     int row_stride;
     guint16 *seq_index;
     guint16 *seq;
     int i;
 
-    if (compose_finish)
-        *compose_finish = FALSE;
-    if (output_chars)
-        *output_chars = NULL;
+    /* compose_finish and output_chars should not be initialized because
+     * ibus_compose_table_check() is called at first and
+     * engine->priv->tentative_match will be preedit after this is called.
+     */
 
     /* Will never match, if the sequence in the compose buffer is longer
      * than the sequences in the table.  Further, compare_seq (key, val)
@@ -1588,7 +1587,8 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
             if (compose_finish)
                 *compose_finish = TRUE;
             if (output_chars) {
-                *output_chars = g_new (gunichar, length + 1);
+                if (!(*output_chars))
+                    *output_chars = g_new (gunichar, length + 1);
                 for (j = 0; j < length; j++) {
                     (*output_chars)[j] = table->priv->data2[index + j];
                 }
@@ -1622,7 +1622,8 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
             if (compose_finish)
                 *compose_finish = TRUE;
             if (output_chars) {
-                *output_chars = g_new (gunichar, 2);
+                if (!(*output_chars))
+                    *output_chars = g_new (gunichar, 2);
                 (*output_chars)[0] = seq[row_stride - 1];
                 (*output_chars)[1] = 0;
             }
@@ -1635,16 +1636,6 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx *table,
 }
 
 
-/* Checks if a keysym is a dead key. Dead key keysym values are defined in
- * ../gdk/gdkkeysyms.h and the first is GDK_KEY_dead_grave. As X.Org is updated,
- * more dead keys are added and we need to update the upper limit.
- * Currently, the upper limit is GDK_KEY_dead_dasia+1. The +1 has to do with
- * a temporary issue in the X.Org header files.
- * In future versions it will be just the keysym (no +1).
- */
-#define IS_DEAD_KEY(k) \
-      ((k) >= IBUS_KEY_dead_grave && (k) <= IBUS_KEY_dead_greek)
-
 /* This function receives a sequence of Unicode characters and tries to
  * normalize it (NFC). We check for the case the the resulting string
  * has length 1 (single character).
@@ -1754,7 +1745,8 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
         i--;
         while (i >= 0) {
             combination_buffer[i+1] = ibus_keysym_to_unicode (compose_buffer[i],
-                                                              TRUE);
+                                                              TRUE,
+                                                              NULL);
             if (!combination_buffer[i+1]) {
                 combination_buffer[i+1] =
                         ibus_keyval_to_unicode (compose_buffer[i]);
@@ -1786,66 +1778,91 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
 
 
 gunichar
-ibus_keysym_to_unicode (guint16  keysym,
-                        gboolean combining) {
-#define CASE(keysym_suffix, unicode)                                    \
-        case IBUS_KEY_dead_##keysym_suffix: return unicode
-#define CASE_COMBINE(keysym_suffix, combined_unicode, isolated_unicode) \
-        case IBUS_KEY_dead_##keysym_suffix:                             \
-            if (combining)                                              \
-                return combined_unicode;                                \
-            else                                                        \
+ibus_keysym_to_unicode (guint16   keysym,
+                        gboolean  combining,
+                        gboolean *need_space) {
+#define CASE(keysym_suffix, unicode, sp)                                      \
+        case IBUS_KEY_dead_##keysym_suffix:                                   \
+            if (need_space)                                                   \
+                *need_space = sp;                                             \
+            return unicode
+#define CASE_COMBINE(keysym_suffix, combined_unicode, isolated_unicode, sp)   \
+        case IBUS_KEY_dead_##keysym_suffix:                                   \
+            if (need_space)                                                   \
+                *need_space = sp;                                             \
+            if (combining)                                                    \
+                return combined_unicode;                                      \
+            else                                                              \
                 return isolated_unicode
     switch (keysym) {
-    CASE (a, 0x03041);
-    CASE (A, 0x03042);
-    CASE (i, 0x03043);
-    CASE (I, 0x03044);
-    CASE (u, 0x03045);
-    CASE (U, 0x03046);
-    CASE (e, 0x03047);
-    CASE (E, 0x03048);
-    CASE (o, 0x03049);
-    CASE (O, 0x0304A);
-    CASE         (abovecomma,                   0x0313);
-    CASE_COMBINE (abovedot,                     0x0307, 0x02D9);
-    CASE         (abovereversedcomma,           0x0314);
-    CASE_COMBINE (abovering,                    0x030A, 0x02DA);
-    CASE_COMBINE (acute,                        0x0301, 0x00B4);
-    CASE         (belowbreve,                   0x032E);
-    CASE_COMBINE (belowcircumflex,              0x032D, 0xA788);
-    CASE_COMBINE (belowcomma,                   0x0326, 0x002C);
-    CASE         (belowdiaeresis,               0x0324);
-    CASE_COMBINE (belowdot,                     0x0323, 0x002E);
-    CASE_COMBINE (belowmacron,                  0x0331, 0x02CD);
-    CASE_COMBINE (belowring,                    0x030A, 0x02F3);
-    CASE_COMBINE (belowtilde,                   0x0330, 0x02F7);
-    CASE_COMBINE (breve,                        0x0306, 0x02D8);
-    CASE_COMBINE (capital_schwa,                0x018F, 0x04D8);
-    CASE_COMBINE (caron,                        0x030C, 0x02C7);
-    CASE_COMBINE (cedilla,                      0x0327, 0x00B8);
-    CASE_COMBINE (circumflex,                   0x0302, 0x005E);
-    CASE         (currency,                     0x00A4);
+#ifdef IBUS_ENGLISH_DEAD_KEY
+    CASE (a, 0x0363, 1);
+    CASE (A, 0x0363, 1);
+    CASE (i, 0x0365, 1);
+    CASE (I, 0x0365, 1);
+    CASE (u, 0x0367, 1);
+    CASE (U, 0x0367, 1);
+    CASE (e, 0x0364, 1);
+    CASE (E, 0x0364, 1);
+    CASE (o, 0x0366, 1);
+    CASE (O, 0x0366, 1);
+#else
+    CASE (a, 0x3041, 0);
+    CASE (A, 0x3042, 0);
+    CASE (i, 0x3043, 0);
+    CASE (I, 0x3044, 0);
+    CASE (u, 0x3045, 0);
+    CASE (U, 0x3046, 0);
+    CASE (e, 0x3047, 0);
+    CASE (E, 0x3048, 0);
+    CASE (o, 0x3049, 0);
+    CASE (O, 0x304A, 0);
+#endif
+    CASE_COMBINE (abovecomma,                   0x0313, 0x02BC, 0);
+    CASE_COMBINE (abovedot,                     0x0307, 0x02D9, 0);
+    CASE_COMBINE (abovereversedcomma,           0x0314, 0x02BD, 0);
+    CASE_COMBINE (abovering,                    0x030A, 0x02DA, 0);
+    CASE_COMBINE (aboveverticalline,            0x030D, 0x02C8, 0);
+    CASE_COMBINE (acute,                        0x0301, 0x00B4, 0);
+    CASE         (belowbreve,                   0x032E, 1);
+    CASE_COMBINE (belowcircumflex,              0x032D, 0xA788, 0);
+    CASE_COMBINE (belowcomma,                   0x0326, 0x002C, 0);
+    CASE         (belowdiaeresis,               0x0324, 1);
+    CASE_COMBINE (belowdot,                     0x0323, 0x002E, 0);
+    CASE_COMBINE (belowmacron,                  0x0331, 0x02CD, 0);
+    CASE_COMBINE (belowring,                    0x030A, 0x02F3, 0);
+    CASE_COMBINE (belowtilde,                   0x0330, 0x02F7, 0);
+    CASE_COMBINE (belowverticalline,            0x0329, 0x02CC, 0);
+    CASE_COMBINE (breve,                        0x0306, 0x02D8, 0);
+    CASE_COMBINE (capital_schwa,                0x1DEA, 0x1D4A, 0);
+    CASE_COMBINE (caron,                        0x030C, 0x02C7, 0);
+    CASE_COMBINE (cedilla,                      0x0327, 0x00B8, 0);
+    CASE_COMBINE (circumflex,                   0x0302, 0x005E, 0);
+    CASE         (currency,                     0x00A4, 0);
     // IBUS_KEY_dead_dasia == IBUS_KEY_dead_abovereversedcomma
-    CASE_COMBINE (diaeresis,                    0x0308, 0x00A8);
-    CASE_COMBINE (doubleacute,                  0x030B, 0x02DD);
-    CASE_COMBINE (doublegrave,                  0x030F, 0x02F5);
-    CASE_COMBINE (grave,                        0x0300, 0x0060);
-    CASE         (greek,                        0x03BC);
-    CASE         (hook,                         0x0309);
-    CASE         (horn,                         0x031B);
-    CASE         (invertedbreve,                0x032F);
-    CASE_COMBINE (iota,                         0x0345, 0x037A);
-    CASE_COMBINE (macron,                       0x0304, 0x00AF);
-    CASE_COMBINE (ogonek,                       0x0328, 0x02DB);
+    CASE_COMBINE (diaeresis,                    0x0308, 0x00A8, 0);
+    CASE_COMBINE (doubleacute,                  0x030B, 0x02DD, 0);
+    CASE_COMBINE (doublegrave,                  0x030F, 0x02F5, 0);
+    CASE_COMBINE (grave,                        0x0300, 0x0060, 0);
+    CASE         (greek,                        0x03BC, 0);
+    CASE_COMBINE (hook,                         0x0309, 0x02C0, 0);
+    CASE         (horn,                         0x031B, 1);
+    CASE         (invertedbreve,                0x032F, 1);
+    CASE_COMBINE (iota,                         0x0345, 0x037A, 0);
+    CASE         (longsolidusoverlay,           0x0338, 1);
+    CASE_COMBINE (lowline,                      0x0332, 0x005F, 0);
+    CASE_COMBINE (macron,                       0x0304, 0x00AF, 0);
+    CASE_COMBINE (ogonek,                       0x0328, 0x02DB, 0);
     // IBUS_KEY_dead_perispomeni == IBUS_KEY_dead_tilde
     // IBUS_KEY_dead_psili == IBUS_KEY_dead_abovecomma
-    CASE_COMBINE (semivoiced_sound,             0x309A, 0x309C);
-    CASE_COMBINE (small_schwa,                  0x1D4A, 0x04D9);
-    CASE         (stroke,                       0x002F);
-    CASE_COMBINE (tilde,                        0x0303, 0x007E);
-    CASE_COMBINE (voiced_sound,                 0x3099, 0x309B);
+    CASE_COMBINE (semivoiced_sound,             0x309A, 0x309C, 0);
+    CASE_COMBINE (small_schwa,                  0x1DEA, 0x1D4A, 0);
+    CASE         (stroke,                       0x0335, 1);
+    CASE_COMBINE (tilde,                        0x0303, 0x007E, 0);
+    CASE_COMBINE (voiced_sound,                 0x3099, 0x309B, 0);
     case IBUS_KEY_Multi_key:
+        if (need_space)
+            *need_space = FALSE;
         /* We only show the Compose key visibly when it is the
          * only glyph in the preedit, or when it occurs in the
          * middle of the sequence. Sadly, the official character,
@@ -1854,6 +1871,8 @@ ibus_keysym_to_unicode (guint16  keysym,
          */
         return 0x00B7;
     default:;
+        if (need_space)
+            *need_space = FALSE;
     }
     return 0x0;
 #undef CASE
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 699cf0d4a..acfc0264f 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -78,13 +78,14 @@ typedef struct {
 
 struct _IBusEngineSimplePrivate {
     guint16            *compose_buffer;
-    gunichar            tentative_match;
-    char               *tentative_emoji;
+    GString            *tentative_match;
     int                 tentative_match_len;
+    char               *tentative_emoji;
 
     guint               hex_mode_enabled : 1;
     guint               in_hex_sequence : 1;
     guint               in_emoji_sequence : 1;
+    guint               in_compose_sequence : 1;
     guint               modifiers_dropped : 1;
     IBusEngineDict     *emoji_dict;
     IBusLookupTable    *lookup_table;
@@ -178,6 +179,8 @@ ibus_engine_simple_init (IBusEngineSimple *simple)
     simple->priv->hex_mode_enabled =
         g_getenv("IBUS_ENABLE_CTRL_SHIFT_U") != NULL ||
         g_getenv("IBUS_ENABLE_CONTROL_SHIFT_U") != NULL;
+    simple->priv->tentative_match = g_string_new ("");
+    simple->priv->tentative_match_len = 0;
 }
 
 
@@ -196,6 +199,9 @@ ibus_engine_simple_destroy (IBusEngineSimple *simple)
     g_clear_object (&priv->lookup_table);
     g_clear_pointer (&priv->compose_buffer, g_free);
     g_clear_pointer (&priv->tentative_emoji, g_free);
+    g_string_free (priv->tentative_match, TRUE);
+    priv->tentative_match = NULL;
+    priv->tentative_match_len = 0;
 
     IBUS_OBJECT_CLASS(ibus_engine_simple_parent_class)->destroy (
         IBUS_OBJECT (simple));
@@ -222,15 +228,15 @@ ibus_engine_simple_reset (IBusEngine *engine)
 
     priv->compose_buffer[0] = 0;
 
-    if (priv->tentative_match || priv->in_hex_sequence) {
+    if (priv->tentative_match->len > 0 || priv->in_hex_sequence) {
         priv->in_hex_sequence = FALSE;
-        priv->tentative_match = 0;
+        g_string_set_size (priv->tentative_match, 0);
         priv->tentative_match_len = 0;
     } else if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
         g_clear_pointer (&priv->tentative_emoji, g_free);
     } else if (!priv->in_hex_sequence && !priv->in_emoji_sequence) {
-        priv->tentative_match = 0;
+        g_string_set_size (priv->tentative_match, 0);
         priv->tentative_match_len = 0;
     }
     ibus_engine_hide_preedit_text ((IBusEngine *)simple);
@@ -244,10 +250,17 @@ ibus_engine_simple_commit_char (IBusEngineSimple *simple,
 
     IBusEngineSimplePrivate *priv = simple->priv;
 
-    if (priv->tentative_match || priv->in_hex_sequence) {
-        priv->in_hex_sequence = FALSE;
-        priv->tentative_match = 0;
+    if (priv->in_hex_sequence ||
+        priv->tentative_match_len > 0 ||
+        priv->compose_buffer[0] != 0) {
+        g_string_set_size (priv->tentative_match, 0);
         priv->tentative_match_len = 0;
+        priv->in_hex_sequence = FALSE;
+        priv->in_compose_sequence = FALSE;
+        priv->compose_buffer[0] = 0;
+        /* Don't call ibus_engine_simple_update_preedit_text() inside
+         * not to call it as duplilcated.
+         */
     }
     if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
@@ -269,10 +282,17 @@ ibus_engine_simple_commit_str (IBusEngineSimple *simple,
 
     backup_str = g_strdup (str);
 
-    if (priv->tentative_match || priv->in_hex_sequence) {
-        priv->in_hex_sequence = FALSE;
-        priv->tentative_match = 0;
+    if (priv->in_hex_sequence ||
+        priv->tentative_match_len > 0 ||
+        priv->compose_buffer[0] != 0) {
+        g_string_set_size (priv->tentative_match, 0);
         priv->tentative_match_len = 0;
+        priv->in_hex_sequence = FALSE;
+        priv->in_compose_sequence = FALSE;
+        priv->compose_buffer[0] = 0;
+        /* Don't call ibus_engine_simple_update_preedit_text() inside
+         * not to call it as duplilcated.
+         */
     }
     if (priv->tentative_emoji || priv->in_emoji_sequence) {
         priv->in_emoji_sequence = FALSE;
@@ -288,8 +308,8 @@ static void
 ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
-
     GString *s = g_string_new ("");
+    int i, j;
 
     if (priv->in_hex_sequence || priv->in_emoji_sequence) {
         int hexchars = 0;
@@ -305,32 +325,59 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
                     ibus_keyval_to_unicode (priv->compose_buffer[hexchars++])
             );
         }
-    } else if (priv->tentative_match) {
-        g_string_append_unichar(s, priv->tentative_match);
     } else if (priv->tentative_emoji && *priv->tentative_emoji) {
         IBusText *text = ibus_text_new_from_string (priv->tentative_emoji);
         int len = strlen (priv->tentative_emoji);
         ibus_text_append_attribute (text,
                 IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
         ibus_engine_update_preedit_text ((IBusEngine *)simple, text, len, TRUE);
+        g_string_free (s, TRUE);
         return;
-    } else {
-        int hexchars = 0;
-        while (priv->compose_buffer[hexchars] != 0) {
-            guint16 keysym = priv->compose_buffer[hexchars];
-            gunichar unichar = ibus_keysym_to_unicode (keysym, FALSE);
-            if (unichar > 0) {
-                g_string_append_unichar(s, unichar);
-            } else {
-                unichar = ibus_keyval_to_unicode (keysym);
-                g_string_append_unichar(s, unichar);
-            }
-            if (!unichar) {
-                g_warning (
+    } else if (priv->in_compose_sequence) {
+        if (priv->tentative_match->len > 0 && priv->compose_buffer[0] != 0) {
+            g_string_append (s, priv->tentative_match->str);
+        } else {
+            for (i = 0; priv->compose_buffer[i]; ++i) {
+                guint16 keysym = priv->compose_buffer[i];
+                gboolean show_keysym = TRUE;
+                gboolean need_space = FALSE;
+                gunichar ch;
+
+                if (keysym == IBUS_KEY_Multi_key) {
+                    /* We only show the Compose key visibly when it is the
+                     * only glyph in the preedit, or when it occurs in the
+                     * middle of the sequence. Sadly, the official character,
+                     * U+2384, COMPOSITION SYMBOL, is bit too distracting, so
+                     * we use U+00B7, MIDDLE DOT.
+                     */
+                    for (j = i + 1; priv->compose_buffer[j]; j++) {
+                        if (priv->compose_buffer[j] != IBUS_KEY_Multi_key) {
+                            show_keysym = FALSE;
+                            break;
+                        }
+                    }
+                    if (!show_keysym)
+                        continue;
+                    ch = ibus_keysym_to_unicode (keysym, FALSE, NULL);
+                    g_string_append_unichar (s, ch);
+                } else if (IS_DEAD_KEY (keysym)) {
+                    ch = ibus_keysym_to_unicode (keysym, FALSE, &need_space);
+                    if (ch) {
+                        if (need_space)
+                            g_string_append_c (s, ' ');
+                        g_string_append_unichar (s, ch);
+                    }
+                } else {
+                    ch = ibus_keyval_to_unicode (keysym);
+                    if (ch)
+                        g_string_append_unichar(s, ch);
+                }
+                if (!ch) {
+                    g_warning (
                         "Not found alternative character of compose key 0x%X",
-                        priv->compose_buffer[hexchars]);
+                        priv->compose_buffer[i]);
+                }
             }
-            ++hexchars;
         }
     }
 
@@ -380,7 +427,7 @@ check_hex (IBusEngineSimple *simple,
 
     CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
 
-    priv->tentative_match = 0;
+    g_string_set_size (priv->tentative_match, 0);
     priv->tentative_match_len = 0;
 
     str = g_string_new (NULL);
@@ -421,7 +468,8 @@ check_hex (IBusEngineSimple *simple,
     }
 
     if (g_unichar_validate (n)) {
-        priv->tentative_match = n;
+        g_string_set_size (priv->tentative_match, 0);
+        g_string_append_unichar (priv->tentative_match, n);
         priv->tentative_match_len = n_compose;
     }
 
@@ -546,21 +594,31 @@ no_sequence_matches (IBusEngineSimple *simple,
 
     CHECK_COMPOSE_BUFFER_LENGTH (n_compose);
 
+    priv->in_compose_sequence = FALSE;
+
     /* No compose sequences found, check first if we have a partial
      * match pending.
      */
-    if (priv->tentative_match) {
+    if (priv->tentative_match_len > 0) {
+        guint16 *compose_buffer;
         int len = priv->tentative_match_len;
         int i;
+        char *str;
 
-        ibus_engine_simple_commit_char (simple, priv->tentative_match);
-        priv->compose_buffer[0] = 0;
+        compose_buffer = alloca (sizeof (guint16) * COMPOSE_BUFFER_SIZE);
+        memcpy (compose_buffer,
+                priv->compose_buffer,
+                sizeof (guint16) * COMPOSE_BUFFER_SIZE);
+
+        str = g_strdup (priv->tentative_match->str);
+        ibus_engine_simple_commit_str (simple, str);
+        g_free (str);
         ibus_engine_simple_update_preedit_text (simple);
 
         for (i=0; i < n_compose - len - 1; i++) {
             ibus_engine_simple_process_key_event (
                     (IBusEngine *)simple,
-                    priv->compose_buffer[len + i],
+                    compose_buffer[len + i],
                     0, 0);
         }
 
@@ -571,6 +629,26 @@ no_sequence_matches (IBusEngineSimple *simple,
         priv->compose_buffer[0] = 0;
         ibus_engine_simple_update_preedit_text (simple);
     } else {
+        if (n_compose == 2 && IS_DEAD_KEY (priv->compose_buffer[0])) {
+            gboolean need_space = FALSE;
+            GString *s = g_string_new ("");
+            /* dead keys are never *really* dead */
+            ch = ibus_keysym_to_unicode (priv->compose_buffer[0],
+                                         FALSE, &need_space);
+            if (ch) {
+                if (need_space)
+                    g_string_append_c (s, ' ');
+                g_string_append_unichar (s, ch);
+            }
+            ch = ibus_keyval_to_unicode (priv->compose_buffer[1]);
+            if (ch != 0 && !g_unichar_iscntrl (ch))
+                g_string_append_unichar (s, ch);
+            ibus_engine_simple_commit_str (simple, s->str);
+            g_string_free (s, TRUE);
+            ibus_engine_simple_update_preedit_text (simple);
+            return TRUE;
+        }
+
         priv->compose_buffer[0] = 0;
         if (n_compose > 1) {
             /* Invalid sequence */
@@ -695,19 +773,46 @@ ibus_engine_simple_set_number_on_lookup_table (IBusEngineSimple *simple,
     ibus_engine_simple_update_preedit_text (simple);
 }
 
+
 static gboolean
 ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
                                             int               n_compose)
 {
     IBusEngineSimplePrivate *priv = simple->priv;
+    GSList *tmp_list;
     gboolean compose_finish = FALSE;
     gboolean compose_match = FALSE;
     GString *output = g_string_new ("");
-    gboolean does_hit = FALSE;
+    gboolean success = FALSE;
     gboolean is_32bit = FALSE;
-    GSList *tmp_list;
     gunichar *output_chars = NULL;
-    gunichar output_char;
+    gunichar output_char = '\0';
+
+    if (n_compose == 2) {
+        /* Special-case deadkey-deadkey sequences.
+         * We are not doing chained deadkeys, so we
+         * want to commit the first key, and contine
+         * preediting with second.
+         */
+        if (IS_DEAD_KEY (priv->compose_buffer[0]) &&
+            IS_DEAD_KEY (priv->compose_buffer[1])) {
+            gboolean need_space = FALSE;
+            gunichar ch = ibus_keysym_to_unicode (priv->compose_buffer[0],
+                                                  FALSE, &need_space);
+            guint16 next = priv->compose_buffer[1];
+            if (ch) {
+                if (need_space)
+                    g_string_append_c (output, ' ');
+                g_string_append_unichar (output, ch);
+                ibus_engine_simple_commit_str (simple, output->str);
+                g_string_set_size (output, 0);
+
+                priv->compose_buffer[0] = next;
+                priv->compose_buffer[1] = 0;
+                n_compose = 1;
+            }
+        }
+    }
 
     G_LOCK (global_tables);
     tmp_list = global_tables;
@@ -721,7 +826,7 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
             &compose_match,
             output,
             is_32bit)) {
-            does_hit = TRUE;
+            success = TRUE;
             break;
         }
         is_32bit = TRUE;
@@ -733,14 +838,15 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
             &compose_match,
             output,
             is_32bit)) {
-            does_hit = TRUE;
+            success = TRUE;
             break;
         }
         tmp_list = tmp_list->next;
     }
     G_UNLOCK (global_tables);
 
-    if (does_hit) {
+    if (success) {
+        priv->in_compose_sequence = TRUE;
         if (compose_finish) {
             if (compose_match) {
                 if (is_32bit) {
@@ -750,59 +856,89 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
                                                     g_utf8_get_char (output->str));
                 }
             }
+            ibus_engine_simple_update_preedit_text (simple);
+            g_string_free (output, TRUE);
+            return TRUE;
         } else if (compose_match) {
-            priv->tentative_match = g_utf8_get_char (output->str);
+            g_string_assign (priv->tentative_match, output->str);
             priv->tentative_match_len = n_compose;
+            ibus_engine_simple_update_preedit_text (simple);
+            g_string_free (output, TRUE);
+            return TRUE;
         }
-        ibus_engine_simple_update_preedit_text (simple);
-        g_string_free (output, TRUE);
-        return TRUE;
     }
     g_string_free (output, TRUE);
+    output = NULL;
 
     if (ibus_compose_table_compact_check (&ibus_compose_table_compact,
                                           priv->compose_buffer,
                                           n_compose,
                                           &compose_finish,
                                           &output_chars)) {
+        priv->in_compose_sequence = TRUE;
         if (compose_finish) {
-            ibus_engine_simple_commit_char (simple, *output_chars);
+            if (success) {
+                g_string_append_unichar (priv->tentative_match, *output_chars);
+                priv->tentative_match_len = n_compose;
+            } else {
+                ibus_engine_simple_commit_char (simple, *output_chars);
+                priv->compose_buffer[0] = 0;
+            }
             g_free (output_chars);
-            priv->compose_buffer[0] = 0;
+            ibus_engine_simple_update_preedit_text (simple);
+            return TRUE;
         }
-        ibus_engine_simple_update_preedit_text (simple);
-        return TRUE;
+        success = TRUE;
     }
+    g_free (output_chars);
+    output_chars = NULL;
     if (ibus_compose_table_compact_check (&ibus_compose_table_compact_32bit,
                                           priv->compose_buffer,
                                           n_compose,
                                           &compose_finish,
                                           &output_chars)) {
+        priv->in_compose_sequence = TRUE;
         if (compose_finish) {
             GError *error = NULL;
             char *str = g_ucs4_to_utf8 (output_chars, -1, NULL, NULL, &error);
-            if (str) {
-                ibus_engine_simple_commit_str (simple, str);
-                g_free (str);
-            } else {
+            if (!str) {
                 g_warning ("Failed to output multiple characters: %s",
                            error->message);
                 g_error_free (error);
+            } else if (success) {
+                g_string_append (priv->tentative_match, str);
+                priv->tentative_match_len = n_compose;
+            } else {
+                ibus_engine_simple_commit_str (simple, str);
+                priv->compose_buffer[0] = 0;
             }
-            priv->compose_buffer[0] = 0;
+            g_free (str);
+            g_free (output_chars);
+            ibus_engine_simple_update_preedit_text (simple);
+            return TRUE;
         }
-        g_free (output_chars);
-        ibus_engine_simple_update_preedit_text (simple);
-        return TRUE;
+        success = TRUE;
     }
-    g_assert (!output_chars);
+    g_free (output_chars);
+    output_chars = NULL;
     if (ibus_check_algorithmically (priv->compose_buffer,
                                     n_compose,
                                     &output_char)) {
+        priv->in_compose_sequence = TRUE;
         if (output_char) {
-            ibus_engine_simple_commit_char (simple, output_char);
-            priv->compose_buffer[0] = 0;
+            if (success) {
+                g_string_append_unichar (priv->tentative_match, output_char);
+                priv->tentative_match_len = n_compose;
+            } else  {
+                ibus_engine_simple_commit_char (simple, output_char);
+                priv->compose_buffer[0] = 0;
+            }
+            ibus_engine_simple_update_preedit_text (simple);
+            return TRUE;
         }
+        success = TRUE;
+    }
+    if (success) {
         ibus_engine_simple_update_preedit_text (simple);
         return TRUE;
     }
@@ -810,6 +946,7 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
     return FALSE;
 }
 
+
 static gboolean
 ibus_engine_simple_process_key_event (IBusEngine *engine,
                                       guint       keyval,
@@ -841,16 +978,17 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         if (priv->in_hex_sequence &&
             (keyval == IBUS_KEY_Control_L || keyval == IBUS_KEY_Control_R ||
              keyval == IBUS_KEY_Shift_L || keyval == IBUS_KEY_Shift_R)) {
-            if (priv->tentative_match &&
-                g_unichar_validate (priv->tentative_match)) {
-                ibus_engine_simple_commit_char (simple, priv->tentative_match);
+            if (priv->tentative_match->len > 0) {
+                char *str = g_strdup (priv->tentative_match->str);
+                ibus_engine_simple_commit_str (simple, str);
+                g_free (str);
                 ibus_engine_simple_update_preedit_text (simple);
             } else if (n_compose == 0) {
                 priv->modifiers_dropped = TRUE;
             } else {
                 /* invalid hex sequence */
                 /* FIXME beep_window (event->window); */
-                priv->tentative_match = 0;
+                g_string_set_size (priv->tentative_match, 0);
                 g_clear_pointer (&priv->tentative_emoji, g_free);
                 priv->in_hex_sequence = FALSE;
                 priv->in_emoji_sequence = FALSE;
@@ -873,7 +1011,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
             } else {
                 /* invalid hex sequence */
                 /* FIXME beep_window (event->window); */
-                priv->tentative_match = 0;
+                g_string_set_size (priv->tentative_match, 0);
                 g_clear_pointer (&priv->tentative_emoji, g_free);
                 priv->in_hex_sequence = FALSE;
                 priv->in_emoji_sequence = FALSE;
@@ -921,7 +1059,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         else if (is_hex_end) {
             /* invalid hex sequence */
             // beep_window (event->window);
-            priv->tentative_match = 0;
+            g_string_set_size (priv->tentative_match, 0);
             g_clear_pointer (&priv->tentative_emoji, g_free);
             priv->in_hex_sequence = FALSE;
             priv->in_emoji_sequence = FALSE;
@@ -999,7 +1137,8 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         if (n_compose > 0) {
             n_compose--;
             priv->compose_buffer[n_compose] = 0;
-            priv->tentative_match = 0;
+            g_string_set_size (priv->tentative_match, 0);
+            priv->tentative_match_len = 0;
             ibus_engine_simple_check_all_compose_table (simple, n_compose);
             return TRUE;
         }
@@ -1007,16 +1146,17 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
     /* Check for hex sequence restart */
     if (priv->in_hex_sequence && have_hex_mods && is_hex_start) {
-        if (priv->tentative_match &&
-            g_unichar_validate (priv->tentative_match)) {
-            ibus_engine_simple_commit_char (simple, priv->tentative_match);
+        if (priv->tentative_match->len > 0 ) {
+            char *str = g_strdup (priv->tentative_match->str);
+            ibus_engine_simple_commit_str (simple, str);
+            g_free (str);
             ibus_engine_simple_update_preedit_text (simple);
         }
         else {
             /* invalid hex sequence */
             if (n_compose > 0) {
                 // FIXME beep_window (event->window);
-                priv->tentative_match = 0;
+                g_string_set_size (priv->tentative_match, 0);
                 priv->in_hex_sequence = FALSE;
                 priv->compose_buffer[0] = 0;
             }
@@ -1044,7 +1184,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         priv->in_hex_sequence = TRUE;
         priv->in_emoji_sequence = FALSE;
         priv->modifiers_dropped = FALSE;
-        priv->tentative_match = 0;
+        g_string_set_size (priv->tentative_match, 0);
         g_clear_pointer (&priv->tentative_emoji, g_free);
 
         // g_debug ("Start HEX MODE");
@@ -1058,7 +1198,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         priv->in_hex_sequence = FALSE;
         priv->in_emoji_sequence = TRUE;
         priv->modifiers_dropped = FALSE;
-        priv->tentative_match = 0;
+        g_string_set_size (priv->tentative_match, 0);
         g_clear_pointer (&priv->tentative_emoji, g_free);
 
         // g_debug ("Start HEX MODE");
@@ -1068,7 +1208,6 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         return TRUE;
     }
 
-    /* Then, check for compose sequences */
     if (priv->in_hex_sequence) {
         if (hex_keyval) {
             SET_COMPOSE_BUFFER_ELEMENT_NEXT (priv->compose_buffer,
@@ -1133,17 +1272,17 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
         if (have_hex_mods) {
             /* space or return ends the sequence, and we eat the key */
             if (n_compose > 0 && is_hex_end) {
-                if (priv->tentative_match &&
-                    g_unichar_validate (priv->tentative_match)) {
-                    ibus_engine_simple_commit_char (simple,
-                            priv->tentative_match);
-                    priv->compose_buffer[0] = 0;
+                if (priv->tentative_match->len > 0) {
+                    char *str = g_strdup (priv->tentative_match->str);
+                    ibus_engine_simple_commit_str (simple, str);
+                    g_free (str);
                     ibus_engine_simple_update_preedit_text (simple);
+                    return TRUE;
                 } else {
                     // FIXME
                     /* invalid hex sequence */
                     // beep_window (event->window);
-                    priv->tentative_match = 0;
+                    g_string_set_size (priv->tentative_match, 0);
                     priv->in_hex_sequence = FALSE;
                     priv->compose_buffer[0] = 0;
                 }
@@ -1234,7 +1373,7 @@ ibus_engine_simple_process_key_event (IBusEngine *engine,
 
             return TRUE;
         }
-    } else {
+    } else { /* Then, check for compose sequences */
         if (ibus_engine_simple_check_all_compose_table (simple, n_compose))
             return TRUE;
     }
diff --git a/src/ibusenginesimpleprivate.h b/src/ibusenginesimpleprivate.h
index 5479e553e..ad93d2d29 100644
--- a/src/ibusenginesimpleprivate.h
+++ b/src/ibusenginesimpleprivate.h
@@ -26,6 +26,12 @@
 
 G_BEGIN_DECLS
 
+/* Checks if a keysym is a dead key. Dead key keysym values are defined in
+ * ibuskeysyms.h and the first is GDK_KEY_dead_grave.
+ */
+#define IS_DEAD_KEY(k) \
+      ((k) >= IBUS_KEY_dead_grave && (k) <= IBUS_KEY_dead_greek)
+
 extern const IBusComposeTableCompactEx ibus_compose_table_compact;
 extern const IBusComposeTableCompactEx ibus_compose_table_compact_32bit;
 
@@ -60,7 +66,8 @@ gboolean ibus_compose_table_compact_check
                                      gboolean                   *compose_finish,
                                      gunichar                  **output_chars);
 gunichar ibus_keysym_to_unicode     (guint16                     keysym,
-                                     gboolean                    combining);
+                                     gboolean                    combining,
+                                     gboolean                   *need_space);
 
 G_END_DECLS
 

From 17ae266cade41e795534532acefc85716bb309ef Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 26 Jul 2021 22:53:34 +0900
Subject: [PATCH 737/816] Code reviews

- Use fstat() and fchmod() but not stat() and chmod() to
  fix race conditions
- Avoid to use after free
- Fix dereference of IBusComposeTable->priv
- Fix to divide by zero
---
 src/ibusbus.c                            | 23 ++++++++++++++++++-----
 src/ibuscomposetable.c                   |  8 ++++++--
 src/tests/ibus-desktop-testing-runner.in |  6 +++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/ibusbus.c b/src/ibusbus.c
index e9b0bcbb4..47400cb80 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -21,13 +21,14 @@
  * USA
  */
 
-#include "ibusbus.h"
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
+#include "ibusbus.h"
 #include "ibusmarshalers.h"
 #include "ibusinternal.h"
 #include "ibusshare.h"
@@ -537,7 +538,8 @@ static void
 ibus_bus_init (IBusBus *bus)
 {
     struct stat buf;
-    gchar *path;
+    char *path;
+    int fd;
 
     bus->priv = IBUS_BUS_GET_PRIVATE (bus);
 
@@ -562,20 +564,31 @@ ibus_bus_init (IBusBus *bus)
         return;
     }
 
-    if (stat (path, &buf) == 0) {
+    errno = 0;
+    if ((fd = open (path, O_RDONLY | O_DIRECTORY, S_IRWXU)) == -1) {
+        g_warning ("open %s failed: %s", path, g_strerror (errno));
+        g_free (path);
+        return;
+    }
+    /* TOCTOU: Use fstat() and fchmod() but not stat() and chmod().
+     * because it can cause a time-of-check, time-of-use race condition.
+     */
+    if (fstat (fd, &buf) == 0) {
         if (buf.st_uid != getuid ()) {
             g_warning ("The owner of %s is not %s!",
                        path, ibus_get_user_name ());
+            close (fd);
             g_free (path);
             return;
         }
         if (buf.st_mode != (S_IFDIR | S_IRWXU)) {
             errno = 0;
-            if (g_chmod (path, 0700))
-                g_warning ("chmod failed: %s", errno ? g_strerror (errno) : "");
+            if (fchmod (fd, S_IRWXU))
+                g_warning ("chmod failed: %s", g_strerror (errno));
         }
     }
 
+    close (fd);
     g_free (path);
 }
 
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 2ad215514..a0b0befc1 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -406,7 +406,7 @@ get_en_compose_file (void)
         path = g_build_filename (X11_DATADIR, *sys_lang, "Compose", NULL);
         if (g_file_test (path, G_FILE_TEST_EXISTS))
             break;
-        g_free (path);
+        g_clear_pointer (&path, g_free);
     }
     return path;
 }
@@ -975,7 +975,10 @@ ibus_compose_table_deserialize (const char *contents,
         goto out_load_cache;
     }
     if (data_length) {
-        retval->priv = g_new0 (IBusComposeTablePrivate, 1);
+        if (!(retval->priv = g_new0 (IBusComposeTablePrivate, 1))) {
+            g_warning ("Failed g_new");
+            goto out_load_cache;
+        }
         retval->priv->data_first = g_new (guint16, data_length);
         memcpy (retval->priv->data_first,
                 data_32bit_first, data_length * sizeof (guint16));
@@ -1565,6 +1568,7 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx
             row_stride = i + 2;
 
             if (seq_index[i + 1] - seq_index[i] > 0) {
+                g_assert (row_stride);
                 seq = bsearch (compose_buffer + 1,
                                table->data + seq_index[i],
                                (seq_index[i + 1] - seq_index[i]) / row_stride,
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 0ef72c038..c10167031 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -220,7 +220,7 @@ init_gnome()
     # G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG=GLib-GIO-DEBUG would append
     # debug messages to gsettings output and could not get the result correctly.
     backup_G_MESSAGES_DEBUG="$G_MESSAGES_DEBUG"
-    export -n G_MESSAGES_DEBUG=''
+    unset G_MESSAGES_DEBUG
     # Disable Tour dialog to get focus
     V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version`
     if [ x"$V" = x"''" ] ; then
@@ -231,8 +231,8 @@ init_gnome()
     NO_SYS_DIR=/usr/share/gnome-shell/extensions/no-overview@fthx
     NO_USER_DIR=$HOME/.local/share/gnome-shell/extensions/no-overview@fthx
     if [ ! -d $NO_SYS_DIR ] && [ ! -d $NO_USER_DIR ] ; then
-        mkdir -p `dirname $NO_USER_DIR`
-        cp -R no-overview@fthx `dirname $NO_USER_DIR`
+        mkdir -p "`dirname $NO_USER_DIR`"
+        cp -R "no-overview@fthx" "`dirname $NO_USER_DIR`"
     fi
     V=`gsettings get org.gnome.shell disable-user-extensions`
     if [ x"$V" = x"true" ] ; then

From a823161768c8f6916dbdebe73842a9fc04521369 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 9 Aug 2021 12:36:40 +0900
Subject: [PATCH 738/816] client/gtk2/ibusimcontext: Enable sync process in
 GTK4

gtk_im_context_filter_key() does not forward control keys likes
BackSpace, Return and change the process mode to the synchronization.

BUG=https://gitlab.gnome.org/GNOME/gtk/-/issues/3465
---
 client/gtk2/ibusimcontext.c | 65 +++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index e7ce53638..da9a402ff 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -110,13 +110,15 @@ static guint    _signal_preedit_end_id = 0;
 static guint    _signal_delete_surrounding_id = 0;
 static guint    _signal_retrieve_surrounding_id = 0;
 
-#if !GTK_CHECK_VERSION (3, 98, 4)
+#if GTK_CHECK_VERSION (3, 98, 4)
+static gboolean _use_sync_mode = TRUE;
+#else
 static const gchar *_no_snooper_apps = NO_SNOOPER_APPS;
 static gboolean _use_key_snooper = ENABLE_SNOOPER;
 static guint    _key_snooper_id = 0;
-#endif
 
 static gboolean _use_sync_mode = FALSE;
+#endif
 
 static const gchar *_discard_password_apps  = "";
 static gboolean _use_discard_password = FALSE;
@@ -767,11 +769,13 @@ ibus_im_context_class_init (IBusIMContextClass *class)
         g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (class));
     g_assert (_signal_retrieve_surrounding_id != 0);
 
-#if !GTK_CHECK_VERSION (3, 98, 4)
+#if GTK_CHECK_VERSION (3, 98, 4)
+    _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", TRUE);
+#else
     _use_key_snooper = !_get_boolean_env ("IBUS_DISABLE_SNOOPER",
                                           !(ENABLE_SNOOPER));
-#endif
     _use_sync_mode = _get_boolean_env ("IBUS_ENABLE_SYNC_MODE", FALSE);
+#endif
     _use_discard_password = _get_boolean_env ("IBUS_DISCARD_PASSWORD", FALSE);
 
 #define CHECK_APP_IN_CSV_ENV_VARIABLES(retval,                          \
@@ -1434,6 +1438,9 @@ static gboolean
 _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 {
     GdkRectangle area;
+#if GTK_CHECK_VERSION (3, 98, 4)
+    GtkWidget *root;
+#endif
 
     if(ibusimcontext->client_window == NULL ||
        ibusimcontext->ibuscontext == NULL) {
@@ -1442,8 +1449,27 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 
     area = ibusimcontext->cursor_area;
 
-#if !GTK_CHECK_VERSION (3, 98, 4)
 #ifdef GDK_WINDOWING_WAYLAND
+#if GTK_CHECK_VERSION (3, 98, 4)
+    root = GTK_WIDGET (gtk_widget_get_root (ibusimcontext->client_window));
+     /* FIXME: GTK_STYLE_CLASS_TITLEBAR is available in GTK3 but not GTK4.
+      * gtk_css_boxes_get_content_rect() is available in GTK4 but it's an
+      * internal API and calculate the window edge 32 in GTK3.
+      */
+    area.y += 32;
+    area.width = 50; /* FIXME: Why 50 meets the cursor position? */
+    area.height = gtk_widget_get_height (root);
+    area.height += 32;
+    if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) {
+        ibus_input_context_set_cursor_location_relative (
+            ibusimcontext->ibuscontext,
+            area.x,
+            area.y,
+            area.width,
+            area.height);
+        return FALSE;
+    }
+#else
     if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) {
         gdouble px, py;
         GdkWindow *parent;
@@ -1469,23 +1495,20 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 #endif
 #endif
 
-    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
 #if GTK_CHECK_VERSION (3, 98, 4)
-        area.x = 0;
-        area.y += gtk_widget_get_height (ibusimcontext->client_window);
 #elif GTK_CHECK_VERSION (2, 91, 0)
-        area.x = 0;
-        area.y += gdk_window_get_height (ibusimcontext->client_window);
+    area.y += gdk_window_get_height (ibusimcontext->client_window);
 #else
+    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
         gint w, h;
         gdk_drawable_get_size (ibusimcontext->client_window, &w, &h);
         area.y += h;
         area.x = 0;
-#endif
     }
+#endif
 
 #if GTK_CHECK_VERSION (3, 98, 4)
-#ifdef GDK_WINDOWING_X11
+#if defined(GDK_WINDOWING_X11)
     GdkDisplay *display = gtk_widget_get_display (ibusimcontext->client_window);
     if (GDK_IS_X11_DISPLAY (display)) {
         Display *xdisplay = gdk_x11_display_get_xdisplay (display);
@@ -1505,21 +1528,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
         XGetWindowAttributes (xdisplay, window, &xwa);
         area.x = x - xwa.x + area.x;
         area.y = y - xwa.y + area.y;
-        area.width = xwa.width;
+        area.width = 50; /* FIXME: Why 50 meets the cursor position? */
         area.height = xwa.height;
     }
 #endif
-#elif GTK_CHECK_VERSION (3, 93, 0)
-    {
-        GtkNative *native = gtk_widget_get_native (
-                ibusimcontext->client_window);
-        GdkSurface *surface = gtk_native_get_surface (native);
-        int root_x = 0;
-        int root_y = 0;
-        gdk_surface_get_position (surface, &root_x, &root_y);
-        area.x += root_x;
-        area.y += root_y;
-    }
 #else
     gdk_window_get_root_coords (ibusimcontext->client_window,
                                 area.x, area.y,
@@ -1541,12 +1553,17 @@ ibus_im_context_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
 
     IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
 
+#if !GTK_CHECK_VERSION (3, 93, 0)
+    /* The area is the relative coordinates and this has to get the absolute
+     * ones in _set_cursor_location_internal() since GTK 4.0.
+     */
     if (ibusimcontext->cursor_area.x == area->x &&
         ibusimcontext->cursor_area.y == area->y &&
         ibusimcontext->cursor_area.width == area->width &&
         ibusimcontext->cursor_area.height == area->height) {
         return;
     }
+#endif
     ibusimcontext->cursor_area = *area;
     _set_cursor_location_internal (ibusimcontext);
     gtk_im_context_set_cursor_location (ibusimcontext->slave, area);

From 71ca4a985966aa5a9dfbfb5c671fee841f8ee730 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed, 18 Aug 2021 11:54:31 +0900
Subject: [PATCH 739/816] client/x11: Add support for XFixes
 ClientDisconnectMode

The Xserver itself is capable of terminating itself once all X11 clients
are gone, yet in a typical full session, there are a number of X11
clients such as ibus-x11 running continuously.

Those always-running clients will prevent the Xserver from terminating,
because the actual number of X11 clients will never drop to 0.

Use XFixes ClientDisconnectMode to inform the X11 server that it can
terminate even if ibus-x11 is still running.

That will allow Xwayland from terminating automatically when regular
clients have quit.

On plain Xorg servers, the lifetime of the session is usually tied to
the session manager or window manager, and this change will have no
effect.

BUG=https://github.com/ibus/ibus/pull/2314
---
 client/x11/Makefile.am |  2 ++
 client/x11/main.c      | 10 ++++++++++
 configure.ac           |  8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 5bd04d336..12de6ea8c 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -49,11 +49,13 @@ ibus_x11_LDADD = \
 	$(libibus) \
 	@X11_LIBS@ \
 	$(GTK_LIBS) \
+	$(XFIXES_LIBS) \
 	$(NULL)
 
 ibus_x11_CFLAGS = \
 	@X11_CFLAGS@ \
 	$(GTK_CFLAGS) \
+	$(XFIXES_CFLAGS) \
 	@DBUS_CFLAGS@ \
 	-I$(top_srcdir)/util/IMdkit \
 	-I$(top_srcdir)/src \
diff --git a/client/x11/main.c b/client/x11/main.c
index ffd776fd6..fe30c1d6c 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -24,10 +24,15 @@
  */
 #define _GNU_SOURCE
 
+#include "config.h"
+
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
+#ifdef HAVE_XFIXES
+#include <X11/extensions/Xfixes.h>
+#endif
 #include <XimProto.h>
 #include <IMdkit.h>
 #include <Xi18n.h>
@@ -1174,6 +1179,11 @@ main (int argc, char **argv)
     XSetErrorHandler (_xerror_handler);
     XSetIOErrorHandler (_xerror_io_handler);
 
+#ifdef HAVE_XFIXES
+    XFixesSetClientDisconnectMode(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                  XFixesClientDisconnectFlagTerminate);
+#endif
+
     while (1) {
         static struct option long_options [] = {
             { "debug", 1, 0, 0},
diff --git a/configure.ac b/configure.ac
index 4e2f8e6e1..6df26afbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,6 +618,13 @@ PKG_CHECK_MODULES(XTEST,
 )
 AM_CONDITIONAL([ENABLE_XTEST], [test x"$enable_xtest" = x"yes"])
 
+PKG_CHECK_MODULES(XFIXES,
+    [x11 xfixes >= 6],
+    [AC_DEFINE([HAVE_XFIXES], [1], [Define to enable XFixes])
+     have_xfixes=yes],
+    [have_xfixes="no (libXfixes version is lower than 6)"]
+)
+
 # --enable-install-tests
 AC_ARG_ENABLE(install-tests,
     AS_HELP_STRING([--enable-install-tests],
@@ -843,6 +850,7 @@ Build options:
   Enable Unicode dict           $enable_unicode_dict
   UCD directory                 $UCD_DIR
   Socket directory              "$IBUS_SOCKET_DIR"
+  XFixes client disconnect      $have_xfixes
   Run test cases                $enable_tests
   Install tests                 $enable_install_tests
 ])

From c0170aeac378dc966406c9a8a0e294c09b34049a Mon Sep 17 00:00:00 2001
From: Emilio Herrera <ehespinosa57@gmail.com>
Date: Wed, 18 Aug 2021 13:01:21 +0900
Subject: [PATCH 740/816] po: Update translation (Spanish)

Update po/es.po at 97.4%
https://translate.fedoraproject.org/projects/ibus/ibus/es/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/es.po | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/po/es.po b/po/es.po
index 47f9de101..8bffc4e60 100644
--- a/po/es.po
+++ b/po/es.po
@@ -23,14 +23,14 @@
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Máximo Castañeda Riloba <mcrcctm@gmail.com>, 2019. #zanata
-# Emilio Herrera <ehespinosa57@gmail.com>, 2020.
+# Emilio Herrera <ehespinosa57@gmail.com>, 2020, 2021.
 # Adolfo Jayme Barrientos <fitoschido@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-10-22 17:25+0000\n"
+"PO-Revision-Date: 2021-02-22 17:40+0000\n"
 "Last-Translator: Emilio Herrera <ehespinosa57@gmail.com>\n"
 "Language-Team: Spanish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/es/>\n"
@@ -39,7 +39,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.1\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -332,6 +332,10 @@ msgid ""
 "language if the value is true and choose them from the desktop locale if the "
 "value is false."
 msgstr ""
+"Algunos puntos del código tiene diferentes glifos y Pango determina los "
+"glifos desde el atributo idioma. Pango elige los glifos desde el idioma del "
+"la máquina IBus si el valor es cierto y los eliges desde el valor regional "
+"del sobremesa si el valor es falso."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
@@ -879,6 +883,8 @@ msgid ""
 "Choose glyphs with the input method's language on the candidate window for "
 "the duplicated code points"
 msgstr ""
+"Elige glifos con el idioma del método de entrada en la ventana candidato "
+"para los puntos de código duplicados"
 
 #: setup/setup.ui:1327
 msgid "<b>Fonts</b>"
@@ -2368,7 +2374,7 @@ msgstr "Numerales rumi"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
 msgid "Yezidi"
-msgstr ""
+msgstr "Yezidi"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2389,14 +2395,14 @@ msgstr "Sogdiano"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:865
 msgid "Chorasmian"
-msgstr ""
+msgstr "Chorasmian"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:869
 msgid "Elymaic"
-msgstr ""
+msgstr "Elymaic"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:

From 1239c930090ebbe8e4622ea4f3df5143b9a623ce Mon Sep 17 00:00:00 2001
From: Abu Huraira <abuhuraira@tutamail.com>
Date: Wed, 18 Aug 2021 13:02:17 +0900
Subject: [PATCH 741/816] po: Update translation (Bengali)

Update po/bn.po at 71.0%
https://translate.fedoraproject.org/projects/ibus/ibus/bn/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/bn.po | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/po/bn.po b/po/bn.po
index d1fc97bfd..698c25068 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -13,13 +13,14 @@
 # runab <runab@redhat.com>, 2009, 2010
 # runab <runab@redhat.com>, 2009-2010
 # Tawsif Hossain Shafi <tenshou170@outlook.com>, 2020.
+# Abu Huraira <abuhuraira@tutamail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2015-07-13 19:48+0900\n"
-"PO-Revision-Date: 2020-10-22 17:25+0000\n"
-"Last-Translator: Tawsif Hossain Shafi <tenshou170@outlook.com>\n"
+"PO-Revision-Date: 2021-03-19 18:01+0000\n"
+"Last-Translator: Abu Huraira <abuhuraira@tutamail.com>\n"
 "Language-Team: Bengali <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/bn/>\n"
 "Language: bn\n"
@@ -27,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.3.1\n"
+"X-Generator: Weblate 4.5.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -355,20 +356,24 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:13
 msgid "Use xmodmap"
-msgstr ""
+msgstr "xmodmap ব্যবহার করুন"
 
 #: ../data/ibus.schemas.in.h:14
+#, fuzzy
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"যদি .xmodmap অথবা .Xmodmap বিদ্যমান থাকে তাহলে xmodmap রান করুন, যখন আইবাস "
+"ইনজিনসমূহ সুইচ করা হয়।"
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
 msgstr "ট্রিগারের শর্টকাট-কি"
 
 #: ../data/ibus.schemas.in.h:17
+#, fuzzy
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse এর জন্য শর্টকাট কী সেট করুন"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
@@ -414,6 +419,8 @@ msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
+"প্রপার্টি প্যানেলের আচরণ। 0 = দেখাবেন না, 1 = স্বয়ংক্রিয় লুকান, 2 = সবসময় "
+"দেখান"
 
 #: ../data/ibus.schemas.in.h:28
 msgid "Language panel position"
@@ -428,8 +435,9 @@ msgstr ""
 "= নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
 
 #: ../data/ibus.schemas.in.h:30
+#, fuzzy
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr ""
+msgstr "প্যানেল যখন সবসময় দৃশ্যমান, সেক্ষেত্রে ইনপুট কার্সরকে অনুসরণ করুন"
 
 #: ../data/ibus.schemas.in.h:31
 msgid ""

From 3ceecf38cf6e2e6b0cd2972c58b0140708031f84 Mon Sep 17 00:00:00 2001
From: Jan Kuparinen <copper_fin@hotmail.com>
Date: Wed, 18 Aug 2021 13:02:47 +0900
Subject: [PATCH 742/816] po: Update translation (Finnish)

Update po/fi.po at 20.3%
https://translate.fedoraproject.org/projects/ibus/ibus/fi/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/fi.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 50ccf8f51..8b29bbe06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-02-12 12:40+0000\n"
-"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
+"PO-Revision-Date: 2021-04-30 13:02+0000\n"
+"Last-Translator: Jan Kuparinen <copper_fin@hotmail.com>\n"
 "Language-Team: Finnish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fi/>\n"
 "Language: fi\n"
@@ -22,25 +22,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.6\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
-msgstr ""
+msgstr "Esikuormita koneet"
 
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr ""
+msgstr "Esikuormita koneet kun ibus käynnistyy"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
-msgstr ""
+msgstr "Koneiden järjestys"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr ""
+msgstr "Syöttömetodilistaan tallennettu koneiden järjestys"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
@@ -658,7 +658,7 @@ msgstr ""
 
 #: setup/setup.ui:682
 msgid "_Remove"
-msgstr "_Poista"
+msgstr "P_oista"
 
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"
@@ -1583,14 +1583,14 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:461
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3172,7 +3172,7 @@ msgstr "Kuvaus: %s"
 
 #: ui/gtk3/emojier.vala:1592
 msgid "None"
-msgstr "Ei mitään"
+msgstr "Ei yhtään"
 
 #: ui/gtk3/emojier.vala:1616
 #, c-format

From 6e1588d041326df1d38f87df583b5a0d4579553b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quentin=20PAG=C3=88S?= <quentinantonin@free.fr>
Date: Wed, 18 Aug 2021 13:04:05 +0900
Subject: [PATCH 743/816] po: Update translation (Occitan)

Update po/oc.po at 52.6%
https://translate.fedoraproject.org/projects/ibus/ibus/oc/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/LINGUAS |    1 +
 po/oc.po   | 3288 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3289 insertions(+)
 create mode 100644 po/oc.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 1d01b2b4c..0df9484f5 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -30,6 +30,7 @@ mn
 mr
 nb
 nl
+oc
 or
 pa
 pl
diff --git a/po/oc.po b/po/oc.po
new file mode 100644
index 000000000..56e6edac7
--- /dev/null
+++ b/po/oc.po
@@ -0,0 +1,3288 @@
+# Occitan translation of ibus.
+# Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# This file is distributed under the same license as the ibus package.
+#
+# Quentin PAGÈS <quentinantonin@free.fr>, 2021.
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus 1.5.23\n"
+"Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
+"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"PO-Revision-Date: 2021-06-08 19:04+0000\n"
+"Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n"
+"Language-Team: Occitan <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/oc/>\n"
+"Language: oc\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.6.2\n"
+
+#. Translators: Here “Preload” is a verb
+#: data/dconf/org.freedesktop.ibus.gschema.xml:11
+msgid "Preload engines"
+msgstr "Precargar los motors"
+
+#. Translators: Tooltip for the button “Preload Engines”
+#: data/dconf/org.freedesktop.ibus.gschema.xml:13
+msgid "Preload engines during ibus starts up"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:17
+msgid "Engines order"
+msgstr "Òrdre dels motors"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:18
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:22
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:23
+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/dconf/org.freedesktop.ibus.gschema.xml:27
+msgid "Saved version number"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:28
+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/dconf/org.freedesktop.ibus.gschema.xml:32
+msgid "Latin layouts which have no ASCII"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+msgid "US layout is appended to the Latin layouts. variant can be omitted."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+msgid "Use xmodmap"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+msgid ""
+"Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+msgid "Use system keyboard layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+msgid "Use system keyboard (XKB) layout"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+msgid "Embed Preedit Text"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+msgid "Embed Preedit Text in Application Window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+msgid "Use global input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+msgid "Share the same input method among all applications"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+msgid "Enable input method by default"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+msgid "Enable input method by default when the application gets input focus"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+msgid "Trigger shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:71
+#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+msgid "The shortcut keys for turning input method on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+msgid "Enable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+msgid "The shortcut keys for turning input method on"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+msgid "Disable shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+msgid "The shortcut keys for turning input method off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:90
+#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+msgid "Next engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:91
+#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:100
+#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+msgid "Prev engine shortcut keys"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:101
+#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+msgid "The shortcut keys for switching to the previous input method"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+msgid "Auto hide"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+msgid ""
+"The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:117
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+msgid "Language panel position"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+msgid "Follow the input cursor in case the panel is always shown"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+msgid ""
+"If true, the panel follows the input cursor in case the panel is always "
+"shown. If false, the panel is shown at a fixed location."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+msgid "The milliseconds to show property panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+msgid ""
+"The milliseconds to show property panel after focus-in or properties are "
+"changed."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+msgid "Orientation of lookup table"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
+#: setup/setup.ui:475
+msgid "Show icon on system tray"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+msgid "Show input method name"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+msgid "Show input method name on language bar"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+msgid "RGBA value of XKB icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+msgid ""
+"XKB icon shows the layout string and the string is rendered with the RGBA "
+"value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
+"form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and "
+"blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,"
+"g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or "
+"percentage values in the range 0% to 100%, and 'a' is a floating point value "
+"in the range 0 to 1 of the alpha."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+msgid "The milliseconds to show the panel icon for a property"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+msgid ""
+"The milliseconds to show the panel icon from the engine icon to a property "
+"icon whenever engines are switched if the property is specified by the value "
+"of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the "
+"property icon is shown immediately."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+msgid "Use custom font"
+msgstr "Utilizar una poliça personalizada"
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:165
+#: data/dconf/org.freedesktop.ibus.gschema.xml:192
+msgid "Custom font"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+msgid "Choose glyphs with input method's language on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+msgid ""
+"Some code points have the different glyphs and Pango determines the glyphs "
+"from the language attribute. Pango chooses glyphs from the IBus engine's "
+"language if the value is true and choose them from the desktop locale if the "
+"value is false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:182
+msgid "Unicode shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+msgid "The shortcut keys for turning Unicode typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:187
+msgid "Emoji shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+msgid "The shortcut keys for turning emoji typing on or off"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+msgid "Custom font name for emoji characters on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:197
+msgid "Default language for emoji dictionary"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+msgid ""
+"Choose a default language of emoji dictionaries on the emoji dialog. The "
+"value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:202
+msgid "favorite emoji list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+msgid ""
+"You can show the favorite emojis on emoji list if this list has any "
+"characters."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:207
+msgid "favorite emoji annotation list on emoji dialog"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+msgid "You can assign an annotation for a favorite emoji in this list."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:212
+msgid "Whether emoji annotations can be match partially or not"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+msgid ""
+"Whether emoji annotations can be matched with a partial string instead of "
+"the exact match or not."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:217
+msgid "Match emoji annotations with the specified length"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+msgid ""
+"Match emoji annotations partially with more than the specified number of "
+"characters instead of the exact match."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:222
+msgid "Choose a condition to match emoji annotations partially"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+msgid ""
+"Choose one of the following conditions to match emoji annotations partially: "
+"0 == Prefix match, 1 == Suffix match, 2 == Containing match"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:227
+msgid "Load the emoji data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:228
+msgid ""
+"Load the emoji data at the time of startup if true. About 10MB memory is "
+"needed to load the data. Load the emoji data when open the emoji dialog at "
+"the beginning if false."
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:232
+msgid "Load the Unicode data at the time of startup"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:233
+msgid ""
+"Load the Unicode data at the time of startup if true. About 15MB memory is "
+"needed to load the data. Load the Unicode data when open the emoji dialog at "
+"the beginning if false. The Unicode data is always loaded after the emoji "
+"data is loaded even if true."
+msgstr ""
+
+#: ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr ""
+
+#: ibus/lang.py:41 src/ibusutil.c:209
+msgid "Other"
+msgstr "Autre"
+
+#: setup/emojilang.py:67
+msgid "Select a language"
+msgstr "Seleccionar una lenga"
+
+#: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
+#: setup/main.py:560
+msgid "_Cancel"
+msgstr "A_nullar"
+
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+msgid "_OK"
+msgstr "_D'acòrdi"
+
+#: setup/emojilang.py:235 setup/enginedialog.py:205
+msgid "More…"
+msgstr "Mai…"
+
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+msgid "About"
+msgstr "A prepaus"
+
+#: setup/engineabout.py:40 setup/setup.ui:1391
+msgid "_Close"
+msgstr "_Tampar"
+
+#: setup/engineabout.py:72
+#, python-format
+msgid "Language: %s\n"
+msgstr "Lenga : %s\n"
+
+#: setup/engineabout.py:75
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "Agençament del clavièr : %s\n"
+
+#: setup/engineabout.py:78
+#, python-format
+msgid "Author: %s\n"
+msgstr "Autor : %s\n"
+
+#: setup/engineabout.py:81
+msgid "Description:\n"
+msgstr "Descripcion :\n"
+
+#: setup/enginecombobox.py:139 setup/enginedialog.py:57
+msgid "Select an input method"
+msgstr ""
+
+#. add button
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+msgid "_Add"
+msgstr "_Apondre"
+
+#. create im name & icon column
+#: setup/enginetreeview.py:69 setup/setup.ui:838
+msgid "Input Method"
+msgstr "Metòde de picada"
+
+#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+msgid "IBus Preferences"
+msgstr "Preferéncias d'IBus"
+
+#: setup/ibus-setup.desktop:4
+msgid "Set IBus Preferences"
+msgstr "Définissez las preferéncias d'IBus"
+
+#: setup/keyboardshortcut.py:55
+msgid "Keyboard shortcuts"
+msgstr "Acorchis de clavièr"
+
+#: setup/keyboardshortcut.py:67
+msgid "Key code:"
+msgstr "Còde tòca :"
+
+#: setup/keyboardshortcut.py:82
+msgid "Modifiers:"
+msgstr "Modificadors :"
+
+#. apply button
+#: setup/keyboardshortcut.py:130
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. delete button
+#: setup/keyboardshortcut.py:136
+msgid "_Delete"
+msgstr "Su_primir lo camin"
+
+#: setup/keyboardshortcut.py:252
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr ""
+
+#: setup/keyboardshortcut.py:255
+msgid "Please press a key (or a key combination)"
+msgstr "Quichatz una tòca (o una combinason de tòcas)"
+
+#: setup/main.py:121 setup/main.py:588
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: setup/main.py:515
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: setup/main.py:536
+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:550
+#, python-format
+msgid "IBus daemon could not be started in %d seconds."
+msgstr ""
+
+#: setup/main.py:562
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr ""
+
+#. Translators: Title of the window
+#: setup/main.py:564
+msgid "switching input methods"
+msgstr ""
+
+#: setup/setup.ui:11
+msgid "Horizontal"
+msgstr "Orizontal"
+
+#: setup/setup.ui:14
+msgid "Vertical"
+msgstr "Vertical"
+
+#: setup/setup.ui:25
+msgid "Top left corner"
+msgstr ""
+
+#: setup/setup.ui:28
+msgid "Top right corner"
+msgstr ""
+
+#: setup/setup.ui:31
+msgid "Bottom left corner"
+msgstr ""
+
+#: setup/setup.ui:34
+msgid "Bottom right corner"
+msgstr ""
+
+#: setup/setup.ui:37
+msgid "Custom"
+msgstr "Personalizats"
+
+#: setup/setup.ui:48
+msgid "Do not show"
+msgstr ""
+
+#: setup/setup.ui:51
+msgid "Hide automatically"
+msgstr ""
+
+#: setup/setup.ui:54
+msgid "Always"
+msgstr "Totjorn"
+
+#: setup/setup.ui:113
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr ""
+
+#: setup/setup.ui:115
+msgid "Next input method:"
+msgstr ""
+
+#: setup/setup.ui:127
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr ""
+
+#: setup/setup.ui:129
+msgid "Previous input method:"
+msgstr ""
+
+#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
+#: setup/setup.ui:903 setup/setup.ui:957
+msgid "..."
+msgstr ""
+
+#: setup/setup.ui:226
+msgid "Enable or disable:"
+msgstr ""
+
+#: setup/setup.ui:238
+msgid "Enable:"
+msgstr ""
+
+#: setup/setup.ui:291
+msgid "Disable:"
+msgstr ""
+
+#: setup/setup.ui:345 setup/setup.ui:983
+msgid "<b>Keyboard Shortcuts</b>"
+msgstr ""
+
+#: setup/setup.ui:374
+msgid "Set the orientation of candidates in lookup table"
+msgstr ""
+
+#: setup/setup.ui:376
+msgid "Candidates orientation:"
+msgstr ""
+
+#: setup/setup.ui:407
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr ""
+
+#: setup/setup.ui:409
+msgid "Show property panel:"
+msgstr ""
+
+#: setup/setup.ui:423
+msgid "Language panel position:"
+msgstr ""
+
+#: setup/setup.ui:494
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr ""
+
+#: setup/setup.ui:508
+msgid "Embed preedit text in application window"
+msgstr ""
+
+#: setup/setup.ui:513
+msgid "Embed the preedit text of input method in the application window"
+msgstr ""
+
+#: setup/setup.ui:527
+msgid "Use custom font:"
+msgstr ""
+
+#: setup/setup.ui:562 setup/setup.ui:1156
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.ui:579
+msgid "General"
+msgstr "General"
+
+#: setup/setup.ui:671
+msgid "Add the selected input method into the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:682
+msgid "_Remove"
+msgstr "_Suprimir"
+
+#: setup/setup.ui:689
+msgid "Remove the selected input method from the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:700
+msgid "_Up"
+msgstr "_Naut"
+
+#: setup/setup.ui:707
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr ""
+
+#: setup/setup.ui:718
+msgid "_Down"
+msgstr "_Bas"
+
+#: setup/setup.ui:725
+msgid "Move down the selected input method in the enabled input methods"
+msgstr ""
+
+#: setup/setup.ui:736
+msgid "_About"
+msgstr "A pr_epaus"
+
+#: setup/setup.ui:743
+msgid "Show information of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:754
+msgid "_Preferences"
+msgstr "_Preferéncias"
+
+#: setup/setup.ui:761
+msgid "Show setup of the selected input method"
+msgstr ""
+
+#: setup/setup.ui:812
+msgid ""
+"<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>"
+msgstr ""
+
+#: setup/setup.ui:873
+msgid ""
+"The shortcut keys to enable conversions of emoji annotations or Unicode names"
+msgstr ""
+
+#: setup/setup.ui:875
+msgid "Emoji annotation:"
+msgstr ""
+
+#: setup/setup.ui:927
+msgid "The shortcut keys to enable Unicode code point conversions"
+msgstr ""
+
+#: setup/setup.ui:929
+msgid "Unicode code point:"
+msgstr ""
+
+#: setup/setup.ui:1013
+msgid "Set a font of Unicode candidates on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1015
+msgid "Unicode font:"
+msgstr ""
+
+#: setup/setup.ui:1038
+msgid "Set a language of emoji annotations on the emoji dialog"
+msgstr ""
+
+#: setup/setup.ui:1040
+msgid "Emoji annotation language:"
+msgstr ""
+
+#: setup/setup.ui:1062
+msgid ""
+"Match emoji annotations partially with the following condition and more than "
+"the number of characters:"
+msgstr ""
+
+#: setup/setup.ui:1067
+msgid ""
+"If emoji annotations can be matched with a partial string instead of the "
+"exact match"
+msgstr ""
+
+#: setup/setup.ui:1101
+msgid "Prefix match"
+msgstr ""
+
+#: setup/setup.ui:1115
+msgid "Suffix match"
+msgstr ""
+
+#: setup/setup.ui:1130
+msgid "Containing match"
+msgstr ""
+
+#: setup/setup.ui:1176
+msgid "Emoji"
+msgstr "Emoji"
+
+#: setup/setup.ui:1230
+msgid "<b>Keyboard Layout</b>"
+msgstr "<b>Disposicion de clavièr</b>"
+
+#: setup/setup.ui:1278
+msgid "<b>Global input method settings</b>"
+msgstr ""
+
+#: setup/setup.ui:1310
+msgid ""
+"Choose glyphs with the input method's language on the candidate window for "
+"the duplicated code points"
+msgstr ""
+
+#: setup/setup.ui:1327
+msgid "<b>Fonts</b>"
+msgstr "<b>Poliças</b>"
+
+#: setup/setup.ui:1347
+msgid "Advanced"
+msgstr "Avançat"
+
+#: src/ibusemojigen.h:30
+msgid "Activities"
+msgstr "Activitats"
+
+#: src/ibusemojigen.h:31
+msgid "Animals & Nature"
+msgstr "Animals e natura"
+
+#: src/ibusemojigen.h:32
+msgid "Component"
+msgstr "Component"
+
+#: src/ibusemojigen.h:33
+msgid "Flags"
+msgstr "Bandièras"
+
+#: src/ibusemojigen.h:34
+msgid "Food & Drink"
+msgstr "Noiridura e bevenda"
+
+#: src/ibusemojigen.h:35
+msgid "Objects"
+msgstr "Objèctes"
+
+#: src/ibusemojigen.h:36
+msgid "People & Body"
+msgstr ""
+
+#: src/ibusemojigen.h:37
+msgid "Smileys & Emotion"
+msgstr ""
+
+#: src/ibusemojigen.h:38
+msgid "Symbols"
+msgstr "Simbòls"
+
+#: src/ibusemojigen.h:39
+msgid "Travel & Places"
+msgstr "Viatges e luòcs"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:33
+msgid "Basic Latin"
+msgstr "Latin de basa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:37
+msgid "Latin-1 Supplement"
+msgstr "Suplement Latin-1"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:41
+msgid "Latin Extended-A"
+msgstr "Latin espandit-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:45
+msgid "Latin Extended-B"
+msgstr "Latin espandit-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:49
+msgid "IPA Extensions"
+msgstr "Extensions IPA"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:53
+msgid "Spacing Modifier Letters"
+msgstr "Letras del modificador d'espaçament"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:57
+msgid "Combining Diacritical Marks"
+msgstr "Marcas diactiticas jonctivas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:61
+msgid "Greek and Coptic"
+msgstr "Grèc e còpte"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:65
+msgid "Cyrillic"
+msgstr "Cirillic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:69
+msgid "Cyrillic Supplement"
+msgstr "Suplement Cirillic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:73
+msgid "Armenian"
+msgstr "Armèni"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:77
+msgid "Hebrew"
+msgstr "Ebrèu"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:81
+msgid "Arabic"
+msgstr "Arabi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:85
+msgid "Syriac"
+msgstr "Siriac"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:89
+msgid "Arabic Supplement"
+msgstr "Suplement arabi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:93
+msgid "Thaana"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:97
+msgid "NKo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:101
+msgid "Samaritan"
+msgstr "Samaritan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:105
+msgid "Mandaic"
+msgstr "Mandean"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:109
+msgid "Syriac Supplement"
+msgstr "Suplement siriac"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-A"
+msgstr "Arabi espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:121
+msgid "Bengali"
+msgstr "Bengalin"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:125
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:129
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:133
+msgid "Oriya"
+msgstr "Oriyà"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:137
+msgid "Tamil"
+msgstr "Tamol"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:141
+msgid "Telugu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:145
+msgid "Kannada"
+msgstr "Kannadà"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:149
+msgid "Malayalam"
+msgstr "Malaialam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:153
+msgid "Sinhala"
+msgstr "Singalés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:157
+msgid "Thai"
+msgstr "Tailandés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:161
+msgid "Lao"
+msgstr "Laossian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:165
+msgid "Tibetan"
+msgstr "Tibetan"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:169
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:173
+msgid "Georgian"
+msgstr "Georgian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:177
+msgid "Hangul Jamo"
+msgstr "Jamos Hangul"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:181
+msgid "Ethiopic"
+msgstr "Etiopian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:185
+msgid "Ethiopic Supplement"
+msgstr "Suplement etiopian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:189
+msgid "Cherokee"
+msgstr "Cheroquí"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:193
+msgid "Unified Canadian Aboriginal Syllabics"
+msgstr "Sillabari autoctòne canadian unificat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:197
+msgid "Ogham"
+msgstr "Ogam"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:201
+msgid "Runic"
+msgstr "Runic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:205
+msgid "Tagalog"
+msgstr "Tagalòg"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:209
+msgid "Hanunoo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:213
+msgid "Buhid"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:217
+msgid "Tagbanwa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:221
+msgid "Khmer"
+msgstr "Cmèr"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:225
+msgid "Mongolian"
+msgstr "Mongòl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:229
+msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgstr "Sillabaris autoctòns canadians unificats espandits"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:233
+msgid "Limbu"
+msgstr "Litua"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:237
+msgid "Tai Le"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:241
+msgid "New Tai Lue"
+msgstr "Tai Lue novèl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:245
+msgid "Khmer Symbols"
+msgstr "Símbòls Cmèr"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:249
+msgid "Buginese"
+msgstr "Bugui"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:253
+msgid "Tai Tham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:257
+msgid "Combining Diacritical Marks Extended"
+msgstr "Suplement de combinasons de marcas diacriticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:261
+msgid "Balinese"
+msgstr "Balinés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:265
+msgid "Sundanese"
+msgstr "Sodanés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:269
+msgid "Batak"
+msgstr "Bascon"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:273
+msgid "Lepcha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:277
+msgid "Ol Chiki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:281
+msgid "Cyrillic Extended-C"
+msgstr "Cirillic espandit - C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:285
+msgid "Georgian Extended"
+msgstr "Georgian espandit"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:289
+msgid "Sundanese Supplement"
+msgstr "Suplement sodanés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:293
+msgid "Vedic Extensions"
+msgstr "Extensions vedicas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:297
+msgid "Phonetic Extensions"
+msgstr "Extensions foneticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:301
+msgid "Phonetic Extensions Supplement"
+msgstr "Suplement d'extensions foneticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:305
+msgid "Combining Diacritical Marks Supplement"
+msgstr "Suplement de combinasons de marcas diacriticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:309
+msgid "Latin Extended Additional"
+msgstr "Latin espandit addicional"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:313
+msgid "Greek Extended"
+msgstr "Grèc espandit"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:317
+msgid "General Punctuation"
+msgstr "Ponctuacion generala"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:321
+msgid "Superscripts and Subscripts"
+msgstr "Exponents e indicis"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:325
+msgid "Currency Symbols"
+msgstr "Simbòls monetaris"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:329
+msgid "Combining Diacritical Marks for Symbols"
+msgstr "Marcas diacriticas jonctivas pels simbòls"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:333
+msgid "Letterlike Symbols"
+msgstr "Simbòls Letterlike (grafèms)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:337
+msgid "Number Forms"
+msgstr "Simbòls de nombres"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:341
+msgid "Arrows"
+msgstr "Sagetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:345
+msgid "Mathematical Operators"
+msgstr "Operadors matematics"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:349
+msgid "Miscellaneous Technical"
+msgstr "Tecnicas divèrsas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:353
+msgid "Control Pictures"
+msgstr "Pictogramas de comanda"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:357
+msgid "Optical Character Recognition"
+msgstr "Reconeissença optica dels caractèrs"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:361
+msgid "Enclosed Alphanumerics"
+msgstr "Alfanumerics encerclats"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:365
+msgid "Box Drawing"
+msgstr "Bóstia de dessenh"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:369
+msgid "Block Elements"
+msgstr "Pavats"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:373
+msgid "Geometric Shapes"
+msgstr "Formas geometricas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:377
+msgid "Miscellaneous Symbols"
+msgstr "Simbòls divèrses"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:381
+msgid "Dingbats"
+msgstr "Ornaments tipografics (« Dingbats »)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:385
+msgid "Miscellaneous Mathematical Symbols-A"
+msgstr "Simbòls divèrses de matematicas-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:389
+msgid "Supplemental Arrows-A"
+msgstr "Suplement A de sagetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:393
+msgid "Braille Patterns"
+msgstr "Combinasons Braille"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:397
+msgid "Supplemental Arrows-B"
+msgstr "Suplement B de sagetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:401
+msgid "Miscellaneous Mathematical Symbols-B"
+msgstr "Simbòls divèrses de matematicas-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:405
+msgid "Supplemental Mathematical Operators"
+msgstr "Operadors matematics suplementaris"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:409
+msgid "Miscellaneous Symbols and Arrows"
+msgstr "Simbòls e flèchas divèrses"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:413
+msgid "Glagolitic"
+msgstr "Glagolític"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:417
+msgid "Latin Extended-C"
+msgstr "Latin espandit - C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:421
+msgid "Coptic"
+msgstr "Còpt"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:425
+msgid "Georgian Supplement"
+msgstr "Suplement georgian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:429
+msgid "Tifinagh"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:433
+msgid "Ethiopic Extended"
+msgstr "Etiopian espandit"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:437
+msgid "Cyrillic Extended-A"
+msgstr "Cirillic espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:441
+msgid "Supplemental Punctuation"
+msgstr "Pontuacion suplementària"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:445
+msgid "CJK Radicals Supplement"
+msgstr "Suplement de claus CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:449
+msgid "Kangxi Radicals"
+msgstr "Radicals Kangxi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:453
+msgid "Ideographic Description Characters"
+msgstr "Caractèrs de descripcion ideofonografica"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:457
+msgid "CJK Symbols and Punctuation"
+msgstr "Simbòls e ponctuacion CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:461
+msgid "Hiragana"
+msgstr "Iragana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:465
+msgid "Katakana"
+msgstr "Katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:469
+msgid "Bopomofo"
+msgstr "Bopomofo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:473
+msgid "Hangul Compatibility Jamo"
+msgstr "Hangul compatible Jamo"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:477
+msgid "Kanbun"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:481
+msgid "Bopomofo Extended"
+msgstr "Bopomofo espandit"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:485
+msgid "CJK Strokes"
+msgstr "Traits CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:489
+msgid "Katakana Phonetic Extensions"
+msgstr "Suplement fonetic katakana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:493
+msgid "Enclosed CJK Letters and Months"
+msgstr "Letras e meses CJC enrodats"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:497
+msgid "CJK Compatibility"
+msgstr "Compatibilitat CJC (Chinés, Japanés, Corean)"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:501
+msgid "CJK Unified Ideographs Extension A"
+msgstr "Extension d'ideogramas unificats CJC - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:505
+msgid "Yijing Hexagram Symbols"
+msgstr "Simbòls d'exagrama Yijing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:509
+msgid "CJK Unified Ideographs"
+msgstr "Ideogramas unificats CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:513
+msgid "Yi Syllables"
+msgstr "Sillabaris Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:517
+msgid "Yi Radicals"
+msgstr "Radicals Yi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:521
+msgid "Lisu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:525
+msgid "Vai"
+msgstr "Vai"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:529
+msgid "Cyrillic Extended-B"
+msgstr "Cirillic espandit - B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:533
+msgid "Bamum"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:537
+msgid "Modifier Tone Letters"
+msgstr "Letras modificatrises de tonalitat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:541
+msgid "Latin Extended-D"
+msgstr "Latin espandit - D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:545
+msgid "Syloti Nagri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:549
+msgid "Common Indic Number Forms"
+msgstr "Formas de nombres indics comunas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:553
+msgid "Phags-pa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:557
+msgid "Saurashtra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:561
+msgid "Devanagari Extended"
+msgstr "Devanagari espandit"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:565
+msgid "Kayah Li"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:569
+msgid "Rejang"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:573
+msgid "Hangul Jamo Extended-A"
+msgstr "Hangul Jamo espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:577
+msgid "Javanese"
+msgstr "Javanés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:581
+msgid "Myanmar Extended-B"
+msgstr "Birman espandit-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:585
+msgid "Cham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:589
+msgid "Myanmar Extended-A"
+msgstr "Myanmar espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:593
+msgid "Tai Viet"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:597
+msgid "Meetei Mayek Extensions"
+msgstr "Extension Meetei Mayek"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:601
+msgid "Ethiopic Extended-A"
+msgstr "Etiopian espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:605
+msgid "Latin Extended-E"
+msgstr "Latin espandit-E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:609
+msgid "Cherokee Supplement"
+msgstr "Suplement Cheroquí"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:613
+msgid "Meetei Mayek"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:617
+msgid "Hangul Syllables"
+msgstr "Sillabas Hangulas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:621
+msgid "Hangul Jamo Extended-B"
+msgstr "Hangul Jamo espandit - B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:625
+msgid "High Surrogates"
+msgstr "Mièja zòna nauta d'indireccion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:629
+msgid "High Private Use Surrogates"
+msgstr "Partida d'usatge privat de la mièja zòna nauta d'indireccion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:633
+msgid "Low Surrogates"
+msgstr "Mièja zòna bassa d'indireccion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:637
+msgid "Private Use Area"
+msgstr "Zòna d'usatge privat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:641
+msgid "CJK Compatibility Ideographs"
+msgstr "Ideogramas compatibles CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:645
+msgid "Alphabetic Presentation Forms"
+msgstr "Formas de presentacion alfabeticas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:649
+msgid "Arabic Presentation Forms-A"
+msgstr "Formas-A de presentacion aràbia"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:653
+msgid "Variation Selectors"
+msgstr "Selectors de variacion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:657
+msgid "Vertical Forms"
+msgstr "Formas verticalas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:661
+msgid "Combining Half Marks"
+msgstr "Mièg signes jonctius"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:665
+msgid "CJK Compatibility Forms"
+msgstr "Formas compatiblas CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:669
+msgid "Small Form Variants"
+msgstr "Pichonas variantas de forma"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:673
+msgid "Arabic Presentation Forms-B"
+msgstr "Forma-B de presentacion aràbia"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:677
+msgid "Halfwidth and Fullwidth Forms"
+msgstr "caractèrs 1/2 e largor plena"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:681
+msgid "Specials"
+msgstr "Simbòls especials"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:685
+msgid "Linear B Syllabary"
+msgstr "Sillabari linear B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:689
+msgid "Linear B Ideograms"
+msgstr "Ideogramas linears B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:693
+msgid "Aegean Numbers"
+msgstr "Nombres egèus"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:697
+msgid "Ancient Greek Numbers"
+msgstr "Nombres grècs ancians"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:701
+msgid "Ancient Symbols"
+msgstr "Simbòls ancians"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:705
+msgid "Phaistos Disc"
+msgstr "Disc de Faïstos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:709
+msgid "Lycian"
+msgstr "Lician"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:713
+msgid "Carian"
+msgstr "Maòri"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:717
+msgid "Coptic Epact Numbers"
+msgstr "Epactes còpts"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:721
+msgid "Old Italic"
+msgstr "Italica anciana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:725
+msgid "Gothic"
+msgstr "Gotic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:729
+msgid "Old Permic"
+msgstr "Ancian Permic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:733
+msgid "Ugaritic"
+msgstr "Ogaritic"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:737
+msgid "Old Persian"
+msgstr "Pèrse ancian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:741
+msgid "Deseret"
+msgstr "Deseret"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:745
+msgid "Shavian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:749
+msgid "Osmanya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:753
+msgid "Osage"
+msgstr "Osatge"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:757
+msgid "Elbasan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:761
+msgid "Caucasian Albanian"
+msgstr "Albanés caucasian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:765
+msgid "Linear A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Cypriot Syllabary"
+msgstr "Sillabari chipriòta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
+msgid "Imperial Aramaic"
+msgstr "Aramean imperial"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Palmyrene"
+msgstr "Palmirenian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
+msgid "Nabataean"
+msgstr "Nabatean"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:785
+msgid "Hatran"
+msgstr "Atran"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:789
+msgid "Phoenician"
+msgstr "Fenician"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:793
+msgid "Lydian"
+msgstr "Lidian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:797
+msgid "Meroitic Hieroglyphs"
+msgstr "Ieroglifes meroïtics"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:801
+msgid "Meroitic Cursive"
+msgstr "Cursiva meroïtica"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:805
+msgid "Kharoshthi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:809
+msgid "Old South Arabian"
+msgstr "Arabi del Sud ancian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:813
+msgid "Old North Arabian"
+msgstr "Arabi del Nòrd ancian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:817
+msgid "Manichaean"
+msgstr "Maniquean"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:821
+msgid "Avestan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:825
+msgid "Inscriptional Parthian"
+msgstr "Part d'inscripcion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:829
+msgid "Inscriptional Pahlavi"
+msgstr "Pehlevi de las inscripcions"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:833
+msgid "Psalter Pahlavi"
+msgstr "Pehlevi dels psautièrs"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:837
+msgid "Old Turkic"
+msgstr "Turc ancian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:841
+msgid "Old Hungarian"
+msgstr "Runas ongresa"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:845
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:849
+msgid "Rumi Numeral Symbols"
+msgstr "Simbòls numerics rumi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:853
+msgid "Yezidi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
+msgid "Chorasmian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:869
+msgid "Elymaic"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Brahmi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Kaithi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
+msgid "Sora Sompeng"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:885
+msgid "Chakma"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:889
+msgid "Mahajani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:893
+msgid "Sharada"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:897
+msgid "Sinhala Archaic Numbers"
+msgstr "Chifras arcaïcas del cingalés"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:901
+msgid "Khojki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:905
+msgid "Multani"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:909
+msgid "Khudawadi"
+msgstr "Khoudawadi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:913
+msgid "Grantha"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:917
+msgid "Newa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:921
+msgid "Tirhuta"
+msgstr "Tirhouta"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:925
+msgid "Siddham"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:929
+msgid "Modi"
+msgstr "Modi"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:933
+msgid "Mongolian Supplement"
+msgstr "Suplement mongòl"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:937
+msgid "Takri"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:941
+msgid "Ahom"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:945
+msgid "Dogra"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:949
+msgid "Warang Citi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:953
+msgid "Dives Akuru"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:957
+msgid "Nandinagari"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:961
+msgid "Zanabazar Square"
+msgstr "Carrat Zanabazar"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:965
+msgid "Soyombo"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:969
+msgid "Pau Cin Hau"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:973
+msgid "Bhaiksuki"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:977
+msgid "Marchen"
+msgstr "Marchen"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:981
+msgid "Masaram Gondi"
+msgstr "Gondí de Masaram"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Gunjala Gondi"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
+msgid "Makasar"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:993
+msgid "Lisu Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:997
+msgid "Tamil Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1001
+msgid "Cuneiform"
+msgstr "Cuneïfòrme"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1005
+msgid "Cuneiform Numbers and Punctuation"
+msgstr "Ponctuacion e nombres cuneifòrme"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1009
+msgid "Early Dynastic Cuneiform"
+msgstr "Ancians cuneifòrmes dinastics"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1013
+msgid "Egyptian Hieroglyphs"
+msgstr "Ieroglifes egipcians"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1017
+msgid "Egyptian Hieroglyph Format Controls"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1021
+msgid "Anatolian Hieroglyphs"
+msgstr "Ieroglifes anatolians"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1025
+msgid "Bamum Supplement"
+msgstr "Suplement Bamum"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1029
+msgid "Mro"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Bassa Vah"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
+msgid "Pahawh Hmong"
+msgstr "Hmong pahawh"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1041
+msgid "Medefaidrin"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1045
+msgid "Miao"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1049
+msgid "Ideographic Symbols and Punctuation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1053
+msgid "Tangut"
+msgstr "Tangut"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Tangut Components"
+msgstr "Components de tangut"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
+msgid "Khitan Small Script"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1065
+msgid "Tangut Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1069
+msgid "Kana Supplement"
+msgstr "Suplement Kana"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1073
+msgid "Kana Extended-A"
+msgstr "Kana espandit - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1077
+msgid "Small Kana Extension"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1081
+msgid "Nushu"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1085
+msgid "Duployan"
+msgstr "Duploiat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1089
+msgid "Shorthand Format Controls"
+msgstr "Contraròtles de format estenografia"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1093
+msgid "Byzantine Musical Symbols"
+msgstr "Símbòls musicals bizantins"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Musical Symbols"
+msgstr "Símbòls musicals"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
+msgid "Ancient Greek Musical Notation"
+msgstr "Notacion musicala grèc ancian"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1105
+msgid "Mayan Numerals"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1109
+msgid "Tai Xuan Jing Symbols"
+msgstr "Simbòls Tai Xuan Jing"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1113
+msgid "Counting Rod Numerals"
+msgstr "Numeracions de bastons"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1117
+msgid "Mathematical Alphanumeric Symbols"
+msgstr "Símbòls musicals"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1121
+msgid "Sutton SignWriting"
+msgstr "Lenga dels signa de Sutton"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Glagolitic Supplement"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
+msgid "Nyiakeng Puachue Hmong"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1133
+msgid "Wancho"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1137
+msgid "Mende Kikakui"
+msgstr "Mendé kikakui"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1141
+msgid "Adlam"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1145
+msgid "Indic Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1149
+msgid "Ottoman Siyaq Numbers"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1153
+msgid "Arabic Mathematical Alphabetic Symbols"
+msgstr "Simbòls alfabetics matematics arabis"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1157
+msgid "Mahjong Tiles"
+msgstr "Tèules de Mahjong"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Domino Tiles"
+msgstr "Tèules de dominos"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
+msgid "Playing Cards"
+msgstr "Cartas de jòc"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1169
+msgid "Enclosed Alphanumeric Supplement"
+msgstr "Suplement alfanumeric inclús"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Enclosed Ideographic Supplement"
+msgstr "Suplement ideografic inclús"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
+msgid "Miscellaneous Symbols and Pictographs"
+msgstr "Simbòls divèrses e pictogramas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Emoticons"
+msgstr "Emoticònas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
+msgid "Ornamental Dingbats"
+msgstr "Dingbats decoratius"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1189
+msgid "Transport and Map Symbols"
+msgstr "Simbòls de transpòrts e de topografia"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1193
+msgid "Alchemical Symbols"
+msgstr "Simbòls alquimics"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1197
+msgid "Geometric Shapes Extended"
+msgstr "Formas geometricas, avançat"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1201
+msgid "Supplemental Arrows-C"
+msgstr "Suplement C de sagetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1205
+msgid "Supplemental Symbols and Pictographs"
+msgstr "Simbòls e pictogramas suplementaris"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1209
+msgid "Chess Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1213
+msgid "Symbols and Pictographs Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1217
+msgid "Symbols for Legacy Computing"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1221
+msgid "CJK Unified Ideographs Extension B"
+msgstr "Extension d'ideogramas unificats CJC - B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1225
+msgid "CJK Unified Ideographs Extension C"
+msgstr "Extension d'ideogramas unificats CJC - C"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1229
+msgid "CJK Unified Ideographs Extension D"
+msgstr "Extension d'ideogramas unificats CJC - D"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1233
+msgid "CJK Unified Ideographs Extension E"
+msgstr "Extension d'ideogramas unificats CJC - E"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1237
+msgid "CJK Unified Ideographs Extension F"
+msgstr "Extension d'ideogramas unificats CJC - F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1241
+msgid "CJK Compatibility Ideographs Supplement"
+msgstr "Suplement d'ideograma de compatibilitat CJC"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1245
+msgid "CJK Unified Ideographs Extension G"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1249
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1253
+msgid "Variation Selectors Supplement"
+msgstr "Suplement de selectors de variacion"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1257
+msgid "Supplementary Private Use Area-A"
+msgstr "Zòna d'utilizacion privada suplementària - A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1261
+msgid "Supplementary Private Use Area-B"
+msgstr "Zòna d'utilizacion privada suplementària - B"
+
+#: tools/main.vala:51
+msgid "List engine name only"
+msgstr ""
+
+#: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: tools/main.vala:93
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: tools/main.vala:161
+msgid "No engine is set.\n"
+msgstr ""
+
+#: tools/main.vala:169
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:174
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: tools/main.vala:217
+msgid "Read the system registry cache."
+msgstr ""
+
+#: tools/main.vala:219
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:237 tools/main.vala:242
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: tools/main.vala:257
+msgid "Write the system registry cache."
+msgstr ""
+
+#: tools/main.vala:259
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: tools/main.vala:295
+msgid ""
+"Use engine schema paths instead of ibus core, which can be comma-separated "
+"values."
+msgstr ""
+
+#: tools/main.vala:381
+msgid "Resetting…"
+msgstr ""
+
+#: tools/main.vala:399
+msgid "Done"
+msgstr "Acabat"
+
+#: tools/main.vala:444
+msgid "Set or get engine"
+msgstr ""
+
+#: tools/main.vala:445
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:446
+msgid "Show available engines"
+msgstr ""
+
+#: tools/main.vala:447
+msgid "(Not implemented)"
+msgstr ""
+
+#: tools/main.vala:448
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:449
+msgid "Show version"
+msgstr "Afichar la version"
+
+#: tools/main.vala:450
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: tools/main.vala:451
+msgid "Create registry cache"
+msgstr ""
+
+#: tools/main.vala:452
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: tools/main.vala:453
+msgid "Show the configuration values"
+msgstr ""
+
+#: tools/main.vala:454
+msgid "Reset the configuration values"
+msgstr ""
+
+#: tools/main.vala:456
+msgid "Save emoji on dialog to clipboard"
+msgstr ""
+
+#: tools/main.vala:458
+msgid "Show this information"
+msgstr ""
+
+#: tools/main.vala:464
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: tools/main.vala:465
+msgid "Commands:\n"
+msgstr "Comandas :\n"
+
+#: tools/main.vala:494
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:233
+msgid "Favorites"
+msgstr "Favorits"
+
+#: ui/gtk3/emojier.vala:234
+msgid "Others"
+msgstr "Autres"
+
+#: ui/gtk3/emojier.vala:235
+msgid "Open Unicode choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:995
+msgid "Bring back emoji choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1097
+msgid "Page Down"
+msgstr "Pagina seguenta"
+
+#: ui/gtk3/emojier.vala:1108
+msgid "Page Up"
+msgstr "Pagina precedenta"
+
+#: ui/gtk3/emojier.vala:1111
+msgid "Show emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1112
+msgid "Close"
+msgstr "Barrar"
+
+#: ui/gtk3/emojier.vala:1118
+msgid "Menu"
+msgstr "Menú"
+
+#: ui/gtk3/emojier.vala:1129
+msgid "Click to view a warning message"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1173
+msgid "Loading a Unicode dictionary:"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1419
+#, c-format
+msgid "Code point: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1425
+msgid "Has emoji variants"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
+#, c-format
+msgid "Description: %s"
+msgstr "Descripcion : %s"
+
+#: ui/gtk3/emojier.vala:1592
+msgid "None"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1616
+#, c-format
+msgid "Annotations: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:1642
+#, c-format
+msgid "Name: %s"
+msgstr "Nom : %s"
+
+#: ui/gtk3/emojier.vala:1650
+#, c-format
+msgid "Alias: %s"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
+msgid "Emoji Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2142
+msgid "Unicode Choice"
+msgstr ""
+
+#: ui/gtk3/emojier.vala:2432
+msgid ""
+"Failed to get the current text application. Please re-focus your "
+"application. E.g. Press Esc key several times to release the emoji typing "
+"mode, click your desktop and click your text application again."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:47
+msgid "Canceled to choose an emoji."
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:67
+msgid "Copied an emoji to your clipboard."
+msgstr ""
+
+#. TRANSLATORS: "FONT" should be capital and translatable.
+#. * It's used for an argument command --font=FONT
+#.
+#: ui/gtk3/emojierapp.vala:126
+msgid "\"FONT\" for emoji characters on emoji dialog"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:127
+msgid "FONT"
+msgstr "POLIÇA"
+
+#. TRANSLATORS: "LANG" should be capital and translatable.
+#. * It's used for an argument command --lang=LANG
+#.
+#: ui/gtk3/emojierapp.vala:132
+msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:133
+msgid "LANG"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:135
+msgid "Emoji annotations can be match partially"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:139
+msgid "Match with the length of the specified integer"
+msgstr ""
+
+#: ui/gtk3/emojierapp.vala:143
+msgid "Match with the condition of the specified integer"
+msgstr ""
+
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
+msgid "IBus Panel"
+msgstr ""
+
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr ""
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1141
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary\n"
+"  Quentin PAGÈS https://launchpad.net/~kwentin\n"
+"  Vincent L. https://launchpad.net/~vincent-laporte\n"
+"  Yannig MARCHEGAY (Kokoyaya) https://launchpad.net/~yannick-marchegay"
+
+#: ui/gtk3/panel.vala:1164
+msgid "Preferences"
+msgstr "_Preferéncias"
+
+#: ui/gtk3/panel.vala:1190
+msgid "Restart"
+msgstr "Reaviar"
+
+#: ui/gtk3/panel.vala:1194
+msgid "Quit"
+msgstr "Quitar"
+
+#. Translators: If your locale is RTL, the msgstr is "default:RTL".
+#. * Otherwise the msgstr is "default:LTR".
+#: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
+msgid "default:LTR"
+msgstr "default:LTR"

From 883f517273fb5324002178540b58928023c84335 Mon Sep 17 00:00:00 2001
From: Liu Tao <lyuutau@outlook.com>
Date: Wed, 18 Aug 2021 13:04:47 +0900
Subject: [PATCH 744/816] po: Update translation (Chinese (Simplified) (zh_CN))

Update po/zh_CN.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/zh_CN.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e96d33cef..1fe4fb174 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,13 +20,14 @@
 # Boyuan Yang <073plan@gmail.com>, 2020.
 # Whired Planck <fungdaat31@outlook.com>, 2020.
 # Dingzhong Chen <wsxy162@gmail.com>, 2021.
+# Liu Tao <lyuutau@outlook.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-01-28 17:40+0000\n"
-"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
+"PO-Revision-Date: 2021-06-16 11:04+0000\n"
+"Last-Translator: Liu Tao <lyuutau@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -34,7 +35,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.6.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -520,7 +521,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "请按下一个键盘按键（或者按键组合）"
+msgstr "请按一个键盘按键（或者一个组合按键）"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"

From a7ebfc94627821ab6f1fd5943ac88971b01a81b3 Mon Sep 17 00:00:00 2001
From: Alexey Rubtsov <rushills@gmail.com>
Date: Wed, 18 Aug 2021 13:06:58 +0900
Subject: [PATCH 745/816] po: Update translation (Russian)

Update po/ru.po at 98.4%
https://translate.fedoraproject.org/projects/ibus/ibus/ru/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/ru.po | 138 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 77 insertions(+), 61 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 782d2ee37..5d8101781 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # Russian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,21 +10,23 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2013-2014
 # yuliya <ypoyarko@redhat.com>, 2015. #zanata
 # Igor Gorbounov <igor.gorbounov@gmail.com>, 2017. #zanata
+# Alexey Rubtsov <rushills@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2017-04-18 11:47+0900\n"
+"PO-Revision-Date: 2021-07-06 15:04+0000\n"
+"Last-Translator: Alexey Rubtsov <rushills@gmail.com>\n"
+"Language-Team: Russian <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/ru/>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-16 03:37-0400\n"
-"Last-Translator: Igor Gorbounov <igor.gorbounov@gmail.com>\n"
-"Language-Team: Russian <trans-ru@lists.fedoraproject.org>\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"
-"X-Generator: Zanata 3.9.6\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"
+"X-Generator: Weblate 4.7.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -72,7 +74,7 @@ msgstr "Параметры IBus"
 
 #: ../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:"
@@ -80,7 +82,7 @@ msgstr "Следующий метод ввода:"
 
 #: ../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:"
@@ -88,11 +90,11 @@ msgstr "Предыдущий метод ввода:"
 
 #: ../setup/setup.ui.h:16
 msgid "The shortcut keys for showing emoji dialog"
-msgstr ""
+msgstr "Сочетание клавиш для вызова диалога с Емодзи"
 
 #: ../setup/setup.ui.h:17
 msgid "Emoji dialog:"
-msgstr ""
+msgstr "Диалог Емодзи:"
 
 #: ../setup/setup.ui.h:18
 msgid "..."
@@ -165,19 +167,19 @@ msgstr "Выбрать шрифт:"
 
 #: ../setup/setup.ui.h:35
 msgid "Set a font of emoji candidates on the emoji dialog"
-msgstr ""
+msgstr "Установить шрифт с вариантами емодзи в диалоге емодзи"
 
 #: ../setup/setup.ui.h:36
 msgid "Emoji font:"
-msgstr ""
+msgstr "Шрифт емодзи:"
 
 #: ../setup/setup.ui.h:37
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr ""
+msgstr "Установить язык для аннотаций емодзи в диалоге емодзи"
 
 #: ../setup/setup.ui.h:38
 msgid "Emoji annotation language:"
-msgstr ""
+msgstr "Язык аннотаций емодзи:"
 
 #: ../setup/setup.ui.h:39
 msgid "<b>Font and Style</b>"
@@ -294,7 +296,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:68
 msgid "Start ibus on login"
-msgstr "Запускать iBus при входе в систему:"
+msgstr "Запускать iBus при входе в систему"
 
 #: ../setup/setup.ui.h:69
 msgid "<b>Startup</b>"
@@ -369,6 +371,8 @@ msgstr "Использовать xmodmap"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
+"Запускать xmodmap при переключении систем ibus, если существует файл ."
+"xmodmap или .Xmodmap."
 
 #: ../data/ibus.schemas.in.h:15
 msgid "Trigger shortcut keys"
@@ -376,7 +380,7 @@ msgstr "Сочетание клавиш для включения/выключе
 
 #: ../data/ibus.schemas.in.h:17
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Сочетание клавиш для  gtk_accelerator_parse"
+msgstr "Сочетание клавиш для gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:18
 msgid "Enable shortcut keys"
@@ -400,7 +404,7 @@ msgstr "Клавиши для следующего метода ввода"
 
 #: ../data/ibus.schemas.in.h:23
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке:"
+msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Prev engine shortcut keys"
@@ -408,7 +412,7 @@ msgstr "Клавиши для предыдущего метода ввода"
 
 #: ../data/ibus.schemas.in.h:25
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
+msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке"
 
 #: ../data/ibus.schemas.in.h:26
 msgid "Auto hide"
@@ -464,7 +468,7 @@ msgstr "Ориентация таблицы поиска"
 
 #: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
+msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Show input method name"
@@ -485,10 +489,17 @@ msgid ""
 "to 255 or precentage values in the range 0% to 100%, and 'a' is a floating "
 "point value in the range 0 to 1 of the alpha."
 msgstr ""
+"Значок XKB показывает строку раскладки и она отрисована с тоном RGBA. Тон "
+"RGBA может быть 1. именем цвета из X11, 2. шестнадцатеричным значением "
+"формата «#rrggbb» где «r», «g» и «b» - шестнадцатеричные цифры для красного, "
+"зелёного и синего, 3. цвет RGB в формате «rgb(r,g,b)» иои 4. цвет RGBA в "
+"формате «rgba(r,g,b,a)», где «r», «g», и «b» - или целые в границах от 0 до "
+"255 или процентные значения от 0% до 100%, и 'a - это число с плавающей "
+"запятой в значении от 0 до 1, устанавливающее прозрачность."
 
 #: ../data/ibus.schemas.in.h:42
 msgid "The milliseconds to show the panel icon for a property"
-msgstr ""
+msgstr "Количество миллисекунд для показа иконки панели для свойства"
 
 #: ../data/ibus.schemas.in.h:43
 msgid ""
@@ -516,35 +527,39 @@ msgstr "Свой шрифт для языковой панели"
 
 #: ../data/ibus.schemas.in.h:50
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "Сочетание клавиш емодзи для gtk_accelerator_parse"
 
 #: ../data/ibus.schemas.in.h:51
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr ""
+msgstr "Сочетание клавиш для включения/выключения ввода емодзи"
 
 #: ../data/ibus.schemas.in.h:52
 msgid "Custom font name for emoji chracters on emoji dialog"
-msgstr ""
+msgstr "Имя пользовательского шрифта емодзи в диалоге"
 
 #: ../data/ibus.schemas.in.h:53
 msgid "Default language for emoji dictionary"
-msgstr ""
+msgstr "Язык по-умолчанию в словаре емодзи"
 
 #: ../data/ibus.schemas.in.h:54
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict"
 msgstr ""
+"Выбрать словарь по-умолчанию для емодзи на диалоге емодзи. Значение $lang "
+"применяется к /usr/share/ibus/dicts/emoji-$lang.dict"
 
 #: ../data/ibus.schemas.in.h:55
 msgid "favorite emoji list on emoji dialog"
-msgstr ""
+msgstr "список избранных емодзи в диалоге емодзи"
 
 #: ../data/ibus.schemas.in.h:56
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
+"Вы можете вывести избранные емодзи в списке, если в этом списке содержит "
+"какие-либо символы."
 
 #: ../data/ibus.schemas.in.h:57
 msgid "Embed Preedit Text"
@@ -569,7 +584,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:63
 msgid "DConf preserve name prefixes"
-msgstr "DConf сохраняет префиксы имен."
+msgstr "DConf сохраняет префиксы имен"
 
 #: ../data/ibus.schemas.in.h:64
 msgid "Prefixes of DConf keys to stop name conversion"
@@ -588,7 +603,7 @@ msgstr "Другие"
 
 #: ../setup/emojilang.py:67
 msgid "Select a language"
-msgstr ""
+msgstr "Выберите язык"
 
 #: ../setup/emojilang.py:70 ../setup/enginedialog.py:60
 #: ../setup/keyboardshortcut.py:339 ../setup/main.py:457
@@ -602,7 +617,7 @@ msgstr "_OK"
 
 #: ../setup/emojilang.py:235 ../setup/enginedialog.py:205
 msgid "More…"
-msgstr ""
+msgstr "Больше…"
 
 #: ../setup/engineabout.py:72
 #, python-format
@@ -754,31 +769,31 @@ msgstr "Запись в файл кэша реестра."
 
 #: ../tools/main.vala:307
 msgid "Resetting…"
-msgstr ""
+msgstr "Сбрасываю…"
 
 #: ../tools/main.vala:321
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #: ../tools/main.vala:366
 msgid "Set or get engine"
-msgstr ""
+msgstr "Установка или получение глобального модуля"
 
 #: ../tools/main.vala:367
 msgid "Exit ibus-daemon"
-msgstr ""
+msgstr "Остановить ibus-daemon"
 
 #: ../tools/main.vala:368
 msgid "Show available engines"
-msgstr ""
+msgstr "Показать доступные глобальные модули"
 
 #: ../tools/main.vala:369
 msgid "(Not implemented)"
-msgstr ""
+msgstr "(не реализовано)"
 
 #: ../tools/main.vala:370
 msgid "Restart ibus-daemon"
-msgstr ""
+msgstr "Перезапустить ibus-daemon"
 
 #: ../tools/main.vala:371
 msgid "Show version"
@@ -786,31 +801,31 @@ msgstr "Показать версию"
 
 #: ../tools/main.vala:372
 msgid "Show the content of registry cache"
-msgstr ""
+msgstr "Показать содержимое кеша реестра"
 
 #: ../tools/main.vala:373
 msgid "Create registry cache"
-msgstr ""
+msgstr "Создать кеш реестра"
 
 #: ../tools/main.vala:374
 msgid "Print the D-Bus address of ibus-daemon"
-msgstr ""
+msgstr "Вывести адрес D-Bus сервиса ibus-daemon"
 
 #: ../tools/main.vala:375
 msgid "Show the configuration values"
-msgstr ""
+msgstr "Показать значения параметров настройки"
 
 #: ../tools/main.vala:376
 msgid "Reset the configuration values"
-msgstr ""
+msgstr "Сбросить значения параметров настройки"
 
 #: ../tools/main.vala:378
 msgid "Save emoji on dialog to clipboard "
-msgstr ""
+msgstr "Сохранить емодзи с диалога в буфер обмена "
 
 #: ../tools/main.vala:380
 msgid "Show this information"
-msgstr ""
+msgstr "Показать эту информацию"
 
 #: ../tools/main.vala:386
 #, c-format
@@ -830,48 +845,48 @@ msgstr "Неизвестная команда: %s\n"
 
 #: ../ui/gtk3/emojier.vala:289 ../ui/gtk3/panel.vala:1224
 msgid "Emoji Dialog"
-msgstr ""
+msgstr "Диалог Емодзи"
 
 #: ../ui/gtk3/emojier.vala:293
 msgid "Type annotation or choose emoji"
-msgstr ""
+msgstr "Введите аннотацию, чтобы выбрать емодзи"
 
 #: ../ui/gtk3/emojier.vala:564 ../ui/gtk3/emojier.vala:603
 msgid "Favorites"
-msgstr ""
+msgstr "Избранные"
 
 #: ../ui/gtk3/emojier.vala:628
 msgid "Page Down"
-msgstr ""
+msgstr "Стр. вниз"
 
 #: ../ui/gtk3/emojier.vala:639
 msgid "Page Up"
-msgstr ""
+msgstr "Стр. вверх"
 
 #. TODO: Provide a custom description and annotation for
 #. the favorite emojis.
 #: ../ui/gtk3/emojier.vala:813 ../ui/gtk3/emojier.vala:827
 #, c-format
 msgid "Description: %s"
-msgstr ""
+msgstr "Описание: %s"
 
 #: ../ui/gtk3/emojier.vala:813
 msgid "None"
-msgstr ""
+msgstr "Нет"
 
 #: ../ui/gtk3/emojier.vala:818 ../ui/gtk3/emojier.vala:857
 #, c-format
 msgid "Code point: %s"
-msgstr ""
+msgstr "Точка кода: %s"
 
 #: ../ui/gtk3/emojier.vala:838
 #, c-format
 msgid "Annotations: %s"
-msgstr ""
+msgstr "Аннотации: %s"
 
 #: ../ui/gtk3/panel.vala:271 ../ui/gtk3/panel.vala:302
 msgid "IBus Panel"
-msgstr ""
+msgstr "Панель IBus"
 
 #: ../ui/gtk3/panel.vala:823
 msgid "IBus Update"
@@ -879,7 +894,7 @@ msgstr "Обновление IBus"
 
 #: ../ui/gtk3/panel.vala:824 ../ui/gtk3/panel.vala:835
 msgid "Super+space is now the default hotkey."
-msgstr ""
+msgstr "Теперь горячей кнопкой служит Super+пробел."
 
 #: ../ui/gtk3/panel.vala:1196
 msgid "IBus is an intelligent input bus for Linux/Unix."
@@ -888,8 +903,9 @@ msgstr "IBus &mdash; интеллектуальная система ввода
 #: ../ui/gtk3/panel.vala:1200
 msgid "translator-credits"
 msgstr ""
-"Alexey Kotlyarov <koterpillar@gmail.com>, 2009.\n"
-"Yulia <ypoyarko@redhat.com>, 2010."
+"Alexey Kotlyarov <koterpillar@gmail.com>, 2009\n"
+"Yulia <ypoyarko@redhat.com>, 2010\n"
+"Alexey Rubtsov <rushills@gmail.com>, 2021"
 
 #: ../ui/gtk3/panel.vala:1219
 msgid "Preferences"
@@ -911,11 +927,11 @@ msgstr "default:LTR"
 
 #: ../ui/gtk3/emojierapp.vala:45
 msgid "Canceled to choose an emoji."
-msgstr ""
+msgstr "Выбор емодзи отменён."
 
 #: ../ui/gtk3/emojierapp.vala:52
 msgid "Copied an emoji to your clipboard."
-msgstr ""
+msgstr "Емодзи скопировано в буфер обмена."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
@@ -926,7 +942,7 @@ msgstr ""
 
 #: ../ui/gtk3/emojierapp.vala:83
 msgid "FONT"
-msgstr ""
+msgstr "ШРИФТ"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
@@ -937,4 +953,4 @@ msgstr ""
 
 #: ../ui/gtk3/emojierapp.vala:89
 msgid "LANG"
-msgstr ""
+msgstr "ЯЗЫК"

From b85c399cc16d1d50b7077f9caf9906ee7e761e93 Mon Sep 17 00:00:00 2001
From: simmon <simmon@nplob.com>
Date: Wed, 18 Aug 2021 13:08:00 +0900
Subject: [PATCH 746/816] po: Update translation (Japanese) (Korean)

Update po/ja.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ja/

Update po/ko.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ko/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/ja.po | 12 ++++----
 po/ko.po | 89 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index e7caa0d97..ce4347990 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,20 +13,22 @@
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008
 # carrotsoft <www.carrotsoft@gmail.com>, 2012
 # fujiwara <takao.fujiwara1@gmail.com>, 2015-2019. #zanata
+# simmon <simmon@nplob.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2019-07-24 03:07+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
+"PO-Revision-Date: 2021-06-20 19:04+0000\n"
+"Last-Translator: simmon <simmon@nplob.com>\n"
+"Language-Team: Japanese <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Weblate 4.7\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -2967,7 +2969,7 @@ msgstr "記号と絵文字拡張 A"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1217
 msgid "Symbols for Legacy Computing"
-msgstr ""
+msgstr "レガシーコンピューティングのシンボル"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
diff --git a/po/ko.po b/po/ko.po
index ebffbcf89..9a766e0f3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -18,30 +18,32 @@
 # Changwoo Ryu <cwryu@debian.org>, 2007-2015. (gucharmap)
 # DaeHyun Sung <sungdh86@gmail.com>, 2016-2019. (gucharmap)
 # Changwoo Ryu <cwryu@debian.org>, 2019-2020.
+# simmon <simmon@nplob.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2020-09-16 08:13+0900\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
-"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
+"PO-Revision-Date: 2021-04-21 03:02+0000\n"
+"Last-Translator: simmon <simmon@nplob.com>\n"
+"Language-Team: Korean <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Weblate 4.6\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
-msgstr "엔진 미리로드"
+msgstr "사전 탑재된 엔진"
 
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "ibus 시작할 때 엔진을 미리 읽어들입니다"
+msgstr "ibus 시작 할 때에 엔진을 미리 탑재합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
@@ -53,7 +55,7 @@ msgstr "입력 방식 목록에 저장된 엔진 순서"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr "IME 전환 창의 팝업 지연 시간, 밀리초 단위"
+msgstr "IME 전환 창의 팝업 지연 시간 밀리 초"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:23
 msgid ""
@@ -73,9 +75,7 @@ msgstr "저장된 버전 번호"
 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/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -83,9 +83,7 @@ msgstr "ASCII가 없는 라틴 문자 키보드 배치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr ""
-"US 키보드 배치가 라틴 문자 키보드 배치에 추가되었습니다. 변형 버전은 생략될 "
-"수 있습니다."
+msgstr "US 키보드 배치가 라틴 문자 키보드 배치에 추가되었습니다. 변형 버전은 생략 될 수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -107,11 +105,11 @@ msgstr "시스템 키보드 배치 (XKB) 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:47
 msgid "Embed Preedit Text"
-msgstr "프리에디트 텍스트 포함"
+msgstr "사전편집 텍스트 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:48
 msgid "Embed Preedit Text in Application Window"
-msgstr "응용 프로그램 창에 프리에디트 텍스트를 포함"
+msgstr "응용 프로그램 창에 사전편집 텍스트를 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
@@ -131,11 +129,11 @@ msgstr "프로그램의 입력창에 포커스가 가면 기본값으로 입력
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
-msgstr "DConf는 이름 접두사를 보존합니다"
+msgstr "DConf는 이름 프리픽스를 보존합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
+msgstr "DConf 키 프리픽스는 이름 변환을 중지합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
@@ -261,12 +259,10 @@ msgid ""
 "percentage values in the range 0% to 100%, and 'a' is a floating point value "
 "in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. "
-"X11의 색상 이름, 2. 'r' 'g' 'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 "
-"'#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0부터 255까지의 값 또"
-"는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또"
-"는, 4. 여기에  'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값"
-"이 될 수 있습니다."
+"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' "
+"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 "
+"0부터 255까지의 값 또는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
+"여기에 'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
@@ -435,8 +431,8 @@ 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."
+"저작권 (c) 2007-2010 Peng Huang\n"
+"저작권 (c) 2007-2010 Red Hat, Inc."
 
 #: ibus/lang.py:41 src/ibusutil.c:209
 msgid "Other"
@@ -449,11 +445,11 @@ msgstr "언어를 선택하십시오"
 #: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
 #: setup/main.py:560
 msgid "_Cancel"
-msgstr "취소(_C)"
+msgstr "_취소"
 
 #: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
-msgstr "확인(_O)"
+msgstr "_오케이"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
@@ -461,11 +457,11 @@ msgstr "더 보기…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
 msgid "About"
-msgstr "정보"
+msgstr "대하여"
 
 #: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
-msgstr "닫기(_C)"
+msgstr "_닫기"
 
 #: setup/engineabout.py:72
 #, python-format
@@ -493,7 +489,7 @@ msgstr "입력 방식을 선택합니다"
 #. add button
 #: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
 msgid "_Add"
-msgstr "추가(_A)"
+msgstr "_추가"
 
 #. create im name & icon column
 #: setup/enginetreeview.py:69 setup/setup.ui:838
@@ -528,7 +524,7 @@ msgstr "적용(_A)"
 #. delete button
 #: setup/keyboardshortcut.py:136
 msgid "_Delete"
-msgstr "삭제(_D)"
+msgstr "_삭제"
 
 #: setup/keyboardshortcut.py:252
 msgid ""
@@ -540,7 +536,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "키 또는 키 조합을 입력하십시오"
+msgstr "키 (또는 키 조합)를 누르세요"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
@@ -713,7 +709,7 @@ msgstr "활성화된 입력 방식 목록에 선택한 입력 방식을 추가
 
 #: setup/setup.ui:682
 msgid "_Remove"
-msgstr "제거(_R)"
+msgstr "_제거"
 
 # tooltip
 #: setup/setup.ui:689
@@ -722,7 +718,7 @@ msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제
 
 #: setup/setup.ui:700
 msgid "_Up"
-msgstr "위로(_U)"
+msgstr "_위"
 
 # tooltip
 #: setup/setup.ui:707
@@ -731,7 +727,7 @@ msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위
 
 #: setup/setup.ui:718
 msgid "_Down"
-msgstr "아래로(_D)"
+msgstr "_아래"
 
 # tooltip
 #: setup/setup.ui:725
@@ -740,7 +736,7 @@ msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아
 
 #: setup/setup.ui:736
 msgid "_About"
-msgstr "정보(_A)"
+msgstr "_정보"
 
 #: setup/setup.ui:743
 msgid "Show information of the selected input method"
@@ -748,7 +744,7 @@ msgstr "선택한 입력 방식의 정보를 표시합니다"
 
 #: setup/setup.ui:754
 msgid "_Preferences"
-msgstr "기본 설정(_P)"
+msgstr "_기본 설정"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
@@ -826,7 +822,7 @@ msgstr "포함 일치"
 
 #: setup/setup.ui:1176
 msgid "Emoji"
-msgstr "에모지"
+msgstr "이모지"
 
 #: setup/setup.ui:1230
 msgid "<b>Keyboard Layout</b>"
@@ -1331,7 +1327,7 @@ msgstr "올 치키 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:281
 msgid "Cyrillic Extended-C"
-msgstr "키릴 문자 확장영역 C"
+msgstr "키릴 문자 확장영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1352,7 +1348,7 @@ msgstr "순다 문자 추가영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:293
 msgid "Vedic Extensions"
-msgstr "베다 확장영역"
+msgstr "베다 확장"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1654,7 +1650,7 @@ msgstr "히라가나"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
 msgid "Katakana"
-msgstr "카타카나"
+msgstr "카다카나"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3301,7 +3297,7 @@ msgstr "다른 이름: %s"
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
 msgid "Emoji Choice"
-msgstr "에모지 선택"
+msgstr "이모지 선택"
 
 #: ui/gtk3/emojier.vala:2142
 msgid "Unicode Choice"
@@ -3334,18 +3330,18 @@ msgstr "\"<글꼴>\"을 에모지 대화창의 에모지 문자에 사용합니
 
 #: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
-msgstr "<글꼴>"
+msgstr "글꼴"
 
 #. TRANSLATORS: "LANG" should be capital and translatable.
 #. * It's used for an argument command --lang=LANG
 #.
 #: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"<언어>\"를 에모지 대화창 주석에 사용합니다 (예: \"en\")"
+msgstr "\"언어\"를 에모지 대화창 주석에 사용합니다. 예: \"en\""
 
 #: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
-msgstr "<언어>"
+msgstr "언어"
 
 #: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
@@ -3371,7 +3367,8 @@ msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 msgid "translator-credits"
 msgstr ""
 "김은주 <eukim@redhat.com>\n"
-"류창우 <cwryu@debian.org>"
+"류창우 <cwryu@debian.org>\n"
+"simmon <simmon@nplob.com>"
 
 #: ui/gtk3/panel.vala:1142
 msgid "Preferences"

From 904f162ee3170125b637fad76cfdde6542a37965 Mon Sep 17 00:00:00 2001
From: Seong-ho Cho <darkcircle.0426@gmail.com>
Date: Wed, 18 Aug 2021 13:10:29 +0900
Subject: [PATCH 747/816] po: Update translation (Korean)

Update po/ko.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ko/

BUG=https://github.com/ibus/ibus/pull/2305
---
 po/ko.po | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 9a766e0f3..99a3bb100 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -10,7 +10,7 @@
 # Hyunsok Oh <hoh@redhat.com>, 2010
 # lego37yoon <lego37yoon@outlook.com>, 2014
 # Michelle Kim <mkim33@gmail.com>, 2012-2014
-# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014, 2021.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # Michelle Kim <mkim33@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
@@ -24,8 +24,8 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2021-04-21 03:02+0000\n"
-"Last-Translator: simmon <simmon@nplob.com>\n"
+"PO-Revision-Date: 2021-07-22 07:04+0000\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Korean <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/ko/>\n"
 "Language: ko\n"
@@ -33,17 +33,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6\n"
+"X-Generator: Weblate 4.7.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
 msgid "Preload engines"
-msgstr "사전 탑재된 엔진"
+msgstr "엔진 미리 불러오기"
 
 #. Translators: Tooltip for the button “Preload Engines”
 #: data/dconf/org.freedesktop.ibus.gschema.xml:13
 msgid "Preload engines during ibus starts up"
-msgstr "ibus 시작 할 때에 엔진을 미리 탑재합니다"
+msgstr "ibus 시작 할 때에 엔진을 미리 불러옵니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:17
 msgid "Engines order"
@@ -69,13 +69,13 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:27
 msgid "Saved version number"
-msgstr "저장된 버전 번호"
+msgstr "저장한 버전 번호"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:28
 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/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -105,11 +105,11 @@ msgstr "시스템 키보드 배치 (XKB) 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:47
 msgid "Embed Preedit Text"
-msgstr "사전편집 텍스트 포함"
+msgstr "사전 편집 텍스트 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:48
 msgid "Embed Preedit Text in Application Window"
-msgstr "응용 프로그램 창에 사전편집 텍스트를 포함"
+msgstr "응용 프로그램 창에 사전 편집 텍스트를 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
@@ -192,7 +192,7 @@ msgstr "자동 숨기기"
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
-msgstr "속성 패널 돌작입니다. 0 = 보여주지 않음, 1 = 자동 숨김, 2 = 항상 표시"
+msgstr "속성 패널 동작입니다. 0 = 보여주지 않음, 1 = 자동 숨김, 2 = 항상 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:117
 #: data/dconf/org.freedesktop.ibus.gschema.xml:121
@@ -285,7 +285,7 @@ msgstr "사용자 정의 글꼴 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
+msgstr "언어 패널용 사용자 정의 글꼴 이름 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
 #: data/dconf/org.freedesktop.ibus.gschema.xml:192
@@ -294,7 +294,7 @@ msgstr "사용자 정의 글꼴"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "언어 패널에 사용할 사용자 정의 글꼴 이름"
+msgstr "언어 패널용 사용자 정의 글꼴 이름"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
 msgid "Choose glyphs with input method's language on candidate window"

From 32d54e0f07c945b906fa52d309879cfd60d8688d Mon Sep 17 00:00:00 2001
From: JungHee Lee <36289819+MarongHappy@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:00:51 +0900
Subject: [PATCH 748/816] po: Update translation (Korean)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update po/ko.po at 100.0%
기존 번역 입력 방식, 입력 방법, 입력기로 번역된 것을 입력기로 통일하였습니다.
새로 추가된 내용을 번역하였습니다.
기타 등등...

BUG=https://github.com/ibus/ibus/pull/2318
---
 po/ko.po | 247 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 138 insertions(+), 109 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 99a3bb100..e63c77177 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -51,7 +51,7 @@ msgstr "엔진 순서"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:18
 msgid "Saved engines order in input method list"
-msgstr "입력 방식 목록에 저장된 엔진 순서"
+msgstr "입력기 목록에 저장된 엔진 순서"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:22
 msgid "Popup delay milliseconds for IME switcher window"
@@ -93,7 +93,8 @@ msgstr "xmodmap 사용"
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
-"ibus 엔진을 전환할 때 .xmodmap 또는 .Xmodmap이 있으면 xmodmap 실행합니다."
+"ibus 엔진을 전환할 때 .xmodmap 또는 .Xmodmap이 있는 경우 xmodmap을 실행합니"
+"다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
 msgid "Use system keyboard layout"
@@ -113,11 +114,11 @@ msgstr "응용 프로그램 창에 사전 편집 텍스트를 포함"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:52
 msgid "Use global input method"
-msgstr "전체 공통 입력 방식 사용"
+msgstr "전체 공통 입력기 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
 msgid "Share the same input method among all applications"
-msgstr "모든 응용 프로그램에서 동일한 입력 방식 공유"
+msgstr "모든 응용 프로그램에서 동일한 입력기 공유"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:57
 msgid "Enable input method by default"
@@ -125,7 +126,7 @@ msgstr "입력기를 기본값으로 활성화"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:58
 msgid "Enable input method by default when the application gets input focus"
-msgstr "프로그램의 입력창에 포커스가 가면 기본값으로 입력기를 활성화합니다"
+msgstr "응용프로그램의 입력창에 포커스가 가면 기본적으로 입력기 활성화"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
@@ -137,56 +138,56 @@ msgstr "DConf 키 프리픽스는 이름 변환을 중지합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
-msgstr "트리거 바로 가기 키"
+msgstr "트리거 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:71
 #: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
 msgid "The shortcut keys for turning input method on or off"
-msgstr "입력 방식을 활성 또는 해제하는 바로 가기 키"
+msgstr "입력기를 켜거나 끄기 위한 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:75
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse의 트리거 바로 가기 키"
+msgstr "gtk_accelerator_parse의 트리거 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:80
 msgid "Enable shortcut keys"
-msgstr "바로 가기 키 활성화"
+msgstr "단축키 활성화"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:81
 msgid "The shortcut keys for turning input method on"
-msgstr "입력 방식을 전환하는 바로 가기 키 활성화"
+msgstr "입력기를 켜기 위한 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:85
 msgid "Disable shortcut keys"
-msgstr "바로 가기 키 비활성화"
+msgstr "단축키 비활성화"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:86
 msgid "The shortcut keys for turning input method off"
-msgstr "입력 방식을 전환하는 바로 가기 키 비활성화"
+msgstr "입력기를 끄기 위한 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:90
 #: data/dconf/org.freedesktop.ibus.gschema.xml:95
 msgid "Next engine shortcut keys"
-msgstr "다음 엔진 바로 가기 키"
+msgstr "다음 엔진 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:91
 #: data/dconf/org.freedesktop.ibus.gschema.xml:96
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 키"
+msgstr "목록에 있는 다음 입력기로 전환하기 위한 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:100
 #: data/dconf/org.freedesktop.ibus.gschema.xml:105
 msgid "Prev engine shortcut keys"
-msgstr "이전 엔진 바로 가기 키"
+msgstr "이전 엔진 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:101
 #: data/dconf/org.freedesktop.ibus.gschema.xml:106
 msgid "The shortcut keys for switching to the previous input method"
-msgstr "목록에 있는 이전 입력 방식으로 전환하는 바로 가기 키"
+msgstr "목록에 있는 이전 입력기로 전환하기 위한 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:112
 msgid "Auto hide"
-msgstr "자동 숨기기"
+msgstr "자동 숨김"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:113
 msgid ""
@@ -201,19 +202,19 @@ msgstr "언어 패널 위치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Follow the input cursor in case the panel is always shown"
-msgstr "패널을 항상 표시할 경우 입력 커서를 따라감"
+msgstr "패널이 항상 표시되는 경우 입력 커서를 따라감"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
-"참이면, 패널을 항상 표시할 때 패널이 입력 커서를 따라갑니다. 거짓이면, 고정"
-"된 위치에서 패널이 나타납니다."
+"참이면, 패널이 항상 표시되는 경우 패널이 입력 커서를 따라갑니다. 거짓이면, 패"
+"널이 고정된 위치에 표시됩니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "The milliseconds to show property panel"
-msgstr "속성 패널을 표시할 시간, 밀리초 단위"
+msgstr "속성 패널을 표시할 시간(밀리초)"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid ""
@@ -239,11 +240,11 @@ msgstr "시스템 트레이에 아이콘 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:145
 msgid "Show input method name"
-msgstr "입력 방식 이름 표시"
+msgstr "입력기 이름 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
 msgid "Show input method name on language bar"
-msgstr "언어 도구 모음에 입력 방식 이름 표시"
+msgstr "입력 도구모음에 입력기 이름 표시"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "RGBA value of XKB icon"
@@ -281,20 +282,20 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:160
 msgid "Use custom font"
-msgstr "사용자 정의 글꼴 사용"
+msgstr "사용자 지정 글꼴 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:161
 msgid "Use custom font name for language panel"
-msgstr "언어 패널용 사용자 정의 글꼴 이름 사용"
+msgstr "언어 패널용 사용자 지정 글꼴 이름 사용"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:165
 #: data/dconf/org.freedesktop.ibus.gschema.xml:192
 msgid "Custom font"
-msgstr "사용자 정의 글꼴"
+msgstr "사용자 지정 글꼴"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Custom font name for language panel"
-msgstr "언어 패널용 사용자 정의 글꼴 이름"
+msgstr "언어 패널에 사용할 지정 글꼴 이름"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
 msgid "Choose glyphs with input method's language on candidate window"
@@ -306,99 +307,103 @@ msgid ""
 "from the language attribute. Pango chooses glyphs from the IBus engine's "
 "language if the value is true and choose them from the desktop locale if the "
 "value is false."
-msgstr "일부 코드 포인트는 여러 개의 글리프를 사용할 수 있어서 Pango에서 언어 속성에 따라 글리프를 결정합니다. 이 값이 참이면 Pango에서는 아이버스 엔진의 언어에 따라 글리프를 결정합니다. 이 값이 거짓이면 데스크톱 로캘에 따라 글리프를 결정합니다."
+msgstr ""
+"일부 코드 포인트는 여러 개의 글리프를 사용할 수 있어서 Pango에서 언어 속성에 "
+"따라 글리프를 결정합니다. 이 값이 참이면 Pango에서는 아이버스 엔진의 언어에 "
+"따라 글리프를 결정합니다. 이 값이 거짓이면 데스크톱 로캘에 따라 글리프를 결정"
+"합니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:182
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr "유니코드 바로 가기 키, gtk_accelerator_parse 형식"
+msgstr "유니코드 단축키, gtk_accelerator_parse 형식"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:183
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr "입력 방식을 활성 또는 해제하는 바로 가기 키"
+msgstr "입력기를 활성 또는 해제하는 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:187
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr "gtk_accelerator_parse에 사용할 에모지 바로 가기 키"
+msgstr "gtk_accelerator_parse의 이모지 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:188
 msgid "The shortcut keys for turning emoji typing on or off"
-msgstr "에모지 입력을 켜거나 끄는 바로 가기 키"
+msgstr "이모지 입력을 켜거나 끄는 단축키"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:193
 msgid "Custom font name for emoji characters on emoji dialog"
-msgstr "에모지 대화창의 에모지 문자에 사용할 사용자 설정 글꼴 이름"
+msgstr "이모지 대화창의 이모지 문자에 사용할 사용자 설정 글꼴 이름"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:197
 msgid "Default language for emoji dictionary"
-msgstr "에모지 사전에 사용할 기본값 언어"
+msgstr "이모지 사전에 사용할 기본값 언어"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:198
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
-"에모지 대화창의 에모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/"
+"이모지 대화창의 이모지 사전의 기본 언어를 선택합니다. $lang 값이면 /usr/"
 "share/ibus/dicts/emoji-$lang.dict 사전을 사용합니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:202
 msgid "favorite emoji list on emoji dialog"
-msgstr "에모지 대화 창의 자주 사용하는 에모지 목록"
+msgstr "이모지 대화 창의 자주 사용하는 이모지 목록"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:203
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
-"이 목록에 문자가 들어 있으면 에모지 목록에서 자주 사용하는 에모지를 표시합니"
+"이 목록에 문자가 들어 있으면 이모지 목록에서 자주 사용하는 이모지를 표시합니"
 "다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:207
 msgid "favorite emoji annotation list on emoji dialog"
-msgstr "에모지 대화 창의 자주 사용하는 에모지 주석"
+msgstr "이모지 대화 창의 자주 사용하는 이모지 주석"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:208
 msgid "You can assign an annotation for a favorite emoji in this list."
-msgstr "이 목록에 자주 사용하는 에모지의 주석을 저장할 수 있습니다."
+msgstr "이 목록에 자주 사용하는 이모지의 주석을 저장할 수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:212
 msgid "Whether emoji annotations can be match partially or not"
-msgstr "에모지 주석을 일부분 일치할지 여부"
+msgstr "이모지 주석을 일부분 일치할지 여부"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:213
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
-"에모지 주석 전체가 일치할 경우가 아니더라도 문자열 일부분만 일치해도 찾을지 "
+"이모지 주석 전체가 일치할 경우가 아니더라도 문자열 일부분만 일치해도 찾을지 "
 "여부."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:217
 msgid "Match emoji annotations with the specified length"
-msgstr "지정한 길이의 에모지 주석 일치"
+msgstr "지정한 길이의 이모지 주석 일치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:218
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
-"에모지 주석 전체가 일치할 경우가 아니더라도 지정한 개수의 문자보다 많이 일치"
+"이모지 주석 전체가 일치할 경우가 아니더라도 지정한 개수의 문자보다 많이 일치"
 "하면 찾습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:222
 msgid "Choose a condition to match emoji annotations partially"
-msgstr "에모지 주석을 부분 일치하는 조건 선택"
+msgstr "이모지 주석을 부분 일치하는 조건 선택"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:223
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
-"에모지 주석을 부분 일치하는 다음 조건 중의 하나를 고르십시오: 0 = 시작 일치, "
+"이모지 주석을 부분 일치하는 다음 조건 중의 하나를 고르십시오: 0 = 시작 일치, "
 "1 == 끝 일치, 2 == 포함 일치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:227
 msgid "Load the emoji data at the time of startup"
-msgstr "시작할 때 에모지 데이터 읽어들이기"
+msgstr "시작할 때 이모지 데이터 읽어들이기"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:228
 msgid ""
@@ -406,8 +411,8 @@ msgid ""
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
-"참이면 시작할 때 에모지 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 "
-"10MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 처음 열 때 에모지 데이터"
+"참이면 시작할 때 이모지 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 "
+"10MB의 메모리가 필요합니다. 거짓이면 이모지 대화창을 처음 열 때 이모지 데이터"
 "를 읽어들입니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:232
@@ -422,8 +427,8 @@ msgid ""
 "data is loaded even if true."
 msgstr ""
 "참이면 시작할 때 유니코드 데이터를 읽어들입니다. 이 데이터를 읽어들이려면 약 "
-"15MB의 메모리가 필요합니다. 거짓이면 에모지 대화창을 처음 열 때 유니코드 데이"
-"터를 읽어들입니다. 참이더라도 에모지 데이터를 읽어들인 뒤에는 유니코드 데이터"
+"15MB의 메모리가 필요합니다. 거짓이면 이모지 대화창을 처음 열 때 유니코드 데이"
+"터를 읽어들입니다. 참이더라도 이모지 데이터를 읽어들인 뒤에는 유니코드 데이터"
 "를 항상 읽어들입니다."
 
 #: ibus/_config.py.in:41
@@ -455,7 +460,7 @@ msgstr "_오케이"
 msgid "More…"
 msgstr "더 보기…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1162
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
 msgstr "대하여"
 
@@ -484,7 +489,7 @@ msgstr "설명:\n"
 
 #: setup/enginecombobox.py:139 setup/enginedialog.py:57
 msgid "Select an input method"
-msgstr "입력 방식을 선택합니다"
+msgstr "입력기를 선택합니다"
 
 #. add button
 #: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
@@ -494,7 +499,7 @@ msgstr "_추가"
 #. create im name & icon column
 #: setup/enginetreeview.py:69 setup/setup.ui:838
 msgid "Input Method"
-msgstr "입력 방식"
+msgstr "입력기"
 
 #: setup/ibus-setup.desktop:3 setup/setup.ui:69
 msgid "IBus Preferences"
@@ -506,7 +511,7 @@ msgstr "IBus 기본 설정 변경"
 
 #: setup/keyboardshortcut.py:55
 msgid "Keyboard shortcuts"
-msgstr "키보드 바로 가기 키"
+msgstr "키보드 단축키"
 
 #: setup/keyboardshortcut.py:67
 msgid "Key code:"
@@ -540,7 +545,7 @@ msgstr "키 (또는 키 조합)를 누르세요"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr "이전 입력 방식으로 전환는 바로 가기 키에 Shift를 누른 키 사용"
+msgstr "이전 입력기로 전환는 단축키에 Shift를 누른 키 사용"
 
 #: setup/main.py:515
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -569,12 +574,12 @@ msgstr "IBus 데몬이 %d초 내에 시작하지 못했습니다."
 #: setup/main.py:562
 #, python-format
 msgid "Select keyboard shortcut for %s"
-msgstr "%s의 바로 가기 키 선택"
+msgstr "%s의 단축키 선택"
 
 #. Translators: Title of the window
 #: setup/main.py:564
 msgid "switching input methods"
-msgstr "입력 방식 전환"
+msgstr "입력기 전환"
 
 #: setup/setup.ui:11
 msgid "Horizontal"
@@ -602,7 +607,7 @@ msgstr "오른쪽 아래 구석"
 
 #: setup/setup.ui:37
 msgid "Custom"
-msgstr "사용자 정의"
+msgstr "사용자 지정"
 
 #: setup/setup.ui:48
 msgid "Do not show"
@@ -610,7 +615,7 @@ msgstr "표시하지 않음"
 
 #: setup/setup.ui:51
 msgid "Hide automatically"
-msgstr "자동으로 숨기기"
+msgstr "자동으로 숨김"
 
 #: setup/setup.ui:54
 msgid "Always"
@@ -619,20 +624,20 @@ msgstr "항상"
 # tooltip
 #: setup/setup.ui:113
 msgid "The shortcut keys for switching to next input method in the list"
-msgstr "목록에 있는 다음 입력 방식으로 전환하는 바로 가기 키"
+msgstr "목록에 있는 다음 입력기로 전환하는 단축키"
 
 #: setup/setup.ui:115
 msgid "Next input method:"
-msgstr "다음 입력 방식:"
+msgstr "다음 입력기:"
 
 # tooltip
 #: setup/setup.ui:127
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr "목록에 있는 이전 입력 방식으로 전환하는 바로 가기 키"
+msgstr "목록에 있는 이전 입력기로 전환하는 단축키"
 
 #: setup/setup.ui:129
 msgid "Previous input method:"
-msgstr "이전 입력 방식:"
+msgstr "이전 입력기:"
 
 #: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
 #: setup/setup.ui:903 setup/setup.ui:957
@@ -653,7 +658,7 @@ msgstr "비활성화:"
 
 #: setup/setup.ui:345 setup/setup.ui:983
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>바로 가기 키</b>"
+msgstr "<b>키보드 단축키</b>"
 
 #: setup/setup.ui:374
 msgid "Set the orientation of candidates in lookup table"
@@ -666,11 +671,11 @@ msgstr "후보 창의 방향:"
 # tooltip
 #: setup/setup.ui:407
 msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr "ibus가 언어 모음을 표시하거나 숨기는 방식을 설정합니다"
+msgstr "입력 도구모음을 표시하거나 숨기는 ibus의 동작 방식을 설정합니다"
 
 #: setup/setup.ui:409
 msgid "Show property panel:"
-msgstr "속성 패널을 표시:"
+msgstr "속성 패널 표시:"
 
 #: setup/setup.ui:423
 msgid "Language panel position:"
@@ -679,7 +684,7 @@ msgstr "언어 패널 위치:"
 # tooltip
 #: setup/setup.ui:494
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr "확인란을 선택하면 입력 방식의 이름을 언어 모음에 표시합니다"
+msgstr "확인란을 선택하면 입력기의 이름을 입력 도구모음에 표시합니다"
 
 #: setup/setup.ui:508
 msgid "Embed preedit text in application window"
@@ -688,11 +693,11 @@ msgstr "응용 프로그램 창에 프리에디트 텍스트 포함"
 # tooltip
 #: setup/setup.ui:513
 msgid "Embed the preedit text of input method in the application window"
-msgstr "입력 방식의 프리에디트 텍스트를 어플레케이션 창에 포함시킵니다"
+msgstr "입력기의 프리에디트 텍스트를 어플레케이션 창에 포함시킵니다"
 
 #: setup/setup.ui:527
 msgid "Use custom font:"
-msgstr "사용자 정의 글꼴 사용:"
+msgstr "사용자 지정 글꼴 사용:"
 
 #: setup/setup.ui:562 setup/setup.ui:1156
 msgid "<b>Font and Style</b>"
@@ -705,7 +710,7 @@ msgstr "일반"
 # tooltip
 #: setup/setup.ui:671
 msgid "Add the selected input method into the enabled input methods"
-msgstr "활성화된 입력 방식 목록에 선택한 입력 방식을 추가합니다"
+msgstr "활성화된 입력기 목록에 선택한 입력기를 추가합니다"
 
 #: setup/setup.ui:682
 msgid "_Remove"
@@ -714,7 +719,7 @@ msgstr "_제거"
 # tooltip
 #: setup/setup.ui:689
 msgid "Remove the selected input method from the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거합니다"
+msgstr "활성화된 입력기 목록에서 선택한 입력기를 제거합니다"
 
 #: setup/setup.ui:700
 msgid "_Up"
@@ -723,7 +728,7 @@ msgstr "_위"
 # tooltip
 #: setup/setup.ui:707
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
+msgstr "활성화된 입력기 목록에서 선택한 입력기를 위로 이동합니다"
 
 #: setup/setup.ui:718
 msgid "_Down"
@@ -732,7 +737,7 @@ msgstr "_아래"
 # tooltip
 #: setup/setup.ui:725
 msgid "Move down the selected input method in the enabled input methods"
-msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 아래로 이동합니다"
+msgstr "활성화된 입력기 목록에서 선택한 입력기를 아래로 이동합니다"
 
 #: setup/setup.ui:736
 msgid "_About"
@@ -740,7 +745,7 @@ msgstr "_정보"
 
 #: setup/setup.ui:743
 msgid "Show information of the selected input method"
-msgstr "선택한 입력 방식의 정보를 표시합니다"
+msgstr "선택한 입력기의 정보를 표시합니다"
 
 #: setup/setup.ui:754
 msgid "_Preferences"
@@ -748,7 +753,7 @@ msgstr "_기본 설정"
 
 #: setup/setup.ui:761
 msgid "Show setup of the selected input method"
-msgstr "선택한 입력 방식의 설정을 표시합니다"
+msgstr "선택한 입력기의 설정을 표시합니다"
 
 #: setup/setup.ui:812
 msgid ""
@@ -756,23 +761,23 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>위의 목록에서 선택한 후 키보드 바로 가기 키를 누르거나 패널 아이콘"
-"을 눌러 활성 입력 방식을 전환할 수 있습니다.</i></small>"
+"<small><i>위의 목록에서 선택한 후 키보드 단축키를 누르거나 패널 아이콘을 눌"
+"러 활성 입력기를 전환할 수 있습니다.</i></small>"
 
 # tooltip
 #: setup/setup.ui:873
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode names"
-msgstr "에모지 주석 또는 유니코드 이름을 문자로 변환하는 바로 가기 키 목록"
+msgstr "이모지 주석 또는 유니코드 이름을 문자로 변환하는 단축키 목록"
 
 #: setup/setup.ui:875
 msgid "Emoji annotation:"
-msgstr "에모지 주석:"
+msgstr "이모지 주석:"
 
 # tooltip
 #: setup/setup.ui:927
 msgid "The shortcut keys to enable Unicode code point conversions"
-msgstr "유니코드 코드 값을 문자로 변환하는 바로 가기 키"
+msgstr "유니코드 코드 값을 문자로 변환하는 단축키"
 
 #: setup/setup.ui:929
 msgid "Unicode code point:"
@@ -781,7 +786,7 @@ msgstr "유니코드 코드 값:"
 # tooltip
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
-msgstr "에모지 대화창의 유니코드 후보 문자의 글꼴을 설정합니다"
+msgstr "이모지 대화창의 유니코드 후보 문자의 글꼴을 설정합니다"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
@@ -790,23 +795,23 @@ msgstr "유니코드 글꼴:"
 # tooltip
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "에모지 대화창의 에모지 주석 언어를 설정합니다"
+msgstr "이모지 대화창의 이모지 주석 언어를 설정합니다"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
-msgstr "에모지 주석 언어:"
+msgstr "이모지 주석 언어:"
 
 #: setup/setup.ui:1062
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
-msgstr "에모지 주석이 다음 조건에 따라 일정 문자 개수보다 더 일치하면 찾기:"
+msgstr "이모지 주석이 다음 조건에 따라 일정 문자 개수보다 더 일치하면 찾기:"
 
 #: setup/setup.ui:1067
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
-msgstr "에모지 주석이 전체 일치하지 않더라도 문자열 일부만 일치하면 찾습니다"
+msgstr "이모지 주석이 전체 일치하지 않더라도 문자열 일부만 일치하면 찾습니다"
 
 #: setup/setup.ui:1101
 msgid "Prefix match"
@@ -830,13 +835,14 @@ msgstr "<b>키보드 배치</b>"
 
 #: setup/setup.ui:1278
 msgid "<b>Global input method settings</b>"
-msgstr "<b>전체 공통 입력 방식 설정</b>"
+msgstr "<b>전체 공통 입력기 설정</b>"
 
 #: setup/setup.ui:1310
 msgid ""
 "Choose glyphs with the input method's language on the candidate window for "
 "the duplicated code points"
-msgstr "중복된 코드 포인트의 후보 창에서 입력기의 언어에 따라 글리프를 선택합니다"
+msgstr ""
+"중복된 코드 포인트의 후보 창에서 입력기의 언어에 따라 글리프를 선택합니다"
 
 #: setup/setup.ui:1327
 msgid "<b>Fonts</b>"
@@ -1277,7 +1283,7 @@ msgstr "부기스 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:253
 msgid "Tai Tham"
-msgstr "타이삼 문자"
+msgstr "란나 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1313,14 +1319,14 @@ msgstr "바타크 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:273
 msgid "Lepcha"
-msgstr "레프차 문자"
+msgstr "렙차 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:277
 msgid "Ol Chiki"
-msgstr "올 치키 문자"
+msgstr "올치키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1376,7 +1382,7 @@ msgstr "조합 구분 표시 추가영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:309
 msgid "Latin Extended Additional"
-msgstr "라틴 확장 추가영역"
+msgstr "라틴 문자 확장 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1559,7 +1565,7 @@ msgstr "여러가지 기호 및 화살표"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:413
 msgid "Glagolitic"
-msgstr "글라골루 문자"
+msgstr "글라골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3141,7 +3147,7 @@ msgstr ""
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr "초기화 중…"
+msgstr "재설정 중…"
 
 #: tools/main.vala:399
 msgid "Done"
@@ -3193,7 +3199,7 @@ msgstr "설정 값 재설정"
 
 #: tools/main.vala:456
 msgid "Save emoji on dialog to clipboard"
-msgstr "대화창의 에모지를 클립보드에 저장"
+msgstr "대화창의 이모지를 클립보드에 저장"
 
 #: tools/main.vala:458
 msgid "Show this information"
@@ -3231,7 +3237,7 @@ msgstr "유니코드 선택 열기"
 
 #: ui/gtk3/emojier.vala:995
 msgid "Bring back emoji choice"
-msgstr "에모지 선택으로 돌아가기"
+msgstr "이모지 선택으로 돌아가기"
 
 #: ui/gtk3/emojier.vala:1097
 msgid "Page Down"
@@ -3243,7 +3249,7 @@ msgstr "이전 페이지"
 
 #: ui/gtk3/emojier.vala:1111
 msgid "Show emoji variants"
-msgstr "에모지 변종 보기"
+msgstr "이모지 변종 보기"
 
 #: ui/gtk3/emojier.vala:1112
 msgid "Close"
@@ -3268,7 +3274,7 @@ msgstr "코드값: %s"
 
 #: ui/gtk3/emojier.vala:1425
 msgid "Has emoji variants"
-msgstr "에모지 변종 있음"
+msgstr "이모지 변종 있음"
 
 #: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
 #, c-format
@@ -3310,23 +3316,23 @@ msgid ""
 "mode, click your desktop and click your text application again."
 msgstr ""
 "현재 텍스트 응용 프로그램을 알아낼 수 없습니다. 응용 프로그램의 포커스를 다"
-"시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 에모지 입력 모드를 벗어나거"
+"시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 이모지 입력 모드를 벗어나거"
 "나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보십시오."
 
 #: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
-msgstr "에모지 선택 취소됨."
+msgstr "이모지 선택 취소됨."
 
 #: ui/gtk3/emojierapp.vala:67
 msgid "Copied an emoji to your clipboard."
-msgstr "에모지를 클립보드에 복사."
+msgstr "이모지를 클립보드에 복사."
 
 #. TRANSLATORS: "FONT" should be capital and translatable.
 #. * It's used for an argument command --font=FONT
 #.
 #: ui/gtk3/emojierapp.vala:126
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "\"<글꼴>\"을 에모지 대화창의 에모지 문자에 사용합니다"
+msgstr "이모지 대화상자의 이모지 문자 \"<글꼴>\""
 
 #: ui/gtk3/emojierapp.vala:127
 msgid "FONT"
@@ -3337,7 +3343,7 @@ msgstr "글꼴"
 #.
 #: ui/gtk3/emojierapp.vala:132
 msgid "\"LANG\" for annotations on emoji dialog. E.g. \"en\""
-msgstr "\"언어\"를 에모지 대화창 주석에 사용합니다. 예: \"en\""
+msgstr "\"언어\"를 이모지 대화창 주석에 사용합니다. 예: \"en\""
 
 #: ui/gtk3/emojierapp.vala:133
 msgid "LANG"
@@ -3345,7 +3351,7 @@ msgstr "언어"
 
 #: ui/gtk3/emojierapp.vala:135
 msgid "Emoji annotations can be match partially"
-msgstr "에모지 주석 일부분과 일치 가능"
+msgstr "이모지 주석을 부분적으로 일치시킬 수 있습니다"
 
 #: ui/gtk3/emojierapp.vala:139
 msgid "Match with the length of the specified integer"
@@ -3353,32 +3359,55 @@ msgstr "지정한 정수 값 길이만큼 일치"
 
 #: ui/gtk3/emojierapp.vala:143
 msgid "Match with the condition of the specified integer"
-msgstr "지정한 정수 값의 조건에 맞게 일치"
+msgstr "지정된 정수의 조건과 일치"
 
 #: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
 msgid "IBus Panel"
 msgstr "IBus 패널"
 
-#: ui/gtk3/panel.vala:1119
+#: ui/gtk3/panel.vala:975
+#, c-format
+msgid ""
+"Your configured input method %s does not exist in IBus input methods so \"US"
+"\" layout was configured instead of your input method."
+msgstr ""
+"당신이 사용하도록 설정한 %s 입력기가 IBUS 입력기에 없으므로, 당신의 입력기 대"
+"신 \"US\" 키보드 배치가 설정되었습니다."
+
+#: ui/gtk3/panel.vala:980
+msgid ""
+"At least one of your configured input methods does not exist in IBus input "
+"methods."
+msgstr "IBus 입력기에는 당신이 사용하도록 설정한 입력기가 존재하지 않습니다."
+
+#: ui/gtk3/panel.vala:983
+msgid ""
+"Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
+"your input methods again."
+msgstr ""
+"`ibus-setup` 명령을 실행하고 \"입력기\" 탭을 연 다음 입력기를 다시 구성하십시"
+"오."
+
+#: ui/gtk3/panel.vala:1141
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 
-#: ui/gtk3/panel.vala:1123
+#: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
 msgstr ""
 "김은주 <eukim@redhat.com>\n"
 "류창우 <cwryu@debian.org>\n"
 "simmon <simmon@nplob.com>"
 
-#: ui/gtk3/panel.vala:1142
+#: ui/gtk3/panel.vala:1164
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ui/gtk3/panel.vala:1168
+#: ui/gtk3/panel.vala:1190
 msgid "Restart"
 msgstr "다시 시작"
 
-#: ui/gtk3/panel.vala:1172
+#: ui/gtk3/panel.vala:1194
 msgid "Quit"
 msgstr "끝내기"
 

From e465011b48cbaca4f18a65cf7b23a1035cf6b105 Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Wed, 18 Aug 2021 06:03:19 +0200
Subject: [PATCH 749/816] setup: Start ibus-daemon with the --daemonize option

When starting ibus-daemon from IBus Preferences, it's started
with the command "ibus-daemon --xim". However, ibus-daemon is
killed once you close IBus Preferences.

This commit adds the "--daemonize" option, so ibus-daemon keeps
running also after IBus Preferences has been closed.

BUG=https://github.com/ibus/ibus/issues/2316
---
 setup/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/main.py b/setup/main.py
index 673c8cdee..1b9056a6d 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -528,7 +528,7 @@ def __init_bus(self):
         GLib.timeout_add_seconds(timeout, lambda *args: main_loop.quit())
         self.__bus.connect("connected", lambda *args: main_loop.quit())
 
-        os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
+        os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim", "--daemonize")
 
         main_loop.run()
 

From bc265fb6c3792573db142c72cfcb36227c384d82 Mon Sep 17 00:00:00 2001
From: user202729 <25191436+user202729@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:24:34 +0900
Subject: [PATCH 750/816] src: Fix a typo in ibusenginesimple.h

BUG=https://github.com/ibus/ibus/pull/2332
---
 src/ibusenginesimple.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ibusenginesimple.h b/src/ibusenginesimple.h
index bd385e5b9..3c490f08b 100644
--- a/src/ibusenginesimple.h
+++ b/src/ibusenginesimple.h
@@ -121,7 +121,7 @@ GType   ibus_engine_simple_get_type       (void);
  * @simple: An IBusEngineSimple.
  * @data: (element-type guint16) (array): The table which must be available
  *      during the whole life of the simple engine.
- * @max_seq_len: Maximum length of a swquence in the table (cannot be greater
+ * @max_seq_len: Maximum length of a sequence in the table (cannot be greater
  *      than %IBUS_MAX_COMPOSE_LEN)
  * @n_seqs: number of sequences in the table
  *

From 934c456e612711940b29429bf6a52ff6cb4be0ab Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Aug 2021 09:36:43 +0900
Subject: [PATCH 751/816] autogen: Check xkeyboard-config-devel for
 XKBCONFIG_BASE variable

---
 autogen.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 20d6361af..693a27408 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,10 +13,14 @@ src/ibusunicodegen.h
 FEDORA_PKG1='autoconf automake libtool gettext-devel'
 FEDORA_PKG2='glib2-devel gtk2-devel gtk3-devel
  wayland-devel'
-FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd'
+FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd
+ xkeyboard-config-devel'
 
 (test -z "$DISABLE_INSTALL_PKGS") && {
     (test -f /etc/fedora-release ) && {
+        rpm -q $FEDORA_PKG1 || exit 1
+        rpm -q $FEDORA_PKG2 || exit 1
+        rpm -q $FEDORA_PKG3 || exit 1
         dnf update --assumeno $FEDORA_PKG1 || exit 1
         dnf update --assumeno $FEDORA_PKG2 || exit 1
         dnf update --assumeno $FEDORA_PKG3 || exit 1

From 238eb612b5e8faa96841006d863044fffac03eab Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Aug 2021 09:42:12 +0900
Subject: [PATCH 752/816] engine: Update simple.xml with xkeyboard-config 2.33

---
 engine/simple.xml.in | 214 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 161 insertions(+), 53 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index f4aa1c6f8..65133d9de 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -3,7 +3,7 @@
     <name>org.freedesktop.IBus.Simple</name>
     <description>A table based simple engine</description>
     <exec>@libexecdir@/ibus-engine-simple</exec>
-    <version>1.5.23.20210221</version>
+    <version>1.5.25.20210819</version>
     <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
     <license>GPL</license>
     <homepage>https://github.com/ibus/ibus/wiki</homepage>
@@ -104,6 +104,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:us:colemak_dh_iso:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>colemak_dh_iso</layout_variant>
+            <longname>English (Colemak-DH ISO)</longname>
+            <description>English (Colemak-DH ISO)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:us:dvorak:eng</name>
             <language>en</language>
@@ -1143,8 +1155,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>ben_inscript</layout_variant>
-            <longname>Bangla (India, Baishakhi Inscript)</longname>
-            <description>Bangla (India, Baishakhi Inscript)</description>
+            <longname>Bangla (India, Baishakhi InScript)</longname>
+            <description>Bangla (India, Baishakhi InScript)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1155,8 +1167,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>ben_inscript</layout_variant>
-            <longname>Bangla (India, Baishakhi Inscript)</longname>
-            <description>Bangla (India, Baishakhi Inscript)</description>
+            <longname>Bangla (India, Baishakhi InScript)</longname>
+            <description>Bangla (India, Baishakhi InScript)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1263,8 +1275,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>mal_enhanced</layout_variant>
-            <longname>Malayalam (enhanced Inscript, with rupee)</longname>
-            <description>Malayalam (enhanced Inscript, with rupee)</description>
+            <longname>Malayalam (enhanced InScript, with rupee)</longname>
+            <description>Malayalam (enhanced InScript, with rupee)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1292,6 +1304,54 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:in:ori-bolnagri:ori</name>
+            <language>or</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori-bolnagri</layout_variant>
+            <longname>Oriya (Bolnagri)</longname>
+            <description>Oriya (Bolnagri)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori-bolnagri:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori-bolnagri</layout_variant>
+            <longname>Oriya (Bolnagri)</longname>
+            <description>Oriya (Bolnagri)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori-wx:ori</name>
+            <language>or</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori-wx</layout_variant>
+            <longname>Oriya (Wx)</longname>
+            <description>Oriya (Wx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in:ori-wx:sat</name>
+            <language>sat</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <layout_variant>ori-wx</layout_variant>
+            <longname>Oriya (Wx)</longname>
+            <description>Oriya (Wx)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:in:olck:sat</name>
             <language>sat</language>
@@ -1359,8 +1419,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>tam</layout_variant>
-            <longname>Tamil (Inscript)</longname>
-            <description>Tamil (Inscript)</description>
+            <longname>Tamil (InScript)</longname>
+            <description>Tamil (InScript)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1509,8 +1569,8 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:in:iipa:inc</name>
-            <language>inc</language>
+            <name>xkb:in:iipa:eng</name>
+            <language>en</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
@@ -1527,8 +1587,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>in</layout>
             <layout_variant>marathi</layout_variant>
-            <longname>Marathi (enhanced Inscript)</longname>
-            <description>Marathi (enhanced Inscript)</description>
+            <longname>Marathi (enhanced InScript)</longname>
+            <description>Marathi (enhanced InScript)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1728,8 +1788,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>azerty-deadkeys</layout_variant>
-            <longname>Kabyle (azerty layout, dead keys)</longname>
-            <description>Kabyle (azerty layout, dead keys)</description>
+            <longname>Kabyle (AZERTY, with dead keys)</longname>
+            <description>Kabyle (AZERTY, with dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1740,8 +1800,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>qwerty-gb-deadkeys</layout_variant>
-            <longname>Kabyle (qwerty-gb layout, dead keys)</longname>
-            <description>Kabyle (qwerty-gb layout, dead keys)</description>
+            <longname>Kabyle (QWERTY, UK, with dead keys)</longname>
+            <description>Kabyle (QWERTY, UK, with dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -1752,8 +1812,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>dz</layout>
             <layout_variant>qwerty-us-deadkeys</layout_variant>
-            <longname>Kabyle (qwerty-us layout, dead keys)</longname>
-            <description>Kabyle (qwerty-us layout, dead keys)</description>
+            <longname>Kabyle (QWERTY, US, with dead keys)</longname>
+            <description>Kabyle (QWERTY, US, with dead keys)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -2973,6 +3033,18 @@
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
+        <engine>
+            <name>xkb:nl:us:nld</name>
+            <language>nl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>nl</layout>
+            <layout_variant>us</layout_variant>
+            <longname>Dutch (US)</longname>
+            <description>Dutch (US)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:nl:mac:nld</name>
             <language>nl</language>
@@ -3618,8 +3690,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>gn</layout>
-            <longname>N'Ko (azerty)</longname>
-            <description>N'Ko (azerty)</description>
+            <longname>N'Ko (AZERTY)</longname>
+            <description>N'Ko (AZERTY)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -3886,7 +3958,7 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:de:tr:tr</name>
+            <name>xkb:de:tr:tur</name>
             <language>tr</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
@@ -5076,8 +5148,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>mt</layout>
             <layout_variant>alt-us</layout_variant>
-            <longname>Maltese (US layout with AltGr overrides)</longname>
-            <description>Maltese (US layout with AltGr overrides)</description>
+            <longname>Maltese (US, with AltGr overrides)</longname>
+            <description>Maltese (US, with AltGr overrides)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6753,6 +6825,42 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:tr:ot:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>ot</layout_variant>
+            <longname>Ottoman</longname>
+            <description>Ottoman</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:otf:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>otf</layout_variant>
+            <longname>Ottoman (F)</longname>
+            <description>Ottoman (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:tr:otk:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>otk</layout_variant>
+            <longname>Old Turkic</longname>
+            <description>Old Turkic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:tw::fox</name>
             <language>fox</language>
@@ -9108,8 +9216,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9119,8 +9227,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9130,8 +9238,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9141,8 +9249,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9152,8 +9260,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9163,8 +9271,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9174,8 +9282,8 @@
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
-            <longname>Indonesian (Arab Melayu, phonetic)</longname>
-            <description>Indonesian (Arab Melayu, phonetic)</description>
+            <longname>Indonesian (Latin)</longname>
+            <description>Indonesian (Latin)</description>
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
@@ -9186,8 +9294,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9198,8 +9306,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9210,8 +9318,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9222,8 +9330,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9234,8 +9342,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9246,8 +9354,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -9258,13 +9366,13 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>id</layout>
             <layout_variant>phoneticx</layout_variant>
-            <longname>Indonesian (Arab Melayu, extended phonetic)</longname>
-            <description>Indonesian (Arab Melayu, extended phonetic)</description>
+            <longname>Indonesian (Arab Pegon, extended phonetic)</longname>
+            <description>Indonesian (Arab Pegon, extended phonetic)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:jv::jv</name>
+            <name>xkb:jv::jav</name>
             <language>jv</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>

From 5bd2ecc54d35be7724720eaa100349b58f8af109 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Aug 2021 09:42:15 +0900
Subject: [PATCH 753/816] src/ibuscomposetable: Do not output incompleted
 compose dead keys

Incompleted dead keys are used in fi_FI compose.
---
 src/ibuscomposetable.c |  2 +-
 src/ibusenginesimple.c | 30 +++++-------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index a0b0befc1..d4184d305 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -514,7 +514,7 @@ ibus_compose_list_check_duplicated (GList *compose_list,
     for (list = compose_list; list != NULL; list = list->next) {
         int i;
         int n_compose = 0;
-        gboolean compose_finish;
+        gboolean compose_finish = FALSE;
         gunichar *output_chars = NULL;
         gunichar output_char = 0;
         guint n_outputs;
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index acfc0264f..83b04ebc3 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -788,31 +788,11 @@ ibus_engine_simple_check_all_compose_table (IBusEngineSimple *simple,
     gunichar *output_chars = NULL;
     gunichar output_char = '\0';
 
-    if (n_compose == 2) {
-        /* Special-case deadkey-deadkey sequences.
-         * We are not doing chained deadkeys, so we
-         * want to commit the first key, and contine
-         * preediting with second.
-         */
-        if (IS_DEAD_KEY (priv->compose_buffer[0]) &&
-            IS_DEAD_KEY (priv->compose_buffer[1])) {
-            gboolean need_space = FALSE;
-            gunichar ch = ibus_keysym_to_unicode (priv->compose_buffer[0],
-                                                  FALSE, &need_space);
-            guint16 next = priv->compose_buffer[1];
-            if (ch) {
-                if (need_space)
-                    g_string_append_c (output, ' ');
-                g_string_append_unichar (output, ch);
-                ibus_engine_simple_commit_str (simple, output->str);
-                g_string_set_size (output, 0);
-
-                priv->compose_buffer[0] = next;
-                priv->compose_buffer[1] = 0;
-                n_compose = 1;
-            }
-        }
-    }
+    /* GtkIMContextSimple output the first compose char in case of
+     * n_compose == 2 but it does not work in fi_FI copmose to output U+1EDD
+     * with the following sequence:
+     * <dead_hook> <dead_horn> <o> : "ờ" U1EDD
+     */
 
     G_LOCK (global_tables);
     tmp_list = global_tables;

From cfb263f04f82a83dd94f6eedcd5017d40a4a1a05 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 Aug 2021 09:44:49 +0900
Subject: [PATCH 754/816] Release 1.5.25

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6df26afbd..29f8b3db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [24])
+m4_define([ibus_micro_version], [25])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 936a0e76df79d92a8bdc03e9205330fb84a2083e Mon Sep 17 00:00:00 2001
From: Alynx Zhou <alynx.zhou@gmail.com>
Date: Wed, 1 Sep 2021 12:04:12 +0900
Subject: [PATCH 755/816] client/gtk2/ibusimcontext: Fix wrong cursor location
 in gtk3 apps

If you apply this patch in your tarball, please also apply this to
client/gtk3/ibusimcontext.c besides client/gtk2/ibusimcontext.c .

BUG=https://github.com/ibus/ibus/issues/2337
---
 client/gtk2/ibusimcontext.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index da9a402ff..b1ccede95 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1497,7 +1497,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
 
 #if GTK_CHECK_VERSION (3, 98, 4)
 #elif GTK_CHECK_VERSION (2, 91, 0)
-    area.y += gdk_window_get_height (ibusimcontext->client_window);
+    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
+        area.x = 0;
+        area.y += gdk_window_get_height (ibusimcontext->client_window);
+    }
 #else
     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
         gint w, h;

From ecca9db0d9750e8a4803758302510999084ff1b2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 31 Aug 2021 15:38:45 +0200
Subject: [PATCH 756/816] Update URLS

IBus got moved to GitHub. This changes the remaining URLs that
still pointed to the old site. Also fixed a typo.

BUG=https://github.com/ibus/ibus/pull/2342
---
 bindings/vala/test/enchant.vala | 2 +-
 setup/ibus-setup.1.in           | 4 ++--
 src/tests/ibus-inputcontext.c   | 4 ++--
 ui/gtk2/gtkpanel.xml.in         | 2 +-
 ui/gtk2/panel.py                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bindings/vala/test/enchant.vala b/bindings/vala/test/enchant.vala
index 3128dba9c..557444897 100644
--- a/bindings/vala/test/enchant.vala
+++ b/bindings/vala/test/enchant.vala
@@ -151,7 +151,7 @@ class TestEngine : Engine {
                                 "org.freedesktop.IBus.Vala",
                                 "ValaTest", "0.0.1", "GPL",
                                 "Peng Huang <shawn.p.huang@gmail.com>",
-                                "http://code.google.com/p/ibus/",
+                                "https://github.com/ibus/ibus/",
                                 "",
                                 "ibus-vala");
         var engine = new EngineDesc ("vala-debug",
diff --git a/setup/ibus-setup.1.in b/setup/ibus-setup.1.in
index f9b5f7175..2b574a1a2 100644
--- a/setup/ibus-setup.1.in
+++ b/setup/ibus-setup.1.in
@@ -17,7 +17,7 @@
 .PP
 IBus is an Intelligent Input Bus. It is a new input framework for Linux
 OS. It provides full featured and user friendly input method user
-interface.  It also may help developers to develop input method easily.  
+interface.  It also may help developers to develop input method easily.
 
 .PP
 .B ibus-setup
@@ -44,7 +44,7 @@ If this option is disabled, You can choose an input metod engine
 by input context.
 
 .SH BUGS
-If you find a bug, please report it at http://code.google.com/p/ibus/issues/list
+If you find a bug, please report it at https://github.com/ibus/ibus/issues
 
 .SH "SEE ALSO"
 .BR ibus (1)
diff --git a/src/tests/ibus-inputcontext.c b/src/tests/ibus-inputcontext.c
index ed04bd64e..beffcda64 100644
--- a/src/tests/ibus-inputcontext.c
+++ b/src/tests/ibus-inputcontext.c
@@ -46,12 +46,12 @@ call_basic_ipcs (IBusInputContext *context)
     ibus_input_context_reset (context);
 
     /* When enable() is called, ibus-daemon may start a global (or preloaded,
-     * or default) engine in an asynchrnous manner and return immediately.
+     * or default) engine in an asynchronous manner and return immediately.
      * Therefore, it is not guaranteed that ibus_input_context_is_enabled()
      * returns TRUE. */
 
     ibus_input_context_focus_in (context);
-} 
+}
 
 static void
 test_input_context (void)
diff --git a/ui/gtk2/gtkpanel.xml.in b/ui/gtk2/gtkpanel.xml.in
index 5f25ddb03..e077d1c88 100644
--- a/ui/gtk2/gtkpanel.xml.in
+++ b/ui/gtk2/gtkpanel.xml.in
@@ -7,6 +7,6 @@
 	<version>@VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
-	<homepage>http://code.google.com/p/ibus</homepage>
+	<homepage>https://github.com/ibus/ibus</homepage>
 	<textdomain>ibus</textdomain>
 </component>
diff --git a/ui/gtk2/panel.py b/ui/gtk2/panel.py
index d00c5a5e0..709abb4a4 100644
--- a/ui/gtk2/panel.py
+++ b/ui/gtk2/panel.py
@@ -511,7 +511,7 @@ def __sys_menu_item_activate_cb(self, item, command):
             about_dialog.set_copyright(ibus.get_copyright())
             about_dialog.set_license(ibus.get_license())
             about_dialog.set_comments(_("IBus is an intelligent input bus for Linux/Unix."))
-            about_dialog.set_website("http://code.google.com/p/ibus")
+            about_dialog.set_website("https://github.com/ibus/ibus")
             about_dialog.set_authors(["Peng Huang <shawn.p.huang@gmail.com>"])
             about_dialog.set_documenters(["Peng Huang <shawn.p.huang@gmail.com>"])
             about_dialog.set_translator_credits(_("translator-credits"))

From 5487a6baa4b22605ba8197ca1a0fa43c91d57786 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Sep 2021 20:23:59 +0900
Subject: [PATCH 757/816] client/gtk2/ibusimcontext: Implement clear preedit
 for GTK4

IBus IM module uses synchornized key processes for GTK4 and the timing
of the GTK reset siginal may work with focus-in/out between windows.
(I don't test GTK4 firefox and terminal yet and the verification is not
completed.)
So ibus_im_context_clear_preedit_text() is now called with the GTK4 reset
siginal.
ibus_im_context_clear_preedit_text() works with ibus-setup-anthy ->
"Conversion" tab -> "Behavior on Focus Out" pull down menu.

BUG=https://github.com/ibus/ibus/issues/2334
---
 client/gtk2/ibusimcontext.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index b1ccede95..e12be45d4 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1270,6 +1270,8 @@ ibus_im_context_reset (GtkIMContext *context)
          * IBus uses button-press-event instead until GTK is fixed.
          * https://gitlab.gnome.org/GNOME/gtk/issues/1534
          */
+        if (_use_sync_mode)
+            ibus_im_context_clear_preedit_text (ibusimcontext);
         ibus_input_context_reset (ibusimcontext->ibuscontext);
     }
     gtk_im_context_reset (ibusimcontext->slave);
@@ -1383,7 +1385,7 @@ ibus_im_context_set_client_window (GtkIMContext *context,
 
     if (ibusimcontext->client_window) {
 #if !GTK_CHECK_VERSION (3, 98, 4)
-        if (ibusimcontext->use_button_press_event)
+        if (ibusimcontext->use_button_press_event && !_use_sync_mode)
             _connect_button_press_event (ibusimcontext, FALSE);
 #endif
         g_object_unref (ibusimcontext->client_window);
@@ -1393,7 +1395,7 @@ ibus_im_context_set_client_window (GtkIMContext *context,
     if (client != NULL) {
         ibusimcontext->client_window = g_object_ref (client);
 #if !GTK_CHECK_VERSION (3, 98, 4)
-        if (!ibusimcontext->use_button_press_event)
+        if (!ibusimcontext->use_button_press_event && !_use_sync_mode)
             _connect_button_press_event (ibusimcontext, TRUE);
 #endif
     }
@@ -1994,7 +1996,8 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
 
 #if !GTK_CHECK_VERSION (3, 98, 4)
     if (!ibusimcontext->use_button_press_event &&
-        mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+        mode == IBUS_ENGINE_PREEDIT_COMMIT &&
+        !_use_sync_mode) {
         if (ibusimcontext->client_window) {
             _connect_button_press_event (ibusimcontext, TRUE);
         }

From 4957d1468db4fc5ed30c3ae1f2afac9e51b329d6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 6 Sep 2021 20:25:52 +0900
Subject: [PATCH 758/816] client/gtk2/ibusimcontext: Calculate keycode from
 keysym in GTK3 forward-key-event

IBus GTK3 mode also calculates keycode from keysym if keycode == 0
with forward-key-event signal to follow GTK4.
---
 client/gtk2/ibusimcontext.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index e12be45d4..b1424e87f 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1939,13 +1939,16 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
     int group = 0;
     g_return_if_fail (GTK_IS_IM_CONTEXT (ibusimcontext));
     if (keycode == 0 && ibusimcontext->client_window) {
-        GdkDisplay *display = gtk_widget_get_display (ibusimcontext->client_window);
+        GdkDisplay *display =
+                gtk_widget_get_display (ibusimcontext->client_window);
         GdkKeymapKey *keys = NULL;
         gint n_keys = 0;
-        if (!gdk_display_map_keyval (display, keyval, &keys, &n_keys))
+        if (gdk_display_map_keyval (display, keyval, &keys, &n_keys)) {
+            keycode = keys->keycode;
+            group = keys->group;
+        } else {
             g_warning ("Failed to parse keycode from keyval %x", keyval);
-       keycode = keys->keycode;
-       group = keys->group;
+        }
     }
     gtk_im_context_filter_key (
         GTK_IM_CONTEXT (ibusimcontext),
@@ -1957,6 +1960,17 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
         (GdkModifierType)state,
         group);
 #else
+    if (keycode == 0 && ibusimcontext->client_window) {
+        GdkDisplay *display =
+                gdk_window_get_display (ibusimcontext->client_window);
+        GdkKeymap *keymap = gdk_keymap_get_for_display (display);
+        GdkKeymapKey *keys = NULL;
+        gint n_keys = 0;
+        if (gdk_keymap_get_entries_for_keyval (keymap, keyval, &keys, &n_keys))
+            keycode = keys->keycode;
+        else
+            g_warning ("Failed to parse keycode from keyval %x", keyval);
+    }
     GdkEventKey *event = _create_gdk_event (ibusimcontext, keyval, keycode, state);
     gdk_event_put ((GdkEvent *)event);
     gdk_event_free ((GdkEvent *)event);

From fbea5441fc53ae1d5533bed1ee53009141cf905a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 10 Sep 2021 00:09:26 +0900
Subject: [PATCH 759/816] Fix build errors in Ubuntu focal

- Ubuntu focal uses glib 2.64.6 which does not include errno.h
  so config.h includes errno.h as the workaround.
- make autogen.sh not to delete dist files in Travis
- Call $(PYTHON) for gensimple.py for Ubuntu python3
- Add a code review in src/ibuscomposetable.c

BUG=https://github.com/ibus/ibus/pull/2348
---
 .travis.yml            | 4 ++++
 autogen.sh             | 2 +-
 configure.ac           | 9 +++++++++
 engine/Makefile.am     | 2 +-
 src/ibuscomposetable.c | 4 ++++
 src/ibusregistry.c     | 4 ++++
 src/ibusshare.c        | 3 +++
 7 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e90dc230c..a7c0dd467 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,8 @@ jobs:
   - name: Build in Ubuntu
     before_script:
     - sudo apt-get -qq update
+    env:
+    - SAVE_DIST_FILES=1
     script:
     - set -e
     - git pull --depth=200
@@ -54,6 +56,7 @@ jobs:
     - >
       ./autogen.sh
       --with-ucd-dir='/usr/share/unicode'
+      --enable-install-tests
     # Set the cutom DESTDIR because the default DESTDIR
     # /home/travis/bulid/fujiwarat/$PKG/ibus/ibus-$VERSION/_inst seems to be
     # too long and failed to set DESTDIR to install bindings/pygobject/IBus.py
@@ -64,6 +67,7 @@ jobs:
       --disable-schemas-install
       --enable-memconf
       --with-ucd-dir='/usr/share/unicode'
+      --enable-install-tests
       "
       DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress"
       VERBOSE=1
diff --git a/autogen.sh b/autogen.sh
index 693a27408..ea633e067 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -53,4 +53,4 @@ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.11 CFLAGS="$CFL
         echo "rm $f"
         rm $f
     done
-}
+} || :
diff --git a/configure.ac b/configure.ac
index 29f8b3db0..ce096ad32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,15 @@ PKG_CHECK_MODULES(GIO2, [
 PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= glib_required_version
 ])
+PKG_CHECK_EXISTS(
+    [glib-2.0 >= 2.65.0],
+    [AC_DEFINE(GLIB2_EMBED_ERRNO_H, TRUE, [glib2 include errno.h])]
+)
+AH_BOTTOM([
+#ifndef GLIB2_EMBED_ERRNO_H
+#  include <errno.h>
+#endif
+])
 
 # --disable-tests option.
 AC_ARG_ENABLE(tests,
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 84bc7f6cd..03867f52f 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -99,7 +99,7 @@ simple.xml: simple.xml.in
 	    mv $@.tmp $@
 
 simple.xml.in:
-	$(srcdir)/gensimple.py \
+	$(PYTHON) $(srcdir)/gensimple.py \
 	    --input=$(XKBCONFIG_BASE)/rules/evdev.xml \
 	    --output=$@ \
 	    --version=$(VERSION).`date '+%Y%m%d'` \
diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index d4184d305..b76464bcd 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -1606,6 +1609,7 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx
             row_stride = i + 1;
 
             if (seq_index[i + 1] - seq_index[i] > 0) {
+                g_assert (row_stride);
                 seq = bsearch (compose_buffer + 1,
                                table->data + seq_index[i],
                                (seq_index[i + 1] - seq_index[i]) / row_stride,
diff --git a/src/ibusregistry.c b/src/ibusregistry.c
index 23c5ca1b7..962afb20c 100644
--- a/src/ibusregistry.c
+++ b/src/ibusregistry.c
@@ -20,6 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 #include <string.h>
diff --git a/src/ibusshare.c b/src/ibusshare.c
index 8974511ad..0c0bda104 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "ibusshare.h"
 #include <glib.h>

From 6b979e7897c8c4316d0345c1ede5bcbcb5b64cd8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 10 Sep 2021 00:39:17 +0900
Subject: [PATCH 760/816] client/gtk2/ibusimcontext: Fix a key event loop with
 forwarding keys

_ibus_context_forward_key_event_cb() caused a key event loop in
_key_snooper_cb() with key release events.
---
 client/gtk2/ibusimcontext.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index b1424e87f..c2df3a877 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -366,6 +366,10 @@ ibus_im_context_commit_event (IBusIMContext *ibusimcontext,
         g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
         g_object_unref (text);
         _request_surrounding_text (ibusimcontext);
+#if !GTK_CHECK_VERSION (3, 98, 4)
+        /* Avoid a loop with _ibus_context_forward_key_event_cb() */
+        event->state |= IBUS_HANDLED_MASK;
+#endif
         return TRUE;
     }
    return FALSE;
@@ -643,12 +647,15 @@ _key_snooper_cb (GtkWidget   *widget,
 
     } while (0);
 
-    if (ibusimcontext != NULL) {
+    if (ibusimcontext != NULL && event->type == GDK_KEY_PRESS) {
         /* "retrieve-surrounding" signal sometimes calls unref by
          * gtk_im_multicontext_get_slave() because priv->context_id is not
          * the latest than global_context_id in GtkIMMulticontext.
          * Since _focus_im_context is gotten by the focus_in event,
          * it would be good to call ref here.
+         *
+         * Most release key events would be redundant from
+         * _ibus_context_forward_key_event_cb ().
          */
         g_object_ref (ibusimcontext);
         _request_surrounding_text (ibusimcontext);
@@ -657,7 +664,7 @@ _key_snooper_cb (GtkWidget   *widget,
 
     retval = _process_key_event (ibuscontext, event, ibusimcontext);
 
-    if (ibusimcontext != NULL) {
+    if (ibusimcontext != NULL && event->type == GDK_KEY_PRESS) {
         /* unref ibusimcontext could call ibus_im_context_finalize here
          * because "retrieve-surrounding" signal could call unref.
          */

From 51e3295659dd9178b98fb266da5abcb750805be8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 10 Sep 2021 00:39:25 +0900
Subject: [PATCH 761/816] src/tests: Add --screendump option in
 ibus-desktop-testing-runner

The screendump is useful in CI to if check gnome-shell-extension-no-overview
works.
Also add ibus-desktop-testing-autostart to get the debug info in CI.
You can copy ibus-desktop-testing.desktop to $HOME/.config/autostart
if CI fails.
---
 src/tests/Makefile.am                     | 11 +++++
 src/tests/ibus-desktop-testing-autostart  | 55 +++++++++++++++++++++++
 src/tests/ibus-desktop-testing-runner.in  | 20 +++++++--
 src/tests/ibus-desktop-testing.desktop.in | 11 +++++
 4 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100755 src/tests/ibus-desktop-testing-autostart
 create mode 100644 src/tests/ibus-desktop-testing.desktop.in

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 13c06eb46..7d00f2367 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -96,6 +96,7 @@ test_sourcesdir = $(datadir)/installed-tests/ibus
 CLEANFILES += \
     $(test_metas) \
     ibus-desktop-testing-runner \
+    org.freedesktop.IBus.Desktop.Testing.desktop \
     $(NULL)
 
 test_execs_PROGRAMS = $(TESTS)
@@ -106,6 +107,14 @@ CLEANFILES += \
     $(NULL)
 endif
 test_execsdir = $(libexecdir)/installed-tests/ibus
+libexec_SCRIPTS = ibus-desktop-testing-autostart
+
+test_frame_DATA = org.freedesktop.IBus.Desktop.Testing.desktop
+test_framedir = $(pkgdatadir)/tests
+org.freedesktop.IBus.Desktop.Testing.desktop: ibus-desktop-testing.desktop.in
+	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|g" \
+	$< > $@.tmp && \
+	mv $@.tmp $@
 endif
 
 $(test_metas): $(test_metas_in) $(test_programs)
@@ -133,6 +142,8 @@ EXTRA_DIST = \
     ibus-compose.emoji \
     ibus-compose.env \
     ibus-compose-locales.in \
+    ibus-desktop-testing.desktop.in \
+    ibus-desktop-testing-autostart \
     ibus-desktop-testing-runner.in \
     $(NULL)
 
diff --git a/src/tests/ibus-desktop-testing-autostart b/src/tests/ibus-desktop-testing-autostart
new file mode 100755
index 000000000..da22b64e1
--- /dev/null
+++ b/src/tests/ibus-desktop-testing-autostart
@@ -0,0 +1,55 @@
+#!/bin/sh
+# -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2021 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+TEST_LOG=
+COMMANDS='
+id
+echo $DISPLAY
+pwd
+pstree -asp $$
+gsettings list-recursively org.gnome.shell
+rpm -q gnome-shell-extension-no-overview gnome-shell gnome-session
+'
+
+if [ $# -gt 0 ] ; then
+    TEST_LOG=$1
+fi
+
+run_test()
+{
+while read cmd ; do
+    if [ x"$cmd" = x ] ; then
+        continue
+    fi
+    echo "# $cmd"
+    eval "$cmd"
+done << EOF_COMMANDS
+`echo "$COMMANDS"`
+EOF_COMMANDS
+}
+
+if [ x"$TEST_LOG" = x ] ; then
+    run_test
+else
+    run_test 2>>$TEST_LOG 1>>$TEST_LOG
+fi
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index c10167031..48528326b 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -36,13 +36,14 @@
 
 
 PROGNAME=`basename $0`
-VERSION=0.2
+VERSION=0.3
 DISPLAY=:99.0
 BUILDDIR="."
 SRCDIR="."
 TEST_LOG="test-suite.log"
 TEST_LOG_STDOUT=0
 RESULT_LOG=""
+SCREEN_LOG=""
 HAVE_GRAPHICS=1
 DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
 PID_XORG=0
@@ -90,14 +91,15 @@ usage()
 "-T, --timeout=TIMEOUT            Set timeout (default TIMEOUT is 300 sec).\n" \
 "-o, --output=OUTPUT_FILE         OUtput the log to OUTPUT_FILE\n"             \
 "-O, --result=RESULT_FILE         OUtput the result to RESULT_FILE\n"          \
+"-S, --screendump=DUMP_FILE       OUtput the screen to DUMP_FILE ('STDOUT' can be stdout)\n" \
 ""
 }
 
 parse_args()
 {
     # This is GNU getopt. "sudo port getopt" in BSD?
-    ARGS=`getopt -o hvb:s:cd:t:r:T:o:O: --long \
-          help,version,builddir:,srcdir:,no-graphics,desktop:,tests:,runner:,timeout:,output:,result:\
+    ARGS=`getopt -o hvb:s:cd:t:r:T:o:O:S: --long \
+          help,version,builddir:,srcdir:,no-graphics,desktop:,tests:,runner:,timeout:,output:,result:,screendump:\
         -- "$@"`;
     eval set -- "$ARGS"
     while [ 1 ] ; do
@@ -113,6 +115,7 @@ parse_args()
         -T | --timeout )     TIMEOUT="$2"; shift 2;;
         -o | --output )      TEST_LOG="$2"; shift 2;;
         -O | --result )      RESULT_LOG="$2"; shift 2;;
+        -S | --screendump )  SCREEN_LOG="$2"; shift 2;;
         -- )                 shift; break;;
         * )                  usage; exit 1;;
         esac
@@ -259,6 +262,7 @@ run_desktop()
 {
     echo "$DESKTOP_COMMAND" | grep gnome-session > /dev/null
     HAS_GNOME=$?
+    export DISPLAY=$DISPLAY
     if test $HAVE_GRAPHICS -eq 1 ; then
         /usr/libexec/Xorg.wrap -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . $DISPLAY &
     else
@@ -266,7 +270,6 @@ run_desktop()
     fi
     PID_XORG=$!
     sleep 1
-    export DISPLAY=$DISPLAY
     # init_gnome need to be called with $DISPLAY before gnome-session is called
     if [  $HAS_GNOME -eq 0 ] ; then
         init_gnome
@@ -454,6 +457,15 @@ main()
     init_desktop
     run_dbus_daemon 2>>$TEST_LOG 1>>$TEST_LOG
     run_desktop 2>>$TEST_LOG 1>>$TEST_LOG
+    if [ x"$SCREEN_LOG" != x ] ; then
+        SCREEN_PNG="`date '+%Y%m%d%H%M%S'`.png"
+        gnome-screenshot --file=$SCREEN_PNG
+        if [ x"$SCREEN_LOG" = xSTDOUT ] ; then
+            base64 $SCREEN_PNG
+        else
+            base64 $SCREEN_PNG > $SCREEN_LOG
+        fi
+    fi
     run_test_suite
     finit
 }
diff --git a/src/tests/ibus-desktop-testing.desktop.in b/src/tests/ibus-desktop-testing.desktop.in
new file mode 100644
index 000000000..fa0c9b40c
--- /dev/null
+++ b/src/tests/ibus-desktop-testing.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=IBus Desktop Testing Runner
+GenericName=Input Method Desktop Testing Runner
+Comment=Test plugin for IBus Desktop Testing
+Exec=@ibexecdir@/ibus-desktop-testing-autostart /var/tmp/ibus-ci-autostart.log
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Icon=ibus
+Categories=System
+Keywords=im;

From acc5570511698c7b5cc037eb81be2c4be52a824f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 29 Oct 2021 12:56:49 +0900
Subject: [PATCH 762/816] ui/gtk3: Erase Emojier preedit/lookup popup between
 applications

It would be better to erase Emojier popup window when users change
the input focus between applications. But it hasn't been implemented
because the focus-out/in events also happen when the Emojier popup window
is launching or rebuilding to the category list in GNOME Wayland.
The focus-out/in events do not happen in Xorg desktops with the rebuilding
GUI because GTK popup window causes focus-in/out evnets in Wayland.

Now I'm convinced with several issues and added a little complicated logic
to erase Emojier popup window with the focus changes between input contexts
to handle focus-in/out events in Wayland.

BUG=rhbz#1942970
---
 ui/gtk3/emojier.vala      | 69 ++++++++++++++++++++++++++++++++++++---
 ui/gtk3/emojierapp.vala   | 12 +++++--
 ui/gtk3/panelbinding.vala | 21 ++++++++++--
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 9e6e92636..69fb8abec 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (c) 2017-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -227,6 +227,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         BACKWARD,
     }
 
+    public bool is_wayland { get; set; }
+
     public const uint BUTTON_CLOSE_BUTTON = 1000;
 
     private const uint EMOJI_GRID_PAGE = 10;
@@ -317,15 +319,18 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     private Gdk.Rectangle m_cursor_location;
     private bool m_is_up_side_down = false;
     private uint m_redraw_window_id;
+    private bool m_rebuilding_gui = false;
+    private uint m_rebuilding_gui_timeout_id;
 
     public signal void candidate_clicked(uint index, uint button, uint state);
     public signal void commit_text(string text);
     public signal void cancel();
 
-    public IBusEmojier() {
+    public IBusEmojier(bool is_wayland) {
         GLib.Object(
             type : Gtk.WindowType.POPUP
         );
+        this.is_wayland = is_wayland;
 
         // GLib.ActionEntry accepts const variables only.
         var action = new GLib.SimpleAction.stateful(
@@ -1002,6 +1007,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
         button.button_press_event.connect((w, e) => {
             m_category_active_index = -1;
             m_show_unicode = false;
+            start_rebuild_gui(false);
             hide_candidate_panel();
             show_all();
             return true;
@@ -1458,6 +1464,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                     show_emoji_for_category(m_backward);
                     show_candidate_panel();
                 } else {
+                    start_rebuild_gui(false);
                     hide_candidate_panel();
                     show_all();
                 }
@@ -1778,6 +1785,34 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    private void start_rebuild_gui(bool initial_launching) {
+        if (!this.is_wayland)
+            return;
+        if (!initial_launching && !base.get_visible())
+            return;
+        if (initial_launching && base.get_visible())
+            return;
+        if (m_rebuilding_gui_timeout_id != 0) {
+            GLib.Source.remove(m_rebuilding_gui_timeout_id);
+            m_rebuilding_gui_timeout_id = 0;
+        }
+
+        m_rebuilding_gui = true;
+        m_rebuilding_gui_timeout_id =
+                GLib.Timeout.add_seconds(10, () => {
+                    if (!m_rebuilding_gui) {
+                        m_rebuilding_gui_timeout_id = 0;
+                        return false;
+                    }
+                    warning("Rebuilding GUI is time out.");
+                    m_rebuilding_gui = false;
+                    m_rebuilding_gui_timeout_id = 0;
+                    return false;
+                },
+                GLib.Priority.DEFAULT_IDLE);
+    }
+
+
     public bool has_variants(uint index,
                              bool need_commit_signal) {
         if (index >= m_lookup_table.get_number_of_candidates())
@@ -1880,12 +1915,17 @@ public class IBusEmojier : Gtk.ApplicationWindow {
                 m_show_unicode = false;
                 m_category_active_index = -1;
             }
+            start_rebuild_gui(false);
             hide_candidate_panel();
             return true;
         } else if (m_backward_index >= 0 && m_backward != null) {
+            // Escape on Emoji variants window does not call focus-out events
+            // because hide() is not called here so start_rebuild_gui()
+            // is not called.
             show_emoji_for_category(m_backward);
             return true;
         } else if (m_candidate_panel_is_visible && m_backward != null) {
+            start_rebuild_gui(false);
             hide_candidate_panel();
             return true;
         }
@@ -2218,7 +2258,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 
         /* Some window managers, e.g. MATE, GNOME, Plasma desktops,
          * does not give the keyboard focus when Emojier is lauched
-         * twice with Ctrl-Shift-e via XIEvent, if present_with_time()
+         * twice with Ctrl-period via XIEvent, if present_with_time()
          * is not applied.
          * But XFCE4 desktop does not effect this bug.
          * Seems this is caused by the window manager's focus stealing
@@ -2265,8 +2305,10 @@ public class IBusEmojier : Gtk.ApplicationWindow {
 #endif
 
 
-    /* override virtual functions */
+    // override virtual functions
     public override void show_all() {
+        // Ctrl-period, space keys causes focus-out/in events in GNOME Wayland.
+        start_rebuild_gui(true);
         base.show_all();
         if (m_candidate_panel_mode)
             show_candidate_panel();
@@ -2416,6 +2458,17 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public override bool focus_in_event(Gdk.EventFocus event) {
+        m_rebuilding_gui = false;
+        return base.focus_in_event(event);
+    }
+
+
+    public override bool focus_out_event(Gdk.EventFocus event) {
+        return base.focus_out_event(event);
+    }
+
+
     public bool is_running() {
         return m_is_running;
     }
@@ -2511,6 +2564,14 @@ public class IBusEmojier : Gtk.ApplicationWindow {
     }
 
 
+    public bool is_rebuilding_gui() {
+        /* The candidate window and preedit text should not be closed
+         * when the GUI is rebuilding.
+         */
+        return m_rebuilding_gui;
+    }
+
+
     public static bool has_loaded_emoji_dict() {
         if (m_emoji_to_data_dict == null)
             return false;
diff --git a/ui/gtk3/emojierapp.vala b/ui/gtk3/emojierapp.vala
index 783c611c1..812356f08 100644
--- a/ui/gtk3/emojierapp.vala
+++ b/ui/gtk3/emojierapp.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright (c) 2017 Peng Wu <alexepico@gmail.com>
- * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (c) 2017-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -208,7 +208,15 @@ public class EmojiApplication : Gtk.Application {
         IBusEmojier.load_unicode_dict();
 
         if (m_emojier == null) {
-            m_emojier = new IBusEmojier();
+            bool is_wayland = false;
+#if USE_GDK_WAYLAND
+            Type instance_type = Gdk.Display.get_default().get_type();
+            Type wayland_type = typeof(GdkWayland.Display);
+            is_wayland = instance_type.is_a(wayland_type);
+#else
+            warning("Checking Wayland is disabled");
+#endif
+            m_emojier = new IBusEmojier(is_wayland);
             // For title handling in gnome-shell
             add_window(m_emojier);
             m_emojier.candidate_clicked.connect((i, b, s) => {
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index 861255b14..e63d93f29 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2018-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2018-2021 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -799,6 +799,23 @@ class PanelBinding : IBus.PanelService {
 
     public override void focus_out(string input_context_path) {
         m_current_context_path = "";
+        /* Close emoji typing when the focus out happens but it's not a
+         * rebuilding GUI.
+         * Emojier rebuilding GUI happens when Escape key is pressed on
+         * Emojier candidate list and the rebuilding also causes focus-out/in
+         * events in GNOME Wayland but not Xorg desktops.
+         * The rebuilding GUI can be checked with m_emojier.is_rebuilding_gui()
+         * in Wayland.
+         * m_emojier.is_rebuilding_gui() always returns false in Xorg desktops
+         * since focus-out/in events does not happen.
+         */
+        if (m_emojier != null && !m_emojier.is_rebuilding_gui()) {
+            m_preedit.reset();
+            m_emojier.set_annotation("");
+            if (m_wayland_lookup_table_is_visible)
+                hide_wayland_lookup_table();
+            key_press_escape();
+        }
     }
 
 
@@ -822,7 +839,7 @@ class PanelBinding : IBus.PanelService {
             m_loaded_unicode = true;
         }
         if (m_emojier == null) {
-            m_emojier = new IBusEmojier();
+            m_emojier = new IBusEmojier(m_is_wayland);
             // For title handling in gnome-shell
             m_application.add_window(m_emojier);
             m_emojier.candidate_clicked.connect((i, b, s) => {

From 28acfd433b3df1673b7c7177915c027ce48c061e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 5 Nov 2021 07:22:34 +0900
Subject: [PATCH 763/816] ui/gtk2: Deprecate gettext.bind_textdomain_codeset()
 since Python 3.8

setup/i18n.py is a symlink of ui/gtk2/i18n.py
env PYTHONWARNINGS='d' ibus-setup

BUG=https://github.com/ibus/ibus/issues/2276
---
 ui/gtk2/i18n.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/gtk2/i18n.py b/ui/gtk2/i18n.py
index 976d1aee3..af14efc63 100644
--- a/ui/gtk2/i18n.py
+++ b/ui/gtk2/i18n.py
@@ -3,7 +3,9 @@
 # ibus - The Input Bus
 #
 # Copyright(c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright(c) 2012-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright(c) 2007-2015 Google, Inc.
+# Copyright(c) 2012-2021 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,12 +25,14 @@
 import locale
 import gettext
 import os
+import sys
 
 DOMAINNAME = "ibus10"
 
 _ = lambda a: gettext.dgettext(DOMAINNAME, a)
 N_ = lambda a: a
 
+PY3K = sys.version_info >= (3, 0)
 LOCALEDIR = os.getenv("IBUS_LOCALEDIR")
 
 def init_textdomain(domainname):
@@ -42,7 +46,9 @@ def init_textdomain(domainname):
     except AttributeError:
         pass
     gettext.bindtextdomain(domainname, LOCALEDIR)
-    gettext.bind_textdomain_codeset(domainname, 'UTF-8')
+    # https://docs.python.org/3/library/gettext.html#gettext.lgettext
+    if not PY3K:
+        gettext.bind_textdomain_codeset(domainname, 'UTF-8')
 
 def gettext_engine_longname(engine):
     name = engine.get_name()

From d53d31d2dbab00e13e23862cf2bf88da532b9465 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 17 Nov 2021 22:54:00 +0900
Subject: [PATCH 764/816] travis: git config pull.rebase false

`git pull` fails with local commits
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a7c0dd467..abd40e7c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,7 @@ jobs:
     - SAVE_DIST_FILES=1
     script:
     - set -e
+    - git config pull.rebase false
     - git pull --depth=200
     # configure options from
     # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules

From cfcc6f194cfc95ab0cf1b3b719d77321c249a83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Tue, 16 Nov 2021 00:33:37 +0100
Subject: [PATCH 765/816] src/ibuscomposetable: invalidate cache based on
 symlink mtime too

When the compose file is a symbolic link, take the link itself's
modification time into account (in addition to its target's) in
determining whether to invalidate the compose cache.

This is useful e.g. on NixOS systems where the compose file might point
to a store path with an irrelevant modification time, and we want the
cache to expire when the symlink itself changes.

BUG=https://github.com/ibus/ibus/pull/2362
---
 src/ibuscomposetable.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index b76464bcd..250e0139f 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1040,10 +1040,14 @@ ibus_compose_table_load_cache (const gchar *compose_file)
         if (!g_file_test (path, G_FILE_TEST_EXISTS))
             break;
 
-        if (g_stat (compose_file, &original_buf))
-            break;
         if (g_stat (path, &cache_buf))
             break;
+        if (g_lstat (compose_file, &original_buf))
+            break;
+        if (original_buf.st_mtime > cache_buf.st_mtime)
+            break;
+        if (g_stat (compose_file, &original_buf))
+            break;
         if (original_buf.st_mtime > cache_buf.st_mtime)
             break;
         if (!g_file_get_contents (path, &contents, &length, &error)) {

From be179342cc6273abb8710546a18e80afd69f3e86 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 2 Dec 2021 23:39:57 +0900
Subject: [PATCH 766/816] travis: Fix bindings/pygobject/test-override-ibus.py

Recently Travis default python was changed to version 2 in Ubuntu focal
and I have to specify python3 in configure.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index abd40e7c5..b9aa9e436 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,7 @@ jobs:
     # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules
     - >
       ./autogen.sh
+      --with-python=/usr/bin/python3
       --with-ucd-dir='/usr/share/unicode'
       --enable-install-tests
     # Set the cutom DESTDIR because the default DESTDIR
@@ -67,6 +68,7 @@ jobs:
       --enable-gtk-doc
       --disable-schemas-install
       --enable-memconf
+      --with-python=/usr/bin/python3
       --with-ucd-dir='/usr/share/unicode'
       --enable-install-tests
       "

From 2bc47f09832073c87ccdf1060bd93ff95878685a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 2 Dec 2021 23:52:36 +0900
Subject: [PATCH 767/816] autogen: Delete gnome-autogen dependency

You may like to call ./autogen.sh --enable-gtk-doc with your custom
configure options.
Also set SAVE_DIST_FILE=1 by default
---
 .travis.yml     |  7 ++--
 autogen.sh      | 96 +++++++++++++++++++++++++++++++++----------------
 src/Makefile.am | 18 ++++++----
 3 files changed, 80 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9aa9e436..8dbff1292 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,11 @@ arch:
 addons:
   apt:
     packages:
-    # For autogen.sh
-    - gnome-common
-    - gtk-doc-tools
     # For make from
     # https://packages.ubuntu.com/search?searchon=sourcenames&keywords=ibus
     - desktop-file-utils
     - gobject-introspection
+    - gtk-doc-tools
     - iso-codes
     - libdconf-dev
     - libgirepository1.0-dev
@@ -47,7 +45,7 @@ jobs:
     before_script:
     - sudo apt-get -qq update
     env:
-    - SAVE_DIST_FILES=1
+    - SAVE_DIST_FILES=0
     script:
     - set -e
     - git config pull.rebase false
@@ -56,6 +54,7 @@ jobs:
     # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules
     - >
       ./autogen.sh
+      --enable-gtk-doc
       --with-python=/usr/bin/python3
       --with-ucd-dir='/usr/share/unicode'
       --enable-install-tests
diff --git a/autogen.sh b/autogen.sh
index ea633e067..1acbf7059 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,22 +1,47 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="ibus"
-DIST_FILES="
-engine/simple.xml.in
-src/ibusemojigen.h
-src/ibusunicodegen.h
-"
+: ${srcdir=$(dirname $0)}
+: ${srcdir:=.}
+: ${SAVE_DIST_FILES:=0}
+
+olddir=$(pwd)
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+WANT_GTK_DOC=0
+GCC_VERSION=$(gcc --version | head -1 | awk '{print $3}')
+GCC_MAJOR_VERSION=$(echo "$GCC_VERSION" | awk -F. '{print $1}')
 FEDORA_PKG1='autoconf automake libtool gettext-devel'
 FEDORA_PKG2='glib2-devel gtk2-devel gtk3-devel
  wayland-devel'
 FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd
  xkeyboard-config-devel'
 
-(test -z "$DISABLE_INSTALL_PKGS") && {
+CFLAGS=${CFLAGS-"-Wall -Wformat -Werror=format-security"}
+(test $GCC_MAJOR_VERSION -ge 10) && {
+    CFLAGS="$CFLAGS -fanalyzer -fsanitize=address -fsanitize=leak"
+    FEDORA_PKG1="$FEDORA_PKG1 libasan"
+}
+
+cd "$srcdir"
+
+(test -f configure.ac \
+  && test -f README ) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+(test $(grep -q "^GTK_DOC_CHECK" configure.ac)) || {
+    WANT_GTK_DOC=1
+    FEDORA_PKG2="$FEDORA_PKG2 gtk-doc"
+}
+
+(test -f ChangeLog) || {
+    touch ChangeLog
+}
+
+(test "x$DISABLE_INSTALL_PKGS" = "x") && {
     (test -f /etc/fedora-release ) && {
         rpm -q $FEDORA_PKG1 || exit 1
         rpm -q $FEDORA_PKG2 || exit 1
@@ -27,30 +52,39 @@ FEDORA_PKG3='cldr-emoji-annotation iso-codes-devel unicode-emoji unicode-ucd
     }
 }
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/README ) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "Not found gnome-autogen.sh. You may need to install gnome-common"
-    exit 1
+CONFIGFLAGS="$@"
+(test "$#" = 0 -a "x$NOCONFIGURE" = "x" ) && {
+    echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+    echo "*** If you wish to pass any to it, please specify them on the" >&2
+    echo "*** '$0' command line." >&2
+    echo "" >&2
+    (test $WANT_GTK_DOC -eq 1) && CONFIGFLAGS="--enable-gtk-doc $@"
 }
 
-(test -f $srcdir/ChangeLog) || {
-    touch $srcdir/ChangeLog
-}
+(test $WANT_GTK_DOC -eq 1) && gtkdocize --copy
 
-CFLAGS=${CFLAGS-"-Wall -Wformat -Werror=format-security"}
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.11 \
+autoreconf --verbose --force --install || exit 1
 
-# 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 "$@"
+cd "$olddir"
+(test "x$NOCONFIGURE" = "x" ) && {
+    echo "$srcdir/configure $CONFIGFLAGS"
+    $srcdir/configure $CONFIGFLAGS || exit 1
+    (test "$1" = "--help" ) && {
+        exit 0
+    } || {
+        echo "Now type 'make' to compile $PKG_NAME" || exit 1
+    }
+} || {
+    echo "Skipping configure process."
+}
 
-(test -z "$SAVE_DIST_FILES") && {
-    for f in $DIST_FILES ; do
-        echo "rm $f"
-        rm $f
-    done
+cd "$srcdir"
+(test "x$SAVE_DIST_FILES" = "x0" ) && {
+    # rm engine/simple.xml.in src/ibusemojigen.h src/ibusunicodegen.h
+    for d in engine src; do
+        echo "make -C $d maintainer-clean-generic"
+        make -C $d maintainer-clean-generic
+   done
 } || :
+cd "$olddir"
diff --git a/src/Makefile.am b/src/Makefile.am
index 742ee7d78..578694b52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2017 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -296,8 +296,8 @@ dicts/emoji-%.dict: emoji-parser
 	    echo "Skip $$plus_comment $@"; \
 	fi;
 
-ibusemojigen.h: dicts/emoji-en.dict
-	$(NULL)
+ibusemojigen.h:
+	$(MAKE) $(AM_MAKEFLAGS) dicts/emoji-en.dict
 
 # We put dicts/emoji-%.dict as the make target for the parallel build
 # and the make target has to be genarated even if the file size is zero.
@@ -364,8 +364,8 @@ dicts/unicode-blocks.dict: unicode-parser
 	    echo "Generated $@"; \
 	fi;
 
-ibusunicodegen.h: dicts/unicode-blocks.dict
-	$(NULL)
+ibusunicodegen.h:
+	$(MAKE) $(AM_MAKEFLAGS) dicts/unicode-blocks.dict
 
 unicode_parser_SOURCES =        \
     unicode-parser.c            \
@@ -398,9 +398,15 @@ CLEANFILES +=                   \
     stamp-ibusenumtypes.h       \
     $(NULL)
 
-DISTCLEANFILES =                \
+MAINTAINERCLEANFILES =          \
     ibusemojigen.h              \
     ibusunicodegen.h            \
+    dicts/emoji-en.dict         \
+    dicts/unicode-blocks.dict   \
+    $(NULL)
+
+DISTCLEANFILES =                \
+    $(MAINTAINERCLEANFILES)     \
     ibusversion.h               \
     $(NULL)
 

From 104148bcdada1f8f22ef905c930f9944f3e99a63 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 2 Dec 2021 23:53:28 +0900
Subject: [PATCH 768/816] src: Disable emoji shortcut key with no-emoji hint

BUG=https://gitlab.gnome.org/GNOME/gtk/-/issues/4337
---
 src/ibusengine.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 9aeafbf9b..7e8448386 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2019 Red Hat, Inc.
+ * Copyright (C) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2021 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
@@ -954,6 +954,10 @@ ibus_engine_filter_key_event (IBusEngine *engine,
         return FALSE;
     for (n = names; n; n = n->next) {
         const gchar *name = (const gchar *)n->data;
+        if (!g_strcmp0 (name, "emoji") &&
+            (engine->priv->content_hints & IBUS_INPUT_HINT_NO_EMOJI)) {
+            continue;
+        }
         keys = g_hash_table_lookup (priv->extension_keybindings, name);
         for (; keys; keys++) {
             if (keys->keyval == 0 && keys->keycode == 0 && keys->state == 0)

From 675b94f63a2bce5554c9bb28a03462ed70933bec Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 3 Dec 2021 00:07:49 +0900
Subject: [PATCH 769/816] travis: Add autopint dependency

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8dbff1292..c065f9e1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ arch:
 addons:
   apt:
     packages:
+    # For autogen.sh
+    - autopoint
     # For make from
     # https://packages.ubuntu.com/search?searchon=sourcenames&keywords=ibus
     - desktop-file-utils

From f5757ada54edaa7d2e3ea948d340cdf48064e30c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Jan 2022 11:20:26 +0900
Subject: [PATCH 770/816] ibusenginesimple: Fix to send char position at
 update_preedit_text

ibus_engine_update_preedit_text() should send the character position
instead of the byte position.

BUG=https://github.com/ibus/ibus/issues/2368
---
 src/ibusenginesimple.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 83b04ebc3..a80e41a56 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2014-2017 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -386,7 +386,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
     } else if (s->len >= G_MAXINT) {
         g_warning ("%s is too long compose length: %lu", s->str, s->len);
     } else {
-        int len = (int)s->len;
+        guint len = (guint)g_utf8_strlen (s->str, -1);
         IBusText *text = ibus_text_new_from_string (s->str);
         ibus_text_append_attribute (text,
                 IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);

From 0e118e7e57caaa298e367ed99f2051ba47a35f81 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 20 Jan 2022 16:33:11 +0900
Subject: [PATCH 771/816] data/dconf: Change XKB layout string color in panel

Replace '#415099' with '#51a2da' in XKB layout string color

BUG=https://github.com/ibus/ibus/issues/2364
---
 data/dconf/org.freedesktop.ibus.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 099b9c600..e90ee5abf 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -146,7 +146,7 @@
       <description>Show input method name on language bar</description>
     </key>
     <key name="xkb-icon-rgba" type="s">
-      <default>'#415099'</default>
+      <default>'#51a2da'</default>
       <summary>RGBA value of XKB icon</summary>
       <description>XKB icon shows the layout string and the string is rendered with the RGBA value. The RGBA value can be 1. a color name from X11, 2. a hex value in form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or percentage values in the range 0% to 100%, and 'a' is a floating point value in the range 0 to 1 of the alpha.</description>
     </key>

From d9ff2bb6b04a7cf7d99f4e9832b4b8905858178c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 20 Jan 2022 16:41:37 +0900
Subject: [PATCH 772/816] data/dconf: Add Ctrl-semicolon to Emoji shortcut key

period key is needed Shift key in French keyboard and Ctrl-period does
not work.
Add Ctrl-semicolon in org.freedesktop.ibus.panel.emoji.hotkey to fix
the problem.

BUG=https://github.com/ibus/ibus/issues/2360
---
 data/dconf/org.freedesktop.ibus.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index e90ee5abf..516f75204 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -183,7 +183,7 @@
       <description>The shortcut keys for turning Unicode typing on or off</description>
     </key>
     <key name="hotkey" type="as">
-      <default>[ '&lt;Control&gt;period' ]</default>
+      <default>[ '&lt;Control&gt;period', '&lt;Control&gt;semicolon' ]</default>
       <summary>Emoji shortcut keys for gtk_accelerator_parse</summary>
       <description>The shortcut keys for turning emoji typing on or off</description>
     </key>

From 5a455b1ead5d72483952356ddfe25b9e3b637e6f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 13 Oct 2021 19:00:47 +0200
Subject: [PATCH 773/816] Fix unref problems with floating references

When running with debug-enabled GLIB there are several critical
errors output: "A floating object ... was finalized. This means
that someone called g_object_unref() on an object that had only
a floating reference; the initial floating reference is not
owned by anyone and must be removed with g_object_ref_sink()."

This change fixes this by calling `g_object_ref_sink()` before
`g_object_unref()` if we have a floating reference.

It also fixes another related problem where we called
`g_object_unref()` on a static IBusText string (created with
`ibus_text_new_from_static_string()`) for which the API documentation
says not to free.

BUG=https://github.com/ibus/ibus/pull/2359
---
 src/ibusinputcontext.c | 21 ++++++++++++++-------
 src/ibusproperty.c     | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 2b1438fc6..4b27551bd 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -550,7 +550,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
         g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text);
 
         if (g_object_is_floating (text))
-            g_object_unref (text);
+            g_object_ref_sink (text);
+        g_object_unref (text);
         return;
     }
     if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) {
@@ -569,7 +570,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        visible);
 
         if (g_object_is_floating (text))
-            g_object_unref (text);
+            g_object_ref_sink (text);
+        g_object_unref (text);
         return;
     }
     if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
@@ -591,7 +593,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        mode);
 
         if (g_object_is_floating (text))
-            g_object_unref (text);
+            g_object_ref_sink (text);
+        g_object_unref (text);
         return;
     }
 
@@ -619,7 +622,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        text,
                        visible);
         if (g_object_is_floating (text))
-            g_object_unref (text);
+            g_object_ref_sink (text);
+        g_object_unref (text);
         return;
     }
 
@@ -637,7 +641,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        table,
                        visible);
         if (g_object_is_floating (table))
-            g_object_unref (table);
+            g_object_ref_sink (table);
+        g_object_unref (table);
         return;
 
     }
@@ -655,7 +660,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        prop_list);
 
         if (g_object_is_floating (prop_list))
-            g_object_unref (prop_list);
+            g_object_ref_sink (prop_list);
+        g_object_unref (prop_list);
         return;
     }
 
@@ -668,7 +674,8 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
         g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop);
 
         if (g_object_is_floating (prop))
-            g_object_unref (prop);
+            g_object_ref_sink (prop);
+        g_object_unref (prop);
         return;
     }
 
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index e87d26b64..6d4ed088e 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -336,17 +336,20 @@ ibus_property_destroy (IBusProperty *prop)
     prop->priv->icon = NULL;
 
     if (prop->priv->label) {
-        g_object_unref (prop->priv->label);
+        if (!ibus_text_get_is_static (prop->priv->label))
+            g_object_unref (prop->priv->label);
         prop->priv->label = NULL;
     }
 
     if (prop->priv->symbol) {
-        g_object_unref (prop->priv->symbol);
+        if (!ibus_text_get_is_static (prop->priv->symbol))
+            g_object_unref (prop->priv->symbol);
         prop->priv->symbol = NULL;
     }
 
     if (prop->priv->tooltip) {
-        g_object_unref (prop->priv->tooltip);
+        if (!ibus_text_get_is_static (prop->priv->tooltip))
+            g_object_unref (prop->priv->tooltip);
         prop->priv->tooltip = NULL;
     }
 
@@ -401,7 +404,7 @@ ibus_property_deserialize (IBusProperty *prop,
     g_variant_get_child (variant, retval++, "u", &prop->priv->type);
 
     GVariant *subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->label != NULL) {
+    if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
         g_object_unref (prop->priv->label);
     }
     prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -411,7 +414,7 @@ ibus_property_deserialize (IBusProperty *prop,
     ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
 
     subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->tooltip != NULL) {
+    if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
         g_object_unref (prop->priv->tooltip);
     }
     prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -432,7 +435,7 @@ ibus_property_deserialize (IBusProperty *prop,
 
     /* Keep the serialized order for the compatibility when add new members. */
     subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->symbol != NULL) {
+    if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
         g_object_unref (prop->priv->symbol);
     }
     prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -564,7 +567,7 @@ ibus_property_set_label (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_return_if_fail (label == NULL || IBUS_IS_TEXT (label));
 
-    if (prop->priv->label) {
+    if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
         g_object_unref (prop->priv->label);
     }
 
@@ -583,7 +586,7 @@ ibus_property_set_symbol (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
 
-    if (prop->priv->symbol) {
+    if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
         g_object_unref (prop->priv->symbol);
     }
 
@@ -612,19 +615,16 @@ ibus_property_set_tooltip (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip));
 
-    IBusPropertyPrivate *priv = prop->priv;
-
-    if (priv->tooltip) {
-        g_object_unref (priv->tooltip);
+    if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
+        g_object_unref (prop->priv->tooltip);
     }
 
     if (tooltip == NULL) {
-        priv->tooltip = ibus_text_new_from_static_string ("");
-        g_object_ref_sink (priv->tooltip);
+        prop->priv->tooltip = ibus_text_new_from_static_string ("");
     }
     else {
-        priv->tooltip = tooltip;
-        g_object_ref_sink (priv->tooltip);
+        prop->priv->tooltip = tooltip;
+        g_object_ref_sink (prop->priv->tooltip);
     }
 }
 

From ad95015dc411f84dd9b8869e596e4707cd2ccd2b Mon Sep 17 00:00:00 2001
From: Sibo Dong <46512211+dongsibo@users.noreply.github.com>
Date: Wed, 2 Feb 2022 19:18:02 +0900
Subject: [PATCH 774/816] ui/gtk3: Update man page for Emoji shortcut key

The default Emoji shortcut key was changed but not updated in
the ibus-emoji.7 man page.

BUG=https://github.com/ibus/ibus/pull/2353
---
 ui/gtk3/ibus-emoji.7.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/gtk3/ibus-emoji.7.in b/ui/gtk3/ibus-emoji.7.in
index 9c6d3c6f0..b4d941eca 100644
--- a/ui/gtk3/ibus-emoji.7.in
+++ b/ui/gtk3/ibus-emoji.7.in
@@ -1,8 +1,8 @@
 .\" This file is distributed under the same license as the ibus
 .\" package.
-.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017-2018.
+.\" Copyright (C) Takao Fujiwara <takao.fujiwara1@gmail.com>, 2017-2022.
 .\"
-.TH "IBUS EMOJI" 7 "August 2018" "@VERSION@" "User Commands"
+.TH "IBUS EMOJI" 7 "February 2022" "@VERSION@" "User Commands"
 .SH NAME
 .B ibus-emoji
 \- Call the IBus emoji utility by
@@ -51,7 +51,7 @@ E.g. "Noto Color Emoji", "Android Emoji" font.
 
 .SH "KEYBOARD OPERATIONS"
 .TP
-\fBControl-Shift-e\fR
+\fBControl-Period or Control-Semicolon\fR
 Launch IBus Emojier. The shortcut key can be customized by
 .B ibus\-setup (1).
 .TP

From 0f1485bfa687386f26ef5909c123e0ae2e3e11b9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 3 Feb 2022 14:03:30 +0900
Subject: [PATCH 775/816] src: Add IBUS_INPUT_HINT_PRIVATE for browser private
 mode

GTK4 added GTK_INPUT_HINT_PRIVATE recently for Web brower
private or guest mode.

BUG=https://github.com/ibus/ibus/issues/2315
---
 src/ibustypes.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ibustypes.h b/src/ibustypes.h
index 798ad04d9..990659ace 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -2,7 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-2020 Red Hat, Inc.
+ * Copyright (C) 2010-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2022 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
@@ -300,6 +301,8 @@ typedef enum
  * @IBUS_INPUT_HINT_VERTICAL_WRITING: The text is vertical. Since 1.5.11
  * @IBUS_INPUT_HINT_EMOJI: Suggest offering Emoji support. Since 1.5.24
  * @IBUS_INPUT_HINT_NO_EMOJI: Suggest not offering Emoji support. Since 1.5.24
+ * @IBUS_INPUT_HINT_PRIVATE: Request that the input method should not
+ *     update personalized data (like typing history). Since 1.5.26
  *
  * Describes hints that might be taken into account by engines.  Note
  * that engines may already tailor their behaviour according to the
@@ -326,7 +329,8 @@ typedef enum
     IBUS_INPUT_HINT_INHIBIT_OSK         = 1 << 7,
     IBUS_INPUT_HINT_VERTICAL_WRITING    = 1 << 8,
     IBUS_INPUT_HINT_EMOJI               = 1 << 9,
-    IBUS_INPUT_HINT_NO_EMOJI            = 1 << 10
+    IBUS_INPUT_HINT_NO_EMOJI            = 1 << 10,
+    IBUS_INPUT_HINT_PRIVATE             = 1 << 11
 } IBusInputHints;
 
 #endif

From 787b564982d17017cb35ab87b71b6a16d7440387 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 3 Feb 2022 14:34:34 +0900
Subject: [PATCH 776/816] bus: mkdir socket dirs instead of socket paths

IBus ran mkdir for socket paths for --address=unix:path
but should does the socket directories instead.

BUG=https://github.com/ibus/ibus/issues/2363
---
 bus/server.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index e8d0ce2bd..6abf84276 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2011-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2011-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2008-2021 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -38,14 +38,14 @@ static GDBusServer *server = NULL;
 static GMainLoop *mainloop = NULL;
 static BusDBusImpl *dbus = NULL;
 static BusIBusImpl *ibus = NULL;
-static gchar *address = NULL;
+static char *address = NULL;
 static gboolean _restart = FALSE;
 
 static void
 _restart_server (void)
 {
-    gchar *exe;
-    gint fd;
+    char *exe;
+    int fd;
     ssize_t r;
     int MAXSIZE = 0xFFF;
     char proclnk[MAXSIZE];
@@ -201,11 +201,11 @@ bus_acquired_handler (GDBusConnection       *connection,
                             NULL);
 }
 
-static gchar *
+static char *
 _bus_extract_address (void)
 {
-    gchar *socket_address = g_strdup (g_address);
-    gchar *p;
+    char *socket_address = g_strdup (g_address);
+    char *p;
 
 #define IF_REPLACE_VARIABLE_WITH_FUNC(variable, func, format)           \
     if ((p = g_strstr_len (socket_address, -1, (variable)))) {          \
@@ -242,12 +242,12 @@ bus_server_init (void)
 #define IBUS_UNIX_ABSTRACT      "unix:abstract="
 #define IBUS_UNIX_DIR           "unix:dir="
 
-    gchar *socket_address;
+    char *socket_address;
     GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE;
-    gchar *guid;
+    char *guid;
     GDBusAuthObserver *observer;
     GError *error = NULL;
-    gchar *unix_dir = NULL;
+    char *unix_dir = NULL;
 
     dbus = bus_dbus_impl_get_default ();
     ibus = bus_ibus_impl_get_default ();
@@ -256,18 +256,24 @@ bus_server_init (void)
     /* init server */
     socket_address = _bus_extract_address ();
 
-#define IF_GET_UNIX_DIR(prefix)                                         \
+#define IF_GET_UNIX_DIR_FROM_DIR(prefix)                                \
     if (g_str_has_prefix (socket_address, (prefix))) {                  \
         unix_dir = g_strdup (socket_address + strlen (prefix));         \
     }
+#define IF_GET_UNIX_DIR_FROM_PATH(prefix)                               \
+    if (g_str_has_prefix (socket_address, (prefix))) {                  \
+        const char *unix_path = socket_address + strlen (prefix);       \
+        unix_dir = g_path_get_dirname (unix_path);                      \
+    }
+
 
-    IF_GET_UNIX_DIR (IBUS_UNIX_TMPDIR)
+    IF_GET_UNIX_DIR_FROM_DIR (IBUS_UNIX_TMPDIR)
     else
-    IF_GET_UNIX_DIR (IBUS_UNIX_PATH)
+    IF_GET_UNIX_DIR_FROM_PATH (IBUS_UNIX_PATH)
     else
-    IF_GET_UNIX_DIR (IBUS_UNIX_ABSTRACT)
+    IF_GET_UNIX_DIR_FROM_PATH (IBUS_UNIX_ABSTRACT)
     else
-    IF_GET_UNIX_DIR (IBUS_UNIX_DIR)
+    IF_GET_UNIX_DIR_FROM_DIR (IBUS_UNIX_DIR)
     else {
         g_error ("Your socket address \"%s\" does not correspond with "
                  "one of the following formats; "
@@ -329,7 +335,8 @@ bus_server_init (void)
                     bus_acquired_handler,
                     NULL, NULL, NULL, NULL);
 
-#undef IF_GET_UNIX_DIR
+#undef IF_GET_UNIX_DIR_FROM_DIR
+#undef IF_GET_UNIX_DIR_FROM_PATH
 #undef IBUS_UNIX_TMPDIR
 #undef IBUS_UNIX_PATH
 #undef IBUS_UNIX_ABSTRACT

From dfd3fbf26fa4b5ff20512b166a8dd321afc10344 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 3 Feb 2022 17:31:08 +0900
Subject: [PATCH 777/816] bus: Do not mkdir abstract unix socket

IBus ran mkdir for unix abstract sockets for --address=unix:abstract
but should not need to mkdir.

BUG=https://github.com/ibus/ibus/issues/2363
---
 bus/server.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bus/server.c b/bus/server.c
index 6abf84276..968d53461 100644
--- a/bus/server.c
+++ b/bus/server.c
@@ -265,13 +265,15 @@ bus_server_init (void)
         const char *unix_path = socket_address + strlen (prefix);       \
         unix_dir = g_path_get_dirname (unix_path);                      \
     }
+#define IF_GET_UNIX_DIR_FROM_ABSTRACT(prefix)                           \
+    if (g_str_has_prefix (socket_address, (prefix))) {}
 
 
     IF_GET_UNIX_DIR_FROM_DIR (IBUS_UNIX_TMPDIR)
     else
     IF_GET_UNIX_DIR_FROM_PATH (IBUS_UNIX_PATH)
     else
-    IF_GET_UNIX_DIR_FROM_PATH (IBUS_UNIX_ABSTRACT)
+    IF_GET_UNIX_DIR_FROM_ABSTRACT (IBUS_UNIX_ABSTRACT)
     else
     IF_GET_UNIX_DIR_FROM_DIR (IBUS_UNIX_DIR)
     else {
@@ -281,7 +283,8 @@ bus_server_init (void)
                  IBUS_UNIX_ABSTRACT "FILE, " IBUS_UNIX_DIR "DIR.",
                  socket_address);
     }
-    if (!g_file_test (unix_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+    if (unix_dir &&
+        !g_file_test (unix_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
         /* Require mkdir for BSD system.
          * The mode 0700 can eliminate malicious users change the mode.
          * `chmod` runs for the last directory only not to change the modes
@@ -337,6 +340,7 @@ bus_server_init (void)
 
 #undef IF_GET_UNIX_DIR_FROM_DIR
 #undef IF_GET_UNIX_DIR_FROM_PATH
+#undef IF_GET_UNIX_DIR_FROM_ABSTRACT
 #undef IBUS_UNIX_TMPDIR
 #undef IBUS_UNIX_PATH
 #undef IBUS_UNIX_ABSTRACT

From c69b61aa66239e1b13c9764b2d3bf6f02d086785 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 4 Feb 2022 15:08:36 +0900
Subject: [PATCH 778/816] src: Fix ibus_key_event_from_string for
 gobject-introspection

BUG=https://github.com/ibus/ibus/issues/2330
---
 src/ibusshare.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ibusshare.h b/src/ibusshare.h
index d70af29f3..d739e2ff8 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2018 Red Hat, Inc.
+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2022 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
@@ -333,8 +333,8 @@ gchar           *ibus_key_event_to_string
 /**
  * ibus_key_event_from_string:
  * @string: Key event string.
- * @keyval: Variable that hold key symbol result.
- * @modifiers: Variable that hold modifiers result.
+ * @keyval: (out): Variable that hold key symbol result.
+ * @modifiers: (out): Variable that hold modifiers result.
  *
  * Parse key event string and return key symbol and modifiers.
  *

From a076b388d856aeb4c8f8317dd6cd9dd6d61fe9ac Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 4 Nov 2020 10:48:45 +0100
Subject: [PATCH 779/816] src, client/x11: Add systemd unit file

This so far depends on GNOME targets, and is thus just usable there.
Other DEs wishing to use systemd and ibus will need to add the
necessary dependencies where applicable.

There are 2 scenarios here:
- On X11 sessions, ibus-daemon will be launched with --xim parameter,
  so ibus-x11 is started with it.
- On Wayland sessions, ibus-daemon will be started without XIM support,
  ibus-x11 will be launched and tear down together with all other
  session X11 services while Xwayland is running.

For the second part of the second situation, additionally install
a script at /etc/xdg/Xwayland-session.d, which takes care of X11
service initialization together with the Xwayland instance.

BUG=https://github.com/ibus/ibus/pull/2377
---
 client/x11/10-ibus-x11.in                     |  2 ++
 client/x11/Makefile.am                        | 18 ++++++++++++
 configure.ac                                  | 17 +++++++++++
 src/Makefile.am                               | 16 +++++++++++
 ....freedesktop.IBus.session.GNOME.service.in | 28 +++++++++++++++++++
 5 files changed, 81 insertions(+)
 create mode 100755 client/x11/10-ibus-x11.in
 create mode 100644 src/org.freedesktop.IBus.session.GNOME.service.in

diff --git a/client/x11/10-ibus-x11.in b/client/x11/10-ibus-x11.in
new file mode 100755
index 000000000..973cbb6f1
--- /dev/null
+++ b/client/x11/10-ibus-x11.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+@libexecdir@/ibus-x11 &
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 12de6ea8c..90454bcfa 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -67,6 +67,16 @@ noinst_HEADERS = \
 	locales.h \
 	$(NULL)
 
+xwaylandsessiond_in_files = 10-ibus-x11.in
+xwaylandsessiond_DATA = $(xwaylandsessiond_in_files:.in=)
+xwaylandsessionddir=$(sysconfdir)/xdg/Xwayland-session.d
+
+10-ibus-x11: 10-ibus-x11.in
+	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|"  $< > $@.tmp && mv $@.tmp $@
+
+install-data-hook:
+	chmod 755 $(DESTDIR)$(xwaylandsessionddir)/10-ibus-x11
+
 $(libIMdkit):
 	(cd $(top_builddir)/util/IMdkit; make)
 
@@ -81,4 +91,12 @@ locales.h:
 		xargs python -c 'import sys;print "#define LOCALES_STRING \"%s\"" % ",".join(sys.argv[1:])' \
 	 ) > $@
 
+CLEANFILES =                    \
+    $(xwaylandsessiond_DATA)    \
+    $(NULL)
+
+EXTRA_DIST =                    \
+    10-ibus-x11.in              \
+    $(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index ce096ad32..73c5e429f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,6 +393,22 @@ if test x"$enable_dconf" = x"yes"; then
     enable_dconf="yes (enabled, use --disable-dconf to disable)"
 fi
 
+AC_ARG_ENABLE(systemd-services,
+    AS_HELP_STRING([--disable-systemd-services],
+                   [Disable systemd services installation]),
+    [enable_systemd=$enableval],
+    [enable_systemd=yes]
+)
+AM_CONDITIONAL([ENABLE_SYSTEMD], [test x"$enable_systemd" = x"yes"])
+
+if test x"$enable_systemd" = x"yes"; then
+    PKG_CHECK_MODULES(SYSTEMD, [
+        systemd >= 0.7.5
+    ])
+    AC_SUBST([SYSTEMD_USER_UNIT_DIR], [`$PKG_CONFIG --variable systemduserunitdir systemd`])
+    enable_systemd="yes (enabled, use --disable-systemd-services to disable)"
+fi
+
 # Check env.
 AC_PATH_PROG(ENV_IBUS_TEST, env)
 AC_SUBST(ENV_IBUS_TEST)
@@ -860,6 +876,7 @@ Build options:
   UCD directory                 $UCD_DIR
   Socket directory              "$IBUS_SOCKET_DIR"
   XFixes client disconnect      $have_xfixes
+  Install systemd service       $enable_systemd
   Run test cases                $enable_tests
   Install tests                 $enable_install_tests
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 578694b52..bbaa6c906 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -317,6 +317,11 @@ install-data-hook:
 	        rm "$(DESTDIR)$(dictdir)/$$file" || exit $$?; \
 	    fi; \
 	done
+	$(MKDIR_P) "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants/"
+	( \
+		cd "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants" ; \
+		$(LN_S) -f "../org.freedesktop.IBus.session.GNOME.service" .; \
+	)
 
 emoji_parser_SOURCES =          \
     emoji-parser.c              \
@@ -383,7 +388,17 @@ clean-local:
 	$(NULL)
 endif
 
+if ENABLE_SYSTEMD
+systemdservice_in_files = org.freedesktop.IBus.session.GNOME.service.in
+systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
+systemdservicedir=$(SYSTEMD_USER_UNIT_DIR)
+
+org.freedesktop.IBus.session.GNOME.service: org.freedesktop.IBus.session.GNOME.service.in
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|"  $< > $@.tmp && mv $@.tmp $@
+endif
+
 EXTRA_DIST =                    \
+    org.freedesktop.IBus.session.GNOME.service.in \
     emoji-parser.c              \
     ibusversion.h.in            \
     ibusmarshalers.list         \
@@ -393,6 +408,7 @@ EXTRA_DIST =                    \
     $(NULL)
 
 CLEANFILES +=                   \
+    $(systemdservice_DATA)      \
     $(BUILT_SOURCES)            \
     stamp-ibusmarshalers.h      \
     stamp-ibusenumtypes.h       \
diff --git a/src/org.freedesktop.IBus.session.GNOME.service.in b/src/org.freedesktop.IBus.session.GNOME.service.in
new file mode 100644
index 000000000..76444dbde
--- /dev/null
+++ b/src/org.freedesktop.IBus.session.GNOME.service.in
@@ -0,0 +1,28 @@
+[Unit]
+Description=IBus Daemon
+CollectMode=inactive-or-failed
+
+# Require GNOME session and specify startup ordering
+Requisite=gnome-session-initialized.target
+After=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session.target
+
+# Needs to run when DISPLAY/WAYLAND_DISPLAY is set
+After=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+
+# Never run in GDM
+Conflicts=gnome-session@gnome-login.target
+
+[Service]
+Type=dbus
+# Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
+ExecStart=sh -c '@bindir@/ibus-daemon --panel disable $([[ $XDG_SESSION_TYPE == "x11" ]] && echo "--xim")'
+Restart=on-abnormal
+BusName=org.freedesktop.IBus
+TimeoutStopSec=5
+Slice=session.slice
+
+[Install]
+WantedBy=gnome-session.target

From b5423f0cff78e627fec12378bfcc70efa79e9379 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 17 Feb 2022 20:15:38 +0900
Subject: [PATCH 780/816] src/services: Add
 org.freedesktop.IBus.session.generic.service

Move bus/*.service.in & src/*.service.in into bus/services

BUG=https://github.com/ibus/ibus/pull/2381
---
 bus/Makefile.am                               | 16 +----
 bus/services/Makefile.am                      | 68 +++++++++++++++++++
 .../org.freedesktop.IBus.service.in           |  0
 ....freedesktop.IBus.session.GNOME.service.in |  2 +-
 ...reedesktop.IBus.session.generic.service.in | 15 ++++
 configure.ac                                  | 48 ++++++-------
 src/Makefile.am                               | 16 -----
 7 files changed, 112 insertions(+), 53 deletions(-)
 create mode 100644 bus/services/Makefile.am
 rename bus/{ => services}/org.freedesktop.IBus.service.in (100%)
 rename {src => bus/services}/org.freedesktop.IBus.session.GNOME.service.in (95%)
 create mode 100644 bus/services/org.freedesktop.IBus.session.generic.service.in

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 4383a8740..e173ee251 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2013-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2018 Red Hat, Inc.
+# Copyright (c) 2013-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2022 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
@@ -22,6 +22,7 @@
 # USA
 
 NULL =
+SUBDIRS = . services
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
@@ -190,15 +191,4 @@ man_onedir = $(mandir)/man1
 %.1.gz: %.1
 	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
 
-
-dbusservice_in_files = org.freedesktop.IBus.service.in
-dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
-dbusservicedir=${datadir}/dbus-1/services
-
-org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" -e "s|\@xim_cli_arg\@|$(XIM_CLI_ARG)|" $< > $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST += $(dbusservice_in_files)
-CLEANFILES += $(dbusservice_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/bus/services/Makefile.am b/bus/services/Makefile.am
new file mode 100644
index 000000000..9cc421532
--- /dev/null
+++ b/bus/services/Makefile.am
@@ -0,0 +1,68 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2022 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
+# 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
+
+NULL =
+
+# Originally this D-Bus service file was added for GNOME but seems not to
+# be used at present.
+#
+# TODO: Check if flatpack uses this file and we could delete
+# org.freedesktop.IBus.service file in the future.
+dbusservice_in_files = org.freedesktop.IBus.service.in
+dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+dbusservicedir=${datadir}/dbus-1/services
+
+systemdservice_in_files = \
+    org.freedesktop.IBus.session.generic.service.in \
+    org.freedesktop.IBus.session.GNOME.service.in \
+    $(NULL)
+
+%.service: %.service.in
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" \
+	                -e "s|\@xim_cli_arg\@|$(XIM_CLI_ARG)|" $< > $@.tmp && \
+	            mv $@.tmp $@
+
+if ENABLE_SYSTEMD
+systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
+systemdservicedir = $(SYSTEMD_USER_UNIT_DIR)
+
+# in install-data-hook.
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants/"
+	( \
+		cd "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants" ; \
+		$(LN_S) -f "../org.freedesktop.IBus.session.GNOME.service" .; \
+	)
+	$(NULL)
+endif
+
+EXTRA_DIST =                    \
+    $(dbusservice_in_files)     \
+    $(systemdservice_in_files)  \
+    $(NULL)
+
+CLEANFILES =                    \
+    $(dbusservice_DATA)         \
+    $(systemdservice_DATA)      \
+    $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/bus/org.freedesktop.IBus.service.in b/bus/services/org.freedesktop.IBus.service.in
similarity index 100%
rename from bus/org.freedesktop.IBus.service.in
rename to bus/services/org.freedesktop.IBus.service.in
diff --git a/src/org.freedesktop.IBus.session.GNOME.service.in b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
similarity index 95%
rename from src/org.freedesktop.IBus.session.GNOME.service.in
rename to bus/services/org.freedesktop.IBus.session.GNOME.service.in
index 76444dbde..a99370fad 100644
--- a/src/org.freedesktop.IBus.session.GNOME.service.in
+++ b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=IBus Daemon
+Description=IBus Daemon for GNOME
 CollectMode=inactive-or-failed
 
 # Require GNOME session and specify startup ordering
diff --git a/bus/services/org.freedesktop.IBus.session.generic.service.in b/bus/services/org.freedesktop.IBus.session.generic.service.in
new file mode 100644
index 000000000..9d4931598
--- /dev/null
+++ b/bus/services/org.freedesktop.IBus.session.generic.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=IBus Daemon for generic sessions
+CollectMode=inactive-or-failed
+
+# Never run in GNOME
+Conflicts=gnome-session-initialized.target
+
+[Service]
+Type=dbus
+# Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
+ExecStart=sh -c '@bindir@/ibus-daemon $IBUS_DAEMON_ARGS'
+Restart=on-abnormal
+BusName=org.freedesktop.IBus
+TimeoutStopSec=5
+Slice=session.slice
diff --git a/configure.ac b/configure.ac
index 73c5e429f..4137e6cc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2021 Red Hat, Inc.
+# Copyright (c) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2022 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
@@ -791,24 +791,22 @@ AC_SUBST(XKBCONFIG_BASE)
 AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
 
 # OUTPUT files
-AC_CONFIG_FILES([ po/Makefile.in
-Makefile
-ibus-1.0.pc
-ibus.spec
+AC_CONFIG_FILES([
+po/Makefile.in
+bindings/Makefile
+bindings/pygobject/Makefile
+bindings/vala/Makefile
+bus/Makefile
+bus/services/Makefile
 client/Makefile
 client/gtk2/Makefile
 client/gtk3/Makefile
 client/gtk4/Makefile
 client/x11/Makefile
 client/wayland/Makefile
-src/Makefile
-src/ibusversion.h
-src/tests/Makefile
-bus/Makefile
-portal/Makefile
-engine/Makefile
-util/Makefile
-util/IMdkit/Makefile
+conf/Makefile
+conf/dconf/Makefile
+conf/memconf/Makefile
 data/Makefile
 data/annotations/Makefile
 data/icons/Makefile
@@ -819,20 +817,24 @@ docs/Makefile
 docs/reference/Makefile
 docs/reference/ibus/ibus-docs.sgml
 docs/reference/ibus/Makefile
-m4/Makefile
+engine/Makefile
 ibus/_config.py
 ibus/Makefile
 ibus/interface/Makefile
-ui/Makefile
-ui/gtk3/Makefile
+m4/Makefile
+portal/Makefile
 setup/Makefile
-bindings/Makefile
-bindings/pygobject/Makefile
-bindings/vala/Makefile
-conf/Makefile
-conf/dconf/Makefile
-conf/memconf/Makefile
+src/Makefile
+src/ibusversion.h
+src/tests/Makefile
 tools/Makefile
+ui/Makefile
+ui/gtk3/Makefile
+util/Makefile
+util/IMdkit/Makefile
+Makefile
+ibus-1.0.pc
+ibus.spec
 ])
 
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index bbaa6c906..578694b52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -317,11 +317,6 @@ install-data-hook:
 	        rm "$(DESTDIR)$(dictdir)/$$file" || exit $$?; \
 	    fi; \
 	done
-	$(MKDIR_P) "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants/"
-	( \
-		cd "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants" ; \
-		$(LN_S) -f "../org.freedesktop.IBus.session.GNOME.service" .; \
-	)
 
 emoji_parser_SOURCES =          \
     emoji-parser.c              \
@@ -388,17 +383,7 @@ clean-local:
 	$(NULL)
 endif
 
-if ENABLE_SYSTEMD
-systemdservice_in_files = org.freedesktop.IBus.session.GNOME.service.in
-systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
-systemdservicedir=$(SYSTEMD_USER_UNIT_DIR)
-
-org.freedesktop.IBus.session.GNOME.service: org.freedesktop.IBus.session.GNOME.service.in
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|"  $< > $@.tmp && mv $@.tmp $@
-endif
-
 EXTRA_DIST =                    \
-    org.freedesktop.IBus.session.GNOME.service.in \
     emoji-parser.c              \
     ibusversion.h.in            \
     ibusmarshalers.list         \
@@ -408,7 +393,6 @@ EXTRA_DIST =                    \
     $(NULL)
 
 CLEANFILES +=                   \
-    $(systemdservice_DATA)      \
     $(BUILT_SOURCES)            \
     stamp-ibusmarshalers.h      \
     stamp-ibusenumtypes.h       \

From 5cfe838715097d61b50da55f80bcff2c698ca885 Mon Sep 17 00:00:00 2001
From: Changwoo Ryu <cwryu@debian.org>
Date: Fri, 18 Feb 2022 09:07:02 +0900
Subject: [PATCH 781/816] client/gtk2/ibusimcontext: Fix forward key keycode
 for GTK4

When a keycode is provided (!= 0) for a forwarded key event, convert it to a
GTK keycode before passing it to gtk_im_context_filter_key().

Also free GdkKeymapKey after gdk_display_map_keyval() is called.

BUG=https://github.com/ibus/ibus/issues/2380
BUG=https://github.com/ibus/ibus/issues/2382
---
 client/gtk2/ibusimcontext.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index c2df3a877..a5e5e7923 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1945,7 +1945,9 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
 #if GTK_CHECK_VERSION (3, 98, 4)
     int group = 0;
     g_return_if_fail (GTK_IS_IM_CONTEXT (ibusimcontext));
-    if (keycode == 0 && ibusimcontext->client_window) {
+    if (keycode != 0) {
+        keycode += 8; // to GTK keycode
+    } else if (ibusimcontext->client_window) {
         GdkDisplay *display =
                 gtk_widget_get_display (ibusimcontext->client_window);
         GdkKeymapKey *keys = NULL;
@@ -1953,6 +1955,7 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
         if (gdk_display_map_keyval (display, keyval, &keys, &n_keys)) {
             keycode = keys->keycode;
             group = keys->group;
+            g_free (keys);
         } else {
             g_warning ("Failed to parse keycode from keyval %x", keyval);
         }

From a82bda58a45470c4be0f3db21eaddc73a230807f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 18 Feb 2022 12:04:09 +0900
Subject: [PATCH 782/816] src/tests: Fix typos

- test_metas_in location
- Check ibus processes in CI
- Fix libexec path
---
 src/tests/Makefile.am                     | 8 ++++----
 src/tests/ibus-desktop-testing-autostart  | 2 ++
 src/tests/ibus-desktop-testing.desktop.in | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 7d00f2367..f932f18f9 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2018 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -117,11 +117,11 @@ org.freedesktop.IBus.Desktop.Testing.desktop: ibus-desktop-testing.desktop.in
 	mv $@.tmp $@
 endif
 
-$(test_metas): $(test_metas_in) $(test_programs)
+$(test_metas): $(test_metas_in)
 	f=`echo $@ | sed -e 's/\.test//'`; \
 	TEST_EXEC=$(test_execsdir)/$$f; \
-	sed -e "s|@TEST_EXEC[@]|$$TEST_EXEC|g" $(test_metas_in) > $@.tmp; \
-	mv $@.tmp $@; \
+	sed -e "s|@TEST_EXEC[@]|$$TEST_EXEC|g" $(srcdir)/$(test_metas_in) \
+	    > $@.tmp && mv $@.tmp $@; \
 	$(NULL)
 
 ibus-compose-locales: ibus-compose-locales.in
diff --git a/src/tests/ibus-desktop-testing-autostart b/src/tests/ibus-desktop-testing-autostart
index da22b64e1..1e1eb1803 100755
--- a/src/tests/ibus-desktop-testing-autostart
+++ b/src/tests/ibus-desktop-testing-autostart
@@ -29,6 +29,8 @@ pwd
 pstree -asp $$
 gsettings list-recursively org.gnome.shell
 rpm -q gnome-shell-extension-no-overview gnome-shell gnome-session
+ps -ef | grep ibus | grep -v grep
+ibus address
 '
 
 if [ $# -gt 0 ] ; then
diff --git a/src/tests/ibus-desktop-testing.desktop.in b/src/tests/ibus-desktop-testing.desktop.in
index fa0c9b40c..1b8153456 100644
--- a/src/tests/ibus-desktop-testing.desktop.in
+++ b/src/tests/ibus-desktop-testing.desktop.in
@@ -2,7 +2,7 @@
 Name=IBus Desktop Testing Runner
 GenericName=Input Method Desktop Testing Runner
 Comment=Test plugin for IBus Desktop Testing
-Exec=@ibexecdir@/ibus-desktop-testing-autostart /var/tmp/ibus-ci-autostart.log
+Exec=@libexecdir@/ibus-desktop-testing-autostart /var/tmp/ibus-ci-autostart.log
 Terminal=false
 Type=Application
 Encoding=UTF-8

From 19377ad22d8145ea431e5de51f047061c98f8d21 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 1 Mar 2022 18:26:21 +0900
Subject: [PATCH 783/816] src/ibuscompose: Check algorithm dead key by 9 length

This change fixes the D-Bus timeout by a long compose preedit text.
check_normalize_nfc() calculates the factorical of the compse preedit
length and assigne the value to an INT variable and it could excceed
the MAX_INT.
Probably I think the length of the compose algorizhm dead key would be
enough 9. I.e. 9! == 46320 <= SHRT_MAX == 32767

BUG=https://github.com/ibus/ibus/issues/2385
---
 src/ibuscomposetable.c | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
index 250e0139f..387a24a8f 100644
--- a/src/ibuscomposetable.c
+++ b/src/ibuscomposetable.c
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
  * Copyright (C) 2013-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2013-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2013-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,6 +46,7 @@
 #define IBUS_COMPOSE_TABLE_MAGIC "IBusComposeTable"
 #define IBUS_COMPOSE_TABLE_VERSION (4)
 #define X11_DATADIR X11_DATA_PREFIX "/share/X11/locale"
+#define IBUS_MAX_COMPOSE_ALGORITHM_LEN 9
 
 typedef struct {
   gunichar     *sequence;
@@ -1659,7 +1660,7 @@ ibus_compose_table_compact_check (const IBusComposeTableCompactEx
 static gboolean
 check_normalize_nfc (gunichar* combination_buffer, int n_compose)
 {
-    gunichar combination_buffer_temp[IBUS_MAX_COMPOSE_LEN];
+    gunichar combination_buffer_temp[IBUS_MAX_COMPOSE_ALGORITHM_LEN + 1];
     char *combination_utf8_temp = NULL;
     char *nfc_temp = NULL;
     int n_combinations;
@@ -1682,7 +1683,7 @@ check_normalize_nfc (gunichar* combination_buffer, int n_compose)
 
     memcpy (combination_buffer_temp,
             combination_buffer,
-            IBUS_MAX_COMPOSE_LEN * sizeof (gunichar) );
+            IBUS_MAX_COMPOSE_ALGORITHM_LEN * sizeof (gunichar) );
 
     for (i = 0; i < n_combinations; i++ ) {
         g_unicode_canonical_ordering (combination_buffer_temp, n_compose);
@@ -1694,7 +1695,7 @@ check_normalize_nfc (gunichar* combination_buffer, int n_compose)
         if (g_utf8_strlen (nfc_temp, -1) == 1) {
             memcpy (combination_buffer,
                     combination_buffer_temp,
-                    IBUS_MAX_COMPOSE_LEN * sizeof (gunichar) );
+                    IBUS_MAX_COMPOSE_ALGORITHM_LEN * sizeof (gunichar) );
 
             g_free (combination_utf8_temp);
             g_free (nfc_temp);
@@ -1708,14 +1709,14 @@ check_normalize_nfc (gunichar* combination_buffer, int n_compose)
         if (n_compose > 2) {
             int j = i % (n_compose - 1) + 1;
             int k = (i+1) % (n_compose - 1) + 1;
-            if (j >= IBUS_MAX_COMPOSE_LEN) {
-                g_warning ("j >= IBUS_MAX_COMPOSE_LEN for " \
-                           "combination_buffer_temp");
+            if (j >= IBUS_MAX_COMPOSE_ALGORITHM_LEN) {
+                g_warning ("j >= %d for combination_buffer_temp",
+                           IBUS_MAX_COMPOSE_ALGORITHM_LEN);
                 break;
             }
-            if (k >= IBUS_MAX_COMPOSE_LEN) {
-                g_warning ("k >= IBUS_MAX_COMPOSE_LEN for " \
-                           "combination_buffer_temp");
+            if (k >= IBUS_MAX_COMPOSE_ALGORITHM_LEN) {
+                g_warning ("k >= %d for combination_buffer_temp",
+                           IBUS_MAX_COMPOSE_ALGORITHM_LEN);
                 break;
             }
             temp_swap = combination_buffer_temp[j];
@@ -1737,13 +1738,23 @@ ibus_check_algorithmically (const guint16 *compose_buffer,
 
 {
     int i;
-    gunichar combination_buffer[IBUS_MAX_COMPOSE_LEN];
+    gunichar combination_buffer[IBUS_MAX_COMPOSE_ALGORITHM_LEN + 1];
     char *combination_utf8, *nfc;
 
     if (output_char)
         *output_char = 0;
 
-    if (n_compose >= IBUS_MAX_COMPOSE_LEN)
+    /* Check the IBUS_MAX_COMPOSE_ALGORITHM_LEN length only here instead of
+     * IBUS_MAX_COMPOSE_LEN length.
+     * Because this API calls check_normalize_nfc() which calculates the factorial
+     * of `n_compose` and assigns the value to `n_combinations`.
+     * I.e. 9! == 40320 <= SHRT_MAX == 32767
+     * The factorial of exceeding INT_MAX spends a long time in check_normalize_nfc()
+     * and causes a D-Bus timeout between GTK clients and IBusEngineSimple.
+     * Currenlty IBUS_MAX_COMPOSE_LEN is much larger and supports the long compose
+     * sequence however the max 9 would be enough for this mechanical compose.
+     */
+    if (n_compose > IBUS_MAX_COMPOSE_ALGORITHM_LEN)
         return FALSE;
 
     for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)

From df664b1f18a9c630ccd884f8ff698abf6cbb1578 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 1 Mar 2022 19:23:25 +0900
Subject: [PATCH 784/816] src/ibusenginesimple: Support GTK4 coompose file

Load $XDG_CONFIG_HOME/gtk-4.0/Compose
---
 src/ibusenginesimple.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index a80e41a56..c57a3ea53 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -1448,8 +1448,16 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             g_free (path);
             return retval;
         }
-        g_free (path);
-        path = NULL;
+        g_clear_pointer(&path, g_free);
+
+        path = g_build_filename (g_get_user_config_dir (),
+                                 "gtk-4.0", "Compose", NULL);
+        if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+            ibus_engine_simple_add_compose_file (simple, path);
+            g_free (path);
+            return retval;
+        }
+        g_clear_pointer(&path, g_free);
 
         path = g_build_filename (g_get_user_config_dir (),
                                  "gtk-3.0", "Compose", NULL);
@@ -1458,8 +1466,7 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             g_free (path);
             return retval;
         }
-        g_free (path);
-        path = NULL;
+        g_clear_pointer(&path, g_free);
 
         home = g_get_home_dir ();
         if (home == NULL)
@@ -1471,8 +1478,7 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
             g_free (path);
             return retval;
         }
-        g_free (path);
-        path = NULL;
+        g_clear_pointer(&path, g_free);
 
 #if GLIB_CHECK_VERSION (2, 58, 0)
         langs = g_get_language_names_with_category ("LC_CTYPE");
@@ -1508,8 +1514,7 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
 
             if (g_file_test (path, G_FILE_TEST_EXISTS))
                 break;
-            g_free (path);
-            path = NULL;
+            g_clear_pointer(&path, g_free);
         }
 
 #if !GLIB_CHECK_VERSION (2, 58, 0)
@@ -1518,15 +1523,13 @@ ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
 
         if (path != NULL)
             ibus_engine_simple_add_compose_file (simple, path);
-        g_free (path);
-        path = NULL;
+        g_clear_pointer(&path, g_free);
     } else {
         path = g_build_filename (X11_DATADIR, locale, "Compose", NULL);
         do {
             if (g_file_test (path, G_FILE_TEST_EXISTS))
                 break;
-            g_free (path);
-            path = NULL;
+            g_clear_pointer(&path, g_free);
         } while (0);
         if (path == NULL)
             return retval;

From 1f27521425051b5af74d0a74e8689b114d9e5903 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Mar 2022 10:31:21 +0900
Subject: [PATCH 785/816] ui/gtk3: Check XDG_SESSION_DESKTOP for Plasma desktop

If ibus-dameon is launched from systemd, XDG_CURRENT_DESKTOP
environment variable could be set after ibus-dameon would be
launched and XDG_CURRENT_DESKTOP could be "(null)".
But XDG_SESSION_DESKTOP can be set with systemd's PAM.
---
 ui/gtk3/panel.vala | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index ab2005d7e..07ce65249 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -3,7 +3,7 @@
  * ibus - The Input Bus
  *
  * Copyright(c) 2011-2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright(c) 2015-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
+ * Copyright(c) 2015-2022 Takao Fujwiara <takao.fujiwara1@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -260,8 +260,23 @@ class Panel : IBus.PanelService {
 
 #if INDICATOR
     private static bool is_kde() {
-        if (Environment.get_variable("XDG_CURRENT_DESKTOP") == "KDE")
+        unowned string? desktop =
+            Environment.get_variable("XDG_CURRENT_DESKTOP");
+        if (desktop == "KDE")
             return true;
+        /* If ibus-dameon is launched from systemd, XDG_CURRENT_DESKTOP
+         * environment variable could be set after ibus-dameon would be
+         * launched and XDG_CURRENT_DESKTOP could be "(null)".
+         * But XDG_SESSION_DESKTOP can be set with systemd's PAM.
+         */
+        if (desktop == null || desktop == "(null)")
+            desktop = Environment.get_variable("XDG_SESSION_DESKTOP");
+        if (desktop == "plasma" || desktop == "KDE-wayland")
+            return true;
+        if (desktop == null) {
+            warning ("XDG_CURRENT_DESKTOP is not exported in your desktop " +
+                     "session.");
+        }
         warning ("If you launch KDE5 on xterm, " +
                  "export XDG_CURRENT_DESKTOP=KDE before launch KDE5.");
         return false;

From a3c07241f3225f9259c8aa576fa0a3fa4ab3ca82 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Mar 2022 10:33:34 +0900
Subject: [PATCH 786/816] engine: Update simple.xml with xkeyboard-config
 2.35.1

---
 engine/simple.xml.in | 983 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 937 insertions(+), 46 deletions(-)

diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 65133d9de..1152b5934 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -3,7 +3,7 @@
     <name>org.freedesktop.IBus.Simple</name>
     <description>A table based simple engine</description>
     <exec>@libexecdir@/ibus-engine-simple</exec>
-    <version>1.5.25.20210819</version>
+    <version>1.5.26.20220314</version>
     <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
     <license>GPL</license>
     <homepage>https://github.com/ibus/ibus/wiki</homepage>
@@ -200,6 +200,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:us:dvorak-mac:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>us</layout>
+            <layout_variant>dvorak-mac</layout_variant>
+            <longname>English (Dvorak, Macintosh)</longname>
+            <description>English (Dvorak, Macintosh)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:us:symbolic:eng</name>
             <language>en</language>
@@ -380,6 +392,17 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:af::drs</name>
+            <language>drs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <longname>Dari</longname>
+            <description>Dari</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
         <engine>
             <name>xkb:af:ps:pus</name>
             <language>ps</language>
@@ -405,17 +428,29 @@
             <rank>1</rank>
         </engine>
         <engine>
-            <name>xkb:af:olpc-ps:pus</name>
+            <name>xkb:af:ps-olpc:pus</name>
             <language>ps</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>af</layout>
-            <layout_variant>olpc-ps</layout_variant>
+            <layout_variant>ps-olpc</layout_variant>
             <longname>Pashto (Afghanistan, OLPC)</longname>
             <description>Pashto (Afghanistan, OLPC)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:af:fa-olpc:drs</name>
+            <language>drs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>af</layout>
+            <layout_variant>fa-olpc</layout_variant>
+            <longname>Dari (Afghanistan, OLPC)</longname>
+            <description>Dari (Afghanistan, OLPC)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:af:uz-olpc:uzb</name>
             <language>uz</language>
@@ -1021,12 +1056,595 @@
             <language>sat</language>
             <license>GPL</license>
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>bd</layout>
-            <layout_variant>probhat</layout_variant>
-            <longname>Bangla (Probhat)</longname>
-            <description>Bangla (Probhat)</description>
+            <layout>bd</layout>
+            <layout_variant>probhat</layout_variant>
+            <longname>Bangla (Probhat)</longname>
+            <description>Bangla (Probhat)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::hin</name>
+            <language>hi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::anp</name>
+            <language>anp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::awa</name>
+            <language>awa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bap</name>
+            <language>bap</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bfy</name>
+            <language>bfy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bgc</name>
+            <language>bgc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bhb</name>
+            <language>bhb</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bhi</name>
+            <language>bhi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bho</name>
+            <language>bho</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bjj</name>
+            <language>bjj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::bra</name>
+            <language>bra</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::brx</name>
+            <language>brx</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::btv</name>
+            <language>btv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::doi</name>
+            <language>doi</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::dty</name>
+            <language>dty</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::gbm</name>
+            <language>gbm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::gom</name>
+            <language>gom</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::gvr</name>
+            <language>gvr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::hne</name>
+            <language>hne</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::hoc</name>
+            <language>hoc</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::hoj</name>
+            <language>hoj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::jml</name>
+            <language>jml</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::kfr</name>
+            <language>kfr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::kfy</name>
+            <language>kfy</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::khn</name>
+            <language>khn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::kok</name>
+            <language>kok</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::kru</name>
+            <language>kru</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mag</name>
+            <language>mag</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mai</name>
+            <language>mai</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mar</name>
+            <language>mr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mgp</name>
+            <language>mgp</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mrd</name>
+            <language>mrd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mtr</name>
+            <language>mtr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::mwr</name>
+            <language>mwr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::nep</name>
+            <language>ne</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::new</name>
+            <language>new</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::noe</name>
+            <language>noe</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::raj</name>
+            <language>raj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::rjs</name>
+            <language>rjs</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::sck</name>
+            <language>sck</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::srx</name>
+            <language>srx</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::swv</name>
+            <language>swv</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::taj</name>
+            <language>taj</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::tdg</name>
+            <language>tdg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::tdh</name>
+            <language>tdh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::thl</name>
+            <language>thl</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::thq</name>
+            <language>thq</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::thr</name>
+            <language>thr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::tkt</name>
+            <language>tkt</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::wbr</name>
+            <language>wbr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::wtm</name>
+            <language>wtm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::xnr</name>
+            <language>xnr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:in::xsr</name>
+            <language>xsr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>in</layout>
+            <longname>Indian</longname>
+            <description>Indian</description>
             <icon>ibus-keyboard</icon>
-            <rank>1</rank>
+            <rank>50</rank>
         </engine>
         <engine>
             <name>xkb:in:ben:ben</name>
@@ -1781,6 +2399,28 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:dz::tzm</name>
+            <language>tzm</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <longname>Berber (Algeria, Latin)</longname>
+            <description>Berber (Algeria, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
+        <engine>
+            <name>xkb:dz::fra</name>
+            <language>fr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>dz</layout>
+            <longname>Berber (Algeria, Latin)</longname>
+            <description>Berber (Algeria, Latin)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
         <engine>
             <name>xkb:dz:azerty-deadkeys:kab</name>
             <language>kab</language>
@@ -1841,6 +2481,17 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ma::ary</name>
+            <language>ary</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <longname>Arabic (Morocco)</longname>
+            <description>Arabic (Morocco)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>50</rank>
+        </engine>
         <engine>
             <name>xkb:ma:french:fra</name>
             <language>fr</language>
@@ -1925,6 +2576,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ma:rif:rif</name>
+            <language>rif</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ma</layout>
+            <layout_variant>rif</layout_variant>
+            <longname>Tarifit</longname>
+            <description>Tarifit</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:cm::eng</name>
             <language>en</language>
@@ -2691,6 +3354,102 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:mm:shn:shn</name>
+            <language>shn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>shn</layout_variant>
+            <longname>Shan</longname>
+            <description>Shan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:shn:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>shn</layout_variant>
+            <longname>Shan</longname>
+            <description>Shan</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:zgt:shn</name>
+            <language>shn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>zgt</layout_variant>
+            <longname>Shan (Zawgyi Tai)</longname>
+            <description>Shan (Zawgyi Tai)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:zgt:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>zgt</layout_variant>
+            <longname>Shan (Zawgyi Tai)</longname>
+            <description>Shan (Zawgyi Tai)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:mnw:mnw</name>
+            <language>mnw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>mnw</layout_variant>
+            <longname>Mon</longname>
+            <description>Mon</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:mnw:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>mnw</layout_variant>
+            <longname>Mon</longname>
+            <description>Mon</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:mnw-a1:mnw</name>
+            <language>mnw</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>mnw-a1</layout_variant>
+            <longname>Mon (A1)</longname>
+            <description>Mon (A1)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:mm:mnw-a1:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>mm</layout>
+            <layout_variant>mnw-a1</layout_variant>
+            <longname>Mon (A1)</longname>
+            <description>Mon (A1)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ca::fra</name>
             <language>fr</language>
@@ -6789,42 +7548,6 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
-        <engine>
-            <name>xkb:tr:crh:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh</layout_variant>
-            <longname>Crimean Tatar (Turkish Q)</longname>
-            <description>Crimean Tatar (Turkish Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:crh_f:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh_f</layout_variant>
-            <longname>Crimean Tatar (Turkish F)</longname>
-            <description>Crimean Tatar (Turkish F)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
-        <engine>
-            <name>xkb:tr:crh_alt:crh</name>
-            <language>crh</language>
-            <license>GPL</license>
-            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
-            <layout>tr</layout>
-            <layout_variant>crh_alt</layout_variant>
-            <longname>Crimean Tatar (Turkish Alt-Q)</longname>
-            <description>Crimean Tatar (Turkish Alt-Q)</description>
-            <icon>ibus-keyboard</icon>
-            <rank>1</rank>
-        </engine>
         <engine>
             <name>xkb:tr:ot:tur</name>
             <language>tr</language>
@@ -6832,8 +7555,8 @@
             <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
             <layout>tr</layout>
             <layout_variant>ot</layout_variant>
-            <longname>Ottoman</longname>
-            <description>Ottoman</description>
+            <longname>Ottoman (Q)</longname>
+            <description>Ottoman (Q)</description>
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
@@ -6861,6 +7584,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:tr:otkf:tur</name>
+            <language>tr</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>tr</layout>
+            <layout_variant>otkf</layout_variant>
+            <longname>Old Turkic (F)</longname>
+            <description>Old Turkic (F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:tw::fox</name>
             <language>fox</language>
@@ -7123,6 +7858,18 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ua:macOS:ukr</name>
+            <language>uk</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>macOS</layout_variant>
+            <longname>Ukrainian (macOS)</longname>
+            <description>Ukrainian (macOS)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:ua:legacy:ukr</name>
             <language>uk</language>
@@ -7171,6 +7918,42 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:ua:crh:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>crh</layout_variant>
+            <longname>Crimean Tatar (Turkish Q)</longname>
+            <description>Crimean Tatar (Turkish Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:crh_f:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>crh_f</layout_variant>
+            <longname>Crimean Tatar (Turkish F)</longname>
+            <description>Crimean Tatar (Turkish F)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:ua:crh_alt:crh</name>
+            <language>crh</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>ua</layout>
+            <layout_variant>crh_alt</layout_variant>
+            <longname>Crimean Tatar (Turkish Alt-Q)</longname>
+            <description>Crimean Tatar (Turkish Alt-Q)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:gb::eng</name>
             <language>en</language>
@@ -7290,6 +8073,30 @@
             <icon>ibus-keyboard</icon>
             <rank>1</rank>
         </engine>
+        <engine>
+            <name>xkb:gb:gla:eng</name>
+            <language>en</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>gla</layout_variant>
+            <longname>Scottish Gaelic</longname>
+            <description>Scottish Gaelic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:gb:gla:gla</name>
+            <language>gd</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>gb</layout>
+            <layout_variant>gla</layout_variant>
+            <longname>Scottish Gaelic</longname>
+            <description>Scottish Gaelic</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:uz::uzb</name>
             <language>uz</language>
@@ -9287,6 +10094,90 @@
             <icon>ibus-keyboard</icon>
             <rank>50</rank>
         </engine>
+        <engine>
+            <name>xkb:id:phonetic:ind</name>
+            <language>id</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:msa</name>
+            <language>ms</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:min</name>
+            <language>min</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:ace</name>
+            <language>ace</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:bjn</name>
+            <language>bjn</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:tsg</name>
+            <language>tsg</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
+        <engine>
+            <name>xkb:id:phonetic:mfa</name>
+            <language>mfa</language>
+            <license>GPL</license>
+            <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+            <layout>id</layout>
+            <layout_variant>phonetic</layout_variant>
+            <longname>Indonesian (Arab Pegon, phonetic)</longname>
+            <description>Indonesian (Arab Pegon, phonetic)</description>
+            <icon>ibus-keyboard</icon>
+            <rank>1</rank>
+        </engine>
         <engine>
             <name>xkb:id:phoneticx:ind</name>
             <language>id</language>

From 9bf9ef0126a6dd5b1d0de9ac3320eb030472631f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Mar 2022 10:33:40 +0900
Subject: [PATCH 787/816] src: Update ibusunicodegen.h with unicode-ucd 14.0.0

---
 src/ibusunicodegen.h | 52 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h
index c891d0e3e..be2462551 100644
--- a/src/ibusunicodegen.h
+++ b/src/ibusunicodegen.h
@@ -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) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2018 Red Hat, Inc.
+ * Copyright (C) 2018-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2018-2021 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
@@ -107,6 +107,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Syriac Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Arabic Extended-B"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -759,10 +763,18 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Caucasian Albanian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Vithkuqi"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Linear A"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-F"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -859,6 +871,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Sogdian"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Old Uyghur"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -963,6 +979,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Soyombo"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Unified Canadian Aboriginal Syllabics Extended-A"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1007,6 +1027,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Early Dynastic Cuneiform"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Cypro-Minoan"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1027,6 +1051,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Mro"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Tangsa"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1063,6 +1091,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Tangut Supplement"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Kana Extended-B"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1087,6 +1119,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Shorthand Format Controls"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Znamenny Musical Notation"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1119,6 +1155,10 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Sutton SignWriting"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Latin Extended-G"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
@@ -1127,10 +1167,18 @@ const static char *unicode_blocks[] = {
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Nyiakeng Puachue Hmong"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Toto"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */
     N_("Wancho"),
+    /* TRANSLATORS: You might refer the translations from gucharmap with
+                    the following command:
+       msgmerge -C gucharmap.po ibus.po ibus.pot */
+    N_("Ethiopic Extended-B"),
     /* TRANSLATORS: You might refer the translations from gucharmap with
                     the following command:
        msgmerge -C gucharmap.po ibus.po ibus.pot */

From e77f80cf7c8a9f9b759abc0da013020719e038db Mon Sep 17 00:00:00 2001
From: Jan Kuparinen <copper_fin@hotmail.com>
Date: Mon, 14 Mar 2022 10:33:43 +0900
Subject: [PATCH 788/816] po: Update translation (Finnish)

Update po/fi.po at 20.7%
https://translate.fedoraproject.org/projects/ibus/ibus/fi/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/fi.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 8b29bbe06..d7a5c36cf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 # Finnish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-04-30 13:02+0000\n"
+"PO-Revision-Date: 2021-10-05 11:05+0000\n"
 "Last-Translator: Jan Kuparinen <copper_fin@hotmail.com>\n"
 "Language-Team: Finnish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/fi/>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.6\n"
+"X-Generator: Weblate 4.8\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -2962,7 +2962,7 @@ msgstr ""
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1249
 msgid "Tags"
-msgstr ""
+msgstr "Tunnisteet"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3146,7 +3146,7 @@ msgstr "Sulje"
 
 #: ui/gtk3/emojier.vala:1118
 msgid "Menu"
-msgstr ""
+msgstr "Valikko"
 
 #: ui/gtk3/emojier.vala:1129
 msgid "Click to view a warning message"

From 6df55eb2d9cac7a34ddd934bb45aebb72bcd0ca0 Mon Sep 17 00:00:00 2001
From: simmon <simmon@nplob.com>
Date: Mon, 14 Mar 2022 10:33:46 +0900
Subject: [PATCH 789/816] po: Update translation (Korean)

Update po/ko.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ko/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/ko.po | 90 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index e63c77177..74ea153e5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -24,8 +24,8 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2021-07-22 07:04+0000\n"
-"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"PO-Revision-Date: 2021-11-11 00:05+0000\n"
+"Last-Translator: simmon <simmon@nplob.com>\n"
 "Language-Team: Korean <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/ko/>\n"
 "Language: ko\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.7.2\n"
+"X-Generator: Weblate 4.8.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -130,11 +130,11 @@ msgstr "응용프로그램의 입력창에 포커스가 가면 기본적으로 
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
-msgstr "DConf는 이름 프리픽스를 보존합니다"
+msgstr "DConf는 이름 접두사를 보존합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
-msgstr "DConf 키 프리픽스는 이름 변환을 중지합니다"
+msgstr "DConf 키 접두사는 이름 변환을 중지합니다"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:70
 msgid "Trigger shortcut keys"
@@ -454,7 +454,7 @@ msgstr "_취소"
 
 #: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
 msgid "_OK"
-msgstr "_오케이"
+msgstr "확인(_O)"
 
 #: setup/emojilang.py:235 setup/enginedialog.py:205
 msgid "More…"
@@ -462,7 +462,7 @@ msgstr "더 보기…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
 msgid "About"
-msgstr "대하여"
+msgstr "정보"
 
 #: setup/engineabout.py:40 setup/setup.ui:1391
 msgid "_Close"
@@ -559,8 +559,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/."
-"bashrc 파일에 추가하고, 데스크톱에 다시 로그인하십시오.\n"
+"IBus를 시작했습니다! IBus를 사용 할 수 으면, 다음 행을 자신의 $HOME/.bashrc 파일에 추가; 그런 후에 자신의 "
+"데스크탑에 다시 로그인하세요.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -591,19 +591,19 @@ msgstr "세로"
 
 #: setup/setup.ui:25
 msgid "Top left corner"
-msgstr "왼쪽 위 구석"
+msgstr "상단 왼쪽 모서리"
 
 #: setup/setup.ui:28
 msgid "Top right corner"
-msgstr "오른쪽 위 구석"
+msgstr "상단 오른쪽 모서리"
 
 #: setup/setup.ui:31
 msgid "Bottom left corner"
-msgstr "왼쪽 아래 구석"
+msgstr "하단 왼쪽 모서리"
 
 #: setup/setup.ui:34
 msgid "Bottom right corner"
-msgstr "오른쪽 아래 구석"
+msgstr "하단 오른쪽 모서리"
 
 #: setup/setup.ui:37
 msgid "Custom"
@@ -761,8 +761,8 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>위의 목록에서 선택한 후 키보드 단축키를 누르거나 패널 아이콘을 눌"
-"러 활성 입력기를 전환할 수 있습니다.</i></small>"
+"<small><i>위의 목록에서 선택한 후 키보드 단축키를 누르거나 패널 아이콘을 눌러 활성 입력기를 전환 할 수 "
+"있습니다.</i></small>"
 
 # tooltip
 #: setup/setup.ui:873
@@ -1515,14 +1515,14 @@ msgstr "딩뱃 기호"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:385
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr "여러가지 수학기호 A"
+msgstr "여러가지 수학기호-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:389
 msgid "Supplemental Arrows-A"
-msgstr "화살표 추가영역 A"
+msgstr "화살표 추가영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1536,14 +1536,14 @@ msgstr "점자 모양"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:397
 msgid "Supplemental Arrows-B"
-msgstr "화살표 추가영역 B"
+msgstr "화살표 추가영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:401
 msgid "Miscellaneous Mathematical Symbols-B"
-msgstr "여러가지 수학기호 B"
+msgstr "여러가지 수학기호-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1572,7 +1572,7 @@ msgstr "글라골 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:417
 msgid "Latin Extended-C"
-msgstr "라틴문자 확장영역 C"
+msgstr "라틴문자 확장영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1770,7 +1770,7 @@ msgstr "바이 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:529
 msgid "Cyrillic Extended-B"
-msgstr "키릴 문자 확장영역 B"
+msgstr "키릴 문자 확장영역-B"
 
 # 아프리카
 #. TRANSLATORS: You might refer the translations from gucharmap with
@@ -1848,7 +1848,7 @@ msgstr "레장 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:573
 msgid "Hangul Jamo Extended-A"
-msgstr "한글 자모 확장영역 A"
+msgstr "한글 자모 확장영역-A"
 
 # 인도네시아
 #. TRANSLATORS: You might refer the translations from gucharmap with
@@ -1863,7 +1863,7 @@ msgstr "자와어"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:581
 msgid "Myanmar Extended-B"
-msgstr "미얀마 확장영역 B"
+msgstr "미얀마 확장영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1877,7 +1877,7 @@ msgstr "참 문자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:589
 msgid "Myanmar Extended-A"
-msgstr "미얀마 확장영역 A"
+msgstr "미얀마 확장영역-A"
 
 # 태국
 #. TRANSLATORS: You might refer the translations from gucharmap with
@@ -1899,14 +1899,14 @@ msgstr "메이테이 문자 확장영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:601
 msgid "Ethiopic Extended-A"
-msgstr "에티오피아 문자 확장영역 A"
+msgstr "에티오피아 문자 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:605
 msgid "Latin Extended-E"
-msgstr "라틴문자 확장영역 E"
+msgstr "라틴문자 확장영역-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1934,7 +1934,7 @@ msgstr "한글 음절"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:621
 msgid "Hangul Jamo Extended-B"
-msgstr "한글 자모 확장영역 B"
+msgstr "한글 자모 확장영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -1976,14 +1976,14 @@ msgstr "한중일 호환 한자"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
 msgid "Alphabetic Presentation Forms"
-msgstr "알파벳 표시 꼴"
+msgstr "알파벳 표시 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
 msgid "Arabic Presentation Forms-A"
-msgstr "아랍 문자 표시 꼴 A"
+msgstr "아랍 문자 표시 양식-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2011,7 +2011,7 @@ msgstr "조합 반각 표시"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
 msgid "CJK Compatibility Forms"
-msgstr "한중일 호환 꼴"
+msgstr "한중일 호환 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2025,14 +2025,14 @@ msgstr "작은꼴 변형"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
 msgid "Arabic Presentation Forms-B"
-msgstr "아랍 문자 표시 꼴 B"
+msgstr "아랍 문자 표시 양식-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
 msgid "Halfwidth and Fullwidth Forms"
-msgstr "반각 및 전각 꼴"
+msgstr "반각 및 전각 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2756,14 +2756,14 @@ msgstr "가나 추가영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1073
 msgid "Kana Extended-A"
-msgstr "가나 확장영역 A"
+msgstr "가나 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1077
 msgid "Small Kana Extension"
-msgstr "작은 가나꼴 확장영역"
+msgstr "작은 가나 확장영역"
 
 # 뉘수 문자(女书, 女書, Nǚshū) 음절 문자이며, 중국의 소수민족인 야오족 여성들만이 사용함.
 #. TRANSLATORS: You might refer the translations from gucharmap with
@@ -2986,7 +2986,7 @@ msgstr "도형 확장영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1201
 msgid "Supplemental Arrows-C"
-msgstr "화살표 추가영역 C"
+msgstr "화살표 추가영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -3084,14 +3084,14 @@ msgstr "여러가지 선택자 추가영역"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1257
 msgid "Supplementary Private Use Area-A"
-msgstr "사용자 추가영역 A"
+msgstr "사용자 추가영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1261
 msgid "Supplementary Private Use Area-B"
-msgstr "사용자 추가영역 B"
+msgstr "사용자 추가영역-B"
 
 #: tools/main.vala:51
 msgid "List engine name only"
@@ -3099,7 +3099,7 @@ msgstr "엔진 이름만 나열합니다"
 
 #: tools/main.vala:67 tools/main.vala:192 tools/main.vala:202
 msgid "Can't connect to IBus.\n"
-msgstr "IBus에 연결할 수 없습니다.\n"
+msgstr "IBus에 연결 할 수 없습니다.\n"
 
 #: tools/main.vala:93
 #, c-format
@@ -3221,7 +3221,7 @@ msgstr "명령:\n"
 #: tools/main.vala:494
 #, c-format
 msgid "%s is unknown command!\n"
-msgstr "%s은(는) 알 수 없는 명령입니다!\n"
+msgstr "%s는 알 수 없는 명령입니다!\n"
 
 #: ui/gtk3/emojier.vala:233
 msgid "Favorites"
@@ -3315,9 +3315,8 @@ msgid ""
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
-"현재 텍스트 응용 프로그램을 알아낼 수 없습니다. 응용 프로그램의 포커스를 다"
-"시 맞춰 보십시오. 예를 들어 Esc 키를 여러번 눌러 이모지 입력 모드를 벗어나거"
-"나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보십시오."
+"현재 텍스트 응용 프로그램을 가져 올 수 없습니다. 응용 프로그램에 다시 초점을 맞춰보세요. 예를 들어 Esc 키를 여러 번 눌러서 "
+"이모지 입력 방식을 벗어나거나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보세요."
 
 #: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
@@ -3394,10 +3393,7 @@ msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 
 #: ui/gtk3/panel.vala:1145
 msgid "translator-credits"
-msgstr ""
-"김은주 <eukim@redhat.com>\n"
-"류창우 <cwryu@debian.org>\n"
-"simmon <simmon@nplob.com>"
+msgstr "simmon <simmon@nplob.com> 2021"
 
 #: ui/gtk3/panel.vala:1164
 msgid "Preferences"

From 0199dde0d9ba472e4611226cb61f15cfa9b52db5 Mon Sep 17 00:00:00 2001
From: Dingzhong Chen <wsxy162@gmail.com>
Date: Mon, 14 Mar 2022 10:33:49 +0900
Subject: [PATCH 790/816] po: Update translation (Chinese (Simplified) (zh_CN))

Update po/zh_CN.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/zh_CN/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/zh_CN.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1fe4fb174..6399420fa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese Translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -26,8 +26,8 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-06-16 11:04+0000\n"
-"Last-Translator: Liu Tao <lyuutau@outlook.com>\n"
+"PO-Revision-Date: 2021-09-17 07:04+0000\n"
+"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/ibus/ibus/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -35,7 +35,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6.2\n"
+"X-Generator: Weblate 4.8\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -521,7 +521,7 @@ msgstr ""
 
 #: setup/keyboardshortcut.py:255
 msgid "Please press a key (or a key combination)"
-msgstr "请按一个键盘按键（或者一个组合按键）"
+msgstr "请按下一个键盘按键（或者按键组合）"
 
 #: setup/main.py:121 setup/main.py:588
 msgid "Use shortcut with shift to switch to the previous input method"

From 58fe1e56b270e80c3950a880090893b56f5e02ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Mon, 14 Mar 2022 10:33:51 +0900
Subject: [PATCH 791/816] po: Update translation (Turkish)

Update po/tr.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/tr/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/tr.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index cfb08bbc7..142202e0e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # Turkish translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Serdar Sağlam <teknomobil@msn.com>, 2019. #zanata
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-01-17 12:37+0000\n"
+"PO-Revision-Date: 2021-09-19 16:04+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: Turkish <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/tr/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.8\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -1462,7 +1462,7 @@ msgstr "Optik Karakter Tanıma"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:361
 msgid "Enclosed Alphanumerics"
-msgstr "Kapalı Alfanumerik"
+msgstr "Kapalı Alfasayısal"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2785,7 +2785,7 @@ msgstr "Sayma Çubuğu Sayıları"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1117
 msgid "Mathematical Alphanumeric Symbols"
-msgstr "Matematiksel Alfanumerik Semboller"
+msgstr "Matematiksel Alfasayısal Semboller"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
@@ -2876,7 +2876,7 @@ msgstr "İskambil Kağıtları"
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:1169
 msgid "Enclosed Alphanumeric Supplement"
-msgstr "Kapalı Alfanumerik İlave"
+msgstr "Kapalı Alfasayısal İlave"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:

From a1528a0a46d45827e110f1fa6361cab7f0152f79 Mon Sep 17 00:00:00 2001
From: Jordi Mas <jmas@softcatala.org>
Date: Mon, 14 Mar 2022 10:33:54 +0900
Subject: [PATCH 792/816] po: Update translation (Catalan)

Update po/ca.po at 88.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ca/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/ca.po | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 0e954d845..d4eedbea2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,6 @@
 # Catalan translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -14,21 +14,22 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
 # Antoni Bella Pérez <antonibella5@yahoo.com>, 2020.
+# Jordi Mas <jmas@softcatala.org>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-01-09 22:01+0000\n"
-"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
-"Language-Team: Catalan <https://translate.stg.fedoraproject.org/projects/"
-"ibus/ibus/ca/>\n"
+"PO-Revision-Date: 2021-10-28 06:05+0000\n"
+"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"Language-Team: Catalan <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 4.8\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -134,7 +135,7 @@ msgstr ""
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:62
 msgid "DConf preserve name prefixes"
-msgstr "DConf preserva els prefixes"
+msgstr "DConf conserva els prefixos de nom"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:63
 msgid "Prefixes of DConf keys to stop name conversion"
@@ -797,7 +798,7 @@ msgstr "Posició del codi Unicode:"
 #: setup/setup.ui:1013
 msgid "Set a font of Unicode candidates on the emoji dialog"
 msgstr ""
-"Estableix un tipus de lletra dels candidats Unicode al diàleg de l'emoji"
+"Estableix un tipus de lletra dels candidats Unicode al diàleg dels emojis"
 
 #: setup/setup.ui:1015
 msgid "Unicode font:"
@@ -805,7 +806,7 @@ msgstr "Tipus de lletra Unicode:"
 
 #: setup/setup.ui:1038
 msgid "Set a language of emoji annotations on the emoji dialog"
-msgstr "Estableix l'idioma de les anotacions emoji al diàleg dels emoji"
+msgstr "Estableix l'idioma de les anotacions emoji al diàleg dels emojis"
 
 #: setup/setup.ui:1040
 msgid "Emoji annotation language:"
@@ -3174,7 +3175,7 @@ msgstr "Altres"
 
 #: ui/gtk3/emojier.vala:235
 msgid "Open Unicode choice"
-msgstr "Obre l'Unicode triat"
+msgstr "Obre el selector Unicode"
 
 #: ui/gtk3/emojier.vala:994
 msgid "Bring back emoji choice"
@@ -3273,7 +3274,7 @@ msgstr "S'ha copiat un emoji al vostre porta-retalls."
 #.
 #: ui/gtk3/emojierapp.vala:114
 msgid "\"FONT\" for emoji characters on emoji dialog"
-msgstr "«TIPUS DE LLETRA» per als caracters emoji en el diàleg emoji"
+msgstr "«TIPUS DE LLETRA» per als caràcters emoji en el diàleg dels emojis"
 
 #: ui/gtk3/emojierapp.vala:115
 msgid "FONT"

From 0e522c40750a2bb1d58354469734c7681dd89bc8 Mon Sep 17 00:00:00 2001
From: Abdullah Albaroty <albaroty@gmail.com>
Date: Mon, 14 Mar 2022 10:33:56 +0900
Subject: [PATCH 793/816] po: Update translation (Arabic)

Update po/ar.po at 35.4%
https://translate.fedoraproject.org/projects/ibus/ibus/ar/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/ar.po | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 1eb17c8e3..eebf9cfac 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,23 +1,28 @@
 # translation of ibus.pot to Arabic
 # Arabic translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
 # Muayyad Alsadi <alsadi@ojuba.org>, 2009
+# Abdullah Albaroty <albaroty@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
-"PO-Revision-Date: 2014-02-18 05:45+0000\n"
-"Last-Translator: Muayyad Alsadi <alsadi@ojuba.org>\n"
-"Language-Team: Arabic <AR@li.org>\n"
+"PO-Revision-Date: 2022-01-11 09:16+0000\n"
+"Last-Translator: Abdullah Albaroty <albaroty@gmail.com>\n"
+"Language-Team: Arabic <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/ar/>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -53,11 +58,11 @@ msgstr ""
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
-msgstr ""
+msgstr "إخفاء تلقائي"
 
 #: ../setup/setup.ui.h:10
 msgid "Always"
-msgstr ""
+msgstr "دائمًا"
 
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"

From 20c5dc9c5d649357bb556b85e79f493b476c6622 Mon Sep 17 00:00:00 2001
From: Zayed Al-Saidi <zayed.alsaidi@gmail.com>
Date: Mon, 14 Mar 2022 10:33:59 +0900
Subject: [PATCH 794/816] po: Update translation (Arabic)

Update po/ar.po at 35.4%
https://translate.fedoraproject.org/projects/ibus/ibus/ar/

BUG=https://github.com/ibus/ibus/pull/2338
---
 po/ar.po | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index eebf9cfac..006ba4d4a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,13 +7,14 @@
 # Translators:
 # Muayyad Alsadi <alsadi@ojuba.org>, 2009
 # Abdullah Albaroty <albaroty@gmail.com>, 2022.
+# Zayed Al-Saidi <zayed.alsaidi@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2014-02-18 13:46+0900\n"
 "PO-Revision-Date: 2022-01-11 09:16+0000\n"
-"Last-Translator: Abdullah Albaroty <albaroty@gmail.com>\n"
+"Last-Translator: Zayed Al-Saidi <zayed.alsaidi@gmail.com>\n"
 "Language-Team: Arabic <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/ar/>\n"
 "Language: ar\n"
@@ -26,11 +27,11 @@ msgstr ""
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr ""
+msgstr "أفقي"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
-msgstr ""
+msgstr "عمودي"
 
 #: ../setup/setup.ui.h:3
 msgid "Top left corner"
@@ -50,11 +51,11 @@ msgstr ""
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr ""
+msgstr "مخصّصة"
 
 #: ../setup/setup.ui.h:8
 msgid "Do not show"
-msgstr ""
+msgstr "لا تعرض"
 
 #: ../setup/setup.ui.h:9
 msgid "Hide automatically"
@@ -98,11 +99,11 @@ msgstr "تفعيّل أو تثبيط:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr ""
+msgstr "مكّن %1"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr ""
+msgstr "عطّل %1"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
@@ -150,7 +151,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr ""
+msgstr "استعمال خط مخصص"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
@@ -231,7 +232,7 @@ msgstr ""
 
 #: ../setup/setup.ui.h:51
 msgid "<b>Keyboard Layout</b>"
-msgstr ""
+msgstr "<b>تخطيط لوحة مفاتيح</b>"
 
 #: ../setup/setup.ui.h:52 ../data/ibus.schemas.in.h:42
 msgid "Share the same input method among all applications"
@@ -243,7 +244,7 @@ msgstr "اختر طريقة الإدخال"
 
 #: ../setup/setup.ui.h:54
 msgid "Advanced"
-msgstr ""
+msgstr "متقدّم"
 
 #: ../setup/setup.ui.h:55
 msgid ""
@@ -350,7 +351,7 @@ msgstr ""
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
-msgstr ""
+msgstr "أخف آليًّا"
 
 #: ../data/ibus.schemas.in.h:21
 msgid ""
@@ -410,7 +411,7 @@ msgstr "استخدم خط مخصص في لوحة اللغة"
 
 #: ../data/ibus.schemas.in.h:37
 msgid "Custom font"
-msgstr ""
+msgstr "خطّ مخصّص"
 
 #: ../data/ibus.schemas.in.h:38
 msgid "Custom font name for language panel"
@@ -495,7 +496,7 @@ msgstr "كود المفتاح"
 
 #: ../setup/keyboardshortcut.py:81
 msgid "Modifiers:"
-msgstr ""
+msgstr "المعدِّلات:"
 
 #. apply button
 #: ../setup/keyboardshortcut.py:133

From 6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 14 Mar 2022 14:13:26 +0900
Subject: [PATCH 795/816] Release 1.5.26

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4137e6cc9..a3cdb2da5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([ibus_released], [1])
 
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [25])
+m4_define([ibus_micro_version], [26])
 m4_define([ibus_abi_current], [5])
 m4_define([ibus_abi_revision],
           [m4_eval(100 * ibus_minor_version + ibus_micro_version)])

From 17648f0522910480b6c5dd4f5356ca1f6c160bf5 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 29 Mar 2022 22:48:19 +0200
Subject: [PATCH 796/816] src: Fix refcounting issues

Commit 5a455b1ead attempted to fix both GLib warnings around
floating references and other presumed refcounting issues. However
it missed 2 kinds of bugs:

- The places that take an IBusText created from a static string
  were made to avoid freeing it afterwards, but the staticness refers
  to the string content, not the object itself.
- The places that are documented to emit signals on floating object
  references used to do the following after signal emission:

  if (g_object_is_floating (object))
    g_object_unref (object)

  And did possibly trigger GLib warnings were changed to:

  if (g_object_is_floating (object))
    g_object_sink_ref (object);
  g_object_unref (object);

  Which fixes the GLib warning for floating references, but do
  unintendedly steal one reference away for non floating references.

This commit is essentially a revert of commit 5a455b1ead, but
addressing both things differently:

- All label/tooltip/symbol IBusText properties in IBusProperty do
  now always sink the reference of the stored object.

- All places documented as maybe using objects with a floating reference
  on signals changed to doing:

  if (g_object_is_floating (object)) {
    g_object_ref_sink (object);
    g_object_unref (object);
  }

  So the floating reference is owned and unreferenced without warnings,
  but already owned references are left unchanged.

This addresses the possible GLib warnings, fixes the possible double
unrefs happening on IBusText used in signals, and fixes the missing
unrefs on IBusText objects created from static strings.

BUG=https://github.com/ibus/ibus/issues/2393
BUG=https://github.com/ibus/ibus/issues/2387
---
 src/ibusinputcontext.c | 35 +++++++++++++++++++++--------------
 src/ibusproperty.c     | 32 +++++++++++++++++---------------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 4b27551bd..7981de381 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -549,9 +549,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
         g_variant_unref (variant);
         g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text);
 
-        if (g_object_is_floating (text))
+        if (g_object_is_floating (text)) {
             g_object_ref_sink (text);
-        g_object_unref (text);
+            g_object_unref (text);
+        }
         return;
     }
     if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) {
@@ -569,9 +570,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        cursor_pos,
                        visible);
 
-        if (g_object_is_floating (text))
+        if (g_object_is_floating (text)) {
             g_object_ref_sink (text);
-        g_object_unref (text);
+            g_object_unref (text);
+        }
         return;
     }
     if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
@@ -592,9 +594,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        visible,
                        mode);
 
-        if (g_object_is_floating (text))
+        if (g_object_is_floating (text)) {
             g_object_ref_sink (text);
-        g_object_unref (text);
+            g_object_unref (text);
+        }
         return;
     }
 
@@ -621,9 +624,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        0,
                        text,
                        visible);
-        if (g_object_is_floating (text))
+        if (g_object_is_floating (text)) {
             g_object_ref_sink (text);
-        g_object_unref (text);
+            g_object_unref (text);
+        }
         return;
     }
 
@@ -640,9 +644,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        0,
                        table,
                        visible);
-        if (g_object_is_floating (table))
+        if (g_object_is_floating (table)) {
             g_object_ref_sink (table);
-        g_object_unref (table);
+            g_object_unref (table);
+        }
         return;
 
     }
@@ -659,9 +664,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
                        0,
                        prop_list);
 
-        if (g_object_is_floating (prop_list))
+        if (g_object_is_floating (prop_list)) {
             g_object_ref_sink (prop_list);
-        g_object_unref (prop_list);
+            g_object_unref (prop_list);
+        }
         return;
     }
 
@@ -673,9 +679,10 @@ ibus_input_context_g_signal (GDBusProxy  *proxy,
 
         g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop);
 
-        if (g_object_is_floating (prop))
+        if (g_object_is_floating (prop)) {
             g_object_ref_sink (prop);
-        g_object_unref (prop);
+            g_object_unref (prop);
+        }
         return;
     }
 
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index 6d4ed088e..cd8a0e2a6 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -336,20 +336,17 @@ ibus_property_destroy (IBusProperty *prop)
     prop->priv->icon = NULL;
 
     if (prop->priv->label) {
-        if (!ibus_text_get_is_static (prop->priv->label))
-            g_object_unref (prop->priv->label);
+        g_object_unref (prop->priv->label);
         prop->priv->label = NULL;
     }
 
     if (prop->priv->symbol) {
-        if (!ibus_text_get_is_static (prop->priv->symbol))
-            g_object_unref (prop->priv->symbol);
+        g_object_unref (prop->priv->symbol);
         prop->priv->symbol = NULL;
     }
 
     if (prop->priv->tooltip) {
-        if (!ibus_text_get_is_static (prop->priv->tooltip))
-            g_object_unref (prop->priv->tooltip);
+        g_object_unref (prop->priv->tooltip);
         prop->priv->tooltip = NULL;
     }
 
@@ -404,7 +401,7 @@ ibus_property_deserialize (IBusProperty *prop,
     g_variant_get_child (variant, retval++, "u", &prop->priv->type);
 
     GVariant *subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
+    if (prop->priv->label) {
         g_object_unref (prop->priv->label);
     }
     prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -414,7 +411,7 @@ ibus_property_deserialize (IBusProperty *prop,
     ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
 
     subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
+    if (prop->priv->tooltip) {
         g_object_unref (prop->priv->tooltip);
     }
     prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -435,7 +432,7 @@ ibus_property_deserialize (IBusProperty *prop,
 
     /* Keep the serialized order for the compatibility when add new members. */
     subvar = g_variant_get_child_value (variant, retval++);
-    if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
+    if (prop->priv->symbol) {
         g_object_unref (prop->priv->symbol);
     }
     prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
@@ -567,7 +564,7 @@ ibus_property_set_label (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_return_if_fail (label == NULL || IBUS_IS_TEXT (label));
 
-    if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
+    if (prop->priv->label) {
         g_object_unref (prop->priv->label);
     }
 
@@ -575,8 +572,10 @@ ibus_property_set_label (IBusProperty *prop,
         prop->priv->label = ibus_text_new_from_static_string ("");
     }
     else {
-        prop->priv->label = g_object_ref_sink (label);
+        prop->priv->label = label;
     }
+
+    g_object_ref_sink (prop->priv->label);
 }
 
 void
@@ -586,7 +585,7 @@ ibus_property_set_symbol (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
 
-    if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
+    if (prop->priv->symbol) {
         g_object_unref (prop->priv->symbol);
     }
 
@@ -594,8 +593,10 @@ ibus_property_set_symbol (IBusProperty *prop,
         prop->priv->symbol = ibus_text_new_from_static_string ("");
     }
     else {
-        prop->priv->symbol = g_object_ref_sink (symbol);
+        prop->priv->symbol = symbol;
     }
+
+    g_object_ref_sink (prop->priv->symbol);
 }
 
 void
@@ -615,7 +616,7 @@ ibus_property_set_tooltip (IBusProperty *prop,
     g_assert (IBUS_IS_PROPERTY (prop));
     g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip));
 
-    if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
+    if (prop->priv->tooltip) {
         g_object_unref (prop->priv->tooltip);
     }
 
@@ -624,8 +625,9 @@ ibus_property_set_tooltip (IBusProperty *prop,
     }
     else {
         prop->priv->tooltip = tooltip;
-        g_object_ref_sink (prop->priv->tooltip);
     }
+
+    g_object_ref_sink (prop->priv->tooltip);
 }
 
 void

From f1c456d26053c32634ecf436bd0082a2910d0b9e Mon Sep 17 00:00:00 2001
From: Mitsuya Shibata <mty.shibata@gmail.com>
Date: Sun, 10 Apr 2022 17:10:01 +0900
Subject: [PATCH 797/816] bus/services: Fix bashisms in
 org.freedesktop.IBus.session.GNOME.service

The "[[ ... ]]" is bash's compound command not in POSIX sh. This style
is problematic in Xorg session in environments where sh is not bash,
suach as Debian and Ubuntu.

BUG=https://github.com/ibus/ibus/issues/2397
---
 bus/services/org.freedesktop.IBus.session.GNOME.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/services/org.freedesktop.IBus.session.GNOME.service.in b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
index a99370fad..7f718e3c9 100644
--- a/bus/services/org.freedesktop.IBus.session.GNOME.service.in
+++ b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
@@ -18,7 +18,7 @@ Conflicts=gnome-session@gnome-login.target
 [Service]
 Type=dbus
 # Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
-ExecStart=sh -c '@bindir@/ibus-daemon --panel disable $([[ $XDG_SESSION_TYPE == "x11" ]] && echo "--xim")'
+ExecStart=sh -c '@bindir@/ibus-daemon --panel disable $([ "$XDG_SESSION_TYPE" = "x11" ] && echo "--xim")'
 Restart=on-abnormal
 BusName=org.freedesktop.IBus
 TimeoutStopSec=5

From 230fb226de17ddd1292e749df5b7a66bf1f1c23f Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 4 May 2022 19:14:51 +0900
Subject: [PATCH 798/816] ui/gtk3: Disable XKB engines in Plasma Wayland

Currently ibus-ui-gtk3 runs the setxkbmap command internally to set
the XKB keymaps from XKB engines but setxkbmap does not work in Wayland
session.
The IBus XKB engines are disabled at the moment in Plamsa Wayland
and ibus-ui-gtk3 asks users to use systemsettings5.

Will use libinput and libxkbcommon later but it would be better
to implement IBus in Plamsa Wayland compositor.

BUG=https://github.com/ibus/ibus/issues/2408
---
 configure.ac        | 16 ++++++++++
 ui/gtk3/Makefile.am | 17 ++++++++++-
 ui/gtk3/panel.vala  | 73 +++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3cdb2da5..79b9c11ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -636,6 +636,21 @@ if test x"$enable_engine" = x"yes"; then
     enable_engine="yes (enabled, use --disable-engine to disable)"
 fi
 
+# --disable-libnotify
+AC_ARG_ENABLE(libnotify,
+    AS_HELP_STRING([--disable-libnotify],
+                   [Disable to link libnotify]),
+    [enable_libnotify=$enableval],
+    [enable_libnotify=yes]
+)
+AM_CONDITIONAL([ENABLE_LIBNOTIFY], [test x"$enable_libnotify" = x"yes"])
+if test x"$enable_libnotify" = x"yes"; then
+    PKG_CHECK_MODULES(LIBNOTIFY, [
+        libnotify >= 0.7
+    ])
+    enable_libnotify="yes (enabled, use --disable-libnotify to disable)"
+fi
+
 PKG_CHECK_MODULES(XTEST,
     [x11 xtst],
     [enable_xtest=yes],
@@ -871,6 +886,7 @@ Build options:
   No snooper regexes            "$NO_SNOOPER_APPS"
   Panel icon                    "$IBUS_ICON_KEYBOARD"
   Enable surrounding-text       $enable_surrounding_text
+  Enable libnotify              $enable_libnotify
   Enable Emoji dict             $enable_emoji_dict
   Unicode Emoji directory       $UNICODE_EMOJI_DIR
   CLDR annotation directory     $EMOJI_ANNOTATION_DIR
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index ab379328c..2a9cabdeb 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
@@ -3,7 +3,7 @@
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2015-2020 Takao Fujwiara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2015-2022 Takao Fujwiara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2007-2020 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
@@ -81,6 +81,21 @@ AM_VALAFLAGS = \
 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
 	$(NULL)
 
+if ENABLE_LIBNOTIFY
+AM_CFLAGS += \
+       @LIBNOTIFY_CFLAGS@ \
+       $(NULL)
+
+AM_LDADD += \
+       @LIBNOTIFY_LIBS@ \
+       $(NULL)
+
+AM_VALAFLAGS += \
+       --pkg=libnotify \
+       -D ENABLE_LIBNOTIFY \
+       $(NULL)
+endif
+
 if ENABLE_APPINDICATOR
 AM_VALAFLAGS += --define=INDICATOR
 endif
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 07ce65249..5cd9c15ca 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -73,6 +73,7 @@ class Panel : IBus.PanelService {
     private string m_icon_prop_key = "";
     private int m_property_icon_delay_time = 500;
     private uint m_property_icon_delay_time_id;
+    private bool m_is_wayland;
 #if INDICATOR
     private bool m_is_kde = is_kde();
 #else
@@ -93,6 +94,18 @@ class Panel : IBus.PanelService {
 
         m_bus = bus;
 
+#if USE_GDK_WAYLAND
+        Gdk.set_allowed_backends("*");
+        var display = Gdk.DisplayManager.get().open_display(null);
+        Type instance_type = display.get_type();
+        Type wayland_type = typeof(GdkWayland.Display);
+        m_is_wayland = instance_type.is_a(wayland_type);
+        Gdk.set_allowed_backends("x11");
+#else
+        m_is_wayland = false;
+        warning("Checking Wayland is disabled");
+#endif
+
         init_settings();
 
         // init ui
@@ -553,6 +566,11 @@ class Panel : IBus.PanelService {
         GLib.List<IBus.EngineDesc> im_engines =
                 get_engines_from_locale(engines);
 
+        if (m_is_wayland) {
+            if (xkb_engines.length() > 0)
+                xkb_engines = new GLib.List<IBus.EngineDesc>();
+        }
+
         string[] names = {};
         foreach (unowned IBus.EngineDesc engine in xkb_engines)
             names += engine.get_name();
@@ -728,6 +746,31 @@ class Panel : IBus.PanelService {
         inited_engines_order = false;
     }
 
+    private void update_version_1_5_26() {
+        var message = _("Keymap changes do not work in Plasma Wayland at " +
+                        "present. Please use systemsettings5 instead.");
+#if ENABLE_LIBNOTIFY
+        if (!Notify.is_initted()) {
+            Notify.init ("ibus");
+        }
+
+        var notification = new Notify.Notification(
+                _("IBus Notification"),
+                message,
+                "ibus");
+        notification.set_timeout(30 * 1000);
+        notification.set_category("hotkey");
+
+        try {
+            notification.show();
+        } catch (GLib.Error e) {
+            warning (message);
+        }
+#else
+        warning (message);
+#endif
+    }
+
     private void set_version() {
         string prev_version = m_settings_general.get_string("version");
         string current_version = null;
@@ -735,6 +778,9 @@ class Panel : IBus.PanelService {
         if (compare_versions(prev_version, "1.5.8") < 0)
             update_version_1_5_8();
 
+        if (compare_versions(prev_version, "1.5.26") < 0)
+            update_version_1_5_26();
+
         current_version = "%d.%d.%d".printf(IBus.MAJOR_VERSION,
                                             IBus.MINOR_VERSION,
                                             IBus.MICRO_VERSION);
@@ -856,7 +902,7 @@ class Panel : IBus.PanelService {
         m_icon_prop_key = "";
 
         // set xkb layout
-        if (!m_use_system_keyboard_layout)
+        if (!m_use_system_keyboard_layout && !m_is_wayland)
             m_xkblayout.set_layout(engine);
 
         set_language_from_engine(engine);
@@ -960,17 +1006,25 @@ class Panel : IBus.PanelService {
                                 string[]? order_names) {
         string[]? engine_names = unowned_engine_names;
 
-        if (engine_names == null || engine_names.length == 0)
-            engine_names = {"xkb:us::eng"};
+        if (engine_names == null || engine_names.length == 0) {
+            if (m_is_wayland)
+                engine_names = {};
+            else
+                engine_names = {"xkb:us::eng"};
+        }
 
         string[] names = {};
 
         foreach (var name in order_names) {
+            if (m_is_wayland && name.has_prefix("xkb:"))
+                continue;
             if (name in engine_names)
                 names += name;
         }
 
         foreach (var name in engine_names) {
+            if (m_is_wayland && name.has_prefix("xkb:"))
+                continue;
             if (name in names)
                 continue;
             names += name;
@@ -1011,9 +1065,14 @@ class Panel : IBus.PanelService {
 	}
 
         if (m_engines.length == 0) {
-            m_engines = engines;
-            switch_engine(0, true);
-            run_preload_engines(engines, 1);
+            if (engines.length > 0) {
+                m_engines = engines;
+                switch_engine(0, true);
+                run_preload_engines(engines, 1);
+            } else {
+                m_candidate_panel.set_language(new Pango.AttrLanguage(
+                        Pango.Language.from_string(null)));
+            }
         } else {
             var current_engine = m_engines[0];
             m_engines = engines;
@@ -1478,6 +1537,8 @@ class Panel : IBus.PanelService {
         /* Do not change the order of m_engines during running switcher. */
         if (m_switcher.is_running())
             return;
+        if (m_engines.length == 0)
+            return;
 
         if (m_icon_type == IconType.INDICATOR) {
             // Wait for the callback of the session bus.

From 9d0f3c53f5ef1d6e4a62e99309b3af547e668366 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 4 May 2022 19:14:57 +0900
Subject: [PATCH 799/816] po: Update POT file with unicode-ucd 14.0.0

XKB engine notification for Plasma Wayland is also added.
---
 po/ibus10.pot      | 750 +++++++++++++++++++++++++--------------------
 ui/gtk3/panel.vala |   2 +-
 2 files changed, 423 insertions(+), 329 deletions(-)

diff --git a/po/ibus10.pot b/po/ibus10.pot
index dbba6ea7e..50e589594 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -1,14 +1,14 @@
 # Source translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2020 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus 1.5.23\n"
+"Project-Id-Version: ibus 1.5.26\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2020-12-11 16:21+0900\n"
+"POT-Creation-Date: 2022-04-29 18:05+0900\n"
+"PO-Revision-Date: 2022-04-29 18:05+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -398,11 +398,11 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#: setup/emojilang.py:235 setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:222
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1259
 msgid "About"
 msgstr ""
 
@@ -955,2015 +955,2099 @@ msgstr ""
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
-msgid "Arabic Extended-A"
+msgid "Arabic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:117
-msgid "Devanagari"
+msgid "Arabic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:121
-msgid "Bengali"
+msgid "Devanagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:125
-msgid "Gurmukhi"
+msgid "Bengali"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:129
-msgid "Gujarati"
+msgid "Gurmukhi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:133
-msgid "Oriya"
+msgid "Gujarati"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:137
-msgid "Tamil"
+msgid "Oriya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:141
-msgid "Telugu"
+msgid "Tamil"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:145
-msgid "Kannada"
+msgid "Telugu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:149
-msgid "Malayalam"
+msgid "Kannada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:153
-msgid "Sinhala"
+msgid "Malayalam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:157
-msgid "Thai"
+msgid "Sinhala"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:161
-msgid "Lao"
+msgid "Thai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:165
-msgid "Tibetan"
+msgid "Lao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:169
-msgid "Myanmar"
+msgid "Tibetan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:173
-msgid "Georgian"
+msgid "Myanmar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:177
-msgid "Hangul Jamo"
+msgid "Georgian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:181
-msgid "Ethiopic"
+msgid "Hangul Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:185
-msgid "Ethiopic Supplement"
+msgid "Ethiopic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:189
-msgid "Cherokee"
+msgid "Ethiopic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:193
-msgid "Unified Canadian Aboriginal Syllabics"
+msgid "Cherokee"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:197
-msgid "Ogham"
+msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:201
-msgid "Runic"
+msgid "Ogham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:205
-msgid "Tagalog"
+msgid "Runic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:209
-msgid "Hanunoo"
+msgid "Tagalog"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:213
-msgid "Buhid"
+msgid "Hanunoo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:217
-msgid "Tagbanwa"
+msgid "Buhid"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:221
-msgid "Khmer"
+msgid "Tagbanwa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:225
-msgid "Mongolian"
+msgid "Khmer"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:229
-msgid "Unified Canadian Aboriginal Syllabics Extended"
+msgid "Mongolian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:233
-msgid "Limbu"
+msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:237
-msgid "Tai Le"
+msgid "Limbu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:241
-msgid "New Tai Lue"
+msgid "Tai Le"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:245
-msgid "Khmer Symbols"
+msgid "New Tai Lue"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:249
-msgid "Buginese"
+msgid "Khmer Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:253
-msgid "Tai Tham"
+msgid "Buginese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:257
-msgid "Combining Diacritical Marks Extended"
+msgid "Tai Tham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:261
-msgid "Balinese"
+msgid "Combining Diacritical Marks Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:265
-msgid "Sundanese"
+msgid "Balinese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:269
-msgid "Batak"
+msgid "Sundanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:273
-msgid "Lepcha"
+msgid "Batak"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:277
-msgid "Ol Chiki"
+msgid "Lepcha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:281
-msgid "Cyrillic Extended-C"
+msgid "Ol Chiki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:285
-msgid "Georgian Extended"
+msgid "Cyrillic Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:289
-msgid "Sundanese Supplement"
+msgid "Georgian Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:293
-msgid "Vedic Extensions"
+msgid "Sundanese Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:297
-msgid "Phonetic Extensions"
+msgid "Vedic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:301
-msgid "Phonetic Extensions Supplement"
+msgid "Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:305
-msgid "Combining Diacritical Marks Supplement"
+msgid "Phonetic Extensions Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:309
-msgid "Latin Extended Additional"
+msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:313
-msgid "Greek Extended"
+msgid "Latin Extended Additional"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:317
-msgid "General Punctuation"
+msgid "Greek Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:321
-msgid "Superscripts and Subscripts"
+msgid "General Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:325
-msgid "Currency Symbols"
+msgid "Superscripts and Subscripts"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:329
-msgid "Combining Diacritical Marks for Symbols"
+msgid "Currency Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:333
-msgid "Letterlike Symbols"
+msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:337
-msgid "Number Forms"
+msgid "Letterlike Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:341
-msgid "Arrows"
+msgid "Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:345
-msgid "Mathematical Operators"
+msgid "Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:349
-msgid "Miscellaneous Technical"
+msgid "Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:353
-msgid "Control Pictures"
+msgid "Miscellaneous Technical"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:357
-msgid "Optical Character Recognition"
+msgid "Control Pictures"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:361
-msgid "Enclosed Alphanumerics"
+msgid "Optical Character Recognition"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:365
-msgid "Box Drawing"
+msgid "Enclosed Alphanumerics"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:369
-msgid "Block Elements"
+msgid "Box Drawing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:373
-msgid "Geometric Shapes"
+msgid "Block Elements"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:377
-msgid "Miscellaneous Symbols"
+msgid "Geometric Shapes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:381
-msgid "Dingbats"
+msgid "Miscellaneous Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:385
-msgid "Miscellaneous Mathematical Symbols-A"
+msgid "Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:389
-msgid "Supplemental Arrows-A"
+msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:393
-msgid "Braille Patterns"
+msgid "Supplemental Arrows-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:397
-msgid "Supplemental Arrows-B"
+msgid "Braille Patterns"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:401
-msgid "Miscellaneous Mathematical Symbols-B"
+msgid "Supplemental Arrows-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:405
-msgid "Supplemental Mathematical Operators"
+msgid "Miscellaneous Mathematical Symbols-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:409
-msgid "Miscellaneous Symbols and Arrows"
+msgid "Supplemental Mathematical Operators"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:413
-msgid "Glagolitic"
+msgid "Miscellaneous Symbols and Arrows"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:417
-msgid "Latin Extended-C"
+msgid "Glagolitic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:421
-msgid "Coptic"
+msgid "Latin Extended-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:425
-msgid "Georgian Supplement"
+msgid "Coptic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:429
-msgid "Tifinagh"
+msgid "Georgian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:433
-msgid "Ethiopic Extended"
+msgid "Tifinagh"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:437
-msgid "Cyrillic Extended-A"
+msgid "Ethiopic Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:441
-msgid "Supplemental Punctuation"
+msgid "Cyrillic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:445
-msgid "CJK Radicals Supplement"
+msgid "Supplemental Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:449
-msgid "Kangxi Radicals"
+msgid "CJK Radicals Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:453
-msgid "Ideographic Description Characters"
+msgid "Kangxi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:457
-msgid "CJK Symbols and Punctuation"
+msgid "Ideographic Description Characters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:461
-msgid "Hiragana"
+msgid "CJK Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:465
-msgid "Katakana"
+msgid "Hiragana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:469
-msgid "Bopomofo"
+msgid "Katakana"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:473
-msgid "Hangul Compatibility Jamo"
+msgid "Bopomofo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:477
-msgid "Kanbun"
+msgid "Hangul Compatibility Jamo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:481
-msgid "Bopomofo Extended"
+msgid "Kanbun"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:485
-msgid "CJK Strokes"
+msgid "Bopomofo Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:489
-msgid "Katakana Phonetic Extensions"
+msgid "CJK Strokes"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:493
-msgid "Enclosed CJK Letters and Months"
+msgid "Katakana Phonetic Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:497
-msgid "CJK Compatibility"
+msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:501
-msgid "CJK Unified Ideographs Extension A"
+msgid "CJK Compatibility"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:505
-msgid "Yijing Hexagram Symbols"
+msgid "CJK Unified Ideographs Extension A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:509
-msgid "CJK Unified Ideographs"
+msgid "Yijing Hexagram Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:513
-msgid "Yi Syllables"
+msgid "CJK Unified Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:517
-msgid "Yi Radicals"
+msgid "Yi Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:521
-msgid "Lisu"
+msgid "Yi Radicals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:525
-msgid "Vai"
+msgid "Lisu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:529
-msgid "Cyrillic Extended-B"
+msgid "Vai"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:533
-msgid "Bamum"
+msgid "Cyrillic Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:537
-msgid "Modifier Tone Letters"
+msgid "Bamum"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:541
-msgid "Latin Extended-D"
+msgid "Modifier Tone Letters"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:545
-msgid "Syloti Nagri"
+msgid "Latin Extended-D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:549
-msgid "Common Indic Number Forms"
+msgid "Syloti Nagri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:553
-msgid "Phags-pa"
+msgid "Common Indic Number Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:557
-msgid "Saurashtra"
+msgid "Phags-pa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:561
-msgid "Devanagari Extended"
+msgid "Saurashtra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:565
-msgid "Kayah Li"
+msgid "Devanagari Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:569
-msgid "Rejang"
+msgid "Kayah Li"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:573
-msgid "Hangul Jamo Extended-A"
+msgid "Rejang"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:577
-msgid "Javanese"
+msgid "Hangul Jamo Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:581
-msgid "Myanmar Extended-B"
+msgid "Javanese"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:585
-msgid "Cham"
+msgid "Myanmar Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:589
-msgid "Myanmar Extended-A"
+msgid "Cham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:593
-msgid "Tai Viet"
+msgid "Myanmar Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:597
-msgid "Meetei Mayek Extensions"
+msgid "Tai Viet"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:601
-msgid "Ethiopic Extended-A"
+msgid "Meetei Mayek Extensions"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:605
-msgid "Latin Extended-E"
+msgid "Ethiopic Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:609
-msgid "Cherokee Supplement"
+msgid "Latin Extended-E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:613
-msgid "Meetei Mayek"
+msgid "Cherokee Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:617
-msgid "Hangul Syllables"
+msgid "Meetei Mayek"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:621
-msgid "Hangul Jamo Extended-B"
+msgid "Hangul Syllables"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:625
-msgid "High Surrogates"
+msgid "Hangul Jamo Extended-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:629
-msgid "High Private Use Surrogates"
+msgid "High Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:633
-msgid "Low Surrogates"
+msgid "High Private Use Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:637
-msgid "Private Use Area"
+msgid "Low Surrogates"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:641
-msgid "CJK Compatibility Ideographs"
+msgid "Private Use Area"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:645
-msgid "Alphabetic Presentation Forms"
+msgid "CJK Compatibility Ideographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:649
-msgid "Arabic Presentation Forms-A"
+msgid "Alphabetic Presentation Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:653
-msgid "Variation Selectors"
+msgid "Arabic Presentation Forms-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:657
-msgid "Vertical Forms"
+msgid "Variation Selectors"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:661
-msgid "Combining Half Marks"
+msgid "Vertical Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:665
-msgid "CJK Compatibility Forms"
+msgid "Combining Half Marks"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:669
-msgid "Small Form Variants"
+msgid "CJK Compatibility Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:673
-msgid "Arabic Presentation Forms-B"
+msgid "Small Form Variants"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:677
-msgid "Halfwidth and Fullwidth Forms"
+msgid "Arabic Presentation Forms-B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:681
-msgid "Specials"
+msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:685
-msgid "Linear B Syllabary"
+msgid "Specials"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:689
-msgid "Linear B Ideograms"
+msgid "Linear B Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:693
-msgid "Aegean Numbers"
+msgid "Linear B Ideograms"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:697
-msgid "Ancient Greek Numbers"
+msgid "Aegean Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:701
-msgid "Ancient Symbols"
+msgid "Ancient Greek Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:705
-msgid "Phaistos Disc"
+msgid "Ancient Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:709
-msgid "Lycian"
+msgid "Phaistos Disc"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:713
-msgid "Carian"
+msgid "Lycian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:717
-msgid "Coptic Epact Numbers"
+msgid "Carian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:721
-msgid "Old Italic"
+msgid "Coptic Epact Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:725
-msgid "Gothic"
+msgid "Old Italic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:729
-msgid "Old Permic"
+msgid "Gothic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:733
-msgid "Ugaritic"
+msgid "Old Permic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:737
-msgid "Old Persian"
+msgid "Ugaritic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:741
-msgid "Deseret"
+msgid "Old Persian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:745
-msgid "Shavian"
+msgid "Deseret"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:749
-msgid "Osmanya"
+msgid "Shavian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:753
-msgid "Osage"
+msgid "Osmanya"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:757
-msgid "Elbasan"
+msgid "Osage"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:761
-msgid "Caucasian Albanian"
+msgid "Elbasan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:765
-msgid "Linear A"
+msgid "Caucasian Albanian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:769
-msgid "Cypriot Syllabary"
+msgid "Vithkuqi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:773
-msgid "Imperial Aramaic"
+msgid "Linear A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:777
-msgid "Palmyrene"
+msgid "Latin Extended-F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:781
-msgid "Nabataean"
+msgid "Cypriot Syllabary"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:785
-msgid "Hatran"
+msgid "Imperial Aramaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:789
-msgid "Phoenician"
+msgid "Palmyrene"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:793
-msgid "Lydian"
+msgid "Nabataean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:797
-msgid "Meroitic Hieroglyphs"
+msgid "Hatran"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:801
-msgid "Meroitic Cursive"
+msgid "Phoenician"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:805
-msgid "Kharoshthi"
+msgid "Lydian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:809
-msgid "Old South Arabian"
+msgid "Meroitic Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:813
-msgid "Old North Arabian"
+msgid "Meroitic Cursive"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:817
-msgid "Manichaean"
+msgid "Kharoshthi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:821
-msgid "Avestan"
+msgid "Old South Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:825
-msgid "Inscriptional Parthian"
+msgid "Old North Arabian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:829
-msgid "Inscriptional Pahlavi"
+msgid "Manichaean"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:833
-msgid "Psalter Pahlavi"
+msgid "Avestan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:837
-msgid "Old Turkic"
+msgid "Inscriptional Parthian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:841
-msgid "Old Hungarian"
+msgid "Inscriptional Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:845
-msgid "Hanifi Rohingya"
+msgid "Psalter Pahlavi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:849
-msgid "Rumi Numeral Symbols"
+msgid "Old Turkic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:853
+msgid "Old Hungarian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:857
+msgid "Hanifi Rohingya"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:861
+msgid "Rumi Numeral Symbols"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:865
 msgid "Yezidi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
-msgid "Old Sogdian"
+#: src/ibusunicodegen.h:869
+msgid "Old Sogdian"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:873
+msgid "Sogdian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
-msgid "Sogdian"
+#: src/ibusunicodegen.h:877
+msgid "Old Uyghur"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:881
 msgid "Chorasmian"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Elymaic"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Brahmi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Kaithi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Sora Sompeng"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Chakma"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Mahajani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Sharada"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Sinhala Archaic Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Khojki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Multani"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Khudawadi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Grantha"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
 msgid "Newa"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:937
 msgid "Tirhuta"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:941
 msgid "Siddham"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:945
 msgid "Modi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:949
 msgid "Mongolian Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:953
 msgid "Takri"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:957
 msgid "Ahom"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:961
 msgid "Dogra"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:965
 msgid "Warang Citi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:969
 msgid "Dives Akuru"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:973
 msgid "Nandinagari"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:977
 msgid "Zanabazar Square"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:981
 msgid "Soyombo"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:985
+msgid "Unified Canadian Aboriginal Syllabics Extended-A"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
 msgid "Pau Cin Hau"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:993
 msgid "Bhaiksuki"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:997
 msgid "Marchen"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1001
 msgid "Masaram Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1005
 msgid "Gunjala Gondi"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1009
 msgid "Makasar"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1013
 msgid "Lisu Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1017
 msgid "Tamil Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1021
 msgid "Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1025
 msgid "Cuneiform Numbers and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1029
 msgid "Early Dynastic Cuneiform"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1033
+msgid "Cypro-Minoan"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
 msgid "Egyptian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1041
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1045
 msgid "Anatolian Hieroglyphs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1049
 msgid "Bamum Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1053
 msgid "Mro"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1057
+msgid "Tangsa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
 msgid "Bassa Vah"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1065
 msgid "Pahawh Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1069
 msgid "Medefaidrin"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1073
 msgid "Miao"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1077
 msgid "Ideographic Symbols and Punctuation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1081
 msgid "Tangut"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1085
 msgid "Tangut Components"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1089
 msgid "Khitan Small Script"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1093
 msgid "Tangut Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1097
+msgid "Kana Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
 msgid "Kana Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1105
 msgid "Kana Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1109
 msgid "Small Kana Extension"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1113
 msgid "Nushu"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1117
 msgid "Duployan"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1121
 msgid "Shorthand Format Controls"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1125
+msgid "Znamenny Musical Notation"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1133
 msgid "Musical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1137
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1141
 msgid "Mayan Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1145
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1149
 msgid "Counting Rod Numerals"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1153
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1157
 msgid "Sutton SignWriting"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1161
+msgid "Latin Extended-G"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
 msgid "Glagolitic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1169
 msgid "Nyiakeng Puachue Hmong"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1173
+msgid "Toto"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
 msgid "Wancho"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
+msgid "Ethiopic Extended-B"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
 msgid "Mende Kikakui"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1189
 msgid "Adlam"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1193
 msgid "Indic Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1197
 msgid "Ottoman Siyaq Numbers"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1201
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1205
 msgid "Mahjong Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1209
 msgid "Domino Tiles"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1213
 msgid "Playing Cards"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1217
 msgid "Enclosed Alphanumeric Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1221
 msgid "Enclosed Ideographic Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1225
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1229
 msgid "Emoticons"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1233
 msgid "Ornamental Dingbats"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1237
 msgid "Transport and Map Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1241
 msgid "Alchemical Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1245
 msgid "Geometric Shapes Extended"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1249
 msgid "Supplemental Arrows-C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1253
 msgid "Supplemental Symbols and Pictographs"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1257
 msgid "Chess Symbols"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1261
 msgid "Symbols and Pictographs Extended-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1265
 msgid "Symbols for Legacy Computing"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1269
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1273
 msgid "CJK Unified Ideographs Extension C"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1277
 msgid "CJK Unified Ideographs Extension D"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1233
+#: src/ibusunicodegen.h:1281
 msgid "CJK Unified Ideographs Extension E"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1237
+#: src/ibusunicodegen.h:1285
 msgid "CJK Unified Ideographs Extension F"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1241
+#: src/ibusunicodegen.h:1289
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1245
+#: src/ibusunicodegen.h:1293
 msgid "CJK Unified Ideographs Extension G"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1249
+#: src/ibusunicodegen.h:1297
 msgid "Tags"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1253
+#: src/ibusunicodegen.h:1301
 msgid "Variation Selectors Supplement"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1257
+#: src/ibusunicodegen.h:1305
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1261
+#: src/ibusunicodegen.h:1309
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
@@ -3094,93 +3178,93 @@ msgstr ""
 msgid "%s is unknown command!\n"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:233
+#: ui/gtk3/emojier.vala:235
 msgid "Favorites"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:234
+#: ui/gtk3/emojier.vala:236
 msgid "Others"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:235
+#: ui/gtk3/emojier.vala:237
 msgid "Open Unicode choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:995
+#: ui/gtk3/emojier.vala:1000
 msgid "Bring back emoji choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1097
+#: ui/gtk3/emojier.vala:1103
 msgid "Page Down"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1108
+#: ui/gtk3/emojier.vala:1114
 msgid "Page Up"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1117
 msgid "Show emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1112
+#: ui/gtk3/emojier.vala:1118
 msgid "Close"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1124
 msgid "Menu"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1129
+#: ui/gtk3/emojier.vala:1135
 msgid "Click to view a warning message"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1173
+#: ui/gtk3/emojier.vala:1179
 msgid "Loading a Unicode dictionary:"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1419
+#: ui/gtk3/emojier.vala:1425
 #, c-format
 msgid "Code point: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1425
+#: ui/gtk3/emojier.vala:1431
 msgid "Has emoji variants"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
+#: ui/gtk3/emojier.vala:1599 ui/gtk3/emojier.vala:1612
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1592
+#: ui/gtk3/emojier.vala:1599
 msgid "None"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1616
+#: ui/gtk3/emojier.vala:1623
 #, c-format
 msgid "Annotations: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1642
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:1650
+#: ui/gtk3/emojier.vala:1657
 #, c-format
 msgid "Alias: %s"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
+#: ui/gtk3/emojier.vala:2180 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1244
 msgid "Emoji Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2142
+#: ui/gtk3/emojier.vala:2182
 msgid "Unicode Choice"
 msgstr ""
 
-#: ui/gtk3/emojier.vala:2432
+#: ui/gtk3/emojier.vala:2485
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3229,46 +3313,56 @@ msgstr ""
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
+#: ui/gtk3/panel.vala:320 ui/gtk3/panel.vala:351
 msgid "IBus Panel"
 msgstr ""
 
-#: ui/gtk3/panel.vala:975
+#: ui/gtk3/panel.vala:756
+msgid "IBus Notification"
+msgstr ""
+
+#: ui/gtk3/panel.vala:757 ui/gtk3/panel.vala:766 ui/gtk3/panel.vala:770
+msgid ""
+"Keymap changes do not work in Plasma Wayland at present. Please use "
+"systemsettings5 instead."
+msgstr ""
+
+#: ui/gtk3/panel.vala:1045
 #, c-format
 msgid ""
-"Your configured input method %s does not exist in IBus input methods so \"US"
-"\" layout was configured instead of your input method."
+"Your configured input method %s does not exist in IBus input methods so "
+"\"US\" layout was configured instead of your input method."
 msgstr ""
 
-#: ui/gtk3/panel.vala:980
+#: ui/gtk3/panel.vala:1050
 msgid ""
 "At least one of your configured input methods does not exist in IBus input "
 "methods."
 msgstr ""
 
-#: ui/gtk3/panel.vala:983
+#: ui/gtk3/panel.vala:1053
 msgid ""
 "Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
 "your input methods again."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1141
+#: ui/gtk3/panel.vala:1216
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1145
+#: ui/gtk3/panel.vala:1220
 msgid "translator-credits"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1164
+#: ui/gtk3/panel.vala:1239
 msgid "Preferences"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1190
+#: ui/gtk3/panel.vala:1265
 msgid "Restart"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1194
+#: ui/gtk3/panel.vala:1269
 msgid "Quit"
 msgstr ""
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 5cd9c15ca..61bfa1b6c 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1207,7 +1207,7 @@ class Panel : IBus.PanelService {
 
             string copyright =
                 "Copyright © 2007-2015 Peng Huang\n" +
-                "Copyright © 2015-2019 Takao Fujiwara\n" +
+                "Copyright © 2015-2022 Takao Fujiwara\n" +
                 "Copyright © 2007-2015 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);

From b4723eb1688f396f6309d034b7c5d2815ead4b94 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 4 May 2022 20:58:21 +0900
Subject: [PATCH 800/816] travis: Add libnotify-dev

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c065f9e1c..a6c04d28c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ addons:
     - libgtk-3-bin
     - libgtk-3-dev
     - libgtk2.0-dev
+    - libnotify-dev
     - libtool
     - libwayland-dev
     - python-gi-dev

From f7c045ec56606b72158addac55e6526bfba1327f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=9D=B8=EC=88=98?= <simmon@nplob.com>
Date: Wed, 4 May 2022 23:09:15 +0900
Subject: [PATCH 801/816] po: Update translation (Korean)

Update po/ko.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ko/

BUG=https://github.com/ibus/ibus/pull/2399
---
 po/ko.po | 774 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 441 insertions(+), 333 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 74ea153e5..a86e29e36 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -19,13 +19,14 @@
 # DaeHyun Sung <sungdh86@gmail.com>, 2016-2019. (gucharmap)
 # Changwoo Ryu <cwryu@debian.org>, 2019-2020.
 # simmon <simmon@nplob.com>, 2021.
+# 김인수 <simmon@nplob.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.21\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-09-03 21:21+0900\n"
-"PO-Revision-Date: 2021-11-11 00:05+0000\n"
-"Last-Translator: simmon <simmon@nplob.com>\n"
+"PO-Revision-Date: 2022-04-10 09:17+0000\n"
+"Last-Translator: 김인수 <simmon@nplob.com>\n"
 "Language-Team: Korean <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/ko/>\n"
 "Language: ko\n"
@@ -33,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.8.1\n"
+"X-Generator: Weblate 4.11.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -75,7 +76,8 @@ msgstr "저장한 버전 번호"
 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/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -83,7 +85,9 @@ msgstr "ASCII가 없는 라틴 문자 키보드 배치"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:33
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
-msgstr "US 키보드 배치가 라틴 문자 키보드 배치에 추가되었습니다. 변형 버전은 생략 될 수 있습니다."
+msgstr ""
+"US 키보드 배치가 라틴 문자 키보드 배치에 추가되었습니다. 변형 버전은 생략 될 "
+"수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:37
 msgid "Use xmodmap"
@@ -260,10 +264,12 @@ msgid ""
 "percentage values in the range 0% to 100%, and 'a' is a floating point value "
 "in the range 0 to 1 of the alpha."
 msgstr ""
-"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. X11의 색상 이름, 2. 'r' 'g' "
-"'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 '#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 "
-"0부터 255까지의 값 또는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또는, 4. "
-"여기에 'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값이 될 수 있습니다."
+"XKB 아이콘은 배치 문자열을 보여주며 RGBA 값을 통해 표현합니다. RGBA 값은 1. "
+"X11의 색상 이름, 2. 'r' 'g' 'b' 자리에 적, 녹, 청의 16진수 값이 들어가는 "
+"'#rrggbb' 형식의 16진수 값이며, 3. 'r', 'g', 'b' 자리에 0부터 255까지의 값 또"
+"는 0%부터 100%까지의 백분율 값이 들어가는 'rgb(r,g,b)' 형식의 RGB 색상 값 또"
+"는, 4. 여기에 'a'는 0부터 1까지의 실수 알파 값이 들어가는 'rgba(r,g,b,a)' 값"
+"이 될 수 있습니다."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:155
 msgid "The milliseconds to show the panel icon for a property"
@@ -456,11 +462,12 @@ msgstr "_취소"
 msgid "_OK"
 msgstr "확인(_O)"
 
-#: setup/emojilang.py:235 setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:205 setup/enginedialog.py:222
 msgid "More…"
 msgstr "더 보기…"
 
 #: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+#: ui/gtk3/panel.vala:1259
 msgid "About"
 msgstr "정보"
 
@@ -559,8 +566,8 @@ msgid ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus를 시작했습니다! IBus를 사용 할 수 으면, 다음 행을 자신의 $HOME/.bashrc 파일에 추가; 그런 후에 자신의 "
-"데스크탑에 다시 로그인하세요.\n"
+"IBus를 시작했습니다! IBus를 사용 할 수 으면, 다음 행을 자신의 $HOME/.bashrc "
+"파일에 추가; 그런 후에 자신의 데스크탑에 다시 로그인하세요.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
@@ -761,8 +768,8 @@ msgid ""
 "ones in the above list by pressing the keyboard shortcut keys or clicking "
 "the panel icon.</i></small>"
 msgstr ""
-"<small><i>위의 목록에서 선택한 후 키보드 단축키를 누르거나 패널 아이콘을 눌러 활성 입력기를 전환 할 수 "
-"있습니다.</i></small>"
+"<small><i>위의 목록에서 선택한 후 키보드 단축키를 누르거나 패널 아이콘을 눌"
+"러 활성 입력기를 전환 할 수 있습니다.</i></small>"
 
 # tooltip
 #: setup/setup.ui:873
@@ -1035,245 +1042,245 @@ msgstr "시리아 문자 추가영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:113
+#: src/ibusunicodegen.h:113 src/ibusunicodegen.h:117
 msgid "Arabic Extended-A"
 msgstr "아랍 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:117 src/ibusunicodegen.h:121
 msgid "Devanagari"
 msgstr "데바나가리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:121 src/ibusunicodegen.h:125
 msgid "Bengali"
 msgstr "벵골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:125 src/ibusunicodegen.h:129
 msgid "Gurmukhi"
 msgstr "구르무키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:129 src/ibusunicodegen.h:133
 msgid "Gujarati"
 msgstr "구자라트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:133 src/ibusunicodegen.h:137
 msgid "Oriya"
 msgstr "오리야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:137 src/ibusunicodegen.h:141
 msgid "Tamil"
 msgstr "타밀 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:141 src/ibusunicodegen.h:145
 msgid "Telugu"
 msgstr "텔루구 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:145 src/ibusunicodegen.h:149
 msgid "Kannada"
 msgstr "칸나다 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:149 src/ibusunicodegen.h:153
 msgid "Malayalam"
 msgstr "말라얌람 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:153 src/ibusunicodegen.h:157
 msgid "Sinhala"
 msgstr "신할라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:157 src/ibusunicodegen.h:161
 msgid "Thai"
 msgstr "타이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:161 src/ibusunicodegen.h:165
 msgid "Lao"
 msgstr "라오 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:165 src/ibusunicodegen.h:169
 msgid "Tibetan"
 msgstr "티베트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:169 src/ibusunicodegen.h:173
 msgid "Myanmar"
 msgstr "미얀마 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:173 src/ibusunicodegen.h:177
 msgid "Georgian"
 msgstr "그루지야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:177 src/ibusunicodegen.h:181
 msgid "Hangul Jamo"
 msgstr "한글 자모"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:181 src/ibusunicodegen.h:185
 msgid "Ethiopic"
 msgstr "에티오피아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:185 src/ibusunicodegen.h:189
 msgid "Ethiopic Supplement"
 msgstr "에티오피아 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:189 src/ibusunicodegen.h:193
 msgid "Cherokee"
 msgstr "체로키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:193 src/ibusunicodegen.h:197
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "통합 캐나다 원주민 음절"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:197 src/ibusunicodegen.h:201
 msgid "Ogham"
 msgstr "오검 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:201 src/ibusunicodegen.h:205
 msgid "Runic"
 msgstr "룬 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:205 src/ibusunicodegen.h:209
 msgid "Tagalog"
 msgstr "타갈로그 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:209 src/ibusunicodegen.h:213
 msgid "Hanunoo"
 msgstr "하누누 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:213 src/ibusunicodegen.h:217
 msgid "Buhid"
 msgstr "부히드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:217 src/ibusunicodegen.h:221
 msgid "Tagbanwa"
 msgstr "타그반와 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:221 src/ibusunicodegen.h:225
 msgid "Khmer"
 msgstr "크메르 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:225 src/ibusunicodegen.h:229
 msgid "Mongolian"
 msgstr "몽골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:229 src/ibusunicodegen.h:233
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "통합 캐나다 원주민 음절 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:233 src/ibusunicodegen.h:237
 msgid "Limbu"
 msgstr "림부 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:237 src/ibusunicodegen.h:241
 msgid "Tai Le"
 msgstr "타이레 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:241 src/ibusunicodegen.h:245
 msgid "New Tai Lue"
 msgstr "신 타이 루에"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:245 src/ibusunicodegen.h:249
 msgid "Khmer Symbols"
 msgstr "크메르 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:249 src/ibusunicodegen.h:253
 msgid "Buginese"
 msgstr "부기스 문자"
 
@@ -1281,28 +1288,28 @@ msgstr "부기스 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:253 src/ibusunicodegen.h:257
 msgid "Tai Tham"
 msgstr "란나 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:257 src/ibusunicodegen.h:261
 msgid "Combining Diacritical Marks Extended"
 msgstr "조합 구분 표시 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:261 src/ibusunicodegen.h:265
 msgid "Balinese"
 msgstr "발리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:265 src/ibusunicodegen.h:269
 msgid "Sundanese"
 msgstr "순다 문자"
 
@@ -1310,252 +1317,252 @@ msgstr "순다 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:269 src/ibusunicodegen.h:273
 msgid "Batak"
 msgstr "바타크 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:273 src/ibusunicodegen.h:277
 msgid "Lepcha"
 msgstr "렙차 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:277 src/ibusunicodegen.h:281
 msgid "Ol Chiki"
 msgstr "올치키 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:281 src/ibusunicodegen.h:285
 msgid "Cyrillic Extended-C"
 msgstr "키릴 문자 확장영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:285 src/ibusunicodegen.h:289
 msgid "Georgian Extended"
 msgstr "그루지야 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:289 src/ibusunicodegen.h:293
 msgid "Sundanese Supplement"
 msgstr "순다 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:293 src/ibusunicodegen.h:297
 msgid "Vedic Extensions"
 msgstr "베다 확장"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:297 src/ibusunicodegen.h:301
 msgid "Phonetic Extensions"
 msgstr "발음 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:301 src/ibusunicodegen.h:305
 msgid "Phonetic Extensions Supplement"
 msgstr "발음 확장 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:305 src/ibusunicodegen.h:309
 msgid "Combining Diacritical Marks Supplement"
 msgstr "조합 구분 표시 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:309 src/ibusunicodegen.h:313
 msgid "Latin Extended Additional"
 msgstr "라틴 문자 확장 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:313 src/ibusunicodegen.h:317
 msgid "Greek Extended"
 msgstr "그리스 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:317 src/ibusunicodegen.h:321
 msgid "General Punctuation"
 msgstr "일반 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:321 src/ibusunicodegen.h:325
 msgid "Superscripts and Subscripts"
 msgstr "위첨자/아래첨자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:325 src/ibusunicodegen.h:329
 msgid "Currency Symbols"
 msgstr "화폐 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:329 src/ibusunicodegen.h:333
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "기호용 조합 구분 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:333 src/ibusunicodegen.h:337
 msgid "Letterlike Symbols"
 msgstr "문자 모양 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:337 src/ibusunicodegen.h:341
 msgid "Number Forms"
 msgstr "여러가지 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:341 src/ibusunicodegen.h:345
 msgid "Arrows"
 msgstr "화살표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:345 src/ibusunicodegen.h:349
 msgid "Mathematical Operators"
 msgstr "수학 연산자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:349 src/ibusunicodegen.h:353
 msgid "Miscellaneous Technical"
 msgstr "여러가지 기타 서술 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:353 src/ibusunicodegen.h:357
 msgid "Control Pictures"
 msgstr "제어 문자 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:357 src/ibusunicodegen.h:361
 msgid "Optical Character Recognition"
 msgstr "광학 인식 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:361 src/ibusunicodegen.h:365
 msgid "Enclosed Alphanumerics"
 msgstr "괄호 영문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:365 src/ibusunicodegen.h:369
 msgid "Box Drawing"
 msgstr "테두리 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:369 src/ibusunicodegen.h:373
 msgid "Block Elements"
 msgstr "블럭 요소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:373 src/ibusunicodegen.h:377
 msgid "Geometric Shapes"
 msgstr "도형"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:377 src/ibusunicodegen.h:381
 msgid "Miscellaneous Symbols"
 msgstr "여러가지 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:381 src/ibusunicodegen.h:385
 msgid "Dingbats"
 msgstr "딩뱃 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:385 src/ibusunicodegen.h:389
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "여러가지 수학기호-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:389 src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-A"
 msgstr "화살표 추가영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:393 src/ibusunicodegen.h:397
 msgid "Braille Patterns"
 msgstr "점자 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:397 src/ibusunicodegen.h:401
 msgid "Supplemental Arrows-B"
 msgstr "화살표 추가영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:401 src/ibusunicodegen.h:405
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "여러가지 수학기호-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:405 src/ibusunicodegen.h:409
 msgid "Supplemental Mathematical Operators"
 msgstr "수학 연산자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:409 src/ibusunicodegen.h:413
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "여러가지 기호 및 화살표"
 
@@ -1563,112 +1570,112 @@ msgstr "여러가지 기호 및 화살표"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:413 src/ibusunicodegen.h:417
 msgid "Glagolitic"
 msgstr "글라골 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:417 src/ibusunicodegen.h:421
 msgid "Latin Extended-C"
 msgstr "라틴문자 확장영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:421 src/ibusunicodegen.h:425
 msgid "Coptic"
 msgstr "콥트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:425 src/ibusunicodegen.h:429
 msgid "Georgian Supplement"
 msgstr "그루지야 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:429 src/ibusunicodegen.h:433
 msgid "Tifinagh"
 msgstr "티피나그 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:433 src/ibusunicodegen.h:437
 msgid "Ethiopic Extended"
 msgstr "에티오피아 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:437 src/ibusunicodegen.h:441
 msgid "Cyrillic Extended-A"
 msgstr "키릴 문자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:441 src/ibusunicodegen.h:445
 msgid "Supplemental Punctuation"
 msgstr "추가 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:445 src/ibusunicodegen.h:449
 msgid "CJK Radicals Supplement"
 msgstr "한중일 부수 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:449 src/ibusunicodegen.h:453
 msgid "Kangxi Radicals"
 msgstr "강희자전 부수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:453 src/ibusunicodegen.h:457
 msgid "Ideographic Description Characters"
 msgstr "한자 기술 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:457 src/ibusunicodegen.h:461
 msgid "CJK Symbols and Punctuation"
 msgstr "한중일 기호 및 문장 부호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:461 src/ibusunicodegen.h:465
 msgid "Hiragana"
 msgstr "히라가나"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:465 src/ibusunicodegen.h:469
 msgid "Katakana"
 msgstr "카다카나"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:469 src/ibusunicodegen.h:473
 msgid "Bopomofo"
 msgstr "주음부호(중국어 발음기호)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:473 src/ibusunicodegen.h:477
 msgid "Hangul Compatibility Jamo"
 msgstr "한글 호환 자모"
 
@@ -1677,98 +1684,98 @@ msgstr "한글 호환 자모"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:477 src/ibusunicodegen.h:481
 msgid "Kanbun"
 msgstr "간분"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:481 src/ibusunicodegen.h:485
 msgid "Bopomofo Extended"
 msgstr "주음부호 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:485 src/ibusunicodegen.h:489
 msgid "CJK Strokes"
 msgstr "한중일 획수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:489 src/ibusunicodegen.h:493
 msgid "Katakana Phonetic Extensions"
 msgstr "카타카나 발음 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:493 src/ibusunicodegen.h:497
 msgid "Enclosed CJK Letters and Months"
 msgstr "한중일 둘러싼 문자 및 날짜 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:497 src/ibusunicodegen.h:501
 msgid "CJK Compatibility"
 msgstr "한중일 호환 영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:501 src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs Extension A"
 msgstr "한중일 통합 한자 확장영역 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:505 src/ibusunicodegen.h:509
 msgid "Yijing Hexagram Symbols"
 msgstr "주역 6선형 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:509 src/ibusunicodegen.h:513
 msgid "CJK Unified Ideographs"
 msgstr "한중일 통합 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:513 src/ibusunicodegen.h:517
 msgid "Yi Syllables"
 msgstr "이 음절문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:517 src/ibusunicodegen.h:521
 msgid "Yi Radicals"
 msgstr "이 문자 부수"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:521 src/ibusunicodegen.h:525
 msgid "Lisu"
 msgstr "리수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:525 src/ibusunicodegen.h:529
 msgid "Vai"
 msgstr "바이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:529 src/ibusunicodegen.h:533
 msgid "Cyrillic Extended-B"
 msgstr "키릴 문자 확장영역-B"
 
@@ -1776,77 +1783,77 @@ msgstr "키릴 문자 확장영역-B"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:533 src/ibusunicodegen.h:537
 msgid "Bamum"
 msgstr "바뭄어 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:537 src/ibusunicodegen.h:541
 msgid "Modifier Tone Letters"
 msgstr "변조 성조 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:541 src/ibusunicodegen.h:545
 msgid "Latin Extended-D"
 msgstr "라틴 문자 확장영역-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:545 src/ibusunicodegen.h:549
 msgid "Syloti Nagri"
 msgstr "실헤티 나가리"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:549 src/ibusunicodegen.h:553
 msgid "Common Indic Number Forms"
 msgstr "인도 공통 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:553 src/ibusunicodegen.h:557
 msgid "Phags-pa"
 msgstr "파스파 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:557 src/ibusunicodegen.h:561
 msgid "Saurashtra"
 msgstr "사우라슈트라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:561 src/ibusunicodegen.h:565
 msgid "Devanagari Extended"
 msgstr "데바나가리 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:565 src/ibusunicodegen.h:569
 msgid "Kayah Li"
 msgstr "카야 리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:569 src/ibusunicodegen.h:573
 msgid "Rejang"
 msgstr "레장 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:573 src/ibusunicodegen.h:577
 msgid "Hangul Jamo Extended-A"
 msgstr "한글 자모 확장영역-A"
 
@@ -1854,28 +1861,28 @@ msgstr "한글 자모 확장영역-A"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:577 src/ibusunicodegen.h:581
 msgid "Javanese"
 msgstr "자와어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:581 src/ibusunicodegen.h:585
 msgid "Myanmar Extended-B"
 msgstr "미얀마 확장영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:585 src/ibusunicodegen.h:589
 msgid "Cham"
 msgstr "참 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:589 src/ibusunicodegen.h:593
 msgid "Myanmar Extended-A"
 msgstr "미얀마 확장영역-A"
 
@@ -1883,217 +1890,217 @@ msgstr "미얀마 확장영역-A"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:593 src/ibusunicodegen.h:597
 msgid "Tai Viet"
 msgstr "타이비엣 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:597 src/ibusunicodegen.h:601
 msgid "Meetei Mayek Extensions"
 msgstr "메이테이 문자 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:601 src/ibusunicodegen.h:605
 msgid "Ethiopic Extended-A"
 msgstr "에티오피아 문자 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:605 src/ibusunicodegen.h:609
 msgid "Latin Extended-E"
 msgstr "라틴문자 확장영역-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:609 src/ibusunicodegen.h:613
 msgid "Cherokee Supplement"
 msgstr "체로키 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:613 src/ibusunicodegen.h:617
 msgid "Meetei Mayek"
 msgstr "메이테이 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:617 src/ibusunicodegen.h:621
 msgid "Hangul Syllables"
 msgstr "한글 음절"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:621 src/ibusunicodegen.h:625
 msgid "Hangul Jamo Extended-B"
 msgstr "한글 자모 확장영역-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:625 src/ibusunicodegen.h:629
 msgid "High Surrogates"
 msgstr "상위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:629 src/ibusunicodegen.h:633
 msgid "High Private Use Surrogates"
 msgstr "개인용 상위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:633 src/ibusunicodegen.h:637
 msgid "Low Surrogates"
 msgstr "하위 확장코드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:637 src/ibusunicodegen.h:641
 msgid "Private Use Area"
 msgstr "개인 사용 영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:641 src/ibusunicodegen.h:645
 msgid "CJK Compatibility Ideographs"
 msgstr "한중일 호환 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:645 src/ibusunicodegen.h:649
 msgid "Alphabetic Presentation Forms"
 msgstr "알파벳 표시 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:649 src/ibusunicodegen.h:653
 msgid "Arabic Presentation Forms-A"
 msgstr "아랍 문자 표시 양식-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:653 src/ibusunicodegen.h:657
 msgid "Variation Selectors"
 msgstr "여러가지 선택자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:657 src/ibusunicodegen.h:661
 msgid "Vertical Forms"
 msgstr "세로 모양"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:661 src/ibusunicodegen.h:665
 msgid "Combining Half Marks"
 msgstr "조합 반각 표시"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:665 src/ibusunicodegen.h:669
 msgid "CJK Compatibility Forms"
 msgstr "한중일 호환 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:669 src/ibusunicodegen.h:673
 msgid "Small Form Variants"
 msgstr "작은꼴 변형"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:673 src/ibusunicodegen.h:677
 msgid "Arabic Presentation Forms-B"
 msgstr "아랍 문자 표시 양식-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:677 src/ibusunicodegen.h:681
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "반각 및 전각 양식"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:681 src/ibusunicodegen.h:685
 msgid "Specials"
 msgstr "특수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:685 src/ibusunicodegen.h:689
 msgid "Linear B Syllabary"
 msgstr "선형 B 음절문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:689 src/ibusunicodegen.h:693
 msgid "Linear B Ideograms"
 msgstr "선형 B 표의문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:693 src/ibusunicodegen.h:697
 msgid "Aegean Numbers"
 msgstr "에게 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:697 src/ibusunicodegen.h:701
 msgid "Ancient Greek Numbers"
 msgstr "고대 그리스 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:701 src/ibusunicodegen.h:705
 msgid "Ancient Symbols"
 msgstr "고대 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:705 src/ibusunicodegen.h:709
 msgid "Phaistos Disc"
 msgstr "파이스토스 원판"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:709 src/ibusunicodegen.h:713
 msgid "Lycian"
 msgstr "리키아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:713 src/ibusunicodegen.h:717
 msgid "Carian"
 msgstr "카리 문자"
 
@@ -2101,63 +2108,63 @@ msgstr "카리 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:717 src/ibusunicodegen.h:721
 msgid "Coptic Epact Numbers"
 msgstr "콥트어 이팩트 번호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:721 src/ibusunicodegen.h:725
 msgid "Old Italic"
 msgstr "고대 이탈리아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:725 src/ibusunicodegen.h:729
 msgid "Gothic"
 msgstr "고트 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:729 src/ibusunicodegen.h:733
 msgid "Old Permic"
 msgstr "고대 페름어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:733 src/ibusunicodegen.h:737
 msgid "Ugaritic"
 msgstr "우가릿 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:737 src/ibusunicodegen.h:741
 msgid "Old Persian"
 msgstr "옛 페르시아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:741 src/ibusunicodegen.h:745
 msgid "Deseret"
 msgstr "데저렛 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:745 src/ibusunicodegen.h:749
 msgid "Shavian"
 msgstr "쇼 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:749 src/ibusunicodegen.h:753
 msgid "Osmanya"
 msgstr "오스마냐 문자"
 
@@ -2165,14 +2172,14 @@ msgstr "오스마냐 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:753 src/ibusunicodegen.h:757
 msgid "Osage"
 msgstr "오세이지 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:757 src/ibusunicodegen.h:761
 msgid "Elbasan"
 msgstr "엘바산 문자"
 
@@ -2180,42 +2187,42 @@ msgstr "엘바산 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:761 src/ibusunicodegen.h:765
 msgid "Caucasian Albanian"
 msgstr "캅카스 알바니아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:765 src/ibusunicodegen.h:773
 msgid "Linear A"
 msgstr "선형 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:769 src/ibusunicodegen.h:781
 msgid "Cypriot Syllabary"
 msgstr "키프로스 음절표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:773 src/ibusunicodegen.h:785
 msgid "Imperial Aramaic"
 msgstr "황실 아람어 알파벳"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:777 src/ibusunicodegen.h:789
 msgid "Palmyrene"
 msgstr "팔미라 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:781 src/ibusunicodegen.h:793
 msgid "Nabataean"
 msgstr "나바테아 문자"
 
@@ -2223,84 +2230,84 @@ msgstr "나바테아 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:785 src/ibusunicodegen.h:797
 msgid "Hatran"
 msgstr "하트란 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:789 src/ibusunicodegen.h:801
 msgid "Phoenician"
 msgstr "페니키아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:793 src/ibusunicodegen.h:805
 msgid "Lydian"
 msgstr "리디아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:797 src/ibusunicodegen.h:809
 msgid "Meroitic Hieroglyphs"
 msgstr "메로에 상형문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:801 src/ibusunicodegen.h:813
 msgid "Meroitic Cursive"
 msgstr "메로에 필기체"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:805 src/ibusunicodegen.h:817
 msgid "Kharoshthi"
 msgstr "카로시디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:809 src/ibusunicodegen.h:821
 msgid "Old South Arabian"
 msgstr "고대 남아라비아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:813 src/ibusunicodegen.h:825
 msgid "Old North Arabian"
 msgstr "고대 북아라비아 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:817 src/ibusunicodegen.h:829
 msgid "Manichaean"
 msgstr "마니교 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:821 src/ibusunicodegen.h:833
 msgid "Avestan"
 msgstr "아베스탄어"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:825 src/ibusunicodegen.h:837
 msgid "Inscriptional Parthian"
 msgstr "파르티아어 새김 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:829 src/ibusunicodegen.h:841
 msgid "Inscriptional Pahlavi"
 msgstr "팔레비어 새김 문자"
 
@@ -2308,21 +2315,21 @@ msgstr "팔레비어 새김 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:833 src/ibusunicodegen.h:845
 msgid "Psalter Pahlavi"
 msgstr "시편 팔레비어 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:837 src/ibusunicodegen.h:849
 msgid "Old Turkic"
 msgstr "고대 튀르크 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:841 src/ibusunicodegen.h:853
 msgid "Old Hungarian"
 msgstr "옛 헝가리 문자"
 
@@ -2330,56 +2337,56 @@ msgstr "옛 헝가리 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:845 src/ibusunicodegen.h:857
 msgid "Hanifi Rohingya"
 msgstr "하니피 로힝야 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:849 src/ibusunicodegen.h:861
 msgid "Rumi Numeral Symbols"
 msgstr "루미 숫자 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:853 src/ibusunicodegen.h:865
 msgid "Yezidi"
 msgstr "야지디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:857 src/ibusunicodegen.h:869
 msgid "Old Sogdian"
 msgstr "고대 소그드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:861 src/ibusunicodegen.h:873
 msgid "Sogdian"
 msgstr "소그드 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:865 src/ibusunicodegen.h:881
 msgid "Chorasmian"
 msgstr "호라즘 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:869 src/ibusunicodegen.h:885
 msgid "Elymaic"
 msgstr "엘리마이스 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:873 src/ibusunicodegen.h:889
 msgid "Brahmi"
 msgstr "브라흐미 문자"
 
@@ -2387,7 +2394,7 @@ msgstr "브라흐미 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:877 src/ibusunicodegen.h:893
 msgid "Kaithi"
 msgstr "카이시 문자"
 
@@ -2395,7 +2402,7 @@ msgstr "카이시 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:881 src/ibusunicodegen.h:897
 msgid "Sora Sompeng"
 msgstr "소라 솜펭 문자"
 
@@ -2403,7 +2410,7 @@ msgstr "소라 솜펭 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:885 src/ibusunicodegen.h:901
 msgid "Chakma"
 msgstr "차크마 문자"
 
@@ -2411,7 +2418,7 @@ msgstr "차크마 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:889 src/ibusunicodegen.h:905
 msgid "Mahajani"
 msgstr "마하자니 문자"
 
@@ -2419,7 +2426,7 @@ msgstr "마하자니 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:893 src/ibusunicodegen.h:909
 msgid "Sharada"
 msgstr "샤라다 문자"
 
@@ -2427,7 +2434,7 @@ msgstr "샤라다 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:897 src/ibusunicodegen.h:913
 msgid "Sinhala Archaic Numbers"
 msgstr "신할라 고대 숫자"
 
@@ -2435,7 +2442,7 @@ msgstr "신할라 고대 숫자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:901 src/ibusunicodegen.h:917
 msgid "Khojki"
 msgstr "코즈키 문자"
 
@@ -2443,7 +2450,7 @@ msgstr "코즈키 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:905 src/ibusunicodegen.h:921
 msgid "Multani"
 msgstr "물타니 문자"
 
@@ -2451,7 +2458,7 @@ msgstr "물타니 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:909 src/ibusunicodegen.h:925
 msgid "Khudawadi"
 msgstr "쿠다와디 문자"
 
@@ -2459,7 +2466,7 @@ msgstr "쿠다와디 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:913 src/ibusunicodegen.h:929
 msgid "Grantha"
 msgstr "그랜사 문자"
 
@@ -2467,7 +2474,7 @@ msgstr "그랜사 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:917 src/ibusunicodegen.h:933
 msgid "Newa"
 msgstr "네와 문자"
 
@@ -2475,7 +2482,7 @@ msgstr "네와 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:921 src/ibusunicodegen.h:937
 msgid "Tirhuta"
 msgstr "티르후타 문자"
 
@@ -2483,7 +2490,7 @@ msgstr "티르후타 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:925 src/ibusunicodegen.h:941
 msgid "Siddham"
 msgstr "시드햄 문자"
 
@@ -2491,14 +2498,14 @@ msgstr "시드햄 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:929 src/ibusunicodegen.h:945
 msgid "Modi"
 msgstr "모디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:933 src/ibusunicodegen.h:949
 msgid "Mongolian Supplement"
 msgstr "몽골 문자 추가영역"
 
@@ -2506,7 +2513,7 @@ msgstr "몽골 문자 추가영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:937 src/ibusunicodegen.h:953
 msgid "Takri"
 msgstr "타크리 문자"
 
@@ -2514,7 +2521,7 @@ msgstr "타크리 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:941 src/ibusunicodegen.h:957
 msgid "Ahom"
 msgstr "아홈 문자"
 
@@ -2522,7 +2529,7 @@ msgstr "아홈 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:945 src/ibusunicodegen.h:961
 msgid "Dogra"
 msgstr "도그라 문자"
 
@@ -2530,28 +2537,28 @@ msgstr "도그라 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:949 src/ibusunicodegen.h:965
 msgid "Warang Citi"
 msgstr "바랑 크시티 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:953 src/ibusunicodegen.h:969
 msgid "Dives Akuru"
 msgstr "디베스 아쿠루 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:957 src/ibusunicodegen.h:973
 msgid "Nandinagari"
 msgstr "난디나가리 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:961 src/ibusunicodegen.h:977
 msgid "Zanabazar Square"
 msgstr "자나바자르 정방형 문자"
 
@@ -2559,21 +2566,21 @@ msgstr "자나바자르 정방형 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:965 src/ibusunicodegen.h:981
 msgid "Soyombo"
 msgstr "소욤보 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:969 src/ibusunicodegen.h:989
 msgid "Pau Cin Hau"
 msgstr "파우 킨 하우 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:973 src/ibusunicodegen.h:993
 msgid "Bhaiksuki"
 msgstr "바이크수키 문자"
 
@@ -2581,77 +2588,77 @@ msgstr "바이크수키 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:977 src/ibusunicodegen.h:997
 msgid "Marchen"
 msgstr "샹슝 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:981 src/ibusunicodegen.h:1001
 msgid "Masaram Gondi"
 msgstr "마사람 곤디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:985 src/ibusunicodegen.h:1005
 msgid "Gunjala Gondi"
 msgstr "건잘라 곤디 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:989 src/ibusunicodegen.h:1009
 msgid "Makasar"
 msgstr "마카사르 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:993 src/ibusunicodegen.h:1013
 msgid "Lisu Supplement"
 msgstr "리수 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:997 src/ibusunicodegen.h:1017
 msgid "Tamil Supplement"
 msgstr "타밀 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1001 src/ibusunicodegen.h:1021
 msgid "Cuneiform"
 msgstr "설형 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1005 src/ibusunicodegen.h:1025
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "설형 숫자및 구두기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1009 src/ibusunicodegen.h:1029
 msgid "Early Dynastic Cuneiform"
 msgstr "초기 왕조 쐐기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1013 src/ibusunicodegen.h:1037
 msgid "Egyptian Hieroglyphs"
 msgstr "고대 이집트 신성문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1017 src/ibusunicodegen.h:1041
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "고대 이집트 신성문자 형식 제어 문자"
 
@@ -2659,35 +2666,35 @@ msgstr "고대 이집트 신성문자 형식 제어 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1021 src/ibusunicodegen.h:1045
 msgid "Anatolian Hieroglyphs"
 msgstr "아나톨리아 상형문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1025 src/ibusunicodegen.h:1049
 msgid "Bamum Supplement"
 msgstr "바뭄어 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1029 src/ibusunicodegen.h:1053
 msgid "Mro"
 msgstr "므로 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1033 src/ibusunicodegen.h:1061
 msgid "Bassa Vah"
 msgstr "바사 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1037 src/ibusunicodegen.h:1065
 msgid "Pahawh Hmong"
 msgstr "파하우몽 문자"
 
@@ -2695,14 +2702,14 @@ msgstr "파하우몽 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1041 src/ibusunicodegen.h:1069
 msgid "Medefaidrin"
 msgstr "메데파이드린 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1045 src/ibusunicodegen.h:1073
 msgid "Miao"
 msgstr "먀오 문자"
 
@@ -2710,7 +2717,7 @@ msgstr "먀오 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1049 src/ibusunicodegen.h:1077
 msgid "Ideographic Symbols and Punctuation"
 msgstr "표의문자용 기호 및 구두 기호"
 
@@ -2718,7 +2725,7 @@ msgstr "표의문자용 기호 및 구두 기호"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1053 src/ibusunicodegen.h:1081
 msgid "Tangut"
 msgstr "서하 문자"
 
@@ -2726,42 +2733,42 @@ msgstr "서하 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1057 src/ibusunicodegen.h:1085
 msgid "Tangut Components"
 msgstr "서하 문자 구성요소"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1061 src/ibusunicodegen.h:1089
 msgid "Khitan Small Script"
 msgstr "거란 소자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1065 src/ibusunicodegen.h:1093
 msgid "Tangut Supplement"
 msgstr "서하 문자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1069 src/ibusunicodegen.h:1101
 msgid "Kana Supplement"
 msgstr "가나 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1073 src/ibusunicodegen.h:1105
 msgid "Kana Extended-A"
 msgstr "가나 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1077 src/ibusunicodegen.h:1109
 msgid "Small Kana Extension"
 msgstr "작은 가나 확장영역"
 
@@ -2769,77 +2776,77 @@ msgstr "작은 가나 확장영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1081 src/ibusunicodegen.h:1113
 msgid "Nushu"
 msgstr "뉘수 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1085 src/ibusunicodegen.h:1117
 msgid "Duployan"
 msgstr "듀플로이언 속기 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1089 src/ibusunicodegen.h:1121
 msgid "Shorthand Format Controls"
 msgstr "속기 형식 컨트롤 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1093 src/ibusunicodegen.h:1129
 msgid "Byzantine Musical Symbols"
 msgstr "비잔틴 음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1097 src/ibusunicodegen.h:1133
 msgid "Musical Symbols"
 msgstr "음악 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1101 src/ibusunicodegen.h:1137
 msgid "Ancient Greek Musical Notation"
 msgstr "고대 그리스 음표"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1105 src/ibusunicodegen.h:1141
 msgid "Mayan Numerals"
 msgstr "마야 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1109 src/ibusunicodegen.h:1145
 msgid "Tai Xuan Jing Symbols"
 msgstr "태현경 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1113 src/ibusunicodegen.h:1149
 msgid "Counting Rod Numerals"
 msgstr "산가지 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1117 src/ibusunicodegen.h:1153
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "수학용 알파벳, 숫자 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1121 src/ibusunicodegen.h:1157
 msgid "Sutton SignWriting"
 msgstr "서튼 수화 표기"
 
@@ -2847,7 +2854,7 @@ msgstr "서튼 수화 표기"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1125 src/ibusunicodegen.h:1165
 msgid "Glagolitic Supplement"
 msgstr "글라골루 문자 추가영역"
 
@@ -2855,21 +2862,21 @@ msgstr "글라골루 문자 추가영역"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1129 src/ibusunicodegen.h:1169
 msgid "Nyiakeng Puachue Hmong"
 msgstr "창세기 몽족 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1133 src/ibusunicodegen.h:1177
 msgid "Wancho"
 msgstr "완초 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1137 src/ibusunicodegen.h:1185
 msgid "Mende Kikakui"
 msgstr "멘데어 키카쿠이 문자"
 
@@ -2877,7 +2884,7 @@ msgstr "멘데어 키카쿠이 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1141 src/ibusunicodegen.h:1189
 msgid "Adlam"
 msgstr "애들램 문자"
 
@@ -2885,7 +2892,7 @@ msgstr "애들램 문자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1145 src/ibusunicodegen.h:1193
 msgid "Indic Siyaq Numbers"
 msgstr "인도 시야크 숫자"
 
@@ -2893,203 +2900,203 @@ msgstr "인도 시야크 숫자"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1149 src/ibusunicodegen.h:1197
 msgid "Ottoman Siyaq Numbers"
 msgstr "오스만 시야크 숫자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1153 src/ibusunicodegen.h:1201
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "아랍 수학용 알파벳 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1157 src/ibusunicodegen.h:1205
 msgid "Mahjong Tiles"
 msgstr "마작 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1161 src/ibusunicodegen.h:1209
 msgid "Domino Tiles"
 msgstr "도미노 타일"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1165 src/ibusunicodegen.h:1213
 msgid "Playing Cards"
 msgstr "플레잉카드"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1169 src/ibusunicodegen.h:1217
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "괄호 영문자 및 숫자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1173 src/ibusunicodegen.h:1221
 msgid "Enclosed Ideographic Supplement"
 msgstr "괄호 한자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1177 src/ibusunicodegen.h:1225
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "여러가지 기호 및 그림 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1181 src/ibusunicodegen.h:1229
 msgid "Emoticons"
 msgstr "이모티콘"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1185 src/ibusunicodegen.h:1233
 msgid "Ornamental Dingbats"
 msgstr "장식용 딩뱃 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1189 src/ibusunicodegen.h:1237
 msgid "Transport and Map Symbols"
 msgstr "교통 및 지도 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1193 src/ibusunicodegen.h:1241
 msgid "Alchemical Symbols"
 msgstr "연금술 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1197 src/ibusunicodegen.h:1245
 msgid "Geometric Shapes Extended"
 msgstr "도형 확장영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1201 src/ibusunicodegen.h:1249
 msgid "Supplemental Arrows-C"
 msgstr "화살표 추가영역-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1205 src/ibusunicodegen.h:1253
 msgid "Supplemental Symbols and Pictographs"
 msgstr "추가 기호 및 그림 문자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1209 src/ibusunicodegen.h:1257
 msgid "Chess Symbols"
 msgstr "체스 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1213 src/ibusunicodegen.h:1261
 msgid "Symbols and Pictographs Extended-A"
 msgstr "기호 및 그림 문자 확장영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1217 src/ibusunicodegen.h:1265
 msgid "Symbols for Legacy Computing"
 msgstr "레거시 컴퓨팅 기호"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1221 src/ibusunicodegen.h:1269
 msgid "CJK Unified Ideographs Extension B"
 msgstr "한중일 통합 한자 확장영역 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1225 src/ibusunicodegen.h:1273
 msgid "CJK Unified Ideographs Extension C"
 msgstr "한중일 통합 한자 확장영역 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1229 src/ibusunicodegen.h:1277
 msgid "CJK Unified Ideographs Extension D"
 msgstr "한중일 통합 한자 확장영역 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1233
+#: src/ibusunicodegen.h:1233 src/ibusunicodegen.h:1281
 msgid "CJK Unified Ideographs Extension E"
 msgstr "한중일 통합 한자 확장영역 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1237
+#: src/ibusunicodegen.h:1237 src/ibusunicodegen.h:1285
 msgid "CJK Unified Ideographs Extension F"
 msgstr "한중일 통합 한자 확장영역 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1241
+#: src/ibusunicodegen.h:1241 src/ibusunicodegen.h:1289
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "한중일 호환 보충 한자"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1245
+#: src/ibusunicodegen.h:1245 src/ibusunicodegen.h:1293
 msgid "CJK Unified Ideographs Extension G"
 msgstr "한중일 통합 한자 확장영역 G"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1249
+#: src/ibusunicodegen.h:1249 src/ibusunicodegen.h:1297
 msgid "Tags"
 msgstr "태그"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1253
+#: src/ibusunicodegen.h:1253 src/ibusunicodegen.h:1301
 msgid "Variation Selectors Supplement"
 msgstr "여러가지 선택자 추가영역"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1257
+#: src/ibusunicodegen.h:1257 src/ibusunicodegen.h:1305
 msgid "Supplementary Private Use Area-A"
 msgstr "사용자 추가영역-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1261
+#: src/ibusunicodegen.h:1261 src/ibusunicodegen.h:1309
 msgid "Supplementary Private Use Area-B"
 msgstr "사용자 추가영역-B"
 
@@ -3223,100 +3230,103 @@ msgstr "명령:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s는 알 수 없는 명령입니다!\n"
 
-#: ui/gtk3/emojier.vala:233
+#: ui/gtk3/emojier.vala:233 ui/gtk3/emojier.vala:235
 msgid "Favorites"
 msgstr "자주 사용"
 
-#: ui/gtk3/emojier.vala:234
+#: ui/gtk3/emojier.vala:234 ui/gtk3/emojier.vala:236
 msgid "Others"
 msgstr "기타"
 
-#: ui/gtk3/emojier.vala:235
+#: ui/gtk3/emojier.vala:235 ui/gtk3/emojier.vala:237
 msgid "Open Unicode choice"
 msgstr "유니코드 선택 열기"
 
-#: ui/gtk3/emojier.vala:995
+#: ui/gtk3/emojier.vala:995 ui/gtk3/emojier.vala:1000
 msgid "Bring back emoji choice"
 msgstr "이모지 선택으로 돌아가기"
 
-#: ui/gtk3/emojier.vala:1097
+#: ui/gtk3/emojier.vala:1097 ui/gtk3/emojier.vala:1103
 msgid "Page Down"
 msgstr "다음 페이지"
 
-#: ui/gtk3/emojier.vala:1108
+#: ui/gtk3/emojier.vala:1108 ui/gtk3/emojier.vala:1114
 msgid "Page Up"
 msgstr "이전 페이지"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1111 ui/gtk3/emojier.vala:1117
 msgid "Show emoji variants"
 msgstr "이모지 변종 보기"
 
-#: ui/gtk3/emojier.vala:1112
+#: ui/gtk3/emojier.vala:1112 ui/gtk3/emojier.vala:1118
 msgid "Close"
 msgstr "닫기"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1118 ui/gtk3/emojier.vala:1124
 msgid "Menu"
 msgstr "메뉴"
 
-#: ui/gtk3/emojier.vala:1129
+#: ui/gtk3/emojier.vala:1129 ui/gtk3/emojier.vala:1135
 msgid "Click to view a warning message"
 msgstr "경고 메시지를 보려면 누르십시오"
 
-#: ui/gtk3/emojier.vala:1173
+#: ui/gtk3/emojier.vala:1173 ui/gtk3/emojier.vala:1179
 msgid "Loading a Unicode dictionary:"
 msgstr "유니코드 사전 읽어들이는 중:"
 
-#: ui/gtk3/emojier.vala:1419
+#: ui/gtk3/emojier.vala:1419 ui/gtk3/emojier.vala:1425
 #, c-format
 msgid "Code point: %s"
 msgstr "코드값: %s"
 
-#: ui/gtk3/emojier.vala:1425
+#: ui/gtk3/emojier.vala:1425 ui/gtk3/emojier.vala:1431
 msgid "Has emoji variants"
 msgstr "이모지 변종 있음"
 
 #: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
+#: ui/gtk3/emojier.vala:1599 ui/gtk3/emojier.vala:1612
 #, c-format
 msgid "Description: %s"
 msgstr "설명: %s"
 
-#: ui/gtk3/emojier.vala:1592
+#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1599
 msgid "None"
 msgstr "없음"
 
-#: ui/gtk3/emojier.vala:1616
+#: ui/gtk3/emojier.vala:1616 ui/gtk3/emojier.vala:1623
 #, c-format
 msgid "Annotations: %s"
 msgstr "주석: %s"
 
-#: ui/gtk3/emojier.vala:1642
+#: ui/gtk3/emojier.vala:1642 ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Name: %s"
 msgstr "이름: %s"
 
-#: ui/gtk3/emojier.vala:1650
+#: ui/gtk3/emojier.vala:1650 ui/gtk3/emojier.vala:1657
 #, c-format
 msgid "Alias: %s"
 msgstr "다른 이름: %s"
 
 #: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
 #: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1147
+#: ui/gtk3/emojier.vala:2180 ui/gtk3/panel.vala:1244
 msgid "Emoji Choice"
 msgstr "이모지 선택"
 
-#: ui/gtk3/emojier.vala:2142
+#: ui/gtk3/emojier.vala:2142 ui/gtk3/emojier.vala:2182
 msgid "Unicode Choice"
 msgstr "유니코드 선택"
 
-#: ui/gtk3/emojier.vala:2432
+#: ui/gtk3/emojier.vala:2432 ui/gtk3/emojier.vala:2485
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
 "mode, click your desktop and click your text application again."
 msgstr ""
-"현재 텍스트 응용 프로그램을 가져 올 수 없습니다. 응용 프로그램에 다시 초점을 맞춰보세요. 예를 들어 Esc 키를 여러 번 눌러서 "
-"이모지 입력 방식을 벗어나거나, 바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보세요."
+"현재 텍스트 응용 프로그램을 가져 올 수 없습니다. 응용 프로그램에 다시 초점을 "
+"맞춰보세요. 예를 들어 Esc 키를 여러 번 눌러서 이모지 입력 방식을 벗어나거나, "
+"바탕 화면을 누르고 텍스트 응용 프로그램을 다시 눌러 보세요."
 
 #: ui/gtk3/emojierapp.vala:47
 msgid "Canceled to choose an emoji."
@@ -3360,11 +3370,12 @@ msgstr "지정한 정수 값 길이만큼 일치"
 msgid "Match with the condition of the specified integer"
 msgstr "지정된 정수의 조건과 일치"
 
-#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
+#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323 ui/gtk3/panel.vala:320
+#: ui/gtk3/panel.vala:351
 msgid "IBus Panel"
 msgstr "IBus 패널"
 
-#: ui/gtk3/panel.vala:975
+#: ui/gtk3/panel.vala:975 ui/gtk3/panel.vala:1045
 #, c-format
 msgid ""
 "Your configured input method %s does not exist in IBus input methods so \"US"
@@ -3373,13 +3384,13 @@ msgstr ""
 "당신이 사용하도록 설정한 %s 입력기가 IBUS 입력기에 없으므로, 당신의 입력기 대"
 "신 \"US\" 키보드 배치가 설정되었습니다."
 
-#: ui/gtk3/panel.vala:980
+#: ui/gtk3/panel.vala:980 ui/gtk3/panel.vala:1050
 msgid ""
 "At least one of your configured input methods does not exist in IBus input "
 "methods."
 msgstr "IBus 입력기에는 당신이 사용하도록 설정한 입력기가 존재하지 않습니다."
 
-#: ui/gtk3/panel.vala:983
+#: ui/gtk3/panel.vala:983 ui/gtk3/panel.vala:1053
 msgid ""
 "Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
 "your input methods again."
@@ -3387,23 +3398,23 @@ msgstr ""
 "`ibus-setup` 명령을 실행하고 \"입력기\" 탭을 연 다음 입력기를 다시 구성하십시"
 "오."
 
-#: ui/gtk3/panel.vala:1141
+#: ui/gtk3/panel.vala:1141 ui/gtk3/panel.vala:1216
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 리눅스/유닉스를 위한 지능형 입력 버스입니다."
 
-#: ui/gtk3/panel.vala:1145
+#: ui/gtk3/panel.vala:1145 ui/gtk3/panel.vala:1220
 msgid "translator-credits"
-msgstr "simmon <simmon@nplob.com> 2021"
+msgstr "simmon <simmon@nplob.com>"
 
-#: ui/gtk3/panel.vala:1164
+#: ui/gtk3/panel.vala:1164 ui/gtk3/panel.vala:1239
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ui/gtk3/panel.vala:1190
+#: ui/gtk3/panel.vala:1190 ui/gtk3/panel.vala:1265
 msgid "Restart"
 msgstr "다시 시작"
 
-#: ui/gtk3/panel.vala:1194
+#: ui/gtk3/panel.vala:1194 ui/gtk3/panel.vala:1269
 msgid "Quit"
 msgstr "끝내기"
 
@@ -3413,6 +3424,103 @@ msgstr "끝내기"
 msgid "default:LTR"
 msgstr "default:LTR"
 
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:113
+msgid "Arabic Extended-B"
+msgstr "아랍 문자 확장영역-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:769
+msgid "Vithkuqi"
+msgstr "비트쿠크"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:777
+msgid "Latin Extended-F"
+msgstr "라틴 문자 확장영역-F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:877
+msgid "Old Uyghur"
+msgstr "고대 위그루어"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:985
+msgid "Unified Canadian Aboriginal Syllabics Extended-A"
+msgstr "통합 캐나다 원주민 음절 확장영역-A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1033
+msgid "Cypro-Minoan"
+msgstr "키프로-미노아어"
+
+# 서하문자(西夏文字, Tangut Block)
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1057
+msgid "Tangsa"
+msgstr "탕사"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1097
+msgid "Kana Extended-B"
+msgstr "가나 확장영역-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1125
+msgid "Znamenny Musical Notation"
+msgstr "즈나메니 기보법"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1161
+msgid "Latin Extended-G"
+msgstr "라틴 문자 확장영역-G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1173
+msgid "Toto"
+msgstr "토토"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1181
+msgid "Ethiopic Extended-B"
+msgstr "에티오피아 문자 확장영역-B"
+
+#: ui/gtk3/panel.vala:756
+msgid "IBus Notification"
+msgstr "IBus 알림"
+
+#: ui/gtk3/panel.vala:757 ui/gtk3/panel.vala:766 ui/gtk3/panel.vala:770
+msgid ""
+"Keymap changes do not work in Plasma Wayland at present. Please use "
+"systemsettings5 instead."
+msgstr ""
+"키맵 변경은 현재 플래즈마 웨이랜드에서 작동하지 않습니다. 대신에 "
+"systemsettings5를 사용하세요."
+
 #~ msgid "Kbd"
 #~ msgstr "키보드"
 

From 5f85888daa35bd4d96b48f7e497079fb5a86f483 Mon Sep 17 00:00:00 2001
From: A S Alam <amanpreet.alam@gmail.com>
Date: Wed, 4 May 2022 23:31:10 +0900
Subject: [PATCH 802/816] po: Update translation (Punjabi)

Update po/pa.po at 38.0%
https://translate.fedoraproject.org/projects/ibus/ibus/pa/

BUG=https://github.com/ibus/ibus/pull/2399
---
 po/pa.po | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/po/pa.po b/po/pa.po
index e7c0104f0..83fad0bac 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,6 +1,6 @@
 # Panjabi translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -15,20 +15,22 @@
 # A S Alam <aalam@fedoraproject.org>, 2015. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2015. #zanata
 # A S Alam <aalam@fedoraproject.org>, 2019. #zanata
+# A S Alam <amanpreet.alam@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2019-04-16 17:33+0900\n"
+"PO-Revision-Date: 2022-04-18 16:17+0000\n"
+"Last-Translator: A S Alam <amanpreet.alam@gmail.com>\n"
+"Language-Team: Punjabi <https://translate.fedoraproject.org/projects/ibus/"
+"ibus/pa/>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-05-23 03:58+0000\n"
-"Last-Translator: A S Alam <aalam@fedoraproject.org>\n"
-"Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
-"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Weblate 4.11.2\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -280,15 +282,15 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਮਨਪਸੰਦ ਫੋਂਟ ਨ
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:173
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਟਰਿੱਗਰ ਕਰੋ"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:174
 msgid "The shortcut keys for turning Unicode typing on or off"
-msgstr ""
+msgstr "ਯੂਨੀਕੋਡ ਲਿਖਣ ਨੂੰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਵਾਸਤੇ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚਾਂ"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:178
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
-msgstr ""
+msgstr "gtk_accelerator_parse ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਟਰਿੱਗਰ ਕਰੋ"
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:179
 msgid "The shortcut keys for turning emoji typing on or off"
@@ -2996,7 +2998,7 @@ msgstr ""
 
 #: tools/main.vala:381
 msgid "Resetting…"
-msgstr "...ਮੁੜ-ਸੈਟ ਕਰ ਰਿਹਾ ਹੈ"
+msgstr "...ਮੁੜ-ਸੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: tools/main.vala:399
 msgid "Done"
@@ -3032,7 +3034,7 @@ msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਦੇ ਅੰਸ਼ ਵਿਖਾਓ"
 
 #: tools/main.vala:451
 msgid "Create registry cache"
-msgstr "ਰਜਿਸਟਰੀ ਕੈਚੇ ਬਣਾਓ।"
+msgstr "ਰਜਿਸਟਰੀ ਕੈਸ਼ ਬਣਾਓ"
 
 #: tools/main.vala:452
 msgid "Print the D-Bus address of ibus-daemon"
@@ -3216,9 +3218,9 @@ msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁ
 #: ui/gtk3/panel.vala:1099
 msgid "translator-credits"
 msgstr ""
-"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੧੨\n"
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> ੨੦੦੮-੨੦੨੨\n"
 "ਜਸਵਿੰਦਰ ਸਿੰਘ <j.phulewala@gmail.com>\n"
-"http://www.satluj.com/"
+"http://satluj.org"
 
 #: ui/gtk3/panel.vala:1118
 msgid "Preferences"

From 8ec7eff589328ca31f6ac06dbd011f750c9aea4a Mon Sep 17 00:00:00 2001
From: Nathan <nathan95@live.it>
Date: Wed, 4 May 2022 23:33:39 +0900
Subject: [PATCH 803/816] po: Update translation (Italian)

Update po/it.po at 32.3%
https://translate.fedoraproject.org/projects/ibus/ibus/it/

BUG=https://github.com/ibus/ibus/pull/2399
---
 po/it.po | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/po/it.po b/po/it.po
index b43ac7425..f41aeed21 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
 # Italian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -19,13 +19,14 @@
 # Luigi Toscano <luigi.toscano@tiscali.it>, 2017. #zanata, 2020.
 # fujiwara <takao.fujiwara1@gmail.com>, 2017. #zanata
 # fujiwara <takao.fujiwara1@gmail.com>, 2018. #zanata
+# Nathan <nathan95@live.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
 "POT-Creation-Date: 2020-01-08 12:40+0900\n"
-"PO-Revision-Date: 2020-02-16 14:38+0000\n"
-"Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
+"PO-Revision-Date: 2022-04-25 08:17+0000\n"
+"Last-Translator: Nathan <nathan95@live.it>\n"
 "Language-Team: Italian <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/it/>\n"
 "Language: it\n"
@@ -33,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10.3\n"
+"X-Generator: Weblate 4.12\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -77,6 +78,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 ""
+"Il numero di versione salvato sarà usato per controllare la differenza tra "
+"la versione dell'ibus precedentemente installato e quella dell'ibus attuale."
 
 #: data/dconf/org.freedesktop.ibus.gschema.xml:32
 msgid "Latin layouts which have no ASCII"
@@ -3272,4 +3275,3 @@ msgstr "Esci"
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
 msgid "default:LTR"
 msgstr "default:LTR"
-

From 2c262cbdd016faca84bf7df9b11d443cd07308b4 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Wed, 4 May 2022 23:35:49 +0900
Subject: [PATCH 804/816] po: Update translation (Ukrainian)

Update po/uk.po at 100.0%
https://translate.fedoraproject.org/projects/ibus/ibus/uk/

BUG=https://github.com/ibus/ibus/pull/2399
---
 po/uk.po | 746 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 421 insertions(+), 325 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 96341b628..fcf48b29e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,17 +1,17 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2011-2015, 2017-2020, 2021.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011-2015, 2017-2020, 2021, 2022.
 # fujiwara <takao.fujiwara1@gmail.com>, 2015, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-12-11 16:21+0900\n"
-"PO-Revision-Date: 2021-01-17 12:37+0000\n"
+"POT-Creation-Date: 2022-04-29 18:05+0900\n"
+"PO-Revision-Date: 2022-05-04 11:02+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/ibus/"
 "ibus/uk/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.12.1\n"
 
 #. Translators: Here “Preload” is a verb
 #: data/dconf/org.freedesktop.ibus.gschema.xml:11
@@ -462,11 +462,11 @@ msgstr "_Скасувати"
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: setup/emojilang.py:235 setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:222
 msgid "More…"
 msgstr "Більше…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1259
 msgid "About"
 msgstr "Інформація"
 
@@ -1050,2015 +1050,2099 @@ msgstr "Додаткові сирійські"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
+msgid "Arabic Extended-B"
+msgstr "Арабська розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
 msgid "Arabic Extended-A"
 msgstr "Арабська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:121
 msgid "Devanagari"
 msgstr "Деванагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:125
 msgid "Bengali"
 msgstr "Бенгальська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:129
 msgid "Gurmukhi"
 msgstr "Гурмухі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:133
 msgid "Gujarati"
 msgstr "Гуджараті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:137
 msgid "Oriya"
 msgstr "Орія"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:141
 msgid "Tamil"
 msgstr "Тамільська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:145
 msgid "Telugu"
 msgstr "Телугу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:149
 msgid "Kannada"
 msgstr "Каннада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:153
 msgid "Malayalam"
 msgstr "Малаялам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:157
 msgid "Sinhala"
 msgstr "Сингальська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:161
 msgid "Thai"
 msgstr "Тайська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:165
 msgid "Lao"
 msgstr "Лаоська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:169
 msgid "Tibetan"
 msgstr "Тибетська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:173
 msgid "Myanmar"
 msgstr "М’янмська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:177
 msgid "Georgian"
 msgstr "Грузинська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:181
 msgid "Hangul Jamo"
 msgstr "Хангиль-чжамо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic"
 msgstr "Ефіопська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:189
 msgid "Ethiopic Supplement"
 msgstr "Додаткові ефіопські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:193
 msgid "Cherokee"
 msgstr "Черокі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:197
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "Уніфіковані силабічні канадських аборигенів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:201
 msgid "Ogham"
 msgstr "Огам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:205
 msgid "Runic"
 msgstr "Рунічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:209
 msgid "Tagalog"
 msgstr "Тагалог"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:213
 msgid "Hanunoo"
 msgstr "Хануну"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:217
 msgid "Buhid"
 msgstr "Бухід"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:221
 msgid "Tagbanwa"
 msgstr "Таґбанва"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:225
 msgid "Khmer"
 msgstr "Кхмерська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:229
 msgid "Mongolian"
 msgstr "Монгольська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:233
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "Уніфіковані силабічні канадських аборигенів (додаткові)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:237
 msgid "Limbu"
 msgstr "Лімбу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:241
 msgid "Tai Le"
 msgstr "Тай лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:245
 msgid "New Tai Lue"
 msgstr "Нова тай лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:249
 msgid "Khmer Symbols"
 msgstr "Кхмерські символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:253
 msgid "Buginese"
 msgstr "Бугійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:257
 msgid "Tai Tham"
 msgstr "Тай-тхем"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:261
 msgid "Combining Diacritical Marks Extended"
 msgstr "Розширення об’єднання діакритичних знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:265
 msgid "Balinese"
 msgstr "Балійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:269
 msgid "Sundanese"
 msgstr "Сунданська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:273
 msgid "Batak"
 msgstr "Батак"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:277
 msgid "Lepcha"
 msgstr "Лепча"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:281
 msgid "Ol Chiki"
 msgstr "Ол-чикі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:285
 msgid "Cyrillic Extended-C"
 msgstr "Кирилиця розширена-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:289
 msgid "Georgian Extended"
 msgstr "Грузинська розширена"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Sundanese Supplement"
 msgstr "Розширена суданська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Vedic Extensions"
 msgstr "Ведичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions"
 msgstr "Фонетичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Phonetic Extensions Supplement"
 msgstr "Додаткові фонетичні розширення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Додаткові об’єднання діакритичних знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Latin Extended Additional"
 msgstr "Латинські додаткові розширені"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "Greek Extended"
 msgstr "Розширена грецька"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "General Punctuation"
 msgstr "Загальна пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Superscripts and Subscripts"
 msgstr "Верхні і нижні індекси"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Currency Symbols"
 msgstr "Символи грошових одиниць"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "Об’єднання діакритичних знаків і символів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Letterlike Symbols"
 msgstr "Схожі на літери символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Number Forms"
 msgstr "Форми чисел"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Arrows"
 msgstr "Стрілки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Mathematical Operators"
 msgstr "Математичні оператори"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Miscellaneous Technical"
 msgstr "Різні технічні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Control Pictures"
 msgstr "Малюнки керування"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Optical Character Recognition"
 msgstr "Оптичне розпізнавання знаків"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Enclosed Alphanumerics"
 msgstr "Буквено-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Box Drawing"
 msgstr "Для малювання рамок"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Block Elements"
 msgstr "Блокові елементи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Geometric Shapes"
 msgstr "Геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Miscellaneous Symbols"
 msgstr "Різні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Dingbats"
 msgstr "Декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Різні математичні символи-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-A"
 msgstr "Додаткові стрілки-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Braille Patterns"
 msgstr "Шаблони Брайля"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Supplemental Arrows-B"
 msgstr "Додаткові стрілки-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Різні математичні символи-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Supplemental Mathematical Operators"
 msgstr "Додаткові математичні дії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "Різні символи і стрілки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Glagolitic"
 msgstr "Глаголиця"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Latin Extended-C"
 msgstr "Латинь розширена-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Coptic"
 msgstr "Коптська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Georgian Supplement"
 msgstr "Додаткові грузинські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Tifinagh"
 msgstr "Тіфінаг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Ethiopic Extended"
 msgstr "Розширена ефіопська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Cyrillic Extended-A"
 msgstr "Розширена кирилиця-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "Supplemental Punctuation"
 msgstr "Додаткова пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "CJK Radicals Supplement"
 msgstr "Додатки радикалів ієрогліфів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Kangxi Radicals"
 msgstr "Радикали кандзі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "Ideographic Description Characters"
 msgstr "Символи-ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "CJK Symbols and Punctuation"
 msgstr "Ієрогліфічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Hiragana"
 msgstr "Хірагана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Katakana"
 msgstr "Катакана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Bopomofo"
 msgstr "Бопомофо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Hangul Compatibility Jamo"
 msgstr "Сумісні корейські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Kanbun"
 msgstr "Канбун"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "Bopomofo Extended"
 msgstr "Додаткові бопомофо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "CJK Strokes"
 msgstr "Ієрогліфічні штрихи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Katakana Phonetic Extensions"
 msgstr "Фонетичні розширення катакани"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "Enclosed CJK Letters and Months"
 msgstr "Вкладені ієрогліфи і назви місяців"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Compatibility"
 msgstr "Сумісність з ієрогліфами"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Ієрогліфічні ідеограми, додаток A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "Yijing Hexagram Symbols"
 msgstr "Символи гексаграм «Книги перетворень»"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "CJK Unified Ideographs"
 msgstr "Універсальні ідеографічні ієрогліфи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Syllables"
 msgstr "Склади Ї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Yi Radicals"
 msgstr "Радикалі Ї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Lisu"
 msgstr "Лісу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Vai"
 msgstr "Вай"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Cyrillic Extended-B"
 msgstr "Кирилиця розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Bamum"
 msgstr "Бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Modifier Tone Letters"
 msgstr "Символи зміни тону"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Latin Extended-D"
 msgstr "Латинь розширена-D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Syloti Nagri"
 msgstr "Силоті нагрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Common Indic Number Forms"
 msgstr "Загальні індійські форми чисел"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Phags-pa"
 msgstr "Фагс-па"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Saurashtra"
 msgstr "Саураштра"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Devanagari Extended"
 msgstr "Розширена деванагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Kayah Li"
 msgstr "Кая-лі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Rejang"
 msgstr "Реджан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Hangul Jamo Extended-A"
 msgstr "Корейска розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Javanese"
 msgstr "Яванська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Myanmar Extended-B"
 msgstr "М’янмська розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Cham"
 msgstr "Тьям"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Myanmar Extended-A"
 msgstr "М’янмська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Tai Viet"
 msgstr "Тай-в’єт"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Meetei Mayek Extensions"
 msgstr "Маніпурі розширена"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Ethiopic Extended-A"
 msgstr "Ефіопська розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Latin Extended-E"
 msgstr "Латинь розширена-E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Cherokee Supplement"
 msgstr "Додаткові черокі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Meetei Mayek"
 msgstr "Маніпурі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Syllables"
 msgstr "Склади хангиля"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "Hangul Jamo Extended-B"
 msgstr "Корейська розширена-B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Surrogates"
 msgstr "Верхні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "High Private Use Surrogates"
 msgstr "Верхні приватні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Low Surrogates"
 msgstr "Нижні замінники"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "Private Use Area"
 msgstr "Область приватного використання"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "CJK Compatibility Ideographs"
 msgstr "Сумісні ієрогліфічні ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Alphabetic Presentation Forms"
 msgstr "Форми відтворення абеток"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Arabic Presentation Forms-A"
 msgstr "Форми відображення арабської A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Variation Selectors"
 msgstr "Вибір варіантів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Vertical Forms"
 msgstr "Вертикальні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "Combining Half Marks"
 msgstr "Комбіновані позначки половинок"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "CJK Compatibility Forms"
 msgstr "Сумісні ієрогліфічні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Small Form Variants"
 msgstr "Варіанти малих форм"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Arabic Presentation Forms-B"
 msgstr "Форми відображення арабської B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "Форми півширини та повної ширини"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Specials"
 msgstr "Спеціальні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Syllabary"
 msgstr "Лінійна писемність B, склади"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Linear B Ideograms"
 msgstr "Лінійна писемність B, ідеограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Aegean Numbers"
 msgstr "Егейські числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Greek Numbers"
 msgstr "Давньогрецькі числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Ancient Symbols"
 msgstr "Давні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Phaistos Disc"
 msgstr "Фестський диск"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Lycian"
 msgstr "Лікійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Carian"
 msgstr "Карійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Coptic Epact Numbers"
 msgstr "Коптські місячні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Old Italic"
 msgstr "Давня італійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Gothic"
 msgstr "Готичні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Old Permic"
 msgstr "Давня пермська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Ugaritic"
 msgstr "Угаритська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Old Persian"
 msgstr "Давня перська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Deseret"
 msgstr "Дезерет"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Shavian"
 msgstr "Шавіан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osmanya"
 msgstr "Османья"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Osage"
 msgstr "Осейдж"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Elbasan"
 msgstr "Ельбасан"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Caucasian Albanian"
 msgstr "Кавказька албанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
+msgid "Vithkuqi"
+msgstr "Віткукі"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
 msgid "Linear A"
 msgstr "Лінійна писемність A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:777
+msgid "Latin Extended-F"
+msgstr "Латинь розширена-F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
 msgid "Cypriot Syllabary"
 msgstr "Кіпріотська складова"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:785
 msgid "Imperial Aramaic"
 msgstr "імперська арамейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:789
 msgid "Palmyrene"
 msgstr "Пальмірська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:793
 msgid "Nabataean"
 msgstr "Набатейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:797
 msgid "Hatran"
 msgstr "Хатран"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:801
 msgid "Phoenician"
 msgstr "Фінікійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:805
 msgid "Lydian"
 msgstr "Лідійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:809
 msgid "Meroitic Hieroglyphs"
 msgstr "Мероїтська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:813
 msgid "Meroitic Cursive"
 msgstr "Мероїтська, скоропис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:817
 msgid "Kharoshthi"
 msgstr "Кхароштхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:821
 msgid "Old South Arabian"
 msgstr "Давня південноарабська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:825
 msgid "Old North Arabian"
 msgstr "Давня північноарабська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:829
 msgid "Manichaean"
 msgstr "Маніхейська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:833
 msgid "Avestan"
 msgstr "Авестанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:837
 msgid "Inscriptional Parthian"
 msgstr "Інскрипційна парфянська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:841
 msgid "Inscriptional Pahlavi"
 msgstr "Інскрипційна пехлеві"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:845
 msgid "Psalter Pahlavi"
 msgstr "Псалтирська пехлеві"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:849
 msgid "Old Turkic"
 msgstr "Давня турецька"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:853
 msgid "Old Hungarian"
 msgstr "Давня угорська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:857
 msgid "Hanifi Rohingya"
 msgstr "Ганіфі рохінджа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:861
 msgid "Rumi Numeral Symbols"
 msgstr "Числові символи румі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:865
 msgid "Yezidi"
 msgstr "Єзидська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:869
 msgid "Old Sogdian"
 msgstr "Давня согдійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:873
 msgid "Sogdian"
 msgstr "Согдійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:877
+msgid "Old Uyghur"
+msgstr "Давня уйгурська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
 msgid "Chorasmian"
 msgstr "хорезмійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Elymaic"
 msgstr "Елімаїдська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Brahmi"
 msgstr "Брахмійська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Kaithi"
 msgstr "Кайтхі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Sora Sompeng"
 msgstr "Соранг сомпенг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Chakma"
 msgstr "Чакма"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Mahajani"
 msgstr "Махаджані"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Sharada"
 msgstr "Шарада"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Sinhala Archaic Numbers"
 msgstr "Сингальські архаїчні числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Khojki"
 msgstr "Ходжкі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Multani"
 msgstr "Мултанська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Khudawadi"
 msgstr "Худабадська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Grantha"
 msgstr "Грантха"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
 msgid "Newa"
 msgstr "Неварська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:937
 msgid "Tirhuta"
 msgstr "Тірхута"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:941
 msgid "Siddham"
 msgstr "Сіддхам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:945
 msgid "Modi"
 msgstr "Моді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:949
 msgid "Mongolian Supplement"
 msgstr "Додаткові монгольські"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:953
 msgid "Takri"
 msgstr "Такрі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:957
 msgid "Ahom"
 msgstr "Ахом"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:961
 msgid "Dogra"
 msgstr "Доґра"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:965
 msgid "Warang Citi"
 msgstr "Варанг-кшиті"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:969
 msgid "Dives Akuru"
 msgstr "Дайвс-акуру"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:973
 msgid "Nandinagari"
 msgstr "Нандінагарі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:977
 msgid "Zanabazar Square"
 msgstr "Квадратний Занабазара"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:981
 msgid "Soyombo"
 msgstr "Сойомбо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:985
+msgid "Unified Canadian Aboriginal Syllabics Extended-A"
+msgstr "Уніфіковані силабічні канадських аборигенів (додаткові) A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
 msgid "Pau Cin Hau"
 msgstr "Пау Цин Хау"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:993
 msgid "Bhaiksuki"
 msgstr "Бхайксукі"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:997
 msgid "Marchen"
 msgstr "Марчен"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1001
 msgid "Masaram Gondi"
 msgstr "Масарам гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1005
 msgid "Gunjala Gondi"
 msgstr "Гунджала гонді"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1009
 msgid "Makasar"
 msgstr "Макасар"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1013
 msgid "Lisu Supplement"
 msgstr "Лісу, доповнення Latin-1"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1017
 msgid "Tamil Supplement"
 msgstr "Додаткова тамільська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1021
 msgid "Cuneiform"
 msgstr "Клинопис"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1025
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "Клинописні числа і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1029
 msgid "Early Dynastic Cuneiform"
 msgstr "Клинопис ранньої династії"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1033
+msgid "Cypro-Minoan"
+msgstr "Кіпро-мінойська"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
 msgid "Egyptian Hieroglyphs"
 msgstr "Єгипетська ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1041
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "Керування форматами єгипетських ієрогліфів"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1045
 msgid "Anatolian Hieroglyphs"
 msgstr "Анатолійьска ієрогліфічна"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1049
 msgid "Bamum Supplement"
 msgstr "Розширений бамум"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1053
 msgid "Mro"
 msgstr "Мро"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1057
+msgid "Tangsa"
+msgstr "Тангса"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
 msgid "Bassa Vah"
 msgstr "Басса-вах"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1065
 msgid "Pahawh Hmong"
 msgstr "Пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1069
 msgid "Medefaidrin"
 msgstr "Медефайдрін"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1073
 msgid "Miao"
 msgstr "Мяо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1077
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Ідеографічні символи і пунктуація"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1081
 msgid "Tangut"
 msgstr "Тангутська"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1085
 msgid "Tangut Components"
 msgstr "Компоненти тангутської"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1089
 msgid "Khitan Small Script"
 msgstr "Киданська мала писемність"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1093
 msgid "Tangut Supplement"
 msgstr "Тангутська, доповнення"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1097
+msgid "Kana Extended-B"
+msgstr "Кана розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
 msgid "Kana Supplement"
 msgstr "Додаткова кана"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1105
 msgid "Kana Extended-A"
 msgstr "Кана розширена-A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1109
 msgid "Small Kana Extension"
 msgstr "Мале розширення кани"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1113
 msgid "Nushu"
 msgstr "Нюй-шу"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1117
 msgid "Duployan"
 msgstr "Система Дюполоє"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1121
 msgid "Shorthand Format Controls"
 msgstr "Керування форматами скоропису"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1125
+msgid "Znamenny Musical Notation"
+msgstr "Символи запису музики знаменного співу"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Byzantine Musical Symbols"
 msgstr "Візантійські музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1133
 msgid "Musical Symbols"
 msgstr "Музичні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1137
 msgid "Ancient Greek Musical Notation"
 msgstr "Давньогрецькі символи запису музики"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1141
 msgid "Mayan Numerals"
 msgstr "Цифри майя"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1145
 msgid "Tai Xuan Jing Symbols"
 msgstr "Символи Тай Хуан Жинь"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1149
 msgid "Counting Rod Numerals"
 msgstr "Числа з паличок для лічби"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1153
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Математичні буквено-цифрові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1157
 msgid "Sutton SignWriting"
 msgstr "Жестова писемність Саттон"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1161
+msgid "Latin Extended-G"
+msgstr "Латинь розширена-G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
 msgid "Glagolitic Supplement"
 msgstr "Додаткові глаголиці"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1169
 msgid "Nyiakeng Puachue Hmong"
 msgstr "Ньякензька пахау-хмонг"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1173
+msgid "Toto"
+msgstr "Тото"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
 msgid "Wancho"
 msgstr "Ванчо"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
+msgid "Ethiopic Extended-B"
+msgstr "Ефіопська розширена-B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
 msgid "Mende Kikakui"
 msgstr "Менде кікауї"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1189
 msgid "Adlam"
 msgstr "Адлам"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1193
 msgid "Indic Siyaq Numbers"
 msgstr "Індійські числа сіяк"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1197
 msgid "Ottoman Siyaq Numbers"
 msgstr "Оттоманські сіякські числа"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1201
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Арабські математичні символи абетки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1205
 msgid "Mahjong Tiles"
 msgstr "Плитки маджонґ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1209
 msgid "Domino Tiles"
 msgstr "Плитки доміно"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1213
 msgid "Playing Cards"
 msgstr "Ігрові карти"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1217
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Додаткові буквенно-цифрові у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1221
 msgid "Enclosed Ideographic Supplement"
 msgstr "Додаткові ідеографічні у рамках"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1225
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "Різні символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1229
 msgid "Emoticons"
 msgstr "Емоційки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1233
 msgid "Ornamental Dingbats"
 msgstr "Орнаментальні декоративні"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1237
 msgid "Transport and Map Symbols"
 msgstr "Транспортні і картографічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1241
 msgid "Alchemical Symbols"
 msgstr "Алхімічні символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1245
 msgid "Geometric Shapes Extended"
 msgstr "Розширені геометричні форми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1249
 msgid "Supplemental Arrows-C"
 msgstr "Додаткові стрілки-C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1253
 msgid "Supplemental Symbols and Pictographs"
 msgstr "Додаткові символи і піктограми"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1257
 msgid "Chess Symbols"
 msgstr "Шахові символи"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1261
 msgid "Symbols and Pictographs Extended-A"
 msgstr "Символи і піктографи, розширення A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1265
 msgid "Symbols for Legacy Computing"
 msgstr "Застарілі символи комп'ютерних наук"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1269
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Уніфіковані ієрогліфічні ідеограми, додаток B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1273
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Ієрогліфічні ідеограми, додаток C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1277
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Ієрогліфічні ідеограми, додаток D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1233
+#: src/ibusunicodegen.h:1281
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Ієрогліфічні ідеограми, додаток E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1237
+#: src/ibusunicodegen.h:1285
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Ієрогліфічні ідеограми, додаток F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1241
+#: src/ibusunicodegen.h:1289
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Додаткові ієрогліфічні ідеограми для сумісності"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1245
+#: src/ibusunicodegen.h:1293
 msgid "CJK Unified Ideographs Extension G"
 msgstr "Універсальні ідеографічні ієрогліфи, додаток G"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1249
+#: src/ibusunicodegen.h:1297
 msgid "Tags"
 msgstr "Мітки"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1253
+#: src/ibusunicodegen.h:1301
 msgid "Variation Selectors Supplement"
 msgstr "Додаткові символи зміни"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1257
+#: src/ibusunicodegen.h:1305
 msgid "Supplementary Private Use Area-A"
 msgstr "Додаткова область приватного використання A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1261
+#: src/ibusunicodegen.h:1309
 msgid "Supplementary Private Use Area-B"
 msgstr "Додаткова область приватного використання B"
 
@@ -3193,93 +3277,93 @@ msgstr "Команди:\n"
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ui/gtk3/emojier.vala:233
+#: ui/gtk3/emojier.vala:235
 msgid "Favorites"
 msgstr "Улюблені"
 
-#: ui/gtk3/emojier.vala:234
+#: ui/gtk3/emojier.vala:236
 msgid "Others"
 msgstr "Інше"
 
-#: ui/gtk3/emojier.vala:235
+#: ui/gtk3/emojier.vala:237
 msgid "Open Unicode choice"
 msgstr "Відкрити вибір Unicode"
 
-#: ui/gtk3/emojier.vala:995
+#: ui/gtk3/emojier.vala:1000
 msgid "Bring back emoji choice"
 msgstr "Повернути вибір емоційок"
 
-#: ui/gtk3/emojier.vala:1097
+#: ui/gtk3/emojier.vala:1103
 msgid "Page Down"
 msgstr "На сторінку вниз"
 
-#: ui/gtk3/emojier.vala:1108
+#: ui/gtk3/emojier.vala:1114
 msgid "Page Up"
 msgstr "На сторінку вгору"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1117
 msgid "Show emoji variants"
 msgstr "Показувати варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1112
+#: ui/gtk3/emojier.vala:1118
 msgid "Close"
 msgstr "Закрити"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1124
 msgid "Menu"
 msgstr "Меню"
 
-#: ui/gtk3/emojier.vala:1129
+#: ui/gtk3/emojier.vala:1135
 msgid "Click to view a warning message"
 msgstr "Натисніть, щоб переглянути попередження"
 
-#: ui/gtk3/emojier.vala:1173
+#: ui/gtk3/emojier.vala:1179
 msgid "Loading a Unicode dictionary:"
 msgstr "Завантаження словника Unicode:"
 
-#: ui/gtk3/emojier.vala:1419
+#: ui/gtk3/emojier.vala:1425
 #, c-format
 msgid "Code point: %s"
 msgstr "Точка кодування: %s"
 
-#: ui/gtk3/emojier.vala:1425
+#: ui/gtk3/emojier.vala:1431
 msgid "Has emoji variants"
 msgstr "Має варіанти емодзі"
 
-#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
+#: ui/gtk3/emojier.vala:1599 ui/gtk3/emojier.vala:1612
 #, c-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ui/gtk3/emojier.vala:1592
+#: ui/gtk3/emojier.vala:1599
 msgid "None"
 msgstr "Немає"
 
-#: ui/gtk3/emojier.vala:1616
+#: ui/gtk3/emojier.vala:1623
 #, c-format
 msgid "Annotations: %s"
 msgstr "Анотації: %s"
 
-#: ui/gtk3/emojier.vala:1642
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Name: %s"
 msgstr "Назва: %s"
 
-#: ui/gtk3/emojier.vala:1650
+#: ui/gtk3/emojier.vala:1657
 #, c-format
 msgid "Alias: %s"
 msgstr "Альтернативна назва: %s"
 
-#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
+#: ui/gtk3/emojier.vala:2180 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1244
 msgid "Emoji Choice"
 msgstr "Вибір емодзі"
 
-#: ui/gtk3/emojier.vala:2142
+#: ui/gtk3/emojier.vala:2182
 msgid "Unicode Choice"
 msgstr "Вибір Unicode"
 
-#: ui/gtk3/emojier.vala:2432
+#: ui/gtk3/emojier.vala:2485
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3332,11 +3416,23 @@ msgstr "Відповідність за вказаною довжиною ряд
 msgid "Match with the condition of the specified integer"
 msgstr "Відповідність з умовою на вказану довжину рядка"
 
-#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
+#: ui/gtk3/panel.vala:320 ui/gtk3/panel.vala:351
 msgid "IBus Panel"
 msgstr "Панель IBus"
 
-#: ui/gtk3/panel.vala:975
+#: ui/gtk3/panel.vala:756
+msgid "IBus Notification"
+msgstr "Сповіщення IBus"
+
+#: ui/gtk3/panel.vala:757 ui/gtk3/panel.vala:766 ui/gtk3/panel.vala:770
+msgid ""
+"Keymap changes do not work in Plasma Wayland at present. Please use "
+"systemsettings5 instead."
+msgstr ""
+"У Плазмі для Wayland зміна розкладок у цій програмі поки не працює. Будь "
+"ласка, скористайтеся для внесення змін systemsettings5."
+
+#: ui/gtk3/panel.vala:1045
 #, c-format
 msgid ""
 "Your configured input method %s does not exist in IBus input methods so \"US"
@@ -3346,7 +3442,7 @@ msgstr ""
 "Через це, замість вибраного вами способу введення, буде використано "
 "розкладку «US»."
 
-#: ui/gtk3/panel.vala:980
+#: ui/gtk3/panel.vala:1050
 msgid ""
 "At least one of your configured input methods does not exist in IBus input "
 "methods."
@@ -3354,7 +3450,7 @@ msgstr ""
 "Серед способів введення IBus немає принаймні одного із налаштованих способів "
 "введення."
 
-#: ui/gtk3/panel.vala:983
+#: ui/gtk3/panel.vala:1053
 msgid ""
 "Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
 "your input methods again."
@@ -3362,23 +3458,23 @@ msgstr ""
 "Будь ласка, віддайте команду «ibus-setup», відкрийте вкладку «Способи "
 "введення» і налаштуйте ваші способи введення ще раз."
 
-#: ui/gtk3/panel.vala:1141
+#: ui/gtk3/panel.vala:1216
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ui/gtk3/panel.vala:1145
+#: ui/gtk3/panel.vala:1220
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
-#: ui/gtk3/panel.vala:1164
+#: ui/gtk3/panel.vala:1239
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ui/gtk3/panel.vala:1190
+#: ui/gtk3/panel.vala:1265
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: ui/gtk3/panel.vala:1194
+#: ui/gtk3/panel.vala:1269
 msgid "Quit"
 msgstr "Вийти"
 

From f3d7aa960b29dda7a5ace7a22ae6de33e2acdcaa Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 5 May 2022 00:19:27 +0900
Subject: [PATCH 805/816] po: Update translation (Japanese)

Update po/uk.po at 98.0%
https://translate.fedoraproject.org/projects/ibus/ibus/ja/

BUG=https://github.com/ibus/ibus/pull/2399
---
 po/ja.po | 751 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 424 insertions(+), 327 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index ce4347990..451fc8bd1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # Japanese translation of ibus.
 # Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.20\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2020-12-11 16:21+0900\n"
+"POT-Creation-Date: 2022-04-29 18:05+0900\n"
 "PO-Revision-Date: 2021-06-20 19:04+0000\n"
 "Last-Translator: simmon <simmon@nplob.com>\n"
 "Language-Team: Japanese <https://translate.fedoraproject.org/projects/ibus/"
@@ -458,11 +458,11 @@ msgstr "キャンセル(_C)"
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: setup/emojilang.py:235 setup/enginedialog.py:205
+#: setup/emojilang.py:235 setup/enginedialog.py:222
 msgid "More…"
 msgstr "さらに…"
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1184
+#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1259
 msgid "About"
 msgstr "情報"
 
@@ -1032,636 +1032,643 @@ msgstr "シリア文字補助"
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
 #: src/ibusunicodegen.h:113
+msgid "Arabic Extended-B"
+msgstr "アラビア文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:117
 msgid "Arabic Extended-A"
 msgstr "アラビア文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:117
+#: src/ibusunicodegen.h:121
 msgid "Devanagari"
 msgstr "デーヴァナーガリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:121
+#: src/ibusunicodegen.h:125
 msgid "Bengali"
 msgstr "ベンガル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:125
+#: src/ibusunicodegen.h:129
 msgid "Gurmukhi"
 msgstr "グルムキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:129
+#: src/ibusunicodegen.h:133
 msgid "Gujarati"
 msgstr "グジャラート文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:133
+#: src/ibusunicodegen.h:137
 msgid "Oriya"
 msgstr "オリヤー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:137
+#: src/ibusunicodegen.h:141
 msgid "Tamil"
 msgstr "タミル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:141
+#: src/ibusunicodegen.h:145
 msgid "Telugu"
 msgstr "テルグ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:145
+#: src/ibusunicodegen.h:149
 msgid "Kannada"
 msgstr "カンナダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:149
+#: src/ibusunicodegen.h:153
 msgid "Malayalam"
 msgstr "マラヤーラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:153
+#: src/ibusunicodegen.h:157
 msgid "Sinhala"
 msgstr "シンハラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:157
+#: src/ibusunicodegen.h:161
 msgid "Thai"
 msgstr "タイ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:161
+#: src/ibusunicodegen.h:165
 msgid "Lao"
 msgstr "ラオス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:165
+#: src/ibusunicodegen.h:169
 msgid "Tibetan"
 msgstr "チベット文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:169
+#: src/ibusunicodegen.h:173
 msgid "Myanmar"
 msgstr "ミャンマー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:173
+#: src/ibusunicodegen.h:177
 msgid "Georgian"
 msgstr "グルジア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:177
+#: src/ibusunicodegen.h:181
 msgid "Hangul Jamo"
 msgstr "ハングル字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:181
+#: src/ibusunicodegen.h:185
 msgid "Ethiopic"
 msgstr "エチオピア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:185
+#: src/ibusunicodegen.h:189
 msgid "Ethiopic Supplement"
 msgstr "エチオピア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:189
+#: src/ibusunicodegen.h:193
 msgid "Cherokee"
 msgstr "チェロキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:193
+#: src/ibusunicodegen.h:197
 msgid "Unified Canadian Aboriginal Syllabics"
 msgstr "統合カナダ先住民音節"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:197
+#: src/ibusunicodegen.h:201
 msgid "Ogham"
 msgstr "オガム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:201
+#: src/ibusunicodegen.h:205
 msgid "Runic"
 msgstr "ルーン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:205
+#: src/ibusunicodegen.h:209
 msgid "Tagalog"
 msgstr "タガログ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:209
+#: src/ibusunicodegen.h:213
 msgid "Hanunoo"
 msgstr "ハヌノオ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:213
+#: src/ibusunicodegen.h:217
 msgid "Buhid"
 msgstr "ブヒッド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:217
+#: src/ibusunicodegen.h:221
 msgid "Tagbanwa"
 msgstr "タグバヌア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:221
+#: src/ibusunicodegen.h:225
 msgid "Khmer"
 msgstr "クメール文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:225
+#: src/ibusunicodegen.h:229
 msgid "Mongolian"
 msgstr "モンゴル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:229
+#: src/ibusunicodegen.h:233
 msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr "統合カナダ先住民音節拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:233
+#: src/ibusunicodegen.h:237
 msgid "Limbu"
 msgstr "リンブ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:237
+#: src/ibusunicodegen.h:241
 msgid "Tai Le"
 msgstr "タイ ロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:241
+#: src/ibusunicodegen.h:245
 msgid "New Tai Lue"
 msgstr "新タイ ロ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:245
+#: src/ibusunicodegen.h:249
 msgid "Khmer Symbols"
 msgstr "クメール文字用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:249
+#: src/ibusunicodegen.h:253
 msgid "Buginese"
 msgstr "ブギス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:253
+#: src/ibusunicodegen.h:257
 msgid "Tai Tham"
 msgstr "ラーンナー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:257
+#: src/ibusunicodegen.h:261
 msgid "Combining Diacritical Marks Extended"
 msgstr "ダイアクリティカルマーク (合成可能) 拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:261
+#: src/ibusunicodegen.h:265
 msgid "Balinese"
 msgstr "バリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:265
+#: src/ibusunicodegen.h:269
 msgid "Sundanese"
 msgstr "スンダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:269
+#: src/ibusunicodegen.h:273
 msgid "Batak"
 msgstr "バタク文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:273
+#: src/ibusunicodegen.h:277
 msgid "Lepcha"
 msgstr "レプチャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:277
+#: src/ibusunicodegen.h:281
 msgid "Ol Chiki"
 msgstr "オル・チキ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:281
+#: src/ibusunicodegen.h:285
 msgid "Cyrillic Extended-C"
 msgstr "キリール文字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:285
+#: src/ibusunicodegen.h:289
 msgid "Georgian Extended"
 msgstr "グルジア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:289
+#: src/ibusunicodegen.h:293
 msgid "Sundanese Supplement"
 msgstr "スンダ文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:293
+#: src/ibusunicodegen.h:297
 msgid "Vedic Extensions"
 msgstr "ヴェーダ文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:297
+#: src/ibusunicodegen.h:301
 msgid "Phonetic Extensions"
 msgstr "音声記号拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:301
+#: src/ibusunicodegen.h:305
 msgid "Phonetic Extensions Supplement"
 msgstr "音声記号拡張補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:305
+#: src/ibusunicodegen.h:309
 msgid "Combining Diacritical Marks Supplement"
 msgstr "ダイアクリティカルマーク (合成可能) 補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:309
+#: src/ibusunicodegen.h:313
 msgid "Latin Extended Additional"
 msgstr "ラテン文字拡張追加"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:313
+#: src/ibusunicodegen.h:317
 msgid "Greek Extended"
 msgstr "ギリシア文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:317
+#: src/ibusunicodegen.h:321
 msgid "General Punctuation"
 msgstr "一般句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:321
+#: src/ibusunicodegen.h:325
 msgid "Superscripts and Subscripts"
 msgstr "上付き・下付き"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:325
+#: src/ibusunicodegen.h:329
 msgid "Currency Symbols"
 msgstr "通貨記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:329
+#: src/ibusunicodegen.h:333
 msgid "Combining Diacritical Marks for Symbols"
 msgstr "記号用ダイアクリティカルマーク (合成可能)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:333
+#: src/ibusunicodegen.h:337
 msgid "Letterlike Symbols"
 msgstr "文字様記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:337
+#: src/ibusunicodegen.h:341
 msgid "Number Forms"
 msgstr "数字に準じるもの"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:341
+#: src/ibusunicodegen.h:345
 msgid "Arrows"
 msgstr "矢印"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:345
+#: src/ibusunicodegen.h:349
 msgid "Mathematical Operators"
 msgstr "数学記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:349
+#: src/ibusunicodegen.h:353
 msgid "Miscellaneous Technical"
 msgstr "その他の技術用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:353
+#: src/ibusunicodegen.h:357
 msgid "Control Pictures"
 msgstr "制御機能用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:357
+#: src/ibusunicodegen.h:361
 msgid "Optical Character Recognition"
 msgstr "光学的文字認識、OCR"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:361
+#: src/ibusunicodegen.h:365
 msgid "Enclosed Alphanumerics"
 msgstr "囲み英数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:365
+#: src/ibusunicodegen.h:369
 msgid "Box Drawing"
 msgstr "けい線素片"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:369
+#: src/ibusunicodegen.h:373
 msgid "Block Elements"
 msgstr "ブロック要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:373
+#: src/ibusunicodegen.h:377
 msgid "Geometric Shapes"
 msgstr "幾何学模様"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:377
+#: src/ibusunicodegen.h:381
 msgid "Miscellaneous Symbols"
 msgstr "その他の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:381
+#: src/ibusunicodegen.h:385
 msgid "Dingbats"
 msgstr "装飾記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:385
+#: src/ibusunicodegen.h:389
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "その他の数学記号 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:389
+#: src/ibusunicodegen.h:393
 msgid "Supplemental Arrows-A"
 msgstr "補助矢印 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:393
+#: src/ibusunicodegen.h:397
 msgid "Braille Patterns"
 msgstr "点字図形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:397
+#: src/ibusunicodegen.h:401
 msgid "Supplemental Arrows-B"
 msgstr "補助矢印 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:401
+#: src/ibusunicodegen.h:405
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "その他の数学記号 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:405
+#: src/ibusunicodegen.h:409
 msgid "Supplemental Mathematical Operators"
 msgstr "補助数学記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:409
+#: src/ibusunicodegen.h:413
 msgid "Miscellaneous Symbols and Arrows"
 msgstr "その他の記号及び矢印"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:413
+#: src/ibusunicodegen.h:417
 msgid "Glagolitic"
 msgstr "グラゴル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:417
+#: src/ibusunicodegen.h:421
 msgid "Latin Extended-C"
 msgstr "ラテン文字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:421
+#: src/ibusunicodegen.h:425
 msgid "Coptic"
 msgstr "コプト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:425
+#: src/ibusunicodegen.h:429
 msgid "Georgian Supplement"
 msgstr "グルジア文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:429
+#: src/ibusunicodegen.h:433
 msgid "Tifinagh"
 msgstr "ティフナグ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:433
+#: src/ibusunicodegen.h:437
 msgid "Ethiopic Extended"
 msgstr "エチオピア文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:437
+#: src/ibusunicodegen.h:441
 msgid "Cyrillic Extended-A"
 msgstr "キリール文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:441
+#: src/ibusunicodegen.h:445
 msgid "Supplemental Punctuation"
 msgstr "補助句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:445
+#: src/ibusunicodegen.h:449
 msgid "CJK Radicals Supplement"
 msgstr "CJK 部首補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:449
+#: src/ibusunicodegen.h:453
 msgid "Kangxi Radicals"
 msgstr "康熙部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:453
+#: src/ibusunicodegen.h:457
 msgid "Ideographic Description Characters"
 msgstr "漢字構成記述文字、IDC"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:457
+#: src/ibusunicodegen.h:461
 msgid "CJK Symbols and Punctuation"
 msgstr "CJK の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:461
+#: src/ibusunicodegen.h:465
 msgid "Hiragana"
 msgstr "平仮名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:465
+#: src/ibusunicodegen.h:469
 msgid "Katakana"
 msgstr "片仮名"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:469
+#: src/ibusunicodegen.h:473
 msgid "Bopomofo"
 msgstr "注音字母"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:473
+#: src/ibusunicodegen.h:477
 msgid "Hangul Compatibility Jamo"
 msgstr "ハングル互換字母"
 
@@ -1670,182 +1677,182 @@ msgstr "ハングル互換字母"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:477
+#: src/ibusunicodegen.h:481
 msgid "Kanbun"
 msgstr "漢文用記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:481
+#: src/ibusunicodegen.h:485
 msgid "Bopomofo Extended"
 msgstr "注音字母拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:485
+#: src/ibusunicodegen.h:489
 msgid "CJK Strokes"
 msgstr "CJK の筆画"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:489
+#: src/ibusunicodegen.h:493
 msgid "Katakana Phonetic Extensions"
 msgstr "片仮名拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:493
+#: src/ibusunicodegen.h:497
 msgid "Enclosed CJK Letters and Months"
 msgstr "囲み CJK 文字・月"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:497
+#: src/ibusunicodegen.h:501
 msgid "CJK Compatibility"
 msgstr "CJK 互換用文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:501
+#: src/ibusunicodegen.h:505
 msgid "CJK Unified Ideographs Extension A"
 msgstr "CJK 統合漢字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:505
+#: src/ibusunicodegen.h:509
 msgid "Yijing Hexagram Symbols"
 msgstr "易経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:509
+#: src/ibusunicodegen.h:513
 msgid "CJK Unified Ideographs"
 msgstr "CJK 統合漢字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:513
+#: src/ibusunicodegen.h:517
 msgid "Yi Syllables"
 msgstr "イ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:517
+#: src/ibusunicodegen.h:521
 msgid "Yi Radicals"
 msgstr "イ文字部首"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:521
+#: src/ibusunicodegen.h:525
 msgid "Lisu"
 msgstr "リス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:525
+#: src/ibusunicodegen.h:529
 msgid "Vai"
 msgstr "ヴァイ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:529
+#: src/ibusunicodegen.h:533
 msgid "Cyrillic Extended-B"
 msgstr "キリール文字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:533
+#: src/ibusunicodegen.h:537
 msgid "Bamum"
 msgstr "バムン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:537
+#: src/ibusunicodegen.h:541
 msgid "Modifier Tone Letters"
 msgstr "声調修飾文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:541
+#: src/ibusunicodegen.h:545
 msgid "Latin Extended-D"
 msgstr "ラテン文字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:545
+#: src/ibusunicodegen.h:549
 msgid "Syloti Nagri"
 msgstr "シロティナグリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:549
+#: src/ibusunicodegen.h:553
 msgid "Common Indic Number Forms"
 msgstr "共通インド数字に準じるもの"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:553
+#: src/ibusunicodegen.h:557
 msgid "Phags-pa"
 msgstr "パスパ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:557
+#: src/ibusunicodegen.h:561
 msgid "Saurashtra"
 msgstr "サウラーシュトラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:561
+#: src/ibusunicodegen.h:565
 msgid "Devanagari Extended"
 msgstr "デーヴァナーガリー文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:565
+#: src/ibusunicodegen.h:569
 msgid "Kayah Li"
 msgstr "カヤー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:569
+#: src/ibusunicodegen.h:573
 msgid "Rejang"
 msgstr "ルジャン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:573
+#: src/ibusunicodegen.h:577
 msgid "Hangul Jamo Extended-A"
 msgstr "ハングル字母拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:577
+#: src/ibusunicodegen.h:581
 msgid "Javanese"
 msgstr "ジャワ文字"
 
@@ -1853,77 +1860,77 @@ msgstr "ジャワ文字"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:581
+#: src/ibusunicodegen.h:585
 msgid "Myanmar Extended-B"
 msgstr "ミャンマー文字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:585
+#: src/ibusunicodegen.h:589
 msgid "Cham"
 msgstr "チャム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:589
+#: src/ibusunicodegen.h:593
 msgid "Myanmar Extended-A"
 msgstr "ミャンマー文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:593
+#: src/ibusunicodegen.h:597
 msgid "Tai Viet"
 msgstr "タイ・ヴェト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:597
+#: src/ibusunicodegen.h:601
 msgid "Meetei Mayek Extensions"
 msgstr "マニプリ文字拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:601
+#: src/ibusunicodegen.h:605
 msgid "Ethiopic Extended-A"
 msgstr "エチオピア文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:605
+#: src/ibusunicodegen.h:609
 msgid "Latin Extended-E"
 msgstr "ラテン文字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:609
+#: src/ibusunicodegen.h:613
 msgid "Cherokee Supplement"
 msgstr "チェロキー文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:613
+#: src/ibusunicodegen.h:617
 msgid "Meetei Mayek"
 msgstr "マニプリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:617
+#: src/ibusunicodegen.h:621
 msgid "Hangul Syllables"
 msgstr "ハングル音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:621
+#: src/ibusunicodegen.h:625
 msgid "Hangul Jamo Extended-B"
 msgstr "ハングル字母拡張 B"
 
@@ -1931,1120 +1938,1198 @@ msgstr "ハングル字母拡張 B"
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:625
+#: src/ibusunicodegen.h:629
 msgid "High Surrogates"
 msgstr "上位代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:629
+#: src/ibusunicodegen.h:633
 msgid "High Private Use Surrogates"
 msgstr "上位私用代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:633
+#: src/ibusunicodegen.h:637
 msgid "Low Surrogates"
 msgstr "下位代用符号位置"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:637
+#: src/ibusunicodegen.h:641
 msgid "Private Use Area"
 msgstr "私用領域"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:641
+#: src/ibusunicodegen.h:645
 msgid "CJK Compatibility Ideographs"
 msgstr "CJK 互換漢字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:645
+#: src/ibusunicodegen.h:649
 msgid "Alphabetic Presentation Forms"
 msgstr "アルファベット表示形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:649
+#: src/ibusunicodegen.h:653
 msgid "Arabic Presentation Forms-A"
 msgstr "アラビア表示形 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:653
+#: src/ibusunicodegen.h:657
 msgid "Variation Selectors"
 msgstr "字形選択子"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:657
+#: src/ibusunicodegen.h:661
 msgid "Vertical Forms"
 msgstr "縦書き形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:661
+#: src/ibusunicodegen.h:665
 msgid "Combining Half Marks"
 msgstr "半記号 (合成可能)"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:665
+#: src/ibusunicodegen.h:669
 msgid "CJK Compatibility Forms"
 msgstr "CJK 互換形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:669
+#: src/ibusunicodegen.h:673
 msgid "Small Form Variants"
 msgstr "小字形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:673
+#: src/ibusunicodegen.h:677
 msgid "Arabic Presentation Forms-B"
 msgstr "アラビア表示形 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:677
+#: src/ibusunicodegen.h:681
 msgid "Halfwidth and Fullwidth Forms"
 msgstr "半角・全角形"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:681
+#: src/ibusunicodegen.h:685
 msgid "Specials"
 msgstr "特殊用途文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:685
+#: src/ibusunicodegen.h:689
 msgid "Linear B Syllabary"
 msgstr "線文字 B 音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:689
+#: src/ibusunicodegen.h:693
 msgid "Linear B Ideograms"
 msgstr "線文字 B 表意文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:693
+#: src/ibusunicodegen.h:697
 msgid "Aegean Numbers"
 msgstr "エーゲ数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:697
+#: src/ibusunicodegen.h:701
 msgid "Ancient Greek Numbers"
 msgstr "古代ギリシア数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:701
+#: src/ibusunicodegen.h:705
 msgid "Ancient Symbols"
 msgstr "古代記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:705
+#: src/ibusunicodegen.h:709
 msgid "Phaistos Disc"
 msgstr "ファイストスの円盤の文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:709
+#: src/ibusunicodegen.h:713
 msgid "Lycian"
 msgstr "リキア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:713
+#: src/ibusunicodegen.h:717
 msgid "Carian"
 msgstr "カリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:717
+#: src/ibusunicodegen.h:721
 msgid "Coptic Epact Numbers"
 msgstr "コプト・エパクト数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:721
+#: src/ibusunicodegen.h:725
 msgid "Old Italic"
 msgstr "古代イタリア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:725
+#: src/ibusunicodegen.h:729
 msgid "Gothic"
 msgstr "ゴート文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:729
+#: src/ibusunicodegen.h:733
 msgid "Old Permic"
 msgstr "古代ペルム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:733
+#: src/ibusunicodegen.h:737
 msgid "Ugaritic"
 msgstr "ウガリト文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:737
+#: src/ibusunicodegen.h:741
 msgid "Old Persian"
 msgstr "古代ペルシャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:741
+#: src/ibusunicodegen.h:745
 msgid "Deseret"
 msgstr "デザレット文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:745
+#: src/ibusunicodegen.h:749
 msgid "Shavian"
 msgstr "シェイヴィアン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:749
+#: src/ibusunicodegen.h:753
 msgid "Osmanya"
 msgstr "オスマニア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:753
+#: src/ibusunicodegen.h:757
 msgid "Osage"
 msgstr "オセージ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:757
+#: src/ibusunicodegen.h:761
 msgid "Elbasan"
 msgstr "エルバサン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:761
+#: src/ibusunicodegen.h:765
 msgid "Caucasian Albanian"
 msgstr "カフカース・アルバニア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:765
+#: src/ibusunicodegen.h:769
+msgid "Vithkuqi"
+msgstr "ビタクチェ文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:773
 msgid "Linear A"
 msgstr "線文字 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:769
+#: src/ibusunicodegen.h:777
+msgid "Latin Extended-F"
+msgstr "ラテン文字拡張 F"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:781
 msgid "Cypriot Syllabary"
 msgstr "キプロス音節文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:773
+#: src/ibusunicodegen.h:785
 msgid "Imperial Aramaic"
 msgstr "アラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:777
+#: src/ibusunicodegen.h:789
 msgid "Palmyrene"
 msgstr "パラミラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:781
+#: src/ibusunicodegen.h:793
 msgid "Nabataean"
 msgstr "ナバテア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:785
+#: src/ibusunicodegen.h:797
 msgid "Hatran"
 msgstr "ハトラ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:789
+#: src/ibusunicodegen.h:801
 msgid "Phoenician"
 msgstr "フェニキア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:793
+#: src/ibusunicodegen.h:805
 msgid "Lydian"
 msgstr "リディア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:797
+#: src/ibusunicodegen.h:809
 msgid "Meroitic Hieroglyphs"
 msgstr "メロエ記念碑文体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:801
+#: src/ibusunicodegen.h:813
 msgid "Meroitic Cursive"
 msgstr "メロエ草書体"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:805
+#: src/ibusunicodegen.h:817
 msgid "Kharoshthi"
 msgstr "カローシュティー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:809
+#: src/ibusunicodegen.h:821
 msgid "Old South Arabian"
 msgstr "古典南アラビア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:813
+#: src/ibusunicodegen.h:825
 msgid "Old North Arabian"
 msgstr "古典北アラビア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:817
+#: src/ibusunicodegen.h:829
 msgid "Manichaean"
 msgstr "マニ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:821
+#: src/ibusunicodegen.h:833
 msgid "Avestan"
 msgstr "アヴェスター文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:825
+#: src/ibusunicodegen.h:837
 msgid "Inscriptional Parthian"
 msgstr "碑文パルティア文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:829
+#: src/ibusunicodegen.h:841
 msgid "Inscriptional Pahlavi"
 msgstr "碑文パフラヴィー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:833
+#: src/ibusunicodegen.h:845
 msgid "Psalter Pahlavi"
 msgstr "聖詠パフラヴィー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:837
+#: src/ibusunicodegen.h:849
 msgid "Old Turkic"
 msgstr "古テュルク文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:841
+#: src/ibusunicodegen.h:853
 msgid "Old Hungarian"
 msgstr "ロヴァーシュ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:845
+#: src/ibusunicodegen.h:857
 msgid "Hanifi Rohingya"
 msgstr "ハニーフィー・ロヒンギャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:849
+#: src/ibusunicodegen.h:861
 msgid "Rumi Numeral Symbols"
 msgstr "ルーミー数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:853
+#: src/ibusunicodegen.h:865
 msgid "Yezidi"
 msgstr "ヤズィーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:857
+#: src/ibusunicodegen.h:869
 msgid "Old Sogdian"
 msgstr "旧ソグド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:861
+#: src/ibusunicodegen.h:873
 msgid "Sogdian"
 msgstr "ソグド文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:865
+#: src/ibusunicodegen.h:877
+msgid "Old Uyghur"
+msgstr "古ウイグル文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:881
 msgid "Chorasmian"
 msgstr "ホラズム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:869
+#: src/ibusunicodegen.h:885
 msgid "Elymaic"
 msgstr "エリマイス文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:873
+#: src/ibusunicodegen.h:889
 msgid "Brahmi"
 msgstr "ブラーフミー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:877
+#: src/ibusunicodegen.h:893
 msgid "Kaithi"
 msgstr "カイティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:881
+#: src/ibusunicodegen.h:897
 msgid "Sora Sompeng"
 msgstr "ソラ・ソンペン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:885
+#: src/ibusunicodegen.h:901
 msgid "Chakma"
 msgstr "チャクマ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:889
+#: src/ibusunicodegen.h:905
 msgid "Mahajani"
 msgstr "マハージャニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:893
+#: src/ibusunicodegen.h:909
 msgid "Sharada"
 msgstr "シャラダ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:897
+#: src/ibusunicodegen.h:913
 msgid "Sinhala Archaic Numbers"
 msgstr "シンハラ旧数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:901
+#: src/ibusunicodegen.h:917
 msgid "Khojki"
 msgstr "ホジャ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:905
+#: src/ibusunicodegen.h:921
 msgid "Multani"
 msgstr "ムルターニー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:909
+#: src/ibusunicodegen.h:925
 msgid "Khudawadi"
 msgstr "フダーワーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:913
+#: src/ibusunicodegen.h:929
 msgid "Grantha"
 msgstr "グランタ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:917
+#: src/ibusunicodegen.h:933
 msgid "Newa"
 msgstr "ネワ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:921
+#: src/ibusunicodegen.h:937
 msgid "Tirhuta"
 msgstr "ティルフータ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:925
+#: src/ibusunicodegen.h:941
 msgid "Siddham"
 msgstr "悉曇文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:929
+#: src/ibusunicodegen.h:945
 msgid "Modi"
 msgstr "モーディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:933
+#: src/ibusunicodegen.h:949
 msgid "Mongolian Supplement"
 msgstr "モンゴル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:937
+#: src/ibusunicodegen.h:953
 msgid "Takri"
 msgstr "タクリ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:941
+#: src/ibusunicodegen.h:957
 msgid "Ahom"
 msgstr "アーホム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:945
+#: src/ibusunicodegen.h:961
 msgid "Dogra"
 msgstr "ドーグリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:949
+#: src/ibusunicodegen.h:965
 msgid "Warang Citi"
 msgstr "ワラング・クシティ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:953
+#: src/ibusunicodegen.h:969
 msgid "Dives Akuru"
 msgstr "ディヴェ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:957
+#: src/ibusunicodegen.h:973
 msgid "Nandinagari"
 msgstr "ナンディナーガリー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:961
+#: src/ibusunicodegen.h:977
 msgid "Zanabazar Square"
 msgstr "ザナバザル方形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:965
+#: src/ibusunicodegen.h:981
 msgid "Soyombo"
 msgstr "ソヨンボ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:969
+#: src/ibusunicodegen.h:985
+msgid "Unified Canadian Aboriginal Syllabics Extended-A"
+msgstr "統合カナダ先住民音節拡張 A"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:989
 msgid "Pau Cin Hau"
 msgstr "パウ・チン・ハウ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:973
+#: src/ibusunicodegen.h:993
 msgid "Bhaiksuki"
 msgstr "バイクシュキー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:977
+#: src/ibusunicodegen.h:997
 msgid "Marchen"
 msgstr "マルチェン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:981
+#: src/ibusunicodegen.h:1001
 msgid "Masaram Gondi"
 msgstr "マサラム・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:985
+#: src/ibusunicodegen.h:1005
 msgid "Gunjala Gondi"
 msgstr "グンジャラ・ゴーンディー文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:989
+#: src/ibusunicodegen.h:1009
 msgid "Makasar"
 msgstr "マカサル文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:993
+#: src/ibusunicodegen.h:1013
 msgid "Lisu Supplement"
 msgstr "リス文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:997
+#: src/ibusunicodegen.h:1017
 msgid "Tamil Supplement"
 msgstr "タミル文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1001
+#: src/ibusunicodegen.h:1021
 msgid "Cuneiform"
 msgstr "くさび形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1005
+#: src/ibusunicodegen.h:1025
 msgid "Cuneiform Numbers and Punctuation"
 msgstr "くさび形文字の数字及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1009
+#: src/ibusunicodegen.h:1029
 msgid "Early Dynastic Cuneiform"
 msgstr "シュメール楔形文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1013
+#: src/ibusunicodegen.h:1033
+msgid "Cypro-Minoan"
+msgstr "キュプロ・ミノア文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1037
 msgid "Egyptian Hieroglyphs"
 msgstr "ヒエログリフ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1017
+#: src/ibusunicodegen.h:1041
 msgid "Egyptian Hieroglyph Format Controls"
 msgstr "ヒエログリフ文字書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1021
+#: src/ibusunicodegen.h:1045
 msgid "Anatolian Hieroglyphs"
 msgstr "アナトリア・ヒエログリフ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1025
+#: src/ibusunicodegen.h:1049
 msgid "Bamum Supplement"
 msgstr "バムン文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1029
+#: src/ibusunicodegen.h:1053
 msgid "Mro"
 msgstr "ムロ文字"
 
+#  タングサ文字 or タンサ文字 in インド
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1033
+#: src/ibusunicodegen.h:1057
+msgid "Tangsa"
+msgstr ""
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1061
 msgid "Bassa Vah"
 msgstr "バサ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1037
+#: src/ibusunicodegen.h:1065
 msgid "Pahawh Hmong"
 msgstr "パハウ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1041
+#: src/ibusunicodegen.h:1069
 msgid "Medefaidrin"
 msgstr "メデファイドリン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1045
+#: src/ibusunicodegen.h:1073
 msgid "Miao"
 msgstr "ポラード文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1049
+#: src/ibusunicodegen.h:1077
 msgid "Ideographic Symbols and Punctuation"
 msgstr "漢字の記号及び句読点"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1053
+#: src/ibusunicodegen.h:1081
 msgid "Tangut"
 msgstr "西夏文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1057
+#: src/ibusunicodegen.h:1085
 msgid "Tangut Components"
 msgstr "西南文字の構成要素"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1061
+#: src/ibusunicodegen.h:1089
 msgid "Khitan Small Script"
 msgstr "契丹小さなスクリプト"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1065
+#: src/ibusunicodegen.h:1093
 msgid "Tangut Supplement"
 msgstr "西夏文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1069
+#: src/ibusunicodegen.h:1097
+msgid "Kana Extended-B"
+msgstr "仮名文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1101
 msgid "Kana Supplement"
 msgstr "仮名文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1073
+#: src/ibusunicodegen.h:1105
 msgid "Kana Extended-A"
 msgstr "仮名文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1077
+#: src/ibusunicodegen.h:1109
 msgid "Small Kana Extension"
 msgstr "小書き仮名拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1081
+#: src/ibusunicodegen.h:1113
 msgid "Nushu"
 msgstr "女書"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1085
+#: src/ibusunicodegen.h:1117
 msgid "Duployan"
 msgstr "デュプロワイエ式速記"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1089
+#: src/ibusunicodegen.h:1121
 msgid "Shorthand Format Controls"
 msgstr "速記書式制御記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1093
+#: src/ibusunicodegen.h:1125
+msgid "Znamenny Musical Notation"
+msgstr "ズナメニ聖歌記譜法"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1129
 msgid "Byzantine Musical Symbols"
 msgstr "ビザンチン音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1097
+#: src/ibusunicodegen.h:1133
 msgid "Musical Symbols"
 msgstr "音楽記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1101
+#: src/ibusunicodegen.h:1137
 msgid "Ancient Greek Musical Notation"
-msgstr "古代ギリシア音符記号"
+msgstr "古代ギリシア記譜法"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1105
+#: src/ibusunicodegen.h:1141
 msgid "Mayan Numerals"
 msgstr "マヤ数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1109
+#: src/ibusunicodegen.h:1145
 msgid "Tai Xuan Jing Symbols"
 msgstr "太玄経記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1113
+#: src/ibusunicodegen.h:1149
 msgid "Counting Rod Numerals"
 msgstr "算木用数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1117
+#: src/ibusunicodegen.h:1153
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1121
+#: src/ibusunicodegen.h:1157
 msgid "Sutton SignWriting"
 msgstr "サットン手話表記法"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1125
+#: src/ibusunicodegen.h:1161
+msgid "Latin Extended-G"
+msgstr "ラテン文字拡張 G"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1165
 msgid "Glagolitic Supplement"
 msgstr "グラゴル文文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1129
+#: src/ibusunicodegen.h:1169
 msgid "Nyiakeng Puachue Hmong"
 msgstr "ニアケン・プアチェ・フモン文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1133
+#: src/ibusunicodegen.h:1173
+msgid "Toto"
+msgstr "トト文字"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1177
 msgid "Wancho"
 msgstr "ワンチョ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1137
+#: src/ibusunicodegen.h:1181
+msgid "Ethiopic Extended-B"
+msgstr "エチオピア文字拡張 B"
+
+#. TRANSLATORS: You might refer the translations from gucharmap with
+#. the following command:
+#. msgmerge -C gucharmap.po ibus.po ibus.pot
+#: src/ibusunicodegen.h:1185
 msgid "Mende Kikakui"
 msgstr "メンデ文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1141
+#: src/ibusunicodegen.h:1189
 msgid "Adlam"
 msgstr "アドラム文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1145
+#: src/ibusunicodegen.h:1193
 msgid "Indic Siyaq Numbers"
 msgstr "インド・シヤク数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1149
+#: src/ibusunicodegen.h:1197
 msgid "Ottoman Siyaq Numbers"
 msgstr "オスマン・シヤク数字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1153
+#: src/ibusunicodegen.h:1201
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "アラビア数学用英数字記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1157
+#: src/ibusunicodegen.h:1205
 msgid "Mahjong Tiles"
 msgstr "麻雀牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1161
+#: src/ibusunicodegen.h:1209
 msgid "Domino Tiles"
 msgstr "ドミノ牌"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1165
+#: src/ibusunicodegen.h:1213
 msgid "Playing Cards"
 msgstr "トランプ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1169
+#: src/ibusunicodegen.h:1217
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "囲み英数字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1173
+#: src/ibusunicodegen.h:1221
 msgid "Enclosed Ideographic Supplement"
 msgstr "囲み表意文字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1177
+#: src/ibusunicodegen.h:1225
 msgid "Miscellaneous Symbols and Pictographs"
 msgstr "その他の記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1181
+#: src/ibusunicodegen.h:1229
 msgid "Emoticons"
 msgstr "顔文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1185
+#: src/ibusunicodegen.h:1233
 msgid "Ornamental Dingbats"
 msgstr "オーナメント"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1189
+#: src/ibusunicodegen.h:1237
 msgid "Transport and Map Symbols"
 msgstr "交通と地図の記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1193
+#: src/ibusunicodegen.h:1241
 msgid "Alchemical Symbols"
 msgstr "錬金術記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1197
+#: src/ibusunicodegen.h:1245
 msgid "Geometric Shapes Extended"
 msgstr "幾何学模様拡張"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1201
+#: src/ibusunicodegen.h:1249
 msgid "Supplemental Arrows-C"
 msgstr "補助矢印 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1205
+#: src/ibusunicodegen.h:1253
 msgid "Supplemental Symbols and Pictographs"
 msgstr "補助記号と絵文字"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1209
+#: src/ibusunicodegen.h:1257
 msgid "Chess Symbols"
 msgstr "チェス記号"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1213
+#: src/ibusunicodegen.h:1261
 msgid "Symbols and Pictographs Extended-A"
 msgstr "記号と絵文字拡張 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1217
+#: src/ibusunicodegen.h:1265
 msgid "Symbols for Legacy Computing"
 msgstr "レガシーコンピューティングのシンボル"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1221
+#: src/ibusunicodegen.h:1269
 msgid "CJK Unified Ideographs Extension B"
 msgstr "CJK 統合漢字拡張 B"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1225
+#: src/ibusunicodegen.h:1273
 msgid "CJK Unified Ideographs Extension C"
 msgstr "CJK 統合漢字拡張 C"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1229
+#: src/ibusunicodegen.h:1277
 msgid "CJK Unified Ideographs Extension D"
 msgstr "CJK 統合漢字拡張 D"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1233
+#: src/ibusunicodegen.h:1281
 msgid "CJK Unified Ideographs Extension E"
 msgstr "CJK 統合漢字拡張 E"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1237
+#: src/ibusunicodegen.h:1285
 msgid "CJK Unified Ideographs Extension F"
 msgstr "CJK 統合漢字拡張 F"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1241
+#: src/ibusunicodegen.h:1289
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "CJK 互換漢字補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1245
+#: src/ibusunicodegen.h:1293
 msgid "CJK Unified Ideographs Extension G"
 msgstr "CJK 統合漢字拡張 G"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1249
+#: src/ibusunicodegen.h:1297
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1253
+#: src/ibusunicodegen.h:1301
 msgid "Variation Selectors Supplement"
 msgstr "字形選択子補助"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1257
+#: src/ibusunicodegen.h:1305
 msgid "Supplementary Private Use Area-A"
 msgstr "補助私用領域 A"
 
 #. TRANSLATORS: You might refer the translations from gucharmap with
 #. the following command:
 #. msgmerge -C gucharmap.po ibus.po ibus.pot
-#: src/ibusunicodegen.h:1261
+#: src/ibusunicodegen.h:1309
 msgid "Supplementary Private Use Area-B"
 msgstr "補助私用領域 B"
 
@@ -3179,93 +3264,93 @@ msgstr "コマンド:\n"
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ui/gtk3/emojier.vala:233
+#: ui/gtk3/emojier.vala:235
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ui/gtk3/emojier.vala:234
+#: ui/gtk3/emojier.vala:236
 msgid "Others"
 msgstr "その他"
 
-#: ui/gtk3/emojier.vala:235
+#: ui/gtk3/emojier.vala:237
 msgid "Open Unicode choice"
 msgstr "Unicode の選択を開く"
 
-#: ui/gtk3/emojier.vala:995
+#: ui/gtk3/emojier.vala:1000
 msgid "Bring back emoji choice"
 msgstr "絵文字の選択に戻る"
 
-#: ui/gtk3/emojier.vala:1097
+#: ui/gtk3/emojier.vala:1103
 msgid "Page Down"
 msgstr "ページをめくる"
 
-#: ui/gtk3/emojier.vala:1108
+#: ui/gtk3/emojier.vala:1114
 msgid "Page Up"
 msgstr "ページを戻す"
 
-#: ui/gtk3/emojier.vala:1111
+#: ui/gtk3/emojier.vala:1117
 msgid "Show emoji variants"
 msgstr "絵文字異形を表示する"
 
-#: ui/gtk3/emojier.vala:1112
+#: ui/gtk3/emojier.vala:1118
 msgid "Close"
 msgstr "閉じる"
 
-#: ui/gtk3/emojier.vala:1118
+#: ui/gtk3/emojier.vala:1124
 msgid "Menu"
 msgstr "メニュー"
 
-#: ui/gtk3/emojier.vala:1129
+#: ui/gtk3/emojier.vala:1135
 msgid "Click to view a warning message"
 msgstr "警告メッセージを閲覧するためにクリックしてください"
 
-#: ui/gtk3/emojier.vala:1173
+#: ui/gtk3/emojier.vala:1179
 msgid "Loading a Unicode dictionary:"
 msgstr "Unicode の辞書を読み込んでいます:"
 
-#: ui/gtk3/emojier.vala:1419
+#: ui/gtk3/emojier.vala:1425
 #, c-format
 msgid "Code point: %s"
 msgstr "コードポイント: %s"
 
-#: ui/gtk3/emojier.vala:1425
+#: ui/gtk3/emojier.vala:1431
 msgid "Has emoji variants"
 msgstr "絵文字異形あり"
 
-#: ui/gtk3/emojier.vala:1592 ui/gtk3/emojier.vala:1605
+#: ui/gtk3/emojier.vala:1599 ui/gtk3/emojier.vala:1612
 #, c-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ui/gtk3/emojier.vala:1592
+#: ui/gtk3/emojier.vala:1599
 msgid "None"
 msgstr "なし"
 
-#: ui/gtk3/emojier.vala:1616
+#: ui/gtk3/emojier.vala:1623
 #, c-format
 msgid "Annotations: %s"
 msgstr "ルビ: %s"
 
-#: ui/gtk3/emojier.vala:1642
+#: ui/gtk3/emojier.vala:1649
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: ui/gtk3/emojier.vala:1650
+#: ui/gtk3/emojier.vala:1657
 #, c-format
 msgid "Alias: %s"
 msgstr "別名: %s"
 
-#: ui/gtk3/emojier.vala:2140 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1169
+#: ui/gtk3/emojier.vala:2180 ui/gtk3/ibus-extension-gtk3.desktop.in:3
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1244
 msgid "Emoji Choice"
 msgstr "絵文字の選択"
 
-#: ui/gtk3/emojier.vala:2142
+#: ui/gtk3/emojier.vala:2182
 msgid "Unicode Choice"
 msgstr "Unicode の選択"
 
-#: ui/gtk3/emojier.vala:2432
+#: ui/gtk3/emojier.vala:2485
 msgid ""
 "Failed to get the current text application. Please re-focus your "
 "application. E.g. Press Esc key several times to release the emoji typing "
@@ -3318,39 +3403,51 @@ msgstr "指定した数字をもつ長さで一致させる"
 msgid "Match with the condition of the specified integer"
 msgstr "指定した数字の条件で一致させる"
 
-#: ui/gtk3/panel.vala:292 ui/gtk3/panel.vala:323
+#: ui/gtk3/panel.vala:320 ui/gtk3/panel.vala:351
 msgid "IBus Panel"
 msgstr "IBus パネル"
 
-#: ui/gtk3/panel.vala:975
+#: ui/gtk3/panel.vala:756
+msgid "IBus Notification"
+msgstr "IBus 通知"
+
+#: ui/gtk3/panel.vala:757 ui/gtk3/panel.vala:766 ui/gtk3/panel.vala:770
+msgid ""
+"Keymap changes do not work in Plasma Wayland at present. Please use "
+"systemsettings5 instead."
+msgstr ""
+"キーマップ変更は現在、Plasma Wayland で動作しません。代わりに "
+"systemsettings5 を使って下さい。"
+
+#: ui/gtk3/panel.vala:1045
 #, c-format
 msgid ""
 "Your configured input method %s does not exist in IBus input methods so \"US"
 "\" layout was configured instead of your input method."
 msgstr ""
-"構成された入力メソッド %s は IBus 入力メソッドに存在しないので、"
-"\"US\" レイアウトがあなたの入力メソッドの代わりに構成されました。"
+"構成された入力メソッド %s は IBus 入力メソッドに存在しないので、\"US\" レイア"
+"ウトがあなたの入力メソッドの代わりに構成されました。"
 
-#: ui/gtk3/panel.vala:980
+#: ui/gtk3/panel.vala:1050
 msgid ""
 "At least one of your configured input methods does not exist in IBus input "
 "methods."
 msgstr ""
 "構成された入力メソッドの少なくとも１つが IBus 入力メソッドに存在しません。"
 
-#: ui/gtk3/panel.vala:983
+#: ui/gtk3/panel.vala:1053
 msgid ""
 "Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
 "your input methods again."
 msgstr ""
-"`ibus-setup` をコマンドを実行して、\"入力メソッド\" タブを開いて、"
-"入力メソッドを再度構成してください。"
+"`ibus-setup` をコマンドを実行して、\"入力メソッド\" タブを開いて、入力メソッ"
+"ドを再度構成してください。"
 
-#: ui/gtk3/panel.vala:1141
+#: ui/gtk3/panel.vala:1216
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ui/gtk3/panel.vala:1145
+#: ui/gtk3/panel.vala:1220
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -3358,15 +3455,15 @@ msgstr ""
 "日向原 龍一 <hyu_gabaru@yahoo.co.jp>\n"
 "MIZUMOTO, Noriko <noriko@fedoraproject.org>"
 
-#: ui/gtk3/panel.vala:1164
+#: ui/gtk3/panel.vala:1239
 msgid "Preferences"
 msgstr "設定"
 
-#: ui/gtk3/panel.vala:1190
+#: ui/gtk3/panel.vala:1265
 msgid "Restart"
 msgstr "再起動"
 
-#: ui/gtk3/panel.vala:1194
+#: ui/gtk3/panel.vala:1269
 msgid "Quit"
 msgstr "終了"
 

From 47303a6f85a7d2601929bd3c87196d27243d2dd7 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 May 2022 20:54:54 +0900
Subject: [PATCH 806/816] src/tests: Run ibus-daemon from CI even if GNOME
 desktop

gnome-shell no longer launch ibus-daemon because gnome-session
launches ibus-daemon with IBus systemd file.
This is a workaround to call ibus-daemon after GNOME fails to
launch ibus-daemon since CI does not use graphical-session.target
systemd service.

BUG=https://gitlab.gnome.org/GNOME/gdm/-/issues/777
---
 src/tests/ibus-desktop-testing-runner.in | 38 +++++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 48528326b..6b2083459 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -55,6 +55,7 @@ GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0m'
 
+
 print_log()
 {
     if [ x"$RESULT_LOG" != x ] ; then
@@ -69,6 +70,7 @@ print_log()
     fi
 }
 
+
 usage()
 {
     $ECHO -e \
@@ -95,6 +97,7 @@ usage()
 ""
 }
 
+
 parse_args()
 {
     # This is GNU getopt. "sudo port getopt" in BSD?
@@ -129,6 +132,7 @@ parse_args()
     fi
 }
 
+
 init_desktop()
 {
     if [ "$RESULT_LOG" != "" ] ; then
@@ -207,6 +211,7 @@ _EOF
     #export XDG_SEAT=seat0
 }
 
+
 run_dbus_daemon()
 {
     # Use dbus-launch --exit-with-session later instead of --sh-syntax
@@ -216,6 +221,7 @@ run_dbus_daemon()
     export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
 }
 
+
 init_gnome()
 {
     # gsettings set command needs dconf-service with the same $DISPLAY
@@ -258,6 +264,7 @@ init_gnome()
     fi
 }
 
+
 run_desktop()
 {
     echo "$DESKTOP_COMMAND" | grep gnome-session > /dev/null
@@ -278,12 +285,28 @@ run_desktop()
     $DESKTOP_COMMAND &
     PID_GNOME_SESSION=$!
     sleep 30
-    if [  $HAS_GNOME -ne 0 ] ; then
-        ibus-daemon --daemonize --verbose
-        sleep 3
-    fi
+
+    # gnome-shell 42 checks if org.freedesktop.IBus.session.GNOME.service
+    # systemd file is available with org.freedesktop.systemd1.Manager.GetUnit
+    # D-Bus method, which is provided by IBus 1.5.26, and if the file
+    # is available, gnome-shell no longer launch ibus-daemon
+    # because gnome-shell assumes gnome-session would launch ibus-daemon
+    # with org.freedesktop.systemd1.Manager.StartUnit D-Bus method.
+    # But actually gnome-session failed to launch ibus-daemon
+    # because the IBus systemd file depends on gnome-session.target
+    # but this CI launches gnome-session directly.
+    #
+    # So ibus-dameon is now always called here after gnome-shell fails to
+    # launch ibus-daemon.
+    # It may be better this CI launches GDM autologin to run gnome-session
+    # with gnome-session.target systemd file.
+    # But `systemctl start gdm` terminates the parent script forcibly
+    # and the script cannot get the CI result.
+    ibus-daemon --daemonize --verbose
+    sleep 3
 }
 
+
 count_case_result()
 {
     retval=$1
@@ -298,6 +321,7 @@ count_case_result()
     echo $pass $fail
 }
 
+
 echo_case_result()
 {
     retval=$1
@@ -311,6 +335,7 @@ echo_case_result()
     fi
 }
 
+
 run_direct_test_cases()
 {
     pass=0
@@ -363,6 +388,7 @@ EOF_ENVS
     echo $pass $fail
 }
 
+
 run_gnome_desktop_testing_runner()
 {
     pass=0
@@ -397,6 +423,7 @@ EOF
     echo $pass $fail
 }
 
+
 run_test_suite()
 {
     pass=0
@@ -435,6 +462,7 @@ EOF_RUNNER
     fi
 }
 
+
 finit()
 {
     echo "# Killing left gnome-session and Xorg"
@@ -451,6 +479,7 @@ finit()
     echo "# Finished $PROGNAME testing"
 }
 
+
 main()
 {
     parse_args "$@"
@@ -470,5 +499,6 @@ main()
     finit
 }
 
+
 # Need to enclose $@ with double quotes not to split the array.
 main "$@"

From 8711dc83225a7fade3ba67ab796ecb03b38406ff Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 May 2022 20:54:58 +0900
Subject: [PATCH 807/816] client/gtk2/ibusimcontext: keycode - 8 for gtk3
 keycode generation

Since IBus keycode subtracts 8 from Linux keycode, keycodes from
gdk_keymap_get_entries_for_keyval() also have to be subtracted 8.
The keycodes will add 8 when they bring back the GDK event loop.
---
 client/gtk2/ibusimcontext.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index a5e5e7923..07835a245 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
- * Copyright (C) 2008-2021 Red Hat, Inc.
+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2008-2022 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
@@ -1980,6 +1980,9 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibuscontext,
             keycode = keys->keycode;
         else
             g_warning ("Failed to parse keycode from keyval %x", keyval);
+        /* _create_gdk_event() will add 8 to keycode. */
+        if (keycode != 0)
+            keycode -= 8;
     }
     GdkEventKey *event = _create_gdk_event (ibusimcontext, keyval, keycode, state);
     gdk_event_put ((GdkEvent *)event);

From 3e5fab4991f4e2e22b56cf57d4dfb779a1d1977c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 20 May 2022 20:54:59 +0900
Subject: [PATCH 808/816] client/gtk2: Revert CCedilla change for pt-BR

gtk_im_context_simple_add_table() is deprecated in GTK4.
I decide to delete gtk_im_context_simple_add_table() here because
the change 03c9e591430c62354bbf26ef7bd4a2e6acfb7c8f is no longer needed
because IBusEngineSimple has implemented to load pt_br compose key
by locale.

Fixes: 03c9e591430c62354bbf26ef7bd4a2e6acfb7c8f

BUG=chromium-os:11421
BUG=http://codereview.appspot.com/3989060
---
 client/gtk2/ibusimcontext.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 07835a245..c7f232936 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -874,33 +874,6 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
     g_bus_unwatch_name (_daemon_name_watch_id);
 }
 
-/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
- * Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */
-
-/* The difference between this and the default input method is the handling
- * of C+acute - this method produces C WITH CEDILLA rather than C WITH ACUTE.
- * For languages that use CCedilla and not acute, this is the preferred mapping,
- * and is particularly important for pt_BR, where the us-intl keyboard is
- * used extensively.
- */
-static guint16 cedilla_compose_seqs[] = {
-#ifdef DEPRECATED_GDK_KEYSYMS
-  GDK_dead_acute,	GDK_C,	0,	0,	0,	0x00C7,	/* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_dead_acute,	GDK_c,	0,	0,	0,	0x00E7,	/* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  GDK_Multi_key,	GDK_apostrophe,	GDK_C,  0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_Multi_key,	GDK_apostrophe,	GDK_c,  0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  GDK_Multi_key,	GDK_C,  GDK_apostrophe,	0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_Multi_key,	GDK_c,  GDK_apostrophe,	0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-#else
-  GDK_KEY_dead_acute,	GDK_KEY_C,	0,	0,	0,	0x00C7,	/* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_KEY_dead_acute,	GDK_KEY_c,	0,	0,	0,	0x00E7,	/* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  GDK_KEY_Multi_key,	GDK_KEY_apostrophe,	GDK_KEY_C,  0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_KEY_Multi_key,	GDK_KEY_apostrophe,	GDK_KEY_c,  0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  GDK_KEY_Multi_key,	GDK_KEY_C,  GDK_KEY_apostrophe,	0,      0,      0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  GDK_KEY_Multi_key,	GDK_KEY_c,  GDK_KEY_apostrophe,	0,      0,      0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-#endif
-};
-
 static void
 ibus_im_context_init (GObject *obj)
 {
@@ -936,10 +909,6 @@ ibus_im_context_init (GObject *obj)
 
     // Create slave im context
     ibusimcontext->slave = gtk_im_context_simple_new ();
-    gtk_im_context_simple_add_table (GTK_IM_CONTEXT_SIMPLE (ibusimcontext->slave),
-                                     cedilla_compose_seqs,
-                                     4,
-                                     G_N_ELEMENTS (cedilla_compose_seqs) / (4 + 2));
 
     g_signal_connect (ibusimcontext->slave,
                       "commit",

From bca7bf0f97230806a26f53c798050408108cfb3d Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 25 May 2022 23:07:24 +0900
Subject: [PATCH 809/816] data/dconf: Update xkb-latin-layouts in gschema

Add more keyboard layouts which cannot produce ASCII to
data/dconf/org.freedesktop.ibus.gschema.xml
Remove "mal" and "mkd", there are no such layouts.

BUG=https://github.com/ibus/ibus/issues/2404
---
 data/dconf/org.freedesktop.ibus.gschema.xml | 47 ++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 516f75204..8b181d76b 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -28,7 +28,52 @@
       <description>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.</description>
     </key>
     <key name="xkb-latin-layouts" type="as">
-      <default>[ 'ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua' ]</default>
+      <default>
+        [ 'af', 'af(fa-olpc)', 'af(ps-olpc)', 'af(ps)', 'af(uz)',
+        'af(uz-olpc)', 'am', 'am(eastern)', 'am(eastern-alt)',
+        'am(phonetic)', 'am(phonetic-alt)', 'am(western)', 'ara',
+        'ara(azerty)', 'ara(azerty_digits)', 'ara(buckwalter)',
+        'ara(digits)', 'ara(qwerty)', 'ara(qwerty_digits)',
+        'az(cyrillic)', 'bd', 'bd(probhat)', 'bg', 'bg(bas_phonetic)',
+        'bg(phonetic)', 'brai', 'brai(left_hand)', 'brai(right_hand)',
+        'bt', 'by', 'by(legacy)', 'ca(ike)', 'ca(multi-2gr)',
+        'cn(tib)', 'cn(tib_asciinum)', 'cn(ug)', 'cz', 'cz(ucw)',
+        'de(ru)', 'dev', 'et', 'fr(geo)', 'ge', 'ge(os)', 'gr',
+        'gr(extended)', 'gr(nodeadkeys)', 'gr(polytonic)',
+        'gr(simple)', 'gur', 'il', 'il(biblical)', 'il(lyx)',
+        'il(phonetic)', 'in', 'in(ben)', 'in(ben_baishakhi)',
+        'in(ben_bornona)', 'in(ben_gitanjali)', 'in(ben_inscript)',
+        'in(ben_probhat)', 'in(bolnagri)', 'in(deva)', 'in(guj)',
+        'in(guru)', 'in(hin-kagapa)', 'in(hin-wx)', 'in(jhelum)',
+        'in(kan)', 'in(kan-kagapa)', 'in(mal)', 'in(mal_enhanced)',
+        'in(mal_lalitha)', 'in(mar-kagapa)', 'in(ori)',
+        'in(san-kagapa)', 'in(tam)', 'in(tam_tamilnet)',
+        'in(tam_tamilnet_TAB)', 'in(tam_tamilnet_TSCII)',
+        'in(tam_tamilnet_with_tam_nums)', 'in(tel)', 'in(tel-kagapa)',
+        'in(urd-phonetic)', 'in(urd-phonetic3)', 'in(urd-winkeys)',
+        'iq', 'ir', 'ir(pes_keypad)', 'jp(kana)', 'jp(mac)', 'kg',
+        'kg(phonetic)', 'kh', 'kz', 'kz(kazrus)', 'kz(ruskaz)', 'la',
+        'la(stea)', 'lk', 'lk(tam_TAB)', 'lk(tam_unicode)', 'ma',
+        'ma(tifinagh)', 'ma(tifinagh-alt)',
+        'ma(tifinagh-alt-phonetic)', 'ma(tifinagh-extended)',
+        'ma(tifinagh-extended-phonetic)', 'ma(tifinagh-phonetic)',
+        'me(cyrillic)', 'me(cyrillicalternatequotes)',
+        'me(cyrillicyz)', 'mk', 'mk(nodeadkeys)', 'mm', 'mn', 'mv',
+        'np', 'ph(capewell-dvorak-bay)', 'ph(capewell-qwerf2k6-bay)',
+        'ph(colemak-bay)', 'ph(dvorak-bay)', 'ph(qwerty-bay)', 'pk',
+        'pk(ara)', 'pk(snd)', 'pk(urd-crulp)', 'pk(urd-nla)',
+        'pl(ru_phonetic_dvorak)', 'rs', 'rs(alternatequotes)',
+        'rs(rue)', 'rs(yz)', 'ru', 'ru(bak)', 'ru(chm)', 'ru(cv)',
+        'ru(dos)', 'ru(kom)', 'ru(legacy)', 'ru(mac)',
+        'ru(os_legacy)', 'ru(os_winkeys)', 'ru(phonetic)',
+        'ru(phonetic_winkeys)', 'ru(sah)', 'ru(srp)', 'ru(tt)',
+        'ru(typewriter)', 'ru(typewriter-legacy)', 'ru(udm)',
+        'ru(xal)', 'se(rus)', 'se(rus_nodeadkeys)', 'se(swl)', 'sy',
+        'sy(syc)', 'sy(syc_phonetic)', 'th', 'th(pat)', 'th(tis)',
+        'tj', 'tj(legacy)', 'tz', 'ua', 'ua(homophonic)',
+        'ua(legacy)', 'ua(phonetic)', 'ua(rstu)', 'ua(rstu_ru)',
+        'ua(typewriter)', 'ua(winkeys)', 'us(chr)', 'us(rus)', 'uz' ]
+      </default>
       <summary>Latin layouts which have no ASCII</summary>
       <description>US layout is appended to the Latin layouts. variant can be omitted.</description>
     </key>

From 16df64edadc21f50906e5442b73425b9256fbf65 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 25 May 2022 23:07:33 +0900
Subject: [PATCH 810/816] src/tests: Add xkb-latin-layouts case

BUG=https://github.com/ibus/ibus/issues/2404
---
 .travis.yml                 |   2 +-
 src/tests/Makefile.am       |  26 ++++++--
 src/tests/runtest           |   1 +
 src/tests/xkb-latin-layouts | 130 ++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 8 deletions(-)
 create mode 100755 src/tests/xkb-latin-layouts

diff --git a/.travis.yml b/.travis.yml
index a6c04d28c..100b3be42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,6 @@ jobs:
       --with-ucd-dir='/usr/share/unicode'
       --enable-install-tests
       "
-      DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress"
+      DISABLE_GUI_TESTS="ibus-compose ibus-keypress test-stress xkb-latin-layouts"
       VERBOSE=1
       DESTDIR="$HOME/build/$USER/dest"
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index f932f18f9..ca5285bd4 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -41,8 +41,9 @@ prog_ldadd =\
     $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la                   \
     $(NULL)
 
-noinst_PROGRAMS = $(TESTS)
-TESTS = \
+noinst_PROGRAMS = $(TESTS_C)
+noinst_SCRIPTS = $(TESTS_SCRIPT)
+TESTS_C = \
     ibus-bus                        \
     ibus-config                     \
     ibus-configservice              \
@@ -56,16 +57,25 @@ TESTS = \
     ibus-util                       \
     $(NULL)
 
+TESTS_SCRIPT = \
+    xkb-latin-layouts               \
+    $(NULL)
+
+TESTS = \
+    $(TESTS_C)                      \
+    $(TESTS_SCRIPT)                 \
+    $(NULL)
+
 CLEANFILES =
 
 if ENABLE_ENGINE
-TESTS += ibus-engine-switch
+TESTS_C += ibus-engine-switch
 endif
 
 if ENABLE_GTK3
-TESTS += ibus-compose
+TESTS_C += ibus-compose
 if ENABLE_XTEST
-TESTS += ibus-keypress
+TESTS_C += ibus-keypress
 endif
 endif
 
@@ -99,9 +109,10 @@ CLEANFILES += \
     org.freedesktop.IBus.Desktop.Testing.desktop \
     $(NULL)
 
-test_execs_PROGRAMS = $(TESTS)
+test_execs_PROGRAMS = $(TESTS_C)
+test_execs_SCRIPTS = $(TESTS_SCRIPT)
 if ENABLE_GTK3
-test_execs_SCRIPTS = ibus-compose-locales
+test_execs_SCRIPTS += ibus-compose-locales
 CLEANFILES += \
     ibus-compose-locales \
     $(NULL)
@@ -138,6 +149,7 @@ ibus-desktop-testing-runner: ibus-desktop-testing-runner.in
 
 EXTRA_DIST = \
     $(test_metas_in) \
+    $(TESTS_SCRIPT) \
     runtest \
     ibus-compose.emoji \
     ibus-compose.env \
diff --git a/src/tests/runtest b/src/tests/runtest
index a6e4194bf..a229140ae 100755
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -35,6 +35,7 @@ ibus-engine-switch
 ibus-compose
 ibus-keypress
 test-stress
+xkb-latin-layouts
 "
 IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
 GTK_QUERY_MODULE=gtk-query-immodules-3.0-32
diff --git a/src/tests/xkb-latin-layouts b/src/tests/xkb-latin-layouts
new file mode 100755
index 000000000..f8dced6b0
--- /dev/null
+++ b/src/tests/xkb-latin-layouts
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+PROGNAME=`basename $0`
+VERSION=0.1
+# POSIX sh has no 'echo -e'
+: ${ECHO:='/usr/bin/echo'}
+TMPDIR=
+INSTALLED_SCHEMAS_DIR=
+
+
+usage()
+{
+    $ECHO -e \
+"This test runs setxkbmap command for gsettings xkb-latin-layouts value\n"     \
+"$PROGNAME [OPTIONS…]\n"                                                       \
+"\n"                                                                           \
+"OPTIONS:\n"                                                                   \
+"-h, --help                       This help\n"                                 \
+"-v, --version                    Show version\n"                              \
+"-D, --schemasdir=DIR             Load the latest schema file in DIR\n"        \
+""
+}
+
+
+parse_args()
+{
+    # This is GNU getopt. "sudo port getopt" in BSD?
+    ARGS=`getopt -o hD:Tv --long \
+          help,schemasdir:,tap,version\
+        -- "$@"`;
+    eval set -- "$ARGS"
+    while [ 1 ] ; do
+        case "$1" in
+        -h | --help )        usage; exit 0;;
+        -D | --schemasdir )  INSTALLED_SCHEMAS_DIR="$2"; shift 2;;
+        -T | --tap )         shift;; # ignore the option
+        -v | --version )     $ECHO -e "$VERSION"; exit 0;;
+        -- )                 shift; break;;
+        * )                  shift;;
+        esac
+    done
+}
+
+
+init()
+{
+    set -e
+
+    # gnome-continuous doesn't have a machine-id set, which
+    # breaks dbus-launch.  There's dbus-run-session which is
+    # better, but not everyone has it yet.
+    export DBUS_FATAL_WARNINGS=0
+    export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+    export XDG_CONFIG_HOME="$TMPDIR/config"
+    export XDG_CACHE_HOME="$TMPDIR/cache"
+    export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
+    mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
+
+    eval `dbus-launch --sh-syntax`
+
+    trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID; setxkbmap -layout us' ERR
+
+    # in case that schema is not installed on the system
+    glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$INSTALLED_SCHEMAS_DIR"
+}
+
+
+finit()
+{
+    # dbus-launch and gsettings run /usr/lib*/gvfsd-fuse $TMPDIR/cache/gvfs -f
+    # via systemd since gvfs 1.45.90 in Fedora 33
+    # and rm $TMPDIR could be failed until umount would be called.
+    if [ -d $TMPDIR/cache/gvfs ] ; then
+        umount $TMPDIR/cache/gvfs
+    fi
+    rm -rf $TMPDIR
+
+    kill $DBUS_SESSION_BUS_PID
+    exit 0
+}
+
+
+test_xkb_keymaps()
+{
+    # Loop over top level schemas since "gsettings list-recursively" only
+    # looks for direct children.
+    xkb_latin_layouts=`gsettings get org.freedesktop.ibus.general xkb-latin-layouts`
+    while read keymap ; do
+        eval keymap="$keymap"
+        HAS_VARIANT=$($ECHO "$keymap" | grep '(' 2> /dev/null) ||:
+        if [ "x$HAS_VARIANT" != "x" ] ; then
+            layout=$($ECHO "$keymap" | sed -e 's/\([^(]*\)([^)]*)/\1/')
+            variant=$($ECHO "$keymap" | sed -e 's/[^(]*(\([^)]*\))/\1/')
+            $ECHO setxkbmap -layout $layout -variant $variant
+            setxkbmap -layout $layout -variant $variant
+        else
+            layout="$keymap"
+            $ECHO setxkbmap -layout $layout
+            setxkbmap -layout $layout
+        fi
+        if [ $? -ne 0 ] ; then
+            $ECHO "Error in layout $layout variant $variant"
+            setxkbmap -layout us
+            exit 1
+        fi
+    done << EOF_READ_XKB
+    `$ECHO $xkb_latin_layouts | sed -e 's/^\[//' -e 's/\]$//' | tr "," "\n"`
+EOF_READ_XKB
+
+    setxkbmap -layout us
+}
+
+
+main()
+{
+    parse_args "$@"
+
+    if [ x"$INSTALLED_SCHEMAS_DIR" != x ] ; then
+        init
+    fi
+
+    test_xkb_keymaps
+
+    if [ x"$INSTALLED_SCHEMAS_DIR" != x ] ; then
+        finit
+    fi
+}
+
+
+main "$@"

From 9f62a40b0ddf4413c4e2d5f7346a6ef09bc2f44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Fri, 3 Jun 2022 15:15:59 +0900
Subject: [PATCH 811/816] configure: Use our own prefix to look up systemd user
 services dir

BUG=https://github.com/ibus/ibus/pull/2388
BUG=https://github.com/NixOS/nixpkgs/pull/164105#discussion_r826011775
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 79b9c11ae..764eba685 100644
--- a/configure.ac
+++ b/configure.ac
@@ -405,7 +405,7 @@ if test x"$enable_systemd" = x"yes"; then
     PKG_CHECK_MODULES(SYSTEMD, [
         systemd >= 0.7.5
     ])
-    AC_SUBST([SYSTEMD_USER_UNIT_DIR], [`$PKG_CONFIG --variable systemduserunitdir systemd`])
+    AC_SUBST([SYSTEMD_USER_UNIT_DIR], [`$PKG_CONFIG --define-variable prefix='${prefix}' --variable systemduserunitdir systemd`])
     enable_systemd="yes (enabled, use --disable-systemd-services to disable)"
 fi
 

From 233a3f4d4d3dc6782e74db5bf4e7c28fae729bc9 Mon Sep 17 00:00:00 2001
From: Hollow Man <hollowman@opensuse.org>
Date: Wed, 26 Jan 2022 09:35:11 +0800
Subject: [PATCH 812/816] Add functionality to change IBus panel themes with
 available GTK themes

To allow IBus to have their own control of themes.

https://gitlab.gnome.org/GNOME/gnome-tweaks/-/blob/b9badc47b92dd73f8cedbd2efc66cbaf3ea25773/gtweak/tweaks/tweak_group_appearance.py#L69

BUG=https://github.com/ibus/ibus/pull/2327

Signed-off-by: Hollow Man <hollowman@opensuse.org>
---
 data/dconf/org.freedesktop.ibus.gschema.xml |  20 +++
 setup/main.py                               | 137 ++++++++++++++++++++
 setup/setup.ui                              |  97 +++++++++++++-
 ui/gtk3/bindingcommon.vala                  |  46 +++++++
 ui/gtk3/panel.vala                          |  18 +++
 ui/gtk3/panelbinding.vala                   |  18 +++
 6 files changed, 335 insertions(+), 1 deletion(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 8b181d76b..051f21a5e 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -210,6 +210,26 @@
       <summary>Custom font</summary>
       <description>Custom font name for language panel</description>
     </key>
+    <key name="use-custom-theme" type="b">
+      <default>false</default>
+      <summary>Use custom theme</summary>
+      <description>Use custom theme name for language panel</description>
+    </key>
+    <key name="custom-theme" type="s">
+      <default>'Adwaita'</default>
+      <summary>Custom theme</summary>
+      <description>Custom theme name for language panel</description>
+    </key>
+    <key name="use-custom-icon" type="b">
+      <default>false</default>
+      <summary>Use custom icon</summary>
+      <description>Use custom icon name for language panel</description>
+    </key>
+    <key name="custom-icon" type="s">
+      <default>'Adwaita'</default>
+      <summary>Custom icon</summary>
+      <description>Custom icon name for language panel</description>
+    </key>
     <key name="use-glyph-from-engine-lang" type="b">
       <default>true</default>
       <summary>Choose glyphs with input method's language on candidate window</summary>
diff --git a/setup/main.py b/setup/main.py
index 1b9056a6d..71896693c 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -29,6 +29,7 @@
 import signal
 import sys
 import time
+import glob
 
 from gi import require_version as gi_require_version
 gi_require_version('GLib', '2.0')
@@ -196,6 +197,79 @@ def __init_panel(self):
                                    'sensitive',
                                    Gio.SettingsBindFlags.GET)
 
+        # custom theme
+        self.__model_custom_theme = self.__builder.get_object(
+                "model_custom_theme")
+        self.__combobox_custom_theme = self.__builder.get_object(
+                "combobox_custom_theme")
+        self.__checkbutton_custom_theme = self.__builder.get_object(
+                "checkbutton_custom_theme")
+
+        def update_combobox_custom_theme(settings, key):
+            theme_name_list = self.__init_available_gtk_themes()
+            self.__model_custom_theme.clear()
+            for name in theme_name_list:
+                self.__model_custom_theme.append([name])
+            current_theme = self.__settings_panel.get_string(key)
+            try:
+                current_theme_number = theme_name_list.index(current_theme)
+            except ValueError:
+                self.__settings_panel.reset(key)
+                current_theme = self.__settings_panel.get_string(key)
+                current_theme_number = theme_name_list.index(current_theme)
+            self.__combobox_custom_theme.set_active(current_theme_number)
+
+        update_combobox_custom_theme(None, 'custom-theme')
+        self.__settings_panel.bind('use-custom-theme',
+                                   self.__checkbutton_custom_theme,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__settings_panel.connect('changed::custom-theme',
+                                   update_combobox_custom_theme)
+        self.__settings_panel.bind('use-custom-theme',
+                                   self.__combobox_custom_theme,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__combobox_custom_theme.connect("changed",
+                                   self.__on_combobox_custom_theme_changed)
+
+
+        # custom icon
+        self.__model_custom_icon = self.__builder.get_object(
+                "model_custom_icon")
+        self.__combobox_custom_icon = self.__builder.get_object(
+                "combobox_custom_icon")
+        self.__checkbutton_custom_icon = self.__builder.get_object(
+                "checkbutton_custom_icon")
+
+        def update_combobox_custom_icon(settings, key):
+            icon_name_list = self.__init_available_gtk_icons()
+            self.__model_custom_icon.clear()
+            for name in icon_name_list:
+                self.__model_custom_icon.append([name])
+            current_icon = self.__settings_panel.get_string(key)
+            try:
+                current_icon_number = icon_name_list.index(current_icon)
+            except ValueError:
+                self.__settings_panel.reset(key)
+                current_icon = self.__settings_panel.get_string(key)
+                current_icon_number = icon_name_list.index(current_icon)
+            self.__combobox_custom_icon.set_active(current_icon_number)
+
+        update_combobox_custom_icon(None, 'custom-icon')
+        self.__settings_panel.bind('use-custom-icon',
+                                   self.__checkbutton_custom_icon,
+                                   'active',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__settings_panel.connect('changed::custom-icon',
+                                   update_combobox_custom_icon)
+        self.__settings_panel.bind('use-custom-icon',
+                                   self.__combobox_custom_icon,
+                                   'sensitive',
+                                   Gio.SettingsBindFlags.DEFAULT)
+        self.__combobox_custom_icon.connect("changed",
+                                   self.__on_combobox_custom_icon_changed)
+
         # show icon on system tray
         self.__checkbutton_show_icon_on_systray = self.__builder.get_object(
                 "checkbutton_show_icon_on_systray")
@@ -588,6 +662,69 @@ def __shortcut_button_clicked_cb(self, button, name, section, _name, entry):
             _("Use shortcut with shift to switch to the previous input method") 
         entry.set_tooltip_text(tooltip)
 
+    def __init_available_gtk_themes(self):
+        path_list = []
+        path_list.append(os.path.join(GLib.get_home_dir(), ".themes"))
+        path_list.append(os.path.join(GLib.get_user_data_dir(), "themes"))
+        path_list.extend(list(map(lambda x: os.path.join(
+            x, "themes"), GLib.get_system_data_dirs())))
+        theme_name_list = []
+        gtk_theme_path = []
+        for path in path_list:
+            gtk_theme_path.extend(glob.glob(path + "/*/gtk-*/gtk.css"))
+            gtk_theme_path.extend(glob.glob(path + "/*/gtk-*/gtk-dark.css"))
+        for path in gtk_theme_path:
+            filename = os.path.basename(path)
+            appendix = ""
+            if filename == "gtk-dark.css":
+                appendix = ":dark"
+            theme_name_list.append(os.path.basename(
+                os.path.dirname(os.path.dirname(path))) + appendix)
+
+        theme_name_list.extend([
+            'Adwaita', 'Adwaita:dark',
+            'HighContrast', 'HighContrastInverse'
+        ])
+        theme_name_list = list(set(theme_name_list))
+        theme_name_list.sort()
+
+        return theme_name_list
+
+    def __on_combobox_custom_theme_changed(self, combobox):
+        tree_iter = self.__combobox_custom_theme.get_active_iter()
+        if tree_iter is not None:
+            model = self.__combobox_custom_theme.get_model()
+            theme_name = model[tree_iter][0]
+            self.__settings_panel.set_string('custom-theme', theme_name)
+
+    def __init_available_gtk_icons(self):
+        path_list = []
+        path_list.append(os.path.join(GLib.get_home_dir(), ".icons"))
+        path_list.append(os.path.join(GLib.get_user_data_dir(), "icons"))
+        path_list.extend(list(map(lambda x: os.path.join(
+            x, "icons"), GLib.get_system_data_dirs())))
+        icon_name_list = []
+        gtk_icon_path = []
+        for path in path_list:
+            gtk_icon_path.extend(glob.glob(path + "/*/index.theme"))
+        for path in gtk_icon_path:
+            dir = os.path.dirname(path)
+            if not os.path.exists(os.path.join(dir, "cursors")):
+                icon_name_list.append(os.path.basename(dir))
+
+        icon_name_list.extend(["Adwaita"])
+        icon_name_list = list(set(icon_name_list))
+        icon_name_list.sort()
+
+        return icon_name_list
+
+    def __on_combobox_custom_icon_changed(self, combobox):
+        tree_iter = self.__combobox_custom_icon.get_active_iter()
+        if tree_iter is not None:
+            model = self.__combobox_custom_icon.get_model()
+            icon_name = model[tree_iter][0]
+            self.__settings_panel.set_string('custom-icon', icon_name)
+
     def __item_started_column_toggled_cb(self, cell, path_str, model):
 
         # get toggled iter
diff --git a/setup/setup.ui b/setup/setup.ui
index a15b9083c..5a9804f9e 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -55,6 +55,18 @@
       </row>
     </data>
   </object>
+  <object class="GtkListStore" id="model_custom_theme">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="model_custom_icon">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkAdjustment" id="adjustment_emoji_partial_match">
     <property name="value">3.0</property>
     <property name="lower">1.0</property>
@@ -1318,13 +1330,96 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkGrid" id="table3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="column_spacing">12</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_custom_theme">
+                                <property name="label" translatable="yes">Use custom theme:</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="halign">start</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="hexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="combobox_custom_theme">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="model">model_custom_theme</property>
+                                <property name="hexpand">True</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer4"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_custom_icon">
+                                <property name="label" translatable="yes">Use custom icon:</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="halign">start</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="combobox_custom_icon">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="model">model_custom_icon</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer5"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Fonts&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Font and Theme&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
diff --git a/ui/gtk3/bindingcommon.vala b/ui/gtk3/bindingcommon.vala
index 150d4c399..e825167b1 100644
--- a/ui/gtk3/bindingcommon.vala
+++ b/ui/gtk3/bindingcommon.vala
@@ -212,4 +212,50 @@ class BindingCommon {
                 css_provider,
                 Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
+
+    public static void
+    set_custom_theme(GLib.Settings? settings_panel) {
+        if (settings_panel == null)
+            return;
+
+        bool use_custom_theme = settings_panel.get_boolean("use-custom-theme");
+        string custom_theme = settings_panel.get_string("custom-theme");
+
+        Gtk.Settings gtk_settings = Gtk.Settings.get_default();
+
+        if (use_custom_theme == false)
+            custom_theme = "";
+
+        if (custom_theme == null || custom_theme == "") {
+            gtk_settings.reset_property("gtk-theme-name");
+            gtk_settings.reset_property("gtk-application-prefer-dark-theme");
+        } else {
+            string[] custom_theme_splitted = custom_theme.split(":");
+            gtk_settings.gtk_theme_name = custom_theme_splitted[0];
+            if (custom_theme_splitted.length == 2 &&
+            custom_theme_splitted[1] == "dark")
+                gtk_settings.gtk_application_prefer_dark_theme = true;
+            else
+                gtk_settings.gtk_application_prefer_dark_theme = false;
+        }
+    }
+
+    public static void
+    set_custom_icon(GLib.Settings? settings_panel) {
+        if (settings_panel == null)
+            return;
+
+        bool use_custom_icon = settings_panel.get_boolean("use-custom-icon");
+        string custom_icon = settings_panel.get_string("custom-icon");
+
+        Gtk.Settings gtk_settings = Gtk.Settings.get_default();
+
+        if (use_custom_icon == false)
+            custom_icon = "";
+
+        if (custom_icon == null || custom_icon == "")
+            gtk_settings.reset_property("gtk-icon-theme-name");
+        else
+            gtk_settings.gtk_icon_theme_name = custom_icon;
+    }
 }
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 61bfa1b6c..101c2b3d4 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -211,6 +211,22 @@ class Panel : IBus.PanelService {
                                               ref m_css_provider);
         });
 
+        m_settings_panel.changed["custom-theme"].connect((key) => {
+                BindingCommon.set_custom_theme(m_settings_panel);
+        });
+
+        m_settings_panel.changed["use-custom-theme"].connect((key) => {
+                BindingCommon.set_custom_theme(m_settings_panel);
+        });
+
+        m_settings_panel.changed["custom-icon"].connect((key) => {
+                BindingCommon.set_custom_icon(m_settings_panel);
+        });
+
+        m_settings_panel.changed["use-custom-icon"].connect((key) => {
+                BindingCommon.set_custom_icon(m_settings_panel);
+        });
+
         m_settings_panel.changed["use-glyph-from-engine-lang"].connect((key) =>
         {
                 m_use_engine_lang = m_settings_panel.get_boolean(
@@ -816,6 +832,8 @@ class Panel : IBus.PanelService {
         BindingCommon.set_custom_font(m_settings_panel,
                                       null,
                                       ref m_css_provider);
+        BindingCommon.set_custom_theme(m_settings_panel);
+        BindingCommon.set_custom_icon(m_settings_panel);
         set_show_icon_on_systray();
         set_lookup_table_orientation();
         set_show_property_panel();
diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
index e63d93f29..3c516afd5 100644
--- a/ui/gtk3/panelbinding.vala
+++ b/ui/gtk3/panelbinding.vala
@@ -270,6 +270,22 @@ class PanelBinding : IBus.PanelService {
                                               ref m_css_provider);
         });
 
+        m_settings_panel.changed["custom-theme"].connect((key) => {
+                BindingCommon.set_custom_theme(m_settings_panel);
+        });
+
+        m_settings_panel.changed["use-custom-theme"].connect((key) => {
+                BindingCommon.set_custom_theme(m_settings_panel);
+        });
+
+        m_settings_panel.changed["custom-icon"].connect((key) => {
+                BindingCommon.set_custom_icon(m_settings_panel);
+        });
+
+        m_settings_panel.changed["use-custom-icon"].connect((key) => {
+                BindingCommon.set_custom_icon(m_settings_panel);
+        });
+
         m_settings_emoji.changed["unicode-hotkey"].connect((key) => {
                 set_emoji_hotkey();
         });
@@ -422,6 +438,8 @@ class PanelBinding : IBus.PanelService {
         BindingCommon.set_custom_font(m_settings_panel,
                                       m_settings_emoji,
                                       ref m_css_provider);
+        BindingCommon.set_custom_theme(m_settings_panel);
+        BindingCommon.set_custom_icon(m_settings_panel);
         set_emoji_favorites();
         if (m_load_emoji_at_startup && !m_loaded_emoji)
             set_emoji_lang();

From addab9fdc7f98c172b6fcb1e24faa133368bdaf3 Mon Sep 17 00:00:00 2001
From: Hollow Man <hollowman@opensuse.org>
Date: Wed, 26 Jan 2022 10:03:04 +0800
Subject: [PATCH 813/816] Revert support for choosing GTK themes dark variant

So that the theme list won't get too messy

BUG=https://github.com/ibus/ibus/pull/2327

Signed-off-by: Hollow Man <hollowman@opensuse.org>
---
 setup/main.py              | 10 ++--------
 ui/gtk3/bindingcommon.vala | 14 +++-----------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index 71896693c..d0e05666a 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -672,18 +672,12 @@ def __init_available_gtk_themes(self):
         gtk_theme_path = []
         for path in path_list:
             gtk_theme_path.extend(glob.glob(path + "/*/gtk-*/gtk.css"))
-            gtk_theme_path.extend(glob.glob(path + "/*/gtk-*/gtk-dark.css"))
         for path in gtk_theme_path:
-            filename = os.path.basename(path)
-            appendix = ""
-            if filename == "gtk-dark.css":
-                appendix = ":dark"
             theme_name_list.append(os.path.basename(
-                os.path.dirname(os.path.dirname(path))) + appendix)
+                os.path.dirname(os.path.dirname(path))))
 
         theme_name_list.extend([
-            'Adwaita', 'Adwaita:dark',
-            'HighContrast', 'HighContrastInverse'
+            'Adwaita', 'HighContrast', 'HighContrastInverse'
         ])
         theme_name_list = list(set(theme_name_list))
         theme_name_list.sort()
diff --git a/ui/gtk3/bindingcommon.vala b/ui/gtk3/bindingcommon.vala
index e825167b1..4ecb71597 100644
--- a/ui/gtk3/bindingcommon.vala
+++ b/ui/gtk3/bindingcommon.vala
@@ -226,18 +226,10 @@ class BindingCommon {
         if (use_custom_theme == false)
             custom_theme = "";
 
-        if (custom_theme == null || custom_theme == "") {
+        if (custom_theme == null || custom_theme == "")
             gtk_settings.reset_property("gtk-theme-name");
-            gtk_settings.reset_property("gtk-application-prefer-dark-theme");
-        } else {
-            string[] custom_theme_splitted = custom_theme.split(":");
-            gtk_settings.gtk_theme_name = custom_theme_splitted[0];
-            if (custom_theme_splitted.length == 2 &&
-            custom_theme_splitted[1] == "dark")
-                gtk_settings.gtk_application_prefer_dark_theme = true;
-            else
-                gtk_settings.gtk_application_prefer_dark_theme = false;
-        }
+        else
+            gtk_settings.gtk_theme_name = custom_theme;
     }
 
     public static void

From ff99828cb60915318ed0f40998a1a23d5dea42c7 Mon Sep 17 00:00:00 2001
From: Hollow Man <hollowman@opensuse.org>
Date: Wed, 26 Jan 2022 11:19:40 +0800
Subject: [PATCH 814/816] Add tooltip text for use custom icon and theme

BUG=https://github.com/ibus/ibus/pull/2327

Signed-off-by: Hollow Man <hollowman@opensuse.org>
---
 setup/setup.ui | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup/setup.ui b/setup/setup.ui
index 5a9804f9e..6ded20616 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1339,6 +1339,7 @@
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_custom_theme">
                                 <property name="label" translatable="yes">Use custom theme:</property>
+                                <property name="tooltip_text" translatable="yes">Choose a theme of the candidate window</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -1375,6 +1376,7 @@
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_custom_icon">
                                 <property name="label" translatable="yes">Use custom icon:</property>
+                                <property name="tooltip_text" translatable="yes">Choose a theme of the arrow buttons on the candidate window</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>

From 9ad063746ec3d919217ae18acce2d4768bcfca05 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 20 Jun 2022 21:01:31 +0900
Subject: [PATCH 815/816] ui/gtk3: Hide XKB engine but enable it in Plasma
 Wayland

IBus just cannot defer key events to the secondary input methods
to switch XKB keymaps in Plasma Wayland because IBus has to handle the
compose keys before defer the key events.

Also update the POT file.

BUG=rhbz#2088656
---
 data/dconf/org.freedesktop.ibus.gschema.xml |   4 +-
 po/ibus10.pot                               | 374 +++++++++++---------
 ui/gtk3/panel.vala                          |  50 ++-
 3 files changed, 248 insertions(+), 180 deletions(-)

diff --git a/data/dconf/org.freedesktop.ibus.gschema.xml b/data/dconf/org.freedesktop.ibus.gschema.xml
index 051f21a5e..0ece2b4f6 100644
--- a/data/dconf/org.freedesktop.ibus.gschema.xml
+++ b/data/dconf/org.freedesktop.ibus.gschema.xml
@@ -223,12 +223,12 @@
     <key name="use-custom-icon" type="b">
       <default>false</default>
       <summary>Use custom icon</summary>
-      <description>Use custom icon name for language panel</description>
+      <description>Use custom icon name for arrow buttons on candidate window</description>
     </key>
     <key name="custom-icon" type="s">
       <default>'Adwaita'</default>
       <summary>Custom icon</summary>
-      <description>Custom icon name for language panel</description>
+      <description>Custom icon name for arrow buttons on candidate window</description>
     </key>
     <key name="use-glyph-from-engine-lang" type="b">
       <default>true</default>
diff --git a/po/ibus10.pot b/po/ibus10.pot
index 50e589594..3f9843ddd 100644
--- a/po/ibus10.pot
+++ b/po/ibus10.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus 1.5.26\n"
 "Report-Msgid-Bugs-To: https://github.com/ibus/ibus/issues\n"
-"POT-Creation-Date: 2022-04-29 18:05+0900\n"
-"PO-Revision-Date: 2022-04-29 18:05+0900\n"
+"POT-Creation-Date: 2022-06-20 20:30+0900\n"
+"PO-Revision-Date: 2022-06-20 20:30+0900\n"
 "Last-Translator: Takao Fujiwara <takao.fujiwara1@gmail.com>\n"
 "Language-Team: Source\n"
 "Language: \n"
@@ -55,174 +55,174 @@ msgid ""
 "version of the previous installed ibus and one of the current ibus."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:32
+#: data/dconf/org.freedesktop.ibus.gschema.xml:77
 msgid "Latin layouts which have no ASCII"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:33
+#: data/dconf/org.freedesktop.ibus.gschema.xml:78
 msgid "US layout is appended to the Latin layouts. variant can be omitted."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:37
+#: data/dconf/org.freedesktop.ibus.gschema.xml:82
 msgid "Use xmodmap"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:38
+#: data/dconf/org.freedesktop.ibus.gschema.xml:83
 msgid ""
 "Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:42 setup/setup.ui:1208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:87 setup/setup.ui:1220
 msgid "Use system keyboard layout"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:43 setup/setup.ui:1213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:88 setup/setup.ui:1225
 msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:47
+#: data/dconf/org.freedesktop.ibus.gschema.xml:92
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:48
+#: data/dconf/org.freedesktop.ibus.gschema.xml:93
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:52
+#: data/dconf/org.freedesktop.ibus.gschema.xml:97
 msgid "Use global input method"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:53 setup/setup.ui:1257
+#: data/dconf/org.freedesktop.ibus.gschema.xml:98 setup/setup.ui:1269
 msgid "Share the same input method among all applications"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:57
+#: data/dconf/org.freedesktop.ibus.gschema.xml:102
 msgid "Enable input method by default"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:58
+#: data/dconf/org.freedesktop.ibus.gschema.xml:103
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:62
+#: data/dconf/org.freedesktop.ibus.gschema.xml:107
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:63
+#: data/dconf/org.freedesktop.ibus.gschema.xml:108
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:70
+#: data/dconf/org.freedesktop.ibus.gschema.xml:115
 msgid "Trigger shortcut keys"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:71
-#: data/dconf/org.freedesktop.ibus.gschema.xml:76 setup/setup.ui:224
+#: data/dconf/org.freedesktop.ibus.gschema.xml:116
+#: data/dconf/org.freedesktop.ibus.gschema.xml:121 setup/setup.ui:236
 msgid "The shortcut keys for turning input method on or off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:75
+#: data/dconf/org.freedesktop.ibus.gschema.xml:120
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:80
+#: data/dconf/org.freedesktop.ibus.gschema.xml:125
 msgid "Enable shortcut keys"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:81
+#: data/dconf/org.freedesktop.ibus.gschema.xml:126
 msgid "The shortcut keys for turning input method on"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:85
+#: data/dconf/org.freedesktop.ibus.gschema.xml:130
 msgid "Disable shortcut keys"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:86
+#: data/dconf/org.freedesktop.ibus.gschema.xml:131
 msgid "The shortcut keys for turning input method off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:90
-#: data/dconf/org.freedesktop.ibus.gschema.xml:95
+#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+#: data/dconf/org.freedesktop.ibus.gschema.xml:140
 msgid "Next engine shortcut keys"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:91
-#: data/dconf/org.freedesktop.ibus.gschema.xml:96
+#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+#: data/dconf/org.freedesktop.ibus.gschema.xml:141
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:100
-#: data/dconf/org.freedesktop.ibus.gschema.xml:105
+#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+#: data/dconf/org.freedesktop.ibus.gschema.xml:150
 msgid "Prev engine shortcut keys"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:101
-#: data/dconf/org.freedesktop.ibus.gschema.xml:106
+#: data/dconf/org.freedesktop.ibus.gschema.xml:146
+#: data/dconf/org.freedesktop.ibus.gschema.xml:151
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:112
+#: data/dconf/org.freedesktop.ibus.gschema.xml:157
 msgid "Auto hide"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:113
+#: data/dconf/org.freedesktop.ibus.gschema.xml:158
 msgid ""
 "The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always "
 "show"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:117
-#: data/dconf/org.freedesktop.ibus.gschema.xml:121
+#: data/dconf/org.freedesktop.ibus.gschema.xml:162
+#: data/dconf/org.freedesktop.ibus.gschema.xml:166
 msgid "Language panel position"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:125
+#: data/dconf/org.freedesktop.ibus.gschema.xml:170
 msgid "Follow the input cursor in case the panel is always shown"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:126
+#: data/dconf/org.freedesktop.ibus.gschema.xml:171
 msgid ""
 "If true, the panel follows the input cursor in case the panel is always "
 "shown. If false, the panel is shown at a fixed location."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:130
+#: data/dconf/org.freedesktop.ibus.gschema.xml:175
 msgid "The milliseconds to show property panel"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:131
+#: data/dconf/org.freedesktop.ibus.gschema.xml:176
 msgid ""
 "The milliseconds to show property panel after focus-in or properties are "
 "changed."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:135
+#: data/dconf/org.freedesktop.ibus.gschema.xml:180
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:136
+#: data/dconf/org.freedesktop.ibus.gschema.xml:181
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:140
-#: data/dconf/org.freedesktop.ibus.gschema.xml:141 setup/setup.ui:470
-#: setup/setup.ui:475
+#: data/dconf/org.freedesktop.ibus.gschema.xml:185
+#: data/dconf/org.freedesktop.ibus.gschema.xml:186 setup/setup.ui:482
+#: setup/setup.ui:487
 msgid "Show icon on system tray"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:145
+#: data/dconf/org.freedesktop.ibus.gschema.xml:190
 msgid "Show input method name"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:146 setup/setup.ui:489
+#: data/dconf/org.freedesktop.ibus.gschema.xml:191 setup/setup.ui:501
 msgid "Show input method name on language bar"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:150
+#: data/dconf/org.freedesktop.ibus.gschema.xml:195
 msgid "RGBA value of XKB icon"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:151
+#: data/dconf/org.freedesktop.ibus.gschema.xml:196
 msgid ""
 "XKB icon shows the layout string and the string is rendered with the RGBA "
 "value. The RGBA value can be 1. a color name from X11, 2. a hex value in "
@@ -233,11 +233,11 @@ msgid ""
 "in the range 0 to 1 of the alpha."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:155
+#: data/dconf/org.freedesktop.ibus.gschema.xml:200
 msgid "The milliseconds to show the panel icon for a property"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:156
+#: data/dconf/org.freedesktop.ibus.gschema.xml:201
 msgid ""
 "The milliseconds to show the panel icon from the engine icon to a property "
 "icon whenever engines are switched if the property is specified by the value "
@@ -245,28 +245,60 @@ msgid ""
 "property icon is shown immediately."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:160
+#: data/dconf/org.freedesktop.ibus.gschema.xml:205
 msgid "Use custom font"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:161
+#: data/dconf/org.freedesktop.ibus.gschema.xml:206
 msgid "Use custom font name for language panel"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:165
-#: data/dconf/org.freedesktop.ibus.gschema.xml:192
+#: data/dconf/org.freedesktop.ibus.gschema.xml:210
+#: data/dconf/org.freedesktop.ibus.gschema.xml:257
 msgid "Custom font"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:166
+#: data/dconf/org.freedesktop.ibus.gschema.xml:211
 msgid "Custom font name for language panel"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:170 setup/setup.ui:1305
+#: data/dconf/org.freedesktop.ibus.gschema.xml:215
+msgid "Use custom theme"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:216
+msgid "Use custom theme name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:220
+msgid "Custom theme"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:221
+msgid "Custom theme name for language panel"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:225
+msgid "Use custom icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:226
+msgid "Use custom icon name for arrow buttons on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:230
+msgid "Custom icon"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:231
+msgid "Custom icon name for arrow buttons on candidate window"
+msgstr ""
+
+#: data/dconf/org.freedesktop.ibus.gschema.xml:235 setup/setup.ui:1317
 msgid "Choose glyphs with input method's language on candidate window"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:171
+#: data/dconf/org.freedesktop.ibus.gschema.xml:236
 msgid ""
 "Some code points have the different glyphs and Pango determines the glyphs "
 "from the language attribute. Pango chooses glyphs from the IBus engine's "
@@ -274,100 +306,100 @@ msgid ""
 "value is false."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:182
+#: data/dconf/org.freedesktop.ibus.gschema.xml:247
 msgid "Unicode shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:183
+#: data/dconf/org.freedesktop.ibus.gschema.xml:248
 msgid "The shortcut keys for turning Unicode typing on or off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:187
+#: data/dconf/org.freedesktop.ibus.gschema.xml:252
 msgid "Emoji shortcut keys for gtk_accelerator_parse"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:188
+#: data/dconf/org.freedesktop.ibus.gschema.xml:253
 msgid "The shortcut keys for turning emoji typing on or off"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:193
+#: data/dconf/org.freedesktop.ibus.gschema.xml:258
 msgid "Custom font name for emoji characters on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:197
+#: data/dconf/org.freedesktop.ibus.gschema.xml:262
 msgid "Default language for emoji dictionary"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:198
+#: data/dconf/org.freedesktop.ibus.gschema.xml:263
 msgid ""
 "Choose a default language of emoji dictionaries on the emoji dialog. The "
 "value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict ."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:202
+#: data/dconf/org.freedesktop.ibus.gschema.xml:267
 msgid "favorite emoji list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:203
+#: data/dconf/org.freedesktop.ibus.gschema.xml:268
 msgid ""
 "You can show the favorite emojis on emoji list if this list has any "
 "characters."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:207
+#: data/dconf/org.freedesktop.ibus.gschema.xml:272
 msgid "favorite emoji annotation list on emoji dialog"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:208
+#: data/dconf/org.freedesktop.ibus.gschema.xml:273
 msgid "You can assign an annotation for a favorite emoji in this list."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:212
+#: data/dconf/org.freedesktop.ibus.gschema.xml:277
 msgid "Whether emoji annotations can be match partially or not"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:213
+#: data/dconf/org.freedesktop.ibus.gschema.xml:278
 msgid ""
 "Whether emoji annotations can be matched with a partial string instead of "
 "the exact match or not."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:217
+#: data/dconf/org.freedesktop.ibus.gschema.xml:282
 msgid "Match emoji annotations with the specified length"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:218
+#: data/dconf/org.freedesktop.ibus.gschema.xml:283
 msgid ""
 "Match emoji annotations partially with more than the specified number of "
 "characters instead of the exact match."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:222
+#: data/dconf/org.freedesktop.ibus.gschema.xml:287
 msgid "Choose a condition to match emoji annotations partially"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:223
+#: data/dconf/org.freedesktop.ibus.gschema.xml:288
 msgid ""
 "Choose one of the following conditions to match emoji annotations partially: "
 "0 == Prefix match, 1 == Suffix match, 2 == Containing match"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:227
+#: data/dconf/org.freedesktop.ibus.gschema.xml:292
 msgid "Load the emoji data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:228
+#: data/dconf/org.freedesktop.ibus.gschema.xml:293
 msgid ""
 "Load the emoji data at the time of startup if true. About 10MB memory is "
 "needed to load the data. Load the emoji data when open the emoji dialog at "
 "the beginning if false."
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:232
+#: data/dconf/org.freedesktop.ibus.gschema.xml:297
 msgid "Load the Unicode data at the time of startup"
 msgstr ""
 
-#: data/dconf/org.freedesktop.ibus.gschema.xml:233
+#: data/dconf/org.freedesktop.ibus.gschema.xml:298
 msgid ""
 "Load the Unicode data at the time of startup if true. About 15MB memory is "
 "needed to load the data. Load the Unicode data when open the emoji dialog at "
@@ -381,7 +413,7 @@ msgid ""
 "Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
 
-#: ibus/lang.py:41 src/ibusutil.c:209
+#: ibus/lang.py:41 src/ibusutil.c:209 ui/gtk3/panel.vala:1323
 msgid "Other"
 msgstr ""
 
@@ -390,11 +422,11 @@ msgid "Select a language"
 msgstr ""
 
 #: setup/emojilang.py:70 setup/enginedialog.py:60 setup/keyboardshortcut.py:339
-#: setup/main.py:560
+#: setup/main.py:634
 msgid "_Cancel"
 msgstr ""
 
-#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:561
+#: setup/emojilang.py:71 setup/keyboardshortcut.py:340 setup/main.py:635
 msgid "_OK"
 msgstr ""
 
@@ -402,11 +434,11 @@ msgstr ""
 msgid "More…"
 msgstr ""
 
-#: setup/engineabout.py:37 setup/setup.ui:1368 ui/gtk3/panel.vala:1259
+#: setup/engineabout.py:37 setup/setup.ui:1465 ui/gtk3/panel.vala:1288
 msgid "About"
 msgstr ""
 
-#: setup/engineabout.py:40 setup/setup.ui:1391
+#: setup/engineabout.py:40 setup/setup.ui:1488
 msgid "_Close"
 msgstr ""
 
@@ -434,16 +466,16 @@ msgid "Select an input method"
 msgstr ""
 
 #. add button
-#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:664
+#: setup/enginedialog.py:61 setup/keyboardshortcut.py:124 setup/setup.ui:676
 msgid "_Add"
 msgstr ""
 
 #. create im name & icon column
-#: setup/enginetreeview.py:69 setup/setup.ui:838
+#: setup/enginetreeview.py:69 setup/setup.ui:850
 msgid "Input Method"
 msgstr ""
 
-#: setup/ibus-setup.desktop:3 setup/setup.ui:69
+#: setup/ibus-setup.desktop:3 setup/setup.ui:81
 msgid "IBus Preferences"
 msgstr ""
 
@@ -483,15 +515,15 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr ""
 
-#: setup/main.py:121 setup/main.py:588
+#: setup/main.py:122 setup/main.py:662
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr ""
 
-#: setup/main.py:515
+#: setup/main.py:589
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr ""
 
-#: setup/main.py:536
+#: setup/main.py:610
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to "
 "your $HOME/.bashrc; then relog into your desktop.\n"
@@ -501,18 +533,18 @@ msgid ""
 msgstr ""
 
 #. Translators: %d == 5 currently
-#: setup/main.py:550
+#: setup/main.py:624
 #, python-format
 msgid "IBus daemon could not be started in %d seconds."
 msgstr ""
 
-#: setup/main.py:562
+#: setup/main.py:636
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr ""
 
 #. Translators: Title of the window
-#: setup/main.py:564
+#: setup/main.py:638
 msgid "switching input methods"
 msgstr ""
 
@@ -556,218 +588,234 @@ msgstr ""
 msgid "Always"
 msgstr ""
 
-#: setup/setup.ui:113
+#: setup/setup.ui:125
 msgid "The shortcut keys for switching to next input method in the list"
 msgstr ""
 
-#: setup/setup.ui:115
+#: setup/setup.ui:127
 msgid "Next input method:"
 msgstr ""
 
-#: setup/setup.ui:127
+#: setup/setup.ui:139
 msgid "The shortcut keys for switching to previous input method in the list"
 msgstr ""
 
-#: setup/setup.ui:129
+#: setup/setup.ui:141
 msgid "Previous input method:"
 msgstr ""
 
-#: setup/setup.ui:157 setup/setup.ui:199 setup/setup.ui:266 setup/setup.ui:319
-#: setup/setup.ui:903 setup/setup.ui:957
+#: setup/setup.ui:169 setup/setup.ui:211 setup/setup.ui:278 setup/setup.ui:331
+#: setup/setup.ui:915 setup/setup.ui:969
 msgid "..."
 msgstr ""
 
-#: setup/setup.ui:226
+#: setup/setup.ui:238
 msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.ui:238
+#: setup/setup.ui:250
 msgid "Enable:"
 msgstr ""
 
-#: setup/setup.ui:291
+#: setup/setup.ui:303
 msgid "Disable:"
 msgstr ""
 
-#: setup/setup.ui:345 setup/setup.ui:983
+#: setup/setup.ui:357 setup/setup.ui:995
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr ""
 
-#: setup/setup.ui:374
+#: setup/setup.ui:386
 msgid "Set the orientation of candidates in lookup table"
 msgstr ""
 
-#: setup/setup.ui:376
+#: setup/setup.ui:388
 msgid "Candidates orientation:"
 msgstr ""
 
-#: setup/setup.ui:407
+#: setup/setup.ui:419
 msgid "Set the behavior of ibus how to show or hide language bar"
 msgstr ""
 
-#: setup/setup.ui:409
+#: setup/setup.ui:421
 msgid "Show property panel:"
 msgstr ""
 
-#: setup/setup.ui:423
+#: setup/setup.ui:435
 msgid "Language panel position:"
 msgstr ""
 
-#: setup/setup.ui:494
+#: setup/setup.ui:506
 msgid "Show input method's name on language bar when check the checkbox"
 msgstr ""
 
-#: setup/setup.ui:508
+#: setup/setup.ui:520
 msgid "Embed preedit text in application window"
 msgstr ""
 
-#: setup/setup.ui:513
+#: setup/setup.ui:525
 msgid "Embed the preedit text of input method in the application window"
 msgstr ""
 
-#: setup/setup.ui:527
+#: setup/setup.ui:539
 msgid "Use custom font:"
 msgstr ""
 
-#: setup/setup.ui:562 setup/setup.ui:1156
+#: setup/setup.ui:574 setup/setup.ui:1168
 msgid "<b>Font and Style</b>"
 msgstr ""
 
-#: setup/setup.ui:579
+#: setup/setup.ui:591
 msgid "General"
 msgstr ""
 
-#: setup/setup.ui:671
+#: setup/setup.ui:683
 msgid "Add the selected input method into the enabled input methods"
 msgstr ""
 
-#: setup/setup.ui:682
+#: setup/setup.ui:694
 msgid "_Remove"
 msgstr ""
 
-#: setup/setup.ui:689
+#: setup/setup.ui:701
 msgid "Remove the selected input method from the enabled input methods"
 msgstr ""
 
-#: setup/setup.ui:700
+#: setup/setup.ui:712
 msgid "_Up"
 msgstr ""
 
-#: setup/setup.ui:707
+#: setup/setup.ui:719
 msgid "Move up the selected input method in the enabled input methods list"
 msgstr ""
 
-#: setup/setup.ui:718
+#: setup/setup.ui:730
 msgid "_Down"
 msgstr ""
 
-#: setup/setup.ui:725
+#: setup/setup.ui:737
 msgid "Move down the selected input method in the enabled input methods"
 msgstr ""
 
-#: setup/setup.ui:736
+#: setup/setup.ui:748
 msgid "_About"
 msgstr ""
 
-#: setup/setup.ui:743
+#: setup/setup.ui:755
 msgid "Show information of the selected input method"
 msgstr ""
 
-#: setup/setup.ui:754
+#: setup/setup.ui:766
 msgid "_Preferences"
 msgstr ""
 
-#: setup/setup.ui:761
+#: setup/setup.ui:773
 msgid "Show setup of the selected input method"
 msgstr ""
 
-#: setup/setup.ui:812
+#: setup/setup.ui:824
 msgid ""
 "<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>"
 msgstr ""
 
-#: setup/setup.ui:873
+#: setup/setup.ui:885
 msgid ""
 "The shortcut keys to enable conversions of emoji annotations or Unicode names"
 msgstr ""
 
-#: setup/setup.ui:875
+#: setup/setup.ui:887
 msgid "Emoji annotation:"
 msgstr ""
 
-#: setup/setup.ui:927
+#: setup/setup.ui:939
 msgid "The shortcut keys to enable Unicode code point conversions"
 msgstr ""
 
-#: setup/setup.ui:929
+#: setup/setup.ui:941
 msgid "Unicode code point:"
 msgstr ""
 
-#: setup/setup.ui:1013
+#: setup/setup.ui:1025
 msgid "Set a font of Unicode candidates on the emoji dialog"
 msgstr ""
 
-#: setup/setup.ui:1015
+#: setup/setup.ui:1027
 msgid "Unicode font:"
 msgstr ""
 
-#: setup/setup.ui:1038
+#: setup/setup.ui:1050
 msgid "Set a language of emoji annotations on the emoji dialog"
 msgstr ""
 
-#: setup/setup.ui:1040
+#: setup/setup.ui:1052
 msgid "Emoji annotation language:"
 msgstr ""
 
-#: setup/setup.ui:1062
+#: setup/setup.ui:1074
 msgid ""
 "Match emoji annotations partially with the following condition and more than "
 "the number of characters:"
 msgstr ""
 
-#: setup/setup.ui:1067
+#: setup/setup.ui:1079
 msgid ""
 "If emoji annotations can be matched with a partial string instead of the "
 "exact match"
 msgstr ""
 
-#: setup/setup.ui:1101
+#: setup/setup.ui:1113
 msgid "Prefix match"
 msgstr ""
 
-#: setup/setup.ui:1115
+#: setup/setup.ui:1127
 msgid "Suffix match"
 msgstr ""
 
-#: setup/setup.ui:1130
+#: setup/setup.ui:1142
 msgid "Containing match"
 msgstr ""
 
-#: setup/setup.ui:1176
+#: setup/setup.ui:1188
 msgid "Emoji"
 msgstr ""
 
-#: setup/setup.ui:1230
+#: setup/setup.ui:1242
 msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: setup/setup.ui:1278
+#: setup/setup.ui:1290
 msgid "<b>Global input method settings</b>"
 msgstr ""
 
-#: setup/setup.ui:1310
+#: setup/setup.ui:1322
 msgid ""
 "Choose glyphs with the input method's language on the candidate window for "
 "the duplicated code points"
 msgstr ""
 
-#: setup/setup.ui:1327
-msgid "<b>Fonts</b>"
+#: setup/setup.ui:1341
+msgid "Use custom theme:"
+msgstr ""
+
+#: setup/setup.ui:1342
+msgid "Choose a theme of the candidate window"
+msgstr ""
+
+#: setup/setup.ui:1378
+msgid "Use custom icon:"
+msgstr ""
+
+#: setup/setup.ui:1379
+msgid "Choose a theme of the arrow buttons on the candidate window"
+msgstr ""
+
+#: setup/setup.ui:1424
+msgid "<b>Font and Theme</b>"
 msgstr ""
 
-#: setup/setup.ui:1347
+#: setup/setup.ui:1444
 msgid "Advanced"
 msgstr ""
 
@@ -3256,7 +3304,7 @@ msgid "Alias: %s"
 msgstr ""
 
 #: ui/gtk3/emojier.vala:2180 ui/gtk3/ibus-extension-gtk3.desktop.in:3
-#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1244
+#: ui/gtk3/ibus-ui-emojier.desktop.in:3 ui/gtk3/panel.vala:1273
 msgid "Emoji Choice"
 msgstr ""
 
@@ -3313,59 +3361,63 @@ msgstr ""
 msgid "Match with the condition of the specified integer"
 msgstr ""
 
-#: ui/gtk3/panel.vala:320 ui/gtk3/panel.vala:351
+#: ui/gtk3/panel.vala:337 ui/gtk3/panel.vala:368
 msgid "IBus Panel"
 msgstr ""
 
-#: ui/gtk3/panel.vala:756
-msgid "IBus Notification"
-msgstr ""
-
-#: ui/gtk3/panel.vala:757 ui/gtk3/panel.vala:766 ui/gtk3/panel.vala:770
+#: ui/gtk3/panel.vala:767
 msgid ""
 "Keymap changes do not work in Plasma Wayland at present. Please use "
 "systemsettings5 instead."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1045
+#: ui/gtk3/panel.vala:775
+msgid "IBus Notification"
+msgstr ""
+
+#: ui/gtk3/panel.vala:1068
 #, c-format
 msgid ""
 "Your configured input method %s does not exist in IBus input methods so "
 "\"US\" layout was configured instead of your input method."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1050
+#: ui/gtk3/panel.vala:1073
 msgid ""
 "At least one of your configured input methods does not exist in IBus input "
 "methods."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1053
+#: ui/gtk3/panel.vala:1076
 msgid ""
 "Please run `ibus-setup` command, open \"Input Method\" tab, and configure "
 "your input methods again."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1216
+#: ui/gtk3/panel.vala:1245
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk3/panel.vala:1220
+#: ui/gtk3/panel.vala:1249
 msgid "translator-credits"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1239
+#: ui/gtk3/panel.vala:1268
 msgid "Preferences"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1265
+#: ui/gtk3/panel.vala:1294
 msgid "Restart"
 msgstr ""
 
-#: ui/gtk3/panel.vala:1269
+#: ui/gtk3/panel.vala:1298
 msgid "Quit"
 msgstr ""
 
+#: ui/gtk3/panel.vala:1324
+msgid "No input method"
+msgstr ""
+
 #. Translators: If your locale is RTL, the msgstr is "default:RTL".
 #. * Otherwise the msgstr is "default:LTR".
 #: ui/gtk3/propertypanel.vala:368 ui/gtk3/propertypanel.vala:376
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 101c2b3d4..452b14c87 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -41,6 +41,7 @@ class Panel : IBus.PanelService {
     private Gtk.Menu m_ime_menu;
     private Gtk.Menu m_sys_menu;
     private IBus.EngineDesc[] m_engines = {};
+    private IBus.EngineDesc m_en_engine;
     private GLib.HashTable<string, IBus.EngineDesc> m_engine_contexts =
             new GLib.HashTable<string, IBus.EngineDesc>(GLib.str_hash,
                                                         GLib.str_equal);
@@ -928,13 +929,20 @@ class Panel : IBus.PanelService {
     }
 
     private void switch_engine(int i, bool force = false) {
-        GLib.assert(i >= 0 && i < m_engines.length);
+        if (m_is_wayland)
+            GLib.assert(i >= 0 && i <= m_engines.length);
+        else
+            GLib.assert(i >= 0 && i < m_engines.length);
 
         // Do not need switch
         if (i == 0 && !force)
             return;
 
-        IBus.EngineDesc engine = m_engines[i];
+        IBus.EngineDesc engine;
+        if (m_is_wayland && m_engines.length == 0)
+            engine = m_en_engine;
+        else
+            engine = m_engines[i];
 
         set_engine(engine);
     }
@@ -1024,17 +1032,15 @@ class Panel : IBus.PanelService {
                                 string[]? order_names) {
         string[]? engine_names = unowned_engine_names;
 
-        if (engine_names == null || engine_names.length == 0) {
-            if (m_is_wayland)
-                engine_names = {};
-            else
-                engine_names = {"xkb:us::eng"};
-        }
+        if (engine_names == null || engine_names.length == 0)
+            engine_names = {"xkb:us::eng"};
 
         string[] names = {};
 
         foreach (var name in order_names) {
             if (m_is_wayland && name.has_prefix("xkb:"))
+                name = "xkb:us::eng";
+            if (name in names)
                 continue;
             if (name in engine_names)
                 names += name;
@@ -1042,7 +1048,7 @@ class Panel : IBus.PanelService {
 
         foreach (var name in engine_names) {
             if (m_is_wayland && name.has_prefix("xkb:"))
-                continue;
+                name = "xkb:us::eng";
             if (name in names)
                 continue;
             names += name;
@@ -1083,14 +1089,20 @@ class Panel : IBus.PanelService {
 	}
 
         if (m_engines.length == 0) {
-            if (engines.length > 0) {
-                m_engines = engines;
-                switch_engine(0, true);
-                run_preload_engines(engines, 1);
-            } else {
-                m_candidate_panel.set_language(new Pango.AttrLanguage(
-                        Pango.Language.from_string(null)));
+            m_engines = engines;
+            // Do not show engines in panel icon and suggest systemsettings5
+            // in Plasma Wayland in case all engines are XKB.
+            if (m_is_wayland && m_engines.length == 1 &&
+                m_engines[0].get_name() == "xkb:us::eng") {
+                m_engines = {};
+                if (m_en_engine == null) {
+                    m_en_engine =
+                            m_bus.get_engines_by_names({"xkb:us::eng"})[0];
+                }
             }
+            switch_engine(0, true);
+            if (m_engines.length > 0)
+                run_preload_engines(m_engines, 1);
         } else {
             var current_engine = m_engines[0];
             m_engines = engines;
@@ -1307,6 +1319,10 @@ class Panel : IBus.PanelService {
             var longname = engine.get_longname();
             var textdomain = engine.get_textdomain();
             var transname = GLib.dgettext(textdomain, longname);
+            if (m_is_wayland && engine.get_name().has_prefix("xkb:")) {
+                language = _("Other");
+                transname = _("No input method");
+            }
             var item = new Gtk.MenuItem.with_label(
                 "%s - %s".printf (IBus.get_language_name(language), transname));
             // Make a copy of engine to workaround a bug in vala.
@@ -1584,7 +1600,7 @@ class Panel : IBus.PanelService {
 
             if (engine != null) {
                 var name = engine.get_name();
-                if (name.length >= 4 && name[0:4] == "xkb:")
+                if (!m_is_wayland && name.length >= 4 && name[0:4] == "xkb:")
                     language = m_switcher.get_xkb_language(engine);
             }
 

From b94f0c1cea5d0e423fef3bcc13b23f212f04c930 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 7 Jul 2022 08:13:57 +0900
Subject: [PATCH 816/816] src: Add IBUS_CAP_OSK to IBusCapabilite

Some IMEs' behavior is different between the on-screen keyboard and
the direct physical keyboard and this flag is useful for the IMEs.

Also fix src/ibusaccelgroup.c for gtkdoc-mkhtml.
If the API comment of IBusCapabilite is updated, XML & HTML files
are rebuilt and gtk-doc-1.33.2 no longer accepts HTML tags in
the comments.
---
 src/ibusaccelgroup.c | 14 +++++++-------
 src/ibustypes.h      |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ibusaccelgroup.c b/src/ibusaccelgroup.c
index ef2d3976b..aec1c7e44 100644
--- a/src/ibusaccelgroup.c
+++ b/src/ibusaccelgroup.c
@@ -267,14 +267,14 @@ is_keycode (const gchar *string)
  *     modifier mask, %NULL
  *
  * Parses a string representing an accelerator. The format looks like
- * “<Control>a” or “<Shift><Alt>F1” or “<Release>z” (the last one is
- * for key release).
+ * “&lt;Control&gt;a” or “&lt;Shift&gt;&lt;Alt&gt;F1” or “&lt;Release%gt;z”
+ * (the last one is for key release).
  *
  * The parser is fairly liberal and allows lower or upper case, and also
- * abbreviations such as “<Ctl>” and “<Ctrl>”. Key names are parsed using
- * gdk_keyval_from_name(). For character keys the name is not the symbol,
- * but the lowercase name, e.g. one would use “<Ctrl>minus” instead of
- * “<Ctrl>-”.
+ * abbreviations such as “&lt;Ctl&gt;” and “&lt;Ctrl&gt;”. Key names are
+ * parsed using gdk_keyval_from_name(). For character keys the name is not the
+ * symbol, but the lowercase name, e.g. one would use “&lt;Ctrl&gt;minus”
+ * instead of “&lt;Ctrl&gt;-”.
  *
  * If the parse fails, @accelerator_key and @accelerator_mods will
  * be set to 0 (zero).
@@ -403,7 +403,7 @@ ibus_accelerator_parse (const gchar      *accelerator,
  *
  * Converts an accelerator keyval and modifier mask into a string
  * parseable by gtk_accelerator_parse(). For example, if you pass in
- * #IBUS_KEY_q and #IBUS_CONTROL_MASK, this function returns “<Control>q”.
+ * #IBUS_KEY_q and #IBUS_CONTROL_MASK, this function returns “&lt;Control&gt;q”.
  *
  * If you need to display accelerators in the user interface,
  * see gtk_accelerator_get_label().
diff --git a/src/ibustypes.h b/src/ibustypes.h
index 990659ace..60bcb92be 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -108,6 +108,7 @@ typedef enum
  * @IBUS_CAP_PROPERTY: UI is capable to have property.
  * @IBUS_CAP_SURROUNDING_TEXT: Client can provide surround text,
  *  or IME can handle surround text.
+ * @IBUS_CAP_OSK: UI is owned by on-screen keyboard.
  *
  * Capability flags of UI.
  */
@@ -118,6 +119,7 @@ typedef enum {
     IBUS_CAP_FOCUS              = 1 << 3,
     IBUS_CAP_PROPERTY           = 1 << 4,
     IBUS_CAP_SURROUNDING_TEXT   = 1 << 5,
+    IBUS_CAP_OSK                = 1 << 6,
 } IBusCapabilite;
 
 /**